Remove parsing of url and receive required data from GitLab Rails.

lfs.go

@@ -10,11 +10,9 @@ import (
 	"errors"
 	"io"
 	"io/ioutil"
-	"log"
 	"net/http"
 	"os"
 	"path/filepath"
-	"regexp"
 	"strconv"
 )
 
@@ -31,43 +29,40 @@ func lfsAuthorizeHandler(handleFunc serviceHandleFunc) serviceHandleFunc {
 			return
 		}
 
-		handleFunc(w, r)
-	}, "")
-}
-
-func handleStoreLfsObject(handleFunc serviceHandleFunc) serviceHandleFunc {
-	return func(w http.ResponseWriter, r *gitRequest) {
+		if r.LfsOid == "" {
+			fail500(w, "lfsAuthorizeHandler", errors.New("Lfs object oid not specified."))
+			return
+		}
 
-		urlPath := r.URL.Path
-		regExp := regexp.MustCompile(`([0-9a-f]{64})/([0-9]+)`)
-		matches := regExp.FindStringSubmatch(urlPath)
+		if r.LfsSize == "" {
+			fail500(w, "lfsAuthorizeHandler", errors.New("Lfs object size not specified."))
+			return
+		}
 
-		if matches == nil {
-			log.Printf("Found no object info in path: %s", urlPath)
+		tmpDir := r.StoreLFSPath
+		if _, err := os.Stat(tmpDir); os.IsNotExist(err) {
+			if err := os.Mkdir(tmpDir, 0700); err != nil {
+				fail500(w, "Couldn't create directory for storing LFS tmp objects.", err)
 				return
 			}
+		}
 
-		oid := matches[1]
-		size := matches[2]
-		log.Printf("Found oid: %s and size: %s", oid, size)
+		handleFunc(w, r)
+	}, "")
+}
 
-		sha := sha256.New()
-		sha.Write([]byte(oid))
-		tmp_hash := hex.EncodeToString(sha.Sum(nil))
-		tmpPath := filepath.Join(r.StoreLFSPath, "tmp")
+func handleStoreLfsObject(handleFunc serviceHandleFunc) serviceHandleFunc {
+	return func(w http.ResponseWriter, r *gitRequest) {
+		oid := r.LfsOid
+		size := r.LfsSize
 
 		var body io.ReadCloser
 
 		body = r.Body
 		defer body.Close()
 
-		dir := filepath.Dir(tmpPath)
-		if err := os.MkdirAll(dir, 0700); err != nil {
-			fail500(w, "Couldn't create directory for storing LFS objects.", err)
-			return
-		}
-
-		file, err := ioutil.TempFile(tmpPath, tmp_hash)
+		tmpPath := r.StoreLFSPath
+		file, err := ioutil.TempFile(tmpPath, "")
 		if err != nil {
 			fail500(w, "Couldn't open tmp file for writing.", err)
 			return

upstream.go

@@ -44,10 +44,13 @@ type authorizationResponse struct {
 	// CommitId is used do prevent race conditions between the 'time of check'
 	// in the GitLab Rails app and the 'time of use' in gitlab-workhorse.
 	CommitId string
-
 	// StoreLFSPath is provided by the GitLab Rails application
 	// to mark where the tmp file should be placed
 	StoreLFSPath string
+	// LFS object id
+	LfsOid string
+	// LFS object size
+	LfsSize string
 }
 
 // A gitReqest is an *http.Request decorated with attributes returned by the