Fix double-generation of scratch token (#6832)#6833
Merged
Conversation
techknowlogick
approved these changes
May 2, 2019
GiteaBot
added
the
lgtm/need 1
Codecov Report
@@ Coverage Diff @@
## master #6833 +/- ##
==========================================
+ Coverage 41.22% 41.22% +<.01%
==========================================
Files 421 421
Lines 58124 58120 -4
==========================================
- Hits 23960 23959 -1
+ Misses 30992 30988 -4
- Partials 3172 3173 +1
Continue to review full report at Codecov.
|
lafriks
approved these changes
May 2, 2019
GiteaBot
added
lgtm/done
Member
|
Please send backport to release/v1.8 branch |
techknowlogick
added
the
backport/done
SagePtr
added a commit
to SagePtr/gitea
that referenced
this pull request
May 2, 2019
lafriks
pushed a commit
that referenced
this pull request
May 2, 2019
This file contains hidden or 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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
5 participants
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.
Removed scratch token regeneration in NewTwoFactor, as it's generated anyway before calling this function.
This fixes bug (#6832) when scratch token was generated twice during 2FA setup and first-generated scratch token was not working (due to instantly being overwritten).