X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/b047cc92acab06d4c1f1d80173486f951b63d729..3fa0a5500d5b58b5d0b9ea940dac85be2da079ec:/lib/controller/federation/login_test.go diff --git a/lib/controller/federation/login_test.go b/lib/controller/federation/login_test.go index f83f5fb935..5353ebf0f5 100644 --- a/lib/controller/federation/login_test.go +++ b/lib/controller/federation/login_test.go @@ -8,8 +8,9 @@ import ( "context" "net/url" - "git.curoverse.com/arvados.git/sdk/go/arvados" - "git.curoverse.com/arvados.git/sdk/go/arvadostest" + "git.arvados.org/arvados.git/sdk/go/arvados" + "git.arvados.org/arvados.git/sdk/go/arvadostest" + "git.arvados.org/arvados.git/sdk/go/auth" check "gopkg.in/check.v1" ) @@ -32,7 +33,44 @@ func (s *LoginSuite) TestDeferToLoginCluster(c *check.C) { c.Check(err, check.IsNil) c.Check(target.Host, check.Equals, s.cluster.RemoteClusters["zhome"].Host) c.Check(target.Scheme, check.Equals, "http") - c.Check(target.Query().Get("remote"), check.Equals, remote) c.Check(target.Query().Get("return_to"), check.Equals, returnTo) + c.Check(target.Query().Get("remote"), check.Equals, remote) + _, remotePresent := target.Query()["remote"] + c.Check(remotePresent, check.Equals, remote != "") + } +} + +func (s *LoginSuite) TestLogout(c *check.C) { + s.cluster.Services.Workbench1.ExternalURL = arvados.URL{Scheme: "https", Host: "workbench1.example.com"} + s.cluster.Services.Workbench2.ExternalURL = arvados.URL{Scheme: "https", Host: "workbench2.example.com"} + s.addHTTPRemote(c, "zhome", &arvadostest.APIStub{}) + s.cluster.Login.LoginCluster = "zhome" + // s.fed is already set by SetUpTest, but we need to + // reinitialize with the above config changes. + s.fed = New(s.cluster) + + returnTo := "https://app.example.com/foo?bar" + for _, trial := range []struct { + token string + returnTo string + target string + }{ + {token: "", returnTo: "", target: s.cluster.Services.Workbench2.ExternalURL.String()}, + {token: "", returnTo: returnTo, target: returnTo}, + {token: "zzzzzzzzzzzzzzzzzzzzz", returnTo: returnTo, target: returnTo}, + {token: "v2/zzzzz-aaaaa-aaaaaaaaaaaaaaa/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", returnTo: returnTo, target: returnTo}, + {token: "v2/zhome-aaaaa-aaaaaaaaaaaaaaa/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", returnTo: returnTo, target: "http://" + s.cluster.RemoteClusters["zhome"].Host + "/logout?" + url.Values{"return_to": {returnTo}}.Encode()}, + } { + c.Logf("trial %#v", trial) + ctx := s.ctx + if trial.token != "" { + ctx = auth.NewContext(ctx, &auth.Credentials{Tokens: []string{trial.token}}) + } + resp, err := s.fed.Logout(ctx, arvados.LogoutOptions{ReturnTo: trial.returnTo}) + c.Assert(err, check.IsNil) + c.Logf(" RedirectLocation %q", resp.RedirectLocation) + target, err := url.Parse(resp.RedirectLocation) + c.Check(err, check.IsNil) + c.Check(target.String(), check.Equals, trial.target) } }