Datasets:

---

JetBrains-Research

/

commit-chronicle

like 9

Follow

JetBrains Research 70

[ { "change_type": "MODIFY", "old_path": "docs/guides/src/main/operator/realm-import.adoc", "new_path": "docs/guides/src/main/operator/realm-import.adoc", "diff": "<@tmpl.guide\ntitle=\"Keycloak Realm Import\"\npriority=30\n-summary=\"How to perform an automated Keyacloak Realm Import\">\n+summary=\"How to perform an automated Keycloak Realm Import using the operator\">\n== Keycloak Realm Import\n-The Keycloak Operator ships with the feature of automatically perform a realm import for the Keycloak Deployment.\n+The Keycloak Operator ships with the ability to automatically perform a realm import for the Keycloak Deployment.\n.Note:\n[NOTE]\n@@ -18,8 +18,8 @@ If a Realm with the same name already exists in Keycloak it will not be overwrit\n.Note:\n[NOTE]\n-The Realm Import CR only supports creation of new realms and doesn't updates or delete those. +\n-Changes to the realm performed directly on Keycloak are not synched back in the CR.\n+The Realm Import CR only supports creation of new realms and doesn't update or delete those. +\n+Changes to the realm performed directly on Keycloak are not synced back in the CR.\n=== Writing Realm Import CR\n@@ -37,10 +37,10 @@ spec:\n...\n----\n-This CR should be created in the same namespace as the Keycloak Deployment CR defined in the field `keycloakCRName`.\n-The `realm` field accepts a full https://www.keycloak.org/docs-api/{version}/rest-api/index.html#_realmrepresentation[RealmRepresentation].\n+This CR should be created in the same namespace as the Keycloak Deployment CR, defined in the field `keycloakCRName`.\n+The `realm` field accepts a full https://www.keycloak.org/docs-api/{majorMinorVersion}/rest-api/index.html#_realmrepresentation[RealmRepresentation].\n-The suggested way to obtain a `RealmRepresentation` is leveraging the export functionality <@links.server id=\"importExport\"/>\n+The recommended way to obtain a `RealmRepresentation` is leveraging the export functionality <@links.server id=\"importExport\"/>\n* export the Realm to a single file\n* convert the json to yaml\n@@ -68,14 +68,14 @@ EOF\nkubectl apply -f example-realm-import.yaml\n----\n-And you can check the progress of the Import by running:\n+You can check the status of the running import by using the following command:\n[source,bash]\n----\nkubectl get keycloakrealmimports/my-realm-kc -o go-template='{{range .status.conditions}}CONDITION: {{.type}}{{\"\\n\"}} STATUS: {{.status}}{{\"\\n\"}} MESSAGE: {{.message}}{{\"\\n\"}}{{end}}'\n----\n-When the import successfully completed the output will look like follow:\n+When the import has successfully completed, the output will look like the example below:\n[source,bash]\n----\n" } ]

[ { "change_type": "MODIFY", "old_path": "distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/licenses.xml", "new_path": "distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/licenses.xml", "diff": "<dependency>\n<groupId>com.webauthn4j</groupId>\n<artifactId>webauthnj4-core</artifactId>\n- <version>0.12.0.RELEASE</version>\n+ <version>0.19.3.RELEASE</version>\n<licenses>\n<license>\n<name>Apache Software License 2.0</name>\n- <url>https://raw.githubusercontent.com/webauthn4j/webauthn4j/0.12.0.RELEASE/LICENSE.txt</url>\n+ <url>https://raw.githubusercontent.com/webauthn4j/webauthn4j/0.19.3.RELEASE/LICENSE.txt</url>\n</license>\n</licenses>\n</dependency>\n<dependency>\n<groupId>com.webauthn4j</groupId>\n<artifactId>webauthnj4-util</artifactId>\n- <version>0.12.0.RELEASE</version>\n+ <version>0.19.3.RELEASE</version>\n<licenses>\n<license>\n<name>Apache Software License 2.0</name>\n- <url>https://raw.githubusercontent.com/webauthn4j/webauthn4j/0.12.0.RELEASE/LICENSE.txt</url>\n+ <url>https://raw.githubusercontent.com/webauthn4j/webauthn4j/0.19.3.RELEASE/LICENSE.txt</url>\n</license>\n</licenses>\n</dependency>\n" }, { "change_type": "MODIFY", "old_path": "distribution/galleon-feature-packs/server-galleon-pack/src/license/keycloak-server-galleon-pack-licenses.xml", "new_path": "distribution/galleon-feature-packs/server-galleon-pack/src/license/keycloak-server-galleon-pack-licenses.xml", "diff": "<dependency>\n<groupId>com.webauthn4j</groupId>\n<artifactId>webauthnj4-core</artifactId>\n- <version>0.12.0.RELEASE</version>\n+ <version>0.19.3.RELEASE</version>\n<licenses>\n<license>\n<name>Apache Software License 2.0</name>\n- <url>https://raw.githubusercontent.com/webauthn4j/webauthn4j/0.12.0.RELEASE/LICENSE.txt</url>\n+ <url>https://raw.githubusercontent.com/webauthn4j/webauthn4j/0.19.3.RELEASE/LICENSE.txt</url>\n</license>\n</licenses>\n</dependency>\n<dependency>\n<groupId>com.webauthn4j</groupId>\n<artifactId>webauthnj4-util</artifactId>\n- <version>0.12.0.RELEASE</version>\n+ <version>0.19.3.RELEASE</version>\n<licenses>\n<license>\n<name>Apache Software License 2.0</name>\n- <url>https://raw.githubusercontent.com/webauthn4j/webauthn4j/0.12.0.RELEASE/LICENSE.txt</url>\n+ <url>https://raw.githubusercontent.com/webauthn4j/webauthn4j/0.19.3.RELEASE/LICENSE.txt</url>\n</license>\n</licenses>\n</dependency>\n" }, { "change_type": "MODIFY", "old_path": "pom.xml", "new_path": "pom.xml", "diff": "<spring-boot26.version>2.6.1</spring-boot26.version>\n<!-- webauthn support -->\n- <webauthn4j.version>0.12.0.RELEASE</webauthn4j.version>\n+ <webauthn4j.version>0.19.3.RELEASE</webauthn4j.version>\n<org.apache.kerby.kerby-asn1.version>2.0.0</org.apache.kerby.kerby-asn1.version>\n<!-- WildFly Galleon Build related properties -->\n" }, { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/authentication/authenticators/browser/WebAuthnAuthenticator.java", "new_path": "services/src/main/java/org/keycloak/authentication/authenticators/browser/WebAuthnAuthenticator.java", "diff": "@@ -203,9 +203,8 @@ public class WebAuthnAuthenticator implements Authenticator, CredentialValidator\nsignature\n);\n- AuthenticationParameters authenticationParameters = new AuthenticationParameters(\n+ WebAuthnCredentialModelInput.KeycloakWebAuthnAuthenticationParameters authenticationParameters = new WebAuthnCredentialModelInput.KeycloakWebAuthnAuthenticationParameters(\nserver,\n- null, // here authenticator cannot be fetched, set it afterwards in WebAuthnCredentialProvider.isValid()\nisUVFlagChecked\n);\n" }, { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/credential/WebAuthnCredentialModelInput.java", "new_path": "services/src/main/java/org/keycloak/credential/WebAuthnCredentialModelInput.java", "diff": "package org.keycloak.credential;\n+import com.webauthn4j.authenticator.Authenticator;\n+import com.webauthn4j.server.ServerProperty;\nimport org.keycloak.common.util.Base64;\nimport com.webauthn4j.data.AuthenticationParameters;\n@@ -27,6 +29,7 @@ import com.webauthn4j.data.attestation.statement.AttestationStatement;\nimport org.keycloak.common.util.CollectionUtil;\nimport java.util.Collections;\n+import java.util.List;\nimport java.util.Set;\nimport java.util.stream.Collectors;\n@@ -34,7 +37,7 @@ public class WebAuthnCredentialModelInput implements CredentialInput {\nprivate AttestedCredentialData attestedCredentialData;\nprivate AttestationStatement attestationStatement;\n- private AuthenticationParameters authenticationParameters; // not persisted because it can only be used on authentication operation.\n+ private KeycloakWebAuthnAuthenticationParameters authenticationParameters; // not persisted because it can only be used on authentication operation.\nprivate AuthenticationRequest authenticationRequest; // not persisted because it can only be used on authentication operation.\nprivate long count;\nprivate String credentialDBId;\n@@ -74,11 +77,11 @@ public class WebAuthnCredentialModelInput implements CredentialInput {\nreturn count;\n}\n- public AuthenticationParameters getAuthenticationParameters() {\n+ public KeycloakWebAuthnAuthenticationParameters getAuthenticationParameters() {\nreturn authenticationParameters;\n}\n- public void setAuthenticationParameters(AuthenticationParameters authenticationParameters) {\n+ public void setAuthenticationParameters(KeycloakWebAuthnAuthenticationParameters authenticationParameters) {\nthis.authenticationParameters = authenticationParameters;\n}\n@@ -184,4 +187,23 @@ public class WebAuthnCredentialModelInput implements CredentialInput {\nsb.deleteCharAt(sb.lastIndexOf(\",\"));\nreturn sb.toString();\n}\n+\n+ public static class KeycloakWebAuthnAuthenticationParameters{\n+\n+ private final ServerProperty serverProperty;\n+ private final boolean userVerificationRequired;\n+\n+ public KeycloakWebAuthnAuthenticationParameters(ServerProperty serverProperty, boolean userVerificationRequired) {\n+ this.serverProperty = serverProperty;\n+ this.userVerificationRequired = userVerificationRequired;\n+ }\n+\n+ public ServerProperty getServerProperty() {\n+ return serverProperty;\n+ }\n+\n+ public boolean isUserVerificationRequired() {\n+ return userVerificationRequired;\n+ }\n+ }\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/authSession/HotRodRootAuthenticationSessionEntity.java", "new_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/authSession/HotRodRootAuthenticationSessionEntity.java", "diff": "@@ -39,10 +39,10 @@ import java.util.Set;\npublic class HotRodRootAuthenticationSessionEntity extends AbstractHotRodEntity {\n@ProtoDoc(\"@Field(index = Index.YES, store = Store.YES)\")\n- @ProtoField(number = 1, required = true)\n- public int entityVersion = 1;\n+ @ProtoField(number = 1)\n+ public Integer entityVersion = 1;\n- @ProtoField(number = 2, required = true)\n+ @ProtoField(number = 2)\npublic String id;\n@ProtoDoc(\"@Field(index = Index.YES, store = Store.YES)\")\n" }, { "change_type": "MODIFY", "old_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/client/HotRodClientEntity.java", "new_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/client/HotRodClientEntity.java", "diff": "@@ -42,11 +42,11 @@ import java.util.stream.Stream;\npublic class HotRodClientEntity extends AbstractHotRodEntity {\n@ProtoDoc(\"@Field(index = Index.YES, store = Store.YES)\")\n- @ProtoField(number = 1, required = true)\n- public int entityVersion = 1;\n+ @ProtoField(number = 1)\n+ public Integer entityVersion = 1;\n@ProtoDoc(\"@Field(index = Index.YES, store = Store.YES)\")\n- @ProtoField(number = 2, required = true)\n+ @ProtoField(number = 2)\npublic String id;\n@ProtoDoc(\"@Field(index = Index.YES, store = Store.YES)\")\n" }, { "change_type": "MODIFY", "old_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/clientscope/HotRodClientScopeEntity.java", "new_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/clientscope/HotRodClientScopeEntity.java", "diff": "@@ -41,10 +41,10 @@ import java.util.Set;\npublic class HotRodClientScopeEntity extends AbstractHotRodEntity {\n@ProtoDoc(\"@Field(index = Index.YES, store = Store.YES)\")\n- @ProtoField(number = 1, required = true)\n- public int entityVersion = 1;\n+ @ProtoField(number = 1)\n+ public Integer entityVersion = 1;\n- @ProtoField(number = 2, required = true)\n+ @ProtoField(number = 2)\npublic String id;\n@ProtoDoc(\"@Field(index = Index.YES, store = Store.YES)\")\n" }, { "change_type": "MODIFY", "old_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/group/HotRodGroupEntity.java", "new_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/group/HotRodGroupEntity.java", "diff": "@@ -61,11 +61,11 @@ public class HotRodGroupEntity extends AbstractHotRodEntity {\n}\n@ProtoDoc(\"@Field(index = Index.YES, store = Store.YES)\")\n- @ProtoField(number = 1, required = true)\n- public int entityVersion = 1;\n+ @ProtoField(number = 1)\n+ public Integer entityVersion = 1;\n@ProtoDoc(\"@Field(index = Index.YES, store = Store.YES)\")\n- @ProtoField(number = 2, required = true)\n+ @ProtoField(number = 2)\npublic String id;\n@ProtoDoc(\"@Field(index = Index.YES, store = Store.YES)\")\n" }, { "change_type": "MODIFY", "old_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/loginFailure/HotRodUserLoginFailureEntity.java", "new_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/loginFailure/HotRodUserLoginFailureEntity.java", "diff": "@@ -32,10 +32,10 @@ import org.keycloak.models.map.storage.hotRod.common.UpdatableHotRodEntityDelega\npublic class HotRodUserLoginFailureEntity extends AbstractHotRodEntity {\n@ProtoDoc(\"@Field(index = Index.YES, store = Store.YES)\")\n- @ProtoField(number = 1, required = true)\n- public int entityVersion = 1;\n+ @ProtoField(number = 1)\n+ public Integer entityVersion = 1;\n- @ProtoField(number = 2, required = true)\n+ @ProtoField(number = 2)\npublic String id;\n@ProtoDoc(\"@Field(index = Index.YES, store = Store.YES)\")\n" }, { "change_type": "MODIFY", "old_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/realm/HotRodRealmEntity.java", "new_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/realm/HotRodRealmEntity.java", "diff": "@@ -72,8 +72,8 @@ import java.util.stream.Collectors;\npublic class HotRodRealmEntity extends AbstractHotRodEntity {\n@ProtoDoc(\"@Field(index = Index.YES, store = Store.YES)\")\n- @ProtoField(number = 1, required = true)\n- public int entityVersion = 1;\n+ @ProtoField(number = 1)\n+ public Integer entityVersion = 1;\n@ProtoField(number = 2)\npublic String id;\n" }, { "change_type": "MODIFY", "old_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/role/HotRodRoleEntity.java", "new_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/role/HotRodRoleEntity.java", "diff": "@@ -59,11 +59,11 @@ public class HotRodRoleEntity extends AbstractHotRodEntity {\n}\n@ProtoDoc(\"@Field(index = Index.YES, store = Store.YES)\")\n- @ProtoField(number = 1, required = true)\n- public int entityVersion = 1;\n+ @ProtoField(number = 1)\n+ public Integer entityVersion = 1;\n@ProtoDoc(\"@Field(index = Index.YES, store = Store.YES)\")\n- @ProtoField(number = 2, required = true)\n+ @ProtoField(number = 2)\npublic String id;\n@ProtoDoc(\"@Field(index = Index.YES, store = Store.YES)\")\n" }, { "change_type": "MODIFY", "old_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/user/HotRodUserEntity.java", "new_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/user/HotRodUserEntity.java", "diff": "@@ -51,11 +51,11 @@ public class HotRodUserEntity extends AbstractHotRodEntity {\nprivate static final Logger LOG = Logger.getLogger(HotRodUserEntity.class);\n@ProtoDoc(\"@Field(index = Index.YES, store = Store.YES)\")\n- @ProtoField(number = 1, required = true)\n- public int entityVersion = 1;\n+ @ProtoField(number = 1)\n+ public Integer entityVersion = 1;\n@ProtoDoc(\"@Field(index = Index.YES, store = Store.YES)\")\n- @ProtoField(number = 2, required = true)\n+ @ProtoField(number = 2)\npublic String id;\n@ProtoDoc(\"@Field(index = Index.YES, store = Store.YES)\")\n" }, { "change_type": "MODIFY", "old_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/userSession/HotRodAuthenticatedClientSessionEntity.java", "new_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/userSession/HotRodAuthenticatedClientSessionEntity.java", "diff": "@@ -35,11 +35,11 @@ import java.util.Set;\npublic class HotRodAuthenticatedClientSessionEntity extends AbstractHotRodEntity {\n@ProtoDoc(\"@Field(index = Index.YES, store = Store.YES)\")\n- @ProtoField(number = 1, required = true)\n- public int entityVersion = 1;\n+ @ProtoField(number = 1)\n+ public Integer entityVersion = 1;\n@ProtoDoc(\"@Field(index = Index.YES, store = Store.YES)\")\n- @ProtoField(number = 2, required = true)\n+ @ProtoField(number = 2)\npublic String id;\n@ProtoDoc(\"@Field(index = Index.YES, store = Store.YES)\")\n" }, { "change_type": "MODIFY", "old_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/userSession/HotRodUserSessionEntity.java", "new_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/userSession/HotRodUserSessionEntity.java", "diff": "@@ -36,10 +36,10 @@ import java.util.Set;\npublic class HotRodUserSessionEntity extends AbstractHotRodEntity {\n@ProtoDoc(\"@Field(index = Index.YES, store = Store.YES)\")\n- @ProtoField(number = 1, required = true)\n- public int entityVersion = 1;\n+ @ProtoField(number = 1)\n+ public Integer entityVersion = 1;\n- @ProtoField(number = 2, required = true)\n+ @ProtoField(number = 2)\npublic String id;\n@ProtoDoc(\"@Field(index = Index.YES, store = Store.YES)\")\n" } ]

[ { "change_type": "MODIFY", "old_path": "distribution/saml-adapters/shared-cli/adapter-elytron-install-saml-offline.cli", "new_path": "distribution/saml-adapters/shared-cli/adapter-elytron-install-saml-offline.cli", "diff": "@@ -54,5 +54,8 @@ end-if\nif (outcome != success) of /subsystem=undertow/application-security-domain=other:read-resource\n/subsystem=undertow/application-security-domain=other:add(http-authentication-factory=keycloak-http-authentication)\nelse\n- echo Undertow already configured with Keycloak\n+ batch\n+ /subsystem=undertow/application-security-domain=other:undefine-attribute(name=security-domain)\n+ /subsystem=undertow/application-security-domain=other:write-attribute(name=http-authentication-factory,value=keycloak-http-authentication)\n+ run-batch\nend-if\n" }, { "change_type": "MODIFY", "old_path": "distribution/saml-adapters/shared-cli/adapter-elytron-install-saml.cli", "new_path": "distribution/saml-adapters/shared-cli/adapter-elytron-install-saml.cli", "diff": "@@ -52,5 +52,8 @@ end-if\nif (outcome != success) of /subsystem=undertow/application-security-domain=other:read-resource\n/subsystem=undertow/application-security-domain=other:add(http-authentication-factory=keycloak-http-authentication)\nelse\n- echo Undertow already configured with Keycloak\n+ batch\n+ /subsystem=undertow/application-security-domain=other:undefine-attribute(name=security-domain)\n+ /subsystem=undertow/application-security-domain=other:write-attribute(name=http-authentication-factory,value=keycloak-http-authentication)\n+ run-batch\nend-if\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/map-jpa/src/main/resources/META-INF/groups/jpa-groups-changelog-1.xml", "new_path": "model/map-jpa/src/main/resources/META-INF/groups/jpa-groups-changelog-1.xml", "diff": "@@ -48,6 +48,11 @@ limitations under the License.\n<column name=\"name\"/>\n<column name=\"parentid\"/>\n</createIndex>\n+ <createIndex tableName=\"kc_group\" indexName=\"group_realmId_parentId\">\n+ <!-- list column parentId first, as it is more selective than realmId -->\n+ <column name=\"parentid\"/>\n+ <column name=\"realmid\"/>\n+ </createIndex>\n<createTable tableName=\"kc_group_attribute\">\n<column name=\"id\" type=\"UUID\">\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/group/MapGroupAdapter.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/group/MapGroupAdapter.java", "diff": "@@ -19,6 +19,7 @@ package org.keycloak.models.map.group;\nimport org.keycloak.models.ClientModel;\nimport org.keycloak.models.GroupModel;\n+import org.keycloak.models.GroupProvider;\nimport org.keycloak.models.KeycloakSession;\nimport org.keycloak.models.RealmModel;\nimport org.keycloak.models.RoleModel;\n@@ -31,7 +32,7 @@ import java.util.Set;\nimport java.util.stream.Stream;\n-public class MapGroupAdapter extends AbstractGroupModel<MapGroupEntity> {\n+public abstract class MapGroupAdapter extends AbstractGroupModel<MapGroupEntity> {\npublic MapGroupAdapter(KeycloakSession session, RealmModel realm, MapGroupEntity entity) {\nsuper(session, realm, entity);\n}\n@@ -99,12 +100,6 @@ public class MapGroupAdapter extends AbstractGroupModel<MapGroupEntity> {\nreturn entity.getParentId();\n}\n- @Override\n- public Stream<GroupModel> getSubGroupsStream() {\n- return session.groups().getGroupsStream(realm)\n- .filter(groupModel -> getId().equals(groupModel.getParentId()));\n- }\n-\n@Override\npublic void setParent(GroupModel group) {\nif (group == null) {\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/group/MapGroupProvider.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/group/MapGroupProvider.java", "diff": "@@ -59,7 +59,12 @@ public class MapGroupProvider implements GroupProvider {\nprivate Function<MapGroupEntity, GroupModel> entityToAdapterFunc(RealmModel realm) {\n// Clone entity before returning back, to avoid giving away a reference to the live object to the caller\n- return origEntity -> new MapGroupAdapter(session, realm, origEntity);\n+ return origEntity -> new MapGroupAdapter(session, realm, origEntity) {\n+ @Override\n+ public Stream<GroupModel> getSubGroupsStream() {\n+ return getGroupsByParentId(realm, this.getId());\n+ }\n+ };\n}\n@Override\n@@ -297,4 +302,13 @@ public class MapGroupProvider implements GroupProvider {\npublic void close() {\n}\n+ private Stream<GroupModel> getGroupsByParentId(RealmModel realm, String parentId) {\n+ LOG.tracef(\"getGroupsByParentId(%s)%s\", parentId, getShortStackTrace());\n+ DefaultModelCriteria<GroupModel> mcb = criteria();\n+ mcb = mcb\n+ .compare(SearchableFields.REALM_ID, Operator.EQ, realm.getId())\n+ .compare(SearchableFields.PARENT_ID, Operator.EQ, parentId);\n+\n+ return tx.read(withCriteria(mcb)).map(entityToAdapterFunc(realm));\n+ }\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/pom.xml", "new_path": "testsuite/integration-arquillian/tests/base/pom.xml", "diff": "</plugins>\n</build>\n</profile>\n+\n+ <profile>\n+ <id>map-storage-jpa</id>\n+ <build>\n+ <plugins>\n+ <plugin>\n+ <artifactId>maven-enforcer-plugin</artifactId>\n+ <goals>\n+ <goal>enforce</goal>\n+ </goals>\n+ <configuration>\n+ <rules>\n+ <requireActiveProfile>\n+ <profiles>map-storage</profiles>\n+ <message>map-storage profile not active</message>\n+ </requireActiveProfile>\n+ </rules>\n+ </configuration>\n+ </plugin>\n+ <plugin>\n+ <groupId>org.apache.maven.plugins</groupId>\n+ <artifactId>maven-surefire-plugin</artifactId>\n+ <configuration>\n+ <systemPropertyVariables>\n+ <keycloak.map.storage.connectionsJpa.url>${keycloak.map.storage.connectionsJpa.url}</keycloak.map.storage.connectionsJpa.url>\n+ <keycloak.map.storage.connectionsJpa.user>${keycloak.map.storage.connectionsJpa.user}</keycloak.map.storage.connectionsJpa.user>\n+ <keycloak.map.storage.connectionsJpa.password>${keycloak.map.storage.connectionsJpa.password}</keycloak.map.storage.connectionsJpa.password>\n+\n+ <keycloak.authSession.map.storage.provider>jpa-map-storage</keycloak.authSession.map.storage.provider>\n+ <keycloak.client.map.storage.provider>jpa-map-storage</keycloak.client.map.storage.provider>\n+ <keycloak.clientScope.map.storage.provider>jpa-map-storage</keycloak.clientScope.map.storage.provider>\n+ <keycloak.group.map.storage.provider>jpa-map-storage</keycloak.group.map.storage.provider>\n+ <keycloak.loginFailure.map.storage.provider>jpa-map-storage</keycloak.loginFailure.map.storage.provider>\n+ <keycloak.realm.map.storage.provider>jpa-map-storage</keycloak.realm.map.storage.provider>\n+ <keycloak.role.map.storage.provider>jpa-map-storage</keycloak.role.map.storage.provider>\n+ </systemPropertyVariables>\n+ </configuration>\n+ </plugin>\n+ </plugins>\n+ </build>\n+ </profile>\n</profiles>\n</project>\n" }, { "change_type": "MODIFY", "old_path": "testsuite/model/pom.xml", "new_path": "testsuite/model/pom.xml", "diff": "<artifactId>infinispan-component-annotations</artifactId>\n<version>${infinispan.version}</version>\n</dependency>\n+ <dependency>\n+ <groupId>org.postgresql</groupId>\n+ <artifactId>postgresql</artifactId>\n+ <version>${postgresql.driver.version}</version>\n+ </dependency>\n</dependencies>\n<build>\n<keycloak.connectionsJpa.default.user>${keycloak.connectionsJpa.user}</keycloak.connectionsJpa.default.user>\n<keycloak.connectionsJpa.default.password>${keycloak.connectionsJpa.password}</keycloak.connectionsJpa.default.password>\n<keycloak.connectionsJpa.default.url>${keycloak.connectionsJpa.url}</keycloak.connectionsJpa.default.url>\n+ <keycloak.map.storage.connectionsJpa.url>${keycloak.map.storage.connectionsJpa.url}</keycloak.map.storage.connectionsJpa.url>\n+ <keycloak.map.storage.connectionsJpa.user>${keycloak.map.storage.connectionsJpa.user}</keycloak.map.storage.connectionsJpa.user>\n+ <keycloak.map.storage.connectionsJpa.password>${keycloak.map.storage.connectionsJpa.password}</keycloak.map.storage.connectionsJpa.password>\n<log4j.configuration>file:${project.build.directory}/test-classes/log4j.properties</log4j.configuration> <!-- for the logging to properly work with tests in the 'other' module -->\n<keycloak.profile.feature.map_storage>${keycloak.profile.feature.map_storage}</keycloak.profile.feature.map_storage>\n<keycloak.userSessions.infinispan.preloadOfflineSessionsFromDatabase>${keycloak.userSessions.infinispan.preloadOfflineSessionsFromDatabase}</keycloak.userSessions.infinispan.preloadOfflineSessionsFromDatabase>\n</properties>\n</profile>\n+ <profile>\n+ <id>map-jpa</id>\n+ <properties>\n+ <keycloak.profile.feature.map_storage>enabled</keycloak.profile.feature.map_storage>\n+ <keycloak.model.parameters>Map,JpaMapStorage</keycloak.model.parameters>\n+ </properties>\n+ </profile>\n+\n<profile>\n<id>.asyncProfiler</id>\n<activation>\n" }, { "change_type": "MODIFY", "old_path": "testsuite/model/src/main/java/org/keycloak/testsuite/model/KeycloakModelParameters.java", "new_path": "testsuite/model/src/main/java/org/keycloak/testsuite/model/KeycloakModelParameters.java", "diff": "@@ -32,6 +32,8 @@ public class KeycloakModelParameters {\nprivate final Set<Class<? extends Spi>> allowedSpis;\nprivate final Set<Class<? extends ProviderFactory>> allowedFactories;\n+ protected static final String STORAGE_CONFIG = \"storage.provider\";\n+\npublic KeycloakModelParameters(Set<Class<? extends Spi>> allowedSpis, Set<Class<? extends ProviderFactory>> allowedFactories) {\nthis.allowedSpis = allowedSpis;\nthis.allowedFactories = allowedFactories;\n" }, { "change_type": "MODIFY", "old_path": "testsuite/model/src/test/java/org/keycloak/testsuite/model/ClientModelTest.java", "new_path": "testsuite/model/src/test/java/org/keycloak/testsuite/model/ClientModelTest.java", "diff": "@@ -122,10 +122,8 @@ public class ClientModelTest extends KeycloakModelTest {\n});\nwithRealm(realmId, (session, realm) -> {\n- ClientModel client = session.clients().searchClientsByClientIdStream(realm, \"%\", 0, 10).findFirst().orElse(null);\n- assertThat(client, notNullValue());\n- assertThat(client.getId(), is(equalTo(searchClient.getId())));\n- assertThat(client.getClientId(), is(equalTo(searchClientId)));\n+ // when searching by \"%\" all entries are expected\n+ assertThat(session.clients().searchClientsByClientIdStream(realm, \"%\", 0, 10).count(), is(equalTo(2L)));\nreturn null;\n});\n}\n" }, { "change_type": "MODIFY", "old_path": "testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/HotRodMapStorage.java", "new_path": "testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/HotRodMapStorage.java", "diff": "@@ -68,8 +68,6 @@ public class HotRodMapStorage extends KeycloakModelParameters {\n.add(ConcurrentHashMapStorageProviderFactory.class) // TODO: this should be removed when we have a HotRod implementation for each area\n.build();\n- private static final String STORAGE_CONFIG = \"storage.provider\";\n-\nprivate HotRodServerRule hotRodServerRule = new HotRodServerRule();\n@Override\n" }, { "change_type": "ADD", "old_path": null, "new_path": "testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/JpaMapStorage.java", "diff": "+/*\n+ * Copyright 2020 Red Hat, Inc. and/or its affiliates\n+ * and other contributors as indicated by the @author tags.\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package org.keycloak.testsuite.model.parameters;\n+\n+import com.google.common.collect.ImmutableSet;\n+import java.util.Set;\n+import org.jboss.logging.Logger;\n+import org.keycloak.authorization.store.StoreFactorySpi;\n+import org.keycloak.models.DeploymentStateSpi;\n+import org.keycloak.models.UserLoginFailureSpi;\n+import org.keycloak.models.UserSessionSpi;\n+import org.keycloak.models.dblock.NoLockingDBLockProviderFactory;\n+import org.keycloak.models.map.authSession.MapRootAuthenticationSessionProviderFactory;\n+import org.keycloak.models.map.authorization.MapAuthorizationStoreFactory;\n+import org.keycloak.models.map.client.MapClientProviderFactory;\n+import org.keycloak.models.map.clientscope.MapClientScopeProviderFactory;\n+import org.keycloak.models.map.deploymentState.MapDeploymentStateProviderFactory;\n+import org.keycloak.models.map.group.MapGroupProviderFactory;\n+import org.keycloak.models.map.loginFailure.MapUserLoginFailureProviderFactory;\n+import org.keycloak.models.map.realm.MapRealmProviderFactory;\n+import org.keycloak.models.map.role.MapRoleProviderFactory;\n+import org.keycloak.models.map.storage.MapStorageSpi;\n+import org.keycloak.models.map.storage.chm.ConcurrentHashMapStorageProviderFactory;\n+import org.keycloak.models.map.storage.jpa.JpaMapStorageProviderFactory;\n+import org.keycloak.models.map.storage.jpa.liquibase.connection.MapLiquibaseConnectionProviderFactory;\n+import org.keycloak.models.map.storage.jpa.liquibase.connection.MapLiquibaseConnectionSpi;\n+import org.keycloak.models.map.storage.jpa.updater.MapJpaUpdaterProviderFactory;\n+import org.keycloak.models.map.storage.jpa.updater.MapJpaUpdaterSpi;\n+import org.keycloak.models.map.user.MapUserProviderFactory;\n+import org.keycloak.models.map.userSession.MapUserSessionProviderFactory;\n+import org.keycloak.provider.ProviderFactory;\n+import org.keycloak.provider.Spi;\n+import org.keycloak.sessions.AuthenticationSessionSpi;\n+import org.keycloak.testsuite.model.Config;\n+import org.keycloak.testsuite.model.KeycloakModelParameters;\n+\n+public class JpaMapStorage extends KeycloakModelParameters {\n+\n+ private static final Logger LOG = Logger.getLogger(JpaMapStorage.class.getName());\n+\n+ static final Set<Class<? extends Spi>> ALLOWED_SPIS = ImmutableSet.<Class<? extends Spi>>builder()\n+ .add(MapJpaUpdaterSpi.class)\n+ .add(MapLiquibaseConnectionSpi.class)\n+ .build();\n+\n+ static final Set<Class<? extends ProviderFactory>> ALLOWED_FACTORIES = ImmutableSet.<Class<? extends ProviderFactory>>builder()\n+ .add(ConcurrentHashMapStorageProviderFactory.class)\n+ .add(JpaMapStorageProviderFactory.class)\n+ .add(MapJpaUpdaterProviderFactory.class)\n+ .add(MapLiquibaseConnectionProviderFactory.class)\n+ .build();\n+\n+ public JpaMapStorage() {\n+ super(ALLOWED_SPIS, ALLOWED_FACTORIES);\n+ }\n+\n+ @Override\n+ public void updateConfig(Config cf) {\n+ cf.spi(MapStorageSpi.NAME)\n+ .provider(ConcurrentHashMapStorageProviderFactory.PROVIDER_ID)\n+ .config(\"dir\", \"${project.build.directory:target}\");\n+\n+ cf.spi(MapStorageSpi.NAME)\n+ .provider(JpaMapStorageProviderFactory.PROVIDER_ID)\n+ .config(\"url\", System.getProperty(\"keycloak.map.storage.connectionsJpa.url\"))\n+ .config(\"user\", System.getProperty(\"keycloak.map.storage.connectionsJpa.user\"))\n+ .config(\"password\", System.getProperty(\"keycloak.map.storage.connectionsJpa.password\"))\n+ .config(\"driver\", \"org.postgresql.Driver\")\n+ .config(\"driverDialect\", \"org.keycloak.models.map.storage.jpa.hibernate.dialect.JsonbPostgreSQL95Dialect\");\n+\n+ cf.spi(AuthenticationSessionSpi.PROVIDER_ID).provider(MapRootAuthenticationSessionProviderFactory.PROVIDER_ID) .config(STORAGE_CONFIG, JpaMapStorageProviderFactory.PROVIDER_ID)\n+ .spi(\"client\").provider(MapClientProviderFactory.PROVIDER_ID) .config(STORAGE_CONFIG, JpaMapStorageProviderFactory.PROVIDER_ID)\n+ .spi(\"clientScope\").provider(MapClientScopeProviderFactory.PROVIDER_ID) .config(STORAGE_CONFIG, JpaMapStorageProviderFactory.PROVIDER_ID)\n+ .spi(\"group\").provider(MapGroupProviderFactory.PROVIDER_ID) .config(STORAGE_CONFIG, JpaMapStorageProviderFactory.PROVIDER_ID)\n+ .spi(\"realm\").provider(MapRealmProviderFactory.PROVIDER_ID) .config(STORAGE_CONFIG, JpaMapStorageProviderFactory.PROVIDER_ID)\n+ .spi(\"role\").provider(MapRoleProviderFactory.PROVIDER_ID) .config(STORAGE_CONFIG, JpaMapStorageProviderFactory.PROVIDER_ID)\n+ .spi(DeploymentStateSpi.NAME).provider(MapDeploymentStateProviderFactory.PROVIDER_ID) .config(STORAGE_CONFIG, ConcurrentHashMapStorageProviderFactory.PROVIDER_ID)\n+ .spi(StoreFactorySpi.NAME).provider(MapAuthorizationStoreFactory.PROVIDER_ID) .config(STORAGE_CONFIG, ConcurrentHashMapStorageProviderFactory.PROVIDER_ID)\n+ .spi(\"user\").provider(MapUserProviderFactory.PROVIDER_ID) .config(STORAGE_CONFIG, ConcurrentHashMapStorageProviderFactory.PROVIDER_ID)\n+ .spi(UserLoginFailureSpi.NAME).provider(MapUserLoginFailureProviderFactory.PROVIDER_ID) .config(STORAGE_CONFIG, JpaMapStorageProviderFactory.PROVIDER_ID)\n+ .spi(\"dblock\").provider(NoLockingDBLockProviderFactory.PROVIDER_ID) .config(STORAGE_CONFIG, ConcurrentHashMapStorageProviderFactory.PROVIDER_ID)\n+ .spi(UserSessionSpi.NAME).provider(MapUserSessionProviderFactory.PROVIDER_ID) .config(\"storage-user-sessions.provider\", ConcurrentHashMapStorageProviderFactory.PROVIDER_ID)\n+ .config(\"storage-client-sessions.provider\", ConcurrentHashMapStorageProviderFactory.PROVIDER_ID);\n+\n+ }\n+}\n" }, { "change_type": "MODIFY", "old_path": "testsuite/model/test-all-profiles.sh", "new_path": "testsuite/model/test-all-profiles.sh", "diff": "@@ -12,6 +12,11 @@ mvn -version\nEXIT_CODE=0\nmvn clean\nfor I in `perl -ne 'print \"$1\\n\" if (m,<id>([^.<]+)</id>,)' pom.xml`; do\n+\n+ ## skip map-jpa for GHA\n+ if [[ $I == 'map-jpa' ]]; then\n+ continue\n+ fi\necho \"========\"\necho \"======== Start of Profile $I\"\necho \"========\"\n" }, { "change_type": "MODIFY", "old_path": "testsuite/pom.xml", "new_path": "testsuite/pom.xml", "diff": "<name>Keycloak TestSuite</name>\n<description />\n+ <properties>\n+ <keycloak.map.storage.connectionsJpa.url>jdbc:postgresql://localhost:5432/keycloak</keycloak.map.storage.connectionsJpa.url>\n+ <keycloak.map.storage.connectionsJpa.user>keycloak</keycloak.map.storage.connectionsJpa.user>\n+ <keycloak.map.storage.connectionsJpa.password>pass</keycloak.map.storage.connectionsJpa.password>\n+ </properties>\n+\n<build>\n<plugins>\n<plugin>\n" } ]

[ { "change_type": "MODIFY", "old_path": ".github/workflows/ci.yml", "new_path": ".github/workflows/ci.yml", "diff": "@@ -143,7 +143,7 @@ jobs:\nfetch-depth: 2\n- name: Check whether HEAD^ contains HotRod storage relevant changes\n- run: echo \"GIT_HOTROD_RELEVANT_DIFF=$( git diff --name-only HEAD^ | egrep -ic -e '^model/hot-rod|^model/map|^model/build-processor|^testsuite/model' )\" >> $GITHUB_ENV\n+ run: echo \"GIT_HOTROD_RELEVANT_DIFF=$( git diff --name-only HEAD^ | egrep -ic -e '^model/map-hot-rod|^model/map/|^model/build-processor' )\" >> $GITHUB_ENV\n- name: Cache Maven packages\nif: ${{ github.event_name != 'pull_request' || matrix.server != 'undertow-map-hot-rod' || env.GIT_HOTROD_RELEVANT_DIFF != 0 }}\n@@ -202,6 +202,93 @@ jobs:\npath: reports-${{ matrix.server }}-base-tests-${{ matrix.tests }}.zip\nif-no-files-found: ignore\n+ test-posgres:\n+ name: Base testsuite (postgres)\n+ needs: build\n+ runs-on: ubuntu-latest\n+ strategy:\n+ matrix:\n+ server: ['undertow-map-jpa']\n+ tests: ['group1','group2','group3']\n+ fail-fast: false\n+\n+ services:\n+ # Label used to access the service container\n+ postgres:\n+ # Docker Hub image\n+ image: postgres\n+ env:\n+ # Provide env variables for the image\n+ POSTGRES_DB: keycloak\n+ POSTGRES_USER: keycloak\n+ POSTGRES_PASSWORD: pass\n+ # Set health checks to wait until postgres has started\n+ options: >-\n+ --health-cmd pg_isready\n+ --health-interval 10s\n+ --health-timeout 5s\n+ --health-retries 5\n+ ports:\n+ # Maps tcp port 5432 on service container to the host\n+ - 5432:5432\n+\n+ steps:\n+ - uses: actions/checkout@v3\n+ with:\n+ fetch-depth: 2\n+\n+ - name: Check whether HEAD^ contains JPA map storage relevant changes\n+ run: echo \"GIT_MAP_JPA_RELEVANT_DIFF=$( git diff --name-only HEAD^ | egrep -ic -e '^model/map-jpa/|^model/map/|^model/build-processor' )\" >> $GITHUB_ENV\n+\n+ - name: Cache Maven packages\n+ if: ${{ github.event_name != 'pull_request' || env.GIT_MAP_JPA_RELEVANT_DIFF != 0 }}\n+ uses: actions/cache@v3\n+ with:\n+ path: ~/.m2/repository\n+ key: cache-2-${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}\n+ restore-keys: cache-1-${{ runner.os }}-m2\n+\n+ - name: Download built keycloak\n+ if: ${{ github.event_name != 'pull_request' || env.GIT_MAP_JPA_RELEVANT_DIFF != 0 }}\n+ id: download-keycloak\n+ uses: actions/download-artifact@v3\n+ with:\n+ path: ~/.m2/repository/org/keycloak/\n+ name: keycloak-artifacts.zip\n+\n+ - uses: actions/setup-java@v3\n+ if: ${{ github.event_name != 'pull_request' || env.GIT_MAP_JPA_RELEVANT_DIFF != 0 }}\n+ with:\n+ distribution: 'temurin'\n+ java-version: ${{ env.DEFAULT_JDK_VERSION }}\n+ - name: Update maven settings\n+ if: ${{ github.event_name != 'pull_request' || env.GIT_MAP_JPA_RELEVANT_DIFF != 0 }}\n+ run: mkdir -p ~/.m2 ; cp .github/settings.xml ~/.m2/\n+\n+ - name: Run base tests\n+ if: ${{ github.event_name != 'pull_request' || env.GIT_MAP_JPA_RELEVANT_DIFF != 0 }}\n+ run: |\n+ declare -A PARAMS TESTGROUP\n+ PARAMS[\"undertow-map-jpa\"]=\"-Pmap-storage,map-storage-jpa -Dpageload.timeout=90000\"\n+ TESTGROUP[\"group1\"]=\"-Dtest=!**.crossdc.**,!**.cluster.**,%regex[org.keycloak.testsuite.(a[abc]|ad[a-l]|[^a-q]).*]\" # Tests alphabetically before admin tests and those after \"r\"\n+ TESTGROUP[\"group2\"]=\"-Dtest=!**.crossdc.**,!**.cluster.**,%regex[org.keycloak.testsuite.(ad[^a-l]|a[^a-d]|b).*]\" # Admin tests and those starting with \"b\"\n+ TESTGROUP[\"group3\"]=\"-Dtest=!**.crossdc.**,!**.cluster.**,%regex[org.keycloak.testsuite.([c-q]).*]\" # All the rest\n+\n+ ./mvnw clean install -nsu -B ${PARAMS[\"${{ matrix.server }}\"]} ${TESTGROUP[\"${{ matrix.tests }}\"]} -f testsuite/integration-arquillian/tests/base/pom.xml | misc/log/trimmer.sh\n+\n+ TEST_RESULT=${PIPESTATUS[0]}\n+ find . -path '*/target/surefire-reports/*.xml' | zip -q reports-${{ matrix.server }}-base-tests-${{ matrix.tests }}.zip -@\n+ exit $TEST_RESULT\n+\n+ - name: Base test reports\n+ uses: actions/upload-artifact@v3\n+ if: failure()\n+ with:\n+ name: reports-${{ matrix.server }}-base-tests-${{ matrix.tests }}\n+ retention-days: 14\n+ path: reports-${{ matrix.server }}-base-tests-${{ matrix.tests }}.zip\n+ if-no-files-found: ignore\n+\ntest-cluster:\nname: Test Clustering\nneeds: build\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/role/delegate/JpaRoleDelegateProvider.java", "new_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/role/delegate/JpaRoleDelegateProvider.java", "diff": "@@ -47,6 +47,7 @@ public class JpaRoleDelegateProvider extends JpaDelegateProvider<JpaRoleEntity>\ncase ID:\ncase REALM_ID:\ncase CLIENT_ID:\n+ case CLIENT_ROLE:\ncase NAME:\ncase DESCRIPTION:\nreturn getDelegate();\n" }, { "change_type": "MODIFY", "old_path": "server-spi-private/src/main/java/org/keycloak/events/admin/AdminEventQuery.java", "new_path": "server-spi-private/src/main/java/org/keycloak/events/admin/AdminEventQuery.java", "diff": "@@ -38,7 +38,7 @@ public interface AdminEventQuery {\n/**\n* Search by authentication realm\n*\n- * @param realmId realm name\n+ * @param realmId realm id\n* @return Associated <code>AdminEventQuery</code> for method chaining\n*/\nAdminEventQuery authRealm(String realmId);\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestingResourceProvider.java", "new_path": "testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestingResourceProvider.java", "diff": "@@ -114,6 +114,7 @@ import java.util.Properties;\nimport java.util.stream.Collectors;\nimport java.util.stream.Stream;\nimport java.util.UUID;\n+import org.keycloak.services.ErrorResponse;\n/**\n* @author <a href=\"mailto:[email protected]\">Stian Thorgersen</a>\n@@ -302,6 +303,8 @@ public class TestingResourceProvider implements RealmResourceProvider {\nEventStoreProvider eventStore = session.getProvider(EventStoreProvider.class);\nRealmModel realm = session.realms().getRealm(realmId);\n+ if (realm == null) return ErrorResponse.error(\"Realm not found\", Response.Status.NOT_FOUND);\n+\neventStore.clear(realm);\nreturn Response.noContent().build();\n}\n@@ -427,6 +430,8 @@ public class TestingResourceProvider implements RealmResourceProvider {\nEventStoreProvider eventStore = session.getProvider(EventStoreProvider.class);\nRealmModel realm = session.realms().getRealm(realmId);\n+ if (realm == null) return ErrorResponse.error(\"Realm not found\", Response.Status.NOT_FOUND);\n+\neventStore.clearAdmin(realm);\nreturn Response.noContent().build();\n}\n@@ -437,6 +442,9 @@ public class TestingResourceProvider implements RealmResourceProvider {\npublic Response clearAdminEventStore(@QueryParam(\"realmId\") String realmId, @QueryParam(\"olderThan\") long olderThan) {\nEventStoreProvider eventStore = session.getProvider(EventStoreProvider.class);\nRealmModel realm = session.realms().getRealm(realmId);\n+\n+ if (realm == null) return ErrorResponse.error(\"Realm not found\", Response.Status.NOT_FOUND);\n+\neventStore.clearAdmin(realm, olderThan);\nreturn Response.noContent().build();\n}\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/events/AbstractEventsTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/events/AbstractEventsTest.java", "diff": "package org.keycloak.testsuite.events;\n+import org.junit.Before;\nimport org.keycloak.representations.idm.RealmRepresentation;\nimport org.keycloak.testsuite.AbstractKeycloakTest;\nimport org.keycloak.testsuite.client.resources.TestingResource;\n@@ -31,16 +32,22 @@ import java.util.List;\n*/\npublic abstract class AbstractEventsTest extends AbstractKeycloakTest {\n+ public static final String REALM_NAME_1 = \"realmName1\";\n+ public static final String REALM_NAME_2 = \"realmName2\";\n+\n+ protected String realmId;\n+ protected String realmId2;\n+\n@Override\npublic void addTestRealms(List<RealmRepresentation> testRealms) {\n- RealmRepresentation rep1 = RealmBuilder.create().name(\"realmId\").build();\n- rep1.setId(\"realmId\");\n-\n- RealmRepresentation rep2 = RealmBuilder.create().name(\"realmId2\").build();\n- rep2.setId(\"realmId2\");\n+ testRealms.add(RealmBuilder.create().name(REALM_NAME_1).build());\n+ testRealms.add(RealmBuilder.create().name(REALM_NAME_2).build());\n+ }\n- testRealms.add(rep1);\n- testRealms.add(rep2);\n+ @Before\n+ public void before() {\n+ realmId = adminClient.realm(REALM_NAME_1).toRepresentation().getId();\n+ realmId2 = adminClient.realm(REALM_NAME_2).toRepresentation().getId();\n}\nprotected TestingResource testing() {\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/events/AdminEventStoreProviderTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/events/AdminEventStoreProviderTest.java", "diff": "@@ -45,7 +45,7 @@ public class AdminEventStoreProviderTest extends AbstractEventsTest {\n@Test\npublic void save() {\n- testing().onAdminEvent(create(\"realmId\", OperationType.CREATE, \"realmId\", \"clientId\", \"userId\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n+ testing().onAdminEvent(create(realmId, OperationType.CREATE, realmId, \"clientId\", \"userId\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n}\n@Test\n@@ -54,15 +54,15 @@ public class AdminEventStoreProviderTest extends AbstractEventsTest {\nlong oldest = System.currentTimeMillis() - 30000;\nlong newest = System.currentTimeMillis() + 30000;\n- testing().onAdminEvent(create(\"realmId\", OperationType.CREATE, \"realmId\", \"clientId\", \"userId\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n- testing().onAdminEvent(create(newest, \"realmId\", OperationType.ACTION, \"realmId\", \"clientId\", \"userId\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n- testing().onAdminEvent(create(newest, \"realmId\", OperationType.ACTION, \"realmId\", \"clientId\", \"userId2\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n- testing().onAdminEvent(create(\"realmId2\", OperationType.CREATE, \"realmId2\", \"clientId\", \"userId\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n- testing().onAdminEvent(create(oldest, \"realmId\", OperationType.CREATE, \"realmId\", \"clientId2\", \"userId\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n- testing().onAdminEvent(create(\"realmId\", OperationType.CREATE, \"realmId\", \"clientId\", \"userId2\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n+ testing().onAdminEvent(create(realmId, OperationType.CREATE, realmId, \"clientId\", \"userId\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n+ testing().onAdminEvent(create(newest, realmId, OperationType.ACTION, realmId, \"clientId\", \"userId\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n+ testing().onAdminEvent(create(newest, realmId, OperationType.ACTION, realmId, \"clientId\", \"userId2\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n+ testing().onAdminEvent(create(realmId2, OperationType.CREATE, realmId2, \"clientId\", \"userId\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n+ testing().onAdminEvent(create(oldest, realmId, OperationType.CREATE, realmId, \"clientId2\", \"userId\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n+ testing().onAdminEvent(create(realmId, OperationType.CREATE, realmId, \"clientId\", \"userId2\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\nAssert.assertEquals(5, testing().getAdminEvents(null, null, null, \"clientId\", null, null, null, null, null, null, null).size());\n- Assert.assertEquals(5, testing().getAdminEvents(null, null, \"realmId\", null, null, null, null, null, null, null, null).size());\n+ Assert.assertEquals(5, testing().getAdminEvents(null, null, realmId, null, null, null, null, null, null, null, null).size());\nAssert.assertEquals(4, testing().getAdminEvents(null, toList(OperationType.CREATE), null, null, null, null, null, null, null, null, null).size());\nAssert.assertEquals(6, testing().getAdminEvents(null, toList(OperationType.CREATE, OperationType.ACTION), null, null, null, null, null, null, null, null, null).size());\nAssert.assertEquals(4, testing().getAdminEvents(null, null, null, null, \"userId\", null, null, null, null, null, null).size());\n@@ -75,8 +75,8 @@ public class AdminEventStoreProviderTest extends AbstractEventsTest {\nAssert.assertEquals(newest, testing().getAdminEvents(null, null, null, null, null, null, null, null, null, null, 1).get(0).getTime());\nAssert.assertEquals(oldest, testing().getAdminEvents(null, null, null, null, null, null, null, null, null, 5, 1).get(0).getTime());\n- testing().clearAdminEventStore(\"realmId\");\n- testing().clearAdminEventStore(\"realmId2\");\n+ testing().clearAdminEventStore(realmId);\n+ testing().clearAdminEventStore(realmId2);\nAssert.assertEquals(0, testing().getAdminEvents(null, null, null, null, null, null, null, null, null, null, null).size());\n@@ -102,20 +102,20 @@ public class AdminEventStoreProviderTest extends AbstractEventsTest {\ne.printStackTrace();\n}\n- testing().onAdminEvent(create(date1, \"realmId\", OperationType.CREATE, \"realmId\", \"clientId\", \"userId\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n- testing().onAdminEvent(create(date1, \"realmId\", OperationType.CREATE, \"realmId\", \"clientId\", \"userId\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n- testing().onAdminEvent(create(date2, \"realmId\", OperationType.ACTION, \"realmId\", \"clientId\", \"userId\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n- testing().onAdminEvent(create(date2, \"realmId\", OperationType.ACTION, \"realmId\", \"clientId\", \"userId\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n- testing().onAdminEvent(create(date3, \"realmId\", OperationType.UPDATE, \"realmId\", \"clientId\", \"userId2\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n- testing().onAdminEvent(create(date3, \"realmId\", OperationType.DELETE, \"realmId\", \"clientId\", \"userId2\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n- testing().onAdminEvent(create(date4, \"realmId2\", OperationType.CREATE, \"realmId2\", \"clientId2\", \"userId2\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n- testing().onAdminEvent(create(date4, \"realmId2\", OperationType.CREATE, \"realmId2\", \"clientId2\", \"userId2\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n+ testing().onAdminEvent(create(date1, realmId, OperationType.CREATE, realmId, \"clientId\", \"userId\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n+ testing().onAdminEvent(create(date1, realmId, OperationType.CREATE, realmId, \"clientId\", \"userId\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n+ testing().onAdminEvent(create(date2, realmId, OperationType.ACTION, realmId, \"clientId\", \"userId\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n+ testing().onAdminEvent(create(date2, realmId, OperationType.ACTION, realmId, \"clientId\", \"userId\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n+ testing().onAdminEvent(create(date3, realmId, OperationType.UPDATE, realmId, \"clientId\", \"userId2\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n+ testing().onAdminEvent(create(date3, realmId, OperationType.DELETE, realmId, \"clientId\", \"userId2\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n+ testing().onAdminEvent(create(date4, realmId2, OperationType.CREATE, realmId2, \"clientId2\", \"userId2\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n+ testing().onAdminEvent(create(date4, realmId2, OperationType.CREATE, realmId2, \"clientId2\", \"userId2\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\nAssert.assertEquals(6, testing().getAdminEvents(null, null, null, \"clientId\", null, null, null, null, null, null, null).size());\nAssert.assertEquals(2, testing().getAdminEvents(null, null, null, \"clientId2\", null, null, null, null, null, null, null).size());\n- Assert.assertEquals(6, testing().getAdminEvents(null, null, \"realmId\", null, null, null, null, null, null, null, null).size());\n- Assert.assertEquals(2, testing().getAdminEvents(null, null, \"realmId2\", null, null, null, null, null, null, null, null).size());\n+ Assert.assertEquals(6, testing().getAdminEvents(null, null, realmId, null, null, null, null, null, null, null, null).size());\n+ Assert.assertEquals(2, testing().getAdminEvents(null, null, realmId2, null, null, null, null, null, null, null, null).size());\nAssert.assertEquals(4, testing().getAdminEvents(null, null, null, null, \"userId\", null, null, null, null, null, null).size());\nAssert.assertEquals(4, testing().getAdminEvents(null, null, null, null, \"userId2\", null, null, null, null, null, null).size());\n@@ -150,12 +150,12 @@ public class AdminEventStoreProviderTest extends AbstractEventsTest {\nlong oldest = System.currentTimeMillis() - 30000;\nlong newest = System.currentTimeMillis() + 30000;\n- testing().onAdminEvent(create(\"realmId\", OperationType.CREATE, \"realmId\", \"clientId\", \"userId\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n- testing().onAdminEvent(create(newest, \"realmId\", OperationType.ACTION, \"realmId\", \"clientId\", \"userId\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n- testing().onAdminEvent(create(newest, \"realmId\", OperationType.ACTION, \"realmId\", \"clientId\", \"userId2\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n- testing().onAdminEvent(create(\"realmId2\", OperationType.CREATE, \"realmId2\", \"clientId\", \"userId\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n- testing().onAdminEvent(create(oldest, \"realmId\", OperationType.CREATE, \"realmId\", \"clientId2\", \"userId\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n- testing().onAdminEvent(create(\"realmId\", OperationType.CREATE, \"realmId\", \"clientId\", \"userId2\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n+ testing().onAdminEvent(create(realmId, OperationType.CREATE, realmId, \"clientId\", \"userId\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n+ testing().onAdminEvent(create(newest, realmId, OperationType.ACTION, realmId, \"clientId\", \"userId\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n+ testing().onAdminEvent(create(newest, realmId, OperationType.ACTION, realmId, \"clientId\", \"userId2\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n+ testing().onAdminEvent(create(realmId2, OperationType.CREATE, realmId2, \"clientId\", \"userId\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n+ testing().onAdminEvent(create(oldest, realmId, OperationType.CREATE, realmId, \"clientId2\", \"userId\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n+ testing().onAdminEvent(create(realmId, OperationType.CREATE, realmId, \"clientId\", \"userId2\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\nAssert.assertEquals(6, testing().getAdminEvents(null, null, null, null, null, null, \"/admin/*\", null, null, null, null).size());\nAssert.assertEquals(6, testing().getAdminEvents(null, null, null, null, null, null, \"*/realms/*\", null, null, null, null).size());\n@@ -168,33 +168,33 @@ public class AdminEventStoreProviderTest extends AbstractEventsTest {\n@Test\npublic void clear() {\n- testing().onAdminEvent(create(System.currentTimeMillis() - 30000, \"realmId\", OperationType.CREATE, \"realmId\", \"clientId\", \"userId\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n- testing().onAdminEvent(create(System.currentTimeMillis() - 20000, \"realmId\", OperationType.CREATE, \"realmId\", \"clientId\", \"userId\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n- testing().onAdminEvent(create(System.currentTimeMillis(), \"realmId\", OperationType.CREATE, \"realmId\", \"clientId\", \"userId\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n- testing().onAdminEvent(create(System.currentTimeMillis(), \"realmId\", OperationType.CREATE, \"realmId\", \"clientId\", \"userId\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n- testing().onAdminEvent(create(System.currentTimeMillis() - 30000, \"realmId2\", OperationType.CREATE, \"realmId2\", \"clientId\", \"userId\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n+ testing().onAdminEvent(create(System.currentTimeMillis() - 30000, realmId, OperationType.CREATE, realmId, \"clientId\", \"userId\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n+ testing().onAdminEvent(create(System.currentTimeMillis() - 20000, realmId, OperationType.CREATE, realmId, \"clientId\", \"userId\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n+ testing().onAdminEvent(create(System.currentTimeMillis(), realmId, OperationType.CREATE, realmId, \"clientId\", \"userId\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n+ testing().onAdminEvent(create(System.currentTimeMillis(), realmId, OperationType.CREATE, realmId, \"clientId\", \"userId\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n+ testing().onAdminEvent(create(System.currentTimeMillis() - 30000, realmId2, OperationType.CREATE, realmId2, \"clientId\", \"userId\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n- testing().clearAdminEventStore(\"realmId\");\n+ testing().clearAdminEventStore(realmId);\nAssert.assertEquals(1, testing().getAdminEvents(null, null, null, null, null, null, null, null, null, null, null).size());\n}\n@Test\npublic void clearOld() {\n- testing().onAdminEvent(create(System.currentTimeMillis() - 30000, \"realmId\", OperationType.CREATE, \"realmId\", \"clientId\", \"userId\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n- testing().onAdminEvent(create(System.currentTimeMillis() - 20000, \"realmId\", OperationType.CREATE, \"realmId\", \"clientId\", \"userId\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n- testing().onAdminEvent(create(System.currentTimeMillis(), \"realmId\", OperationType.CREATE, \"realmId\", \"clientId\", \"userId\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n- testing().onAdminEvent(create(System.currentTimeMillis(), \"realmId\", OperationType.CREATE, \"realmId\", \"clientId\", \"userId\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n- testing().onAdminEvent(create(System.currentTimeMillis() - 30000, \"realmId\", OperationType.CREATE, \"realmId\", \"clientId\", \"userId\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n+ testing().onAdminEvent(create(System.currentTimeMillis() - 30000, realmId, OperationType.CREATE, realmId, \"clientId\", \"userId\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n+ testing().onAdminEvent(create(System.currentTimeMillis() - 20000, realmId, OperationType.CREATE, realmId, \"clientId\", \"userId\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n+ testing().onAdminEvent(create(System.currentTimeMillis(), realmId, OperationType.CREATE, realmId, \"clientId\", \"userId\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n+ testing().onAdminEvent(create(System.currentTimeMillis(), realmId, OperationType.CREATE, realmId, \"clientId\", \"userId\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n+ testing().onAdminEvent(create(System.currentTimeMillis() - 30000, realmId, OperationType.CREATE, realmId, \"clientId\", \"userId\", \"127.0.0.1\", \"/admin/realms/master\", \"error\"), false);\n- testing().clearAdminEventStore(\"realmId\", System.currentTimeMillis() - 10000);\n+ testing().clearAdminEventStore(realmId, System.currentTimeMillis() - 10000);\nAssert.assertEquals(2, testing().getAdminEvents(null, null, null, null, null, null, null, null, null, null, null).size());\n}\n@Test\npublic void handleCustomResourceTypeEvents() {\n- testing().onAdminEvent(create(\"realmId\", OperationType.CREATE, \"realmId\", \"clientId\", \"userId\", \"127.0.0.1\", \"/admin/realms/master\", \"my-custom-resource\", \"error\"), false);\n+ testing().onAdminEvent(create(realmId, OperationType.CREATE, realmId, \"clientId\", \"userId\", \"127.0.0.1\", \"/admin/realms/master\", \"my-custom-resource\", \"error\"), false);\nList<AdminEventRepresentation> adminEvents = testing().getAdminEvents(null, null, null, \"clientId\", null, null, null, null, null, null, null);\nAssert.assertEquals(1, adminEvents.size());\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/events/EventStoreProviderTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/events/EventStoreProviderTest.java", "diff": "@@ -21,27 +21,24 @@ import org.apache.commons.lang3.StringUtils;\nimport org.junit.After;\nimport org.junit.Assert;\nimport org.junit.Assume;\n-import org.junit.Before;\nimport org.junit.Test;\n-import org.keycloak.common.util.Time;\nimport org.keycloak.events.EventStoreProvider;\nimport org.keycloak.events.EventType;\n-import org.keycloak.events.log.JBossLoggingEventListenerProviderFactory;\n-import org.keycloak.models.utils.KeycloakModelUtils;\nimport org.keycloak.representations.idm.EventRepresentation;\nimport org.keycloak.representations.idm.RealmRepresentation;\nimport org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude;\nimport java.text.ParseException;\nimport java.text.SimpleDateFormat;\n-import java.util.ArrayList;\nimport java.util.Date;\nimport java.util.HashMap;\nimport java.util.List;\nimport java.util.Map;\nimport org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer;\n-import org.keycloak.testsuite.util.WaitUtils;\n+\n+import static org.keycloak.testsuite.events.AbstractEventsTest.REALM_NAME_1;\n+import static org.keycloak.testsuite.events.AbstractEventsTest.REALM_NAME_2;\n/**\n* @author <a href=\"mailto:[email protected]\">Stian Thorgersen</a>\n@@ -49,12 +46,6 @@ import org.keycloak.testsuite.util.WaitUtils;\n*/\npublic class EventStoreProviderTest extends AbstractEventsTest {\n- public static final String REALM_NAME_1 = \"realmName1\";\n- public static final String REALM_NAME_2 = \"realmName2\";\n-\n- private String realmId;\n- private String realmId2;\n-\n@Override\npublic void addTestRealms(List<RealmRepresentation> testRealms) {\nsuper.addTestRealms(testRealms);\n@@ -69,12 +60,6 @@ public class EventStoreProviderTest extends AbstractEventsTest {\n}\n}\n- @Before\n- public void before() {\n- realmId = adminClient.realm(REALM_NAME_1).toRepresentation().getId();\n- realmId2 = adminClient.realm(REALM_NAME_2).toRepresentation().getId();\n- }\n-\n@After\npublic void after() {\ntesting().clearEventStore();\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/ClientModelTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/ClientModelTest.java", "diff": "@@ -174,11 +174,12 @@ public class ClientModelTest extends AbstractKeycloakTest {\ncurrentSession = sessionClientRoleRemoveTx2;\nRealmModel realm = currentSession.realms().getRealmByName(realmName);\n- ClientModel scoped = realm.getClientByClientId(\"scoped\");\nClientModel from = realm.getClientByClientId(\"from\");\nRoleModel role = currentSession.roles().getRoleById(realm, roleId);\nfrom.removeRole(role);\n+ ClientModel scoped = realm.getClientByClientId(\"scoped\");\n+\n// used to throw an NPE\nassertThat(\"Scope Mappings is not 0\", scoped.getScopeMappingsStream().count(), is(0L));\ncurrentSession.clients().removeClient(realm, scoped.getId());\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaMapStorageProviderFactory.java", "new_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaMapStorageProviderFactory.java", "diff": "@@ -115,7 +115,7 @@ public class JpaMapStorageProviderFactory implements\nMapStorageProviderFactory,\nEnvironmentDependentProviderFactory {\n- public static final String PROVIDER_ID = \"jpa-map-storage\";\n+ public static final String PROVIDER_ID = \"jpa\";\nprivate static final String SESSION_TX_PREFIX = \"jpa-map-tx-\";\nprivate static final AtomicInteger ENUMERATOR = new AtomicInteger(0);\nprivate static final Logger logger = Logger.getLogger(JpaMapStorageProviderFactory.class);\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/pom.xml", "new_path": "testsuite/integration-arquillian/tests/base/pom.xml", "diff": "<keycloak.map.storage.connectionsJpa.user>${keycloak.map.storage.connectionsJpa.user}</keycloak.map.storage.connectionsJpa.user>\n<keycloak.map.storage.connectionsJpa.password>${keycloak.map.storage.connectionsJpa.password}</keycloak.map.storage.connectionsJpa.password>\n- <keycloak.authSession.map.storage.provider>jpa-map-storage</keycloak.authSession.map.storage.provider>\n- <keycloak.client.map.storage.provider>jpa-map-storage</keycloak.client.map.storage.provider>\n- <keycloak.clientScope.map.storage.provider>jpa-map-storage</keycloak.clientScope.map.storage.provider>\n- <keycloak.group.map.storage.provider>jpa-map-storage</keycloak.group.map.storage.provider>\n- <keycloak.loginFailure.map.storage.provider>jpa-map-storage</keycloak.loginFailure.map.storage.provider>\n- <keycloak.realm.map.storage.provider>jpa-map-storage</keycloak.realm.map.storage.provider>\n- <keycloak.role.map.storage.provider>jpa-map-storage</keycloak.role.map.storage.provider>\n+ <keycloak.authSession.map.storage.provider>jpa</keycloak.authSession.map.storage.provider>\n+ <keycloak.client.map.storage.provider>jpa</keycloak.client.map.storage.provider>\n+ <keycloak.clientScope.map.storage.provider>jpa</keycloak.clientScope.map.storage.provider>\n+ <keycloak.group.map.storage.provider>jpa</keycloak.group.map.storage.provider>\n+ <keycloak.loginFailure.map.storage.provider>jpa</keycloak.loginFailure.map.storage.provider>\n+ <keycloak.realm.map.storage.provider>jpa</keycloak.realm.map.storage.provider>\n+ <keycloak.role.map.storage.provider>jpa</keycloak.role.map.storage.provider>\n</systemPropertyVariables>\n</configuration>\n</plugin>\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/resources/META-INF/keycloak-server.json", "new_path": "testsuite/integration-arquillian/tests/base/src/test/resources/META-INF/keycloak-server.json", "diff": "\"keyType.realms\": \"string\",\n\"keyType.authz-resource-servers\": \"string\"\n},\n- \"jpa-map-storage\": {\n+ \"jpa\": {\n\"url\": \"${keycloak.map.storage.connectionsJpa.url:}\",\n\"user\": \"${keycloak.map.storage.connectionsJpa.user:}\",\n\"password\": \"${keycloak.map.storage.connectionsJpa.password:}\",\n" }, { "change_type": "MODIFY", "old_path": "testsuite/utils/src/main/resources/META-INF/keycloak-server.json", "new_path": "testsuite/utils/src/main/resources/META-INF/keycloak-server.json", "diff": "\"keyType.realms\": \"string\",\n\"keyType.authz-resource-servers\": \"string\"\n},\n- \"jpa-map-storage\": {\n+ \"jpa\": {\n\"url\": \"${keycloak.map.storage.connectionsJpa.url:}\",\n\"user\": \"${keycloak.map.storage.connectionsJpa.user:}\",\n\"password\": \"${keycloak.map.storage.connectionsJpa.password:}\",\n" } ]

[ { "change_type": "MODIFY", "old_path": "testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/JpaMapStorage.java", "new_path": "testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/JpaMapStorage.java", "diff": "@@ -20,6 +20,7 @@ import com.google.common.collect.ImmutableSet;\nimport java.util.Set;\nimport org.jboss.logging.Logger;\nimport org.keycloak.authorization.store.StoreFactorySpi;\n+import org.keycloak.events.EventStoreSpi;\nimport org.keycloak.models.DeploymentStateSpi;\nimport org.keycloak.models.UserLoginFailureSpi;\nimport org.keycloak.models.UserSessionSpi;\n@@ -94,7 +95,8 @@ public class JpaMapStorage extends KeycloakModelParameters {\n.spi(UserLoginFailureSpi.NAME).provider(MapUserLoginFailureProviderFactory.PROVIDER_ID) .config(STORAGE_CONFIG, JpaMapStorageProviderFactory.PROVIDER_ID)\n.spi(\"dblock\").provider(NoLockingDBLockProviderFactory.PROVIDER_ID) .config(STORAGE_CONFIG, ConcurrentHashMapStorageProviderFactory.PROVIDER_ID)\n.spi(UserSessionSpi.NAME).provider(MapUserSessionProviderFactory.PROVIDER_ID) .config(\"storage-user-sessions.provider\", ConcurrentHashMapStorageProviderFactory.PROVIDER_ID)\n- .config(\"storage-client-sessions.provider\", ConcurrentHashMapStorageProviderFactory.PROVIDER_ID);\n-\n+ .config(\"storage-client-sessions.provider\", ConcurrentHashMapStorageProviderFactory.PROVIDER_ID)\n+ .spi(EventStoreSpi.NAME).provider(MapUserSessionProviderFactory.PROVIDER_ID) .config(\"storage-admin-events.provider\", ConcurrentHashMapStorageProviderFactory.PROVIDER_ID)\n+ .config(\"storage-auth-events.provider\", ConcurrentHashMapStorageProviderFactory.PROVIDER_ID);\n}\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/hibernate/jsonb/JsonbType.java", "new_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/hibernate/jsonb/JsonbType.java", "diff": "@@ -21,6 +21,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;\nimport com.fasterxml.jackson.annotation.JsonInclude;\nimport com.fasterxml.jackson.annotation.JsonTypeInfo;\nimport com.fasterxml.jackson.annotation.PropertyAccessor;\n+import com.fasterxml.jackson.databind.DeserializationFeature;\nimport com.fasterxml.jackson.databind.JsonNode;\nimport com.fasterxml.jackson.databind.ObjectMapper;\nimport com.fasterxml.jackson.databind.SerializationFeature;\n@@ -85,6 +86,7 @@ public class JsonbType extends AbstractSingleColumnStandardBasicType<Object> imp\npublic static final ObjectMapper MAPPER = new ObjectMapper()\n.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false)\n.enable(SerializationFeature.INDENT_OUTPUT)\n+ .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)\n.setSerializationInclusion(JsonInclude.Include.NON_NULL)\n.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.NONE)\n.setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY)\n" } ]

[ { "change_type": "MODIFY", "old_path": ".github/workflows/operator-ci.yml", "new_path": ".github/workflows/operator-ci.yml", "diff": "@@ -79,9 +79,8 @@ jobs:\n(cd operator && ./scripts/build-testing-docker-images.sh ${{ steps.vars.outputs.version }} keycloak custom-keycloak)\n- name: Test operator running locally\n- working-directory: operator\nrun: |\n- mvn clean verify \\\n+ mvn -Poperator -pl operator -am clean verify \\\n-Dquarkus.kubernetes.deployment-target=kubernetes \\\n-Doperator.keycloak.image=keycloak:${{ steps.vars.outputs.version }} \\\n-Dtest.operator.custom.image=custom-keycloak:${{ steps.vars.outputs.version }} \\\n@@ -125,10 +124,9 @@ jobs:\n(cd operator && ./scripts/build-testing-docker-images.sh ${{ steps.vars.outputs.version }} keycloak custom-keycloak)\n- name: Test operator running in cluster\n- working-directory: operator\nrun: |\neval $(minikube -p minikube docker-env)\n- mvn clean verify \\\n+ mvn -Poperator -pl operator -am clean verify \\\n-Dquarkus.container-image.build=true \\\n-Dquarkus.kubernetes.deployment-target=kubernetes \\\n-Doperator.keycloak.image=keycloak:${{ steps.vars.outputs.version }} \\\n" } ]

[ { "change_type": "MODIFY", "old_path": "adapters/oidc/adapter-core/src/main/java/org/keycloak/adapters/authentication/ClientIdAndSecretCredentialsProvider.java", "new_path": "adapters/oidc/adapter-core/src/main/java/org/keycloak/adapters/authentication/ClientIdAndSecretCredentialsProvider.java", "diff": "@@ -45,7 +45,7 @@ public class ClientIdAndSecretCredentialsProvider implements ClientCredentialsPr\n@Override\npublic void init(KeycloakDeployment deployment, Object config) {\n- clientSecret = (String) config;\n+ clientSecret = (config == null ? null : config.toString());\n}\n@Override\n" } ]

[ { "change_type": "MODIFY", "old_path": "adapters/oidc/js/dist/keycloak.d.ts", "new_path": "adapters/oidc/js/dist/keycloak.d.ts", "diff": "@@ -151,7 +151,7 @@ export interface KeycloakInitOptions {\n/**\n* Specifies an uri to redirect to after silent check-sso.\n* Silent check-sso will only happen, when this redirect uri is given and\n- * the specified uri is available whithin the application.\n+ * the specified uri is available within the application.\n*/\nsilentCheckSsoRedirectUri?: string;\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/jpa/src/main/java/org/keycloak/connections/jpa/util/JpaUtils.java", "new_path": "model/jpa/src/main/java/org/keycloak/connections/jpa/util/JpaUtils.java", "diff": "@@ -25,7 +25,7 @@ import org.hibernate.jpa.boot.internal.ParsedPersistenceXmlDescriptor;\nimport org.hibernate.jpa.boot.internal.PersistenceXmlParser;\nimport org.hibernate.jpa.boot.spi.Bootstrap;\nimport org.keycloak.connections.jpa.entityprovider.JpaEntityProvider;\n-import org.keycloak.connections.jpa.entityprovider.ProxyClassLoader;\n+import org.keycloak.utils.ProxyClassLoader;\nimport org.keycloak.models.KeycloakSession;\nimport javax.persistence.EntityManager;\n" }, { "change_type": "MODIFY", "old_path": "pom.xml", "new_path": "pom.xml", "diff": "<xmlsec.version>2.2.3</xmlsec.version>\n<glassfish.json.version>1.1.6</glassfish.json.version>\n<wildfly.common.version>1.6.0.Final</wildfly.common.version>\n+ <nashorn.version>15.3</nashorn.version>\n<ua-parser.version>1.5.2</ua-parser.version>\n<picketbox.version>5.0.3.Final</picketbox.version>\n<google.guava.version>30.1-jre</google.guava.version>\n<artifactId>jakarta.json</artifactId>\n<version>${glassfish.json.version}</version>\n</dependency>\n+ <dependency>\n+ <groupId>org.openjdk.nashorn</groupId>\n+ <artifactId>nashorn-core</artifactId>\n+ <version>${nashorn.version}</version>\n+ </dependency>\n<!-- Twitter -->\n<dependency>\n" }, { "change_type": "MODIFY", "old_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/QuarkusPlatform.java", "new_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/QuarkusPlatform.java", "diff": "@@ -19,13 +19,20 @@ package org.keycloak.quarkus.runtime.integration;\nimport java.io.File;\nimport java.io.IOException;\n+import java.net.MalformedURLException;\n+import java.net.URL;\n+import java.net.URLClassLoader;\nimport java.nio.file.Files;\nimport java.nio.file.Path;\n+import java.util.ArrayList;\n+import java.util.LinkedList;\nimport java.util.List;\nimport java.util.concurrent.CopyOnWriteArrayList;\nimport java.util.concurrent.atomic.AtomicBoolean;\n+import java.util.stream.Stream;\nimport org.jboss.logging.Logger;\n+import org.keycloak.Config;\nimport org.keycloak.platform.Platform;\nimport org.keycloak.platform.PlatformProvider;\nimport org.keycloak.quarkus.runtime.InitializationException;\n@@ -159,4 +166,10 @@ public class QuarkusPlatform implements PlatformProvider {\nprivate void reset() {\ndeferredExceptions.clear();\n}\n+\n+ @Override\n+ public ClassLoader getScriptEngineClassLoader(Config.Scope scriptProviderConfig) {\n+ // It is fine to return null assuming that nashorn and it's dependencies are included on the classpath (usually \"providers\" directory)\n+ return null;\n+ }\n}\n" }, { "change_type": "RENAME", "old_path": "model/jpa/src/main/java/org/keycloak/connections/jpa/entityprovider/ProxyClassLoader.java", "new_path": "server-spi-private/src/main/java/org/keycloak/utils/ProxyClassLoader.java", "diff": "/*\n- * Copyright 2016 Red Hat, Inc. and/or its affiliates\n+ * Copyright 2022 Red Hat, Inc. and/or its affiliates\n* and other contributors as indicated by the @author tags.\n*\n* Licensed under the Apache License, Version 2.0 (the \"License\");\n* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n* See the License for the specific language governing permissions and\n* limitations under the License.\n+ *\n*/\n-package org.keycloak.connections.jpa.entityprovider;\n+package org.keycloak.utils;\n+import java.io.IOException;\nimport java.net.URL;\n+import java.util.Arrays;\nimport java.util.Collection;\n-import java.util.HashSet;\n+import java.util.Enumeration;\n+import java.util.Iterator;\n+import java.util.LinkedHashSet;\nimport java.util.Set;\n/**\n@@ -29,7 +34,8 @@ import java.util.Set;\n* Effectively it forms a proxy to one or more other classloaders.\n*\n* The way it works:\n- * - Get all (unique) classloaders from all provided classes\n+ * - Get list of classloaders, which will be used as \"delegates\" when loaded classes or resources.\n+ * - Can be retrived from provided classloaders or alternatively from the provided classes where the \"delegate classloaders\" will be determined from the classloaders of given classes\n* - For each class or resource that is 'requested':\n* - First try all provided classloaders and if we have a match, return that\n* - If no match was found: proceed with 'normal' classloading in 'current classpath' scope\n@@ -41,17 +47,28 @@ public class ProxyClassLoader extends ClassLoader {\nprivate Set<ClassLoader> classloaders;\n- public ProxyClassLoader(Collection<Class<?>> classes, ClassLoader parentClassLoader) {\n- super(parentClassLoader);\n- init(classes);\n+ /**\n+ * Init classloader with the list of given delegates\n+ * @param delegateClassLoaders\n+ */\n+ public ProxyClassLoader(ClassLoader... delegateClassLoaders) {\n+ if (delegateClassLoaders == null || delegateClassLoaders.length == 0) {\n+ throw new IllegalStateException(\"At least one classloader to delegate must be provided\");\n+ }\n+ classloaders = new LinkedHashSet<>();\n+ classloaders.addAll(Arrays.asList(delegateClassLoaders));\n}\n+ /**\n+ * Get all unique classloaders from the provided classes to be used as \"Delegate classloaders\"\n+ * @param classes\n+ */\npublic ProxyClassLoader(Collection<Class<?>> classes) {\ninit(classes);\n}\nprivate void init(Collection<Class<?>> classes) {\n- classloaders = new HashSet<>();\n+ classloaders = new LinkedHashSet<>();\nfor (Class<?> clazz : classes) {\nclassloaders.add(clazz.getClassLoader());\n}\n@@ -84,4 +101,33 @@ public class ProxyClassLoader extends ClassLoader {\nreturn super.getResource(name);\n}\n+ @Override\n+ public Enumeration<URL> getResources(String name) throws IOException {\n+ final LinkedHashSet<URL> resourceUrls = new LinkedHashSet();\n+\n+ for (ClassLoader classloader : classloaders) {\n+ Enumeration<URL> child = classloader.getResources(name);\n+\n+ while (child.hasMoreElements()) {\n+ resourceUrls.add(child.nextElement());\n+ }\n+ }\n+\n+ return new Enumeration<URL>() {\n+ final Iterator<URL> resourceUrlIterator = resourceUrls.iterator();\n+\n+ public boolean hasMoreElements() {\n+ return this.resourceUrlIterator.hasNext();\n+ }\n+\n+ public URL nextElement() {\n+ return (URL)this.resourceUrlIterator.next();\n+ }\n+ };\n+ }\n+\n+ @Override\n+ public String toString() {\n+ return \"ProxyClassLoader: Delegates: \" + classloaders;\n+ }\n}\n" }, { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/platform/PlatformProvider.java", "new_path": "services/src/main/java/org/keycloak/platform/PlatformProvider.java", "diff": "@@ -19,6 +19,8 @@ package org.keycloak.platform;\nimport java.io.File;\n+import org.keycloak.Config;\n+\npublic interface PlatformProvider {\nvoid onStartup(Runnable runnable);\n@@ -33,4 +35,17 @@ public interface PlatformProvider {\n*/\nFile getTmpDirectory();\n+\n+ /**\n+ * Returns classloader to load script engine. Classloader should contain the implementation of {@link javax.script.ScriptEngineFactory}\n+ * and it's definition inside META-INF/services of the jar file(s), which will be provided by this classloader.\n+ *\n+ * This method can return null and in that case, the default Keycloak services classloader will be used for load script engine. Note that java versions earlier than 15 always contain\n+ * the \"nashorn\" script engine by default on the classpath (it is part of the Java platform itself) and hence for them it is always fine to return null (unless you want to override default engine)\n+ *\n+ * @param scriptProviderConfig Configuration scope of the \"default\" provider of \"scripting\" SPI. It can contain some config properties for the classloader (EG. file path)\n+ * @return classloader or null\n+ */\n+ ClassLoader getScriptEngineClassLoader(Config.Scope scriptProviderConfig);\n+\n}\n" }, { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/scripting/DefaultScriptingProvider.java", "new_path": "services/src/main/java/org/keycloak/scripting/DefaultScriptingProvider.java", "diff": "@@ -24,7 +24,9 @@ import javax.script.ScriptEngineManager;\nimport javax.script.ScriptException;\nimport org.keycloak.models.ScriptModel;\n+import org.keycloak.platform.Platform;\nimport org.keycloak.services.ServicesLogger;\n+import org.keycloak.utils.ProxyClassLoader;\n/**\n* A {@link ScriptingProvider} that uses a {@link ScriptEngineManager} to evaluate scripts with a {@link ScriptEngine}.\n@@ -125,8 +127,17 @@ public class DefaultScriptingProvider implements ScriptingProvider {\nprivate ScriptEngine lookupScriptEngineFor(ScriptModel script) {\nClassLoader cl = Thread.currentThread().getContextClassLoader();\ntry {\n- Thread.currentThread().setContextClassLoader(DefaultScriptingProvider.class.getClassLoader());\n- return factory.getScriptEngineManager().getEngineByMimeType(script.getMimeType());\n+ ClassLoader scriptClassLoader = Platform.getPlatform().getScriptEngineClassLoader(factory.getConfig());\n+\n+ // Also need to use classloader of keycloak services itself to be able to use keycloak classes in the scripts\n+ if (scriptClassLoader != null) {\n+ scriptClassLoader = new ProxyClassLoader(scriptClassLoader, DefaultScriptingProvider.class.getClassLoader());\n+ } else {\n+ scriptClassLoader = DefaultScriptingProvider.class.getClassLoader();\n+ }\n+\n+ Thread.currentThread().setContextClassLoader(scriptClassLoader);\n+ return new ScriptEngineManager().getEngineByMimeType(script.getMimeType());\n}\nfinally {\nThread.currentThread().setContextClassLoader(cl);\n" }, { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/scripting/DefaultScriptingProviderFactory.java", "new_path": "services/src/main/java/org/keycloak/scripting/DefaultScriptingProviderFactory.java", "diff": "@@ -23,10 +23,8 @@ import org.jboss.logging.Logger;\nimport org.keycloak.Config;\nimport org.keycloak.models.KeycloakSession;\nimport org.keycloak.models.KeycloakSessionFactory;\n-import org.keycloak.protocol.oidc.OIDCWellKnownProviderFactory;\nimport javax.script.ScriptEngine;\n-import javax.script.ScriptEngineManager;\n/**\n* @author <a href=\"mailto:[email protected]\">Thomas Darimont</a>\n@@ -35,30 +33,28 @@ public class DefaultScriptingProviderFactory implements ScriptingProviderFactory\nprivate static final Logger logger = Logger.getLogger(DefaultScriptingProviderFactory.class);\n- static final String ID = \"script-based-auth\";\n-\n- private ScriptEngineManager scriptEngineManager;\n+ static final String ID = \"default\";\nprivate boolean enableScriptEngineCache;\n// Key is mime-type. Value is engine for the particular mime-type. Cache can be used when the scriptEngine can be shared across multiple threads / requests (which is the case for nashorn)\nprivate Map<String, ScriptEngine> scriptEngineCache;\n+ private Config.Scope config;\n+\n@Override\npublic ScriptingProvider create(KeycloakSession session) {\n- lazyInit();\n-\nreturn new DefaultScriptingProvider(this);\n}\n@Override\npublic void init(Config.Scope config) {\n+ this.config = config;\nthis.enableScriptEngineCache = config.getBoolean(\"enable-script-engine-cache\", true);\nlogger.debugf(\"Enable script engine cache: %b\", this.enableScriptEngineCache);\n+ if (enableScriptEngineCache) {\n+ scriptEngineCache = new ConcurrentHashMap<>();\n}\n-\n- ScriptEngineManager getScriptEngineManager() {\n- return scriptEngineManager;\n}\nboolean isEnableScriptEngineCache() {\n@@ -69,6 +65,10 @@ public class DefaultScriptingProviderFactory implements ScriptingProviderFactory\nreturn scriptEngineCache;\n}\n+ Config.Scope getConfig() {\n+ return config;\n+ }\n+\n@Override\npublic void postInit(KeycloakSessionFactory factory) {\n//NOOP\n@@ -84,17 +84,4 @@ public class DefaultScriptingProviderFactory implements ScriptingProviderFactory\nreturn ID;\n}\n- private void lazyInit() {\n- if (scriptEngineManager == null) {\n- synchronized (this) {\n- if (scriptEngineManager == null) {\n- scriptEngineManager = new ScriptEngineManager();\n- if (enableScriptEngineCache) {\n- scriptEngineCache = new ConcurrentHashMap<>();\n- }\n- }\n- }\n- }\n- }\n-\n}\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/servers/auth-server/jboss/common/ant/configure.xml", "new_path": "testsuite/integration-arquillian/servers/auth-server/jboss/common/ant/configure.xml", "diff": "</filterset>\n</copy>\n</target>\n+\n+ <!-- Needed on Java 15 and later -->\n+ <target name=\"deploy-nashorn-module\">\n+ <copy todir=\"${cli.tmp.dir}\">\n+ <resources>\n+ <file file=\"${common.resources}/jboss-cli/deploy-nashorn-module.cli\"/>\n+ </resources>\n+ <filterset>\n+ <filter token=\"NASHORN_JAR\" value=\"${project.build.directory}/nashorn/nashorn-core-${nashorn.version}.jar\"/>\n+ </filterset>\n+ </copy>\n+ <echo>Nashorn module deployed</echo>\n+ </target>\n+\n</project>\n" }, { "change_type": "ADD", "old_path": null, "new_path": "testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/deploy-nashorn-module.cli", "diff": "+echo *** Installing nashorn-core module ***\n+module add --module-root-dir=../modules/system/layers/keycloak/ \\\n+ --name=org.openjdk.nashorn.nashorn-core \\\n+ --resources=@NASHORN_JAR@ \\\n+ --dependencies=asm.asm,jdk.dynalink\n\\ No newline at end of file\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/servers/auth-server/jboss/pom.xml", "new_path": "testsuite/integration-arquillian/servers/auth-server/jboss/pom.xml", "diff": "</properties>\n</profile>\n+ <!-- Nashorn script engine needs to be manually added for the new Java versions as it is not part of the JDK anymore -->\n+ <profile>\n+ <id>jdk15</id>\n+ <activation>\n+ <jdk>[15,)</jdk>\n+ </activation>\n+\n+ <build>\n+ <pluginManagement>\n+ <plugins>\n+ <plugin>\n+ <artifactId>maven-dependency-plugin</artifactId>\n+ <executions>\n+ <execution>\n+ <id>copy-nashorn-module</id>\n+ <phase>generate-resources</phase>\n+ <goals>\n+ <goal>copy</goal>\n+ </goals>\n+ <configuration>\n+ <artifactItems>\n+ <artifactItem>\n+ <groupId>org.openjdk.nashorn</groupId>\n+ <artifactId>nashorn-core</artifactId>\n+ <version>${nashorn.version}</version>\n+ <type>jar</type>\n+ </artifactItem>\n+ </artifactItems>\n+ <outputDirectory>${project.build.directory}/nashorn</outputDirectory>\n+ <overWriteIfNewer>true</overWriteIfNewer>\n+ </configuration>\n+ </execution>\n+ </executions>\n+ </plugin>\n+ <plugin>\n+ <groupId>org.apache.maven.plugins</groupId>\n+ <artifactId>maven-antrun-plugin</artifactId>\n+ <executions>\n+ <execution>\n+ <id>deploy-nashorn-module</id>\n+ <phase>generate-resources</phase>\n+ <goals>\n+ <goal>run</goal>\n+ </goals>\n+ <configuration>\n+ <target>\n+ <ant antfile=\"${common.resources}/ant/configure.xml\" target=\"deploy-nashorn-module\" />\n+ </target>\n+ </configuration>\n+ </execution>\n+ </executions>\n+ </plugin>\n+ </plugins>\n+ </pluginManagement>\n+ </build>\n+ </profile>\n+\n</profiles>\n</project>\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/servers/auth-server/quarkus/pom.xml", "new_path": "testsuite/integration-arquillian/servers/auth-server/quarkus/pom.xml", "diff": "<auth.server.quarkus.cluster.config>ha</auth.server.quarkus.cluster.config>\n</properties>\n</profile>\n+\n+ <!-- Nashorn script engine needs to be manually added for the new Java versions as it is not part of the JDK anymore -->\n+ <profile>\n+ <id>jdk15</id>\n+ <activation>\n+ <jdk>[15,)</jdk>\n+ </activation>\n+\n+ <dependencies>\n+ <dependency>\n+ <groupId>org.openjdk.nashorn</groupId>\n+ <artifactId>nashorn-core</artifactId>\n+ </dependency>\n+ </dependencies>\n+\n+ <build>\n+ <plugins>\n+ <plugin>\n+ <groupId>org.apache.maven.plugins</groupId>\n+ <artifactId>maven-dependency-plugin</artifactId>\n+ <executions>\n+ <execution>\n+ <id>copy-dependencies-quarkus</id>\n+ <phase>generate-resources</phase>\n+ <goals>\n+ <goal>copy-dependencies</goal>\n+ </goals>\n+ <configuration>\n+ <outputDirectory>${auth.server.home}/providers</outputDirectory>\n+ <includeArtifactIds>nashorn-core,asm,asm-util,asm-commons</includeArtifactIds>\n+ </configuration>\n+ </execution>\n+ </executions>\n+ </plugin>\n+ </plugins>\n+ </build>\n+ </profile>\n+\n</profiles>\n</project>\n\\ No newline at end of file\n" }, { "change_type": "MODIFY", "old_path": "testsuite/utils/pom.xml", "new_path": "testsuite/utils/pom.xml", "diff": "<artifactId>mssql-jdbc</artifactId>\n<version>${mssql.driver.version}</version>\n</dependency>\n+\n+ <!-- Nashorn -->\n+ <dependency>\n+ <groupId>org.openjdk.nashorn</groupId>\n+ <artifactId>nashorn-core</artifactId>\n+ </dependency>\n</dependencies>\n" }, { "change_type": "MODIFY", "old_path": "testsuite/utils/src/main/java/org/keycloak/testsuite/TestPlatform.java", "new_path": "testsuite/utils/src/main/java/org/keycloak/testsuite/TestPlatform.java", "diff": "@@ -22,6 +22,7 @@ import java.io.IOException;\nimport java.nio.file.Files;\nimport org.jboss.logging.Logger;\n+import org.keycloak.Config;\nimport org.keycloak.platform.PlatformProvider;\npublic class TestPlatform implements PlatformProvider {\n@@ -70,4 +71,10 @@ public class TestPlatform implements PlatformProvider {\n}\nreturn tmpDir;\n}\n+\n+ @Override\n+ public ClassLoader getScriptEngineClassLoader(Config.Scope scriptProviderConfig) {\n+ // It is fine to return null as nashorn should be automatically included on the classpath of testsuite utils\n+ return null;\n+ }\n}\n" }, { "change_type": "MODIFY", "old_path": "wildfly/extensions/src/main/java/org/keycloak/provider/wildfly/WildflyPlatform.java", "new_path": "wildfly/extensions/src/main/java/org/keycloak/provider/wildfly/WildflyPlatform.java", "diff": "@@ -20,6 +20,11 @@ package org.keycloak.provider.wildfly;\nimport java.io.File;\nimport org.jboss.logging.Logger;\n+import org.jboss.modules.Module;\n+import org.jboss.modules.ModuleIdentifier;\n+import org.jboss.modules.ModuleLoadException;\n+import org.keycloak.Config;\n+import org.keycloak.common.util.Environment;\nimport org.keycloak.platform.PlatformProvider;\nimport org.keycloak.services.ServicesLogger;\n@@ -27,6 +32,9 @@ public class WildflyPlatform implements PlatformProvider {\nprivate static final Logger log = Logger.getLogger(WildflyPlatform.class);\n+ // In this module, the attempt to load script engine will be done by default\n+ private static final String DEFAULT_SCRIPT_ENGINE_MODULE = \"org.openjdk.nashorn.nashorn-core\";\n+\nRunnable shutdownHook;\nprivate File tmpDir;\n@@ -74,4 +82,25 @@ public class WildflyPlatform implements PlatformProvider {\n}\nreturn tmpDir;\n}\n+\n+ @Override\n+ public ClassLoader getScriptEngineClassLoader(Config.Scope scriptProviderConfig) {\n+ String engineModule = scriptProviderConfig.get(\"script-engine-module\");\n+ if (engineModule == null) {\n+ engineModule = DEFAULT_SCRIPT_ENGINE_MODULE;\n+ }\n+\n+ try {\n+ Module module = Module.getContextModuleLoader().loadModule(ModuleIdentifier.fromString(engineModule));\n+ log.infof(\"Found script engine module '%s'\", engineModule);\n+ return module.getClassLoader();\n+ } catch (ModuleLoadException mle) {\n+ if (WildflyUtil.getJavaVersion() >= 15) {\n+ log.warnf(\"Cannot find script engine in the JBoss module '%s'. Please add JavaScript engine to the specified JBoss Module or make sure it is available on the classpath\", engineModule);\n+ } else {\n+ log.debugf(\"Cannot find script engine in the JBoss module '%s'. Will fallback to the default script engine\", engineModule);\n+ }\n+ return null;\n+ }\n+ }\n}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "wildfly/extensions/src/main/java/org/keycloak/provider/wildfly/WildflyUtil.java", "diff": "+/*\n+ * Copyright 2022 Red Hat, Inc. and/or its affiliates\n+ * and other contributors as indicated by the @author tags.\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ *\n+ */\n+\n+package org.keycloak.provider.wildfly;\n+\n+/**\n+ * @author <a href=\"mailto:[email protected]\">Marek Posolda</a>\n+ */\n+public class WildflyUtil {\n+\n+ /**\n+ * @return major version of java runtime like 8, 11 or 17\n+ */\n+ public static int getJavaVersion() {\n+ String version = System.getProperty(\"java.version\");\n+ if (version.startsWith(\"1.\")) {\n+ version = version.substring(2, 3);\n+ } else {\n+ int dot = version.indexOf(\".\");\n+ if (dot != -1) version = version.substring(0, dot);\n+ }\n+\n+ return Integer.parseInt(version);\n+ }\n+}\n" } ]

[ { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/protocol/oidc/TokenManager.java", "new_path": "services/src/main/java/org/keycloak/protocol/oidc/TokenManager.java", "diff": "@@ -357,7 +357,7 @@ public class TokenManager {\n}\n- public RefreshResult refreshAccessToken(KeycloakSession session, UriInfo uriInfo, ClientConnection connection, RealmModel realm, ClientModel authorizedClient,\n+ public AccessTokenResponseBuilder refreshAccessToken(KeycloakSession session, UriInfo uriInfo, ClientConnection connection, RealmModel realm, ClientModel authorizedClient,\nString encodedRefreshToken, EventBuilder event, HttpHeaders headers, HttpRequest request) throws OAuthErrorException {\nRefreshToken refreshToken = verifyRefreshToken(session, realm, authorizedClient, request, encodedRefreshToken, true);\n@@ -410,9 +410,7 @@ public class TokenManager {\nresponseBuilder.generateIDToken().generateAccessTokenHash();\n}\n- AccessTokenResponse res = responseBuilder.build();\n-\n- return new RefreshResult(res, TokenUtil.TOKEN_TYPE_OFFLINE.equals(refreshToken.getType()));\n+ return responseBuilder;\n}\nprivate void validateTokenReuseForRefresh(KeycloakSession session, RealmModel realm, RefreshToken refreshToken,\n@@ -1192,6 +1190,10 @@ public class TokenManager {\nreturn this;\n}\n+ public boolean isOfflineToken() {\n+ return refreshToken != null && TokenUtil.TOKEN_TYPE_OFFLINE.equals(refreshToken.getType());\n+ }\n+\npublic AccessTokenResponse build() {\nif (accessToken != null) {\nevent.detail(Details.TOKEN_ID, accessToken.getId());\n@@ -1279,25 +1281,6 @@ public class TokenManager {\nreturn TokenUtil.TOKEN_TYPE_BEARER;\n}\n- public static class RefreshResult {\n-\n- private final AccessTokenResponse response;\n- private final boolean offlineToken;\n-\n- private RefreshResult(AccessTokenResponse response, boolean offlineToken) {\n- this.response = response;\n- this.offlineToken = offlineToken;\n- }\n-\n- public AccessTokenResponse getResponse() {\n- return response;\n- }\n-\n- public boolean isOfflineToken() {\n- return offlineToken;\n- }\n- }\n-\npublic static class NotBeforeCheck implements TokenVerifier.Predicate<JsonWebToken> {\nprivate final int notBefore;\n" }, { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/protocol/oidc/endpoints/TokenEndpoint.java", "new_path": "services/src/main/java/org/keycloak/protocol/oidc/endpoints/TokenEndpoint.java", "diff": "@@ -502,10 +502,10 @@ public class TokenEndpoint {\nAccessTokenResponse res;\ntry {\n// KEYCLOAK-6771 Certificate Bound Token\n- TokenManager.RefreshResult result = tokenManager.refreshAccessToken(session, session.getContext().getUri(), clientConnection, realm, client, refreshToken, event, headers, request);\n- res = result.getResponse();\n+ TokenManager.AccessTokenResponseBuilder responseBuilder = tokenManager.refreshAccessToken(session, session.getContext().getUri(), clientConnection, realm, client, refreshToken, event, headers, request);\n+ res = responseBuilder.build();\n- if (!result.isOfflineToken()) {\n+ if (!responseBuilder.isOfflineToken()) {\nUserSessionModel userSession = session.sessions().getUserSession(realm, res.getSessionState());\nAuthenticatedClientSessionModel clientSession = userSession.getAuthenticatedClientSessionByClient(client.getId());\nupdateClientSession(clientSession);\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/map-jpa/src/main/resources/META-INF/client-scopes/jpa-client-scopes-changelog-1.xml", "new_path": "model/map-jpa/src/main/resources/META-INF/client-scopes/jpa-client-scopes-changelog-1.xml", "diff": "@@ -57,8 +57,6 @@ limitations under the License.\n<column name=\"name\" type=\"VARCHAR(255)\"/>\n<column name=\"value\" type=\"text\"/>\n</createTable>\n- <!-- this is deferrable and initiallyDeferred as hibernate will first insert new entries and then delete the old by default -->\n- <addUniqueConstraint tableName=\"kc_client_scope_attribute\" columnNames=\"fk_root, name, value\" deferrable=\"true\" initiallyDeferred=\"true\" />\n<createIndex tableName=\"kc_client_scope_attribute\" indexName=\"client_scope_attr_fk_root\">\n<column name=\"fk_root\"/>\n</createIndex>\n@@ -71,4 +69,11 @@ limitations under the License.\n</modifySql>\n</changeSet>\n+ <changeSet author=\"keycloak\" id=\"client-scopes-2\" dbms=\"postgresql\">\n+ <!-- this is deferrable and initiallyDeferred as hibernate will first insert new entries and then delete the old by default -->\n+ <!-- this will not work on cockroachdb as deferred indexes are not supported in version 22.1 yet, therefore, only run it on postgresql -->\n+ <!-- see https://go.crdb.dev/issue-v/31632/v21.2 for the current status of the implementation -->\n+ <addUniqueConstraint tableName=\"kc_client_scope_attribute\" columnNames=\"fk_root, name, value\" deferrable=\"true\" initiallyDeferred=\"true\" />\n+ </changeSet>\n+\n</databaseChangeLog>\n" }, { "change_type": "MODIFY", "old_path": "model/map-jpa/src/main/resources/META-INF/clients/jpa-clients-changelog-1.xml", "new_path": "model/map-jpa/src/main/resources/META-INF/clients/jpa-clients-changelog-1.xml", "diff": "@@ -64,8 +64,6 @@ limitations under the License.\n<column name=\"name\" type=\"VARCHAR(255)\"/>\n<column name=\"value\" type=\"text\"/>\n</createTable>\n- <!-- this is deferrable and initiallyDeferred as hibernate will first insert new entries and then delete the old by default -->\n- <addUniqueConstraint tableName=\"kc_client_attribute\" columnNames=\"fk_root, name, value\" deferrable=\"true\" initiallyDeferred=\"true\" />\n<createIndex tableName=\"kc_client_attribute\" indexName=\"client_attr_fk_root\">\n<column name=\"fk_root\"/>\n</createIndex>\n@@ -78,4 +76,11 @@ limitations under the License.\n</modifySql>\n</changeSet>\n+ <changeSet author=\"keycloak\" id=\"clients-2\" dbms=\"postgresql\">\n+ <!-- this is deferrable and initiallyDeferred as hibernate will first insert new entries and then delete the old by default -->\n+ <!-- this will not work on cockroachdb as deferred indexes are not supported in version 22.1 yet, therefore, only run it on postgresql -->\n+ <!-- see https://go.crdb.dev/issue-v/31632/v21.2 for the current status of the implementation -->\n+ <addUniqueConstraint tableName=\"kc_client_attribute\" columnNames=\"fk_root, name, value\" deferrable=\"true\" initiallyDeferred=\"true\" />\n+ </changeSet>\n+\n</databaseChangeLog>\n" }, { "change_type": "MODIFY", "old_path": "model/map-jpa/src/main/resources/META-INF/groups/jpa-groups-changelog-1.xml", "new_path": "model/map-jpa/src/main/resources/META-INF/groups/jpa-groups-changelog-1.xml", "diff": "@@ -64,8 +64,6 @@ limitations under the License.\n<column name=\"name\" type=\"VARCHAR(255)\"/>\n<column name=\"value\" type=\"text\"/>\n</createTable>\n- <!-- this is deferrable and initiallyDeferred as hibernate will first insert new entries and then delete the old by default -->\n- <addUniqueConstraint tableName=\"kc_group_attribute\" columnNames=\"fk_root, name, value\" deferrable=\"true\" initiallyDeferred=\"true\" />\n<createIndex tableName=\"kc_group_attribute\" indexName=\"group_attr_fk_root\">\n<column name=\"fk_root\"/>\n</createIndex>\n@@ -78,4 +76,11 @@ limitations under the License.\n</modifySql>\n</changeSet>\n+ <changeSet author=\"keycloak\" id=\"groups-2\" dbms=\"postgresql\">\n+ <!-- this is deferrable and initiallyDeferred as hibernate will first insert new entries and then delete the old by default -->\n+ <!-- this will not work on cockroachdb as deferred indexes are not supported in version 22.1 yet, therefore, only run it on postgresql -->\n+ <!-- see https://go.crdb.dev/issue-v/31632/v21.2 for the current status of the implementation -->\n+ <addUniqueConstraint tableName=\"kc_group_attribute\" columnNames=\"fk_root, name, value\" deferrable=\"true\" initiallyDeferred=\"true\" />\n+ </changeSet>\n+\n</databaseChangeLog>\n" }, { "change_type": "MODIFY", "old_path": "model/map-jpa/src/main/resources/META-INF/realms/jpa-realms-changelog-1.xml", "new_path": "model/map-jpa/src/main/resources/META-INF/realms/jpa-realms-changelog-1.xml", "diff": "@@ -83,8 +83,6 @@ limitations under the License.\n<column name=\"name\" type=\"VARCHAR(255)\"/>\n<column name=\"value\" type=\"TEXT\"/>\n</createTable>\n- <!-- this is deferrable and initiallyDeferred as hibernate will first insert new entries and then delete the old by default -->\n- <addUniqueConstraint tableName=\"kc_realm_attribute\" columnNames=\"fk_root, name, value\" deferrable=\"true\" initiallyDeferred=\"true\" />\n<createIndex tableName=\"kc_realm_attribute\" indexName=\"realm_attr_fk_root\">\n<column name=\"fk_root\"/>\n</createIndex>\n@@ -97,4 +95,11 @@ limitations under the License.\n</modifySql>\n</changeSet>\n+ <changeSet author=\"keycloak\" id=\"realms-2\" dbms=\"postgresql\">\n+ <!-- this is deferrable and initiallyDeferred as hibernate will first insert new entries and then delete the old by default -->\n+ <!-- this will not work on cockroachdb as deferred indexes are not supported in version 22.1 yet, therefore, only run it on postgresql -->\n+ <!-- see https://go.crdb.dev/issue-v/31632/v21.2 for the current status of the implementation -->\n+ <addUniqueConstraint tableName=\"kc_realm_attribute\" columnNames=\"fk_root, name, value\" deferrable=\"true\" initiallyDeferred=\"true\" />\n+ </changeSet>\n+\n</databaseChangeLog>\n" }, { "change_type": "MODIFY", "old_path": "model/map-jpa/src/main/resources/META-INF/roles/jpa-roles-changelog-1.xml", "new_path": "model/map-jpa/src/main/resources/META-INF/roles/jpa-roles-changelog-1.xml", "diff": "@@ -66,8 +66,6 @@ limitations under the License.\n<column name=\"name\" type=\"VARCHAR(255)\"/>\n<column name=\"value\" type=\"text\"/>\n</createTable>\n- <!-- this is deferrable and initiallyDeferred as hibernate will first insert new entries and then delete the old by default -->\n- <addUniqueConstraint tableName=\"kc_role_attribute\" columnNames=\"fk_root, name, value\" deferrable=\"true\" initiallyDeferred=\"true\" />\n<createIndex tableName=\"kc_role_attribute\" indexName=\"role_attr_fk_root\">\n<column name=\"fk_root\"/>\n</createIndex>\n@@ -80,4 +78,11 @@ limitations under the License.\n</modifySql>\n</changeSet>\n+ <changeSet author=\"keycloak\" id=\"roles-2\" dbms=\"postgresql\">\n+ <!-- this is deferrable and initiallyDeferred as hibernate will first insert new entries and then delete the old by default -->\n+ <!-- this will not work on cockroachdb as deferred indexes are not supported in version 22.1 yet, therefore, only run it on postgresql -->\n+ <!-- see https://go.crdb.dev/issue-v/31632/v21.2 for the current status of the implementation -->\n+ <addUniqueConstraint tableName=\"kc_role_attribute\" columnNames=\"fk_root, name, value\" deferrable=\"true\" initiallyDeferred=\"true\" />\n+ </changeSet>\n+\n</databaseChangeLog>\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/storage/chm/ConcurrentHashMapStorage.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/storage/chm/ConcurrentHashMapStorage.java", "diff": "@@ -129,7 +129,12 @@ public class ConcurrentHashMapStorage<K, V extends AbstractEntity & UpdatableEnt\n@SuppressWarnings(\"unchecked\")\npublic MapKeycloakTransaction<V, M> createTransaction(KeycloakSession session) {\nMapKeycloakTransaction<V, M> sessionTransaction = session.getAttribute(\"map-transaction-\" + hashCode(), MapKeycloakTransaction.class);\n- return sessionTransaction == null ? new ConcurrentHashMapKeycloakTransaction<>(this, keyConverter, cloner, fieldPredicates) : sessionTransaction;\n+\n+ if (sessionTransaction == null) {\n+ sessionTransaction = new ConcurrentHashMapKeycloakTransaction<>(this, keyConverter, cloner, fieldPredicates);\n+ session.setAttribute(\"map-transaction-\" + hashCode(), sessionTransaction);\n+ }\n+ return sessionTransaction;\n}\npublic MapModelCriteriaBuilder<K, V, M> createCriteriaBuilder() {\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/storage/chm/UserSessionConcurrentHashMapStorage.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/storage/chm/UserSessionConcurrentHashMapStorage.java", "diff": "@@ -92,6 +92,11 @@ public class UserSessionConcurrentHashMapStorage<K> extends ConcurrentHashMapSto\n@SuppressWarnings(\"unchecked\")\npublic MapKeycloakTransaction<MapUserSessionEntity, UserSessionModel> createTransaction(KeycloakSession session) {\nMapKeycloakTransaction<MapUserSessionEntity, UserSessionModel> sessionTransaction = session.getAttribute(\"map-transaction-\" + hashCode(), MapKeycloakTransaction.class);\n- return sessionTransaction == null ? new Transaction(clientSessionStore.createTransaction(session), clientSessionStore.getKeyConverter(), cloner, fieldPredicates) : sessionTransaction;\n+\n+ if (sessionTransaction == null) {\n+ sessionTransaction = new Transaction(clientSessionStore.createTransaction(session), clientSessionStore.getKeyConverter(), cloner, fieldPredicates);\n+ session.setAttribute(\"map-transaction-\" + hashCode(), sessionTransaction);\n+ }\n+ return sessionTransaction;\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "testsuite/model/src/test/java/org/keycloak/testsuite/model/session/UserSessionProviderModelTest.java", "new_path": "testsuite/model/src/test/java/org/keycloak/testsuite/model/session/UserSessionProviderModelTest.java", "diff": "@@ -20,6 +20,7 @@ import org.junit.Assert;\nimport org.junit.Test;\nimport org.keycloak.common.util.Time;\nimport org.keycloak.models.AuthenticatedClientSessionModel;\n+import org.keycloak.models.ClientModel;\nimport org.keycloak.models.Constants;\nimport org.keycloak.models.KeycloakSession;\nimport org.keycloak.models.RealmModel;\n@@ -42,6 +43,8 @@ import java.util.List;\nimport java.util.concurrent.atomic.AtomicReference;\nimport java.util.stream.Collectors;\n+import static org.hamcrest.CoreMatchers.nullValue;\n+import static org.hamcrest.MatcherAssert.assertThat;\nimport static org.keycloak.testsuite.model.session.UserSessionPersisterProviderTest.createClients;\nimport static org.keycloak.testsuite.model.session.UserSessionPersisterProviderTest.createSessions;\n@@ -202,4 +205,20 @@ public class UserSessionProviderModelTest extends KeycloakModelTest {\n}\n}\n}\n+\n+ @Test\n+ public void testCascadeRemovalOfClientSessionOnUserSessionRemoval() {\n+ UserSessionModel[] origSessions = inComittedTransaction(session -> { return createSessions(session, realmId); });\n+\n+ String testAppClientSessionId = withRealm(realmId, (session, realm) -> {\n+ ClientModel testApp = realm.getClientByClientId(\"test-app\");\n+ UserSessionModel userSessionToBeRemoved = session.sessions().getUserSession(realm, origSessions[0].getId());\n+ String returnValue = userSessionToBeRemoved.getAuthenticatedClientSessions().get(testApp.getId()).getId();\n+\n+ session.sessions().removeUserSession(realm, userSessionToBeRemoved);\n+ return returnValue;\n+ });\n+\n+ assertThat(withRealm(realmId, (session, realm) -> session.sessions().getClientSession(origSessions[0], realm.getClientByClientId(\"test-app\"), testAppClientSessionId, false)), nullValue());\n+ }\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/HotRodMapStorage.java", "new_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/HotRodMapStorage.java", "diff": "@@ -56,10 +56,10 @@ public class HotRodMapStorage<K, E extends AbstractHotRodEntity, V extends HotRo\nprivate static final Logger LOG = Logger.getLogger(HotRodMapStorage.class);\nprivate final RemoteCache<K, E> remoteCache;\n- private final StringKeyConverter<K> keyConverter;\n- private final HotRodEntityDescriptor<E, V> storedEntityDescriptor;\n+ protected final StringKeyConverter<K> keyConverter;\n+ protected final HotRodEntityDescriptor<E, V> storedEntityDescriptor;\nprivate final Function<E, V> delegateProducer;\n- private final DeepCloner cloner;\n+ protected final DeepCloner cloner;\npublic HotRodMapStorage(RemoteCache<K, E> remoteCache, StringKeyConverter<K> keyConverter, HotRodEntityDescriptor<E, V> storedEntityDescriptor, DeepCloner cloner) {\nthis.remoteCache = remoteCache;\n@@ -191,7 +191,13 @@ public class HotRodMapStorage<K, E extends AbstractHotRodEntity, V extends HotRo\n@Override\npublic MapKeycloakTransaction<V, M> createTransaction(KeycloakSession session) {\n+ MapKeycloakTransaction<V, M> sessionTransaction = session.getAttribute(\"map-transaction-\" + hashCode(), MapKeycloakTransaction.class);\n+\n+ if (sessionTransaction == null) {\nMap<SearchableModelField<? super M>, MapModelCriteriaBuilder.UpdatePredicatesFunc<K, V, M>> fieldPredicates = MapFieldPredicates.getPredicates((Class<M>) storedEntityDescriptor.getModelTypeClass());\n- return new ConcurrentHashMapKeycloakTransaction<>(this, keyConverter, cloner, fieldPredicates);\n+ sessionTransaction = new ConcurrentHashMapKeycloakTransaction<>(this, keyConverter, cloner, fieldPredicates);\n+ session.setAttribute(\"map-transaction-\" + hashCode(), sessionTransaction);\n+ }\n+ return sessionTransaction;\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/HotRodMapStorageProvider.java", "new_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/HotRodMapStorageProvider.java", "diff": "package org.keycloak.models.map.storage.hotRod;\n+import org.keycloak.models.KeycloakSession;\nimport org.keycloak.models.map.common.AbstractEntity;\n-import org.keycloak.models.map.common.DeepCloner;\n-import org.keycloak.models.map.storage.hotRod.common.AbstractHotRodEntity;\n-import org.keycloak.models.map.storage.hotRod.common.HotRodEntityDelegate;\n-import org.keycloak.models.map.storage.hotRod.common.HotRodEntityDescriptor;\n-import org.keycloak.models.map.common.StringKeyConverter;\n-import org.keycloak.models.map.storage.hotRod.connections.HotRodConnectionProvider;\nimport org.keycloak.models.map.storage.MapStorage;\nimport org.keycloak.models.map.storage.MapStorageProvider;\nimport org.keycloak.models.map.storage.MapStorageProviderFactory;\npublic class HotRodMapStorageProvider implements MapStorageProvider {\n+ private final KeycloakSession session;\nprivate final HotRodMapStorageProviderFactory factory;\n- private final HotRodConnectionProvider connectionProvider;\n- private final DeepCloner cloner;\n- public HotRodMapStorageProvider(HotRodMapStorageProviderFactory factory, HotRodConnectionProvider connectionProvider, DeepCloner cloner) {\n+ public HotRodMapStorageProvider(KeycloakSession session, HotRodMapStorageProviderFactory factory) {\n+ this.session = session;\nthis.factory = factory;\n- this.connectionProvider = connectionProvider;\n- this.cloner = cloner;\n}\n@Override\npublic <V extends AbstractEntity, M> MapStorage<V, M> getStorage(Class<M> modelType, MapStorageProviderFactory.Flag... flags) {\n- HotRodMapStorage storage = getHotRodStorage(modelType, flags);\n- return storage;\n- }\n-\n- @SuppressWarnings(\"unchecked\")\n- public <E extends AbstractHotRodEntity, V extends HotRodEntityDelegate<E> & AbstractEntity, M> HotRodMapStorage<String, E, V, M> getHotRodStorage(Class<M> modelType, MapStorageProviderFactory.Flag... flags) {\n- HotRodEntityDescriptor<E, V> entityDescriptor = (HotRodEntityDescriptor<E, V>) factory.getEntityDescriptor(modelType);\n- return new HotRodMapStorage<>(connectionProvider.getRemoteCache(entityDescriptor.getCacheName()), StringKeyConverter.StringKey.INSTANCE, entityDescriptor, cloner);\n+ return (MapStorage<V, M>) factory.getHotRodStorage(session, modelType, flags);\n}\n@Override\n" }, { "change_type": "MODIFY", "old_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/HotRodMapStorageProviderFactory.java", "new_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/HotRodMapStorageProviderFactory.java", "diff": "@@ -45,6 +45,8 @@ import org.keycloak.models.map.authorization.entity.MapScopeEntity;\nimport org.keycloak.models.map.authSession.MapAuthenticationSessionEntity;\nimport org.keycloak.models.map.authSession.MapRootAuthenticationSessionEntity;\nimport org.keycloak.models.map.clientscope.MapClientScopeEntity;\n+import org.keycloak.models.map.common.AbstractEntity;\n+import org.keycloak.models.map.common.StringKeyConverter;\nimport org.keycloak.models.map.group.MapGroupEntity;\nimport org.keycloak.models.map.loginFailure.MapUserLoginFailureEntity;\nimport org.keycloak.models.map.realm.MapRealmEntity;\n@@ -73,6 +75,8 @@ import org.keycloak.models.map.storage.hotRod.authorization.HotRodResourceServer\nimport org.keycloak.models.map.storage.hotRod.authorization.HotRodResourceServerEntityDelegate;\nimport org.keycloak.models.map.storage.hotRod.authorization.HotRodScopeEntity;\nimport org.keycloak.models.map.storage.hotRod.authorization.HotRodScopeEntityDelegate;\n+import org.keycloak.models.map.storage.hotRod.common.AbstractHotRodEntity;\n+import org.keycloak.models.map.storage.hotRod.common.HotRodEntityDelegate;\nimport org.keycloak.models.map.storage.hotRod.loginFailure.HotRodUserLoginFailureEntity;\nimport org.keycloak.models.map.storage.hotRod.loginFailure.HotRodUserLoginFailureEntityDelegate;\nimport org.keycloak.models.map.storage.hotRod.role.HotRodRoleEntity;\n@@ -113,6 +117,7 @@ import org.keycloak.models.map.storage.hotRod.userSession.HotRodAuthenticatedCli\nimport org.keycloak.models.map.storage.hotRod.userSession.HotRodAuthenticatedClientSessionEntityDelegate;\nimport org.keycloak.models.map.storage.hotRod.userSession.HotRodUserSessionEntity;\nimport org.keycloak.models.map.storage.hotRod.userSession.HotRodUserSessionEntityDelegate;\n+import org.keycloak.models.map.storage.hotRod.userSession.HotRodUserSessionMapStorage;\nimport org.keycloak.models.map.user.MapUserConsentEntity;\nimport org.keycloak.models.map.user.MapUserCredentialEntity;\nimport org.keycloak.models.map.user.MapUserEntity;\n@@ -124,11 +129,14 @@ import org.keycloak.sessions.RootAuthenticationSessionModel;\nimport java.util.HashMap;\nimport java.util.Map;\n+import java.util.concurrent.ConcurrentHashMap;\npublic class HotRodMapStorageProviderFactory implements AmphibianProviderFactory<MapStorageProvider>, MapStorageProviderFactory, EnvironmentDependentProviderFactory {\npublic static final String PROVIDER_ID = \"hotrod\";\nprivate static final Logger LOG = Logger.getLogger(HotRodMapStorageProviderFactory.class);\n+ private final Map<Class<?>, HotRodMapStorage> storages = new ConcurrentHashMap<>();\n+\nprivate final static DeepCloner CLONER = new DeepCloner.Builder()\n.constructor(MapRootAuthenticationSessionEntity.class, HotRodRootAuthenticationSessionEntityDelegate::new)\n@@ -289,17 +297,28 @@ public class HotRodMapStorageProviderFactory implements AmphibianProviderFactory\n@Override\npublic MapStorageProvider create(KeycloakSession session) {\n- HotRodConnectionProvider cacheProvider = session.getProvider(HotRodConnectionProvider.class);\n+ return new HotRodMapStorageProvider(session, this);\n+ }\n- if (cacheProvider == null) {\n- throw new IllegalStateException(\"Cannot find HotRodConnectionProvider interface implementation\");\n+ public HotRodEntityDescriptor<?, ?> getEntityDescriptor(Class<?> c) {\n+ return ENTITY_DESCRIPTOR_MAP.get(c);\n}\n- return new HotRodMapStorageProvider(this, cacheProvider, CLONER);\n+ public <E extends AbstractHotRodEntity, V extends HotRodEntityDelegate<E> & AbstractEntity, M> HotRodMapStorage<String, E, V, M> getHotRodStorage(KeycloakSession session, Class<M> modelType, MapStorageProviderFactory.Flag... flags) {\n+ if (modelType == UserSessionModel.class) getHotRodStorage(session, AuthenticatedClientSessionModel.class, flags);\n+ return storages.computeIfAbsent(modelType, c -> createHotRodStorage(session, modelType, flags));\n}\n- public HotRodEntityDescriptor<?, ?> getEntityDescriptor(Class<?> c) {\n- return ENTITY_DESCRIPTOR_MAP.get(c);\n+ private <E extends AbstractHotRodEntity, V extends HotRodEntityDelegate<E> & AbstractEntity, M> HotRodMapStorage<String, E, V, M> createHotRodStorage(KeycloakSession session, Class<M> modelType, MapStorageProviderFactory.Flag... flags) {\n+ HotRodConnectionProvider connectionProvider = session.getProvider(HotRodConnectionProvider.class);\n+ HotRodEntityDescriptor<E, V> entityDescriptor = (HotRodEntityDescriptor<E, V>) getEntityDescriptor(modelType);\n+\n+ if (modelType == UserSessionModel.class) {\n+ HotRodMapStorage clientSessionStore = getHotRodStorage(session, AuthenticatedClientSessionModel.class);\n+ return new HotRodUserSessionMapStorage(clientSessionStore, connectionProvider.getRemoteCache(entityDescriptor.getCacheName()), StringKeyConverter.StringKey.INSTANCE, entityDescriptor, CLONER);\n+\n+ }\n+ return new HotRodMapStorage<>(connectionProvider.getRemoteCache(entityDescriptor.getCacheName()), StringKeyConverter.StringKey.INSTANCE, entityDescriptor, CLONER);\n}\n@Override\n" }, { "change_type": "ADD", "old_path": null, "new_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/userSession/HotRodUserSessionMapStorage.java", "diff": "+/*\n+ * Copyright 2022 Red Hat, Inc. and/or its affiliates\n+ * and other contributors as indicated by the @author tags.\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+\n+package org.keycloak.models.map.storage.hotRod.userSession;\n+\n+import org.infinispan.client.hotrod.RemoteCache;\n+import org.keycloak.models.AuthenticatedClientSessionModel;\n+import org.keycloak.models.KeycloakSession;\n+import org.keycloak.models.UserSessionModel;\n+import org.keycloak.models.map.common.DeepCloner;\n+import org.keycloak.models.map.common.StringKeyConverter;\n+import org.keycloak.models.map.storage.MapKeycloakTransaction;\n+import org.keycloak.models.map.storage.chm.MapFieldPredicates;\n+import org.keycloak.models.map.storage.chm.MapModelCriteriaBuilder;\n+import org.keycloak.models.map.storage.chm.UserSessionCascadeRemovalTransaction;\n+import org.keycloak.models.map.storage.hotRod.HotRodMapStorage;\n+import org.keycloak.models.map.storage.hotRod.common.HotRodEntityDescriptor;\n+import org.keycloak.storage.SearchableModelField;\n+\n+import java.util.Map;\n+\n+public class HotRodUserSessionMapStorage<K> extends HotRodMapStorage<K, HotRodUserSessionEntity, HotRodUserSessionEntityDelegate, UserSessionModel> {\n+\n+ private final HotRodMapStorage<K, HotRodAuthenticatedClientSessionEntity, HotRodAuthenticatedClientSessionEntityDelegate, AuthenticatedClientSessionModel> hotRodClientSessionStore;\n+\n+ public HotRodUserSessionMapStorage(HotRodMapStorage<K, HotRodAuthenticatedClientSessionEntity, HotRodAuthenticatedClientSessionEntityDelegate, AuthenticatedClientSessionModel> hotRodClientSessionStore,\n+ RemoteCache<K, HotRodUserSessionEntity> remoteCache,\n+ StringKeyConverter<K> keyConverter,\n+ HotRodEntityDescriptor<HotRodUserSessionEntity, HotRodUserSessionEntityDelegate> storedEntityDescriptor,\n+ DeepCloner cloner\n+ ) {\n+ super(remoteCache, keyConverter, storedEntityDescriptor, cloner);\n+ this.hotRodClientSessionStore = hotRodClientSessionStore;\n+ }\n+\n+ @Override\n+ public MapKeycloakTransaction<HotRodUserSessionEntityDelegate, UserSessionModel> createTransaction(KeycloakSession session) {\n+ MapKeycloakTransaction<HotRodUserSessionEntityDelegate, UserSessionModel> sessionTransaction = session.getAttribute(\"map-transaction-\" + hashCode(), MapKeycloakTransaction.class);\n+\n+ if (sessionTransaction == null) {\n+ Map<SearchableModelField<? super UserSessionModel>, MapModelCriteriaBuilder.UpdatePredicatesFunc<K, HotRodUserSessionEntityDelegate, UserSessionModel>> fieldPredicates = MapFieldPredicates.getPredicates((Class<UserSessionModel>) storedEntityDescriptor.getModelTypeClass());\n+ sessionTransaction = new UserSessionCascadeRemovalTransaction<>(this, hotRodClientSessionStore.createTransaction(session), keyConverter, cloner, fieldPredicates);\n+ session.setAttribute(\"map-transaction-\" + hashCode(), sessionTransaction);\n+ }\n+\n+ return sessionTransaction;\n+ }\n+}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "model/map/src/main/java/org/keycloak/models/map/storage/chm/UserSessionCascadeRemovalTransaction.java", "diff": "+/*\n+ * Copyright 2022 Red Hat, Inc. and/or its affiliates\n+ * and other contributors as indicated by the @author tags.\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+\n+package org.keycloak.models.map.storage.chm;\n+\n+import org.keycloak.models.AuthenticatedClientSessionModel;\n+import org.keycloak.models.UserSessionModel;\n+import org.keycloak.models.map.common.AbstractEntity;\n+import org.keycloak.models.map.common.DeepCloner;\n+import org.keycloak.models.map.common.StringKeyConverter;\n+import org.keycloak.models.map.storage.MapKeycloakTransaction;\n+import org.keycloak.models.map.storage.ModelCriteriaBuilder;\n+import org.keycloak.models.map.storage.QueryParameters;\n+import org.keycloak.models.map.storage.criteria.DefaultModelCriteria;\n+import org.keycloak.models.map.userSession.MapAuthenticatedClientSessionEntity;\n+import org.keycloak.models.map.userSession.MapUserSessionEntity;\n+import org.keycloak.storage.SearchableModelField;\n+\n+import java.util.Map;\n+import java.util.Set;\n+import java.util.stream.Collectors;\n+\n+import static org.keycloak.models.map.storage.QueryParameters.withCriteria;\n+\n+public class UserSessionCascadeRemovalTransaction<K, V extends MapUserSessionEntity> extends ConcurrentHashMapKeycloakTransaction<K, V, UserSessionModel> {\n+\n+ private final MapKeycloakTransaction<? extends MapAuthenticatedClientSessionEntity, AuthenticatedClientSessionModel> clientSessionTr;\n+\n+ public UserSessionCascadeRemovalTransaction(ConcurrentHashMapCrudOperations<V, UserSessionModel> userSessionConcurrentHashMapStorage,\n+ MapKeycloakTransaction<? extends MapAuthenticatedClientSessionEntity, AuthenticatedClientSessionModel> clientSessionTr,\n+ StringKeyConverter<K> keyConverter,\n+ DeepCloner cloner,\n+ Map<SearchableModelField<? super UserSessionModel>,\n+ MapModelCriteriaBuilder.UpdatePredicatesFunc<K,\n+ V,\n+ UserSessionModel>> fieldPredicates) {\n+ super(userSessionConcurrentHashMapStorage, keyConverter, cloner, fieldPredicates);\n+ this.clientSessionTr = clientSessionTr;\n+ }\n+\n+ @Override\n+ public long delete(QueryParameters<UserSessionModel> queryParameters) {\n+ Set<String> ids = read(queryParameters).map(AbstractEntity::getId).collect(Collectors.toSet());\n+ DefaultModelCriteria<AuthenticatedClientSessionModel> csMcb = DefaultModelCriteria.<AuthenticatedClientSessionModel>criteria()\n+ .compare(AuthenticatedClientSessionModel.SearchableFields.USER_SESSION_ID, ModelCriteriaBuilder.Operator.IN, ids);\n+ clientSessionTr.delete(withCriteria(csMcb));\n+ return super.delete(queryParameters);\n+ }\n+\n+ @Override\n+ public boolean delete(String key) {\n+ DefaultModelCriteria<AuthenticatedClientSessionModel> csMcb = DefaultModelCriteria.<AuthenticatedClientSessionModel>criteria()\n+ .compare(AuthenticatedClientSessionModel.SearchableFields.USER_SESSION_ID, ModelCriteriaBuilder.Operator.EQ, key);\n+ clientSessionTr.delete(withCriteria(csMcb));\n+ return super.delete(key);\n+ }\n+\n+}\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/storage/chm/UserSessionConcurrentHashMapStorage.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/storage/chm/UserSessionConcurrentHashMapStorage.java", "diff": "@@ -20,22 +20,10 @@ import org.keycloak.models.map.common.StringKeyConverter;\nimport org.keycloak.models.AuthenticatedClientSessionModel;\nimport org.keycloak.models.KeycloakSession;\nimport org.keycloak.models.UserSessionModel;\n-import org.keycloak.models.map.common.AbstractEntity;\nimport org.keycloak.models.map.common.DeepCloner;\nimport org.keycloak.models.map.storage.MapKeycloakTransaction;\n-import org.keycloak.models.map.storage.ModelCriteriaBuilder.Operator;\n-import org.keycloak.models.map.storage.QueryParameters;\n-import org.keycloak.models.map.storage.chm.MapModelCriteriaBuilder.UpdatePredicatesFunc;\n-import org.keycloak.models.map.storage.criteria.DefaultModelCriteria;\nimport org.keycloak.models.map.userSession.MapAuthenticatedClientSessionEntity;\nimport org.keycloak.models.map.userSession.MapUserSessionEntity;\n-import org.keycloak.storage.SearchableModelField;\n-\n-import java.util.Map;\n-import java.util.Set;\n-import java.util.stream.Collectors;\n-\n-import static org.keycloak.models.map.storage.QueryParameters.withCriteria;\n/**\n* User session storage with a naive implementation of referential integrity in client to user session relation, restricted to\n@@ -47,40 +35,6 @@ public class UserSessionConcurrentHashMapStorage<K> extends ConcurrentHashMapSto\nprivate final ConcurrentHashMapStorage<K, MapAuthenticatedClientSessionEntity, AuthenticatedClientSessionModel> clientSessionStore;\n- private class Transaction extends ConcurrentHashMapKeycloakTransaction<K, MapUserSessionEntity, UserSessionModel> {\n-\n- private final MapKeycloakTransaction<MapAuthenticatedClientSessionEntity, AuthenticatedClientSessionModel> clientSessionTr;\n-\n- public Transaction(MapKeycloakTransaction<MapAuthenticatedClientSessionEntity, AuthenticatedClientSessionModel> clientSessionTr,\n- StringKeyConverter<K> keyConverter,\n- DeepCloner cloner,\n- Map<SearchableModelField<? super UserSessionModel>,\n- UpdatePredicatesFunc<K,\n- MapUserSessionEntity,\n- UserSessionModel>> fieldPredicates) {\n- super(UserSessionConcurrentHashMapStorage.this, keyConverter, cloner, fieldPredicates);\n- this.clientSessionTr = clientSessionTr;\n- }\n-\n- @Override\n- public long delete(QueryParameters<UserSessionModel> queryParameters) {\n- Set<String> ids = read(queryParameters).map(AbstractEntity::getId).collect(Collectors.toSet());\n- DefaultModelCriteria<AuthenticatedClientSessionModel> csMcb = DefaultModelCriteria.<AuthenticatedClientSessionModel>criteria()\n- .compare(AuthenticatedClientSessionModel.SearchableFields.USER_SESSION_ID, Operator.IN, ids);\n- clientSessionTr.delete(withCriteria(csMcb));\n- return super.delete(queryParameters);\n- }\n-\n- @Override\n- public boolean delete(String key) {\n- DefaultModelCriteria<AuthenticatedClientSessionModel> csMcb = DefaultModelCriteria.<AuthenticatedClientSessionModel>criteria()\n- .compare(AuthenticatedClientSessionModel.SearchableFields.USER_SESSION_ID, Operator.EQ, key);\n- clientSessionTr.delete(withCriteria(csMcb));\n- return super.delete(key);\n- }\n-\n- }\n-\n@SuppressWarnings(\"unchecked\")\npublic UserSessionConcurrentHashMapStorage(ConcurrentHashMapStorage<K, MapAuthenticatedClientSessionEntity, AuthenticatedClientSessionModel> clientSessionStore,\nStringKeyConverter<K> keyConverter, DeepCloner cloner) {\n@@ -94,7 +48,7 @@ public class UserSessionConcurrentHashMapStorage<K> extends ConcurrentHashMapSto\nMapKeycloakTransaction<MapUserSessionEntity, UserSessionModel> sessionTransaction = session.getAttribute(\"map-transaction-\" + hashCode(), MapKeycloakTransaction.class);\nif (sessionTransaction == null) {\n- sessionTransaction = new Transaction(clientSessionStore.createTransaction(session), clientSessionStore.getKeyConverter(), cloner, fieldPredicates);\n+ sessionTransaction = new UserSessionCascadeRemovalTransaction<>(this, clientSessionStore.createTransaction(session), clientSessionStore.getKeyConverter(), cloner, fieldPredicates);\nsession.setAttribute(\"map-transaction-\" + hashCode(), sessionTransaction);\n}\nreturn sessionTransaction;\n" } ]

[ { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/services/managers/CodeGenerateUtil.java", "new_path": "services/src/main/java/org/keycloak/services/managers/CodeGenerateUtil.java", "diff": "@@ -23,6 +23,9 @@ import org.keycloak.common.util.SecretGenerator;\nimport org.keycloak.events.EventBuilder;\nimport org.keycloak.models.ClientModel;\nimport org.keycloak.models.KeycloakSession;\n+import org.keycloak.models.KeycloakSessionFactory;\n+import org.keycloak.models.KeycloakSessionTask;\n+import org.keycloak.models.KeycloakTransaction;\nimport org.keycloak.models.RealmModel;\nimport org.keycloak.models.utils.KeycloakModelUtils;\nimport org.keycloak.sessions.AuthenticationSessionModel;\n@@ -103,9 +106,8 @@ class CodeGenerateUtil {\nString actionId = Base64Url.encode(SecretGenerator.getInstance().randomBytes());\nauthSession.setAuthNote(ACTIVE_CODE, actionId);\n- // We need to set the active code to the authSession in the separate sub-transaction as well\n- // to make sure the change is committed if the main transaction is rolled back later.\n- KeycloakModelUtils.runJobInTransaction(session.getKeycloakSessionFactory(), (KeycloakSession currentSession) -> {\n+ // enlist a transaction that ensures the code is set in the auth session in case the main transaction is rolled back.\n+ session.getTransactionManager().enlist(new RollbackDrivenTransaction(session.getKeycloakSessionFactory(), currentSession -> {\nfinal RootAuthenticationSessionModel rootAuthenticationSession = currentSession.authenticationSessions()\n.getRootAuthenticationSession(authSession.getRealm(), authSession.getParentSession().getId());\nAuthenticationSessionModel authenticationSession = rootAuthenticationSession == null ? null : rootAuthenticationSession\n@@ -113,7 +115,7 @@ class CodeGenerateUtil {\nif (authenticationSession != null) {\nauthenticationSession.setAuthNote(ACTIVE_CODE, actionId);\n}\n- });\n+ }));\nnextCode = actionId;\n} else {\nlogger.debug(\"Code already generated for authentication session, using same code\");\n@@ -138,15 +140,13 @@ class CodeGenerateUtil {\n}\nauthSession.removeAuthNote(ACTIVE_CODE);\n-\n- // We need to remove the active code from the authSession in the separate sub-transaction as well\n- // to make sure the change is committed if the main transaction is rolled back later.\n- KeycloakModelUtils.runJobInTransaction(session.getKeycloakSessionFactory(), (KeycloakSession currentSession) -> {\n+ // enlist a transaction that ensures the code is removed in case the main transaction is rolled back.\n+ session.getTransactionManager().enlist(new RollbackDrivenTransaction(session.getKeycloakSessionFactory(), currentSession -> {\nAuthenticationSessionModel authenticationSession = currentSession.authenticationSessions()\n.getRootAuthenticationSession(authSession.getRealm(), authSession.getParentSession().getId())\n.getAuthenticationSession(authSession.getClient(), authSession.getTabId());\nauthenticationSession.removeAuthNote(ACTIVE_CODE);\n- });\n+ }));\nreturn MessageDigest.isEqual(code.getBytes(), activeCode.getBytes());\n}\n@@ -173,5 +173,47 @@ class CodeGenerateUtil {\n}\n}\n+ /**\n+ * A {@link KeycloakTransaction} that runs a task only when {@link #rollback()} is called.\n+ */\n+ private static class RollbackDrivenTransaction implements KeycloakTransaction {\n+\n+ private final KeycloakSessionFactory factory;\n+ private final KeycloakSessionTask task;\n+\n+ RollbackDrivenTransaction(final KeycloakSessionFactory factory, final KeycloakSessionTask task) {\n+ this.factory = factory;\n+ this.task = task;\n+ }\n+\n+ @Override\n+ public void begin() {\n+ // no-op - this tx doesn't participate in the regular transaction flow, only when rollback is triggered.\n+ }\n+\n+ @Override\n+ public void commit() {\n+ // no-op - this tx doesn't participate in the regular transaction flow, only when rollback is triggered.\n+ }\n+\n+ @Override\n+ public void rollback() {\n+ KeycloakModelUtils.runJobInTransaction(this.factory, this.task);\n+ }\n+\n+ @Override\n+ public void setRollbackOnly() {\n+ // no-op - this tx doesn't participate in the regular transaction flow, only when rollback is triggered.\n+ }\n+\n+ @Override\n+ public boolean getRollbackOnly() {\n+ return false;\n+ }\n+ @Override\n+ public boolean isActive() {\n+ return false;\n+ }\n+ }\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/protocol/oidc/endpoints/LogoutEndpoint.java", "new_path": "services/src/main/java/org/keycloak/protocol/oidc/endpoints/LogoutEndpoint.java", "diff": "@@ -289,6 +289,30 @@ public class LogoutEndpoint {\n.createLogoutConfirmPage();\n}\n+ /**\n+ * This endpoint can be used either as:\n+ * - OpenID Connect RP-Initiated Logout POST endpoint according to the specification https://openid.net/specs/openid-connect-rpinitiated-1_0.html#RPLogout\n+ * - Legacy Logout endpoint with refresh_token as an argument and client authentication needed. See {@link #logoutToken} for more details\n+ *\n+ * @return response\n+ */\n+ @POST\n+ @Consumes(MediaType.APPLICATION_FORM_URLENCODED)\n+ public Response logout() {\n+ MultivaluedMap<String, String> form = request.getDecodedFormParameters();\n+ if (form.containsKey(OAuth2Constants.REFRESH_TOKEN)) {\n+ return logoutToken();\n+ } else {\n+ return logout(form.getFirst(OIDCLoginProtocol.REDIRECT_URI_PARAM),\n+ form.getFirst(OIDCLoginProtocol.ID_TOKEN_HINT),\n+ form.getFirst(OIDCLoginProtocol.CLIENT_ID_PARAM),\n+ form.getFirst(OIDCLoginProtocol.POST_LOGOUT_REDIRECT_URI_PARAM),\n+ form.getFirst(OIDCLoginProtocol.STATE_PARAM),\n+ form.getFirst(OIDCLoginProtocol.UI_LOCALES_PARAM),\n+ form.getFirst(AuthenticationManager.INITIATING_IDP_PARAM));\n+ }\n+ }\n+\n@Path(\"/logout-confirm\")\n@POST\n@Consumes(MediaType.APPLICATION_FORM_URLENCODED)\n@@ -389,9 +413,7 @@ public class LogoutEndpoint {\n*\n* @return\n*/\n- @POST\n- @Consumes(MediaType.APPLICATION_FORM_URLENCODED)\n- public Response logoutToken() {\n+ private Response logoutToken() {\ncors = Cors.add(request).auth().allowedMethods(\"POST\").auth().exposedHeaders(Cors.ACCESS_CONTROL_ALLOW_METHODS);\nMultivaluedMap<String, String> form = request.getDecodedFormParameters();\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestingResourceProvider.java", "new_path": "testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestingResourceProvider.java", "diff": "@@ -1000,7 +1000,7 @@ public class TestingResourceProvider implements RealmResourceProvider {\n* See URLUtils.sendPOSTWithWebDriver for more details\n*\n* @param postRequestUrl Absolute URL. It can include query parameters etc. The POST request will be send to this URL\n- * @param encodedFormParameters Encoded parameters in the form of \"param1=value1:param2=value2\"\n+ * @param encodedFormParameters Encoded parameters in the form of \"param1=value1&param2=value2\"\n* @return\n*/\n@GET\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/URLUtils.java", "new_path": "testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/URLUtils.java", "diff": "@@ -11,6 +11,7 @@ import org.openqa.selenium.support.ui.WebDriverWait;\nimport java.net.URI;\nimport java.util.Arrays;\nimport java.util.List;\n+import java.util.Map;\nimport java.util.regex.Pattern;\nimport static org.keycloak.testsuite.util.DroneUtils.getCurrentDriver;\n@@ -96,6 +97,28 @@ public final class URLUtils {\nreturn true;\n}\n+ /**\n+ * @see #sendPOSTRequestWithWebDriver(String, String)\n+ *\n+ * @param postRequestUrl\n+ * @param formParams form params in key/value form\n+ */\n+ public static void sendPOSTRequestWithWebDriver(String postRequestUrl, Map<String, String> formParams) {\n+ StringBuilder sb = new StringBuilder();\n+ boolean first = true;\n+ for (Map.Entry<String, String> entry : formParams.entrySet()) {\n+ if (first) {\n+ first = false;\n+ } else {\n+ sb.append(\"&\");\n+ }\n+ sb.append(entry.getKey())\n+ .append(\"=\")\n+ .append(entry.getValue());\n+ }\n+ sendPOSTRequestWithWebDriver(postRequestUrl, sb.toString());\n+ }\n+\n/**\n* This will send POST request to specified URL with specified form parameters. It's not easily possible to \"trick\" web driver to send POST\n* request with custom parameters, which are not directly available in the form.\n" } ]

[ { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/request/BackchannelAuthenticationEndpointRequestParser.java", "new_path": "services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/request/BackchannelAuthenticationEndpointRequestParser.java", "diff": "package org.keycloak.protocol.oidc.grants.ciba.endpoints.request;\nimport org.jboss.logging.Logger;\n+import org.keycloak.OAuth2Constants;\nimport org.keycloak.protocol.oidc.OIDCLoginProtocol;\nimport org.keycloak.protocol.oidc.grants.ciba.CibaGrantType;\n@@ -71,6 +72,11 @@ public abstract class BackchannelAuthenticationEndpointRequestParser {\nKNOWN_REQ_PARAMS.add(OIDCLoginProtocol.MAX_AGE_PARAM);\nKNOWN_REQ_PARAMS.add(OIDCLoginProtocol.UI_LOCALES_PARAM);\nKNOWN_REQ_PARAMS.add(OIDCLoginProtocol.CLAIMS_PARAM);\n+\n+ // these parameters are not included in Authentication Channel Request\n+ // if these are included in Backchannel Authentication Request's body part for \"client_secret_post\" client authentication\n+ KNOWN_REQ_PARAMS.add(OAuth2Constants.CLIENT_ID);\n+ KNOWN_REQ_PARAMS.add(OAuth2Constants.CLIENT_SECRET);\n}\npublic void parseRequest(BackchannelAuthenticationEndpointRequest request) {\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/CIBATest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/CIBATest.java", "diff": "@@ -746,6 +746,16 @@ public class CIBATest extends AbstractClientPoliciesTest {\ntestBackchannelAuthenticationFlow(true, null);\n}\n+ @Test\n+ public void testBackchannelAuthenticationFlowWithClientIdAndSecretInBody() throws Exception {\n+ Map<String, String> additionalParameters = new HashMap<>();\n+ // these parameters are not included in Authentication Channel Request\n+ // if these are included in Backchannel Authentication Request's body part.\n+ additionalParameters.put(OAuth2Constants.CLIENT_ID, TEST_CLIENT_NAME);\n+ additionalParameters.put(OAuth2Constants.CLIENT_SECRET, TEST_CLIENT_PASSWORD);\n+ testBackchannelAuthenticationFlow(true, \"ABCDE\", additionalParameters);\n+ }\n+\n@Test\npublic void testBackchannelClientValidations() throws Exception {\nClientResource clientResource = null;\n@@ -2728,11 +2738,17 @@ public class CIBATest extends AbstractClientPoliciesTest {\n}\nprivate void testBackchannelAuthenticationFlow(boolean isOfflineAccess, String bindingMessage) throws Exception {\n+ testBackchannelAuthenticationFlow(isOfflineAccess, bindingMessage, null);\n+ }\n+\n+ private void testBackchannelAuthenticationFlow(boolean isOfflineAccess, String bindingMessage, Map<String, String> additionalParameters) throws Exception {\nClientResource clientResource = null;\nClientRepresentation clientRep = null;\n+ if (additionalParameters == null) {\n+ additionalParameters = new HashMap<>();\n+ }\ntry {\nfinal String username = \"nutzername-rot\";\n- Map<String, String> additionalParameters = new HashMap<>();\nadditionalParameters.put(\"user_device\", \"mobile\");\n// prepare CIBA settings\n@@ -2755,6 +2771,8 @@ public class CIBATest extends AbstractClientPoliciesTest {\nif (isOfflineAccess) assertThat(authenticationChannelReq.getScope(), is(containsString(OAuth2Constants.OFFLINE_ACCESS)));\nassertThat(authenticationChannelReq.getScope(), is(containsString(OAuth2Constants.SCOPE_OPENID)));\nassertThat(authenticationChannelReq.getAdditionalParameters().get(\"user_device\"), is(equalTo(\"mobile\")));\n+ assertThat(authenticationChannelReq.getAdditionalParameters().get(OAuth2Constants.CLIENT_ID), nullValue());\n+ assertThat(authenticationChannelReq.getAdditionalParameters().get(OAuth2Constants.CLIENT_SECRET), nullValue());\n// user Authentication Channel completed\nEventRepresentation loginEvent = doAuthenticationChannelCallback(testRequest);\n@@ -2786,4 +2804,5 @@ public class CIBATest extends AbstractClientPoliciesTest {\nrevertCIBASettings(clientResource, clientRep);\n}\n}\n+\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/forms/login/freemarker/FreeMarkerLoginFormsProvider.java", "new_path": "services/src/main/java/org/keycloak/forms/login/freemarker/FreeMarkerLoginFormsProvider.java", "diff": "@@ -494,6 +494,9 @@ public class FreeMarkerLoginFormsProvider implements LoginFormsProvider {\ncase REGISTER:\nb = UriBuilder.fromUri(Urls.realmRegisterPage(baseUri, realm.getName()));\nbreak;\n+ case LOGOUT_CONFIRM:\n+ b = UriBuilder.fromUri(Urls.logoutConfirm(baseUri, realm.getName()));\n+ break;\ndefault:\nb = UriBuilder.fromUri(baseUri).path(uriInfo.getPath());\nbreak;\n" }, { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/protocol/oidc/endpoints/LogoutEndpoint.java", "new_path": "services/src/main/java/org/keycloak/protocol/oidc/endpoints/LogoutEndpoint.java", "diff": "@@ -38,6 +38,7 @@ import org.keycloak.models.ClientModel;\nimport org.keycloak.models.Constants;\nimport org.keycloak.models.KeycloakSession;\nimport org.keycloak.models.RealmModel;\n+import org.keycloak.models.UserModel;\nimport org.keycloak.models.UserSessionModel;\nimport org.keycloak.models.utils.SystemClientUtil;\nimport org.keycloak.protocol.oidc.BackchannelLogoutResponse;\n@@ -65,6 +66,7 @@ import org.keycloak.services.messages.Messages;\nimport org.keycloak.services.resources.Cors;\nimport org.keycloak.services.resources.LogoutSessionCodeChecks;\nimport org.keycloak.services.resources.SessionCodeChecks;\n+import org.keycloak.services.util.LocaleUtil;\nimport org.keycloak.services.util.MtlsHoKTokenUtil;\nimport org.keycloak.sessions.AuthenticationSessionModel;\nimport org.keycloak.sessions.RootAuthenticationSessionModel;\n@@ -258,9 +260,12 @@ public class LogoutEndpoint {\nLoginFormsProvider loginForm = session.getProvider(LoginFormsProvider.class)\n.setAuthenticationSession(logoutSession);\n+ UserSessionModel userSession = null;\n+\n// Check if we have session in the browser. If yes and it is different session than referenced by id_token_hint, the confirmation should be displayed\nAuthenticationManager.AuthResult authResult = AuthenticationManager.authenticateIdentityCookie(session, realm, false);\nif (authResult != null) {\n+ userSession = authResult.getSession();\nif (idToken != null && idToken.getSessionState() != null && !idToken.getSessionState().equals(authResult.getSession().getId())) {\nforcedConfirmation = true;\n}\n@@ -272,6 +277,17 @@ public class LogoutEndpoint {\n}\n}\n+ if (userSession == null && idToken != null && idToken.getSessionState() != null) {\n+ userSession = session.sessions().getUserSession(realm, idToken.getSessionState());\n+ }\n+\n+ // Try to figure user because of localization\n+ if (userSession != null) {\n+ UserModel user = userSession.getUser();\n+ logoutSession.setAuthenticatedUser(user);\n+ loginForm.setUser(user);\n+ }\n+\n// Logout confirmation screen will be displayed to the user in this case\nif (confirmationNeeded || forcedConfirmation) {\nreturn displayLogoutConfirmationScreen(loginForm, logoutSession);\n@@ -297,6 +313,7 @@ public class LogoutEndpoint {\n* @return response\n*/\n@POST\n+ @NoCache\n@Consumes(MediaType.APPLICATION_FORM_URLENCODED)\npublic Response logout() {\nMultivaluedMap<String, String> form = request.getDecodedFormParameters();\n@@ -315,6 +332,7 @@ public class LogoutEndpoint {\n@Path(\"/logout-confirm\")\n@POST\n+ @NoCache\n@Consumes(MediaType.APPLICATION_FORM_URLENCODED)\npublic Response logoutConfirmAction() {\nMultivaluedMap<String, String> formData = request.getDecodedFormParameters();\n@@ -327,7 +345,7 @@ public class LogoutEndpoint {\nSessionCodeChecks checks = new LogoutSessionCodeChecks(realm, session.getContext().getUri(), request, clientConnection, session, event, code, clientId, tabId);\nchecks.initialVerify();\n- if (!checks.verifyActiveAndValidAction(AuthenticationSessionModel.Action.LOGGING_OUT.name(), ClientSessionCode.ActionType.USER) || !formData.containsKey(\"confirmLogout\")) {\n+ if (!checks.verifyActiveAndValidAction(AuthenticationSessionModel.Action.LOGGING_OUT.name(), ClientSessionCode.ActionType.USER) || !checks.isActionRequest() || !formData.containsKey(\"confirmLogout\")) {\nAuthenticationSessionModel logoutSession = checks.getAuthenticationSession();\nlogger.debugf(\"Failed verification during logout. logoutSessionId=%s, clientId=%s, tabId=%s\",\nlogoutSession != null ? logoutSession.getParentSession().getId() : \"unknown\", clientId, tabId);\n@@ -347,6 +365,48 @@ public class LogoutEndpoint {\n}\n+ // Typically shown when user changes localization on the logout confirmation screen\n+ @Path(\"/logout-confirm\")\n+ @NoCache\n+ @GET\n+ public Response logoutConfirmGet() {\n+ event.event(EventType.LOGOUT);\n+\n+ String clientId = session.getContext().getUri().getQueryParameters().getFirst(Constants.CLIENT_ID);\n+ String tabId = session.getContext().getUri().getQueryParameters().getFirst(Constants.TAB_ID);\n+\n+ logger.tracef(\"Changing localization by user during logout. clientId=%s, tabId=%s, kc_locale: %s\", clientId, tabId, session.getContext().getUri().getQueryParameters().getFirst(LocaleSelectorProvider.KC_LOCALE_PARAM));\n+\n+ SessionCodeChecks checks = new LogoutSessionCodeChecks(realm, session.getContext().getUri(), request, clientConnection, session, event, null, clientId, tabId);\n+ AuthenticationSessionModel logoutSession = checks.initialVerifyAuthSession();\n+ if (logoutSession == null) {\n+ logger.debugf(\"Failed verification when changing locale logout. clientId=%s, tabId=%s\", clientId, tabId);\n+\n+ LoginFormsProvider loginForm = session.getProvider(LoginFormsProvider.class);\n+ if (clientId == null || clientId.equals(SystemClientUtil.getSystemClient(realm).getClientId())) {\n+ // Cleanup system client URL to avoid links to account management\n+ loginForm.setAttribute(Constants.SKIP_LINK, true);\n+ }\n+\n+ AuthenticationManager.AuthResult authResult = AuthenticationManager.authenticateIdentityCookie(session, realm, false);\n+ if (authResult != null) {\n+ return ErrorPage.error(session, logoutSession, Response.Status.BAD_REQUEST, Messages.FAILED_LOGOUT);\n+ } else {\n+ // Probably changing locale on logout screen after logout was already performed. If there is no session in the browser, we can just display that logout was already finished\n+ return loginForm.setSuccess(Messages.SUCCESS_LOGOUT).createInfoPage();\n+ }\n+ }\n+\n+ LocaleUtil.processLocaleParam(session, realm, logoutSession);\n+\n+ LoginFormsProvider loginForm = session.getProvider(LoginFormsProvider.class)\n+ .setAuthenticationSession(logoutSession)\n+ .setUser(logoutSession.getAuthenticatedUser());\n+\n+ return displayLogoutConfirmationScreen(loginForm, logoutSession);\n+ }\n+\n+\n// Method triggered after user eventually confirmed that he wants to logout and all other checks were done\nprivate Response doBrowserLogout(AuthenticationSessionModel logoutSession) {\nUserSessionModel userSession = null;\n" }, { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/services/managers/AuthenticationManager.java", "new_path": "services/src/main/java/org/keycloak/services/managers/AuthenticationManager.java", "diff": "@@ -374,10 +374,10 @@ public class AuthenticationManager {\n} else {\nlogoutAuthSession = rootLogoutSession.createAuthenticationSession(client);\nlogoutAuthSession.setAction(AuthenticationSessionModel.Action.LOGGING_OUT.name());\n- session.getContext().setClient(client);\nlogger.tracef(\"Creating logout session for client '%s'. Authentication session id: %s\", client.getClientId(), rootLogoutSession.getId());\n}\nsession.getContext().setAuthenticationSession(logoutAuthSession);\n+ session.getContext().setClient(client);\nreturn logoutAuthSession;\n}\n" }, { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/services/resources/LoginActionsService.java", "new_path": "services/src/main/java/org/keycloak/services/resources/LoginActionsService.java", "diff": "@@ -83,6 +83,7 @@ import org.keycloak.services.resource.RealmResourceProvider;\nimport org.keycloak.services.util.AuthenticationFlowURLHelper;\nimport org.keycloak.services.util.BrowserHistoryHelper;\nimport org.keycloak.services.util.CacheControlUtil;\n+import org.keycloak.services.util.LocaleUtil;\nimport org.keycloak.sessions.AuthenticationSessionCompoundId;\nimport org.keycloak.sessions.AuthenticationSessionModel;\nimport org.keycloak.sessions.RootAuthenticationSessionModel;\n@@ -277,15 +278,7 @@ public class LoginActionsService {\n}\nprotected void processLocaleParam(AuthenticationSessionModel authSession) {\n- if (authSession != null && realm.isInternationalizationEnabled()) {\n- String locale = session.getContext().getUri().getQueryParameters().getFirst(LocaleSelectorProvider.KC_LOCALE_PARAM);\n- if (locale != null) {\n- authSession.setAuthNote(LocaleSelectorProvider.USER_REQUEST_LOCALE, locale);\n-\n- LocaleUpdaterProvider localeUpdater = session.getProvider(LocaleUpdaterProvider.class);\n- localeUpdater.updateLocaleCookie(locale);\n- }\n- }\n+ LocaleUtil.processLocaleParam(session, realm, authSession);\n}\nprotected Response processAuthentication(boolean action, String execution, AuthenticationSessionModel authSession, String errorMessage) {\n" }, { "change_type": "ADD", "old_path": null, "new_path": "services/src/main/java/org/keycloak/services/util/LocaleUtil.java", "diff": "+/*\n+ * Copyright 2022 Red Hat, Inc. and/or its affiliates\n+ * and other contributors as indicated by the @author tags.\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ *\n+ */\n+\n+package org.keycloak.services.util;\n+\n+import org.keycloak.locale.LocaleSelectorProvider;\n+import org.keycloak.locale.LocaleUpdaterProvider;\n+import org.keycloak.models.KeycloakSession;\n+import org.keycloak.models.RealmModel;\n+import org.keycloak.sessions.AuthenticationSessionModel;\n+\n+/**\n+ * @author <a href=\"mailto:[email protected]\">Marek Posolda</a>\n+ */\n+public class LocaleUtil {\n+\n+ public static void processLocaleParam(KeycloakSession session, RealmModel realm, AuthenticationSessionModel authSession) {\n+ if (authSession != null && realm.isInternationalizationEnabled()) {\n+ String locale = session.getContext().getUri().getQueryParameters().getFirst(LocaleSelectorProvider.KC_LOCALE_PARAM);\n+ if (locale != null) {\n+ authSession.setAuthNote(LocaleSelectorProvider.USER_REQUEST_LOCALE, locale);\n+\n+ LocaleUpdaterProvider localeUpdater = session.getProvider(LocaleUpdaterProvider.class);\n+ localeUpdater.updateLocaleCookie(locale);\n+ }\n+ }\n+ }\n+}\n" } ]

[ { "change_type": "MODIFY", "old_path": "testsuite/model/src/test/java/org/keycloak/testsuite/model/session/OfflineSessionPersistenceTest.java", "new_path": "testsuite/model/src/test/java/org/keycloak/testsuite/model/session/OfflineSessionPersistenceTest.java", "diff": "@@ -136,8 +136,9 @@ public class OfflineSessionPersistenceTest extends KeycloakModelTest {\n@RequireProvider(UserSessionPersisterProvider.class)\n@RequireProvider(value = UserSessionProvider.class, only = InfinispanUserSessionProviderFactory.PROVIDER_ID)\npublic void testPersistenceMultipleNodesClientSessionAtSameNode() throws InterruptedException {\n+ int numClients = 2;\nList<String> clientIds = withRealm(realmId, (session, realm) -> {\n- return IntStream.range(0, 5)\n+ return IntStream.range(0, numClients)\n.mapToObj(cid -> session.clients().addClient(realm, \"client-\" + cid))\n.map(ClientModel::getId)\n.collect(Collectors.toList());\n@@ -152,8 +153,8 @@ public class OfflineSessionPersistenceTest extends KeycloakModelTest {\ninIndependentFactories(NUM_FACTORIES, 60, () -> {\nwithRealm(realmId, (session, realm) -> {\n// Create offline sessions\n- userIds.forEach(userId -> createOfflineSessions(session, realm, userId, offlineUserSession -> {\n- IntStream.range(0, 5)\n+ userIds.stream().limit(userIds.size() / 10).forEach(userId -> createOfflineSessions(session, realm, userId, offlineUserSession -> {\n+ IntStream.range(0, numClients)\n.mapToObj(cid -> session.clients().getClientById(realm, clientIds.get(cid)))\n// TODO in the future: The following two lines are weird. Why an online client session needs to exist in order to create an offline one?\n.map(client -> session.sessions().createClientSession(realm, client, offlineUserSession))\n@@ -187,7 +188,7 @@ public class OfflineSessionPersistenceTest extends KeycloakModelTest {\n});\nreinitializeKeycloakSessionFactory();\n- inIndependentFactories(4, 30, () -> assertOfflineSessionsExist(realmId, clientSessionIds));\n+ inIndependentFactories(NUM_FACTORIES + 1, 30, () -> assertOfflineSessionsExist(realmId, clientSessionIds));\n}\n@Test(timeout = 90 * 1000)\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/authSession/MapAuthenticationSessionEntity.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/authSession/MapAuthenticationSessionEntity.java", "diff": "@@ -34,6 +34,19 @@ public interface MapAuthenticationSessionEntity extends UpdatableEntity {\nString getTabId();\nvoid setTabId(String tabId);\n+ /**\n+ * Returns a point in time (timestamp in milliseconds since The Epoch) when the authentication session entity was created.\n+ *\n+ * @return a timestamp in milliseconds since The Epoch or {@code null} when the time is unknown\n+ */\n+ Long getTimestamp();\n+\n+ /**\n+ * Sets a point in the (timestamp in milliseconds since The Epoch) when the authentication session entity was created.\n+ * @param timestamp a timestamp in milliseconds since The Epoch or {@code null} when the time is unknown\n+ */\n+ void setTimestamp(Long timestamp);\n+\nMap<String, String> getUserSessionNotes();\nvoid setUserSessionNotes(Map<String, String> userSessionNotes);\nvoid setUserSessionNote(String name, String value);\n@@ -44,9 +57,6 @@ public interface MapAuthenticationSessionEntity extends UpdatableEntity {\nString getAuthUserId();\nvoid setAuthUserId(String authUserId);\n- Long getTimestamp();\n- void setTimestamp(Long timestamp);\n-\nString getRedirectUri();\nvoid setRedirectUri(String redirectUri);\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/authSession/MapRootAuthenticationSessionEntity.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/authSession/MapRootAuthenticationSessionEntity.java", "diff": "@@ -85,6 +85,21 @@ public interface MapRootAuthenticationSessionEntity extends AbstractEntity, Upda\nString getRealmId();\nvoid setRealmId(String realmId);\n+ /**\n+ * Returns a point in time (timestamp in milliseconds since The Epoch) when the root authentication session entity was created or\n+ * updated during an authentication process.\n+ *\n+ * @return a timestamp in milliseconds since The Epoch or {@code null} when the time is unknown\n+ */\n+ Long getTimestamp();\n+\n+ /**\n+ * Sets a point in the (timestamp in milliseconds since The Epoch) when the root authentication session entity was created or\n+ * updated during an authentication process.\n+ * @param timestamp a timestamp in milliseconds since The Epoch or {@code null} when the time is unknown\n+ */\n+ void setTimestamp(Long timestamp);\n+\nSet<MapAuthenticationSessionEntity> getAuthenticationSessions();\nvoid setAuthenticationSessions(Set<MapAuthenticationSessionEntity> authenticationSessions);\nOptional<MapAuthenticationSessionEntity> getAuthenticationSession(String tabId);\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/common/ExpirableEntity.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/common/ExpirableEntity.java", "diff": "@@ -44,18 +44,4 @@ public interface ExpirableEntity extends AbstractEntity {\n* @param expiration a timestamp in milliseconds since The Epoch or {@code null} if this entity never expires.\n*/\nvoid setExpiration(Long expiration);\n-\n- /**\n- * Returns a point in time (timestamp in milliseconds since The Epoch) when this entity was created or updated\n- *\n- * @return a timestamp in milliseconds since The Epoch or {@code null} when the time is unknown\n- */\n- Long getTimestamp();\n-\n- /**\n- * Sets a point in the (timestamp in milliseconds since The Epoch) when this entity was created or updated\n- *\n- * @param timestamp a timestamp in milliseconds since The Epoch or {@code null} when the time is unknown\n- */\n- void setTimestamp(Long timestamp);\n}\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/events/MapAdminEventEntity.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/events/MapAdminEventEntity.java", "diff": "@@ -48,6 +48,19 @@ public interface MapAdminEventEntity extends UpdatableEntity, AbstractEntity, Ex\n}\n+ /**\n+ * Returns a point in time (timestamp in milliseconds since The Epoch) when the event was created.\n+ *\n+ * @return a timestamp in milliseconds since The Epoch or {@code null} when the time is unknown\n+ */\n+ Long getTimestamp();\n+\n+ /**\n+ * Sets a point in the (timestamp in milliseconds since The Epoch) when this entity was created.\n+ * @param timestamp a timestamp in milliseconds since The Epoch or {@code null} when the time is unknown\n+ */\n+ void setTimestamp(Long timestamp);\n+\nString getRealmId();\nvoid setRealmId(String realmId);\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/events/MapAuthEventEntity.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/events/MapAuthEventEntity.java", "diff": "@@ -50,6 +50,19 @@ public interface MapAuthEventEntity extends UpdatableEntity, AbstractEntity, Exp\n}\n+ /**\n+ * Returns a point in time (timestamp in milliseconds since The Epoch) when the event entity was created.\n+ *\n+ * @return a timestamp in milliseconds since The Epoch or {@code null} when the time is unknown\n+ */\n+ Long getTimestamp();\n+\n+ /**\n+ * Sets a point in the (timestamp in milliseconds since The Epoch) when the event entity was created.\n+ * @param timestamp a timestamp in milliseconds since The Epoch or {@code null} when the time is unknown\n+ */\n+ void setTimestamp(Long timestamp);\n+\nEventType getType();\nvoid setType(EventType type);\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/realm/entity/MapClientInitialAccessEntity.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/realm/entity/MapClientInitialAccessEntity.java", "diff": "@@ -57,6 +57,19 @@ public interface MapClientInitialAccessEntity extends UpdatableEntity, AbstractE\nreturn model;\n}\n+ /**\n+ * Returns a point in time (timestamp in milliseconds since The Epoch) when the client initial access entity was created.\n+ *\n+ * @return a timestamp in milliseconds since The Epoch or {@code null} when the time is unknown\n+ */\n+ Long getTimestamp();\n+\n+ /**\n+ * Sets a point in the (timestamp in milliseconds since The Epoch) when the client initial access entity was created.\n+ * @param timestamp a timestamp in milliseconds since The Epoch or {@code null} when the time is unknown\n+ */\n+ void setTimestamp(Long timestamp);\n+\nInteger getCount();\nvoid setCount(Integer count);\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/userSession/MapAuthenticatedClientSessionEntity.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/userSession/MapAuthenticatedClientSessionEntity.java", "diff": "@@ -50,6 +50,19 @@ public interface MapAuthenticatedClientSessionEntity extends AbstractEntity, Upd\n}\n}\n+ /**\n+ * Returns a point in time (timestamp in milliseconds since The Epoch) when the client session entity was created or updated (refreshed).\n+ *\n+ * @return a timestamp in milliseconds since The Epoch or {@code null} when the time is unknown\n+ */\n+ Long getTimestamp();\n+\n+ /**\n+ * Sets a point in the (timestamp in milliseconds since The Epoch) when the client session entity was created or updated (refreshed).\n+ * @param timestamp a timestamp in milliseconds since The Epoch or {@code null} when the time is unknown\n+ */\n+ void setTimestamp(Long timestamp);\n+\nString getRealmId();\nvoid setRealmId(String realmId);\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/userSession/MapUserSessionEntity.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/userSession/MapUserSessionEntity.java", "diff": "@@ -76,7 +76,30 @@ public interface MapUserSessionEntity extends AbstractEntity, UpdatableEntity, E\nBoolean isRememberMe();\nvoid setRememberMe(Boolean rememberMe);\n+ /**\n+ * Returns a point in time (timestamp in milliseconds since The Epoch) when the user session entity was created.\n+ *\n+ * @return a timestamp in milliseconds since The Epoch or {@code null} when the time is unknown\n+ */\n+ Long getTimestamp();\n+\n+ /**\n+ * Sets a point in the (timestamp in milliseconds since The Epoch) when the user session entity was created.\n+ * @param timestamp a timestamp in milliseconds since The Epoch or {@code null} when the time is unknown\n+ */\n+ void setTimestamp(Long timestamp);\n+\n+ /**\n+ * Returns a point in time (timestamp in milliseconds since The Epoch) when the user session entity was last refreshed.\n+ *\n+ * @return a timestamp in milliseconds since The Epoch or {@code null} when the time is unknown\n+ */\nLong getLastSessionRefresh();\n+\n+ /**\n+ * Sets a point in the (timestamp in milliseconds since The Epoch) when the user session entity was last refreshed.\n+ * @param lastSessionRefresh a timestamp in milliseconds since The Epoch or {@code null} when the time is unknown\n+ */\nvoid setLastSessionRefresh(Long lastSessionRefresh);\nMap<String, String> getNotes();\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/Constants.java", "new_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/Constants.java", "diff": "@@ -25,8 +25,10 @@ public interface Constants {\npublic static final Integer CURRENT_SCHEMA_VERSION_AUTHZ_SCOPE = 1;\npublic static final Integer CURRENT_SCHEMA_VERSION_CLIENT = 1;\npublic static final Integer CURRENT_SCHEMA_VERSION_CLIENT_SCOPE = 1;\n+ public static final Integer CURRENT_SCHEMA_VERSION_COMPONENT = 1;\npublic static final Integer CURRENT_SCHEMA_VERSION_GROUP = 1;\npublic static final Integer CURRENT_SCHEMA_VERSION_REALM = 1;\npublic static final Integer CURRENT_SCHEMA_VERSION_ROLE = 1;\n+ public static final Integer CURRENT_SCHEMA_VERSION_ROOT_AUTH_SESSION = 1;\npublic static final Integer CURRENT_SCHEMA_VERSION_USER_LOGIN_FAILURE = 1;\n}\n" }, { "change_type": "MODIFY", "old_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authSession/entity/JpaRootAuthenticationSessionEntity.java", "new_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authSession/entity/JpaRootAuthenticationSessionEntity.java", "diff": "@@ -37,13 +37,12 @@ import org.hibernate.annotations.TypeDefs;\nimport org.keycloak.models.map.authSession.MapAuthenticationSessionEntity;\nimport org.keycloak.models.map.authSession.MapRootAuthenticationSessionEntity.AbstractRootAuthenticationSessionEntity;\nimport org.keycloak.models.map.common.DeepCloner;\n-import static org.keycloak.models.map.storage.jpa.Constants.CURRENT_SCHEMA_VERSION_AUTH_SESSION;\n-import static org.keycloak.models.map.storage.jpa.JpaMapStorageProviderFactory.CLONER;\n-\nimport org.keycloak.models.map.common.UuidValidator;\n+import org.keycloak.models.map.storage.jpa.Constants;\nimport org.keycloak.models.map.storage.jpa.JpaRootVersionedEntity;\nimport org.keycloak.models.map.storage.jpa.hibernate.jsonb.JsonbType;\n+import static org.keycloak.models.map.storage.jpa.JpaMapStorageProviderFactory.CLONER;\n/**\n* Entity represents root authentication session.\n@@ -130,7 +129,7 @@ public class JpaRootAuthenticationSessionEntity extends AbstractRootAuthenticati\n@Override\npublic Integer getCurrentSchemaVersion() {\n- return CURRENT_SCHEMA_VERSION_AUTH_SESSION;\n+ return Constants.CURRENT_SCHEMA_VERSION_ROOT_AUTH_SESSION;\n}\n@Override\n" }, { "change_type": "MODIFY", "old_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/realm/entity/JpaComponentEntity.java", "new_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/realm/entity/JpaComponentEntity.java", "diff": "@@ -38,10 +38,10 @@ import org.keycloak.models.map.common.DeepCloner;\nimport org.keycloak.models.map.common.UpdatableEntity;\nimport org.keycloak.models.map.common.UuidValidator;\nimport org.keycloak.models.map.realm.entity.MapComponentEntity;\n+import org.keycloak.models.map.storage.jpa.Constants;\nimport org.keycloak.models.map.storage.jpa.JpaRootVersionedEntity;\nimport org.keycloak.models.map.storage.jpa.hibernate.jsonb.JsonbType;\n-import static org.keycloak.models.map.storage.jpa.Constants.CURRENT_SCHEMA_VERSION_REALM;\n/**\n* JPA {@link MapComponentEntity} implementation. Some fields are annotated with {@code @Column(insertable = false, updatable = false)}\n@@ -132,7 +132,7 @@ public class JpaComponentEntity extends UpdatableEntity.Impl implements MapCompo\n@Override\npublic Integer getCurrentSchemaVersion() {\n- return CURRENT_SCHEMA_VERSION_REALM;\n+ return Constants.CURRENT_SCHEMA_VERSION_COMPONENT;\n}\n@Override\n" }, { "change_type": "MODIFY", "old_path": "model/map-jpa/src/main/resources/META-INF/auth-sessions/jpa-auth-sessions-changelog-1.xml", "new_path": "model/map-jpa/src/main/resources/META-INF/auth-sessions/jpa-auth-sessions-changelog-1.xml", "diff": "@@ -22,7 +22,6 @@ limitations under the License.\nxsi:schemaLocation=\"http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd\nhttp://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd\">\n- <!-- format of id of changeSet: auth-sessions-${org.keycloak.models.map.storage.jpa.Constants.CURRENT_SCHEMA_VERSION_AUTH_SESSION} -->\n<changeSet author=\"keycloak\" id=\"auth-sessions-1\">\n<createTable tableName=\"kc_auth_root_session\">\n" }, { "change_type": "MODIFY", "old_path": "model/map-jpa/src/main/resources/META-INF/jpa-auth-sessions-changelog.xml", "new_path": "model/map-jpa/src/main/resources/META-INF/jpa-auth-sessions-changelog.xml", "diff": "@@ -18,6 +18,5 @@ limitations under the License.\n<databaseChangeLog xmlns=\"http://www.liquibase.org/xml/ns/dbchangelog\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd\">\n- <!-- format of id of changelog file names: jpa-auth-sessions-changelog-${org.keycloak.models.map.storage.jpa.Constants.CURRENT_SCHEMA_VERSION_AUTH_SESSION}.xml -->\n<include file=\"META-INF/auth-sessions/jpa-auth-sessions-changelog-1.xml\"/>\n</databaseChangeLog>\n" }, { "change_type": "MODIFY", "old_path": "model/map-jpa/src/main/resources/META-INF/jpa-realms-changelog.xml", "new_path": "model/map-jpa/src/main/resources/META-INF/jpa-realms-changelog.xml", "diff": "@@ -18,6 +18,5 @@ limitations under the License.\n<databaseChangeLog xmlns=\"http://www.liquibase.org/xml/ns/dbchangelog\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd\">\n- <!-- format of id of changelog file names: jpa-realms-changelog-${org.keycloak.models.map.storage.jpa.Constants.CURRENT_SCHEMA_VERSION_REALM}.xml -->\n<include file=\"META-INF/realms/jpa-realms-changelog-1.xml\"/>\n</databaseChangeLog>\n" }, { "change_type": "MODIFY", "old_path": "model/map-jpa/src/main/resources/META-INF/realms/jpa-realms-changelog-1.xml", "new_path": "model/map-jpa/src/main/resources/META-INF/realms/jpa-realms-changelog-1.xml", "diff": "@@ -22,7 +22,6 @@ limitations under the License.\nxsi:schemaLocation=\"http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd\nhttp://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd\">\n- <!-- format of id of changeSet: realms-${org.keycloak.models.map.storage.jpa.Constants.CURRENT_SCHEMA_VERSION_REALM} -->\n<changeSet author=\"keycloak\" id=\"realms-1\">\n<createTable tableName=\"kc_realm\">\n" } ]

[ { "change_type": "MODIFY", "old_path": "examples/kerberos/README.md", "new_path": "examples/kerberos/README.md", "diff": "@@ -75,7 +75,7 @@ with password `secret` .\nThen in your web browser open `http://localhost:8080/kerberos-portal` . You should be logged-in automatically through SPNEGO without displaying Keycloak login screen.\nKeycloak will also transmit the delegated GSS credential to the application inside access token and application will be able to login with this credential\n-to the LDAP server and retrieve some data from it (Actually it just retrieve few simple data about authenticated user himself).\n+to the LDAP server and retrieve some data from it (Actually it just retrieve few simple data about authenticated user themself).\nTroubleshooting\n" }, { "change_type": "MODIFY", "old_path": "federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/msad/MSADUserAccountControlStorageMapper.java", "new_path": "federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/msad/MSADUserAccountControlStorageMapper.java", "diff": "@@ -75,7 +75,7 @@ public class MSADUserAccountControlStorageMapper extends AbstractLDAPStorageMapp\n@Override\npublic LDAPOperationDecorator beforePasswordUpdate(UserModel user, LDAPObject ldapUser, UserCredentialModel password) {\n- // Not apply policies if password is reset by admin (not by user himself)\n+ // Not apply policies if password is reset by admin (not by user themself)\nif (password.isAdminRequest()) {\nreturn null;\n}\n" }, { "change_type": "MODIFY", "old_path": "themes/src/main/resources-community/theme/base/admin/messages/admin-messages_de.properties", "new_path": "themes/src/main/resources-community/theme/base/admin/messages/admin-messages_de.properties", "diff": "@@ -907,7 +907,7 @@ action=Aktion\n#client-scopes.evaluate.granted-realm-effective-roles.tooltip=Client has scope mappings for these roles. Those roles will be in the access token issued to this client if authenticated user is member of them\n#client-scopes.evaluate.granted-client-effective-roles=Granted Effective Client Roles\n#generated-access-token=Generated Access Token\n-#generated-access-token.tooltip=See the example token, which will be generated and sent to the client when selected user is authenticated. You can see claims and roles, which the token will contain based on the effective protocol mappers and role scope mappings and also based on the claims/roles assigned to user himself\n+#generated-access-token.tooltip=See the example token, which will be generated and sent to the client when selected user is authenticated. You can see claims and roles, which the token will contain based on the effective protocol mappers and role scope mappings and also based on the claims/roles assigned to user themself\nmanage=Verwalten\nauthentication=Authentifizierung\n" }, { "change_type": "MODIFY", "old_path": "themes/src/main/resources/theme/base/admin/messages/admin-messages_en.properties", "new_path": "themes/src/main/resources/theme/base/admin/messages/admin-messages_en.properties", "diff": "@@ -1156,9 +1156,9 @@ client-scopes.evaluate.granted-realm-effective-roles=Granted Effective Realm Rol\nclient-scopes.evaluate.granted-realm-effective-roles.tooltip=Client has scope mappings for these roles. Those roles will be in the access token issued to this client if the authenticated user is a member of them\nclient-scopes.evaluate.granted-client-effective-roles=Granted Effective Client Roles\ngenerated-access-token=Generated Access Token\n-generated-access-token.tooltip=See the example access token, which will be generated and sent to the client when selected user is authenticated. You can see claims and roles that the token will contain based on the effective protocol mappers and role scope mappings and also based on the claims/roles assigned to user himself\n+generated-access-token.tooltip=See the example access token, which will be generated and sent to the client when selected user is authenticated. You can see claims and roles that the token will contain based on the effective protocol mappers and role scope mappings and also based on the claims/roles assigned to user themselves\ngenerated-id-token=Generated ID Token\n-generated-id-token.tooltip=See the example ID Token, which will be generated and sent to the client when selected user is authenticated. You can see claims and roles that the token will contain based on the effective protocol mappers and role scope mappings and also based on the claims/roles assigned to user himself\n+generated-id-token.tooltip=See the example ID Token, which will be generated and sent to the client when selected user is authenticated. You can see claims and roles that the token will contain based on the effective protocol mappers and role scope mappings and also based on the claims/roles assigned to user themselves\ngenerated-user-info=Generated User Info\ngenerated-user-info.tooltip=See the example User Info, which will be provided by the User Info Endpoint\n" } ]

[ { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/services/clientpolicy/condition/ClientAccessTypeCondition.java", "new_path": "services/src/main/java/org/keycloak/services/clientpolicy/condition/ClientAccessTypeCondition.java", "diff": "@@ -25,9 +25,11 @@ import org.jboss.logging.Logger;\nimport org.keycloak.models.ClientModel;\nimport org.keycloak.models.KeycloakSession;\nimport org.keycloak.representations.idm.ClientPolicyConditionConfigurationRepresentation;\n+import org.keycloak.representations.idm.ClientRepresentation;\nimport org.keycloak.services.clientpolicy.ClientPolicyContext;\nimport org.keycloak.services.clientpolicy.ClientPolicyException;\nimport org.keycloak.services.clientpolicy.ClientPolicyVote;\n+import org.keycloak.services.clientpolicy.context.ClientCRUDContext;\n/**\n* @author <a href=\"mailto:[email protected]\">Takashi Norimatsu</a>\n@@ -74,10 +76,14 @@ public class ClientAccessTypeCondition extends AbstractClientPolicyConditionProv\ncase TOKEN_INTROSPECT:\ncase USERINFO_REQUEST:\ncase LOGOUT_REQUEST:\n+ case UPDATE:\ncase UPDATED:\ncase REGISTERED:\nif (isClientAccessTypeMatched()) return ClientPolicyVote.YES;\nreturn ClientPolicyVote.NO;\n+ case REGISTER:\n+ if (isProposedClientAccessTypeMatched((ClientCRUDContext)context)) return ClientPolicyVote.YES;\n+ return ClientPolicyVote.NO;\ndefault:\nreturn ClientPolicyVote.ABSTAIN;\n}\n@@ -86,14 +92,31 @@ public class ClientAccessTypeCondition extends AbstractClientPolicyConditionProv\nprivate String getClientAccessType() {\nClientModel client = session.getContext().getClient();\nif (client == null) return null;\n+ return getClientAccessType(client.isPublicClient(), client.isBearerOnly());\n+ }\n+\n+ private String getProposedClientAccessType(ClientCRUDContext context) {\n+ ClientRepresentation clientRep = context.getProposedClientRepresentation();\n+ if (clientRep == null) return null;\n+ return getClientAccessType(Optional.ofNullable(clientRep.isPublicClient()).orElse(Boolean.FALSE).booleanValue(),\n+ Optional.ofNullable(clientRep.isBearerOnly()).orElse(Boolean.FALSE).booleanValue());\n+ }\n- if (client.isPublicClient()) return ClientAccessTypeConditionFactory.TYPE_PUBLIC;\n- if (client.isBearerOnly()) return ClientAccessTypeConditionFactory.TYPE_BEARERONLY;\n+ private String getClientAccessType(boolean isPublicClient, boolean isBearerOnly) {\n+ if (isPublicClient) return ClientAccessTypeConditionFactory.TYPE_PUBLIC;\n+ if (isBearerOnly) return ClientAccessTypeConditionFactory.TYPE_BEARERONLY;\nelse return ClientAccessTypeConditionFactory.TYPE_CONFIDENTIAL;\n}\nprivate boolean isClientAccessTypeMatched() {\n- final String accessType = getClientAccessType();\n+ return isClientAccessTypeMatched(getClientAccessType());\n+ }\n+\n+ private boolean isProposedClientAccessTypeMatched(ClientCRUDContext context) {\n+ return isClientAccessTypeMatched(getProposedClientAccessType(context));\n+ }\n+\n+ private boolean isClientAccessTypeMatched(String accessType) {\nif (accessType == null) return false;\nList<String> expectedAccessTypes = Optional.ofNullable(configuration.getType()).orElse(Collections.emptyList());\n" }, { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/services/clientpolicy/executor/ClientSecretRotationExecutor.java", "new_path": "services/src/main/java/org/keycloak/services/clientpolicy/executor/ClientSecretRotationExecutor.java", "diff": "@@ -49,25 +49,25 @@ public class ClientSecretRotationExecutor implements\n@Override\npublic void executeOnEvent(ClientPolicyContext context) throws ClientPolicyException {\n- if (!session.getContext().getClient().isPublicClient() && !session.getContext().getClient()\n- .isBearerOnly()) {\n- session.setAttribute(ClientSecretConstants.CLIENT_SECRET_ROTATION_ENABLED, Boolean.TRUE);\nswitch (context.getEvent()) {\ncase REGISTERED:\ncase UPDATED:\n+ if(isClientWithSecret(session.getContext().getClient())) {\n+ session.setAttribute(ClientSecretConstants.CLIENT_SECRET_ROTATION_ENABLED, Boolean.TRUE);\nexecuteOnClientCreateOrUpdate((ClientCRUDContext) context);\n+ }\nbreak;\n-\ncase AUTHORIZATION_REQUEST:\ncase TOKEN_REQUEST:\n+ if(isClientWithSecret(session.getContext().getClient())) {\n+ session.setAttribute(ClientSecretConstants.CLIENT_SECRET_ROTATION_ENABLED, Boolean.TRUE);\nexecuteOnAuthRequest();\n- return;\n-\n+ }\n+ break;\ndefault:\nreturn;\n}\n}\n- }\n@Override\npublic void setupConfiguration(ClientSecretRotationExecutor.Configuration config) {\n@@ -80,6 +80,11 @@ public class ClientSecretRotationExecutor implements\n}\n+ private boolean isClientWithSecret(ClientModel client) {\n+ if (client == null) return false;\n+ return (!client.isPublicClient() && !client.isBearerOnly());\n+ }\n+\nprivate void executeOnAuthRequest() {\nClientModel client = session.getContext().getClient();\nOIDCClientSecretConfigWrapper wrapper = OIDCClientSecretConfigWrapper.fromClientModel(\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientPoliciesTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientPoliciesTest.java", "diff": "@@ -1053,6 +1053,66 @@ public class ClientPoliciesTest extends AbstractClientPoliciesTest {\nsuccessfulLoginAndLogout(clientBetaId, null);\nfailLoginWithoutNonce(clientAlphaId);\n+\n+ // update profiles\n+ json = (new ClientProfilesBuilder()).addProfile(\n+ (new ClientProfileBuilder()).createProfile(PROFILE_NAME, \"El Primer Perfil\")\n+ .addExecutor(PKCEEnforcerExecutorFactory.PROVIDER_ID,\n+ createPKCEEnforceExecutorConfig(Boolean.FALSE)) // check only\n+ .toRepresentation()\n+ ).toString();\n+ updateProfiles(json);\n+\n+ // Attempt to create a confidential client without PKCE setting. Should fail\n+ try {\n+ createClientByAdmin(generateSuffixedName(\"Gamma-App\"), (ClientRepresentation clientRep) -> {\n+ clientRep.setSecret(\"secretGamma\");\n+ clientRep.setBearerOnly(Boolean.FALSE);\n+ clientRep.setPublicClient(Boolean.FALSE);\n+ });\n+ fail();\n+ } catch (ClientPolicyException e) {\n+ assertEquals(OAuthErrorException.INVALID_CLIENT_METADATA, e.getMessage());\n+ assertEquals(\"Invalid client metadata: code_challenge_method\", e.getErrorDetail());\n+ }\n+\n+ json = (new ClientProfilesBuilder()).addProfile(\n+ (new ClientProfileBuilder()).createProfile(PROFILE_NAME, \"El Primer Perfil\")\n+ .addExecutor(PKCEEnforcerExecutorFactory.PROVIDER_ID,\n+ createPKCEEnforceExecutorConfig(Boolean.TRUE)) // enforce\n+ .toRepresentation()\n+ ).toString();\n+ updateProfiles(json);\n+\n+ authCreateClients();\n+ String clientGammaId = createClientDynamically(generateSuffixedName(\"Gamma-App\"), (OIDCClientRepresentation clientRep) -> {\n+ clientRep.setClientSecret(\"secretGamma\");\n+ });\n+\n+ ClientRepresentation clientRep = getClientByAdmin(clientGammaId);\n+ assertEquals(OAuth2Constants.PKCE_METHOD_S256, OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).getPkceCodeChallengeMethod());\n+\n+ json = (new ClientProfilesBuilder()).addProfile(\n+ (new ClientProfileBuilder()).createProfile(PROFILE_NAME, \"El Primer Perfil\")\n+ .addExecutor(PKCEEnforcerExecutorFactory.PROVIDER_ID,\n+ createPKCEEnforceExecutorConfig(Boolean.FALSE)) // check only\n+ .toRepresentation()\n+ ).toString();\n+ updateProfiles(json);\n+\n+ // Attempt to update the confidential client with not allowed PKCE setting. Should fail\n+ try {\n+ updateClientByAdmin(clientGammaId, (ClientRepresentation updatingClientRep) -> {\n+ updatingClientRep.setAttributes(new HashMap<>());\n+ updatingClientRep.getAttributes().put(OIDCConfigAttributes.PKCE_CODE_CHALLENGE_METHOD, OAuth2Constants.PKCE_METHOD_PLAIN);\n+ });\n+ } catch (ClientPolicyException e) {\n+ assertEquals(OAuthErrorException.INVALID_CLIENT_METADATA, e.getMessage());\n+ assertEquals(\"Invalid client metadata: code_challenge_method\", e.getErrorDetail());\n+ }\n+ ClientRepresentation cRep = getClientByAdmin(clientGammaId);\n+ assertEquals(OAuth2Constants.PKCE_METHOD_S256, cRep.getAttributes().get(OIDCConfigAttributes.PKCE_CODE_CHALLENGE_METHOD));\n+\n}\n@Test\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/HotRodMapStorageProviderFactory.java", "new_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/HotRodMapStorageProviderFactory.java", "diff": "@@ -26,6 +26,7 @@ import org.keycloak.authorization.model.ResourceServer;\nimport org.keycloak.authorization.model.Scope;\nimport org.keycloak.common.Profile;\nimport org.keycloak.component.AmphibianProviderFactory;\n+import org.keycloak.models.ActionTokenValueModel;\nimport org.keycloak.events.Event;\nimport org.keycloak.events.admin.AdminEvent;\nimport org.keycloak.models.AuthenticatedClientSessionModel;\n@@ -66,6 +67,7 @@ import org.keycloak.models.map.realm.entity.MapRequiredActionProviderEntity;\nimport org.keycloak.models.map.realm.entity.MapRequiredCredentialEntity;\nimport org.keycloak.models.map.realm.entity.MapWebAuthnPolicyEntity;\nimport org.keycloak.models.map.role.MapRoleEntity;\n+import org.keycloak.models.map.singleUseObject.MapSingleUseObjectEntity;\nimport org.keycloak.models.map.storage.hotRod.authSession.HotRodAuthenticationSessionEntityDelegate;\nimport org.keycloak.models.map.storage.hotRod.authSession.HotRodRootAuthenticationSessionEntity;\nimport org.keycloak.models.map.storage.hotRod.authSession.HotRodRootAuthenticationSessionEntityDelegate;\n@@ -116,6 +118,8 @@ import org.keycloak.models.map.storage.hotRod.realm.entity.HotRodOTPPolicyEntity\nimport org.keycloak.models.map.storage.hotRod.realm.entity.HotRodRequiredActionProviderEntityDelegate;\nimport org.keycloak.models.map.storage.hotRod.realm.entity.HotRodRequiredCredentialEntityDelegate;\nimport org.keycloak.models.map.storage.hotRod.realm.entity.HotRodWebAuthnPolicyEntityDelegate;\n+import org.keycloak.models.map.storage.hotRod.singleUseObject.HotRodSingleUseObjectEntity;\n+import org.keycloak.models.map.storage.hotRod.singleUseObject.HotRodSingleUseObjectEntityDelegate;\nimport org.keycloak.models.map.storage.hotRod.user.HotRodUserConsentEntityDelegate;\nimport org.keycloak.models.map.storage.hotRod.user.HotRodUserCredentialEntityDelegate;\nimport org.keycloak.models.map.storage.hotRod.user.HotRodUserEntity;\n@@ -159,6 +163,8 @@ public class HotRodMapStorageProviderFactory implements AmphibianProviderFactory\n.constructor(MapRoleEntity.class, HotRodRoleEntityDelegate::new)\n+ .constructor(MapSingleUseObjectEntity.class, HotRodSingleUseObjectEntityDelegate::new)\n+\n.constructor(MapUserEntity.class, HotRodUserEntityDelegate::new)\n.constructor(MapUserCredentialEntity.class, HotRodUserCredentialEntityDelegate::new)\n.constructor(MapUserFederatedIdentityEntity.class, HotRodUserFederatedIdentityEntityDelegate::new)\n@@ -242,6 +248,12 @@ public class HotRodMapStorageProviderFactory implements AmphibianProviderFactory\nHotRodRealmEntity.class,\nHotRodRealmEntityDelegate::new));\n+ // single-use object storage descriptor\n+ ENTITY_DESCRIPTOR_MAP.put(ActionTokenValueModel.class,\n+ new HotRodEntityDescriptor<>(ActionTokenValueModel.class,\n+ HotRodSingleUseObjectEntity.class,\n+ HotRodSingleUseObjectEntityDelegate::new));\n+\n// User sessions descriptor\nENTITY_DESCRIPTOR_MAP.put(UserSessionModel.class,\nnew HotRodEntityDescriptor<>(UserSessionModel.class,\n@@ -339,6 +351,8 @@ public class HotRodMapStorageProviderFactory implements AmphibianProviderFactory\nHotRodMapStorage clientSessionStore = getHotRodStorage(session, AuthenticatedClientSessionModel.class);\nreturn new HotRodUserSessionMapStorage(clientSessionStore, connectionProvider.getRemoteCache(entityDescriptor.getCacheName()), StringKeyConverter.StringKey.INSTANCE, entityDescriptor, CLONER);\n+ } else if (modelType == ActionTokenValueModel.class) {\n+ return new SingleUseObjectHotRodMapStorage(connectionProvider.getRemoteCache(entityDescriptor.getCacheName()), StringKeyConverter.StringKey.INSTANCE, entityDescriptor, CLONER);\n}\nreturn new HotRodMapStorage<>(connectionProvider.getRemoteCache(entityDescriptor.getCacheName()), StringKeyConverter.StringKey.INSTANCE, entityDescriptor, CLONER);\n}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/SingleUseObjectHotRodMapStorage.java", "diff": "+/*\n+ * Copyright 2022 Red Hat, Inc. and/or its affiliates\n+ * and other contributors as indicated by the @author tags.\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+\n+package org.keycloak.models.map.storage.hotRod;\n+\n+import org.infinispan.client.hotrod.RemoteCache;\n+import org.keycloak.models.ActionTokenValueModel;\n+import org.keycloak.models.KeycloakSession;\n+import org.keycloak.models.map.common.AbstractEntity;\n+import org.keycloak.models.map.common.DeepCloner;\n+import org.keycloak.models.map.common.StringKeyConverter;\n+import org.keycloak.models.map.storage.chm.MapModelCriteriaBuilder;\n+import org.keycloak.models.map.storage.chm.SingleUseObjectKeycloakTransaction;\n+import org.keycloak.models.map.storage.MapKeycloakTransaction;\n+import org.keycloak.models.map.storage.QueryParameters;\n+import org.keycloak.models.map.storage.chm.MapFieldPredicates;\n+import org.keycloak.models.map.storage.chm.SingleUseObjectModelCriteriaBuilder;\n+import org.keycloak.models.map.storage.criteria.DefaultModelCriteria;\n+import org.keycloak.models.map.storage.hotRod.common.AbstractHotRodEntity;\n+import org.keycloak.models.map.storage.hotRod.common.HotRodEntityDelegate;\n+import org.keycloak.models.map.storage.hotRod.common.HotRodEntityDescriptor;\n+import org.keycloak.models.map.storage.hotRod.singleUseObject.HotRodSingleUseObjectEntity;\n+import org.keycloak.models.map.storage.hotRod.singleUseObject.HotRodSingleUseObjectEntityDelegate;\n+import org.keycloak.storage.SearchableModelField;\n+\n+import java.util.Map;\n+import java.util.stream.Stream;\n+\n+\n+/**\n+ * @author <a href=\"mailto:[email protected]\">Martin Kanis</a>\n+ */\n+public class SingleUseObjectHotRodMapStorage<K, E extends AbstractHotRodEntity, V extends HotRodEntityDelegate<E> & AbstractEntity, M>\n+ extends HotRodMapStorage<String, HotRodSingleUseObjectEntity, HotRodSingleUseObjectEntityDelegate, ActionTokenValueModel> {\n+\n+ private final StringKeyConverter<String> keyConverter;\n+ private final HotRodEntityDescriptor<HotRodSingleUseObjectEntity, HotRodSingleUseObjectEntityDelegate> storedEntityDescriptor;\n+ private final DeepCloner cloner;\n+\n+ public SingleUseObjectHotRodMapStorage(RemoteCache<String, HotRodSingleUseObjectEntity> remoteCache, StringKeyConverter<String> keyConverter,\n+ HotRodEntityDescriptor<HotRodSingleUseObjectEntity, HotRodSingleUseObjectEntityDelegate> storedEntityDescriptor,\n+ DeepCloner cloner) {\n+ super(remoteCache, keyConverter, storedEntityDescriptor, cloner);\n+ this.keyConverter = keyConverter;\n+ this.storedEntityDescriptor = storedEntityDescriptor;\n+ this.cloner = cloner;\n+ }\n+\n+ @Override\n+ public MapKeycloakTransaction<HotRodSingleUseObjectEntityDelegate, ActionTokenValueModel> createTransaction(KeycloakSession session) {\n+ MapKeycloakTransaction<HotRodSingleUseObjectEntityDelegate, ActionTokenValueModel> transaction = session.getAttribute(\"map-transaction-\" + hashCode(), MapKeycloakTransaction.class);\n+\n+ if (transaction == null) {\n+ Map<SearchableModelField<? super ActionTokenValueModel>, MapModelCriteriaBuilder.UpdatePredicatesFunc<K, HotRodSingleUseObjectEntityDelegate, ActionTokenValueModel>> fieldPredicates =\n+ MapFieldPredicates.getPredicates((Class<ActionTokenValueModel>) storedEntityDescriptor.getModelTypeClass());\n+ transaction = new SingleUseObjectKeycloakTransaction(this, keyConverter, cloner, fieldPredicates);\n+ session.setAttribute(\"map-transaction-\" + hashCode(), transaction);\n+ }\n+\n+ return transaction;\n+ }\n+\n+ @Override\n+ public HotRodSingleUseObjectEntityDelegate create(HotRodSingleUseObjectEntityDelegate value) {\n+ if (value.getId() == null) {\n+ if (value.getUserId() != null && value.getActionId() != null && value.getActionVerificationNonce() != null) {\n+ value.setId(value.getUserId() + \":\" + value.getActionId() + \":\" + value.getActionVerificationNonce());\n+ }\n+ }\n+ return super.create(value);\n+ }\n+\n+ @Override\n+ public Stream<HotRodSingleUseObjectEntityDelegate> read(QueryParameters<ActionTokenValueModel> queryParameters) {\n+ DefaultModelCriteria<ActionTokenValueModel> criteria = queryParameters.getModelCriteriaBuilder();\n+\n+ if (criteria == null) {\n+ return Stream.empty();\n+ }\n+\n+ SingleUseObjectModelCriteriaBuilder mcb = criteria.flashToModelCriteriaBuilder(createSingleUseObjectCriteriaBuilder());\n+ if (mcb.isValid()) {\n+ HotRodSingleUseObjectEntityDelegate value = read(mcb.getKey());\n+\n+ return value != null && value.getHotRodEntity() != null ? Stream.of(value) : Stream.empty();\n+ }\n+\n+ return super.read(queryParameters);\n+ }\n+\n+ private SingleUseObjectModelCriteriaBuilder createSingleUseObjectCriteriaBuilder() {\n+ return new SingleUseObjectModelCriteriaBuilder();\n+ }\n+\n+}\n" }, { "change_type": "MODIFY", "old_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/common/ProtoSchemaInitializer.java", "new_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/common/ProtoSchemaInitializer.java", "diff": "@@ -54,6 +54,7 @@ import org.keycloak.models.map.storage.hotRod.realm.entity.HotRodRequiredCredent\nimport org.keycloak.models.map.storage.hotRod.realm.entity.HotRodRequirement;\nimport org.keycloak.models.map.storage.hotRod.realm.entity.HotRodWebAuthnPolicyEntity;\nimport org.keycloak.models.map.storage.hotRod.role.HotRodRoleEntity;\n+import org.keycloak.models.map.storage.hotRod.singleUseObject.HotRodSingleUseObjectEntity;\nimport org.keycloak.models.map.storage.hotRod.user.HotRodUserConsentEntity;\nimport org.keycloak.models.map.storage.hotRod.user.HotRodUserCredentialEntity;\nimport org.keycloak.models.map.storage.hotRod.user.HotRodUserEntity;\n@@ -110,6 +111,9 @@ import org.keycloak.models.map.storage.hotRod.userSession.HotRodUserSessionEntit\nHotRodWebAuthnPolicyEntity.class,\nHotRodRealmEntity.class,\n+ // single-use objects\n+ HotRodSingleUseObjectEntity.class,\n+\n// User sessions\nHotRodUserSessionEntity.class,\nHotRodSessionState.class,\n" }, { "change_type": "ADD", "old_path": null, "new_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/singleUseObject/HotRodSingleUseObjectEntity.java", "diff": "+/*\n+ * Copyright 2022 Red Hat, Inc. and/or its affiliates\n+ * and other contributors as indicated by the @author tags.\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+\n+package org.keycloak.models.map.storage.hotRod.singleUseObject;\n+\n+import org.infinispan.protostream.annotations.ProtoDoc;\n+import org.infinispan.protostream.annotations.ProtoField;\n+import org.keycloak.models.map.annotations.GenerateHotRodEntityImplementation;\n+import org.keycloak.models.map.singleUseObject.MapSingleUseObjectEntity;\n+import org.keycloak.models.map.storage.hotRod.common.AbstractHotRodEntity;\n+import org.keycloak.models.map.storage.hotRod.common.HotRodPair;\n+import org.keycloak.models.map.storage.hotRod.common.UpdatableHotRodEntityDelegateImpl;\n+\n+import java.util.Set;\n+\n+@GenerateHotRodEntityImplementation(\n+ implementInterface = \"org.keycloak.models.map.singleUseObject.MapSingleUseObjectEntity\",\n+ inherits = \"org.keycloak.models.map.storage.hotRod.singleUseObject.HotRodSingleUseObjectEntity.AbstractHotRodSingleUseObjectEntityDelegate\"\n+)\n+@ProtoDoc(\"@Indexed\")\n+public class HotRodSingleUseObjectEntity extends AbstractHotRodEntity {\n+\n+ @ProtoDoc(\"@Field(index = Index.YES, store = Store.YES)\")\n+ @ProtoField(number = 1)\n+ public Integer entityVersion = 1;\n+\n+ @ProtoField(number = 2)\n+ public String id;\n+\n+ @ProtoField(number = 3)\n+ public String userId;\n+\n+ @ProtoField(number = 4)\n+ public String actionId;\n+\n+ @ProtoField(number = 5)\n+ public String actionVerificationNonce;\n+\n+ @ProtoField(number = 6)\n+ public Long expiration;\n+\n+ @ProtoField(number = 7)\n+ public Set<HotRodPair<String, String>> notes;\n+\n+ public static abstract class AbstractHotRodSingleUseObjectEntityDelegate extends UpdatableHotRodEntityDelegateImpl<HotRodSingleUseObjectEntity> implements MapSingleUseObjectEntity {\n+\n+ @Override\n+ public String getId() {\n+ HotRodSingleUseObjectEntity hotRodEntity = getHotRodEntity();\n+ return hotRodEntity != null ? hotRodEntity.id : null;\n+ }\n+\n+ @Override\n+ public void setId(String id) {\n+ HotRodSingleUseObjectEntity entity = getHotRodEntity();\n+ if (entity.id != null) throw new IllegalStateException(\"Id cannot be changed\");\n+ entity.id = id;\n+ entity.updated |= id != null;\n+ }\n+ }\n+\n+ @Override\n+ public boolean equals(Object o) {\n+ return HotRodSingleUseObjectEntityDelegate.entityEquals(this, o);\n+ }\n+\n+ @Override\n+ public int hashCode() {\n+ return HotRodSingleUseObjectEntityDelegate.entityHashCode(this);\n+ }\n+}\n" }, { "change_type": "MODIFY", "old_path": "model/map-hot-rod/src/main/resources/config/cacheConfig.xml", "new_path": "model/map-hot-rod/src/main/resources/config/cacheConfig.xml", "diff": "</indexed-entities>\n</indexing>\n</distributed-cache>\n+ <distributed-cache name=\"single-use-objects\" mode=\"SYNC\">\n+ <indexing>\n+ <indexed-entities>\n+ <indexed-entity>kc.HotRodSingleUseObjectEntity</indexed-entity>\n+ </indexed-entities>\n+ </indexing>\n+ <encoding media-type=\"application/x-protostream\"/>\n+ </distributed-cache>\n</cache-container>\n</infinispan>\n" }, { "change_type": "MODIFY", "old_path": "model/map-hot-rod/src/main/resources/config/infinispan.xml", "new_path": "model/map-hot-rod/src/main/resources/config/infinispan.xml", "diff": "</indexed-entities>\n</indexing>\n</distributed-cache>\n+ <distributed-cache name=\"single-use-objects\" mode=\"SYNC\">\n+ <indexing>\n+ <indexed-entities>\n+ <indexed-entity>kc.HotRodSingleUseObjectEntity</indexed-entity>\n+ </indexed-entities>\n+ </indexing>\n+ <encoding media-type=\"application/x-protostream\"/>\n+ </distributed-cache>\n</cache-container>\n</infinispan>\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/storage/chm/SingleUseObjectConcurrentHashMapStorage.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/storage/chm/SingleUseObjectConcurrentHashMapStorage.java", "diff": "@@ -26,9 +26,7 @@ import org.keycloak.models.map.singleUseObject.MapSingleUseObjectEntity;\nimport org.keycloak.models.map.storage.MapKeycloakTransaction;\nimport org.keycloak.models.map.storage.QueryParameters;\nimport org.keycloak.models.map.storage.criteria.DefaultModelCriteria;\n-import org.keycloak.storage.SearchableModelField;\n-import java.util.Map;\nimport java.util.stream.Stream;\n/**\n@@ -44,7 +42,13 @@ public class SingleUseObjectConcurrentHashMapStorage<K, V extends AbstractEntity\n@SuppressWarnings(\"unchecked\")\npublic MapKeycloakTransaction<MapSingleUseObjectEntity, ActionTokenValueModel> createTransaction(KeycloakSession session) {\nMapKeycloakTransaction<MapSingleUseObjectEntity, ActionTokenValueModel> actionTokenTransaction = session.getAttribute(\"map-transaction-\" + hashCode(), MapKeycloakTransaction.class);\n- return actionTokenTransaction == null ? new SingleUseObjectConcurrentHashMapStorage.Transaction(getKeyConverter(), cloner, fieldPredicates) : actionTokenTransaction;\n+\n+ if (actionTokenTransaction == null) {\n+ actionTokenTransaction = new SingleUseObjectKeycloakTransaction(this, keyConverter, cloner, fieldPredicates);\n+ session.setAttribute(\"map-transaction-\" + hashCode(), actionTokenTransaction);\n+ }\n+\n+ return actionTokenTransaction;\n}\n@Override\n@@ -78,21 +82,4 @@ public class SingleUseObjectConcurrentHashMapStorage<K, V extends AbstractEntity\nreturn new SingleUseObjectModelCriteriaBuilder();\n}\n- private class Transaction extends ConcurrentHashMapKeycloakTransaction<K, MapSingleUseObjectEntity, ActionTokenValueModel> {\n-\n- public Transaction(StringKeyConverter<K> keyConverter, DeepCloner cloner,\n- Map<SearchableModelField<? super ActionTokenValueModel>, MapModelCriteriaBuilder.UpdatePredicatesFunc<K, MapSingleUseObjectEntity, ActionTokenValueModel>> fieldPredicates) {\n- super(SingleUseObjectConcurrentHashMapStorage.this, keyConverter, cloner, fieldPredicates);\n- }\n-\n- @Override\n- public MapSingleUseObjectEntity create(MapSingleUseObjectEntity value) {\n- if (value.getId() == null) {\n- if (value.getUserId() != null && value.getActionId() != null && value.getActionVerificationNonce() != null) {\n- value.setId(value.getUserId() + \":\" + value.getActionId() + \":\" + value.getActionVerificationNonce());\n- }\n- }\n- return super.create(value);\n- }\n- }\n}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "model/map/src/main/java/org/keycloak/models/map/storage/chm/SingleUseObjectKeycloakTransaction.java", "diff": "+/*\n+ * Copyright 2022 Red Hat, Inc. and/or its affiliates\n+ * and other contributors as indicated by the @author tags.\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+\n+package org.keycloak.models.map.storage.chm;\n+\n+import org.keycloak.models.ActionTokenValueModel;\n+import org.keycloak.models.map.common.DeepCloner;\n+import org.keycloak.models.map.common.StringKeyConverter;\n+import org.keycloak.models.map.singleUseObject.MapSingleUseObjectEntity;\n+import org.keycloak.storage.SearchableModelField;\n+\n+import java.util.Map;\n+\n+/**\n+ * @author <a href=\"mailto:[email protected]\">Martin Kanis</a>\n+ */\n+public class SingleUseObjectKeycloakTransaction<K> extends ConcurrentHashMapKeycloakTransaction<K, MapSingleUseObjectEntity, ActionTokenValueModel> {\n+\n+ public SingleUseObjectKeycloakTransaction(ConcurrentHashMapCrudOperations<MapSingleUseObjectEntity, ActionTokenValueModel> map,\n+ StringKeyConverter<K> keyConverter,\n+ DeepCloner cloner,\n+ Map<SearchableModelField<? super ActionTokenValueModel>,\n+ MapModelCriteriaBuilder.UpdatePredicatesFunc<K, MapSingleUseObjectEntity, ActionTokenValueModel>> fieldPredicates) {\n+ super(map, keyConverter, cloner, fieldPredicates);\n+ }\n+\n+ @Override\n+ public MapSingleUseObjectEntity create(MapSingleUseObjectEntity value) {\n+ if (value.getId() == null) {\n+ if (value.getUserId() != null && value.getActionId() != null && value.getActionVerificationNonce() != null) {\n+ value.setId(value.getUserId() + \":\" + value.getActionId() + \":\" + value.getActionVerificationNonce());\n+ }\n+ }\n+ return super.create(value);\n+ }\n+}\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/pom.xml", "new_path": "testsuite/integration-arquillian/tests/pom.xml", "diff": "<keycloak.userSession.map.storage.provider>hotrod</keycloak.userSession.map.storage.provider>\n<keycloak.authorization.map.storage.provider>hotrod</keycloak.authorization.map.storage.provider>\n<keycloak.eventStore.map.storage.provider>hotrod</keycloak.eventStore.map.storage.provider>\n+ <keycloak.actionToken.map.storage.provider>hotrod</keycloak.actionToken.map.storage.provider>\n+ <keycloak.singleUseObject.map.storage.provider>hotrod</keycloak.singleUseObject.map.storage.provider>\n</systemPropertyVariables>\n</configuration>\n</plugin>\n" }, { "change_type": "MODIFY", "old_path": "testsuite/model/src/main/resources/hotrod/infinispan.xml", "new_path": "testsuite/model/src/main/resources/hotrod/infinispan.xml", "diff": "</indexed-entities>\n</indexing>\n</distributed-cache>\n+ <distributed-cache name=\"single-use-objects\" mode=\"SYNC\">\n+ <indexing>\n+ <indexed-entities>\n+ <indexed-entity>kc.HotRodSingleUseObjectEntity</indexed-entity>\n+ </indexed-entities>\n+ </indexing>\n+ <encoding media-type=\"application/x-protostream\"/>\n+ </distributed-cache>\n</cache-container>\n</infinispan>\n" }, { "change_type": "MODIFY", "old_path": "testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/HotRodMapStorage.java", "new_path": "testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/HotRodMapStorage.java", "diff": "@@ -76,8 +76,8 @@ public class HotRodMapStorage extends KeycloakModelParameters {\n@Override\npublic void updateConfig(Config cf) {\ncf.spi(AuthenticationSessionSpi.PROVIDER_ID).provider(MapRootAuthenticationSessionProviderFactory.PROVIDER_ID).config(STORAGE_CONFIG, HotRodMapStorageProviderFactory.PROVIDER_ID)\n- .spi(ActionTokenStoreSpi.NAME).provider(MapSingleUseObjectProviderFactory.PROVIDER_ID).config(STORAGE_CONFIG, ConcurrentHashMapStorageProviderFactory.PROVIDER_ID)\n- .spi(SingleUseObjectSpi.NAME).provider(MapSingleUseObjectProviderFactory.PROVIDER_ID).config(STORAGE_CONFIG, ConcurrentHashMapStorageProviderFactory.PROVIDER_ID)\n+ .spi(ActionTokenStoreSpi.NAME).provider(MapSingleUseObjectProviderFactory.PROVIDER_ID).config(STORAGE_CONFIG, HotRodMapStorageProviderFactory.PROVIDER_ID)\n+ .spi(SingleUseObjectSpi.NAME).provider(MapSingleUseObjectProviderFactory.PROVIDER_ID).config(STORAGE_CONFIG, HotRodMapStorageProviderFactory.PROVIDER_ID)\n.spi(\"client\").provider(MapClientProviderFactory.PROVIDER_ID).config(STORAGE_CONFIG, HotRodMapStorageProviderFactory.PROVIDER_ID)\n.spi(\"clientScope\").provider(MapClientScopeProviderFactory.PROVIDER_ID).config(STORAGE_CONFIG, HotRodMapStorageProviderFactory.PROVIDER_ID)\n.spi(\"group\").provider(MapGroupProviderFactory.PROVIDER_ID).config(STORAGE_CONFIG, HotRodMapStorageProviderFactory.PROVIDER_ID)\n" } ]

[ { "change_type": "MODIFY", "old_path": "server-spi-private/src/main/java/org/keycloak/events/Details.java", "new_path": "server-spi-private/src/main/java/org/keycloak/events/Details.java", "diff": "@@ -55,6 +55,7 @@ public interface Details {\nString UPDATED_REFRESH_TOKEN_ID = \"updated_refresh_token_id\";\nString NODE_HOST = \"node_host\";\nString REASON = \"reason\";\n+ String GRANTED_CLIENT = \"granted_client\";\nString REVOKED_CLIENT = \"revoked_client\";\nString AUDIENCE = \"audience\";\nString PERMISSION = \"permission\";\n" }, { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/services/resources/account/AccountRestService.java", "new_path": "services/src/main/java/org/keycloak/services/resources/account/AccountRestService.java", "diff": "@@ -123,6 +123,7 @@ public class AccountRestService {\nthis.event = event;\nthis.locale = session.getContext().resolveLocale(user);\nthis.version = version;\n+ event.client(auth.getClient()).user(auth.getUser());\n}\npublic void init() {\n@@ -201,7 +202,7 @@ public class AccountRestService {\npublic Response updateAccount(UserRepresentation rep) {\nauth.require(AccountRoles.MANAGE_ACCOUNT);\n- event.event(EventType.UPDATE_PROFILE).client(auth.getClient()).user(auth.getUser()).detail(Details.CONTEXT, UserProfileContext.ACCOUNT.name());\n+ event.event(EventType.UPDATE_PROFILE).detail(Details.CONTEXT, UserProfileContext.ACCOUNT.name());\nUserProfileProvider profileProvider = session.getProvider(UserProfileProvider.class);\nUserProfile profile = profileProvider.create(UserProfileContext.ACCOUNT, rep.toAttributes(), auth.getUser());\n@@ -350,14 +351,13 @@ public class AccountRestService {\nevent.event(EventType.REVOKE_GRANT);\nClientModel client = realm.getClientByClientId(clientId);\nif (client == null) {\n- event.event(EventType.REVOKE_GRANT_ERROR);\nString msg = String.format(\"No client with clientId: %s found.\", clientId);\nevent.error(msg);\nreturn ErrorResponse.error(msg, Response.Status.NOT_FOUND);\n}\nUserConsentManager.revokeConsentToClient(session, client, user);\n- event.success();\n+ event.detail(Details.REVOKED_CLIENT, client.getClientId()).success();\nreturn Response.noContent().build();\n}\n@@ -375,6 +375,7 @@ public class AccountRestService {\n@Produces(MediaType.APPLICATION_JSON)\npublic Response grantConsent(final @PathParam(\"clientId\") String clientId,\nfinal ConsentRepresentation consent) {\n+ event.event(EventType.GRANT_CONSENT);\nreturn upsert(clientId, consent);\n}\n@@ -391,6 +392,7 @@ public class AccountRestService {\n@Produces(MediaType.APPLICATION_JSON)\npublic Response updateConsent(final @PathParam(\"clientId\") String clientId,\nfinal ConsentRepresentation consent) {\n+ event.event(EventType.UPDATE_CONSENT);\nreturn upsert(clientId, consent);\n}\n@@ -406,10 +408,8 @@ public class AccountRestService {\ncheckAccountApiEnabled();\nauth.requireOneOf(AccountRoles.MANAGE_ACCOUNT, AccountRoles.MANAGE_CONSENT);\n- event.event(EventType.GRANT_CONSENT);\nClientModel client = realm.getClientByClientId(clientId);\nif (client == null) {\n- event.event(EventType.GRANT_CONSENT_ERROR);\nString msg = String.format(\"No client with clientId: %s found.\", clientId);\nevent.error(msg);\nreturn ErrorResponse.error(msg, Response.Status.NOT_FOUND);\n@@ -419,10 +419,14 @@ public class AccountRestService {\nUserConsentModel grantedConsent = createConsent(client, consent);\nif (session.users().getConsentByClient(realm, user.getId(), client.getId()) == null) {\nsession.users().addConsent(realm, user.getId(), grantedConsent);\n+ event.event(EventType.GRANT_CONSENT);\n} else {\nsession.users().updateConsent(realm, user.getId(), grantedConsent);\n+ event.event(EventType.UPDATE_CONSENT);\n}\n- event.success();\n+ event.detail(Details.GRANTED_CLIENT,client.getClientId());\n+ String scopeString = grantedConsent.getGrantedClientScopes().stream().map(cs->cs.getName()).collect(Collectors.joining(\" \"));\n+ event.detail(Details.SCOPE, scopeString).success();\ngrantedConsent = session.users().getConsentByClient(realm, user.getId(), client.getId());\nreturn Response.ok(modelToRepresentation(grantedConsent)).build();\n} catch (IllegalArgumentException e) {\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AbstractRestServiceTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AbstractRestServiceTest.java", "diff": "@@ -86,7 +86,7 @@ public abstract class AbstractRestServiceTest extends AbstractTestRealmKeycloakT\ntestRealm.getUsers().add(UserBuilder.create().username(\"view-account-access\").role(\"account\", \"view-profile\").password(\"password\").build());\ntestRealm.getUsers().add(UserBuilder.create().username(\"view-applications-access\").addRoles(\"user\", \"offline_access\").role(\"account\", \"view-applications\").role(\"account\", \"manage-consent\").password(\"password\").build());\ntestRealm.getUsers().add(UserBuilder.create().username(\"view-consent-access\").role(\"account\", \"view-consent\").password(\"password\").build());\n- testRealm.getUsers().add(UserBuilder.create().username(\"manage-consent-access\").role(\"account\", \"manage-consent\").password(\"password\").build());\n+ testRealm.getUsers().add(UserBuilder.create().username(\"manage-consent-access\").role(\"account\", \"manage-consent\").role(\"account\", \"view-profile\").password(\"password\").build());\norg.keycloak.representations.idm.ClientRepresentation inUseApp = ClientBuilder.create().clientId(\"in-use-client\")\n.id(KeycloakModelUtils.generateId())\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceTest.java", "diff": "@@ -1004,91 +1004,114 @@ public class AccountRestServiceTest extends AbstractRestServiceTest {\nassertEquals(404, response.getStatus());\n}\n+ private ConsentRepresentation createRequestedConsent(List<ClientScopeRepresentation> scopes) {\n+ ConsentRepresentation requestedConsent = new ConsentRepresentation();\n+ requestedConsent.setGrantedScopes(scopes.stream().map((scope)-> {\n+ ConsentScopeRepresentation consentScopeRepresentation = new ConsentScopeRepresentation();\n+ consentScopeRepresentation.setId(scope.getId());\n+ return consentScopeRepresentation;\n+ }).collect(Collectors.toList()));\n+ return requestedConsent;\n+ }\n+\n@Test\npublic void createConsentForClient() throws IOException {\n- TokenUtil token = new TokenUtil(\"manage-consent-access\", \"password\");\n+ tokenUtil = new TokenUtil(\"manage-consent-access\", \"password\");\nString appId = \"security-admin-console\";\n-\n- ClientScopeRepresentation clientScopeRepresentation = testRealm().clientScopes().findAll().get(0);\n- ConsentScopeRepresentation consentScopeRepresentation = new ConsentScopeRepresentation();\n- consentScopeRepresentation.setId(clientScopeRepresentation.getId());\n-\n- ConsentRepresentation requestedConsent = new ConsentRepresentation();\n- requestedConsent.setGrantedScopes(Collections.singletonList(consentScopeRepresentation));\n+ List<ClientScopeRepresentation> requestedScopes = testRealm().clientScopes().findAll().subList(0,2);\n+ ConsentRepresentation requestedConsent = createRequestedConsent(requestedScopes);\nConsentRepresentation consentRepresentation = SimpleHttp\n.doPost(getAccountUrl(\"applications/\" + appId + \"/consent\"), httpClient)\n.header(\"Accept\", \"application/json\")\n.json(requestedConsent)\n- .auth(token.getToken())\n+ .auth(tokenUtil.getToken())\n.asJson(ConsentRepresentation.class);\nassertTrue(consentRepresentation.getCreatedDate() > 0);\nassertTrue(consentRepresentation.getLastUpdatedDate() > 0);\n- assertEquals(1, consentRepresentation.getGrantedScopes().size());\n- assertEquals(consentScopeRepresentation.getId(), consentRepresentation.getGrantedScopes().get(0).getId());\n+ assertEquals(2, consentRepresentation.getGrantedScopes().size());\n+ assertEquals(requestedScopes.get(0).getId(), consentRepresentation.getGrantedScopes().get(0).getId());\n+ assertEquals(requestedScopes.get(1).getId(), consentRepresentation.getGrantedScopes().get(1).getId());\n+\n+ events.poll();\n+ String expectedScopeDetails = requestedScopes.stream().map(cs->cs.getName()).collect(Collectors.joining(\" \"));\n+ events.expectAccount(EventType.GRANT_CONSENT)\n+ .user(getUser().getId())\n+ .detail(Details.GRANTED_CLIENT,appId)\n+ .detail(Details.SCOPE,expectedScopeDetails)\n+ .assertEvent();\n+ events.assertEmpty();\n+\n+ //cleanup\n+ SimpleHttp.doDelete(getAccountUrl(\"applications/\" + appId + \"/consent\"), httpClient)\n+ .header(\"Accept\", \"application/json\")\n+ .auth(tokenUtil.getToken())\n+ .asResponse();\n}\n@Test\npublic void updateConsentForClient() throws IOException {\n- TokenUtil token = new TokenUtil(\"manage-consent-access\", \"password\");\n+ tokenUtil = new TokenUtil(\"manage-consent-access\", \"password\");\nString appId = \"security-admin-console\";\n-\n- ClientScopeRepresentation clientScopeRepresentation = testRealm().clientScopes().findAll().get(0);\n- ConsentScopeRepresentation consentScopeRepresentation = new ConsentScopeRepresentation();\n- consentScopeRepresentation.setId(clientScopeRepresentation.getId());\n-\n- ConsentRepresentation requestedConsent = new ConsentRepresentation();\n- requestedConsent.setGrantedScopes(Collections.singletonList(consentScopeRepresentation));\n+ List<ClientScopeRepresentation> requestedScopes = testRealm().clientScopes().findAll().subList(0,1);\n+ ConsentRepresentation requestedConsent = createRequestedConsent(requestedScopes);\nConsentRepresentation consentRepresentation = SimpleHttp\n.doPost(getAccountUrl(\"applications/\" + appId + \"/consent\"), httpClient)\n.header(\"Accept\", \"application/json\")\n.json(requestedConsent)\n- .auth(token.getToken())\n+ .auth(tokenUtil.getToken())\n.asJson(ConsentRepresentation.class);\nassertTrue(consentRepresentation.getCreatedDate() > 0);\nassertTrue(consentRepresentation.getLastUpdatedDate() > 0);\nassertEquals(1, consentRepresentation.getGrantedScopes().size());\n- assertEquals(consentScopeRepresentation.getId(), consentRepresentation.getGrantedScopes().get(0).getId());\n+ assertEquals(requestedScopes.get(0).getId(), consentRepresentation.getGrantedScopes().get(0).getId());\n- clientScopeRepresentation = testRealm().clientScopes().findAll().get(1);\n- consentScopeRepresentation = new ConsentScopeRepresentation();\n- consentScopeRepresentation.setId(clientScopeRepresentation.getId());\n-\n- requestedConsent = new ConsentRepresentation();\n- requestedConsent.setGrantedScopes(Collections.singletonList(consentScopeRepresentation));\n+ requestedScopes = testRealm().clientScopes().findAll().subList(1,2);\n+ requestedConsent = createRequestedConsent(requestedScopes);\nConsentRepresentation consentRepresentation2 = SimpleHttp\n.doPost(getAccountUrl(\"applications/\" + appId + \"/consent\"), httpClient)\n.header(\"Accept\", \"application/json\")\n.json(requestedConsent)\n- .auth(token.getToken())\n+ .auth(tokenUtil.getToken())\n.asJson(ConsentRepresentation.class);\nassertTrue(consentRepresentation2.getCreatedDate() > 0);\nassertEquals(consentRepresentation.getCreatedDate(), consentRepresentation2.getCreatedDate());\nassertTrue(consentRepresentation2.getLastUpdatedDate() > 0);\nassertTrue(consentRepresentation2.getLastUpdatedDate() > consentRepresentation.getLastUpdatedDate());\nassertEquals(1, consentRepresentation2.getGrantedScopes().size());\n- assertEquals(consentScopeRepresentation.getId(), consentRepresentation2.getGrantedScopes().get(0).getId());\n+ assertEquals(requestedScopes.get(0).getId(), consentRepresentation2.getGrantedScopes().get(0).getId());\n+\n+ events.poll();\n+ events.poll();\n+ events.expectAccount(EventType.UPDATE_CONSENT)\n+ .user(getUser().getId())\n+ .detail(Details.GRANTED_CLIENT,appId)\n+ .detail(Details.SCOPE,requestedScopes.get(0).getName())\n+ .assertEvent();\n+ events.assertEmpty();\n+\n+ //Cleanup\n+ SimpleHttp.doDelete(getAccountUrl(\"applications/\" + appId + \"/consent\"), httpClient)\n+ .header(\"Accept\", \"application/json\")\n+ .auth(tokenUtil.getToken())\n+ .asResponse();\n}\n@Test\npublic void createConsentForNotExistingClient() throws IOException {\n- TokenUtil token = new TokenUtil(\"manage-consent-access\", \"password\");\n+ tokenUtil = new TokenUtil(\"manage-consent-access\", \"password\");\nString appId = \"not-existing\";\n- ClientScopeRepresentation clientScopeRepresentation = testRealm().clientScopes().findAll().get(0);\n- ConsentScopeRepresentation consentScopeRepresentation = new ConsentScopeRepresentation();\n- consentScopeRepresentation.setId(clientScopeRepresentation.getId());\n-\n- ConsentRepresentation requestedConsent = new ConsentRepresentation();\n- requestedConsent.setGrantedScopes(Collections.singletonList(consentScopeRepresentation));\n+ List<ClientScopeRepresentation> requestedScopes = testRealm().clientScopes().findAll().subList(0,1);\n+ ConsentRepresentation requestedConsent = createRequestedConsent(requestedScopes);\nSimpleHttp.Response response = SimpleHttp\n.doPost(getAccountUrl(\"applications/\" + appId + \"/consent\"), httpClient)\n.header(\"Accept\", \"application/json\")\n.json(requestedConsent)\n- .auth(token.getToken())\n+ .auth(tokenUtil.getToken())\n.asResponse();\nassertEquals(404, response.getStatus());\n@@ -1096,21 +1119,17 @@ public class AccountRestServiceTest extends AbstractRestServiceTest {\n@Test\npublic void createConsentForClientWithoutPermission() throws IOException {\n- TokenUtil token = new TokenUtil(\"view-consent-access\", \"password\");\n+ tokenUtil = new TokenUtil(\"view-consent-access\", \"password\");\nString appId = \"security-admin-console\";\n- ClientScopeRepresentation clientScopeRepresentation = testRealm().clientScopes().findAll().get(0);\n- ConsentScopeRepresentation consentScopeRepresentation = new ConsentScopeRepresentation();\n- consentScopeRepresentation.setId(clientScopeRepresentation.getId());\n-\n- ConsentRepresentation requestedConsent = new ConsentRepresentation();\n- requestedConsent.setGrantedScopes(Collections.singletonList(consentScopeRepresentation));\n+ List<ClientScopeRepresentation> requestedScopes = testRealm().clientScopes().findAll().subList(0,1);\n+ ConsentRepresentation requestedConsent = createRequestedConsent(requestedScopes);\nSimpleHttp.Response response = SimpleHttp\n.doPost(getAccountUrl(\"applications/\" + appId + \"/consent\"), httpClient)\n.header(\"Accept\", \"application/json\")\n.json(requestedConsent)\n- .auth(token.getToken())\n+ .auth(tokenUtil.getToken())\n.asResponse();\nassertEquals(403, response.getStatus());\n@@ -1118,89 +1137,102 @@ public class AccountRestServiceTest extends AbstractRestServiceTest {\n@Test\npublic void createConsentForClientWithPut() throws IOException {\n- TokenUtil token = new TokenUtil(\"manage-consent-access\", \"password\");\n+ tokenUtil = new TokenUtil(\"manage-consent-access\", \"password\");\nString appId = \"security-admin-console\";\n- ClientScopeRepresentation clientScopeRepresentation = testRealm().clientScopes().findAll().get(0);\n- ConsentScopeRepresentation consentScopeRepresentation = new ConsentScopeRepresentation();\n- consentScopeRepresentation.setId(clientScopeRepresentation.getId());\n-\n- ConsentRepresentation requestedConsent = new ConsentRepresentation();\n- requestedConsent.setGrantedScopes(Collections.singletonList(consentScopeRepresentation));\n+ List<ClientScopeRepresentation> requestedScopes = testRealm().clientScopes().findAll().subList(0,1);\n+ ConsentRepresentation requestedConsent = createRequestedConsent(requestedScopes);\nConsentRepresentation consentRepresentation = SimpleHttp\n.doPut(getAccountUrl(\"applications/\" + appId + \"/consent\"), httpClient)\n.header(\"Accept\", \"application/json\")\n.json(requestedConsent)\n- .auth(token.getToken())\n+ .auth(tokenUtil.getToken())\n.asJson(ConsentRepresentation.class);\nassertTrue(consentRepresentation.getCreatedDate() > 0);\nassertTrue(consentRepresentation.getLastUpdatedDate() > 0);\nassertEquals(1, consentRepresentation.getGrantedScopes().size());\n- assertEquals(consentScopeRepresentation.getId(), consentRepresentation.getGrantedScopes().get(0).getId());\n+ assertEquals(requestedScopes.get(0).getId(), consentRepresentation.getGrantedScopes().get(0).getId());\n+\n+ events.poll();\n+ events.expectAccount(EventType.GRANT_CONSENT)\n+ .user(getUser().getId())\n+ .detail(Details.GRANTED_CLIENT,appId)\n+ .detail(Details.SCOPE,requestedScopes.get(0).getName())\n+ .assertEvent();\n+ events.assertEmpty();\n+\n+ //Cleanup\n+ SimpleHttp.doDelete(getAccountUrl(\"applications/\" + appId + \"/consent\"), httpClient)\n+ .header(\"Accept\", \"application/json\")\n+ .auth(tokenUtil.getToken())\n+ .asResponse();\n}\n@Test\npublic void updateConsentForClientWithPut() throws IOException {\n- TokenUtil token = new TokenUtil(\"manage-consent-access\", \"password\");\n+ tokenUtil = new TokenUtil(\"manage-consent-access\", \"password\");\nString appId = \"security-admin-console\";\n- ClientScopeRepresentation clientScopeRepresentation = testRealm().clientScopes().findAll().get(0);\n- ConsentScopeRepresentation consentScopeRepresentation = new ConsentScopeRepresentation();\n- consentScopeRepresentation.setId(clientScopeRepresentation.getId());\n-\n- ConsentRepresentation requestedConsent = new ConsentRepresentation();\n- requestedConsent.setGrantedScopes(Collections.singletonList(consentScopeRepresentation));\n+ List<ClientScopeRepresentation> requestedScopes = testRealm().clientScopes().findAll().subList(0,1);\n+ ConsentRepresentation requestedConsent = createRequestedConsent(requestedScopes);\nConsentRepresentation consentRepresentation = SimpleHttp\n.doPut(getAccountUrl(\"applications/\" + appId + \"/consent\"), httpClient)\n.header(\"Accept\", \"application/json\")\n.json(requestedConsent)\n- .auth(token.getToken())\n+ .auth(tokenUtil.getToken())\n.asJson(ConsentRepresentation.class);\nassertTrue(consentRepresentation.getCreatedDate() > 0);\nassertTrue(consentRepresentation.getLastUpdatedDate() > 0);\nassertEquals(1, consentRepresentation.getGrantedScopes().size());\n- assertEquals(consentScopeRepresentation.getId(), consentRepresentation.getGrantedScopes().get(0).getId());\n+ assertEquals(requestedScopes.get(0).getId(), consentRepresentation.getGrantedScopes().get(0).getId());\n- clientScopeRepresentation = testRealm().clientScopes().findAll().get(1);\n- consentScopeRepresentation = new ConsentScopeRepresentation();\n- consentScopeRepresentation.setId(clientScopeRepresentation.getId());\n-\n- requestedConsent = new ConsentRepresentation();\n- requestedConsent.setGrantedScopes(Collections.singletonList(consentScopeRepresentation));\n+ requestedScopes = testRealm().clientScopes().findAll().subList(1,2);\n+ requestedConsent = createRequestedConsent(requestedScopes);\nConsentRepresentation consentRepresentation2 = SimpleHttp\n.doPut(getAccountUrl(\"applications/\" + appId + \"/consent\"), httpClient)\n.header(\"Accept\", \"application/json\")\n.json(requestedConsent)\n- .auth(token.getToken())\n+ .auth(tokenUtil.getToken())\n.asJson(ConsentRepresentation.class);\nassertTrue(consentRepresentation2.getCreatedDate() > 0);\nassertEquals(consentRepresentation.getCreatedDate(), consentRepresentation2.getCreatedDate());\nassertTrue(consentRepresentation2.getLastUpdatedDate() > 0);\nassertTrue(consentRepresentation2.getLastUpdatedDate() > consentRepresentation.getLastUpdatedDate());\nassertEquals(1, consentRepresentation2.getGrantedScopes().size());\n- assertEquals(consentScopeRepresentation.getId(), consentRepresentation2.getGrantedScopes().get(0).getId());\n+ assertEquals(requestedScopes.get(0).getId(), consentRepresentation2.getGrantedScopes().get(0).getId());\n+\n+ events.poll();\n+ events.poll();\n+ events.expectAccount(EventType.UPDATE_CONSENT)\n+ .user(getUser().getId())\n+ .detail(Details.GRANTED_CLIENT,appId)\n+ .detail(Details.SCOPE,requestedScopes.get(0).getName())\n+ .assertEvent();\n+ events.assertEmpty();\n+\n+ //Cleanup\n+ SimpleHttp.doDelete(getAccountUrl(\"applications/\" + appId + \"/consent\"), httpClient)\n+ .header(\"Accept\", \"application/json\")\n+ .auth(tokenUtil.getToken())\n+ .asResponse();\n}\n@Test\npublic void createConsentForNotExistingClientWithPut() throws IOException {\n- TokenUtil token = new TokenUtil(\"manage-consent-access\", \"password\");\n+ tokenUtil = new TokenUtil(\"manage-consent-access\", \"password\");\nString appId = \"not-existing\";\n- ClientScopeRepresentation clientScopeRepresentation = testRealm().clientScopes().findAll().get(0);\n- ConsentScopeRepresentation consentScopeRepresentation = new ConsentScopeRepresentation();\n- consentScopeRepresentation.setId(clientScopeRepresentation.getId());\n-\n- ConsentRepresentation requestedConsent = new ConsentRepresentation();\n- requestedConsent.setGrantedScopes(Collections.singletonList(consentScopeRepresentation));\n+ List<ClientScopeRepresentation> requestedScopes = testRealm().clientScopes().findAll().subList(0,1);\n+ ConsentRepresentation requestedConsent = createRequestedConsent(requestedScopes);\nSimpleHttp.Response response = SimpleHttp\n.doPut(getAccountUrl(\"applications/\" + appId + \"/consent\"), httpClient)\n.header(\"Accept\", \"application/json\")\n.json(requestedConsent)\n- .auth(token.getToken())\n+ .auth(tokenUtil.getToken())\n.asResponse();\nassertEquals(404, response.getStatus());\n@@ -1208,21 +1240,17 @@ public class AccountRestServiceTest extends AbstractRestServiceTest {\n@Test\npublic void createConsentForClientWithoutPermissionWithPut() throws IOException {\n- TokenUtil token = new TokenUtil(\"view-consent-access\", \"password\");\n+ tokenUtil = new TokenUtil(\"view-consent-access\", \"password\");\nString appId = \"security-admin-console\";\n- ClientScopeRepresentation clientScopeRepresentation = testRealm().clientScopes().findAll().get(0);\n- ConsentScopeRepresentation consentScopeRepresentation = new ConsentScopeRepresentation();\n- consentScopeRepresentation.setId(clientScopeRepresentation.getId());\n-\n- ConsentRepresentation requestedConsent = new ConsentRepresentation();\n- requestedConsent.setGrantedScopes(Collections.singletonList(consentScopeRepresentation));\n+ List<ClientScopeRepresentation> requestedScopes = testRealm().clientScopes().findAll().subList(0,1);\n+ ConsentRepresentation requestedConsent = createRequestedConsent(requestedScopes);\nSimpleHttp.Response response = SimpleHttp\n.doPut(getAccountUrl(\"applications/\" + appId + \"/consent\"), httpClient)\n.header(\"Accept\", \"application/json\")\n.json(requestedConsent)\n- .auth(token.getToken())\n+ .auth(tokenUtil.getToken())\n.asResponse();\nassertEquals(403, response.getStatus());\n@@ -1230,31 +1258,27 @@ public class AccountRestServiceTest extends AbstractRestServiceTest {\n@Test\npublic void getConsentForClient() throws IOException {\n- TokenUtil token = new TokenUtil(\"manage-consent-access\", \"password\");\n+ tokenUtil = new TokenUtil(\"manage-consent-access\", \"password\");\nString appId = \"security-admin-console\";\n- ClientScopeRepresentation clientScopeRepresentation = testRealm().clientScopes().findAll().get(0);\n- ConsentScopeRepresentation consentScopeRepresentation = new ConsentScopeRepresentation();\n- consentScopeRepresentation.setId(clientScopeRepresentation.getId());\n-\n- ConsentRepresentation requestedConsent = new ConsentRepresentation();\n- requestedConsent.setGrantedScopes(Collections.singletonList(consentScopeRepresentation));\n+ List<ClientScopeRepresentation> requestedScopes = testRealm().clientScopes().findAll().subList(0,1);\n+ ConsentRepresentation requestedConsent = createRequestedConsent(requestedScopes);\nConsentRepresentation consentRepresentation1 = SimpleHttp\n.doPost(getAccountUrl(\"applications/\" + appId + \"/consent\"), httpClient)\n.header(\"Accept\", \"application/json\")\n.json(requestedConsent)\n- .auth(token.getToken())\n+ .auth(tokenUtil.getToken())\n.asJson(ConsentRepresentation.class);\nassertTrue(consentRepresentation1.getCreatedDate() > 0);\nassertTrue(consentRepresentation1.getLastUpdatedDate() > 0);\nassertEquals(1, consentRepresentation1.getGrantedScopes().size());\n- assertEquals(consentScopeRepresentation.getId(), consentRepresentation1.getGrantedScopes().get(0).getId());\n+ assertEquals(requestedScopes.get(0).getId(), consentRepresentation1.getGrantedScopes().get(0).getId());\nConsentRepresentation consentRepresentation2 = SimpleHttp\n.doGet(getAccountUrl(\"applications/\" + appId + \"/consent\"), httpClient)\n.header(\"Accept\", \"application/json\")\n- .auth(token.getToken())\n+ .auth(tokenUtil.getToken())\n.asJson(ConsentRepresentation.class);\nassertEquals(consentRepresentation1.getLastUpdatedDate(), consentRepresentation2.getLastUpdatedDate());\nassertEquals(consentRepresentation1.getCreatedDate(), consentRepresentation2.getCreatedDate());\n@@ -1263,98 +1287,102 @@ public class AccountRestServiceTest extends AbstractRestServiceTest {\n@Test\npublic void getConsentForNotExistingClient() throws IOException {\n- TokenUtil token = new TokenUtil(\"view-consent-access\", \"password\");\n+ tokenUtil = new TokenUtil(\"view-consent-access\", \"password\");\nString appId = \"not-existing\";\nSimpleHttp.Response response = SimpleHttp\n.doGet(getAccountUrl(\"applications/\" + appId + \"/consent\"), httpClient)\n.header(\"Accept\", \"application/json\")\n- .auth(token.getToken())\n+ .auth(tokenUtil.getToken())\n.asResponse();\nassertEquals(404, response.getStatus());\n}\n@Test\npublic void getNotExistingConsentForClient() throws IOException {\n- TokenUtil token = new TokenUtil(\"view-consent-access\", \"password\");\n+ tokenUtil = new TokenUtil(\"view-consent-access\", \"password\");\nString appId = \"security-admin-console\";\nSimpleHttp.Response response = SimpleHttp\n.doGet(getAccountUrl(\"applications/\" + appId + \"/consent\"), httpClient)\n.header(\"Accept\", \"application/json\")\n- .auth(token.getToken())\n+ .auth(tokenUtil.getToken())\n.asResponse();\nassertEquals(204, response.getStatus());\n}\n@Test\npublic void getConsentWithoutPermission() throws IOException {\n- TokenUtil token = new TokenUtil(\"no-account-access\", \"password\");\n+ tokenUtil = new TokenUtil(\"no-account-access\", \"password\");\nString appId = \"security-admin-console\";\nSimpleHttp.Response response = SimpleHttp\n.doGet(getAccountUrl(\"applications/\" + appId + \"/consent\"), httpClient)\n.header(\"Accept\", \"application/json\")\n- .auth(token.getToken())\n+ .auth(tokenUtil.getToken())\n.asResponse();\nassertEquals(403, response.getStatus());\n}\n@Test\npublic void deleteConsentForClient() throws IOException {\n- TokenUtil token = new TokenUtil(\"manage-consent-access\", \"password\");\n+ tokenUtil = new TokenUtil(\"manage-consent-access\", \"password\");\nString appId = \"security-admin-console\";\n- ClientScopeRepresentation clientScopeRepresentation = testRealm().clientScopes().findAll().get(0);\n- ConsentScopeRepresentation consentScopeRepresentation = new ConsentScopeRepresentation();\n- consentScopeRepresentation.setId(clientScopeRepresentation.getId());\n-\n- ConsentRepresentation requestedConsent = new ConsentRepresentation();\n- requestedConsent.setGrantedScopes(Collections.singletonList(consentScopeRepresentation));\n+ List<ClientScopeRepresentation> requestedScopes = testRealm().clientScopes().findAll().subList(0,1);\n+ ConsentRepresentation requestedConsent = createRequestedConsent(requestedScopes);\nConsentRepresentation consentRepresentation = SimpleHttp\n.doPost(getAccountUrl(\"applications/\" + appId + \"/consent\"), httpClient)\n.header(\"Accept\", \"application/json\")\n.json(requestedConsent)\n- .auth(token.getToken())\n+ .auth(tokenUtil.getToken())\n.asJson(ConsentRepresentation.class);\nassertTrue(consentRepresentation.getCreatedDate() > 0);\nassertTrue(consentRepresentation.getLastUpdatedDate() > 0);\nassertEquals(1, consentRepresentation.getGrantedScopes().size());\n- assertEquals(consentScopeRepresentation.getId(), consentRepresentation.getGrantedScopes().get(0).getId());\n+ assertEquals(requestedScopes.get(0).getId(), consentRepresentation.getGrantedScopes().get(0).getId());\nSimpleHttp.Response response = SimpleHttp\n.doDelete(getAccountUrl(\"applications/\" + appId + \"/consent\"), httpClient)\n.header(\"Accept\", \"application/json\")\n- .auth(token.getToken())\n+ .auth(tokenUtil.getToken())\n.asResponse();\nassertEquals(204, response.getStatus());\n+ events.poll();\n+ events.poll();\n+ events.expectAccount(EventType.REVOKE_GRANT)\n+ .user(getUser().getId())\n+ .detail(Details.REVOKED_CLIENT,appId)\n+ .assertEvent();\n+ events.assertEmpty();\n+\nresponse = SimpleHttp\n.doDelete(getAccountUrl(\"applications/\" + appId + \"/consent\"), httpClient)\n.header(\"Accept\", \"application/json\")\n- .auth(token.getToken())\n+ .auth(tokenUtil.getToken())\n.asResponse();\nassertEquals(204, response.getStatus());\n}\n@Test\npublic void deleteConsentForNotExistingClient() throws IOException {\n- TokenUtil token = new TokenUtil(\"manage-consent-access\", \"password\");\n+ tokenUtil = new TokenUtil(\"manage-consent-access\", \"password\");\nString appId = \"not-existing\";\nSimpleHttp.Response response = SimpleHttp\n.doDelete(getAccountUrl(\"applications/\" + appId + \"/consent\"), httpClient)\n.header(\"Accept\", \"application/json\")\n- .auth(token.getToken())\n+ .auth(tokenUtil.getToken())\n.asResponse();\nassertEquals(404, response.getStatus());\n}\n@Test\npublic void deleteConsentWithoutPermission() throws IOException {\n- TokenUtil token = new TokenUtil(\"view-consent-access\", \"password\");\n+ tokenUtil = new TokenUtil(\"view-consent-access\", \"password\");\nString appId = \"security-admin-console\";\nSimpleHttp.Response response = SimpleHttp\n.doDelete(getAccountUrl(\"applications/\" + appId + \"/consent\"), httpClient)\n.header(\"Accept\", \"application/json\")\n- .auth(token.getToken())\n+ .auth(tokenUtil.getToken())\n.asResponse();\nassertEquals(403, response.getStatus());\n}\n@@ -1367,19 +1395,19 @@ public class AccountRestServiceTest extends AbstractRestServiceTest {\nOAuthClient.AccessTokenResponse offlineTokenResponse = oauth.doGrantAccessTokenRequest(\"secret1\", \"view-applications-access\", \"password\");\nassertNull(offlineTokenResponse.getErrorDescription());\n- TokenUtil token = new TokenUtil(\"view-applications-access\", \"password\");\n+ tokenUtil = new TokenUtil(\"view-applications-access\", \"password\");\nSimpleHttp.Response response = SimpleHttp\n.doDelete(getAccountUrl(\"applications/offline-client/consent\"), httpClient)\n.header(\"Accept\", \"application/json\")\n- .auth(token.getToken())\n+ .auth(tokenUtil.getToken())\n.asResponse();\nassertEquals(204, response.getStatus());\nList<ClientRepresentation> applications = SimpleHttp\n.doGet(getAccountUrl(\"applications\"), httpClient)\n.header(\"Accept\", \"application/json\")\n- .auth(token.getToken())\n+ .auth(tokenUtil.getToken())\n.asJson(new TypeReference<List<ClientRepresentation>>() {\n});\nassertFalse(applications.isEmpty());\n" } ]

[ { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/scripting/DefaultScriptingProvider.java", "new_path": "services/src/main/java/org/keycloak/scripting/DefaultScriptingProvider.java", "diff": "@@ -23,6 +23,7 @@ import javax.script.ScriptEngine;\nimport javax.script.ScriptEngineManager;\nimport javax.script.ScriptException;\n+import org.jboss.logging.Logger;\nimport org.keycloak.models.ScriptModel;\nimport org.keycloak.platform.Platform;\nimport org.keycloak.services.ServicesLogger;\n@@ -35,6 +36,8 @@ import org.keycloak.utils.ProxyClassLoader;\n*/\npublic class DefaultScriptingProvider implements ScriptingProvider {\n+ private static final Logger logger = Logger.getLogger(DefaultScriptingProvider.class);\n+\nprivate final DefaultScriptingProviderFactory factory;\nDefaultScriptingProvider(DefaultScriptingProviderFactory factory) {\n@@ -136,6 +139,8 @@ public class DefaultScriptingProvider implements ScriptingProvider {\nscriptClassLoader = DefaultScriptingProvider.class.getClassLoader();\n}\n+ logger.debugf(\"Using classloader %s to load script engine\", scriptClassLoader);\n+\nThread.currentThread().setContextClassLoader(scriptClassLoader);\nreturn new ScriptEngineManager().getEngineByMimeType(script.getMimeType());\n}\n" }, { "change_type": "MODIFY", "old_path": "testsuite/utils/pom.xml", "new_path": "testsuite/utils/pom.xml", "diff": "<version>${mssql.driver.version}</version>\n</dependency>\n- <!-- Nashorn -->\n+ </dependencies>\n+\n+\n+ <profiles>\n+\n+ <!-- Nashorn script engine needs to be manually added for the new Java versions as it is not part of the JDK anymore -->\n+ <profile>\n+ <id>jdk15</id>\n+ <activation>\n+ <jdk>[15,)</jdk>\n+ </activation>\n+\n+ <dependencies>\n<dependency>\n<groupId>org.openjdk.nashorn</groupId>\n<artifactId>nashorn-core</artifactId>\n</dependency>\n</dependencies>\n+ </profile>\n-\n- <profiles>\n<profile>\n<id>keycloak-server</id>\n<build>\n" }, { "change_type": "MODIFY", "old_path": "wildfly/extensions/src/main/java/org/keycloak/provider/wildfly/WildflyPlatform.java", "new_path": "wildfly/extensions/src/main/java/org/keycloak/provider/wildfly/WildflyPlatform.java", "diff": "@@ -35,6 +35,9 @@ public class WildflyPlatform implements PlatformProvider {\n// In this module, the attempt to load script engine will be done by default\nprivate static final String DEFAULT_SCRIPT_ENGINE_MODULE = \"org.openjdk.nashorn.nashorn-core\";\n+ // Module name for deployment of keycloak server\n+ private static final String DEPLOYMENT_MODULE_NAME = \"deployment.keycloak-server.war\";\n+\nRunnable shutdownHook;\nprivate File tmpDir;\n@@ -97,10 +100,18 @@ public class WildflyPlatform implements PlatformProvider {\n} catch (ModuleLoadException mle) {\nif (WildflyUtil.getJavaVersion() >= 15) {\nlog.warnf(\"Cannot find script engine in the JBoss module '%s'. Please add JavaScript engine to the specified JBoss Module or make sure it is available on the classpath\", engineModule);\n+ return null;\n} else {\n- log.debugf(\"Cannot find script engine in the JBoss module '%s'. Will fallback to the default script engine\", engineModule);\n- }\n+ try {\n+ Module module = Module.getContextModuleLoader().loadModule(ModuleIdentifier.fromString(DEPLOYMENT_MODULE_NAME));\n+ log.debugf(\"Cannot find script engine in the JBoss module '%s'. Will fallback to the default script engine available from the module '%s'\", engineModule, DEPLOYMENT_MODULE_NAME);\n+ return module.getClassLoader();\n+ } catch (ModuleLoadException mle2) {\n+ // Should not happen\n+ log.warnf(\"Cannot find script engine in the JBoss module '%s' and in the module '%s'. Please add JavaScript engine to the specified JBoss Module or make sure it is available on the classpath\", engineModule, DEPLOYMENT_MODULE_NAME);\nreturn null;\n}\n}\n}\n+ }\n+}\n" } ]

[ { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AssertEvents.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AssertEvents.java", "diff": "@@ -36,6 +36,7 @@ import org.keycloak.representations.idm.UserRepresentation;\nimport org.keycloak.representations.idm.UserSessionRepresentation;\nimport org.keycloak.util.TokenUtil;\n+import java.util.Arrays;\nimport java.util.HashMap;\nimport java.util.List;\nimport java.util.Map;\n@@ -310,8 +311,24 @@ public class AssertEvents implements TestRule {\n}\npublic ExpectedEvent detail(String key, String value) {\n+ if (key.equals(Details.SCOPE)) {\n+ // the scopes can be given in any order,\n+ // therefore, use a matcher that takes a string and ignores the order of the scopes\n+ return detail(key, new TypeSafeMatcher<String>() {\n+ @Override\n+ protected boolean matchesSafely(String actualValue) {\n+ return Matchers.containsInAnyOrder(value.split(\" \")).matches(Arrays.asList(actualValue.split(\" \")));\n+ }\n+\n+ @Override\n+ public void describeTo(Description description) {\n+ description.appendText(\"contains scope in any order\");\n+ }\n+ });\n+ } else {\nreturn detail(key, CoreMatchers.equalTo(value));\n}\n+ }\npublic ExpectedEvent detail(String key, Matcher<? super String> matcher) {\nif (details == null) {\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceTest.java", "diff": "@@ -1029,9 +1029,8 @@ public class AccountRestServiceTest extends AbstractRestServiceTest {\n.asJson(ConsentRepresentation.class);\nassertTrue(consentRepresentation.getCreatedDate() > 0);\nassertTrue(consentRepresentation.getLastUpdatedDate() > 0);\n- assertEquals(2, consentRepresentation.getGrantedScopes().size());\n- assertEquals(requestedScopes.get(0).getId(), consentRepresentation.getGrantedScopes().get(0).getId());\n- assertEquals(requestedScopes.get(1).getId(), consentRepresentation.getGrantedScopes().get(1).getId());\n+ assertThat(consentRepresentation.getGrantedScopes().stream().map(ConsentScopeRepresentation::getId).collect(Collectors.toList()),\n+ containsInAnyOrder(requestedScopes.stream().map(ClientScopeRepresentation::getId).toArray()));\nevents.poll();\nString expectedScopeDetails = requestedScopes.stream().map(cs->cs.getName()).collect(Collectors.joining(\" \"));\n" } ]

[ { "change_type": "MODIFY", "old_path": ".github/workflows/operator-ci.yml", "new_path": ".github/workflows/operator-ci.yml", "diff": "@@ -81,7 +81,7 @@ jobs:\n- name: Test operator running locally\nrun: |\nmvn clean verify -Poperator -pl :keycloak-operator -am \\\n- -Dquarkus.kubernetes.deployment-target=kubernetes \\\n+ -Dquarkus.kubernetes.image-pull-policy=IfNotPresent \\\n-Doperator.keycloak.image=keycloak:${{ steps.vars.outputs.version }} \\\n-Dtest.operator.custom.image=custom-keycloak:${{ steps.vars.outputs.version }} \\\n-Doperator.keycloak.image-pull-policy=Never \\\n@@ -128,7 +128,7 @@ jobs:\neval $(minikube -p minikube docker-env)\nmvn clean verify -Poperator -pl :keycloak-operator -am \\\n-Dquarkus.container-image.build=true \\\n- -Dquarkus.kubernetes.deployment-target=kubernetes \\\n+ -Dquarkus.kubernetes.image-pull-policy=IfNotPresent \\\n-Doperator.keycloak.image=keycloak:${{ steps.vars.outputs.version }} \\\n-Dquarkus.jib.jvm-arguments=\"-Djava.util.logging.manager=org.jboss.logmanager.LogManager\",\"-Doperator.keycloak.image-pull-policy=Never\" \\\n-Dtest.operator.custom.image=custom-keycloak:${{ steps.vars.outputs.version }} \\\n" }, { "change_type": "MODIFY", "old_path": "operator/README.md", "new_path": "operator/README.md", "diff": "@@ -77,7 +77,7 @@ Testing allows 2 methods specified in the property `test.operator.deployment` :\nmvn clean verify \\\n-Dquarkus.container-image.build=true \\\n-Dquarkus.container-image.tag=test \\\n- -Dquarkus.kubernetes.deployment-target=kubernetes \\\n+ -Dquarkus.kubernetes.image-pull-policy=IfNotPresent \\\n-Dtest.operator.deployment=remote\n```\n@@ -102,3 +102,18 @@ And run the tests passing an extra Java property:\n```bash\n-Dtest.operator.custom.image=custom-keycloak:latest\n```\n+\n+### Testing using a pre-built operator image from a remote registry\n+You can run the testsuite using an already built operator image from a remote image registry.\n+\n+To do this, you need to set `quarkus.container-image.build=false` and specify the desired image\n+you want to use by setting `quarkus.container-image.image=<your-image>:<your-tag>`\n+\n+#### Example:\n+\n+```bash\n+ mvn clean verify \\\n+ -Dquarkus.container-image.build=false \\\n+ -Dquarkus.container-image.image=quay.io/keycloak/keycloak-operator:nightly \\\n+ -Dtest.operator.deployment=remote\n+```\n" }, { "change_type": "ADD", "old_path": null, "new_path": "operator/app/src/main/kubernetes/minikube.yml", "diff": "+kubernetes.yml\n\\ No newline at end of file\n" }, { "change_type": "MODIFY", "old_path": "operator/app/src/test/java/org/keycloak/operator/ClusterOperatorTest.java", "new_path": "operator/app/src/test/java/org/keycloak/operator/ClusterOperatorTest.java", "diff": "@@ -96,19 +96,9 @@ public abstract class ClusterOperatorTest {\n}\nprivate static void createRBACresourcesAndOperatorDeployment() throws FileNotFoundException {\n- Log.info(\"Creating RBAC into Namespace \" + namespace);\n- List<HasMetadata> hasMetadata = k8sclient.load(new FileInputStream(TARGET_KUBERNETES_GENERATED_YML_FOLDER + deploymentTarget + \".yml\"))\n- .inNamespace(namespace).get();\n- hasMetadata.stream()\n- .map(b -> {\n- if (\"Deployment\".equalsIgnoreCase(b.getKind()) && b.getMetadata().getName().contains(\"operator\")) {\n- ((Deployment) b).getSpec().getTemplate().getSpec().getContainers().get(0).setImagePullPolicy(\"Never\");\n- }\n- return b;\n- }).forEach(c -> {\n- Log.info(\"processing part : \" + c.getKind() + \"--\" + c.getMetadata().getName() + \" -- \" + namespace);\n- k8sclient.resource(c).inNamespace(namespace).createOrReplace();\n- });\n+ Log.info(\"Creating RBAC and Deployment into Namespace \" + namespace);\n+ k8sclient.load(new FileInputStream(TARGET_KUBERNETES_GENERATED_YML_FOLDER + deploymentTarget + \".yml\"))\n+ .inNamespace(namespace).createOrReplace();\n}\nprivate static void cleanRBACresourcesAndOperatorDeployment() throws FileNotFoundException {\n@@ -116,6 +106,7 @@ public abstract class ClusterOperatorTest {\nk8sclient.load(new FileInputStream(TARGET_KUBERNETES_GENERATED_YML_FOLDER +deploymentTarget+\".yml\"))\n.inNamespace(namespace).delete();\n}\n+\nprivate static void createCRDs() {\nLog.info(\"Creating CRDs\");\ntry {\n@@ -134,7 +125,7 @@ public abstract class ClusterOperatorTest {\nprivate static void registerReconcilers() {\nLog.info(\"Registering reconcilers for operator : \" + operator + \" [\" + operatorDeployment + \"]\");\n- for (Reconciler reconciler : reconcilers) {\n+ for (Reconciler<?> reconciler : reconcilers) {\nfinal var config = configuration.getConfigurationFor(reconciler);\nif (!config.isRegistrationDelayed()) {\nLog.info(\"Register and apply : \" + reconciler.getClass().getName());\n@@ -216,7 +207,7 @@ public abstract class ClusterOperatorTest {\n.withLabels(Constants.DEFAULT_LABELS)\n.list()\n.getItems();\n- assertThat(kcDeployments.size()).isEqualTo(0);\n+ assertThat(kcDeployments.size()).isZero();\n});\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/services/resources/account/AccountRestService.java", "new_path": "services/src/main/java/org/keycloak/services/resources/account/AccountRestService.java", "diff": "@@ -27,7 +27,9 @@ import java.util.Map;\nimport java.util.Objects;\nimport java.util.Properties;\nimport java.util.Set;\n+import java.util.function.Consumer;\nimport java.util.function.Function;\n+import java.util.function.Supplier;\nimport java.util.stream.Collectors;\nimport java.util.stream.Stream;\n@@ -146,23 +148,35 @@ public class AccountRestService {\nUserRepresentation rep = new UserRepresentation();\nrep.setId(user.getId());\n- rep.setUsername(user.getUsername());\n- rep.setFirstName(user.getFirstName());\n- rep.setLastName(user.getLastName());\n- rep.setEmail(user.getEmail());\n- rep.setEmailVerified(user.isEmailVerified());\nUserProfileProvider provider = session.getProvider(UserProfileProvider.class);\nUserProfile profile = provider.create(UserProfileContext.ACCOUNT, user);\nrep.setAttributes(profile.getAttributes().getReadable(false));\n+ addReadableBuiltinAttributes(user, rep, profile.getAttributes().getReadable(true).keySet());\n+\nif(userProfileMetadata == null || userProfileMetadata.booleanValue())\nrep.setUserProfileMetadata(createUserProfileMetadata(profile));\nreturn rep;\n}\n+ private void addReadableBuiltinAttributes(UserModel user, UserRepresentation rep, Set<String> readableAttributes) {\n+ setIfReadable(UserModel.USERNAME, readableAttributes, rep::setUsername, user::getUsername);\n+ setIfReadable(UserModel.FIRST_NAME, readableAttributes, rep::setFirstName, user::getFirstName);\n+ setIfReadable(UserModel.LAST_NAME, readableAttributes, rep::setLastName, user::getLastName);\n+ setIfReadable(UserModel.EMAIL, readableAttributes, rep::setEmail, user::getEmail);\n+ // emailVerified is readable when email is readable\n+ setIfReadable(UserModel.EMAIL, readableAttributes, rep::setEmailVerified, user::isEmailVerified);\n+ }\n+\n+ private <T> void setIfReadable(String attributeName, Set<String> readableAttributes, Consumer<T> setter, Supplier<T> getter) {\n+ if (readableAttributes.contains(attributeName)) {\n+ setter.accept(getter.get());\n+ }\n+ }\n+\nprivate UserProfileMetadata createUserProfileMetadata(final UserProfile profile) {\nMap<String, List<String>> am = profile.getAttributes().getReadable();\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceWithUserProfileTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceWithUserProfileTest.java", "diff": "@@ -43,7 +43,6 @@ import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude;\nimport org.keycloak.testsuite.arquillian.annotation.EnableFeature;\nimport org.keycloak.testsuite.forms.VerifyProfileTest;\nimport org.keycloak.userprofile.UserProfileContext;\n-import org.keycloak.userprofile.EventAuditingAttributeChangeListener;\n/**\n*\n@@ -79,6 +78,21 @@ public class AccountRestServiceWithUserProfileTest extends AccountRestServiceTes\n+ \"{\\\"name\\\": \\\"attr_no_permission\\\",\" + PERMISSIONS_ADMIN_ONLY + \"}\"\n+ \"]}\";\n+ private static String UP_CONFIG_NO_ACCESS_TO_NAME_FIELDS = \"{\\\"attributes\\\": [\"\n+ + \"{\\\"name\\\": \\\"firstName\\\",\" + PERMISSIONS_ADMIN_ONLY + \", \\\"required\\\": {}, \\\"displayName\\\": \\\"${profile.firstName}\\\", \\\"validations\\\": {\\\"length\\\": { \\\"max\\\": 255 }}},\"\n+ + \"{\\\"name\\\": \\\"lastName\\\",\" + PERMISSIONS_ADMIN_ONLY + \", \\\"required\\\": {}, \\\"displayName\\\": \\\"Last name\\\", \\\"annotations\\\": {\\\"formHintKey\\\" : \\\"userEmailFormFieldHint\\\", \\\"anotherKey\\\" : 10, \\\"yetAnotherKey\\\" : \\\"some value\\\"}},\"\n+ + \"{\\\"name\\\": \\\"attr_readonly\\\",\" + PERMISSIONS_ADMIN_EDITABLE + \"},\"\n+ + \"{\\\"name\\\": \\\"attr_no_permission\\\",\" + PERMISSIONS_ADMIN_ONLY + \"}\"\n+ + \"]}\";\n+\n+ private static String UP_CONFIG_RO_ACCESS_TO_NAME_FIELDS = \"{\\\"attributes\\\": [\"\n+ + \"{\\\"name\\\": \\\"firstName\\\",\" + PERMISSIONS_ADMIN_EDITABLE + \", \\\"required\\\": {}, \\\"displayName\\\": \\\"${profile.firstName}\\\", \\\"validations\\\": {\\\"length\\\": { \\\"max\\\": 255 }}},\"\n+ + \"{\\\"name\\\": \\\"lastName\\\",\" + PERMISSIONS_ADMIN_EDITABLE + \", \\\"required\\\": {}, \\\"displayName\\\": \\\"Last name\\\", \\\"annotations\\\": {\\\"formHintKey\\\" : \\\"userEmailFormFieldHint\\\", \\\"anotherKey\\\" : 10, \\\"yetAnotherKey\\\" : \\\"some value\\\"}},\"\n+ + \"{\\\"name\\\": \\\"attr_readonly\\\",\" + PERMISSIONS_ADMIN_EDITABLE + \"},\"\n+ + \"{\\\"name\\\": \\\"attr_no_permission\\\",\" + PERMISSIONS_ADMIN_ONLY + \"}\"\n+ + \"]}\";\n+\n+\n@Test\n@Override\npublic void testGetUserProfileMetadata_EditUsernameAllowed() throws IOException {\n@@ -115,6 +129,65 @@ public class AccountRestServiceWithUserProfileTest extends AccountRestServiceTes\nassertNull(getUserProfileAttributeMetadata(user, \"attr_no_permission\"));\n}\n+ @Test\n+ public void testGetUserProfileMetadata_NoAccessToNameFields() throws IOException {\n+\n+ try {\n+ RealmRepresentation realmRep = adminClient.realm(\"test\").toRepresentation();\n+ realmRep.setEditUsernameAllowed(false);\n+ adminClient.realm(\"test\").update(realmRep);\n+\n+ setUserProfileConfiguration(UP_CONFIG_NO_ACCESS_TO_NAME_FIELDS);\n+\n+ UserRepresentation user = getUser();\n+ assertNotNull(user.getUserProfileMetadata());\n+\n+ assertUserProfileAttributeMetadata(user, \"username\", \"${username}\", true, true);\n+ assertUserProfileAttributeMetadata(user, \"email\", \"${email}\", true, false);\n+\n+ assertNull(getUserProfileAttributeMetadata(user, \"firstName\"));\n+ assertNull(getUserProfileAttributeMetadata(user, \"lastName\"));\n+ assertUserProfileAttributeMetadata(user, \"attr_readonly\", \"attr_readonly\", false, true);\n+\n+ assertNull(getUserProfileAttributeMetadata(user, \"attr_no_permission\"));\n+\n+ } finally {\n+ RealmRepresentation realmRep = testRealm().toRepresentation();\n+ realmRep.setEditUsernameAllowed(true);\n+ testRealm().update(realmRep);\n+ }\n+ }\n+\n+ @Test\n+ public void testGetUserProfileMetadata_RoAccessToNameFields() throws IOException {\n+\n+ try {\n+ RealmRepresentation realmRep = adminClient.realm(\"test\").toRepresentation();\n+ realmRep.setEditUsernameAllowed(false);\n+ adminClient.realm(\"test\").update(realmRep);\n+\n+ setUserProfileConfiguration(UP_CONFIG_RO_ACCESS_TO_NAME_FIELDS);\n+\n+ UserRepresentation user = getUser();\n+ assertNotNull(user.getUserProfileMetadata());\n+\n+ assertUserProfileAttributeMetadata(user, \"username\", \"${username}\", true, true);\n+ assertUserProfileAttributeMetadata(user, \"email\", \"${email}\", true, false);\n+\n+ assertUserProfileAttributeMetadata(user, \"firstName\", \"${profile.firstName}\", true, true);\n+ assertUserProfileAttributeMetadata(user, \"lastName\", \"Last name\", true, true);\n+ assertUserProfileAttributeMetadata(user, \"attr_readonly\", \"attr_readonly\", false, true);\n+\n+ assertNull(getUserProfileAttributeMetadata(user, \"attr_no_permission\"));\n+\n+ } finally {\n+ RealmRepresentation realmRep = testRealm().toRepresentation();\n+ realmRep.setEditUsernameAllowed(true);\n+ testRealm().update(realmRep);\n+ }\n+ }\n+\n+\n@Test\n@Override\npublic void testGetUserProfileMetadata_EditUsernameDisallowed() throws IOException {\n" }, { "change_type": "MODIFY", "old_path": "themes/src/main/resources/theme/keycloak.v2/account/src/app/content/account-page/AccountPage.tsx", "new_path": "themes/src/main/resources/theme/keycloak.v2/account/src/app/content/account-page/AccountPage.tsx", "diff": "@@ -197,7 +197,7 @@ export class AccountPage extends React.Component<AccountPageProps, AccountPageSt\n)}\n</FormGroup>\n)}\n- {!this.isUpdateEmailFeatureEnabled && <FormGroup\n+ {!this.isUpdateEmailFeatureEnabled && fields.email != undefined && <FormGroup\nlabel={Msg.localize('email')}\nfieldId=\"email-address\"\nhelperTextInvalid={this.state.errors.email}\n@@ -250,7 +250,7 @@ export class AccountPage extends React.Component<AccountPageProps, AccountPageSt\n}\n</InputGroup>\n</FormGroup> }\n- <FormGroup\n+ { fields.firstName != undefined && <FormGroup\nlabel={Msg.localize(\"firstName\")}\nfieldId=\"first-name\"\nhelperTextInvalid={this.state.errors.firstName}\n@@ -275,7 +275,8 @@ export class AccountPage extends React.Component<AccountPageProps, AccountPageSt\n}\n></TextInput>\n</FormGroup>\n- <FormGroup\n+ }\n+ {fields.lastName != undefined && <FormGroup\nlabel={Msg.localize(\"lastName\")}\nfieldId=\"last-name\"\nhelperTextInvalid={this.state.errors.lastName}\n@@ -300,6 +301,7 @@ export class AccountPage extends React.Component<AccountPageProps, AccountPageSt\n}\n></TextInput>\n</FormGroup>\n+ }\n{features.isInternationalizationEnabled && (\n<FormGroup\nlabel={Msg.localize(\"selectLocale\")}\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaMapKeycloakTransaction.java", "new_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaMapKeycloakTransaction.java", "diff": "*/\npackage org.keycloak.models.map.storage.jpa;\n+import java.util.HashMap;\nimport java.util.LinkedList;\nimport java.util.List;\nimport java.util.UUID;\n@@ -36,6 +37,9 @@ import org.keycloak.models.map.common.StringKeyConverter;\nimport org.keycloak.models.map.common.StringKeyConverter.UUIDKey;\nimport org.keycloak.models.map.storage.MapKeycloakTransaction;\nimport org.keycloak.models.map.storage.QueryParameters;\n+import org.keycloak.models.map.storage.chm.MapFieldPredicates;\n+import org.keycloak.models.map.storage.chm.MapModelCriteriaBuilder;\n+\nimport static org.keycloak.models.map.storage.jpa.JpaMapStorageProviderFactory.CLONER;\nimport static org.keycloak.utils.StreamsUtil.closing;\n@@ -43,12 +47,14 @@ public abstract class JpaMapKeycloakTransaction<RE extends JpaRootEntity, E exte\nprivate static final Logger logger = Logger.getLogger(JpaMapKeycloakTransaction.class);\nprivate final Class<RE> entityType;\n+ private final Class<M> modelType;\nprotected EntityManager em;\n@SuppressWarnings(\"unchecked\")\n- public JpaMapKeycloakTransaction(Class<RE> entityType, EntityManager em) {\n+ public JpaMapKeycloakTransaction(Class<RE> entityType, Class<M> modelType, EntityManager em) {\nthis.em = em;\nthis.entityType = entityType;\n+ this.modelType = modelType;\n}\nprotected abstract Selection<? extends RE> selectCbConstruct(CriteriaBuilder cb, Root<RE> root);\n@@ -56,17 +62,34 @@ public abstract class JpaMapKeycloakTransaction<RE extends JpaRootEntity, E exte\nprotected abstract JpaModelCriteriaBuilder createJpaModelCriteriaBuilder();\nprotected abstract E mapToEntityDelegate(RE original);\n+ private final HashMap<String, E> cacheWithinSession = new HashMap<>();\n+\n+ /**\n+ * Use the cache within the session to ensure that there is only one instance per entity within the current session.\n+ */\n+ private E mapToEntityDelegateUnique(RE original) {\n+ if (original == null) {\n+ return null;\n+ }\n+ E entity = cacheWithinSession.get(original.getId());\n+ if (entity == null) {\n+ entity = mapToEntityDelegate(original);\n+ cacheWithinSession.put(original.getId(), entity);\n+ }\n+ return entity;\n+ }\n+\n@Override\n@SuppressWarnings(\"unchecked\")\npublic E create(E mapEntity) {\n- JpaRootEntity jpaEntity = entityType.cast(CLONER.from(mapEntity));\n+ RE jpaEntity = entityType.cast(CLONER.from(mapEntity));\nif (mapEntity.getId() == null) {\njpaEntity.setId(StringKeyConverter.UUIDKey.INSTANCE.yieldNewUniqueKey().toString());\n}\nlogger.tracef(\"tx %d: create entity %s\", hashCode(), jpaEntity.getId());\nsetEntityVersion(jpaEntity);\nem.persist(jpaEntity);\n- return (E) jpaEntity;\n+ return mapToEntityDelegateUnique(jpaEntity);\n}\n@Override\n@@ -75,7 +98,7 @@ public abstract class JpaMapKeycloakTransaction<RE extends JpaRootEntity, E exte\nif (key == null) return null;\nUUID uuid = StringKeyConverter.UUIDKey.INSTANCE.fromStringSafe(key);\nif (uuid == null) return null;\n- return (E) em.find(entityType, uuid);\n+ return mapToEntityDelegateUnique(em.find(entityType, uuid));\n}\n@Override\n@@ -112,7 +135,7 @@ public abstract class JpaMapKeycloakTransaction<RE extends JpaRootEntity, E exte\nif (predicateFunc != null) query.where(predicateFunc.apply(cb, root));\nreturn closing(paginateQuery(em.createQuery(query), queryParameters.getOffset(), queryParameters.getLimit()).getResultStream())\n- .map(this::mapToEntityDelegate);\n+ .map(this::mapToEntityDelegateUnique);\n}\n@Override\n@@ -139,6 +162,7 @@ public abstract class JpaMapKeycloakTransaction<RE extends JpaRootEntity, E exte\nif (key == null) return false;\nUUID uuid = UUIDKey.INSTANCE.fromStringSafe(key);\nif (uuid == null) return false;\n+ cacheWithinSession.remove(key);\nem.remove(em.getReference(entityType, uuid));\nlogger.tracef(\"tx %d: delete entity %s\", hashCode(), key);\nreturn true;\n@@ -152,6 +176,20 @@ public abstract class JpaMapKeycloakTransaction<RE extends JpaRootEntity, E exte\nCriteriaBuilder cb = em.getCriteriaBuilder();\n+ // Remove all entities that are in the persistence context and that match the criteria.\n+ // This avoids calling flush and clear which would detach all other unrelated entities as well.\n+ int[] removed = {0};\n+ MapModelCriteriaBuilder<String, E, M> mapMcb = queryParameters.getModelCriteriaBuilder().flashToModelCriteriaBuilder(createCriteriaBuilderMap());\n+ cacheWithinSession.entrySet().removeIf(entry -> {\n+ if (mapMcb.getKeyFilter().test(entry.getKey()) && mapMcb.getEntityFilter().test(entry.getValue())) {\n+ em.remove(em.getReference(entityType, UUIDKey.INSTANCE.fromString(entry.getKey())));\n+ removed[0]++;\n+ return true;\n+ } else {\n+ return false;\n+ }\n+ });\n+\nCriteriaDelete<RE> deleteQuery = cb.createCriteriaDelete(entityType);\nRoot<RE> root = deleteQuery.from(entityType);\n@@ -159,7 +197,11 @@ public abstract class JpaMapKeycloakTransaction<RE extends JpaRootEntity, E exte\nBiFunction<CriteriaBuilder, Root<RE>, Predicate> predicateFunc = mcb.getPredicateFunc();\nif (predicateFunc != null) deleteQuery.where(predicateFunc.apply(cb, root));\n- return em.createQuery(deleteQuery).executeUpdate();\n+ return em.createQuery(deleteQuery).executeUpdate() + removed[0];\n+ }\n+\n+ private MapModelCriteriaBuilder<String, E, M> createCriteriaBuilderMap() {\n+ return new MapModelCriteriaBuilder<>(StringKeyConverter.StringKey.INSTANCE, MapFieldPredicates.getPredicates(modelType));\n}\n@Override\n" }, { "change_type": "MODIFY", "old_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authSession/JpaRootAuthenticationSessionMapKeycloakTransaction.java", "new_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authSession/JpaRootAuthenticationSessionMapKeycloakTransaction.java", "diff": "@@ -34,7 +34,7 @@ public class JpaRootAuthenticationSessionMapKeycloakTransaction extends JpaMapKe\n@SuppressWarnings(\"unchecked\")\npublic JpaRootAuthenticationSessionMapKeycloakTransaction(EntityManager em) {\n- super(JpaRootAuthenticationSessionEntity.class, em);\n+ super(JpaRootAuthenticationSessionEntity.class, RootAuthenticationSessionModel.class, em);\n}\n@Override\n" }, { "change_type": "MODIFY", "old_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/permission/JpaPermissionMapKeycloakTransaction.java", "new_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/permission/JpaPermissionMapKeycloakTransaction.java", "diff": "@@ -34,7 +34,7 @@ public class JpaPermissionMapKeycloakTransaction extends JpaMapKeycloakTransacti\n@SuppressWarnings(\"unchecked\")\npublic JpaPermissionMapKeycloakTransaction(EntityManager em) {\n- super(JpaPermissionEntity.class, em);\n+ super(JpaPermissionEntity.class, PermissionTicket.class, em);\n}\n@Override\n" }, { "change_type": "MODIFY", "old_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/policy/JpaPolicyMapKeycloakTransaction.java", "new_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/policy/JpaPolicyMapKeycloakTransaction.java", "diff": "@@ -34,7 +34,7 @@ public class JpaPolicyMapKeycloakTransaction extends JpaMapKeycloakTransaction<J\n@SuppressWarnings(\"unchecked\")\npublic JpaPolicyMapKeycloakTransaction(EntityManager em) {\n- super(JpaPolicyEntity.class, em);\n+ super(JpaPolicyEntity.class, Policy.class, em);\n}\n@Override\n" }, { "change_type": "MODIFY", "old_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/resource/JpaResourceMapKeycloakTransaction.java", "new_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/resource/JpaResourceMapKeycloakTransaction.java", "diff": "@@ -34,7 +34,7 @@ public class JpaResourceMapKeycloakTransaction extends JpaMapKeycloakTransaction\n@SuppressWarnings(\"unchecked\")\npublic JpaResourceMapKeycloakTransaction(EntityManager em) {\n- super(JpaResourceEntity.class, em);\n+ super(JpaResourceEntity.class, Resource.class, em);\n}\n@Override\n" }, { "change_type": "MODIFY", "old_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/resourceServer/JpaResourceServerMapKeycloakTransaction.java", "new_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/resourceServer/JpaResourceServerMapKeycloakTransaction.java", "diff": "@@ -34,7 +34,7 @@ public class JpaResourceServerMapKeycloakTransaction extends JpaMapKeycloakTrans\n@SuppressWarnings(\"unchecked\")\npublic JpaResourceServerMapKeycloakTransaction(EntityManager em) {\n- super(JpaResourceServerEntity.class, em);\n+ super(JpaResourceServerEntity.class, ResourceServer.class, em);\n}\n@Override\n" }, { "change_type": "MODIFY", "old_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/scope/JpaScopeMapKeycloakTransaction.java", "new_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/scope/JpaScopeMapKeycloakTransaction.java", "diff": "@@ -34,7 +34,7 @@ public class JpaScopeMapKeycloakTransaction extends JpaMapKeycloakTransaction<Jp\n@SuppressWarnings(\"unchecked\")\npublic JpaScopeMapKeycloakTransaction(EntityManager em) {\n- super(JpaScopeEntity.class, em);\n+ super(JpaScopeEntity.class, Scope.class, em);\n}\n@Override\n" }, { "change_type": "MODIFY", "old_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/client/JpaClientMapKeycloakTransaction.java", "new_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/client/JpaClientMapKeycloakTransaction.java", "diff": "@@ -34,7 +34,7 @@ public class JpaClientMapKeycloakTransaction extends JpaMapKeycloakTransaction<J\n@SuppressWarnings(\"unchecked\")\npublic JpaClientMapKeycloakTransaction(EntityManager em) {\n- super(JpaClientEntity.class, em);\n+ super(JpaClientEntity.class, ClientModel.class, em);\n}\n@Override\n" }, { "change_type": "MODIFY", "old_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/clientscope/JpaClientScopeMapKeycloakTransaction.java", "new_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/clientscope/JpaClientScopeMapKeycloakTransaction.java", "diff": "@@ -34,7 +34,7 @@ public class JpaClientScopeMapKeycloakTransaction extends JpaMapKeycloakTransact\n@SuppressWarnings(\"unchecked\")\npublic JpaClientScopeMapKeycloakTransaction(EntityManager em) {\n- super(JpaClientScopeEntity.class, em);\n+ super(JpaClientScopeEntity.class, ClientScopeModel.class, em);\n}\n@Override\n" }, { "change_type": "MODIFY", "old_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/group/JpaGroupMapKeycloakTransaction.java", "new_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/group/JpaGroupMapKeycloakTransaction.java", "diff": "@@ -34,7 +34,7 @@ public class JpaGroupMapKeycloakTransaction extends JpaMapKeycloakTransaction<Jp\n@SuppressWarnings(\"unchecked\")\npublic JpaGroupMapKeycloakTransaction(EntityManager em) {\n- super(JpaGroupEntity.class, em);\n+ super(JpaGroupEntity.class, GroupModel.class, em);\n}\n@Override\n" }, { "change_type": "MODIFY", "old_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/loginFailure/JpaUserLoginFailureMapKeycloakTransaction.java", "new_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/loginFailure/JpaUserLoginFailureMapKeycloakTransaction.java", "diff": "@@ -41,7 +41,7 @@ public class JpaUserLoginFailureMapKeycloakTransaction extends JpaMapKeycloakTra\n@SuppressWarnings(\"unchecked\")\npublic JpaUserLoginFailureMapKeycloakTransaction(EntityManager em) {\n- super(JpaUserLoginFailureEntity.class, em);\n+ super(JpaUserLoginFailureEntity.class, UserLoginFailureModel.class, em);\n}\n@Override\n" }, { "change_type": "MODIFY", "old_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/realm/JpaRealmMapKeycloakTransaction.java", "new_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/realm/JpaRealmMapKeycloakTransaction.java", "diff": "@@ -40,7 +40,7 @@ import static org.keycloak.models.map.storage.jpa.Constants.CURRENT_SCHEMA_VERSI\npublic class JpaRealmMapKeycloakTransaction extends JpaMapKeycloakTransaction<JpaRealmEntity, MapRealmEntity, RealmModel> {\npublic JpaRealmMapKeycloakTransaction(final EntityManager em) {\n- super(JpaRealmEntity.class, em);\n+ super(JpaRealmEntity.class, RealmModel.class, em);\n}\n@Override\n" }, { "change_type": "MODIFY", "old_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/role/JpaRoleMapKeycloakTransaction.java", "new_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/role/JpaRoleMapKeycloakTransaction.java", "diff": "@@ -34,7 +34,7 @@ public class JpaRoleMapKeycloakTransaction extends JpaMapKeycloakTransaction<Jpa\n@SuppressWarnings(\"unchecked\")\npublic JpaRoleMapKeycloakTransaction(EntityManager em) {\n- super(JpaRoleEntity.class, em);\n+ super(JpaRoleEntity.class, RoleModel.class, em);\n}\n@Override\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/ConcurrentTransactionsTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/ConcurrentTransactionsTest.java", "diff": "@@ -109,10 +109,14 @@ public class ConcurrentTransactionsTest extends AbstractTestRealmKeycloakTest {\nthrow new IllegalStateException(\"Timeout when waiting for updateLatch\");\n}\n- logger.info(\"transaction1: Going to read client again\");\n-\n- client1 = currentSession.clients().getClientByClientId(realm1, \"client\");\n- logger.info(\"transaction1: secret: \" + client1.getSecret());\n+ // the behavior upon reading client information would depend on the store:\n+ // * it might return the new values if this really touches the store and it using read committed and not repeatable read\n+ // * it might return the old values if the information is cached within the current session (either explicitly, or implicitly using the JPA persistence context), or using repeatable read\n+ // * it might throw an exception if a concurrent modification exception occurred when reading additional data from the store and read committed is used\n+\n+ // logger.info(\"transaction1: Going to read client again\");\n+ // client1 = currentSession.clients().getClientByClientId(realm1, \"client\");\n+ // logger.info(\"transaction1: secret: \" + client1.getSecret());\n} catch (Exception e) {\nexceptionHolder.set(e);\n" } ]

[ { "change_type": "MODIFY", "old_path": "operator/app/src/main/java/org/keycloak/operator/controllers/KeycloakIngress.java", "new_path": "operator/app/src/main/java/org/keycloak/operator/controllers/KeycloakIngress.java", "diff": "@@ -67,6 +67,7 @@ public class KeycloakIngress extends OperatorManagedResource implements StatusUp\n.withName(getName())\n.withNamespace(getNamespace())\n.addToAnnotations(\"nginx.ingress.kubernetes.io/backend-protocol\", backendProtocol)\n+ .addToAnnotations(\"route.openshift.io/termination\", \"passthrough\")\n.endMetadata()\n.withNewSpec()\n.withNewDefaultBackend()\n@@ -80,7 +81,7 @@ public class KeycloakIngress extends OperatorManagedResource implements StatusUp\n.addNewRule()\n.withNewHttp()\n.addNewPath()\n- .withPath(\"/\")\n+ .withPath(\"\")\n.withPathType(\"ImplementationSpecific\")\n.withNewBackend()\n.withNewService()\n" }, { "change_type": "MODIFY", "old_path": "operator/app/src/test/java/org/keycloak/operator/KeycloakIngressE2EIT.java", "new_path": "operator/app/src/test/java/org/keycloak/operator/KeycloakIngressE2EIT.java", "diff": "@@ -141,6 +141,7 @@ public class KeycloakIngressE2EIT extends ClusterOperatorTest {\nvar i = ingressSelector.get();\nassertThat(i.getMetadata().getLabels().entrySet().containsAll(labels.entrySet())).isTrue(); // additional labels should not be overwritten\nassertEquals(\"HTTPS\", i.getMetadata().getAnnotations().get(\"nginx.ingress.kubernetes.io/backend-protocol\"));\n+ assertEquals(\"passthrough\", i.getMetadata().getAnnotations().get(\"route.openshift.io/termination\"));\nassertEquals(Constants.KEYCLOAK_HTTPS_PORT, i.getSpec().getDefaultBackend().getService().getPort().getNumber());\n});\n" } ]

[ { "change_type": "MODIFY", "old_path": "operator/app/pom.xml", "new_path": "operator/app/pom.xml", "diff": "-->\n<resteasy.version>4.7.5.Final</resteasy.version>\n<wildfly.common.version>1.5.4.Final-format-001</wildfly.common.version>\n- <jackson.version>2.13.2</jackson.version>\n- <jackson.databind.version>2.13.2.2</jackson.databind.version>\n+ <jackson.version>2.13.3</jackson.version>\n+ <jackson.databind.version>2.13.3</jackson.databind.version>\n<kubernetes-client.version>5.12.2</kubernetes-client.version>\n<compiler-plugin.version>3.8.1</compiler-plugin.version>\n<maven.compiler.target>11</maven.compiler.target>\n<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\n<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>\n- <quarkus.operator.sdk.version>3.0.7</quarkus.operator.sdk.version>\n- <quarkus.version>2.7.5.Final</quarkus.version>\n+ <quarkus.operator.sdk.version>3.0.8</quarkus.operator.sdk.version>\n+ <quarkus.version>2.7.6.Final</quarkus.version>\n<quarkus.container-image.group>keycloak</quarkus.container-image.group>\n<quarkus.jib.base-jvm-image>registry.access.redhat.com/ubi8/openjdk-11-runtime</quarkus.jib.base-jvm-image>\n<maven-failsafe-plugin.version>2.22.0</maven-failsafe-plugin.version>\n" }, { "change_type": "MODIFY", "old_path": "pom.xml", "new_path": "pom.xml", "diff": "<jboss.snapshots.repo.id>jboss-snapshots-repository</jboss.snapshots.repo.id>\n<jboss.snapshots.repo.url>https://s01.oss.sonatype.org/content/repositories/snapshots/</jboss.snapshots.repo.url>\n- <quarkus.version>2.7.5.Final</quarkus.version>\n+ <quarkus.version>2.7.6.Final</quarkus.version>\n<!--\nPerforming a Wildfly upgrade? Run the:\n" }, { "change_type": "MODIFY", "old_path": "quarkus/pom.xml", "new_path": "quarkus/pom.xml", "diff": "for reference\n-->\n<resteasy.version>4.7.5.Final</resteasy.version>\n- <jackson.version>2.13.2</jackson.version>\n- <jackson.databind.version>2.13.2.2</jackson.databind.version>\n+ <jackson.version>2.13.3</jackson.version>\n+ <jackson.databind.version>2.13.3</jackson.databind.version>\n<hibernate.core.version>5.6.5.Final</hibernate.core.version>\n<mysql.driver.version>8.0.28</mysql.driver.version>\n<postgresql.version>42.3.3</postgresql.version>\n<!--\nQuarkiverse dependency versions\n-->\n- <io.quarkiverse.vault.version>1.0.2</io.quarkiverse.vault.version>\n+ <io.quarkiverse.vault.version>1.1.0</io.quarkiverse.vault.version>\n<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\n<maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>\n" }, { "change_type": "MODIFY", "old_path": "quarkus/tests/integration/src/main/java/org/keycloak/it/junit5/extension/CLIResult.java", "new_path": "quarkus/tests/integration/src/main/java/org/keycloak/it/junit5/extension/CLIResult.java", "diff": "@@ -101,7 +101,7 @@ public interface CLIResult extends LaunchResult {\n}\ndefault void assertBuildRuntimeMismatchWarning(String quarkusBuildtimePropKey) {\n- assertTrue(getOutput().contains(\" - \" + quarkusBuildtimePropKey + \" is set to 'false' but it is build time fixed to 'true'. Did you change the property \" + quarkusBuildtimePropKey + \" after building the application?\"));\n+ assertTrue(getOutput().contains(\" - \" + quarkusBuildtimePropKey + \" is set to 'true' but it is build time fixed to 'false'. Did you change the property \" + quarkusBuildtimePropKey + \" after building the application?\"));\n}\ndefault boolean isClustered() {\n" }, { "change_type": "MODIFY", "old_path": "quarkus/tests/integration/src/main/java/org/keycloak/it/utils/DockerKeycloakDistribution.java", "new_path": "quarkus/tests/integration/src/main/java/org/keycloak/it/utils/DockerKeycloakDistribution.java", "diff": "@@ -43,7 +43,7 @@ public final class DockerKeycloakDistribution implements KeycloakDistribution {\nprivate GenericContainer getKeycloakContainer() {\nif (!distributionFile.exists()) {\n- throw new RuntimeException(\"Distribution archive \" + distributionFile.getAbsolutePath() +\" doesn't exists\");\n+ throw new RuntimeException(\"Distribution archive \" + distributionFile.getAbsolutePath() +\" doesn't exist\");\n}\nreturn new GenericContainer(\nnew ImageFromDockerfile(\"keycloak-under-test\", false)\n" }, { "change_type": "MODIFY", "old_path": "quarkus/tests/integration/src/main/java/org/keycloak/it/utils/RawKeycloakDistribution.java", "new_path": "quarkus/tests/integration/src/main/java/org/keycloak/it/utils/RawKeycloakDistribution.java", "diff": "@@ -328,7 +328,7 @@ public final class RawKeycloakDistribution implements KeycloakDistribution {\nFile distFile = new File(\"../../dist/\" + File.separator + \"target\" + File.separator + \"keycloak-\" + Version.VERSION_KEYCLOAK + \".zip\");\nif (!distFile.exists()) {\n- throw new RuntimeException(\"Distribution archive \" + distFile.getAbsolutePath() +\" doesn't exists\");\n+ throw new RuntimeException(\"Distribution archive \" + distFile.getAbsolutePath() +\" doesn't exist\");\n}\ndistRootPath.toFile().mkdirs();\nString distDirName = distFile.getName();\n" }, { "change_type": "MODIFY", "old_path": "quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/QuarkusPropertiesDistTest.java", "new_path": "quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/QuarkusPropertiesDistTest.java", "diff": "/*\n- * Copyright 2021 Red Hat, Inc. and/or its affiliates\n+ * Copyright 2022 Red Hat, Inc. and/or its affiliates\n* and other contributors as indicated by the @author tags.\n*\n* Licensed under the Apache License, Version 2.0 (the \"License\");\n" } ]

[ { "change_type": "MODIFY", "old_path": "themes/src/main/resources-community/theme/base/login/messages/messages_fr.properties", "new_path": "themes/src/main/resources-community/theme/base/login/messages/messages_fr.properties", "diff": "@@ -10,7 +10,7 @@ doAccept=Accepter\ndoDecline=D\\u00e9cliner\ndoForgotPassword=Mot de passe oubli\\u00e9 ?\ndoClickHere=Cliquez ici\n-doImpersonate=Usurper l'identit\\u00e9\n+doImpersonate=Usurper l''identit\\u00e9\nkerberosNotConfigured=Kerberos non configur\\u00e9\nkerberosNotConfiguredTitle=Kerberos non configur\\u00e9\nbypassKerberosDetail=Si vous n''\\u00eates pas connect\\u00e9 via Kerberos ou bien que votre navigateur n''est pas configur\\u00e9 pour la connexion via Kerberos. Veuillez cliquer pour vous connecter via un autre moyen.\n@@ -216,6 +216,7 @@ failedToProcessResponseMessage=Erreur lors du traitement de la r\\u00e9ponse\nhttpsRequiredMessage=Le protocole HTTPS est requis\nrealmNotEnabledMessage=Le domaine n''est pas activ\\u00e9\ninvalidRequestMessage=Requ\\u00eate invalide\n+successLogout=Vous \\u00eates d\\u00e9connect\\u00e9\nfailedLogout=La d\\u00e9connexion a \\u00e9chou\\u00e9e\nunknownLoginRequesterMessage=Compte inconnu du demandeur\nloginRequesterNotEnabledMessage=La connexion du demandeur n''est pas active\n@@ -281,3 +282,15 @@ noCertificate=[Pas de certificat]\npageNotFound=Page non trouv\\u00e9e\ninternalServerError=Une erreur interne du serveur s''est produite\n+\n+\n+# Identity provider\n+identity-provider-redirector=Connexion avec un autre fournisseur d''identit\\u00e9\n+identity-provider-login-label=Ou se connecter avec\n+\n+\n+frontchannel-logout.title=D\\u00e9connexion\n+frontchannel-logout.message=Vous \\u00eates d\\u00e9connect\\u00e9 des applications suivantes\n+logoutConfirmTitle=D\\u00e9connexion\n+logoutConfirmHeader=\\u00cates-vous s\\u00fbr de vouloir vous d\\u00e9connecter ?\n+doLogout=Se d\\u00e9connecter\n" } ]

[ { "change_type": "MODIFY", "old_path": "themes/src/main/resources-community/theme/base/email/messages/messages_fr.properties", "new_path": "themes/src/main/resources-community/theme/base/email/messages/messages_fr.properties", "diff": "@@ -4,6 +4,9 @@ emailVerificationBodyHtml=<p>Quelqu''un vient de cr\\u00e9er un compte \"{2}\" avec\nemailUpdateConfirmationSubject=V\\u00e9rification du nouveau courriel\nemailUpdateConfirmationBody=Afin d''utiliser le courriel {1} dans votre compte {2}, cliquez sur le lien ci-dessous\\n\\n{0}\\n\\nCe lien expire dans {3}.\\n\\nSinon, veuillez ignorer ce message.\nemailUpdateConfirmationBodyHtml=<p>Afin d''utiliser le courriel {1} dans votre compte {2}, cliquez sur le lien ci-dessous</p><p><a href=\"{0}\">{0}</a></p><p>Ce lien expirera dans {3}.</p><p>Sinon, veuillez ignorer ce message.</p>\n+identityProviderLinkSubject=Lien {0}\n+identityProviderLinkBody=Quelqu''un souhaite lier votre compte \"{1}\" au compte \"{0}\" de l''utilisateur {2} . Si vous \\u00eates \\u00e0 l''origine de cette requ\\u00eate, veuillez cliquer sur le lien ci-dessous pour lier les comptes\\n\\n{3}\\n\\nCe lien expire dans {5}.\\n\\nSinon, veuillez ignorer ce message ; aucun changement ne sera effectu\\u00e9 sur votre compte. Si vous liez les comptes, vous pourrez vous connecter \\u00e0 {1} via {0}.\n+identityProviderLinkBodyHtml=<p>Quelqu''un souhaite lier votre compte <b>{1}</b> au compte <b>{0}</b> de l''utilisateur {2}. Si vous \\u00eates \\u00e0 l''origine de cette requ\\u00eate, veuillez cliquer sur le lien ci-dessous pour lier les comptes</p><p><a href=\"{3}\">Lien pour confirmer la liaison des comptes</a></p><p>Ce lien expire dans {5}.</p><p>Sinon, veuillez ignorer ce message ; aucun changement ne sera effectu\\u00e9 sur votre compte. Si vous liez les comptes, vous pourrez vous connecter \\u00e0 {1} via {0}.</p>\npasswordResetSubject=R\\u00e9initialiser le mot de passe\npasswordResetBody=Quelqu''un vient de demander une r\\u00e9initialisation de mot de passe pour votre compte {2}. Si vous \\u00eates \\u00e0 l''origine de cette requ\\u00eate, veuillez cliquer sur le lien ci-dessous pour le mettre \\u00e0 jour.\\n\\n{0}\\n\\nCe lien expire dans {3}.\\n\\nSinon, veuillez ignorer ce message ; aucun changement ne sera effectu\\u00e9 sur votre compte.\npasswordResetBodyHtml=<p>Quelqu''un vient de demander une r\\u00e9initialisation de mot de passe pour votre compte {2}. Si vous \\u00eates \\u00e0 l''origine de cette requ\\u00eate, veuillez cliquer sur le lien ci-dessous pour le mettre \\u00e0 jour.</p><p><a href=\"{0}\">Lien pour r\\u00e9initialiser votre mot de passe</a></p><p>Ce lien expire dans {3}.</p><p>Sinon, veuillez ignorer ce message ; aucun changement ne sera effectu\\u00e9 sur votre compte.</p>\n@@ -38,3 +41,6 @@ linkExpirationFormatter.timePeriodUnit.hours=heures\nlinkExpirationFormatter.timePeriodUnit.hours.1=heure\nlinkExpirationFormatter.timePeriodUnit.days=jours\nlinkExpirationFormatter.timePeriodUnit.days.1=jour\n+\n+emailVerificationBodyCode=Veuillez v\\u00e9rifier votre adresse de courriel en saisissant le code suivant.\\n\\n{0}\\n\\n.\n+emailVerificationBodyCodeHtml=<p>Veuillez v\\u00e9rifier votre adresse de courriel en saisissant le code suivant.</p><p><b>{0}</b></p>\n" } ]

[ { "change_type": "MODIFY", "old_path": "themes/src/main/resources-community/theme/base/login/messages/messages_fr.properties", "new_path": "themes/src/main/resources-community/theme/base/login/messages/messages_fr.properties", "diff": "@@ -370,6 +370,10 @@ internalServerError=Une erreur interne du serveur s''est produite\n# Identity provider\nidentity-provider-redirector=Connexion avec un autre fournisseur d''identit\\u00e9\nidentity-provider-login-label=Ou se connecter avec\n+idp-email-verification-display-name=V\\u00e9rification du courriel\n+idp-email-verification-help-text=Lier votre compte en validant votre courriel.\n+idp-username-password-form-display-name=Nom d''utilisateur et mot de passe\n+idp-username-password-form-help-text=Lier votre compte en vous connectant.\nconsole-username=Nom d''utilisateur:\nconsole-password=Mot de passe:\n" }, { "change_type": "MODIFY", "old_path": "themes/src/main/resources/theme/base/login/messages/messages_en.properties", "new_path": "themes/src/main/resources/theme/base/login/messages/messages_en.properties", "diff": "@@ -474,6 +474,10 @@ webauthn-error-user-not-found=Unknown user authenticated by the Security key.\n# Identity provider\nidentity-provider-redirector=Connect with another Identity Provider\nidentity-provider-login-label=Or sign in with\n+idp-email-verification-display-name=Email Verification\n+idp-email-verification-help-text=Link your account by validating your email.\n+idp-username-password-form-display-name=Username and password\n+idp-username-password-form-help-text=Link your account by logging in.\nfinalDeletionConfirmation=If you delete your account, it cannot be restored. To keep your account, click Cancel.\nirreversibleAction=This action is irreversible\n" } ]

[ { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/URLAssert.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/URLAssert.java", "diff": "@@ -23,6 +23,7 @@ import org.apache.http.client.methods.CloseableHttpResponse;\nimport org.apache.http.client.methods.HttpGet;\nimport org.apache.http.impl.client.CloseableHttpClient;\nimport org.apache.http.impl.client.HttpClients;\n+import org.awaitility.core.ThrowingRunnable;\nimport org.junit.Assert;\nimport org.keycloak.testsuite.auth.page.login.PageWithLoginUrl;\nimport org.keycloak.testsuite.page.AbstractPage;\n@@ -36,7 +37,9 @@ import java.io.Reader;\nimport java.io.StringWriter;\nimport java.net.URI;\nimport java.nio.charset.Charset;\n+import java.util.concurrent.TimeUnit;\n+import static org.awaitility.Awaitility.await;\nimport static org.junit.Assert.assertTrue;\nimport static org.keycloak.testsuite.util.URLUtils.currentUrlDoesntStartWith;\nimport static org.keycloak.testsuite.util.URLUtils.currentUrlEquals;\n@@ -68,8 +71,10 @@ public class URLAssert {\n}\npublic static void assertCurrentUrlEquals(final String url) {\n+ awaitUntilAsserted(() -> {\nassertTrue(\"Expected URL: \" + url + \" ; actual: \" + DroneUtils.getCurrentDriver().getCurrentUrl(),\ncurrentUrlEquals(url));\n+ });\n}\npublic static void assertCurrentUrlStartsWith(final AbstractPage page, WebDriver driver) {\n@@ -87,12 +92,10 @@ public class URLAssert {\n}\npublic static void assertCurrentUrlStartsWith(final String url){\n+ awaitUntilAsserted(() -> {\nassertTrue(\"URL expected to begin with: \" + removeDefaultPorts(url) + \" ; actual URL: \" + DroneUtils.getCurrentDriver().getCurrentUrl(),\ncurrentUrlStartsWith(removeDefaultPorts(url)));\n- }\n-\n- public static void waitUntilUrlStartsWith(String url, int timeOutInSeconds) {\n- new WebDriverWait(DroneUtils.getCurrentDriver(), timeOutInSeconds).until(ExpectedConditions.urlMatches(\"^\" + url));\n+ });\n}\npublic static void assertCurrentUrlDoesntStartWith(final AbstractPage page, WebDriver driver) {\n@@ -101,7 +104,9 @@ public class URLAssert {\npublic static void assertCurrentUrlDoesntStartWith(final String url, WebDriver driver) {\nDroneUtils.addWebDriver(driver);\n+ awaitUntilAsserted(() -> {\nassertCurrentUrlDoesntStartWith(url);\n+ });\nDroneUtils.removeWebDriver();\n}\n@@ -110,8 +115,10 @@ public class URLAssert {\n}\npublic static void assertCurrentUrlDoesntStartWith(final String url) {\n+ awaitUntilAsserted(() -> {\nassertTrue(\"URL expected NOT to begin with: \" + url + \" ; actual URL: \" + DroneUtils.getCurrentDriver().getCurrentUrl(),\ncurrentUrlDoesntStartWith(url));\n+ });\n}\n@@ -193,4 +200,13 @@ public class URLAssert {\nprotected abstract void assertResponseBody(String body) throws IOException;\n}\n+\n+ private static void awaitUntilAsserted(ThrowingRunnable r) {\n+ await()\n+ .pollInterval(100, TimeUnit.MILLISECONDS)\n+ .pollInSameThread() // to ensure that drones are accessible\n+ .atMost(10, TimeUnit.SECONDS)\n+ .untilAsserted(r);\n+ }\n+\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/authentication/authenticators/x509/X509ClientCertificateAuthenticator.java", "new_path": "services/src/main/java/org/keycloak/authentication/authenticators/x509/X509ClientCertificateAuthenticator.java", "diff": "@@ -96,7 +96,7 @@ public class X509ClientCertificateAuthenticator extends AbstractX509ClientCertif\nString errorMessage = \"Certificate validation's failed.\";\n// TODO is calling form().setErrors enough to show errors on login screen?\ncontext.challenge(createErrorResponse(context, certs[0].getSubjectDN().getName(),\n- errorMessage, e.getMessage()));\n+ errorMessage, \"Certificate revoked or incorrect.\"));\ncontext.attempted();\nreturn;\n}\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509BrowserCRLTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509BrowserCRLTest.java", "diff": "@@ -136,7 +136,7 @@ public class X509BrowserCRLTest extends AbstractX509AuthenticationTest {\nAssert.assertNotNull(cfgId);\n// Verify there is an error message because of invalid CRL signature\n- assertLoginFailedWithExpectedX509Error(\"Certificate validation's failed.\\nSignature length not correct\");\n+ assertLoginFailedWithExpectedX509Error(\"Certificate validation's failed.\\nCertificate revoked or incorrect.\");\n}\n@@ -194,7 +194,7 @@ public class X509BrowserCRLTest extends AbstractX509AuthenticationTest {\nprivate void assertLoginFailedDueRevokedCertificate() {\n- assertLoginFailedWithExpectedX509Error(\"Certificate validation's failed.\\nCertificate has been revoked, certificate's subject:\");\n+ assertLoginFailedWithExpectedX509Error(\"Certificate validation's failed.\\nCertificate revoked or incorrect.\");\n}\nprivate void assertLoginFailedWithExpectedX509Error(String expectedError) {\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509BrowserLoginTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509BrowserLoginTest.java", "diff": "@@ -106,7 +106,7 @@ public class X509BrowserLoginTest extends AbstractX509AuthenticationTest {\nloginConfirmationPage.open();\nAssert.assertThat(loginPage.getError(), containsString(\"Certificate validation's failed.\\n\" +\n- \"Key Usage bit 'dataEncipherment' is not set.\"));\n+ \"Certificate revoked or incorrect.\"));\n}\n@Test\n" } ]

[ { "change_type": "MODIFY", "old_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/Environment.java", "new_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/Environment.java", "diff": "@@ -34,6 +34,7 @@ import java.util.stream.Collectors;\nimport io.quarkus.runtime.LaunchMode;\nimport io.quarkus.runtime.configuration.ProfileManager;\nimport org.apache.commons.lang3.SystemUtils;\n+import org.keycloak.quarkus.runtime.configuration.PersistedConfigSource;\npublic final class Environment {\n@@ -43,8 +44,8 @@ public final class Environment {\npublic static final String DATA_PATH = \"/data\";\npublic static final String DEFAULT_THEMES_PATH = \"/themes\";\npublic static final String DEV_PROFILE_VALUE = \"dev\";\n+ public static final String PROD_PROFILE_VALUE = \"prod\";\npublic static final String LAUNCH_MODE = \"kc.launch.mode\";\n-\nprivate Environment() {}\npublic static Boolean isRebuild() {\n@@ -116,7 +117,7 @@ public final class Environment {\npublic static String getCurrentOrPersistedProfile() {\nString profile = getProfile();\nif(profile == null) {\n- profile = getConfig().getRawValue(PROFILE);\n+ profile = PersistedConfigSource.getInstance().getValue(PROFILE);\n}\nreturn profile;\n}\n" }, { "change_type": "MODIFY", "old_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/ShowConfig.java", "new_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/ShowConfig.java", "diff": "package org.keycloak.quarkus.runtime.cli.command;\nimport static org.keycloak.quarkus.runtime.Environment.getCurrentOrPersistedProfile;\n+import static org.keycloak.quarkus.runtime.Environment.setProfile;\nimport static org.keycloak.quarkus.runtime.configuration.Configuration.getConfigValue;\nimport static org.keycloak.quarkus.runtime.configuration.Configuration.getPropertyNames;\nimport static org.keycloak.quarkus.runtime.configuration.mappers.PropertyMappers.formatValue;\nimport java.util.HashSet;\n+import java.util.List;\nimport java.util.Map;\n+import java.util.Optional;\nimport java.util.Set;\nimport java.util.function.BiConsumer;\nimport java.util.function.Predicate;\n@@ -45,6 +48,9 @@ import picocli.CommandLine.Parameters;\npublic final class ShowConfig extends AbstractCommand implements Runnable {\npublic static final String NAME = \"show-config\";\n+ private static final List<String> ignoredPropertyKeys = List.of(\n+ \"kc.config.args\", \"kc.show.config\", \"kc.profile\", \"kc.quarkus-properties-enabled\", \"kc.home.dir\");\n+\n@Parameters(\nparamLabel = \"filter\",\ndefaultValue = \"none\",\n@@ -55,11 +61,10 @@ public final class ShowConfig extends AbstractCommand implements Runnable {\npublic void run() {\nSystem.setProperty(\"kc.show.config\", filter);\nString configArgs = System.getProperty(\"kc.show.config\");\n+ String profile = Optional.ofNullable(getCurrentOrPersistedProfile()).orElse(Environment.PROD_PROFILE_VALUE);\n+ setProfile(profile);\n- if (configArgs != null) {\nMap<String, Set<String>> properties = getPropertiesByGroup();\n- String profile = getCurrentOrPersistedProfile();\n-\nprintRunTimeConfig(properties, profile);\nif (configArgs.equalsIgnoreCase(\"all\")) {\n@@ -72,14 +77,13 @@ public final class ShowConfig extends AbstractCommand implements Runnable {\nQuarkus.asyncExit(0);\n}\n}\n- }\nprivate void printRunTimeConfig(Map<String, Set<String>> properties, String profile) {\nSet<String> uniqueNames = new HashSet<>();\nspec.commandLine().getOut().printf(\"Current Mode: %s%n\", Environment.getKeycloakModeFromProfile(profile));\n- spec.commandLine().getOut().println(\"Runtime Configuration:\");\n+ spec.commandLine().getOut().println(\"Current Configuration:\");\nproperties.get(MicroProfileConfigProvider.NS_KEYCLOAK).stream().sorted()\n.filter(uniqueNames::add)\n@@ -151,8 +155,9 @@ public final class ShowConfig extends AbstractCommand implements Runnable {\n}\nprivate static boolean filterByGroup(String property) {\n- return property.startsWith(MicroProfileConfigProvider.NS_KEYCLOAK)\n+ return (property.startsWith(MicroProfileConfigProvider.NS_KEYCLOAK)\n|| property.startsWith(MicroProfileConfigProvider.NS_QUARKUS)\n- || property.startsWith(\"%\");\n+ || property.startsWith(\"%\"))\n+ && !ignoredPropertyKeys.contains(property);\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/PropertyMappingInterceptor.java", "new_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/PropertyMappingInterceptor.java", "diff": "@@ -39,8 +39,6 @@ import org.keycloak.quarkus.runtime.configuration.mappers.PropertyMappers;\n*/\npublic class PropertyMappingInterceptor implements ConfigSourceInterceptor {\n- private final boolean isQuarkusPropertiesEnabled = QuarkusPropertiesConfigSource.isQuarkusPropertiesEnabled();\n-\n@Override\npublic ConfigValue getValue(ConfigSourceInterceptorContext context, String name) {\nConfigValue value = PropertyMappers.getValue(context, name);\n" }, { "change_type": "MODIFY", "old_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/QuarkusPropertiesConfigSource.java", "new_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/QuarkusPropertiesConfigSource.java", "diff": "@@ -60,10 +60,6 @@ public final class QuarkusPropertiesConfigSource extends AbstractLocationConfigS\nreturn NAME.equals(value.getConfigSourceName());\n}\n- public static boolean isQuarkusPropertiesEnabled() {\n- return parseBoolean(getRawPersistedProperty(QUARKUS_PROPERTY_ENABLED).orElse(Boolean.FALSE.toString()));\n- }\n-\npublic static Path getConfigurationFile() {\nString homeDir = Environment.getHomeDir();\n" }, { "change_type": "MODIFY", "old_path": "quarkus/tests/integration/src/test/java/org/keycloak/it/cli/ShowConfigCommandTest.java", "new_path": "quarkus/tests/integration/src/test/java/org/keycloak/it/cli/ShowConfigCommandTest.java", "diff": "@@ -35,14 +35,14 @@ public class ShowConfigCommandTest {\n@Launch({ ShowConfig.NAME })\nvoid testShowConfigCommandShowsRuntimeConfig(LaunchResult result) {\nAssertions.assertTrue(result.getOutput()\n- .contains(\"Runtime Configuration\"));\n+ .contains(\"Current Configuration\"));\n}\n@Test\n@Launch({ ShowConfig.NAME, \"all\" })\nvoid testShowConfigCommandWithAllShowsAllProfiles(LaunchResult result) {\nAssertions.assertTrue(result.getOutput()\n- .contains(\"Runtime Configuration\"));\n+ .contains(\"Current Configuration\"));\nAssertions.assertTrue(result.getOutput()\n.contains(\"Quarkus Configuration\"));\n}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ShowConfigCommandDistTest.java", "diff": "+package org.keycloak.it.cli.dist;\n+\n+import org.junit.jupiter.api.Test;\n+import org.keycloak.it.junit5.extension.CLIResult;\n+import org.keycloak.it.junit5.extension.DistributionTest;\n+import org.keycloak.it.junit5.extension.RawDistOnly;\n+import org.keycloak.it.utils.KeycloakDistribution;\n+\n+@DistributionTest\n+public class ShowConfigCommandDistTest {\n+\n+ @Test\n+ @RawDistOnly(reason = \"Containers are immutable\")\n+ void testShowConfigPicksUpRightConfigDependingOnCurrentMode(KeycloakDistribution distribution) {\n+ CLIResult initialResult = distribution.run(\"show-config\");\n+ initialResult.assertMessage(\"Current Mode: production\");\n+ initialResult.assertMessage(\"kc.http-enabled = false\");\n+\n+ distribution.run(\"start-dev\");\n+\n+ CLIResult devModeResult = distribution.run(\"show-config\");\n+ devModeResult.assertMessage(\"Current Mode: development\");\n+ devModeResult.assertMessage(\"kc.http-enabled = true\");\n+\n+ distribution.run(\"build\");\n+\n+ CLIResult resetResult = distribution.run(\"show-config\");\n+ resetResult.assertMessage(\"Current Mode: production\");\n+ resetResult.assertMessage(\"kc.http-enabled = false\");\n+ }\n+}\n" } ]

[ { "change_type": "MODIFY", "old_path": "pom.xml", "new_path": "pom.xml", "diff": "<plugin>\n<groupId>org.apache.maven.plugins</groupId>\n<artifactId>maven-surefire-plugin</artifactId>\n- <version>3.0.0-M6</version>\n+ <version>3.0.0-M7</version>\n<configuration>\n<forkMode>once</forkMode>\n<argLine>-Djava.awt.headless=true ${surefire.memory.settings} ${surefire.system.args} -Duser.language=en -Duser.region=US</argLine>\n" }, { "change_type": "MODIFY", "old_path": "quarkus/pom.xml", "new_path": "quarkus/pom.xml", "diff": "<maven.compiler.source>11</maven.compiler.source>\n<maven.compiler.target>11</maven.compiler.target>\n- <surefire-plugin.version>3.0.0-M6</surefire-plugin.version>\n+ <!-- Needs to be aligned with Quarkus, see e.g. https://github.com/quarkusio/quarkus-quickstarts/blob/2.7.6.Final/getting-started-async/pom.xml#L14 -->\n+ <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>\n</properties>\n<dependencyManagement>\n" } ]

[ { "change_type": "MODIFY", "old_path": "core/src/main/java/org/keycloak/representations/idm/authorization/DecisionStrategy.java", "new_path": "core/src/main/java/org/keycloak/representations/idm/authorization/DecisionStrategy.java", "diff": "*/\npackage org.keycloak.representations.idm.authorization;\n+import java.util.Map;\n+import java.util.Objects;\n+import org.keycloak.util.EnumWithStableIndex;\n+\n/**\n* The decision strategy dictates how the policies associated with a given policy are evaluated and how a final decision\n* is obtained.\n*\n* @author <a href=\"mailto:[email protected]\">Pedro Igor</a>\n*/\n-public enum DecisionStrategy {\n+public enum DecisionStrategy implements EnumWithStableIndex {\n/**\n* Defines that at least one policy must evaluate to a positive decision in order to the overall decision be also positive.\n*/\n- AFFIRMATIVE,\n+ AFFIRMATIVE(0),\n/**\n* Defines that all policies must evaluate to a positive decision in order to the overall decision be also positive.\n*/\n- UNANIMOUS,\n+ UNANIMOUS(1),\n/**\n* Defines that the number of positive decisions must be greater than the number of negative decisions. If the number of positive and negative is the same,\n* the final decision will be negative.\n*/\n- CONSENSUS\n+ CONSENSUS(2);\n+\n+ private final int stableIndex;\n+ private static final Map<Integer, DecisionStrategy> BY_ID = EnumWithStableIndex.getReverseIndex(values());\n+\n+ private DecisionStrategy(int stableIndex) {\n+ Objects.requireNonNull(stableIndex);\n+ this.stableIndex = stableIndex;\n+ }\n+\n+ @Override\n+ public int getStableIndex() {\n+ return stableIndex;\n+ }\n+\n+ public static DecisionStrategy valueOfInteger(Integer id) {\n+ return id == null ? null : BY_ID.get(id);\n+ }\n}\n" }, { "change_type": "MODIFY", "old_path": "core/src/main/java/org/keycloak/representations/idm/authorization/Logic.java", "new_path": "core/src/main/java/org/keycloak/representations/idm/authorization/Logic.java", "diff": "*/\npackage org.keycloak.representations.idm.authorization;\n+import java.util.Map;\n+import java.util.Objects;\n+import org.keycloak.util.EnumWithStableIndex;\n+\n/**\n* The decision strategy dictates how the policies associated with a given policy are evaluated and how a final decision\n* is obtained.\n*\n* @author <a href=\"mailto:[email protected]\">Pedro Igor</a>\n*/\n-public enum Logic {\n+public enum Logic implements EnumWithStableIndex {\n/**\n* Defines that this policy follows a positive logic. In other words, the final decision is the policy outcome.\n*/\n- POSITIVE,\n+ POSITIVE(0),\n/**\n* Defines that this policy uses a logical negation. In other words, the final decision would be a negative of the policy outcome.\n*/\n- NEGATIVE,\n+ NEGATIVE(1);\n+\n+ private final int stableIndex;\n+ private static final Map<Integer, Logic> BY_ID = EnumWithStableIndex.getReverseIndex(values());\n+\n+ private Logic(int stableIndex) {\n+ Objects.requireNonNull(stableIndex);\n+ this.stableIndex = stableIndex;\n+ }\n+\n+ @Override\n+ public int getStableIndex() {\n+ return stableIndex;\n+ }\n+\n+ public static Logic valueOfInteger(Integer id) {\n+ return id == null ? null : BY_ID.get(id);\n+ }\n}\n" }, { "change_type": "MODIFY", "old_path": "core/src/main/java/org/keycloak/representations/idm/authorization/PolicyEnforcementMode.java", "new_path": "core/src/main/java/org/keycloak/representations/idm/authorization/PolicyEnforcementMode.java", "diff": "*/\npackage org.keycloak.representations.idm.authorization;\n+import java.util.Map;\n+import java.util.Objects;\n+import org.keycloak.util.EnumWithStableIndex;\n+\n/**\n* The policy enforcement mode dictates how authorization requests are handled by the server.\n*\n* @author <a href=\"mailto:[email protected]\">Pedro Igor</a>\n*/\n-public enum PolicyEnforcementMode {\n+public enum PolicyEnforcementMode implements EnumWithStableIndex {\n/**\n* Requests are denied by default even when there is no policy associated with a given resource.\n*/\n- ENFORCING,\n+ ENFORCING(0),\n/**\n* Requests are allowed even when there is no policy associated with a given resource.\n*/\n- PERMISSIVE,\n+ PERMISSIVE(1),\n/**\n* Completely disables the evaluation of policies and allow access to any resource.\n*/\n- DISABLED\n+ DISABLED(2);\n+\n+ private final int stableIndex;\n+ private static final Map<Integer, PolicyEnforcementMode> BY_ID = EnumWithStableIndex.getReverseIndex(values());\n+\n+ private PolicyEnforcementMode(int stableIndex) {\n+ Objects.requireNonNull(stableIndex);\n+ this.stableIndex = stableIndex;\n+ }\n+\n+ @Override\n+ public int getStableIndex() {\n+ return stableIndex;\n+ }\n+\n+ public static PolicyEnforcementMode valueOfInteger(Integer id) {\n+ return id == null ? null : BY_ID.get(id);\n+ }\n}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "core/src/main/java/org/keycloak/util/EnumWithStableIndex.java", "diff": "+/*\n+ * Copyright 2022 Red Hat, Inc. and/or its affiliates\n+ * and other contributors as indicated by the @author tags.\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package org.keycloak.util;\n+\n+import java.util.Map;\n+import java.util.function.Function;\n+import java.util.stream.Collectors;\n+import java.util.stream.Stream;\n+\n+/**\n+ * Classes implementing this interface guarantee that for each instance of this class,\n+ * there exists an mutually unique integer which is stable in time, and identifies\n+ * always the same instance of this class.\n+ * The index might be used for persistence, hence the index of a particular item\n+ * cannot be changed.\n+ * This is mostly usable for @{code enum}s.\n+ */\n+public interface EnumWithStableIndex {\n+ /**\n+ * @return Unique numeric index which is stable in time and identifies an instance.\n+ * Reusing the same index for two distinct entries of the same class is forbidden even\n+ * if they cannot exist at the same time (e.g. one is deleted before other is introduced).\n+ */\n+ public int getStableIndex();\n+\n+ public static <E extends EnumWithStableIndex> Map<Integer, E> getReverseIndex(E[] values) {\n+ return Stream.of(values).collect(Collectors.toMap(EnumWithStableIndex::getStableIndex, Function.identity()));\n+ }\n+}\n" }, { "change_type": "MODIFY", "old_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/hibernate/jsonb/JsonbType.java", "new_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/hibernate/jsonb/JsonbType.java", "diff": "@@ -20,6 +20,7 @@ import com.fasterxml.jackson.annotation.JsonAutoDetect;\nimport com.fasterxml.jackson.annotation.JsonIgnore;\nimport com.fasterxml.jackson.annotation.JsonInclude;\nimport com.fasterxml.jackson.annotation.JsonTypeInfo;\n+import com.fasterxml.jackson.annotation.JsonValue;\nimport com.fasterxml.jackson.annotation.PropertyAccessor;\nimport com.fasterxml.jackson.databind.DeserializationFeature;\nimport com.fasterxml.jackson.databind.JsonNode;\n@@ -77,8 +78,7 @@ import org.keycloak.models.map.realm.entity.MapRequiredCredentialEntity;\nimport org.keycloak.models.map.realm.entity.MapRequiredCredentialEntityImpl;\nimport org.keycloak.models.map.realm.entity.MapWebAuthnPolicyEntity;\nimport org.keycloak.models.map.realm.entity.MapWebAuthnPolicyEntityImpl;\n-\n-import static org.keycloak.models.map.storage.jpa.hibernate.jsonb.JpaEntityMigration.MIGRATIONS;\n+import org.keycloak.util.EnumWithStableIndex;\npublic class JsonbType extends AbstractSingleColumnStandardBasicType<Object> implements DynamicParameterizedType {\n@@ -105,7 +105,9 @@ public class JsonbType extends AbstractSingleColumnStandardBasicType<Object> imp\n.addAbstractTypeMapping(MapWebAuthnPolicyEntity.class, MapWebAuthnPolicyEntityImpl.class))\n.addMixIn(UpdatableEntity.class, IgnoreUpdatedMixIn.class)\n.addMixIn(DeepCloner.class, IgnoredTypeMixIn.class)\n- .addMixIn(EntityWithAttributes.class, IgnoredMetadataFieldsMixIn.class);\n+ .addMixIn(EntityWithAttributes.class, IgnoredMetadataFieldsMixIn.class)\n+ .addMixIn(EnumWithStableIndex.class, EnumsMixIn.class)\n+ ;\nabstract class IgnoredMetadataFieldsMixIn {\n@JsonIgnore public abstract String getId();\n@@ -115,6 +117,13 @@ public class JsonbType extends AbstractSingleColumnStandardBasicType<Object> imp\n@JsonIgnore public abstract Boolean isClientRole();\n}\n+ abstract static class EnumsMixIn implements EnumWithStableIndex {\n+\n+ // we convert enums to its index and vice versa\n+ @Override\n+ @JsonValue public abstract int getStableIndex();\n+ }\n+\npublic JsonbType() {\nsuper(JsonbSqlTypeDescriptor.INSTANCE, new JsonbJavaTypeDescriptor());\n}\n@@ -232,7 +241,7 @@ public class JsonbType extends AbstractSingleColumnStandardBasicType<Object> imp\n}\nprivate ObjectNode migrate(ObjectNode tree, Integer entityVersion) {\n- return MIGRATIONS.getOrDefault(valueType, (node, version) -> node).apply(tree, entityVersion);\n+ return JpaEntityMigration.MIGRATIONS.getOrDefault(valueType, (node, version) -> node).apply(tree, entityVersion);\n}\n@Override\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/events/EventUtils.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/events/EventUtils.java", "diff": "@@ -20,8 +20,6 @@ package org.keycloak.models.map.events;\nimport org.keycloak.events.Event;\nimport org.keycloak.events.admin.AdminEvent;\nimport org.keycloak.events.admin.AuthDetails;\n-import org.keycloak.models.KeycloakSession;\n-import org.keycloak.models.map.common.TimeAdapter;\nimport java.util.Collections;\nimport java.util.Map;\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/events/MapAdminEventQuery.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/events/MapAdminEventQuery.java", "diff": "@@ -90,7 +90,7 @@ public class MapAdminEventQuery implements AdminEventQuery {\n@Override\npublic AdminEventQuery resourceType(ResourceType... resourceTypes) {\n- mcb = mcb.compare(SearchableFields.RESOURCE_TYPE, EQ, Arrays.stream(resourceTypes));\n+ mcb = mcb.compare(SearchableFields.RESOURCE_TYPE, IN, Arrays.stream(resourceTypes));\nreturn this;\n}\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/realm/MapRealmAdapter.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/realm/MapRealmAdapter.java", "diff": "@@ -1771,10 +1771,12 @@ public class MapRealmAdapter extends AbstractRealmModel<MapRealmEntity> implemen\nreturn String.format(\"%s@%08x\", getId(), hashCode());\n}\n+ @Override\npublic CibaConfig getCibaPolicy() {\nreturn new CibaConfig(this);\n}\n+ @Override\npublic ParConfig getParPolicy() {\nreturn new ParConfig(this);\n}\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/userSession/MapUserSessionEntity.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/userSession/MapUserSessionEntity.java", "diff": "@@ -19,7 +19,6 @@ package org.keycloak.models.map.userSession;\nimport org.keycloak.models.UserSessionModel;\nimport org.keycloak.models.map.annotations.GenerateEntityImplementations;\nimport org.keycloak.models.map.common.AbstractEntity;\n-\nimport org.keycloak.models.map.common.DeepCloner;\nimport org.keycloak.models.map.common.ExpirableEntity;\nimport org.keycloak.models.map.common.UpdatableEntity;\n" }, { "change_type": "MODIFY", "old_path": "pom.xml", "new_path": "pom.xml", "diff": "<infinispan.version>12.1.7.Final</infinispan.version>\n<infinispan.protostream.processor.version>4.4.1.Final</infinispan.protostream.processor.version>\n<javax.annotation-api.version>1.3.2</javax.annotation-api.version>\n- <jackson.version>2.12.1</jackson.version>\n- <jackson.databind.version>2.12.6.1</jackson.databind.version>\n+ <jackson.version>2.13.2</jackson.version>\n+ <jackson.databind.version>2.13.2.2</jackson.databind.version>\n<jackson.annotations.version>${jackson.databind.version}</jackson.annotations.version>\n<jakarta.mail.version>1.6.5</jakarta.mail.version>\n<jboss-jaxrs-api_2.1_spec>2.0.1.Final</jboss-jaxrs-api_2.1_spec>\n<jmeter.plugin.version>1.9.0</jmeter.plugin.version>\n<jmeter.analysis.plugin.version>1.0.4</jmeter.analysis.plugin.version>\n<minify.plugin.version>1.7.6</minify.plugin.version>\n- <osgi.bundle.plugin.version>2.3.7</osgi.bundle.plugin.version>\n+ <osgi.bundle.plugin.version>2.4.0</osgi.bundle.plugin.version>\n<wildfly.plugin.version>2.0.1.Final</wildfly.plugin.version>\n<nexus.staging.plugin.version>1.6.5</nexus.staging.plugin.version>\n<frontend.plugin.version>1.12.0</frontend.plugin.version>\n" }, { "change_type": "MODIFY", "old_path": "server-spi-private/src/main/java/org/keycloak/events/EventType.java", "new_path": "server-spi-private/src/main/java/org/keycloak/events/EventType.java", "diff": "package org.keycloak.events;\n+import java.util.Map;\n+import java.util.Objects;\n+import org.keycloak.util.EnumWithStableIndex;\n+\n/**\n* @author <a href=\"mailto:[email protected]\">Stian Thorgersen</a>\n*/\n-public enum EventType {\n+public enum EventType implements EnumWithStableIndex {\n- LOGIN(true),\n- LOGIN_ERROR(true),\n- REGISTER(true),\n- REGISTER_ERROR(true),\n- LOGOUT(true),\n- LOGOUT_ERROR(true),\n+ LOGIN(0, true),\n+ LOGIN_ERROR(0x10000 + LOGIN.getStableIndex(), true),\n+ REGISTER(1, true),\n+ REGISTER_ERROR(0x10000 + REGISTER.getStableIndex(), true),\n+ LOGOUT(2, true),\n+ LOGOUT_ERROR(0x10000 + LOGOUT.getStableIndex(), true),\n- CODE_TO_TOKEN(true),\n- CODE_TO_TOKEN_ERROR(true),\n+ CODE_TO_TOKEN(3, true),\n+ CODE_TO_TOKEN_ERROR(0x10000 + CODE_TO_TOKEN.getStableIndex(), true),\n- CLIENT_LOGIN(true),\n- CLIENT_LOGIN_ERROR(true),\n+ CLIENT_LOGIN(4, true),\n+ CLIENT_LOGIN_ERROR(0x10000 + CLIENT_LOGIN.getStableIndex(), true),\n- REFRESH_TOKEN(false),\n- REFRESH_TOKEN_ERROR(false),\n+ REFRESH_TOKEN(5, false),\n+ REFRESH_TOKEN_ERROR(0x10000 + REFRESH_TOKEN.getStableIndex(), false),\n/**\n* @deprecated see KEYCLOAK-2266\n*/\n@Deprecated\n- VALIDATE_ACCESS_TOKEN(false),\n+ VALIDATE_ACCESS_TOKEN(6, false),\n@Deprecated\n- VALIDATE_ACCESS_TOKEN_ERROR(false),\n- INTROSPECT_TOKEN(false),\n- INTROSPECT_TOKEN_ERROR(false),\n-\n- FEDERATED_IDENTITY_LINK(true),\n- FEDERATED_IDENTITY_LINK_ERROR(true),\n- REMOVE_FEDERATED_IDENTITY(true),\n- REMOVE_FEDERATED_IDENTITY_ERROR(true),\n-\n- UPDATE_EMAIL(true),\n- UPDATE_EMAIL_ERROR(true),\n- UPDATE_PROFILE(true),\n- UPDATE_PROFILE_ERROR(true),\n- UPDATE_PASSWORD(true),\n- UPDATE_PASSWORD_ERROR(true),\n- UPDATE_TOTP(true),\n- UPDATE_TOTP_ERROR(true),\n- VERIFY_EMAIL(true),\n- VERIFY_EMAIL_ERROR(true),\n- VERIFY_PROFILE(true),\n- VERIFY_PROFILE_ERROR(true),\n-\n- REMOVE_TOTP(true),\n- REMOVE_TOTP_ERROR(true),\n-\n- GRANT_CONSENT(true),\n- GRANT_CONSENT_ERROR(true),\n- UPDATE_CONSENT(true),\n- UPDATE_CONSENT_ERROR(true),\n- REVOKE_GRANT(true),\n- REVOKE_GRANT_ERROR(true),\n-\n- SEND_VERIFY_EMAIL(true),\n- SEND_VERIFY_EMAIL_ERROR(true),\n- SEND_RESET_PASSWORD(true),\n- SEND_RESET_PASSWORD_ERROR(true),\n- SEND_IDENTITY_PROVIDER_LINK(true),\n- SEND_IDENTITY_PROVIDER_LINK_ERROR(true),\n- RESET_PASSWORD(true),\n- RESET_PASSWORD_ERROR(true),\n-\n- RESTART_AUTHENTICATION(true),\n- RESTART_AUTHENTICATION_ERROR(true),\n-\n- INVALID_SIGNATURE(false),\n- INVALID_SIGNATURE_ERROR(false),\n- REGISTER_NODE(false),\n- REGISTER_NODE_ERROR(false),\n- UNREGISTER_NODE(false),\n- UNREGISTER_NODE_ERROR(false),\n-\n- USER_INFO_REQUEST(false),\n- USER_INFO_REQUEST_ERROR(false),\n-\n- IDENTITY_PROVIDER_LINK_ACCOUNT(true),\n- IDENTITY_PROVIDER_LINK_ACCOUNT_ERROR(true),\n- IDENTITY_PROVIDER_LOGIN(false),\n- IDENTITY_PROVIDER_LOGIN_ERROR(false),\n- IDENTITY_PROVIDER_FIRST_LOGIN(true),\n- IDENTITY_PROVIDER_FIRST_LOGIN_ERROR(true),\n- IDENTITY_PROVIDER_POST_LOGIN(true),\n- IDENTITY_PROVIDER_POST_LOGIN_ERROR(true),\n- IDENTITY_PROVIDER_RESPONSE(false),\n- IDENTITY_PROVIDER_RESPONSE_ERROR(false),\n- IDENTITY_PROVIDER_RETRIEVE_TOKEN(false),\n- IDENTITY_PROVIDER_RETRIEVE_TOKEN_ERROR(false),\n- IMPERSONATE(true),\n- IMPERSONATE_ERROR(true),\n- CUSTOM_REQUIRED_ACTION(true),\n- CUSTOM_REQUIRED_ACTION_ERROR(true),\n- EXECUTE_ACTIONS(true),\n- EXECUTE_ACTIONS_ERROR(true),\n- EXECUTE_ACTION_TOKEN(true),\n- EXECUTE_ACTION_TOKEN_ERROR(true),\n-\n- CLIENT_INFO(false),\n- CLIENT_INFO_ERROR(false),\n- CLIENT_REGISTER(true),\n- CLIENT_REGISTER_ERROR(true),\n- CLIENT_UPDATE(true),\n- CLIENT_UPDATE_ERROR(true),\n- CLIENT_DELETE(true),\n- CLIENT_DELETE_ERROR(true),\n-\n- CLIENT_INITIATED_ACCOUNT_LINKING(true),\n- CLIENT_INITIATED_ACCOUNT_LINKING_ERROR(true),\n- TOKEN_EXCHANGE(true),\n- TOKEN_EXCHANGE_ERROR(true),\n-\n- OAUTH2_DEVICE_AUTH(true),\n- OAUTH2_DEVICE_AUTH_ERROR(true),\n- OAUTH2_DEVICE_VERIFY_USER_CODE(true),\n- OAUTH2_DEVICE_VERIFY_USER_CODE_ERROR(true),\n- OAUTH2_DEVICE_CODE_TO_TOKEN(true),\n- OAUTH2_DEVICE_CODE_TO_TOKEN_ERROR(true),\n-\n- AUTHREQID_TO_TOKEN(true),\n- AUTHREQID_TO_TOKEN_ERROR(true),\n-\n- PERMISSION_TOKEN(true),\n- PERMISSION_TOKEN_ERROR(false),\n-\n- DELETE_ACCOUNT(true),\n- DELETE_ACCOUNT_ERROR(true),\n+ VALIDATE_ACCESS_TOKEN_ERROR(0x10000 + VALIDATE_ACCESS_TOKEN.getStableIndex(), false),\n+ INTROSPECT_TOKEN(7, false),\n+ INTROSPECT_TOKEN_ERROR(0x10000 + INTROSPECT_TOKEN.getStableIndex(), false),\n+\n+ FEDERATED_IDENTITY_LINK(8, true),\n+ FEDERATED_IDENTITY_LINK_ERROR(0x10000 + FEDERATED_IDENTITY_LINK.getStableIndex(), true),\n+ REMOVE_FEDERATED_IDENTITY(9, true),\n+ REMOVE_FEDERATED_IDENTITY_ERROR(0x10000 + REMOVE_FEDERATED_IDENTITY.getStableIndex(), true),\n+\n+ UPDATE_EMAIL(10, true),\n+ UPDATE_EMAIL_ERROR(0x10000 + UPDATE_EMAIL.getStableIndex(), true),\n+ UPDATE_PROFILE(11, true),\n+ UPDATE_PROFILE_ERROR(0x10000 + UPDATE_PROFILE.getStableIndex(), true),\n+ UPDATE_PASSWORD(12, true),\n+ UPDATE_PASSWORD_ERROR(0x10000 + UPDATE_PASSWORD.getStableIndex(), true),\n+ UPDATE_TOTP(13, true),\n+ UPDATE_TOTP_ERROR(0x10000 + UPDATE_TOTP.getStableIndex(), true),\n+ VERIFY_EMAIL(14, true),\n+ VERIFY_EMAIL_ERROR(0x10000 + VERIFY_EMAIL.getStableIndex(), true),\n+ VERIFY_PROFILE(15, true),\n+ VERIFY_PROFILE_ERROR(0x10000 + VERIFY_PROFILE.getStableIndex(), true),\n+\n+ REMOVE_TOTP(16, true),\n+ REMOVE_TOTP_ERROR(0x10000 + REMOVE_TOTP.getStableIndex(), true),\n+\n+ GRANT_CONSENT(17, true),\n+ GRANT_CONSENT_ERROR(0x10000 + GRANT_CONSENT.getStableIndex(), true),\n+ UPDATE_CONSENT(18, true),\n+ UPDATE_CONSENT_ERROR(0x10000 + UPDATE_CONSENT.getStableIndex(), true),\n+ REVOKE_GRANT(19, true),\n+ REVOKE_GRANT_ERROR(0x10000 + REVOKE_GRANT.getStableIndex(), true),\n+\n+ SEND_VERIFY_EMAIL(20, true),\n+ SEND_VERIFY_EMAIL_ERROR(0x10000 + SEND_VERIFY_EMAIL.getStableIndex(), true),\n+ SEND_RESET_PASSWORD(21, true),\n+ SEND_RESET_PASSWORD_ERROR(0x10000 + SEND_RESET_PASSWORD.getStableIndex(), true),\n+ SEND_IDENTITY_PROVIDER_LINK(22, true),\n+ SEND_IDENTITY_PROVIDER_LINK_ERROR(0x10000 + SEND_IDENTITY_PROVIDER_LINK.getStableIndex(), true),\n+ RESET_PASSWORD(23, true),\n+ RESET_PASSWORD_ERROR(0x10000 + RESET_PASSWORD.getStableIndex(), true),\n+\n+ RESTART_AUTHENTICATION(24, true),\n+ RESTART_AUTHENTICATION_ERROR(0x10000 + RESTART_AUTHENTICATION.getStableIndex(), true),\n+\n+ INVALID_SIGNATURE(25, false),\n+ INVALID_SIGNATURE_ERROR(0x10000 + INVALID_SIGNATURE.getStableIndex(), false),\n+ REGISTER_NODE(26, false),\n+ REGISTER_NODE_ERROR(0x10000 + REGISTER_NODE.getStableIndex(), false),\n+ UNREGISTER_NODE(27, false),\n+ UNREGISTER_NODE_ERROR(0x10000 + UNREGISTER_NODE.getStableIndex(), false),\n+\n+ USER_INFO_REQUEST(28, false),\n+ USER_INFO_REQUEST_ERROR(0x10000 + USER_INFO_REQUEST.getStableIndex(), false),\n+\n+ IDENTITY_PROVIDER_LINK_ACCOUNT(29, true),\n+ IDENTITY_PROVIDER_LINK_ACCOUNT_ERROR(0x10000 + IDENTITY_PROVIDER_LINK_ACCOUNT.getStableIndex(), true),\n+ IDENTITY_PROVIDER_LOGIN(30, false),\n+ IDENTITY_PROVIDER_LOGIN_ERROR(0x10000 + IDENTITY_PROVIDER_LOGIN.getStableIndex(), false),\n+ IDENTITY_PROVIDER_FIRST_LOGIN(31, true),\n+ IDENTITY_PROVIDER_FIRST_LOGIN_ERROR(0x10000 + IDENTITY_PROVIDER_FIRST_LOGIN.getStableIndex(), true),\n+ IDENTITY_PROVIDER_POST_LOGIN(32, true),\n+ IDENTITY_PROVIDER_POST_LOGIN_ERROR(0x10000 + IDENTITY_PROVIDER_POST_LOGIN.getStableIndex(), true),\n+ IDENTITY_PROVIDER_RESPONSE(33, false),\n+ IDENTITY_PROVIDER_RESPONSE_ERROR(0x10000 + IDENTITY_PROVIDER_RESPONSE.getStableIndex(), false),\n+ IDENTITY_PROVIDER_RETRIEVE_TOKEN(34, false),\n+ IDENTITY_PROVIDER_RETRIEVE_TOKEN_ERROR(0x10000 + IDENTITY_PROVIDER_RETRIEVE_TOKEN.getStableIndex(), false),\n+ IMPERSONATE(35, true),\n+ IMPERSONATE_ERROR(0x10000 + IMPERSONATE.getStableIndex(), true),\n+ CUSTOM_REQUIRED_ACTION(36, true),\n+ CUSTOM_REQUIRED_ACTION_ERROR(0x10000 + CUSTOM_REQUIRED_ACTION.getStableIndex(), true),\n+ EXECUTE_ACTIONS(37, true),\n+ EXECUTE_ACTIONS_ERROR(0x10000 + EXECUTE_ACTIONS.getStableIndex(), true),\n+ EXECUTE_ACTION_TOKEN(38, true),\n+ EXECUTE_ACTION_TOKEN_ERROR(0x10000 + EXECUTE_ACTION_TOKEN.getStableIndex(), true),\n+\n+ CLIENT_INFO(39, false),\n+ CLIENT_INFO_ERROR(0x10000 + CLIENT_INFO.getStableIndex(), false),\n+ CLIENT_REGISTER(40, true),\n+ CLIENT_REGISTER_ERROR(0x10000 + CLIENT_REGISTER.getStableIndex(), true),\n+ CLIENT_UPDATE(41, true),\n+ CLIENT_UPDATE_ERROR(0x10000 + CLIENT_UPDATE.getStableIndex(), true),\n+ CLIENT_DELETE(42, true),\n+ CLIENT_DELETE_ERROR(0x10000 + CLIENT_DELETE.getStableIndex(), true),\n+\n+ CLIENT_INITIATED_ACCOUNT_LINKING(43, true),\n+ CLIENT_INITIATED_ACCOUNT_LINKING_ERROR(0x10000 + CLIENT_INITIATED_ACCOUNT_LINKING.getStableIndex(), true),\n+ TOKEN_EXCHANGE(44, true),\n+ TOKEN_EXCHANGE_ERROR(0x10000 + TOKEN_EXCHANGE.getStableIndex(), true),\n+\n+ OAUTH2_DEVICE_AUTH(45, true),\n+ OAUTH2_DEVICE_AUTH_ERROR(0x10000 + OAUTH2_DEVICE_AUTH.getStableIndex(), true),\n+ OAUTH2_DEVICE_VERIFY_USER_CODE(46, true),\n+ OAUTH2_DEVICE_VERIFY_USER_CODE_ERROR(0x10000 + OAUTH2_DEVICE_VERIFY_USER_CODE.getStableIndex(), true),\n+ OAUTH2_DEVICE_CODE_TO_TOKEN(47, true),\n+ OAUTH2_DEVICE_CODE_TO_TOKEN_ERROR(0x10000 + OAUTH2_DEVICE_CODE_TO_TOKEN.getStableIndex(), true),\n+\n+ AUTHREQID_TO_TOKEN(48, true),\n+ AUTHREQID_TO_TOKEN_ERROR(0x10000 + AUTHREQID_TO_TOKEN.getStableIndex(), true),\n+\n+ PERMISSION_TOKEN(49, true),\n+ PERMISSION_TOKEN_ERROR(0x10000 + PERMISSION_TOKEN.getStableIndex(), false),\n+\n+ DELETE_ACCOUNT(50, true),\n+ DELETE_ACCOUNT_ERROR(0x10000 + DELETE_ACCOUNT.getStableIndex(), true),\n// PAR request.\n- PUSHED_AUTHORIZATION_REQUEST(false),\n- PUSHED_AUTHORIZATION_REQUEST_ERROR(false);\n+ PUSHED_AUTHORIZATION_REQUEST(51, false),\n+ PUSHED_AUTHORIZATION_REQUEST_ERROR(0x10000 + PUSHED_AUTHORIZATION_REQUEST.getStableIndex(), false);\n- private boolean saveByDefault;\n+ private final int stableIndex;\n+ private final boolean saveByDefault;\n+ private static final Map<Integer, EventType> BY_ID = EnumWithStableIndex.getReverseIndex(values());\n- EventType(boolean saveByDefault) {\n+ EventType(int stableIndex, boolean saveByDefault) {\n+ Objects.requireNonNull(stableIndex);\n+ this.stableIndex = stableIndex;\nthis.saveByDefault = saveByDefault;\n}\n+ @Override\n+ public int getStableIndex() {\n+ return stableIndex;\n+ }\n+\n/**\n* Determines whether this event is stored when the admin has not set a specific set of event types to save.\n* @return\n@@ -168,4 +181,7 @@ public enum EventType {\nreturn saveByDefault;\n}\n+ public static EventType valueOfInteger(Integer id) {\n+ return id == null ? null : BY_ID.get(id);\n+ }\n}\n" }, { "change_type": "MODIFY", "old_path": "server-spi-private/src/main/java/org/keycloak/events/admin/OperationType.java", "new_path": "server-spi-private/src/main/java/org/keycloak/events/admin/OperationType.java", "diff": "package org.keycloak.events.admin;\n+import java.util.Map;\n+import java.util.Objects;\n+import org.keycloak.util.EnumWithStableIndex;\n+\n/**\n* @author <a href=\"mailto:[email protected]\">Stian Thorgersen</a>\n*/\n-public enum OperationType {\n+public enum OperationType implements EnumWithStableIndex {\n+\n+ CREATE(0),\n+ UPDATE(1),\n+ DELETE(2),\n+ ACTION(3);\n- CREATE,\n- UPDATE,\n- DELETE,\n- ACTION;\n+ private final int stableIndex;\n+ private static final Map<Integer, OperationType> BY_ID = EnumWithStableIndex.getReverseIndex(values());\n+\n+ private OperationType(int stableIndex) {\n+ Objects.requireNonNull(stableIndex);\n+ this.stableIndex = stableIndex;\n+ }\n+ @Override\n+ public int getStableIndex() {\n+ return stableIndex;\n+ }\n+\n+ public static OperationType valueOfInteger(Integer id) {\n+ return id == null ? null : BY_ID.get(id);\n+ }\n}\n" }, { "change_type": "MODIFY", "old_path": "server-spi/src/main/java/org/keycloak/models/AuthenticationExecutionModel.java", "new_path": "server-spi/src/main/java/org/keycloak/models/AuthenticationExecutionModel.java", "diff": "@@ -19,6 +19,9 @@ package org.keycloak.models;\nimport java.io.Serializable;\nimport java.util.Comparator;\n+import java.util.Map;\n+import java.util.Objects;\n+import org.keycloak.util.EnumWithStableIndex;\n/**\n* @author <a href=\"mailto:[email protected]\">Bill Burke</a>\n@@ -118,11 +121,28 @@ public class AuthenticationExecutionModel implements Serializable {\nthis.authenticatorFlow = authenticatorFlow;\n}\n- public enum Requirement {\n- REQUIRED,\n- CONDITIONAL,\n- ALTERNATIVE,\n- DISABLED\n+ public enum Requirement implements EnumWithStableIndex {\n+ REQUIRED(0),\n+ CONDITIONAL(1),\n+ ALTERNATIVE(2),\n+ DISABLED(3);\n+\n+ private final int stableIndex;\n+ private static final Map<Integer, Requirement> BY_ID = EnumWithStableIndex.getReverseIndex(values());\n+\n+ private Requirement(int stableIndex) {\n+ Objects.requireNonNull(stableIndex);\n+ this.stableIndex = stableIndex;\n+ }\n+\n+ @Override\n+ public int getStableIndex() {\n+ return stableIndex;\n+ }\n+\n+ public static Requirement valueOfInteger(Integer id) {\n+ return id == null ? null : BY_ID.get(id);\n+ }\n}\npublic boolean isRequired() {\n" }, { "change_type": "MODIFY", "old_path": "server-spi/src/main/java/org/keycloak/models/UserSessionModel.java", "new_path": "server-spi/src/main/java/org/keycloak/models/UserSessionModel.java", "diff": "@@ -21,6 +21,8 @@ import org.keycloak.storage.SearchableModelField;\nimport java.util.Collection;\nimport java.util.Map;\n+import java.util.Objects;\n+import org.keycloak.util.EnumWithStableIndex;\n/**\n* @author <a href=\"mailto:[email protected]\">Stian Thorgersen</a>\n@@ -110,11 +112,28 @@ public interface UserSessionModel {\n// Will completely restart whole state of user session. It will just keep same ID.\nvoid restartSession(RealmModel realm, UserModel user, String loginUsername, String ipAddress, String authMethod, boolean rememberMe, String brokerSessionId, String brokerUserId);\n- enum State {\n- LOGGED_IN,\n- LOGGING_OUT,\n- LOGGED_OUT,\n- LOGGED_OUT_UNCONFIRMED;\n+ enum State implements EnumWithStableIndex {\n+ LOGGED_IN(0),\n+ LOGGING_OUT(1),\n+ LOGGED_OUT(2),\n+ LOGGED_OUT_UNCONFIRMED(3);\n+\n+ private final int stableIndex;\n+ private static final Map<Integer, State> BY_ID = EnumWithStableIndex.getReverseIndex(values());\n+\n+ private State(int stableIndex) {\n+ Objects.requireNonNull(stableIndex);\n+ this.stableIndex = stableIndex;\n+ }\n+\n+ @Override\n+ public int getStableIndex() {\n+ return stableIndex;\n+ }\n+\n+ public static State valueOfInteger(Integer id) {\n+ return id == null ? null : BY_ID.get(id);\n+ }\n}\n/**\n" }, { "change_type": "MODIFY", "old_path": "server-spi/src/main/java/org/keycloak/sessions/CommonClientSessionModel.java", "new_path": "server-spi/src/main/java/org/keycloak/sessions/CommonClientSessionModel.java", "diff": "package org.keycloak.sessions;\n+import java.util.Map;\n+import java.util.Objects;\nimport org.keycloak.models.ClientModel;\nimport org.keycloak.models.RealmModel;\n+import org.keycloak.util.EnumWithStableIndex;\n/**\n* Predecesor of AuthenticationSessionModel, ClientLoginSessionModel and ClientSessionModel (then action tickets). Maybe we will remove it later...\n@@ -48,14 +51,31 @@ public interface CommonClientSessionModel {\nUSER_CODE_VERIFICATION\n}\n- enum ExecutionStatus {\n- FAILED,\n- SUCCESS,\n- SETUP_REQUIRED,\n- ATTEMPTED,\n- SKIPPED,\n- CHALLENGED,\n- EVALUATED_TRUE,\n- EVALUATED_FALSE\n+ enum ExecutionStatus implements EnumWithStableIndex {\n+ FAILED(0),\n+ SUCCESS(1),\n+ SETUP_REQUIRED(2),\n+ ATTEMPTED(3),\n+ SKIPPED(4),\n+ CHALLENGED(5),\n+ EVALUATED_TRUE(6),\n+ EVALUATED_FALSE(7);\n+\n+ private final int stableIndex;\n+ private static final Map<Integer, ExecutionStatus> BY_ID = EnumWithStableIndex.getReverseIndex(values());\n+\n+ private ExecutionStatus(int stableIndex) {\n+ Objects.requireNonNull(stableIndex);\n+ this.stableIndex = stableIndex;\n+ }\n+\n+ @Override\n+ public int getStableIndex() {\n+ return stableIndex;\n+ }\n+\n+ public static ExecutionStatus valueOfInteger(Integer id) {\n+ return id == null ? null : BY_ID.get(id);\n+ }\n}\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "common/src/main/java/org/keycloak/common/util/CertificateUtils.java", "new_path": "common/src/main/java/org/keycloak/common/util/CertificateUtils.java", "diff": "package org.keycloak.common.util;\n-import org.bouncycastle.asn1.ASN1Sequence;\n-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;\nimport org.bouncycastle.asn1.x500.X500Name;\n-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;\nimport org.bouncycastle.asn1.x509.BasicConstraints;\nimport org.bouncycastle.asn1.x509.ExtendedKeyUsage;\nimport org.bouncycastle.asn1.x509.Extension;\n@@ -28,17 +25,11 @@ import org.bouncycastle.asn1.x509.KeyPurposeId;\nimport org.bouncycastle.asn1.x509.KeyUsage;\nimport org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;\nimport org.bouncycastle.cert.X509CertificateHolder;\n-import org.bouncycastle.cert.X509ExtensionUtils;\nimport org.bouncycastle.cert.X509v1CertificateBuilder;\nimport org.bouncycastle.cert.X509v3CertificateBuilder;\nimport org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;\n-import org.bouncycastle.crypto.util.PrivateKeyFactory;\n+import org.bouncycastle.cert.jcajce.JcaX509ExtensionUtils;\nimport org.bouncycastle.operator.ContentSigner;\n-import org.bouncycastle.operator.DefaultDigestAlgorithmIdentifierFinder;\n-import org.bouncycastle.operator.DefaultSignatureAlgorithmIdentifierFinder;\n-import org.bouncycastle.operator.DigestCalculator;\n-import org.bouncycastle.operator.bc.BcDigestCalculatorProvider;\n-import org.bouncycastle.operator.bc.BcRSAContentSignerBuilder;\nimport org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;\nimport java.math.BigInteger;\n@@ -89,9 +80,7 @@ public class CertificateUtils {\nX509v3CertificateBuilder certGen = new X509v3CertificateBuilder(new X500Name(caCert.getSubjectDN().getName()),\nserialNumber, notBefore, notAfter, subjectDN, subjPubKeyInfo);\n- DigestCalculator digCalc = new BcDigestCalculatorProvider()\n- .get(new AlgorithmIdentifier(OIWObjectIdentifiers.idSHA1));\n- X509ExtensionUtils x509ExtensionUtils = new X509ExtensionUtils(digCalc);\n+ JcaX509ExtensionUtils x509ExtensionUtils = new JcaX509ExtensionUtils();\n// Subject Key Identifier\ncertGen.addExtension(Extension.subjectKeyIdentifier, false,\n@@ -167,11 +156,9 @@ public class CertificateUtils {\n*/\npublic static ContentSigner createSigner(PrivateKey privateKey) {\ntry {\n- AlgorithmIdentifier sigAlgId = new DefaultSignatureAlgorithmIdentifierFinder().find(\"SHA256WithRSAEncryption\");\n- AlgorithmIdentifier digAlgId = new DefaultDigestAlgorithmIdentifierFinder().find(sigAlgId);\n-\n- return new BcRSAContentSignerBuilder(sigAlgId, digAlgId)\n- .build(PrivateKeyFactory.createKey(privateKey.getEncoded()));\n+ JcaContentSignerBuilder signerBuilder = new JcaContentSignerBuilder(\"SHA256WithRSAEncryption\")\n+ .setProvider(BouncyIntegration.PROVIDER);\n+ return signerBuilder.build(privateKey);\n} catch (Exception e) {\nthrow new RuntimeException(\"Could not create content signer.\", e);\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/userSession/MapUserSessionProvider.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/userSession/MapUserSessionProvider.java", "diff": "@@ -68,6 +68,10 @@ public class MapUserSessionProvider implements UserSessionProvider {\n* Storage for transient user sessions which lifespan is limited to one request.\n*/\nprivate final Map<String, MapUserSessionEntity> transientUserSessions = new HashMap<>();\n+ /**\n+ * Storage for client sessions where parent is transient user session. Lifespan is limited to one request.\n+ */\n+ private final Map<String, MapAuthenticatedClientSessionEntity> transientClientSessions = new HashMap<>();\npublic MapUserSessionProvider(KeycloakSession session, MapStorage<MapUserSessionEntity, UserSessionModel> userSessionStore,\nMapStorage<MapAuthenticatedClientSessionEntity, AuthenticatedClientSessionModel> clientSessionStore) {\n@@ -82,12 +86,14 @@ public class MapUserSessionProvider implements UserSessionProvider {\nprivate Function<MapUserSessionEntity, UserSessionModel> userEntityToAdapterFunc(RealmModel realm) {\n// Clone entity before returning back, to avoid giving away a reference to the live object to the caller\nreturn (origEntity) -> {\n+ if (origEntity == null) return null;\nlong expiration = origEntity.getExpiration() != null ? origEntity.getExpiration() : 0L;\nif (expiration <= Time.currentTimeMillis()) {\n- if (Objects.equals(origEntity.getPersistenceState(), TRANSIENT)) {\n+ if (TRANSIENT == origEntity.getPersistenceState()) {\ntransientUserSessions.remove(origEntity.getId());\n- }\n+ } else {\nuserSessionTx.delete(origEntity.getId());\n+ }\nreturn null;\n} else {\nreturn new MapUserSessionAdapter(session, realm, origEntity) {\n@@ -112,10 +118,14 @@ public class MapUserSessionProvider implements UserSessionProvider {\nUserSessionModel userSession) {\n// Clone entity before returning back, to avoid giving away a reference to the live object to the caller\nreturn origEntity -> {\n+ if (origEntity == null) return null;\nlong expiration = origEntity.getExpiration() != null ? origEntity.getExpiration() : 0L;\nif (expiration <= Time.currentTimeMillis()) {\nuserSession.removeAuthenticatedClientSessions(Arrays.asList(origEntity.getClientId()));\n+ // if a client session is found among transient ones we can skip call to store\n+ if (transientClientSessions.remove(origEntity.getId()) == null) {\nclientSessionTx.delete(origEntity.getId());\n+ }\nreturn null;\n} else {\nreturn new MapAuthenticatedClientSessionAdapter(session, realm, client, userSession, origEntity) {\n@@ -123,8 +133,11 @@ public class MapUserSessionProvider implements UserSessionProvider {\npublic void detachFromUserSession() {\nthis.userSession = null;\n+ // if a client session is found among transient ones we can skip call to store\n+ if (transientClientSessions.remove(entity.getId()) == null) {\nclientSessionTx.delete(entity.getId());\n}\n+ }\n@Override\npublic void setTimestamp(int timestamp) {\n@@ -144,20 +157,27 @@ public class MapUserSessionProvider implements UserSessionProvider {\n@Override\npublic AuthenticatedClientSessionModel createClientSession(RealmModel realm, ClientModel client, UserSessionModel userSession) {\n+ LOG.tracef(\"createClientSession(%s, %s, %s)%s\", realm, client, userSession, getShortStackTrace());\n+\n+ MapUserSessionEntity userSessionEntity = getUserSessionById(userSession.getId());\n+\n+ if (userSessionEntity == null) {\n+ throw new IllegalStateException(\"User session entity does not exist: \" + userSession.getId());\n+ }\n+\nMapAuthenticatedClientSessionEntity entity = createAuthenticatedClientSessionEntityInstance(null, userSession.getId(),\nrealm.getId(), client.getId(), false);\nString started = entity.getTimestamp() != null ? String.valueOf(TimeAdapter.fromMilliSecondsToSeconds(entity.getTimestamp())) : String.valueOf(0);\nentity.setNote(AuthenticatedClientSessionModel.STARTED_AT_NOTE, started);\nsetClientSessionExpiration(entity, realm, client);\n- LOG.tracef(\"createClientSession(%s, %s, %s)%s\", realm, client, userSession, getShortStackTrace());\n-\n+ if (TRANSIENT == userSessionEntity.getPersistenceState()) {\n+ if (entity.getId() == null) {\n+ entity.setId(UUID.randomUUID().toString());\n+ }\n+ transientClientSessions.put(entity.getId(), entity);\n+ } else {\nentity = clientSessionTx.create(entity);\n-\n- MapUserSessionEntity userSessionEntity = getUserSessionById(userSession.getId());\n-\n- if (userSessionEntity == null) {\n- throw new IllegalStateException(\"User session entity does not exist: \" + userSession.getId());\n}\nuserSessionEntity.setAuthenticatedClientSession(client.getId(), entity.getId());\n@@ -177,6 +197,12 @@ public class MapUserSessionProvider implements UserSessionProvider {\nreturn null;\n}\n+ MapAuthenticatedClientSessionEntity entity = transientClientSessions.get(clientSessionId);\n+\n+ if (entity != null) {\n+ return clientEntityToAdapterFunc(client.getRealm(), client, userSession).apply(entity);\n+ }\n+\nDefaultModelCriteria<AuthenticatedClientSessionModel> mcb = criteria();\nmcb = mcb.compare(AuthenticatedClientSessionModel.SearchableFields.ID, Operator.EQ, clientSessionId)\n.compare(AuthenticatedClientSessionModel.SearchableFields.USER_SESSION_ID, Operator.EQ, userSession.getId())\n@@ -204,20 +230,18 @@ public class MapUserSessionProvider implements UserSessionProvider {\nString brokerUserId, UserSessionModel.SessionPersistenceState persistenceState) {\nLOG.tracef(\"createUserSession(%s, %s, %s, %s)%s\", id, realm, loginUsername, persistenceState, getShortStackTrace());\n- MapUserSessionEntity entity;\n- if (Objects.equals(persistenceState, TRANSIENT)) {\n+ MapUserSessionEntity entity = createUserSessionEntityInstance(id, realm.getId(), user.getId(), loginUsername, ipAddress, authMethod,\n+ rememberMe, brokerSessionId, brokerUserId, false);\n+\n+ if (TRANSIENT == persistenceState) {\nif (id == null) {\n- id = UUID.randomUUID().toString();\n+ entity.setId(UUID.randomUUID().toString());\n}\n- entity = createUserSessionEntityInstance(id, realm.getId(), user.getId(), loginUsername, ipAddress, authMethod,\n- rememberMe, brokerSessionId, brokerUserId, false);\ntransientUserSessions.put(entity.getId(), entity);\n} else {\nif (id != null && userSessionTx.read(id) != null) {\nthrow new ModelDuplicateException(\"User session exists: \" + id);\n}\n- entity = createUserSessionEntityInstance(id, realm.getId(), user.getId(), loginUsername, ipAddress, authMethod,\n- rememberMe, brokerSessionId, brokerUserId, false);\nentity = userSessionTx.create(entity);\n}\n" }, { "change_type": "MODIFY", "old_path": "testsuite/model/src/test/java/org/keycloak/testsuite/model/session/UserSessionProviderModelTest.java", "new_path": "testsuite/model/src/test/java/org/keycloak/testsuite/model/session/UserSessionProviderModelTest.java", "diff": "@@ -43,6 +43,7 @@ import java.util.List;\nimport java.util.concurrent.atomic.AtomicReference;\nimport java.util.stream.Collectors;\n+import static org.hamcrest.CoreMatchers.notNullValue;\nimport static org.hamcrest.CoreMatchers.nullValue;\nimport static org.hamcrest.MatcherAssert.assertThat;\nimport static org.keycloak.testsuite.model.session.UserSessionPersisterProviderTest.createClients;\n@@ -221,4 +222,31 @@ public class UserSessionProviderModelTest extends KeycloakModelTest {\nassertThat(withRealm(realmId, (session, realm) -> session.sessions().getClientSession(origSessions[0], realm.getClientByClientId(\"test-app\"), testAppClientSessionId, false)), nullValue());\n}\n+\n+ @Test\n+ public void testClientSessionIsNotPersistedForTransientUserSession() {\n+ Object[] transientUserSessionWithClientSessionId = inComittedTransaction(session -> {\n+ RealmModel realm = session.realms().getRealm(realmId);\n+ UserSessionModel userSession = session.sessions().createUserSession(null, realm, session.users().getUserByUsername(realm, \"user1\"), \"user1\", \"127.0.0.1\", \"form\", false, null, null, UserSessionModel.SessionPersistenceState.TRANSIENT);\n+\n+ ClientModel testApp = realm.getClientByClientId(\"test-app\");\n+ AuthenticatedClientSessionModel clientSession = session.sessions().createClientSession(realm, testApp, userSession);\n+\n+ // assert the client sessions are present\n+ assertThat(session.sessions().getClientSession(userSession, testApp, clientSession.getId(), false), notNullValue());\n+ Object[] result = new Object[2];\n+ result[0] = userSession;\n+ result[1] = clientSession.getId();\n+ return result;\n+ });\n+\n+ inComittedTransaction(session -> {\n+ RealmModel realm = session.realms().getRealm(realmId);\n+ ClientModel testApp = realm.getClientByClientId(\"test-app\");\n+ UserSessionModel userSession = (UserSessionModel) transientUserSessionWithClientSessionId[0];\n+ String clientSessionId = (String) transientUserSessionWithClientSessionId[1];\n+ // in new transaction transient session should not be present\n+ assertThat(session.sessions().getClientSession(userSession, testApp, clientSessionId, false), nullValue());\n+ });\n+ }\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/KeycloakQuarkusServerDeployableContainer.java", "new_path": "testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/KeycloakQuarkusServerDeployableContainer.java", "diff": "@@ -27,6 +27,7 @@ import java.util.concurrent.TimeUnit;\nimport java.util.concurrent.atomic.AtomicBoolean;\nimport org.apache.commons.io.FileUtils;\n+import org.apache.commons.lang3.SystemUtils;\nimport org.jboss.arquillian.container.spi.client.container.DeployableContainer;\nimport org.jboss.arquillian.container.spi.client.container.DeploymentException;\nimport org.jboss.arquillian.container.spi.client.container.LifecycleException;\n@@ -149,8 +150,7 @@ public class KeycloakQuarkusServerDeployableContainer implements DeployableConta\nprivate String[] getProcessCommands() {\nList<String> commands = new ArrayList<>();\n-\n- commands.add(\"./kc.sh\");\n+ commands.add(getCommand());\ncommands.add(\"-v\");\ncommands.add(\"start\");\ncommands.add(\"--http-enabled=true\");\n@@ -297,6 +297,13 @@ public class KeycloakQuarkusServerDeployableContainer implements DeployableConta\nstart();\n}\n+ private static String getCommand() {\n+ if (SystemUtils.IS_OS_WINDOWS) {\n+ return \"kc.bat\";\n+ }\n+ return \"./kc.sh\";\n+ }\n+\npublic List<String> getAdditionalBuildArgs() {\nreturn additionalBuildArgs;\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/UserSessionProviderTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/UserSessionProviderTest.java", "diff": "@@ -142,6 +142,7 @@ public class UserSessionProviderTest extends AbstractTestRealmKeycloakTest {\nUserSessionModel[] sessions = createSessions(session);\nTime.setOffset(100);\n+ try {\nUserSessionModel userSession = session.sessions().getUserSession(realm, sessions[0].getId());\nassertSession(userSession, session.users().getUserByUsername(realm, \"user1\"), \"127.0.0.1\", started, started, \"test-app\", \"third-party\");\n@@ -150,9 +151,10 @@ public class UserSessionProviderTest extends AbstractTestRealmKeycloakTest {\nuserSession = session.sessions().getUserSession(realm, sessions[0].getId());\nassertSession(userSession, session.users().getUserByUsername(realm, \"user2\"), \"127.0.0.6\", started + 100, started + 100);\n-\n+ } finally {\nTime.setOffset(0);\n}\n+ }\n@Test\n@ModelTest\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientAuthSignedJWTTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientAuthSignedJWTTest.java", "diff": "@@ -1077,8 +1077,12 @@ public class ClientAuthSignedJWTTest extends AbstractKeycloakTest {\n}\nTime.setOffset(tokenTimeOffset);\n- String jwt = jwtProvider.createSignedRequestToken(app1.getClientId(), getRealmInfoUrl());\n+ String jwt;\n+ try {\n+ jwt = jwtProvider.createSignedRequestToken(app1.getClientId(), getRealmInfoUrl());\n+ } finally {\nTime.setOffset(0);\n+ }\nreturn doClientCredentialsGrantRequest(jwt);\n}\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/session/LastSessionRefreshUnitTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/session/LastSessionRefreshUnitTest.java", "diff": "@@ -118,6 +118,7 @@ public class LastSessionRefreshUnitTest extends AbstractKeycloakTest {\n@Override\npublic void run(KeycloakSession session) {\n+ try {\n// Long timer interval. No message due the timer wasn't executed\nCrossDCLastSessionRefreshStore customStore1 = createStoreInstance(session, 100000, 10);\nTime.setOffset(100);\n@@ -146,10 +147,10 @@ public class LastSessionRefreshUnitTest extends AbstractKeycloakTest {\nthrow new RuntimeException();\n}\nAssert.assertEquals(1, counter.get());\n-\n-\n+ } finally {\nTime.setOffset(0);\n}\n+ }\n}\n" }, { "change_type": "MODIFY", "old_path": "testsuite/model/src/test/java/org/keycloak/testsuite/model/KeycloakModelTest.java", "new_path": "testsuite/model/src/test/java/org/keycloak/testsuite/model/KeycloakModelTest.java", "diff": "@@ -24,6 +24,7 @@ import org.keycloak.authorization.AuthorizationSpi;\nimport org.keycloak.authorization.DefaultAuthorizationProviderFactory;\nimport org.keycloak.authorization.store.StoreFactorySpi;\nimport org.keycloak.cluster.ClusterSpi;\n+import org.keycloak.common.util.Time;\nimport org.keycloak.component.ComponentFactoryProviderFactory;\nimport org.keycloak.component.ComponentFactorySpi;\nimport org.keycloak.events.EventStoreSpi;\n@@ -557,13 +558,15 @@ public abstract class KeycloakModelTest {\n}\n@Before\n- public void createEnvironment() {\n+ public final void createEnvironment() {\n+ Time.setOffset(0);\nUSE_DEFAULT_FACTORY = isUseSameKeycloakSessionFactoryForAllThreads();\nKeycloakModelUtils.runJobInTransaction(getFactory(), this::createEnvironment);\n}\n@After\n- public void cleanEnvironment() {\n+ public final void cleanEnvironment() {\n+ Time.setOffset(0);\nif (getFactory() == null) {\nreinitializeKeycloakSessionFactory();\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/authorization/HotRodResourceServerEntity.java", "new_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/authorization/HotRodResourceServerEntity.java", "diff": "@@ -29,6 +29,7 @@ import org.keycloak.models.map.storage.hotRod.common.UpdatableHotRodEntityDelega\nimplementInterface = \"org.keycloak.models.map.authorization.entity.MapResourceServerEntity\",\ninherits = \"org.keycloak.models.map.storage.hotRod.authorization.HotRodResourceServerEntity.AbstractHotRodResourceServerEntity\"\n)\n+@ProtoDoc(\"@Indexed\")\npublic class HotRodResourceServerEntity extends AbstractHotRodEntity {\n@ProtoDoc(\"@Field(index = Index.YES, store = Store.YES)\")\n" }, { "change_type": "MODIFY", "old_path": "model/map-hot-rod/src/main/resources/config/cacheConfig.xml", "new_path": "model/map-hot-rod/src/main/resources/config/cacheConfig.xml", "diff": "<encoding media-type=\"application/x-protostream\"/>\n<indexing>\n<indexed-entities>\n+ <indexed-entity>kc.HotRodResourceServerEntity</indexed-entity>\n<indexed-entity>kc.HotRodResourceEntity</indexed-entity>\n<indexed-entity>kc.HotRodScopeEntity</indexed-entity>\n<indexed-entity>kc.HotRodPolicyEntity</indexed-entity>\n" }, { "change_type": "MODIFY", "old_path": "model/map-hot-rod/src/main/resources/config/infinispan.xml", "new_path": "model/map-hot-rod/src/main/resources/config/infinispan.xml", "diff": "<encoding media-type=\"application/x-protostream\"/>\n<indexing>\n<indexed-entities>\n+ <indexed-entity>kc.HotRodResourceServerEntity</indexed-entity>\n<indexed-entity>kc.HotRodResourceEntity</indexed-entity>\n<indexed-entity>kc.HotRodScopeEntity</indexed-entity>\n<indexed-entity>kc.HotRodPolicyEntity</indexed-entity>\n" }, { "change_type": "MODIFY", "old_path": "testsuite/model/src/main/resources/hotrod/infinispan.xml", "new_path": "testsuite/model/src/main/resources/hotrod/infinispan.xml", "diff": "<encoding media-type=\"application/x-protostream\"/>\n<indexing>\n<indexed-entities>\n+ <indexed-entity>kc.HotRodResourceServerEntity</indexed-entity>\n<indexed-entity>kc.HotRodResourceEntity</indexed-entity>\n<indexed-entity>kc.HotRodScopeEntity</indexed-entity>\n<indexed-entity>kc.HotRodPolicyEntity</indexed-entity>\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/realm/HotRodRealmEntity.java", "new_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/realm/HotRodRealmEntity.java", "diff": "@@ -19,7 +19,6 @@ package org.keycloak.models.map.storage.hotRod.realm;\nimport org.infinispan.protostream.annotations.ProtoDoc;\nimport org.infinispan.protostream.annotations.ProtoField;\n-import org.keycloak.common.util.Time;\nimport org.keycloak.models.map.annotations.GenerateHotRodEntityImplementation;\nimport org.keycloak.models.map.common.UpdatableEntity;\nimport org.keycloak.models.map.realm.MapRealmEntity;\n@@ -64,6 +63,8 @@ import java.util.Optional;\nimport java.util.Set;\nimport java.util.stream.Collectors;\n+import static org.keycloak.models.map.common.ExpirationUtils.isExpired;\n+\n@GenerateHotRodEntityImplementation(\nimplementInterface = \"org.keycloak.models.map.realm.MapRealmEntity\",\ninherits = \"org.keycloak.models.map.storage.hotRod.realm.HotRodRealmEntity.AbstractHotRodRealmEntityDelegate\"\n@@ -424,8 +425,7 @@ public class HotRodRealmEntity extends AbstractHotRodEntity {\n}\nprivate boolean checkIfExpired(MapClientInitialAccessEntity cia) {\n- return cia.getRemainingCount() < 1 ||\n- (cia.getExpiration() != null && cia.getExpiration() < Time.currentTimeMillis());\n+ return cia.getRemainingCount() < 1 || isExpired(cia, true);\n}\n}\n@Override\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/authSession/MapRootAuthenticationSessionProvider.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/authSession/MapRootAuthenticationSessionProvider.java", "diff": "@@ -28,7 +28,6 @@ import org.keycloak.models.map.storage.MapKeycloakTransaction;\nimport org.keycloak.models.map.storage.MapStorage;\nimport org.keycloak.models.map.storage.ModelCriteriaBuilder.Operator;\nimport org.keycloak.models.map.storage.criteria.DefaultModelCriteria;\n-import org.keycloak.models.utils.SessionExpiration;\nimport org.keycloak.sessions.AuthenticationSessionCompoundId;\nimport org.keycloak.sessions.AuthenticationSessionProvider;\nimport org.keycloak.sessions.RootAuthenticationSessionModel;\n@@ -41,6 +40,7 @@ import java.util.function.Function;\nimport java.util.function.Predicate;\nimport static org.keycloak.common.util.StackUtil.getShortStackTrace;\n+import static org.keycloak.models.map.common.ExpirationUtils.isExpired;\nimport static org.keycloak.models.map.storage.QueryParameters.withCriteria;\nimport static org.keycloak.models.map.storage.criteria.DefaultModelCriteria.criteria;\nimport static org.keycloak.models.utils.SessionExpiration.getAuthSessionLifespan;\n@@ -65,13 +65,11 @@ public class MapRootAuthenticationSessionProvider implements AuthenticationSessi\nprivate Function<MapRootAuthenticationSessionEntity, RootAuthenticationSessionModel> entityToAdapterFunc(RealmModel realm) {\nreturn origEntity -> {\n- //return new MapRootAuthenticationSessionAdapter(session, realm, origEntity);\n- Long expiration = origEntity.getExpiration();\n- if (expiration == null || Time.currentTimeMillis() < origEntity.getExpiration()) {\n- return new MapRootAuthenticationSessionAdapter(session, realm, origEntity);\n- } else {\n+ if (isExpired(origEntity, true)) {\ntx.delete(origEntity.getId());\nreturn null;\n+ } else {\n+ return new MapRootAuthenticationSessionAdapter(session, realm, origEntity);\n}\n};\n}\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/common/ExpirableEntity.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/common/ExpirableEntity.java", "diff": "@@ -34,7 +34,8 @@ public interface ExpirableEntity extends AbstractEntity {\n/**\n* Returns a point in the time (timestamp in milliseconds since The Epoch) when this entity expires.\n*\n- * @return a timestamp in milliseconds since The Epoch or {@code null} if this entity never expires.\n+ * @return a timestamp in milliseconds since The Epoch or {@code null} if this entity never expires\n+ * or expiration is not known.\n*/\nLong getExpiration();\n" }, { "change_type": "ADD", "old_path": null, "new_path": "model/map/src/main/java/org/keycloak/models/map/common/ExpirationUtils.java", "diff": "+/*\n+ * Copyright 2022 Red Hat, Inc. and/or its affiliates\n+ * and other contributors as indicated by the @author tags.\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+\n+package org.keycloak.models.map.common;\n+\n+import org.keycloak.common.util.Time;\n+\n+public class ExpirationUtils {\n+\n+ /**\n+ * Checks whether the {@code entity} is expired\n+ *\n+ * @param entity to check\n+ * @param allowInfiniteValues sets how null values are interpreted, if true entity with expiration equal\n+ * to {@code null} is interpreted as never expiring entity, if false entities\n+ * with {@code null} expiration are interpreted as expired entities\n+ * @return true if the {@code entity} is expired (expiration time is in the past or now), false otherwise\n+ */\n+ public static boolean isExpired(ExpirableEntity entity, boolean allowInfiniteValues) {\n+ Long expiration = entity.getExpiration();\n+ if (!allowInfiniteValues && expiration == null) return false;\n+ return expiration != null && expiration <= Time.currentTimeMillis();\n+ }\n+}\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/events/MapEventStoreProvider.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/events/MapEventStoreProvider.java", "diff": "@@ -38,6 +38,7 @@ import java.util.function.Function;\nimport java.util.stream.Stream;\nimport static org.keycloak.common.util.StackUtil.getShortStackTrace;\n+import static org.keycloak.models.map.common.ExpirationUtils.isExpired;\nimport static org.keycloak.models.map.events.EventUtils.modelToEntity;\npublic class MapEventStoreProvider implements EventStoreProvider {\n@@ -79,9 +80,8 @@ public class MapEventStoreProvider implements EventStoreProvider {\n}\nprivate boolean filterExpired(ExpirableEntity event) {\n- Long expiration = event.getExpiration();\n// Check if entity is expired\n- if (expiration != null && expiration <= Time.currentTimeMillis()) {\n+ if (isExpired(event, true)) {\n// Remove entity\nauthEventsTX.delete(event.getId());\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/realm/MapRealmEntity.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/realm/MapRealmEntity.java", "diff": "package org.keycloak.models.map.realm;\n-import org.keycloak.common.util.Time;\nimport org.keycloak.models.map.annotations.GenerateEntityImplementations;\nimport org.keycloak.models.map.annotations.IgnoreForEntityImplementationGenerator;\nimport org.keycloak.models.map.common.AbstractEntity;\n@@ -43,6 +42,8 @@ import java.util.Optional;\nimport java.util.Set;\nimport java.util.stream.Collectors;\n+import static org.keycloak.models.map.common.ExpirationUtils.isExpired;\n+\n@GenerateEntityImplementations(\ninherits = \"org.keycloak.models.map.realm.MapRealmEntity.AbstractRealmEntity\"\n)\n@@ -237,8 +238,7 @@ public interface MapRealmEntity extends UpdatableEntity, AbstractEntity, EntityW\n}\nprivate boolean checkIfExpired(MapClientInitialAccessEntity cia) {\n- return cia.getRemainingCount() < 1 ||\n- (cia.getExpiration() != null && cia.getExpiration() < Time.currentTimeMillis());\n+ return cia.getRemainingCount() < 1 || isExpired(cia, true);\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/singleUseObject/MapSingleUseObjectAdapter.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/singleUseObject/MapSingleUseObjectAdapter.java", "diff": "@@ -46,7 +46,7 @@ public class MapSingleUseObjectAdapter extends AbstractSingleUseObjectModel<MapS\n@Override\npublic int getExpiration() {\nLong expiration = entity.getExpiration();\n- return expiration != null ? TimeAdapter.fromLongWithTimeInSecondsToIntegerWithTimeInSeconds(expiration) : 0;\n+ return expiration != null ? TimeAdapter.fromLongWithTimeInSecondsToIntegerWithTimeInSeconds(TimeAdapter.fromMilliSecondsToSeconds(expiration)) : 0;\n}\n@Override\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/singleUseObject/MapSingleUseObjectProvider.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/singleUseObject/MapSingleUseObjectProvider.java", "diff": "@@ -35,6 +35,7 @@ import java.util.Collections;\nimport java.util.Map;\nimport static org.keycloak.common.util.StackUtil.getShortStackTrace;\n+import static org.keycloak.models.map.common.ExpirationUtils.isExpired;\nimport static org.keycloak.models.map.storage.QueryParameters.withCriteria;\nimport static org.keycloak.models.map.storage.criteria.DefaultModelCriteria.criteria;\n@@ -55,12 +56,11 @@ public class MapSingleUseObjectProvider implements ActionTokenStoreProvider, Sin\n}\nprivate ActionTokenValueModel singleUseEntityToAdapter(MapSingleUseObjectEntity origEntity) {\n- long expiration = origEntity.getExpiration() != null ? origEntity.getExpiration() : 0L;\n- if (Time.currentTime() < expiration) {\n- return new MapSingleUseObjectAdapter(session, origEntity);\n- } else {\n+ if (isExpired(origEntity, false)) {\nactionTokenStoreTx.delete(origEntity.getId());\nreturn null;\n+ } else {\n+ return new MapSingleUseObjectAdapter(session, origEntity);\n}\n}\n@@ -75,7 +75,8 @@ public class MapSingleUseObjectProvider implements ActionTokenStoreProvider, Sin\nDefaultModelCriteria<ActionTokenValueModel> mcb = criteria();\nmcb = mcb.compare(ActionTokenValueModel.SearchableFields.USER_ID, ModelCriteriaBuilder.Operator.EQ, actionTokenKey.getUserId())\n.compare(ActionTokenValueModel.SearchableFields.ACTION_ID, ModelCriteriaBuilder.Operator.EQ, actionTokenKey.getActionId())\n- .compare(ActionTokenValueModel.SearchableFields.ACTION_VERIFICATION_NONCE, ModelCriteriaBuilder.Operator.EQ, actionTokenKey.getActionVerificationNonce().toString());\n+ .compare(ActionTokenValueModel.SearchableFields.ACTION_VERIFICATION_NONCE, ModelCriteriaBuilder.Operator.EQ, actionTokenKey.getActionVerificationNonce().toString())\n+ .compare(ActionTokenValueModel.SearchableFields.EXPIRATION, ModelCriteriaBuilder.Operator.GT, Time.currentTimeMillis());\nActionTokenValueModel existing = actionTokenStoreTx.read(withCriteria(mcb))\n.findFirst().map(this::singleUseEntityToAdapter).orElse(null);\n@@ -85,7 +86,7 @@ public class MapSingleUseObjectProvider implements ActionTokenStoreProvider, Sin\nactionTokenStoreEntity.setUserId(actionTokenKey.getUserId());\nactionTokenStoreEntity.setActionId(actionTokenKey.getActionId());\nactionTokenStoreEntity.setActionVerificationNonce(actionTokenKey.getActionVerificationNonce().toString());\n- actionTokenStoreEntity.setExpiration(TimeAdapter.fromIntegerWithTimeInSecondsToLongWithTimeAsInSeconds(actionTokenKey.getExpiration()));\n+ actionTokenStoreEntity.setExpiration(TimeAdapter.fromSecondsToMilliseconds(actionTokenKey.getExpiration()));\nactionTokenStoreEntity.setNotes(notes);\nLOG.debugf(\"Adding used action token to actionTokens cache: %s\", actionTokenKey.toString());\n@@ -105,7 +106,8 @@ public class MapSingleUseObjectProvider implements ActionTokenStoreProvider, Sin\nDefaultModelCriteria<ActionTokenValueModel> mcb = criteria();\nmcb = mcb.compare(ActionTokenValueModel.SearchableFields.USER_ID, ModelCriteriaBuilder.Operator.EQ, key.getUserId())\n.compare(ActionTokenValueModel.SearchableFields.ACTION_ID, ModelCriteriaBuilder.Operator.EQ, key.getActionId())\n- .compare(ActionTokenValueModel.SearchableFields.ACTION_VERIFICATION_NONCE, ModelCriteriaBuilder.Operator.EQ, key.getActionVerificationNonce().toString());\n+ .compare(ActionTokenValueModel.SearchableFields.ACTION_VERIFICATION_NONCE, ModelCriteriaBuilder.Operator.EQ, key.getActionVerificationNonce().toString())\n+ .compare(ActionTokenValueModel.SearchableFields.EXPIRATION, ModelCriteriaBuilder.Operator.GT, Time.currentTimeMillis());\nreturn actionTokenStoreTx.read(withCriteria(mcb))\n.findFirst().map(this::singleUseEntityToAdapter).orElse(null);\n@@ -122,7 +124,8 @@ public class MapSingleUseObjectProvider implements ActionTokenStoreProvider, Sin\nDefaultModelCriteria<ActionTokenValueModel> mcb = criteria();\nmcb = mcb.compare(ActionTokenValueModel.SearchableFields.USER_ID, ModelCriteriaBuilder.Operator.EQ, key.getUserId())\n.compare(ActionTokenValueModel.SearchableFields.ACTION_ID, ModelCriteriaBuilder.Operator.EQ, key.getActionId())\n- .compare(ActionTokenValueModel.SearchableFields.ACTION_VERIFICATION_NONCE, ModelCriteriaBuilder.Operator.EQ, key.getActionVerificationNonce().toString());\n+ .compare(ActionTokenValueModel.SearchableFields.ACTION_VERIFICATION_NONCE, ModelCriteriaBuilder.Operator.EQ, key.getActionVerificationNonce().toString())\n+ .compare(ActionTokenValueModel.SearchableFields.EXPIRATION, ModelCriteriaBuilder.Operator.GT, Time.currentTimeMillis());\nMapSingleUseObjectEntity mapSingleUseObjectEntity = actionTokenStoreTx.read(withCriteria(mcb)).findFirst().orElse(null);\nif (mapSingleUseObjectEntity != null) {\n@@ -148,7 +151,7 @@ public class MapSingleUseObjectProvider implements ActionTokenStoreProvider, Sin\nsingleUseEntity = new MapSingleUseObjectEntityImpl();\nsingleUseEntity.setId(key);\n- singleUseEntity.setExpiration((long) Time.currentTime() + lifespanSeconds);\n+ singleUseEntity.setExpiration(Time.currentTimeMillis() + TimeAdapter.fromSecondsToMilliseconds(lifespanSeconds));\nsingleUseEntity.setNotes(notes);\nactionTokenStoreTx.create(singleUseEntity);\n@@ -206,7 +209,7 @@ public class MapSingleUseObjectProvider implements ActionTokenStoreProvider, Sin\n} else {\nsingleUseEntity = new MapSingleUseObjectEntityImpl();\nsingleUseEntity.setId(key);\n- singleUseEntity.setExpiration((long) Time.currentTime() + lifespanInSeconds);\n+ singleUseEntity.setExpiration(Time.currentTimeMillis() + TimeAdapter.fromSecondsToMilliseconds(lifespanInSeconds));\nactionTokenStoreTx.create(singleUseEntity);\n@@ -231,11 +234,11 @@ public class MapSingleUseObjectProvider implements ActionTokenStoreProvider, Sin\nprivate MapSingleUseObjectEntity getWithExpiration(String key) {\nMapSingleUseObjectEntity singleUseEntity = actionTokenStoreTx.read(key);\nif (singleUseEntity != null) {\n- long expiration = singleUseEntity.getExpiration() != null ? singleUseEntity.getExpiration() : 0L;\n- if (Time.currentTime() < expiration) {\n+ if (isExpired(singleUseEntity, false)) {\n+ actionTokenStoreTx.delete(key);\n+ } else {\nreturn singleUseEntity;\n}\n- actionTokenStoreTx.delete(key);\n}\nreturn null;\n}\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/storage/chm/MapFieldPredicates.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/storage/chm/MapFieldPredicates.java", "diff": "@@ -235,6 +235,7 @@ public class MapFieldPredicates {\nput(ACTION_TOKEN_PREDICATES, ActionTokenValueModel.SearchableFields.USER_ID, MapSingleUseObjectEntity::getUserId);\nput(ACTION_TOKEN_PREDICATES, ActionTokenValueModel.SearchableFields.ACTION_ID, MapSingleUseObjectEntity::getActionId);\nput(ACTION_TOKEN_PREDICATES, ActionTokenValueModel.SearchableFields.ACTION_VERIFICATION_NONCE, MapSingleUseObjectEntity::getActionVerificationNonce);\n+ put(ACTION_TOKEN_PREDICATES, ActionTokenValueModel.SearchableFields.EXPIRATION, MapSingleUseObjectEntity::getExpiration);\n}\nstatic {\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/storage/chm/SingleUseObjectConcurrentHashMapStorage.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/storage/chm/SingleUseObjectConcurrentHashMapStorage.java", "diff": "@@ -29,6 +29,8 @@ import org.keycloak.models.map.storage.criteria.DefaultModelCriteria;\nimport java.util.stream.Stream;\n+import static org.keycloak.models.map.common.ExpirationUtils.isExpired;\n+\n/**\n* @author <a href=\"mailto:[email protected]\">Martin Kanis</a>\n*/\n@@ -72,7 +74,8 @@ public class SingleUseObjectConcurrentHashMapStorage<K, V extends AbstractEntity\nSingleUseObjectModelCriteriaBuilder mcb = criteria.flashToModelCriteriaBuilder(createSingleUseObjectCriteriaBuilder());\nif (mcb.isValid()) {\nMapSingleUseObjectEntity value = read(mcb.getKey());\n- return value != null ? Stream.of(value) : Stream.empty();\n+ if (value == null || (mcb.checkExpiration() && isExpired(value, false))) return Stream.empty();\n+ return Stream.of(value);\n}\nreturn super.read(queryParameters);\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/storage/chm/SingleUseObjectModelCriteriaBuilder.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/storage/chm/SingleUseObjectModelCriteriaBuilder.java", "diff": "package org.keycloak.models.map.storage.chm;\n+import org.keycloak.models.ActionTokenValueModel;\nimport org.keycloak.models.map.storage.ModelCriteriaBuilder;\nimport org.keycloak.storage.SearchableModelField;\n@@ -31,13 +32,16 @@ public class SingleUseObjectModelCriteriaBuilder implements ModelCriteriaBuilder\nprivate String actionVerificationNonce;\n+ private Boolean checkExpiration;\n+\npublic SingleUseObjectModelCriteriaBuilder() {\n}\n- public SingleUseObjectModelCriteriaBuilder(String userId, String actionId, String actionVerificationNonce) {\n+ public SingleUseObjectModelCriteriaBuilder(String userId, String actionId, String actionVerificationNonce, Boolean checkExpiration) {\nthis.userId = userId;\nthis.actionId = actionId;\nthis.actionVerificationNonce = actionVerificationNonce;\n+ this.checkExpiration = checkExpiration;\n}\n@Override\n@@ -48,8 +52,11 @@ public class SingleUseObjectModelCriteriaBuilder implements ModelCriteriaBuilder\nactionId = value[0].toString();\n} else if (modelField == org.keycloak.models.ActionTokenValueModel.SearchableFields.ACTION_VERIFICATION_NONCE) {\nactionVerificationNonce = value[0].toString();\n+ } else if (modelField == ActionTokenValueModel.SearchableFields.EXPIRATION && op == Operator.GT) {\n+ checkExpiration = true;\n}\n- return new SingleUseObjectModelCriteriaBuilder(userId, actionId, actionVerificationNonce);\n+\n+ return new SingleUseObjectModelCriteriaBuilder(userId, actionId, actionVerificationNonce, checkExpiration);\n}\n@Override\n@@ -57,6 +64,7 @@ public class SingleUseObjectModelCriteriaBuilder implements ModelCriteriaBuilder\nString userId = null;\nString actionId = null;\nString actionVerificationNonce = null;\n+ Boolean checkExpiration = null;\nfor (ModelCriteriaBuilder builder: builders) {\nSingleUseObjectModelCriteriaBuilder suoMcb = (SingleUseObjectModelCriteriaBuilder) builder;\n@@ -69,8 +77,11 @@ public class SingleUseObjectModelCriteriaBuilder implements ModelCriteriaBuilder\nif (suoMcb.actionVerificationNonce != null) {\nactionVerificationNonce = suoMcb.actionVerificationNonce;\n}\n+ if (suoMcb.checkExpiration != null) {\n+ checkExpiration = suoMcb.checkExpiration;\n+ }\n}\n- return new SingleUseObjectModelCriteriaBuilder(userId, actionId, actionVerificationNonce);\n+ return new SingleUseObjectModelCriteriaBuilder(userId, actionId, actionVerificationNonce, checkExpiration);\n}\n@Override\n@@ -87,6 +98,10 @@ public class SingleUseObjectModelCriteriaBuilder implements ModelCriteriaBuilder\nreturn userId != null && actionId != null && actionVerificationNonce != null;\n}\n+ public boolean checkExpiration() {\n+ return checkExpiration != null && checkExpiration;\n+ }\n+\npublic String getKey() {\nreturn userId + \":\" + actionId + \":\" + actionVerificationNonce;\n}\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/userSession/MapUserSessionProvider.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/userSession/MapUserSessionProvider.java", "diff": "@@ -49,6 +49,7 @@ import java.util.stream.Stream;\nimport static org.keycloak.common.util.StackUtil.getShortStackTrace;\nimport static org.keycloak.models.UserSessionModel.CORRESPONDING_SESSION_ID;\nimport static org.keycloak.models.UserSessionModel.SessionPersistenceState.TRANSIENT;\n+import static org.keycloak.models.map.common.ExpirationUtils.isExpired;\nimport static org.keycloak.models.map.storage.QueryParameters.withCriteria;\nimport static org.keycloak.models.map.storage.criteria.DefaultModelCriteria.criteria;\nimport static org.keycloak.models.map.userSession.SessionExpiration.setClientSessionExpiration;\n@@ -87,8 +88,7 @@ public class MapUserSessionProvider implements UserSessionProvider {\n// Clone entity before returning back, to avoid giving away a reference to the live object to the caller\nreturn (origEntity) -> {\nif (origEntity == null) return null;\n- long expiration = origEntity.getExpiration() != null ? origEntity.getExpiration() : 0L;\n- if (expiration <= Time.currentTimeMillis()) {\n+ if (isExpired(origEntity, false)) {\nif (TRANSIENT == origEntity.getPersistenceState()) {\ntransientUserSessions.remove(origEntity.getId());\n} else {\n@@ -119,8 +119,7 @@ public class MapUserSessionProvider implements UserSessionProvider {\n// Clone entity before returning back, to avoid giving away a reference to the live object to the caller\nreturn origEntity -> {\nif (origEntity == null) return null;\n- long expiration = origEntity.getExpiration() != null ? origEntity.getExpiration() : 0L;\n- if (expiration <= Time.currentTimeMillis()) {\n+ if (isExpired(origEntity, false)) {\nuserSession.removeAuthenticatedClientSessions(Arrays.asList(origEntity.getClientId()));\n// if a client session is found among transient ones we can skip call to store\nif (transientClientSessions.remove(origEntity.getId()) == null) {\n" }, { "change_type": "MODIFY", "old_path": "server-spi/src/main/java/org/keycloak/models/ActionTokenValueModel.java", "new_path": "server-spi/src/main/java/org/keycloak/models/ActionTokenValueModel.java", "diff": "@@ -31,6 +31,7 @@ public interface ActionTokenValueModel {\npublic static final SearchableModelField<ActionTokenValueModel> USER_ID = new SearchableModelField<>(\"userId\", String.class);\npublic static final SearchableModelField<ActionTokenValueModel> ACTION_ID = new SearchableModelField<>(\"actionId\", String.class);\npublic static final SearchableModelField<ActionTokenValueModel> ACTION_VERIFICATION_NONCE = new SearchableModelField<>(\"actionVerificationNonce\", String.class);\n+ public static final SearchableModelField<ActionTokenValueModel> EXPIRATION = new SearchableModelField<>(\"expiration\", Long.class);\n}\n/**\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/UserCacheSession.java", "new_path": "model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/UserCacheSession.java", "diff": "@@ -23,6 +23,7 @@ import org.keycloak.credential.CredentialInput;\nimport org.keycloak.models.ClientScopeModel;\nimport org.keycloak.models.CredentialValidationOutput;\nimport org.keycloak.models.IdentityProviderModel;\n+import org.keycloak.models.LegacySessionSupportProvider;\nimport org.keycloak.models.cache.infinispan.events.InvalidationEvent;\nimport org.keycloak.common.constants.ServiceAccountConstants;\nimport org.keycloak.component.ComponentModel;\n@@ -372,7 +373,7 @@ public class UserCacheSession implements UserCache.Streams, OnCreateComponent, O\nprivate void onCache(RealmModel realm, UserAdapter adapter, UserModel delegate) {\n((OnUserCache)getDelegate()).onCache(realm, adapter, delegate);\n- ((OnUserCache)session.userCredentialManager()).onCache(realm, adapter, delegate);\n+ ((OnUserCache) session.getProvider(LegacySessionSupportProvider.class).userCredentialManager()).onCache(realm, adapter, delegate);\n}\n@Override\n" }, { "change_type": "RENAME", "old_path": "services/src/main/java/org/keycloak/credential/UserCredentialStoreManager.java", "new_path": "model/legacy-services/src/main/java/org/keycloak/credential/UserCredentialStoreManager.java", "diff": "*/\npackage org.keycloak.credential;\n+import org.jboss.logging.Logger;\nimport org.keycloak.common.util.reflections.Types;\nimport org.keycloak.models.CredentialValidationOutput;\nimport org.keycloak.models.KeycloakSession;\n@@ -33,8 +34,10 @@ import java.util.stream.Stream;\n* @author <a href=\"mailto:[email protected]\">Bill Burke</a>\n* @version $Revision: 1 $\n*/\n-public class UserCredentialStoreManager\n- implements UserCredentialManager.Streams, OnUserCache {\n+@Deprecated\n+public class UserCredentialStoreManager implements UserCredentialManager.Streams, OnUserCache {\n+\n+ private final static Logger log = Logger.getLogger(UserCredentialStoreManager.class);\nprivate final KeycloakSession session;\n@@ -45,90 +48,91 @@ public class UserCredentialStoreManager\n@Override\n@Deprecated // Keep this up to and including Keycloak 19, the use methods on user.getUserCredentialManager() instead\npublic void updateCredential(RealmModel realm, UserModel user, CredentialModel cred) {\n- // TODO: no longer used in non-legacy code, can be removed\n+ warnAboutUsage();\nuser.getUserCredentialManager().updateStoredCredential(cred);\n}\n@Override\n@Deprecated // Keep this up to and including Keycloak 19, the use methods on user.getUserCredentialManager() instead\npublic CredentialModel createCredential(RealmModel realm, UserModel user, CredentialModel cred) {\n- // TODO: no longer used in non-legacy code, can be removed\n+ warnAboutUsage();\nreturn user.getUserCredentialManager().createStoredCredential(cred);\n}\n@Override\n@Deprecated // Keep this up to and including Keycloak 19, the use methods on user.getUserCredentialManager() instead\npublic boolean removeStoredCredential(RealmModel realm, UserModel user, String id) {\n- // TODO: no longer used in non-legacy code, can be removed\n+ warnAboutUsage();\nreturn user.getUserCredentialManager().removeStoredCredentialById(id);\n}\n@Override\n@Deprecated // Keep this up to and including Keycloak 19, the use methods on user.getUserCredentialManager() instead\npublic CredentialModel getStoredCredentialById(RealmModel realm, UserModel user, String id) {\n- // TODO: no longer used in non-legacy code, can be removed\n+ warnAboutUsage();\nreturn user.getUserCredentialManager().getStoredCredentialById(id);\n}\n@Override\n@Deprecated // Keep this up to and including Keycloak 19, the use methods on user.getUserCredentialManager() instead\npublic Stream<CredentialModel> getStoredCredentialsStream(RealmModel realm, UserModel user) {\n- // TODO: no longer used in non-legacy code, can be removed\n+ warnAboutUsage();\nreturn user.getUserCredentialManager().getStoredCredentialsStream();\n}\n@Override\n@Deprecated // Keep this up to and including Keycloak 19, the use methods on user.getUserCredentialManager() instead\npublic Stream<CredentialModel> getStoredCredentialsByTypeStream(RealmModel realm, UserModel user, String type) {\n- // TODO: no longer used in non-legacy code, can be removed\n+ warnAboutUsage();\nreturn user.getUserCredentialManager().getStoredCredentialsByTypeStream(type);\n}\n@Override\n@Deprecated // Keep this up to and including Keycloak 19, the use methods on user.getUserCredentialManager() instead\npublic CredentialModel getStoredCredentialByNameAndType(RealmModel realm, UserModel user, String name, String type) {\n- // TODO: no longer used in non-legacy code, can be removed\n+ warnAboutUsage();\nreturn user.getUserCredentialManager().getStoredCredentialByNameAndType(name, type);\n}\n@Override\n@Deprecated // Keep this up to and including Keycloak 19, the use methods on user.getUserCredentialManager() instead\npublic boolean moveCredentialTo(RealmModel realm, UserModel user, String id, String newPreviousCredentialId){\n- // TODO: no longer used, can be removed\n+ warnAboutUsage();\nreturn user.getUserCredentialManager().moveStoredCredentialTo(id, newPreviousCredentialId);\n}\n@Override\n@Deprecated // Keep this up to and including Keycloak 19, the use methods on user.getUserCredentialManager() instead\npublic boolean isValid(RealmModel realm, UserModel user, CredentialInput... inputs) {\n- // TODO: no longer used, can be removed\n+ warnAboutUsage();\nreturn isValid(realm, user, Arrays.asList(inputs));\n}\n@Override\n@Deprecated // Keep this up to and including Keycloak 19, the use methods on user.getUserCredentialManager() instead\npublic CredentialModel createCredentialThroughProvider(RealmModel realm, UserModel user, CredentialModel model){\n- // TODO: no longer used, can be removed\n+ warnAboutUsage();\nreturn user.getUserCredentialManager().createCredentialThroughProvider(model);\n}\n@Override\n@Deprecated // Keep this up to and including Keycloak 19, the use methods on user.getUserCredentialManager() instead\npublic void updateCredentialLabel(RealmModel realm, UserModel user, String credentialId, String userLabel){\n- // TODO: no longer used, can be removed\n+ warnAboutUsage();\nuser.getUserCredentialManager().updateCredentialLabel(credentialId, userLabel);\n}\n@Override\n@Deprecated // Keep this up to and including Keycloak 19, the use methods on user.getUserCredentialManager() instead\npublic boolean isValid(RealmModel realm, UserModel user, List<CredentialInput> inputs) {\n- // TODO: no longer used, can be removed\n+ warnAboutUsage();\nreturn user.getUserCredentialManager().isValid(inputs);\n}\n@Deprecated // Keep this up to and including Keycloak 19, then inline\npublic static <T> Stream<T> getCredentialProviders(KeycloakSession session, Class<T> type) {\n- // TODO: no longer used, can be removed\n+ // called via #onCache()\n+ // warnAboutUsage();\nreturn session.getKeycloakSessionFactory().getProviderFactoriesStream(CredentialProvider.class)\n.filter(f -> Types.supports(type, f, CredentialProviderFactory.class))\n.map(f -> (T) session.getProvider(CredentialProvider.class, f.getId()));\n@@ -137,56 +141,57 @@ public class UserCredentialStoreManager\n@Override\n@Deprecated // Keep this up to and including Keycloak 19, the use methods on user.getUserCredentialManager() instead\npublic boolean updateCredential(RealmModel realm, UserModel user, CredentialInput input) {\n- // TODO: no longer used, can be removed\n+ warnAboutUsage();\nreturn user.getUserCredentialManager().updateCredential(input);\n}\n@Override\n@Deprecated // Keep this up to and including Keycloak 19, the use methods on user.getUserCredentialManager() instead\npublic void disableCredentialType(RealmModel realm, UserModel user, String credentialType) {\n- // TODO: no longer used, can be removed\n+ warnAboutUsage();\nuser.getUserCredentialManager().disableCredentialType(credentialType);\n}\n@Override\n@Deprecated // Keep this up to and including Keycloak 19, the use methods on user.getUserCredentialManager() instead\npublic Stream<String> getDisableableCredentialTypesStream(RealmModel realm, UserModel user) {\n- // TODO: no longer used, can be removed\n+ warnAboutUsage();\nreturn user.getUserCredentialManager().getDisableableCredentialTypesStream();\n}\n@Override\n@Deprecated // Keep this up to and including Keycloak 19, the use methods on user.getUserCredentialManager() instead\npublic boolean isConfiguredFor(RealmModel realm, UserModel user, String type) {\n- // TODO: no longer used, can be removed\n+ warnAboutUsage();\nreturn user.getUserCredentialManager().isConfiguredFor(type);\n}\n@Override\n@Deprecated // Keep this up to and including Keycloak 19, the use methods on user.getUserCredentialManager() instead\npublic boolean isConfiguredLocally(RealmModel realm, UserModel user, String type) {\n- // TODO: no longer used, can be removed\n+ warnAboutUsage();\nreturn user.getUserCredentialManager().isConfiguredLocally(type);\n}\n@Override\n@Deprecated // Keep this up to and including Keycloak 19, the use methods on user.getUserCredentialManager() instead\npublic CredentialValidationOutput authenticate(KeycloakSession session, RealmModel realm, CredentialInput input) {\n- // TODO: no longer used, can be removed\n+ warnAboutUsage();\nreturn session.users().getUserByCredential(realm, input);\n}\n@Override\n@Deprecated // Keep this up to and including Keycloak 19, then remove it together with the OnUserCache class\npublic void onCache(RealmModel realm, CachedUserModel user, UserModel delegate) {\n- // TODO: only called from legacy code (infinispan), can be removed\n+ // called by UserCacheSession#onCache, therefore don't warn here\n+ // warnAboutUsage();\ngetCredentialProviders(session, OnUserCache.class).forEach(validator -> validator.onCache(realm, user, delegate));\n}\n@Override\n@Deprecated // Keep this up to and including Keycloak 19, the use methods on user.getUserCredentialManager() instead\npublic Stream<String> getConfiguredUserStorageCredentialTypesStream(RealmModel realm, UserModel user) {\n- // TODO: no longer used, can be removed\n+ warnAboutUsage();\nreturn user.getUserCredentialManager().getConfiguredUserStorageCredentialTypesStream();\n}\n@@ -195,4 +200,11 @@ public class UserCredentialStoreManager\n}\n+ private static void warnAboutUsage() {\n+ if (log.isEnabled(Logger.Level.WARN)) {\n+ // check if warning is enabled first before constructing the exception that is expensive to construct\n+ log.warn(\"Calls to session.userCredentialManager() now deprecated. Use user.getUserCredentialManager() instead!\", new RuntimeException());\n+ }\n+ }\n+\n}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "model/legacy-services/src/main/java/org/keycloak/services/legacysessionsupport/LegacySessionSupportProviderFactoryImpl.java", "diff": "+package org.keycloak.services.legacysessionsupport;\n+\n+import org.keycloak.Config;\n+import org.keycloak.models.KeycloakSession;\n+import org.keycloak.models.KeycloakSessionFactory;\n+import org.keycloak.models.LegacySessionSupportProvider;\n+\n+/**\n+ * @author Alexander Schwartz\n+ */\n+public class LegacySessionSupportProviderFactoryImpl implements LegacySessionSupportProviderFactory<LegacySessionSupportProvider> {\n+\n+ private static final String PROVIDER_ID = \"default\";\n+\n+ @Override\n+ public LegacySessionSupportProvider create(KeycloakSession session) {\n+ return new LegacySessionSupportProviderImpl(session);\n+ }\n+\n+ @Override\n+ public void init(Config.Scope config) {\n+ }\n+\n+ @Override\n+ public void postInit(KeycloakSessionFactory factory) {\n+ }\n+\n+ @Override\n+ public void close() {\n+ }\n+\n+ @Override\n+ public String getId() {\n+ return PROVIDER_ID;\n+ }\n+\n+}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "model/legacy-services/src/main/java/org/keycloak/services/legacysessionsupport/LegacySessionSupportProviderImpl.java", "diff": "+package org.keycloak.services.legacysessionsupport;\n+\n+import org.keycloak.credential.UserCredentialStoreManager;\n+import org.keycloak.models.KeycloakSession;\n+import org.keycloak.models.UserCredentialManager;\n+import org.keycloak.models.LegacySessionSupportProvider;\n+\n+/**\n+ * @author Alexander Schwartz\n+ */\n+public class LegacySessionSupportProviderImpl implements LegacySessionSupportProvider {\n+\n+ private final KeycloakSession session;\n+\n+ public LegacySessionSupportProviderImpl(KeycloakSession session) {\n+ this.session = session;\n+ }\n+\n+ @Override\n+ public void close() {\n+\n+ }\n+\n+ @Override\n+ @Deprecated\n+ public UserCredentialManager userCredentialManager() {\n+ // UserCacheSession calls session.userCredentialManager().onCache(), therefore can't trigger a warning here at the moment.\n+ return new UserCredentialStoreManager(session);\n+ }\n+\n+}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "model/legacy-services/src/main/resources/META-INF/services/org.keycloak.services.legacysessionsupport.LegacySessionSupportProviderFactory", "diff": "+#\n+# Copyright 2022 Red Hat, Inc. and/or its affiliates\n+# and other contributors as indicated by the @author tags.\n+#\n+# Licensed under the Apache License, Version 2.0 (the \"License\");\n+# you may not use this file except in compliance with the License.\n+# You may obtain a copy of the License at\n+#\n+# http://www.apache.org/licenses/LICENSE-2.0\n+#\n+# Unless required by applicable law or agreed to in writing, software\n+# distributed under the License is distributed on an \"AS IS\" BASIS,\n+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+# See the License for the specific language governing permissions and\n+# limitations under the License.\n+#\n+\n+org.keycloak.services.legacysessionsupport.LegacySessionSupportProviderFactoryImpl\n\\ No newline at end of file\n" }, { "change_type": "ADD", "old_path": null, "new_path": "server-spi-private/src/main/java/org/keycloak/models/LegacySessionSupportProvider.java", "diff": "+package org.keycloak.models;\n+\n+import org.keycloak.provider.Provider;\n+\n+/**\n+ * Support for elements in Keycloak's session that are deprecated.\n+ * This allows the deprecated implementations to be moved to the legacy module.\n+ *\n+ * @author Alexander Schwartz\n+ */\n+public interface LegacySessionSupportProvider extends Provider {\n+\n+ @Deprecated\n+ UserCredentialManager userCredentialManager();\n+}\n" }, { "change_type": "MODIFY", "old_path": "server-spi/src/main/java/org/keycloak/models/SingleUserCredentialManager.java", "new_path": "server-spi/src/main/java/org/keycloak/models/SingleUserCredentialManager.java", "diff": "@@ -68,7 +68,9 @@ public interface SingleUserCredentialManager {\n@Deprecated\nboolean isConfiguredLocally(String type);\n+ // TODO: not needed for new store? -> no, will be removed without replacement\nStream<String> getConfiguredUserStorageCredentialTypesStream();\n+ // TODO: not needed for new store? -> no, will be removed without replacement\nCredentialModel createCredentialThroughProvider(CredentialModel model);\n}\n" }, { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/services/DefaultKeycloakSession.java", "new_path": "services/src/main/java/org/keycloak/services/DefaultKeycloakSession.java", "diff": "@@ -18,7 +18,6 @@ package org.keycloak.services;\nimport org.keycloak.component.ComponentFactory;\nimport org.keycloak.component.ComponentModel;\n-import org.keycloak.credential.UserCredentialStoreManager;\nimport org.keycloak.jose.jws.DefaultTokenManager;\nimport org.keycloak.keys.DefaultKeyManager;\nimport org.keycloak.models.ClientProvider;\n@@ -45,6 +44,7 @@ import org.keycloak.provider.ProviderFactory;\nimport org.keycloak.provider.InvalidationHandler.InvalidableObjectType;\nimport org.keycloak.provider.InvalidationHandler.ObjectType;\nimport org.keycloak.services.clientpolicy.ClientPolicyManager;\n+import org.keycloak.models.LegacySessionSupportProvider;\nimport org.keycloak.sessions.AuthenticationSessionProvider;\nimport org.keycloak.storage.DatastoreProvider;\nimport org.keycloak.storage.federated.UserFederatedStorageProvider;\n@@ -76,12 +76,13 @@ public class DefaultKeycloakSession implements KeycloakSession {\nprivate final Map<String, Object> attributes = new HashMap<>();\nprivate final Map<InvalidableObjectType, Set<Object>> invalidationMap = new HashMap<>();\nprivate DatastoreProvider datastoreProvider;\n- private UserCredentialStoreManager userCredentialStorageManager;\n+ @Deprecated\n+ private UserCredentialManager userCredentialStorageManager;\nprivate UserSessionProvider sessionProvider;\nprivate UserLoginFailureProvider userLoginFailureProvider;\nprivate AuthenticationSessionProvider authenticationSessionProvider;\nprivate UserFederatedStorageProvider userFederatedStorageProvider;\n- private KeycloakContext context;\n+ private final KeycloakContext context;\nprivate KeyManager keyManager;\nprivate ThemeManager themeManager;\nprivate TokenManager tokenManager;\n@@ -229,8 +230,15 @@ public class DefaultKeycloakSession implements KeycloakSession {\n}\n@Override\n+ @Deprecated\npublic UserCredentialManager userCredentialManager() {\n- if (userCredentialStorageManager == null) userCredentialStorageManager = new UserCredentialStoreManager(this);\n+ if (userCredentialStorageManager == null) {\n+ LegacySessionSupportProvider provider = this.getProvider(LegacySessionSupportProvider.class);\n+ if (provider == null) {\n+ throw new IllegalStateException(\"legacy support for a UserCredentialManager is not enabled\");\n+ }\n+ userCredentialStorageManager = provider.userCredentialManager();\n+ }\nreturn userCredentialStorageManager;\n}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "services/src/main/java/org/keycloak/services/legacysessionsupport/LegacySessionSupportProviderFactory.java", "diff": "+package org.keycloak.services.legacysessionsupport;\n+\n+import org.keycloak.models.LegacySessionSupportProvider;\n+import org.keycloak.provider.ProviderFactory;\n+\n+/**\n+ * @author Alexander Schwartz\n+ */\n+public interface LegacySessionSupportProviderFactory<T extends LegacySessionSupportProvider> extends ProviderFactory<T> {\n+}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "services/src/main/java/org/keycloak/services/legacysessionsupport/LegacySessionSupportSpi.java", "diff": "+package org.keycloak.services.legacysessionsupport;\n+\n+import org.keycloak.models.LegacySessionSupportProvider;\n+import org.keycloak.provider.Provider;\n+import org.keycloak.provider.Spi;\n+\n+/**\n+ * @author Alexander Schwartz\n+ */\n+public class LegacySessionSupportSpi implements Spi {\n+\n+ @Override\n+ public boolean isInternal() {\n+ return true;\n+ }\n+\n+ @Override\n+ public String getName() {\n+ return \"legacy-session-support\";\n+ }\n+\n+ @Override\n+ public Class<? extends Provider> getProviderClass() {\n+ return LegacySessionSupportProvider.class;\n+ }\n+\n+ @Override\n+ public Class<? extends LegacySessionSupportProviderFactory> getProviderFactoryClass() {\n+ return LegacySessionSupportProviderFactory.class;\n+ }\n+\n+}\n" }, { "change_type": "MODIFY", "old_path": "services/src/main/resources/META-INF/services/org.keycloak.provider.Spi", "new_path": "services/src/main/resources/META-INF/services/org.keycloak.provider.Spi", "diff": "@@ -28,4 +28,4 @@ org.keycloak.protocol.oidc.grants.ciba.channel.AuthenticationChannelSpi\norg.keycloak.protocol.oidc.grants.ciba.resolvers.CIBALoginUserResolverSpi\norg.keycloak.protocol.oidc.rar.AuthorizationRequestParserSpi\norg.keycloak.services.resources.admin.ext.AdminRealmResourceSpi\n-org.keycloak.credential.SingleUserCredentialManagerSpi\n+org.keycloak.services.legacysessionsupport.LegacySessionSupportSpi\n" }, { "change_type": "MODIFY", "old_path": "testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/Infinispan.java", "new_path": "testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/Infinispan.java", "diff": "@@ -27,6 +27,8 @@ import org.keycloak.models.sessions.infinispan.InfinispanAuthenticationSessionPr\nimport org.keycloak.models.sessions.infinispan.InfinispanSingleUseObjectProviderFactory;\nimport org.keycloak.models.sessions.infinispan.InfinispanUserLoginFailureProviderFactory;\nimport org.keycloak.models.sessions.infinispan.InfinispanUserSessionProviderFactory;\n+import org.keycloak.services.legacysessionsupport.LegacySessionSupportProviderFactory;\n+import org.keycloak.services.legacysessionsupport.LegacySessionSupportSpi;\nimport org.keycloak.sessions.AuthenticationSessionSpi;\nimport org.keycloak.sessions.StickySessionEncoderProviderFactory;\nimport org.keycloak.sessions.StickySessionEncoderSpi;\n@@ -62,6 +64,8 @@ public class Infinispan extends KeycloakModelParameters {\n.add(ActionTokenStoreSpi.class)\n.add(SingleUseObjectSpi.class)\n+ .add(LegacySessionSupportSpi.class) // necessary as it will call session.userCredentialManager().onCache()\n+\n.build();\nstatic final Set<Class<? extends ProviderFactory>> ALLOWED_FACTORIES = ImmutableSet.<Class<? extends ProviderFactory>>builder()\n@@ -76,6 +80,7 @@ public class Infinispan extends KeycloakModelParameters {\n.add(InfinispanSingleUseObjectProviderFactory.class)\n.add(StickySessionEncoderProviderFactory.class)\n.add(TimerProviderFactory.class)\n+ .add(LegacySessionSupportProviderFactory.class)\n.build();\n@Override\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/legacy-private/src/main/java/org/keycloak/storage/UserStorageManager.java", "new_path": "model/legacy-private/src/main/java/org/keycloak/storage/UserStorageManager.java", "diff": "@@ -30,6 +30,7 @@ import java.util.concurrent.atomic.AtomicInteger;\nimport java.util.stream.Stream;\nimport org.jboss.logging.Logger;\n+import org.keycloak.common.constants.ServiceAccountConstants;\nimport org.keycloak.common.util.reflections.Types;\nimport org.keycloak.component.ComponentFactory;\nimport org.keycloak.component.ComponentModel;\n@@ -267,6 +268,11 @@ public class UserStorageManager extends AbstractStorageManager<UserStorageProvid\n@Override\npublic UserModel addUser(RealmModel realm, String username) {\n+ if (username.startsWith(ServiceAccountConstants.SERVICE_ACCOUNT_USER_PREFIX)) {\n+ // Don't use federation for service account user\n+ return localStorage().addUser(realm, username);\n+ }\n+\nreturn getEnabledStorageProviders(realm, UserRegistrationProvider.class)\n.map(provider -> provider.addUser(realm, username))\n.filter(Objects::nonNull)\n" }, { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/services/managers/ClientManager.java", "new_path": "services/src/main/java/org/keycloak/services/managers/ClientManager.java", "diff": "@@ -159,8 +159,7 @@ public class ClientManager {\nString username = ServiceAccountConstants.SERVICE_ACCOUNT_USER_PREFIX + client.getClientId();\nlogger.debugf(\"Creating service account user '%s'\", username);\n- // Don't use federation for service account user\n- UserModel user = realmManager.getSession().userLocalStorage().addUser(client.getRealm(), username);\n+ UserModel user = realmManager.getSession().users().addUser(client.getRealm(), username);\nuser.setEnabled(true);\nuser.setServiceAccountClientLink(client.getId());\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/legacy-private/src/main/java/org/keycloak/storage/datastore/LegacyExportImportManager.java", "new_path": "model/legacy-private/src/main/java/org/keycloak/storage/datastore/LegacyExportImportManager.java", "diff": "@@ -28,6 +28,8 @@ import org.keycloak.models.RealmModel;\nimport org.keycloak.models.RequiredActionProviderModel;\nimport org.keycloak.models.RoleModel;\nimport org.keycloak.models.ScopeContainerModel;\n+import org.keycloak.models.UserConsentModel;\n+import org.keycloak.models.UserModel;\nimport org.keycloak.models.WebAuthnPolicy;\nimport org.keycloak.models.utils.ComponentUtil;\nimport org.keycloak.models.utils.DefaultAuthenticationFlows;\n@@ -46,6 +48,7 @@ import org.keycloak.representations.idm.ClientTemplateRepresentation;\nimport org.keycloak.representations.idm.ComponentExportRepresentation;\nimport org.keycloak.representations.idm.ComponentRepresentation;\nimport org.keycloak.representations.idm.CredentialRepresentation;\n+import org.keycloak.representations.idm.FederatedIdentityRepresentation;\nimport org.keycloak.representations.idm.GroupRepresentation;\nimport org.keycloak.representations.idm.IdentityProviderMapperRepresentation;\nimport org.keycloak.representations.idm.IdentityProviderRepresentation;\n@@ -55,6 +58,8 @@ import org.keycloak.representations.idm.RealmRepresentation;\nimport org.keycloak.representations.idm.RequiredActionProviderRepresentation;\nimport org.keycloak.representations.idm.RoleRepresentation;\nimport org.keycloak.representations.idm.ScopeMappingRepresentation;\n+import org.keycloak.representations.idm.SocialLinkRepresentation;\n+import org.keycloak.representations.idm.UserConsentRepresentation;\nimport org.keycloak.representations.idm.UserFederationMapperRepresentation;\nimport org.keycloak.representations.idm.UserFederationProviderRepresentation;\nimport org.keycloak.representations.idm.UserRepresentation;\n@@ -64,6 +69,7 @@ import org.keycloak.storage.UserStorageProviderModel;\nimport org.keycloak.userprofile.UserProfileProvider;\nimport org.keycloak.validation.ValidationUtil;\n+import java.util.ArrayList;\nimport java.util.Arrays;\nimport java.util.HashMap;\nimport java.util.HashSet;\n@@ -74,7 +80,10 @@ import java.util.Set;\nimport java.util.function.Function;\nimport java.util.stream.Collectors;\n-import static org.keycloak.models.utils.RepresentationToModel.createUser;\n+import static org.keycloak.models.utils.RepresentationToModel.createCredentials;\n+import static org.keycloak.models.utils.RepresentationToModel.createFederatedIdentities;\n+import static org.keycloak.models.utils.RepresentationToModel.createGroups;\n+import static org.keycloak.models.utils.RepresentationToModel.createRoleMappings;\nimport static org.keycloak.models.utils.RepresentationToModel.importFederatedUser;\nimport static org.keycloak.models.utils.RepresentationToModel.importGroup;\nimport static org.keycloak.models.utils.RepresentationToModel.importRoles;\n@@ -349,7 +358,7 @@ public class LegacyExportImportManager implements ExportImportManager {\nif (rep.getUsers() != null) {\nfor (UserRepresentation userRep : rep.getUsers()) {\n- createUser(session, newRealm, userRep);\n+ createUser(newRealm, userRep);\n}\n}\n@@ -766,6 +775,80 @@ public class LegacyExportImportManager implements ExportImportManager {\n}\n}\n+ @Override\n+ public UserModel createUser(RealmModel newRealm, UserRepresentation userRep) {\n+ convertDeprecatedSocialProviders(userRep);\n+\n+ // Import users just to user storage. Don't federate\n+ UserModel user = session.userLocalStorage().addUser(newRealm, userRep.getId(), userRep.getUsername(), false, false);\n+ user.setEnabled(userRep.isEnabled() != null && userRep.isEnabled());\n+ user.setCreatedTimestamp(userRep.getCreatedTimestamp());\n+ user.setEmail(userRep.getEmail());\n+ if (userRep.isEmailVerified() != null) user.setEmailVerified(userRep.isEmailVerified());\n+ user.setFirstName(userRep.getFirstName());\n+ user.setLastName(userRep.getLastName());\n+ user.setFederationLink(userRep.getFederationLink());\n+ if (userRep.getAttributes() != null) {\n+ for (Map.Entry<String, List<String>> entry : userRep.getAttributes().entrySet()) {\n+ List<String> value = entry.getValue();\n+ if (value != null) {\n+ user.setAttribute(entry.getKey(), new ArrayList<>(value));\n+ }\n+ }\n+ }\n+ if (userRep.getRequiredActions() != null) {\n+ for (String requiredAction : userRep.getRequiredActions()) {\n+ try {\n+ user.addRequiredAction(UserModel.RequiredAction.valueOf(requiredAction.toUpperCase()));\n+ } catch (IllegalArgumentException iae) {\n+ user.addRequiredAction(requiredAction);\n+ }\n+ }\n+ }\n+ createCredentials(userRep, session, newRealm, user, false);\n+ createFederatedIdentities(userRep, session, newRealm, user);\n+ createRoleMappings(userRep, user, newRealm);\n+ if (userRep.getClientConsents() != null) {\n+ for (UserConsentRepresentation consentRep : userRep.getClientConsents()) {\n+ UserConsentModel consentModel = RepresentationToModel.toModel(newRealm, consentRep);\n+ session.users().addConsent(newRealm, user.getId(), consentModel);\n+ }\n+ }\n+\n+ if (userRep.getNotBefore() != null) {\n+ session.users().setNotBeforeForUser(newRealm, user, userRep.getNotBefore());\n+ }\n+\n+ if (userRep.getServiceAccountClientId() != null) {\n+ String clientId = userRep.getServiceAccountClientId();\n+ ClientModel client = newRealm.getClientByClientId(clientId);\n+ if (client == null) {\n+ throw new RuntimeException(\"Unable to find client specified for service account link. Client: \" + clientId);\n+ }\n+ user.setServiceAccountClientLink(client.getId());\n+ }\n+ createGroups(userRep, newRealm, user);\n+ return user;\n+ }\n+\n+ public static void convertDeprecatedSocialProviders(UserRepresentation user) {\n+ if (user.getSocialLinks() != null && !user.getSocialLinks().isEmpty() && user.getFederatedIdentities() == null) {\n+\n+ logger.warnf(\"Using deprecated 'socialLinks' configuration in JSON representation for user '%s'. It will be removed in future versions\", user.getUsername());\n+ List<FederatedIdentityRepresentation> federatedIdentities = new LinkedList<>();\n+ for (SocialLinkRepresentation social : user.getSocialLinks()) {\n+ FederatedIdentityRepresentation federatedIdentity = new FederatedIdentityRepresentation();\n+ federatedIdentity.setIdentityProvider(social.getSocialProvider());\n+ federatedIdentity.setUserId(social.getSocialUserId());\n+ federatedIdentity.setUserName(social.getSocialUsername());\n+ federatedIdentities.add(federatedIdentity);\n+ }\n+ user.setFederatedIdentities(federatedIdentities);\n+ }\n+\n+ user.setSocialLinks(null);\n+ }\n+\nprivate static void convertDeprecatedApplications(KeycloakSession session, RealmRepresentation realm) {\nif (realm.getApplications() != null || realm.getOauthClients() != null) {\nif (realm.getClients() == null) {\n" }, { "change_type": "MODIFY", "old_path": "server-spi-private/src/main/java/org/keycloak/models/utils/RepresentationToModel.java", "new_path": "server-spi-private/src/main/java/org/keycloak/models/utils/RepresentationToModel.java", "diff": "@@ -217,24 +217,6 @@ public class RepresentationToModel {\n}\n- private static void convertDeprecatedSocialProviders(UserRepresentation user) {\n- if (user.getSocialLinks() != null && !user.getSocialLinks().isEmpty() && user.getFederatedIdentities() == null) {\n-\n- logger.warnf(\"Using deprecated 'socialLinks' configuration in JSON representation for user '%s'. It will be removed in future versions\", user.getUsername());\n- List<FederatedIdentityRepresentation> federatedIdentities = new LinkedList<>();\n- for (SocialLinkRepresentation social : user.getSocialLinks()) {\n- FederatedIdentityRepresentation federatedIdentity = new FederatedIdentityRepresentation();\n- federatedIdentity.setIdentityProvider(social.getSocialProvider());\n- federatedIdentity.setUserId(social.getSocialUserId());\n- federatedIdentity.setUserName(social.getSocialUsername());\n- federatedIdentities.add(federatedIdentity);\n- }\n- user.setFederatedIdentities(federatedIdentities);\n- }\n-\n- user.setSocialLinks(null);\n- }\n-\nprivate static void convertDeprecatedCredentialsFormat(UserRepresentation user) {\nif (user.getCredentials() != null) {\nfor (CredentialRepresentation cred : user.getCredentials()) {\n@@ -699,58 +681,7 @@ public class RepresentationToModel {\n// Users\npublic static UserModel createUser(KeycloakSession session, RealmModel newRealm, UserRepresentation userRep) {\n- convertDeprecatedSocialProviders(userRep);\n-\n- // Import users just to user storage. Don't federate\n- UserModel user = session.userLocalStorage().addUser(newRealm, userRep.getId(), userRep.getUsername(), false, false);\n- user.setEnabled(userRep.isEnabled() != null && userRep.isEnabled());\n- user.setCreatedTimestamp(userRep.getCreatedTimestamp());\n- user.setEmail(userRep.getEmail());\n- if (userRep.isEmailVerified() != null) user.setEmailVerified(userRep.isEmailVerified());\n- user.setFirstName(userRep.getFirstName());\n- user.setLastName(userRep.getLastName());\n- user.setFederationLink(userRep.getFederationLink());\n- if (userRep.getAttributes() != null) {\n- for (Map.Entry<String, List<String>> entry : userRep.getAttributes().entrySet()) {\n- List<String> value = entry.getValue();\n- if (value != null) {\n- user.setAttribute(entry.getKey(), new ArrayList<>(value));\n- }\n- }\n- }\n- if (userRep.getRequiredActions() != null) {\n- for (String requiredAction : userRep.getRequiredActions()) {\n- try {\n- user.addRequiredAction(UserModel.RequiredAction.valueOf(requiredAction.toUpperCase()));\n- } catch (IllegalArgumentException iae) {\n- user.addRequiredAction(requiredAction);\n- }\n- }\n- }\n- createCredentials(userRep, session, newRealm, user, false);\n- createFederatedIdentities(userRep, session, newRealm, user);\n- createRoleMappings(userRep, user, newRealm);\n- if (userRep.getClientConsents() != null) {\n- for (UserConsentRepresentation consentRep : userRep.getClientConsents()) {\n- UserConsentModel consentModel = toModel(newRealm, consentRep);\n- session.users().addConsent(newRealm, user.getId(), consentModel);\n- }\n- }\n-\n- if (userRep.getNotBefore() != null) {\n- session.users().setNotBeforeForUser(newRealm, user, userRep.getNotBefore());\n- }\n-\n- if (userRep.getServiceAccountClientId() != null) {\n- String clientId = userRep.getServiceAccountClientId();\n- ClientModel client = newRealm.getClientByClientId(clientId);\n- if (client == null) {\n- throw new RuntimeException(\"Unable to find client specified for service account link. Client: \" + clientId);\n- }\n- user.setServiceAccountClientLink(client.getId());\n- }\n- createGroups(userRep, newRealm, user);\n- return user;\n+ return session.getProvider(DatastoreProvider.class).getExportImportManager().createUser(newRealm, userRep);\n}\npublic static void createGroups(UserRepresentation userRep, RealmModel newRealm, UserModel user) {\n" }, { "change_type": "MODIFY", "old_path": "server-spi-private/src/main/java/org/keycloak/storage/ExportImportManager.java", "new_path": "server-spi-private/src/main/java/org/keycloak/storage/ExportImportManager.java", "diff": "package org.keycloak.storage;\n-import org.keycloak.models.KeycloakSession;\nimport org.keycloak.models.RealmModel;\n+import org.keycloak.models.UserModel;\nimport org.keycloak.representations.idm.RealmRepresentation;\n+import org.keycloak.representations.idm.UserRepresentation;\n/**\n* Manage importing and updating of realms for the legacy store.\n@@ -13,4 +14,6 @@ public interface ExportImportManager {\nvoid importRealm(RealmRepresentation rep, RealmModel newRealm, boolean skipUserDependent);\nvoid updateRealm(RealmRepresentation rep, RealmModel realm);\n+\n+ UserModel createUser(RealmModel realm, UserRepresentation userRep);\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/legacy-private/src/main/java/org/keycloak/storage/datastore/LegacyExportImportManager.java", "new_path": "model/legacy-private/src/main/java/org/keycloak/storage/datastore/LegacyExportImportManager.java", "diff": "@@ -17,6 +17,7 @@ import org.keycloak.models.ClaimMask;\nimport org.keycloak.models.ClientModel;\nimport org.keycloak.models.ClientScopeModel;\nimport org.keycloak.models.Constants;\n+import org.keycloak.models.FederatedIdentityModel;\nimport org.keycloak.models.GroupModel;\nimport org.keycloak.models.KeycloakSession;\nimport org.keycloak.models.LDAPConstants;\n@@ -66,6 +67,7 @@ import org.keycloak.representations.idm.UserRepresentation;\nimport org.keycloak.storage.ExportImportManager;\nimport org.keycloak.storage.UserStorageProvider;\nimport org.keycloak.storage.UserStorageProviderModel;\n+import org.keycloak.storage.federated.UserFederatedStorageProvider;\nimport org.keycloak.userprofile.UserProfileProvider;\nimport org.keycloak.validation.ValidationUtil;\n@@ -84,7 +86,6 @@ import static org.keycloak.models.utils.RepresentationToModel.createCredentials;\nimport static org.keycloak.models.utils.RepresentationToModel.createFederatedIdentities;\nimport static org.keycloak.models.utils.RepresentationToModel.createGroups;\nimport static org.keycloak.models.utils.RepresentationToModel.createRoleMappings;\n-import static org.keycloak.models.utils.RepresentationToModel.importFederatedUser;\nimport static org.keycloak.models.utils.RepresentationToModel.importGroup;\nimport static org.keycloak.models.utils.RepresentationToModel.importRoles;\n@@ -1376,4 +1377,93 @@ public class LegacyExportImportManager implements ExportImportManager {\n}\n}\n+ public static void importFederatedUser(KeycloakSession session, RealmModel newRealm, UserRepresentation userRep) {\n+ UserFederatedStorageProvider federatedStorage = session.userFederatedStorage();\n+ if (userRep.getAttributes() != null) {\n+ for (Map.Entry<String, List<String>> entry : userRep.getAttributes().entrySet()) {\n+ String key = entry.getKey();\n+ List<String> value = entry.getValue();\n+ if (value != null) {\n+ federatedStorage.setAttribute(newRealm, userRep.getId(), key, new LinkedList<>(value));\n+ }\n+ }\n+ }\n+ if (userRep.getRequiredActions() != null) {\n+ for (String action : userRep.getRequiredActions()) {\n+ federatedStorage.addRequiredAction(newRealm, userRep.getId(), action);\n+ }\n+ }\n+ if (userRep.getCredentials() != null) {\n+ for (CredentialRepresentation cred : userRep.getCredentials()) {\n+ federatedStorage.createCredential(newRealm, userRep.getId(), RepresentationToModel.toModel(cred));\n+ }\n+ }\n+ createFederatedRoleMappings(federatedStorage, userRep, newRealm);\n+\n+ if (userRep.getGroups() != null) {\n+ for (String path : userRep.getGroups()) {\n+ GroupModel group = KeycloakModelUtils.findGroupByPath(newRealm, path);\n+ if (group == null) {\n+ throw new RuntimeException(\"Unable to find group specified by path: \" + path);\n+\n+ }\n+ federatedStorage.joinGroup(newRealm, userRep.getId(), group);\n+ }\n+ }\n+\n+ if (userRep.getFederatedIdentities() != null) {\n+ for (FederatedIdentityRepresentation identity : userRep.getFederatedIdentities()) {\n+ FederatedIdentityModel mappingModel = new FederatedIdentityModel(identity.getIdentityProvider(), identity.getUserId(), identity.getUserName());\n+ federatedStorage.addFederatedIdentity(newRealm, userRep.getId(), mappingModel);\n+ }\n+ }\n+ if (userRep.getClientConsents() != null) {\n+ for (UserConsentRepresentation consentRep : userRep.getClientConsents()) {\n+ UserConsentModel consentModel = RepresentationToModel.toModel(newRealm, consentRep);\n+ federatedStorage.addConsent(newRealm, userRep.getId(), consentModel);\n+ }\n+ }\n+ if (userRep.getNotBefore() != null) {\n+ federatedStorage.setNotBeforeForUser(newRealm, userRep.getId(), userRep.getNotBefore());\n+ }\n+\n+\n+ }\n+\n+ private static void createFederatedRoleMappings(UserFederatedStorageProvider federatedStorage, UserRepresentation userRep, RealmModel realm) {\n+ if (userRep.getRealmRoles() != null) {\n+ for (String roleString : userRep.getRealmRoles()) {\n+ RoleModel role = realm.getRole(roleString.trim());\n+ if (role == null) {\n+ role = realm.addRole(roleString.trim());\n+ }\n+ federatedStorage.grantRole(realm, userRep.getId(), role);\n+ }\n+ }\n+ if (userRep.getClientRoles() != null) {\n+ for (Map.Entry<String, List<String>> entry : userRep.getClientRoles().entrySet()) {\n+ ClientModel client = realm.getClientByClientId(entry.getKey());\n+ if (client == null) {\n+ throw new RuntimeException(\"Unable to find client role mappings for client: \" + entry.getKey());\n+ }\n+ createFederatedClientRoleMappings(federatedStorage, realm, client, userRep, entry.getValue());\n+ }\n+ }\n+ }\n+\n+ private static void createFederatedClientRoleMappings(UserFederatedStorageProvider federatedStorage, RealmModel realm, ClientModel clientModel, UserRepresentation userRep, List<String> roleNames) {\n+ if (userRep == null) {\n+ throw new RuntimeException(\"User not found\");\n+ }\n+\n+ for (String roleName : roleNames) {\n+ RoleModel role = clientModel.getRole(roleName.trim());\n+ if (role == null) {\n+ role = clientModel.addRole(roleName.trim());\n+ }\n+ federatedStorage.grantRole(realm, userRep.getId(), role);\n+\n+ }\n+ }\n+\n}\n" }, { "change_type": "RENAME", "old_path": "services/src/main/java/org/keycloak/exportimport/dir/DirExportProvider.java", "new_path": "model/legacy-services/src/main/java/org/keycloak/exportimport/dir/DirExportProvider.java", "diff": "" }, { "change_type": "RENAME", "old_path": "services/src/main/java/org/keycloak/exportimport/dir/DirExportProviderFactory.java", "new_path": "model/legacy-services/src/main/java/org/keycloak/exportimport/dir/DirExportProviderFactory.java", "diff": "" }, { "change_type": "RENAME", "old_path": "services/src/main/java/org/keycloak/exportimport/dir/DirImportProvider.java", "new_path": "model/legacy-services/src/main/java/org/keycloak/exportimport/dir/DirImportProvider.java", "diff": "" }, { "change_type": "RENAME", "old_path": "services/src/main/java/org/keycloak/exportimport/dir/DirImportProviderFactory.java", "new_path": "model/legacy-services/src/main/java/org/keycloak/exportimport/dir/DirImportProviderFactory.java", "diff": "" }, { "change_type": "RENAME", "old_path": "services/src/main/java/org/keycloak/exportimport/singlefile/SingleFileExportProvider.java", "new_path": "model/legacy-services/src/main/java/org/keycloak/exportimport/singlefile/SingleFileExportProvider.java", "diff": "" }, { "change_type": "RENAME", "old_path": "services/src/main/java/org/keycloak/exportimport/singlefile/SingleFileExportProviderFactory.java", "new_path": "model/legacy-services/src/main/java/org/keycloak/exportimport/singlefile/SingleFileExportProviderFactory.java", "diff": "" }, { "change_type": "RENAME", "old_path": "services/src/main/java/org/keycloak/exportimport/singlefile/SingleFileImportProvider.java", "new_path": "model/legacy-services/src/main/java/org/keycloak/exportimport/singlefile/SingleFileImportProvider.java", "diff": "" }, { "change_type": "RENAME", "old_path": "services/src/main/java/org/keycloak/exportimport/singlefile/SingleFileImportProviderFactory.java", "new_path": "model/legacy-services/src/main/java/org/keycloak/exportimport/singlefile/SingleFileImportProviderFactory.java", "diff": "" }, { "change_type": "RENAME", "old_path": "services/src/main/java/org/keycloak/exportimport/util/ExportImportSessionTask.java", "new_path": "model/legacy-services/src/main/java/org/keycloak/exportimport/util/ExportImportSessionTask.java", "diff": "" }, { "change_type": "RENAME", "old_path": "services/src/main/java/org/keycloak/exportimport/util/ImportUtils.java", "new_path": "model/legacy-services/src/main/java/org/keycloak/exportimport/util/ImportUtils.java", "diff": "@@ -32,6 +32,7 @@ import org.keycloak.models.utils.RepresentationToModel;\nimport org.keycloak.representations.idm.RealmRepresentation;\nimport org.keycloak.representations.idm.UserRepresentation;\nimport org.keycloak.services.managers.RealmManager;\n+import org.keycloak.storage.datastore.LegacyExportImportManager;\nimport java.io.IOException;\nimport java.io.InputStream;\n@@ -265,9 +266,8 @@ public class ImportUtils {\nprivate static void importFederatedUsers(KeycloakSession session, RealmProvider model, String realmName, List<UserRepresentation> userReps) {\nRealmModel realm = model.getRealmByName(realmName);\nfor (UserRepresentation user : userReps) {\n- RepresentationToModel.importFederatedUser(session, realm, user);\n+ LegacyExportImportManager.importFederatedUser(session, realm, user);\n}\n}\n-\n}\n" }, { "change_type": "RENAME", "old_path": "services/src/main/java/org/keycloak/exportimport/util/MultipleStepsExportProvider.java", "new_path": "model/legacy-services/src/main/java/org/keycloak/exportimport/util/MultipleStepsExportProvider.java", "diff": "" }, { "change_type": "RENAME", "old_path": "services/src/main/resources/META-INF/services/org.keycloak.exportimport.ExportProviderFactory", "new_path": "model/legacy-services/src/main/resources/META-INF/services/org.keycloak.exportimport.ExportProviderFactory", "diff": "" }, { "change_type": "RENAME", "old_path": "services/src/main/resources/META-INF/services/org.keycloak.exportimport.ImportProviderFactory", "new_path": "model/legacy-services/src/main/resources/META-INF/services/org.keycloak.exportimport.ImportProviderFactory", "diff": "" }, { "change_type": "MODIFY", "old_path": "server-spi-private/src/main/java/org/keycloak/models/utils/RepresentationToModel.java", "new_path": "server-spi-private/src/main/java/org/keycloak/models/utils/RepresentationToModel.java", "diff": "@@ -764,7 +764,7 @@ public class RepresentationToModel {\n}\n}\n- public static void createClientRoleMappings(ClientModel clientModel, UserModel user, List<String> roleNames) {\n+ private static void createClientRoleMappings(ClientModel clientModel, UserModel user, List<String> roleNames) {\nif (user == null) {\nthrow new RuntimeException(\"User not found\");\n}\n@@ -1525,95 +1525,6 @@ public class RepresentationToModel {\nreturn ticket;\n}\n- public static void importFederatedUser(KeycloakSession session, RealmModel newRealm, UserRepresentation userRep) {\n- UserFederatedStorageProvider federatedStorage = session.userFederatedStorage();\n- if (userRep.getAttributes() != null) {\n- for (Map.Entry<String, List<String>> entry : userRep.getAttributes().entrySet()) {\n- String key = entry.getKey();\n- List<String> value = entry.getValue();\n- if (value != null) {\n- federatedStorage.setAttribute(newRealm, userRep.getId(), key, new LinkedList<>(value));\n- }\n- }\n- }\n- if (userRep.getRequiredActions() != null) {\n- for (String action : userRep.getRequiredActions()) {\n- federatedStorage.addRequiredAction(newRealm, userRep.getId(), action);\n- }\n- }\n- if (userRep.getCredentials() != null) {\n- for (CredentialRepresentation cred : userRep.getCredentials()) {\n- federatedStorage.createCredential(newRealm, userRep.getId(), toModel(cred));\n- }\n- }\n- createFederatedRoleMappings(federatedStorage, userRep, newRealm);\n-\n- if (userRep.getGroups() != null) {\n- for (String path : userRep.getGroups()) {\n- GroupModel group = KeycloakModelUtils.findGroupByPath(newRealm, path);\n- if (group == null) {\n- throw new RuntimeException(\"Unable to find group specified by path: \" + path);\n-\n- }\n- federatedStorage.joinGroup(newRealm, userRep.getId(), group);\n- }\n- }\n-\n- if (userRep.getFederatedIdentities() != null) {\n- for (FederatedIdentityRepresentation identity : userRep.getFederatedIdentities()) {\n- FederatedIdentityModel mappingModel = new FederatedIdentityModel(identity.getIdentityProvider(), identity.getUserId(), identity.getUserName());\n- federatedStorage.addFederatedIdentity(newRealm, userRep.getId(), mappingModel);\n- }\n- }\n- if (userRep.getClientConsents() != null) {\n- for (UserConsentRepresentation consentRep : userRep.getClientConsents()) {\n- UserConsentModel consentModel = toModel(newRealm, consentRep);\n- federatedStorage.addConsent(newRealm, userRep.getId(), consentModel);\n- }\n- }\n- if (userRep.getNotBefore() != null) {\n- federatedStorage.setNotBeforeForUser(newRealm, userRep.getId(), userRep.getNotBefore());\n- }\n-\n-\n- }\n-\n- public static void createFederatedRoleMappings(UserFederatedStorageProvider federatedStorage, UserRepresentation userRep, RealmModel realm) {\n- if (userRep.getRealmRoles() != null) {\n- for (String roleString : userRep.getRealmRoles()) {\n- RoleModel role = realm.getRole(roleString.trim());\n- if (role == null) {\n- role = realm.addRole(roleString.trim());\n- }\n- federatedStorage.grantRole(realm, userRep.getId(), role);\n- }\n- }\n- if (userRep.getClientRoles() != null) {\n- for (Map.Entry<String, List<String>> entry : userRep.getClientRoles().entrySet()) {\n- ClientModel client = realm.getClientByClientId(entry.getKey());\n- if (client == null) {\n- throw new RuntimeException(\"Unable to find client role mappings for client: \" + entry.getKey());\n- }\n- createFederatedClientRoleMappings(federatedStorage, realm, client, userRep, entry.getValue());\n- }\n- }\n- }\n-\n- public static void createFederatedClientRoleMappings(UserFederatedStorageProvider federatedStorage, RealmModel realm, ClientModel clientModel, UserRepresentation userRep, List<String> roleNames) {\n- if (userRep == null) {\n- throw new RuntimeException(\"User not found\");\n- }\n-\n- for (String roleName : roleNames) {\n- RoleModel role = clientModel.getRole(roleName.trim());\n- if (role == null) {\n- role = clientModel.addRole(roleName.trim());\n- }\n- federatedStorage.grantRole(realm, userRep.getId(), role);\n-\n- }\n- }\n-\npublic static Map<String, String> removeEmptyString(Map<String, String> map) {\nif (map == null) {\nreturn null;\n" } ]

[ { "change_type": "MODIFY", "old_path": "server-spi/src/main/java/org/keycloak/storage/adapter/AbstractUserAdapterFederatedStorage.java", "new_path": "server-spi/src/main/java/org/keycloak/storage/adapter/AbstractUserAdapterFederatedStorage.java", "diff": "@@ -18,11 +18,13 @@ package org.keycloak.storage.adapter;\nimport org.keycloak.common.util.MultivaluedHashMap;\nimport org.keycloak.component.ComponentModel;\n+import org.keycloak.credential.LegacySingleUserCredentialManager;\nimport org.keycloak.models.ClientModel;\nimport org.keycloak.models.GroupModel;\nimport org.keycloak.models.KeycloakSession;\nimport org.keycloak.models.RealmModel;\nimport org.keycloak.models.RoleModel;\n+import org.keycloak.models.SingleEntityCredentialManager;\nimport org.keycloak.models.UserModel;\nimport org.keycloak.models.UserModelDefaultMethods;\nimport org.keycloak.models.utils.RoleUtils;\n@@ -400,6 +402,11 @@ public abstract class AbstractUserAdapterFederatedStorage extends UserModelDefau\n}\n+ @Override\n+ public SingleEntityCredentialManager credentialManager() {\n+ return new LegacySingleUserCredentialManager(session, realm, this);\n+ }\n+\n@Override\npublic boolean equals(Object o) {\nif (this == o) return true;\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/BackwardsCompatibilityUserStorage.java", "new_path": "testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/BackwardsCompatibilityUserStorage.java", "diff": "@@ -102,11 +102,6 @@ public class BackwardsCompatibilityUserStorage implements UserLookupProvider, Us\nthrow new RuntimeException(\"Unsupported to change username\");\n}\n}\n-\n- @Override\n- public SingleEntityCredentialManager credentialManager() {\n- return new LegacySingleUserCredentialManager(session, realm, this);\n- }\n};\n}\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/PassThroughFederatedUserStorageProvider.java", "new_path": "testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/PassThroughFederatedUserStorageProvider.java", "diff": "@@ -165,11 +165,6 @@ public class PassThroughFederatedUserStorageProvider implements\n@Override\npublic void setUsername(String username) {\n}\n-\n- @Override\n- public SingleEntityCredentialManager credentialManager() {\n- return new LegacySingleUserCredentialManager(session, realm, this);\n- }\n};\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/UserMapStorage.java", "new_path": "testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/UserMapStorage.java", "diff": "@@ -144,11 +144,6 @@ public class UserMapStorage implements UserLookupProvider.Streams, UserStoragePr\npublic String getFederationLink() {\nreturn model.getId();\n}\n-\n- @Override\n- public SingleEntityCredentialManager credentialManager() {\n- return new LegacySingleUserCredentialManager(session, realm, this);\n- }\n};\n}\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/UserPropertyFileStorage.java", "new_path": "testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/UserPropertyFileStorage.java", "diff": "@@ -134,11 +134,6 @@ public class UserPropertyFileStorage implements UserLookupProvider.Streams, User\npublic void setUsername(String username) {\nthrow new RuntimeException(\"Unsupported\");\n}\n-\n- @Override\n- public SingleEntityCredentialManager credentialManager() {\n- return new LegacySingleUserCredentialManager(session, realm, this);\n- }\n};\n} else {\nreturn new AbstractUserAdapter.Streams(session, realm, model) {\n" } ]

[ { "change_type": "MODIFY", "old_path": "server-spi/src/main/java/org/keycloak/models/KeycloakSession.java", "new_path": "server-spi/src/main/java/org/keycloak/models/KeycloakSession.java", "diff": "@@ -71,7 +71,7 @@ public interface KeycloakSession {\n* @param clazz\n* @param componentId Component configuration\n* @throws IllegalArgumentException If the realm is not set in the context.\n- * @return Provider configured according to the {@link componentId}, {@code null} if it cannot be instantiated.\n+ * @return Provider configured according to the {@param componentId}, {@code null} if it cannot be instantiated.\n*/\n<T extends Provider> T getComponentProvider(Class<T> clazz, String componentId);\n@@ -83,7 +83,7 @@ public interface KeycloakSession {\n* @param componentId Component configuration\n* @param modelGetter Getter to retrieve componentModel\n* @throws IllegalArgumentException If the realm is not set in the context.\n- * @return Provider configured according to the {@link componentId}, {@code null} if it cannot be instantiated.\n+ * @return Provider configured according to the {@param componentId}, {@code null} if it cannot be instantiated.\n*/\n<T extends Provider> T getComponentProvider(Class<T> clazz, String componentId, Function<KeycloakSessionFactory, ComponentModel> modelGetter);\n@@ -209,34 +209,39 @@ public interface KeycloakSession {\n*\n* @return may be null if cache is disabled\n*/\n+ @Deprecated\nUserCache userCache();\n/**\n* A cached view of all users in system including users loaded by UserStorageProviders\n*\n- * @return\n+ * @return UserProvider instance\n*/\nUserProvider users();\n/**\n* @return ClientStorageManager instance\n*/\n+ @Deprecated\nClientProvider clientStorageManager();\n/**\n* @return ClientScopeStorageManager instance\n* @deprecated Use {@link #clientScopes()} instead\n*/\n+ @Deprecated\nClientScopeProvider clientScopeStorageManager();\n/**\n* @return RoleStorageManager instance\n*/\n+ @Deprecated\nRoleProvider roleStorageManager();\n/**\n* @return GroupStorageManager instance\n*/\n+ @Deprecated\nGroupProvider groupStorageManager();\n/**\n@@ -244,11 +249,12 @@ public interface KeycloakSession {\n*\n* @return\n*/\n+ @Deprecated\nUserProvider userStorageManager();\n/**\n* Service that allows you to valid and update credentials for a user\n- * @deprecated Use {@link UserModel#getUserCredentialManager()} instead.\n+ * @deprecated Use {@link UserModel#credentialManager()} instead.\n* @return\n*/\n@Deprecated\n@@ -256,11 +262,11 @@ public interface KeycloakSession {\n/**\n* Keycloak specific local storage for users. No cache in front, this api talks directly to database configured for Keycloak\n- *\n- * @return\n*/\n+ @Deprecated\nUserProvider userLocalStorage();\n+ @Deprecated\nRealmProvider realmLocalStorage();\n/**\n@@ -268,6 +274,7 @@ public interface KeycloakSession {\n*\n* @return\n*/\n+ @Deprecated\nClientProvider clientLocalStorage();\n/**\n@@ -276,6 +283,7 @@ public interface KeycloakSession {\n* @deprecated Use {@link #clientScopes()} instead\n* @return\n*/\n+ @Deprecated\nClientScopeProvider clientScopeLocalStorage();\n/**\n@@ -283,6 +291,7 @@ public interface KeycloakSession {\n*\n* @return\n*/\n+ @Deprecated\nGroupProvider groupLocalStorage();\n/**\n@@ -290,6 +299,7 @@ public interface KeycloakSession {\n*\n* @return\n*/\n+ @Deprecated\nRoleProvider roleLocalStorage();\n/**\n@@ -298,6 +308,7 @@ public interface KeycloakSession {\n*\n* @return\n*/\n+ @Deprecated\nUserFederatedStorageProvider userFederatedStorage();\n/**\n" }, { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/services/DefaultKeycloakSession.java", "new_path": "services/src/main/java/org/keycloak/services/DefaultKeycloakSession.java", "diff": "*/\npackage org.keycloak.services;\n+import org.jboss.logging.Logger;\n+import org.keycloak.common.util.StackUtil;\nimport org.keycloak.component.ComponentFactory;\nimport org.keycloak.component.ComponentModel;\nimport org.keycloak.jose.jws.DefaultTokenManager;\n@@ -69,6 +71,7 @@ import java.util.stream.Collectors;\n*/\npublic class DefaultKeycloakSession implements KeycloakSession {\n+ private final static Logger log = Logger.getLogger(DefaultKeycloakSession.class);\nprivate final DefaultKeycloakSessionFactory factory;\nprivate final Map<Integer, Provider> providers = new HashMap<>();\nprivate final List<Provider> closable = new LinkedList<>();\n@@ -167,59 +170,68 @@ public class DefaultKeycloakSession implements KeycloakSession {\n}\n@Override\n- @Deprecated // put deprecated on the interface\n+ @Deprecated\npublic UserProvider userLocalStorage() {\n- // TODO: if we would call users() here, we could get the cache in legacy mode instead and would then loop\n- return getProvider(UserProvider.class);\n+ log.warnf(\"The semantics of this method have changed: Please see the migration guide on how to migrate.%s\", StackUtil.getShortStackTrace());\n+ return users();\n}\n@Override\n- @Deprecated // put deprecated on the interface (all *LocalStorage, all *Managers)\n+ @Deprecated\npublic RealmProvider realmLocalStorage() {\nreturn realms();\n}\n@Override\n+ @Deprecated\npublic ClientProvider clientLocalStorage() {\nreturn clients();\n}\n@Override\n+ @Deprecated\npublic ClientScopeProvider clientScopeLocalStorage() {\nreturn clientScopes();\n}\n@Override\n+ @Deprecated\npublic GroupProvider groupLocalStorage() {\nreturn groups();\n}\n@Override\n+ @Deprecated\npublic ClientProvider clientStorageManager() {\nreturn clients();\n}\n@Override\n+ @Deprecated\npublic ClientScopeProvider clientScopeStorageManager() {\nreturn clientScopes();\n}\n@Override\n+ @Deprecated\npublic RoleProvider roleLocalStorage() {\nreturn roles();\n}\n@Override\n+ @Deprecated\npublic RoleProvider roleStorageManager() {\nreturn roles();\n}\n@Override\n+ @Deprecated\npublic GroupProvider groupStorageManager() {\nreturn groups();\n}\n@Override\n+ @Deprecated\npublic UserProvider userStorageManager() {\nreturn users();\n}\n@@ -322,7 +334,6 @@ public class DefaultKeycloakSession implements KeycloakSession {\nreturn null;\n}\n- @SuppressWarnings(\"unchecked\")\nComponentFactory<T, T> componentFactory = (ComponentFactory<T, T>) providerFactory;\nT provider = componentFactory.create(this, componentModel);\nenlistForClose(provider);\n" } ]

[ { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/UserStorageConsentTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/UserStorageConsentTest.java", "diff": "@@ -23,6 +23,7 @@ import org.junit.Assert;\nimport org.junit.Before;\nimport org.junit.Test;\nimport org.keycloak.OAuth2Constants;\n+import org.keycloak.common.Profile.Feature;\nimport org.keycloak.common.util.MultivaluedHashMap;\nimport org.keycloak.models.ClientModel;\nimport org.keycloak.models.ClientScopeModel;\n@@ -36,6 +37,7 @@ import org.keycloak.representations.idm.ComponentRepresentation;\nimport org.keycloak.representations.idm.RoleRepresentation;\nimport org.keycloak.representations.idm.UserRepresentation;\nimport org.keycloak.storage.UserStorageProvider;\n+import org.keycloak.testsuite.ProfileAssume;\nimport org.keycloak.testsuite.adapter.AbstractServletsAdapterTest;\nimport org.keycloak.testsuite.adapter.page.ProductPortal;\nimport org.keycloak.testsuite.admin.ApiUtil;\n@@ -55,6 +57,7 @@ import java.util.List;\nimport java.util.Map;\nimport java.util.stream.Collectors;\n+import org.junit.BeforeClass;\nimport static org.keycloak.storage.UserStorageProviderModel.IMPORT_ENABLED;\nimport static org.keycloak.testsuite.util.URLAssert.assertCurrentUrlEquals;\nimport static org.keycloak.testsuite.util.URLAssert.assertCurrentUrlStartsWithLoginUrlOf;\n@@ -88,6 +91,12 @@ public class UserStorageConsentTest extends AbstractServletsAdapterTest {\nreturn servletDeployment(ProductPortal.DEPLOYMENT_NAME, ProductServlet.class);\n}\n+ @BeforeClass\n+ public static void checkNotMapStorage() {\n+ // This test requires user storage SPI\n+ ProfileAssume.assumeFeatureDisabled(Feature.MAP_STORAGE);\n+ }\n+\n@Before\npublic void addProvidersBeforeTest() throws URISyntaxException, IOException {\nComponentRepresentation memProvider = new ComponentRepresentation();\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AccountLinkTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AccountLinkTest.java", "diff": "@@ -22,6 +22,7 @@ import org.junit.Test;\nimport org.keycloak.admin.client.resource.RealmResource;\nimport org.keycloak.admin.client.resource.UsersResource;\nimport org.keycloak.common.Profile;\n+import org.keycloak.common.Profile.Feature;\nimport org.keycloak.common.util.MultivaluedHashMap;\nimport org.keycloak.models.KeycloakSession;\nimport org.keycloak.models.RealmModel;\n@@ -32,6 +33,7 @@ import org.keycloak.representations.idm.RealmRepresentation;\nimport org.keycloak.representations.idm.UserRepresentation;\nimport org.keycloak.storage.UserStorageProvider;\nimport org.keycloak.testsuite.AbstractKeycloakTest;\n+import org.keycloak.testsuite.ProfileAssume;\nimport org.keycloak.testsuite.arquillian.annotation.DisableFeature;\nimport org.keycloak.testsuite.federation.PassThroughFederatedUserStorageProvider;\nimport org.keycloak.testsuite.federation.PassThroughFederatedUserStorageProviderFactory;\n@@ -135,6 +137,8 @@ public class AccountLinkTest extends AbstractKeycloakTest {\n@Test\npublic void testAccountLinkWithUserStorageProvider() {\n+ ProfileAssume.assumeFeatureDisabled(Feature.MAP_STORAGE);\n+\nString childUsername = PassThroughFederatedUserStorageProvider.PASSTHROUGH_USERNAME;\nString childPassword = PassThroughFederatedUserStorageProvider.INITIAL_PASSWORD;\nString childIdp = CHILD_IDP;\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/exportimport/ExportImportTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/exportimport/ExportImportTest.java", "diff": "@@ -24,6 +24,7 @@ import org.junit.After;\nimport org.junit.Test;\nimport org.keycloak.admin.client.resource.RealmResource;\nimport org.keycloak.authentication.requiredactions.WebAuthnRegisterFactory;\n+import org.keycloak.common.Profile.Feature;\nimport org.keycloak.exportimport.ExportImportConfig;\nimport org.keycloak.exportimport.Strategy;\nimport org.keycloak.exportimport.dir.DirExportProvider;\n@@ -38,6 +39,7 @@ import org.keycloak.representations.idm.RequiredActionProviderRepresentation;\nimport org.keycloak.representations.idm.UserRepresentation;\nimport org.keycloak.testsuite.AbstractKeycloakTest;\nimport org.keycloak.testsuite.Assert;\n+import org.keycloak.testsuite.ProfileAssume;\nimport org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude;\nimport org.keycloak.testsuite.client.resources.TestingExportImportResource;\nimport org.keycloak.testsuite.runonserver.RunHelpers;\n@@ -61,6 +63,7 @@ import static org.junit.Assert.assertThat;\nimport static org.junit.Assert.assertTrue;\nimport static org.keycloak.testsuite.admin.AbstractAdminTest.loadJson;\nimport org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer;\n+import org.junit.BeforeClass;\n/**\n*\n@@ -71,6 +74,12 @@ import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.A\n@AuthServerContainerExclude(AuthServer.REMOTE)\npublic class ExportImportTest extends AbstractKeycloakTest {\n+ @BeforeClass\n+ public static void checkNotMapStorage() {\n+ // Disabled temporarily, re-enable once export/import functionality is implemented for map storage\n+ ProfileAssume.assumeFeatureDisabled(Feature.MAP_STORAGE);\n+ }\n+\n@Override\npublic void addTestRealms(List<RealmRepresentation> testRealms) {\nRealmRepresentation testRealm1 = loadJson(getClass().getResourceAsStream(\"/testrealm.json\"), RealmRepresentation.class);\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/AbstractKerberosTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/AbstractKerberosTest.java", "diff": "@@ -52,6 +52,7 @@ import org.keycloak.OAuth2Constants;\nimport org.keycloak.adapters.HttpClientBuilder;\nimport org.keycloak.admin.client.resource.RealmResource;\nimport org.keycloak.authentication.authenticators.browser.SpnegoAuthenticatorFactory;\n+import org.keycloak.common.Profile.Feature;\nimport org.keycloak.common.util.MultivaluedHashMap;\nimport org.keycloak.events.Details;\nimport org.keycloak.federation.kerberos.CommonKerberosConfig;\n@@ -70,6 +71,7 @@ import org.keycloak.storage.UserStorageProviderModel;\nimport org.keycloak.testsuite.AbstractAuthTest;\nimport org.keycloak.testsuite.Assert;\nimport org.keycloak.testsuite.AssertEvents;\n+import org.keycloak.testsuite.ProfileAssume;\nimport org.keycloak.testsuite.admin.ApiUtil;\nimport org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude;\nimport org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer;\n@@ -77,6 +79,7 @@ import org.keycloak.testsuite.pages.AccountPasswordPage;\nimport org.keycloak.testsuite.pages.LoginPage;\nimport org.keycloak.testsuite.util.KerberosRule;\nimport org.keycloak.testsuite.util.OAuthClient;\n+import org.junit.BeforeClass;\n/**\n* Contains just helper methods. No test methods.\n@@ -135,6 +138,10 @@ public abstract class AbstractKerberosTest extends AbstractAuthTest {\nreturn adminClient.realm(\"test\");\n}\n+ @BeforeClass\n+ public static void checkNotMapStorage() {\n+ ProfileAssume.assumeFeatureDisabled(Feature.MAP_STORAGE);\n+ }\n@Before\n@Override\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/AbstractLDAPTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/AbstractLDAPTest.java", "diff": "package org.keycloak.testsuite.federation.ldap;\n+import org.keycloak.common.Profile.Feature;\nimport java.util.List;\nimport java.util.Map;\n@@ -27,6 +28,7 @@ import org.keycloak.representations.idm.RealmRepresentation;\nimport org.keycloak.storage.ldap.mappers.LDAPStorageMapper;\nimport org.keycloak.testsuite.AbstractTestRealmKeycloakTest;\nimport org.keycloak.testsuite.AssertEvents;\n+import org.keycloak.testsuite.ProfileAssume;\nimport org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude;\nimport org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer;\nimport org.keycloak.testsuite.pages.AccountPasswordPage;\n@@ -37,6 +39,7 @@ import org.keycloak.testsuite.pages.LoginPasswordUpdatePage;\nimport org.keycloak.testsuite.pages.OAuthGrantPage;\nimport org.keycloak.testsuite.pages.RegisterPage;\nimport org.keycloak.testsuite.util.LDAPRule;\n+import org.junit.BeforeClass;\n/**\n@@ -90,6 +93,11 @@ public abstract class AbstractLDAPTest extends AbstractTestRealmKeycloakTest {\nafterImportTestRealm();\n}\n+ @BeforeClass\n+ public static void checkNotMapStorage() {\n+ ProfileAssume.assumeFeatureDisabled(Feature.MAP_STORAGE);\n+ }\n+\nprotected void createLDAPProvider() {\nMap<String, String> cfg = getLDAPRule().getConfig();\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/AbstractUserStorageDirtyDeletionTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/AbstractUserStorageDirtyDeletionTest.java", "diff": "@@ -5,12 +5,14 @@ import org.junit.Before;\nimport org.junit.Test;\nimport org.keycloak.admin.client.resource.GroupResource;\nimport org.keycloak.admin.client.resource.UserResource;\n+import org.keycloak.common.Profile.Feature;\nimport org.keycloak.common.util.MultivaluedHashMap;\nimport org.keycloak.models.KeycloakSession;\nimport org.keycloak.models.LDAPConstants;\nimport org.keycloak.models.RealmModel;\nimport org.keycloak.representations.idm.ComponentRepresentation;\nimport org.keycloak.storage.UserStorageProvider;\n+import org.keycloak.testsuite.ProfileAssume;\nimport org.keycloak.testsuite.admin.concurrency.AbstractConcurrencyTest;\nimport org.keycloak.testsuite.federation.UserMapStorage;\nimport org.keycloak.testsuite.federation.UserMapStorageFactory;\n@@ -24,6 +26,7 @@ import java.util.Set;\nimport java.util.stream.Collectors;\nimport java.util.stream.IntStream;\n+import org.junit.BeforeClass;\nimport static org.hamcrest.Matchers.hasSize;\nimport static org.junit.Assert.assertThat;\nimport static org.keycloak.storage.UserStorageProviderModel.IMPORT_ENABLED;\n@@ -41,6 +44,11 @@ public abstract class AbstractUserStorageDirtyDeletionTest extends AbstractConcu\nprivate List<Creator<UserResource>> createdUsers;\n+ @BeforeClass\n+ public static void checkNotMapStorage() {\n+ ProfileAssume.assumeFeatureDisabled(Feature.MAP_STORAGE);\n+ }\n+\npublic static void remove20UsersFromStorageProvider(KeycloakSession session) {\nassertThat(REMOVED_USERS_COUNT, Matchers.lessThan(NUM_USERS));\nfinal RealmModel realm = session.realms().getRealmByName(TEST_REALM_NAME);\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/BackwardsCompatibilityUserStorageTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/BackwardsCompatibilityUserStorageTest.java", "diff": "@@ -31,6 +31,7 @@ import org.junit.Before;\nimport org.junit.Test;\nimport org.keycloak.admin.client.resource.UserResource;\nimport org.keycloak.common.Profile;\n+import org.keycloak.common.Profile.Feature;\nimport org.keycloak.common.util.MultivaluedHashMap;\nimport org.keycloak.credential.CredentialModel;\nimport org.keycloak.models.RealmModel;\n@@ -43,6 +44,7 @@ import org.keycloak.storage.StorageId;\nimport org.keycloak.storage.UserStorageProvider;\nimport org.keycloak.testsuite.AbstractAuthTest;\nimport org.keycloak.testsuite.Assert;\n+import org.keycloak.testsuite.ProfileAssume;\nimport org.keycloak.testsuite.admin.ApiUtil;\nimport org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude;\nimport org.keycloak.testsuite.arquillian.annotation.DisableFeature;\n@@ -53,6 +55,7 @@ import org.keycloak.testsuite.pages.LoginConfigTotpPage;\nimport org.keycloak.testsuite.pages.LoginPage;\nimport org.keycloak.testsuite.pages.LoginTotpPage;\n+import org.junit.BeforeClass;\nimport static org.keycloak.testsuite.util.URLAssert.assertCurrentUrlDoesntStartWith;\nimport static org.keycloak.testsuite.util.URLAssert.assertCurrentUrlStartsWith;\n@@ -85,6 +88,11 @@ public class BackwardsCompatibilityUserStorageTest extends AbstractAuthTest {\nprivate TimeBasedOTP totp = new TimeBasedOTP();\n+ @BeforeClass\n+ public static void checkNotMapStorage() {\n+ ProfileAssume.assumeFeatureDisabled(Feature.MAP_STORAGE);\n+ }\n+\n@Before\npublic void addProvidersBeforeTest() throws URISyntaxException, IOException {\nComponentRepresentation memProvider = new ComponentRepresentation();\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/ClientStorageTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/ClientStorageTest.java", "diff": "@@ -24,6 +24,7 @@ import org.junit.Before;\nimport org.junit.Rule;\nimport org.junit.Test;\nimport org.keycloak.OAuth2Constants;\n+import org.keycloak.common.Profile.Feature;\nimport org.keycloak.common.util.MultivaluedHashMap;\nimport org.keycloak.component.ComponentModel;\nimport org.keycloak.events.Details;\n@@ -42,6 +43,7 @@ import org.keycloak.storage.client.ClientStorageProvider;\nimport org.keycloak.storage.client.ClientStorageProviderModel;\nimport org.keycloak.testsuite.AbstractTestRealmKeycloakTest;\nimport org.keycloak.testsuite.AssertEvents;\n+import org.keycloak.testsuite.ProfileAssume;\nimport org.keycloak.testsuite.admin.ApiUtil;\nimport org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude;\nimport org.keycloak.testsuite.auth.page.AuthRealm;\n@@ -78,6 +80,7 @@ import static org.junit.Assert.assertThat;\nimport static org.keycloak.testsuite.admin.ApiUtil.findUserByUsername;\nimport org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer;\nimport org.keycloak.testsuite.util.AdminClientUtil;\n+import org.junit.BeforeClass;\n/**\n* Test that clients can override auth flows\n@@ -112,6 +115,11 @@ public class ClientStorageTest extends AbstractTestRealmKeycloakTest {\nreturn id;\n}\n+ @BeforeClass\n+ public static void checkNotMapStorage() {\n+ ProfileAssume.assumeFeatureDisabled(Feature.MAP_STORAGE);\n+ }\n+\n@Before\npublic void addProvidersBeforeTest() throws URISyntaxException, IOException {\nComponentRepresentation provider = new ComponentRepresentation();\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/GroupStorageTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/GroupStorageTest.java", "diff": "package org.keycloak.testsuite.federation.storage;\n+import org.keycloak.common.Profile.Feature;\nimport org.junit.Before;\nimport org.junit.Test;\nimport org.keycloak.common.util.MultivaluedHashMap;\n@@ -28,6 +29,7 @@ import org.keycloak.representations.idm.RealmRepresentation;\nimport org.keycloak.storage.StorageId;\nimport org.keycloak.storage.group.GroupStorageProvider;\nimport org.keycloak.testsuite.AbstractTestRealmKeycloakTest;\n+import org.keycloak.testsuite.ProfileAssume;\nimport org.keycloak.testsuite.admin.ApiUtil;\nimport org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude;\nimport org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer;\n@@ -39,6 +41,7 @@ import java.io.IOException;\nimport java.net.URISyntaxException;\nimport java.util.stream.Collectors;\n+import org.junit.BeforeClass;\nimport static org.hamcrest.Matchers.allOf;\nimport static org.hamcrest.Matchers.hasItem;\nimport static org.hamcrest.Matchers.not;\n@@ -62,6 +65,11 @@ public class GroupStorageTest extends AbstractTestRealmKeycloakTest {\n}\n}\n+ @BeforeClass\n+ public static void checkNotMapStorage() {\n+ ProfileAssume.assumeFeatureDisabled(Feature.MAP_STORAGE);\n+ }\n+\n@Before\npublic void addProvidersBeforeTest() throws URISyntaxException, IOException {\nComponentRepresentation provider = new ComponentRepresentation();\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/RoleStorageTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/RoleStorageTest.java", "diff": "package org.keycloak.testsuite.federation.storage;\n+import org.keycloak.common.Profile.Feature;\nimport java.io.IOException;\nimport java.net.URISyntaxException;\nimport java.util.stream.Collectors;\n@@ -37,11 +38,13 @@ import org.keycloak.representations.idm.RealmRepresentation;\nimport org.keycloak.storage.StorageId;\nimport org.keycloak.storage.role.RoleStorageProvider;\nimport org.keycloak.testsuite.AbstractTestRealmKeycloakTest;\n+import org.keycloak.testsuite.ProfileAssume;\nimport org.keycloak.testsuite.admin.ApiUtil;\nimport org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude;\nimport org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer;\nimport org.keycloak.testsuite.auth.page.AuthRealm;\nimport org.keycloak.testsuite.federation.HardcodedRoleStorageProviderFactory;\n+import org.junit.BeforeClass;\n@AuthServerContainerExclude(AuthServer.REMOTE)\npublic class RoleStorageTest extends AbstractTestRealmKeycloakTest {\n@@ -60,6 +63,11 @@ public class RoleStorageTest extends AbstractTestRealmKeycloakTest {\n}\n}\n+ @BeforeClass\n+ public static void checkNotMapStorage() {\n+ ProfileAssume.assumeFeatureDisabled(Feature.MAP_STORAGE);\n+ }\n+\n@Before\npublic void addProvidersBeforeTest() throws URISyntaxException, IOException {\nComponentRepresentation provider = new ComponentRepresentation();\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/AbstractJsonFileImportMigrationTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/AbstractJsonFileImportMigrationTest.java", "diff": "*/\npackage org.keycloak.testsuite.migration;\n+import org.keycloak.common.Profile.Feature;\nimport static org.hamcrest.MatcherAssert.assertThat;\nimport static org.hamcrest.Matchers.equalTo;\nimport static org.hamcrest.Matchers.is;\n@@ -23,6 +24,8 @@ import org.junit.Assert;\nimport org.junit.Before;\nimport org.keycloak.representations.idm.RealmRepresentation;\n+import org.keycloak.testsuite.ProfileAssume;\n+import org.junit.BeforeClass;\nimport static org.keycloak.testsuite.auth.page.AuthRealm.MASTER;\n/**\n@@ -33,6 +36,11 @@ public abstract class AbstractJsonFileImportMigrationTest extends AbstractMigrat\nprotected RealmRepresentation masterRep;\nprotected String masterTestClientId;\n+ @BeforeClass\n+ public static void checkNotMapStorage() {\n+ ProfileAssume.assumeFeatureDisabled(Feature.MAP_STORAGE);\n+ }\n+\n@Before\npublic void beforeMigrationTest() {\nmigrationRealm = adminClient.realms().realm(MIGRATION);\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/UserConsentModelTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/UserConsentModelTest.java", "diff": "package org.keycloak.testsuite.model;\n+import org.keycloak.common.Profile.Feature;\nimport org.junit.After;\nimport org.junit.Assert;\nimport org.junit.Before;\n@@ -36,6 +37,7 @@ import org.keycloak.representations.idm.RealmRepresentation;\nimport org.keycloak.services.managers.RealmManager;\nimport org.keycloak.storage.client.ClientStorageProviderModel;\nimport org.keycloak.testsuite.AbstractTestRealmKeycloakTest;\n+import org.keycloak.testsuite.ProfileAssume;\nimport org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude;\nimport org.keycloak.testsuite.arquillian.annotation.ModelTest;\nimport org.keycloak.testsuite.federation.HardcodedClientStorageProviderFactory;\n@@ -45,6 +47,7 @@ import java.util.concurrent.atomic.AtomicReference;\nimport java.util.stream.Collectors;\nimport org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer;\n+import org.junit.BeforeClass;\n/**\n* @author <a href=\"mailto:[email protected]\">Marek Posolda</a>\n@@ -56,6 +59,12 @@ public class UserConsentModelTest extends AbstractTestRealmKeycloakTest {\nprivate static String realmId;\n+ @BeforeClass\n+ public static void checkNotMapStorage() {\n+ // This test requires legacy client storage\n+ ProfileAssume.assumeFeatureDisabled(Feature.MAP_STORAGE);\n+ }\n+\n@Before\npublic void before() {\ntestingClient.server().run(session -> {\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/openshift/OpenshiftClientStorageTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/openshift/OpenshiftClientStorageTest.java", "diff": "@@ -30,6 +30,7 @@ import org.junit.Test;\nimport org.keycloak.OAuth2Constants;\nimport org.keycloak.OAuthErrorException;\nimport org.keycloak.admin.client.resource.ComponentResource;\n+import org.keycloak.common.Profile.Feature;\nimport org.keycloak.common.util.MultivaluedHashMap;\nimport org.keycloak.common.util.StreamUtil;\nimport org.keycloak.events.Details;\n@@ -41,6 +42,7 @@ import org.keycloak.storage.client.ClientStorageProvider;\nimport org.keycloak.storage.openshift.OpenshiftClientStorageProviderFactory;\nimport org.keycloak.testsuite.AbstractTestRealmKeycloakTest;\nimport org.keycloak.testsuite.AssertEvents;\n+import org.keycloak.testsuite.ProfileAssume;\nimport org.keycloak.testsuite.admin.ApiUtil;\nimport org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude;\nimport org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer;\n@@ -94,6 +96,11 @@ public final class OpenshiftClientStorageTest extends AbstractTestRealmKeycloakT\npublic void configureTestRealm(RealmRepresentation testRealm) {\n}\n+ @BeforeClass\n+ public static void checkNotMapStorage() {\n+ ProfileAssume.assumeFeatureDisabled(Feature.MAP_STORAGE);\n+ }\n+\n@BeforeClass\npublic static void onBeforeClass() {\nOPENSHIFT_API_SERVER = Undertow.builder().addHttpListener(8880, \"localhost\", new HttpHandler() {\n" } ]

[ { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/services/DefaultKeycloakSession.java", "new_path": "services/src/main/java/org/keycloak/services/DefaultKeycloakSession.java", "diff": "@@ -230,10 +230,20 @@ public class DefaultKeycloakSession implements KeycloakSession {\nreturn groups();\n}\n+ private final ThreadLocal<Boolean> recursionPreventionUserStorageManager = new ThreadLocal<>();\n+\n@Override\n@Deprecated\npublic UserProvider userStorageManager() {\n+ if(recursionPreventionUserStorageManager.get() != null) {\n+ throw new IllegalStateException(\"userStorageManager() is being called recursively. Please adjust your code according to the Keycloak 19 migration guide.\");\n+ }\n+ try {\n+ recursionPreventionUserStorageManager.set(Boolean.TRUE);\nreturn users();\n+ } finally {\n+ recursionPreventionUserStorageManager.remove();\n+ }\n}\n@Override\n" } ]

[ { "change_type": "RENAME", "old_path": "model/map/src/main/java/org/keycloak/models/map/credential/DefaultMapSingleEntityCredentialManagerEntity.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/credential/DefaultMapSubjectCredentialManagerEntity.java", "diff": "@@ -23,12 +23,12 @@ import java.util.List;\nimport java.util.stream.Stream;\n/**\n- * Standard implementation for a {@link MapSingleEntityCredentialManagerEntity} where the store doesn't provide\n+ * Standard implementation for a {@link MapSubjectCredentialManagerEntity} where the store doesn't provide\n* validation of credentials.\n*\n* @author Alexander Schwartz\n*/\n-public class DefaultMapSingleEntityCredentialManagerEntity implements MapSingleEntityCredentialManagerEntity {\n+public class DefaultMapSubjectCredentialManagerEntity implements MapSubjectCredentialManagerEntity {\n@Override\npublic void validateCredentials(List<CredentialInput> inputs) {\n}\n" }, { "change_type": "RENAME", "old_path": "model/map/src/main/java/org/keycloak/models/map/credential/MapSingleEntityCredentialManagerEntity.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/credential/MapSubjectCredentialManagerEntity.java", "diff": "@@ -27,7 +27,7 @@ import java.util.stream.Stream;\n*\n* @author Alexander Schwartz\n*/\n-public interface MapSingleEntityCredentialManagerEntity {\n+public interface MapSubjectCredentialManagerEntity {\n/**\n* Validate the credentials of a user.\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/user/MapUserEntity.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/user/MapUserEntity.java", "diff": "@@ -24,8 +24,8 @@ import org.keycloak.models.map.common.AbstractEntity;\nimport org.keycloak.models.map.common.DeepCloner;\nimport org.keycloak.models.map.common.EntityWithAttributes;\nimport org.keycloak.models.map.common.UpdatableEntity;\n-import org.keycloak.models.map.credential.DefaultMapSingleEntityCredentialManagerEntity;\n-import org.keycloak.models.map.credential.MapSingleEntityCredentialManagerEntity;\n+import org.keycloak.models.map.credential.DefaultMapSubjectCredentialManagerEntity;\n+import org.keycloak.models.map.credential.MapSubjectCredentialManagerEntity;\nimport org.keycloak.models.utils.KeycloakModelUtils;\nimport java.util.Collections;\n@@ -248,7 +248,7 @@ public interface MapUserEntity extends UpdatableEntity, AbstractEntity, EntityWi\nLong getNotBefore();\nvoid setNotBefore(Long notBefore);\n- default MapSingleEntityCredentialManagerEntity credentialManager() {\n- return new DefaultMapSingleEntityCredentialManagerEntity();\n+ default MapSubjectCredentialManagerEntity credentialManager() {\n+ return new DefaultMapSubjectCredentialManagerEntity();\n}\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-model-infinispan/main/module.xml", "new_path": "distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-model-infinispan/main/module.xml", "diff": "<module name=\"org.keycloak.keycloak-server-spi-private\"/>\n<module name=\"org.keycloak.keycloak-wildfly-extensions\" export=\"true\" services=\"import\"/>\n<module name=\"org.keycloak.keycloak-model-legacy\"/>\n+ <module name=\"org.keycloak.keycloak-model-legacy-private\"/>\n<module name=\"org.infinispan\"/>\n<module name=\"org.infinispan.commons\"/>\n<module name=\"org.infinispan.persistence.remote\"/>\n" }, { "change_type": "MODIFY", "old_path": "model/infinispan/pom.xml", "new_path": "model/infinispan/pom.xml", "diff": "<groupId>org.keycloak</groupId>\n<artifactId>keycloak-model-legacy</artifactId>\n</dependency>\n+ <dependency>\n+ <groupId>org.keycloak</groupId>\n+ <artifactId>keycloak-model-legacy-private</artifactId>\n+ </dependency>\n<dependency>\n<groupId>org.keycloak</groupId>\n<artifactId>keycloak-server-spi-private</artifactId>\n" }, { "change_type": "MODIFY", "old_path": "model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/InfinispanUserCacheProviderFactory.java", "new_path": "model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/InfinispanUserCacheProviderFactory.java", "diff": "@@ -29,11 +29,14 @@ import org.keycloak.models.cache.UserCache;\nimport org.keycloak.models.cache.UserCacheProviderFactory;\nimport org.keycloak.models.cache.infinispan.entities.Revisioned;\nimport org.keycloak.models.cache.infinispan.events.InvalidationEvent;\n+import org.keycloak.provider.InvalidationHandler;\n+import org.keycloak.provider.InvalidationHandler.InvalidableObjectType;;\n+import org.keycloak.provider.InvalidationHandler.ObjectType;;\n/**\n* @author <a href=\"mailto:[email protected]\">Stian Thorgersen</a>\n*/\n-public class InfinispanUserCacheProviderFactory implements UserCacheProviderFactory {\n+public class InfinispanUserCacheProviderFactory implements UserCacheProviderFactory, InvalidationHandler {\nprivate static final Logger log = Logger.getLogger(InfinispanUserCacheProviderFactory.class);\npublic static final String USER_CLEAR_CACHE_EVENTS = \"USER_CLEAR_CACHE_EVENTS\";\n@@ -78,6 +81,15 @@ public class InfinispanUserCacheProviderFactory implements UserCacheProviderFact\n}\n}\n+ @Override\n+ public void invalidate(KeycloakSession session, InvalidableObjectType type, Object... params) {\n+ if (type == ObjectType.REALM || type == ObjectType.USER) {\n+ if (this.userCache != null) {\n+ this.userCache.clear();\n+ }\n+ }\n+ }\n+\n@Override\npublic void init(Config.Scope config) {\n}\n@@ -95,6 +107,4 @@ public class InfinispanUserCacheProviderFactory implements UserCacheProviderFact\npublic String getId() {\nreturn \"default\";\n}\n-\n-\n}\n" }, { "change_type": "RENAME", "old_path": "server-spi-private/src/main/java/org/keycloak/models/cache/CacheUserProviderSpi.java", "new_path": "model/legacy-private/src/main/java/org/keycloak/models/cache/CacheUserProviderSpi.java", "diff": "" }, { "change_type": "RENAME", "old_path": "server-spi-private/src/main/java/org/keycloak/models/cache/UserCacheProviderFactory.java", "new_path": "model/legacy-private/src/main/java/org/keycloak/models/cache/UserCacheProviderFactory.java", "diff": "" }, { "change_type": "ADD", "old_path": null, "new_path": "model/legacy-private/src/main/resources/META-INF/services/org.keycloak.provider.Spi", "diff": "+#\n+# Copyright 2022 Red Hat, Inc. and/or its affiliates\n+# and other contributors as indicated by the @author tags.\n+#\n+# Licensed under the Apache License, Version 2.0 (the \"License\");\n+# you may not use this file except in compliance with the License.\n+# You may obtain a copy of the License at\n+#\n+# http://www.apache.org/licenses/LICENSE-2.0\n+#\n+# Unless required by applicable law or agreed to in writing, software\n+# distributed under the License is distributed on an \"AS IS\" BASIS,\n+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+# See the License for the specific language governing permissions and\n+# limitations under the License.\n+#\n+\n+org.keycloak.models.cache.CacheUserProviderSpi\n" }, { "change_type": "MODIFY", "old_path": "model/legacy-services/src/main/java/org/keycloak/services/legacysessionsupport/LegacySessionSupportProviderImpl.java", "new_path": "model/legacy-services/src/main/java/org/keycloak/services/legacysessionsupport/LegacySessionSupportProviderImpl.java", "diff": "@@ -21,6 +21,7 @@ import org.keycloak.credential.UserCredentialStoreManager;\nimport org.keycloak.models.KeycloakSession;\nimport org.keycloak.models.UserCredentialManager;\nimport org.keycloak.models.LegacySessionSupportProvider;\n+import org.keycloak.models.cache.UserCache;\n/**\n* @author Alexander Schwartz\n@@ -45,4 +46,9 @@ public class LegacySessionSupportProviderImpl implements LegacySessionSupportPro\nreturn new UserCredentialStoreManager(session);\n}\n+ @Override\n+ public UserCache userCache() {\n+ return session.getProvider(UserCache.class);\n+ }\n+\n}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "model/legacy-services/src/main/java/org/keycloak/services/resources/admin/ClearUserCacheRealmAdminProvider.java", "diff": "+/*\n+ * Copyright 2022 Red Hat, Inc. and/or its affiliates\n+ * and other contributors as indicated by the @author tags.\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+\n+package org.keycloak.services.resources.admin;\n+\n+import org.keycloak.Config.Scope;\n+import org.keycloak.models.KeycloakSession;\n+import org.keycloak.models.KeycloakSessionFactory;\n+import org.keycloak.models.RealmModel;\n+import org.keycloak.services.resources.admin.ext.AdminRealmResourceProvider;\n+import org.keycloak.services.resources.admin.ext.AdminRealmResourceProviderFactory;\n+import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator;\n+\n+public class ClearUserCacheRealmAdminProvider implements AdminRealmResourceProviderFactory, AdminRealmResourceProvider {\n+\n+ @Override\n+ public AdminRealmResourceProvider create(KeycloakSession session) {\n+ return this;\n+ }\n+\n+ @Override\n+ public void init(Scope config) {\n+ }\n+\n+ @Override\n+ public void postInit(KeycloakSessionFactory factory) {\n+ }\n+\n+ @Override\n+ public void close() {\n+ }\n+\n+ @Override\n+ public String getId() {\n+ return \"clear-user-cache\";\n+ }\n+\n+ @Override\n+ public Object getResource(KeycloakSession session, RealmModel realm, AdminPermissionEvaluator auth, AdminEventBuilder adminEvent) {\n+ return new ClearUserCacheResource(realm, auth, adminEvent);\n+ }\n+\n+}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "model/legacy-services/src/main/java/org/keycloak/services/resources/admin/ClearUserCacheResource.java", "diff": "+/*\n+ * Copyright 2022 Red Hat, Inc. and/or its affiliates\n+ * and other contributors as indicated by the @author tags.\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package org.keycloak.services.resources.admin;\n+\n+import org.keycloak.events.admin.OperationType;\n+import org.keycloak.models.KeycloakSession;\n+import org.keycloak.models.RealmModel;\n+import org.keycloak.models.cache.UserCache;\n+import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator;\n+\n+import javax.ws.rs.POST;\n+import javax.ws.rs.core.Context;\n+\n+/**\n+ * Clear user cache.\n+ */\n+public class ClearUserCacheResource {\n+ protected RealmModel realm;\n+\n+ protected AdminPermissionEvaluator auth;\n+\n+ protected AdminEventBuilder adminEvent;\n+\n+ @Context\n+ protected KeycloakSession session;\n+\n+ public ClearUserCacheResource(RealmModel realm, AdminPermissionEvaluator auth, AdminEventBuilder adminEvent) {\n+ this.auth = auth;\n+ this.realm = realm;\n+ this.adminEvent = adminEvent;\n+ }\n+\n+ /**\n+ * Clear user cache\n+ */\n+ @POST\n+ public void clearUserCache() {\n+ auth.realm().requireManageRealm();\n+\n+ UserCache cache = session.getProvider(UserCache.class);\n+ if (cache != null) {\n+ cache.clear();\n+ }\n+\n+ adminEvent.operation(OperationType.ACTION).resourcePath(session.getContext().getUri()).success();\n+ }\n+\n+}\n" }, { "change_type": "MODIFY", "old_path": "model/legacy-services/src/main/resources/META-INF/services/org.keycloak.services.resources.admin.ext.AdminRealmResourceProviderFactory", "new_path": "model/legacy-services/src/main/resources/META-INF/services/org.keycloak.services.resources.admin.ext.AdminRealmResourceProviderFactory", "diff": "#\norg.keycloak.services.resources.admin.UserStorageProviderRealmAdminProvider\n+org.keycloak.services.resources.admin.ClearUserCacheRealmAdminProvider\n" }, { "change_type": "RENAME", "old_path": "server-spi/src/main/java/org/keycloak/models/cache/UserCache.java", "new_path": "model/legacy/src/main/java/org/keycloak/models/cache/UserCache.java", "diff": "" }, { "change_type": "MODIFY", "old_path": "server-spi-private/src/main/java/org/keycloak/models/LegacySessionSupportProvider.java", "new_path": "server-spi-private/src/main/java/org/keycloak/models/LegacySessionSupportProvider.java", "diff": "@@ -29,4 +29,7 @@ public interface LegacySessionSupportProvider extends Provider {\n@Deprecated\nUserCredentialManager userCredentialManager();\n+\n+ @Deprecated\n+ UserProvider userCache();\n}\n" }, { "change_type": "MODIFY", "old_path": "server-spi-private/src/main/resources/META-INF/services/org.keycloak.provider.Spi", "new_path": "server-spi-private/src/main/resources/META-INF/services/org.keycloak.provider.Spi", "diff": "@@ -58,7 +58,6 @@ org.keycloak.theme.ThemeSpi\norg.keycloak.truststore.TruststoreSpi\norg.keycloak.connections.httpclient.HttpClientSpi\norg.keycloak.models.cache.CacheRealmProviderSpi\n-org.keycloak.models.cache.CacheUserProviderSpi\norg.keycloak.authentication.AuthenticatorSpi\norg.keycloak.authentication.ClientAuthenticatorSpi\norg.keycloak.authentication.RequiredActionSpi\n" }, { "change_type": "MODIFY", "old_path": "server-spi/src/main/java/org/keycloak/models/KeycloakSession.java", "new_path": "server-spi/src/main/java/org/keycloak/models/KeycloakSession.java", "diff": "package org.keycloak.models;\nimport org.keycloak.component.ComponentModel;\n-import org.keycloak.models.cache.UserCache;\nimport org.keycloak.provider.InvalidationHandler.InvalidableObjectType;\nimport org.keycloak.provider.Provider;\nimport org.keycloak.services.clientpolicy.ClientPolicyManager;\n@@ -210,7 +209,7 @@ public interface KeycloakSession {\n* @return may be null if cache is disabled\n*/\n@Deprecated\n- UserCache userCache();\n+ UserProvider userCache();\n/**\n* A cached view of all users in system including users loaded by UserStorageProviders\n" }, { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/services/DefaultKeycloakSession.java", "new_path": "services/src/main/java/org/keycloak/services/DefaultKeycloakSession.java", "diff": "@@ -39,7 +39,6 @@ import org.keycloak.models.UserCredentialManager;\nimport org.keycloak.models.UserLoginFailureProvider;\nimport org.keycloak.models.UserProvider;\nimport org.keycloak.models.UserSessionProvider;\n-import org.keycloak.models.cache.UserCache;\nimport org.keycloak.models.utils.KeycloakModelUtils;\nimport org.keycloak.provider.Provider;\nimport org.keycloak.provider.ProviderFactory;\n@@ -111,9 +110,13 @@ public class DefaultKeycloakSession implements KeycloakSession {\n}\n@Override\n- public UserCache userCache() {\n- return getProvider(UserCache.class);\n-\n+ @Deprecated\n+ public UserProvider userCache() {\n+ LegacySessionSupportProvider provider = this.getProvider(LegacySessionSupportProvider.class);\n+ if (provider == null) {\n+ throw new IllegalStateException(\"legacy support for userCache is not enabled\");\n+ }\n+ return provider.userCache();\n}\n@Override\n" }, { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java", "new_path": "services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java", "diff": "@@ -78,6 +78,7 @@ import org.keycloak.models.ClientScopeModel;\nimport org.keycloak.models.Constants;\nimport org.keycloak.models.GroupModel;\nimport org.keycloak.models.KeycloakSession;\n+import org.keycloak.models.LegacySessionSupportProvider;\nimport org.keycloak.models.ModelDuplicateException;\nimport org.keycloak.models.ModelException;\nimport org.keycloak.models.RealmModel;\n@@ -85,13 +86,13 @@ import org.keycloak.models.RequiredActionProviderModel;\nimport org.keycloak.models.UserModel;\nimport org.keycloak.models.UserSessionModel;\nimport org.keycloak.models.cache.CacheRealmProvider;\n-import org.keycloak.models.cache.UserCache;\nimport org.keycloak.models.utils.KeycloakModelUtils;\nimport org.keycloak.models.utils.ModelToRepresentation;\nimport org.keycloak.models.utils.RepresentationToModel;\nimport org.keycloak.models.utils.StripSecretsUtils;\nimport org.keycloak.partialimport.PartialImportManager;\nimport org.keycloak.protocol.oidc.TokenManager;\n+import org.keycloak.provider.InvalidationHandler;\nimport org.keycloak.representations.adapters.action.GlobalRequestResult;\nimport org.keycloak.representations.idm.AdminEventRepresentation;\nimport org.keycloak.representations.idm.ClientRepresentation;\n@@ -440,8 +441,7 @@ public class RealmAdminResource {\nadminEvent.operation(OperationType.UPDATE).representation(StripSecretsUtils.strip(rep)).success();\nif (rep.isDuplicateEmailsAllowed() != null && rep.isDuplicateEmailsAllowed() != wasDuplicateEmailsAllowed) {\n- UserCache cache = session.getProvider(UserCache.class);\n- if (cache != null) cache.clear();\n+ session.invalidate(InvalidationHandler.ObjectType.REALM, realm.getId());\n}\nreturn Response.noContent().build();\n@@ -1097,23 +1097,6 @@ public class RealmAdminResource {\nadminEvent.operation(OperationType.ACTION).resourcePath(session.getContext().getUri()).success();\n}\n- /**\n- * Clear user cache\n- *\n- */\n- @Path(\"clear-user-cache\")\n- @POST\n- public void clearUserCache() {\n- auth.realm().requireManageRealm();\n-\n- UserCache cache = session.getProvider(UserCache.class);\n- if (cache != null) {\n- cache.clear();\n- }\n-\n- adminEvent.operation(OperationType.ACTION).resourcePath(session.getContext().getUri()).success();\n- }\n-\n/**\n* Clear cache of external public keys (Public keys of clients or Identity providers)\n*\n" } ]

[ { "change_type": "RENAME", "old_path": "server-spi-private/src/main/java/org/keycloak/models/cache/CacheRealmProvider.java", "new_path": "model/legacy-private/src/main/java/org/keycloak/models/cache/CacheRealmProvider.java", "diff": "" }, { "change_type": "RENAME", "old_path": "server-spi-private/src/main/java/org/keycloak/models/cache/CacheRealmProviderFactory.java", "new_path": "model/legacy-private/src/main/java/org/keycloak/models/cache/CacheRealmProviderFactory.java", "diff": "" }, { "change_type": "RENAME", "old_path": "server-spi-private/src/main/java/org/keycloak/models/cache/CacheRealmProviderSpi.java", "new_path": "model/legacy-private/src/main/java/org/keycloak/models/cache/CacheRealmProviderSpi.java", "diff": "" }, { "change_type": "MODIFY", "old_path": "model/legacy-private/src/main/resources/META-INF/services/org.keycloak.provider.Spi", "new_path": "model/legacy-private/src/main/resources/META-INF/services/org.keycloak.provider.Spi", "diff": "#\norg.keycloak.models.cache.CacheUserProviderSpi\n+org.keycloak.models.cache.CacheRealmProviderSpi\n" }, { "change_type": "ADD", "old_path": null, "new_path": "model/legacy-services/src/main/java/org/keycloak/services/resources/admin/ClearRealmCacheRealmAdminProvider.java", "diff": "+/*\n+ * Copyright 2022 Red Hat, Inc. and/or its affiliates\n+ * and other contributors as indicated by the @author tags.\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+\n+package org.keycloak.services.resources.admin;\n+\n+import org.keycloak.Config.Scope;\n+import org.keycloak.models.KeycloakSession;\n+import org.keycloak.models.KeycloakSessionFactory;\n+import org.keycloak.models.RealmModel;\n+import org.keycloak.services.resources.admin.ext.AdminRealmResourceProvider;\n+import org.keycloak.services.resources.admin.ext.AdminRealmResourceProviderFactory;\n+import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator;\n+\n+public class ClearRealmCacheRealmAdminProvider implements AdminRealmResourceProviderFactory, AdminRealmResourceProvider {\n+\n+ @Override\n+ public AdminRealmResourceProvider create(KeycloakSession session) {\n+ return this;\n+ }\n+\n+ @Override\n+ public void init(Scope config) {\n+ }\n+\n+ @Override\n+ public void postInit(KeycloakSessionFactory factory) {\n+ }\n+\n+ @Override\n+ public void close() {\n+ }\n+\n+ @Override\n+ public String getId() {\n+ return \"clear-realm-cache\";\n+ }\n+\n+ @Override\n+ public Object getResource(KeycloakSession session, RealmModel realm, AdminPermissionEvaluator auth, AdminEventBuilder adminEvent) {\n+ return new ClearRealmCacheResource(realm, auth, adminEvent);\n+ }\n+\n+}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "model/legacy-services/src/main/java/org/keycloak/services/resources/admin/ClearRealmCacheResource.java", "diff": "+/*\n+ * Copyright 2022 Red Hat, Inc. and/or its affiliates\n+ * and other contributors as indicated by the @author tags.\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package org.keycloak.services.resources.admin;\n+\n+import org.keycloak.events.admin.OperationType;\n+import org.keycloak.models.KeycloakSession;\n+import org.keycloak.models.RealmModel;\n+import org.keycloak.models.cache.CacheRealmProvider;\n+import org.keycloak.models.cache.UserCache;\n+import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator;\n+\n+import javax.ws.rs.POST;\n+import javax.ws.rs.core.Context;\n+\n+/**\n+ * Clear user cache.\n+ */\n+public class ClearRealmCacheResource {\n+ protected RealmModel realm;\n+\n+ protected AdminPermissionEvaluator auth;\n+\n+ protected AdminEventBuilder adminEvent;\n+\n+ @Context\n+ protected KeycloakSession session;\n+\n+ public ClearRealmCacheResource(RealmModel realm, AdminPermissionEvaluator auth, AdminEventBuilder adminEvent) {\n+ this.auth = auth;\n+ this.realm = realm;\n+ this.adminEvent = adminEvent;\n+ }\n+\n+ /**\n+ * Clear user cache\n+ */\n+ @POST\n+ public void clearRealmCache() {\n+ auth.realm().requireManageRealm();\n+\n+ CacheRealmProvider cache = session.getProvider(CacheRealmProvider.class);\n+ if (cache != null) {\n+ cache.clear();\n+ }\n+\n+ adminEvent.operation(OperationType.ACTION).resourcePath(session.getContext().getUri()).success();\n+ }\n+\n+}\n" }, { "change_type": "MODIFY", "old_path": "model/legacy-services/src/main/resources/META-INF/services/org.keycloak.services.resources.admin.ext.AdminRealmResourceProviderFactory", "new_path": "model/legacy-services/src/main/resources/META-INF/services/org.keycloak.services.resources.admin.ext.AdminRealmResourceProviderFactory", "diff": "org.keycloak.services.resources.admin.UserStorageProviderRealmAdminProvider\norg.keycloak.services.resources.admin.ClearUserCacheRealmAdminProvider\n+org.keycloak.services.resources.admin.ClearRealmCacheRealmAdminProvider\n" }, { "change_type": "MODIFY", "old_path": "server-spi-private/src/main/resources/META-INF/services/org.keycloak.provider.Spi", "new_path": "server-spi-private/src/main/resources/META-INF/services/org.keycloak.provider.Spi", "diff": "@@ -57,7 +57,6 @@ org.keycloak.executors.ExecutorsSpi\norg.keycloak.theme.ThemeSpi\norg.keycloak.truststore.TruststoreSpi\norg.keycloak.connections.httpclient.HttpClientSpi\n-org.keycloak.models.cache.CacheRealmProviderSpi\norg.keycloak.authentication.AuthenticatorSpi\norg.keycloak.authentication.ClientAuthenticatorSpi\norg.keycloak.authentication.RequiredActionSpi\n" }, { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java", "new_path": "services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java", "diff": "@@ -85,7 +85,6 @@ import org.keycloak.models.RealmModel;\nimport org.keycloak.models.RequiredActionProviderModel;\nimport org.keycloak.models.UserModel;\nimport org.keycloak.models.UserSessionModel;\n-import org.keycloak.models.cache.CacheRealmProvider;\nimport org.keycloak.models.utils.KeycloakModelUtils;\nimport org.keycloak.models.utils.ModelToRepresentation;\nimport org.keycloak.models.utils.RepresentationToModel;\n@@ -1080,23 +1079,6 @@ public class RealmAdminResource {\nreturn stripForExport(session, rep);\n}\n- /**\n- * Clear realm cache\n- *\n- */\n- @Path(\"clear-realm-cache\")\n- @POST\n- public void clearRealmCache() {\n- auth.realm().requireManageRealm();\n-\n- CacheRealmProvider cache = session.getProvider(CacheRealmProvider.class);\n- if (cache != null) {\n- cache.clear();\n- }\n-\n- adminEvent.operation(OperationType.ACTION).resourcePath(session.getContext().getUri()).success();\n- }\n-\n/**\n* Clear cache of external public keys (Public keys of clients or Identity providers)\n*\n" } ]

[ { "change_type": "ADD", "old_path": null, "new_path": "core/src/main/java/org/keycloak/crypto/integration/CryptoIntegration.java", "diff": "+package org.keycloak.crypto.integration;\n+\n+import java.util.ServiceLoader;\n+\n+import org.jboss.logging.Logger;\n+import org.keycloak.common.util.BouncyIntegration;\n+\n+/**\n+ * @author <a href=\"mailto:[email protected]\">Marek Posolda</a>\n+ */\n+public class CryptoIntegration {\n+\n+ protected static final Logger logger = Logger.getLogger(CryptoIntegration.class);\n+\n+ private static volatile CryptoProvider securityProvider;\n+\n+ public static CryptoProvider getProvider() {\n+ if (securityProvider == null) {\n+ logger.debugf(\"Using BouncyCastle provider: %s\", BouncyIntegration.PROVIDER);\n+ securityProvider = detectProvider();\n+ logger.infof(\"Detected security provider: %s\", securityProvider);\n+ }\n+ return securityProvider;\n+ }\n+\n+\n+ // This can be possibly set by the configuration (SPI) to override the \"detected\" instance\n+ public static void setProvider(CryptoProvider provider) {\n+ securityProvider = provider;\n+ }\n+\n+\n+ // Try to auto-detect provider\n+ private static CryptoProvider detectProvider() {\n+ // TODO This may not work on Wildfly (assuming FIPS module will be different Wildfly module than keycloak-core). May need to be improved (EG. with usage of org.keycloak.platform.Platform)\n+ for (CryptoProvider cryptoProvider : ServiceLoader.load(CryptoProvider.class, CryptoIntegration.class.getClassLoader())) {\n+ return cryptoProvider;\n+ }\n+ // Fallback. This should not be needed once DefaultCryptoProvider is moved into separate module like \"crypto/default\" and provided via ServiceLoader\n+ return new DefaultCryptoProvider();\n+ }\n+\n+}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "core/src/main/java/org/keycloak/crypto/integration/CryptoProvider.java", "diff": "+package org.keycloak.crypto.integration;\n+\n+import java.security.NoSuchAlgorithmException;\n+import java.security.NoSuchProviderException;\n+import java.security.SecureRandom;\n+\n+import org.keycloak.jose.jwe.alg.JWEAlgorithmProvider;\n+\n+/**\n+ * Abstraction to handle differences between the APIs for non-fips and fips mode\n+ *\n+ * @author <a href=\"mailto:[email protected]\">Marek Posolda</a>\n+ */\n+public interface CryptoProvider {\n+\n+ /**\n+ * @return secureRandom implementation based on the available security algorithms according to environment (FIPS non-fips)\n+ */\n+ SecureRandom getSecureRandom() throws NoSuchAlgorithmException, NoSuchProviderException;\n+\n+ JWEAlgorithmProvider getAesKeyWrapAlgorithmProvider();\n+}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "core/src/main/java/org/keycloak/crypto/integration/DefaultCryptoProvider.java", "diff": "+package org.keycloak.crypto.integration;\n+\n+import java.security.NoSuchAlgorithmException;\n+import java.security.SecureRandom;\n+\n+import org.keycloak.jose.jwe.alg.AesKeyWrapAlgorithmProvider;\n+import org.keycloak.jose.jwe.alg.JWEAlgorithmProvider;\n+\n+/**\n+ * @author <a href=\"mailto:[email protected]\">Marek Posolda</a>\n+ */\n+public class DefaultCryptoProvider implements CryptoProvider {\n+\n+ @Override\n+ public SecureRandom getSecureRandom() throws NoSuchAlgorithmException {\n+ return SecureRandom.getInstance(\"SHA1PRNG\");\n+ }\n+\n+ @Override\n+ public JWEAlgorithmProvider getAesKeyWrapAlgorithmProvider() {\n+ return new AesKeyWrapAlgorithmProvider();\n+ }\n+}\n" }, { "change_type": "MODIFY", "old_path": "core/src/main/java/org/keycloak/jose/jwe/JWERegistry.java", "new_path": "core/src/main/java/org/keycloak/jose/jwe/JWERegistry.java", "diff": "@@ -20,7 +20,7 @@ package org.keycloak.jose.jwe;\nimport java.util.HashMap;\nimport java.util.Map;\n-import org.keycloak.jose.jwe.alg.AesKeyWrapAlgorithmProvider;\n+import org.keycloak.crypto.integration.CryptoIntegration;\nimport org.keycloak.jose.jwe.alg.DirectAlgorithmProvider;\nimport org.keycloak.jose.jwe.alg.JWEAlgorithmProvider;\nimport org.keycloak.jose.jwe.alg.RsaKeyEncryption256JWEAlgorithmProvider;\n@@ -47,7 +47,7 @@ class JWERegistry {\nstatic {\n// Provider 'dir' just directly uses encryption keys for encrypt/decrypt content.\nALG_PROVIDERS.put(JWEConstants.DIR, new DirectAlgorithmProvider());\n- ALG_PROVIDERS.put(JWEConstants.A128KW, new AesKeyWrapAlgorithmProvider());\n+ ALG_PROVIDERS.put(JWEConstants.A128KW, CryptoIntegration.getProvider().getAesKeyWrapAlgorithmProvider());\nALG_PROVIDERS.put(JWEConstants.RSA_OAEP, new RsaKeyEncryptionJWEAlgorithmProvider(\"RSA/ECB/OAEPWithSHA-1AndMGF1Padding\"));\nALG_PROVIDERS.put(JWEConstants.RSA_OAEP_256, new RsaKeyEncryption256JWEAlgorithmProvider(\"RSA/ECB/OAEPWithSHA-256AndMGF1Padding\"));\n" }, { "change_type": "MODIFY", "old_path": "core/src/test/java/org/keycloak/jose/jwk/JWKTest.java", "new_path": "core/src/test/java/org/keycloak/jose/jwk/JWKTest.java", "diff": "@@ -25,6 +25,7 @@ import org.keycloak.common.util.BouncyIntegration;\nimport org.keycloak.common.util.KeyUtils;\nimport org.keycloak.common.util.PemUtils;\nimport org.keycloak.crypto.JavaAlgorithm;\n+import org.keycloak.crypto.integration.CryptoIntegration;\nimport org.keycloak.util.JsonSerialization;\nimport java.nio.charset.StandardCharsets;\n@@ -33,7 +34,6 @@ import java.security.KeyPairGenerator;\nimport java.security.PrivateKey;\nimport java.security.PublicKey;\nimport java.security.SecureRandom;\n-import java.security.Security;\nimport java.security.Signature;\nimport java.security.cert.X509Certificate;\nimport java.security.interfaces.ECPublicKey;\n@@ -130,7 +130,7 @@ public class JWKTest {\n@Test\npublic void publicEs256() throws Exception {\nKeyPairGenerator keyGen = KeyPairGenerator.getInstance(\"EC\", BouncyIntegration.PROVIDER);\n- SecureRandom randomGen = SecureRandom.getInstance(\"SHA1PRNG\");\n+ SecureRandom randomGen = CryptoIntegration.getProvider().getSecureRandom();\nECGenParameterSpec ecSpec = new ECGenParameterSpec(\"secp256r1\");\nkeyGen.initialize(ecSpec, randomGen);\nKeyPair keyPair = keyGen.generateKeyPair();\n" }, { "change_type": "ADD", "old_path": null, "new_path": "crypto/fips1402/pom.xml", "diff": "+<?xml version=\"1.0\"?>\n+<!--\n+ ~ Copyright 2022 Red Hat, Inc. and/or its affiliates\n+ ~ and other contributors as indicated by the @author tags.\n+ ~\n+ ~ Licensed under the Apache License, Version 2.0 (the \"License\");\n+ ~ you may not use this file except in compliance with the License.\n+ ~ You may obtain a copy of the License at\n+ ~\n+ ~ http://www.apache.org/licenses/LICENSE-2.0\n+ ~\n+ ~ Unless required by applicable law or agreed to in writing, software\n+ ~ distributed under the License is distributed on an \"AS IS\" BASIS,\n+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ ~ See the License for the specific language governing permissions and\n+ ~ limitations under the License.\n+ -->\n+\n+<project xmlns=\"http://maven.apache.org/POM/4.0.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n+ xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd\">\n+ <parent>\n+ <artifactId>keycloak-crypto-parent</artifactId>\n+ <groupId>org.keycloak</groupId>\n+ <version>999-SNAPSHOT</version>\n+ <relativePath>../pom.xml</relativePath>\n+ </parent>\n+ <modelVersion>4.0.0</modelVersion>\n+\n+ <artifactId>keycloak-fips1402</artifactId>\n+ <name>Keycloak FIPS 140-2 Integration</name>\n+ <description/>\n+\n+ <dependencies>\n+ <dependency>\n+ <groupId>org.keycloak</groupId>\n+ <artifactId>keycloak-core</artifactId>\n+ <exclusions>\n+ <exclusion>\n+ <groupId>org.bouncycastle</groupId>\n+ <artifactId>bcprov-jdk15on</artifactId>\n+ </exclusion>\n+ <exclusion>\n+ <groupId>org.bouncycastle</groupId>\n+ <artifactId>bcpkix-jdk15on</artifactId>\n+ </exclusion>\n+ </exclusions>\n+ </dependency>\n+\n+ <dependency>\n+ <groupId>org.bouncycastle</groupId>\n+ <artifactId>bc-fips</artifactId>\n+ </dependency>\n+ <dependency>\n+ <groupId>org.bouncycastle</groupId>\n+ <artifactId>bctls-fips</artifactId>\n+ </dependency>\n+ <dependency>\n+ <groupId>org.bouncycastle</groupId>\n+ <artifactId>bcpkix-fips</artifactId>\n+ </dependency>\n+\n+ <dependency>\n+ <groupId>org.jboss.logging</groupId>\n+ <artifactId>jboss-logging</artifactId>\n+ <scope>provided</scope>\n+ </dependency>\n+ <dependency>\n+ <groupId>junit</groupId>\n+ <artifactId>junit</artifactId>\n+ <scope>test</scope>\n+ </dependency>\n+ <dependency>\n+ <groupId>org.hamcrest</groupId>\n+ <artifactId>hamcrest</artifactId>\n+ <scope>test</scope>\n+ </dependency>\n+ </dependencies>\n+\n+</project>\n\\ No newline at end of file\n" }, { "change_type": "ADD", "old_path": null, "new_path": "crypto/fips1402/src/main/java/org/keycloak/crypto/fips/FIPS1402Provider.java", "diff": "+package org.keycloak.crypto.fips;\n+\n+import java.security.NoSuchAlgorithmException;\n+import java.security.NoSuchProviderException;\n+import java.security.SecureRandom;\n+\n+import org.keycloak.crypto.integration.CryptoProvider;\n+import org.keycloak.jose.jwe.alg.JWEAlgorithmProvider;\n+\n+\n+/**\n+ * Integration based on FIPS 140-2\n+ *\n+ * @author <a href=\"mailto:[email protected]\">Marek Posolda</a>\n+ */\n+public class FIPS1402Provider implements CryptoProvider {\n+\n+ @Override\n+ public SecureRandom getSecureRandom() throws NoSuchAlgorithmException, NoSuchProviderException {\n+ return SecureRandom.getInstance(\"DEFAULT\",\"BCFIPS\");\n+ }\n+\n+ @Override\n+ public JWEAlgorithmProvider getAesKeyWrapAlgorithmProvider() {\n+ return new FIPSAesKeyWrapAlgorithmProvider();\n+ }\n+}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "crypto/fips1402/src/main/java/org/keycloak/crypto/fips/FIPSAesKeyWrapAlgorithmProvider.java", "diff": "+package org.keycloak.crypto.fips;\n+\n+import java.security.Key;\n+\n+import org.bouncycastle.crypto.KeyUnwrapper;\n+import org.bouncycastle.crypto.KeyWrapper;\n+import org.bouncycastle.crypto.SymmetricKey;\n+import org.bouncycastle.crypto.SymmetricSecretKey;\n+import org.bouncycastle.crypto.fips.FipsAES;\n+import org.keycloak.jose.jwe.JWEKeyStorage;\n+import org.keycloak.jose.jwe.alg.JWEAlgorithmProvider;\n+import org.keycloak.jose.jwe.enc.JWEEncryptionProvider;\n+\n+/**\n+ * Variant of {@link org.keycloak.jose.jwe.alg.AesKeyWrapAlgorithmProvider} based on FIPS\n+ */\n+public class FIPSAesKeyWrapAlgorithmProvider implements JWEAlgorithmProvider {\n+\n+ @Override\n+ public byte[] decodeCek(byte[] encodedCek, Key encryptionKey) throws Exception {\n+ byte[] keyBytes = encryptionKey.getEncoded(); // bytes making up AES key doing the wrapping\n+ SymmetricKey aesKey = new SymmetricSecretKey(FipsAES.KW, keyBytes);\n+ FipsAES.KeyWrapOperatorFactory factory = new FipsAES.KeyWrapOperatorFactory();\n+ KeyUnwrapper unwrapper = factory.createKeyUnwrapper(aesKey, FipsAES.KW);\n+ return unwrapper.unwrap(encodedCek, 0, encodedCek.length);\n+ }\n+\n+ @Override\n+ public byte[] encodeCek(JWEEncryptionProvider encryptionProvider, JWEKeyStorage keyStorage, Key encryptionKey) throws Exception {\n+ byte[] inputKeyBytes = keyStorage.getCekBytes(); // bytes making up the key to be wrapped\n+ byte[] keyBytes = encryptionKey.getEncoded(); // bytes making up AES key doing the wrapping\n+ SymmetricKey aesKey = new SymmetricSecretKey(FipsAES.KW, keyBytes);\n+ FipsAES.KeyWrapOperatorFactory factory = new FipsAES.KeyWrapOperatorFactory();\n+ KeyWrapper wrapper = factory.createKeyWrapper(aesKey, FipsAES.KW);\n+ return wrapper.wrap(inputKeyBytes, 0, inputKeyBytes.length);\n+ }\n+}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "crypto/fips1402/src/main/resources/META-INF/services/org.keycloak.crypto.integration.CryptoProvider", "diff": "+#\n+# Copyright 2022 Red Hat, Inc. and/or its affiliates\n+# and other contributors as indicated by the @author tags.\n+#\n+# Licensed under the Apache License, Version 2.0 (the \"License\");\n+# you may not use this file except in compliance with the License.\n+# You may obtain a copy of the License at\n+#\n+# http://www.apache.org/licenses/LICENSE-2.0\n+#\n+# Unless required by applicable law or agreed to in writing, software\n+# distributed under the License is distributed on an \"AS IS\" BASIS,\n+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+# See the License for the specific language governing permissions and\n+# limitations under the License.\n+#\n+\n+org.keycloak.crypto.fips.FIPS1402Provider\n\\ No newline at end of file\n" }, { "change_type": "ADD", "old_path": null, "new_path": "crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/FIPS1402UnitTest.java", "diff": "+package org.keycloak.crypto.fips.test;\n+\n+import java.security.SecureRandom;\n+\n+import org.junit.Assert;\n+import org.junit.Test;\n+import org.keycloak.crypto.fips.FIPSAesKeyWrapAlgorithmProvider;\n+import org.keycloak.crypto.integration.CryptoIntegration;\n+import org.keycloak.jose.jwe.alg.JWEAlgorithmProvider;\n+\n+/**\n+ * @author <a href=\"mailto:[email protected]\">Marek Posolda</a>\n+ */\n+public class FIPS1402UnitTest {\n+\n+\n+ @Test\n+ public void testFips() throws Exception {\n+ JWEAlgorithmProvider jweAlg = CryptoIntegration.getProvider().getAesKeyWrapAlgorithmProvider();\n+ Assert.assertEquals(jweAlg.getClass(), FIPSAesKeyWrapAlgorithmProvider.class);\n+\n+ SecureRandom scr = CryptoIntegration.getProvider().getSecureRandom();\n+ Assert.assertEquals(\"BCFIPS\", scr.getProvider().getName());\n+ }\n+}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "crypto/pom.xml", "diff": "+<!--\n+ ~ Copyright 2022 Red Hat, Inc. and/or its affiliates\n+ ~ and other contributors as indicated by the @author tags.\n+ ~\n+ ~ Licensed under the Apache License, Version 2.0 (the \"License\");\n+ ~ you may not use this file except in compliance with the License.\n+ ~ You may obtain a copy of the License at\n+ ~\n+ ~ http://www.apache.org/licenses/LICENSE-2.0\n+ ~\n+ ~ Unless required by applicable law or agreed to in writing, software\n+ ~ distributed under the License is distributed on an \"AS IS\" BASIS,\n+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ ~ See the License for the specific language governing permissions and\n+ ~ limitations under the License.\n+ -->\n+\n+<project xmlns=\"http://maven.apache.org/POM/4.0.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n+ xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd\">\n+ <parent>\n+ <artifactId>keycloak-parent</artifactId>\n+ <groupId>org.keycloak</groupId>\n+ <version>999-SNAPSHOT</version>\n+ <relativePath>../pom.xml</relativePath>\n+ </parent>\n+ <name>Keycloak Crypto Parent</name>\n+ <description/>\n+ <modelVersion>4.0.0</modelVersion>\n+\n+ <artifactId>keycloak-crypto-parent</artifactId>\n+ <packaging>pom</packaging>\n+\n+ <modules>\n+ <module>fips1402</module>\n+ </modules>\n+</project>\n\\ No newline at end of file\n" }, { "change_type": "ADD", "old_path": null, "new_path": "docs/fips.md", "diff": "+FIPS 140-2 Integration\n+======================\n+\n+Build with FIPS\n+---------------\n+\n+With OpenJDK 11 on the classpath, run this from the project root directory:\n+\n+```\n+mvn clean install -DskipTests=true -Dfips140-2 -Pquarkus\n+```\n+The property `fips140-2` is used to trigger maven profile to build keycloak+quarkus distribution with `bouncycastle-fips` dependencies instead of plain `bouncycastle`\n+and also with `keycloak-fips140-2` module containing some security code dependent on bouncycastle-fips APIs.\n+\n+Then unzip and check only bouncycastle-fips libraries are inside \"lib\" directory:\n+```\n+tar xf $KEYCLOAK_SOURCES/quarkus/dist/target/keycloak-999-SNAPSHOT.tar.gz\n+ls keycloak-999-SNAPSHOT/lib/lib/main/org.bouncycastle.bc*\n+```\n+Output should be something like:\n+```\n+keycloak-999-SNAPSHOT/lib/lib/main/org.bouncycastle.bc-fips-1.0.2.jar keycloak-999-SNAPSHOT/lib/lib/main/org.bouncycastle.bctls-fips-1.0.11.jar\n+keycloak-999-SNAPSHOT/lib/lib/main/org.bouncycastle.bcpkix-fips-1.0.3.jar\n+```\n+\n+Similarly the JAR keycloak-fips-integration should be available:\n+```\n+ls keycloak-999-SNAPSHOT/lib/lib/main/org.keycloak.keycloak-fips-integration-999-SNAPSHOT.jar\n+```\n+\n+Now run the server on the FIPS enabled machine with FIPS-enabled OpenJDK (Tested on RHEL 8.6):\n+```\n+cd keycloak-999-SNAPSHOT/bin\n+./kc.sh start-dev\n+```\n+\n+NOTE: Right now, server should start, and I am able to create admin user on `http://localhost:8080`, but I am not able to finish\n+login to the admin console. However the Keycloak uses bouncycastle-fips libraries and the `CryptoIntegration` uses `FIPS1402Provider`. More fixes are required to have Keycloak server working...\n\\ No newline at end of file\n" }, { "change_type": "MODIFY", "old_path": "pom.xml", "new_path": "pom.xml", "diff": "<apache.mime4j.version>0.6</apache.mime4j.version>\n<jboss.dmr.version>1.5.1.Final</jboss.dmr.version>\n<bouncycastle.version>1.68</bouncycastle.version>\n+\n+ <!-- TODO Are these correct versions? -->\n+ <bouncycastle.fips.version>1.0.2.3</bouncycastle.fips.version>\n+ <bouncycastle.pkixfips.version>1.0.5</bouncycastle.pkixfips.version>\n+ <bouncycastle.tlsfips.version>1.0.12.2</bouncycastle.tlsfips.version>\n+\n<cxf.version>3.3.10</cxf.version>\n<cxf.jetty.version>3.3.10</cxf.jetty.version>\n<cxf.jaxrs.version>3.3.10</cxf.jaxrs.version>\n<module>boms</module>\n<module>common</module>\n<module>core</module>\n+ <module>crypto</module>\n<module>dependencies</module>\n<module>docs</module>\n<module>server-spi</module>\n<artifactId>bcpkix-jdk15on</artifactId>\n<version>${bouncycastle.version}</version>\n</dependency>\n+ <dependency>\n+ <groupId>org.bouncycastle</groupId>\n+ <artifactId>bc-fips</artifactId>\n+ <version>${bouncycastle.fips.version}</version>\n+ </dependency>\n+ <dependency>\n+ <groupId>org.bouncycastle</groupId>\n+ <artifactId>bctls-fips</artifactId>\n+ <version>${bouncycastle.tlsfips.version}</version>\n+ </dependency>\n+ <dependency>\n+ <groupId>org.bouncycastle</groupId>\n+ <artifactId>bcpkix-fips</artifactId>\n+ <version>${bouncycastle.pkixfips.version}</version>\n+ </dependency>\n<dependency>\n<groupId>com.github.ua-parser</groupId>\n<artifactId>uap-java</artifactId>\n<artifactId>keycloak-client-registration-cli</artifactId>\n<version>${project.version}</version>\n</dependency>\n+ <dependency>\n+ <groupId>org.keycloak</groupId>\n+ <artifactId>keycloak-fips1402</artifactId>\n+ <version>${project.version}</version>\n+ </dependency>\n<dependency>\n<groupId>org.keycloak</groupId>\n<artifactId>keycloak-admin-cli</artifactId>\n" }, { "change_type": "MODIFY", "old_path": "quarkus/runtime/pom.xml", "new_path": "quarkus/runtime/pom.xml", "diff": "</exclusion>\n</exclusions>\n</dependency>\n- <dependency>\n- <groupId>org.bouncycastle</groupId>\n- <artifactId>bcpkix-jdk15on</artifactId>\n- <exclusions>\n- <exclusion>\n- <groupId>*</groupId>\n- <artifactId>*</artifactId>\n- </exclusion>\n- </exclusions>\n- </dependency>\n- <dependency>\n- <groupId>org.bouncycastle</groupId>\n- <artifactId>bcprov-jdk15on</artifactId>\n- <exclusions>\n- <exclusion>\n- <groupId>*</groupId>\n- <artifactId>*</artifactId>\n- </exclusion>\n- </exclusions>\n- </dependency>\n<dependency>\n<groupId>org.infinispan</groupId>\n<artifactId>infinispan-server-hotrod</artifactId>\n</dependency>\n</dependencies>\n</profile>\n+\n+ <profile>\n+ <id>crypto-default</id>\n+ <activation>\n+ <property>\n+ <name>!fips140-2</name>\n+ </property>\n+ </activation>\n+ <dependencies>\n+ <dependency>\n+ <groupId>org.bouncycastle</groupId>\n+ <artifactId>bcpkix-jdk15on</artifactId>\n+ <exclusions>\n+ <exclusion>\n+ <groupId>*</groupId>\n+ <artifactId>*</artifactId>\n+ </exclusion>\n+ </exclusions>\n+ </dependency>\n+ <dependency>\n+ <groupId>org.bouncycastle</groupId>\n+ <artifactId>bcprov-jdk15on</artifactId>\n+ <exclusions>\n+ <exclusion>\n+ <groupId>*</groupId>\n+ <artifactId>*</artifactId>\n+ </exclusion>\n+ </exclusions>\n+ </dependency>\n+ </dependencies>\n+ </profile>\n+\n+ <profile>\n+ <id>fips140-2</id>\n+ <activation>\n+ <property>\n+ <name>fips140-2</name>\n+ </property>\n+ </activation>\n+ <dependencies>\n+ <dependency>\n+ <groupId>org.keycloak</groupId>\n+ <artifactId>keycloak-fips1402</artifactId>\n+ </dependency>\n+ </dependencies>\n+ </profile>\n</profiles>\n<build>\n" } ]

[ { "change_type": "MODIFY", "old_path": ".github/workflows/ci.yml", "new_path": ".github/workflows/ci.yml", "diff": "@@ -327,10 +327,7 @@ jobs:\n- name: Run cluster tests\nif: ${{ github.event_name != 'pull_request' || env.GIT_DIFF != 0 }}\nrun: |\n- echo '::group::Compiling testsuite'\n- ./mvnw clean install -nsu -B -Pauth-server-wildfly,auth-server-cluster,db-mysql,jpa -Dsession.cache.owners=2 -DskipTests -f testsuite/integration-arquillian/pom.xml\n- echo '::endgroup::'\n- ./mvnw clean install -nsu -B -Pauth-server-wildfly,auth-server-cluster,db-mysql,jpa -Dsession.cache.owners=2 -Dbackends.console.output=true -Dauth.server.log.check=false -Dfrontend.console.output=true -Dtest=org.keycloak.testsuite.cluster.**.*Test -f testsuite/integration-arquillian/tests/base/pom.xml | misc/log/trimmer.sh\n+ ./mvnw clean install -nsu -B -Pauth-server-wildfly,auth-server-cluster,db-mysql,jpa -Dsession.cache.owners=2 -Dbackends.console.output=true -Dauth.server.log.check=false -Dfrontend.console.output=true -Dtest=org.keycloak.testsuite.cluster.**.*Test -f testsuite/integration-arquillian/pom.xml | misc/log/trimmer.sh\nTEST_RESULT=${PIPESTATUS[0]}\nfind . -path '*/target/surefire-reports/*.xml' | zip -q reports-cluster-tests.zip -@\nexit $TEST_RESULT\n@@ -439,7 +436,7 @@ jobs:\necho '::group::Compiling testsuite'\n./mvnw clean install -nsu -B -Pauth-server-quarkus -DskipTests -f testsuite/pom.xml\necho '::endgroup::'\n- ./mvnw clean install -nsu -B -Pauth-server-cluster-quarkus -Dsession.cache.owners=2 -Dtest=**.cluster.** -f testsuite/integration-arquillian/tests/base/pom.xml | misc/log/trimmer.sh\n+ ./mvnw clean install -nsu -B -Pauth-server-cluster-quarkus -Dsession.cache.owners=2 -Dtest=**.cluster.** -f testsuite/integration-arquillian/pom.xml | misc/log/trimmer.sh\nTEST_RESULT=${PIPESTATUS[0]}\nfind . -path '*/target/surefire-reports/*.xml' | zip -q reports-quarkus-cluster-tests.zip -@\nexit $TEST_RESULT\n" }, { "change_type": "MODIFY", "old_path": "pom.xml", "new_path": "pom.xml", "diff": "<forkMode>once</forkMode>\n<argLine>-Djava.awt.headless=true ${surefire.memory.settings} ${surefire.system.args} -Duser.language=en -Duser.region=US</argLine>\n<runOrder>alphabetical</runOrder>\n+ <failIfNoSpecifiedTests>false</failIfNoSpecifiedTests>\n</configuration>\n</plugin>\n<plugin>\n" } ]

[ { "change_type": "MODIFY", "old_path": "pom.xml", "new_path": "pom.xml", "diff": "<!-- Frontend -->\n<node.version>v16.13.2</node.version>\n-\n- <!-- Minimum Java version supported for running Keycloak -->\n- <!-- maven.compiler.target and maven.compiler.source already set to 1.8 in the parent pom -->\n- <!-- other modules will configure a higher Java version (for example Quarkus) -->\n- <maven.compiler.release>8</maven.compiler.release>\n</properties>\n<url>http://keycloak.org</url>\n</build>\n</profile>\n+ <profile>\n+ <id>built-with-jdk-9-or-later</id>\n+ <activation>\n+ <!-- only activate this on JDK 9 or later as this option is unknown for JDK 8, and as it is not necessary for JDK 8 -->\n+ <!-- support for running with JDK 8 is still necessary for some downstream integration tests -->\n+ <jdk>(9,)</jdk>\n+ </activation>\n+ <properties>\n+ <!-- Minimum Java version supported for running Keycloak -->\n+ <!-- maven.compiler.target and maven.compiler.source already set to 1.8 in the parent pom -->\n+ <!-- other modules will configure a higher Java version (for example, Quarkus) -->\n+ <maven.compiler.release>8</maven.compiler.release>\n+ </properties>\n+ </profile>\n+\n<profile>\n<id>nexus-staging</id>\n<build>\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaMapKeycloakTransaction.java", "new_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaMapKeycloakTransaction.java", "diff": "@@ -31,8 +31,9 @@ import javax.persistence.criteria.Predicate;\nimport javax.persistence.criteria.Root;\nimport javax.persistence.criteria.Selection;\nimport org.jboss.logging.Logger;\n-import static org.keycloak.models.map.storage.jpa.PaginationUtils.paginateQuery;\n+import org.keycloak.common.util.Time;\nimport org.keycloak.models.map.common.AbstractEntity;\n+import org.keycloak.models.map.common.ExpirableEntity;\nimport org.keycloak.models.map.common.StringKeyConverter;\nimport org.keycloak.models.map.common.StringKeyConverter.UUIDKey;\nimport org.keycloak.models.map.storage.MapKeycloakTransaction;\n@@ -40,7 +41,9 @@ import org.keycloak.models.map.storage.QueryParameters;\nimport org.keycloak.models.map.storage.chm.MapFieldPredicates;\nimport org.keycloak.models.map.storage.chm.MapModelCriteriaBuilder;\n+import static org.keycloak.models.map.common.ExpirationUtils.isExpired;\nimport static org.keycloak.models.map.storage.jpa.JpaMapStorageProviderFactory.CLONER;\n+import static org.keycloak.models.map.storage.jpa.PaginationUtils.paginateQuery;\nimport static org.keycloak.utils.StreamsUtil.closing;\npublic abstract class JpaMapKeycloakTransaction<RE extends JpaRootEntity, E extends AbstractEntity, M> implements MapKeycloakTransaction<E, M> {\n@@ -48,6 +51,7 @@ public abstract class JpaMapKeycloakTransaction<RE extends JpaRootEntity, E exte\nprivate static final Logger logger = Logger.getLogger(JpaMapKeycloakTransaction.class);\nprivate final Class<RE> entityType;\nprivate final Class<M> modelType;\n+ private final boolean isExpirableEntity;\nprotected EntityManager em;\n@SuppressWarnings(\"unchecked\")\n@@ -55,6 +59,7 @@ public abstract class JpaMapKeycloakTransaction<RE extends JpaRootEntity, E exte\nthis.em = em;\nthis.entityType = entityType;\nthis.modelType = modelType;\n+ this.isExpirableEntity = ExpirableEntity.class.isAssignableFrom(entityType);\n}\nprotected abstract Selection<? extends RE> selectCbConstruct(CriteriaBuilder cb, Root<RE> root);\n@@ -98,7 +103,8 @@ public abstract class JpaMapKeycloakTransaction<RE extends JpaRootEntity, E exte\nif (key == null) return null;\nUUID uuid = StringKeyConverter.UUIDKey.INSTANCE.fromStringSafe(key);\nif (uuid == null) return null;\n- return mapToEntityDelegateUnique(em.find(entityType, uuid));\n+ E e = mapToEntityDelegateUnique(em.find(entityType, uuid));\n+ return e != null && isExpirableEntity && isExpired((ExpirableEntity) e, true) ? null : e;\n}\n@Override\n@@ -132,6 +138,10 @@ public abstract class JpaMapKeycloakTransaction<RE extends JpaRootEntity, E exte\n}\nBiFunction<CriteriaBuilder, Root<RE>, Predicate> predicateFunc = mcb.getPredicateFunc();\n+ if (this.isExpirableEntity) {\n+ predicateFunc = predicateFunc != null ? predicateFunc.andThen(predicate -> cb.and(predicate, notExpired(cb, root)))\n+ : this::notExpired;\n+ }\nif (predicateFunc != null) query.where(predicateFunc.apply(cb, root));\nreturn closing(paginateQuery(em.createQuery(query), queryParameters.getOffset(), queryParameters.getLimit()).getResultStream())\n@@ -233,4 +243,9 @@ public abstract class JpaMapKeycloakTransaction<RE extends JpaRootEntity, E exte\npublic boolean isActive() {\nreturn em.getTransaction().isActive();\n}\n+\n+ private Predicate notExpired(final CriteriaBuilder cb, final Root<RE> root) {\n+ return cb.or(cb.greaterThan(root.get(\"expiration\"), Time.currentTimeMillis()),\n+ cb.isNull(root.get(\"expiration\")));\n+ }\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/BackchannelAuthenticationEndpoint.java", "new_path": "services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/BackchannelAuthenticationEndpoint.java", "diff": "@@ -31,6 +31,7 @@ import org.keycloak.models.OAuth2DeviceUserCodeModel;\nimport org.keycloak.models.RealmModel;\nimport org.keycloak.models.SingleUseObjectProvider;\nimport org.keycloak.models.UserModel;\n+import org.keycloak.protocol.oidc.TokenManager;\nimport org.keycloak.protocol.oidc.grants.ciba.CibaGrantType;\nimport org.keycloak.protocol.oidc.grants.ciba.channel.AuthenticationChannelProvider;\nimport org.keycloak.protocol.oidc.grants.ciba.channel.CIBAAuthenticationRequest;\n@@ -173,6 +174,10 @@ public class BackchannelAuthenticationEndpoint extends AbstractCibaEndpoint {\nthrow new ErrorResponseException(OAuthErrorException.INVALID_REQUEST, \"missing parameter : scope\",\nResponse.Status.BAD_REQUEST);\n}\n+ if (!TokenManager.isValidScope(scope, client)) {\n+ throw new ErrorResponseException(OAuthErrorException.INVALID_REQUEST, \"Invalid scopes: \" + scope,\n+ Response.Status.BAD_REQUEST);\n+ }\nrequest.setScope(scope);\n// optional parameters\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/CIBATest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/CIBATest.java", "diff": "@@ -2285,6 +2285,34 @@ public class CIBATest extends AbstractClientPoliciesTest {\n}\n+ @Test\n+ public void testBackchannelAuthenticationFlowWithInvalidScope() throws Exception {\n+ ClientResource clientResource = null;\n+ ClientRepresentation clientRep = null;\n+ try {\n+ final String username = \"nutzername-rot\";\n+ final String bindingMessage = \"valid_binding_message\";\n+ final String invalidScope = \"not_exist_scope\";\n+\n+ // prepare CIBA settings\n+ clientResource = ApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME);\n+ assertThat(clientResource, notNullValue());\n+\n+ clientRep = clientResource.toRepresentation();\n+ prepareCIBASettings(clientResource, clientRep);\n+ oauth.scope(invalidScope);\n+\n+ // user Backchannel Authentication Request\n+ AuthenticationRequestAcknowledgement response = oauth.doBackchannelAuthenticationRequest(TEST_CLIENT_NAME, TEST_CLIENT_PASSWORD, username, bindingMessage, null, null, null);\n+ assertThat(response.getStatusCode(), is(equalTo(400)));\n+ assertThat(response.getError(), is(OAuthErrorException.INVALID_REQUEST));\n+ assertThat(response.getErrorDescription(), is(\"Invalid scopes: \" + OAuth2Constants.SCOPE_OPENID + \" \" + invalidScope));\n+\n+ } finally {\n+ revertCIBASettings(clientResource, clientRep);\n+ }\n+ }\n+\nprivate void testBackchannelAuthenticationFlowNotRegisterSigAlgInAdvanceWithSignedAuthentication(String clientName, boolean useRequestUri, String requestedSigAlg, String sigAlg, int statusCode, String errorDescription) throws Exception {\nString clientId = createClientDynamically(clientName, (OIDCClientRepresentation clientRep) -> {\nList<String> grantTypes = Optional.ofNullable(clientRep.getGrantTypes()).orElse(new ArrayList<>());\n" } ]

[ { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/protocol/oidc/grants/device/clientpolicy/context/DeviceTokenRequestContext.java", "new_path": "services/src/main/java/org/keycloak/protocol/oidc/grants/device/clientpolicy/context/DeviceTokenRequestContext.java", "diff": "@@ -39,7 +39,7 @@ public class DeviceTokenRequestContext implements ClientPolicyContext {\n@Override\npublic ClientPolicyEvent getEvent() {\n- return ClientPolicyEvent.DEVICE_AUTHORIZATION_REQUEST;\n+ return ClientPolicyEvent.DEVICE_TOKEN_REQUEST;\n}\npublic OAuth2DeviceCodeModel getDeviceCodeModel() {\n" }, { "change_type": "RENAME", "old_path": "testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/services/clientpolicy/condition/TestRaiseExeptionCondition.java", "new_path": "testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/services/clientpolicy/condition/TestRaiseExceptionCondition.java", "diff": "@@ -28,9 +28,9 @@ import org.keycloak.representations.idm.ClientPolicyConditionConfigurationRepres\n/**\n* @author <a href=\"mailto:[email protected]\">Takashi Norimatsu</a>\n*/\n-public class TestRaiseExeptionCondition extends AbstractClientPolicyConditionProvider<TestRaiseExeptionCondition.Configuration> {\n+public class TestRaiseExceptionCondition extends AbstractClientPolicyConditionProvider<TestRaiseExceptionCondition.Configuration> {\n- public TestRaiseExeptionCondition(KeycloakSession session) {\n+ public TestRaiseExceptionCondition(KeycloakSession session) {\nsuper(session);\n}\n@@ -44,7 +44,7 @@ public class TestRaiseExeptionCondition extends AbstractClientPolicyConditionPro\n@Override\npublic String getProviderId() {\n- return TestRaiseExeptionConditionFactory.PROVIDER_ID;\n+ return TestRaiseExceptionConditionFactory.PROVIDER_ID;\n}\n@Override\n" }, { "change_type": "RENAME", "old_path": "testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/services/clientpolicy/condition/TestRaiseExeptionConditionFactory.java", "new_path": "testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/services/clientpolicy/condition/TestRaiseExceptionConditionFactory.java", "diff": "@@ -30,13 +30,13 @@ import org.keycloak.services.clientpolicy.condition.ClientPolicyConditionProvide\n/**\n* @author <a href=\"mailto:[email protected]\">Takashi Norimatsu</a>\n*/\n-public class TestRaiseExeptionConditionFactory implements ClientPolicyConditionProviderFactory {\n+public class TestRaiseExceptionConditionFactory implements ClientPolicyConditionProviderFactory {\npublic static final String PROVIDER_ID = \"test-raise-exception\";\n@Override\npublic ClientPolicyConditionProvider create(KeycloakSession session) {\n- return new TestRaiseExeptionCondition(session);\n+ return new TestRaiseExceptionCondition(session);\n}\n@Override\n" }, { "change_type": "RENAME", "old_path": "testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/services/clientpolicy/executor/TestRaiseExeptionExecutor.java", "new_path": "testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/services/clientpolicy/executor/TestRaiseExceptionExecutor.java", "diff": "package org.keycloak.testsuite.services.clientpolicy.executor;\n+import java.util.List;\n+\nimport org.jboss.logging.Logger;\nimport org.keycloak.models.KeycloakSession;\nimport org.keycloak.services.clientpolicy.ClientPolicyContext;\n@@ -25,19 +27,42 @@ import org.keycloak.services.clientpolicy.ClientPolicyException;\nimport org.keycloak.representations.idm.ClientPolicyExecutorConfigurationRepresentation;\nimport org.keycloak.services.clientpolicy.executor.ClientPolicyExecutorProvider;\n-public class TestRaiseExeptionExecutor implements ClientPolicyExecutorProvider<ClientPolicyExecutorConfigurationRepresentation> {\n+public class TestRaiseExceptionExecutor implements ClientPolicyExecutorProvider<TestRaiseExceptionExecutor.Configuration> {\n- private static final Logger logger = Logger.getLogger(TestRaiseExeptionExecutor.class);\n+ private static final Logger logger = Logger.getLogger(TestRaiseExceptionExecutor.class);\nprotected final KeycloakSession session;\n+ private Configuration configuration;\n- public TestRaiseExeptionExecutor(KeycloakSession session) {\n+ public TestRaiseExceptionExecutor(KeycloakSession session) {\nthis.session = session;\n}\n+ @Override\n+ public void setupConfiguration(TestRaiseExceptionExecutor.Configuration config) {\n+ this.configuration = config;\n+ }\n+\n+ @Override\n+ public Class<Configuration> getExecutorConfigurationClass() {\n+ return Configuration.class;\n+ }\n+\n+ public static class Configuration extends ClientPolicyExecutorConfigurationRepresentation {\n+ protected List<ClientPolicyEvent> events;\n+\n+ public List<ClientPolicyEvent> getEvents() {\n+ return events;\n+ }\n+\n+ public void setEvents(List<ClientPolicyEvent> events) {\n+ this.events = events;\n+ }\n+ }\n+\n@Override\npublic String getProviderId() {\n- return TestRaiseExeptionExecutorFactory.PROVIDER_ID;\n+ return TestRaiseExceptionExecutorFactory.PROVIDER_ID;\n}\n@Override\n@@ -47,20 +72,9 @@ public class TestRaiseExeptionExecutor implements ClientPolicyExecutorProvider<C\nprivate boolean isThrowExceptionNeeded(ClientPolicyEvent event) {\nlogger.tracev(\"Client Policy Trigger Event = {0}\", event);\n- switch (event) {\n- case REGISTERED:\n- case UPDATED:\n- case UNREGISTER:\n- case SERVICE_ACCOUNT_TOKEN_REQUEST:\n- case BACKCHANNEL_AUTHENTICATION_REQUEST:\n- case BACKCHANNEL_TOKEN_REQUEST:\n- case PUSHED_AUTHORIZATION_REQUEST:\n- case DEVICE_AUTHORIZATION_REQUEST:\n- case DEVICE_TOKEN_REQUEST:\n- return true;\n- default :\n- return false;\n+ if (configuration != null && configuration.getEvents() != null && !configuration.getEvents().isEmpty()) {\n+ return configuration.getEvents().contains(event);\n}\n-\n+ return false;\n}\n}\n\\ No newline at end of file\n" }, { "change_type": "RENAME", "old_path": "testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/services/clientpolicy/executor/TestRaiseExeptionExecutorFactory.java", "new_path": "testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/services/clientpolicy/executor/TestRaiseExceptionExecutorFactory.java", "diff": "@@ -27,13 +27,13 @@ import org.keycloak.provider.ProviderConfigProperty;\nimport org.keycloak.services.clientpolicy.executor.ClientPolicyExecutorProvider;\nimport org.keycloak.services.clientpolicy.executor.ClientPolicyExecutorProviderFactory;\n-public class TestRaiseExeptionExecutorFactory implements ClientPolicyExecutorProviderFactory {\n+public class TestRaiseExceptionExecutorFactory implements ClientPolicyExecutorProviderFactory {\npublic static final String PROVIDER_ID = \"test-raise-exception\";\n@Override\npublic ClientPolicyExecutorProvider create(KeycloakSession session) {\n- return new TestRaiseExeptionExecutor(session);\n+ return new TestRaiseExceptionExecutor(session);\n}\n@Override\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/resources/META-INF/services/org.keycloak.services.clientpolicy.condition.ClientPolicyConditionProviderFactory", "new_path": "testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/resources/META-INF/services/org.keycloak.services.clientpolicy.condition.ClientPolicyConditionProviderFactory", "diff": "-org.keycloak.testsuite.services.clientpolicy.condition.TestRaiseExeptionConditionFactory\n\\ No newline at end of file\n+org.keycloak.testsuite.services.clientpolicy.condition.TestRaiseExceptionConditionFactory\n\\ No newline at end of file\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/resources/META-INF/services/org.keycloak.services.clientpolicy.executor.ClientPolicyExecutorProviderFactory", "new_path": "testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/resources/META-INF/services/org.keycloak.services.clientpolicy.executor.ClientPolicyExecutorProviderFactory", "diff": "-org.keycloak.testsuite.services.clientpolicy.executor.TestRaiseExeptionExecutorFactory\n\\ No newline at end of file\n+org.keycloak.testsuite.services.clientpolicy.executor.TestRaiseExceptionExecutorFactory\n\\ No newline at end of file\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/CIBATest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/CIBATest.java", "diff": "@@ -43,6 +43,7 @@ import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientRolesCo\nimport static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientScopesConditionConfig;\nimport static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientUpdateContextConditionConfig;\nimport static org.keycloak.testsuite.util.ClientPoliciesUtil.createSecureCibaAuthenticationRequestSigningAlgorithmExecutorConfig;\n+import static org.keycloak.testsuite.util.ClientPoliciesUtil.createTestRaiseExeptionExecutorConfig;\nimport java.io.IOException;\nimport java.net.URI;\n@@ -109,7 +110,7 @@ import org.keycloak.testsuite.client.resources.TestApplicationResourceUrls;\nimport org.keycloak.testsuite.client.resources.TestOIDCEndpointsApplicationResource;\nimport org.keycloak.testsuite.rest.representation.TestAuthenticationChannelRequest;\nimport org.keycloak.testsuite.rest.resource.TestingOIDCEndpointsApplicationResource.AuthorizationEndpointRequestObject;\n-import org.keycloak.testsuite.services.clientpolicy.executor.TestRaiseExeptionExecutorFactory;\n+import org.keycloak.testsuite.services.clientpolicy.executor.TestRaiseExceptionExecutorFactory;\nimport org.keycloak.testsuite.util.InfinispanTestTimeServiceRule;\nimport org.keycloak.testsuite.util.KeycloakModelUtils;\nimport org.keycloak.testsuite.util.Matchers;\n@@ -1789,7 +1790,8 @@ public class CIBATest extends AbstractClientPoliciesTest {\n// register profiles\nString json = (new ClientProfilesBuilder()).addProfile(\n(new ClientProfileBuilder()).createProfile(PROFILE_NAME, \"Den Forste Profilen\")\n- .addExecutor(TestRaiseExeptionExecutorFactory.PROVIDER_ID, null)\n+ .addExecutor(TestRaiseExceptionExecutorFactory.PROVIDER_ID,\n+ createTestRaiseExeptionExecutorConfig(Arrays.asList(ClientPolicyEvent.BACKCHANNEL_AUTHENTICATION_REQUEST)))\n.toRepresentation()\n).toString();\nupdateProfiles(json);\n@@ -1848,7 +1850,8 @@ public class CIBATest extends AbstractClientPoliciesTest {\n// register profiles\nString json = (new ClientProfilesBuilder()).addProfile(\n(new ClientProfileBuilder()).createProfile(PROFILE_NAME, \"Den Forste Profilen\")\n- .addExecutor(TestRaiseExeptionExecutorFactory.PROVIDER_ID, null)\n+ .addExecutor(TestRaiseExceptionExecutorFactory.PROVIDER_ID,\n+ createTestRaiseExeptionExecutorConfig(Arrays.asList(ClientPolicyEvent.BACKCHANNEL_TOKEN_REQUEST)))\n.toRepresentation()\n).toString();\nupdateProfiles(json);\n@@ -2216,7 +2219,8 @@ public class CIBATest extends AbstractClientPoliciesTest {\n// register profiles\nString json = (new ClientProfilesBuilder()).addProfile(\n(new ClientProfileBuilder()).createProfile(PROFILE_NAME, \"Het Eerste Profiel\")\n- .addExecutor(TestRaiseExeptionExecutorFactory.PROVIDER_ID, null)\n+ .addExecutor(TestRaiseExceptionExecutorFactory.PROVIDER_ID,\n+ createTestRaiseExeptionExecutorConfig(Arrays.asList(ClientPolicyEvent.BACKCHANNEL_AUTHENTICATION_REQUEST)))\n.toRepresentation()\n).toString();\nupdateProfiles(json);\n@@ -2243,6 +2247,14 @@ public class CIBATest extends AbstractClientPoliciesTest {\nassertThat(response.getStatusCode(), is(equalTo(200)));\nAssert.assertNotNull(response.getAuthReqId());\n+ json = (new ClientProfilesBuilder()).addProfile(\n+ (new ClientProfileBuilder()).createProfile(PROFILE_NAME, \"Het Eerste Profiel\")\n+ .addExecutor(TestRaiseExceptionExecutorFactory.PROVIDER_ID,\n+ createTestRaiseExeptionExecutorConfig(Arrays.asList(ClientPolicyEvent.BACKCHANNEL_TOKEN_REQUEST)))\n+ .toRepresentation()\n+ ).toString();\n+ updateProfiles(json);\n+\njson = (new ClientPoliciesBuilder()).addPolicy(\n(new ClientPolicyBuilder()).createPolicy(POLICY_NAME, \"Het Eerste Beleid\", Boolean.TRUE)\n.addCondition(ClientScopesConditionFactory.PROVIDER_ID,\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientPoliciesTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientPoliciesTest.java", "diff": "@@ -122,8 +122,8 @@ import org.keycloak.testsuite.pages.LogoutConfirmPage;\nimport org.keycloak.testsuite.pages.OAuth2DeviceVerificationPage;\nimport org.keycloak.testsuite.pages.OAuthGrantPage;\nimport org.keycloak.testsuite.rest.resource.TestingOIDCEndpointsApplicationResource.AuthorizationEndpointRequestObject;\n-import org.keycloak.testsuite.services.clientpolicy.condition.TestRaiseExeptionConditionFactory;\n-import org.keycloak.testsuite.services.clientpolicy.executor.TestRaiseExeptionExecutorFactory;\n+import org.keycloak.testsuite.services.clientpolicy.condition.TestRaiseExceptionConditionFactory;\n+import org.keycloak.testsuite.services.clientpolicy.executor.TestRaiseExceptionExecutorFactory;\nimport org.keycloak.testsuite.updaters.ClientAttributeUpdater;\nimport org.keycloak.testsuite.util.ClientBuilder;\nimport org.keycloak.testsuite.util.ClientPoliciesUtil;\n@@ -169,6 +169,7 @@ import static org.keycloak.testsuite.util.ClientPoliciesUtil.createSecureRespons\nimport static org.keycloak.testsuite.util.ClientPoliciesUtil.createSecureSigningAlgorithmEnforceExecutorConfig;\nimport static org.keycloak.testsuite.util.ClientPoliciesUtil.createSecureSigningAlgorithmForSignedJwtEnforceExecutorConfig;\nimport static org.keycloak.testsuite.util.ClientPoliciesUtil.createTestRaiseExeptionConditionConfig;\n+import static org.keycloak.testsuite.util.ClientPoliciesUtil.createTestRaiseExeptionExecutorConfig;\n/**\n* @author <a href=\"mailto:[email protected]\">Takashi Norimatsu</a>\n@@ -734,7 +735,7 @@ public class ClientPoliciesTest extends AbstractClientPoliciesTest {\n// register policies\nString json = (new ClientPoliciesBuilder()).addPolicy(\n(new ClientPolicyBuilder()).createPolicy(POLICY_NAME, \"Fyrsta Stefnan\", Boolean.TRUE)\n- .addCondition(TestRaiseExeptionConditionFactory.PROVIDER_ID,\n+ .addCondition(TestRaiseExceptionConditionFactory.PROVIDER_ID,\ncreateTestRaiseExeptionConditionConfig())\n.toRepresentation()\n).toString();\n@@ -2083,7 +2084,8 @@ public class ClientPoliciesTest extends AbstractClientPoliciesTest {\n// register profiles\nString json = (new ClientProfilesBuilder()).addProfile(\n(new ClientProfileBuilder()).createProfile(PROFILE_NAME, \"Den Forste Profilen\")\n- .addExecutor(TestRaiseExeptionExecutorFactory.PROVIDER_ID, null)\n+ .addExecutor(TestRaiseExceptionExecutorFactory.PROVIDER_ID,\n+ createTestRaiseExeptionExecutorConfig(Arrays.asList(ClientPolicyEvent.SERVICE_ACCOUNT_TOKEN_REQUEST)))\n.toRepresentation()\n).toString();\nupdateProfiles(json);\n@@ -2358,7 +2360,9 @@ public class ClientPoliciesTest extends AbstractClientPoliciesTest {\n// register profiles\nString json = (new ClientProfilesBuilder()).addProfile(\n(new ClientProfileBuilder()).createProfile(PROFILE_NAME, \"Den Forste Profilen\")\n- .addExecutor(TestRaiseExeptionExecutorFactory.PROVIDER_ID, null)\n+ .addExecutor(TestRaiseExceptionExecutorFactory.PROVIDER_ID,\n+ createTestRaiseExeptionExecutorConfig(Arrays.asList(\n+ ClientPolicyEvent.REGISTERED, ClientPolicyEvent.UPDATED, ClientPolicyEvent.UNREGISTER)))\n.toRepresentation()\n).toString();\nupdateProfiles(json);\n@@ -2632,7 +2636,8 @@ public class ClientPoliciesTest extends AbstractClientPoliciesTest {\n// register profiles\nString json = (new ClientProfilesBuilder()).addProfile(\n(new ClientProfileBuilder()).createProfile(PROFILE_NAME, \"Den Forste Profilen\")\n- .addExecutor(TestRaiseExeptionExecutorFactory.PROVIDER_ID, null)\n+ .addExecutor(TestRaiseExceptionExecutorFactory.PROVIDER_ID,\n+ createTestRaiseExeptionExecutorConfig(Arrays.asList(ClientPolicyEvent.DEVICE_AUTHORIZATION_REQUEST)))\n.toRepresentation()\n).toString();\nupdateProfiles(json);\n@@ -2688,7 +2693,8 @@ public class ClientPoliciesTest extends AbstractClientPoliciesTest {\n// register profiles\nString json = (new ClientProfilesBuilder()).addProfile(\n(new ClientProfileBuilder()).createProfile(PROFILE_NAME, \"Den Forste Profilen\")\n- .addExecutor(TestRaiseExeptionExecutorFactory.PROVIDER_ID, null)\n+ .addExecutor(TestRaiseExceptionExecutorFactory.PROVIDER_ID,\n+ createTestRaiseExeptionExecutorConfig(Arrays.asList(ClientPolicyEvent.DEVICE_TOKEN_REQUEST)))\n.toRepresentation()\n).toString();\nupdateProfiles(json);\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/par/ParTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/par/ParTest.java", "diff": "@@ -67,7 +67,7 @@ import org.keycloak.testsuite.client.AbstractClientPoliciesTest;\nimport org.keycloak.testsuite.client.resources.TestApplicationResourceUrls;\nimport org.keycloak.testsuite.client.resources.TestOIDCEndpointsApplicationResource;\nimport org.keycloak.testsuite.rest.resource.TestingOIDCEndpointsApplicationResource;\n-import org.keycloak.testsuite.services.clientpolicy.executor.TestRaiseExeptionExecutorFactory;\n+import org.keycloak.testsuite.services.clientpolicy.executor.TestRaiseExceptionExecutorFactory;\nimport org.keycloak.testsuite.util.ClientBuilder;\nimport org.keycloak.testsuite.util.OAuthClient;\nimport org.keycloak.testsuite.util.RoleBuilder;\n@@ -79,6 +79,7 @@ import org.keycloak.testsuite.util.OAuthClient.ParResponse;\nimport org.keycloak.util.JsonSerialization;\nimport static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientRolesConditionConfig;\n+import static org.keycloak.testsuite.util.ClientPoliciesUtil.createTestRaiseExeptionExecutorConfig;\npublic class ParTest extends AbstractClientPoliciesTest {\n@@ -1147,7 +1148,8 @@ public class ParTest extends AbstractClientPoliciesTest {\n// register profiles\nString json = (new ClientProfilesBuilder()).addProfile(\n(new ClientProfileBuilder()).createProfile(PROFILE_NAME, \"Den Forste Profilen\")\n- .addExecutor(TestRaiseExeptionExecutorFactory.PROVIDER_ID, null)\n+ .addExecutor(TestRaiseExceptionExecutorFactory.PROVIDER_ID,\n+ createTestRaiseExeptionExecutorConfig(Arrays.asList(ClientPolicyEvent.PUSHED_AUTHORIZATION_REQUEST)))\n.toRepresentation()\n).toString();\nupdateProfiles(json);\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/ClientPoliciesUtil.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/ClientPoliciesUtil.java", "diff": "@@ -30,6 +30,7 @@ import org.keycloak.representations.idm.ClientPolicyExecutorRepresentation;\nimport org.keycloak.representations.idm.ClientPolicyRepresentation;\nimport org.keycloak.representations.idm.ClientProfileRepresentation;\nimport org.keycloak.representations.idm.ClientProfilesRepresentation;\n+import org.keycloak.services.clientpolicy.ClientPolicyEvent;\nimport org.keycloak.services.clientpolicy.condition.ClientAccessTypeCondition;\nimport org.keycloak.services.clientpolicy.condition.ClientRolesCondition;\nimport org.keycloak.services.clientpolicy.condition.ClientScopesCondition;\n@@ -47,7 +48,8 @@ import org.keycloak.services.clientpolicy.executor.SecureRequestObjectExecutor;\nimport org.keycloak.services.clientpolicy.executor.SecureResponseTypeExecutor;\nimport org.keycloak.services.clientpolicy.executor.SecureSigningAlgorithmExecutor;\nimport org.keycloak.services.clientpolicy.executor.SecureSigningAlgorithmForSignedJwtExecutor;\n-import org.keycloak.testsuite.services.clientpolicy.condition.TestRaiseExeptionCondition;\n+import org.keycloak.testsuite.services.clientpolicy.condition.TestRaiseExceptionCondition;\n+import org.keycloak.testsuite.services.clientpolicy.executor.TestRaiseExceptionExecutor;\nimport org.keycloak.util.JsonSerialization;\nimport java.util.ArrayList;\n@@ -302,8 +304,14 @@ public final class ClientPoliciesUtil {\n// Client Policies - Condition CRUD Operations\n- public static TestRaiseExeptionCondition.Configuration createTestRaiseExeptionConditionConfig() {\n- return new TestRaiseExeptionCondition.Configuration();\n+ public static TestRaiseExceptionCondition.Configuration createTestRaiseExeptionConditionConfig() {\n+ return new TestRaiseExceptionCondition.Configuration();\n+ }\n+\n+ public static TestRaiseExceptionExecutor.Configuration createTestRaiseExeptionExecutorConfig(List<ClientPolicyEvent> events) {\n+ TestRaiseExceptionExecutor.Configuration conf = new TestRaiseExceptionExecutor.Configuration();\n+ conf.setEvents(events);\n+ return conf;\n}\npublic static ClientPolicyConditionConfigurationRepresentation createAnyClientConditionConfig() {\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/legacy-private/src/main/java/org/keycloak/storage/UserStorageManager.java", "new_path": "model/legacy-private/src/main/java/org/keycloak/storage/UserStorageManager.java", "diff": "@@ -282,7 +282,10 @@ public class UserStorageManager extends AbstractStorageManager<UserStorageProvid\n@Override\npublic boolean removeUser(RealmModel realm, UserModel user) {\n- if (getFederatedStorage() != null) getFederatedStorage().preRemove(realm, user);\n+ if (getFederatedStorage() != null && user.getServiceAccountClientLink() == null) {\n+ getFederatedStorage().preRemove(realm, user);\n+ }\n+\nStorageId storageId = new StorageId(user.getId());\nif (storageId.getProviderId() == null) {\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authSession/entity/JpaAuthenticationSessionEntity.java", "new_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authSession/entity/JpaAuthenticationSessionEntity.java", "diff": "@@ -37,6 +37,7 @@ import org.keycloak.models.map.common.DeepCloner;\nimport org.keycloak.models.map.common.UpdatableEntity;\nimport static org.keycloak.models.map.storage.jpa.Constants.CURRENT_SCHEMA_VERSION_AUTH_SESSION;\nimport org.keycloak.models.map.storage.jpa.JpaRootEntity;\n+import org.keycloak.models.map.storage.jpa.JpaRootVersionedEntity;\nimport org.keycloak.models.map.storage.jpa.hibernate.jsonb.JsonbType;\nimport org.keycloak.sessions.CommonClientSessionModel;\n@@ -52,13 +53,18 @@ import org.keycloak.sessions.CommonClientSessionModel;\n@Entity\n@Table(name = \"kc_auth_session\")\n@TypeDefs({@TypeDef(name = \"jsonb\", typeClass = JsonbType.class)})\n-public class JpaAuthenticationSessionEntity extends UpdatableEntity.Impl implements MapAuthenticationSessionEntity, JpaRootEntity {\n+public class JpaAuthenticationSessionEntity extends UpdatableEntity.Impl implements MapAuthenticationSessionEntity, JpaRootVersionedEntity {\n@Id\n@Column\n@GeneratedValue\nprivate UUID id;\n+ //used for implicit optimistic locking\n+ @Version\n+ @Column\n+ private int version;\n+\n@Type(type = \"jsonb\")\n@Column(columnDefinition = \"jsonb\")\nprivate final JpaAuthenticationSessionMetadata metadata;\n@@ -107,6 +113,11 @@ public class JpaAuthenticationSessionEntity extends UpdatableEntity.Impl impleme\nreturn CURRENT_SCHEMA_VERSION_AUTH_SESSION;\n}\n+ @Override\n+ public int getVersion() {\n+ return version;\n+ }\n+\n@Override\npublic String getTabId() {\nreturn metadata.getTabId();\n" }, { "change_type": "MODIFY", "old_path": "model/map-jpa/src/main/resources/META-INF/auth-sessions/jpa-auth-sessions-changelog-1.xml", "new_path": "model/map-jpa/src/main/resources/META-INF/auth-sessions/jpa-auth-sessions-changelog-1.xml", "diff": "@@ -51,6 +51,9 @@ limitations under the License.\n<column name=\"id\" type=\"UUID\">\n<constraints primaryKey=\"true\" nullable=\"false\"/>\n</column>\n+ <column name=\"version\" type=\"INTEGER\" defaultValueNumeric=\"0\">\n+ <constraints nullable=\"false\"/>\n+ </column>\n<column name=\"fk_root\" type=\"UUID\">\n<constraints foreignKeyName=\"auth_session_fk_root_fkey\" references=\"kc_auth_root_session(id)\" deleteCascade=\"true\"/>\n</column>\n" } ]

[ { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/protocol/oidc/endpoints/TokenEndpoint.java", "new_path": "services/src/main/java/org/keycloak/protocol/oidc/endpoints/TokenEndpoint.java", "diff": "@@ -734,8 +734,17 @@ public class TokenEndpoint {\n}\n// TODO : do the same as codeToToken()\n- AccessTokenResponse res = responseBuilder.build();\n-\n+ AccessTokenResponse res = null;\n+ try {\n+ res = responseBuilder.build();\n+ } catch (RuntimeException re) {\n+ if (\"can not get encryption KEK\".equals(re.getMessage())) {\n+ throw new CorsErrorResponseException(cors, OAuthErrorException.INVALID_REQUEST,\n+ \"can not get encryption KEK\", Response.Status.BAD_REQUEST);\n+ } else {\n+ throw re;\n+ }\n+ }\nevent.success();\nreturn cors.builder(Response.ok(res, MediaType.APPLICATION_JSON_TYPE)).build();\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/IdTokenEncryptionTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/IdTokenEncryptionTest.java", "diff": "@@ -90,7 +90,7 @@ public class IdTokenEncryptionTest extends AbstractTestRealmKeycloakTest {\n@Before\npublic void clientConfiguration() {\n- ClientManager.realm(adminClient.realm(\"test\")).clientId(\"test-app\").directAccessGrant(true);\n+ ClientManager.realm(adminClient.realm(\"test\")).clientId(\"test-app\").directAccessGrant(true).setServiceAccountsEnabled(true);\n/*\n* Configure the default client ID. Seems like OAuthClient is keeping the state of clientID\n* For example: If some test case configure oauth.clientId(\"sample-public-client\"), other tests\n@@ -297,7 +297,7 @@ public class IdTokenEncryptionTest extends AbstractTestRealmKeycloakTest {\n@Test\n@UncaughtServerErrorExpected\n- public void testIdTokenEncryptionWithoutEncryptionKEK() {\n+ public void testIdTokenEncryptionWithoutEncryptionKEK() throws Exception{\nClientResource clientResource = null;\nClientRepresentation clientRep = null;\ntry {\n@@ -323,6 +323,11 @@ public class IdTokenEncryptionTest extends AbstractTestRealmKeycloakTest {\nAssert.assertEquals(OAuthErrorException.INVALID_REQUEST, atr.getError());\nAssert.assertEquals(\"can not get encryption KEK\", atr.getErrorDescription());\n+ // get id token but failed with client_credentials grant type\n+ oauth.scope(\"openid\");\n+ OAuthClient.AccessTokenResponse responseClientCredentials = oauth.doClientCredentialsGrantAccessTokenRequest(clientRep.getSecret());\n+ Assert.assertEquals(OAuthErrorException.INVALID_REQUEST, responseClientCredentials.getError());\n+ Assert.assertEquals(\"can not get encryption KEK\", responseClientCredentials.getErrorDescription());\n} finally {\n// Revert\nclientResource = ApiUtil.findClientByClientId(adminClient.realm(\"test\"), \"test-app\");\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/build-processor/src/main/java/org/keycloak/models/map/processor/GenerateHotRodEntityImplementationsProcessor.java", "new_path": "model/build-processor/src/main/java/org/keycloak/models/map/processor/GenerateHotRodEntityImplementationsProcessor.java", "diff": "@@ -169,6 +169,7 @@ public class GenerateHotRodEntityImplementationsProcessor extends AbstractGenera\npw.println(\" \" +\n\"public \" + hotRodSimpleClassName + \"(\" + className + \" \" + ENTITY_VARIABLE + \") {\"\n);\n+ pw.println(\" java.util.Objects.requireNonNull(\" + ENTITY_VARIABLE + \");\");\npw.println(\" this.\" + ENTITY_VARIABLE + \" = \" + ENTITY_VARIABLE + \";\");\nif (usingGeneratedCloner) {\npw.println(\" this.cloner = DeepCloner.DUMB_CLONER;\");\n" }, { "change_type": "MODIFY", "old_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/HotRodMapStorage.java", "new_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/HotRodMapStorage.java", "diff": "@@ -93,15 +93,25 @@ public class HotRodMapStorage<K, E extends AbstractHotRodEntity, V extends HotRo\nObjects.requireNonNull(key, \"Key must be non-null\");\nK k = keyConverter.fromStringSafe(key);\n- V v = delegateProducer.apply(remoteCache.get(k));\n- if (v == null || v.getHotRodEntity() == null) return null;\n- return isExpirableEntity && isExpired((ExpirableEntity) v, true) ? null : v;\n+ // Obtain value from Infinispan\n+ E hotRodEntity = remoteCache.get(k);\n+ if (hotRodEntity == null) return null;\n+\n+ // Create delegate that implements Map*Entity\n+ V delegateEntity = delegateProducer.apply(hotRodEntity);\n+\n+ // Check expiration if necessary and return value\n+ return isExpirableEntity && isExpired((ExpirableEntity) delegateEntity, true) ? null : delegateEntity;\n}\n@Override\npublic V update(V value) {\nK key = keyConverter.fromStringSafe(value.getId());\n- return delegateProducer.apply(remoteCache.replace(key, value.getHotRodEntity()));\n+\n+ E previousValue = remoteCache.replace(key, value.getHotRodEntity());\n+ if (previousValue == null) return null;\n+\n+ return delegateProducer.apply(previousValue);\n}\n@Override\n" }, { "change_type": "MODIFY", "old_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/SingleUseObjectHotRodMapStorage.java", "new_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/SingleUseObjectHotRodMapStorage.java", "diff": "@@ -95,8 +95,7 @@ public class SingleUseObjectHotRodMapStorage<K, E extends AbstractHotRodEntity,\nSingleUseObjectModelCriteriaBuilder mcb = criteria.flashToModelCriteriaBuilder(createSingleUseObjectCriteriaBuilder());\nif (mcb.isValid()) {\nHotRodSingleUseObjectEntityDelegate value = read(mcb.getKey());\n-\n- return value != null && value.getHotRodEntity() != null ? Stream.of(value) : Stream.empty();\n+ return value != null ? Stream.of(value) : Stream.empty();\n}\nreturn super.read(queryParameters);\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/storage/chm/ConcurrentHashMapCrudOperations.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/storage/chm/ConcurrentHashMapCrudOperations.java", "diff": "@@ -37,6 +37,9 @@ public interface ConcurrentHashMapCrudOperations<V extends AbstractEntity & Upda\n* Updates the object with the key of the {@code value}'s ID in the storage if it already exists.\n*\n* @param value Updated value\n+ * @return the previous value associated with the specified key, or null if there was no mapping for the key.\n+ * (A null return can also indicate that the map previously associated null with the key,\n+ * if the implementation supports null values.)\n* @throws NullPointerException if the object or its {@code id} is {@code null}\n* @see AbstractEntity#getId()\n*/\n" } ]

[ { "change_type": "MODIFY", "old_path": "themes/src/main/resources-community/theme/base/login/messages/messages_de.properties", "new_path": "themes/src/main/resources-community/theme/base/login/messages/messages_de.properties", "diff": "@@ -99,13 +99,13 @@ restartLoginTooltip=Login neustarten\nloginTotpIntro=Sie m\\u00FCssen einen One Time Passwort-Generator einrichten, um auf dieses Konto zugreifen zu k\\u00F6nnen.\nloginTotpStep1=Installieren Sie eine der folgenden Applikationen auf Ihrem Smartphone:\n-loginTotpStep2=\\u00D6ffnen Sie die Applikation und scannen Sie den Barcode.\n-loginTotpStep3=Geben Sie den von der Applikation generierten One-time Code ein und klicken Sie auf Speichern.\n+loginTotpStep2=\\u00D6ffnen Sie die Applikation und scannen Sie den QR-Code.\n+loginTotpStep3=Geben Sie den von der Applikation generierten One-time Code ein und klicken Sie auf Absenden.\nloginTotpStep3DeviceName=Geben Sie einen Ger\\u00E4tenamen an, um die Verwaltung Ihrer OTP-Ger\\u00E4te zu erleichtern.\nloginTotpManualStep2=\\u00D6ffnen Sie die Applikation und geben Sie den folgenden Schl\\u00FCssel ein.\nloginTotpManualStep3=Verwenden Sie die folgenden Konfigurationswerte, falls Sie diese f\\u00FCr die Applikation anpassen k\\u00F6nnen:\n-loginTotpUnableToScan=Sie k\\u00F6nnen den Barcode nicht scannen?\n-loginTotpScanBarcode=Barcode scannen?\n+loginTotpUnableToScan=Sie k\\u00F6nnen den QR-Code nicht scannen?\n+loginTotpScanBarcode=QR-Code scannen?\nloginCredential=Anmeldeinformation\nloginOtpOneTime=One-time code\nloginTotpType=Typ\n" } ]

[ { "change_type": "MODIFY", "old_path": "themes/src/main/resources-community/theme/keycloak.v2/account/messages/messages_de.properties", "new_path": "themes/src/main/resources-community/theme/keycloak.v2/account/messages/messages_de.properties", "diff": "@@ -99,6 +99,7 @@ invalidRequestMessage=Ung\\u00FCltige Anfrage\n# Applications page\napplicationsPageTitle=Anwendungen\n+applicationsPageSubTitle=Verwalten Sie Ihre Anwendungsberechtigungen\ninternalApp=Intern\nthirdPartyApp=Drittanbieter\nofflineAccess=Offline Zugriff\n" }, { "change_type": "MODIFY", "old_path": "themes/src/main/resources/theme/keycloak.v2/account/messages/messages_en.properties", "new_path": "themes/src/main/resources/theme/keycloak.v2/account/messages/messages_en.properties", "diff": "@@ -117,6 +117,7 @@ invalidRequestMessage=Invalid request\n# Applications page\napplicationsPageTitle=Applications\n+applicationsPageSubTitle=Manage your application permissions\ninternalApp=Internal\nthirdPartyApp=Third-party\nofflineAccess=Offline access\n" }, { "change_type": "MODIFY", "old_path": "themes/src/main/resources/theme/keycloak.v2/account/src/app/content/applications-page/ApplicationsPage.tsx", "new_path": "themes/src/main/resources/theme/keycloak.v2/account/src/app/content/applications-page/ApplicationsPage.tsx", "diff": "@@ -131,7 +131,7 @@ export class ApplicationsPage extends React.Component<ApplicationsPageProps, App\nreturn (\n<ContentPage\ntitle={Msg.localize('applicationsPageTitle')}\n- introMessage=\"Manage your application permissions.\"\n+ introMessage={Msg.localize('applicationsPageSubTitle')}\n>\n<PageSection isFilled variant={PageSectionVariants.light}>\n" } ]

[ { "change_type": "MODIFY", "old_path": "themes/src/main/resources-community/theme/base/login/messages/messages_de.properties", "new_path": "themes/src/main/resources-community/theme/base/login/messages/messages_de.properties", "diff": "@@ -32,6 +32,7 @@ unknownUser=Unbekannter Benutzer\nloginTotpTitle=Mehrfachauthentifizierung konfigurieren\nloginProfileTitle=Benutzerkonto Informationen aktualisieren\nloginTimeout=Sie haben zu lange gebraucht, um sich anzumelden. Bitte versuchen Sie es erneut.\n+reauthenticate=Zum Fortsetzen bitte erneut anmelden\noauthGrantTitle=OAuth gew\\u00E4hren\noauthGrantTitleHtml={0}\nerrorTitle=Es ist ein Fehler aufgetreten.\n" } ]

[ { "change_type": "MODIFY", "old_path": "distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-model-jpa/main/module.xml", "new_path": "distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-model-jpa/main/module.xml", "diff": "<module name=\"org.keycloak.keycloak-server-spi\"/>\n<module name=\"org.keycloak.keycloak-server-spi-private\"/>\n<module name=\"org.keycloak.keycloak-model-legacy\"/>\n+ <module name=\"org.keycloak.keycloak-model-legacy-private\"/>\n<module name=\"javax.persistence.api\"/>\n<module name=\"org.jboss.logging\"/>\n<module name=\"org.liquibase\" services=\"import\"/>\n" }, { "change_type": "MODIFY", "old_path": "distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-model-jpa/main/module.xml", "new_path": "distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-model-jpa/main/module.xml", "diff": "<module name=\"org.keycloak.keycloak-server-spi\"/>\n<module name=\"org.keycloak.keycloak-server-spi-private\"/>\n<module name=\"org.keycloak.keycloak-model-legacy\"/>\n+ <module name=\"org.keycloak.keycloak-model-legacy-private\"/>\n<module name=\"javax.persistence.api\"/>\n<module name=\"org.jboss.logging\"/>\n<module name=\"org.liquibase\" services=\"import\"/>\n" }, { "change_type": "MODIFY", "old_path": "model/jpa/pom.xml", "new_path": "model/jpa/pom.xml", "diff": "<groupId>org.keycloak</groupId>\n<artifactId>keycloak-model-legacy</artifactId>\n</dependency>\n+ <dependency>\n+ <groupId>org.keycloak</groupId>\n+ <artifactId>keycloak-model-legacy-private</artifactId>\n+ </dependency>\n<dependency>\n<groupId>org.liquibase</groupId>\n<artifactId>liquibase-core</artifactId>\n" }, { "change_type": "RENAME", "old_path": "server-spi-private/src/main/java/org/keycloak/migration/MigrationModelManager.java", "new_path": "model/legacy-private/src/main/java/org/keycloak/migration/MigrationModelManager.java", "diff": "@@ -21,21 +21,20 @@ import org.keycloak.models.KeycloakSession;\nimport org.keycloak.models.RealmModel;\nimport org.keycloak.representations.idm.RealmRepresentation;\nimport org.keycloak.storage.DatastoreProvider;\n+import org.keycloak.storage.datastore.LegacyDatastoreProvider;\n/**\n* @author <a href=\"mailto:[email protected]\">Bill Burke</a>\n* @version $Revision: 1 $\n*/\n-@Deprecated // as this will be moved to a legacy module\npublic class MigrationModelManager {\n-\npublic static void migrate(KeycloakSession session) {\n- session.getProvider(DatastoreProvider.class).getMigrationManager().migrate();\n+ ((LegacyDatastoreProvider) session.getProvider(DatastoreProvider.class)).getMigrationManager().migrate();\n}\npublic static void migrateImport(KeycloakSession session, RealmModel realm, RealmRepresentation rep, boolean skipUserDependent) {\n- session.getProvider(DatastoreProvider.class).getMigrationManager().migrate(realm, rep, skipUserDependent);\n+ ((LegacyDatastoreProvider) session.getProvider(DatastoreProvider.class)).getMigrationManager().migrate(realm, rep, skipUserDependent);\n}\n}\n" }, { "change_type": "RENAME", "old_path": "server-spi-private/src/main/java/org/keycloak/storage/MigrationManager.java", "new_path": "model/legacy-private/src/main/java/org/keycloak/storage/MigrationManager.java", "diff": "@@ -26,7 +26,6 @@ import org.keycloak.representations.idm.RealmRepresentation;\n*\n* @author Alexander Schwartz\n*/\n-@Deprecated\npublic interface MigrationManager {\nvoid migrate();\n" }, { "change_type": "MODIFY", "old_path": "model/legacy-private/src/main/java/org/keycloak/storage/datastore/LegacyDatastoreProvider.java", "new_path": "model/legacy-private/src/main/java/org/keycloak/storage/datastore/LegacyDatastoreProvider.java", "diff": "@@ -223,8 +223,6 @@ public class LegacyDatastoreProvider implements DatastoreProvider, LegacyStoreMa\nreturn new LegacyExportImportManager(session);\n}\n- @Override\n- @Deprecated\npublic MigrationManager getMigrationManager() {\nreturn new LegacyMigrationManager(session);\n}\n" }, { "change_type": "MODIFY", "old_path": "model/legacy-private/src/main/java/org/keycloak/storage/datastore/LegacyDatastoreProviderFactory.java", "new_path": "model/legacy-private/src/main/java/org/keycloak/storage/datastore/LegacyDatastoreProviderFactory.java", "diff": "@@ -20,6 +20,7 @@ package org.keycloak.storage.datastore;\nimport org.keycloak.Config;\nimport org.keycloak.Config.Scope;\nimport org.keycloak.common.Profile;\n+import org.keycloak.migration.MigrationModelManager;\nimport org.keycloak.models.KeycloakSession;\nimport org.keycloak.models.KeycloakSessionFactory;\nimport org.keycloak.models.utils.PostMigrationEvent;\n@@ -33,6 +34,7 @@ import org.keycloak.services.scheduled.ClusterAwareScheduledTaskRunner;\nimport org.keycloak.services.scheduled.ScheduledTaskRunner;\nimport org.keycloak.storage.DatastoreProvider;\nimport org.keycloak.storage.DatastoreProviderFactory;\n+import org.keycloak.storage.LegacyStoreMigrateRepresentationEvent;\nimport org.keycloak.storage.LegacyStoreSyncEvent;\nimport org.keycloak.storage.managers.UserStorageSyncManager;\nimport org.keycloak.timer.TimerProvider;\n@@ -86,6 +88,9 @@ public class LegacyDatastoreProviderFactory implements DatastoreProviderFactory,\n} else if (event instanceof LegacyStoreSyncEvent) {\nLegacyStoreSyncEvent ev = (LegacyStoreSyncEvent) event;\nUserStorageSyncManager.notifyToRefreshPeriodicSyncAll(ev.getSession(), ev.getRealm(), ev.getRemoved());\n+ } else if (event instanceof LegacyStoreMigrateRepresentationEvent) {\n+ LegacyStoreMigrateRepresentationEvent ev = (LegacyStoreMigrateRepresentationEvent) event;\n+ MigrationModelManager.migrateImport(ev.getSession(), ev.getRealm(), ev.getRep(), ev.isSkipUserDependent());\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/datastore/MapDatastoreProvider.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/datastore/MapDatastoreProvider.java", "diff": "@@ -21,14 +21,11 @@ import org.keycloak.models.ClientProvider;\nimport org.keycloak.models.ClientScopeProvider;\nimport org.keycloak.models.GroupProvider;\nimport org.keycloak.models.KeycloakSession;\n-import org.keycloak.models.RealmModel;\nimport org.keycloak.models.RealmProvider;\nimport org.keycloak.models.RoleProvider;\nimport org.keycloak.models.UserProvider;\n-import org.keycloak.representations.idm.RealmRepresentation;\nimport org.keycloak.storage.DatastoreProvider;\nimport org.keycloak.storage.ExportImportManager;\n-import org.keycloak.storage.MigrationManager;\npublic class MapDatastoreProvider implements DatastoreProvider {\n@@ -77,19 +74,4 @@ public class MapDatastoreProvider implements DatastoreProvider {\nreturn new MapExportImportManager(session);\n}\n- @Override\n- public MigrationManager getMigrationManager() {\n- return new MigrationManager() {\n- @Override\n- public void migrate() {\n- // Do not migrate the datasources\n- }\n-\n- @Override\n- public void migrate(RealmModel realm, RealmRepresentation rep, boolean skipUserDependent) {\n- // Do not migrate the representation: assume it is the latest\n- }\n- };\n- }\n-\n}\n" }, { "change_type": "MODIFY", "old_path": "server-spi-private/src/main/java/org/keycloak/storage/DatastoreProvider.java", "new_path": "server-spi-private/src/main/java/org/keycloak/storage/DatastoreProvider.java", "diff": "@@ -41,7 +41,4 @@ public interface DatastoreProvider extends Provider {\nUserProvider users();\nExportImportManager getExportImportManager();\n-\n- MigrationManager getMigrationManager();\n-\n}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "server-spi-private/src/main/java/org/keycloak/storage/LegacyStoreMigrateRepresentationEvent.java", "diff": "+/*\n+ * Copyright 2022 Red Hat, Inc. and/or its affiliates\n+ * and other contributors as indicated by the @author tags.\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package org.keycloak.storage;\n+\n+import org.keycloak.models.KeycloakSession;\n+import org.keycloak.models.RealmModel;\n+import org.keycloak.provider.ProviderEvent;\n+import org.keycloak.representations.idm.RealmRepresentation;\n+\n+/**\n+ * Event for notifying legacy store, so it can do migrations on the representation as needed.\n+ *\n+ * CAUTION: This event is exceptional as it performs any necessary modificaton of the representation.\n+ * This will be removed once the legacy store has been removed.\n+ */\n+public class LegacyStoreMigrateRepresentationEvent implements ProviderEvent {\n+\n+ private final KeycloakSession session;\n+ private final RealmModel realm;\n+ private final RealmRepresentation rep;\n+ private final boolean skipUserDependent;\n+\n+ public LegacyStoreMigrateRepresentationEvent(KeycloakSession session, RealmModel realm, RealmRepresentation rep, boolean skipUserDependent) {\n+ this.session = session;\n+ this.realm = realm;\n+ this.rep = rep;\n+ this.skipUserDependent = skipUserDependent;\n+ }\n+\n+ public static void fire(KeycloakSession session, RealmModel realm, RealmRepresentation rep, boolean skipUserDependent) {\n+ session.getKeycloakSessionFactory().publish(new LegacyStoreMigrateRepresentationEvent(session, realm, rep, skipUserDependent));\n+ }\n+\n+ public KeycloakSession getSession() {\n+ return session;\n+ }\n+\n+ public RealmModel getRealm() {\n+ return realm;\n+ }\n+\n+ public RealmRepresentation getRep() {\n+ return rep;\n+ }\n+\n+ public boolean isSkipUserDependent() {\n+ return skipUserDependent;\n+ }\n+}\n\\ No newline at end of file\n" }, { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/services/managers/RealmManager.java", "new_path": "services/src/main/java/org/keycloak/services/managers/RealmManager.java", "diff": "@@ -19,7 +19,6 @@ package org.keycloak.services.managers;\nimport org.keycloak.Config;\nimport org.keycloak.common.Profile;\nimport org.keycloak.common.enums.SslRequired;\n-import org.keycloak.migration.MigrationModelManager;\nimport org.keycloak.models.AccountRoles;\nimport org.keycloak.models.AdminRoles;\nimport org.keycloak.models.BrowserSecurityHeaders;\n@@ -52,6 +51,7 @@ import org.keycloak.representations.idm.RealmEventsConfigRepresentation;\nimport org.keycloak.representations.idm.RealmRepresentation;\nimport org.keycloak.representations.idm.RoleRepresentation;\nimport org.keycloak.sessions.AuthenticationSessionProvider;\n+import org.keycloak.storage.LegacyStoreMigrateRepresentationEvent;\nimport org.keycloak.storage.LegacyStoreSyncEvent;\nimport org.keycloak.services.clientregistration.policy.DefaultClientRegistrationPolicies;\n@@ -592,7 +592,7 @@ public class RealmManager {\nsetupClientRegistrations(realm);\nif (rep.getKeycloakVersion() != null) {\n- MigrationModelManager.migrateImport(session, realm, rep, skipUserDependent);\n+ LegacyStoreMigrateRepresentationEvent.fire(session, realm, rep, skipUserDependent);\n}\nsession.clientPolicy().updateRealmModelFromRepresentation(realm, rep);\n" } ]

[ { "change_type": "MODIFY", "old_path": ".github/workflows/ci.yml", "new_path": ".github/workflows/ci.yml", "diff": "@@ -464,7 +464,7 @@ jobs:\nwith:\ndistribution: 'temurin'\njava-version: ${{ env.DEFAULT_JDK_VERSION }}\n- cahe: 'maven'\n+ cache: 'maven'\n- name: Cleanup org.keycloak artifacts\nrun: rm -rf ~/.m2/repository/org/keycloak >/dev/null || true\n" } ]

[ { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/protocol/oidc/endpoints/LogoutEndpoint.java", "new_path": "services/src/main/java/org/keycloak/protocol/oidc/endpoints/LogoutEndpoint.java", "diff": "package org.keycloak.protocol.oidc.endpoints;\n+import static org.keycloak.models.UserSessionModel.State.LOGGED_OUT;\n+import static org.keycloak.models.UserSessionModel.State.LOGGING_OUT;\n+import static org.keycloak.services.resources.LoginActionsService.SESSION_CODE;\n+\nimport org.jboss.logging.Logger;\nimport org.jboss.resteasy.annotations.cache.NoCache;\nimport org.jboss.resteasy.spi.HttpRequest;\n@@ -72,6 +76,10 @@ import org.keycloak.sessions.AuthenticationSessionModel;\nimport org.keycloak.sessions.RootAuthenticationSessionModel;\nimport org.keycloak.util.TokenUtil;\n+import java.util.concurrent.atomic.AtomicReference;\n+import java.util.stream.Collectors;\n+import java.util.stream.Stream;\n+\nimport javax.ws.rs.Consumes;\nimport javax.ws.rs.GET;\nimport javax.ws.rs.OPTIONS;\n@@ -83,13 +91,6 @@ import javax.ws.rs.core.HttpHeaders;\nimport javax.ws.rs.core.MediaType;\nimport javax.ws.rs.core.MultivaluedMap;\nimport javax.ws.rs.core.Response;\n-import java.util.concurrent.atomic.AtomicReference;\n-import java.util.stream.Collectors;\n-import java.util.stream.Stream;\n-\n-import static org.keycloak.models.UserSessionModel.State.LOGGED_OUT;\n-import static org.keycloak.models.UserSessionModel.State.LOGGING_OUT;\n-import static org.keycloak.services.resources.LoginActionsService.SESSION_CODE;\n/**\n* @author <a href=\"mailto:[email protected]\">Stian Thorgersen</a>\n@@ -162,7 +163,8 @@ public class LogoutEndpoint {\n@QueryParam(OIDCLoginProtocol.UI_LOCALES_PARAM) String uiLocales,\n@QueryParam(AuthenticationManager.INITIATING_IDP_PARAM) String initiatingIdp) {\n- if (deprecatedRedirectUri != null && !providerConfig.isLegacyLogoutRedirectUri()) {\n+ if (!providerConfig.isLegacyLogoutRedirectUri()) {\n+ if (deprecatedRedirectUri != null) {\nevent.event(EventType.LOGOUT);\nevent.error(Errors.INVALID_REQUEST);\nlogger.warnf(\"Parameter 'redirect_uri' no longer supported. Please use 'post_logout_redirect_uri' with 'id_token_hint' for this endpoint. Alternatively you can enable backwards compatibility option '%s' of oidc login protocol in the server configuration.\",\n@@ -173,9 +175,15 @@ public class LogoutEndpoint {\nif (postLogoutRedirectUri != null && encodedIdToken == null && clientId == null) {\nevent.event(EventType.LOGOUT);\nevent.error(Errors.INVALID_REQUEST);\n- logger.warnf(\"Either the parameter 'client_id' or the parameter 'id_token_hint' is required when 'post_logout_redirect_uri' is used.\");\n- return ErrorPage.error(session, null, Response.Status.BAD_REQUEST, Messages.MISSING_PARAMETER, OIDCLoginProtocol.ID_TOKEN_HINT);\n+ logger.warnf(\n+ \"Either the parameter 'client_id' or the parameter 'id_token_hint' is required when 'post_logout_redirect_uri' is used.\");\n+ return ErrorPage.error(session, null, Response.Status.BAD_REQUEST, Messages.MISSING_PARAMETER,\n+ OIDCLoginProtocol.ID_TOKEN_HINT);\n}\n+ }\n+\n+ deprecatedRedirectUri = providerConfig.isLegacyLogoutRedirectUri() ? deprecatedRedirectUri : null;\n+ final String redirectUri = postLogoutRedirectUri != null ? postLogoutRedirectUri : deprecatedRedirectUri;\nboolean confirmationNeeded = true;\nboolean forcedConfirmation = false;\n@@ -222,12 +230,15 @@ public class LogoutEndpoint {\n}\nString validatedRedirectUri = null;\n- if (postLogoutRedirectUri != null || deprecatedRedirectUri != null) {\n- String redirectUri = postLogoutRedirectUri != null ? postLogoutRedirectUri : deprecatedRedirectUri;\n+ if (redirectUri != null) {\nif (client != null) {\nvalidatedRedirectUri = RedirectUtils.verifyRedirectUri(session, redirectUri, client);\n- } else if (providerConfig.isLegacyLogoutRedirectUri()) {\n- validatedRedirectUri = RedirectUtils.verifyRealmRedirectUri(session, deprecatedRedirectUri);\n+ } else if (clientId == null) {\n+ /*\n+ * Only call verifyRealmRedirectUri, in case both clientId and client are null - otherwise\n+ * the logout uri contains a non-existing client, and we should show an INVALID_REDIRECT_URI error\n+ */\n+ validatedRedirectUri = RedirectUtils.verifyRealmRedirectUri(session, redirectUri);\n}\nif (validatedRedirectUri == null) {\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/LegacyLogoutTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/LegacyLogoutTest.java", "diff": "@@ -52,6 +52,7 @@ import org.keycloak.testsuite.util.InfinispanTestTimeServiceRule;\nimport org.keycloak.testsuite.util.OAuthClient;\nimport org.keycloak.testsuite.util.ServerURLs;\n+import static org.hamcrest.MatcherAssert.assertThat;\nimport static org.hamcrest.Matchers.is;\nimport static org.keycloak.testsuite.util.URLAssert.assertCurrentUrlDoesntStartWith;\nimport static org.keycloak.testsuite.util.URLAssert.assertCurrentUrlEquals;\n@@ -147,6 +148,27 @@ public class LegacyLogoutTest extends AbstractTestRealmKeycloakTest {\nassertCurrentUrlEquals(APP_REDIRECT_URI);\n}\n+ // Test with \"post_logout_redirect_uri\" without \"id_token_hint\": User should confirm logout.\n+ @Test\n+ public void logoutWithPostLogoutUriWithoutIdTokenHint() {\n+ OAuthClient.AccessTokenResponse tokenResponse = loginUser();\n+ String sessionId = tokenResponse.getSessionState();\n+\n+ String logoutUrl = oauth.getLogoutUrl().postLogoutRedirectUri(APP_REDIRECT_URI).build();\n+ driver.navigate().to(logoutUrl);\n+\n+ // Assert logout confirmation page. Session still exists. Assert default language on logout page (English)\n+ logoutConfirmPage.assertCurrent();\n+ assertThat(true, is(isSessionActive(sessionId)));\n+ events.assertEmpty();\n+ logoutConfirmPage.confirmLogout();\n+\n+ // Redirected back to the application with expected state\n+ events.expectLogout(sessionId).removeDetail(Details.REDIRECT_URI).assertEvent();\n+ assertThat(false, is(isSessionActive(sessionId)));\n+ assertCurrentUrlEquals(APP_REDIRECT_URI);\n+ }\n+\n// KEYCLOAK-16517 Make sure that just real clients with standardFlow or implicitFlow enabled are considered for redirectUri\n@Test\n" } ]

[ { "change_type": "MODIFY", "old_path": "testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/JpaMapStorage.java", "new_path": "testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/JpaMapStorage.java", "diff": "@@ -93,7 +93,7 @@ public class JpaMapStorage extends KeycloakModelParameters {\n.spi(\"realm\").provider(MapRealmProviderFactory.PROVIDER_ID) .config(STORAGE_CONFIG, JpaMapStorageProviderFactory.PROVIDER_ID)\n.spi(\"role\").provider(MapRoleProviderFactory.PROVIDER_ID) .config(STORAGE_CONFIG, JpaMapStorageProviderFactory.PROVIDER_ID)\n.spi(DeploymentStateSpi.NAME).provider(MapDeploymentStateProviderFactory.PROVIDER_ID) .config(STORAGE_CONFIG, ConcurrentHashMapStorageProviderFactory.PROVIDER_ID)\n- .spi(StoreFactorySpi.NAME).provider(MapAuthorizationStoreFactory.PROVIDER_ID) .config(STORAGE_CONFIG, ConcurrentHashMapStorageProviderFactory.PROVIDER_ID)\n+ .spi(StoreFactorySpi.NAME).provider(MapAuthorizationStoreFactory.PROVIDER_ID) .config(STORAGE_CONFIG, JpaMapStorageProviderFactory.PROVIDER_ID)\n.spi(\"user\").provider(MapUserProviderFactory.PROVIDER_ID) .config(STORAGE_CONFIG, ConcurrentHashMapStorageProviderFactory.PROVIDER_ID)\n.spi(UserLoginFailureSpi.NAME).provider(MapUserLoginFailureProviderFactory.PROVIDER_ID) .config(STORAGE_CONFIG, JpaMapStorageProviderFactory.PROVIDER_ID)\n.spi(\"dblock\").provider(NoLockingDBLockProviderFactory.PROVIDER_ID) .config(STORAGE_CONFIG, ConcurrentHashMapStorageProviderFactory.PROVIDER_ID)\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/client/HotRodClientEntity.java", "new_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/client/HotRodClientEntity.java", "diff": "@@ -24,12 +24,14 @@ import org.keycloak.models.map.storage.hotRod.common.AbstractHotRodEntity;\nimport org.keycloak.models.map.storage.hotRod.common.HotRodAttributeEntity;\nimport org.keycloak.models.map.storage.hotRod.common.HotRodPair;\nimport org.keycloak.models.map.client.MapClientEntity;\n+import org.keycloak.models.map.client.MapProtocolMapperEntity;\nimport org.keycloak.models.map.storage.hotRod.common.UpdatableHotRodEntityDelegateImpl;\nimport java.util.Collection;\nimport java.util.LinkedList;\nimport java.util.Map;\nimport java.util.Objects;\n+import java.util.Optional;\nimport java.util.Set;\nimport java.util.stream.Stream;\n@@ -190,6 +192,20 @@ public class HotRodClientEntity extends AbstractHotRodEntity {\n.filter(me -> Objects.equals(me.getValue(), defaultScope))\n.map(Map.Entry::getKey);\n}\n+\n+ @Override\n+ public Optional<MapProtocolMapperEntity> getProtocolMapper(String id) {\n+ Set<MapProtocolMapperEntity> mappers = getProtocolMappers();\n+ if (mappers == null || mappers.isEmpty()) return Optional.empty();\n+\n+ return mappers.stream().filter(m -> Objects.equals(m.getId(), id)).findFirst();\n+ }\n+\n+ @Override\n+ public void removeProtocolMapper(String id) {\n+ HotRodClientEntity entity = getHotRodEntity();\n+ entity.updated |= entity.protocolMappers != null && entity.protocolMappers.removeIf(m -> Objects.equals(m.id, id));\n+ }\n}\n@Override\n" }, { "change_type": "MODIFY", "old_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/client/entity/JpaClientEntity.java", "new_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/client/entity/JpaClientEntity.java", "diff": "@@ -211,23 +211,13 @@ public class JpaClientEntity extends AbstractClientEntity implements JpaRootVers\n}\n@Override\n- public MapProtocolMapperEntity getProtocolMapper(String id) {\n- return metadata.getProtocolMapper(id);\n- }\n-\n- @Override\n- public Map<String, MapProtocolMapperEntity> getProtocolMappers() {\n+ public Set<MapProtocolMapperEntity> getProtocolMappers() {\nreturn metadata.getProtocolMappers();\n}\n@Override\n- public void removeProtocolMapper(String id) {\n- metadata.removeProtocolMapper(id);\n- }\n-\n- @Override\n- public void setProtocolMapper(String id, MapProtocolMapperEntity mapping) {\n- metadata.setProtocolMapper(id, mapping);\n+ public void addProtocolMapper(MapProtocolMapperEntity mapping) {\n+ metadata.addProtocolMapper(mapping);\n}\n@Override\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/client/MapClientAdapter.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/client/MapClientAdapter.java", "diff": "@@ -524,9 +524,8 @@ public abstract class MapClientAdapter extends AbstractClientModel<MapClientEnti\n@Override\npublic Stream<ProtocolMapperModel> getProtocolMappersStream() {\n- final Map<String, MapProtocolMapperEntity> protocolMappers = entity.getProtocolMappers();\n- return protocolMappers == null ? Stream.empty() : protocolMappers.values().stream().distinct()\n- .map(pmUtils::toModel);\n+ final Set<MapProtocolMapperEntity> protocolMappers = entity.getProtocolMappers();\n+ return protocolMappers == null ? Stream.empty() : protocolMappers.stream().distinct().map(pmUtils::toModel);\n}\n@Override\n@@ -544,7 +543,7 @@ public abstract class MapClientAdapter extends AbstractClientModel<MapClientEnti\npm.setConfig(new HashMap<>());\n}\n- entity.setProtocolMapper(pm.getId(), pm);\n+ entity.addProtocolMapper(pm);\nreturn pmUtils.toModel(pm);\n}\n@@ -560,23 +559,25 @@ public abstract class MapClientAdapter extends AbstractClientModel<MapClientEnti\npublic void updateProtocolMapper(ProtocolMapperModel mapping) {\nfinal String id = mapping == null ? null : mapping.getId();\nif (id != null) {\n- entity.setProtocolMapper(id, MapProtocolMapperUtils.fromModel(mapping));\n+ entity.getProtocolMapper(id).ifPresent((pmEntity) -> {\n+ entity.removeProtocolMapper(id);\n+ addProtocolMapper(mapping);\n+ });\n}\n}\n@Override\npublic ProtocolMapperModel getProtocolMapperById(String id) {\n- MapProtocolMapperEntity protocolMapper = entity.getProtocolMapper(id);\n- return protocolMapper == null ? null : pmUtils.toModel(protocolMapper);\n+ return entity.getProtocolMapper(id).map(pmUtils::toModel).orElse(null);\n}\n@Override\npublic ProtocolMapperModel getProtocolMapperByName(String protocol, String name) {\n- final Map<String, MapProtocolMapperEntity> protocolMappers = entity.getProtocolMappers();\n+ final Set<MapProtocolMapperEntity> protocolMappers = entity.getProtocolMappers();\nif (! Objects.equals(protocol, safeGetProtocol())) {\nreturn null;\n}\n- return protocolMappers == null ? null : protocolMappers.values().stream()\n+ return protocolMappers == null ? null : protocolMappers.stream()\n.filter(pm -> Objects.equals(pm.getName(), name))\n.map(pmUtils::toModel)\n.findAny()\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/client/MapClientEntity.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/client/MapClientEntity.java", "diff": "@@ -59,13 +59,13 @@ public interface MapClientEntity extends AbstractEntity, UpdatableEntity, Entity\n@Override\npublic boolean isUpdated() {\nreturn this.updated\n- || Optional.ofNullable(getProtocolMappers()).orElseGet(Collections::emptyMap).values().stream().anyMatch(MapProtocolMapperEntity::isUpdated);\n+ || Optional.ofNullable(getProtocolMappers()).orElseGet(Collections::emptySet).stream().anyMatch(MapProtocolMapperEntity::isUpdated);\n}\n@Override\npublic void clearUpdatedFlag() {\nthis.updated = false;\n- Optional.ofNullable(getProtocolMappers()).orElseGet(Collections::emptyMap).values().forEach(UpdatableEntity::clearUpdatedFlag);\n+ Optional.ofNullable(getProtocolMappers()).orElseGet(Collections::emptySet).forEach(UpdatableEntity::clearUpdatedFlag);\n}\n@Override\n@@ -75,6 +75,20 @@ public interface MapClientEntity extends AbstractEntity, UpdatableEntity, Entity\n.filter(me -> Objects.equals(me.getValue(), defaultScope))\n.map(Entry::getKey);\n}\n+\n+ @Override\n+ public Optional<MapProtocolMapperEntity> getProtocolMapper(String id) {\n+ Set<MapProtocolMapperEntity> mappers = getProtocolMappers();\n+ if (mappers == null || mappers.isEmpty()) return Optional.empty();\n+\n+ return mappers.stream().filter(mapper -> Objects.equals(mapper.getId(), id)).findFirst();\n+ }\n+\n+ @Override\n+ public void removeProtocolMapper(String id) {\n+ Set<MapProtocolMapperEntity> mappers = getProtocolMappers();\n+ this.updated |= mappers != null && mappers.removeIf(mapper -> Objects.equals(mapper.getId(), id));\n+ }\n}\nMap<String, Boolean> getClientScopes();\n@@ -82,9 +96,9 @@ public interface MapClientEntity extends AbstractEntity, UpdatableEntity, Entity\nvoid setClientScope(String id, Boolean defaultScope);\nvoid removeClientScope(String id);\n- MapProtocolMapperEntity getProtocolMapper(String id);\n- Map<String, MapProtocolMapperEntity> getProtocolMappers();\n- void setProtocolMapper(String id, MapProtocolMapperEntity mapping);\n+ Optional<MapProtocolMapperEntity> getProtocolMapper(String id);\n+ Set<MapProtocolMapperEntity> getProtocolMappers();\n+ void addProtocolMapper(MapProtocolMapperEntity mapping);\nvoid removeProtocolMapper(String id);\nvoid addRedirectUri(String redirectUri);\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/test/java/org/keycloak/models/map/client/MapClientEntityClonerTest.java", "new_path": "model/map/src/test/java/org/keycloak/models/map/client/MapClientEntityClonerTest.java", "diff": "@@ -92,7 +92,7 @@ public class MapClientEntityClonerTest {\nconfig.put(\"key1\", \"value1\");\nconfig.put(\"key2\", \"value2\");\npmm.setConfig(config);\n- newInstance.setProtocolMapper(\"pmm-id\", pmm);\n+ newInstance.addProtocolMapper(pmm);\nnewInstance.setAttribute(\"attr\", Arrays.asList(\"aa\", \"bb\", \"cc\"));\nMapClientEntity clonedInstance = CLONER.newInstance(MapClientEntity.class);\n@@ -108,10 +108,12 @@ public class MapClientEntityClonerTest {\nassertThat(clonedInstance.getAttributes().get(\"attr\"), not(sameInstance(newInstance.getAttributes().get(\"attr\"))));\nassertThat(clonedInstance.getProtocolMappers(), not(sameInstance(newInstance.getProtocolMappers())));\n- assertThat(clonedInstance.getProtocolMapper(\"pmm-id\"), not(sameInstance(newInstance.getProtocolMapper(\"pmm-id\"))));\n- assertThat(clonedInstance.getProtocolMapper(\"pmm-id\"), equalTo(newInstance.getProtocolMapper(\"pmm-id\")));\n- assertThat(clonedInstance.getProtocolMapper(\"pmm-id\").getConfig(), not(sameInstance(newInstance.getProtocolMapper(\"pmm-id\").getConfig())));\n- assertThat(clonedInstance.getProtocolMapper(\"pmm-id\").getConfig(), equalTo(newInstance.getProtocolMapper(\"pmm-id\").getConfig()));\n+ assertThat(clonedInstance.getProtocolMapper(\"pmm-id\").isPresent(), is(true));\n+ assertThat(newInstance.getProtocolMapper(\"pmm-id\").isPresent(), is(true));\n+ assertThat(clonedInstance.getProtocolMapper(\"pmm-id\").get(), not(sameInstance(newInstance.getProtocolMapper(\"pmm-id\").get())));\n+ assertThat(clonedInstance.getProtocolMapper(\"pmm-id\").get(), equalTo(newInstance.getProtocolMapper(\"pmm-id\").get()));\n+ assertThat(clonedInstance.getProtocolMapper(\"pmm-id\").get().getConfig(), not(sameInstance(newInstance.getProtocolMapper(\"pmm-id\").get().getConfig())));\n+ assertThat(clonedInstance.getProtocolMapper(\"pmm-id\").get().getConfig(), equalTo(newInstance.getProtocolMapper(\"pmm-id\").get().getConfig()));\nassertThat(clonedInstance.getAuthenticationFlowBindingOverrides(), nullValue());\nassertThat(clonedInstance.getRegistrationToken(), nullValue());\n@@ -130,7 +132,7 @@ public class MapClientEntityClonerTest {\nconfig.put(\"key2\", \"value2\");\npmm.setConfig(config);\n- newInstance.setProtocolMapper(\"pmm-id\", pmm);\n+ newInstance.addProtocolMapper(pmm);\nnewInstance.setAttribute(\"attr\", Arrays.asList(\"aa\", \"bb\", \"cc\"));\nMapClientEntity clonedInstance = CLONER.newInstance(MapClientEntity.class);\n@@ -146,10 +148,12 @@ public class MapClientEntityClonerTest {\nassertThat(clonedInstance.getAttributes().get(\"attr\"), not(sameInstance(newInstance.getAttributes().get(\"attr\"))));\nassertThat(clonedInstance.getProtocolMappers(), not(sameInstance(newInstance.getProtocolMappers())));\n- assertThat(clonedInstance.getProtocolMapper(\"pmm-id\"), not(sameInstance(newInstance.getProtocolMapper(\"pmm-id\"))));\n- assertThat(clonedInstance.getProtocolMapper(\"pmm-id\"), equalTo(newInstance.getProtocolMapper(\"pmm-id\")));\n- assertThat(clonedInstance.getProtocolMapper(\"pmm-id\").getConfig(), not(sameInstance(newInstance.getProtocolMapper(\"pmm-id\").getConfig())));\n- assertThat(clonedInstance.getProtocolMapper(\"pmm-id\").getConfig(), equalTo(newInstance.getProtocolMapper(\"pmm-id\").getConfig()));\n+ assertThat(clonedInstance.getProtocolMapper(\"pmm-id\").isPresent(), is(true));\n+ assertThat(newInstance.getProtocolMapper(\"pmm-id\").isPresent(), is(true));\n+ assertThat(clonedInstance.getProtocolMapper(\"pmm-id\").get(), not(sameInstance(newInstance.getProtocolMapper(\"pmm-id\").get())));\n+ assertThat(clonedInstance.getProtocolMapper(\"pmm-id\").get(), equalTo(newInstance.getProtocolMapper(\"pmm-id\").get()));\n+ assertThat(clonedInstance.getProtocolMapper(\"pmm-id\").get().getConfig(), not(sameInstance(newInstance.getProtocolMapper(\"pmm-id\").get().getConfig())));\n+ assertThat(clonedInstance.getProtocolMapper(\"pmm-id\").get().getConfig(), equalTo(newInstance.getProtocolMapper(\"pmm-id\").get().getConfig()));\nassertThat(clonedInstance.getAuthenticationFlowBindingOverrides(), nullValue());\nassertThat(clonedInstance.getRegistrationToken(), nullValue());\n" }, { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/services/clientregistration/oidc/OIDCClientRegistrationProvider.java", "new_path": "services/src/main/java/org/keycloak/services/clientregistration/oidc/OIDCClientRegistrationProvider.java", "diff": "@@ -164,7 +164,7 @@ public class OIDCClientRegistrationProvider extends AbstractClientRegistrationPr\n} else {\nreturn false;\n}\n- }).forEach((ProtocolMapperModel mapping) -> {\n+ }).collect(Collectors.toList()).forEach((ProtocolMapperModel mapping) -> {\nPairwiseSubMapperHelper.setSectorIdentifierUri(mapping, sectorIdentifierUri);\nclientModel.updateProtocolMapper(mapping);\n});\n" } ]

[ { "change_type": "MODIFY", "old_path": "server-spi-private/src/main/java/org/keycloak/events/Errors.java", "new_path": "server-spi-private/src/main/java/org/keycloak/events/Errors.java", "diff": "@@ -30,6 +30,7 @@ public interface Errors {\nString CLIENT_DISABLED = \"client_disabled\";\nString INVALID_CLIENT_CREDENTIALS = \"invalid_client_credentials\";\nString INVALID_CLIENT = \"invalid_client\";\n+ String UNAUTHORIZED_CLIENT =\"unauthorized_client\";\nString CONSENT_DENIED = \"consent_denied\";\nString RESOLVE_REQUIRED_ACTIONS = \"resolve_required_actions\";\n" }, { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/protocol/oidc/grants/device/endpoints/DeviceEndpoint.java", "new_path": "services/src/main/java/org/keycloak/protocol/oidc/grants/device/endpoints/DeviceEndpoint.java", "diff": "@@ -364,8 +364,7 @@ public class DeviceEndpoint extends AuthorizationEndpointBase implements RealmRe\nif (client == null) {\nevent.error(Errors.INVALID_REQUEST);\n- throw new ErrorPageException(session, null, Response.Status.BAD_REQUEST, Messages.MISSING_PARAMETER,\n- OIDCLoginProtocol.CLIENT_ID_PARAM);\n+ throw new ErrorResponseException(Errors.INVALID_REQUEST, \"Missing parameters:\"+ OIDCLoginProtocol.CLIENT_ID_PARAM,Response.Status.BAD_REQUEST);\n}\ncheckClient(client.getClientId());\n@@ -376,8 +375,7 @@ public class DeviceEndpoint extends AuthorizationEndpointBase implements RealmRe\nprivate ClientModel checkClient(String clientId) {\nif (clientId == null) {\nevent.error(Errors.INVALID_REQUEST);\n- throw new ErrorPageException(session, null, Response.Status.BAD_REQUEST,\n- Messages.MISSING_PARAMETER, OIDCLoginProtocol.CLIENT_ID_PARAM);\n+ throw new ErrorResponseException(Errors.INVALID_REQUEST, \"Missing parameters:\"+ OIDCLoginProtocol.CLIENT_ID_PARAM, Response.Status.BAD_REQUEST);\n}\nevent.client(clientId);\n@@ -385,24 +383,22 @@ public class DeviceEndpoint extends AuthorizationEndpointBase implements RealmRe\nClientModel client = realm.getClientByClientId(clientId);\nif (client == null) {\nevent.error(Errors.CLIENT_NOT_FOUND);\n- throw new ErrorPageException(session, null, Response.Status.BAD_REQUEST,\n- Messages.CLIENT_NOT_FOUND);\n+ throw new ErrorResponseException(Errors.INVALID_CLIENT, \"Client not found.\", Response.Status.BAD_REQUEST);\n}\nif (!client.isEnabled()) {\nevent.error(Errors.CLIENT_DISABLED);\n- throw new ErrorPageException(session, null, Response.Status.BAD_REQUEST, Messages.CLIENT_DISABLED);\n+ throw new ErrorResponseException(Errors.INVALID_CLIENT, \"Client disabled.\", Response.Status.BAD_REQUEST);\n}\nif (!realm.getOAuth2DeviceConfig().isOAuth2DeviceAuthorizationGrantEnabled(client)) {\nevent.error(Errors.NOT_ALLOWED);\n- throw new ErrorPageException(session, null, Response.Status.BAD_REQUEST,\n- Messages.OAUTH2_DEVICE_AUTHORIZATION_GRANT_DISABLED);\n+ throw new ErrorResponseException(Errors.UNAUTHORIZED_CLIENT, \"Client is not allowed to initiate OAuth 2.0 Device Authorization Grant. The flow is disabled for the client.\", Response.Status.BAD_REQUEST);\n}\nif (client.isBearerOnly()) {\nevent.error(Errors.NOT_ALLOWED);\n- throw new ErrorPageException(session, null, Response.Status.FORBIDDEN, Messages.BEARER_ONLY);\n+ throw new ErrorResponseException(Errors.UNAUTHORIZED_CLIENT, \"Bearer-only applications are not allowed to initiate browser login.\", Response.Status.FORBIDDEN);\n}\nString protocol = client.getProtocol();\n@@ -413,7 +409,7 @@ public class DeviceEndpoint extends AuthorizationEndpointBase implements RealmRe\n}\nif (!protocol.equals(OIDCLoginProtocol.LOGIN_PROTOCOL)) {\nevent.error(Errors.INVALID_CLIENT);\n- throw new ErrorPageException(session, null, Response.Status.BAD_REQUEST, \"Wrong client protocol.\");\n+ throw new ErrorResponseException(Errors.UNAUTHORIZED_CLIENT, \"Wrong client protocol.\" , Response.Status.BAD_REQUEST);\n}\nsession.getContext().setClient(client);\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuth2DeviceAuthorizationGrantTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuth2DeviceAuthorizationGrantTest.java", "diff": "@@ -28,6 +28,7 @@ import org.junit.Test;\nimport org.keycloak.OAuth2Constants;\nimport org.keycloak.admin.client.resource.ClientResource;\nimport org.keycloak.admin.client.resource.RealmResource;\n+import org.keycloak.events.Errors;\nimport org.keycloak.models.ClientScopeModel;\nimport org.keycloak.models.OAuth2DeviceConfig;\nimport org.keycloak.models.utils.KeycloakModelUtils;\n@@ -851,6 +852,51 @@ public class OAuth2DeviceAuthorizationGrantTest extends AbstractKeycloakTest {\nverificationPage.assertInvalidUserCodePage();\n}\n+ @Test\n+ public void testNotFoundClient() throws Exception {\n+ oauth.realm(REALM_NAME);\n+ oauth.clientId(\"test-device-public2\");\n+ OAuthClient.DeviceAuthorizationResponse response = oauth.doDeviceAuthorizationRequest(\"test-device-public2\", null);\n+\n+ Assert.assertEquals(400, response.getStatusCode());\n+ Assert.assertEquals(Errors.INVALID_CLIENT, response.getError());\n+ Assert.assertEquals(\"Invalid client credentials\", response.getErrorDescription());\n+ }\n+ @Test\n+ public void testClientWithErrors() throws Exception {\n+ try {\n+ ClientResource client = ApiUtil.findClientByClientId(adminClient.realm(REALM_NAME), DEVICE_APP_PUBLIC);\n+ ClientRepresentation clientRepresentation = client.toRepresentation();\n+ clientRepresentation.getAttributes().put(OAuth2DeviceConfig.OAUTH2_DEVICE_AUTHORIZATION_GRANT_ENABLED, \"false\");\n+ client.update(clientRepresentation);\n+ oauth.realm(REALM_NAME);\n+ oauth.clientId(DEVICE_APP_PUBLIC);\n+\n+ //DeviceAuthorizationGrant not enabled\n+ OAuthClient.DeviceAuthorizationResponse response = oauth.doDeviceAuthorizationRequest(DEVICE_APP_PUBLIC, null);\n+ Assert.assertEquals(400, response.getStatusCode());\n+ Assert.assertEquals(Errors.UNAUTHORIZED_CLIENT, response.getError());\n+ Assert.assertEquals(\"Client is not allowed to initiate OAuth 2.0 Device Authorization Grant. The flow is disabled for the client.\", response.getErrorDescription());\n+\n+ clientRepresentation.getAttributes().put(OAuth2DeviceConfig.OAUTH2_DEVICE_AUTHORIZATION_GRANT_ENABLED, \"true\");\n+ clientRepresentation.setBearerOnly(true);\n+ client.update(clientRepresentation);\n+\n+ //BearerOnly client\n+ response = oauth.doDeviceAuthorizationRequest(DEVICE_APP_PUBLIC, null);\n+ Assert.assertEquals(403, response.getStatusCode());\n+ Assert.assertEquals(Errors.UNAUTHORIZED_CLIENT, response.getError());\n+ Assert.assertEquals(\"Bearer-only applications are not allowed to initiate browser login.\", response.getErrorDescription());\n+\n+ } finally {\n+ ClientResource client = ApiUtil.findClientByClientId(adminClient.realm(REALM_NAME), DEVICE_APP_PUBLIC);\n+ ClientRepresentation clientRepresentation = client.toRepresentation();\n+ clientRepresentation.getAttributes().put(OAuth2DeviceConfig.OAUTH2_DEVICE_AUTHORIZATION_GRANT_ENABLED, \"true\");\n+ clientRepresentation.setBearerOnly(false);\n+ client.update(clientRepresentation);\n+ }\n+ }\n+\nprivate void openVerificationPage(String verificationUri) {\ndriver.navigate().to(verificationUri);\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/jpa/src/main/java/org/keycloak/events/jpa/JpaAdminEventQuery.java", "new_path": "model/jpa/src/main/java/org/keycloak/events/jpa/JpaAdminEventQuery.java", "diff": "@@ -20,7 +20,6 @@ package org.keycloak.events.jpa;\nimport org.keycloak.events.admin.AdminEvent;\nimport org.keycloak.events.admin.AdminEventQuery;\nimport org.keycloak.events.admin.OperationType;\n-import org.keycloak.events.admin.ResourceType;\nimport javax.persistence.EntityManager;\nimport javax.persistence.TypedQuery;\n@@ -77,14 +76,8 @@ public class JpaAdminEventQuery implements AdminEventQuery {\n}\n@Override\n- public AdminEventQuery resourceType(ResourceType... resourceTypes) {\n-\n- List<String> resourceTypeStrings = new LinkedList<String>();\n- for (ResourceType e : resourceTypes) {\n- resourceTypeStrings.add(e.toString());\n- }\n- predicates.add(root.get(\"resourceType\").in(resourceTypeStrings));\n-\n+ public AdminEventQuery resourceType(List<String> resourceTypes) {\n+ predicates.add(root.get(\"resourceType\").in(resourceTypes));\nreturn this;\n}\n" }, { "change_type": "MODIFY", "old_path": "model/jpa/src/main/java/org/keycloak/events/jpa/JpaEventStoreProvider.java", "new_path": "model/jpa/src/main/java/org/keycloak/events/jpa/JpaEventStoreProvider.java", "diff": "@@ -210,11 +210,7 @@ public class JpaEventStoreProvider implements EventStoreProvider {\nadminEventEntity.setRealmId(adminEvent.getRealmId());\nsetAuthDetails(adminEventEntity, adminEvent.getAuthDetails());\nadminEventEntity.setOperationType(adminEvent.getOperationType().toString());\n-\n- if (adminEvent.getResourceTypeAsString() != null) {\n- adminEventEntity.setResourceType(adminEvent.getResourceTypeAsString());\n- }\n-\n+ adminEventEntity.setResourceType(adminEvent.getResourceType());\nadminEventEntity.setResourcePath(adminEvent.getResourcePath());\nadminEventEntity.setError(adminEvent.getError());\n@@ -231,11 +227,7 @@ public class JpaEventStoreProvider implements EventStoreProvider {\nadminEvent.setRealmId(adminEventEntity.getRealmId());\nsetAuthDetails(adminEvent, adminEventEntity);\nadminEvent.setOperationType(OperationType.valueOf(adminEventEntity.getOperationType()));\n-\n- if (adminEventEntity.getResourceType() != null) {\n- adminEvent.setResourceTypeAsString(adminEventEntity.getResourceType());\n- }\n-\n+ adminEvent.setResourceType(adminEventEntity.getResourceType());\nadminEvent.setResourcePath(adminEventEntity.getResourcePath());\nadminEvent.setError(adminEventEntity.getError());\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/events/EventUtils.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/events/EventUtils.java", "diff": "@@ -50,7 +50,7 @@ public class EventUtils {\nadminEvent.setRealmId(adminEventEntity.getRealmId());\nsetAuthDetails(adminEvent, adminEventEntity);\nadminEvent.setOperationType(adminEventEntity.getOperationType());\n- adminEvent.setResourceTypeAsString(adminEventEntity.getResourceType());\n+ adminEvent.setResourceType(adminEventEntity.getResourceType());\nadminEvent.setResourcePath(adminEventEntity.getResourcePath());\nadminEvent.setError(adminEventEntity.getError());\n@@ -68,7 +68,7 @@ public class EventUtils {\nmapAdminEvent.setRealmId(adminEvent.getRealmId());\nsetAuthDetails(mapAdminEvent, adminEvent.getAuthDetails());\nmapAdminEvent.setOperationType(adminEvent.getOperationType());\n- mapAdminEvent.setResourceType(adminEvent.getResourceTypeAsString());\n+ mapAdminEvent.setResourceType(adminEvent.getResourceType());\nmapAdminEvent.setResourcePath(adminEvent.getResourcePath());\nmapAdminEvent.setError(adminEvent.getError());\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/events/MapAdminEventQuery.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/events/MapAdminEventQuery.java", "diff": "@@ -21,12 +21,12 @@ import org.keycloak.events.admin.AdminEvent;\nimport org.keycloak.events.admin.AdminEvent.SearchableFields;\nimport org.keycloak.events.admin.AdminEventQuery;\nimport org.keycloak.events.admin.OperationType;\n-import org.keycloak.events.admin.ResourceType;\nimport org.keycloak.models.map.storage.QueryParameters;\nimport org.keycloak.models.map.storage.criteria.DefaultModelCriteria;\nimport java.util.Arrays;\nimport java.util.Date;\n+import java.util.List;\nimport java.util.function.Function;\nimport java.util.stream.Stream;\n@@ -86,8 +86,8 @@ public class MapAdminEventQuery implements AdminEventQuery {\n}\n@Override\n- public AdminEventQuery resourceType(ResourceType... resourceTypes) {\n- mcb = mcb.compare(SearchableFields.RESOURCE_TYPE, IN, Arrays.stream(resourceTypes));\n+ public AdminEventQuery resourceType(List<String> resourceTypes) {\n+ mcb = mcb.compare(SearchableFields.RESOURCE_TYPE, IN, resourceTypes);\nreturn this;\n}\n" }, { "change_type": "MODIFY", "old_path": "server-spi-private/src/main/java/org/keycloak/events/admin/AdminEvent.java", "new_path": "server-spi-private/src/main/java/org/keycloak/events/admin/AdminEvent.java", "diff": "@@ -64,7 +64,7 @@ public class AdminEvent {\nthis.time = toCopy.getTime();\nthis.realmId = toCopy.getRealmId();\nthis.authDetails = new AuthDetails(toCopy.getAuthDetails());\n- this.resourceType = toCopy.getResourceTypeAsString();\n+ this.resourceType = toCopy.getResourceType();\nthis.operationType = toCopy.getOperationType();\nthis.resourcePath = toCopy.getResourcePath();\nthis.representation = toCopy.getRepresentation();\n@@ -186,35 +186,11 @@ public class AdminEvent {\n*\n* @return\n*/\n- public ResourceType getResourceType() {\n- if (resourceType == null) {\n- return null;\n- }\n- try {\n- return ResourceType.valueOf(resourceType);\n- }\n- catch (IllegalArgumentException e) {\n- return ResourceType.CUSTOM;\n- }\n- }\n-\n- public void setResourceType(ResourceType resourceType) {\n- this.resourceType = resourceType == null ? null : resourceType.toString();\n- }\n-\n- /**\n- * Returns the type as string. Custom resource types with values different from {@link ResourceType} are possible. In this case {@link #getResourceType()} returns <code>CUSTOM</code>.\n- *\n- * @return\n- */\n- public String getResourceTypeAsString() {\n+ public String getResourceType() {\nreturn resourceType;\n}\n- /**\n- * Setter for custom resource types with values different from {@link ResourceType}.\n- */\n- public void setResourceTypeAsString(String resourceType) {\n+ public void setResourceType(String resourceType) {\nthis.resourceType = resourceType;\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "server-spi-private/src/main/java/org/keycloak/events/admin/AdminEventQuery.java", "new_path": "server-spi-private/src/main/java/org/keycloak/events/admin/AdminEventQuery.java", "diff": "@@ -80,7 +80,7 @@ public interface AdminEventQuery {\n* @param resourceTypes\n* @return <code>this</code> for method chaining\n*/\n- AdminEventQuery resourceType(ResourceType ... resourceTypes);\n+ AdminEventQuery resourceType(List<String> resourceTypes);\n/**\n* Search by resource path. Supports wildcard <code>*</code>. For example:\n" }, { "change_type": "MODIFY", "old_path": "server-spi-private/src/main/java/org/keycloak/events/admin/ResourceType.java", "new_path": "server-spi-private/src/main/java/org/keycloak/events/admin/ResourceType.java", "diff": "@@ -21,170 +21,38 @@ package org.keycloak.events.admin;\n*\n* @author <a href=\"mailto:[email protected]\">Thomas Darimont</a>\n*/\n-public enum ResourceType {\n-\n- /**\n- *\n- */\n- REALM\n-\n- /**\n- *\n- */\n- , REALM_ROLE\n-\n- /**\n- *\n- */\n- , REALM_ROLE_MAPPING\n-\n- /**\n- *\n- */\n- , REALM_SCOPE_MAPPING\n-\n- /**\n- *\n- */\n- , AUTH_FLOW\n-\n- /**\n- *\n- */\n- , AUTH_EXECUTION_FLOW\n-\n- /**\n- *\n- */\n- , AUTH_EXECUTION\n-\n- /**\n- *\n- */\n- , AUTHENTICATOR_CONFIG\n-\n- /**\n- *\n- */\n- , REQUIRED_ACTION\n-\n- /**\n- *\n- */\n- , IDENTITY_PROVIDER\n-\n- /**\n- *\n- */\n- , IDENTITY_PROVIDER_MAPPER\n-\n- /**\n- *\n- */\n- , PROTOCOL_MAPPER\n-\n- /**\n- *\n- */\n- , USER\n-\n- /**\n- *\n- */\n- , USER_LOGIN_FAILURE\n-\n- /**\n- *\n- */\n- , USER_SESSION\n-\n- /**\n- *\n- */\n- , USER_FEDERATION_PROVIDER\n-\n- /**\n- *\n- */\n- , USER_FEDERATION_MAPPER\n-\n- /**\n- *\n- */\n- , GROUP\n-\n- /**\n- *\n- */\n- , GROUP_MEMBERSHIP\n-\n- /**\n- *\n- */\n- , CLIENT\n-\n- /**\n- *\n- */\n- , CLIENT_INITIAL_ACCESS_MODEL\n-\n- /**\n- *\n- */\n- , CLIENT_ROLE\n-\n- /**\n- *\n- */\n- , CLIENT_ROLE_MAPPING\n-\n- /**\n- *\n- */\n- , CLIENT_SCOPE\n-\n- /**\n- *\n- */\n- , CLIENT_SCOPE_MAPPING\n-\n- /**\n- *\n- */\n- , CLIENT_SCOPE_CLIENT_MAPPING\n-\n- /**\n- *\n- */\n- , CLUSTER_NODE\n-\n- /**\n- *\n- */\n- , COMPONENT\n-\n- /**\n- *\n- */\n- , AUTHORIZATION_RESOURCE_SERVER\n-\n- /**\n- *\n- */\n- , AUTHORIZATION_RESOURCE\n-\n- /**\n- *\n- */\n- , AUTHORIZATION_SCOPE\n-\n- /**\n- *\n- */\n- , AUTHORIZATION_POLICY\n-\n- /**\n- *\n- */\n- , CUSTOM;\n+public interface ResourceType {\n+\n+ public static String REALM = \"REALM\";\n+ public static String REALM_ROLE = \"REALM_ROLE\";\n+ public static String REALM_ROLE_MAPPING = \"REALM_ROLE_MAPPING\";\n+ public static String REALM_SCOPE_MAPPING = \"REALM_SCOPE_MAPPING\";\n+ public static String AUTH_FLOW = \"AUTH_FLOW\";\n+ public static String AUTH_EXECUTION_FLOW = \"AUTH_EXECUTION_FLOW\";\n+ public static String AUTH_EXECUTION = \"AUTH_EXECUTION\";\n+ public static String AUTHENTICATOR_CONFIG = \"AUTHENTICATOR_CONFIG\";\n+ public static String REQUIRED_ACTION = \"REQUIRED_ACTION\";\n+ public static String IDENTITY_PROVIDER = \"IDENTITY_PROVIDER\";\n+ public static String IDENTITY_PROVIDER_MAPPER = \"IDENTITY_PROVIDER_MAPPER\";\n+ public static String PROTOCOL_MAPPER = \"PROTOCOL_MAPPER\";\n+ public static String USER = \"USER\";\n+ public static String USER_LOGIN_FAILURE = \"USER_LOGIN_FAILURE\";\n+ public static String USER_SESSION = \"USER_SESSION\";\n+ public static String USER_FEDERATION_PROVIDER = \"USER_FEDERATION_PROVIDER\";\n+ public static String USER_FEDERATION_MAPPER = \"USER_FEDERATION_MAPPER\";\n+ public static String GROUP = \"GROUP\";\n+ public static String GROUP_MEMBERSHIP = \"GROUP_MEMBERSHIP\";\n+ public static String CLIENT = \"CLIENT\";\n+ public static String CLIENT_INITIAL_ACCESS_MODEL = \"CLIENT_INITIAL_ACCESS_MODEL\";\n+ public static String CLIENT_ROLE = \"CLIENT_ROLE\";\n+ public static String CLIENT_ROLE_MAPPING = \"CLIENT_ROLE_MAPPING\";\n+ public static String CLIENT_SCOPE = \"CLIENT_SCOPE\";\n+ public static String CLIENT_SCOPE_MAPPING = \"CLIENT_SCOPE_MAPPING\";\n+ public static String CLIENT_SCOPE_CLIENT_MAPPING = \"CLIENT_SCOPE_CLIENT_MAPPING\";\n+ public static String CLUSTER_NODE = \"CLUSTER_NODE\";\n+ public static String COMPONENT = \"COMPONENT\";\n+ public static String AUTHORIZATION_RESOURCE_SERVER = \"AUTHORIZATION_RESOURCE_SERVER\";\n+ public static String AUTHORIZATION_RESOURCE = \"AUTHORIZATION_RESOURCE\";\n+ public static String AUTHORIZATION_SCOPE = \"AUTHORIZATION_SCOPE\";\n+ public static String AUTHORIZATION_POLICY = \"AUTHORIZATION_POLICY\";\n}\n" }, { "change_type": "MODIFY", "old_path": "server-spi-private/src/main/java/org/keycloak/models/utils/ModelToRepresentation.java", "new_path": "server-spi-private/src/main/java/org/keycloak/models/utils/ModelToRepresentation.java", "diff": "@@ -282,9 +282,7 @@ public class ModelToRepresentation {\nrep.setAuthDetails(toRepresentation(adminEvent.getAuthDetails()));\n}\nrep.setOperationType(adminEvent.getOperationType().toString());\n- if (adminEvent.getResourceTypeAsString() != null) {\n- rep.setResourceType(adminEvent.getResourceTypeAsString());\n- }\n+ rep.setResourceType(adminEvent.getResourceType());\nrep.setResourcePath(adminEvent.getResourcePath());\nrep.setRepresentation(adminEvent.getRepresentation());\nrep.setError(adminEvent.getError());\n" }, { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/events/log/JBossLoggingEventListenerProvider.java", "new_path": "services/src/main/java/org/keycloak/events/log/JBossLoggingEventListenerProvider.java", "diff": "@@ -136,7 +136,7 @@ public class JBossLoggingEventListenerProvider implements EventListenerProvider\nsb.append(\", ipAddress=\");\nsb.append(adminEvent.getAuthDetails().getIpAddress());\nsb.append(\", resourceType=\");\n- sb.append(adminEvent.getResourceTypeAsString());\n+ sb.append(adminEvent.getResourceType());\nsb.append(\", resourcePath=\");\nsb.append(adminEvent.getResourcePath());\n" }, { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/services/resources/admin/AdminEventBuilder.java", "new_path": "services/src/main/java/org/keycloak/services/resources/admin/AdminEventBuilder.java", "diff": "@@ -24,7 +24,6 @@ import org.keycloak.events.EventStoreProvider;\nimport org.keycloak.events.admin.AdminEvent;\nimport org.keycloak.events.admin.AuthDetails;\nimport org.keycloak.events.admin.OperationType;\n-import org.keycloak.events.admin.ResourceType;\nimport org.keycloak.models.ClientModel;\nimport org.keycloak.models.KeycloakSession;\nimport org.keycloak.models.RealmModel;\n@@ -113,16 +112,8 @@ public class AdminEventBuilder {\nreturn this;\n}\n- public AdminEventBuilder resource(ResourceType resourceType){\n- adminEvent.setResourceType(resourceType);\n- return this;\n- }\n-\n- /**\n- * Setter for custom resource types with values different from {@link ResourceType}.\n- */\npublic AdminEventBuilder resource(String resourceType){\n- adminEvent.setResourceTypeAsString(resourceType);\n+ adminEvent.setResourceType(resourceType);\nreturn this;\n}\n" }, { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java", "new_path": "services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java", "diff": "@@ -849,15 +849,9 @@ public class RealmAdminResource {\n}\nif (resourceTypes != null && !resourceTypes.isEmpty()) {\n- ResourceType[] t = new ResourceType[resourceTypes.size()];\n- for (int i = 0; i < t.length; i++) {\n- t[i] = ResourceType.valueOf(resourceTypes.get(i));\n- }\n- query.resourceType(t);\n+ query.resourceType(resourceTypes);\n}\n-\n-\nif(dateFrom != null) {\nSimpleDateFormat df = new SimpleDateFormat(\"yyyy-MM-dd\");\nDate from = null;\n" }, { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/services/resources/admin/info/ServerInfoAdminResource.java", "new_path": "services/src/main/java/org/keycloak/services/resources/admin/info/ServerInfoAdminResource.java", "diff": "@@ -25,7 +25,6 @@ import org.keycloak.common.Profile;\nimport org.keycloak.component.ComponentFactory;\nimport org.keycloak.events.EventType;\nimport org.keycloak.events.admin.OperationType;\n-import org.keycloak.events.admin.ResourceType;\nimport org.keycloak.models.KeycloakSession;\nimport org.keycloak.models.utils.ModelToRepresentation;\nimport org.keycloak.policy.PasswordPolicyProvider;\n@@ -75,7 +74,7 @@ import java.util.stream.Stream;\n*/\npublic class ServerInfoAdminResource {\n- private static final Map<String, List<String>> ENUMS = createEnumsMap(EventType.class, OperationType.class, ResourceType.class);\n+ private static final Map<String, List<String>> ENUMS = createEnumsMap(EventType.class, OperationType.class);\n@Context\nprivate KeycloakSession session;\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestingResourceProvider.java", "new_path": "testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestingResourceProvider.java", "diff": "@@ -559,9 +559,7 @@ public class TestingResourceProvider implements RealmResourceProvider {\nevent.setAuthDetails(repToModel(rep.getAuthDetails()));\nevent.setError(rep.getError());\nevent.setOperationType(OperationType.valueOf(rep.getOperationType()));\n- if (rep.getResourceType() != null) {\n- event.setResourceTypeAsString(rep.getResourceType());\n- }\n+ event.setResourceType(rep.getResourceType());\nevent.setRealmId(rep.getRealmId());\nevent.setRepresentation(rep.getRepresentation());\nevent.setResourcePath(rep.getResourcePath());\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/AssertAdminEvents.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/AssertAdminEvents.java", "diff": "@@ -27,7 +27,6 @@ import org.junit.runners.model.Statement;\nimport org.keycloak.common.util.ObjectUtil;\nimport org.keycloak.common.util.reflections.Reflections;\nimport org.keycloak.events.admin.OperationType;\n-import org.keycloak.events.admin.ResourceType;\nimport org.keycloak.jose.jws.JWSInput;\nimport org.keycloak.jose.jws.JWSInputException;\nimport org.keycloak.representations.AccessToken;\n@@ -97,19 +96,19 @@ public class AssertAdminEvents implements TestRule {\n- public AdminEventRepresentation assertEvent(String realmId, OperationType operationType, String resourcePath, ResourceType resourceType) {\n+ public AdminEventRepresentation assertEvent(String realmId, OperationType operationType, String resourcePath, String resourceType) {\nreturn assertEvent(realmId, operationType, resourcePath, null, resourceType);\n}\n- public AdminEventRepresentation assertEvent(String realmId, OperationType operationType, Matcher<String> resourcePath, ResourceType resourceType) {\n+ public AdminEventRepresentation assertEvent(String realmId, OperationType operationType, Matcher<String> resourcePath, String resourceType) {\nreturn assertEvent(realmId, operationType, resourcePath, null, resourceType);\n}\n- public AdminEventRepresentation assertEvent(String realmId, OperationType operationType, String resourcePath, Object representation, ResourceType resourceType) {\n+ public AdminEventRepresentation assertEvent(String realmId, OperationType operationType, String resourcePath, Object representation, String resourceType) {\nreturn assertEvent(realmId, operationType, Matchers.equalTo(resourcePath), representation, resourceType);\n}\n- public AdminEventRepresentation assertEvent(String realmId, OperationType operationType, Matcher<String> resourcePath, Object representation, ResourceType resourceType) {\n+ public AdminEventRepresentation assertEvent(String realmId, OperationType operationType, Matcher<String> resourcePath, Object representation, String resourceType) {\nreturn expect().realmId(realmId)\n.operationType(operationType)\n.resourcePath(resourcePath)\n@@ -124,7 +123,7 @@ public class AssertAdminEvents implements TestRule {\nprivate AdminEventRepresentation expected = new AdminEventRepresentation();\nprivate Matcher<String> resourcePath;\n- private ResourceType resourceType;\n+ private String resourceType;\nprivate Object expectedRep;\npublic ExpectedAdminEvent realmId(String realmId) {\n@@ -151,8 +150,8 @@ public class AssertAdminEvents implements TestRule {\nreturn this;\n}\n- public ExpectedAdminEvent resourceType(ResourceType resourceType){\n- expected.setResourceType(resourceType.toString());\n+ public ExpectedAdminEvent resourceType(String resourceType){\n+ expected.setResourceType(resourceType);\nreturn this;\n}\n" } ]

[ { "change_type": "RENAME", "old_path": "server-spi/src/main/java/org/keycloak/models/cache/CachedUserModel.java", "new_path": "model/legacy/src/main/java/org/keycloak/models/cache/CachedUserModel.java", "diff": "/*\n- * Copyright 2016 Red Hat, Inc. and/or its affiliates\n+ * Copyright 2022 Red Hat, Inc. and/or its affiliates\n* and other contributors as indicated by the @author tags.\n*\n* Licensed under the Apache License, Version 2.0 (the \"License\");\n" }, { "change_type": "RENAME", "old_path": "server-spi/src/main/java/org/keycloak/models/cache/OnUserCache.java", "new_path": "model/legacy/src/main/java/org/keycloak/models/cache/OnUserCache.java", "diff": "/*\n- * Copyright 2016 Red Hat, Inc. and/or its affiliates\n+ * Copyright 2022 Red Hat, Inc. and/or its affiliates\n* and other contributors as indicated by the @author tags.\n*\n* Licensed under the Apache License, Version 2.0 (the \"License\");\n" } ]

[ { "change_type": "RENAME", "old_path": "server-spi-private/src/main/java/org/keycloak/storage/group/GroupStorageProviderFactory.java", "new_path": "model/legacy-private/src/main/java/org/keycloak/storage/group/GroupStorageProviderFactory.java", "diff": "" }, { "change_type": "RENAME", "old_path": "server-spi-private/src/main/java/org/keycloak/storage/group/GroupStorageProviderSpi.java", "new_path": "model/legacy-private/src/main/java/org/keycloak/storage/group/GroupStorageProviderSpi.java", "diff": "" }, { "change_type": "MODIFY", "old_path": "model/legacy-private/src/main/resources/META-INF/services/org.keycloak.provider.Spi", "new_path": "model/legacy-private/src/main/resources/META-INF/services/org.keycloak.provider.Spi", "diff": "org.keycloak.models.cache.CacheUserProviderSpi\norg.keycloak.models.cache.CacheRealmProviderSpi\norg.keycloak.storage.client.ClientStorageProviderSpi\n+org.keycloak.storage.group.GroupStorageProviderSpi\n" }, { "change_type": "RENAME", "old_path": "server-spi/src/main/java/org/keycloak/storage/group/GroupStorageProvider.java", "new_path": "model/legacy/src/main/java/org/keycloak/storage/group/GroupStorageProvider.java", "diff": "" }, { "change_type": "RENAME", "old_path": "server-spi/src/main/java/org/keycloak/storage/group/GroupStorageProviderModel.java", "new_path": "model/legacy/src/main/java/org/keycloak/storage/group/GroupStorageProviderModel.java", "diff": "" }, { "change_type": "MODIFY", "old_path": "server-spi-private/src/main/resources/META-INF/services/org.keycloak.provider.Spi", "new_path": "server-spi-private/src/main/resources/META-INF/services/org.keycloak.provider.Spi", "diff": "@@ -80,7 +80,6 @@ org.keycloak.keys.KeySpi\norg.keycloak.storage.DatastoreSpi\norg.keycloak.storage.clientscope.ClientScopeStorageProviderSpi\norg.keycloak.storage.role.RoleStorageProviderSpi\n-org.keycloak.storage.group.GroupStorageProviderSpi\norg.keycloak.crypto.SignatureSpi\norg.keycloak.crypto.ClientSignatureVerifierSpi\norg.keycloak.crypto.HashSpi\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/legacy-private/src/main/java/org/keycloak/storage/RoleStorageManager.java", "new_path": "model/legacy-private/src/main/java/org/keycloak/storage/RoleStorageManager.java", "diff": "@@ -23,6 +23,7 @@ import org.keycloak.common.util.reflections.Types;\nimport org.keycloak.component.ComponentModel;\nimport org.keycloak.models.ClientModel;\nimport org.keycloak.models.KeycloakSession;\n+import org.keycloak.models.LegacyRealmModel;\nimport org.keycloak.models.ModelException;\nimport org.keycloak.models.RealmModel;\nimport org.keycloak.models.RoleModel;\n@@ -71,9 +72,8 @@ public class RoleStorageManager implements RoleProvider {\nreturn getStorageProviderInstance(session, storageModel, factory);\n}\n-\npublic static <T> Stream<RoleStorageProviderModel> getStorageProviders(RealmModel realm, KeycloakSession session, Class<T> type) {\n- return realm.getRoleStorageProvidersStream()\n+ return ((LegacyRealmModel) realm).getRoleStorageProvidersStream()\n.filter(model -> {\nRoleStorageProviderFactory factory = getRoleStorageProviderFactory(model, session);\nif (factory == null) {\n@@ -162,9 +162,9 @@ public class RoleStorageManager implements RoleProvider {\n/**\n* Obtaining roles from an external role storage is time-bounded. In case the external role storage\n* isn't available at least roles from a local storage are returned. For this purpose\n- * the {@link org.keycloak.services.DefaultKeycloakSessionFactory#getRoleStorageProviderTimeout()} property is used.\n+ * the <code>org.keycloak.services.DefaultKeycloakSessionFactory#getRoleStorageProviderTimeout()</code> property is used.\n* Default value is 3000 milliseconds and it's configurable.\n- * See {@link org.keycloak.services.DefaultKeycloakSessionFactory} for details.\n+ * See <code>org.keycloak.services.DefaultKeycloakSessionFactory</code> for details.\n*/\n@Override\npublic Stream<RoleModel> searchForRolesStream(RealmModel realm, String search, Integer first, Integer max) {\n@@ -229,9 +229,9 @@ public class RoleStorageManager implements RoleProvider {\n/**\n* Obtaining roles from an external role storage is time-bounded. In case the external role storage\n* isn't available at least roles from a local storage are returned. For this purpose\n- * the {@link org.keycloak.services.DefaultKeycloakSessionFactory#getRoleStorageProviderTimeout()} property is used.\n+ * the <code>org.keycloak.services.DefaultKeycloakSessionFactory#getRoleStorageProviderTimeout()} property is used.\n* Default value is 3000 milliseconds and it's configurable.\n- * See {@link org.keycloak.services.DefaultKeycloakSessionFactory} for details.\n+ * See <code>org.keycloak.services.DefaultKeycloakSessionFactory</code> for details.\n*/\n@Override\npublic Stream<RoleModel> searchForClientRolesStream(ClientModel client, String search, Integer first, Integer max) {\n" }, { "change_type": "MODIFY", "old_path": "model/legacy/src/main/java/org/keycloak/models/LegacyRealmModel.java", "new_path": "model/legacy/src/main/java/org/keycloak/models/LegacyRealmModel.java", "diff": "@@ -20,6 +20,8 @@ package org.keycloak.models;\nimport org.keycloak.models.RealmModel;\nimport org.keycloak.storage.client.ClientStorageProvider;\nimport org.keycloak.storage.client.ClientStorageProviderModel;\n+import org.keycloak.storage.role.RoleStorageProvider;\n+import org.keycloak.storage.role.RoleStorageProviderModel;\nimport java.util.List;\nimport java.util.stream.Collectors;\n@@ -47,4 +49,24 @@ public interface LegacyRealmModel extends RealmModel {\n.map(ClientStorageProviderModel::new)\n.sorted(ClientStorageProviderModel.comparator);\n}\n+\n+ /**\n+ * @deprecated Use {@link #getRoleStorageProvidersStream() getRoleStorageProvidersStream} instead.\n+ */\n+ @Deprecated\n+ default List<RoleStorageProviderModel> getRoleStorageProviders() {\n+ return getRoleStorageProvidersStream().collect(Collectors.toList());\n+ }\n+\n+ /**\n+ * Returns sorted {@link RoleStorageProviderModel RoleStorageProviderModel} as a stream.\n+ * It should be used with forEachOrdered if the ordering is required.\n+ * @return Sorted stream of {@link RoleStorageProviderModel}. Never returns {@code null}.\n+ */\n+ default Stream<RoleStorageProviderModel> getRoleStorageProvidersStream() {\n+ return getComponentsStream(getId(), RoleStorageProvider.class.getName())\n+ .map(RoleStorageProviderModel::new)\n+ .sorted(RoleStorageProviderModel.comparator);\n+ }\n+\n}\n" }, { "change_type": "RENAME", "old_path": "server-spi/src/main/java/org/keycloak/storage/role/RoleStorageProviderModel.java", "new_path": "model/legacy/src/main/java/org/keycloak/storage/role/RoleStorageProviderModel.java", "diff": "" }, { "change_type": "MODIFY", "old_path": "server-spi/src/main/java/org/keycloak/models/RealmModel.java", "new_path": "server-spi/src/main/java/org/keycloak/models/RealmModel.java", "diff": "@@ -23,8 +23,6 @@ import org.keycloak.component.ComponentModel;\nimport org.keycloak.provider.Provider;\nimport org.keycloak.provider.ProviderEvent;\nimport org.keycloak.storage.SearchableModelField;\n-import org.keycloak.storage.role.RoleStorageProvider;\n-import org.keycloak.storage.role.RoleStorageProviderModel;\nimport java.util.List;\nimport java.util.Map;\n@@ -658,25 +656,6 @@ public interface RealmModel extends RoleContainerModel {\nComponentModel getComponent(String id);\n- /**\n- * @deprecated Use {@link #getRoleStorageProvidersStream() getRoleStorageProvidersStream} instead.\n- */\n- @Deprecated\n- default List<RoleStorageProviderModel> getRoleStorageProviders() {\n- return getRoleStorageProvidersStream().collect(Collectors.toList());\n- }\n-\n- /**\n- * Returns sorted {@link RoleStorageProviderModel RoleStorageProviderModel} as a stream.\n- * It should be used with forEachOrdered if the ordering is required.\n- * @return Sorted stream of {@link RoleStorageProviderModel}. Never returns {@code null}.\n- */\n- default Stream<RoleStorageProviderModel> getRoleStorageProvidersStream() {\n- return getComponentsStream(getId(), RoleStorageProvider.class.getName())\n- .map(RoleStorageProviderModel::new)\n- .sorted(RoleStorageProviderModel.comparator);\n- }\n-\n/**\n* Returns stream of ComponentModels that represent StorageProviders for class storageProviderClass in this realm.\n* @param storageProviderClass {@code Class<? extends Provider>}\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/ClientStorageTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/ClientStorageTest.java", "diff": "@@ -31,6 +31,7 @@ import org.keycloak.events.Details;\nimport org.keycloak.models.ClientModel;\nimport org.keycloak.models.Constants;\nimport org.keycloak.models.KeycloakSession;\n+import org.keycloak.models.LegacyRealmModel;\nimport org.keycloak.models.RealmModel;\nimport org.keycloak.models.cache.infinispan.ClientAdapter;\nimport org.keycloak.representations.AccessToken;\n@@ -341,7 +342,7 @@ public class ClientStorageTest extends AbstractTestRealmKeycloakTest {\ntestingClient.server().run(session -> {\nRealmModel realm = session.realms().getRealmByName(\"test\");\n- ClientStorageProviderModel model = realm.getClientStorageProvidersStream().findFirst().get();\n+ ClientStorageProviderModel model = ((LegacyRealmModel) realm).getClientStorageProvidersStream().findFirst().get();\nCalendar eviction = Calendar.getInstance();\neviction.add(Calendar.HOUR, 1);\nmodel.setCachePolicy(CacheableStorageProviderModel.CachePolicy.EVICT_DAILY);\n@@ -366,7 +367,7 @@ public class ClientStorageTest extends AbstractTestRealmKeycloakTest {\ntestingClient.server().run(session -> {\nRealmModel realm = session.realms().getRealmByName(\"test\");\n- ClientStorageProviderModel model = realm.getClientStorageProvidersStream().findAny().get();\n+ ClientStorageProviderModel model = ((LegacyRealmModel) realm).getClientStorageProvidersStream().findAny().get();\nCalendar eviction = Calendar.getInstance();\neviction.add(Calendar.HOUR, 4 * 24);\nmodel.setCachePolicy(CacheableStorageProviderModel.CachePolicy.EVICT_WEEKLY);\n@@ -394,7 +395,7 @@ public class ClientStorageTest extends AbstractTestRealmKeycloakTest {\ntestingClient.server().run(session -> {\nRealmModel realm = session.realms().getRealmByName(\"test\");\n- ClientStorageProviderModel model = realm.getClientStorageProvidersStream().findFirst().get();\n+ ClientStorageProviderModel model = ((LegacyRealmModel) realm).getClientStorageProvidersStream().findFirst().get();\nmodel.setCachePolicy(CacheableStorageProviderModel.CachePolicy.MAX_LIFESPAN);\nmodel.setMaxLifespan(1 * 60 * 60 * 1000);\nrealm.updateComponent(model);\n@@ -446,7 +447,7 @@ public class ClientStorageTest extends AbstractTestRealmKeycloakTest {\ntestingClient.server().run(session -> {\nRealmModel realm = session.realms().getRealmByName(\"test\");\n- ClientStorageProviderModel model = realm.getClientStorageProvidersStream().findFirst().get();\n+ ClientStorageProviderModel model = ((LegacyRealmModel) realm).getClientStorageProvidersStream().findFirst().get();\nmodel.setCachePolicy(CacheableStorageProviderModel.CachePolicy.NO_CACHE);\nrealm.updateComponent(model);\n});\n@@ -466,7 +467,7 @@ public class ClientStorageTest extends AbstractTestRealmKeycloakTest {\nprivate void setDefaultCachePolicy() {\ntestingClient.server().run(session -> {\nRealmModel realm = session.realms().getRealmByName(\"test\");\n- ClientStorageProviderModel model = realm.getClientStorageProvidersStream().findFirst().get();\n+ ClientStorageProviderModel model = ((LegacyRealmModel) realm).getClientStorageProvidersStream().findFirst().get();\nmodel.setCachePolicy(CacheableStorageProviderModel.CachePolicy.DEFAULT);\nrealm.updateComponent(model);\n});\n" } ]

[ { "change_type": "RENAME", "old_path": "server-spi-private/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProvider.java", "new_path": "model/legacy-private/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProvider.java", "diff": "" }, { "change_type": "RENAME", "old_path": "server-spi-private/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProviderFactory.java", "new_path": "model/legacy-private/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProviderFactory.java", "diff": "" }, { "change_type": "RENAME", "old_path": "server-spi-private/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProviderModel.java", "new_path": "model/legacy-private/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProviderModel.java", "diff": "" }, { "change_type": "RENAME", "old_path": "server-spi-private/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProviderSpi.java", "new_path": "model/legacy-private/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProviderSpi.java", "diff": "" }, { "change_type": "MODIFY", "old_path": "model/legacy-private/src/main/resources/META-INF/services/org.keycloak.provider.Spi", "new_path": "model/legacy-private/src/main/resources/META-INF/services/org.keycloak.provider.Spi", "diff": "@@ -19,3 +19,4 @@ org.keycloak.models.cache.CacheUserProviderSpi\norg.keycloak.models.cache.CacheRealmProviderSpi\norg.keycloak.storage.client.ClientStorageProviderSpi\norg.keycloak.storage.group.GroupStorageProviderSpi\n+org.keycloak.storage.clientscope.ClientScopeStorageProviderSpi\n" }, { "change_type": "MODIFY", "old_path": "server-spi-private/src/main/resources/META-INF/services/org.keycloak.provider.Spi", "new_path": "server-spi-private/src/main/resources/META-INF/services/org.keycloak.provider.Spi", "diff": "@@ -78,7 +78,6 @@ org.keycloak.credential.CredentialSpi\norg.keycloak.keys.PublicKeyStorageSpi\norg.keycloak.keys.KeySpi\norg.keycloak.storage.DatastoreSpi\n-org.keycloak.storage.clientscope.ClientScopeStorageProviderSpi\norg.keycloak.storage.role.RoleStorageProviderSpi\norg.keycloak.crypto.SignatureSpi\norg.keycloak.crypto.ClientSignatureVerifierSpi\n" } ]

[ { "change_type": "MODIFY", "old_path": "quarkus/config-api/src/main/java/org/keycloak/config/TransactionOptions.java", "new_path": "quarkus/config-api/src/main/java/org/keycloak/config/TransactionOptions.java", "diff": "@@ -7,15 +7,24 @@ public class TransactionOptions {\npublic static final Option<Boolean> TRANSACTION_XA_ENABLED = new OptionBuilder<>(\"transaction-xa-enabled\", Boolean.class)\n.category(OptionCategory.TRANSACTION)\n- .description(\"Manually override the transaction type. Transaction type XA and the appropriate driver is used by default.\")\n+ .description(\"If set to false, Keycloak uses a non-XA datasource in case the database does not support XA transactions.\")\n.buildTime(true)\n.defaultValue(Boolean.TRUE)\n.expectedValues(Boolean.TRUE, Boolean.FALSE)\n.build();\n+ public static final Option<Boolean> TRANSACTION_JTA_ENABLED = new OptionBuilder<>(\"transaction-jta-enabled\", Boolean.class)\n+ .category(OptionCategory.TRANSACTION)\n+ .description(\"Set if distributed transactions are supported. If set to false, transactions are managed by the server and can not be joined if multiple data sources are used. By default, distributed transactions are enabled and only XA data sources can be used.\")\n+ .buildTime(true)\n+ .hidden()\n+ .expectedValues(Boolean.TRUE, Boolean.FALSE)\n+ .build();\n+\npublic static final List<Option<?>> ALL_OPTIONS = new ArrayList<>();\nstatic {\nALL_OPTIONS.add(TRANSACTION_XA_ENABLED);\n+ ALL_OPTIONS.add(TRANSACTION_JTA_ENABLED);\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/DatabasePropertyMappers.java", "new_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/DatabasePropertyMappers.java", "diff": "@@ -100,8 +100,14 @@ final class DatabasePropertyMappers {\nprivate static Optional<String> getXaOrNonXaDriver(Optional<String> value, ConfigSourceInterceptorContext context) {\nConfigValue xaEnabledConfigValue = context.proceed(\"kc.transaction-xa-enabled\");\n+ ConfigValue jtaEnabledConfiguration = context.proceed(\"kc.transaction-jta-enabled\");\nboolean isXaEnabled = xaEnabledConfigValue == null || Boolean.parseBoolean(xaEnabledConfigValue.getValue());\n+ boolean isJtaEnabled = jtaEnabledConfiguration == null || Boolean.parseBoolean(jtaEnabledConfiguration.getValue());\n+\n+ if(!isJtaEnabled) {\n+ isXaEnabled = false;\n+ }\nOptional<String> driver = Database.getDriver(value.get(), isXaEnabled);\n" }, { "change_type": "MODIFY", "old_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/TransactionPropertyMappers.java", "new_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/TransactionPropertyMappers.java", "diff": "package org.keycloak.quarkus.runtime.configuration.mappers;\nimport io.smallrye.config.ConfigSourceInterceptorContext;\n+import io.smallrye.config.ConfigValue;\nimport org.keycloak.config.TransactionOptions;\nimport static java.util.Optional.of;\n@@ -10,12 +11,18 @@ import java.util.Optional;\npublic class TransactionPropertyMappers {\n+ private static final String QUARKUS_TXPROP_TARGET = \"quarkus.datasource.jdbc.transactions\";\n+\nprivate TransactionPropertyMappers(){}\npublic static PropertyMapper[] getTransactionPropertyMappers() {\nreturn new PropertyMapper[] {\nfromOption(TransactionOptions.TRANSACTION_XA_ENABLED)\n- .to(\"quarkus.datasource.jdbc.transactions\")\n+ .to(QUARKUS_TXPROP_TARGET)\n+ .paramLabel(Boolean.TRUE + \"|\" + Boolean.FALSE)\n+ .transformer(TransactionPropertyMappers::getQuarkusTransactionsValue)\n+ .build(),\n+ fromOption(TransactionOptions.TRANSACTION_JTA_ENABLED)\n.paramLabel(Boolean.TRUE + \"|\" + Boolean.FALSE)\n.transformer(TransactionPropertyMappers::getQuarkusTransactionsValue)\n.build()\n@@ -24,6 +31,11 @@ public class TransactionPropertyMappers {\nprivate static Optional<String> getQuarkusTransactionsValue(Optional<String> txValue, ConfigSourceInterceptorContext context) {\nboolean isXaEnabled = Boolean.parseBoolean(txValue.get());\n+ boolean isJtaEnabled = getBooleanValue(\"kc.transaction-jta-enabled\", context, true);\n+\n+ if (!isJtaEnabled) {\n+ return of(\"disabled\");\n+ }\nif (isXaEnabled) {\nreturn of(\"xa\");\n@@ -32,4 +44,13 @@ public class TransactionPropertyMappers {\nreturn of(\"enabled\");\n}\n+ private static boolean getBooleanValue(String key, ConfigSourceInterceptorContext context, boolean defaultValue) {\n+ boolean returnValue = defaultValue;\n+ ConfigValue configValue = context.proceed(key);\n+\n+ if (configValue != null) {\n+ returnValue = Boolean.parseBoolean(configValue.getValue());\n+ }\n+ return returnValue;\n+ }\n}\n" }, { "change_type": "MODIFY", "old_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/jpa/AbstractJpaConnectionProviderFactory.java", "new_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/jpa/AbstractJpaConnectionProviderFactory.java", "diff": "@@ -24,13 +24,11 @@ import java.util.Optional;\nimport javax.enterprise.inject.Instance;\nimport javax.persistence.EntityManager;\nimport javax.persistence.EntityManagerFactory;\n-import javax.persistence.EntityTransaction;\nimport javax.persistence.FlushModeType;\nimport javax.persistence.SynchronizationType;\nimport org.hibernate.internal.SessionFactoryImpl;\nimport org.keycloak.Config;\nimport org.keycloak.connections.jpa.JpaConnectionProviderFactory;\n-import org.keycloak.connections.jpa.JpaKeycloakTransaction;\nimport org.keycloak.connections.jpa.PersistenceExceptionConverter;\nimport org.keycloak.models.KeycloakSession;\nimport org.keycloak.models.KeycloakSessionFactory;\n" }, { "change_type": "MODIFY", "old_path": "quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/test/ConfigurationTest.java", "new_path": "quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/test/ConfigurationTest.java", "diff": "@@ -423,18 +423,25 @@ public class ConfigurationTest {\nSystem.setProperty(CLI_ARGS, \"--db=mssql\" + ARG_SEPARATOR + \"--transaction-xa-enabled=false\");\nassertTrue(System.getProperty(CLI_ARGS, \"\").contains(\"mssql\"));\n- SmallRyeConfig config = createConfig();\n- assertEquals(\"com.microsoft.sqlserver.jdbc.SQLServerDriver\", config.getConfigValue(\"quarkus.datasource.jdbc.driver\").getValue());\n- assertEquals(\"enabled\", config.getConfigValue(\"quarkus.datasource.jdbc.transactions\").getValue());\n+ SmallRyeConfig jtaEnabledConfig = createConfig();\n+ assertEquals(\"com.microsoft.sqlserver.jdbc.SQLServerDriver\", jtaEnabledConfig.getConfigValue(\"quarkus.datasource.jdbc.driver\").getValue());\n+ assertEquals(\"enabled\", jtaEnabledConfig.getConfigValue(\"quarkus.datasource.jdbc.transactions\").getValue());\nSystem.setProperty(CLI_ARGS, \"--db=mssql\" + ARG_SEPARATOR + \"--transaction-xa-enabled=true\");\nassertTrue(System.getProperty(CLI_ARGS, \"\").contains(\"mssql\"));\n- SmallRyeConfig config2 = createConfig();\n+ SmallRyeConfig xaConfig = createConfig();\n- assertEquals(\"com.microsoft.sqlserver.jdbc.SQLServerXADataSource\", config2.getConfigValue(\"quarkus.datasource.jdbc.driver\").getValue());\n- assertEquals(\"xa\", config2.getConfigValue(\"quarkus.datasource.jdbc.transactions\").getValue());\n+ assertEquals(\"com.microsoft.sqlserver.jdbc.SQLServerXADataSource\", xaConfig.getConfigValue(\"quarkus.datasource.jdbc.driver\").getValue());\n+ assertEquals(\"xa\", xaConfig.getConfigValue(\"quarkus.datasource.jdbc.transactions\").getValue());\n+\n+ System.setProperty(CLI_ARGS, \"--db=mssql\" + ARG_SEPARATOR + \"--transaction-jta-enabled=false\");\n+ SmallRyeConfig jtaDisabledConfig = createConfig();\n+\n+ assertEquals(\"com.microsoft.sqlserver.jdbc.SQLServerDriver\", jtaDisabledConfig.getConfigValue(\"quarkus.datasource.jdbc.driver\").getValue());\n+ assertEquals(\"disabled\", jtaDisabledConfig.getConfigValue(\"quarkus.datasource.jdbc.transactions\").getValue());\n}\n+ @Test\npublic void testResolveHealthOption() {\nSystem.setProperty(CLI_ARGS, \"--health-enabled=true\");\nSmallRyeConfig config = createConfig();\n" }, { "change_type": "MODIFY", "old_path": "quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testBuildHelp.unix.approved.txt", "new_path": "quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testBuildHelp.unix.approved.txt", "diff": "Binary files a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testBuildHelp.unix.approved.txt and b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testBuildHelp.unix.approved.txt differ\n" }, { "change_type": "MODIFY", "old_path": "quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testBuildHelp.windows.approved.txt", "new_path": "quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testBuildHelp.windows.approved.txt", "diff": "Binary files a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testBuildHelp.windows.approved.txt and b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testBuildHelp.windows.approved.txt differ\n" }, { "change_type": "MODIFY", "old_path": "quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testStartDevHelpAll.unix.approved.txt", "new_path": "quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testStartDevHelpAll.unix.approved.txt", "diff": "Binary files a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testStartDevHelpAll.unix.approved.txt and b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testStartDevHelpAll.unix.approved.txt differ\n" }, { "change_type": "MODIFY", "old_path": "quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testStartDevHelpAll.windows.approved.txt", "new_path": "quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testStartDevHelpAll.windows.approved.txt", "diff": "Binary files a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testStartDevHelpAll.windows.approved.txt and b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testStartDevHelpAll.windows.approved.txt differ\n" } ]

[ { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/protocol/oidc/OIDCWellKnownProvider.java", "new_path": "services/src/main/java/org/keycloak/protocol/oidc/OIDCWellKnownProvider.java", "diff": "@@ -22,6 +22,7 @@ import org.keycloak.OAuth2Constants;\nimport org.keycloak.authentication.ClientAuthenticator;\nimport org.keycloak.authentication.ClientAuthenticatorFactory;\nimport org.keycloak.authentication.authenticators.util.LoAUtil;\n+import org.keycloak.common.Profile;\nimport org.keycloak.crypto.CekManagementProvider;\nimport org.keycloak.crypto.ClientSignatureVerifierProvider;\nimport org.keycloak.crypto.ContentEncryptionProvider;\n@@ -70,10 +71,7 @@ import java.util.stream.Stream;\n*/\npublic class OIDCWellKnownProvider implements WellKnownProvider {\n- public static final List<String> DEFAULT_GRANT_TYPES_SUPPORTED = list(OAuth2Constants.AUTHORIZATION_CODE,\n- OAuth2Constants.IMPLICIT, OAuth2Constants.REFRESH_TOKEN, OAuth2Constants.PASSWORD, OAuth2Constants.CLIENT_CREDENTIALS,\n- OAuth2Constants.DEVICE_CODE_GRANT_TYPE,\n- OAuth2Constants.CIBA_GRANT_TYPE);\n+ public final List<String> DEFAULT_GRANT_TYPES_SUPPORTED;\npublic static final List<String> DEFAULT_RESPONSE_TYPES_SUPPORTED = list(OAuth2Constants.CODE, OIDCResponseType.NONE, OIDCResponseType.ID_TOKEN, OIDCResponseType.TOKEN, \"id_token token\", \"code id_token\", \"code token\", \"code id_token token\");\n@@ -100,6 +98,13 @@ public class OIDCWellKnownProvider implements WellKnownProvider {\n}\npublic OIDCWellKnownProvider(KeycloakSession session, Map<String, Object> openidConfigOverride, boolean includeClientScopes) {\n+ DEFAULT_GRANT_TYPES_SUPPORTED = Stream.of(OAuth2Constants.AUTHORIZATION_CODE,\n+ OAuth2Constants.IMPLICIT, OAuth2Constants.REFRESH_TOKEN, OAuth2Constants.PASSWORD, OAuth2Constants.CLIENT_CREDENTIALS,\n+ OAuth2Constants.DEVICE_CODE_GRANT_TYPE,\n+ OAuth2Constants.CIBA_GRANT_TYPE).collect(Collectors.toList());\n+ if (Profile.isFeatureEnabled(Profile.Feature.TOKEN_EXCHANGE)) {\n+ DEFAULT_GRANT_TYPES_SUPPORTED.add(OAuth2Constants.TOKEN_EXCHANGE_GRANT_TYPE);\n+ }\nthis.session = session;\nthis.openidConfigOverride = openidConfigOverride;\nthis.includeClientScopes = includeClientScopes;\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCWellKnownProviderTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCWellKnownProviderTest.java", "diff": "@@ -26,6 +26,7 @@ import org.junit.Test;\nimport org.keycloak.OAuth2Constants;\nimport org.keycloak.admin.client.resource.RealmResource;\nimport org.keycloak.broker.provider.util.SimpleHttp;\n+import org.keycloak.common.Profile;\nimport org.keycloak.crypto.Algorithm;\nimport org.keycloak.jose.jwe.JWEConstants;\nimport org.keycloak.jose.jwk.JSONWebKeySet;\n@@ -46,6 +47,7 @@ import org.keycloak.testsuite.AbstractKeycloakTest;\nimport org.keycloak.testsuite.Assert;\nimport org.keycloak.testsuite.admin.AbstractAdminTest;\nimport org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude;\n+import org.keycloak.testsuite.arquillian.annotation.EnableFeature;\nimport org.keycloak.testsuite.forms.BrowserFlowTest;\nimport org.keycloak.testsuite.forms.LevelOfAssuranceFlowTest;\nimport org.keycloak.testsuite.util.AdminClientUtil;\n@@ -133,6 +135,7 @@ public class OIDCWellKnownProviderTest extends AbstractKeycloakTest {\n// Support standard + implicit + hybrid flow\nassertContains(oidcConfig.getResponseTypesSupported(), OAuth2Constants.CODE, OIDCResponseType.ID_TOKEN, \"id_token token\", \"code id_token\", \"code token\", \"code id_token token\");\n+ assertEquals(oidcConfig.getGrantTypesSupported().size(),7);\nassertContains(oidcConfig.getGrantTypesSupported(), OAuth2Constants.AUTHORIZATION_CODE, OAuth2Constants.IMPLICIT,\nOAuth2Constants.DEVICE_CODE_GRANT_TYPE);\nassertContains(oidcConfig.getResponseModesSupported(), \"query\", \"fragment\", \"form_post\", \"jwt\", \"query.jwt\", \"fragment.jwt\", \"form_post.jwt\");\n@@ -384,6 +387,19 @@ public class OIDCWellKnownProviderTest extends AbstractKeycloakTest {\n}\n}\n+ @Test\n+ @EnableFeature(value = Profile.Feature.TOKEN_EXCHANGE, skipRestart = true)\n+ public void testGrantTypesSupportedWithTokenExchange() throws IOException {\n+ Client client = AdminClientUtil.createResteasyClient();\n+ try {\n+ OIDCConfigurationRepresentation oidcConfig = getOIDCDiscoveryRepresentation(client, OAuthClient.AUTH_SERVER_ROOT);\n+ assertEquals(oidcConfig.getGrantTypesSupported().size(),8);\n+ assertContains(oidcConfig.getGrantTypesSupported(), OAuth2Constants.TOKEN_EXCHANGE_GRANT_TYPE);\n+ } finally {\n+ client.close();\n+ }\n+ }\n+\nprivate void assertScopesSupportedMatchesWithRealm(OIDCConfigurationRepresentation oidcConfig) {\nAssert.assertNames(oidcConfig.getScopesSupported(), OAuth2Constants.SCOPE_OPENID, OAuth2Constants.OFFLINE_ACCESS,\nOAuth2Constants.SCOPE_PROFILE, OAuth2Constants.SCOPE_EMAIL, OAuth2Constants.SCOPE_PHONE, OAuth2Constants.SCOPE_ADDRESS, OIDCLoginProtocolFactory.ACR_SCOPE,\n" } ]

[ { "change_type": "MODIFY", "old_path": ".github/workflows/codeql-java-analysis.yml", "new_path": ".github/workflows/codeql-java-analysis.yml", "diff": "@@ -12,6 +12,7 @@ on:\nbranches: [main]\npaths:\n- '**.java'\n+ - '.github/workflows/codeql-java-analysis.yml'\nschedule:\n- cron: '0 9 * * 2'\n@@ -38,7 +39,7 @@ jobs:\nlanguages: java\n- name: Build Keycloak\n- run: mvn install -Dmaven.test.skip -DskipQuarkus -DskipTestsuite -DskipExamples -DskipTests\n+ run: mvn -B install -DskipTests -DskipQuarkus -DskipTestsuite -DskipExamples -DskipTests\n- name: Perform CodeQL Analysis\nuses: github/codeql-action/[email protected]\n" } ]

[ { "change_type": "MODIFY", "old_path": "server-spi/src/main/java/org/keycloak/models/KeycloakSession.java", "new_path": "server-spi/src/main/java/org/keycloak/models/KeycloakSession.java", "diff": "@@ -206,6 +206,8 @@ public interface KeycloakSession {\n/**\n* The user cache\n*\n+ * @deprecated The access to the UserCache interface is no longer possible here, and this method is about to be removed.\n+ * Adjust your code according to the Keycloak 19 Upgrading Guide.\n* @return may be null if cache is disabled\n*/\n@Deprecated\n@@ -271,7 +273,7 @@ public interface KeycloakSession {\n/**\n* Keycloak specific local storage for clients. No cache in front, this api talks directly to database configured for Keycloak\n*\n- * @return\n+ * @deprecated Access to the legacy store is no longer possible via this method. Adjust your code according to the Keycloak 19 Upgrading Guide.\n*/\n@Deprecated\nClientProvider clientLocalStorage();\n@@ -279,8 +281,7 @@ public interface KeycloakSession {\n/**\n* Keycloak specific local storage for client scopes. No cache in front, this api talks directly to database configured for Keycloak\n*\n- * @deprecated Use {@link #clientScopes()} instead\n- * @return\n+ * @deprecated Access to the legacy store is no longer possible via this method. Adjust your code according to the Keycloak 19 Upgrading Guide.\n*/\n@Deprecated\nClientScopeProvider clientScopeLocalStorage();\n@@ -288,7 +289,7 @@ public interface KeycloakSession {\n/**\n* Keycloak specific local storage for groups. No cache in front, this api talks directly to storage configured for Keycloak\n*\n- * @return\n+ * @deprecated Access to the legacy store is no longer possible via this method. Adjust your code according to the Keycloak 19 Upgrading Guide.\n*/\n@Deprecated\nGroupProvider groupLocalStorage();\n@@ -296,7 +297,7 @@ public interface KeycloakSession {\n/**\n* Keycloak specific local storage for roles. No cache in front, this api talks directly to storage configured for Keycloak\n*\n- * @return\n+ * @deprecated Access to the legacy store is no longer possible via this method. Adjust your code according to the Keycloak 19 Upgrading Guide.\n*/\n@Deprecated\nRoleProvider roleLocalStorage();\n@@ -305,7 +306,7 @@ public interface KeycloakSession {\n* Hybrid storage for UserStorageProviders that can't store a specific piece of keycloak data in their external storage.\n* No cache in front.\n*\n- * @return\n+ * @deprecated Access to the legacy store is no longer possible via this method. Adjust your code according to the Keycloak 19 Upgrading Guide.\n*/\n@Deprecated\nUserFederatedStorageProvider userFederatedStorage();\n" }, { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/services/DefaultKeycloakSession.java", "new_path": "services/src/main/java/org/keycloak/services/DefaultKeycloakSession.java", "diff": "@@ -176,78 +176,67 @@ public class DefaultKeycloakSession implements KeycloakSession {\n@Override\n@Deprecated\npublic UserProvider userLocalStorage() {\n- log.warnf(\"The semantics of this method have changed: Please see the migration guide on how to migrate.%s\", StackUtil.getShortStackTrace());\n- return users();\n+ throw new IllegalStateException(\"Access to the legacy store is no longer possible via this method. Adjust your code according to the Keycloak 19 Upgrading Guide.\");\n}\n@Override\n@Deprecated\npublic RealmProvider realmLocalStorage() {\n- return realms();\n+ throw new IllegalStateException(\"Access to the legacy store is no longer possible via this method. Adjust your code according to the Keycloak 19 Upgrading Guide.\");\n}\n@Override\n@Deprecated\npublic ClientProvider clientLocalStorage() {\n- return clients();\n+ throw new IllegalStateException(\"Access to the legacy store is no longer possible via this method. Adjust your code according to the Keycloak 19 Upgrading Guide.\");\n}\n@Override\n@Deprecated\npublic ClientScopeProvider clientScopeLocalStorage() {\n- return clientScopes();\n+ throw new IllegalStateException(\"Access to the legacy store is no longer possible via this method. Adjust your code according to the Keycloak 19 Upgrading Guide.\");\n}\n@Override\n@Deprecated\npublic GroupProvider groupLocalStorage() {\n- return groups();\n+ throw new IllegalStateException(\"Access to the legacy store is no longer possible via this method. Adjust your code according to the Keycloak 19 Upgrading Guide.\");\n}\n@Override\n@Deprecated\npublic ClientProvider clientStorageManager() {\n- return clients();\n+ throw new IllegalStateException(\"Access to the legacy store is no longer possible via this method. Adjust your code according to the Keycloak 19 Upgrading Guide.\");\n}\n@Override\n@Deprecated\npublic ClientScopeProvider clientScopeStorageManager() {\n- return clientScopes();\n+ throw new IllegalStateException(\"Access to the legacy store is no longer possible via this method. Adjust your code according to the Keycloak 19 Upgrading Guide.\");\n}\n@Override\n@Deprecated\npublic RoleProvider roleLocalStorage() {\n- return roles();\n+ throw new IllegalStateException(\"Access to the legacy store is no longer possible via this method. Adjust your code according to the Keycloak 19 Upgrading Guide.\");\n}\n@Override\n@Deprecated\npublic RoleProvider roleStorageManager() {\n- return roles();\n+ throw new IllegalStateException(\"Access to the legacy store is no longer possible via this method. Adjust your code according to the Keycloak 19 Upgrading Guide.\");\n}\n@Override\n@Deprecated\npublic GroupProvider groupStorageManager() {\n- return groups();\n+ throw new IllegalStateException(\"Access to the legacy store is no longer possible via this method. Adjust your code according to the Keycloak 19 Upgrading Guide.\");\n}\n- private final ThreadLocal<Boolean> recursionPreventionUserStorageManager = new ThreadLocal<>();\n-\n@Override\n@Deprecated\npublic UserProvider userStorageManager() {\n- if(recursionPreventionUserStorageManager.get() != null) {\n- throw new IllegalStateException(\"userStorageManager() is being called recursively. Please adjust your code according to the Keycloak 19 migration guide.\");\n- }\n- try {\n- recursionPreventionUserStorageManager.set(Boolean.TRUE);\n- return users();\n- } finally {\n- recursionPreventionUserStorageManager.remove();\n- }\n+ throw new IllegalStateException(\"Access to the legacy store is no longer possible via this method. Adjust your code according to the Keycloak 19 Upgrading Guide.\");\n}\n@Override\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/jpa/src/main/java/org/keycloak/models/jpa/session/JpaUserSessionPersisterProviderFactory.java", "new_path": "model/jpa/src/main/java/org/keycloak/models/jpa/session/JpaUserSessionPersisterProviderFactory.java", "diff": "package org.keycloak.models.jpa.session;\nimport org.keycloak.Config;\n+import org.keycloak.common.Profile;\nimport org.keycloak.connections.jpa.JpaConnectionProvider;\nimport org.keycloak.models.KeycloakSession;\nimport org.keycloak.models.KeycloakSessionFactory;\nimport org.keycloak.models.session.UserSessionPersisterProvider;\nimport org.keycloak.models.session.UserSessionPersisterProviderFactory;\n+import org.keycloak.provider.EnvironmentDependentProviderFactory;\nimport javax.persistence.EntityManager;\n/**\n* @author <a href=\"mailto:[email protected]\">Marek Posolda</a>\n*/\n-public class JpaUserSessionPersisterProviderFactory implements UserSessionPersisterProviderFactory {\n+public class JpaUserSessionPersisterProviderFactory implements UserSessionPersisterProviderFactory, EnvironmentDependentProviderFactory {\npublic static final String ID = \"jpa\";\n@@ -63,4 +65,9 @@ public class JpaUserSessionPersisterProviderFactory implements UserSessionPersis\npublic int order() {\nreturn 100;\n}\n+\n+ @Override\n+ public boolean isSupported() {\n+ return !Profile.isFeatureEnabled(Profile.Feature.MAP_STORAGE);\n+ }\n}\n" }, { "change_type": "RENAME", "old_path": "server-spi-private/src/main/java/org/keycloak/models/session/DisabledUserSessionPersisterProvider.java", "new_path": "model/legacy-private/src/main/java/org/keycloak/models/session/DisabledUserSessionPersisterProvider.java", "diff": "" }, { "change_type": "RENAME", "old_path": "server-spi-private/src/main/java/org/keycloak/models/session/PersistentAuthenticatedClientSessionAdapter.java", "new_path": "model/legacy-private/src/main/java/org/keycloak/models/session/PersistentAuthenticatedClientSessionAdapter.java", "diff": "" }, { "change_type": "RENAME", "old_path": "server-spi-private/src/main/java/org/keycloak/models/session/PersistentClientSessionModel.java", "new_path": "model/legacy-private/src/main/java/org/keycloak/models/session/PersistentClientSessionModel.java", "diff": "" }, { "change_type": "RENAME", "old_path": "server-spi-private/src/main/java/org/keycloak/models/session/PersistentUserSessionAdapter.java", "new_path": "model/legacy-private/src/main/java/org/keycloak/models/session/PersistentUserSessionAdapter.java", "diff": "" }, { "change_type": "RENAME", "old_path": "server-spi-private/src/main/java/org/keycloak/models/session/PersistentUserSessionModel.java", "new_path": "model/legacy-private/src/main/java/org/keycloak/models/session/PersistentUserSessionModel.java", "diff": "" }, { "change_type": "RENAME", "old_path": "server-spi-private/src/main/java/org/keycloak/models/session/UserSessionPersisterProvider.java", "new_path": "model/legacy-private/src/main/java/org/keycloak/models/session/UserSessionPersisterProvider.java", "diff": "" }, { "change_type": "RENAME", "old_path": "server-spi-private/src/main/java/org/keycloak/models/session/UserSessionPersisterProviderFactory.java", "new_path": "model/legacy-private/src/main/java/org/keycloak/models/session/UserSessionPersisterProviderFactory.java", "diff": "" }, { "change_type": "RENAME", "old_path": "server-spi-private/src/main/java/org/keycloak/models/session/UserSessionPersisterSpi.java", "new_path": "model/legacy-private/src/main/java/org/keycloak/models/session/UserSessionPersisterSpi.java", "diff": "" }, { "change_type": "RENAME", "old_path": "server-spi-private/src/main/resources/META-INF/services/org.keycloak.models.session.UserSessionPersisterProviderFactory", "new_path": "model/legacy-private/src/main/resources/META-INF/services/org.keycloak.models.session.UserSessionPersisterProviderFactory", "diff": "" }, { "change_type": "MODIFY", "old_path": "model/legacy-private/src/main/resources/META-INF/services/org.keycloak.provider.Spi", "new_path": "model/legacy-private/src/main/resources/META-INF/services/org.keycloak.provider.Spi", "diff": "@@ -20,3 +20,4 @@ org.keycloak.models.cache.CacheRealmProviderSpi\norg.keycloak.storage.client.ClientStorageProviderSpi\norg.keycloak.storage.group.GroupStorageProviderSpi\norg.keycloak.storage.clientscope.ClientScopeStorageProviderSpi\n+org.keycloak.models.session.UserSessionPersisterSpi\n" }, { "change_type": "MODIFY", "old_path": "server-spi-private/src/main/resources/META-INF/services/org.keycloak.provider.Spi", "new_path": "server-spi-private/src/main/resources/META-INF/services/org.keycloak.provider.Spi", "diff": "@@ -30,7 +30,6 @@ org.keycloak.models.SingleUseObjectSpi\norg.keycloak.models.UserSessionSpi\norg.keycloak.models.UserLoginFailureSpi\norg.keycloak.models.UserSpi\n-org.keycloak.models.session.UserSessionPersisterSpi\norg.keycloak.models.dblock.DBLockSpi\norg.keycloak.migration.MigrationSpi\norg.keycloak.events.EventListenerSpi\n" }, { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/services/managers/UserSessionManager.java", "new_path": "services/src/main/java/org/keycloak/services/managers/UserSessionManager.java", "diff": "@@ -27,7 +27,6 @@ import org.keycloak.models.RealmModel;\nimport org.keycloak.models.RoleModel;\nimport org.keycloak.models.UserModel;\nimport org.keycloak.models.UserSessionModel;\n-import org.keycloak.models.session.UserSessionPersisterProvider;\nimport org.keycloak.services.ServicesLogger;\nimport java.util.List;\n@@ -46,11 +45,9 @@ public class UserSessionManager {\nprivate static final Logger logger = Logger.getLogger(UserSessionManager.class);\nprivate final KeycloakSession kcSession;\n- private final UserSessionPersisterProvider persister;\npublic UserSessionManager(KeycloakSession session) {\nthis.kcSession = session;\n- this.persister = session.getProvider(UserSessionPersisterProvider.class);\n}\npublic void createOrUpdateOfflineSession(AuthenticatedClientSessionModel clientSession, UserSessionModel userSession) {\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/pom.xml", "new_path": "testsuite/integration-arquillian/tests/base/pom.xml", "diff": "<keycloak.authorizationCache.enabled>false</keycloak.authorizationCache.enabled>\n<keycloak.realmCache.enabled>false</keycloak.realmCache.enabled>\n<keycloak.userCache.enabled>false</keycloak.userCache.enabled>\n+ <keycloak.userSessionPersister.provider></keycloak.userSessionPersister.provider>\n</systemPropertyVariables>\n</configuration>\n</plugin>\n" } ]

[ { "change_type": "MODIFY", "old_path": "quarkus/server/pom.xml", "new_path": "quarkus/server/pom.xml", "diff": "</dependency>\n</dependencies>\n+ <properties>\n+ <!-- define this as a property, so it can still be overwritten on the CLI -->\n+ <!-- direct the auto-created files to the target folder, so they are cleaned by \"mvn clean\" -->\n+ <kc.home.dir>${project.build.directory}/kc</kc.home.dir>\n+ </properties>\n+\n<build>\n<finalName>keycloak</finalName>\n<plugins>\n<version>${quarkus.version}</version>\n<configuration>\n<finalName>keycloak</finalName>\n+ <systemProperties>\n+ <kc.home.dir>${kc.home.dir}</kc.home.dir>\n+ </systemProperties>\n</configuration>\n<executions>\n<execution>\n" }, { "change_type": "MODIFY", "old_path": "quarkus/server/src/main/java/org/keycloak/quarkus/_private/IDELauncher.java", "new_path": "quarkus/server/src/main/java/org/keycloak/quarkus/_private/IDELauncher.java", "diff": "package org.keycloak.quarkus._private;\n+import java.io.File;\n+import java.nio.file.Path;\n+import java.nio.file.Paths;\nimport java.util.ArrayList;\nimport java.util.Arrays;\nimport java.util.List;\n@@ -27,6 +30,13 @@ public class IDELauncher {\npublic static void main(String[] args) {\nList<String> devArgs = new ArrayList<>();\n+ if (System.getProperty(\"kc.home.dir\") == null) {\n+ // direct the auto-created files to the target folder, so they are cleaned by \"mvn clean\"\n+ // users can still provide a different folder by setting the property when starting it from their IDE.\n+ Path path = Paths.get(System.getProperty(\"user.dir\"), \"target\", \"kc\");\n+ System.setProperty(\"kc.home.dir\", path.toAbsolutePath().toString());\n+ }\n+\ndevArgs.addAll(Arrays.asList(args));\nif (devArgs.isEmpty()) {\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/singleUseObject/JpaSingleUseObjectModelCriteriaBuilder.java", "new_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/singleUseObject/JpaSingleUseObjectModelCriteriaBuilder.java", "diff": "@@ -27,6 +27,7 @@ import javax.persistence.criteria.Root;\nimport org.keycloak.models.ActionTokenValueModel;\nimport org.keycloak.models.map.storage.CriterionNotSupportedException;\nimport org.keycloak.models.map.storage.jpa.JpaModelCriteriaBuilder;\n+import org.keycloak.models.map.storage.jpa.role.JpaPredicateFunction;\nimport org.keycloak.models.map.storage.jpa.singleUseObject.entity.JpaSingleUseObjectEntity;\nimport org.keycloak.storage.SearchableModelField;\n@@ -48,7 +49,7 @@ public class JpaSingleUseObjectModelCriteriaBuilder extends JpaModelCriteriaBuil\nsuper(JpaSingleUseObjectModelCriteriaBuilder::new);\n}\n- public JpaSingleUseObjectModelCriteriaBuilder(BiFunction<CriteriaBuilder, Root<JpaSingleUseObjectEntity>, Predicate> predicateFunc) {\n+ public JpaSingleUseObjectModelCriteriaBuilder(JpaPredicateFunction<JpaSingleUseObjectEntity> predicateFunc) {\nsuper(JpaSingleUseObjectModelCriteriaBuilder::new, predicateFunc);\n}\n@@ -62,13 +63,13 @@ public class JpaSingleUseObjectModelCriteriaBuilder extends JpaModelCriteriaBuil\nvalidateValue(value, modelField, op, String.class);\n- return new JpaSingleUseObjectModelCriteriaBuilder((cb, root) ->\n+ return new JpaSingleUseObjectModelCriteriaBuilder((cb, query, root) ->\ncb.equal(cb.function(\"->>\", String.class, root.get(\"metadata\"),\ncb.literal(FIELD_TO_JSON_PROP.get(modelField.getName()))), value[0])\n);\n} else if(modelField == ActionTokenValueModel.SearchableFields.OBJECT_KEY) {\nvalidateValue(value, modelField, op, String.class);\n- return new JpaSingleUseObjectModelCriteriaBuilder((cb, root) ->\n+ return new JpaSingleUseObjectModelCriteriaBuilder((cb, query, root) ->\ncb.equal(root.get(modelField.getName()), value[0])\n);\n} else {\n" } ]

[ { "change_type": "MODIFY", "old_path": ".github/workflows/codeql-js-adapter-analysis.yml", "new_path": ".github/workflows/codeql-js-adapter-analysis.yml", "diff": "@@ -12,6 +12,7 @@ on:\nbranches: [main]\npaths:\n- 'adapters/oidc/js/**'\n+ - '.github/workflows/codeql-js-adapter-analysis.yml'\nschedule:\n- cron: '0 9 * * 2'\n@@ -41,7 +42,7 @@ jobs:\nsource-root: adapters/oidc/js/\n- name: Build Keycloak\n- run: mvn install -Dmaven.test.skip -DskipQuarkus -DskipTestsuite -DskipExamples -DskipTests\n+ run: mvn -B install -DskipTests -DskipQuarkus -DskipTestsuite -DskipExamples -DskipTests\n- name: Perform CodeQL Analysis\nuses: github/codeql-action/[email protected]\n" }, { "change_type": "MODIFY", "old_path": ".github/workflows/codeql-theme-analysis.yml", "new_path": ".github/workflows/codeql-theme-analysis.yml", "diff": "@@ -12,6 +12,7 @@ on:\nbranches: [main]\npaths:\n- 'themes/src/**'\n+ - '.github/workflows/codeql-theme-analysis.yml'\nschedule:\n- cron: '0 9 * * 2'\n@@ -41,7 +42,7 @@ jobs:\nsource-root: themes/\n- name: Build Keycloak\n- run: mvn install -Dmaven.test.skip -DskipQuarkus -DskipTestsuite -DskipExamples -DskipTests\n+ run: mvn -B install -DskipTests -DskipQuarkus -DskipTestsuite -DskipExamples -DskipTests\n- name: Perform CodeQL Analysis\nuses: github/codeql-action/[email protected]\n" } ]

[ { "change_type": "MODIFY", "old_path": "testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/JpaMapStorage.java", "new_path": "testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/JpaMapStorage.java", "diff": "@@ -98,7 +98,7 @@ public class JpaMapStorage extends KeycloakModelParameters {\n.spi(\"user\").provider(MapUserProviderFactory.PROVIDER_ID) .config(STORAGE_CONFIG, JpaMapStorageProviderFactory.PROVIDER_ID)\n.spi(UserLoginFailureSpi.NAME).provider(MapUserLoginFailureProviderFactory.PROVIDER_ID) .config(STORAGE_CONFIG, JpaMapStorageProviderFactory.PROVIDER_ID)\n.spi(\"dblock\").provider(NoLockingDBLockProviderFactory.PROVIDER_ID) .config(STORAGE_CONFIG, ConcurrentHashMapStorageProviderFactory.PROVIDER_ID)\n- .spi(ActionTokenStoreSpi.NAME).provider(MapSingleUseObjectProviderFactory.PROVIDER_ID) .config(STORAGE_CONFIG, ConcurrentHashMapStorageProviderFactory.PROVIDER_ID)\n+ .spi(ActionTokenStoreSpi.NAME).provider(MapSingleUseObjectProviderFactory.PROVIDER_ID) .config(STORAGE_CONFIG, JpaMapStorageProviderFactory.PROVIDER_ID)\n.spi(SingleUseObjectSpi.NAME).provider(MapSingleUseObjectProviderFactory.PROVIDER_ID) .config(STORAGE_CONFIG, JpaMapStorageProviderFactory.PROVIDER_ID)\n.spi(\"publicKeyStorage\").provider(MapPublicKeyStorageProviderFactory.PROVIDER_ID) .config(STORAGE_CONFIG, ConcurrentHashMapStorageProviderFactory.PROVIDER_ID)\n.spi(UserSessionSpi.NAME).provider(MapUserSessionProviderFactory.PROVIDER_ID) .config(\"storage-user-sessions.provider\", ConcurrentHashMapStorageProviderFactory.PROVIDER_ID)\n" } ]

[ { "change_type": "MODIFY", "old_path": ".github/workflows/ci.yml", "new_path": ".github/workflows/ci.yml", "diff": "@@ -4,6 +4,9 @@ on:\npush:\nbranches-ignore: [main]\npull_request:\n+ paths-ignore:\n+ - '.github/workflows/**'\n+ - '!.github/workflows/ci.yml'\nschedule:\n- cron: '0 0 * * *'\n" }, { "change_type": "MODIFY", "old_path": ".github/workflows/codeql-java-analysis.yml", "new_path": ".github/workflows/codeql-java-analysis.yml", "diff": "@@ -7,7 +7,9 @@ name: \"CodeQL Java\"\non:\npush:\n- branches-ignore: [main]\n+ branches-ignore:\n+ - 'main'\n+ - 'dependabot/**'\npull_request:\nbranches: [main]\npaths:\n" }, { "change_type": "MODIFY", "old_path": ".github/workflows/codeql-js-adapter-analysis.yml", "new_path": ".github/workflows/codeql-js-adapter-analysis.yml", "diff": "@@ -7,7 +7,9 @@ name: \"CodeQL JS Adapter\"\non:\npush:\n- branches-ignore: [main]\n+ branches-ignore:\n+ - 'main'\n+ - 'dependabot/**'\npull_request:\nbranches: [main]\npaths:\n" }, { "change_type": "MODIFY", "old_path": ".github/workflows/codeql-theme-analysis.yml", "new_path": ".github/workflows/codeql-theme-analysis.yml", "diff": "@@ -7,7 +7,9 @@ name: \"CodeQL Themes\"\non:\npush:\n- branches-ignore: [main]\n+ branches-ignore:\n+ - 'main'\n+ - 'dependabot/**'\npull_request:\nbranches: [main]\npaths:\n" }, { "change_type": "MODIFY", "old_path": ".github/workflows/operator-ci.yml", "new_path": ".github/workflows/operator-ci.yml", "diff": "@@ -4,6 +4,9 @@ on:\npush:\nbranches-ignore: [main]\npull_request:\n+ paths-ignore:\n+ - '.github/workflows/**'\n+ - '!.github/workflows/operator-ci.yml'\nschedule:\n- cron: '0 0 * * *'\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_3_0.java", "new_path": "model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_3_0.java", "diff": "@@ -22,12 +22,12 @@ import org.keycloak.component.ComponentFactory;\nimport org.keycloak.migration.ModelVersion;\nimport org.keycloak.models.KeycloakSession;\nimport org.keycloak.models.LDAPConstants;\n+import org.keycloak.models.LegacyRealmModel;\nimport org.keycloak.models.RealmModel;\nimport org.keycloak.provider.ProviderFactory;\nimport org.keycloak.representations.idm.RealmRepresentation;\nimport org.keycloak.storage.UserStorageProvider;\nimport org.keycloak.storage.UserStorageProviderModel;\n-import org.keycloak.storage.UserStorageUtil;\nimport javax.naming.directory.SearchControls;\nimport java.util.List;\n@@ -53,7 +53,7 @@ public class MigrateTo1_3_0 implements Migration {\n}\nprivate void migrateLDAPProviders(KeycloakSession session, RealmModel realm) {\n- UserStorageUtil.getUserStorageProvidersStream(realm).forEachOrdered(fedProvider -> {\n+ ((LegacyRealmModel) realm).getUserStorageProvidersStream().forEachOrdered(fedProvider -> {\nif (fedProvider.getProviderId().equals(LDAPConstants.LDAP_PROVIDER)) {\nfedProvider = new UserStorageProviderModel(fedProvider); // copy don't want to muck with cache\nMultivaluedHashMap<String, String> config = fedProvider.getConfig();\n" }, { "change_type": "MODIFY", "old_path": "model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_4_0.java", "new_path": "model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_4_0.java", "diff": "@@ -22,8 +22,8 @@ import org.keycloak.migration.ModelVersion;\nimport org.keycloak.models.ImpersonationConstants;\nimport org.keycloak.models.KeycloakSession;\nimport org.keycloak.models.LDAPConstants;\n+import org.keycloak.models.LegacyRealmModel;\nimport org.keycloak.models.RealmModel;\n-import org.keycloak.models.UserModel;\nimport org.keycloak.models.cache.UserCache;\nimport org.keycloak.models.utils.DefaultAuthenticationFlows;\nimport org.keycloak.models.utils.DefaultRequiredActions;\n@@ -69,7 +69,7 @@ public class MigrateTo1_4_0 implements Migration {\nprivate void migrateLDAPMappers(KeycloakSession session, RealmModel realm) {\nList<String> mandatoryInLdap = Arrays.asList(\"username\", \"username-cn\", \"first name\", \"last name\");\n- UserStorageUtil.getUserStorageProvidersStream(realm)\n+ ((LegacyRealmModel) realm).getUserStorageProvidersStream()\n.filter(providerModel -> Objects.equals(providerModel.getProviderId(), LDAPConstants.LDAP_PROVIDER))\n.forEachOrdered(providerModel -> realm.getComponentsStream(providerModel.getId())\n.filter(mapper -> mandatoryInLdap.contains(mapper.getName()))\n" }, { "change_type": "MODIFY", "old_path": "model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_8_0.java", "new_path": "model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_8_0.java", "diff": "@@ -21,11 +21,11 @@ import org.keycloak.component.ComponentModel;\nimport org.keycloak.migration.ModelVersion;\nimport org.keycloak.models.KeycloakSession;\nimport org.keycloak.models.LDAPConstants;\n+import org.keycloak.models.LegacyRealmModel;\nimport org.keycloak.models.RealmModel;\nimport org.keycloak.models.utils.KeycloakModelUtils;\nimport org.keycloak.representations.idm.RealmRepresentation;\nimport org.keycloak.storage.UserStorageProviderModel;\n-import org.keycloak.storage.UserStorageUtil;\nimport java.util.Objects;\n@@ -51,7 +51,7 @@ public class MigrateTo1_8_0 implements Migration {\n}\nprotected void migrateRealm(RealmModel realm) {\n- UserStorageUtil.getUserStorageProvidersStream(realm)\n+ ((LegacyRealmModel) realm).getUserStorageProvidersStream()\n.filter(fedProvider -> Objects.equals(fedProvider.getProviderId(), LDAPConstants.LDAP_PROVIDER))\n.filter(this::isActiveDirectory)\n.filter(fedProvider -> Objects.isNull(getMapperByName(realm, fedProvider, \"MSAD account controls\")))\n" }, { "change_type": "MODIFY", "old_path": "model/legacy-private/src/main/java/org/keycloak/storage/managers/UserStorageSyncManager.java", "new_path": "model/legacy-private/src/main/java/org/keycloak/storage/managers/UserStorageSyncManager.java", "diff": "@@ -26,12 +26,12 @@ import org.keycloak.component.ComponentModel;\nimport org.keycloak.models.KeycloakSession;\nimport org.keycloak.models.KeycloakSessionFactory;\nimport org.keycloak.models.KeycloakSessionTask;\n+import org.keycloak.models.LegacyRealmModel;\nimport org.keycloak.models.RealmModel;\nimport org.keycloak.models.utils.KeycloakModelUtils;\nimport org.keycloak.storage.UserStorageProvider;\nimport org.keycloak.storage.UserStorageProviderFactory;\nimport org.keycloak.storage.UserStorageProviderModel;\n-import org.keycloak.storage.UserStorageUtil;\nimport org.keycloak.storage.user.ImportSynchronization;\nimport org.keycloak.storage.user.SynchronizationResult;\nimport org.keycloak.timer.TimerProvider;\n@@ -62,7 +62,7 @@ public class UserStorageSyncManager {\npublic void run(KeycloakSession session) {\nStream<RealmModel> realms = session.realms().getRealmsWithProviderTypeStream(UserStorageProvider.class);\nrealms.forEach(realm -> {\n- Stream<UserStorageProviderModel> providers = UserStorageUtil.getUserStorageProvidersStream(realm);\n+ Stream<UserStorageProviderModel> providers = ((LegacyRealmModel) realm).getUserStorageProvidersStream();\nproviders.forEachOrdered(provider -> {\nUserStorageProviderFactory factory = (UserStorageProviderFactory) session.getKeycloakSessionFactory().getProviderFactory(UserStorageProvider.class, provider.getProviderId());\nif (factory instanceof ImportSynchronization && provider.isImportEnabled()) {\n@@ -166,7 +166,7 @@ public class UserStorageSyncManager {\npublic static void notifyToRefreshPeriodicSyncAll(KeycloakSession session, RealmModel realm, boolean removed) {\n- UserStorageUtil.getUserStorageProvidersStream(realm).forEachOrdered(fedProvider ->\n+ ((LegacyRealmModel) realm).getUserStorageProvidersStream().forEachOrdered(fedProvider ->\nnotifyToRefreshPeriodicSync(session, realm, fedProvider, removed));\n}\n@@ -268,7 +268,7 @@ public class UserStorageSyncManager {\n@Override\npublic void run(KeycloakSession session) {\nRealmModel persistentRealm = session.realms().getRealm(realmId);\n- UserStorageUtil.getUserStorageProvidersStream(persistentRealm)\n+ ((LegacyRealmModel) persistentRealm).getUserStorageProvidersStream()\n.filter(persistentFedProvider -> Objects.equals(provider.getId(), persistentFedProvider.getId()))\n.forEachOrdered(persistentFedProvider -> {\n// Update persistent provider in DB\n" }, { "change_type": "MODIFY", "old_path": "model/legacy/src/main/java/org/keycloak/models/LegacyRealmModel.java", "new_path": "model/legacy/src/main/java/org/keycloak/models/LegacyRealmModel.java", "diff": "package org.keycloak.models;\nimport org.keycloak.models.RealmModel;\n+import org.keycloak.storage.UserStorageProvider;\n+import org.keycloak.storage.UserStorageProviderModel;\nimport org.keycloak.storage.client.ClientStorageProvider;\nimport org.keycloak.storage.client.ClientStorageProviderModel;\nimport org.keycloak.storage.role.RoleStorageProvider;\n@@ -69,4 +71,23 @@ public interface LegacyRealmModel extends RealmModel {\n.sorted(RoleStorageProviderModel.comparator);\n}\n+ /**\n+ * @deprecated Use {@link #getUserStorageProvidersStream() getUserStorageProvidersStream} instead.\n+ */\n+ @Deprecated\n+ default List<UserStorageProviderModel> getUserStorageProviders() {\n+ return getUserStorageProvidersStream().collect(Collectors.toList());\n+ }\n+\n+ /**\n+ * Returns sorted {@link UserStorageProviderModel UserStorageProviderModel} as a stream.\n+ * It should be used with forEachOrdered if the ordering is required.\n+ * @return Sorted stream of {@link UserStorageProviderModel}. Never returns {@code null}.\n+ */\n+ default Stream<UserStorageProviderModel> getUserStorageProvidersStream() {\n+ return getComponentsStream(getId(), UserStorageProvider.class.getName())\n+ .map(UserStorageProviderModel::new)\n+ .sorted(UserStorageProviderModel.comparator);\n+ }\n+\n}\n" }, { "change_type": "MODIFY", "old_path": "model/legacy/src/main/java/org/keycloak/storage/UserStorageUtil.java", "new_path": "model/legacy/src/main/java/org/keycloak/storage/UserStorageUtil.java", "diff": "package org.keycloak.storage;\nimport org.keycloak.models.KeycloakSession;\n-import org.keycloak.models.RealmModel;\nimport org.keycloak.models.cache.UserCache;\nimport org.keycloak.storage.federated.UserFederatedStorageProvider;\n-import java.util.stream.Stream;\n-\n/**\n* @author Alexander Schwartz\n*/\npublic class UserStorageUtil {\n- /**\n- * Returns sorted {@link UserStorageProviderModel UserStorageProviderModel} as a stream.\n- * It should be used with forEachOrdered if the ordering is required.\n- * @return Sorted stream of {@link UserStorageProviderModel}. Never returns {@code null}.\n- */\n- public static Stream<UserStorageProviderModel> getUserStorageProvidersStream(RealmModel realm) {\n- return realm.getComponentsStream(realm.getId(), UserStorageProvider.class.getName())\n- .map(UserStorageProviderModel::new)\n- .sorted(UserStorageProviderModel.comparator);\n- }\npublic static UserFederatedStorageProvider userFederatedStorage(KeycloakSession session) {\nreturn session.getProvider(UserFederatedStorageProvider.class);\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPSyncTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPSyncTest.java", "diff": "@@ -33,6 +33,7 @@ import org.keycloak.component.ComponentModel;\nimport org.keycloak.models.GroupModel;\nimport org.keycloak.models.KeycloakSessionFactory;\nimport org.keycloak.models.LDAPConstants;\n+import org.keycloak.models.LegacyRealmModel;\nimport org.keycloak.models.RealmModel;\nimport org.keycloak.models.UserModel;\nimport org.keycloak.models.UserProvider;\n@@ -148,7 +149,7 @@ public class LDAPSyncTest extends AbstractLDAPTest {\n// Assert lastSync time updated\nAssert.assertTrue(ctx.getLdapModel().getLastSync() > 0);\n- UserStorageUtil.getUserStorageProvidersStream(testRealm).forEachOrdered(persistentFedModel -> {\n+ ((LegacyRealmModel) testRealm).getUserStorageProvidersStream().forEachOrdered(persistentFedModel -> {\nif (LDAPStorageProviderFactory.PROVIDER_NAME.equals(persistentFedModel.getProviderId())) {\nAssert.assertTrue(persistentFedModel.getLastSync() > 0);\n} else {\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageProvidersTestUtils.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageProvidersTestUtils.java", "diff": "@@ -4,12 +4,12 @@ import org.jboss.logging.Logger;\nimport org.keycloak.common.util.reflections.Types;\nimport org.keycloak.component.ComponentModel;\nimport org.keycloak.models.KeycloakSession;\n+import org.keycloak.models.LegacyRealmModel;\nimport org.keycloak.models.ModelException;\nimport org.keycloak.models.RealmModel;\nimport org.keycloak.storage.UserStorageProvider;\nimport org.keycloak.storage.UserStorageProviderFactory;\nimport org.keycloak.storage.UserStorageProviderModel;\n-import org.keycloak.storage.UserStorageUtil;\nimport java.util.stream.Stream;\n@@ -47,7 +47,7 @@ public class UserStorageProvidersTestUtils {\n}\npublic static <T> Stream<UserStorageProviderModel> getStorageProviders(RealmModel realm, KeycloakSession session, Class<T> type) {\n- return UserStorageUtil.getUserStorageProvidersStream(realm)\n+ return ((LegacyRealmModel) realm).getUserStorageProvidersStream()\n.filter(model -> {\nUserStorageProviderFactory factory = getUserStorageProviderFactory(model, session);\nif (factory == null) {\n" }, { "change_type": "MODIFY", "old_path": "testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/SyncDummyFederationProviderCommand.java", "new_path": "testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/SyncDummyFederationProviderCommand.java", "diff": "@@ -19,10 +19,10 @@ package org.keycloak.testsuite.util.cli;\nimport org.keycloak.common.util.MultivaluedHashMap;\nimport org.keycloak.models.KeycloakSession;\n+import org.keycloak.models.LegacyRealmModel;\nimport org.keycloak.models.RealmModel;\nimport org.keycloak.storage.managers.UserStorageSyncManager;\nimport org.keycloak.storage.UserStorageProviderModel;\n-import org.keycloak.storage.UserStorageUtil;\nimport java.util.Objects;\n@@ -71,7 +71,7 @@ public class SyncDummyFederationProviderCommand extends AbstractCommand {\nreturn null;\n}\n- return UserStorageUtil.getUserStorageProvidersStream(realm)\n+ return ((LegacyRealmModel) realm).getUserStorageProvidersStream()\n.filter(fedProvider -> Objects.equals(fedProvider.getName(), displayName))\n.findFirst()\n.orElse(null);\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/jpa/src/main/java/org/keycloak/storage/jpa/JpaUserFederatedStorageProviderFactory.java", "new_path": "model/jpa/src/main/java/org/keycloak/storage/jpa/JpaUserFederatedStorageProviderFactory.java", "diff": "package org.keycloak.storage.jpa;\nimport org.keycloak.Config;\n+import org.keycloak.common.Profile;\nimport org.keycloak.connections.jpa.JpaConnectionProvider;\nimport org.keycloak.models.KeycloakSession;\nimport org.keycloak.models.KeycloakSessionFactory;\n+import org.keycloak.provider.EnvironmentDependentProviderFactory;\nimport org.keycloak.storage.federated.UserFederatedStorageProvider;\nimport org.keycloak.storage.federated.UserFederatedStorageProviderFactory;\n@@ -29,7 +31,7 @@ import javax.persistence.EntityManager;\n* @author <a href=\"mailto:[email protected]\">Bill Burke</a>\n* @version $Revision: 1 $\n*/\n-public class JpaUserFederatedStorageProviderFactory implements UserFederatedStorageProviderFactory {\n+public class JpaUserFederatedStorageProviderFactory implements UserFederatedStorageProviderFactory, EnvironmentDependentProviderFactory {\n@Override\npublic UserFederatedStorageProvider create(KeycloakSession session) {\nEntityManager em = session.getProvider(JpaConnectionProvider.class).getEntityManager();\n@@ -55,4 +57,10 @@ public class JpaUserFederatedStorageProviderFactory implements UserFederatedStor\npublic String getId() {\nreturn \"jpa\";\n}\n+\n+ @Override\n+ public boolean isSupported() {\n+ return !Profile.isFeatureEnabled(Profile.Feature.MAP_STORAGE);\n+ }\n+\n}\n" }, { "change_type": "MODIFY", "old_path": "model/legacy-services/src/main/java/org/keycloak/exportimport/util/MultipleStepsExportProvider.java", "new_path": "model/legacy-services/src/main/java/org/keycloak/exportimport/util/MultipleStepsExportProvider.java", "diff": "@@ -84,7 +84,11 @@ public abstract class MultipleStepsExportProvider implements ExportProvider {\n// Count total number of users\nif (!exportUsersIntoRealmFile) {\nusersHolder.totalCount = session.users().getUsersCount(realm, true);\n+ if (UserStorageUtil.userFederatedStorage(session) != null) {\nfederatedUsersHolder.totalCount = UserStorageUtil.userFederatedStorage(session).getStoredUsersCount(realm);\n+ } else {\n+ federatedUsersHolder.totalCount = 0;\n+ }\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/exportimport/util/ExportUtils.java", "new_path": "services/src/main/java/org/keycloak/exportimport/util/ExportUtils.java", "diff": "@@ -235,11 +235,14 @@ public class ExportUtils {\nrep.setUsers(users);\n}\n+ UserFederatedStorageProvider userFederatedStorageProvider = userFederatedStorage(session);\n+ if (userFederatedStorageProvider != null) {\nList<UserRepresentation> federatedUsers = userFederatedStorage(session).getStoredUsersStream(realm, 0, -1)\n.map(user -> exportFederatedUser(session, realm, user, options)).collect(Collectors.toList());\nif (federatedUsers.size() > 0) {\nrep.setFederatedUsers(federatedUsers);\n}\n+ }\n} else if (options.isClientsIncluded() && options.isOnlyServiceAccountsIncluded()) {\nList<UserRepresentation> users = new LinkedList<>();\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/pom.xml", "new_path": "testsuite/integration-arquillian/tests/base/pom.xml", "diff": "<keycloak.userCache.enabled>false</keycloak.userCache.enabled>\n<keycloak.publicKeyCache.enabled>false</keycloak.publicKeyCache.enabled>\n<keycloak.userSessionPersister.provider></keycloak.userSessionPersister.provider>\n+ <keycloak.userFederatedStorage.provider></keycloak.userFederatedStorage.provider>\n</systemPropertyVariables>\n</configuration>\n</plugin>\n" } ]

[ { "change_type": "ADD", "old_path": null, "new_path": "quarkus/config-api/src/main/java/org/keycloak/config/ConfigSupportLevel.java", "diff": "+package org.keycloak.config;\n+\n+public enum ConfigSupportLevel {\n+ DEPRECATED,\n+ EXPERIMENTAL,\n+ PREVIEW,\n+ SUPPORTED\n+}\n" }, { "change_type": "MODIFY", "old_path": "quarkus/config-api/src/main/java/org/keycloak/config/Option.java", "new_path": "quarkus/config-api/src/main/java/org/keycloak/config/Option.java", "diff": "@@ -2,7 +2,6 @@ package org.keycloak.config;\nimport java.util.List;\nimport java.util.Optional;\n-import java.util.Set;\npublic class Option<T> {\n@@ -21,7 +20,7 @@ public class Option<T> {\nthis.category = category;\nthis.hidden = hidden;\nthis.buildTime = buildTime;\n- this.description = description;\n+ this.description = getDescriptionByCategorySupportLevel(description);\nthis.defaultValue = defaultValue;\nthis.expectedValues = expectedValues;\n}\n@@ -67,4 +66,22 @@ public class Option<T> {\n);\n}\n+ private String getDescriptionByCategorySupportLevel(String description) {\n+ if(description == null || description.isBlank()) {\n+ return description;\n+ }\n+\n+ switch(this.getCategory().getSupportLevel()) {\n+ case PREVIEW:\n+ description = \"Preview: \" + description;\n+ break;\n+ case EXPERIMENTAL:\n+ description = \"Experimental: \" + description;\n+ break;\n+ default:\n+ description = description;\n+ }\n+\n+ return description;\n+ }\n}\n" }, { "change_type": "MODIFY", "old_path": "quarkus/config-api/src/main/java/org/keycloak/config/OptionCategory.java", "new_path": "quarkus/config-api/src/main/java/org/keycloak/config/OptionCategory.java", "diff": "@@ -2,27 +2,29 @@ package org.keycloak.config;\npublic enum OptionCategory {\n// ordered by name asc\n- CLUSTERING(\"Cluster\", 10),\n- STORAGE(\"Storage\", 15),\n- DATABASE(\"Database\", 20),\n- TRANSACTION(\"Transaction\",30),\n- FEATURE(\"Feature\", 40),\n- HOSTNAME(\"Hostname\", 50),\n- HTTP(\"HTTP/TLS\", 60),\n- HEALTH(\"Health\", 70),\n- METRICS(\"Metrics\", 80),\n- PROXY(\"Proxy\", 90),\n- VAULT(\"Vault\", 100),\n- LOGGING(\"Logging\", 110),\n- GENERAL(\"General\", 999);\n-\n- private final String heading;\n+ CLUSTERING(\"Cluster\", 10, ConfigSupportLevel.SUPPORTED),\n+ STORAGE(\"Storage\", 15, ConfigSupportLevel.EXPERIMENTAL),\n+ DATABASE(\"Database\", 20, ConfigSupportLevel.SUPPORTED),\n+ TRANSACTION(\"Transaction\",30, ConfigSupportLevel.SUPPORTED),\n+ FEATURE(\"Feature\", 40, ConfigSupportLevel.SUPPORTED),\n+ HOSTNAME(\"Hostname\", 50, ConfigSupportLevel.SUPPORTED),\n+ HTTP(\"HTTP/TLS\", 60, ConfigSupportLevel.SUPPORTED),\n+ HEALTH(\"Health\", 70, ConfigSupportLevel.SUPPORTED),\n+ METRICS(\"Metrics\", 80, ConfigSupportLevel.SUPPORTED),\n+ PROXY(\"Proxy\", 90, ConfigSupportLevel.SUPPORTED),\n+ VAULT(\"Vault\", 100, ConfigSupportLevel.SUPPORTED),\n+ LOGGING(\"Logging\", 110, ConfigSupportLevel.SUPPORTED),\n+ GENERAL(\"General\", 999, ConfigSupportLevel.SUPPORTED);\n+ private String heading;\n//Categories with a lower number are shown before groups with a higher number\nprivate final int order;\n+ private final ConfigSupportLevel supportLevel;\n- OptionCategory(String heading, int order) {\n- this.heading = heading; this.order = order;\n+ OptionCategory(String heading, int order, ConfigSupportLevel supportLevel) {\n+ this.order = order;\n+ this.supportLevel = supportLevel;\n+ this.heading = getHeadingBySupportLevel(heading);\n}\npublic String getHeading() {\n@@ -33,4 +35,19 @@ public enum OptionCategory {\nreturn this.order;\n}\n+ public ConfigSupportLevel getSupportLevel() {\n+ return this.supportLevel;\n+ }\n+\n+ private String getHeadingBySupportLevel(String heading) {\n+ if (this.supportLevel.equals(ConfigSupportLevel.EXPERIMENTAL)){\n+ heading = heading + \" (Experimental)\";\n+ }\n+\n+ if (this.supportLevel.equals(ConfigSupportLevel.PREVIEW)){\n+ heading = heading + \" (Preview)\";\n+ }\n+\n+ return heading;\n+ }\n}\n" }, { "change_type": "MODIFY", "old_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/Picocli.java", "new_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/Picocli.java", "diff": "@@ -47,6 +47,7 @@ import java.util.regex.Pattern;\nimport java.util.stream.Collectors;\nimport org.eclipse.microprofile.config.spi.ConfigSource;\n+import org.keycloak.config.ConfigSupportLevel;\nimport org.keycloak.config.MultiOption;\nimport org.keycloak.config.OptionCategory;\nimport org.keycloak.quarkus.runtime.cli.command.Build;\n@@ -399,6 +400,7 @@ public final class Picocli {\nfor(PropertyMapper mapper: mappersInCategory) {\nString name = mapper.getCliFormat();\n+\nString description = mapper.getDescription();\nif (description == null || cSpec.optionsMap().containsKey(name) || name.endsWith(OPTION_PART_SEPARATOR)) {\n" }, { "change_type": "MODIFY", "old_path": "quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testBuildHelp.unix.approved.txt", "new_path": "quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testBuildHelp.unix.approved.txt", "diff": "Binary files a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testBuildHelp.unix.approved.txt and b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testBuildHelp.unix.approved.txt differ\n" }, { "change_type": "MODIFY", "old_path": "quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testBuildHelp.windows.approved.txt", "new_path": "quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testBuildHelp.windows.approved.txt", "diff": "Binary files a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testBuildHelp.windows.approved.txt and b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testBuildHelp.windows.approved.txt differ\n" }, { "change_type": "MODIFY", "old_path": "quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testStartDevHelpAll.unix.approved.txt", "new_path": "quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testStartDevHelpAll.unix.approved.txt", "diff": "Binary files a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testStartDevHelpAll.unix.approved.txt and b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testStartDevHelpAll.unix.approved.txt differ\n" }, { "change_type": "MODIFY", "old_path": "quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testStartDevHelpAll.windows.approved.txt", "new_path": "quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testStartDevHelpAll.windows.approved.txt", "diff": "Binary files a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testStartDevHelpAll.windows.approved.txt and b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testStartDevHelpAll.windows.approved.txt differ\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/SingleUseObjectHotRodMapStorage.java", "new_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/SingleUseObjectHotRodMapStorage.java", "diff": "@@ -80,6 +80,9 @@ public class SingleUseObjectHotRodMapStorage<K, E extends AbstractHotRodEntity,\nif (value.getUserId() != null && value.getActionId() != null && value.getActionVerificationNonce() != null) {\nvalue.setId(value.getUserId() + \":\" + value.getActionId() + \":\" + value.getActionVerificationNonce());\n}\n+ if (value.getObjectKey() != null) {\n+ value.setId(value.getObjectKey());\n+ }\n}\nreturn super.create(value);\n}\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/storage/chm/SingleUseObjectConcurrentHashMapStorage.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/storage/chm/SingleUseObjectConcurrentHashMapStorage.java", "diff": "@@ -57,6 +57,9 @@ public class SingleUseObjectConcurrentHashMapStorage<K, V extends AbstractEntity\nif (value.getUserId() != null && value.getActionId() != null && value.getActionVerificationNonce() != null) {\nvalue.setId(value.getUserId() + \":\" + value.getActionId() + \":\" + value.getActionVerificationNonce());\n}\n+ if (value.getObjectKey() != null) {\n+ value.setId(value.getObjectKey());\n+ }\n}\nreturn super.create(value);\n}\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/storage/chm/SingleUseObjectKeycloakTransaction.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/storage/chm/SingleUseObjectKeycloakTransaction.java", "diff": "@@ -44,6 +44,9 @@ public class SingleUseObjectKeycloakTransaction<K> extends ConcurrentHashMapKeyc\nif (value.getUserId() != null && value.getActionId() != null && value.getActionVerificationNonce() != null) {\nvalue.setId(value.getUserId() + \":\" + value.getActionId() + \":\" + value.getActionVerificationNonce());\n}\n+ if (value.getObjectKey() != null) {\n+ value.setId(value.getObjectKey());\n+ }\n}\nreturn super.create(value);\n}\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/storage/chm/SingleUseObjectModelCriteriaBuilder.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/storage/chm/SingleUseObjectModelCriteriaBuilder.java", "diff": "package org.keycloak.models.map.storage.chm;\n+import org.keycloak.models.ActionTokenValueModel;\nimport org.keycloak.models.map.storage.ModelCriteriaBuilder;\nimport org.keycloak.storage.SearchableModelField;\n@@ -31,13 +32,16 @@ public class SingleUseObjectModelCriteriaBuilder implements ModelCriteriaBuilder\nprivate String actionVerificationNonce;\n+ private String objectKey;\n+\npublic SingleUseObjectModelCriteriaBuilder() {\n}\n- public SingleUseObjectModelCriteriaBuilder(String userId, String actionId, String actionVerificationNonce) {\n+ public SingleUseObjectModelCriteriaBuilder(String userId, String actionId, String actionVerificationNonce, String objectKey) {\nthis.userId = userId;\nthis.actionId = actionId;\nthis.actionVerificationNonce = actionVerificationNonce;\n+ this.objectKey = objectKey;\n}\n@Override\n@@ -48,8 +52,10 @@ public class SingleUseObjectModelCriteriaBuilder implements ModelCriteriaBuilder\nactionId = value[0].toString();\n} else if (modelField == org.keycloak.models.ActionTokenValueModel.SearchableFields.ACTION_VERIFICATION_NONCE) {\nactionVerificationNonce = value[0].toString();\n+ } else if (modelField == ActionTokenValueModel.SearchableFields.OBJECT_KEY) {\n+ objectKey = value[0].toString();\n}\n- return new SingleUseObjectModelCriteriaBuilder(userId, actionId, actionVerificationNonce);\n+ return new SingleUseObjectModelCriteriaBuilder(userId, actionId, actionVerificationNonce, objectKey);\n}\n@Override\n@@ -57,6 +63,7 @@ public class SingleUseObjectModelCriteriaBuilder implements ModelCriteriaBuilder\nString userId = null;\nString actionId = null;\nString actionVerificationNonce = null;\n+ String objectKey = null;\nfor (ModelCriteriaBuilder builder: builders) {\nSingleUseObjectModelCriteriaBuilder suoMcb = (SingleUseObjectModelCriteriaBuilder) builder;\n@@ -69,8 +76,11 @@ public class SingleUseObjectModelCriteriaBuilder implements ModelCriteriaBuilder\nif (suoMcb.actionVerificationNonce != null) {\nactionVerificationNonce = suoMcb.actionVerificationNonce;\n}\n+ if (suoMcb.objectKey != null) {\n+ objectKey = suoMcb.objectKey;\n+ }\n}\n- return new SingleUseObjectModelCriteriaBuilder(userId, actionId, actionVerificationNonce);\n+ return new SingleUseObjectModelCriteriaBuilder(userId, actionId, actionVerificationNonce, objectKey);\n}\n@Override\n@@ -84,10 +94,11 @@ public class SingleUseObjectModelCriteriaBuilder implements ModelCriteriaBuilder\n}\npublic boolean isValid() {\n- return userId != null && actionId != null && actionVerificationNonce != null;\n+ return (userId != null && actionId != null && actionVerificationNonce != null) || objectKey != null;\n}\npublic String getKey() {\n+ if (objectKey != null) return objectKey;\nreturn userId + \":\" + actionId + \":\" + actionVerificationNonce;\n}\n}\n" } ]