X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/92da01ee9c52ca89b36a0edd21a4f42b8eb48e0d..0ce66018616c5177bc9268280119d6f08f339d4d:/lib/controller/handler_test.go diff --git a/lib/controller/handler_test.go b/lib/controller/handler_test.go index 3c7ae3a2d9..9b71c349a4 100644 --- a/lib/controller/handler_test.go +++ b/lib/controller/handler_test.go @@ -26,13 +26,9 @@ import ( check "gopkg.in/check.v1" ) -var forceLegacyAPI14 bool - // Gocheck boilerplate func Test(t *testing.T) { - for _, forceLegacyAPI14 = range []bool{false, true} { - check.TestingT(t) - } + check.TestingT(t) } var _ = check.Suite(&HandlerSuite{}) @@ -48,10 +44,10 @@ func (s *HandlerSuite) SetUpTest(c *check.C) { s.ctx, s.cancel = context.WithCancel(context.Background()) s.ctx = ctxlog.Context(s.ctx, ctxlog.New(os.Stderr, "json", "debug")) s.cluster = &arvados.Cluster{ - ClusterID: "zzzzz", - PostgreSQL: integrationTestCluster().PostgreSQL, - ForceLegacyAPI14: forceLegacyAPI14, + ClusterID: "zzzzz", + PostgreSQL: integrationTestCluster().PostgreSQL, } + s.cluster.API.RequestTimeout = arvados.Duration(5 * time.Minute) s.cluster.TLS.Insecure = true arvadostest.SetServiceURL(&s.cluster.Services.RailsAPI, "https://"+os.Getenv("ARVADOS_TEST_API_HOST")) arvadostest.SetServiceURL(&s.cluster.Services.Controller, "http://localhost:/") @@ -71,7 +67,10 @@ func (s *HandlerSuite) TestConfigExport(c *check.C) { req := httptest.NewRequest(method, "/arvados/v1/config", nil) resp := httptest.NewRecorder() s.handler.ServeHTTP(resp, req) - c.Check(resp.Code, check.Equals, http.StatusOK) + c.Log(resp.Body.String()) + if !c.Check(resp.Code, check.Equals, http.StatusOK) { + continue + } c.Check(resp.Header().Get("Access-Control-Allow-Origin"), check.Equals, `*`) c.Check(resp.Header().Get("Access-Control-Allow-Methods"), check.Matches, `.*\bGET\b.*`) c.Check(resp.Header().Get("Access-Control-Allow-Headers"), check.Matches, `.+`) @@ -80,12 +79,11 @@ func (s *HandlerSuite) TestConfigExport(c *check.C) { continue } var cluster arvados.Cluster - c.Log(resp.Body.String()) err := json.Unmarshal(resp.Body.Bytes(), &cluster) c.Check(err, check.IsNil) c.Check(cluster.ManagementToken, check.Equals, "") c.Check(cluster.SystemRootToken, check.Equals, "") - c.Check(cluster.Collections.BlobSigning, check.DeepEquals, true) + c.Check(cluster.Collections.BlobSigning, check.Equals, true) c.Check(cluster.Collections.BlobSigningTTL, check.Equals, arvados.Duration(23*time.Second)) } } @@ -166,39 +164,7 @@ func (s *HandlerSuite) TestProxyNotFound(c *check.C) { c.Check(jresp["errors"], check.FitsTypeOf, []interface{}{}) } -func (s *HandlerSuite) TestProxyRedirect(c *check.C) { - s.cluster.Login.SSO.Enable = true - s.cluster.Login.SSO.ProviderAppID = "test" - s.cluster.Login.SSO.ProviderAppSecret = "test" - req := httptest.NewRequest("GET", "https://0.0.0.0:1/login?return_to=foo", nil) - resp := httptest.NewRecorder() - s.handler.ServeHTTP(resp, req) - if !c.Check(resp.Code, check.Equals, http.StatusFound) { - c.Log(resp.Body.String()) - } - // Old "proxy entire request" code path returns an absolute - // URL. New lib/controller/federation code path returns a - // relative URL. - c.Check(resp.Header().Get("Location"), check.Matches, `(https://0.0.0.0:1)?/auth/joshid\?return_to=%2Cfoo&?`) -} - -func (s *HandlerSuite) TestLogoutSSO(c *check.C) { - s.cluster.Login.SSO.Enable = true - s.cluster.Login.SSO.ProviderAppID = "test" - req := httptest.NewRequest("GET", "https://0.0.0.0:1/logout?return_to=https://example.com/foo", nil) - resp := httptest.NewRecorder() - s.handler.ServeHTTP(resp, req) - if !c.Check(resp.Code, check.Equals, http.StatusFound) { - c.Log(resp.Body.String()) - } - c.Check(resp.Header().Get("Location"), check.Equals, "http://localhost:3002/users/sign_out?"+url.Values{"redirect_uri": {"https://example.com/foo"}}.Encode()) -} - func (s *HandlerSuite) TestLogoutGoogle(c *check.C) { - if s.cluster.ForceLegacyAPI14 { - // Google login N/A - return - } s.cluster.Login.Google.Enable = true s.cluster.Login.Google.ClientID = "test" req := httptest.NewRequest("GET", "https://0.0.0.0:1/logout?return_to=https://example.com/foo", nil) @@ -291,6 +257,8 @@ func (s *HandlerSuite) CheckObjectType(c *check.C, url string, token string, ski } resp2, err := client.Get(s.cluster.Services.RailsAPI.ExternalURL.String() + url + "/?api_token=" + token) c.Check(err, check.Equals, nil) + c.Assert(resp2.StatusCode, check.Equals, http.StatusOK, + check.Commentf("Wasn't able to get data from the RailsAPI at %q", url)) defer resp2.Body.Close() db, err := ioutil.ReadAll(resp2.Body) c.Check(err, check.Equals, nil) @@ -331,7 +299,7 @@ func (s *HandlerSuite) TestGetObjects(c *check.C) { "api_clients/" + arvadostest.TrustedWorkbenchAPIClientUUID: nil, "api_client_authorizations/" + arvadostest.AdminTokenUUID: nil, "authorized_keys/" + arvadostest.AdminAuthorizedKeysUUID: nil, - "collections/" + arvadostest.CollectionWithUniqueWordsUUID: map[string]bool{"href": true}, + "collections/" + arvadostest.CollectionWithUniqueWordsUUID: {"href": true}, "containers/" + arvadostest.RunningContainerUUID: nil, "container_requests/" + arvadostest.QueuedContainerRequestUUID: nil, "groups/" + arvadostest.AProjectUUID: nil, @@ -340,7 +308,7 @@ func (s *HandlerSuite) TestGetObjects(c *check.C) { "logs/" + arvadostest.CrunchstatForRunningJobLogUUID: nil, "nodes/" + arvadostest.IdleNodeUUID: nil, "repositories/" + arvadostest.ArvadosRepoUUID: nil, - "users/" + arvadostest.ActiveUserUUID: map[string]bool{"href": true}, + "users/" + arvadostest.ActiveUserUUID: {"href": true}, "virtual_machines/" + arvadostest.TestVMUUID: nil, "workflows/" + arvadostest.WorkflowWithDefinitionYAMLUUID: nil, } @@ -348,3 +316,19 @@ func (s *HandlerSuite) TestGetObjects(c *check.C) { s.CheckObjectType(c, "/arvados/v1/"+url, arvadostest.AdminToken, skippedFields) } } + +func (s *HandlerSuite) TestRedactRailsAPIHostFromErrors(c *check.C) { + req := httptest.NewRequest("GET", "https://0.0.0.0:1/arvados/v1/collections/zzzzz-4zz18-abcdefghijklmno", nil) + req.Header.Set("Authorization", "Bearer "+arvadostest.ActiveToken) + resp := httptest.NewRecorder() + s.handler.ServeHTTP(resp, req) + c.Check(resp.Code, check.Equals, http.StatusNotFound) + var jresp struct { + Errors []string + } + c.Log(resp.Body.String()) + c.Assert(json.NewDecoder(resp.Body).Decode(&jresp), check.IsNil) + c.Assert(jresp.Errors, check.HasLen, 1) + c.Check(jresp.Errors[0], check.Matches, `.*//railsapi\.internal/arvados/v1/collections/.*: 404 Not Found.*`) + c.Check(jresp.Errors[0], check.Not(check.Matches), `(?ms).*127.0.0.1.*`) +}