mirror of
https://github.com/NodeBB/NodeBB.git
synced 2026-05-07 08:06:51 +02:00
fix: #14116, don't return ban reason if login credentials are incorrect
This commit is contained in:
@@ -409,21 +409,20 @@ authenticationController.localLogin = async function (req, username, password, n
|
|||||||
|
|
||||||
userData.isAdminOrGlobalMod = isAdminOrGlobalMod;
|
userData.isAdminOrGlobalMod = isAdminOrGlobalMod;
|
||||||
|
|
||||||
if (!canLoginIfBanned) {
|
|
||||||
return next(await getBanError(uid));
|
|
||||||
}
|
|
||||||
|
|
||||||
// Doing this after the ban check, because user's privileges might change after a ban expires
|
|
||||||
const hasLoginPrivilege = await privileges.global.can('local:login', uid);
|
|
||||||
if (parseInt(uid, 10) && !hasLoginPrivilege) {
|
|
||||||
return next(new Error('[[error:local-login-disabled]]'));
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const passwordMatch = await user.isPasswordCorrect(uid, password, req.ip);
|
const passwordMatch = await user.isPasswordCorrect(uid, password, req.ip);
|
||||||
if (!passwordMatch) {
|
if (!passwordMatch) {
|
||||||
return next(new Error('[[error:invalid-login-credentials]]'));
|
return next(new Error('[[error:invalid-login-credentials]]'));
|
||||||
}
|
}
|
||||||
|
if (!canLoginIfBanned) {
|
||||||
|
return next(await getBanError(uid));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Doing this after the ban check, because user's privileges might change after a ban expires
|
||||||
|
const hasLoginPrivilege = await privileges.global.can('local:login', uid);
|
||||||
|
if (parseInt(uid, 10) && !hasLoginPrivilege) {
|
||||||
|
return next(new Error('[[error:local-login-disabled]]'));
|
||||||
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
if (req.loggedIn) {
|
if (req.loggedIn) {
|
||||||
await logoutAsync(req);
|
await logoutAsync(req);
|
||||||
|
|||||||
11
test/user.js
11
test/user.js
@@ -1394,6 +1394,17 @@ describe('User', () => {
|
|||||||
assert.strictEqual(await db.isSortedSetMember('users:banned', testUid), false);
|
assert.strictEqual(await db.isSortedSetMember('users:banned', testUid), false);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('should not return ban reason if login is incorrect', async () => {
|
||||||
|
const testUid = await User.create({ username: 'bannedUser4', password: '654321' });
|
||||||
|
await User.bans.ban(testUid, 0, 'testing bans');
|
||||||
|
let { response, body } = await helpers.loginUser('bannedUser4', '5555555');
|
||||||
|
assert.strictEqual(response.status, 403);
|
||||||
|
assert.strictEqual(body, '[[error:invalid-login-credentials]]');
|
||||||
|
|
||||||
|
({ response, body } = await helpers.loginUser('bannedUser4', '654321'));
|
||||||
|
assert.strictEqual(response.status, 403);
|
||||||
|
assert.strictEqual(body.reason, 'testing bans');
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Digest.getSubscribers', () => {
|
describe('Digest.getSubscribers', () => {
|
||||||
|
|||||||
Reference in New Issue
Block a user