Skip to content

Commit 1dedf9b

Browse files
authored
Fix http protocol auth (#27875) (#27878)
backport #27875
1 parent 2147bfd commit 1dedf9b

File tree

4 files changed

+46
-14
lines changed

4 files changed

+46
-14
lines changed

routers/web/githttp.go

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
// Copyright 2023 The Gitea Authors. All rights reserved.
2+
// SPDX-License-Identifier: MIT
3+
4+
package web
5+
6+
import (
7+
"net/http"
8+
9+
"code.gitea.io/gitea/modules/context"
10+
"code.gitea.io/gitea/modules/setting"
11+
"code.gitea.io/gitea/modules/web"
12+
"code.gitea.io/gitea/routers/web/repo"
13+
context_service "code.gitea.io/gitea/services/context"
14+
)
15+
16+
func requireSignIn(ctx *context.Context) {
17+
if !setting.Service.RequireSignInView {
18+
return
19+
}
20+
21+
// rely on the results of Contexter
22+
if !ctx.IsSigned {
23+
// TODO: support digit auth - which would be Authorization header with digit
24+
ctx.Resp.Header().Set("WWW-Authenticate", `Basic realm="Gitea"`)
25+
ctx.Error(http.StatusUnauthorized)
26+
}
27+
}
28+
29+
func gitHTTPRouters(m *web.Route) {
30+
m.Group("", func() {
31+
m.PostOptions("/git-upload-pack", repo.ServiceUploadPack)
32+
m.PostOptions("/git-receive-pack", repo.ServiceReceivePack)
33+
m.GetOptions("/info/refs", repo.GetInfoRefs)
34+
m.GetOptions("/HEAD", repo.GetTextFile("HEAD"))
35+
m.GetOptions("/objects/info/alternates", repo.GetTextFile("objects/info/alternates"))
36+
m.GetOptions("/objects/info/http-alternates", repo.GetTextFile("objects/info/http-alternates"))
37+
m.GetOptions("/objects/info/packs", repo.GetInfoPacks)
38+
m.GetOptions("/objects/info/{file:[^/]*}", repo.GetTextFile(""))
39+
m.GetOptions("/objects/{head:[0-9a-f]{2}}/{hash:[0-9a-f]{38}}", repo.GetLooseObject)
40+
m.GetOptions("/objects/pack/pack-{file:[0-9a-f]{40}}.pack", repo.GetPackFile)
41+
m.GetOptions("/objects/pack/pack-{file:[0-9a-f]{40}}.idx", repo.GetIdxFile)
42+
}, ignSignInAndCsrf, requireSignIn, repo.HTTPGitEnabledHandler, repo.CorsHandler(), context_service.UserAssignmentWeb())
43+
}
File renamed without changes.
File renamed without changes.

routers/web/web.go

+3-14
Original file line numberDiff line numberDiff line change
@@ -174,14 +174,15 @@ func Routes(ctx gocontext.Context) *web.Route {
174174
return routes
175175
}
176176

177+
var ignSignInAndCsrf = auth_service.VerifyAuthWithOptions(&auth_service.VerifyOptions{DisableCSRF: true})
178+
177179
// registerRoutes register routes
178180
func registerRoutes(m *web.Route) {
179181
reqSignIn := auth_service.VerifyAuthWithOptions(&auth_service.VerifyOptions{SignInRequired: true})
180182
reqSignOut := auth_service.VerifyAuthWithOptions(&auth_service.VerifyOptions{SignOutRequired: true})
181183
// TODO: rename them to "optSignIn", which means that the "sign-in" could be optional, depends on the VerifyOptions (RequireSignInView)
182184
ignSignIn := auth_service.VerifyAuthWithOptions(&auth_service.VerifyOptions{SignInRequired: setting.Service.RequireSignInView})
183185
ignExploreSignIn := auth_service.VerifyAuthWithOptions(&auth_service.VerifyOptions{SignInRequired: setting.Service.RequireSignInView || setting.Service.Explore.RequireSigninView})
184-
ignSignInAndCsrf := auth_service.VerifyAuthWithOptions(&auth_service.VerifyOptions{DisableCSRF: true})
185186
validation.AddBindingRules()
186187

187188
linkAccountEnabled := func(ctx *context.Context) {
@@ -1377,19 +1378,7 @@ func registerRoutes(m *web.Route) {
13771378
})
13781379
}, ignSignInAndCsrf, lfsServerEnabled)
13791380

1380-
m.Group("", func() {
1381-
m.PostOptions("/git-upload-pack", repo.ServiceUploadPack)
1382-
m.PostOptions("/git-receive-pack", repo.ServiceReceivePack)
1383-
m.GetOptions("/info/refs", repo.GetInfoRefs)
1384-
m.GetOptions("/HEAD", repo.GetTextFile("HEAD"))
1385-
m.GetOptions("/objects/info/alternates", repo.GetTextFile("objects/info/alternates"))
1386-
m.GetOptions("/objects/info/http-alternates", repo.GetTextFile("objects/info/http-alternates"))
1387-
m.GetOptions("/objects/info/packs", repo.GetInfoPacks)
1388-
m.GetOptions("/objects/info/{file:[^/]*}", repo.GetTextFile(""))
1389-
m.GetOptions("/objects/{head:[0-9a-f]{2}}/{hash:[0-9a-f]{38}}", repo.GetLooseObject)
1390-
m.GetOptions("/objects/pack/pack-{file:[0-9a-f]{40}}.pack", repo.GetPackFile)
1391-
m.GetOptions("/objects/pack/pack-{file:[0-9a-f]{40}}.idx", repo.GetIdxFile)
1392-
}, ignSignInAndCsrf, repo.HTTPGitEnabledHandler, repo.CorsHandler(), context_service.UserAssignmentWeb())
1381+
gitHTTPRouters(m)
13931382
})
13941383
})
13951384
// ***** END: Repository *****

0 commit comments

Comments
 (0)