diff --git a/VERSION b/VERSION new file mode 100644 index 0000000000000000000000000000000000000000..d917d3e26adc9854b4569871e20111c38de2606f --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +0.1.2 diff --git a/router/info_refs.go b/router/info_refs.go index 2f5db24d3dbd40233785d6fff1662625a09ffef6..e7744cfea4626cd59bc9f7e37ae12e050ec0d97a 100644 --- a/router/info_refs.go +++ b/router/info_refs.go @@ -22,16 +22,12 @@ func GetInfoRefs(w http.ResponseWriter, r *http.Request) { vars := mux.Vars(r) rpc := vars["service"] - glId := r.Header.Get(gitlabIdHeader) - if glId == "" { - helper.Fail500(w, r, fmt.Errorf("GetInfoRefs: %s header was not found", gitlabIdHeader)) - return - } repoPath := r.Header.Get(gitalyRepoPathHeader) if repoPath == "" { helper.Fail500(w, r, fmt.Errorf("GetInfoRefs: %s header was not found", gitalyRepoPathHeader)) return } + glId := r.Header.Get(gitlabIdHeader) // Allowed to be empty // Prepare our Git subprocess cmd := gitCommand(glId, "git", rpc, "--stateless-rpc", "--advertise-refs", repoPath) diff --git a/router/info_refs_test.go b/router/info_refs_test.go index fc280bbe356bb8bd9d244cdc1fd4aec70d22a4a7..a34b7c9545467eca4dd202771f0ab0038613caf7 100644 --- a/router/info_refs_test.go +++ b/router/info_refs_test.go @@ -88,21 +88,16 @@ func TestFailedUploadPackRequestDueToMissingHeaders(t *testing.T) { recorder := httptest.NewRecorder() resource := "/projects/1/git-http/info-refs/upload-pack" + req, err := http.NewRequest("GET", resource, &bytes.Buffer{}) if err != nil { t.Fatal("Failed creating a request to %s", resource) } + NewRouter().ServeHTTP(recorder, req) - for _, headerName := range []string{"Gitaly-Repo-Path", "Gitaly-GL-Id"} { - req.Header.Set(headerName, "Dummy Value") - - NewRouter().ServeHTTP(recorder, req) - - if recorder.Code != 500 { - t.Errorf("GET %q: expected 200, got %d", resource, recorder.Code) - } - - req.Header.Del(headerName) + expected := 500 + if recorder.Code != expected { + t.Errorf("GET %q: expected %d, got %d", resource, expected, recorder.Code) } }