mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-20 15:36:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 27

webaccess: Factor out common code

Browse source
This commit is contained in:
Richard Hansen 2020-09-12 17:23:48 -04:00 • committed by John McLear
parent f9087fabd6
commit 2bc26b8ef8
1 changed files with 11 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/node/hooks/express/webaccess.js
View file

@ -17,18 +17,21 @@ exports.checkAccess = (req, res, next) => {
// This may be called twice per access: once before authentication is checked and once after (if // This may be called twice per access: once before authentication is checked and once after (if
// settings.requireAuthorization is true). // settings.requireAuthorization is true).
const authorize = (cb) => { const authorize = (fail) => {
// Do not require auth for static paths and the API...this could be a bit brittle // Do not require auth for static paths and the API...this could be a bit brittle
if (req.path.match(/^\/(static|javascripts|pluginfw|api)/)) return cb(true); if (req.path.match(/^\/(static|javascripts|pluginfw|api)/)) return next();
if (req.path.toLowerCase().indexOf('/admin') !== 0) { if (req.path.toLowerCase().indexOf('/admin') !== 0) {
if (!settings.requireAuthentication) return cb(true); if (!settings.requireAuthentication) return next();
if (!settings.requireAuthorization && req.session && req.session.user) return cb(true); if (!settings.requireAuthorization && req.session && req.session.user) return next();
} }
if (req.session && req.session.user && req.session.user.is_admin) return cb(true); if (req.session && req.session.user && req.session.user.is_admin) return next();
hooks.aCallFirst('authorize', {req, res, next, resource: req.path}, hookResultMangle(cb)); hooks.aCallFirst('authorize', {req, res, next, resource: req.path}, hookResultMangle((ok) => {
if (ok) return next();
return fail();
));
}; };
/* Authentication OR authorization failed. */ /* Authentication OR authorization failed. */
@ -59,12 +62,7 @@ exports.checkAccess = (req, res, next) => {
let step1PreAuthenticate, step2Authenticate, step3Authorize; let step1PreAuthenticate, step2Authenticate, step3Authorize;
step1PreAuthenticate = () => { step1PreAuthenticate = () => authorize(step2Authenticate);
authorize((ok) => {
if (ok) return next();
step2Authenticate();
});
};
step2Authenticate = () => { step2Authenticate = () => {
const ctx = {req, res, next}; const ctx = {req, res, next};
@ -98,12 +96,7 @@ exports.checkAccess = (req, res, next) => {
})); }));
}; };
step3Authorize = () => { step3Authorize = () => authorize(failure);
authorize((ok) => {
if (ok) return next();
failure();
});
};
step1PreAuthenticate(); step1PreAuthenticate();
}; };