Skip to content

Restore token authentication for git http when 2FA active #15915

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

Merged
merged 3 commits into from
May 19, 2021
Merged

Restore token authentication for git http when 2FA active #15915

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6904aa7
Restore token authentication for git http when 2FA active
zeripath May 18, 2021
14bd34f
Merge branch 'main' into fix-otp-token-auth
6543 May 18, 2021
e0a4a04
Merge branch 'main' into fix-otp-token-auth
6543 May 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion routers/repo/http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ func httpBase(ctx *context.Context) (h *serviceHandler) {
return
}

if ctx.IsBasicAuth {
if ctx.IsBasicAuth && ctx.Data["IsApiToken"] != true {
_, err = models.GetTwoFactorByUID(ctx.User.ID)
if err == nil {
// TODO: This response should be changed to "invalid credentials" for security reasons once the expectation behind it (creating an app token to authenticate) is properly documented
Expand Down