From: Lucas Di Pentima <ldipentima@veritasgenetics.com>
Date: Tue, 6 Aug 2019 19:36:27 +0000 (-0300)
Subject: Merge branch 'master' into 14716-webdav-cluster-config
X-Git-Tag: 2.0.0~223^2~15
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/acb1d98cdfa6e33bfd3e1bb7510b78a4fd9384e2

Merge branch 'master' into 14716-webdav-cluster-config

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>
---

acb1d98cdfa6e33bfd3e1bb7510b78a4fd9384e2
diff --cc services/keep-web/handler.go
index fab004c89f,837579fe25..863b91a7e1
--- a/services/keep-web/handler.go
+++ b/services/keep-web/handler.go
@@@ -348,10 -351,7 +351,7 @@@ func (h *handler) ServeHTTP(wOrig http.
  	}
  
  	if tokens == nil {
- 		if credentialsOK {
- 			reqTokens = auth.CredentialsFromRequest(r).Tokens
- 		}
 -		tokens = append(reqTokens, h.Config.AnonymousTokens...)
 +		tokens = append(reqTokens, h.Config.cluster.Users.AnonymousUserToken)
  	}
  
  	if len(targetPath) > 0 && targetPath[0] == "_" {
diff --cc services/keep-web/handler_test.go
index 17719601a9,dd91df3549..fe8e767c4c
--- a/services/keep-web/handler_test.go
+++ b/services/keep-web/handler_test.go
@@@ -569,8 -559,18 +569,18 @@@ func (s *IntegrationSuite) testVhostRed
  	return resp
  }
  
- func (s *IntegrationSuite) TestDirectoryListing(c *check.C) {
+ func (s *IntegrationSuite) TestDirectoryListingWithAnonymousToken(c *check.C) {
 -	s.testServer.Config.AnonymousTokens = []string{arvadostest.AnonymousToken}
++	s.testServer.Config.cluster.Users.AnonymousUserToken = arvadostest.AnonymousToken
+ 	s.testDirectoryListing(c)
+ }
+ 
+ func (s *IntegrationSuite) TestDirectoryListingWithNoAnonymousToken(c *check.C) {
 -	s.testServer.Config.AnonymousTokens = nil
++	s.testServer.Config.cluster.Users.AnonymousUserToken = ""
+ 	s.testDirectoryListing(c)
+ }
+ 
+ func (s *IntegrationSuite) testDirectoryListing(c *check.C) {
 -	s.testServer.Config.AttachmentOnlyHost = "download.example.com"
 +	s.testServer.Config.cluster.Services.WebDAVDownload.ExternalURL.Host = "download.example.com"
  	authHeader := http.Header{
  		"Authorization": {"OAuth2 " + arvadostest.ActiveToken},
  	}
diff --cc services/keep-web/server_test.go
index b398f34065,0263dcf08f..12596b16bb
--- a/services/keep-web/server_test.go
+++ b/services/keep-web/server_test.go
@@@ -301,6 -298,7 +301,7 @@@ func (s *IntegrationSuite) runCurl(c *c
  }
  
  func (s *IntegrationSuite) TestMetrics(c *check.C) {
 -	s.testServer.Config.AttachmentOnlyHost = s.testServer.Addr
++	s.testServer.Config.cluster.Services.WebDAVDownload.ExternalURL.Host = s.testServer.Addr
  	origin := "http://" + s.testServer.Addr
  	req, _ := http.NewRequest("GET", origin+"/notfound", nil)
  	_, err := http.DefaultClient.Do(req)