Unify two factor check #27915
Merged
Unify two factor check #27915
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
Add two factor login test.
KN4CK3R
commented
Nov 5, 2023
Comment on lines
-704
to
-709
| // The OAuth2 plugin is expected to be executed first, as it must ignore the user id stored | ||
| // in the session (if there is a user id stored in session other plugins might return the user | ||
| // object for that id). | ||
| // | ||
| // The Session plugin is expected to be executed second, in order to skip authentication | ||
| // for users that have already signed in. |
There was a problem hiding this comment.
Not related but this comment does not make sense because there is no session in api routes.
delvh
approved these changes
Nov 5, 2023
wxiaoguang
approved these changes
Nov 5, 2023
|
@KN4CK3R please fix the merge conflicts. 🍵 |
|
I was unable to create a backport for 1.20. @KN4CK3R, please send one manually. 🍵 |
GiteaBot
pushed a commit
to GiteaBot/gitea
that referenced
this pull request
Nov 6, 2023
Fixes go-gitea#27819 We have support for two factor logins with the normal web login and with basic auth. For basic auth the two factor check was implemented at three different places and you need to know that this check is necessary. This PR moves the check into the basic auth itself.
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
Nov 6, 2023
* upstream/main: Fix edit topic UI (go-gitea#27925) Unify two factor check (go-gitea#27915) Revert go-gitea#27870 (go-gitea#27917) Fix JS NPE when viewing specific range of PR commits (go-gitea#27912) Install poetry dependencies with --no-root (go-gitea#27919) Show correct commit sha when viewing single commit diff (go-gitea#27916) Fix 500 when deleting a dismissed review (go-gitea#27903) Remove action runners on user deletion (go-gitea#27902) Remove SSH workaround (go-gitea#27893) Remove "tabindex" from some form buttons (go-gitea#27892) Refactor the function RemoveOrgUser (go-gitea#27582) Fix DownloadFunc when migrating releases (go-gitea#27887)
KN4CK3R
added a commit
to KN4CK3R/gitea
that referenced
this pull request
Nov 6, 2023
Fixes go-gitea#27819 We have support for two factor logins with the normal web login and with basic auth. For basic auth the two factor check was implemented at three different places and you need to know that this check is necessary. This PR moves the check into the basic auth itself.
KN4CK3R
added a commit
that referenced
this pull request
Nov 6, 2023
Backport #27915 by @KN4CK3R Fixes #27819 We have support for two factor logins with the normal web login and with basic auth. For basic auth the two factor check was implemented at three different places and you need to know that this check is necessary. This PR moves the check into the basic auth itself. Co-authored-by: KN4CK3R <[email protected]>
fuxiaohei
pushed a commit
to fuxiaohei/gitea
that referenced
this pull request
Jan 17, 2024
Fixes go-gitea#27819 We have support for two factor logins with the normal web login and with basic auth. For basic auth the two factor check was implemented at three different places and you need to know that this check is necessary. This PR moves the check into the basic auth itself.
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 #27819
We have support for two factor logins with the normal web login and with basic auth. For basic auth the two factor check was implemented at three different places and you need to know that this check is necessary. This PR moves the check into the basic auth itself.