Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-02-26 16:41:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: accidental early return in confirmByCode, tests, race condition

Browse Source 
A race condition caused mongo/psql tests to fail.
This commit is contained in:
Julian Lam
2021-07-19 15:42:57 -04:00
parent a917210c5b
commit caf8968791
3 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/user/email.js
View File

@@ -126,14 +126,12 @@ UserEmail.confirmByCode = async function (code) {
let oldEmail = await user.getUserField(confirmObj.uid, 'email'); let oldEmail = await user.getUserField(confirmObj.uid, 'email');
if (oldEmail) { if (oldEmail) {
oldEmail = oldEmail || ''; oldEmail = oldEmail || '';
if (oldEmail === confirmObj.email) { if (oldEmail !== confirmObj.email) {
return; await db.sortedSetRemove('email:uid', oldEmail.toLowerCase());
await db.sortedSetRemove('email:sorted', `${oldEmail.toLowerCase()}:${confirmObj.uid}`);
await user.auth.revokeAllSessions(confirmObj.uid);
await events.log('email-change', { oldEmail, newEmail: confirmObj.email });
} }
await db.sortedSetRemove('email:uid', oldEmail.toLowerCase());
await db.sortedSetRemove('email:sorted', `${oldEmail.toLowerCase()}:${confirmObj.uid}`);
await user.auth.revokeAllSessions(confirmObj.uid);
await events.log('email-change', { oldEmail, newEmail: confirmObj.email });
} }
await Promise.all([ await Promise.all([

3
src/user/invite.js
View File

@@ -42,7 +42,8 @@ module.exports = function (User) {
const email_exists = await User.getUidByEmail(email); const email_exists = await User.getUidByEmail(email);
if (email_exists) { if (email_exists) {
throw new Error('[[error:email-taken]]'); // Silently drop the invitation if the invited email already exists locally
return true;
} }
const invitation_exists = await db.exists(`invitation:uid:${uid}:invited:${email}`); const invitation_exists = await db.exists(`invitation:uid:${uid}:invited:${email}`);

16
test/user.js
View File

@@ -975,11 +975,10 @@ describe('User', () => {
const uid = await User.create({ username: longName }); const uid = await User.create({ username: longName });
await socketUser.changeUsernameEmail({ uid: uid }, { uid: uid, username: longName, email: 'verylong@name.com' }); await socketUser.changeUsernameEmail({ uid: uid }, { uid: uid, username: longName, email: 'verylong@name.com' });
const userData = await db.getObject(`user:${uid}`); const userData = await db.getObject(`user:${uid}`);
assert.strictEqual(userData.username, longName); const awaitingValidation = await User.email.isValidationPending(uid, 'verylong@name.com');
const event = (await events.getEvents('email-confirmation-sent', 0, 0)).pop(); assert.strictEqual(userData.username, longName);
assert.strictEqual(parseInt(event.uid, 10), uid); assert.strictEqual(awaitingValidation, true);
assert.strictEqual(event.email, 'verylong@name.com');
}); });
it('should not update a user\'s username if it did not change', (done) => { it('should not update a user\'s username if it did not change', (done) => {
@@ -2048,6 +2047,7 @@ describe('User', () => {
async.apply(groups.create, { name: OWN_PRIVATE_GROUP, ownerUid: inviterUid, private: 1 }), async.apply(groups.create, { name: OWN_PRIVATE_GROUP, ownerUid: inviterUid, private: 1 }),
async.apply(groups.join, 'administrators', adminUid), async.apply(groups.join, 'administrators', adminUid),
async.apply(groups.join, 'cid:0:privileges:invite', inviterUid), async.apply(groups.join, 'cid:0:privileges:invite', inviterUid),
async.apply(User.email.confirmByUid, inviterUid),
], done); ], done);
}); });
}); });
@@ -2181,10 +2181,12 @@ describe('User', () => {
assert.strictEqual(numInvites, 0); assert.strictEqual(numInvites, 0);
}); });
it('should error if email exists', async () => { it('should succeed if email exists but not actually send an invite', async () => {
const { res } = await helpers.invite({ emails: 'inviter@nodebb.org', groupsToJoin: [] }, inviterUid, jar, csrf_token); const { res } = await helpers.invite({ emails: 'inviter@nodebb.org', groupsToJoin: [] }, inviterUid, jar, csrf_token);
assert.strictEqual(res.statusCode, 400); const numInvites = await User.getInvitesNumber(adminUid);
assert.strictEqual(res.body.status.message, 'Email taken');
assert.strictEqual(res.statusCode, 200);
assert.strictEqual(numInvites, 0);
}); });
}); });