From f2e44c635368077e852857fbdc62d565df5a4268 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Mon, 9 May 2022 12:01:46 +0200 Subject: [PATCH] expose IDP secret configuration via environment variables --- changelog/unreleased/fix-configure-idp-secrets-env.md | 6 ++++++ extensions/idp/pkg/config/config.go | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 changelog/unreleased/fix-configure-idp-secrets-env.md diff --git a/changelog/unreleased/fix-configure-idp-secrets-env.md b/changelog/unreleased/fix-configure-idp-secrets-env.md new file mode 100644 index 00000000000..4a342db94b2 --- /dev/null +++ b/changelog/unreleased/fix-configure-idp-secrets-env.md @@ -0,0 +1,6 @@ +Bugfix: Make IDP secrets configurable via environment variables + +We've fixed the configuration options of the IDP to make the IDP secrets again +configurable via environment variables. + +https://github.com/owncloud/ocis/pull/3744 diff --git a/extensions/idp/pkg/config/config.go b/extensions/idp/pkg/config/config.go index ef60c689890..7ae60b295c1 100644 --- a/extensions/idp/pkg/config/config.go +++ b/extensions/idp/pkg/config/config.go @@ -86,7 +86,7 @@ type Settings struct { AllowClientGuests bool `yaml:"allow_client_guests" env:"IDP_ALLOW_CLIENT_GUESTS"` AllowDynamicClientRegistration bool `yaml:"allow_dynamic_client_registration" env:"IDP_ALLOW_DYNAMIC_CLIENT_REGISTRATION"` - EncryptionSecretFile string `yaml:"encrypt_secret_file" env:"IDP_ENCRYPTION_SECRET"` + EncryptionSecretFile string `yaml:"encrypt_secret_file" env:"IDP_ENCRYPTION_SECRET_FILE"` Listen string @@ -101,7 +101,7 @@ type Settings struct { SigningKid string `yaml:"signing_kid" env:"IDP_SIGNING_KID"` SigningMethod string `yaml:"signing_method" env:"IDP_SIGNING_METHOD"` - SigningPrivateKeyFiles []string `yaml:"signing_private_key_files"` // TODO: is this even needed? + SigningPrivateKeyFiles []string `yaml:"signing_private_key_files" env:"IDP_SIGNING_PRIVATE_KEY_FILES"` ValidationKeysPath string `yaml:"validation_keys_path" env:"IDP_VALIDATION_KEYS_PATH"` CookieBackendURI string