Check if file exists before trying to upload it.

archive.go

@@ -16,7 +16,7 @@ import (
 	"time"
 )
 
-func handleGetArchive(w http.ResponseWriter, r *gitRequest, format string) (callback *gitRequest){
+func handleGetArchive(w http.ResponseWriter, r *gitRequest, format string) (callback *gitRequest) {
 	archiveFilename := path.Base(r.ArchivePath)
 
 	if cachedArchive, err := os.Open(r.ArchivePath); err == nil {

git-http.go

@@ -12,7 +12,7 @@ import (
 	"strings"
 )
 
-func handleGetInfoRefs(w http.ResponseWriter, r *gitRequest, _ string) (callback *gitRequest){
+func handleGetInfoRefs(w http.ResponseWriter, r *gitRequest, _ string) (callback *gitRequest) {
 	rpc := r.URL.Query().Get("service")
 	if !(rpc == "git-upload-pack" || rpc == "git-receive-pack") {
 		// The 'dumb' Git HTTP protocol is not supported
@@ -58,7 +58,7 @@ func handleGetInfoRefs(w http.ResponseWriter, r *gitRequest, _ string) (callback
 	return
 }
 
-func handlePostRPC(w http.ResponseWriter, r *gitRequest, rpc string) (callback *gitRequest){
+func handlePostRPC(w http.ResponseWriter, r *gitRequest, rpc string) (callback *gitRequest) {
 	var body io.ReadCloser
 	var err error
 

githandler.go

@@ -25,7 +25,7 @@ type gitHandler struct {
 type gitService struct {
 	method     string
 	regex      *regexp.Regexp
-	handleFunc func(w http.ResponseWriter, r *gitRequest, rpc string)(*gitRequest)
+	handleFunc func(w http.ResponseWriter, r *gitRequest, rpc string) *gitRequest
 	rpc        string
 }
 
@@ -169,13 +169,23 @@ func looksLikeRepo(p string) bool {
 
 func (h *gitHandler) doAuthRequest(r *http.Request) (result *http.Response, err error) {
 	url := h.authBackend + r.URL.RequestURI()
-
-	authReq := doRequest(r, url)
-	if authReq != nil {
-		return h.httpClient.Do(authReq)
+	authReq, err := http.NewRequest(r.Method, url, nil)
+	if err != nil {
+		return nil, err
 	}
-
-	return
+	// Forward all headers from our client to the auth backend. This includes
+	// HTTP Basic authentication credentials (the 'Authorization' header).
+	for k, v := range r.Header {
+		authReq.Header[k] = v
+	}
+	// Also forward the Host header, which is excluded from the Header map by the http libary.
+	// This allows the Host header received by the backend to be consistent with other
+	// requests not going through gitlab-workhorse.
+	authReq.Host = r.Host
+	// Set a custom header for the request. This can be used in some
+	// configurations (Passenger) to solve auth request routing problems.
+	authReq.Header.Set("GitLab-Git-HTTP-Server", Version)
+	return h.httpClient.Do(authReq)
 }
 
 func (h *gitHandler) doCallback(w http.ResponseWriter, r *gitRequest) (result *http.Response, err error) {

lfs.go

@@ -23,9 +23,8 @@ var (
 	errSizeMismatch = errors.New("Content size does not match")
 )
 
-func handleStoreLfsObject(w http.ResponseWriter, r *gitRequest, rpc string) (callback *gitRequest){
+func handleStoreLfsObject(w http.ResponseWriter, r *gitRequest, rpc string) (callback *gitRequest) {
 	var body io.ReadCloser
-	var err error
 
 	urlPath := r.URL.Path
 	regExp := regexp.MustCompile(`([0-9a-f]{64})/([0-9]+)`)
@@ -40,8 +39,11 @@ func handleStoreLfsObject(w http.ResponseWriter, r *gitRequest, rpc string) (cal
 	size := matches[2]
 	log.Printf("Found oid: %s and size: %s", oid, size)
 
-	path := filepath.Join(r.StoreLFSPath, transformKey(oid))
-	tmpPath := path + ".tmp"
+	storePath := filepath.Join(r.StoreLFSPath, transformKey(oid))
+
+	if _, err := os.Stat(storePath); os.IsNotExist(err) {
+		var err error
+		tmpPath := filepath.Join(r.StoreLFSPath, "tmp", oid)
 
 		// TODO try removing gzip, possibly not needed
 		// The client request body may have been gzipped.
@@ -57,7 +59,7 @@ func handleStoreLfsObject(w http.ResponseWriter, r *gitRequest, rpc string) (cal
 		defer body.Close()
 
 		// TODO maybe set dir permissions to 700
-	dir := filepath.Dir(path)
+		dir := filepath.Dir(tmpPath)
 		if err := os.MkdirAll(dir, 0750); err != nil {
 			fail500(w, "Couldn't create directory for storing LFS objects.", err)
 			return
@@ -69,7 +71,7 @@ func handleStoreLfsObject(w http.ResponseWriter, r *gitRequest, rpc string) (cal
 			fail500(w, "Couldn't open tmp file for writing.", err)
 			return
 		}
-	defer os.Remove(tmpPath)
+		// defer os.Remove(tmpPath)
 		defer file.Close()
 
 		hash := sha256.New()
@@ -98,11 +100,11 @@ func handleStoreLfsObject(w http.ResponseWriter, r *gitRequest, rpc string) (cal
 			fail500(w, "Inconsistent size: ", errSizeMismatch)
 			return
 		}
-
-	if err := os.Rename(tmpPath, path); err != nil {
-		fail500(w, "Failed to rename temporary LFS object.", err)
-		return
 	}
+	// if err := os.Rename(tmpPath, path); err != nil {
+	// 	fail500(w, "Failed to rename temporary LFS object.", err)
+	// 	return
+	// }
 
 	log.Printf("Received the LFS object from client, oid: %s", oid)
 
@@ -110,7 +112,7 @@ func handleStoreLfsObject(w http.ResponseWriter, r *gitRequest, rpc string) (cal
 
 }
 
-func handleRetreiveLfsObject(w http.ResponseWriter, r *gitRequest, rpc string) (callback *gitRequest){
+func handleRetreiveLfsObject(w http.ResponseWriter, r *gitRequest, rpc string) (callback *gitRequest) {
 	log.Printf("I should download %s", r)
 
 	urlPath := r.URL.Path