libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases Packages Activity Actions

NPE in User Session Note mapper on Token Exchange

Browse source 
Closes #24200

Signed-off-by: Douglas Palmer <dpalmer@redhat.com>
This commit is contained in:
Douglas Palmer 2023-11-22 11:51:17 -08:00 committed by Pedro Igor
parent a83b9d11fa
commit 7e78d29f8d
3 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
server-spi-private/src/main/java/org/keycloak/broker/provider/BrokeredIdentityContext.java
View file

@ -48,6 +48,7 @@ public class BrokeredIdentityContext {
private IdentityProviderModel idpConfig;
private IdentityProvider idp;
private Map<String, Object> contextData = new HashMap<>();
private Map<String, String> claims = new HashMap<>();
private AuthenticationSessionModel authenticationSession;
public BrokeredIdentityContext(String id) {
@ -161,6 +162,14 @@ public class BrokeredIdentityContext {
this.contextData = contextData;
}
public Map<String, String> getClaims() {
return claims;
}
public void setClaims(Map<String, String> claims) {
this.claims = claims;
}
// Set the attribute, which will be available on "Update profile" page and in authenticators
public void setUserAttribute(String attributeName, String attributeValue) {
List<String> list = new ArrayList<>();

7
services/src/main/java/org/keycloak/broker/oidc/mappers/ClaimToUserSessionNoteMapper.java
View file

@ -127,7 +127,12 @@ public class ClaimToUserSessionNoteMapper extends AbstractClaimMapper {
: valueEquals(value, claimValue);
if (claimValuesMatch) {
context.getAuthenticationSession().setUserSessionNote(claim.getKey(), claimValue);
if(context.getAuthenticationSession() != null) {
context.getAuthenticationSession().setUserSessionNote(claim.getKey(), claimValue);
}
else {
context.getClaims().put(claim.getKey(), claimValue);
}
}
}
}

2
services/src/main/java/org/keycloak/protocol/oidc/DefaultTokenExchangeProvider.java
View file

@ -515,6 +515,8 @@ public class DefaultTokenExchangeProvider implements TokenExchangeProvider {
userSession.setNote(IdentityProvider.EXTERNAL_IDENTITY_PROVIDER, externalIdpModel.get().getAlias());
userSession.setNote(IdentityProvider.FEDERATED_ACCESS_TOKEN, subjectToken);
context.getClaims().forEach((k, v) -> userSession.setNote(k, v));
return exchangeClientToClient(user, userSession, null, false);
}