Skip to content

fix(auth): restrict Keep service account to Keep API calls only #414

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

Open
jgwesterlund wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(auth): restrict Keep service account to Keep API calls only #414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 internal/googleapi/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ func optionsForAccountScopes(ctx context.Context, serviceLabel string, email str

var ts oauth2.TokenSource

if serviceAccountTS, saPath, ok, err := tokenSourceForServiceAccountScopes(ctx, email, scopes); err != nil {
if serviceAccountTS, saPath, ok, err := tokenSourceForServiceAccountScopes(ctx, serviceLabel, email, scopes); err != nil {
return nil, fmt.Errorf("service account token source: %w", err)
} else if ok {
slog.Debug("using service account credentials", "email", email, "path", saPath)
Expand Down
7 changes: 6 additions & 1 deletion internal/googleapi/service_account.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ var newServiceAccountTokenSource = func(ctx context.Context, keyJSON []byte, sub
return cfg.TokenSource(ctx), nil
}

func tokenSourceForServiceAccountScopes(ctx context.Context, email string, scopes []string) (oauth2.TokenSource, string, bool, error) {
func tokenSourceForServiceAccountScopes(ctx context.Context, serviceLabel string, email string, scopes []string) (oauth2.TokenSource, string, bool, error) {
saPath, err := config.ServiceAccountPath(email)
if err != nil {
return nil, "", false, fmt.Errorf("service account path: %w", err)
Expand All @@ -45,6 +45,11 @@ func tokenSourceForServiceAccountScopes(ctx context.Context, email string, scope
return nil, "", false, fmt.Errorf("read service account key: %w", readErr)
}

// Keep-specific service account files should only be used for Keep.
if serviceLabel != "keep" {
return nil, "", false, nil
}

// Backwards compatibility: Keep used a dedicated stored service account file.
keepSAPath, keepErr := config.KeepServiceAccountPath(email)
if keepErr == nil {
Expand Down