[ARVADOS] updated: 1.1.0-52-g43b48ac

[Git user]

Summary of changes:
 services/api/config/application.rb     |  3 +++
 services/api/lib/safer_file_store.rb   | 16 ++++++++++++++++
 services/arv-git-httpd/auth_handler.go |  2 +-
 services/arv-git-httpd/server_test.go  |  2 +-
 4 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 services/api/lib/safer_file_store.rb

       via  43b48acab676c1097d393c755e5320b370afa937 (commit)
       via  83c3efb73a8e0f1bd1ccef750f49128be5cdd93c (commit)
       via  ea929fb925acea37ca13542569cc183e7170e395 (commit)
      from  6fd6ddcebda57df4ecb2303dc229420c2c13af7b (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 43b48acab676c1097d393c755e5320b370afa937
Merge: 83c3efb ea929fb
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Thu Oct 19 14:15:47 2017 -0400

    Merge branch '12461-cache-race'
    
    refs #12461
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>


commit 83c3efb73a8e0f1bd1ccef750f49128be5cdd93c
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Thu Oct 19 14:12:07 2017 -0400

    Fix wrong HTTP status code for early "impossible path" check.
    
    No issue #
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/services/arv-git-httpd/auth_handler.go b/services/arv-git-httpd/auth_handler.go
index 7a2841f..0f9c7a5 100644
--- a/services/arv-git-httpd/auth_handler.go
+++ b/services/arv-git-httpd/auth_handler.go
@@ -78,7 +78,7 @@ func (h *authHandler) ServeHTTP(wOrig http.ResponseWriter, r *http.Request) {
 	// "foo/bar".
 	pathParts := strings.SplitN(r.URL.Path[1:], ".git/", 2)
 	if len(pathParts) != 2 {
-		statusCode, statusText = http.StatusBadRequest, "bad request"
+		statusCode, statusText = http.StatusNotFound, "not found"
 		return
 	}
 	repoName = pathParts[0]
diff --git a/services/arv-git-httpd/server_test.go b/services/arv-git-httpd/server_test.go
index b4fc532..77049c3 100644
--- a/services/arv-git-httpd/server_test.go
+++ b/services/arv-git-httpd/server_test.go
@@ -95,7 +95,7 @@ func (s *GitSuite) TestShortToken(c *check.C) {
 func (s *GitSuite) TestShortTokenBadReq(c *check.C) {
 	for _, repo := range []string{"bogus"} {
 		err := s.RunGit(c, "s3cr3t", "fetch", repo)
-		c.Assert(err, check.ErrorMatches, `.* requested URL returned error.*`)
+		c.Assert(err, check.ErrorMatches, `.*not found.*`)
 	}
 }
 

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


hooks/post-receive
--