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

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

diff --cc lib/config/config.default.yml
Simple merge

diff --cc lib/config/deprecated.go
Simple merge

diff --cc lib/config/export.go
Simple merge

diff --cc lib/config/generated_config.go
Simple merge

diff --cc sdk/go/arvados/config.go
Simple merge

diff --cc services/keep-web/handler.go
index fab004c89f23fce759c8386b42f6db5d46023df1,837579fe25acfbff5283b28bbb7f4375a3322280..863b91a7e1beecae13635cb0e89c830bb264faac
--- 1/services/keep-web/handler.go
--- 2/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 17719601a9c7b76147b4abefea4edf7db3eff472,dd91df354900175592501ce794a6d9dc46cf8f41..fe8e767c4c63aa9d51d390220b7c5fe14173c63e
--- 1/services/keep-web/handler_test.go
--- 2/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 b398f34065e2039941e17660a20d42497819203d,0263dcf08f92c906032664c8b0d3b6de8726d9b7..12596b16bb1bd3edce95bc8daf63dac100819e15
--- 1/services/keep-web/server_test.go
--- 2/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)