Merge pull request #3319 from gmgigi96/fix-oidc-custom-claims

Fix oidc provider crash when custom claims are provided
cs3org · Oct 6, 2022 · 6d7e9b0 · 6d7e9b0
2 parents c26f6a9 + d5fa595
commit 6d7e9b0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/changelog/unreleased/oidc-fix.md b/changelog/unreleased/oidc-fix.md
@@ -0,0 +1,4 @@
+Bugfix: Fix oidc provider crash when custom claims are provided
+
+https://github.com/cs3org/reva/pull/3319
+
diff --git a/pkg/auth/manager/oidc/oidc.go b/pkg/auth/manager/oidc/oidc.go
@@ -310,6 +310,10 @@ func (am *mgr) resolveUser(ctx context.Context, claims map[string]interface{}) e
 	)
 
 	uid, gid := am.getUserID(claims)
+	if uid != 0 && gid != 0 {
+		claims[am.c.UIDClaim] = uid
+		claims[am.c.GIDClaim] = gid
+	}
 
 	if len(am.oidcUsersMapping) > 0 {
 		claim = "username"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,4 @@
		Bugfix: Fix oidc provider crash when custom claims are provided

		https://github.com/cs3org/reva/pull/3319