MyFavMirrors/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-03-30 17:23:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix passport failureRedirect for subdomain paths

Browse Source 
Signed-off-by: si458 <simonsmith5521@gmail.com>
This commit is contained in:
si458 2024-06-11 20:38:09 +01:00
parent d7341ab153
commit 42a07e9d74
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
webserver.js
View File

@ -6710,7 +6710,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
res.set('Content-Type', 'text/html'); res.set('Content-Type', 'text/html');
res.end('<html><head><meta http-equiv="refresh" content=0;url="' + url + '"></head><body></body></html>'); res.end('<html><head><meta http-equiv="refresh" content=0;url="' + url + '"></head><body></body></html>');
} else { } else {
domain.passport.authenticate('twitter-' + domain.id, { failureRedirect: '/' })(req, res, function (err) { if (err != null) { console.log(err); } next(); }); domain.passport.authenticate('twitter-' + domain.id, { failureRedirect: url })(req, res, function (err) { if (err != null) { console.log(err); } next(); });
} }
}, handleStrategyLogin); }, handleStrategyLogin);
} }
@ -6725,7 +6725,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
obj.app.get(url + 'auth-google-callback', function (req, res, next) { obj.app.get(url + 'auth-google-callback', function (req, res, next) {
var domain = getDomain(req); var domain = getDomain(req);
if (domain.passport == null) { next(); return; } if (domain.passport == null) { next(); return; }
domain.passport.authenticate('google-' + domain.id, { failureRedirect: '/' })(req, res, function (err) { if (err != null) { console.log(err); } next(); }); domain.passport.authenticate('google-' + domain.id, { failureRedirect: url })(req, res, function (err) { if (err != null) { console.log(err); } next(); });
}, handleStrategyLogin); }, handleStrategyLogin);
} }
@ -6739,7 +6739,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
obj.app.get(url + 'auth-github-callback', function (req, res, next) { obj.app.get(url + 'auth-github-callback', function (req, res, next) {
var domain = getDomain(req); var domain = getDomain(req);
if (domain.passport == null) { next(); return; } if (domain.passport == null) { next(); return; }
domain.passport.authenticate('github-' + domain.id, { failureRedirect: '/' })(req, res, next); domain.passport.authenticate('github-' + domain.id, { failureRedirect: url })(req, res, next);
}, handleStrategyLogin); }, handleStrategyLogin);
} }
@ -6762,7 +6762,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
} else { } else {
if (req.query.state != null) { if (req.query.state != null) {
var c = obj.parent.decodeCookie(req.query.state, obj.parent.loginCookieEncryptionKey, 10); // 10 minute timeout var c = obj.parent.decodeCookie(req.query.state, obj.parent.loginCookieEncryptionKey, 10); // 10 minute timeout
if ((c != null) && (c.p == 'azure')) { domain.passport.authenticate('azure-' + domain.id, { failureRedirect: '/' })(req, res, next); return; } if ((c != null) && (c.p == 'azure')) { domain.passport.authenticate('azure-' + domain.id, { failureRedirect: url })(req, res, next); return; }
} }
next(); next();
} }
@ -6776,7 +6776,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
obj.app.get(authURL, function (req, res, next) { obj.app.get(authURL, function (req, res, next) {
var domain = getDomain(req); var domain = getDomain(req);
if (domain.passport == null) { next(); return; } if (domain.passport == null) { next(); return; }
domain.passport.authenticate(`oidc-${domain.id}`, { failureRedirect: '/', failureFlash: true })(req, res, next); domain.passport.authenticate(`oidc-${domain.id}`, { failureRedirect: url, failureFlash: true })(req, res, next);
}); });
let redirectPath; let redirectPath;
if (typeof domain.authstrategies.oidc.client.redirect_uri == 'string') { if (typeof domain.authstrategies.oidc.client.redirect_uri == 'string') {
@ -6792,7 +6792,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
if (domain.passport == null) { next(); return; } if (domain.passport == null) { next(); return; }
if (req.session && req.session.userid) { next(); return; } // already logged in so dont authenticate just carry on if (req.session && req.session.userid) { next(); return; } // already logged in so dont authenticate just carry on
if (req.session && req.session['oidc-' + domain.id]) { // we have a request to login so do authenticate if (req.session && req.session['oidc-' + domain.id]) { // we have a request to login so do authenticate
domain.passport.authenticate(`oidc-${domain.id}`, { failureRedirect: '/', failureFlash: true })(req, res, next); domain.passport.authenticate(`oidc-${domain.id}`, { failureRedirect: url, failureFlash: true })(req, res, next);
} else { // no idea so carry on } else { // no idea so carry on
next(); return; next(); return;
} }
@ -6804,12 +6804,12 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
obj.app.get(url + 'auth-saml', function (req, res, next) { obj.app.get(url + 'auth-saml', function (req, res, next) {
var domain = getDomain(req); var domain = getDomain(req);
if (domain.passport == null) { next(); return; } if (domain.passport == null) { next(); return; }
domain.passport.authenticate('saml-' + domain.id, { failureRedirect: '/', failureFlash: true })(req, res, next); domain.passport.authenticate('saml-' + domain.id, { failureRedirect: url, failureFlash: true })(req, res, next);
}); });
obj.app.post(url + 'auth-saml-callback', obj.bodyParser.urlencoded({ extended: false }), function (req, res, next) { obj.app.post(url + 'auth-saml-callback', obj.bodyParser.urlencoded({ extended: false }), function (req, res, next) {
var domain = getDomain(req); var domain = getDomain(req);
if (domain.passport == null) { next(); return; } if (domain.passport == null) { next(); return; }
domain.passport.authenticate('saml-' + domain.id, { failureRedirect: '/', failureFlash: true })(req, res, next); domain.passport.authenticate('saml-' + domain.id, { failureRedirect: url, failureFlash: true })(req, res, next);
}, handleStrategyLogin); }, handleStrategyLogin);
} }
@ -6818,12 +6818,12 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
obj.app.get(url + 'auth-intel', function (req, res, next) { obj.app.get(url + 'auth-intel', function (req, res, next) {
var domain = getDomain(req); var domain = getDomain(req);
if (domain.passport == null) { next(); return; } if (domain.passport == null) { next(); return; }
domain.passport.authenticate('isaml-' + domain.id, { failureRedirect: '/', failureFlash: true })(req, res, next); domain.passport.authenticate('isaml-' + domain.id, { failureRedirect: url, failureFlash: true })(req, res, next);
}); });
obj.app.post(url + 'auth-intel-callback', obj.bodyParser.urlencoded({ extended: false }), function (req, res, next) { obj.app.post(url + 'auth-intel-callback', obj.bodyParser.urlencoded({ extended: false }), function (req, res, next) {
var domain = getDomain(req); var domain = getDomain(req);
if (domain.passport == null) { next(); return; } if (domain.passport == null) { next(); return; }
domain.passport.authenticate('isaml-' + domain.id, { failureRedirect: '/', failureFlash: true })(req, res, next); domain.passport.authenticate('isaml-' + domain.id, { failureRedirect: url, failureFlash: true })(req, res, next);
}, handleStrategyLogin); }, handleStrategyLogin);
} }
@ -6832,12 +6832,12 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
obj.app.get(url + 'auth-jumpcloud', function (req, res, next) { obj.app.get(url + 'auth-jumpcloud', function (req, res, next) {
var domain = getDomain(req); var domain = getDomain(req);
if (domain.passport == null) { next(); return; } if (domain.passport == null) { next(); return; }
domain.passport.authenticate('jumpcloud-' + domain.id, { failureRedirect: '/', failureFlash: true })(req, res, next); domain.passport.authenticate('jumpcloud-' + domain.id, { failureRedirect: url, failureFlash: true })(req, res, next);
}); });
obj.app.post(url + 'auth-jumpcloud-callback', obj.bodyParser.urlencoded({ extended: false }), function (req, res, next) { obj.app.post(url + 'auth-jumpcloud-callback', obj.bodyParser.urlencoded({ extended: false }), function (req, res, next) {
var domain = getDomain(req); var domain = getDomain(req);
if (domain.passport == null) { next(); return; } if (domain.passport == null) { next(); return; }
domain.passport.authenticate('jumpcloud-' + domain.id, { failureRedirect: '/', failureFlash: true })(req, res, next); domain.passport.authenticate('jumpcloud-' + domain.id, { failureRedirect: url, failureFlash: true })(req, res, next);
}, handleStrategyLogin); }, handleStrategyLogin);
} }
} }