From e150e9a4857b33a6502625d289d91af38a267a96 Mon Sep 17 00:00:00 2001 From: Shard Date: Thu, 30 Apr 2026 23:32:36 +0000 Subject: [PATCH] fix(admin-auth): use dedicated Keycloak secret key for sor-admin --- Server/src/SOR.Admin/Program.cs | 8 +++++++- Server/src/SOR.Admin/appsettings.json | 3 ++- deploy/k8s/deployment-admin.yaml | 7 ++++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Server/src/SOR.Admin/Program.cs b/Server/src/SOR.Admin/Program.cs index 17e845b..e780b6d 100644 --- a/Server/src/SOR.Admin/Program.cs +++ b/Server/src/SOR.Admin/Program.cs @@ -37,6 +37,12 @@ var keycloakAuthority = builder.Configuration["Keycloak:Authority"] var keycloakClientId = builder.Configuration["Keycloak:ClientId"] ?? throw new InvalidOperationException("Keycloak:ClientId is required. Set via Keycloak__ClientId env var."); +// Prefer an admin-specific secret key so SOR.Admin does not accidentally share +// a secret with other Keycloak clients (e.g. website). Fall back to the legacy +// Keycloak:ClientSecret key for backward compatibility. +var keycloakClientSecret = builder.Configuration["Keycloak:ClientSecret:Admin"] + ?? builder.Configuration["Keycloak:ClientSecret"]; + // ── Blazor Server ────────────────────────────────────────────────────────── builder.Services.AddRazorComponents() .AddInteractiveServerComponents(); @@ -71,7 +77,7 @@ builder.Services { options.Authority = keycloakAuthority; options.ClientId = keycloakClientId; - options.ClientSecret = builder.Configuration["Keycloak:ClientSecret"]; + options.ClientSecret = keycloakClientSecret; // If the public auth domain isn't reachable from inside the cluster (DNS/ // network policy), set Keycloak__MetadataAddress to the internal k8s service // URL, e.g. http://keycloak.keycloak.svc.cluster.local:8080/realms/aeternalis diff --git a/Server/src/SOR.Admin/appsettings.json b/Server/src/SOR.Admin/appsettings.json index 31e9a90..f39277d 100644 --- a/Server/src/SOR.Admin/appsettings.json +++ b/Server/src/SOR.Admin/appsettings.json @@ -28,7 +28,8 @@ "AllowedHosts": "*", // Keycloak OIDC — override in production via k8s secret env vars: - // Keycloak__Authority, Keycloak__ClientId, Keycloak__ClientSecret + // Keycloak__Authority, Keycloak__ClientId, Keycloak__ClientSecret__Admin + // Legacy fallback still supported: Keycloak__ClientSecret // A confidential client "sor-admin" must be created in the Keycloak realm with: // - Valid redirect URI: https:///signin-oidc // - Post-logout URI: https:///signout-callback-oidc diff --git a/deploy/k8s/deployment-admin.yaml b/deploy/k8s/deployment-admin.yaml index 11ea9c7..258e1e4 100644 --- a/deploy/k8s/deployment-admin.yaml +++ b/deploy/k8s/deployment-admin.yaml @@ -85,12 +85,13 @@ spec: name: sor-app-secrets key: Admin__Password - # Keycloak OIDC confidential client secret (required for code→token exchange). - - name: Keycloak__ClientSecret + # Keycloak OIDC secret for the sor-admin client (required for code→token exchange). + # Use a dedicated key to avoid accidental secret sharing with other clients. + - name: Keycloak__ClientSecret__Admin valueFrom: secretKeyRef: name: sor-app-secrets - key: Keycloak__ClientSecret + key: Keycloak__ClientSecret__Admin # ASP.NET Core Data Protection — persists Blazor auth cookies across restarts. # TODO: generate a strong random value and store in sor-app-secrets.