X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/def8257f4e2a9db0ce772f3155125b3fd6f26368..e470a947218ecf042ca75c69d4579a052199e570:/lib/controller/handler_test.go diff --git a/lib/controller/handler_test.go b/lib/controller/handler_test.go index 53f5e65c6b..f09203f724 100644 --- a/lib/controller/handler_test.go +++ b/lib/controller/handler_test.go @@ -19,6 +19,7 @@ import ( "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/httpserver" "github.com/prometheus/client_golang/prometheus" @@ -180,6 +181,32 @@ func (s *HandlerSuite) TestProxyRedirect(c *check.C) { 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.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.GoogleClientID = "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, "https://example.com/foo") +} + func (s *HandlerSuite) TestValidateV1APIToken(c *check.C) { req := httptest.NewRequest("GET", "/arvados/v1/users/current", nil) user, ok, err := s.handler.(*Handler).validateAPItoken(req, arvadostest.ActiveToken) @@ -203,6 +230,26 @@ func (s *HandlerSuite) TestValidateV2APIToken(c *check.C) { c.Check(user.Authorization.TokenV2(), check.Equals, arvadostest.ActiveTokenV2) } +func (s *HandlerSuite) TestValidateRemoteToken(c *check.C) { + saltedToken, err := auth.SaltToken(arvadostest.ActiveTokenV2, "abcde") + c.Assert(err, check.IsNil) + for _, trial := range []struct { + code int + token string + }{ + {http.StatusOK, saltedToken}, + {http.StatusUnauthorized, "bogus"}, + } { + req := httptest.NewRequest("GET", "https://0.0.0.0:1/arvados/v1/users/current?remote=abcde", nil) + req.Header.Set("Authorization", "Bearer "+trial.token) + resp := httptest.NewRecorder() + s.handler.ServeHTTP(resp, req) + if !c.Check(resp.Code, check.Equals, trial.code) { + c.Logf("HTTP %d: %s", resp.Code, resp.Body.String()) + } + } +} + func (s *HandlerSuite) TestCreateAPIToken(c *check.C) { req := httptest.NewRequest("GET", "/arvados/v1/users/current", nil) auth, err := s.handler.(*Handler).createAPItoken(req, arvadostest.ActiveUserUUID, nil) @@ -219,27 +266,27 @@ func (s *HandlerSuite) TestCreateAPIToken(c *check.C) { c.Check(user.Authorization.TokenV2(), check.Equals, auth.TokenV2()) } -func (s *HandlerSuite) TestGetCollection(c *check.C) { +func (s *HandlerSuite) CheckObjectType(c *check.C, url string, token string, skippedFields map[string]bool) { var proxied, direct map[string]interface{} var err error // Get collection from controller - fooURL := "/arvados/v1/collections/" + arvadostest.FooCollection - req := httptest.NewRequest("GET", fooURL, nil) - req.Header.Set("Authorization", "Bearer "+arvadostest.ActiveToken) + req := httptest.NewRequest("GET", url, nil) + req.Header.Set("Authorization", "Bearer "+token) resp := httptest.NewRecorder() s.handler.ServeHTTP(resp, req) - c.Check(resp.Code, check.Equals, http.StatusOK) + c.Assert(resp.Code, check.Equals, http.StatusOK, + check.Commentf("Wasn't able to get data from the controller at %q", url)) err = json.Unmarshal(resp.Body.Bytes(), &proxied) c.Check(err, check.Equals, nil) - // Get collection directly from railsAPI + // Get collection directly from RailsAPI client := &http.Client{ Transport: &http.Transport{ TLSClientConfig: &tls.Config{InsecureSkipVerify: true}, }, } - resp2, err := client.Get(s.cluster.Services.RailsAPI.ExternalURL.String() + fooURL + "/?api_token=" + arvadostest.ActiveToken) + resp2, err := client.Get(s.cluster.Services.RailsAPI.ExternalURL.String() + url + "/?api_token=" + token) c.Check(err, check.Equals, nil) defer resp2.Body.Close() db, err := ioutil.ReadAll(resp2.Body) @@ -247,18 +294,54 @@ func (s *HandlerSuite) TestGetCollection(c *check.C) { err = json.Unmarshal(db, &direct) c.Check(err, check.Equals, nil) - // Check that all railsAPI provided keys exist on the controller response - // and their non-nil values are equal. + // Check that all RailsAPI provided keys exist on the controller response. for k := range direct { - if val, ok := proxied[k]; ok { - if k == "manifest_text" { + if _, ok := skippedFields[k]; ok { + continue + } else if val, ok := proxied[k]; ok { + if direct["kind"] == "arvados#collection" && k == "manifest_text" { // Tokens differ from request to request c.Check(strings.Split(val.(string), "+A")[0], check.Equals, strings.Split(direct[k].(string), "+A")[0]) - } else if direct[k] != nil { - c.Check(val, check.DeepEquals, direct[k]) + } else { + c.Check(val, check.DeepEquals, direct[k], + check.Commentf("RailsAPI %s key %q's value %q differs from controller's %q.", direct["kind"], k, direct[k], val)) } } else { - c.Errorf("Key %q missing", k) + c.Errorf("%s's key %q missing on controller's response.", direct["kind"], k) } } } + +func (s *HandlerSuite) TestGetObjects(c *check.C) { + // Get the 1st keep service's uuid from the running test server. + req := httptest.NewRequest("GET", "/arvados/v1/keep_services/", nil) + req.Header.Set("Authorization", "Bearer "+arvadostest.AdminToken) + resp := httptest.NewRecorder() + s.handler.ServeHTTP(resp, req) + c.Assert(resp.Code, check.Equals, http.StatusOK) + var ksList arvados.KeepServiceList + json.Unmarshal(resp.Body.Bytes(), &ksList) + c.Assert(len(ksList.Items), check.Not(check.Equals), 0) + ksUUID := ksList.Items[0].UUID + + testCases := map[string]map[string]bool{ + "api_clients/" + arvadostest.TrustedWorkbenchAPIClientUUID: nil, + "api_client_authorizations/" + arvadostest.AdminTokenUUID: nil, + "authorized_keys/" + arvadostest.AdminAuthorizedKeysUUID: nil, + "collections/" + arvadostest.CollectionWithUniqueWordsUUID: map[string]bool{"href": true}, + "containers/" + arvadostest.RunningContainerUUID: nil, + "container_requests/" + arvadostest.QueuedContainerRequestUUID: nil, + "groups/" + arvadostest.AProjectUUID: nil, + "keep_services/" + ksUUID: nil, + "links/" + arvadostest.ActiveUserCanReadAllUsersLinkUUID: nil, + "logs/" + arvadostest.CrunchstatForRunningJobLogUUID: nil, + "nodes/" + arvadostest.IdleNodeUUID: nil, + "repositories/" + arvadostest.ArvadosRepoUUID: nil, + "users/" + arvadostest.ActiveUserUUID: map[string]bool{"href": true}, + "virtual_machines/" + arvadostest.TestVMUUID: nil, + "workflows/" + arvadostest.WorkflowWithDefinitionYAMLUUID: nil, + } + for url, skippedFields := range testCases { + s.CheckObjectType(c, "/arvados/v1/"+url, arvadostest.AdminToken, skippedFields) + } +}