From f9d850d18c27208dc1190abf79ea9b05c87542d6 Mon Sep 17 00:00:00 2001 From: Gianmaria Del Monte Date: Thu, 6 Oct 2022 11:59:56 +0200 Subject: [PATCH 1/2] fix oidc driver --- pkg/auth/manager/oidc/oidc.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkg/auth/manager/oidc/oidc.go b/pkg/auth/manager/oidc/oidc.go index 2b36d633d1..d43e0fdfdc 100644 --- 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" From d5fa59554e40615df172c810bc2843e8a925541d Mon Sep 17 00:00:00 2001 From: Gianmaria Del Monte Date: Thu, 6 Oct 2022 14:37:31 +0200 Subject: [PATCH 2/2] add changelog --- changelog/unreleased/oidc-fix.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 changelog/unreleased/oidc-fix.md diff --git a/changelog/unreleased/oidc-fix.md b/changelog/unreleased/oidc-fix.md new file mode 100644 index 0000000000..9cb8c8b937 --- /dev/null +++ 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 +