rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

[bug] Fix login attempts to disabled users

Browse Source
This commit is contained in:
Cohee
2024-10-09 01:54:56 +03:00
parent 07d6808e4e
commit 0ada5407ee
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/middleware/basicAuth.js
View File

@@ -36,12 +36,12 @@ const basicAuthMiddleware = async function (request, response, callback) {
} else if (PER_USER_BASIC_AUTH) { } else if (PER_USER_BASIC_AUTH) {
const userHandles = await getAllUserHandles(); const userHandles = await getAllUserHandles();
for (const userHandle of userHandles) { for (const userHandle of userHandles) {
if (username == userHandle) { if (username === userHandle) {
const user = await storage.getItem(toKey(userHandle)); const user = await storage.getItem(toKey(userHandle));
if (user && (user.password && user.password === getPasswordHash(password, user.salt))) { if (user && user.enabled && (user.password && user.password === getPasswordHash(password, user.salt))) {
return callback(); return callback();
} }
else if (user && !user.password && !password) { else if (user && user.enabled && !user.password && !password) {
// Login to an account without password // Login to an account without password
return callback(); return callback();
} }

2
src/users.js
View File

@@ -636,7 +636,7 @@ async function autheliaUserLogin(request) {
for (const userHandle of userHandles) { for (const userHandle of userHandles) {
if (remoteUser == userHandle) { if (remoteUser == userHandle) {
const user = await storage.getItem(toKey(userHandle)); const user = await storage.getItem(toKey(userHandle));
if (user) { if (user && user.enabled) {
request.session.handle = userHandle; request.session.handle = userHandle;
return true; return true;
} }