fix(oidc): make gitea + nextcloud OIDC login-source registration persist
The Keycloak OIDC postStart registration for gitea and nextcloud ran but never persisted, leaving `gitea admin auth list` empty and nextcloud's user_oidc with "No providers configured" despite the apps installing/ enabling and the client secret being present. Two distinct root causes, confirmed by running the registration manually against the live warm pods: - nextcloud: a QUOTING BUG, not a race. The OCC() wrapper runs `su -c "php occ $*"`, which word-split `--scope="openid email profile"` back into three tokens, so occ saw `email profile` as extra positional args -> "Too many arguments to user_oidc:provider" -> exit 1, swallowed by `|| echo failed`. Failed on EVERY boot. Fixed by running the provider call as ONE `su -c` with the scope single-quoted so www-data's shell keeps it a single argument; keep the OCC() wrapper only for single-token subcommands. - gitea: a first-boot RACE. The direct `admin auth add-oauth` persists once the app/network is warm (verified live), but fired too early at postStart and its failure was swallowed (`|| echo ... >&2`, exit 0). Hardening applied to both catalog sources (rendered into apps/wave-*): - wait (bounded ~90s) for the Keycloak discovery doc to return HTTP 200; - nextcloud also waits for `installed: true` AND `maintenance: false`; - register idempotently (create-or-update) then VERIFY the source/provider actually persisted, retrying the whole cycle (guards exit-0-but-nothing- stuck); - on give-up, log LOUDLY to stderr AND a marker file on the persistent volume (/data, /var/www/html) instead of swallowing — next failure is visible; - never crashloop: missing-secret guard retained, break-glass local admin stays usable. Co-Authored-By: Claude Opus 4.8 <[email protected]>
This commit is contained in:
1 parent
2919a1d72e
commit
d34c639269
4 files changed
+161
-41
No files matched your search
+55
-24
@@ -93,31 +93,62 @@ lifecycle:
|
||||
fi
|
||||
# --- Keycloak OIDC login source (idempotent add-or-update; R-IDP-02/06) ---
|
||||
# Registers the confidential `gitea` client as the OAuth2 login source "keycloak" against the
|
||||
# homelab realm's discovery doc. The `groups` claim maps the platform-admins group to Gitea
|
||||
# admin (--admin-group). Auto-discovery pulls auth/token/userinfo/jwks endpoints. Runs on every
|
||||
# start: updates the existing source if present, else creates it. Missing secret => skip (the
|
||||
# local break-glass admin above still works), so an unfilled secret never crashes the pod.
|
||||
if [ -n "${GITEA_OIDC_CLIENT_SECRET:-}" ]; then
|
||||
oidc_id=$(su-exec git gitea admin auth list 2>/dev/null | awk '$2=="keycloak"{print $1; exit}')
|
||||
if [ -n "$oidc_id" ]; then
|
||||
su-exec git gitea admin auth update-oauth --id "$oidc_id" \
|
||||
--name keycloak --provider openidConnect --key gitea \
|
||||
--secret "$GITEA_OIDC_CLIENT_SECRET" \
|
||||
--auto-discover-url https://keycloak.home.keithjackson.dev/realms/homelab/.well-known/openid-configuration \
|
||||
--scopes "openid email profile" --group-claim-name groups --admin-group platform-admins \
|
||||
&& echo "[gitea-oidc] updated login source 'keycloak' (id $oidc_id)" \
|
||||
|| echo "[gitea-oidc] update-oauth failed" >&2
|
||||
else
|
||||
su-exec git gitea admin auth add-oauth \
|
||||
--name keycloak --provider openidConnect --key gitea \
|
||||
--secret "$GITEA_OIDC_CLIENT_SECRET" \
|
||||
--auto-discover-url https://keycloak.home.keithjackson.dev/realms/homelab/.well-known/openid-configuration \
|
||||
--scopes "openid email profile" --group-claim-name groups --admin-group platform-admins \
|
||||
&& echo "[gitea-oidc] added login source 'keycloak'" \
|
||||
|| echo "[gitea-oidc] add-oauth failed" >&2
|
||||
fi
|
||||
else
|
||||
# homelab realm's discovery doc. The `groups` claim maps platform-admins -> Gitea admin
|
||||
# (--admin-group). Missing secret => skip (break-glass admin still works), so an unfilled
|
||||
# secret never crashes the pod.
|
||||
#
|
||||
# HARDENED (was a silent first-boot RACE): this step used to fire before the app/network was
|
||||
# ready and swallow its failure (|| echo ... >&2, exit 0), so SSO silently never registered.
|
||||
# Now it (1) waits — bounded, ~90s — for the Keycloak discovery doc to serve HTTP 200,
|
||||
# (2) registers (update-in-place if present, else create), (3) VERIFIES the source actually
|
||||
# persisted and retries the whole cycle, and (4) on give-up logs LOUDLY to stderr AND a marker
|
||||
# file on the persistent /data volume WITHOUT crashlooping the pod (break-glass admin stays
|
||||
# usable). The verify-then-retry loop is the real guarantee against "exit 0 but nothing stuck".
|
||||
GITEA_DISCOVERY_URL=https://keycloak.home.keithjackson.dev/realms/homelab/.well-known/openid-configuration
|
||||
gitea_oidc_fail() {
|
||||
echo "[gitea-oidc] FAILED to register 'keycloak' login source: $1" >&2
|
||||
{ echo "$(date -u +%Y-%m-%dT%H:%M:%SZ) [gitea-oidc] FAILED: $1"; } >> /data/gitea-oidc-bootstrap.log 2>/dev/null || true
|
||||
}
|
||||
if [ -z "${GITEA_OIDC_CLIENT_SECRET:-}" ]; then
|
||||
echo "[gitea-oidc] GITEA_OIDC_CLIENT_SECRET unset; skipping OIDC source (break-glass admin only)"
|
||||
else
|
||||
# (1) Wait up to ~90s for the Keycloak discovery doc to be reachable (HTTP 200).
|
||||
d=0; disc_ok=0
|
||||
while [ "$d" -lt 45 ]; do
|
||||
if [ "$(curl -sS -o /dev/null -w '%{http_code}' --max-time 5 "$GITEA_DISCOVERY_URL" 2>/dev/null)" = "200" ]; then
|
||||
disc_ok=1; break
|
||||
fi
|
||||
d=$((d + 1)); sleep 2
|
||||
done
|
||||
[ "$disc_ok" = 1 ] || gitea_oidc_fail "Keycloak discovery endpoint not reachable (HTTP 200) within timeout"
|
||||
# (2)+(3) Register (update-in-place or create) then VERIFY it persisted; retry the whole cycle.
|
||||
r=0; reg_ok=0
|
||||
while [ "$r" -lt 10 ]; do
|
||||
oidc_id=$(su-exec git gitea admin auth list 2>/dev/null | awk '$2=="keycloak"{print $1; exit}')
|
||||
if [ -n "$oidc_id" ]; then
|
||||
su-exec git gitea admin auth update-oauth --id "$oidc_id" \
|
||||
--name keycloak --provider openidConnect --key gitea \
|
||||
--secret "$GITEA_OIDC_CLIENT_SECRET" \
|
||||
--auto-discover-url "$GITEA_DISCOVERY_URL" \
|
||||
--scopes "openid email profile" --group-claim-name groups --admin-group platform-admins >/dev/null 2>&1 || true
|
||||
else
|
||||
su-exec git gitea admin auth add-oauth \
|
||||
--name keycloak --provider openidConnect --key gitea \
|
||||
--secret "$GITEA_OIDC_CLIENT_SECRET" \
|
||||
--auto-discover-url "$GITEA_DISCOVERY_URL" \
|
||||
--scopes "openid email profile" --group-claim-name groups --admin-group platform-admins >/dev/null 2>&1 || true
|
||||
fi
|
||||
# VERIFY: the "keycloak" source must actually be listed now (guards the exit-0-but-nothing-persisted race).
|
||||
if su-exec git gitea admin auth list 2>/dev/null | awk '$2=="keycloak"{f=1} END{exit !f}'; then
|
||||
reg_ok=1; break
|
||||
fi
|
||||
r=$((r + 1)); sleep 3
|
||||
done
|
||||
if [ "$reg_ok" = 1 ]; then
|
||||
echo "[gitea-oidc] login source 'keycloak' registered and verified"
|
||||
else
|
||||
gitea_oidc_fail "add/update-oauth ran but the 'keycloak' source did not persist after retries"
|
||||
fi
|
||||
fi
|
||||
exposure: public # edge-forwarded git host at gitea.home.keithjackson.dev (docs/09; R-DNS/R-NET)
|
||||
egress: internet # normal WAN egress (docs/03; R-NET-05)
|
||||
|
||||
Reference in new issue
Block a user