From ced355fbd37d0fff36ca6d74113f2cb7e72a1109 Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Tue, 24 Jan 2017 16:37:03 +0100 Subject: [PATCH 1/2] Allow empty GL_ID --- router/info_refs.go | 6 +----- router/info_refs_test.go | 15 +++++---------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/router/info_refs.go b/router/info_refs.go index 2f5db24d3db..e7744cfea46 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 fc280bbe356..a34b7c95454 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) } } -- GitLab From 03cd909e503454105b6e5767d18aedadb410e85b Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Thu, 26 Jan 2017 18:14:13 +0100 Subject: [PATCH 2/2] Version 0.1.2 (same as 0.1.1) --- VERSION | 1 + 1 file changed, 1 insertion(+) create mode 100644 VERSION diff --git a/VERSION b/VERSION new file mode 100644 index 00000000000..d917d3e26ad --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +0.1.2 -- GitLab