diff --git a/.env.example b/.env.example index 4171f4c..e74d662 100644 --- a/.env.example +++ b/.env.example @@ -9,6 +9,9 @@ OIDC_ISSUER= OIDC_CLIENT_ID= OIDC_CLIENT_SECRET= OIDC_REDIRECT_URL= +OIDC_SCOPES=openid profile email groups +OIDC_GROUPS_CLAIM=groups +OIDC_LOGOUT=true OIDC_NAME=SSO OIDC_ALLOWED_GROUPS= OIDC_ADMIN_GROUPS= diff --git a/cmd/server/main.go b/cmd/server/main.go index fea584d..3292129 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -275,7 +275,7 @@ func oidcConfig(secret []byte, ttl time.Duration) (auth.Config, error) { ClientID: os.Getenv("OIDC_CLIENT_ID"), ClientSecret: secretEnv("OIDC_CLIENT_SECRET"), RedirectURL: os.Getenv("OIDC_REDIRECT_URL"), - Scopes: fields(env("OIDC_SCOPES", "openid profile email")), + Scopes: fields(env("OIDC_SCOPES", "openid profile email groups")), GroupsClaim: env("OIDC_GROUPS_CLAIM", "groups"), SessionTTL: ttl, Secret: secret, diff --git a/docker-compose.yml b/docker-compose.yml index e2485e5..72413d8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,7 +20,8 @@ services: OIDC_CLIENT_ID: ${OIDC_CLIENT_ID:-} OIDC_CLIENT_SECRET: ${OIDC_CLIENT_SECRET:-} OIDC_REDIRECT_URL: ${OIDC_REDIRECT_URL:-} - OIDC_SCOPES: ${OIDC_SCOPES:-openid profile email} + # Ajouter « groups » pour OIDC_ALLOWED_GROUPS / OIDC_ADMIN_GROUPS. + OIDC_SCOPES: ${OIDC_SCOPES:-openid profile email groups} OIDC_NAME: ${OIDC_NAME:-SSO} OIDC_ALLOWED_GROUPS: ${OIDC_ALLOWED_GROUPS:-} OIDC_GROUPS_CLAIM: ${OIDC_GROUPS_CLAIM:-groups} diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index dd64245..21352c7 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -186,6 +186,9 @@ function Shell({ me, reloadMe }: { me: Me; reloadMe: () => Promise }) { {title} + diff --git a/internal/auth/oidc.go b/internal/auth/oidc.go index 50cc6e2..bc08568 100644 --- a/internal/auth/oidc.go +++ b/internal/auth/oidc.go @@ -347,7 +347,7 @@ func (a *OIDC) callback(w http.ResponseWriter, r *http.Request) { } user, err := a.exchange(r, q.Get("code"), st) if errors.Is(err, errForbidden) { - slog.Warn("OIDC : accès refusé", "sub", user.Sub, "name", user.Name) + slog.Warn("OIDC : accès refusé (groupes du jeton, à comparer à OIDC_ALLOWED_GROUPS)", "sub", user.Sub, "name", user.Name, "groups", user.Groups, "claim", a.cfg.GroupsClaim, "allowed", a.cfg.AllowedGroups) page(w, http.StatusForbidden, "Accès refusé", "Votre compte ("+user.Name+") n'appartient à aucun groupe autorisé.", "/auth/logout", "Changer de compte") return