-
Notifications
You must be signed in to change notification settings - Fork 263
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.
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
[feat] Super User Privilege Toggle #2111
base: develop
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -42,7 +42,6 @@ const checkRestricted = async (req, res, next) => { | |
module.exports = async (req, res, next) => { | ||
try { | ||
let token = req.cookies[config.get("userToken.cookieName")]; | ||
|
||
/** | ||
* Enable Bearer Token authentication for NON-PRODUCTION environments | ||
* This is enabled as Swagger UI does not support cookie authe | ||
|
@@ -51,12 +50,24 @@ module.exports = async (req, res, next) => { | |
token = req.headers.authorization.split(" ")[1]; | ||
} | ||
|
||
const { userId } = authService.verifyAuthToken(token); | ||
const { userId, superUserAccess } = authService.verifyAuthToken(token); | ||
const userDoc = await dataAccess.retrieveUsers({ id: userId }); | ||
let userData; | ||
|
||
// add user data to `req.userData` for further use | ||
const userData = await dataAccess.retrieveUsers({ id: userId }); | ||
req.userData = userData.user; | ||
|
||
if (superUserAccess === false) { | ||
userData = userDoc.user; | ||
userData.roles.super_user = false; | ||
userData.superUserAccess = false; | ||
} else if (superUserAccess === true || superUserAccess === undefined) { | ||
userData = userDoc.user; | ||
if (superUserAccess === true) { | ||
userData.superUserAccess = true; | ||
} else { | ||
userData.superUserAccess = undefined; | ||
} | ||
} | ||
req.userData = userData; | ||
Comment on lines
+53
to
+70
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Middleware tests are missing |
||
return checkRestricted(req, res, next); | ||
} catch (err) { | ||
logger.error(err); | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,17 +14,19 @@ | |
|
||
router.post("/", authorizeAndAuthenticate([ROLES.SUPERUSER], [Services.CRON_JOB_HANDLER]), users.markUnverified); | ||
router.post("/update-in-discord", authenticate, authorizeRoles([SUPERUSER]), users.setInDiscordScript); | ||
router.post("/verify", authenticate, users.verifyUser); | ||
Check failure Code scanning / CodeQL Missing rate limiting High
This route handler performs
authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading |
||
router.get("/userId/:userId", users.getUserById); | ||
router.patch("/self", authenticate, userValidator.updateUser, users.updateSelf); | ||
Check failure Code scanning / CodeQL Missing rate limiting High
This route handler performs
authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading |
||
router.get("/", userValidator.getUsers, users.getUsers); | ||
Check failure Code scanning / CodeQL Missing rate limiting High
This route handler performs
authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading |
||
router.get("/self", authenticate, users.getSelfDetails); | ||
Check failure Code scanning / CodeQL Missing rate limiting High
This route handler performs
authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading Check failure Code scanning / CodeQL Missing rate limiting High
This route handler performs
authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading |
||
router.get("/set-super-user-access", authenticate, users.setSuperUserAccessLimiter); | ||
Check failure Code scanning / CodeQL Missing rate limiting High
This route handler performs
authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading Check failure Code scanning / CodeQL Missing rate limiting High
This route handler performs
authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can you change the route name to be more descriptive? |
||
router.get("/get-super-user-access-status", authenticate, users.getSuperUserAccessStatus); | ||
Check failure Code scanning / CodeQL Missing rate limiting High
This route handler performs
authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading |
||
router.get("/isDeveloper", authenticate, users.isDeveloper); | ||
router.get("/isUsernameAvailable/:username", authenticate, users.getUsernameAvailabilty); | ||
Check failure Code scanning / CodeQL Missing rate limiting High
This route handler performs
authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading |
||
router.get("/username", authenticate, userValidator.validateGenerateUsernameQuery, users.generateUsername); | ||
Check failure Code scanning / CodeQL Missing rate limiting High
This route handler performs
authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading Check failure Code scanning / CodeQL Missing rate limiting High
This route handler performs
authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading |
||
router.get("/chaincode", authenticate, users.generateChaincode); | ||
Check failure Code scanning / CodeQL Missing rate limiting High
This route handler performs
authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading Check failure Code scanning / CodeQL Missing rate limiting High
This route handler performs
authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading Check failure Code scanning / CodeQL Missing rate limiting High
This route handler performs
authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading |
||
router.get("/search", userValidator.validateUserQueryParams, users.filterUsers); | ||
Check failure Code scanning / CodeQL Missing rate limiting High
This route handler performs
authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading Check failure Code scanning / CodeQL Missing rate limiting High
This route handler performs
authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading |
||
router.get("/identity-stats", authenticate, authorizeRoles([SUPERUSER]), users.getIdentityStats); | ||
Check failure Code scanning / CodeQL Missing rate limiting High
This route handler performs
authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading |
||
router.patch( | ||
"/:userId/update-nickname", | ||
authenticate, | ||
|
@@ -33,13 +35,13 @@ | |
users.updateDiscordUserNickname | ||
); | ||
router.get("/:username", users.getUser); | ||
router.get("/:userId/intro", authenticate, authorizeRoles([SUPERUSER]), users.getUserIntro); | ||
Check failure Code scanning / CodeQL Missing rate limiting High
This route handler performs
authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading Check failure Code scanning / CodeQL Missing rate limiting High
This route handler performs
authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading |
||
router.put("/self/intro", authenticate, userValidator.validateJoinData, users.addUserIntro); | ||
Check failure Code scanning / CodeQL Missing rate limiting High
This route handler performs
authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading Check failure Code scanning / CodeQL Missing rate limiting High
This route handler performs
authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading |
||
router.get("/:id/skills", users.getUserSkills); | ||
Check failure Code scanning / CodeQL Missing rate limiting High
This route handler performs
authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading |
||
router.get("/:id/badges", getUserBadges); | ||
router.patch( | ||
"/", | ||
authenticate, | ||
Check failure Code scanning / CodeQL Missing rate limiting High
This route handler performs
authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading |
||
authorizeRoles([SUPERUSER]), | ||
userValidator.validateUsersPatchHandler, | ||
users.usersPatchHandler | ||
|
@@ -48,22 +50,22 @@ | |
"/:id/temporary/data", | ||
authenticate, | ||
authorizeRoles([SUPERUSER]), | ||
userValidator.validateUpdateRoles, | ||
Check failure Code scanning / CodeQL Missing rate limiting High
This route handler performs
authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading |
||
users.updateRoles | ||
Check failure Code scanning / CodeQL Missing rate limiting High
This route handler performs
authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading |
||
); | ||
|
||
// upload.single('profile') -> multer inmemory storage of file for type multipart/form-data | ||
router.post("/picture", authenticate, checkIsVerifiedDiscord, upload.single("profile"), users.postUserPicture); | ||
Check failure Code scanning / CodeQL Missing rate limiting High
This route handler performs
authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading |
||
router.patch( | ||
"/picture/verify/:id", | ||
authenticate, | ||
Check failure Code scanning / CodeQL Missing rate limiting High
This route handler performs
authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading |
||
authorizeRoles([SUPERUSER]), | ||
userValidator.validateImageVerificationQuery, | ||
users.verifyUserImage | ||
); | ||
router.get("/picture/:id", authenticate, authorizeRoles([SUPERUSER]), users.getUserImageForVerification); | ||
Check failure Code scanning / CodeQL Missing rate limiting High
This route handler performs
authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading |
||
router.patch("/profileURL", authenticate, userValidator.updateProfileURL, users.profileURL); | ||
Check failure Code scanning / CodeQL Missing rate limiting High
This route handler performs
authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading Check failure Code scanning / CodeQL Missing rate limiting High
This route handler performs
authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading |
||
router.patch("/rejectDiff", authenticate, authorizeRoles([SUPERUSER]), users.rejectProfileDiff); | ||
Check failure Code scanning / CodeQL Missing rate limiting High
This route handler performs
authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading Check failure Code scanning / CodeQL Missing rate limiting High
This route handler performs
authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading |
||
router.patch("/:userId", authenticate, authorizeRoles([SUPERUSER]), users.updateUser); | ||
router.get("/suggestedUsers/:skillId", authenticate, authorizeRoles([SUPERUSER]), users.getSuggestedUsers); | ||
Check failure Code scanning / CodeQL Missing rate limiting High
This route handler performs
authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading |
||
module.exports = router; | ||
Check failure Code scanning / CodeQL Missing rate limiting High
This route handler performs
authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading This route handler performs authorization Error loading related location Loading |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This function become complex and not readable so fix this