Skip to content

auth: Remove the OIDC connector login logic #18999

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
camscale merged 3 commits into from
Dec 6, 2022
Merged

auth: Remove the OIDC connector login logic #18999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
20da2c7
auth: Remove OIDC connector
camscale Nov 22, 2022
ca18e13
auth: remove OIDC connector web API handler
camscale Nov 29, 2022
78ee4b6
Update e submodule
camscale Nov 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion e
Open in desktop
Submodule e updated from f0862d to 4eeb1c
35 changes: 0 additions & 35 deletions lib/auth/apiserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,6 @@ func NewAPIServer(config *APIConfig) (http.Handler, error) {
srv.POST("/:version/configuration/static_tokens", srv.WithAuth(srv.setStaticTokens))

// SSO validation handlers
srv.POST("/:version/oidc/requests/validate", srv.WithAuth(srv.validateOIDCAuthCallback))
srv.POST("/:version/github/requests/validate", srv.WithAuth(srv.validateGithubAuthCallback))

// Audit logs AKA events
Expand Down Expand Up @@ -719,40 +718,6 @@ func (s *APIServer) deleteCertAuthority(auth ClientI, w http.ResponseWriter, r *
return message(fmt.Sprintf("cert '%v' deleted", id)), nil
}

func (s *APIServer) validateOIDCAuthCallback(auth ClientI, w http.ResponseWriter, r *http.Request, p httprouter.Params, version string) (interface{}, error) {
var req *ValidateOIDCAuthCallbackReq
if err := httplib.ReadJSON(r, &req); err != nil {
return nil, trace.Wrap(err)
}
response, err := auth.ValidateOIDCAuthCallback(r.Context(), req.Query)
if err != nil {
return nil, trace.Wrap(err)
}
raw := OIDCAuthRawResponse{
Username: response.Username,
Identity: response.Identity,
Cert: response.Cert,
TLSCert: response.TLSCert,
Req: response.Req,
}
if response.Session != nil {
rawSession, err := services.MarshalWebSession(response.Session, services.WithVersion(version))
if err != nil {
return nil, trace.Wrap(err)
}
raw.Session = rawSession
}
raw.HostSigners = make([]json.RawMessage, len(response.HostSigners))
for i, ca := range response.HostSigners {
data, err := services.MarshalCertAuthority(ca, services.WithVersion(version))
if err != nil {
return nil, trace.Wrap(err)
}
raw.HostSigners[i] = data
}
return &raw, nil
}

// validateGithubAuthCallbackReq is a request to validate Github OAuth2 callback
type validateGithubAuthCallbackReq struct {
// Query is the callback query string
Expand Down
9 changes: 0 additions & 9 deletions lib/auth/auth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,15 +294,6 @@ func NewServer(cfg *InitConfig, opts ...ServerOption) (*Server, error) {
as.kubernetesTokenValidator = &kubernetestoken.Validator{}
}

oas, err := NewOIDCAuthService(&OIDCAuthServiceConfig{
Auth: &as,
Emitter: as.emitter,
})
if err != nil {
return nil, trace.Wrap(err)
}
as.SetOIDCService(oas)

return &as, nil
}

Expand Down
183 changes: 0 additions & 183 deletions lib/auth/auth_with_roles_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,189 +247,6 @@ func TestInstaller(t *testing.T) {
}
}

