jketreno/ketr.photos
1
0
Fork 0
Code Issues 1 Activity

Restructure LDAP auth so it works with restricted albums

Browse Source 
Signed-off-by: James Ketrenos <james_git@ketrenos.com>
This commit is contained in:
James Ketr 2018-10-18 16:53:36 -07:00
parent 2800f53076
commit 859fb9d748
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/routes/users.js
View File

@ -125,7 +125,6 @@ const getSessionUser = function(req) {
}
let user = results[0];
req.user = user;
if (!user.mailVerified) {
user.restriction = user.restriction || "Email address not verified.";
@ -140,6 +139,8 @@ const getSessionUser = function(req) {
return user;
});
}).then(function(user) {
req.user = user;
/* If the user already has a restriction, or there are no album user restrictions,
* return the user to the next promise */
if (user.restriction || !config.has("restrictions")) {
@ -155,7 +156,7 @@ const getSessionUser = function(req) {
return user;
}
}
console.log("Unauthorized (logged in) access by user: " + req.user.username);
console.log("Unauthorized (logged in) access by user: " + user.username);
user.restriction = "Unauthorized access attempt to restricted album.";
return user;
@ -204,9 +205,9 @@ router.post("/login", function(req, res) {
return ldapPromise(username, password).then(function(ldap) {
let user = {};
user.name = ldap.displayName;
user.username = ldap.uid;
user.id = "LDAP";
user.displayName = ldap.displayName;
user.username = ldap.uid;
user.mail = ldap.mail;
user.authenticated = 1;
user.mailVerified = 1;
@ -252,6 +253,7 @@ router.post("/login", function(req, res) {
return res.status(200).send(user);
});
}).catch(function(error) {
console.log(error);
return res.status(403).send(error);
});
});