Skip to content
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

[v8] Restrict Google JSON credentials to the service_account type. #16040

Merged
merged 2 commits into from
Sep 5, 2022
Merged

[v8] Restrict Google JSON credentials to the service_account type. #16040

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f0b911
Restrict Google JSON creds to service_account
espadolini Aug 31, 2022
4383363
Merge branch 'branch/v8' into bot/backport-16003-branch/v8
espadolini Sep 5, 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
30 changes: 15 additions & 15 deletions lib/auth/oidc_google.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (

"github.com/coreos/go-oidc/jose"
"github.com/gravitational/trace"
"golang.org/x/oauth2"
"golang.org/x/oauth2/google"
directory "google.golang.org/api/admin/directory/v1"
"google.golang.org/api/cloudidentity/v1"
Expand Down Expand Up @@ -75,7 +76,7 @@ func addGoogleWorkspaceClaims(ctx context.Context, connector types.OIDCConnector

if credentials != nil {
log.Debugf("fetching transitive Google groups for %v", email)
googleGroups, err = groupsFromGoogleCloudIdentity(ctx, email, option.WithCredentials(credentials))
googleGroups, err = groupsFromGoogleCloudIdentity(ctx, email, option.WithTokenSource(credentials))
if err != nil {
return nil, trace.Wrap(err)
}
Expand All @@ -91,7 +92,7 @@ func addGoogleWorkspaceClaims(ctx context.Context, connector types.OIDCConnector
}

log.Debugf("fetching direct Google groups with no domain filtering for %v", email)
googleGroups, err = groupsFromGoogleDirectory(ctx, email, "", option.WithCredentials(credentials))
googleGroups, err = groupsFromGoogleDirectory(ctx, email, "", option.WithTokenSource(credentials))
if err != nil {
return nil, trace.Wrap(err)
}
Expand All @@ -115,7 +116,7 @@ func addGoogleWorkspaceClaims(ctx context.Context, connector types.OIDCConnector
}

log.Debugf("fetching direct Google groups for %v, filtering by domain %v", email, hostedDomain)
googleGroups, err = groupsFromGoogleDirectory(ctx, email, hostedDomain, option.WithCredentials(credentials))
googleGroups, err = groupsFromGoogleDirectory(ctx, email, hostedDomain, option.WithTokenSource(credentials))
if err != nil {
return nil, trace.Wrap(err)
}
Expand All @@ -137,7 +138,7 @@ func addGoogleWorkspaceClaims(ctx context.Context, connector types.OIDCConnector
return claims, nil
}

func getGoogleWorkspaceCredentials(ctx context.Context, connector types.OIDCConnector, scopes ...string) (*google.Credentials, error) {
func getGoogleWorkspaceCredentials(ctx context.Context, connector types.OIDCConnector, scopes ...string) (oauth2.TokenSource, error) {
var jsonCredentials []byte
var credentialLoadingMethod string
if connector.GetGoogleServiceAccountURI() != "" {
Expand All @@ -158,29 +159,28 @@ func getGoogleWorkspaceCredentials(ctx context.Context, connector types.OIDCConn
jsonCredentials = []byte(connector.GetGoogleServiceAccount())
}

// we only support service_account credentials (the only ones that allow
// specifying an arbitrary Subject)
jwtConfig, err := google.JWTConfigFromJSON(jsonCredentials, scopes...)
if err != nil {
return nil, trace.BadParameter("unable to parse google service account from %v: %v", credentialLoadingMethod, err)
}
// The "Admin SDK Directory API" needs admin delegation (see
// https://developers.google.com/admin-sdk/directory/v1/guides/delegation
// and
// https://developers.google.com/identity/protocols/oauth2/service-account#delegatingauthority )
// and the "Cloud Identity API" needs an account with View permission on
// all groups to work reliably.
credentialsParams := google.CredentialsParams{
Subject: connector.GetGoogleAdminEmail(),
Scopes: scopes,
}

credentials, err := google.CredentialsFromJSONWithParams(ctx, jsonCredentials, credentialsParams)
if err != nil {
return nil, trace.BadParameter("unable to parse google service account from %v: %v", credentialLoadingMethod, err)
}
jwtConfig.Subject = connector.GetGoogleAdminEmail()

token, err := credentials.TokenSource.Token()
tokenSource := jwtConfig.TokenSource(ctx)
token, err := tokenSource.Token()
if err != nil || !token.Valid() {
log.Debugf("failed to obtain valid Google Workspace credentials for scopes %v", scopes)
return nil, nil
}

return credentials, nil
return tokenSource, nil
}

func groupsFromGoogleDirectory(ctx context.Context, email, filterDomain string, clientOptions ...option.ClientOption) ([]string, error) {
Expand Down