ActivityPub-federated video streaming platform using P2P directly in your web browser
Separate redis keys to check user email
Chocobozzzc6d673e8c6ee
diff --git a/packages/tests/src/api/users/users-email-verification.ts b/packages/tests/src/api/users/users-email-verification.tsindex 0e5ab0e359..6f5e806231 100644--- a/packages/tests/src/api/users/users-email-verification.ts+++ b/packages/tests/src/api/users/users-email-verification.ts@@ -128,6 +128,48 @@ describe('Test users email verification', function () {}})+ it('Should not verify a pending email using a verification string minted for the main email', async function () {+ this.timeout(30000)++ let mainEmailVerificationString: string++ {+ await server.users.updateMe({+ token: userAccessToken,+ email: '[email protected]',+ currentPassword: user1.password+ })++ await waitJobs(server)+ expectedEmailsLength+++ expect(emails).to.have.lengthOf(expectedEmailsLength)+ }++ {+ await server.users.askSendVerifyEmail({ email: '[email protected]' })++ await waitJobs(server)+ expectedEmailsLength+++ expect(emails).to.have.lengthOf(expectedEmailsLength)++ const email = emails[expectedEmailsLength - 1]++ const verificationStringMatches = /verificationString=([a-z0-9]+)/.exec(email['text'])+ mainEmailVerificationString = verificationStringMatches[1]+ }++ await server.users.verifyEmail({+ userId,+ verificationString: mainEmailVerificationString,+ isPendingEmail: true,+ expectedStatus: HttpStatusCode.FORBIDDEN_403+ })++ const me = await server.users.getMyInfo({ token: userAccessToken })+ expect(me.email).to.equal('[email protected]')+ expect(me.pendingEmail).to.equal('[email protected]')+ })+it('Should register user not requiring email verification if setting not enabled', async function () {this.timeout(5000)await server.config.updateExistingConfig({diff --git a/server/core/controllers/api/users/email-verification.ts b/server/core/controllers/api/users/email-verification.tsindex 2d643f7b4a..84e5b76f2d 100644--- a/server/core/controllers/api/users/email-verification.ts+++ b/server/core/controllers/api/users/email-verification.ts@@ -77,7 +77,7 @@ async function verifyUserEmail (req: express.Request, res: express.Response) {user.pendingEmail = null}- await Redis.Instance.deleteUserVerifyEmailLink(user.id)+ await Redis.Instance.deleteUserVerifyEmailLink(user.id, req.body.isPendingEmail === true)await user.save()diff --git a/server/core/lib/redis.ts b/server/core/lib/redis.tsindex dc3e53e4a9..69df3b77c8 100644--- a/server/core/lib/redis.ts+++ b/server/core/lib/redis.ts@@ -219,20 +219,20 @@ class Redis {/* ************ Email verification ************ */- async setUserVerifyEmailVerificationString (userId: number) {+ async setUserVerifyEmailVerificationString (userId: number, isPendingEmail: boolean) {const generatedString = await generateRandomString(32)- await this.setValue(this.generateUserVerifyEmailKey(userId), generatedString, EMAIL_VERIFY_LIFETIME)+ await this.setValue(this.generateUserVerifyEmailKey(userId, isPendingEmail), generatedString, EMAIL_VERIFY_LIFETIME)return generatedString}- async getUserVerifyEmailLink (userId: number) {- return this.getValue(this.generateUserVerifyEmailKey(userId))+ async getUserVerifyEmailLink (userId: number, isPendingEmail: boolean) {+ return this.getValue(this.generateUserVerifyEmailKey(userId, isPendingEmail))}- deleteUserVerifyEmailLink (userId: number) {- return this.removeValue(this.generateUserVerifyEmailKey(userId))+ deleteUserVerifyEmailLink (userId: number, isPendingEmail: boolean) {+ return this.removeValue(this.generateUserVerifyEmailKey(userId, isPendingEmail))}async setRegistrationVerifyEmailVerificationString (registrationId: number) {@@ -522,8 +522,8 @@ class Redis {return sha256(CONFIG.SECRETS.PEERTUBE + '-' + ip)}- private generateUserVerifyEmailKey (userId: number) {- return 'verify-email-user-' + userId+ private generateUserVerifyEmailKey (userId: number, isPendingEmail: boolean) {+ return 'verify-email-user-' + userId + (isPendingEmail ? '-pending' : '')}private generateRegistrationVerifyEmailKey (registrationId: number) {diff --git a/server/core/lib/user.ts b/server/core/lib/user.tsindex 2fd4cfc646..d7ea972e32 100644--- a/server/core/lib/user.ts+++ b/server/core/lib/user.ts@@ -178,7 +178,7 @@ export async function createApplicationActor (applicationId: number) {// ---------------------------------------------------------------------------export async function buildUserVerifyEmail (user: MUser, isPendingEmail: boolean) {- const verificationString = await Redis.Instance.setUserVerifyEmailVerificationString(user.id)+ const verificationString = await Redis.Instance.setUserVerifyEmailVerificationString(user.id, isPendingEmail)const verifyEmailUrl = `${WEBSERVER.URL}/verify-account/email?userId=${user.id}&verificationString=${verificationString}`diff --git a/server/core/middlewares/validators/users/user-email-verification.ts b/server/core/middlewares/validators/users/user-email-verification.tsindex d178dd05b6..af25768178 100644--- a/server/core/middlewares/validators/users/user-email-verification.ts+++ b/server/core/middlewares/validators/users/user-email-verification.ts@@ -94,7 +94,7 @@ export const usersVerifyEmailValidator = [if (!await checkUserIdExist(req.params.id, res)) returnconst user = res.locals.user- const redisVerificationString = await Redis.Instance.getUserVerifyEmailLink(user.id)+ const redisVerificationString = await Redis.Instance.getUserVerifyEmailLink(user.id, req.body.isPendingEmail === true)if (!isSecretEqual(redisVerificationString, req.body.verificationString)) {return res.fail({ status: HttpStatusCode.FORBIDDEN_403, message: 'Invalid verification string.' })