Skip to content

Move HttpBackend function to Http to reduce function calls when git smart http requests #9057

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
Nov 21, 2019
Merged

Move HttpBackend function to Http to reduce function calls when git smart http requests #9057

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c142706
Move HttpBackend function to Http to reduce function calls when git s…
lunny Nov 18, 2019
762b17e
Merge branch 'master' into lunny/remove_httpbackend
lunny Nov 20, 2019
89dc434
Merge branch 'master' into lunny/remove_httpbackend
lunny Nov 21, 2019
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
97 changes: 47 additions & 50 deletions routers/repo/http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,11 +277,56 @@ func HTTP(ctx *context.Context) {
}
}

HTTPBackend(ctx, &serviceConfig{
w := ctx.Resp
r := ctx.Req.Request
cfg := &serviceConfig{
UploadPack: true,
ReceivePack: true,
Env: environ,
})(ctx.Resp, ctx.Req.Request)
}

for _, route := range routes {
r.URL.Path = strings.ToLower(r.URL.Path) // blue: In case some repo name has upper case name
if m := route.reg.FindStringSubmatch(r.URL.Path); m != nil {
if setting.Repository.DisableHTTPGit {
w.WriteHeader(http.StatusForbidden)
_, err := w.Write([]byte("Interacting with repositories by HTTP protocol is not allowed"))
if err != nil {
log.Error(err.Error())
}
return
}
if route.method != r.Method {
if r.Proto == "HTTP/1.1" {
w.WriteHeader(http.StatusMethodNotAllowed)
_, err := w.Write([]byte("Method Not Allowed"))
if err != nil {
log.Error(err.Error())
}
} else {
w.WriteHeader(http.StatusBadRequest)
_, err := w.Write([]byte("Bad Request"))
if err != nil {
log.Error(err.Error())
}
}
return
}

file := strings.Replace(r.URL.Path, m[1]+"/", "", 1)
dir, err := getGitRepoPath(m[1])
if err != nil {
log.Error(err.Error())
ctx.NotFound("Smart Git HTTP", err)
return
}

route.handler(serviceHandler{cfg, w, r, dir, file, cfg.Env})
return
}
}

ctx.NotFound("Smart Git HTTP", nil)
}

type serviceConfig struct {
Expand Down Expand Up @@ -522,51 +567,3 @@ func getGitRepoPath(subdir string) (string, error) {

return fpath, nil
}

// HTTPBackend middleware for git smart HTTP protocol
func HTTPBackend(ctx *context.Context, cfg *serviceConfig) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
for _, route := range routes {
r.URL.Path = strings.ToLower(r.URL.Path) // blue: In case some repo name has upper case name
if m := route.reg.FindStringSubmatch(r.URL.Path); m != nil {
if setting.Repository.DisableHTTPGit {
w.WriteHeader(http.StatusForbidden)
_, err := w.Write([]byte("Interacting with repositories by HTTP protocol is not allowed"))
if err != nil {
log.Error(err.Error())
}
return
}
if route.method != r.Method {
if r.Proto == "HTTP/1.1" {
w.WriteHeader(http.StatusMethodNotAllowed)
_, err := w.Write([]byte("Method Not Allowed"))
if err != nil {
log.Error(err.Error())
}
} else {
w.WriteHeader(http.StatusBadRequest)
_, err := w.Write([]byte("Bad Request"))
if err != nil {
log.Error(err.Error())
}
}
return
}

file := strings.Replace(r.URL.Path, m[1]+"/", "", 1)
dir, err := getGitRepoPath(m[1])
if err != nil {
log.Error(err.Error())
ctx.NotFound("HTTPBackend", err)
return
}

route.handler(serviceHandler{cfg, w, r, dir, file, cfg.Env})
return
}
}

ctx.NotFound("HTTPBackend", nil)
}
}