X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/5d68da382b77745e69640dfdd4e4bd9110e72f4a..1123c446a167b531b0683004ff3283d50aa037d0:/services/keep-web/handler_test.go diff --git a/services/keep-web/handler_test.go b/services/keep-web/handler_test.go index 3863265613..29bcdac1b7 100644 --- a/services/keep-web/handler_test.go +++ b/services/keep-web/handler_test.go @@ -17,10 +17,12 @@ 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" + "git.arvados.org/arvados.git/lib/config" + "git.arvados.org/arvados.git/sdk/go/arvados" + "git.arvados.org/arvados.git/sdk/go/arvadostest" + "git.arvados.org/arvados.git/sdk/go/auth" + "git.arvados.org/arvados.git/sdk/go/ctxlog" + "git.arvados.org/arvados.git/sdk/go/keepclient" check "gopkg.in/check.v1" ) @@ -31,14 +33,33 @@ type UnitSuite struct { } func (s *UnitSuite) SetUpTest(c *check.C) { - ldr := config.NewLoader(nil, nil) - cfg, err := ldr.LoadDefaults() + ldr := config.NewLoader(bytes.NewBufferString("Clusters: {zzzzz: {}}"), ctxlog.TestLogger(c)) + ldr.Path = "-" + cfg, err := ldr.Load() c.Assert(err, check.IsNil) s.Config = cfg } +func (s *UnitSuite) TestKeepClientBlockCache(c *check.C) { + cfg := newConfig(s.Config) + cfg.cluster.Collections.WebDAVCache.MaxBlockEntries = 42 + h := handler{Config: cfg} + c.Check(keepclient.DefaultBlockCache.MaxBlocks, check.Not(check.Equals), cfg.cluster.Collections.WebDAVCache.MaxBlockEntries) + u := mustParseURL("http://keep-web.example/c=" + arvadostest.FooCollection + "/t=" + arvadostest.ActiveToken + "/foo") + req := &http.Request{ + Method: "GET", + Host: u.Host, + URL: u, + RequestURI: u.RequestURI(), + } + resp := httptest.NewRecorder() + h.ServeHTTP(resp, req) + c.Check(resp.Code, check.Equals, http.StatusOK) + c.Check(keepclient.DefaultBlockCache.MaxBlocks, check.Equals, cfg.cluster.Collections.WebDAVCache.MaxBlockEntries) +} + func (s *UnitSuite) TestCORSPreflight(c *check.C) { - h := handler{Config: DefaultConfig(s.Config)} + h := handler{Config: newConfig(s.Config)} u := mustParseURL("http://keep-web.example/c=" + arvadostest.FooCollection + "/foo") req := &http.Request{ Method: "OPTIONS", @@ -88,7 +109,7 @@ func (s *UnitSuite) TestInvalidUUID(c *check.C) { RequestURI: u.RequestURI(), } resp := httptest.NewRecorder() - cfg := DefaultConfig(s.Config) + cfg := newConfig(s.Config) cfg.cluster.Users.AnonymousUserToken = arvadostest.AnonymousToken h := handler{Config: cfg} h.ServeHTTP(resp, req) @@ -328,7 +349,7 @@ func (s *IntegrationSuite) TestVhostRedirectQueryTokenSingleOriginError(c *check "", "", http.StatusBadRequest, - "", + "cannot serve inline content at this URL (possible configuration error; see https://doc.arvados.org/install/install-keep-web.html#dns)\n", ) } @@ -403,7 +424,7 @@ func (s *IntegrationSuite) TestVhostRedirectQueryTokenAttachmentOnlyHost(c *chec "", "", http.StatusBadRequest, - "", + "cannot serve inline content at this URL (possible configuration error; see https://doc.arvados.org/install/install-keep-web.html#dns)\n", ) resp := s.testVhostRedirectTokenToCookie(c, "GET", @@ -499,6 +520,56 @@ func (s *IntegrationSuite) TestSpecialCharsInPath(c *check.C) { c.Check(resp.Body.String(), check.Matches, `(?ms).*href="./https:%5c%22odd%27%20path%20chars"\S+https:\\"odd' path chars.*`) } +func (s *IntegrationSuite) TestForwardSlashSubstitution(c *check.C) { + arv := arvados.NewClientFromEnv() + s.testServer.Config.cluster.Services.WebDAVDownload.ExternalURL.Host = "download.example.com" + s.testServer.Config.cluster.Collections.ForwardSlashNameSubstitution = "{SOLIDUS}" + name := "foo/bar/baz" + nameShown := strings.Replace(name, "/", "{SOLIDUS}", -1) + nameShownEscaped := strings.Replace(name, "/", "%7bSOLIDUS%7d", -1) + + client := s.testServer.Config.Client + client.AuthToken = arvadostest.ActiveToken + fs, err := (&arvados.Collection{}).FileSystem(&client, nil) + c.Assert(err, check.IsNil) + f, err := fs.OpenFile("filename", os.O_CREATE, 0777) + c.Assert(err, check.IsNil) + f.Close() + mtxt, err := fs.MarshalManifest(".") + c.Assert(err, check.IsNil) + var coll arvados.Collection + err = client.RequestAndDecode(&coll, "POST", "arvados/v1/collections", nil, map[string]interface{}{ + "collection": map[string]string{ + "manifest_text": mtxt, + "name": name, + "owner_uuid": arvadostest.AProjectUUID, + }, + }) + c.Assert(err, check.IsNil) + defer arv.RequestAndDecode(&coll, "DELETE", "arvados/v1/collections/"+coll.UUID, nil, nil) + + base := "http://download.example.com/by_id/" + coll.OwnerUUID + "/" + for tryURL, expectRegexp := range map[string]string{ + base: `(?ms).*href="./` + nameShownEscaped + `/"\S+` + nameShown + `.*`, + base + nameShownEscaped + "/": `(?ms).*href="./filename"\S+filename.*`, + } { + u, _ := url.Parse(tryURL) + req := &http.Request{ + Method: "GET", + Host: u.Host, + URL: u, + RequestURI: u.RequestURI(), + Header: http.Header{ + "Authorization": {"Bearer " + client.AuthToken}, + }, + } + resp := httptest.NewRecorder() + s.testServer.Handler.ServeHTTP(resp, req) + c.Check(resp.Code, check.Equals, http.StatusOK) + c.Check(resp.Body.String(), check.Matches, expectRegexp) + } +} + // XHRs can't follow redirect-with-cookie so they rely on method=POST // and disposition=attachment (telling us it's acceptable to respond // with content instead of a redirect) and an Origin header that gets @@ -569,7 +640,17 @@ func (s *IntegrationSuite) testVhostRedirectTokenToCookie(c *check.C, method, ho return resp } -func (s *IntegrationSuite) TestDirectoryListing(c *check.C) { +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}, @@ -593,13 +674,14 @@ func (s *IntegrationSuite) TestDirectoryListing(c *check.C) { expect: []string{"foo", "bar"}, cutDirs: 1, }, - // This test case fails - // { - // 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/", header: authHeader, @@ -779,7 +861,12 @@ func (s *IntegrationSuite) TestDirectoryListing(c *check.C) { } else { c.Check(resp.Code, check.Equals, http.StatusMultiStatus, comment) for _, e := range trial.expect { - c.Check(resp.Body.String(), check.Matches, `(?ms).*`+filepath.Join(u.Path, e)+`.*`, comment) + if strings.HasSuffix(e, "/") { + e = filepath.Join(u.Path, e) + "/" + } else { + e = filepath.Join(u.Path, e) + } + c.Check(resp.Body.String(), check.Matches, `(?ms).*`+e+`.*`, comment) } } }