ClusterCockpit/cc-backend
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-backend synced 2026-04-01 21:47:31 +02:00
Code Issues Packages Releases Activity

feat: Also submit projects array via oidc token

Browse Source 
Entire-Checkpoint: 2064482d97e1
This commit is contained in:
Jan Eitzinger
2026-04-01 13:46:21 +02:00
parent 31a8a11f1b
commit 43807ae12a
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
internal/auth/oidc.go
View File

@@ -162,7 +162,8 @@ func (oa *OIDC) OAuth2Callback(rw http.ResponseWriter, r *http.Request) {
return return
} }
projects := make([]string, 0) // projects is populated below from ID token claims
var projects []string
// Extract profile claims from userinfo (username, name) // Extract profile claims from userinfo (username, name)
var userInfoClaims struct { var userInfoClaims struct {
@@ -189,6 +190,8 @@ func (oa *OIDC) OAuth2Callback(rw http.ResponseWriter, r *http.Request) {
ResourceAccess map[string]struct { ResourceAccess map[string]struct {
Roles []string `json:"roles"` Roles []string `json:"roles"`
} `json:"resource_access"` } `json:"resource_access"`
// Custom multi-valued user attribute mapped via a Keycloak User Attribute mapper
Projects []string `json:"projects"`
} }
if err := idToken.Claims(&idTokenClaims); err != nil { if err := idToken.Claims(&idTokenClaims); err != nil {
cclog.Errorf("failed to extract ID token claims: %s", err.Error()) cclog.Errorf("failed to extract ID token claims: %s", err.Error())
@@ -199,6 +202,12 @@ func (oa *OIDC) OAuth2Callback(rw http.ResponseWriter, r *http.Request) {
cclog.Debugf("OIDC userinfo claims: username=%q name=%q", userInfoClaims.Username, userInfoClaims.Name) cclog.Debugf("OIDC userinfo claims: username=%q name=%q", userInfoClaims.Username, userInfoClaims.Name)
cclog.Debugf("OIDC ID token realm_access roles: %v", idTokenClaims.RealmAccess.Roles) cclog.Debugf("OIDC ID token realm_access roles: %v", idTokenClaims.RealmAccess.Roles)
cclog.Debugf("OIDC ID token resource_access: %v", idTokenClaims.ResourceAccess) cclog.Debugf("OIDC ID token resource_access: %v", idTokenClaims.ResourceAccess)
cclog.Debugf("OIDC ID token projects: %v", idTokenClaims.Projects)
projects = idTokenClaims.Projects
if projects == nil {
projects = []string{}
}
// Prefer username from userInfo; fall back to ID token claim // Prefer username from userInfo; fall back to ID token claim
username := userInfoClaims.Username username := userInfoClaims.Username