Skip to content
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

Fixed group array mutation on call to validator middleware #274

Open
wants to merge 1 commit into
base: 2023-root-v2
Choose a base branch
from
Open
Changes from all commits
Commits
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
58 changes: 30 additions & 28 deletions backend/router/authenticatedRoute.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,46 +39,48 @@ authenticatedRoute.param('userId', (req, res, next, userId) => {
});


const validateGroup = (group, allowAnonymous = false, allowNoGroupMatching = false) => (req, res, next) => {
const validateGroup = (group, allowAnonymous = false, allowNoGroupMatching = false) => {
// Allow either a single group or multiple valid groups passed as an array
if (!Array.isArray(group)) { group = [group]; }

group = group.filter(e => ALLOWED_GROUPS.indexOf(e) > -1);

group.push("admin"); // admins have access to all routes.

let accessTokenFromClient = req.headers.authorization;
return (req, res, next) => {
let accessTokenFromClient = req.headers.authorization;

cognitoExpress.validate(accessTokenFromClient, function (err, response) {
if (err) {
if (allowAnonymous) {
res.locals.user = {};
next();
return;
cognitoExpress.validate(accessTokenFromClient, function (err, response) {
if (err) {
if (allowAnonymous) {
res.locals.user = {};
next();
return;
}
else {
return res.status(401).send(err);
}
}
else {
return res.status(401).send(err);
}
}
res.locals.user = response;
if (res.locals.user['cognito:groups'] && group.some(g => res.locals.user['cognito:groups'].indexOf(g) !== -1)) {
next();
}
else {
if (allowNoGroupMatching) {
next();
return;
}
if (allowAnonymous) {
res.locals.user = {};
res.locals.user = response;
if (res.locals.user['cognito:groups'] && group.some(g => res.locals.user['cognito:groups'].indexOf(g) !== -1)) {
next();
return;
}
else {
return res.status(403).send("Unauthorized; user is not in group " + group + ".");
if (allowNoGroupMatching) {
next();
return;
}
if (allowAnonymous) {
res.locals.user = {};
next();
return;
}
else {
return res.status(403).send("Unauthorized; user is not in group " + group + ".");
}
}
}
});
});
}
}

export const adminRoute = express.Router();
Expand Down