More ServeHTTP and detach methods from API

artifacts.go

@@ -4,7 +4,7 @@ import (
 	"net/http"
 )
 
-func (api *API) artifactsAuthorizeHandler(h httpHandleFunc) httpHandleFunc {
+func artifactsAuthorizeHandler(api *API, h httpHandleFunc) httpHandleFunc {
 	return api.preAuthorizeHandler(func(w http.ResponseWriter, r *http.Request, a *apiResponse) {
 		r.Header.Set(tempPathHeader, a.TempPath)
 		h(w, r)

error_pages.go

@@ -59,13 +59,13 @@ func (s *errorPageResponseWriter) Flush() {
 	s.WriteHeader(http.StatusOK)
 }
 
-func handleRailsError(documentRoot *string, handler httpHandleFunc) httpHandleFunc {
+func handleRailsError(documentRoot *string, handler http.Handler) httpHandleFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		rw := errorPageResponseWriter{
 			rw:   w,
 			path: documentRoot,
 		}
 		defer rw.Flush()
-		handler(&rw, r)
+		handler.ServeHTTP(&rw, r)
 	}
 }

error_pages_test.go

@@ -21,11 +21,11 @@ func TestIfErrorPageIsPresented(t *testing.T) {
 	ioutil.WriteFile(filepath.Join(dir, "404.html"), []byte(errorPage), 0600)
 
 	w := httptest.NewRecorder()
-
-	handleRailsError(&dir, func(w http.ResponseWriter, _ *http.Request) {
+	h := httpHandleFunc(func(w http.ResponseWriter, _ *http.Request) {
 		w.WriteHeader(404)
 		fmt.Fprint(w, "Not Found")
-	})(w, nil)
+	})
+	handleRailsError(&dir, h)(w, nil)
 	w.Flush()
 
 	assertResponseCode(t, w, 404)
@@ -41,11 +41,11 @@ func TestIfErrorPassedIfNoErrorPageIsFound(t *testing.T) {
 
 	w := httptest.NewRecorder()
 	errorResponse := "ERROR"
-
-	handleRailsError(&dir, func(w http.ResponseWriter, _ *http.Request) {
+	h := httpHandleFunc(func(w http.ResponseWriter, _ *http.Request) {
 		w.WriteHeader(404)
 		fmt.Fprint(w, errorResponse)
-	})(w, nil)
+	})
+	handleRailsError(&dir, h)(w, nil)
 	w.Flush()
 
 	assertResponseCode(t, w, 404)

git-http.go

@@ -26,7 +26,7 @@ func looksLikeRepo(p string) bool {
 	return true
 }
 
-func (api *API) repoPreAuthorizeHandler(handleFunc serviceHandleFunc) httpHandleFunc {
+func repoPreAuthorizeHandler(api *API, handleFunc serviceHandleFunc) httpHandleFunc {
 	return api.preAuthorizeHandler(func(w http.ResponseWriter, r *http.Request, a *apiResponse) {
 		if a.RepoPath == "" {
 			fail500(w, errors.New("repoPreAuthorizeHandler: RepoPath empty"))

lfs.go

@@ -17,7 +17,7 @@ import (
 	"path/filepath"
 )
 
-func (api *API) lfsAuthorizeHandler(handleFunc serviceHandleFunc) httpHandleFunc {
+func lfsAuthorizeHandler(api *API, handleFunc serviceHandleFunc) httpHandleFunc {
 	return api.preAuthorizeHandler(func(w http.ResponseWriter, r *http.Request, a *apiResponse) {
 
 		if a.StoreLFSPath == "" {
@@ -39,41 +39,43 @@ func (api *API) lfsAuthorizeHandler(handleFunc serviceHandleFunc) httpHandleFunc
 	}, "/authorize")
 }
 
-func (p *Proxy) handleStoreLfsObject(w http.ResponseWriter, r *http.Request, a *apiResponse) {
-	file, err := ioutil.TempFile(a.StoreLFSPath, a.LfsOid)
-	if err != nil {
-		fail500(w, fmt.Errorf("handleStoreLfsObject: create tempfile: %v", err))
-		return
-	}
-	defer os.Remove(file.Name())
-	defer file.Close()
+func handleStoreLfsObject(h http.Handler) serviceHandleFunc {
+	return func(w http.ResponseWriter, r *http.Request, a *apiResponse) {
+		file, err := ioutil.TempFile(a.StoreLFSPath, a.LfsOid)
+		if err != nil {
+			fail500(w, fmt.Errorf("handleStoreLfsObject: create tempfile: %v", err))
+			return
+		}
+		defer os.Remove(file.Name())
+		defer file.Close()
 
-	hash := sha256.New()
-	hw := io.MultiWriter(hash, file)
+		hash := sha256.New()
+		hw := io.MultiWriter(hash, file)
 
-	written, err := io.Copy(hw, r.Body)
-	if err != nil {
-		fail500(w, fmt.Errorf("handleStoreLfsObject: write tempfile: %v", err))
-		return
-	}
-	file.Close()
+		written, err := io.Copy(hw, r.Body)
+		if err != nil {
+			fail500(w, fmt.Errorf("handleStoreLfsObject: write tempfile: %v", err))
+			return
+		}
+		file.Close()
 
-	if written != a.LfsSize {
-		fail500(w, fmt.Errorf("handleStoreLfsObject: expected size %d, wrote %d", a.LfsSize, written))
-		return
-	}
+		if written != a.LfsSize {
+			fail500(w, fmt.Errorf("handleStoreLfsObject: expected size %d, wrote %d", a.LfsSize, written))
+			return
+		}
 
-	shaStr := hex.EncodeToString(hash.Sum(nil))
-	if shaStr != a.LfsOid {
-		fail500(w, fmt.Errorf("handleStoreLfsObject: expected sha256 %s, got %s", a.LfsOid, shaStr))
-		return
-	}
+		shaStr := hex.EncodeToString(hash.Sum(nil))
+		if shaStr != a.LfsOid {
+			fail500(w, fmt.Errorf("handleStoreLfsObject: expected sha256 %s, got %s", a.LfsOid, shaStr))
+			return
+		}
 
-	// Inject header and body
-	r.Header.Set("X-GitLab-Lfs-Tmp", filepath.Base(file.Name()))
-	r.Body = ioutil.NopCloser(&bytes.Buffer{})
-	r.ContentLength = 0
+		// Inject header and body
+		r.Header.Set("X-GitLab-Lfs-Tmp", filepath.Base(file.Name()))
+		r.Body = ioutil.NopCloser(&bytes.Buffer{})
+		r.ContentLength = 0
 
-	// And proxy the request
-	p.ServeHTTP(w, r)
+		// And proxy the request
+		h.ServeHTTP(w, r)
+	}
 }

main.go

@@ -70,27 +70,27 @@ func compileRoutes(u *upstream) {
 	proxy := u.Proxy
 	httpRoutes = []httpRoute{
 		// Git Clone
-		httpRoute{"GET", regexp.MustCompile(gitProjectPattern + `info/refs\z`), api.repoPreAuthorizeHandler(handleGetInfoRefs)},
-		httpRoute{"POST", regexp.MustCompile(gitProjectPattern + `git-upload-pack\z`), contentEncodingHandler(api.repoPreAuthorizeHandler(handlePostRPC))},
-		httpRoute{"POST", regexp.MustCompile(gitProjectPattern + `git-receive-pack\z`), contentEncodingHandler(api.repoPreAuthorizeHandler(handlePostRPC))},
-		httpRoute{"PUT", regexp.MustCompile(gitProjectPattern + `gitlab-lfs/objects/([0-9a-f]{64})/([0-9]+)\z`), api.lfsAuthorizeHandler(proxy.handleStoreLfsObject)},
+		httpRoute{"GET", regexp.MustCompile(gitProjectPattern + `info/refs\z`), repoPreAuthorizeHandler(api, handleGetInfoRefs)},
+		httpRoute{"POST", regexp.MustCompile(gitProjectPattern + `git-upload-pack\z`), contentEncodingHandler(repoPreAuthorizeHandler(api, handlePostRPC))},
+		httpRoute{"POST", regexp.MustCompile(gitProjectPattern + `git-receive-pack\z`), contentEncodingHandler(repoPreAuthorizeHandler(api, handlePostRPC))},
+		httpRoute{"PUT", regexp.MustCompile(gitProjectPattern + `gitlab-lfs/objects/([0-9a-f]{64})/([0-9]+)\z`), lfsAuthorizeHandler(api, handleStoreLfsObject(proxy))},
 
 		// Repository Archive
-		httpRoute{"GET", regexp.MustCompile(projectPattern + `repository/archive\z`), api.repoPreAuthorizeHandler(handleGetArchive)},
-		httpRoute{"GET", regexp.MustCompile(projectPattern + `repository/archive.zip\z`), api.repoPreAuthorizeHandler(handleGetArchive)},
-		httpRoute{"GET", regexp.MustCompile(projectPattern + `repository/archive.tar\z`), api.repoPreAuthorizeHandler(handleGetArchive)},
-		httpRoute{"GET", regexp.MustCompile(projectPattern + `repository/archive.tar.gz\z`), api.repoPreAuthorizeHandler(handleGetArchive)},
-		httpRoute{"GET", regexp.MustCompile(projectPattern + `repository/archive.tar.bz2\z`), api.repoPreAuthorizeHandler(handleGetArchive)},
+		httpRoute{"GET", regexp.MustCompile(projectPattern + `repository/archive\z`), repoPreAuthorizeHandler(api, handleGetArchive)},
+		httpRoute{"GET", regexp.MustCompile(projectPattern + `repository/archive.zip\z`), repoPreAuthorizeHandler(api, handleGetArchive)},
+		httpRoute{"GET", regexp.MustCompile(projectPattern + `repository/archive.tar\z`), repoPreAuthorizeHandler(api, handleGetArchive)},
+		httpRoute{"GET", regexp.MustCompile(projectPattern + `repository/archive.tar.gz\z`), repoPreAuthorizeHandler(api, handleGetArchive)},
+		httpRoute{"GET", regexp.MustCompile(projectPattern + `repository/archive.tar.bz2\z`), repoPreAuthorizeHandler(api, handleGetArchive)},
 
 		// Repository Archive API
-		httpRoute{"GET", regexp.MustCompile(projectsAPIPattern + `repository/archive\z`), api.repoPreAuthorizeHandler(handleGetArchive)},
-		httpRoute{"GET", regexp.MustCompile(projectsAPIPattern + `repository/archive.zip\z`), api.repoPreAuthorizeHandler(handleGetArchive)},
-		httpRoute{"GET", regexp.MustCompile(projectsAPIPattern + `repository/archive.tar\z`), api.repoPreAuthorizeHandler(handleGetArchive)},
-		httpRoute{"GET", regexp.MustCompile(projectsAPIPattern + `repository/archive.tar.gz\z`), api.repoPreAuthorizeHandler(handleGetArchive)},
-		httpRoute{"GET", regexp.MustCompile(projectsAPIPattern + `repository/archive.tar.bz2\z`), api.repoPreAuthorizeHandler(handleGetArchive)},
+		httpRoute{"GET", regexp.MustCompile(projectsAPIPattern + `repository/archive\z`), repoPreAuthorizeHandler(api, handleGetArchive)},
+		httpRoute{"GET", regexp.MustCompile(projectsAPIPattern + `repository/archive.zip\z`), repoPreAuthorizeHandler(api, handleGetArchive)},
+		httpRoute{"GET", regexp.MustCompile(projectsAPIPattern + `repository/archive.tar\z`), repoPreAuthorizeHandler(api, handleGetArchive)},
+		httpRoute{"GET", regexp.MustCompile(projectsAPIPattern + `repository/archive.tar.gz\z`), repoPreAuthorizeHandler(api, handleGetArchive)},
+		httpRoute{"GET", regexp.MustCompile(projectsAPIPattern + `repository/archive.tar.bz2\z`), repoPreAuthorizeHandler(api, handleGetArchive)},
 
 		// CI Artifacts API
-		httpRoute{"POST", regexp.MustCompile(ciAPIPattern + `v1/builds/[0-9]+/artifacts\z`), contentEncodingHandler(api.artifactsAuthorizeHandler(handleFileUploads(proxy)))},
+		httpRoute{"POST", regexp.MustCompile(ciAPIPattern + `v1/builds/[0-9]+/artifacts\z`), contentEncodingHandler(artifactsAuthorizeHandler(api, handleFileUploads(proxy)))},
 
 		// Explicitly proxy API requests
 		httpRoute{"", regexp.MustCompile(apiPattern), proxy},
@@ -102,7 +102,7 @@ func compileRoutes(u *upstream) {
 				handleDevelopmentMode(developmentMode,
 					handleDeployPage(documentRoot,
 						handleRailsError(documentRoot,
-							proxy.ServeHTTP,
+							proxy,
 						),
 					),
 				),
@@ -114,7 +114,7 @@ func compileRoutes(u *upstream) {
 			u.handleServeFile(documentRoot, CacheDisabled,
 				handleDeployPage(documentRoot,
 					handleRailsError(documentRoot,
-						proxy.ServeHTTP,
+						proxy,
 					),
 				),
 			),