OIDC: Support object-shaped and string group claims

The group claim was assumed to always be an array, which crashes with
providers like Zitadel that return an object with role names as keys
(e.g. { "admin": {...}, "user": {...} }). Normalize all common formats:
array, single string, and object (extract keys).

Fixes #4744
This commit is contained in:
Denis Arnst 2026-02-12 13:25:56 +01:00
parent 84b3d4d215
commit 67f8eb6815
No known key found for this signature in database
GPG key ID: D5866C58940197BF
2 changed files with 73 additions and 1 deletions

View file

@ -187,6 +187,63 @@ describe('OidcAuthStrategy', function () {
})
})
describe('single string claim', function () {
it('should handle a single string group value', async function () {
DatabaseStub.serverSettings.authOpenIDGroupClaim = 'groups'
global.ServerSettings.authOpenIDGroupMap = {}
const user = { type: 'guest', username: 'testuser', save: sinon.stub().resolves() }
await strategy.setUserGroup(user, { groups: 'admin' })
expect(user.type).to.equal('admin')
})
})
describe('object-shaped claims (e.g. Zitadel)', function () {
it('should extract group names from object keys with legacy match', async function () {
DatabaseStub.serverSettings.authOpenIDGroupClaim = 'urn:zitadel:iam:org:project:roles'
global.ServerSettings.authOpenIDGroupMap = {}
const user = { type: 'user', username: 'testuser', save: sinon.stub().resolves() }
await strategy.setUserGroup(user, {
'urn:zitadel:iam:org:project:roles': {
admin: { '359584706087354371': 'website.de' },
user: { '359584706087354371': 'website.de' }
}
})
expect(user.type).to.equal('admin')
})
it('should extract group names from object keys with explicit mapping', async function () {
DatabaseStub.serverSettings.authOpenIDGroupClaim = 'urn:zitadel:iam:org:project:roles'
global.ServerSettings.authOpenIDGroupMap = { 'zitadel-users': 'user', 'zitadel-admins': 'admin' }
const user = { type: 'guest', username: 'testuser', save: sinon.stub().resolves() }
await strategy.setUserGroup(user, {
'urn:zitadel:iam:org:project:roles': {
'zitadel-users': { '123': 'example.com' }
}
})
expect(user.type).to.equal('user')
})
it('should throw when no matching group in object keys', async function () {
DatabaseStub.serverSettings.authOpenIDGroupClaim = 'roles'
global.ServerSettings.authOpenIDGroupMap = {}
const user = { type: 'user', username: 'testuser', save: sinon.stub().resolves() }
try {
await strategy.setUserGroup(user, {
roles: { 'some-unknown-role': { '123': 'example.com' } }
})
expect.fail('Should have thrown')
} catch (error) {
expect(error).to.be.instanceOf(AuthError)
expect(error.statusCode).to.equal(401)
expect(error.message).to.include('No valid group found')
}
})
})
describe('missing group claim in userinfo', function () {
it('should throw when group claim is not in userinfo', async function () {
DatabaseStub.serverSettings.authOpenIDGroupClaim = 'groups'