[ARVADOS] updated: 7c89127a0214c77578c09bac9ac24ce9e1c5e104

git at public.curoverse.com git at public.curoverse.com
Mon Aug 10 14:51:13 EDT 2015


Summary of changes:
 services/arv-git-httpd/auth_handler.go | 2 +-
 services/arv-git-httpd/server_test.go  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

       via  7c89127a0214c77578c09bac9ac24ce9e1c5e104 (commit)
      from  70ddebda3dbe90c8a347c9077397106c6fb949c0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 7c89127a0214c77578c09bac9ac24ce9e1c5e104
Author: radhika <radhika at curoverse.com>
Date:   Mon Aug 10 14:32:50 2015 -0400

    6827: fix error in setting valid token.

diff --git a/services/arv-git-httpd/auth_handler.go b/services/arv-git-httpd/auth_handler.go
index 89d942a..1165354 100644
--- a/services/arv-git-httpd/auth_handler.go
+++ b/services/arv-git-httpd/auth_handler.go
@@ -103,9 +103,9 @@ func (h *authHandler) ServeHTTP(wOrig http.ResponseWriter, r *http.Request) {
 		"filters": [][]string{{"name", "=", repoName}},
 	}, &reposFound); err != nil {
 		statusCode, statusText = http.StatusInternalServerError, err.Error()
-		validApiToken = true
 		return
 	}
+	validApiToken = true
 	if avail, ok := reposFound["items_available"].(float64); !ok {
 		statusCode, statusText = http.StatusInternalServerError, "bad list response from API"
 		return
diff --git a/services/arv-git-httpd/server_test.go b/services/arv-git-httpd/server_test.go
index 9d36921..beabedd 100644
--- a/services/arv-git-httpd/server_test.go
+++ b/services/arv-git-httpd/server_test.go
@@ -88,7 +88,7 @@ func (s *IntegrationSuite) TestInvalidToken(c *check.C) {
 func (s *IntegrationSuite) TestShortToken(c *check.C) {
 	for _, repo := range []string{"active/foo.git", "active/foo/.git"} {
 		err := s.runGit(c, "s3cr3t", "fetch", repo)
-		c.Assert(err, check.ErrorMatches, `.* Authentication failed.*`)
+		c.Assert(err, check.ErrorMatches, `.* 500 while accessing.*`)
 	}
 }
 

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list