[bug] Fix login attempts to disabled users

0ada5407ee92d15083bcedc0ab494b4495cd4b44

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

2 files changed, +4 -4Showing whitespace changes
src/middleware/basicAuth.js+3 -3
@@ -36,12 +36,12 @@ const basicAuthMiddleware = async function (request, response, callback) {
3636 } else if (PER_USER_BASIC_AUTH) {
3737 const userHandles = await getAllUserHandles();
3838 for (const userHandle of userHandles) {
3939 if (username === userHandle) {
4040 const user = await storage.getItem(toKey(userHandle));
4141 if (user && user.enabled && (user.password && user.password === getPasswordHash(password, user.salt))) {
4242 return callback();
4343 }
4444 else if (user && user.enabled && !user.password && !password) {
4545 // Login to an account without password
4646 return callback();
4747 }
src/users.js+1 -1
@@ -636,7 +636,7 @@ async function autheliaUserLogin(request) {
636636 for (const userHandle of userHandles) {
637637 if (remoteUser == userHandle) {
638638 const user = await storage.getItem(toKey(userHandle));
639639 if (user && user.enabled) {
640640 request.session.handle = userHandle;
641641 return true;
642642 }