Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Make sure inner transactions are using their own session #42317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ahus1 merged 1 commit into from
Sep 3, 2025
Merged

Make sure inner transactions are using their own session #42317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions ...ation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/AbstractLDAPStorageMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import java.util.List;
import java.util.Set;
import org.keycloak.models.RoleModel;
import org.keycloak.utils.KeycloakSessionUtil;

/**
* Stateful per-request object
Expand All @@ -39,14 +40,12 @@
*/
public abstract class AbstractLDAPStorageMapper implements LDAPStorageMapper {

protected final KeycloakSession session;
protected final ComponentModel mapperModel;
protected final LDAPStorageProvider ldapProvider;

public AbstractLDAPStorageMapper(ComponentModel mapperModel, LDAPStorageProvider ldapProvider) {
this.mapperModel = mapperModel;
this.ldapProvider = ldapProvider;
this.session = ldapProvider.getSession();
}

@Override
Expand Down Expand Up @@ -99,4 +98,7 @@ public void close() {

}

protected KeycloakSession getSession() {
return KeycloakSessionUtil.getKeycloakSession();
}
}
2 changes: 1 addition & 1 deletion ...ldap/src/main/java/org/keycloak/storage/ldap/mappers/HardcodedLDAPGroupStorageMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public void onImportUserFromLDAP(LDAPObject ldapUser, UserModel user, RealmModel

private GroupModel getGroup(RealmModel realm) {
String groupName = mapperModel.getConfig().getFirst(HardcodedLDAPGroupStorageMapper.GROUP);
GroupModel group = KeycloakModelUtils.findGroupByPath(session, realm, groupName);
GroupModel group = KeycloakModelUtils.findGroupByPath(getSession(), realm, groupName);
if (group == null) {
logger.warnf("Hardcoded group '%s' configured in mapper '%s' is not available anymore");
}
Expand Down
8 changes: 4 additions & 4 deletions .../main/java/org/keycloak/storage/ldap/mappers/membership/group/GroupLDAPStorageMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ protected GroupModel findKcGroupByLDAPGroup(RealmModel realm, GroupModel parent,
.filter(group -> Objects.equals(group.getName(), groupName)).findFirst().orElse(null);
} else {
// Without preserved inheritance, it's always at groups path
return session.groups().getGroupByName(realm, parent, groupName);
return getSession().groups().getGroupByName(realm, parent, groupName);
}
}

Expand Down Expand Up @@ -807,7 +807,7 @@ protected String getKcGroupPathFromLDAPGroupName(String ldapGroupName) {
* Provides KC group defined as groups path or null (top-level group) if corresponding group is not available.
*/
protected GroupModel getKcGroupsPathGroup(RealmModel realm) {
return config.isTopLevelGroupsPath() ? null : KeycloakModelUtils.findGroupByPath(session, realm, config.getGroupsPath());
return config.isTopLevelGroupsPath() ? null : KeycloakModelUtils.findGroupByPath(getSession(), realm, config.getGroupsPath());
}

protected boolean isGroupInGroupPath(RealmModel realm, GroupModel group) {
Expand All @@ -817,7 +817,7 @@ protected boolean isGroupInGroupPath(RealmModel realm, GroupModel group) {
if (config.isTopLevelGroupsPath()) {
return true; // any group is in the path of the top level path.
}
GroupModel groupPathGroup = KeycloakModelUtils.findGroupByPath(session, realm, config.getGroupsPath());
GroupModel groupPathGroup = KeycloakModelUtils.findGroupByPath(getSession(), realm, config.getGroupsPath());
if (groupPathGroup != null) {
while(!groupPathGroup.getId().equals(group.getId())) {
group = group.getParent();
Expand Down Expand Up @@ -851,7 +851,7 @@ protected Stream<GroupModel> getKcSubGroups(RealmModel realm, GroupModel parentG
if (parentGroup == null) {
parentGroup = getKcGroupsPathGroup(realm);
}
return parentGroup == null ? session.groups().getTopLevelGroupsStream(realm) :
return parentGroup == null ? getSession().groups().getTopLevelGroupsStream(realm) :
parentGroup.getSubGroupsStream();
}

Expand Down
6 changes: 3 additions & 3 deletions ...main/java/org/keycloak/storage/ldap/mappers/msad/MSADUserAccountControlStorageMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ protected boolean processAuthErrorCode(String errorCode, UserModel user) {
// User needs to change his MSAD password. Allow him to login, but add UPDATE_PASSWORD required action to authenticationSession
if (user.getRequiredActionsStream().noneMatch(action -> Objects.equals(action, UserModel.RequiredAction.UPDATE_PASSWORD.name()))) {
// This usually happens when 532 was returned, which means that "pwdLastSet" is set to some positive value, which is older than MSAD password expiration policy.
AuthenticationSessionModel authSession = session.getContext().getAuthenticationSession();
AuthenticationSessionModel authSession = getSession().getContext().getAuthenticationSession();
if (authSession != null) {
if (authSession.getRequiredActions().stream().noneMatch(action -> Objects.equals(action, UserModel.RequiredAction.UPDATE_PASSWORD.name()))) {
logger.debugf("Adding requiredAction UPDATE_PASSWORD to the authenticationSession of user %s", user.getUsername());
Expand Down Expand Up @@ -226,7 +226,7 @@ protected UserAccountControl getUserAccountControl(LDAPObject ldapUser) {
return control;
}

RealmModel realm = session.getContext().getRealm();
RealmModel realm = getSession().getContext().getRealm();

if (realm == null) {
return control;
Expand All @@ -250,7 +250,7 @@ protected void updateUserAccountControl(boolean updateInLDAP, LDAPObject ldapUse
}

private String getRealmName() {
RealmModel realm = session.getContext().getRealm();
RealmModel realm = getSession().getContext().getRealm();
return (realm != null) ? realm.getName() : "null";
}

Expand Down
Loading