X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/9ab021c2c2720b563f012b99dfbf3e7034a3c245..0ce66018616c5177bc9268280119d6f08f339d4d:/lib/controller/localdb/login_oidc_test.go diff --git a/lib/controller/localdb/login_oidc_test.go b/lib/controller/localdb/login_oidc_test.go index 59fb8ce05a..3d16500747 100644 --- a/lib/controller/localdb/login_oidc_test.go +++ b/lib/controller/localdb/login_oidc_test.go @@ -7,10 +7,11 @@ package localdb import ( "bytes" "context" - "crypto/rand" - "crypto/rsa" + "crypto/hmac" + "crypto/sha256" "encoding/json" "fmt" + "io" "net/http" "net/http/httptest" "net/url" @@ -25,8 +26,8 @@ import ( "git.arvados.org/arvados.git/sdk/go/arvadostest" "git.arvados.org/arvados.git/sdk/go/auth" "git.arvados.org/arvados.git/sdk/go/ctxlog" + "github.com/jmoiron/sqlx" check "gopkg.in/check.v1" - jose "gopkg.in/square/go-jose.v2" ) // Gocheck boilerplate @@ -34,159 +35,74 @@ func Test(t *testing.T) { check.TestingT(t) } -var _ = check.Suite(&LoginSuite{}) - -type LoginSuite struct { - cluster *arvados.Cluster - ctx context.Context - localdb *Conn - railsSpy *arvadostest.Proxy - fakeIssuer *httptest.Server - fakePeopleAPI *httptest.Server - fakePeopleAPIResponse map[string]interface{} - issuerKey *rsa.PrivateKey - - // expected token request - validCode string - // desired response from token endpoint - authEmail string - authEmailVerified bool - authName string +var _ = check.Suite(&OIDCLoginSuite{}) + +type OIDCLoginSuite struct { + cluster *arvados.Cluster + localdb *Conn + railsSpy *arvadostest.Proxy + fakeProvider *arvadostest.OIDCProvider } -func (s *LoginSuite) TearDownSuite(c *check.C) { +func (s *OIDCLoginSuite) TearDownSuite(c *check.C) { // Undo any changes/additions to the user database so they // don't affect subsequent tests. arvadostest.ResetEnv() c.Check(arvados.NewClientFromEnv().RequestAndDecode(nil, "POST", "database/reset", nil, nil), check.IsNil) } -func (s *LoginSuite) SetUpTest(c *check.C) { - var err error - s.issuerKey, err = rsa.GenerateKey(rand.Reader, 2048) - c.Assert(err, check.IsNil) - - s.authEmail = "active-user@arvados.local" - s.authEmailVerified = true - s.authName = "Fake User Name" - s.fakeIssuer = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) { - req.ParseForm() - c.Logf("fakeIssuer: got req: %s %s %s", req.Method, req.URL, req.Form) - w.Header().Set("Content-Type", "application/json") - switch req.URL.Path { - case "/.well-known/openid-configuration": - json.NewEncoder(w).Encode(map[string]interface{}{ - "issuer": s.fakeIssuer.URL, - "authorization_endpoint": s.fakeIssuer.URL + "/auth", - "token_endpoint": s.fakeIssuer.URL + "/token", - "jwks_uri": s.fakeIssuer.URL + "/jwks", - "userinfo_endpoint": s.fakeIssuer.URL + "/userinfo", - }) - case "/token": - if req.Form.Get("code") != s.validCode || s.validCode == "" { - w.WriteHeader(http.StatusUnauthorized) - return - } - idToken, _ := json.Marshal(map[string]interface{}{ - "iss": s.fakeIssuer.URL, - "aud": []string{"test%client$id"}, - "sub": "fake-user-id", - "exp": time.Now().UTC().Add(time.Minute).UnixNano(), - "iat": time.Now().UTC().UnixNano(), - "nonce": "fake-nonce", - "email": s.authEmail, - "email_verified": s.authEmailVerified, - "name": s.authName, - }) - json.NewEncoder(w).Encode(struct { - AccessToken string `json:"access_token"` - TokenType string `json:"token_type"` - RefreshToken string `json:"refresh_token"` - ExpiresIn int32 `json:"expires_in"` - IDToken string `json:"id_token"` - }{ - AccessToken: s.fakeToken(c, []byte("fake access token")), - TokenType: "Bearer", - RefreshToken: "test-refresh-token", - ExpiresIn: 30, - IDToken: s.fakeToken(c, idToken), - }) - case "/jwks": - json.NewEncoder(w).Encode(jose.JSONWebKeySet{ - Keys: []jose.JSONWebKey{ - {Key: s.issuerKey.Public(), Algorithm: string(jose.RS256), KeyID: ""}, - }, - }) - case "/auth": - w.WriteHeader(http.StatusInternalServerError) - case "/userinfo": - w.WriteHeader(http.StatusInternalServerError) - default: - w.WriteHeader(http.StatusNotFound) - } - })) - s.validCode = fmt.Sprintf("abcdefgh-%d", time.Now().Unix()) - - s.fakePeopleAPI = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) { - req.ParseForm() - c.Logf("fakePeopleAPI: got req: %s %s %s", req.Method, req.URL, req.Form) - w.Header().Set("Content-Type", "application/json") - switch req.URL.Path { - case "/v1/people/me": - if f := req.Form.Get("personFields"); f != "emailAddresses,names" { - w.WriteHeader(http.StatusBadRequest) - break - } - json.NewEncoder(w).Encode(s.fakePeopleAPIResponse) - default: - w.WriteHeader(http.StatusNotFound) - } - })) - s.fakePeopleAPIResponse = map[string]interface{}{} +func (s *OIDCLoginSuite) SetUpTest(c *check.C) { + s.fakeProvider = arvadostest.NewOIDCProvider(c) + s.fakeProvider.AuthEmail = "active-user@arvados.local" + s.fakeProvider.AuthEmailVerified = true + s.fakeProvider.AuthName = "Fake User Name" + s.fakeProvider.ValidCode = fmt.Sprintf("abcdefgh-%d", time.Now().Unix()) + s.fakeProvider.PeopleAPIResponse = map[string]interface{}{} cfg, err := config.NewLoader(nil, ctxlog.TestLogger(c)).Load() + c.Assert(err, check.IsNil) s.cluster, err = cfg.GetCluster("") - s.cluster.Login.SSO.Enable = false + c.Assert(err, check.IsNil) s.cluster.Login.Google.Enable = true s.cluster.Login.Google.ClientID = "test%client$id" s.cluster.Login.Google.ClientSecret = "test#client/secret" s.cluster.Users.PreferDomainForUsername = "PreferDomainForUsername.example.com" - c.Assert(err, check.IsNil) + s.fakeProvider.ValidClientID = "test%client$id" + s.fakeProvider.ValidClientSecret = "test#client/secret" s.localdb = NewConn(s.cluster) c.Assert(s.localdb.loginController, check.FitsTypeOf, (*oidcLoginController)(nil)) - c.Check(s.localdb.loginController.(*oidcLoginController).Issuer, check.Equals, "https://accounts.google.com") - s.localdb.loginController.(*oidcLoginController).Issuer = s.fakeIssuer.URL - s.localdb.loginController.(*oidcLoginController).peopleAPIBasePath = s.fakePeopleAPI.URL + s.localdb.loginController.(*oidcLoginController).Issuer = s.fakeProvider.Issuer.URL + s.localdb.loginController.(*oidcLoginController).peopleAPIBasePath = s.fakeProvider.PeopleAPI.URL s.railsSpy = arvadostest.NewProxy(c, s.cluster.Services.RailsAPI) *s.localdb.railsProxy = *rpc.NewConn(s.cluster.ClusterID, s.railsSpy.URL, true, rpc.PassthroughTokenProvider) } -func (s *LoginSuite) TearDownTest(c *check.C) { +func (s *OIDCLoginSuite) TearDownTest(c *check.C) { s.railsSpy.Close() } -func (s *LoginSuite) TestGoogleLogout(c *check.C) { +func (s *OIDCLoginSuite) TestGoogleLogout(c *check.C) { resp, err := s.localdb.Logout(context.Background(), arvados.LogoutOptions{ReturnTo: "https://foo.example.com/bar"}) c.Check(err, check.IsNil) c.Check(resp.RedirectLocation, check.Equals, "https://foo.example.com/bar") } -func (s *LoginSuite) TestGoogleLogin_Start_Bogus(c *check.C) { +func (s *OIDCLoginSuite) TestGoogleLogin_Start_Bogus(c *check.C) { resp, err := s.localdb.Login(context.Background(), arvados.LoginOptions{}) c.Check(err, check.IsNil) c.Check(resp.RedirectLocation, check.Equals, "") c.Check(resp.HTML.String(), check.Matches, `.*missing return_to parameter.*`) } -func (s *LoginSuite) TestGoogleLogin_Start(c *check.C) { +func (s *OIDCLoginSuite) TestGoogleLogin_Start(c *check.C) { for _, remote := range []string{"", "zzzzz"} { resp, err := s.localdb.Login(context.Background(), arvados.LoginOptions{Remote: remote, ReturnTo: "https://app.example.com/foo?bar"}) c.Check(err, check.IsNil) target, err := url.Parse(resp.RedirectLocation) c.Check(err, check.IsNil) - issuerURL, _ := url.Parse(s.fakeIssuer.URL) + issuerURL, _ := url.Parse(s.fakeProvider.Issuer.URL) c.Check(target.Host, check.Equals, issuerURL.Host) q := target.Query() c.Check(q.Get("client_id"), check.Equals, "test%client$id") @@ -198,7 +114,7 @@ func (s *LoginSuite) TestGoogleLogin_Start(c *check.C) { } } -func (s *LoginSuite) TestGoogleLogin_InvalidCode(c *check.C) { +func (s *OIDCLoginSuite) TestGoogleLogin_InvalidCode(c *check.C) { state := s.startLogin(c) resp, err := s.localdb.Login(context.Background(), arvados.LoginOptions{ Code: "first-try-a-bogus-code", @@ -209,10 +125,10 @@ func (s *LoginSuite) TestGoogleLogin_InvalidCode(c *check.C) { c.Check(resp.HTML.String(), check.Matches, `(?ms).*error in OAuth2 exchange.*cannot fetch token.*`) } -func (s *LoginSuite) TestGoogleLogin_InvalidState(c *check.C) { +func (s *OIDCLoginSuite) TestGoogleLogin_InvalidState(c *check.C) { s.startLogin(c) resp, err := s.localdb.Login(context.Background(), arvados.LoginOptions{ - Code: s.validCode, + Code: s.fakeProvider.ValidCode, State: "bogus-state", }) c.Check(err, check.IsNil) @@ -220,21 +136,21 @@ func (s *LoginSuite) TestGoogleLogin_InvalidState(c *check.C) { c.Check(resp.HTML.String(), check.Matches, `(?ms).*invalid OAuth2 state.*`) } -func (s *LoginSuite) setupPeopleAPIError(c *check.C) { - s.fakePeopleAPI = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) { +func (s *OIDCLoginSuite) setupPeopleAPIError(c *check.C) { + s.fakeProvider.PeopleAPI = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) { w.WriteHeader(http.StatusForbidden) fmt.Fprintln(w, `Error 403: accessNotConfigured`) })) - s.localdb.loginController.(*oidcLoginController).peopleAPIBasePath = s.fakePeopleAPI.URL + s.localdb.loginController.(*oidcLoginController).peopleAPIBasePath = s.fakeProvider.PeopleAPI.URL } -func (s *LoginSuite) TestGoogleLogin_PeopleAPIDisabled(c *check.C) { - s.cluster.Login.Google.AlternateEmailAddresses = false - s.authEmail = "joe.smith@primary.example.com" +func (s *OIDCLoginSuite) TestGoogleLogin_PeopleAPIDisabled(c *check.C) { + s.localdb.loginController.(*oidcLoginController).UseGooglePeopleAPI = false + s.fakeProvider.AuthEmail = "joe.smith@primary.example.com" s.setupPeopleAPIError(c) state := s.startLogin(c) _, err := s.localdb.Login(context.Background(), arvados.LoginOptions{ - Code: s.validCode, + Code: s.fakeProvider.ValidCode, State: state, }) c.Check(err, check.IsNil) @@ -242,21 +158,256 @@ func (s *LoginSuite) TestGoogleLogin_PeopleAPIDisabled(c *check.C) { c.Check(authinfo.Email, check.Equals, "joe.smith@primary.example.com") } -func (s *LoginSuite) TestGoogleLogin_PeopleAPIError(c *check.C) { +func (s *OIDCLoginSuite) TestConfig(c *check.C) { + s.cluster.Login.Google.Enable = false + s.cluster.Login.OpenIDConnect.Enable = true + s.cluster.Login.OpenIDConnect.Issuer = "https://accounts.example.com/" + s.cluster.Login.OpenIDConnect.ClientID = "oidc-client-id" + s.cluster.Login.OpenIDConnect.ClientSecret = "oidc-client-secret" + s.cluster.Login.OpenIDConnect.AuthenticationRequestParameters = map[string]string{"testkey": "testvalue"} + localdb := NewConn(s.cluster) + ctrl := localdb.loginController.(*oidcLoginController) + c.Check(ctrl.Issuer, check.Equals, "https://accounts.example.com/") + c.Check(ctrl.ClientID, check.Equals, "oidc-client-id") + c.Check(ctrl.ClientSecret, check.Equals, "oidc-client-secret") + c.Check(ctrl.UseGooglePeopleAPI, check.Equals, false) + c.Check(ctrl.AuthParams["testkey"], check.Equals, "testvalue") + + for _, enableAltEmails := range []bool{false, true} { + s.cluster.Login.OpenIDConnect.Enable = false + s.cluster.Login.Google.Enable = true + s.cluster.Login.Google.ClientID = "google-client-id" + s.cluster.Login.Google.ClientSecret = "google-client-secret" + s.cluster.Login.Google.AlternateEmailAddresses = enableAltEmails + s.cluster.Login.Google.AuthenticationRequestParameters = map[string]string{"testkey": "testvalue"} + localdb = NewConn(s.cluster) + ctrl = localdb.loginController.(*oidcLoginController) + c.Check(ctrl.Issuer, check.Equals, "https://accounts.google.com") + c.Check(ctrl.ClientID, check.Equals, "google-client-id") + c.Check(ctrl.ClientSecret, check.Equals, "google-client-secret") + c.Check(ctrl.UseGooglePeopleAPI, check.Equals, enableAltEmails) + c.Check(ctrl.AuthParams["testkey"], check.Equals, "testvalue") + } +} + +func (s *OIDCLoginSuite) TestGoogleLogin_PeopleAPIError(c *check.C) { s.setupPeopleAPIError(c) state := s.startLogin(c) resp, err := s.localdb.Login(context.Background(), arvados.LoginOptions{ - Code: s.validCode, + Code: s.fakeProvider.ValidCode, State: state, }) c.Check(err, check.IsNil) c.Check(resp.RedirectLocation, check.Equals, "") } -func (s *LoginSuite) TestGoogleLogin_Success(c *check.C) { - state := s.startLogin(c) +func (s *OIDCLoginSuite) TestOIDCAuthorizer(c *check.C) { + s.cluster.Login.Google.Enable = false + s.cluster.Login.OpenIDConnect.Enable = true + json.Unmarshal([]byte(fmt.Sprintf("%q", s.fakeProvider.Issuer.URL)), &s.cluster.Login.OpenIDConnect.Issuer) + s.cluster.Login.OpenIDConnect.ClientID = "oidc#client#id" + s.cluster.Login.OpenIDConnect.ClientSecret = "oidc#client#secret" + s.cluster.Login.OpenIDConnect.AcceptAccessToken = true + s.cluster.Login.OpenIDConnect.AcceptAccessTokenScope = "" + s.fakeProvider.ValidClientID = "oidc#client#id" + s.fakeProvider.ValidClientSecret = "oidc#client#secret" + db := arvadostest.DB(c, s.cluster) + + tokenCacheTTL = time.Millisecond + tokenCacheRaceWindow = time.Millisecond + tokenCacheNegativeTTL = time.Millisecond + + oidcAuthorizer := OIDCAccessTokenAuthorizer(s.cluster, func(context.Context) (*sqlx.DB, error) { return db, nil }) + accessToken := s.fakeProvider.ValidAccessToken() + + mac := hmac.New(sha256.New, []byte(s.cluster.SystemRootToken)) + io.WriteString(mac, accessToken) + apiToken := fmt.Sprintf("%x", mac.Sum(nil)) + + cleanup := func() { + _, err := db.Exec(`delete from api_client_authorizations where api_token=$1`, apiToken) + c.Check(err, check.IsNil) + } + cleanup() + defer cleanup() + + ctx := auth.NewContext(context.Background(), &auth.Credentials{Tokens: []string{accessToken}}) + var exp1 time.Time + oidcAuthorizer.WrapCalls(func(ctx context.Context, opts interface{}) (interface{}, error) { + creds, ok := auth.FromContext(ctx) + c.Assert(ok, check.Equals, true) + c.Assert(creds.Tokens, check.HasLen, 1) + c.Check(creds.Tokens[0], check.Equals, accessToken) + + err := db.QueryRowContext(ctx, `select expires_at at time zone 'UTC' from api_client_authorizations where api_token=$1`, apiToken).Scan(&exp1) + c.Check(err, check.IsNil) + c.Check(exp1.Sub(time.Now()) > -time.Second, check.Equals, true) + c.Check(exp1.Sub(time.Now()) < time.Second, check.Equals, true) + return nil, nil + })(ctx, nil) + + // If the token is used again after the in-memory cache + // expires, oidcAuthorizer must re-check the token and update + // the expires_at value in the database. + time.Sleep(3 * time.Millisecond) + oidcAuthorizer.WrapCalls(func(ctx context.Context, opts interface{}) (interface{}, error) { + var exp time.Time + err := db.QueryRowContext(ctx, `select expires_at at time zone 'UTC' from api_client_authorizations where api_token=$1`, apiToken).Scan(&exp) + c.Check(err, check.IsNil) + c.Check(exp.Sub(exp1) > 0, check.Equals, true) + c.Check(exp.Sub(exp1) < time.Second, check.Equals, true) + return nil, nil + })(ctx, nil) + + s.fakeProvider.AccessTokenPayload = map[string]interface{}{"scope": "openid profile foobar"} + accessToken = s.fakeProvider.ValidAccessToken() + ctx = auth.NewContext(context.Background(), &auth.Credentials{Tokens: []string{accessToken}}) + + mac = hmac.New(sha256.New, []byte(s.cluster.SystemRootToken)) + io.WriteString(mac, accessToken) + apiToken = fmt.Sprintf("%x", mac.Sum(nil)) + + for _, trial := range []struct { + configEnable bool + configScope string + acceptable bool + shouldRun bool + }{ + {true, "foobar", true, true}, + {true, "foo", false, false}, + {true, "", true, true}, + {false, "", false, true}, + {false, "foobar", false, true}, + } { + c.Logf("trial = %+v", trial) + cleanup() + s.cluster.Login.OpenIDConnect.AcceptAccessToken = trial.configEnable + s.cluster.Login.OpenIDConnect.AcceptAccessTokenScope = trial.configScope + oidcAuthorizer = OIDCAccessTokenAuthorizer(s.cluster, func(context.Context) (*sqlx.DB, error) { return db, nil }) + checked := false + oidcAuthorizer.WrapCalls(func(ctx context.Context, opts interface{}) (interface{}, error) { + var n int + err := db.QueryRowContext(ctx, `select count(*) from api_client_authorizations where api_token=$1`, apiToken).Scan(&n) + c.Check(err, check.IsNil) + if trial.acceptable { + c.Check(n, check.Equals, 1) + } else { + c.Check(n, check.Equals, 0) + } + checked = true + return nil, nil + })(ctx, nil) + c.Check(checked, check.Equals, trial.shouldRun) + } +} + +func (s *OIDCLoginSuite) TestGenericOIDCLogin(c *check.C) { + s.cluster.Login.Google.Enable = false + s.cluster.Login.OpenIDConnect.Enable = true + json.Unmarshal([]byte(fmt.Sprintf("%q", s.fakeProvider.Issuer.URL)), &s.cluster.Login.OpenIDConnect.Issuer) + s.cluster.Login.OpenIDConnect.ClientID = "oidc#client#id" + s.cluster.Login.OpenIDConnect.ClientSecret = "oidc#client#secret" + s.cluster.Login.OpenIDConnect.AuthenticationRequestParameters = map[string]string{"testkey": "testvalue"} + s.fakeProvider.ValidClientID = "oidc#client#id" + s.fakeProvider.ValidClientSecret = "oidc#client#secret" + for _, trial := range []struct { + expectEmail string // "" if failure expected + setup func() + }{ + { + expectEmail: "user@oidc.example.com", + setup: func() { + c.Log("=== succeed because email_verified is false but not required") + s.fakeProvider.AuthEmail = "user@oidc.example.com" + s.fakeProvider.AuthEmailVerified = false + s.cluster.Login.OpenIDConnect.EmailClaim = "email" + s.cluster.Login.OpenIDConnect.EmailVerifiedClaim = "" + s.cluster.Login.OpenIDConnect.UsernameClaim = "" + }, + }, + { + expectEmail: "", + setup: func() { + c.Log("=== fail because email_verified is false and required") + s.fakeProvider.AuthEmail = "user@oidc.example.com" + s.fakeProvider.AuthEmailVerified = false + s.cluster.Login.OpenIDConnect.EmailClaim = "email" + s.cluster.Login.OpenIDConnect.EmailVerifiedClaim = "email_verified" + s.cluster.Login.OpenIDConnect.UsernameClaim = "" + }, + }, + { + expectEmail: "user@oidc.example.com", + setup: func() { + c.Log("=== succeed because email_verified is false but config uses custom 'verified' claim") + s.fakeProvider.AuthEmail = "user@oidc.example.com" + s.fakeProvider.AuthEmailVerified = false + s.cluster.Login.OpenIDConnect.EmailClaim = "email" + s.cluster.Login.OpenIDConnect.EmailVerifiedClaim = "alt_verified" + s.cluster.Login.OpenIDConnect.UsernameClaim = "" + }, + }, + { + expectEmail: "alt_email@example.com", + setup: func() { + c.Log("=== succeed with custom 'email' and 'email_verified' claims") + s.fakeProvider.AuthEmail = "bad@wrong.example.com" + s.fakeProvider.AuthEmailVerified = false + s.cluster.Login.OpenIDConnect.EmailClaim = "alt_email" + s.cluster.Login.OpenIDConnect.EmailVerifiedClaim = "alt_verified" + s.cluster.Login.OpenIDConnect.UsernameClaim = "alt_username" + }, + }, + } { + trial.setup() + if s.railsSpy != nil { + s.railsSpy.Close() + } + s.railsSpy = arvadostest.NewProxy(c, s.cluster.Services.RailsAPI) + s.localdb = NewConn(s.cluster) + *s.localdb.railsProxy = *rpc.NewConn(s.cluster.ClusterID, s.railsSpy.URL, true, rpc.PassthroughTokenProvider) + + state := s.startLogin(c, func(form url.Values) { + c.Check(form.Get("testkey"), check.Equals, "testvalue") + }) + resp, err := s.localdb.Login(context.Background(), arvados.LoginOptions{ + Code: s.fakeProvider.ValidCode, + State: state, + }) + c.Assert(err, check.IsNil) + if trial.expectEmail == "" { + c.Check(resp.HTML.String(), check.Matches, `(?ms).*Login error.*`) + c.Check(resp.RedirectLocation, check.Equals, "") + continue + } + c.Check(resp.HTML.String(), check.Equals, "") + target, err := url.Parse(resp.RedirectLocation) + c.Assert(err, check.IsNil) + token := target.Query().Get("api_token") + c.Check(token, check.Matches, `v2/zzzzz-gj3su-.{15}/.{32,50}`) + authinfo := getCallbackAuthInfo(c, s.railsSpy) + c.Check(authinfo.Email, check.Equals, trial.expectEmail) + + switch s.cluster.Login.OpenIDConnect.UsernameClaim { + case "alt_username": + c.Check(authinfo.Username, check.Equals, "desired-username") + case "": + c.Check(authinfo.Username, check.Equals, "") + default: + c.Fail() // bad test case + } + } +} + +func (s *OIDCLoginSuite) TestGoogleLogin_Success(c *check.C) { + s.cluster.Login.Google.AuthenticationRequestParameters["prompt"] = "consent" + s.cluster.Login.Google.AuthenticationRequestParameters["foo"] = "bar" + state := s.startLogin(c, func(form url.Values) { + c.Check(form.Get("foo"), check.Equals, "bar") + c.Check(form.Get("prompt"), check.Equals, "consent") + }) resp, err := s.localdb.Login(context.Background(), arvados.LoginOptions{ - Code: s.validCode, + Code: s.fakeProvider.ValidCode, State: state, }) c.Check(err, check.IsNil) @@ -292,9 +443,9 @@ func (s *LoginSuite) TestGoogleLogin_Success(c *check.C) { c.Check(err, check.ErrorMatches, `.*401 Unauthorized: Not logged in.*`) } -func (s *LoginSuite) TestGoogleLogin_RealName(c *check.C) { - s.authEmail = "joe.smith@primary.example.com" - s.fakePeopleAPIResponse = map[string]interface{}{ +func (s *OIDCLoginSuite) TestGoogleLogin_RealName(c *check.C) { + s.fakeProvider.AuthEmail = "joe.smith@primary.example.com" + s.fakeProvider.PeopleAPIResponse = map[string]interface{}{ "names": []map[string]interface{}{ { "metadata": map[string]interface{}{"primary": false}, @@ -310,7 +461,7 @@ func (s *LoginSuite) TestGoogleLogin_RealName(c *check.C) { } state := s.startLogin(c) s.localdb.Login(context.Background(), arvados.LoginOptions{ - Code: s.validCode, + Code: s.fakeProvider.ValidCode, State: state, }) @@ -319,12 +470,12 @@ func (s *LoginSuite) TestGoogleLogin_RealName(c *check.C) { c.Check(authinfo.LastName, check.Equals, "Psmith") } -func (s *LoginSuite) TestGoogleLogin_OIDCRealName(c *check.C) { - s.authName = "Joe P. Smith" - s.authEmail = "joe.smith@primary.example.com" +func (s *OIDCLoginSuite) TestGoogleLogin_OIDCRealName(c *check.C) { + s.fakeProvider.AuthName = "Joe P. Smith" + s.fakeProvider.AuthEmail = "joe.smith@primary.example.com" state := s.startLogin(c) s.localdb.Login(context.Background(), arvados.LoginOptions{ - Code: s.validCode, + Code: s.fakeProvider.ValidCode, State: state, }) @@ -334,9 +485,9 @@ func (s *LoginSuite) TestGoogleLogin_OIDCRealName(c *check.C) { } // People API returns some additional email addresses. -func (s *LoginSuite) TestGoogleLogin_AlternateEmailAddresses(c *check.C) { - s.authEmail = "joe.smith@primary.example.com" - s.fakePeopleAPIResponse = map[string]interface{}{ +func (s *OIDCLoginSuite) TestGoogleLogin_AlternateEmailAddresses(c *check.C) { + s.fakeProvider.AuthEmail = "joe.smith@primary.example.com" + s.fakeProvider.PeopleAPIResponse = map[string]interface{}{ "emailAddresses": []map[string]interface{}{ { "metadata": map[string]interface{}{"verified": true}, @@ -353,7 +504,7 @@ func (s *LoginSuite) TestGoogleLogin_AlternateEmailAddresses(c *check.C) { } state := s.startLogin(c) s.localdb.Login(context.Background(), arvados.LoginOptions{ - Code: s.validCode, + Code: s.fakeProvider.ValidCode, State: state, }) @@ -363,9 +514,9 @@ func (s *LoginSuite) TestGoogleLogin_AlternateEmailAddresses(c *check.C) { } // Primary address is not the one initially returned by oidc. -func (s *LoginSuite) TestGoogleLogin_AlternateEmailAddresses_Primary(c *check.C) { - s.authEmail = "joe.smith@alternate.example.com" - s.fakePeopleAPIResponse = map[string]interface{}{ +func (s *OIDCLoginSuite) TestGoogleLogin_AlternateEmailAddresses_Primary(c *check.C) { + s.fakeProvider.AuthEmail = "joe.smith@alternate.example.com" + s.fakeProvider.PeopleAPIResponse = map[string]interface{}{ "emailAddresses": []map[string]interface{}{ { "metadata": map[string]interface{}{"verified": true, "primary": true}, @@ -383,7 +534,7 @@ func (s *LoginSuite) TestGoogleLogin_AlternateEmailAddresses_Primary(c *check.C) } state := s.startLogin(c) s.localdb.Login(context.Background(), arvados.LoginOptions{ - Code: s.validCode, + Code: s.fakeProvider.ValidCode, State: state, }) authinfo := getCallbackAuthInfo(c, s.railsSpy) @@ -392,10 +543,10 @@ func (s *LoginSuite) TestGoogleLogin_AlternateEmailAddresses_Primary(c *check.C) c.Check(authinfo.Username, check.Equals, "jsmith") } -func (s *LoginSuite) TestGoogleLogin_NoPrimaryEmailAddress(c *check.C) { - s.authEmail = "joe.smith@unverified.example.com" - s.authEmailVerified = false - s.fakePeopleAPIResponse = map[string]interface{}{ +func (s *OIDCLoginSuite) TestGoogleLogin_NoPrimaryEmailAddress(c *check.C) { + s.fakeProvider.AuthEmail = "joe.smith@unverified.example.com" + s.fakeProvider.AuthEmailVerified = false + s.fakeProvider.PeopleAPIResponse = map[string]interface{}{ "emailAddresses": []map[string]interface{}{ { "metadata": map[string]interface{}{"verified": true}, @@ -409,7 +560,7 @@ func (s *LoginSuite) TestGoogleLogin_NoPrimaryEmailAddress(c *check.C) { } state := s.startLogin(c) s.localdb.Login(context.Background(), arvados.LoginOptions{ - Code: s.validCode, + Code: s.fakeProvider.ValidCode, State: state, }) @@ -419,7 +570,7 @@ func (s *LoginSuite) TestGoogleLogin_NoPrimaryEmailAddress(c *check.C) { c.Check(authinfo.Username, check.Equals, "") } -func (s *LoginSuite) startLogin(c *check.C) (state string) { +func (s *OIDCLoginSuite) startLogin(c *check.C, checks ...func(url.Values)) (state string) { // Initiate login, but instead of following the redirect to // the provider, just grab state from the redirect URL. resp, err := s.localdb.Login(context.Background(), arvados.LoginOptions{ReturnTo: "https://app.example.com/foo?bar"}) @@ -428,24 +579,11 @@ func (s *LoginSuite) startLogin(c *check.C) (state string) { c.Check(err, check.IsNil) state = target.Query().Get("state") c.Check(state, check.Not(check.Equals), "") - return -} - -func (s *LoginSuite) fakeToken(c *check.C, payload []byte) string { - signer, err := jose.NewSigner(jose.SigningKey{Algorithm: jose.RS256, Key: s.issuerKey}, nil) - if err != nil { - c.Error(err) + for _, fn := range checks { + fn(target.Query()) } - object, err := signer.Sign(payload) - if err != nil { - c.Error(err) - } - t, err := object.CompactSerialize() - if err != nil { - c.Error(err) - } - c.Logf("fakeToken(%q) == %q", payload, t) - return t + s.cluster.Login.OpenIDConnect.AuthenticationRequestParameters = map[string]string{"testkey": "testvalue"} + return } func getCallbackAuthInfo(c *check.C, railsSpy *arvadostest.Proxy) (authinfo rpc.UserSessionAuthInfo) {