X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/678f1f53466c3f2133f63a6e6ad553f5e5d14804..7abf74e3ad723ed8aed4d13e794a8f6ad6f44059:/services/keep-web/handler_test.go

diff --git a/services/keep-web/handler_test.go b/services/keep-web/handler_test.go
index 93259f74cd..fe8e767c4c 100644
--- a/services/keep-web/handler_test.go
+++ b/services/keep-web/handler_test.go
@@ -17,6 +17,7 @@ import (
 	"regexp"
 	"strings"
 
+	"git.curoverse.com/arvados.git/lib/config"
 	"git.curoverse.com/arvados.git/sdk/go/arvados"
 	"git.curoverse.com/arvados.git/sdk/go/arvadostest"
 	"git.curoverse.com/arvados.git/sdk/go/auth"
@@ -25,10 +26,19 @@ import (
 
 var _ = check.Suite(&UnitSuite{})
 
-type UnitSuite struct{}
+type UnitSuite struct {
+	Config *arvados.Config
+}
+
+func (s *UnitSuite) SetUpTest(c *check.C) {
+	ldr := config.NewLoader(nil, nil)
+	cfg, err := ldr.LoadDefaults()
+	c.Assert(err, check.IsNil)
+	s.Config = cfg
+}
 
 func (s *UnitSuite) TestCORSPreflight(c *check.C) {
-	h := handler{Config: DefaultConfig()}
+	h := handler{Config: DefaultConfig(s.Config)}
 	u := mustParseURL("http://keep-web.example/c=" + arvadostest.FooCollection + "/foo")
 	req := &http.Request{
 		Method:     "OPTIONS",
@@ -78,8 +88,8 @@ func (s *UnitSuite) TestInvalidUUID(c *check.C) {
 			RequestURI: u.RequestURI(),
 		}
 		resp := httptest.NewRecorder()
-		cfg := DefaultConfig()
-		cfg.AnonymousTokens = []string{arvadostest.AnonymousToken}
+		cfg := DefaultConfig(s.Config)
+		cfg.cluster.Users.AnonymousUserToken = arvadostest.AnonymousToken
 		h := handler{Config: cfg}
 		h.ServeHTTP(resp, req)
 		c.Check(resp.Code, check.Equals, http.StatusNotFound)
@@ -338,7 +348,7 @@ func (s *IntegrationSuite) TestVhostRedirectQueryTokenRequestAttachment(c *check
 }
 
 func (s *IntegrationSuite) TestVhostRedirectQueryTokenSiteFS(c *check.C) {
-	s.testServer.Config.AttachmentOnlyHost = "download.example.com"
+	s.testServer.Config.cluster.Services.WebDAVDownload.ExternalURL.Host = "download.example.com"
 	resp := s.testVhostRedirectTokenToCookie(c, "GET",
 		"download.example.com/by_id/"+arvadostest.FooCollection+"/foo",
 		"?api_token="+arvadostest.ActiveToken,
@@ -351,7 +361,7 @@ func (s *IntegrationSuite) TestVhostRedirectQueryTokenSiteFS(c *check.C) {
 }
 
 func (s *IntegrationSuite) TestPastCollectionVersionFileAccess(c *check.C) {
-	s.testServer.Config.AttachmentOnlyHost = "download.example.com"
+	s.testServer.Config.cluster.Services.WebDAVDownload.ExternalURL.Host = "download.example.com"
 	resp := s.testVhostRedirectTokenToCookie(c, "GET",
 		"download.example.com/c="+arvadostest.WazVersion1Collection+"/waz",
 		"?api_token="+arvadostest.ActiveToken,
@@ -373,7 +383,7 @@ func (s *IntegrationSuite) TestPastCollectionVersionFileAccess(c *check.C) {
 }
 
 func (s *IntegrationSuite) TestVhostRedirectQueryTokenTrustAllContent(c *check.C) {
-	s.testServer.Config.TrustAllContent = true
+	s.testServer.Config.cluster.Collections.TrustAllContent = true
 	s.testVhostRedirectTokenToCookie(c, "GET",
 		"example.com/c="+arvadostest.FooCollection+"/foo",
 		"?api_token="+arvadostest.ActiveToken,
@@ -385,7 +395,7 @@ func (s *IntegrationSuite) TestVhostRedirectQueryTokenTrustAllContent(c *check.C
 }
 
 func (s *IntegrationSuite) TestVhostRedirectQueryTokenAttachmentOnlyHost(c *check.C) {
-	s.testServer.Config.AttachmentOnlyHost = "example.com:1234"
+	s.testServer.Config.cluster.Services.WebDAVDownload.ExternalURL.Host = "example.com:1234"
 
 	s.testVhostRedirectTokenToCookie(c, "GET",
 		"example.com/c="+arvadostest.FooCollection+"/foo",
@@ -430,7 +440,7 @@ func (s *IntegrationSuite) TestVhostRedirectPOSTFormTokenToCookie404(c *check.C)
 }
 
 func (s *IntegrationSuite) TestAnonymousTokenOK(c *check.C) {
-	s.testServer.Config.AnonymousTokens = []string{arvadostest.AnonymousToken}
+	s.testServer.Config.cluster.Users.AnonymousUserToken = arvadostest.AnonymousToken
 	s.testVhostRedirectTokenToCookie(c, "GET",
 		"example.com/c="+arvadostest.HelloWorldCollection+"/Hello%20world.txt",
 		"",
@@ -442,7 +452,7 @@ func (s *IntegrationSuite) TestAnonymousTokenOK(c *check.C) {
 }
 
 func (s *IntegrationSuite) TestAnonymousTokenError(c *check.C) {
-	s.testServer.Config.AnonymousTokens = []string{"anonymousTokenConfiguredButInvalid"}
+	s.testServer.Config.cluster.Users.AnonymousUserToken = "anonymousTokenConfiguredButInvalid"
 	s.testVhostRedirectTokenToCookie(c, "GET",
 		"example.com/c="+arvadostest.HelloWorldCollection+"/Hello%20world.txt",
 		"",
@@ -454,7 +464,7 @@ func (s *IntegrationSuite) TestAnonymousTokenError(c *check.C) {
 }
 
 func (s *IntegrationSuite) TestSpecialCharsInPath(c *check.C) {
-	s.testServer.Config.AttachmentOnlyHost = "download.example.com"
+	s.testServer.Config.cluster.Services.WebDAVDownload.ExternalURL.Host = "download.example.com"
 
 	client := s.testServer.Config.Client
 	client.AuthToken = arvadostest.ActiveToken
@@ -559,8 +569,18 @@ func (s *IntegrationSuite) testVhostRedirectTokenToCookie(c *check.C, method, ho
 	return resp
 }
 
-func (s *IntegrationSuite) TestDirectoryListing(c *check.C) {
-	s.testServer.Config.AttachmentOnlyHost = "download.example.com"
+func (s *IntegrationSuite) TestDirectoryListingWithAnonymousToken(c *check.C) {
+	s.testServer.Config.cluster.Users.AnonymousUserToken = arvadostest.AnonymousToken
+	s.testDirectoryListing(c)
+}
+
+func (s *IntegrationSuite) TestDirectoryListingWithNoAnonymousToken(c *check.C) {
+	s.testServer.Config.cluster.Users.AnonymousUserToken = ""
+	s.testDirectoryListing(c)
+}
+
+func (s *IntegrationSuite) testDirectoryListing(c *check.C) {
+	s.testServer.Config.cluster.Services.WebDAVDownload.ExternalURL.Host = "download.example.com"
 	authHeader := http.Header{
 		"Authorization": {"OAuth2 " + arvadostest.ActiveToken},
 	}
@@ -584,10 +604,12 @@ func (s *IntegrationSuite) TestDirectoryListing(c *check.C) {
 			cutDirs: 1,
 		},
 		{
-			uri:     "download.example.com/collections/" + arvadostest.FooAndBarFilesInDirUUID + "/",
-			header:  authHeader,
-			expect:  []string{"dir1/foo", "dir1/bar"},
-			cutDirs: 2,
+			// URLs of this form ignore authHeader, and
+			// FooAndBarFilesInDirUUID isn't public, so
+			// this returns 404.
+			uri:    "download.example.com/collections/" + arvadostest.FooAndBarFilesInDirUUID + "/",
+			header: authHeader,
+			expect: nil,
 		},
 		{
 			uri:     "download.example.com/users/active/foo_file_in_dir/",
@@ -695,7 +717,7 @@ func (s *IntegrationSuite) TestDirectoryListing(c *check.C) {
 			cutDirs: 2,
 		},
 	} {
-		c.Logf("HTML: %q => %q", trial.uri, trial.expect)
+		comment := check.Commentf("HTML: %q => %q", trial.uri, trial.expect)
 		resp := httptest.NewRecorder()
 		u := mustParseURL("//" + trial.uri)
 		req := &http.Request{
@@ -724,19 +746,19 @@ func (s *IntegrationSuite) TestDirectoryListing(c *check.C) {
 			s.testServer.Handler.ServeHTTP(resp, req)
 		}
 		if trial.redirect != "" {
-			c.Check(req.URL.Path, check.Equals, trial.redirect)
+			c.Check(req.URL.Path, check.Equals, trial.redirect, comment)
 		}
 		if trial.expect == nil {
-			c.Check(resp.Code, check.Equals, http.StatusNotFound)
+			c.Check(resp.Code, check.Equals, http.StatusNotFound, comment)
 		} else {
-			c.Check(resp.Code, check.Equals, http.StatusOK)
+			c.Check(resp.Code, check.Equals, http.StatusOK, comment)
 			for _, e := range trial.expect {
-				c.Check(resp.Body.String(), check.Matches, `(?ms).*href="./`+e+`".*`)
+				c.Check(resp.Body.String(), check.Matches, `(?ms).*href="./`+e+`".*`, comment)
 			}
-			c.Check(resp.Body.String(), check.Matches, `(?ms).*--cut-dirs=`+fmt.Sprintf("%d", trial.cutDirs)+` .*`)
+			c.Check(resp.Body.String(), check.Matches, `(?ms).*--cut-dirs=`+fmt.Sprintf("%d", trial.cutDirs)+` .*`, comment)
 		}
 
-		c.Logf("WebDAV: %q => %q", trial.uri, trial.expect)
+		comment = check.Commentf("WebDAV: %q => %q", trial.uri, trial.expect)
 		req = &http.Request{
 			Method:     "OPTIONS",
 			Host:       u.Host,
@@ -748,9 +770,9 @@ func (s *IntegrationSuite) TestDirectoryListing(c *check.C) {
 		resp = httptest.NewRecorder()
 		s.testServer.Handler.ServeHTTP(resp, req)
 		if trial.expect == nil {
-			c.Check(resp.Code, check.Equals, http.StatusNotFound)
+			c.Check(resp.Code, check.Equals, http.StatusNotFound, comment)
 		} else {
-			c.Check(resp.Code, check.Equals, http.StatusOK)
+			c.Check(resp.Code, check.Equals, http.StatusOK, comment)
 		}
 
 		req = &http.Request{
@@ -764,11 +786,11 @@ func (s *IntegrationSuite) TestDirectoryListing(c *check.C) {
 		resp = httptest.NewRecorder()
 		s.testServer.Handler.ServeHTTP(resp, req)
 		if trial.expect == nil {
-			c.Check(resp.Code, check.Equals, http.StatusNotFound)
+			c.Check(resp.Code, check.Equals, http.StatusNotFound, comment)
 		} else {
-			c.Check(resp.Code, check.Equals, http.StatusMultiStatus)
+			c.Check(resp.Code, check.Equals, http.StatusMultiStatus, comment)
 			for _, e := range trial.expect {
-				c.Check(resp.Body.String(), check.Matches, `(?ms).*<D:href>`+filepath.Join(u.Path, e)+`</D:href>.*`)
+				c.Check(resp.Body.String(), check.Matches, `(?ms).*<D:href>`+filepath.Join(u.Path, e)+`</D:href>.*`, comment)
 			}
 		}
 	}
@@ -790,7 +812,7 @@ func (s *IntegrationSuite) TestDeleteLastFile(c *check.C) {
 
 	var updated arvados.Collection
 	for _, fnm := range []string{"foo.txt", "bar.txt"} {
-		s.testServer.Config.AttachmentOnlyHost = "example.com"
+		s.testServer.Config.cluster.Services.WebDAVDownload.ExternalURL.Host = "example.com"
 		u, _ := url.Parse("http://example.com/c=" + newCollection.UUID + "/" + fnm)
 		req := &http.Request{
 			Method:     "DELETE",
@@ -815,7 +837,7 @@ func (s *IntegrationSuite) TestDeleteLastFile(c *check.C) {
 }
 
 func (s *IntegrationSuite) TestHealthCheckPing(c *check.C) {
-	s.testServer.Config.ManagementToken = arvadostest.ManagementToken
+	s.testServer.Config.cluster.ManagementToken = arvadostest.ManagementToken
 	authHeader := http.Header{
 		"Authorization": {"Bearer " + arvadostest.ManagementToken},
 	}