X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/1071f4f96fcb2084424c4b29dd5915880c650254..4b58bfc5b58db18e4816102f9850757f0884a42e:/services/keep-web/handler_test.go diff --git a/services/keep-web/handler_test.go b/services/keep-web/handler_test.go index 3b41d80cfc..4a76276392 100644 --- a/services/keep-web/handler_test.go +++ b/services/keep-web/handler_test.go @@ -18,6 +18,7 @@ import ( "path/filepath" "regexp" "strings" + "sync" "time" "git.arvados.org/arvados.git/lib/config" @@ -83,7 +84,7 @@ func (s *UnitSuite) TestCORSPreflight(c *check.C) { c.Check(resp.Body.String(), check.Equals, "") c.Check(resp.Header().Get("Access-Control-Allow-Origin"), check.Equals, "*") c.Check(resp.Header().Get("Access-Control-Allow-Methods"), check.Equals, "COPY, DELETE, GET, LOCK, MKCOL, MOVE, OPTIONS, POST, PROPFIND, PROPPATCH, PUT, RMCOL, UNLOCK") - c.Check(resp.Header().Get("Access-Control-Allow-Headers"), check.Equals, "Authorization, Content-Type, Range, Depth, Destination, If, Lock-Token, Overwrite, Timeout") + c.Check(resp.Header().Get("Access-Control-Allow-Headers"), check.Equals, "Authorization, Content-Type, Range, Depth, Destination, If, Lock-Token, Overwrite, Timeout, Cache-Control") // Check preflight for a disallowed request resp = httptest.NewRecorder() @@ -93,6 +94,120 @@ func (s *UnitSuite) TestCORSPreflight(c *check.C) { c.Check(resp.Code, check.Equals, http.StatusMethodNotAllowed) } +func (s *UnitSuite) TestWebdavPrefixAndSource(c *check.C) { + for _, trial := range []struct { + method string + path string + prefix string + source string + notFound bool + seeOther bool + }{ + { + method: "PROPFIND", + path: "/", + }, + { + method: "PROPFIND", + path: "/dir1", + }, + { + method: "PROPFIND", + path: "/dir1/", + }, + { + method: "PROPFIND", + path: "/dir1/foo", + prefix: "/dir1", + source: "/dir1", + }, + { + method: "PROPFIND", + path: "/prefix/dir1/foo", + prefix: "/prefix/", + source: "", + }, + { + method: "PROPFIND", + path: "/prefix/dir1/foo", + prefix: "/prefix", + source: "", + }, + { + method: "PROPFIND", + path: "/prefix/dir1/foo", + prefix: "/prefix/", + source: "/", + }, + { + method: "PROPFIND", + path: "/prefix/foo", + prefix: "/prefix/", + source: "/dir1/", + }, + { + method: "GET", + path: "/prefix/foo", + prefix: "/prefix/", + source: "/dir1/", + }, + { + method: "PROPFIND", + path: "/prefix/", + prefix: "/prefix", + source: "/dir1", + }, + { + method: "PROPFIND", + path: "/prefix", + prefix: "/prefix", + source: "/dir1/", + }, + { + method: "GET", + path: "/prefix", + prefix: "/prefix", + source: "/dir1", + seeOther: true, + }, + { + method: "PROPFIND", + path: "/dir1/foo", + prefix: "", + source: "/dir1", + notFound: true, + }, + } { + c.Logf("trial %+v", trial) + u := mustParseURL("http://" + arvadostest.FooBarDirCollection + ".keep-web.example" + trial.path) + req := &http.Request{ + Method: trial.method, + Host: u.Host, + URL: u, + RequestURI: u.RequestURI(), + Header: http.Header{ + "Authorization": {"Bearer " + arvadostest.ActiveTokenV2}, + "X-Webdav-Prefix": {trial.prefix}, + "X-Webdav-Source": {trial.source}, + }, + Body: ioutil.NopCloser(bytes.NewReader(nil)), + } + + resp := httptest.NewRecorder() + s.handler.ServeHTTP(resp, req) + if trial.notFound { + c.Check(resp.Code, check.Equals, http.StatusNotFound) + } else if trial.method == "PROPFIND" { + c.Check(resp.Code, check.Equals, http.StatusMultiStatus) + c.Check(resp.Body.String(), check.Matches, `(?ms).*>\n?$`) + } else if trial.seeOther { + c.Check(resp.Code, check.Equals, http.StatusSeeOther) + } else { + c.Check(resp.Code, check.Equals, http.StatusOK) + } + } +} + func (s *UnitSuite) TestEmptyResponse(c *check.C) { for _, trial := range []struct { dataExists bool @@ -1510,3 +1625,72 @@ func (s *IntegrationSuite) TestUploadLoggingPermission(c *check.C) { } } } + +func (s *IntegrationSuite) TestConcurrentWrites(c *check.C) { + s.handler.Cluster.Collections.WebDAVCache.TTL = arvados.Duration(time.Second * 2) + lockTidyInterval = time.Second + client := arvados.NewClientFromEnv() + client.AuthToken = arvadostest.ActiveTokenV2 + // Start small, and increase concurrency (2^2, 4^2, ...) + // only until hitting failure. Avoids unnecessarily long + // failure reports. + for n := 2; n < 16 && !c.Failed(); n = n * 2 { + c.Logf("%s: n=%d", c.TestName(), n) + + var coll arvados.Collection + err := client.RequestAndDecode(&coll, "POST", "arvados/v1/collections", nil, nil) + c.Assert(err, check.IsNil) + defer client.RequestAndDecode(&coll, "DELETE", "arvados/v1/collections/"+coll.UUID, nil, nil) + + var wg sync.WaitGroup + for i := 0; i < n && !c.Failed(); i++ { + i := i + wg.Add(1) + go func() { + defer wg.Done() + u := mustParseURL(fmt.Sprintf("http://%s.collections.example.com/i=%d", coll.UUID, i)) + resp := httptest.NewRecorder() + req, err := http.NewRequest("MKCOL", u.String(), nil) + c.Assert(err, check.IsNil) + req.Header.Set("Authorization", "Bearer "+client.AuthToken) + s.handler.ServeHTTP(resp, req) + c.Assert(resp.Code, check.Equals, http.StatusCreated) + for j := 0; j < n && !c.Failed(); j++ { + j := j + wg.Add(1) + go func() { + defer wg.Done() + content := fmt.Sprintf("i=%d/j=%d", i, j) + u := mustParseURL("http://" + coll.UUID + ".collections.example.com/" + content) + + resp := httptest.NewRecorder() + req, err := http.NewRequest("PUT", u.String(), strings.NewReader(content)) + c.Assert(err, check.IsNil) + req.Header.Set("Authorization", "Bearer "+client.AuthToken) + s.handler.ServeHTTP(resp, req) + c.Check(resp.Code, check.Equals, http.StatusCreated) + + time.Sleep(time.Second) + resp = httptest.NewRecorder() + req, err = http.NewRequest("GET", u.String(), nil) + c.Assert(err, check.IsNil) + req.Header.Set("Authorization", "Bearer "+client.AuthToken) + s.handler.ServeHTTP(resp, req) + c.Check(resp.Code, check.Equals, http.StatusOK) + c.Check(resp.Body.String(), check.Equals, content) + }() + } + }() + } + wg.Wait() + for i := 0; i < n; i++ { + u := mustParseURL(fmt.Sprintf("http://%s.collections.example.com/i=%d", coll.UUID, i)) + resp := httptest.NewRecorder() + req, err := http.NewRequest("PROPFIND", u.String(), &bytes.Buffer{}) + c.Assert(err, check.IsNil) + req.Header.Set("Authorization", "Bearer "+client.AuthToken) + s.handler.ServeHTTP(resp, req) + c.Assert(resp.Code, check.Equals, http.StatusMultiStatus) + } + } +}