func TestOIDCAuthRequest(t *testing.T) {
ctx := context.Background()
srv := newTestTLSServer(t)

emptyRole, err := CreateRole(ctx, srv.Auth(), "test-empty", types.RoleSpecV5{})
require.NoError(t, err)

access1Role, err := CreateRole(ctx, srv.Auth(), "test-access-1", types.RoleSpecV5{
Allow: types.RoleConditions{
Rules: []types.Rule{
{
Resources: []string{types.KindOIDCRequest},
Verbs: []string{types.VerbCreate},
},
},
},
})
require.NoError(t, err)

access2Role, err := CreateRole(ctx, srv.Auth(), "test-access-2", types.RoleSpecV5{
Allow: types.RoleConditions{
Rules: []types.Rule{
{
Resources: []string{types.KindOIDC},
Verbs: []string{types.VerbCreate},
},
},
},
})
require.NoError(t, err)

access3Role, err := CreateRole(ctx, srv.Auth(), "test-access-3", types.RoleSpecV5{
Allow: types.RoleConditions{
Rules: []types.Rule{
{
Resources: []string{types.KindOIDC, types.KindOIDCRequest},
Verbs: []string{types.VerbCreate},
},
},
},
})
require.NoError(t, err)

readerRole, err := CreateRole(ctx, srv.Auth(), "test-access-4", types.RoleSpecV5{
Allow: types.RoleConditions{
Rules: []types.Rule{
{
Resources: []string{types.KindOIDCRequest},
Verbs: []string{types.VerbRead},
},
},
},
})
require.NoError(t, err)

conn, err := types.NewOIDCConnector("example", types.OIDCConnectorSpecV3{
IssuerURL: "https://gitlab.com",
ClientID: "example-client-id",
ClientSecret: "example-client-secret",
RedirectURLs: []string{"https://localhost:3080/v1/webapi/oidc/callback"},
Display: "sign in with example.com",
Scope: []string{"foo", "bar"},
ClaimsToRoles: []types.ClaimMapping{
{
Claim: "groups",
Value: "idp-admin",
Roles: []string{"access"},
},
},
})
require.NoError(t, err)

err = srv.Auth().UpsertOIDCConnector(context.Background(), conn)
require.NoError(t, err)

reqNormal := types.OIDCAuthRequest{ConnectorID: conn.GetName(), Type: constants.OIDC}
reqTest := types.OIDCAuthRequest{
ConnectorID: conn.GetName(),
Type: constants.OIDC,
SSOTestFlow: true,
ConnectorSpec: &types.OIDCConnectorSpecV3{
IssuerURL: "https://gitlab.com",
ClientID: "example-client-id",
ClientSecret: "example-client-secret",
RedirectURLs: []string{"https://localhost:3080/v1/webapi/oidc/callback"},
Display: "sign in with example.com",
Scope: []string{"foo", "bar"},
ClaimsToRoles: []types.ClaimMapping{
{
Claim: "groups",
Value: "idp-admin",
Roles: []string{"access"},
},
},
},
}

tests := []struct {
desc string
roles []string
request types.OIDCAuthRequest
expectAccessDenied bool
}{
{
desc: "empty role - no access",
roles: []string{emptyRole.GetName()},
request: reqNormal,
expectAccessDenied: true,
},
{
desc: "can create regular request with normal access",
roles: []string{access1Role.GetName()},
request: reqNormal,
expectAccessDenied: false,
},
{
desc: "cannot create sso test request with normal access",
roles: []string{access1Role.GetName()},
request: reqTest,
expectAccessDenied: true,
},
{
desc: "cannot create normal request with connector access",
roles: []string{access2Role.GetName()},
request: reqNormal,
expectAccessDenied: true,
},
{
desc: "cannot create sso test request with connector access",
roles: []string{access2Role.GetName()},
request: reqTest,
expectAccessDenied: true,
},
{
desc: "can create regular request with combined access",
roles: []string{access3Role.GetName()},
request: reqNormal,
expectAccessDenied: false,
},
{
desc: "can create sso test request with combined access",
roles: []string{access3Role.GetName()},
request: reqTest,
expectAccessDenied: false,
},
}

user, err := CreateUser(srv.Auth(), "dummy")
require.NoError(t, err)

userReader, err := CreateUser(srv.Auth(), "dummy-reader", readerRole)
require.NoError(t, err)

clientReader, err := srv.NewClient(TestUser(userReader.GetName()))
require.NoError(t, err)

for _, tt := range tests {
t.Run(tt.desc, func(t *testing.T) {
user.SetRoles(tt.roles)
err = srv.Auth().UpsertUser(user)
require.NoError(t, err)

client, err := srv.NewClient(TestUser(user.GetName()))
require.NoError(t, err)

request, err := client.CreateOIDCAuthRequest(ctx, tt.request)
if tt.expectAccessDenied {
require.Error(t, err)
require.True(t, trace.IsAccessDenied(err), "expected access denied, got: %v", err)
return
}

require.NoError(t, err)
require.NotEmpty(t, request.StateToken)
require.Equal(t, tt.request.ConnectorID, request.ConnectorID)

requestCopy, err := clientReader.GetOIDCAuthRequest(ctx, request.StateToken)
require.NoError(t, err)
require.Equal(t, request, requestCopy)
})
}
}

func TestGithubAuthRequest(t *testing.T) {
ctx := context.Background()
srv := newTestTLSServer(t)
Expand Down
Loading