Skip to content

restrict access based on the blockIP property of the jwt #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Apr 12, 2022
Merged

restrict access based on the blockIP property of the jwt #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
02d5f5d
add try catch
ThomasKranitsas Apr 7, 2022
5d9d7ec
add logging
ThomasKranitsas Apr 7, 2022
29f214c
fix lint
ThomasKranitsas Apr 7, 2022
e49d4cc
fix issue with fetching member data
ThomasKranitsas Apr 7, 2022
31cb42a
fix issue with fetching member data
ThomasKranitsas Apr 7, 2022
4efe0f5
fix issue with fetching member data
ThomasKranitsas Apr 7, 2022
8c3ddc8
clean up
ThomasKranitsas Apr 7, 2022
e482676
wrap call to fetch member in try catch
ThomasKranitsas Apr 7, 2022
9b627ea
clean up country restrictions to read from jwt
ThomasKranitsas Apr 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions app-routes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,14 @@ module.exports = (app) => {
}
})

if (def.forbiddenCountries) {
actions.push(async (req, res, next) => {
if (req.authUser.isMachine) {
next()
if (def.blockByIp) {
actions.push((req, res, next) => {
req.authUser.blockIP = _.find(req.authUser, (value, key) => {
return (key.indexOf('blockIP') !== -1)
})
if (req.authUser.blockIP) {
throw new errors.ForbiddenError('Access denied')
} else {
req.authUser.userId = String(req.authUser.userId)
const user = await helper.getMemberById(req.authUser.userId)
if (!user || _.intersection([user.homeCountryCode, user.competitionCountryCode], def.forbiddenCountries).length > 0) {
throw new errors.ForbiddenError('Access denied')
}
next()
}
})
Expand Down
22 changes: 1 addition & 21 deletions config/default.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,25 +68,5 @@ module.exports = {
RESOURCE_ROLE_CREATE_TOPIC: process.env.RESOURCE_ROLE_CREATE_TOPIC || 'challenge.action.resource.role.create',
RESOURCE_ROLE_UPDATE_TOPIC: process.env.RESOURCE_ROLE_UPDATE_TOPIC || 'challenge.action.resource.role.update',

AUTOMATED_TESTING_NAME_PREFIX: process.env.AUTOMATED_TESTING_NAME_PREFIX || 'POSTMANE2E-',

FORBIDDEN_COUNTRIES: [
'Iran',
'North Korea',
'Cuba',
'Sudan',
'Syria',
'Belarus',
'Russia',
'Russian Federation'
],
FORBIDDEN_COUNTRIES_ALPHA_3: [
'IRN',
'PRK',
'CUB',
'SDN', 'SSD', // (south sudan)
'SYR',
'BLR',
'RUS'
]
AUTOMATED_TESTING_NAME_PREFIX: process.env.AUTOMATED_TESTING_NAME_PREFIX || 'POSTMANE2E-'
}
9 changes: 7 additions & 2 deletions src/common/helper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,13 @@ async function getMemberInfoById (id) {
* @returns {Promise<void>}
*/
async function getMemberById (id) {
const res = await getRequest(`${config.MEMBER_API_URL}?userId=${id}`)
return _.get(res, 'data[0]')
try {
const res = await getRequest(`${config.MEMBER_API_URL}`, { userId: id })
return _.get(res, 'body[0]')
} catch (e) {
logger.debug(e.message)
logger.debug(e)
}
}

/**
Expand Down
6 changes: 2 additions & 4 deletions src/routes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@

const constants = require('../app-constants')
const {
SCOPES: { READ, CREATE, DELETE, UPDATE, ALL },
FORBIDDEN_COUNTRIES,
FORBIDDEN_COUNTRIES_ALPHA_3
SCOPES: { READ, CREATE, DELETE, UPDATE, ALL }
} = require('config')

module.exports = {
Expand All @@ -25,7 +23,7 @@ module.exports = {
auth: 'jwt',
access: [constants.UserRoles.Admin, constants.UserRoles.Copilot, constants.UserRoles.Manager, constants.UserRoles.User],
scopes: [CREATE, ALL],
forbiddenCountries: [...FORBIDDEN_COUNTRIES, ...FORBIDDEN_COUNTRIES_ALPHA_3]
blockByIp: true
},
delete: {
controller: 'ResourceController',
Expand Down