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

Fix reading fallback values for providers, set environment variables #3429

Merged
merged 2 commits into from
May 27, 2024
Merged

Fix reading fallback values for providers, set environment variables #3429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d45e92
Fix reading fallback values for the GH providers
jhrozek May 27, 2024
3963ac4
Pass in github provider settings from env variables
JAORMX May 27, 2024
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
12 changes: 8 additions & 4 deletions deployment/helm/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,6 @@ spec:
- "--grpc-host=0.0.0.0"
- "--http-host=0.0.0.0"
- "--metric-host=0.0.0.0"
- "--github-client-id-file=/secrets/app/client_id"
- "--github-client-secret-file=/secrets/app/client_secret"
- "--github-app-client-id-file=/secrets/github-app/github_app_client_id"
- "--github-app-client-secret-file=/secrets/github-app/github_app_client_secret"
env:
- name: "MINDER_CRYPTO_KEYSTORE_LOCAL_KEY_DIR"
value: "/secrets/auth/"
Expand All @@ -78,6 +74,14 @@ spec:
value: "/secrets/identity/identity_client_secret"
- name: "MINDER_UNSTABLE_TRUSTY_ENDPOINT"
value: "{{ .Values.trusty.endpoint }}"
- name: "MINDER_GITHUB_CLIENT_ID_FILE"
value: "/secrets/app/client_id"
- name: "MINDER_GITHUB_CLIENT_SECRET_FILE"
value: "/secrets/app/client_secret"
- name: "MINDER_GITHUB_APP_CLIENT_ID_FILE"
value: "/secrets/github-app/github_app_client_id"
- name: "MINDER_GITHUB_APP_CLIENT_SECRET_FILE"
value: "/secrets/github-app/github_app_client_secret"
- name: "MINDER_PROVIDER_GITHUB_APP_PRIVATE_KEY"
value: "/secrets/github-app/github_app_private_key"
- name: "MINDER_PROVIDER_GITHUB_APP_WEBHOOK_SECRET_FILE"
Expand Down
30 changes: 14 additions & 16 deletions internal/auth/oauth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,36 +48,34 @@ func getOAuthClientConfig(c *server.ProviderConfig, provider string) (*server.OA
return nil, fmt.Errorf("invalid provider: %s", provider)
}

// first read the new provider-nested key. If it's missing, fallback to using the older
// top-level keys.
switch provider {
case Github:
if viper.IsSet(Github) {
oc, err = fallbackOAuthClientConfig("github")
} else if c != nil && c.GitHub != nil {
if c != nil && c.GitHub != nil {
oc = &c.GitHub.OAuthClientConfig
} else {
return nil, fmt.Errorf("missing GitHub OAuth client config")
}
fallbackOAuthClientConfigValues("github", oc)
case GitHubApp:
if viper.IsSet(GitHubApp) {
oc, err = fallbackOAuthClientConfig(GitHubApp)
} else if c != nil && c.GitHubApp != nil {
if c != nil && c.GitHubApp != nil {
oc = &c.GitHubApp.OAuthClientConfig
} else {
return nil, fmt.Errorf("missing GitHub App OAuth client config")
}
fallbackOAuthClientConfigValues("github-app", oc)
default:
err = fmt.Errorf("unknown provider: %s", provider)
}

return oc, err
}

func fallbackOAuthClientConfig(key string) (*server.OAuthClientConfig, error) {
var cfg server.OAuthClientConfig
if err := viper.UnmarshalKey(key, &cfg); err != nil {
return nil, err
}
return &cfg, nil
func fallbackOAuthClientConfigValues(provider string, cfg *server.OAuthClientConfig) {
// we read the values one-by-one instead of just getting the top-level key to allow
// for environment variables to be set per-variable
cfg.ClientID = viper.GetString(fmt.Sprintf("%s.client_id", provider))
cfg.ClientIDFile = viper.GetString(fmt.Sprintf("%s.client_id_file", provider))
cfg.ClientSecret = viper.GetString(fmt.Sprintf("%s.client_secret", provider))
cfg.ClientSecretFile = viper.GetString(fmt.Sprintf("%s.client_secret_file", provider))
cfg.RedirectURI = viper.GetString(fmt.Sprintf("%s.redirect_uri", provider))
}

// NewOAuthConfig creates a new OAuth2 config for the given provider
Expand Down