Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: allow litteral quotes in oidc env values (#1272)
Kyle Mendell40fe94f0d6bb
diff --git a/backend/internal/config/config.go b/backend/internal/config/config.goindex 19086a30f..7f68128a8 100644--- a/backend/internal/config/config.go+++ b/backend/internal/config/config.go@@ -54,9 +54,9 @@ func Load() *Config {EncryptionKey: getEnvOrDefault("ENCRYPTION_KEY", "arcane-dev-key-32-characters!!!"),OidcEnabled: getBoolEnvOrDefault("OIDC_ENABLED", false),- OidcClientID: os.Getenv("OIDC_CLIENT_ID"),- OidcClientSecret: os.Getenv("OIDC_CLIENT_SECRET"),- OidcIssuerURL: os.Getenv("OIDC_ISSUER_URL"),+ OidcClientID: getEnvOrDefault("OIDC_CLIENT_ID", ""),+ OidcClientSecret: getEnvOrDefault("OIDC_CLIENT_SECRET", ""),+ OidcIssuerURL: getEnvOrDefault("OIDC_ISSUER_URL", ""),OidcScopes: getEnvOrDefault("OIDC_SCOPES", "openid email profile"),OidcAdminClaim: getEnvOrDefault("OIDC_ADMIN_CLAIM", ""),OidcAdminValue: getEnvOrDefault("OIDC_ADMIN_VALUE", ""),@@ -77,11 +77,20 @@ func Load() *Config {func getEnvOrDefault[T interface{ ~string }](key string, defaultValue T) T {if value := os.Getenv(key); value != "" {- return T(value)+ return T(trimQuotes(value))}return defaultValue}+func trimQuotes(s string) string {+ if len(s) >= 2 {+ if (s[0] == '"' && s[len(s)-1] == '"') || (s[0] == '\'' && s[len(s)-1] == '\'') {+ return s[1 : len(s)-1]+ }+ }+ return s+}+func (a AppEnvironment) IsProdEnvironment() bool {return a == AppEnvironmentProduction}@@ -92,6 +101,7 @@ func (a AppEnvironment) IsTestEnvironment() bool {func getBoolEnvOrDefault(key string, defaultValue bool) bool {if v, ok := os.LookupEnv(key); ok && v != "" {+ v = trimQuotes(v)if b, err := strconv.ParseBool(v); err == nil {return b}diff --git a/backend/internal/services/settings_service.go b/backend/internal/services/settings_service.goindex 61cd52397..fe9d3078d 100644--- a/backend/internal/services/settings_service.go+++ b/backend/internal/services/settings_service.go@@ -190,7 +190,7 @@ func (s *SettingsService) loadDatabaseConfigFromEnv(ctx context.Context, db *datmask = fmt.Sprintf("%d chars", len(val))}slog.DebugContext(ctx, "loadDatabaseConfigFromEnv: env override found", "key", key, "env", envVarName, "valueMasked", mask)- rv.Field(i).FieldByName("Value").SetString(val)+ rv.Field(i).FieldByName("Value").SetString(utils.TrimQuotes(val))continue} else if val, ok := settingsMap[key]; ok {// Fallback to database if environment variable is not set@@ -245,7 +245,7 @@ func (s *SettingsService) applyEnvOverrides(ctx context.Context, dest *models.SeenvVarName := utils.CamelCaseToScreamingSnakeCase(key)if val, ok := os.LookupEnv(envVarName); ok && val != "" {slog.DebugContext(ctx, "applyEnvOverrides: applying env override", "key", key, "env", envVarName)- rv.Field(i).FieldByName("Value").SetString(val)+ rv.Field(i).FieldByName("Value").SetString(utils.TrimQuotes(val))}}}@@ -598,6 +598,7 @@ func (s *SettingsService) PersistEnvSettingsIfMissing(ctx context.Context) errorif !ok {continue}+ envVal = utils.TrimQuotes(envVal)var existing models.SettingVariableerr := tx.Where("key = ?", key).First(&existing).Errordiff --git a/backend/internal/utils/string_util.go b/backend/internal/utils/string_util.goindex 4d148fa7c..937a57cc5 100644--- a/backend/internal/utils/string_util.go+++ b/backend/internal/utils/string_util.go@@ -42,3 +42,12 @@ func GenerateRandomString(length int) string {}return base64.URLEncoding.EncodeToString(bytes)[:length]}++func TrimQuotes(s string) string {+ if len(s) >= 2 {+ if (s[0] == '"' && s[len(s)-1] == '"') || (s[0] == '\'' && s[len(s)-1] == '\'') {+ return s[1 : len(s)-1]+ }+ }+ return s+}