This repository has been archived by the owner on Apr 3, 2019. It is now read-only.
fix(email): on password reset, hash email with the emailToHashWith value
#6579
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ghost
added
the
vbudhram
force-pushed
the
issue-6571-incorrect-password-change-email
branch
from
cd70117
to
fbb6e39
Compare
vbudhram
commented
Sep 25, 2018
| * @returns {Promise} - resolves when complete | ||
| */ | ||
| completePasswordReset (password, token, code, relier) { | ||
| completePasswordReset (password, token, code, relier, emailToHashWith) { |
There was a problem hiding this comment.
Not a huge fan of this variable name, but I used it in other parts of the code..so I'll be consistent for time being.
There was a problem hiding this comment.
+1 for consistency, at least until we get around to a cleanup like https://github.com/mozilla/fxa-auth-server/issues/2344
| @@ -1173,6 +1174,47 @@ define(function (require, exports, module) { | |||
| }); | |||
| }); | |||
|
|
|||
| describe('completeAccountPasswordResetWithRecoveryKey', () => { | |||
There was a problem hiding this comment.
Noticed I didn't add a test for this before.
|
@mozilla/fxa-devs I think this is ready for r! |
|
Looks like email timeout errors, will restart in a bit. |
|
Verified as fixed on Train 122. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #6571
After some investigating and head scratching, it turns out that the password reset is not using the correct email address to hash the password when the password is reset. I am not sure when this got regressed but suspect it might have been with account recovery.
This PR pdates the
completePasswordResetandresetPasswordWithRecoveryKeyfunctions to correctly pass the email that should be hashed with password (emailToHashWith). This value ensures that passwords are always hashed with the original email the account was created with.Unfortunately, with this bug, we can't have that guarantee anymore because there might be some users that reset their passwords (after performing a primary email change), so their password would be hashed with the new email.
In practice, I don't believe this is an issue because the auth-server will only compare the
authPWthat the content-server passes to it.