Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ensure that 2fa is checked on reset-password #9857

Merged
merged 5 commits into from
Jan 19, 2020
Merged

Ensure that 2fa is checked on reset-password #9857

merged 5 commits into from
Jan 19, 2020

Conversation

zeripath
Copy link
Contributor

No description provided.

@zeripath zeripath added this to the 1.12.0 milestone Jan 18, 2020
@codecov-io
Copy link

codecov-io commented Jan 18, 2020 •
edited
Loading

Codecov Report

Merging #9857 into master will decrease coverage by 0.01%.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #9857      +/-   ##
==========================================
- Coverage   42.29%   42.28%   -0.02%     
==========================================
  Files         604      604              
  Lines       79212    79228      +16     
==========================================
- Hits        33504    33501       -3     
- Misses      41579    41598      +19     
  Partials     4129     4129
Impacted Files Coverage Δ
modules/graceful/server.go 48.55% <0%> (-3.8%) ⬇️
modules/setting/setting.go 45.09% <0%> (-0.44%) ⬇️
services/pull/check.go 56.64% <0%> (-2.1%) ⬇️
models/error.go 30.76% <0%> (-0.55%) ⬇️
modules/avatar/avatar.go 54% <0%> (+6%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2a1cf3c...e87bbce. Read the comment docs.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jan 18, 2020
lafriks
lafriks requested changes Jan 18, 2020
View reviewed changes
routers/user/auth.go Outdated Show resolved Hide resolved
routers/user/auth.go Outdated Show resolved Hide resolved
routers/user/auth.go Outdated Show resolved Hide resolved
zeripath
zeripath commented Jan 19, 2020
View reviewed changes
routers/user/auth.go Outdated Show resolved Hide resolved
zeripath
zeripath commented Jan 19, 2020
View reviewed changes
routers/user/auth.go Outdated Show resolved Hide resolved
zeripath
zeripath commented Jan 19, 2020
View reviewed changes
routers/user/auth.go Outdated Show resolved Hide resolved
@zeripath @lafriks
Apply suggestions from code review
29512b3 
Co-Authored-By: Lauris BH <lauris@nix.lv>
@zeripath
Copy link
Contributor Author

zeripath commented Jan 19, 2020 •
edited
Loading

So I think I need to move the scratch code and passcode check to be after the validation asif the scratch code is used you need to redirect to change it?

Done.

@6543 6543 mentioned this pull request Jan 19, 2020
Merged
6543
6543 approved these changes Jan 19, 2020
View reviewed changes
Copy link
Member

@6543 6543 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

template format need more discusion ...
and then apply the style to all ...

but it should not block this fix

@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Jan 19, 2020
@6543 6543 mentioned this pull request Jan 19, 2020
Closed
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Jan 19, 2020
@zeripath zeripath merged commit fb8aea4 into go-gitea:master Jan 19, 2020
@zeripath zeripath deleted the reset-password-2fa branch January 19, 2020 20:17
pull bot pushed a commit to techknowlogick/gitea that referenced this pull request Jan 19, 2020
@zeripath @lafriks
Ensure that 2fa is checked on reset-password (go-gitea#9857)
92d6bca 
* Ensure that 2fa is checked on reset-password

* Apply suggestions from code review

Co-Authored-By: Lauris BH <lauris@nix.lv>

* Properly manage scratch_code regeneration

Co-authored-by: Lauris BH <lauris@nix.lv>
zeripath added a commit to zeripath/gitea that referenced this pull request Jan 19, 2020
@zeripath @lafriks
Ensure that 2fa is checked on reset-password (go-gitea#9857)
f2e6a59 
* Ensure that 2fa is checked on reset-password

* Apply suggestions from code review

Co-Authored-By: Lauris BH <lauris@nix.lv>

* Properly manage scratch_code regeneration

Co-authored-by: Lauris BH <lauris@nix.lv>
zeripath added a commit to zeripath/gitea that referenced this pull request Jan 19, 2020
@zeripath @lafriks
Ensure that 2fa is checked on reset-password (go-gitea#9857)
4bb926d 
* Ensure that 2fa is checked on reset-password

* Apply suggestions from code review

Co-Authored-By: Lauris BH <lauris@nix.lv>

* Properly manage scratch_code regeneration

Co-authored-by: Lauris BH <lauris@nix.lv>
zeripath added a commit that referenced this pull request Jan 19, 2020
@zeripath @lafriks
Ensure that 2fa is checked on reset-password (#9857) (#9876)
e878d74 
* Ensure that 2fa is checked on reset-password

* Apply suggestions from code review

Co-Authored-By: Lauris BH <lauris@nix.lv>

* Properly manage scratch_code regeneration

Co-authored-by: Lauris BH <lauris@nix.lv>

Co-authored-by: Lauris BH <lauris@nix.lv>
techknowlogick pushed a commit that referenced this pull request Jan 19, 2020
@zeripath @lafriks @techknowlogick
Ensure that 2fa is checked on reset-password (#9857) (#9877)
e3e0248 
* Ensure that 2fa is checked on reset-password

* Apply suggestions from code review

Co-Authored-By: Lauris BH <lauris@nix.lv>

* Properly manage scratch_code regeneration

Co-authored-by: Lauris BH <lauris@nix.lv>

Co-authored-by: Lauris BH <lauris@nix.lv>
@zeripath zeripath added backport/done All backports for this PR have been created backport/v1.10 labels Jan 22, 2020
This was referenced Jan 22, 2020
Merged
Merged
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@techknowlogick techknowlogick techknowlogick approved these changes

@lafriks lafriks lafriks approved these changes

@6543 6543 6543 approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug
Projects
None yet
Milestone
1.12.0
Development

Successfully merging this pull request may close these issues.
6 participants
@zeripath @codecov-io @techknowlogick @lafriks @6543 @GiteaBot