X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/29bfdcc937816027c162071cc7044eb8e695ab4c..48c38895200cdafaaeca37299bf8352878389a77:/lib/controller/handler_test.go diff --git a/lib/controller/handler_test.go b/lib/controller/handler_test.go index 06a5a84113..d54f50cf1f 100644 --- a/lib/controller/handler_test.go +++ b/lib/controller/handler_test.go @@ -6,7 +6,9 @@ package controller import ( "context" + "crypto/tls" "encoding/json" + "io/ioutil" "net/http" "net/http/httptest" "net/url" @@ -15,16 +17,21 @@ import ( "testing" "time" - "git.curoverse.com/arvados.git/sdk/go/arvados" - "git.curoverse.com/arvados.git/sdk/go/arvadostest" - "git.curoverse.com/arvados.git/sdk/go/ctxlog" - "git.curoverse.com/arvados.git/sdk/go/httpserver" + "git.arvados.org/arvados.git/sdk/go/arvados" + "git.arvados.org/arvados.git/sdk/go/arvadostest" + "git.arvados.org/arvados.git/sdk/go/ctxlog" + "git.arvados.org/arvados.git/sdk/go/httpserver" + "github.com/prometheus/client_golang/prometheus" check "gopkg.in/check.v1" ) +var forceLegacyAPI14 bool + // Gocheck boilerplate func Test(t *testing.T) { - check.TestingT(t) + for _, forceLegacyAPI14 = range []bool{false, true} { + check.TestingT(t) + } } var _ = check.Suite(&HandlerSuite{}) @@ -40,13 +47,14 @@ 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, - TLS: arvados.TLS{Insecure: true}, + ClusterID: "zzzzz", + PostgreSQL: integrationTestCluster().PostgreSQL, + ForceLegacyAPI14: forceLegacyAPI14, } + 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:/") - s.handler = newHandler(s.ctx, s.cluster, "") + s.handler = newHandler(s.ctx, s.cluster, "", prometheus.NewRegistry()) } func (s *HandlerSuite) TearDownTest(c *check.C) { @@ -54,20 +62,31 @@ func (s *HandlerSuite) TearDownTest(c *check.C) { } func (s *HandlerSuite) TestConfigExport(c *check.C) { - s.cluster.Containers.CloudVMs.PollInterval = arvados.Duration(23 * time.Second) - req := httptest.NewRequest("GET", "/arvados/v1/config", nil) - resp := httptest.NewRecorder() - s.handler.ServeHTTP(resp, req) - c.Check(resp.Code, check.Equals, http.StatusOK) - 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.TLS.Insecure, check.Equals, true) - c.Check(cluster.Services.RailsAPI, check.DeepEquals, s.cluster.Services.RailsAPI) - c.Check(cluster.Containers.CloudVMs.PollInterval, check.Equals, arvados.Duration(23*time.Second)) + s.cluster.ManagementToken = "secret" + s.cluster.SystemRootToken = "secret" + s.cluster.Collections.BlobSigning = true + s.cluster.Collections.BlobSigningTTL = arvados.Duration(23 * time.Second) + for _, method := range []string{"GET", "OPTIONS"} { + 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.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, `.+`) + if method == "OPTIONS" { + c.Check(resp.Body.String(), check.HasLen, 0) + 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.BlobSigningTTL, check.Equals, arvados.Duration(23*time.Second)) + } } func (s *HandlerSuite) TestProxyDiscoveryDoc(c *check.C) { @@ -147,17 +166,25 @@ func (s *HandlerSuite) TestProxyNotFound(c *check.C) { } func (s *HandlerSuite) TestProxyRedirect(c *check.C) { + s.cluster.Login.ProviderAppID = "test" + s.cluster.Login.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) - c.Check(resp.Code, check.Equals, http.StatusFound) - c.Check(resp.Header().Get("Location"), check.Matches, `https://0.0.0.0:1/auth/joshid\?return_to=%2Cfoo&?`) + 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) TestValidateV1APIToken(c *check.C) { req := httptest.NewRequest("GET", "/arvados/v1/users/current", nil) - user, err := s.handler.(*Handler).validateAPItoken(req, arvadostest.ActiveToken) + user, ok, err := s.handler.(*Handler).validateAPItoken(req, arvadostest.ActiveToken) c.Assert(err, check.IsNil) + c.Check(ok, check.Equals, true) c.Check(user.Authorization.UUID, check.Equals, arvadostest.ActiveTokenUUID) c.Check(user.Authorization.APIToken, check.Equals, arvadostest.ActiveToken) c.Check(user.Authorization.Scopes, check.DeepEquals, []string{"all"}) @@ -166,8 +193,9 @@ func (s *HandlerSuite) TestValidateV1APIToken(c *check.C) { func (s *HandlerSuite) TestValidateV2APIToken(c *check.C) { req := httptest.NewRequest("GET", "/arvados/v1/users/current", nil) - user, err := s.handler.(*Handler).validateAPItoken(req, arvadostest.ActiveTokenV2) + user, ok, err := s.handler.(*Handler).validateAPItoken(req, arvadostest.ActiveTokenV2) c.Assert(err, check.IsNil) + c.Check(ok, check.Equals, true) c.Check(user.Authorization.UUID, check.Equals, arvadostest.ActiveTokenUUID) c.Check(user.Authorization.APIToken, check.Equals, arvadostest.ActiveToken) c.Check(user.Authorization.Scopes, check.DeepEquals, []string{"all"}) @@ -181,11 +209,92 @@ func (s *HandlerSuite) TestCreateAPIToken(c *check.C) { c.Assert(err, check.IsNil) c.Check(auth.Scopes, check.DeepEquals, []string{"all"}) - user, err := s.handler.(*Handler).validateAPItoken(req, auth.TokenV2()) + user, ok, err := s.handler.(*Handler).validateAPItoken(req, auth.TokenV2()) c.Assert(err, check.IsNil) + c.Check(ok, check.Equals, true) c.Check(user.Authorization.UUID, check.Equals, auth.UUID) c.Check(user.Authorization.APIToken, check.Equals, auth.APIToken) c.Check(user.Authorization.Scopes, check.DeepEquals, []string{"all"}) c.Check(user.UUID, check.Equals, arvadostest.ActiveUserUUID) c.Check(user.Authorization.TokenV2(), check.Equals, auth.TokenV2()) } + +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 + req := httptest.NewRequest("GET", url, nil) + req.Header.Set("Authorization", "Bearer "+token) + resp := httptest.NewRecorder() + s.handler.ServeHTTP(resp, req) + 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 + client := &http.Client{ + Transport: &http.Transport{ + TLSClientConfig: &tls.Config{InsecureSkipVerify: true}, + }, + } + 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) + c.Check(err, check.Equals, nil) + err = json.Unmarshal(db, &direct) + c.Check(err, check.Equals, nil) + + // Check that all RailsAPI provided keys exist on the controller response. + for k := range direct { + 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 { + 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("%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) + } +}