[bug] Fix login attempts to disabled users

0ada5407ee92d15083bcedc0ab494b4495cd4b44

Cohee <18619528+Cohee1207@users.noreply.github.com>

2 files changed, +4 -4Ignore whitespace
src/middleware/basicAuth.js+3 -3
@@ -36,12 +36,12 @@ const basicAuthMiddleware = async function (request, response, callback) {
36 } else if (PER_USER_BASIC_AUTH) {36 } else if (PER_USER_BASIC_AUTH) {
37 const userHandles = await getAllUserHandles();37 const userHandles = await getAllUserHandles();
38 for (const userHandle of userHandles) {38 for (const userHandle of userHandles) {
39 if (username == userHandle) {39 if (username === userHandle) {
40 const user = await storage.getItem(toKey(userHandle));40 const user = await storage.getItem(toKey(userHandle));
41 if (user && (user.password && user.password === getPasswordHash(password, user.salt))) {41 if (user && user.enabled && (user.password && user.password === getPasswordHash(password, user.salt))) {
42 return callback();42 return callback();
43 }43 }
44 else if (user && !user.password && !password) {44 else if (user && user.enabled && !user.password && !password) {
45 // Login to an account without password45 // Login to an account without password
46 return callback();46 return callback();
47 }47 }
src/users.js+1 -1
@@ -636,7 +636,7 @@ async function autheliaUserLogin(request) {
636 for (const userHandle of userHandles) {636 for (const userHandle of userHandles) {
637 if (remoteUser == userHandle) {637 if (remoteUser == userHandle) {
638 const user = await storage.getItem(toKey(userHandle));638 const user = await storage.getItem(toKey(userHandle));
639 if (user) {639 if (user && user.enabled) {
640 request.session.handle = userHandle;640 request.session.handle = userHandle;
641 return true;641 return true;
642 }642 }