Node.js based forum software built for the modern web
fix: closes #14524, don't return errors for rate limit error
Barış Soner Uşaklı1d3d65bed9da
diff --git a/src/socket.io/user.js b/src/socket.io/user.jsindex 7903d44014..671b3bd7bf 100644--- a/src/socket.io/user.js+++ b/src/socket.io/user.js@@ -50,7 +50,7 @@ SocketUser.reset.send = async function (socket, email) {} catch (err) {await logEvent(err.message);await sleep(2500 + (utils.secureRandom(0, 500) - 250));- const internalErrors = ['[[error:invalid-email]]'];+ const internalErrors = ['[[error:invalid-email]]', '[[error:reset-rate-limited]]'];if (!internalErrors.includes(err.message)) {throw err;}diff --git a/src/user/reset.js b/src/user/reset.jsindex ff7e17cc57..52704384a7 100644--- a/src/user/reset.js+++ b/src/user/reset.js@@ -47,7 +47,7 @@ UserReset.send = async function (email) {if (!uid) {throw new Error('[[error:invalid-email]]');}- await lockReset(uid, '[[error:reset-rate-limited]]');+ await lockReset(uid);try {await canGenerate(uid);await db.sortedSetAdd('reset:issueDate:uid', Date.now(), uid);@@ -65,13 +65,12 @@ UserReset.send = async function (email) {}};-async function lockReset(uid, error) {+async function lockReset(uid) {const value = `reset${uid}`;const count = await db.incrObjectField('locks', value);if (count > 1) {- throw new Error(error);+ throw new Error('[[error:reset-rate-limited]]');}- return value;}async function canGenerate(uid) {diff --git a/test/user/reset.js b/test/user/reset.jsindex 7ce3b60b1d..a7d919119b 100644--- a/test/user/reset.js+++ b/test/user/reset.js@@ -118,9 +118,9 @@ describe('locks', () => {let uid;let email;beforeEach(async () => {- const [username, password] = [utils.generateUUID().slice(0, 10), utils.generateUUID()];+ const username = utils.generateUUID().slice(0, 10);email = `${username}@nodebb.org`;- uid = await user.create({ username, password, email }, {+ uid = await user.create({ username, email }, {emailVerification: 'verify',});});@@ -141,13 +141,26 @@ describe('locks', () => {});});- it('should not allow multiple socket calls to the reset method either', async () => {- await assert.rejects(Promise.all([+ it('socket method should shallow rate limit error', async () => {+ const results = await Promise.all([socketUser.reset.send({ uid: 0 }, email),socketUser.reset.send({ uid: 0 }, email),- ]), {- message: '[[error:reset-rate-limited]]',- });+ ]);+ assert.deepStrictEqual(results, [undefined, undefined]);+ });++ it('socket method should swallow errors when called within the rate limit', async () => {+ let result = await socketUser.reset.send({ uid: 0 }, email);+ assert.strictEqual(result, undefined);+ result = await socketUser.reset.send({ uid: 0 }, email);+ assert.strictEqual(result, undefined);+ });++ it('socket method should swallow errors with unknown email', async () => {+ let result = await socketUser.reset.send({ uid: 0 }, '[email protected]');+ assert.strictEqual(result, undefined);+ result = await socketUser.reset.send({ uid: 0 }, '[email protected]');+ assert.strictEqual(result, undefined);});it('should properly unlock user reset', async () => {