Datasets:

---

JetBrains-Research

/

commit-chronicle

like 9

Follow

JetBrains Research 70

[ { "change_type": "MODIFY", "old_path": "quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/KeycloakProcessor.java", "new_path": "quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/KeycloakProcessor.java", "diff": "@@ -126,6 +126,12 @@ class KeycloakProcessor {\nprivate static final Map<String, Function<ScriptProviderMetadata, ProviderFactory>> DEPLOYEABLE_SCRIPT_PROVIDERS = new HashMap<>();\nprivate static final String KEYCLOAK_SCRIPTS_JSON_PATH = \"META-INF/keycloak-scripts.json\";\n+ private static final List<Class<? extends ProviderFactory>> IGNORED_PROVIDER_FACTORY = Arrays.asList(\n+ JBossJtaTransactionManagerLookup.class,\n+ DefaultJpaConnectionProviderFactory.class,\n+ DefaultLiquibaseConnectionProvider.class,\n+ LiquibaseJpaUpdaterProviderFactory.class);\n+\nstatic {\nDEPLOYEABLE_SCRIPT_PROVIDERS.put(AUTHENTICATORS, KeycloakProcessor::registerScriptAuthenticator);\nDEPLOYEABLE_SCRIPT_PROVIDERS.put(POLICIES, KeycloakProcessor::registerScriptPolicy);\n@@ -387,11 +393,7 @@ class KeycloakProcessor {\npreConfiguredProviders.putAll(deployedScriptProviders);\nfor (ProviderFactory factory : loadedFactories) {\n- if (Arrays.asList(\n- JBossJtaTransactionManagerLookup.class,\n- DefaultJpaConnectionProviderFactory.class,\n- DefaultLiquibaseConnectionProvider.class,\n- LiquibaseJpaUpdaterProviderFactory.class).contains(factory.getClass())) {\n+ if (IGNORED_PROVIDER_FACTORY.contains(factory.getClass())) {\ncontinue;\n}\n" }, { "change_type": "MODIFY", "old_path": "quarkus/pom.xml", "new_path": "quarkus/pom.xml", "diff": "<properties>\n<!-- Quarkus version -->\n- <quarkus.version>2.3.0.Final</quarkus.version>\n+ <quarkus.version>2.4.0.CR1</quarkus.version>\n<!--\nOverride versions based on Quarkus dependencies.\nMake sure to update these dependencies when Quarkus version changes.\n+ See https://github.com/quarkusio/quarkus/blob/<versionTag>/bom/application/pom.xml\n+ for reference\n-->\n<resteasy.version>4.7.0.Final</resteasy.version>\n<jackson.version>2.12.5</jackson.version>\n<jackson.databind.version>${jackson.version}</jackson.databind.version>\n- <hibernate.core.version>5.6.0.Beta2</hibernate.core.version>\n+ <hibernate.core.version>5.6.0.CR1</hibernate.core.version>\n<mysql.driver.version>8.0.26</mysql.driver.version>\n- <postgresql.version>42.2.23</postgresql.version>\n+ <postgresql.version>42.2.24</postgresql.version>\n<microprofile-metrics-api.version>3.0</microprofile-metrics-api.version>\n<wildfly.common.version>1.5.4.Final-format-001</wildfly.common.version>\n" }, { "change_type": "MODIFY", "old_path": "quarkus/runtime/pom.xml", "new_path": "quarkus/runtime/pom.xml", "diff": "<scope>test</scope>\n</dependency>\n+ <!-- logging wrapper for log4j-->\n+ <dependency>\n+ <groupId>org.jboss.logmanager</groupId>\n+ <artifactId>log4j-jboss-logmanager</artifactId>\n+ </dependency>\n+\n<!-- twitter api -->\n<dependency>\n<groupId>org.twitter4j</groupId>\n<artifactId>openshift-restclient-java</artifactId>\n<version>${version.com.openshift.openshift-restclient-java}</version>\n<exclusions>\n+ <exclusion>\n+ <groupId>log4j</groupId>\n+ <artifactId>log4j</artifactId>\n+ </exclusion>\n<exclusion>\n<groupId>org.slf4j</groupId>\n<artifactId>slf4j-log4j12</artifactId>\n" } ]

[ { "change_type": "MODIFY", "old_path": "testsuite/performance/keycloak/src/main/scripts/Dockerfile", "new_path": "testsuite/performance/keycloak/src/main/scripts/Dockerfile", "diff": "@@ -19,7 +19,7 @@ ADD *.sh /usr/local/bin/\nUSER root\nRUN chown -R jboss .; chgrp -R jboss .; chmod -R -v ug+x bin/*.sh ; \\\n- chmod -R -v ug+x /usr/local/bin/\n+ chmod -R -v +x /usr/local/bin/\nUSER jboss\n" } ]

[ { "change_type": "MODIFY", "old_path": "server-spi/src/main/java/org/keycloak/services/clientpolicy/ClientPolicyEvent.java", "new_path": "server-spi/src/main/java/org/keycloak/services/clientpolicy/ClientPolicyEvent.java", "diff": "@@ -42,6 +42,7 @@ public enum ClientPolicyEvent {\nBACKCHANNEL_TOKEN_REQUEST,\nPUSHED_AUTHORIZATION_REQUEST,\nDEVICE_AUTHORIZATION_REQUEST,\n- DEVICE_TOKEN_REQUEST\n+ DEVICE_TOKEN_REQUEST,\n+ RESOURCE_OWNER_PASSWORD_CREDENTIALS_REQUEST\n}\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": "@@ -74,6 +74,7 @@ import org.keycloak.services.CorsErrorResponseException;\nimport org.keycloak.services.ServicesLogger;\nimport org.keycloak.services.Urls;\nimport org.keycloak.services.clientpolicy.ClientPolicyException;\n+import org.keycloak.services.clientpolicy.context.ResourceOwnerPasswordCredentialsContext;\nimport org.keycloak.services.clientpolicy.context.ServiceAccountTokenRequestContext;\nimport org.keycloak.services.clientpolicy.context.TokenRefreshContext;\nimport org.keycloak.services.clientpolicy.context.TokenRequestContext;\n@@ -630,6 +631,14 @@ public class TokenEndpoint {\nevent.error(Errors.CONSENT_DENIED);\nthrow new CorsErrorResponseException(cors, OAuthErrorException.INVALID_CLIENT, \"Client requires user consent\", Response.Status.BAD_REQUEST);\n}\n+\n+ try {\n+ session.clientPolicy().triggerOnEvent(new ResourceOwnerPasswordCredentialsContext(formParams));\n+ } catch (ClientPolicyException cpe) {\n+ event.error(cpe.getError());\n+ throw new CorsErrorResponseException(cors, cpe.getError(), cpe.getErrorDetail(), cpe.getErrorStatus());\n+ }\n+\nString scope = getRequestedScopes();\nRootAuthenticationSessionModel rootAuthSession = new AuthenticationSessionManager(session).createAuthenticationSession(realm, false);\n" }, { "change_type": "ADD", "old_path": null, "new_path": "services/src/main/java/org/keycloak/services/clientpolicy/context/ResourceOwnerPasswordCredentialsContext.java", "diff": "+/*\n+ * Copyright 2021 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.clientpolicy.context;\n+\n+import javax.ws.rs.core.MultivaluedMap;\n+\n+import org.keycloak.services.clientpolicy.ClientPolicyContext;\n+import org.keycloak.services.clientpolicy.ClientPolicyEvent;\n+\n+/**\n+ * @author <a href=\"mailto:[email protected]\">Takashi Norimatsu</a>\n+ */\n+public class ResourceOwnerPasswordCredentialsContext implements ClientPolicyContext {\n+\n+ private final MultivaluedMap<String, String> params;\n+\n+ public ResourceOwnerPasswordCredentialsContext(MultivaluedMap<String, String> params) {\n+ this.params = params;\n+ }\n+\n+ @Override\n+ public ClientPolicyEvent getEvent() {\n+ return ClientPolicyEvent.RESOURCE_OWNER_PASSWORD_CREDENTIALS_REQUEST;\n+ }\n+\n+ public MultivaluedMap<String, String> getParams() {\n+ return params;\n+ }\n+\n+}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "services/src/main/java/org/keycloak/services/clientpolicy/executor/RejectResourceOwnerPasswordCredentialsGrantExecutor.java", "diff": "+/*\n+ * Copyright 2021 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.clientpolicy.executor;\n+\n+import javax.ws.rs.core.MultivaluedMap;\n+\n+import org.keycloak.OAuthErrorException;\n+import org.keycloak.models.KeycloakSession;\n+import org.keycloak.representations.idm.ClientPolicyExecutorConfigurationRepresentation;\n+import org.keycloak.representations.idm.ClientRepresentation;\n+import org.keycloak.services.clientpolicy.ClientPolicyContext;\n+import org.keycloak.services.clientpolicy.ClientPolicyException;\n+import org.keycloak.services.clientpolicy.context.ClientCRUDContext;\n+import org.keycloak.services.clientpolicy.context.ResourceOwnerPasswordCredentialsContext;\n+\n+import com.fasterxml.jackson.annotation.JsonProperty;\n+\n+/**\n+ * @author <a href=\"mailto:[email protected]\">Takashi Norimatsu</a>\n+ */\n+public class RejectResourceOwnerPasswordCredentialsGrantExecutor implements ClientPolicyExecutorProvider<RejectResourceOwnerPasswordCredentialsGrantExecutor.Configuration> {\n+\n+ private final KeycloakSession session;\n+ private Configuration configuration;\n+\n+ public RejectResourceOwnerPasswordCredentialsGrantExecutor(KeycloakSession session) {\n+ this.session = session;\n+ }\n+\n+ @Override\n+ public void setupConfiguration(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+ @JsonProperty(\"auto-configure\")\n+ protected Boolean autoConfigure;\n+\n+ public Boolean isAutoConfigure() {\n+ return autoConfigure;\n+ }\n+\n+ public void setAutoConfigure(Boolean autoConfigure) {\n+ this.autoConfigure = autoConfigure;\n+ }\n+ }\n+\n+ @Override\n+ public String getProviderId() {\n+ return RejectResourceOwnerPasswordCredentialsGrantExecutorFactory.PROVIDER_ID;\n+ }\n+\n+ @Override\n+ public void executeOnEvent(ClientPolicyContext context) throws ClientPolicyException {\n+ switch (context.getEvent()) {\n+ case REGISTER:\n+ case UPDATE:\n+ ClientCRUDContext clientUpdateContext = (ClientCRUDContext)context;\n+ autoConfigure(clientUpdateContext.getProposedClientRepresentation());\n+ validate(clientUpdateContext.getProposedClientRepresentation());\n+ break;\n+ case RESOURCE_OWNER_PASSWORD_CREDENTIALS_REQUEST:\n+ ResourceOwnerPasswordCredentialsContext ropcContext = (ResourceOwnerPasswordCredentialsContext)context;\n+ executeOnAuthorizationRequest(ropcContext.getParams());\n+ return;\n+ default:\n+ return;\n+ }\n+ }\n+\n+ private void autoConfigure(ClientRepresentation rep) {\n+ if (configuration.isAutoConfigure())\n+ rep.setDirectAccessGrantsEnabled(Boolean.FALSE);\n+ }\n+\n+ private void validate(ClientRepresentation rep) throws ClientPolicyException {\n+ boolean isResourceOwnerPasswordCredentialsGrantEnabled = rep.isDirectAccessGrantsEnabled().booleanValue();\n+ if (!isResourceOwnerPasswordCredentialsGrantEnabled) return;\n+ throw new ClientPolicyException(OAuthErrorException.INVALID_CLIENT_METADATA, \"Invalid client metadata: resource owner password credentials grant enabled\");\n+ }\n+\n+ private void executeOnAuthorizationRequest(MultivaluedMap<String, String> params) throws ClientPolicyException {\n+ // Before client policies operation, Token Endpoint logic has already checked whether resource owner password credentials grant is activated for a client.\n+ // This method rejects resource owner password credentials grant regardless of client setting for allowing resource owner password credentials grant.\n+ throw new ClientPolicyException(OAuthErrorException.INVALID_GRANT, \"resource owner password credentials grant is prohibited.\");\n+ }\n+\n+}\n\\ No newline at end of file\n" }, { "change_type": "ADD", "old_path": null, "new_path": "services/src/main/java/org/keycloak/services/clientpolicy/executor/RejectResourceOwnerPasswordCredentialsGrantExecutorFactory.java", "diff": "+/*\n+ * Copyright 2021 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.clientpolicy.executor;\n+\n+import java.util.Collections;\n+import java.util.List;\n+\n+import org.keycloak.Config.Scope;\n+import org.keycloak.models.KeycloakSession;\n+import org.keycloak.models.KeycloakSessionFactory;\n+import org.keycloak.provider.ProviderConfigProperty;\n+\n+/**\n+ * @author <a href=\"mailto:[email protected]\">Takashi Norimatsu</a>\n+ */\n+public class RejectResourceOwnerPasswordCredentialsGrantExecutorFactory implements ClientPolicyExecutorProviderFactory {\n+\n+ public static final String PROVIDER_ID = \"reject-ropc-grant\";\n+\n+ public static final String AUTO_CONFIGURE = \"auto-configure\";\n+\n+ private static final ProviderConfigProperty AUTO_CONFIGURE_PROPERTY = new ProviderConfigProperty(\n+ AUTO_CONFIGURE, \"Auto-configure\", \"If On, then the during client creation or update, the configuration of the client will be auto-configured to reject a resource owner password credentials grant.\", ProviderConfigProperty.BOOLEAN_TYPE, false);\n+\n+ @Override\n+ public ClientPolicyExecutorProvider create(KeycloakSession session) {\n+ return new RejectResourceOwnerPasswordCredentialsGrantExecutor(session);\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 PROVIDER_ID;\n+ }\n+\n+ @Override\n+ public String getHelpText() {\n+ return \"It makes keycloak to reject a resource owner password credentials grant.\";\n+ }\n+\n+ @Override\n+ public List<ProviderConfigProperty> getConfigProperties() {\n+ return Collections.singletonList(AUTO_CONFIGURE_PROPERTY);\n+ }\n+\n+}\n\\ No newline at end of file\n" }, { "change_type": "MODIFY", "old_path": "services/src/main/resources/META-INF/services/org.keycloak.services.clientpolicy.executor.ClientPolicyExecutorProviderFactory", "new_path": "services/src/main/resources/META-INF/services/org.keycloak.services.clientpolicy.executor.ClientPolicyExecutorProviderFactory", "diff": "@@ -14,3 +14,4 @@ org.keycloak.protocol.oidc.grants.ciba.clientpolicy.executor.SecureCibaSessionEn\norg.keycloak.protocol.oidc.grants.ciba.clientpolicy.executor.SecureCibaSignedAuthenticationRequestExecutorFactory\norg.keycloak.protocol.oidc.grants.ciba.clientpolicy.executor.SecureCibaAuthenticationRequestSigningAlgorithmExecutorFactory\norg.keycloak.services.clientpolicy.executor.SecureLogoutExecutorFactory\n+org.keycloak.services.clientpolicy.executor.RejectResourceOwnerPasswordCredentialsGrantExecutorFactory\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/ClientPoliciesTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientPoliciesTest.java", "diff": "@@ -79,6 +79,7 @@ import org.keycloak.services.clientpolicy.executor.ConsentRequiredExecutorFactor\nimport org.keycloak.services.clientpolicy.executor.FullScopeDisabledExecutorFactory;\nimport org.keycloak.services.clientpolicy.executor.HolderOfKeyEnforcerExecutorFactory;\nimport org.keycloak.services.clientpolicy.executor.PKCEEnforcerExecutorFactory;\n+import org.keycloak.services.clientpolicy.executor.RejectResourceOwnerPasswordCredentialsGrantExecutorFactory;\nimport org.keycloak.services.clientpolicy.executor.SecureClientAuthenticatorExecutorFactory;\nimport org.keycloak.services.clientpolicy.executor.SecureClientUrisExecutorFactory;\nimport org.keycloak.services.clientpolicy.executor.SecureLogoutExecutorFactory;\n@@ -148,6 +149,7 @@ import static org.keycloak.testsuite.util.ClientPoliciesUtil.createSecureSigning\nimport static org.keycloak.testsuite.util.ClientPoliciesUtil.createSecureSigningAlgorithmForSignedJwtEnforceExecutorConfig;\nimport static org.keycloak.testsuite.util.ClientPoliciesUtil.createTestRaiseExeptionConditionConfig;\nimport static org.keycloak.testsuite.util.ClientPoliciesUtil.createFullScopeDisabledExecutorConfig;\n+import static org.keycloak.testsuite.util.ClientPoliciesUtil.createRejectisResourceOwnerPasswordCredentialsGrantExecutorConfig;\nimport javax.ws.rs.BadRequestException;\n@@ -2695,6 +2697,47 @@ public class ClientPoliciesTest extends AbstractClientPoliciesTest {\nassertTrue(driver.getPageSource().contains(\"Front-channel logout is not allowed for this client\"));\n}\n+ @Test\n+ public void testRejectResourceOwnerCredentialsGrantExecutor() throws Exception {\n+\n+ String clientId = generateSuffixedName(CLIENT_NAME);\n+ String clientSecret = \"secret\";\n+\n+ createClientByAdmin(clientId, (ClientRepresentation clientRep) -> {\n+ clientRep.setSecret(clientSecret);\n+ clientRep.setStandardFlowEnabled(Boolean.TRUE);\n+ clientRep.setDirectAccessGrantsEnabled(Boolean.TRUE);\n+ clientRep.setPublicClient(Boolean.FALSE);\n+ });\n+\n+ // register profiles\n+ String json = (new ClientProfilesBuilder()).addProfile(\n+ (new ClientProfileBuilder()).createProfile(PROFILE_NAME, \"Purofairu desu\")\n+ .addExecutor(RejectResourceOwnerPasswordCredentialsGrantExecutorFactory.PROVIDER_ID,\n+ createRejectisResourceOwnerPasswordCredentialsGrantExecutorConfig(Boolean.TRUE))\n+ .toRepresentation()\n+ ).toString();\n+ updateProfiles(json);\n+\n+ // register policies\n+ json = (new ClientPoliciesBuilder()).addPolicy(\n+ (new ClientPolicyBuilder()).createPolicy(POLICY_NAME, \"Porisii desu\", Boolean.TRUE)\n+ .addCondition(AnyClientConditionFactory.PROVIDER_ID,\n+ createAnyClientConditionConfig())\n+ .addProfile(PROFILE_NAME)\n+ .toRepresentation()\n+ ).toString();\n+ updatePolicies(json);\n+\n+ oauth.clientId(clientId);\n+ OAuthClient.AccessTokenResponse response = oauth.doGrantAccessTokenRequest(clientSecret, TEST_USER_NAME, TEST_USER_PASSWORD, null);\n+\n+ assertEquals(400, response.getStatusCode());\n+ assertEquals(OAuthErrorException.INVALID_GRANT, response.getError());\n+ assertEquals(\"resource owner password credentials grant is prohibited.\", response.getErrorDescription());\n+\n+ }\n+\nprivate void openVerificationPage(String verificationUri) {\ndriver.navigate().to(verificationUri);\n}\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": "@@ -41,6 +41,7 @@ import org.keycloak.services.clientpolicy.executor.ConsentRequiredExecutor;\nimport org.keycloak.services.clientpolicy.executor.FullScopeDisabledExecutor;\nimport org.keycloak.services.clientpolicy.executor.HolderOfKeyEnforcerExecutor;\nimport org.keycloak.services.clientpolicy.executor.PKCEEnforcerExecutor;\n+import org.keycloak.services.clientpolicy.executor.RejectResourceOwnerPasswordCredentialsGrantExecutor;\nimport org.keycloak.services.clientpolicy.executor.SecureClientAuthenticatorExecutor;\nimport org.keycloak.services.clientpolicy.executor.SecureRequestObjectExecutor;\nimport org.keycloak.services.clientpolicy.executor.SecureResponseTypeExecutor;\n@@ -211,6 +212,12 @@ public final class ClientPoliciesUtil {\nreturn config;\n}\n+ public static RejectResourceOwnerPasswordCredentialsGrantExecutor.Configuration createRejectisResourceOwnerPasswordCredentialsGrantExecutorConfig(Boolean autoConfigure) {\n+ RejectResourceOwnerPasswordCredentialsGrantExecutor.Configuration config = new RejectResourceOwnerPasswordCredentialsGrantExecutor.Configuration();\n+ config.setAutoConfigure(autoConfigure);\n+ return config;\n+ }\n+\npublic static class ClientPoliciesBuilder {\nprivate final ClientPoliciesRepresentation policiesRep;\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": "@@ -147,7 +147,7 @@ public class MapRootAuthenticationSessionProvider implements AuthenticationSessi\nModelCriteriaBuilder<RootAuthenticationSessionModel> mcb = sessionStore.createCriteriaBuilder()\n.compare(SearchableFields.REALM_ID, Operator.EQ, realm.getId());\n- sessionStore.delete(withCriteria(mcb));\n+ tx.delete(withCriteria(mcb));\n}\n@Override\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/client/MapClientProvider.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/client/MapClientProvider.java", "diff": "@@ -216,7 +216,7 @@ public class MapClientProvider implements ClientProvider {\nModelCriteriaBuilder<ClientModel> mcb = clientStore.createCriteriaBuilder()\n.compare(SearchableFields.REALM_ID, Operator.EQ, realm.getId());\n- return this.clientStore.getCount(withCriteria(mcb));\n+ return tx.getCount(withCriteria(mcb));\n}\n@Override\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/storage/MapStorage.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/storage/MapStorage.java", "diff": "@@ -22,10 +22,6 @@ import java.util.stream.Stream;\n/**\n* Implementation of this interface interacts with a persistence storage storing various entities, e.g. users, realms.\n- * It contains basic object CRUD operations as well as bulk {@link #read(org.keycloak.models.map.storage.QueryParameters)}\n- * and bulk {@link #delete(org.keycloak.models.map.storage.QueryParameters)} operations,\n- * and operation for determining the number of the objects satisfying given criteria\n- * ({@link #getCount(org.keycloak.models.map.storage.QueryParameters)}).\n*\n* @author hmlnarik\n* @param <V> Type of the stored values that contains all the data stripped of session state. In other words, in the entities\n@@ -37,75 +33,6 @@ import java.util.stream.Stream;\n*/\npublic interface MapStorage<V extends AbstractEntity, M> {\n- /**\n- * Creates an object in the store. ID of the {@code value} may be prescribed in id of the {@code value}.\n- * If the id is {@code null} or its format is not matching the store internal format for ID, then\n- * the {@code value}'s ID will be generated and returned in the id of the return value.\n- * @param value Entity to create in the store\n- * @throws NullPointerException if {@code value} is {@code null}\n- * @see AbstractEntity#getId()\n- * @return Entity representing the {@code value} in the store. It may or may not be the same instance as {@code value}\n- */\n- V create(V value);\n-\n- /**\n- * Returns object with the given {@code key} from the storage or {@code null} if object does not exist.\n- * <br>\n- * TODO: Consider returning {@code Optional<V>} instead.\n- * @param key Key of the object. Must not be {@code null}.\n- * @return See description\n- * @throws NullPointerException if the {@code key} is {@code null}\n- */\n- V read(String key);\n-\n- /**\n- * Returns stream of objects satisfying given {@code criteria} from the storage.\n- * The criteria are specified in the given criteria builder based on model properties.\n- *\n- * @param queryParameters parameters for the query like firstResult, maxResult, requested ordering, etc.\n- * @return Stream of objects. Never returns {@code null}.\n- * @throws IllegalStateException If {@code criteria} is not compatible, i.e. has not been originally created\n- * by the {@link #createCriteriaBuilder()} method of this object.\n- */\n- Stream<V> read(QueryParameters<M> queryParameters);\n-\n- /**\n- * Returns the number of objects satisfying given {@code criteria} from the storage.\n- * The criteria are specified in the given criteria builder based on model properties.\n- *\n- * @param queryParameters parameters for the query like firstResult, maxResult, requested ordering, etc.\n- * @return Number of objects. Never returns {@code null}.\n- * @throws IllegalStateException If {@code criteria} is not compatible, i.e. has not been originally created\n- * by the {@link #createCriteriaBuilder()} method of this object.\n- */\n- long getCount(QueryParameters<M> queryParameters);\n-\n- /**\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- * @throws NullPointerException if the object or its {@code id} is {@code null}\n- * @see AbstractEntity#getId()\n- */\n- V update(V value);\n-\n- /**\n- * Deletes object with the given {@code key} from the storage, if exists, no-op otherwise.\n- * @param key\n- * @return Returns {@code true} if the object has been deleted or result cannot be determined, {@code false} otherwise.\n- */\n- boolean delete(String key);\n-\n- /**\n- * Deletes objects that match the given criteria.\n- * @param queryParameters parameters for the query like firstResult, maxResult, requested ordering, etc.\n- * @return Number of removed objects (might return {@code -1} if not supported)\n- * @throws IllegalStateException If {@code criteria} is not compatible, i.e. has not been originally created\n- * by the {@link #createCriteriaBuilder()} method of this object.\n- */\n- long delete(QueryParameters<M> queryParameters);\n-\n-\n/**\n* Returns criteria builder for the storage engine.\n* The criteria are specified in the given criteria builder based on model properties.\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/storage/chm/ConcurrentHashMapKeycloakTransaction.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/storage/chm/ConcurrentHashMapKeycloakTransaction.java", "diff": "@@ -43,7 +43,7 @@ public class ConcurrentHashMapKeycloakTransaction<K, V extends AbstractEntity &\nprotected boolean active;\nprotected boolean rollback;\nprotected final Map<String, MapTaskWithValue> tasks = new LinkedHashMap<>();\n- protected final MapStorage<V, M> map;\n+ protected final ConcurrentHashMapStorage<K, V, M> map;\nprotected final StringKeyConvertor<K> keyConvertor;\nprotected final DeepCloner cloner;\n@@ -51,7 +51,7 @@ public class ConcurrentHashMapKeycloakTransaction<K, V extends AbstractEntity &\nCREATE, UPDATE, DELETE,\n}\n- public ConcurrentHashMapKeycloakTransaction(MapStorage<V, M> map, StringKeyConvertor<K> keyConvertor, DeepCloner cloner) {\n+ public ConcurrentHashMapKeycloakTransaction(ConcurrentHashMapStorage<K, V, M> map, StringKeyConvertor<K> keyConvertor, DeepCloner cloner) {\nthis.map = map;\nthis.keyConvertor = keyConvertor;\nthis.cloner = cloner;\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": "@@ -41,6 +41,11 @@ import java.util.function.Predicate;\nimport static org.keycloak.utils.StreamsUtil.paginatedStream;\n/**\n+ *\n+ * It contains basic object CRUD operations as well as bulk {@link #read(org.keycloak.models.map.storage.QueryParameters)}\n+ * and bulk {@link #delete(org.keycloak.models.map.storage.QueryParameters)} operations,\n+ * and operation for determining the number of the objects satisfying given criteria\n+ * ({@link #getCount(org.keycloak.models.map.storage.QueryParameters)}).\n*\n* @author hmlnarik\n*/\n@@ -59,7 +64,15 @@ public class ConcurrentHashMapStorage<K, V extends AbstractEntity & UpdatableEnt\nthis.cloner = cloner;\n}\n- @Override\n+ /**\n+ * Creates an object in the store. ID of the {@code value} may be prescribed in id of the {@code value}.\n+ * If the id is {@code null} or its format is not matching the store internal format for ID, then\n+ * the {@code value}'s ID will be generated and returned in the id of the return value.\n+ * @param value Entity to create in the store\n+ * @throws NullPointerException if {@code value} is {@code null}\n+ * @see AbstractEntity#getId()\n+ * @return Entity representing the {@code value} in the store. It may or may not be the same instance as {@code value}\n+ */\npublic V create(V value) {\nK key = keyConvertor.fromStringSafe(value.getId());\nif (key == null) {\n@@ -70,26 +83,49 @@ public class ConcurrentHashMapStorage<K, V extends AbstractEntity & UpdatableEnt\nreturn value;\n}\n- @Override\n+ /**\n+ * Returns object with the given {@code key} from the storage or {@code null} if object does not exist.\n+ * <br>\n+ * TODO: Consider returning {@code Optional<V>} instead.\n+ * @param key Key of the object. Must not be {@code null}.\n+ * @return See description\n+ * @throws NullPointerException if the {@code key} is {@code null}\n+ */\npublic V read(String key) {\nObjects.requireNonNull(key, \"Key must be non-null\");\nK k = keyConvertor.fromStringSafe(key);\nreturn store.get(k);\n}\n- @Override\n+ /**\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+ * @throws NullPointerException if the object or its {@code id} is {@code null}\n+ * @see AbstractEntity#getId()\n+ */\npublic V update(V value) {\nK key = getKeyConvertor().fromStringSafe(value.getId());\nreturn store.replace(key, value);\n}\n- @Override\n+ /**\n+ * Deletes object with the given {@code key} from the storage, if exists, no-op otherwise.\n+ * @param key\n+ * @return Returns {@code true} if the object has been deleted or result cannot be determined, {@code false} otherwise.\n+ */\npublic boolean delete(String key) {\nK k = getKeyConvertor().fromStringSafe(key);\nreturn store.remove(k) != null;\n}\n- @Override\n+ /**\n+ * Deletes objects that match the given criteria.\n+ * @param queryParameters parameters for the query like firstResult, maxResult, requested ordering, etc.\n+ * @return Number of removed objects (might return {@code -1} if not supported)\n+ * @throws IllegalStateException If {@code criteria} is not compatible, i.e. has not been originally created\n+ * by the {@link #createCriteriaBuilder()} method of this object.\n+ */\npublic long delete(QueryParameters<M> queryParameters) {\nModelCriteriaBuilder<M> criteria = queryParameters.getModelCriteriaBuilder();\n@@ -139,7 +175,15 @@ public class ConcurrentHashMapStorage<K, V extends AbstractEntity & UpdatableEnt\nreturn keyConvertor;\n}\n- @Override\n+ /**\n+ * Returns stream of objects satisfying given {@code criteria} from the storage.\n+ * The criteria are specified in the given criteria builder based on model properties.\n+ *\n+ * @param queryParameters parameters for the query like firstResult, maxResult, requested ordering, etc.\n+ * @return Stream of objects. Never returns {@code null}.\n+ * @throws IllegalStateException If {@code criteria} is not compatible, i.e. has not been originally created\n+ * by the {@link #createCriteriaBuilder()} method of this object.\n+ */\npublic Stream<V> read(QueryParameters<M> queryParameters) {\nModelCriteriaBuilder<M> criteria = queryParameters.getModelCriteriaBuilder();\n@@ -160,7 +204,15 @@ public class ConcurrentHashMapStorage<K, V extends AbstractEntity & UpdatableEnt\nreturn stream.map(Map.Entry::getValue);\n}\n- @Override\n+ /**\n+ * Returns the number of objects satisfying given {@code criteria} from the storage.\n+ * The criteria are specified in the given criteria builder based on model properties.\n+ *\n+ * @param queryParameters parameters for the query like firstResult, maxResult, requested ordering, etc.\n+ * @return Number of objects. Never returns {@code null}.\n+ * @throws IllegalStateException If {@code criteria} is not compatible, i.e. has not been originally created\n+ * by the {@link #createCriteriaBuilder()} method of this object.\n+ */\npublic long getCount(QueryParameters<M> queryParameters) {\nreturn read(queryParameters).count();\n}\n" }, { "change_type": "RENAME", "old_path": "testsuite/model/src/test/java/org/keycloak/testsuite/model/MapStorageTest.java", "new_path": "testsuite/model/src/test/java/org/keycloak/testsuite/model/ConcurrentHashMapStorageTest.java", "diff": "@@ -50,9 +50,9 @@ import static org.hamcrest.Matchers.nullValue;\n@RequireProvider(value = ClientProvider.class, only = {MapClientProviderFactory.PROVIDER_ID})\n@RequireProvider(RealmProvider.class)\n@RequireProvider(value = MapStorageProvider.class, only = {ConcurrentHashMapStorageProviderFactory.PROVIDER_ID})\n-public class MapStorageTest extends KeycloakModelTest {\n+public class ConcurrentHashMapStorageTest extends KeycloakModelTest {\n- private static final Logger LOG = Logger.getLogger(MapStorageTest.class.getName());\n+ private static final Logger LOG = Logger.getLogger(ConcurrentHashMapStorageTest.class.getName());\nprivate String realmId;\n@@ -155,7 +155,7 @@ public class MapStorageTest extends KeycloakModelTest {\nassertClientsPersisted(component1Id, component2Id, idMain, id1, id2);\n}\n- private <K,K1> void assertClientDoesNotExist(MapStorage<MapClientEntity, ClientModel> storage, String id, final StringKeyConvertor<K1> kc, final StringKeyConvertor<K> kcStorage) {\n+ private <K,K1> void assertClientDoesNotExist(ConcurrentHashMapStorage<K, MapClientEntity, ClientModel> storage, String id, final StringKeyConvertor<K1> kc, final StringKeyConvertor<K> kcStorage) {\n// Assert that the other stores do not contain the to-be-created clients (if they use compatible key format)\ntry {\nassertThat(storage.read(id), nullValue());\n" } ]

[ { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/broker/saml/SAMLIdentityProvider.java", "new_path": "services/src/main/java/org/keycloak/broker/saml/SAMLIdentityProvider.java", "diff": "@@ -359,8 +359,7 @@ public class SAMLIdentityProvider extends AbstractIdentityProvider<SAMLIdentityP\nboolean wantAssertionsEncrypted = getConfig().isWantAssertionsEncrypted();\nString entityId = getEntityId(uriInfo, realm);\nString nameIDPolicyFormat = getConfig().getNameIDPolicyFormat();\n- int attributeConsumingServiceIndex = getConfig().getAttributeConsumingServiceIndex() != null ? getConfig().getAttributeConsumingServiceIndex(): 1;\n- String attributeConsumingServiceName = getConfig().getAttributeConsumingServiceName();\n+\nList<Element> signingKeys = new LinkedList<>();\nList<Element> encryptionKeys = new LinkedList<>();\n@@ -394,41 +393,37 @@ public class SAMLIdentityProvider extends AbstractIdentityProvider<SAMLIdentityP\nwantAuthnRequestsSigned, wantAssertionsSigned, wantAssertionsEncrypted,\nentityId, nameIDPolicyFormat, signingKeys, encryptionKeys);\n- // Create the AttributeConsumingService\n+ // Create the AttributeConsumingService if at least one attribute importer mapper exists\n+ List<IdentityProviderMapperModel> mappers = realm.getIdentityProviderMappersByAliasStream(getConfig().getAlias()).filter(mapper -> \"saml-user-attribute-idp-mapper\".equals(mapper.getIdentityProviderMapper())).collect(Collectors.toList());\n+\n+ if (!mappers.isEmpty()) {\n+ int attributeConsumingServiceIndex = getConfig().getAttributeConsumingServiceIndex() != null ? getConfig().getAttributeConsumingServiceIndex() : 1;\n+ String attributeConsumingServiceName = getConfig().getAttributeConsumingServiceName();\n+ //default value for attributeConsumingServiceName\n+ if (attributeConsumingServiceName == null)\n+ attributeConsumingServiceName = realm.getDisplayName() != null ? realm.getDisplayName() : realm.getName() ;\nAttributeConsumingServiceType attributeConsumingService = new AttributeConsumingServiceType(attributeConsumingServiceIndex);\nattributeConsumingService.setIsDefault(true);\n- if (attributeConsumingServiceName != null && attributeConsumingServiceName.length() > 0)\n- {\nString currentLocale = realm.getDefaultLocale() == null ? \"en\" : realm.getDefaultLocale();\nLocalizedNameType attributeConsumingServiceNameElement = new LocalizedNameType(currentLocale);\nattributeConsumingServiceNameElement.setValue(attributeConsumingServiceName);\nattributeConsumingService.addServiceName(attributeConsumingServiceNameElement);\n- }\n// Look for the SP descriptor and add the attribute consuming service\nfor (EntityDescriptorType.EDTChoiceType choiceType : entityDescriptor.getChoiceType()) {\nList<EntityDescriptorType.EDTDescriptorChoiceType> descriptors = choiceType.getDescriptors();\n-\n- if (descriptors != null) {\nfor (EntityDescriptorType.EDTDescriptorChoiceType descriptor : descriptors) {\n- if (descriptor.getSpDescriptor() != null) {\ndescriptor.getSpDescriptor().addAttributeConsumerService(attributeConsumingService);\n}\n}\n- }\n- }\n// Add the attribute mappers\n- realm.getIdentityProviderMappersByAliasStream(getConfig().getAlias())\n- .forEach(mapper -> {\n- IdentityProviderMapper target = (IdentityProviderMapper) session.getKeycloakSessionFactory().getProviderFactory(IdentityProviderMapper.class, mapper.getIdentityProviderMapper());\n- if (target instanceof SamlMetadataDescriptorUpdater)\n- {\n- SamlMetadataDescriptorUpdater metadataAttrProvider = (SamlMetadataDescriptorUpdater)target;\n+ mappers.forEach(mapper -> {\n+ SamlMetadataDescriptorUpdater metadataAttrProvider = (SamlMetadataDescriptorUpdater) session.getKeycloakSessionFactory().getProviderFactory(IdentityProviderMapper.class, mapper.getIdentityProviderMapper());\nmetadataAttrProvider.updateMetadata(mapper, entityDescriptor);\n- }\n});\n+ }\n// Write the metadata and export it to a string\nmetadataWriter.writeEntityDescriptor(entityDescriptor);\n" }, { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/broker/saml/mappers/UserAttributeMapper.java", "new_path": "services/src/main/java/org/keycloak/broker/saml/mappers/UserAttributeMapper.java", "diff": "@@ -234,17 +234,12 @@ public class UserAttributeMapper extends AbstractIdentityProviderMapper implemen\n// Add the requestedAttribute item to any AttributeConsumingServices\nfor (EntityDescriptorType.EDTChoiceType choiceType : entityDescriptor.getChoiceType()) {\nList<EntityDescriptorType.EDTDescriptorChoiceType> descriptors = choiceType.getDescriptors();\n-\n- if (descriptors != null) {\nfor (EntityDescriptorType.EDTDescriptorChoiceType descriptor : descriptors) {\n- if (descriptor.getSpDescriptor() != null && descriptor.getSpDescriptor().getAttributeConsumingService() != null) {\n- for (AttributeConsumingServiceType attributeConsumingService: descriptor.getSpDescriptor().getAttributeConsumingService())\n- {\n+ for (AttributeConsumingServiceType attributeConsumingService : descriptor.getSpDescriptor().getAttributeConsumingService()) {\nattributeConsumingService.addRequestedAttribute(requestedAttribute);\n}\n}\n- }\n- }\n+\n}\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlSpDescriptorTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlSpDescriptorTest.java", "diff": "@@ -13,6 +13,7 @@ import org.keycloak.models.IdentityProviderMapperSyncMode;\nimport org.keycloak.representations.idm.IdentityProviderMapperRepresentation;\nimport org.keycloak.saml.common.exceptions.ParsingException;\nimport org.keycloak.saml.processing.core.parsers.saml.SAMLParser;\n+import org.keycloak.testsuite.Assert;\nimport org.keycloak.testsuite.updaters.IdentityProviderAttributeUpdater;\nimport java.io.Closeable;\n@@ -21,6 +22,9 @@ import java.net.URISyntaxException;\nimport static org.hamcrest.MatcherAssert.assertThat;\nimport static org.hamcrest.Matchers.is;\n+import static org.hamcrest.Matchers.empty;\n+import static org.hamcrest.Matchers.not;\n+import static org.hamcrest.Matchers.notNullValue;\npublic class KcSamlSpDescriptorTest extends AbstractBrokerTest {\n@@ -30,9 +34,9 @@ public class KcSamlSpDescriptorTest extends AbstractBrokerTest {\n}\n@Test\n- public void testAttributeConsumingServiceIndexInSpMetadata() throws IOException, ParsingException, URISyntaxException {\n+ public void testAttributeConsumingServiceNameInSpMetadata() throws IOException, ParsingException, URISyntaxException {\ntry (Closeable idpUpdater = new IdentityProviderAttributeUpdater(identityProviderResource)\n- .setAttribute(SAMLIdentityProviderConfig.ATTRIBUTE_CONSUMING_SERVICE_INDEX, \"15\")\n+ .setAttribute(SAMLIdentityProviderConfig.ATTRIBUTE_CONSUMING_SERVICE_NAME, \"My Attribute Set\")\n.update())\n{\n@@ -41,32 +45,50 @@ public class KcSamlSpDescriptorTest extends AbstractBrokerTest {\nEntityDescriptorType o = (EntityDescriptorType) parser.parse(new StringInputStream(spDescriptorString));\nSPSSODescriptorType spDescriptor = o.getChoiceType().get(0).getDescriptors().get(0).getSpDescriptor();\n- assertThat(spDescriptor.getAttributeConsumingService().isEmpty(), is(false));\n- assertThat(spDescriptor.getAttributeConsumingService().get(0).getIndex(), is(15));\n+ //attribute mappers do not exist- no AttributeConsumingService\n+ assertThat(spDescriptor.getAttributeConsumingService(), empty());\n}\n}\n@Test\n- public void testAttributeConsumingServiceNameInSpMetadata() throws IOException, ParsingException, URISyntaxException {\n+ public void testAttributeConsumingServiceMappersInSpMetadataWithoutServiceName() throws IOException, ParsingException, URISyntaxException {\ntry (Closeable idpUpdater = new IdentityProviderAttributeUpdater(identityProviderResource)\n- .setAttribute(SAMLIdentityProviderConfig.ATTRIBUTE_CONSUMING_SERVICE_NAME, \"My Attribute Set\")\n+ .setAttribute(SAMLIdentityProviderConfig.ATTRIBUTE_CONSUMING_SERVICE_INDEX, \"12\")\n.update())\n{\n+ IdentityProviderMapperRepresentation attrMapperEmail = new IdentityProviderMapperRepresentation();\n+ attrMapperEmail.setName(\"attribute-mapper-email\");\n+ attrMapperEmail.setIdentityProviderMapper(UserAttributeMapper.PROVIDER_ID);\n+ attrMapperEmail.setConfig(ImmutableMap.<String,String>builder()\n+ .put(IdentityProviderMapperModel.SYNC_MODE, IdentityProviderMapperSyncMode.INHERIT.toString())\n+ .put(UserAttributeMapper.ATTRIBUTE_NAME, \"email_attr_name\")\n+ .put(UserAttributeMapper.ATTRIBUTE_FRIENDLY_NAME, \"email_attr_friendlyname\")\n+ .put(UserAttributeMapper.USER_ATTRIBUTE, \"email\")\n+ .build());\n+ attrMapperEmail.setIdentityProviderAlias(bc.getIDPAlias());\n+\n+ identityProviderResource.addMapper(attrMapperEmail);\nString spDescriptorString = identityProviderResource.export(null).readEntity(String.class);\nSAMLParser parser = SAMLParser.getInstance();\nEntityDescriptorType o = (EntityDescriptorType) parser.parse(new StringInputStream(spDescriptorString));\nSPSSODescriptorType spDescriptor = o.getChoiceType().get(0).getDescriptors().get(0).getSpDescriptor();\n- assertThat(spDescriptor.getAttributeConsumingService().isEmpty(), is(false));\n- assertThat(spDescriptor.getAttributeConsumingService().get(0).getServiceName().get(0).getValue(), is(\"My Attribute Set\"));\n+ assertThat(spDescriptor.getAttributeConsumingService(), not(empty()));\n+ assertThat(spDescriptor.getAttributeConsumingService().get(0).getIndex(), is(12));\n+ assertThat(spDescriptor.getAttributeConsumingService().get(0).getRequestedAttribute(), notNullValue());\n+ assertThat(spDescriptor.getAttributeConsumingService().get(0).getRequestedAttribute(), not(empty()));\n+ assertThat(spDescriptor.getAttributeConsumingService().get(0).getRequestedAttribute().get(0).getName(), is(\"email_attr_name\"));\n+ assertThat(spDescriptor.getAttributeConsumingService().get(0).getRequestedAttribute().get(0).getFriendlyName(), is(\"email_attr_friendlyname\"));\n+ assertThat(spDescriptor.getAttributeConsumingService().get(0).getServiceName(), notNullValue());\n+ assertThat(spDescriptor.getAttributeConsumingService().get(0).getServiceName().get(0).getValue(), is(bc.consumerRealmName()));\n}\n}\n@Test\n- public void testAttributeConsumingServiceMappersInSpMetadata() throws IOException, ParsingException, URISyntaxException {\n+ public void testAttributeConsumingServiceMappersInSpMetadataWithServiceName() throws IOException, ParsingException, URISyntaxException {\ntry (Closeable idpUpdater = new IdentityProviderAttributeUpdater(identityProviderResource)\n- .setAttribute(SAMLIdentityProviderConfig.ATTRIBUTE_CONSUMING_SERVICE_INDEX, \"12\")\n+ .setAttribute(SAMLIdentityProviderConfig.ATTRIBUTE_CONSUMING_SERVICE_INDEX, \"12\").setAttribute(SAMLIdentityProviderConfig.ATTRIBUTE_CONSUMING_SERVICE_NAME, \"My Attribute Set\")\n.update())\n{\nIdentityProviderMapperRepresentation attrMapperEmail = new IdentityProviderMapperRepresentation();\n@@ -87,12 +109,14 @@ public class KcSamlSpDescriptorTest extends AbstractBrokerTest {\nEntityDescriptorType o = (EntityDescriptorType) parser.parse(new StringInputStream(spDescriptorString));\nSPSSODescriptorType spDescriptor = o.getChoiceType().get(0).getDescriptors().get(0).getSpDescriptor();\n- assertThat(spDescriptor.getAttributeConsumingService().isEmpty(), is(false));\n+ assertThat(spDescriptor.getAttributeConsumingService(), not(empty()));\nassertThat(spDescriptor.getAttributeConsumingService().get(0).getIndex(), is(12));\n- assertThat(spDescriptor.getAttributeConsumingService().get(0).getRequestedAttribute() != null, is(true));\n- assertThat(spDescriptor.getAttributeConsumingService().get(0).getRequestedAttribute().isEmpty(), is(false));\n+ assertThat(spDescriptor.getAttributeConsumingService().get(0).getRequestedAttribute(), notNullValue());\n+ assertThat(spDescriptor.getAttributeConsumingService().get(0).getRequestedAttribute(), not(empty()));\nassertThat(spDescriptor.getAttributeConsumingService().get(0).getRequestedAttribute().get(0).getName(), is(\"email_attr_name\"));\nassertThat(spDescriptor.getAttributeConsumingService().get(0).getRequestedAttribute().get(0).getFriendlyName(), is(\"email_attr_friendlyname\"));\n+ assertThat(spDescriptor.getAttributeConsumingService().get(0).getServiceName(), notNullValue());\n+ assertThat(spDescriptor.getAttributeConsumingService().get(0).getServiceName().get(0).getValue(), is(\"My Attribute Set\"));\n}\n}\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": "@@ -746,7 +746,7 @@ identity-provider.saml.protocol-endpoints.saml.tooltip=Shows the configuration o\nidentity-provider.saml.attribute-consuming-service-index=Attribute Consuming Service Index\nidentity-provider.saml.attribute-consuming-service-index.tooltip=Index of the Attribute Consuming Service profile to request during authentication\nidentity-provider.saml.attribute-consuming-service-name=Attribute Consuming Service Name\n-identity-provider.saml.attribute-consuming-service-name.tooltip=Name of the Attribute Consuming Service profile to advertise in the SP metadata\n+identity-provider.saml.attribute-consuming-service-name.tooltip=Name of the Attribute Consuming Service profile to advertise in the SP metadata. Default value equal to the realm display name when configured, otherwise equal to the realm name.\nsaml-config=SAML Config\nidentity-provider.saml-config.tooltip=SAML SP and external IDP configuration.\nsingle-signon-service-url=Single Sign-On Service URL\n" } ]

[ { "change_type": "MODIFY", "old_path": "quarkus/pom.xml", "new_path": "quarkus/pom.xml", "diff": "<properties>\n<!-- Quarkus version -->\n- <quarkus.version>2.4.0.CR1</quarkus.version>\n+ <quarkus.version>2.4.0.Final</quarkus.version>\n<!--\nOverride versions based on Quarkus dependencies.\n<resteasy.version>4.7.0.Final</resteasy.version>\n<jackson.version>2.12.5</jackson.version>\n<jackson.databind.version>${jackson.version}</jackson.databind.version>\n- <hibernate.core.version>5.6.0.CR1</hibernate.core.version>\n+ <hibernate.core.version>5.6.0.Final</hibernate.core.version>\n<mysql.driver.version>8.0.26</mysql.driver.version>\n<postgresql.version>42.2.24</postgresql.version>\n<microprofile-metrics-api.version>3.0</microprofile-metrics-api.version>\n" } ]

[ { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureLogoutExecutor.java", "new_path": "services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureLogoutExecutor.java", "diff": "@@ -65,7 +65,7 @@ public class SecureLogoutExecutor implements ClientPolicyExecutorProvider<Secure\n@Override\npublic String getProviderId() {\n- return PKCEEnforcerExecutorFactory.PROVIDER_ID;\n+ return SecureLogoutExecutorFactory.PROVIDER_ID;\n}\n@Override\n" } ]

[ { "change_type": "ADD", "old_path": null, "new_path": "model/map/src/main/java/org/keycloak/models/map/storage/criteria/DefaultModelCriteria.java", "diff": "+/*\n+ * Copyright 2021 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.models.map.storage.criteria;\n+\n+import org.keycloak.models.map.storage.ModelCriteriaBuilder;\n+import org.keycloak.models.map.storage.criteria.ModelCriteriaNode.ExtOperator;\n+import org.keycloak.storage.SearchableModelField;\n+\n+/**\n+ * Descriptive model criteria implementation which in other words represents a Boolean formula on searchable fields.\n+ * @author hmlnarik\n+ */\n+public class DefaultModelCriteria<M> implements ModelCriteriaBuilder<M> {\n+\n+ private final ModelCriteriaNode<M> node;\n+\n+ public DefaultModelCriteria() {\n+ this.node = null;\n+ }\n+\n+ private DefaultModelCriteria(ModelCriteriaNode<M> node) {\n+ this.node = node;\n+ }\n+\n+ @Override\n+ public DefaultModelCriteria<M> compare(SearchableModelField<M> modelField, Operator op, Object... value) {\n+ final ModelCriteriaNode<M> targetNode;\n+ if (isEmpty()) {\n+ targetNode = new ModelCriteriaNode<>(modelField, op, value);\n+ } else if (node.getNodeOperator() == ExtOperator.AND) {\n+ targetNode = node.cloneTree();\n+ targetNode.addChild(new ModelCriteriaNode<>(modelField, op, value));\n+ } else {\n+ targetNode = new ModelCriteriaNode<>(ExtOperator.AND);\n+ targetNode.addChild(node.cloneTree());\n+ targetNode.addChild(new ModelCriteriaNode<>(modelField, op, value));\n+ }\n+ return new DefaultModelCriteria<>(targetNode);\n+ }\n+\n+ @Override\n+ public DefaultModelCriteria<M> and(ModelCriteriaBuilder<M>... mcbs) {\n+ final ModelCriteriaNode<M> targetNode = new ModelCriteriaNode<>(ExtOperator.AND);\n+ for (ModelCriteriaBuilder<M> mcb : mcbs) {\n+ targetNode.addChild(((DefaultModelCriteria<M>) mcb.unwrap(DefaultModelCriteria.class)).node);\n+ }\n+ return new DefaultModelCriteria<>(targetNode);\n+ }\n+\n+ @Override\n+ public DefaultModelCriteria<M> or(ModelCriteriaBuilder<M>... mcbs) {\n+ final ModelCriteriaNode<M> targetNode = new ModelCriteriaNode<>(ExtOperator.OR);\n+ for (ModelCriteriaBuilder<M> mcb : mcbs) {\n+ targetNode.addChild(((DefaultModelCriteria<M>) mcb.unwrap(DefaultModelCriteria.class)).node);\n+ }\n+ return new DefaultModelCriteria<>(targetNode);\n+ }\n+\n+ @Override\n+ public DefaultModelCriteria<M> not(ModelCriteriaBuilder<M> mcb) {\n+ final ModelCriteriaNode<M> targetNode = new ModelCriteriaNode<>(ExtOperator.NOT);\n+ targetNode.addChild(((DefaultModelCriteria<M>) mcb.unwrap(DefaultModelCriteria.class)).node);\n+ return new DefaultModelCriteria<>(targetNode);\n+ }\n+\n+ /**\n+ * Copies contents of this {@code ModelCriteriaBuilder} into\n+ * another {@code ModelCriteriaBuilder}.\n+ * @param mcb {@code ModelCriteriaBuilder} to copy the contents onto\n+ * @return Updated {@code ModelCriteriaBuilder}\n+ */\n+ public ModelCriteriaBuilder<M> flashToModelCriteriaBuilder(ModelCriteriaBuilder<M> mcb) {\n+ return mcb == null ? null : node.flashToModelCriteriaBuilder(mcb);\n+ }\n+\n+ public boolean isEmpty() {\n+ return node == null;\n+ }\n+\n+ @Override\n+ public String toString() {\n+ return isEmpty() ? \"\" : node.toString();\n+ }\n+\n+}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "model/map/src/main/java/org/keycloak/models/map/storage/criteria/ModelCriteriaNode.java", "diff": "+/*\n+ * Copyright 2021 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.models.map.storage.criteria;\n+\n+import org.keycloak.models.map.storage.ModelCriteriaBuilder;\n+import org.keycloak.models.map.storage.ModelCriteriaBuilder.Operator;\n+import org.keycloak.models.map.storage.tree.DefaultTreeNode;\n+import org.keycloak.storage.SearchableModelField;\n+import java.util.Arrays;\n+import java.util.Collections;\n+import java.util.Objects;\n+import java.util.stream.Collectors;\n+\n+/**\n+ *\n+ * @author hmlnarik\n+ */\n+public class ModelCriteriaNode<M> extends DefaultTreeNode<ModelCriteriaNode<M>> {\n+\n+ public static enum ExtOperator {\n+ AND {\n+ @Override public <M> ModelCriteriaBuilder<M> apply(ModelCriteriaBuilder<M> mcb, ModelCriteriaNode<M> node) {\n+ if (node.getChildren().isEmpty()) {\n+ return null;\n+ }\n+ final ModelCriteriaBuilder[] operands = node.getChildren().stream()\n+ .map(n -> n.flashToModelCriteriaBuilder(mcb))\n+ .filter(Objects::nonNull)\n+ .toArray(ModelCriteriaBuilder[]::new);\n+ return operands.length == 0 ? null : mcb.and(operands);\n+ }\n+ @Override public String toString(ModelCriteriaNode<?> node) {\n+ return \"(\" + node.getChildren().stream().map(ModelCriteriaNode::toString).collect(Collectors.joining(\" && \")) + \")\";\n+ }\n+ },\n+ OR {\n+ @Override public <M> ModelCriteriaBuilder<M> apply(ModelCriteriaBuilder<M> mcb, ModelCriteriaNode<M> node) {\n+ if (node.getChildren().isEmpty()) {\n+ return null;\n+ }\n+ final ModelCriteriaBuilder[] operands = node.getChildren().stream()\n+ .map(n -> n.flashToModelCriteriaBuilder(mcb))\n+ .filter(Objects::nonNull)\n+ .toArray(ModelCriteriaBuilder[]::new);\n+ return operands.length == 0 ? null : mcb.or(operands);\n+ }\n+ @Override public String toString(ModelCriteriaNode<?> node) {\n+ return \"(\" + node.getChildren().stream().map(ModelCriteriaNode::toString).collect(Collectors.joining(\" || \")) + \")\";\n+ }\n+ },\n+ NOT {\n+ @Override public <M> ModelCriteriaBuilder<M> apply(ModelCriteriaBuilder<M> mcb, ModelCriteriaNode<M> node) {\n+ return mcb.not(node.getChildren().iterator().next().flashToModelCriteriaBuilder(mcb));\n+ }\n+ @Override public String toString(ModelCriteriaNode<?> node) {\n+ return \"! \" + node.getChildren().iterator().next().toString();\n+ }\n+ },\n+ SIMPLE_OPERATOR {\n+ @Override public <M> ModelCriteriaBuilder<M> apply(ModelCriteriaBuilder<M> mcb, ModelCriteriaNode<M> node) {\n+ return mcb.compare(\n+ node.field,\n+ node.simpleOperator,\n+ node.simpleOperatorArguments\n+ );\n+ }\n+ @Override public String toString(ModelCriteriaNode<?> node) {\n+ return node.field.getName() + \" \" + node.simpleOperator + \" \" + Arrays.deepToString(node.simpleOperatorArguments);\n+ }\n+ },\n+ ;\n+\n+ public abstract <M> ModelCriteriaBuilder<M> apply(ModelCriteriaBuilder<M> mcbCreator, ModelCriteriaNode<M> node);\n+ public abstract String toString(ModelCriteriaNode<?> node);\n+ }\n+\n+ private final ExtOperator nodeOperator;\n+\n+ private final Operator simpleOperator;\n+\n+ private final SearchableModelField<M> field;\n+\n+ private final Object[] simpleOperatorArguments;\n+\n+ public ModelCriteriaNode(SearchableModelField<M> field, Operator simpleOperator, Object... simpleOperatorArguments) {\n+ super(Collections.emptyMap());\n+ this.simpleOperator = simpleOperator;\n+ this.field = field;\n+ this.simpleOperatorArguments = simpleOperatorArguments;\n+ this.nodeOperator = ExtOperator.SIMPLE_OPERATOR;\n+ }\n+\n+ public ModelCriteriaNode(ExtOperator nodeOperator) {\n+ super(Collections.emptyMap());\n+ this.nodeOperator = nodeOperator;\n+ this.simpleOperator = null;\n+ this.field = null;\n+ this.simpleOperatorArguments = null;\n+ }\n+\n+ private ModelCriteriaNode(ExtOperator nodeOperator, Operator simpleOperator, SearchableModelField<M> field, Object[] simpleOperatorArguments) {\n+ super(Collections.emptyMap());\n+ this.nodeOperator = nodeOperator;\n+ this.simpleOperator = simpleOperator;\n+ this.field = field;\n+ this.simpleOperatorArguments = simpleOperatorArguments;\n+ }\n+\n+ public ExtOperator getNodeOperator() {\n+ return nodeOperator;\n+ }\n+\n+ public ModelCriteriaNode<M> cloneTree() {\n+ return cloneTree(n -> new ModelCriteriaNode<>(n.nodeOperator, n.simpleOperator, n.field, n.simpleOperatorArguments));\n+ }\n+\n+ public ModelCriteriaBuilder<M> flashToModelCriteriaBuilder(ModelCriteriaBuilder<M> mcb) {\n+ final ModelCriteriaBuilder<M> res = nodeOperator.apply(mcb, this);\n+ return res == null ? mcb : res;\n+ }\n+\n+ @Override\n+ public String toString() {\n+ return nodeOperator.toString(this);\n+ }\n+\n+}\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/storage/tree/DefaultTreeNode.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/storage/tree/DefaultTreeNode.java", "diff": "@@ -26,8 +26,8 @@ import java.util.ListIterator;\nimport java.util.Map;\nimport java.util.Optional;\nimport java.util.Queue;\n-import java.util.Stack;\nimport java.util.function.Consumer;\n+import java.util.function.Function;\nimport java.util.function.Predicate;\n/**\n@@ -39,8 +39,8 @@ import java.util.function.Predicate;\n*/\npublic class DefaultTreeNode<Self extends DefaultTreeNode<Self>> implements TreeNode<Self> {\n- private final Map<String, Object> edgeProperties = new HashMap<>();\n- private final Map<String, Object> nodeProperties = new HashMap<>();\n+ private final Map<String, Object> nodeProperties;\n+ private final Map<String, Object> edgeProperties;\nprivate final Map<String, Object> treeProperties;\nprivate final LinkedList<Self> children = new LinkedList<>();\nprivate String id;\n@@ -51,6 +51,14 @@ public class DefaultTreeNode<Self extends DefaultTreeNode<Self>> implements Tree\n*/\nprotected DefaultTreeNode(Map<String, Object> treeProperties) {\nthis.treeProperties = treeProperties;\n+ this.edgeProperties = new HashMap<>();\n+ this.nodeProperties = new HashMap<>();\n+ }\n+\n+ public DefaultTreeNode(Map<String, Object> nodeProperties, Map<String, Object> edgeProperties, Map<String, Object> treeProperties) {\n+ this.nodeProperties = nodeProperties;\n+ this.edgeProperties = edgeProperties;\n+ this.treeProperties = treeProperties;\n}\n@Override\n@@ -106,7 +114,7 @@ public class DefaultTreeNode<Self extends DefaultTreeNode<Self>> implements Tree\n@Override\npublic Optional<Self> findFirstDfs(Predicate<Self> visitor) {\nDeque<Self> stack = new LinkedList<>();\n- stack.add((Self) this);\n+ stack.add(getThis());\nwhile (! stack.isEmpty()) {\nSelf node = stack.pop();\nif (visitor.test(node)) {\n@@ -124,7 +132,7 @@ public class DefaultTreeNode<Self extends DefaultTreeNode<Self>> implements Tree\n@Override\npublic Optional<Self> findFirstBottommostDfs(Predicate<Self> visitor) {\nDeque<Self> stack = new LinkedList<>();\n- stack.add((Self) this);\n+ stack.add(getThis());\nwhile (! stack.isEmpty()) {\nSelf node = stack.pop();\nif (visitor.test(node)) {\n@@ -149,7 +157,7 @@ public class DefaultTreeNode<Self extends DefaultTreeNode<Self>> implements Tree\n@Override\npublic Optional<Self> findFirstBfs(Predicate<Self> visitor) {\nQueue<Self> queue = new LinkedList<>();\n- queue.add((Self) this);\n+ queue.add(getThis());\nwhile (! queue.isEmpty()) {\nSelf node = queue.poll();\nif (visitor.test(node)) {\n@@ -165,7 +173,7 @@ public class DefaultTreeNode<Self extends DefaultTreeNode<Self>> implements Tree\npublic List<Self> getPathToRoot(PathOrientation orientation) {\nLinkedList<Self> res = new LinkedList<>();\nConsumer<Self> addFunc = orientation == PathOrientation.BOTTOM_FIRST ? res::addLast : res::addFirst;\n- Optional<Self> p = Optional.of((Self) this);\n+ Optional<Self> p = Optional.of(getThis());\nwhile (p.isPresent()) {\naddFunc.accept(p.get());\np = p.get().getParent();\n@@ -186,7 +194,7 @@ public class DefaultTreeNode<Self extends DefaultTreeNode<Self>> implements Tree\nif (! this.children.contains(node)) {\nthis.children.add(node);\n}\n- node.setParent((Self) this);\n+ node.setParent(getThis());\n// Prevent setting a parent of this node as a child of this node. In such a case, remove the parent of this node\nfor (Optional<Self> p = getParent(); p.isPresent(); p = p.get().getParent()) {\n@@ -205,7 +213,7 @@ public class DefaultTreeNode<Self extends DefaultTreeNode<Self>> implements Tree\nif (! this.children.contains(node)) {\nthis.children.add(index, node);\n}\n- node.setParent((Self) this);\n+ node.setParent(getThis());\n// Prevent setting a parent of this node as a child of this node. In such a case, remove the parent of this node\nfor (Optional<Self> p = getParent(); p.isPresent(); p = p.get().getParent()) {\n@@ -276,12 +284,23 @@ public class DefaultTreeNode<Self extends DefaultTreeNode<Self>> implements Tree\nif (this.parent != null) {\nSelf previousParent = this.parent;\nthis.parent = null;\n- previousParent.removeChild((Self) this);\n+ previousParent.removeChild(getThis());\n}\nif (parent != null) {\nthis.parent = parent;\n- parent.addChild((Self) this);\n+ parent.addChild(getThis());\n+ }\n}\n+\n+ public <RNode extends TreeNode<? super RNode>> RNode cloneTree(Function<Self, RNode> instantiateFunc) {\n+ final RNode res = instantiateFunc.apply(getThis());\n+ this.getChildren().forEach(c -> res.addChild(c.cloneTree(instantiateFunc)));\n+ return res;\n+ }\n+\n+ @SuppressWarnings(\"unchecked\")\n+ private Self getThis() {\n+ return (Self) this;\n}\n}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "model/map/src/test/java/org/keycloak/models/map/storage/criteria/DefaultModelCriteriaTest.java", "diff": "+/*\n+ * Copyright 2021 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.models.map.storage.criteria;\n+\n+import org.keycloak.models.ClientModel;\n+import org.keycloak.models.map.storage.ModelCriteriaBuilder.Operator;\n+import static org.hamcrest.MatcherAssert.assertThat;\n+import org.junit.Test;\n+import static org.hamcrest.Matchers.hasToString;\n+import static org.keycloak.models.ClientModel.SearchableFields.*;\n+\n+/**\n+ *\n+ * @author hmlnarik\n+ */\n+public class DefaultModelCriteriaTest {\n+\n+ @Test\n+ public void testSimpleCompare() {\n+ DefaultModelCriteria<ClientModel> v = new DefaultModelCriteria<>();\n+ assertThat(v.compare(CLIENT_ID, Operator.EQ, 3), hasToString(\"clientId EQ [3]\"));\n+ assertThat(v.compare(CLIENT_ID, Operator.EQ, 4).compare(ID, Operator.EQ, 5), hasToString(\"(clientId EQ [4] && id EQ [5])\"));\n+ }\n+\n+ @Test\n+ public void testSimpleCompareAnd() {\n+ DefaultModelCriteria<ClientModel> v = new DefaultModelCriteria<>();\n+ assertThat(v.and(v.compare(CLIENT_ID, Operator.EQ, 3)), hasToString(\"(clientId EQ [3])\"));\n+ assertThat(v.and(v.compare(CLIENT_ID, Operator.EQ, 4).compare(ID, Operator.EQ, 5)), hasToString(\"((clientId EQ [4] && id EQ [5]))\"));\n+ assertThat(v.and(v.compare(CLIENT_ID, Operator.EQ, 4), v.compare(ID, Operator.EQ, 5)), hasToString(\"(clientId EQ [4] && id EQ [5])\"));\n+ }\n+\n+ @Test\n+ public void testSimpleCompareOr() {\n+ DefaultModelCriteria<ClientModel> v = new DefaultModelCriteria<>();\n+ assertThat(v.or(v.compare(CLIENT_ID, Operator.EQ, 3)), hasToString(\"(clientId EQ [3])\"));\n+ assertThat(v.or(v.compare(CLIENT_ID, Operator.EQ, 4).compare(ID, Operator.EQ, 5)), hasToString(\"((clientId EQ [4] && id EQ [5]))\"));\n+ assertThat(v.or(v.compare(CLIENT_ID, Operator.EQ, 4), v.compare(ID, Operator.EQ, 5)), hasToString(\"(clientId EQ [4] || id EQ [5])\"));\n+ }\n+\n+ @Test\n+ public void testSimpleCompareAndOr() {\n+ DefaultModelCriteria<ClientModel> v = new DefaultModelCriteria<>();\n+ assertThat(v.or(\n+ v.and(\n+ v.compare(CLIENT_ID, Operator.EQ, 4),\n+ v.compare(ID, Operator.EQ, 5)\n+ ),\n+ v.compare(ATTRIBUTE, Operator.EQ, \"city\", \"Ankh-Morpork\")\n+ ), hasToString(\"((clientId EQ [4] && id EQ [5]) || attribute EQ [city, Ankh-Morpork])\"));\n+ }\n+\n+ @Test\n+ public void testComplexCompareAndOr() {\n+ DefaultModelCriteria<ClientModel> v = new DefaultModelCriteria<>();\n+ assertThat(v.or(\n+ v.and(\n+ v.compare(CLIENT_ID, Operator.EQ, 4),\n+ v.compare(REALM_ID, Operator.EQ, \"aa\")\n+ ),\n+ v.not(v.compare(ID, Operator.EQ, 5))\n+ ),\n+ hasToString(\"((clientId EQ [4] && realmId EQ [aa]) || ! id EQ [5])\")\n+ );\n+\n+ assertThat(v.or(\n+ v.and(\n+ v.compare(CLIENT_ID, Operator.EQ, 4),\n+ v.compare(REALM_ID, Operator.EQ, \"aa\")\n+ ),\n+ v.not(\n+ v.compare(ID, Operator.EQ, 5)\n+ ).compare(ENABLED, Operator.EQ, \"true\")\n+ ),\n+ hasToString(\"((clientId EQ [4] && realmId EQ [aa]) || (! id EQ [5] && enabled EQ [true]))\")\n+ );\n+ }\n+\n+ @Test\n+ public void testFlashingToAnotherMCB() {\n+ DefaultModelCriteria<ClientModel> v = new DefaultModelCriteria<>();\n+ assertThat(v.or(\n+ v.and(\n+ v.compare(CLIENT_ID, Operator.EQ, 4),\n+ v.compare(REALM_ID, Operator.EQ, \"aa\")\n+ ),\n+ v.not(v.compare(ID, Operator.EQ, 5))\n+ ).flashToModelCriteriaBuilder(new DefaultModelCriteria<>()),\n+ hasToString(\"((clientId EQ [4] && realmId EQ [aa]) || ! id EQ [5])\")\n+ );\n+\n+ assertThat(v.or(\n+ v.and(\n+ v.compare(CLIENT_ID, Operator.EQ, 4),\n+ v.compare(REALM_ID, Operator.EQ, \"aa\")\n+ ),\n+ v.not(\n+ v.compare(ID, Operator.EQ, 5)\n+ ).compare(ENABLED, Operator.EQ, \"true\")\n+ ).flashToModelCriteriaBuilder(new DefaultModelCriteria<>()),\n+ hasToString(\"((clientId EQ [4] && realmId EQ [aa]) || (! id EQ [5] && enabled EQ [true]))\")\n+ );\n+ }\n+\n+}\n" } ]

[ { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateProfileWithUserProfileTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateProfileWithUserProfileTest.java", "diff": "*/\npackage org.keycloak.testsuite.actions;\n+import static org.hamcrest.CoreMatchers.is;\n+import static org.hamcrest.MatcherAssert.assertThat;\nimport static org.junit.Assert.assertEquals;\nimport static org.junit.Assert.assertFalse;\nimport static org.junit.Assert.assertTrue;\n@@ -31,6 +33,7 @@ import static org.keycloak.testsuite.forms.VerifyProfileTest.CONFIGURATION_FOR_U\nimport java.util.ArrayList;\nimport java.util.Collections;\n+import org.apache.commons.lang3.StringUtils;\nimport org.junit.Assert;\nimport org.junit.Before;\nimport org.junit.Test;\n@@ -48,7 +51,6 @@ import org.keycloak.testsuite.forms.VerifyProfileTest;\nimport org.keycloak.testsuite.pages.AppPage.RequestType;\nimport org.keycloak.testsuite.util.ClientScopeBuilder;\nimport org.keycloak.testsuite.util.KeycloakModelUtils;\n-import org.keycloak.userprofile.EventAuditingAttributeChangeListener;\nimport org.openqa.selenium.By;\n/**\n@@ -295,7 +297,7 @@ public class RequiredActionUpdateProfileWithUserProfileTest extends RequiredActi\n// assert user is really updated in persistent store\nUserRepresentation user = ActionUtil.findUserWithAdminClient(adminClient, USERNAME1);\nAssert.assertEquals(\"New first\", user.getFirstName());\n- Assert.assertEquals(\"\", user.getLastName());\n+ assertThat(StringUtils.isEmpty(user.getLastName()), is(true));\nAssert.assertEquals(\"[email protected]\", user.getEmail());\nAssert.assertEquals(USERNAME1, user.getUsername());\n}\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcFirstBrokerLoginWithUserProfileTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcFirstBrokerLoginWithUserProfileTest.java", "diff": "*/\npackage org.keycloak.testsuite.broker;\n+import static org.hamcrest.CoreMatchers.is;\n+import static org.hamcrest.MatcherAssert.assertThat;\nimport static org.junit.Assert.assertEquals;\nimport static org.keycloak.testsuite.broker.BrokerTestTools.getConsumerRoot;\nimport static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage;\n@@ -23,6 +25,7 @@ import static org.keycloak.testsuite.forms.VerifyProfileTest.ATTRIBUTE_DEPARTMEN\nimport static org.keycloak.testsuite.forms.VerifyProfileTest.PERMISSIONS_ADMIN_EDITABLE;\nimport static org.keycloak.testsuite.forms.VerifyProfileTest.PERMISSIONS_ALL;\n+import org.apache.commons.lang3.StringUtils;\nimport org.junit.Assert;\nimport org.junit.Before;\nimport org.junit.Test;\n@@ -355,7 +358,7 @@ public class KcOidcFirstBrokerLoginWithUserProfileTest extends KcOidcFirstBroker\nUserRepresentation user = VerifyProfileTest.getUserByUsername(testRealm(),\"attributeNotRequiredAndSelectedByScopeCanBeIgnored\");\nassertEquals(\"FirstAA\", user.getFirstName());\nassertEquals(\"LastAA\", user.getLastName());\n- assertEquals(\"\", user.firstAttribute(ATTRIBUTE_DEPARTMENT));\n+ assertThat(StringUtils.isEmpty(user.firstAttribute(ATTRIBUTE_DEPARTMENT)), is(true));\n}\n@Test\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RegisterWithUserProfileTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RegisterWithUserProfileTest.java", "diff": "*/\npackage org.keycloak.testsuite.forms;\n+import static org.hamcrest.CoreMatchers.is;\n+import static org.hamcrest.MatcherAssert.assertThat;\nimport static org.junit.Assert.assertEquals;\nimport static org.keycloak.testsuite.forms.VerifyProfileTest.PERMISSIONS_ALL;\n@@ -28,6 +30,7 @@ import java.util.ArrayList;\nimport java.util.Collections;\nimport java.util.List;\n+import org.apache.commons.lang3.StringUtils;\nimport org.junit.Assert;\nimport org.junit.Before;\nimport org.junit.Test;\n@@ -545,7 +548,7 @@ public class RegisterWithUserProfileTest extends RegisterTest {\nUserRepresentation user = getUser(userId);\nassertEquals(\"FirstAA\", user.getFirstName());\nassertEquals(\"LastAA\", user.getLastName());\n- assertEquals(\"\", user.firstAttribute(ATTRIBUTE_DEPARTMENT));\n+ assertThat(StringUtils.isEmpty(user.firstAttribute(ATTRIBUTE_DEPARTMENT)), is(true));\n}\n@Test\n@@ -613,7 +616,12 @@ public class RegisterWithUserProfileTest extends RegisterTest {\nassertEquals(username.toLowerCase(), user.getUsername());\nassertEquals(email.toLowerCase(), user.getEmail());\nassertEquals(firstName, user.getFirstName());\n- assertEquals(lastName, user.getLastName());\n+\n+ if (StringUtils.isEmpty(lastName)) {\n+ assertThat(StringUtils.isEmpty(user.getLastName()), is(true));\n+ } else {\n+ assertThat(user.getLastName(), is(lastName));\n+ }\n}\nprotected void setUserProfileConfiguration(String configuration) {\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/VerifyProfileTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/VerifyProfileTest.java", "diff": "*/\npackage org.keycloak.testsuite.forms;\n+import static org.hamcrest.CoreMatchers.is;\n+import static org.hamcrest.MatcherAssert.assertThat;\nimport static org.junit.Assert.assertEquals;\nimport static org.junit.Assert.assertFalse;\nimport static org.junit.Assert.assertTrue;\n@@ -29,6 +31,7 @@ import java.util.UUID;\nimport javax.ws.rs.core.Response;\n+import org.apache.commons.lang3.StringUtils;\nimport org.jboss.arquillian.graphene.page.Page;\nimport org.jboss.arquillian.test.api.ArquillianResource;\nimport org.junit.Assert;\n@@ -58,7 +61,6 @@ import org.keycloak.testsuite.util.OAuthClient;\nimport org.keycloak.testsuite.util.RealmBuilder;\nimport org.keycloak.testsuite.util.UserBuilder;\nimport org.keycloak.userprofile.UserProfileContext;\n-import org.keycloak.userprofile.EventAuditingAttributeChangeListener;\nimport org.openqa.selenium.By;\n/**\n@@ -420,7 +422,7 @@ public class VerifyProfileTest extends AbstractTestRealmKeycloakTest {\nUserRepresentation user = getUser(user2Id);\nassertEquals(\"First\", user.getFirstName());\n- assertEquals(\"\", user.getLastName());\n+ assertThat(StringUtils.isEmpty(user.getLastName()), is(true));\n}\n@Test\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": "},\n\"userProfile\": {\n- \"provider\": \"${keycloak.userProfile.provider:}\",\n+ \"provider\": \"${keycloak.userProfile.provider:declarative-user-profile}\",\n\"declarative-user-profile\": {\n\"read-only-attributes\": [ \"deniedFoo\", \"deniedBar*\", \"deniedSome/thing\", \"deniedsome*thing\" ],\n\"admin-read-only-attributes\": [ \"deniedSomeAdmin\" ]\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/storage/ModelCriteriaBuilder.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/storage/ModelCriteriaBuilder.java", "diff": "@@ -117,7 +117,7 @@ public interface ModelCriteriaBuilder<M> {\n* @return\n* @throws CriterionNotSupported If the operator is not supported for the given field.\n*/\n- ModelCriteriaBuilder<M> compare(SearchableModelField<M> modelField, Operator op, Object... value);\n+ ModelCriteriaBuilder<M> compare(SearchableModelField<? super M> modelField, Operator op, Object... value);\n/**\n* Creates and returns a new instance of {@code ModelCriteriaBuilder} that\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": "@@ -53,7 +53,7 @@ public class ConcurrentHashMapStorage<K, V extends AbstractEntity & UpdatableEnt\nprotected final ConcurrentMap<K, V> store = new ConcurrentHashMap<>();\n- protected final Map<SearchableModelField<M>, UpdatePredicatesFunc<K, V, M>> fieldPredicates;\n+ protected final Map<SearchableModelField<? super M>, UpdatePredicatesFunc<K, V, M>> fieldPredicates;\nprotected final StringKeyConvertor<K> keyConvertor;\nprotected final DeepCloner cloner;\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": "@@ -527,7 +527,7 @@ public class MapFieldPredicates {\n}\n@SuppressWarnings(\"unchecked\")\n- public static <K, V extends AbstractEntity, M> Map<SearchableModelField<M>, UpdatePredicatesFunc<K, V, M>> getPredicates(Class<M> clazz) {\n+ public static <K, V extends AbstractEntity, M> Map<SearchableModelField<? super M>, UpdatePredicatesFunc<K, V, M>> getPredicates(Class<M> clazz) {\nreturn PREDICATES.get(clazz);\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/storage/chm/MapModelCriteriaBuilder.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/storage/chm/MapModelCriteriaBuilder.java", "diff": "@@ -43,14 +43,14 @@ public class MapModelCriteriaBuilder<K, V extends AbstractEntity, M> implements\nprivate static final Predicate<Object> ALWAYS_FALSE = (e) -> false;\nprivate final Predicate<? super K> keyFilter;\nprivate final Predicate<? super V> entityFilter;\n- private final Map<SearchableModelField<M>, UpdatePredicatesFunc<K, V, M>> fieldPredicates;\n+ private final Map<SearchableModelField<? super M>, UpdatePredicatesFunc<K, V, M>> fieldPredicates;\nprivate final StringKeyConvertor<K> keyConvertor;\n- public MapModelCriteriaBuilder(StringKeyConvertor<K> keyConvertor, Map<SearchableModelField<M>, UpdatePredicatesFunc<K, V, M>> fieldPredicates) {\n+ public MapModelCriteriaBuilder(StringKeyConvertor<K> keyConvertor, Map<SearchableModelField<? super M>, UpdatePredicatesFunc<K, V, M>> fieldPredicates) {\nthis(keyConvertor, fieldPredicates, ALWAYS_TRUE, ALWAYS_TRUE);\n}\n- private MapModelCriteriaBuilder(StringKeyConvertor<K> keyConvertor, Map<SearchableModelField<M>, UpdatePredicatesFunc<K, V, M>> fieldPredicates, Predicate<? super K> indexReadFilter, Predicate<? super V> sequentialReadFilter) {\n+ private MapModelCriteriaBuilder(StringKeyConvertor<K> keyConvertor, Map<SearchableModelField<? super M>, UpdatePredicatesFunc<K, V, M>> fieldPredicates, Predicate<? super K> indexReadFilter, Predicate<? super V> sequentialReadFilter) {\nthis.keyConvertor = keyConvertor;\nthis.fieldPredicates = fieldPredicates;\nthis.keyFilter = indexReadFilter;\n@@ -58,7 +58,7 @@ public class MapModelCriteriaBuilder<K, V extends AbstractEntity, M> implements\n}\n@Override\n- public MapModelCriteriaBuilder<K, V, M> compare(SearchableModelField<M> modelField, Operator op, Object... values) {\n+ public MapModelCriteriaBuilder<K, V, M> compare(SearchableModelField<? super M> modelField, Operator op, Object... values) {\nUpdatePredicatesFunc<K, V, M> method = fieldPredicates.get(modelField);\nif (method == null) {\nthrow new IllegalArgumentException(\"Filter not implemented for field \" + modelField);\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/storage/criteria/DefaultModelCriteria.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/storage/criteria/DefaultModelCriteria.java", "diff": "@@ -19,6 +19,8 @@ package org.keycloak.models.map.storage.criteria;\nimport org.keycloak.models.map.storage.ModelCriteriaBuilder;\nimport org.keycloak.models.map.storage.criteria.ModelCriteriaNode.ExtOperator;\nimport org.keycloak.storage.SearchableModelField;\n+import java.util.concurrent.atomic.AtomicBoolean;\n+import java.util.stream.Stream;\n/**\n* Descriptive model criteria implementation which in other words represents a Boolean formula on searchable fields.\n@@ -26,55 +28,113 @@ import org.keycloak.storage.SearchableModelField;\n*/\npublic class DefaultModelCriteria<M> implements ModelCriteriaBuilder<M> {\n- private final ModelCriteriaNode<M> node;\n+ private static final DefaultModelCriteria<?> INSTANCE = new DefaultModelCriteria<>(null);\n- public DefaultModelCriteria() {\n- this.node = null;\n- }\n+ private final ModelCriteriaNode<M> node;\nprivate DefaultModelCriteria(ModelCriteriaNode<M> node) {\nthis.node = node;\n}\n+ public static <M> DefaultModelCriteria<M> criteria() {\n+ return (DefaultModelCriteria<M>) INSTANCE;\n+ }\n+\n@Override\n- public DefaultModelCriteria<M> compare(SearchableModelField<M> modelField, Operator op, Object... value) {\n- final ModelCriteriaNode<M> targetNode;\n+ public DefaultModelCriteria<M> compare(SearchableModelField<? super M> modelField, Operator op, Object... value) {\n+ return compare(new ModelCriteriaNode<>(modelField, op, value));\n+ }\n+\n+ private DefaultModelCriteria<M> compare(final ModelCriteriaNode<M> nodeToAdd) {\n+ ModelCriteriaNode<M> targetNode;\n+\nif (isEmpty()) {\n- targetNode = new ModelCriteriaNode<>(modelField, op, value);\n+ targetNode = nodeToAdd;\n} else if (node.getNodeOperator() == ExtOperator.AND) {\ntargetNode = node.cloneTree();\n- targetNode.addChild(new ModelCriteriaNode<>(modelField, op, value));\n+ targetNode.addChild(nodeToAdd);\n} else {\ntargetNode = new ModelCriteriaNode<>(ExtOperator.AND);\ntargetNode.addChild(node.cloneTree());\n- targetNode.addChild(new ModelCriteriaNode<>(modelField, op, value));\n+ targetNode.addChild(nodeToAdd);\n}\n+\nreturn new DefaultModelCriteria<>(targetNode);\n}\n@Override\npublic DefaultModelCriteria<M> and(ModelCriteriaBuilder<M>... mcbs) {\n+ if (mcbs.length == 1) {\n+ ModelCriteriaNode<M> toBeChild = ((DefaultModelCriteria<M>) mcbs[0].unwrap(DefaultModelCriteria.class)).node;\n+ if (toBeChild.getNodeOperator() == ExtOperator.AND || toBeChild.getNodeOperator() == ExtOperator.OR) {\n+ return ((DefaultModelCriteria<M>) mcbs[0].unwrap(DefaultModelCriteria.class));\n+ }\n+ }\n+\nfinal ModelCriteriaNode<M> targetNode = new ModelCriteriaNode<>(ExtOperator.AND);\n+ AtomicBoolean hasFalseNode = new AtomicBoolean(false);\nfor (ModelCriteriaBuilder<M> mcb : mcbs) {\n- targetNode.addChild(((DefaultModelCriteria<M>) mcb.unwrap(DefaultModelCriteria.class)).node);\n+ final ModelCriteriaNode<M> nodeToAdd = ((DefaultModelCriteria<M>) mcb.unwrap(DefaultModelCriteria.class)).node;\n+ getNodesToAddForAndOr(nodeToAdd, ExtOperator.AND)\n+ .filter(ModelCriteriaNode::isNotTrueNode)\n+ .peek(n -> { if (n.isFalseNode()) hasFalseNode.lazySet(true); })\n+ .map(ModelCriteriaNode::cloneTree)\n+ .forEach(targetNode::addChild);\n+\n+ if (hasFalseNode.get()) {\n+ return compare(new ModelCriteriaNode<>(ExtOperator.__FALSE__));\n}\n- return new DefaultModelCriteria<>(targetNode);\n+ }\n+\n+ if (targetNode.getChildren().isEmpty()) {\n+ // AND on empty set of formulae is TRUE: It does hold that there all formulae are satisfied\n+ return compare(new ModelCriteriaNode<>(ExtOperator.__TRUE__));\n+ }\n+\n+ return compare(targetNode);\n}\n@Override\npublic DefaultModelCriteria<M> or(ModelCriteriaBuilder<M>... mcbs) {\n+ if (mcbs.length == 1) {\n+ ModelCriteriaNode<M> toBeChild = ((DefaultModelCriteria<M>) mcbs[0].unwrap(DefaultModelCriteria.class)).node;\n+ if (toBeChild.getNodeOperator() == ExtOperator.AND || toBeChild.getNodeOperator() == ExtOperator.OR) {\n+ return ((DefaultModelCriteria<M>) mcbs[0].unwrap(DefaultModelCriteria.class));\n+ }\n+ }\n+\nfinal ModelCriteriaNode<M> targetNode = new ModelCriteriaNode<>(ExtOperator.OR);\n+ AtomicBoolean hasTrueNode = new AtomicBoolean(false);\nfor (ModelCriteriaBuilder<M> mcb : mcbs) {\n- targetNode.addChild(((DefaultModelCriteria<M>) mcb.unwrap(DefaultModelCriteria.class)).node);\n+ final ModelCriteriaNode<M> nodeToAdd = ((DefaultModelCriteria<M>) mcb.unwrap(DefaultModelCriteria.class)).node;\n+ getNodesToAddForAndOr(nodeToAdd, ExtOperator.OR)\n+ .filter(ModelCriteriaNode::isNotFalseNode)\n+ .peek(n -> { if (n.isTrueNode()) hasTrueNode.lazySet(true); })\n+ .map(ModelCriteriaNode::cloneTree)\n+ .forEach(targetNode::addChild);\n+\n+ if (hasTrueNode.get()) {\n+ return compare(new ModelCriteriaNode<>(ExtOperator.__TRUE__));\n}\n- return new DefaultModelCriteria<>(targetNode);\n+ }\n+\n+ if (targetNode.getChildren().isEmpty()) {\n+ // OR on empty set of formulae is FALSE: It does not hold that there is at least one satisfied formula\n+ return compare(new ModelCriteriaNode<>(ExtOperator.__FALSE__));\n+ }\n+\n+ return compare(targetNode);\n}\n@Override\npublic DefaultModelCriteria<M> not(ModelCriteriaBuilder<M> mcb) {\nfinal ModelCriteriaNode<M> targetNode = new ModelCriteriaNode<>(ExtOperator.NOT);\n- targetNode.addChild(((DefaultModelCriteria<M>) mcb.unwrap(DefaultModelCriteria.class)).node);\n- return new DefaultModelCriteria<>(targetNode);\n+ ModelCriteriaNode<M> toBeChild = ((DefaultModelCriteria<M>) mcb.unwrap(DefaultModelCriteria.class)).node;\n+ if (toBeChild.getNodeOperator() == ExtOperator.NOT) {\n+ return compare(toBeChild.getChildren().get(0).cloneTree());\n+ }\n+ targetNode.addChild(toBeChild.cloneTree());\n+ return compare(targetNode);\n}\n/**\n@@ -83,10 +143,35 @@ public class DefaultModelCriteria<M> implements ModelCriteriaBuilder<M> {\n* @param mcb {@code ModelCriteriaBuilder} to copy the contents onto\n* @return Updated {@code ModelCriteriaBuilder}\n*/\n- public ModelCriteriaBuilder<M> flashToModelCriteriaBuilder(ModelCriteriaBuilder<M> mcb) {\n+ public <C extends ModelCriteriaBuilder<M>> C flashToModelCriteriaBuilder(C mcb) {\nreturn mcb == null ? null : node.flashToModelCriteriaBuilder(mcb);\n}\n+ /**\n+ * Optimizes this formula into another {@code ModelCriteriaBuilder}, using the values of\n+ * {@link ExtOperator#__TRUE__} and {@link ExtOperator#__FALSE__} accordingly.\n+ * @return New instance of {@code }\n+ */\n+ public DefaultModelCriteria<M> optimize() {\n+ return flashToModelCriteriaBuilder(criteria());\n+ }\n+\n+ @FunctionalInterface\n+ public interface AtomicFormulaTester<M> {\n+ public Boolean test(SearchableModelField<? super M> field, Operator operator, Object[] operatorArguments);\n+ }\n+\n+ public DefaultModelCriteria<M> partiallyEvaluate(AtomicFormulaTester<M> tester) {\n+ return new DefaultModelCriteria<>(node.cloneTree((field, operator, operatorArguments) -> {\n+ Boolean res = tester.test(field, operator, operatorArguments);\n+ if (res == null) {\n+ return new ModelCriteriaNode<>(field, operator, operatorArguments);\n+ } else {\n+ return new ModelCriteriaNode<>(res ? ExtOperator.__TRUE__ : ExtOperator.__FALSE__);\n+ }\n+ }, ModelCriteriaNode::new));\n+ }\n+\npublic boolean isEmpty() {\nreturn node == null;\n}\n@@ -96,4 +181,14 @@ public class DefaultModelCriteria<M> implements ModelCriteriaBuilder<M> {\nreturn isEmpty() ? \"\" : node.toString();\n}\n+ private Stream<ModelCriteriaNode<M>> getNodesToAddForAndOr(ModelCriteriaNode<M> nodeToAdd, ExtOperator operatorBeingAdded) {\n+ final ExtOperator op = nodeToAdd.getNodeOperator();\n+\n+ if (op == operatorBeingAdded) {\n+ return nodeToAdd.getChildren().stream();\n+ }\n+\n+ return Stream.of(nodeToAdd);\n+ }\n+\n}\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/storage/criteria/ModelCriteriaNode.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/storage/criteria/ModelCriteriaNode.java", "diff": "@@ -23,17 +23,19 @@ import org.keycloak.storage.SearchableModelField;\nimport java.util.Arrays;\nimport java.util.Collections;\nimport java.util.Objects;\n+import java.util.function.Function;\nimport java.util.stream.Collectors;\n+import java.util.stream.Stream;\n/**\n- *\n+ * TODO: Introduce separation of parameter values and the structure\n* @author hmlnarik\n*/\npublic class ModelCriteriaNode<M> extends DefaultTreeNode<ModelCriteriaNode<M>> {\npublic static enum ExtOperator {\nAND {\n- @Override public <M> ModelCriteriaBuilder<M> apply(ModelCriteriaBuilder<M> mcb, ModelCriteriaNode<M> node) {\n+ @Override public <M, C extends ModelCriteriaBuilder<M>> C apply(C mcb, ModelCriteriaNode<M> node) {\nif (node.getChildren().isEmpty()) {\nreturn null;\n}\n@@ -41,14 +43,14 @@ public class ModelCriteriaNode<M> extends DefaultTreeNode<ModelCriteriaNode<M>>\n.map(n -> n.flashToModelCriteriaBuilder(mcb))\n.filter(Objects::nonNull)\n.toArray(ModelCriteriaBuilder[]::new);\n- return operands.length == 0 ? null : mcb.and(operands);\n+ return operands.length == 0 ? null : (C) mcb.and(operands);\n}\n@Override public String toString(ModelCriteriaNode<?> node) {\nreturn \"(\" + node.getChildren().stream().map(ModelCriteriaNode::toString).collect(Collectors.joining(\" && \")) + \")\";\n}\n},\nOR {\n- @Override public <M> ModelCriteriaBuilder<M> apply(ModelCriteriaBuilder<M> mcb, ModelCriteriaNode<M> node) {\n+ @Override public <M, C extends ModelCriteriaBuilder<M>> C apply(C mcb, ModelCriteriaNode<M> node) {\nif (node.getChildren().isEmpty()) {\nreturn null;\n}\n@@ -56,23 +58,23 @@ public class ModelCriteriaNode<M> extends DefaultTreeNode<ModelCriteriaNode<M>>\n.map(n -> n.flashToModelCriteriaBuilder(mcb))\n.filter(Objects::nonNull)\n.toArray(ModelCriteriaBuilder[]::new);\n- return operands.length == 0 ? null : mcb.or(operands);\n+ return operands.length == 0 ? null : (C) mcb.or(operands);\n}\n@Override public String toString(ModelCriteriaNode<?> node) {\nreturn \"(\" + node.getChildren().stream().map(ModelCriteriaNode::toString).collect(Collectors.joining(\" || \")) + \")\";\n}\n},\nNOT {\n- @Override public <M> ModelCriteriaBuilder<M> apply(ModelCriteriaBuilder<M> mcb, ModelCriteriaNode<M> node) {\n- return mcb.not(node.getChildren().iterator().next().flashToModelCriteriaBuilder(mcb));\n+ @Override public <M, C extends ModelCriteriaBuilder<M>> C apply(C mcb, ModelCriteriaNode<M> node) {\n+ return (C) mcb.not(node.getChildren().iterator().next().flashToModelCriteriaBuilder(mcb));\n}\n@Override public String toString(ModelCriteriaNode<?> node) {\nreturn \"! \" + node.getChildren().iterator().next().toString();\n}\n},\n- SIMPLE_OPERATOR {\n- @Override public <M> ModelCriteriaBuilder<M> apply(ModelCriteriaBuilder<M> mcb, ModelCriteriaNode<M> node) {\n- return mcb.compare(\n+ ATOMIC_FORMULA {\n+ @Override public <M, C extends ModelCriteriaBuilder<M>> C apply(C mcb, ModelCriteriaNode<M> node) {\n+ return (C) mcb.compare(\nnode.field,\nnode.simpleOperator,\nnode.simpleOperatorArguments\n@@ -82,9 +84,25 @@ public class ModelCriteriaNode<M> extends DefaultTreeNode<ModelCriteriaNode<M>>\nreturn node.field.getName() + \" \" + node.simpleOperator + \" \" + Arrays.deepToString(node.simpleOperatorArguments);\n}\n},\n+ __FALSE__ {\n+ @Override public <M, C extends ModelCriteriaBuilder<M>> C apply(C mcb, ModelCriteriaNode<M> node) {\n+ return (C) mcb.or();\n+ }\n+ @Override public String toString(ModelCriteriaNode<?> node) {\n+ return \"__FALSE__\";\n+ }\n+ },\n+ __TRUE__ {\n+ @Override public <M, C extends ModelCriteriaBuilder<M>> C apply(C mcb, ModelCriteriaNode<M> node) {\n+ return (C) mcb.and();\n+ }\n+ @Override public String toString(ModelCriteriaNode<?> node) {\n+ return \"__TRUE__\";\n+ }\n+ }\n;\n- public abstract <M> ModelCriteriaBuilder<M> apply(ModelCriteriaBuilder<M> mcbCreator, ModelCriteriaNode<M> node);\n+ public abstract <M, C extends ModelCriteriaBuilder<M>> C apply(C mcbCreator, ModelCriteriaNode<M> node);\npublic abstract String toString(ModelCriteriaNode<?> node);\n}\n@@ -92,16 +110,27 @@ public class ModelCriteriaNode<M> extends DefaultTreeNode<ModelCriteriaNode<M>>\nprivate final Operator simpleOperator;\n- private final SearchableModelField<M> field;\n+ private final SearchableModelField<? super M> field;\nprivate final Object[] simpleOperatorArguments;\n- public ModelCriteriaNode(SearchableModelField<M> field, Operator simpleOperator, Object... simpleOperatorArguments) {\n+ public ModelCriteriaNode(SearchableModelField<? super M> field, Operator simpleOperator, Object[] simpleOperatorArguments) {\nsuper(Collections.emptyMap());\nthis.simpleOperator = simpleOperator;\nthis.field = field;\nthis.simpleOperatorArguments = simpleOperatorArguments;\n- this.nodeOperator = ExtOperator.SIMPLE_OPERATOR;\n+ this.nodeOperator = ExtOperator.ATOMIC_FORMULA;\n+\n+ if (simpleOperatorArguments != null) {\n+ for (int i = 0; i < simpleOperatorArguments.length; i ++) {\n+ Object arg = simpleOperatorArguments[i];\n+ if (arg instanceof Stream) {\n+ try (Stream<?> sArg = (Stream<?>) arg) {\n+ simpleOperatorArguments[i] = sArg.collect(Collectors.toList());\n+ }\n+ }\n+ }\n+ }\n}\npublic ModelCriteriaNode(ExtOperator nodeOperator) {\n@@ -112,7 +141,7 @@ public class ModelCriteriaNode<M> extends DefaultTreeNode<ModelCriteriaNode<M>>\nthis.simpleOperatorArguments = null;\n}\n- private ModelCriteriaNode(ExtOperator nodeOperator, Operator simpleOperator, SearchableModelField<M> field, Object[] simpleOperatorArguments) {\n+ private ModelCriteriaNode(ExtOperator nodeOperator, Operator simpleOperator, SearchableModelField<? super M> field, Object[] simpleOperatorArguments) {\nsuper(Collections.emptyMap());\nthis.nodeOperator = nodeOperator;\nthis.simpleOperator = simpleOperator;\n@@ -125,11 +154,40 @@ public class ModelCriteriaNode<M> extends DefaultTreeNode<ModelCriteriaNode<M>>\n}\npublic ModelCriteriaNode<M> cloneTree() {\n- return cloneTree(n -> new ModelCriteriaNode<>(n.nodeOperator, n.simpleOperator, n.field, n.simpleOperatorArguments));\n+ return cloneTree(ModelCriteriaNode::new, ModelCriteriaNode::new);\n+ }\n+\n+ @FunctionalInterface\n+ public interface AtomicFormulaInstantiator<M> {\n+ public ModelCriteriaNode<M> instantiate(SearchableModelField<? super M> field, Operator operator, Object[] operatorArguments);\n+ }\n+\n+ public ModelCriteriaNode<M> cloneTree(AtomicFormulaInstantiator<M> atomicFormulaInstantiator, Function<ExtOperator, ModelCriteriaNode<M>> booleanNodeInstantiator) {\n+ return cloneTree(n ->\n+ n.getNodeOperator() == ExtOperator.ATOMIC_FORMULA\n+ ? atomicFormulaInstantiator.instantiate(n.field, n.simpleOperator, n.simpleOperatorArguments)\n+ : booleanNodeInstantiator.apply(n.nodeOperator)\n+ );\n+ }\n+\n+ public boolean isFalseNode() {\n+ return getNodeOperator() == ExtOperator.__FALSE__;\n+ }\n+\n+ public boolean isNotFalseNode() {\n+ return getNodeOperator() != ExtOperator.__FALSE__;\n+ }\n+\n+ public boolean isTrueNode() {\n+ return getNodeOperator() == ExtOperator.__TRUE__;\n+ }\n+\n+ public boolean isNotTrueNode() {\n+ return getNodeOperator() != ExtOperator.__TRUE__;\n}\n- public ModelCriteriaBuilder<M> flashToModelCriteriaBuilder(ModelCriteriaBuilder<M> mcb) {\n- final ModelCriteriaBuilder<M> res = nodeOperator.apply(mcb, this);\n+ public <C extends ModelCriteriaBuilder<M>> C flashToModelCriteriaBuilder(C mcb) {\n+ final C res = nodeOperator.apply(mcb, this);\nreturn res == null ? mcb : res;\n}\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/test/java/org/keycloak/models/map/storage/criteria/DefaultModelCriteriaTest.java", "new_path": "model/map/src/test/java/org/keycloak/models/map/storage/criteria/DefaultModelCriteriaTest.java", "diff": "package org.keycloak.models.map.storage.criteria;\nimport org.keycloak.models.ClientModel;\n+import org.keycloak.models.RoleModel;\nimport org.keycloak.models.map.storage.ModelCriteriaBuilder.Operator;\n+import java.util.Arrays;\nimport static org.hamcrest.MatcherAssert.assertThat;\nimport org.junit.Test;\nimport static org.hamcrest.Matchers.hasToString;\nimport static org.keycloak.models.ClientModel.SearchableFields.*;\n+import static org.keycloak.models.map.storage.criteria.DefaultModelCriteria.criteria;\n/**\n*\n@@ -31,42 +34,71 @@ public class DefaultModelCriteriaTest {\n@Test\npublic void testSimpleCompare() {\n- DefaultModelCriteria<ClientModel> v = new DefaultModelCriteria<>();\n+ DefaultModelCriteria<ClientModel> v = criteria();\nassertThat(v.compare(CLIENT_ID, Operator.EQ, 3), hasToString(\"clientId EQ [3]\"));\nassertThat(v.compare(CLIENT_ID, Operator.EQ, 4).compare(ID, Operator.EQ, 5), hasToString(\"(clientId EQ [4] && id EQ [5])\"));\n}\n@Test\npublic void testSimpleCompareAnd() {\n- DefaultModelCriteria<ClientModel> v = new DefaultModelCriteria<>();\n+ DefaultModelCriteria<ClientModel> v = criteria();\n+ assertThat(v.and(), hasToString(\"__TRUE__\"));\n+ assertThat(v.and(v.or()), hasToString(\"__FALSE__\"));\n+\nassertThat(v.and(v.compare(CLIENT_ID, Operator.EQ, 3)), hasToString(\"(clientId EQ [3])\"));\n- assertThat(v.and(v.compare(CLIENT_ID, Operator.EQ, 4).compare(ID, Operator.EQ, 5)), hasToString(\"((clientId EQ [4] && id EQ [5]))\"));\n+ assertThat(v.and(v.compare(CLIENT_ID, Operator.EQ, 3), v.or()), hasToString(\"__FALSE__\"));\n+ assertThat(v.and(v.compare(CLIENT_ID, Operator.EQ, 4).compare(ID, Operator.EQ, 5)), hasToString(\"(clientId EQ [4] && id EQ [5])\"));\nassertThat(v.and(v.compare(CLIENT_ID, Operator.EQ, 4), v.compare(ID, Operator.EQ, 5)), hasToString(\"(clientId EQ [4] && id EQ [5])\"));\n}\n@Test\npublic void testSimpleCompareOr() {\n- DefaultModelCriteria<ClientModel> v = new DefaultModelCriteria<>();\n+ DefaultModelCriteria<ClientModel> v = criteria();\n+ assertThat(v.or(), hasToString(\"__FALSE__\"));\n+ assertThat(v.or(v.and()), hasToString(\"__TRUE__\"));\n+\nassertThat(v.or(v.compare(CLIENT_ID, Operator.EQ, 3)), hasToString(\"(clientId EQ [3])\"));\n- assertThat(v.or(v.compare(CLIENT_ID, Operator.EQ, 4).compare(ID, Operator.EQ, 5)), hasToString(\"((clientId EQ [4] && id EQ [5]))\"));\n+ assertThat(v.or(v.compare(CLIENT_ID, Operator.EQ, 3), v.and()), hasToString(\"__TRUE__\"));\n+ assertThat(v.or(v.compare(CLIENT_ID, Operator.EQ, 4).compare(ID, Operator.EQ, 5)), hasToString(\"(clientId EQ [4] && id EQ [5])\"));\nassertThat(v.or(v.compare(CLIENT_ID, Operator.EQ, 4), v.compare(ID, Operator.EQ, 5)), hasToString(\"(clientId EQ [4] || id EQ [5])\"));\n+ assertThat(v.or(v.or(v.compare(CLIENT_ID, Operator.EQ, 4), v.compare(ID, Operator.EQ, 5))), hasToString(\"(clientId EQ [4] || id EQ [5])\"));\n+ assertThat(v.and(v.or(v.compare(CLIENT_ID, Operator.EQ, 4), v.compare(ID, Operator.EQ, 5))), hasToString(\"(clientId EQ [4] || id EQ [5])\"));\n}\n@Test\npublic void testSimpleCompareAndOr() {\n- DefaultModelCriteria<ClientModel> v = new DefaultModelCriteria<>();\n+ DefaultModelCriteria<ClientModel> v = criteria();\nassertThat(v.or(\nv.and(\nv.compare(CLIENT_ID, Operator.EQ, 4),\nv.compare(ID, Operator.EQ, 5)\n),\n- v.compare(ATTRIBUTE, Operator.EQ, \"city\", \"Ankh-Morpork\")\n+ v.not(v.not(v.compare(ATTRIBUTE, Operator.EQ, \"city\", \"Ankh-Morpork\")))\n), hasToString(\"((clientId EQ [4] && id EQ [5]) || attribute EQ [city, Ankh-Morpork])\"));\n+\n+ DefaultModelCriteria<RoleModel> mcb = criteria();\n+ assertThat(mcb.and(\n+ mcb.compare(RoleModel.SearchableFields.REALM_ID, Operator.EQ, \"realmId\"),\n+ mcb.compare(RoleModel.SearchableFields.CLIENT_ID, Operator.EQ, \"clientId\"),\n+ mcb.or(\n+ mcb.compare(RoleModel.SearchableFields.NAME, Operator.ILIKE, \"%search%\"),\n+ mcb.compare(RoleModel.SearchableFields.DESCRIPTION, Operator.ILIKE, \"%search%\")\n+ )\n+ ), hasToString(\"(realmId EQ [realmId] && clientId EQ [clientId] && (name ILIKE [%search%] || description ILIKE [%search%]))\"));\n+\n+ assertThat(mcb\n+ .compare(RoleModel.SearchableFields.REALM_ID, Operator.EQ, \"realmId\")\n+ .compare(RoleModel.SearchableFields.CLIENT_ID, Operator.EQ, \"clientId\")\n+ .or(\n+ mcb.compare(RoleModel.SearchableFields.NAME, Operator.ILIKE, \"%search%\"),\n+ mcb.compare(RoleModel.SearchableFields.DESCRIPTION, Operator.ILIKE, \"%search%\")\n+ ),\n+ hasToString(\"(realmId EQ [realmId] && clientId EQ [clientId] && (name ILIKE [%search%] || description ILIKE [%search%]))\"));\n}\n@Test\npublic void testComplexCompareAndOr() {\n- DefaultModelCriteria<ClientModel> v = new DefaultModelCriteria<>();\n+ DefaultModelCriteria<ClientModel> v = criteria();\nassertThat(v.or(\nv.and(\nv.compare(CLIENT_ID, Operator.EQ, 4),\n@@ -88,18 +120,49 @@ public class DefaultModelCriteriaTest {\n),\nhasToString(\"((clientId EQ [4] && realmId EQ [aa]) || (! id EQ [5] && enabled EQ [true]))\")\n);\n+\n+ assertThat(v.or(\n+ v.and(\n+ v.compare(CLIENT_ID, Operator.EQ, 4),\n+ v.compare(REALM_ID, Operator.EQ, \"aa\")\n+ ),\n+ v.not(\n+ v.not(\n+ v.compare(ID, Operator.EQ, 5)\n+ ).compare(ENABLED, Operator.EQ, \"true\")\n+ )\n+ ),\n+ hasToString(\"((clientId EQ [4] && realmId EQ [aa]) || ! (! id EQ [5] && enabled EQ [true]))\")\n+ );\n+\n+ assertThat(v.or(\n+ v.and(\n+ v.compare(CLIENT_ID, Operator.EQ, 4),\n+ v.compare(REALM_ID, Operator.EQ, \"aa\")\n+ ),\n+ v.not(\n+ v.not(\n+ v.and(\n+ v.compare(ID, Operator.EQ, 5)\n+ .compare(ENABLED, Operator.EQ, \"true\")\n+ )\n+ )\n+ )\n+ ),\n+ hasToString(\"((clientId EQ [4] && realmId EQ [aa]) || (id EQ [5] && enabled EQ [true]))\")\n+ );\n}\n@Test\npublic void testFlashingToAnotherMCB() {\n- DefaultModelCriteria<ClientModel> v = new DefaultModelCriteria<>();\n+ DefaultModelCriteria<ClientModel> v = criteria();\nassertThat(v.or(\nv.and(\nv.compare(CLIENT_ID, Operator.EQ, 4),\nv.compare(REALM_ID, Operator.EQ, \"aa\")\n),\nv.not(v.compare(ID, Operator.EQ, 5))\n- ).flashToModelCriteriaBuilder(new DefaultModelCriteria<>()),\n+ ).flashToModelCriteriaBuilder(criteria()),\nhasToString(\"((clientId EQ [4] && realmId EQ [aa]) || ! id EQ [5])\")\n);\n@@ -111,9 +174,35 @@ public class DefaultModelCriteriaTest {\nv.not(\nv.compare(ID, Operator.EQ, 5)\n).compare(ENABLED, Operator.EQ, \"true\")\n- ).flashToModelCriteriaBuilder(new DefaultModelCriteria<>()),\n+ ).flashToModelCriteriaBuilder(criteria()),\nhasToString(\"((clientId EQ [4] && realmId EQ [aa]) || (! id EQ [5] && enabled EQ [true]))\")\n);\n}\n+ @Test\n+ public void testCloning() {\n+ DefaultModelCriteria<ClientModel> v = criteria();\n+\n+ assertThat(v.and(v.compare(CLIENT_ID, Operator.EQ, 4).compare(ID, Operator.EQ, 5))\n+ .partiallyEvaluate((field, operator, operatorArguments) ->\n+ (field == CLIENT_ID && operator == Operator.EQ && Arrays.asList(operatorArguments).contains(4))\n+ || (field == ID && operator == Operator.EQ && Arrays.asList(operatorArguments).contains(5))\n+ ? true\n+ : null\n+ ),\n+ hasToString(\"(__TRUE__ && __TRUE__)\"));\n+\n+ assertThat(v.and(v.compare(CLIENT_ID, Operator.EQ, 4).compare(ID, Operator.EQ, 5))\n+ .partiallyEvaluate((field, operator, operatorArguments) ->\n+ (field == CLIENT_ID && operator == Operator.EQ && Arrays.asList(operatorArguments).contains(4))\n+ || (field == ID && operator == Operator.EQ && Arrays.asList(operatorArguments).contains(5))\n+ ? true\n+ : null\n+ ).optimize(),\n+ hasToString(\"__TRUE__\"));\n+\n+ assertThat(v.and(v.compare(CLIENT_ID, Operator.EQ, 4).compare(ID, Operator.EQ, 5))\n+ .partiallyEvaluate((field, operator, operatorArguments) -> field == CLIENT_ID && operator == Operator.EQ && Arrays.asList(operatorArguments).contains(6) ? true : null),\n+ hasToString(\"(clientId EQ [4] && id EQ [5])\"));\n+ }\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": ".github/workflows/ci.yml", "new_path": ".github/workflows/ci.yml", "diff": "@@ -369,7 +369,7 @@ jobs:\n- uses: actions/checkout@v2\nwith:\nrepository: keycloak/keycloak-quickstarts\n- ref: master # default is \"latest\"\n+ ref: main # default is \"latest\"\n- uses: actions/checkout@v2\nwith:\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": "@@ -39,6 +39,7 @@ public final class Environment {\npublic static final String CLI_ARGS = \"kc.config.args\";\npublic static final String PROFILE =\"kc.profile\";\npublic static final String ENV_PROFILE =\"KC_PROFILE\";\n+ public static final String DATA_PATH = \"/data\";\nprivate Environment() {}\n@@ -60,6 +61,10 @@ public final class Environment {\nreturn null;\n}\n+ public static String getDataDir() {\n+ return getHomeDir() + DATA_PATH;\n+ }\n+\npublic static Path getProvidersPath() {\nPath homePath = Environment.getHomePath();\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": "@@ -148,7 +148,8 @@ public class QuarkusPlatform implements PlatformProvider {\nthrow new RuntimeException(\"It was not possible to create temporary directory keycloak-quarkus-tmp\", ioex);\n}\n} else {\n- tmpDir = new File(homeDir, \"tmp\");\n+ String dataDir = Environment.getDataDir();\n+ tmpDir = new File(dataDir, \"tmp\");\ntmpDir.mkdir();\n}\n" }, { "change_type": "MODIFY", "old_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/Database.java", "new_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/Database.java", "diff": "@@ -94,7 +94,7 @@ public final class Database {\npublic String apply(String alias) {\nif (\"h2-file\".equalsIgnoreCase(alias)) {\nreturn \"jdbc:h2:file:${kc.home.dir:${kc.db.url.path:~}}\" + File.separator + \"${kc.data.dir:data}\"\n- + File.separator + \"keycloakdb${kc.db.url.properties:;;AUTO_SERVER=TRUE}\";\n+ + File.separator + \"h2\" + File.separator + \"keycloakdb${kc.db.url.properties:;;AUTO_SERVER=TRUE}\";\n}\nreturn \"jdbc:h2:mem:keycloakdb${kc.db.url.properties:}\";\n}\n" }, { "change_type": "MODIFY", "old_path": "quarkus/runtime/src/test/java/org/keycloak/provider/quarkus/ConfigurationTest.java", "new_path": "quarkus/runtime/src/test/java/org/keycloak/provider/quarkus/ConfigurationTest.java", "diff": "@@ -224,7 +224,7 @@ public class ConfigurationTest {\nSystem.setProperty(CLI_ARGS, \"--db=h2-file\");\nSmallRyeConfig config = createConfig();\nassertEquals(QuarkusH2Dialect.class.getName(), config.getConfigValue(\"quarkus.hibernate-orm.dialect\").getValue());\n- assertEquals(\"jdbc:h2:file:~/data/keycloakdb;;AUTO_SERVER=TRUE\", config.getConfigValue(\"quarkus.datasource.jdbc.url\").getValue());\n+ assertEquals(\"jdbc:h2:file:~/data/h2/keycloakdb;;AUTO_SERVER=TRUE\", config.getConfigValue(\"quarkus.datasource.jdbc.url\").getValue());\nSystem.setProperty(CLI_ARGS, \"--db=h2-mem\");\nconfig = createConfig();\n@@ -250,7 +250,7 @@ public class ConfigurationTest {\nSystem.setProperty(CLI_ARGS, \"--db=h2-file\");\nSmallRyeConfig config = createConfig();\nassertEquals(QuarkusH2Dialect.class.getName(), config.getConfigValue(\"quarkus.hibernate-orm.dialect\").getValue());\n- assertEquals(\"jdbc:h2:file:test-dir\" + File.separator + \"data\" + File.separator + \"keycloakdb;;test=test;test1=test1\", config.getConfigValue(\"quarkus.datasource.jdbc.url\").getValue());\n+ assertEquals(\"jdbc:h2:file:test-dir\" + File.separator + \"data\" + File.separator + \"h2\" + File.separator + \"keycloakdb;;test=test;test1=test1\", config.getConfigValue(\"quarkus.datasource.jdbc.url\").getValue());\nSystem.setProperty(\"kc.db.url.properties\", \"?test=test&test1=test1\");\nSystem.setProperty(CLI_ARGS, \"--db=mariadb\");\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/client/MapClientProvider.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/client/MapClientProvider.java", "diff": "@@ -241,7 +241,7 @@ public class MapClientProvider implements ClientProvider {\nModelCriteriaBuilder<ClientModel> mcb = criteria();\nmcb = mcb.compare(SearchableFields.REALM_ID, Operator.EQ, realm.getId())\n- .compare(SearchableFields.CLIENT_ID, Operator.ILIKE, clientId);\n+ .compare(SearchableFields.CLIENT_ID, Operator.EQ, clientId);\nreturn tx.read(withCriteria(mcb))\n.map(entityToAdapterFunc(realm))\n" } ]

[ { "change_type": "MODIFY", "old_path": "quarkus/pom.xml", "new_path": "quarkus/pom.xml", "diff": "<properties>\n<!-- Quarkus version -->\n- <quarkus.version>2.4.0.Final</quarkus.version>\n+ <quarkus.version>2.4.1.Final</quarkus.version>\n<!--\nOverride versions based on Quarkus dependencies.\n<resteasy.version>4.7.0.Final</resteasy.version>\n<jackson.version>2.12.5</jackson.version>\n<jackson.databind.version>${jackson.version}</jackson.databind.version>\n- <hibernate.core.version>5.6.0.Final</hibernate.core.version>\n+ <hibernate.core.version>5.6.1.Final</hibernate.core.version>\n<mysql.driver.version>8.0.26</mysql.driver.version>\n<postgresql.version>42.2.24</postgresql.version>\n<microprofile-metrics-api.version>3.0</microprofile-metrics-api.version>\n" } ]

[ { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/keys/GeneratedEcdsaKeyProviderFactory.java", "new_path": "services/src/main/java/org/keycloak/keys/GeneratedEcdsaKeyProviderFactory.java", "diff": "@@ -28,7 +28,10 @@ import org.keycloak.models.RealmModel;\nimport org.keycloak.provider.ConfigurationValidationHelper;\nimport org.keycloak.provider.ProviderConfigProperty;\n+import java.security.KeyFactory;\nimport java.security.KeyPair;\n+import java.security.interfaces.ECPublicKey;\n+import java.security.spec.X509EncodedKeySpec;\nimport java.util.List;\npublic class GeneratedEcdsaKeyProviderFactory extends AbstractEcdsaKeyProviderFactory {\n@@ -103,7 +106,7 @@ public class GeneratedEcdsaKeyProviderFactory extends AbstractEcdsaKeyProviderFa\ngenerateKeys(model, ecInNistRep);\nlogger.debugv(\"Generated keys for {0}\", realm.getName());\n} else {\n- String currentEc = model.get(ECDSA_ELLIPTIC_CURVE_KEY);\n+ String currentEc = getCurveFromPublicKey(model.getConfig().getFirst(GeneratedEcdsaKeyProviderFactory.ECDSA_PUBLIC_KEY_KEY));\nif (!ecInNistRep.equals(currentEc)) {\ngenerateKeys(model, ecInNistRep);\nlogger.debugv(\"Elliptic Curve changed, generating new keys for {0}\", realm.getName());\n@@ -123,4 +126,14 @@ public class GeneratedEcdsaKeyProviderFactory extends AbstractEcdsaKeyProviderFa\n}\n}\n+ private String getCurveFromPublicKey(String publicEcdsaKeyBase64Encoded) {\n+ try {\n+ KeyFactory kf = KeyFactory.getInstance(\"EC\");\n+ X509EncodedKeySpec publicKeySpec = new X509EncodedKeySpec(Base64.decode(publicEcdsaKeyBase64Encoded));\n+ ECPublicKey ecKey = (ECPublicKey) kf.generatePublic(publicKeySpec);\n+ return \"P-\" + ecKey.getParams().getCurve().getField().getFieldSize();\n+ } catch (Throwable t) {\n+ throw new ComponentValidationException(\"Failed to get EC from its public key\", t);\n+ }\n+ }\n}\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/keys/GeneratedEcdsaKeyProviderTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/keys/GeneratedEcdsaKeyProviderTest.java", "diff": "package org.keycloak.testsuite.keys;\nimport static org.junit.Assert.assertEquals;\n+import static org.junit.Assert.assertNotEquals;\nimport static org.junit.Assert.assertNotNull;\nimport static org.keycloak.testsuite.admin.AbstractAdminTest.loadJson;\n+import java.security.KeyFactory;\n+import java.security.interfaces.ECPublicKey;\n+import java.security.spec.X509EncodedKeySpec;\nimport java.util.List;\nimport javax.ws.rs.WebApplicationException;\n@@ -28,8 +32,10 @@ import javax.ws.rs.core.Response;\nimport org.jboss.arquillian.graphene.page.Page;\nimport org.junit.Rule;\nimport org.junit.Test;\n+import org.keycloak.common.util.Base64;\nimport org.keycloak.common.util.MultivaluedHashMap;\nimport org.keycloak.crypto.KeyType;\n+import org.keycloak.keys.AbstractEcdsaKeyProviderFactory;\nimport org.keycloak.keys.GeneratedEcdsaKeyProviderFactory;\nimport org.keycloak.keys.KeyProvider;\nimport org.keycloak.representations.idm.ComponentRepresentation;\n@@ -88,7 +94,7 @@ public class GeneratedEcdsaKeyProviderTest extends AbstractKeycloakTest {\nunsupportedEc(\"K-163\");\n}\n- private void supportedEc(String ecInNistRep) {\n+ private String supportedEc(String ecInNistRep) {\nlong priority = System.currentTimeMillis();\nComponentRepresentation rep = createRep(\"valid\", GeneratedEcdsaKeyProviderFactory.ID);\n@@ -127,6 +133,8 @@ public class GeneratedEcdsaKeyProviderTest extends AbstractKeycloakTest {\nassertEquals(id, key.getProviderId());\nassertEquals(KeyType.EC, key.getType());\nassertEquals(priority, key.getProviderPriority());\n+\n+ return id; // created key's component id\n}\nprivate void unsupportedEc(String ecInNistRep) {\n@@ -152,6 +160,60 @@ public class GeneratedEcdsaKeyProviderTest extends AbstractKeycloakTest {\nassertEquals(isEcAccepted, false);\n}\n+ @Test\n+ public void changeCurveFromP256ToP384() throws Exception {\n+ changeCurve(\"P-256\", \"P-384\");\n+ }\n+\n+ @Test\n+ public void changeCurveFromP384ToP521() throws Exception {\n+ changeCurve(\"P-384\", \"P-521\");\n+ }\n+\n+ @Test\n+ public void changeCurveFromP521ToP256() throws Exception {\n+ changeCurve(\"P-521\", \"P-256\");\n+ }\n+\n+ private void changeCurve(String FromEcInNistRep, String ToEcInNistRep) throws Exception {\n+ String keyComponentId = supportedEc(FromEcInNistRep);\n+ KeysMetadataRepresentation keys = adminClient.realm(TEST_REALM_NAME).keys().getKeyMetadata();\n+ KeysMetadataRepresentation.KeyMetadataRepresentation originalKey = null;\n+ for (KeyMetadataRepresentation k : keys.getKeys()) {\n+ if (KeyType.EC.equals(k.getType()) && keyComponentId.equals(k.getProviderId())) {\n+ originalKey = k;\n+ break;\n+ }\n+ }\n+\n+ ComponentRepresentation createdRep = adminClient.realm(TEST_REALM_NAME).components().component(keyComponentId).toRepresentation();\n+ createdRep.getConfig().putSingle(ECDSA_ELLIPTIC_CURVE_KEY, ToEcInNistRep);\n+ adminClient.realm(TEST_REALM_NAME).components().component(keyComponentId).update(createdRep);\n+\n+ createdRep = adminClient.realm(TEST_REALM_NAME).components().component(keyComponentId).toRepresentation();\n+\n+ // stands for the number of properties in the key provider config\n+ assertEquals(2, createdRep.getConfig().size());\n+ assertEquals(ToEcInNistRep, createdRep.getConfig().getFirst(ECDSA_ELLIPTIC_CURVE_KEY));\n+\n+ keys = adminClient.realm(TEST_REALM_NAME).keys().getKeyMetadata();\n+ KeysMetadataRepresentation.KeyMetadataRepresentation key = null;\n+ for (KeyMetadataRepresentation k : keys.getKeys()) {\n+ if (KeyType.EC.equals(k.getType()) && keyComponentId.equals(k.getProviderId())) {\n+ key = k;\n+ break;\n+ }\n+ }\n+ assertNotNull(key);\n+\n+ assertEquals(keyComponentId, key.getProviderId());\n+ assertNotEquals(originalKey.getKid(), key.getKid()); // kid is changed if key was regenerated\n+ assertEquals(KeyType.EC, key.getType());\n+ assertNotEquals(originalKey.getAlgorithm(), key.getAlgorithm());\n+ assertEquals(ToEcInNistRep, AbstractEcdsaKeyProviderFactory.convertAlgorithmToECDomainParmNistRep(key.getAlgorithm()));\n+ assertEquals(ToEcInNistRep, getCurveFromPublicKey(key.getPublicKey()));\n+ }\n+\nprotected ComponentRepresentation createRep(String name, String providerId) {\nComponentRepresentation rep = new ComponentRepresentation();\nrep.setName(name);\n@@ -161,4 +223,11 @@ public class GeneratedEcdsaKeyProviderTest extends AbstractKeycloakTest {\nrep.setConfig(new MultivaluedHashMap<>());\nreturn rep;\n}\n+\n+ private String getCurveFromPublicKey(String publicEcdsaKeyBase64Encoded) throws Exception {\n+ KeyFactory kf = KeyFactory.getInstance(\"EC\");\n+ X509EncodedKeySpec publicKeySpec = new X509EncodedKeySpec(Base64.decode(publicEcdsaKeyBase64Encoded));\n+ ECPublicKey ecKey = (ECPublicKey) kf.generatePublic(publicKeySpec);\n+ return \"P-\" + ecKey.getParams().getCurve().getField().getFieldSize();\n+ }\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/RootAuthenticationSessionAdapter.java", "new_path": "model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/RootAuthenticationSessionAdapter.java", "diff": "@@ -20,6 +20,7 @@ package org.keycloak.models.sessions.infinispan;\nimport java.util.Comparator;\nimport java.util.HashMap;\nimport java.util.Map;\n+import java.util.Objects;\nimport java.util.concurrent.TimeUnit;\nimport org.infinispan.Cache;\n@@ -117,6 +118,8 @@ public class RootAuthenticationSessionAdapter implements RootAuthenticationSessi\n@Override\npublic AuthenticationSessionModel createAuthenticationSession(ClientModel client) {\n+ Objects.requireNonNull(client, \"client\");\n+\nMap<String, AuthenticationSessionEntity> authenticationSessions = entity.getAuthenticationSessions();\nif (authenticationSessions.size() >= authSessionsLimit) {\nString tabId = authenticationSessions.entrySet().stream().min(TIMESTAMP_COMPARATOR).map(Map.Entry::getKey).orElse(null);\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": "@@ -109,6 +109,5 @@ public interface Errors {\nString INVALID_OAUTH2_DEVICE_CODE = \"invalid_oauth2_device_code\";\nString EXPIRED_OAUTH2_DEVICE_CODE = \"expired_oauth2_device_code\";\nString INVALID_OAUTH2_USER_CODE = \"invalid_oauth2_user_code\";\n- String EXPIRED_OAUTH2_USER_CODE = \"expired_oauth2_user_code\";\nString SLOW_DOWN = \"slow_down\";\n}\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": "@@ -19,13 +19,9 @@ package org.keycloak.protocol.oidc.grants.device.endpoints;\nimport org.jboss.logging.Logger;\nimport org.jboss.resteasy.spi.HttpRequest;\n-import org.keycloak.OAuth2Constants;\nimport org.keycloak.OAuthErrorException;\n-import org.keycloak.authentication.AuthenticationProcessor;\nimport org.keycloak.common.util.Base64Url;\nimport org.keycloak.common.util.SecretGenerator;\n-import org.keycloak.common.util.Time;\n-import org.keycloak.constants.AdapterConstants;\nimport org.keycloak.events.Details;\nimport org.keycloak.events.Errors;\nimport org.keycloak.events.EventBuilder;\n@@ -39,9 +35,7 @@ import org.keycloak.models.OAuth2DeviceTokenStoreProvider;\nimport org.keycloak.models.OAuth2DeviceUserCodeModel;\nimport org.keycloak.models.OAuth2DeviceUserCodeProvider;\nimport org.keycloak.models.RealmModel;\n-import org.keycloak.models.utils.SystemClientUtil;\nimport org.keycloak.protocol.AuthorizationEndpointBase;\n-import org.keycloak.protocol.oidc.OIDCAdvancedConfigWrapper;\nimport org.keycloak.protocol.oidc.OIDCLoginProtocol;\nimport org.keycloak.protocol.oidc.endpoints.request.AuthorizationEndpointRequest;\nimport org.keycloak.protocol.oidc.endpoints.request.AuthorizationEndpointRequestParserProcessor;\n@@ -57,7 +51,6 @@ import org.keycloak.services.Urls;\nimport org.keycloak.services.clientpolicy.ClientPolicyException;\nimport org.keycloak.services.messages.Messages;\nimport org.keycloak.services.resource.RealmResourceProvider;\n-import org.keycloak.services.resources.SessionCodeChecks;\nimport org.keycloak.services.resources.Cors;\nimport org.keycloak.services.util.CacheControlUtil;\nimport org.keycloak.sessions.AuthenticationSessionModel;\n@@ -66,7 +59,6 @@ import org.keycloak.util.TokenUtil;\nimport javax.ws.rs.Consumes;\nimport javax.ws.rs.GET;\n-import javax.ws.rs.HttpMethod;\nimport javax.ws.rs.OPTIONS;\nimport javax.ws.rs.POST;\nimport javax.ws.rs.Path;\n@@ -77,10 +69,7 @@ import javax.ws.rs.core.MediaType;\nimport javax.ws.rs.core.MultivaluedMap;\nimport javax.ws.rs.core.Response;\n-import static org.keycloak.protocol.oidc.endpoints.AuthorizationEndpoint.LOGIN_SESSION_NOTE_ADDITIONAL_REQ_PARAMS_PREFIX;\nimport static org.keycloak.protocol.oidc.grants.device.DeviceGrantType.OAUTH2_DEVICE_USER_CODE;\n-import static org.keycloak.protocol.oidc.grants.device.DeviceGrantType.OAUTH2_USER_CODE_VERIFY;\n-import static org.keycloak.services.resources.LoginActionsService.SESSION_CODE;\n/**\n* @author <a href=\"mailto:[email protected]\">Hiroyuki Wada</a>\n@@ -210,13 +199,20 @@ public class DeviceEndpoint extends AuthorizationEndpointBase implements RealmRe\nOAuth2DeviceCodeModel deviceCode = store.getByUserCode(realm, formattedUserCode);\nif (deviceCode == null) {\n- event.error(Errors.INVALID_OAUTH2_USER_CODE);\n- return createVerificationPage(Messages.OAUTH2_DEVICE_INVALID_USER_CODE);\n+ return invalidUserCodeResponse(Messages.OAUTH2_DEVICE_INVALID_USER_CODE, \"device code not found (it may already have been used)\");\n+ }\n+\n+ if (!deviceCode.isPending()) {\n+ event.detail(\"device_code_user_session_id\", deviceCode.getUserSessionId());\n+ return invalidUserCodeResponse(Messages.OAUTH2_DEVICE_INVALID_USER_CODE, \"device code already used and not yet deleted\");\n+ }\n+\n+ if (deviceCode.isDenied()) {\n+ return invalidUserCodeResponse(Messages.OAUTH2_DEVICE_INVALID_USER_CODE, \"device code denied\");\n}\nif (deviceCode.isExpired()) {\n- event.error(Errors.INVALID_OAUTH2_USER_CODE);\n- return createVerificationPage(Messages.OAUTH2_DEVICE_EXPIRED_USER_CODE);\n+ return invalidUserCodeResponse(Messages.OAUTH2_DEVICE_EXPIRED_USER_CODE, \"device code expired\");\n}\nreturn processVerification(deviceCode, formattedUserCode);\n@@ -272,6 +268,18 @@ public class DeviceEndpoint extends AuthorizationEndpointBase implements RealmRe\n}\n}\n+ /**\n+ * @param errorMessage Message code for the verification page\n+ * @param reason For event details; not exposed to end user\n+ * @return Verification page response with error message\n+ */\n+ private Response invalidUserCodeResponse(String errorMessage, String reason) {\n+ event.error(Errors.INVALID_OAUTH2_USER_CODE);\n+ event.detail(Details.REASON, reason);\n+ logger.debugf(\"invalid user code: %s\", reason);\n+ return createVerificationPage(errorMessage);\n+ }\n+\nprivate Response createVerificationPage(String errorMessage) {\nString execution = AuthenticatedClientSessionModel.Action.USER_CODE_VERIFICATION.name();\n@@ -286,12 +294,6 @@ public class DeviceEndpoint extends AuthorizationEndpointBase implements RealmRe\n}\nprivate Response processVerification(OAuth2DeviceCodeModel deviceCode, String userCode) {\n- long expiresIn = deviceCode.getExpiration() - Time.currentTime();\n- if (expiresIn < 0) {\n- event.error(Errors.EXPIRED_OAUTH2_USER_CODE);\n- return createVerificationPage(Messages.OAUTH2_DEVICE_INVALID_USER_CODE);\n- }\n-\nClientModel client = realm.getClientByClientId(deviceCode.getClientId());\nAuthenticationSessionModel authenticationSession = createAuthenticationSession(client);\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/OAuth2DeviceVerificationPage.java", "new_path": "testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/OAuth2DeviceVerificationPage.java", "diff": "@@ -26,6 +26,8 @@ import org.openqa.selenium.support.FindBy;\n*/\npublic class OAuth2DeviceVerificationPage extends LanguageComboboxAwarePage {\n+ private static final String CONSENT_DENIED_MESSAGE = \"Consent denied for connecting the device.\";\n+\n@FindBy(id = \"device-user-code\")\nprivate WebElement userCodeInput;\n@@ -74,6 +76,11 @@ public class OAuth2DeviceVerificationPage extends LanguageComboboxAwarePage {\nisInvalidUserCodePage());\n}\n+ public void assertExpiredUserCodePage() {\n+ Assert.assertTrue(\"Expected expired user code page but was \" + driver.getTitle() + \" (\" + driver.getCurrentUrl() + \")\",\n+ isExpiredUserCodePage());\n+ }\n+\nprivate boolean isApprovedPage() {\nif (driver.getTitle().startsWith(\"Sign in to \")) {\ntry {\n@@ -88,9 +95,8 @@ public class OAuth2DeviceVerificationPage extends LanguageComboboxAwarePage {\nprivate boolean isDeniedPage() {\nif (driver.getTitle().startsWith(\"Sign in to \")) {\ntry {\n- driver.findElement(By.id(\"kc-page-title\")).getText().equals(\"Device Login Failed\");\n- driver.findElement(By.className(\"instruction\")).getText().equals(\"Consent denied for connecting the device.\");\n- return true;\n+ return driver.findElement(By.id(\"kc-page-title\")).getText().equals(\"Device Login Failed\")\n+ && driver.findElement(By.className(\"instruction\")).getText().equals(CONSENT_DENIED_MESSAGE);\n} catch (Throwable t) {\n}\n}\n@@ -101,9 +107,20 @@ public class OAuth2DeviceVerificationPage extends LanguageComboboxAwarePage {\nif (driver.getTitle().startsWith(\"Sign in to \")) {\ntry {\ndriver.findElement(By.id(\"device-user-code\"));\n- driver.findElement(By.id(\"kc-page-title\")).getText().equals(\"Device Login\");\n- driver.findElement(By.className(\"kc-feedback-text\")).getText().equals(\"Invalid code, please try again.\");\n- return true;\n+ return driver.findElement(By.id(\"kc-page-title\")).getText().equals(\"Device Login\")\n+ && driver.findElement(By.className(\"kc-feedback-text\")).getText().equals(\"Invalid code, please try again.\");\n+ } catch (Throwable t) {\n+ }\n+ }\n+ return false;\n+ }\n+\n+ private boolean isExpiredUserCodePage() {\n+ if (driver.getTitle().startsWith(\"Sign in to \")) {\n+ try {\n+ driver.findElement(By.id(\"device-user-code\"));\n+ return driver.findElement(By.id(\"kc-page-title\")).getText().equals(\"Device Login\")\n+ && driver.findElement(By.className(\"kc-feedback-text\")).getText().equals(\"The code has expired. Please go back to your device and try connecting again.\");\n} catch (Throwable t) {\n}\n}\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": "@@ -303,7 +303,7 @@ public class OAuth2DeviceAuthorizationGrantTest extends AbstractKeycloakTest {\nresetTimeOffset();\n}\n- verificationPage.assertInvalidUserCodePage();\n+ verificationPage.assertExpiredUserCodePage();\n}\n@Test\n@@ -614,6 +614,39 @@ public class OAuth2DeviceAuthorizationGrantTest extends AbstractKeycloakTest {\nAssert.assertEquals(15, rep.getOAuth2DeviceCodeLifespan().intValue());\n}\n+ // KEYCLOAK-19700\n+ @Test\n+ public void testConsentCancelCannotBeReused() throws Exception {\n+ // Device Authorization Request from device\n+ oauth.realm(REALM_NAME);\n+ oauth.clientId(DEVICE_APP);\n+ OAuthClient.DeviceAuthorizationResponse response = oauth.doDeviceAuthorizationRequest(DEVICE_APP, \"secret\");\n+\n+ Assert.assertEquals(200, response.getStatusCode());\n+ assertNotNull(response.getDeviceCode());\n+ assertNotNull(response.getUserCode());\n+ assertNotNull(response.getVerificationUri());\n+ assertNotNull(response.getVerificationUriComplete());\n+ Assert.assertEquals(60, response.getExpiresIn());\n+ Assert.assertEquals(5, response.getInterval());\n+\n+ openVerificationPage(response.getVerificationUriComplete());\n+ loginPage.assertCurrent();\n+\n+ // Do Login\n+ oauth.fillLoginForm(\"device-login\", \"password\");\n+\n+ // Consent\n+ grantPage.assertCurrent();\n+ grantPage.cancel();\n+\n+ verificationPage.assertDeniedPage();\n+\n+ openVerificationPage(response.getVerificationUriComplete());\n+\n+ verificationPage.assertInvalidUserCodePage();\n+ }\n+\nprivate void openVerificationPage(String verificationUri) {\ndriver.navigate().to(verificationUri);\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/protocol/oidc/AccessTokenIntrospectionProvider.java", "new_path": "services/src/main/java/org/keycloak/protocol/oidc/AccessTokenIntrospectionProvider.java", "diff": "package org.keycloak.protocol.oidc;\nimport com.fasterxml.jackson.databind.node.ObjectNode;\n+import org.jboss.logging.Logger;\nimport org.keycloak.TokenVerifier;\nimport org.keycloak.common.VerificationException;\nimport org.keycloak.crypto.SignatureProvider;\n@@ -40,6 +41,7 @@ public class AccessTokenIntrospectionProvider implements TokenIntrospectionProvi\nprivate final KeycloakSession session;\nprivate final TokenManager tokenManager;\nprivate final RealmModel realm;\n+ private static final Logger logger = Logger.getLogger(AccessTokenIntrospectionProvider.class);\npublic AccessTokenIntrospectionProvider(KeycloakSession session) {\nthis.session = session;\n@@ -90,6 +92,7 @@ public class AccessTokenIntrospectionProvider implements TokenIntrospectionProvi\naccessToken = verifier.verify().getToken();\n} catch (VerificationException e) {\n+ logger.debugf(\"JWT check failed: %s\", e.getMessage());\nreturn null;\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": "@@ -237,6 +237,7 @@ public class TokenManager {\n.withChecks(NotBeforeCheck.forModel(client), TokenVerifier.IS_ACTIVE)\n.verify();\n} catch (VerificationException e) {\n+ logger.debugf(\"JWT check failed: %s\", e.getMessage());\nreturn false;\n}\n@@ -326,6 +327,7 @@ public class TokenManager {\n.withChecks(NotBeforeCheck.forModel(session ,realm, user))\n.verify();\n} catch (VerificationException e) {\n+ logger.debugf(\"JWT check failed: %s\", e.getMessage());\nreturn false;\n}\nreturn true;\n" } ]

[ { "change_type": "MODIFY", "old_path": "distribution/server-x-dist/src/main/content/bin/kc.sh", "new_path": "distribution/server-x-dist/src/main/content/bin/kc.sh", "diff": "@@ -23,7 +23,7 @@ fi\nGREP=\"grep\"\nDIRNAME=`dirname \"$RESOLVED_NAME\"`\n-SERVER_OPTS=\"-Dkc.home.dir=$DIRNAME/../ -Djboss.server.config.dir=$DIRNAME/../conf -Dkeycloak.theme.dir=$DIRNAME/../themes -Djava.util.logging.manager=org.jboss.logmanager.LogManager\"\n+SERVER_OPTS=\"-Dkc.home.dir=$DIRNAME/../ -Djboss.server.config.dir=$DIRNAME/../conf -Djava.util.logging.manager=org.jboss.logmanager.LogManager\"\nDEBUG_MODE=\"${DEBUG:-false}\"\nDEBUG_PORT=\"${DEBUG_PORT:-8787}\"\n" }, { "change_type": "MODIFY", "old_path": "quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/KeycloakProcessor.java", "new_path": "quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/KeycloakProcessor.java", "diff": "@@ -124,6 +124,7 @@ import org.keycloak.representations.provider.ScriptProviderMetadata;\nimport org.keycloak.quarkus.runtime.integration.web.NotFoundHandler;\nimport org.keycloak.services.ServicesLogger;\nimport org.keycloak.quarkus.runtime.services.health.KeycloakMetricsHandler;\n+import org.keycloak.theme.FolderThemeProviderFactory;\nimport org.keycloak.transaction.JBossJtaTransactionManagerLookup;\nimport org.keycloak.quarkus.runtime.Environment;\nimport org.keycloak.util.JsonSerialization;\n@@ -141,6 +142,7 @@ class KeycloakProcessor {\nJBossJtaTransactionManagerLookup.class,\nDefaultJpaConnectionProviderFactory.class,\nDefaultLiquibaseConnectionProvider.class,\n+ FolderThemeProviderFactory.class,\nLiquibaseJpaUpdaterProviderFactory.class);\nstatic {\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": "@@ -40,6 +40,7 @@ public final class Environment {\npublic static final String PROFILE =\"kc.profile\";\npublic static final String ENV_PROFILE =\"KC_PROFILE\";\npublic static final String DATA_PATH = \"/data\";\n+ public static final String DEFAULT_THEMES_PATH = \"/themes\";\nprivate Environment() {}\n@@ -65,6 +66,10 @@ public final class Environment {\nreturn getHomeDir() + DATA_PATH;\n}\n+ public static String getDefaultThemeRootDir() {\n+ return getHomeDir() + DEFAULT_THEMES_PATH;\n+ }\n+\npublic static Path getProvidersPath() {\nPath homePath = Environment.getHomePath();\n" }, { "change_type": "ADD", "old_path": null, "new_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/themes/QuarkusFolderThemeProviderFactory.java", "diff": "+package org.keycloak.quarkus.runtime.themes;\n+\n+import org.keycloak.Config;\n+import org.keycloak.models.KeycloakSession;\n+import org.keycloak.models.KeycloakSessionFactory;\n+import org.keycloak.quarkus.runtime.Environment;\n+import org.keycloak.theme.FolderThemeProvider;\n+import org.keycloak.theme.ThemeProvider;\n+import org.keycloak.theme.ThemeProviderFactory;\n+\n+import java.io.File;\n+import java.util.Objects;\n+\n+public class QuarkusFolderThemeProviderFactory implements ThemeProviderFactory {\n+\n+ private static final String CONFIG_DIR_KEY = \"dir\";\n+ private FolderThemeProvider themeProvider;\n+\n+ @Override\n+ public ThemeProvider create(KeycloakSession sessions) {\n+ return themeProvider;\n+ }\n+\n+ @Override\n+ public void init(Config.Scope config) {\n+ String configDir = config.get(CONFIG_DIR_KEY);\n+ File rootDir = getThemeRootDirWithFallback(configDir);\n+ themeProvider = new FolderThemeProvider(rootDir);\n+ }\n+\n+ @Override\n+ public void postInit(KeycloakSessionFactory factory) {\n+\n+ }\n+\n+ @Override\n+ public void close() {\n+\n+ }\n+\n+ @Override\n+ public String getId() {\n+ return \"folder\";\n+ }\n+\n+ /**\n+ * Determines if the theme root directory we get\n+ * from {@link Config} exists.\n+ * If not, uses the default theme directory as a fallback.\n+ *\n+ * @param rootDirFromConfig string value from {@link Config}\n+ * @return Directory to use as theme root directory in {@link File} format, either from config or from default. Null if none is available.\n+ * @throws RuntimeException when filesystem path is not accessible\n+ */\n+ private File getThemeRootDirWithFallback(String rootDirFromConfig) {\n+ File themeRootDir;\n+\n+ themeRootDir = new File(Objects.requireNonNullElseGet(rootDirFromConfig, Environment::getDefaultThemeRootDir));\n+\n+ if (!themeRootDir.exists()) {\n+ return null;\n+ }\n+\n+ return themeRootDir;\n+ }\n+}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "quarkus/runtime/src/main/resources/META-INF/services/org.keycloak.theme.ThemeProviderFactory", "diff": "+org.keycloak.quarkus.runtime.themes.QuarkusFolderThemeProviderFactory\n+\n+\n" }, { "change_type": "MODIFY", "old_path": "quarkus/server/src/main/resources/META-INF/keycloak.properties", "new_path": "quarkus/server/src/main/resources/META-INF/keycloak.properties", "diff": "@@ -9,9 +9,6 @@ http.enabled=false\n# Metrics and healthcheck are disabled by default\nmetrics.enabled=false\n-# Themes\n-spi.theme.folder.dir=${kc.home.dir:}/themes\n-\n# Basic settings for running in production. Change accordingly before deploying the server.\n# Database\n#%prod.db=postgres\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/servers/auth-server/quarkus/src/main/content/conf/keycloak.properties", "new_path": "testsuite/integration-arquillian/servers/auth-server/quarkus/src/main/content/conf/keycloak.properties", "diff": "@@ -27,9 +27,6 @@ spi.truststore.file.password=secret\nspi.user-profile.declarative-user-profile.read-only-attributes=deniedFoo,deniedBar*,deniedSome/thing,deniedsome*thing\nspi.user-profile.declarative-user-profile.admin-read-only-attributes=deniedSomeAdmin\n-#theme folders dir\n-spi.theme.folder.dir=${kc.home.dir:}/themes\n-\n#password-blacklists path\nspi.password-policy.password-blacklist.blacklists-path=${kc.home.dir:}/dependency/password-blacklists\n" } ]

[ { "change_type": "MODIFY", "old_path": "integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmResource.java", "new_path": "integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmResource.java", "diff": "@@ -142,7 +142,7 @@ public interface RealmResource {\n@Produces(MediaType.APPLICATION_JSON)\nList<AdminEventRepresentation> getAdminEvents(@QueryParam(\"operationTypes\") List<String> operationTypes, @QueryParam(\"authRealm\") String authRealm, @QueryParam(\"authClient\") String authClient,\n@QueryParam(\"authUser\") String authUser, @QueryParam(\"authIpAddress\") String authIpAddress,\n- @QueryParam(\"resourcePath\") String resourcePath, @QueryParam(\"dateFrom\") String dateFrom,\n+ @QueryParam(\"resourcePath\") String resourcePath, @QueryParam(\"resourceTypes\") List<String> resourceTypes, @QueryParam(\"dateFrom\") String dateFrom,\n@QueryParam(\"dateTo\") String dateTo, @QueryParam(\"first\") Integer firstResult,\n@QueryParam(\"max\") Integer maxResults);\n" } ]

[ { "change_type": "MODIFY", "old_path": "integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmResource.java", "new_path": "integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmResource.java", "diff": "@@ -137,6 +137,15 @@ public interface RealmResource {\n@Produces(MediaType.APPLICATION_JSON)\nList<AdminEventRepresentation> getAdminEvents();\n+ @GET\n+ @Path(\"admin-events\")\n+ @Produces(MediaType.APPLICATION_JSON)\n+ List<AdminEventRepresentation> getAdminEvents(@QueryParam(\"operationTypes\") List<String> operationTypes, @QueryParam(\"authRealm\") String authRealm, @QueryParam(\"authClient\") String authClient,\n+ @QueryParam(\"authUser\") String authUser, @QueryParam(\"authIpAddress\") String authIpAddress,\n+ @QueryParam(\"resourcePath\") String resourcePath, @QueryParam(\"dateFrom\") String dateFrom,\n+ @QueryParam(\"dateTo\") String dateTo, @QueryParam(\"first\") Integer firstResult,\n+ @QueryParam(\"max\") Integer maxResults);\n+\n@GET\n@Path(\"admin-events\")\n@Produces(MediaType.APPLICATION_JSON)\n" } ]

[ { "change_type": "MODIFY", "old_path": "adapters/oidc/adapter-core/src/main/java/org/keycloak/adapters/PreAuthActionsHandler.java", "new_path": "adapters/oidc/adapter-core/src/main/java/org/keycloak/adapters/PreAuthActionsHandler.java", "diff": "@@ -104,7 +104,7 @@ public class PreAuthActionsHandler {\nreturn false;\n}\nString origin = facade.getRequest().getHeader(CorsHeaders.ORIGIN);\n- if (origin == null || origin.equals(\"null\")) {\n+ if (origin == null) {\nlog.debug(\"checkCorsPreflight: no origin header\");\nreturn false;\n}\n" }, { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/services/resources/Cors.java", "new_path": "services/src/main/java/org/keycloak/services/resources/Cors.java", "diff": "@@ -135,7 +135,7 @@ public class Cors {\npublic Response build() {\nString origin = request.getHttpHeaders().getRequestHeaders().getFirst(ORIGIN_HEADER);\n- if (origin == null || origin.equals(\"null\")) {\n+ if (origin == null) {\nlogger.trace(\"No origin header ignoring\");\nreturn builder.build();\n}\n@@ -182,7 +182,7 @@ public class Cors {\npublic void build(HttpResponse response) {\nString origin = request.getHttpHeaders().getRequestHeaders().getFirst(ORIGIN_HEADER);\n- if (origin == null || origin.equals(\"null\")) {\n+ if (origin == null) {\nlogger.trace(\"No origin header ignoring\");\nreturn;\n}\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": "@@ -263,6 +263,13 @@ public class OIDCWellKnownProviderTest extends AbstractKeycloakTest {\nResponse response = request.get();\nassertEquals(\"http://somehost\", response.getHeaders().getFirst(Cors.ACCESS_CONTROL_ALLOW_ORIGIN));\n+\n+\n+ Invocation.Builder nullRequest = oidcDiscoveryTarget.request();\n+ nullRequest.header(Cors.ORIGIN_HEADER, \"null\");\n+ Response nullResponse = nullRequest.get();\n+\n+ assertEquals(\"null\", nullResponse.getHeaders().getFirst(Cors.ACCESS_CONTROL_ALLOW_ORIGIN));\n}\n@Test\n" } ]

[ { "change_type": "MODIFY", "old_path": "themes/src/main/resources-community/theme/base/login/messages/messages_es.properties", "new_path": "themes/src/main/resources-community/theme/base/login/messages/messages_es.properties", "diff": "@@ -16,6 +16,7 @@ bypassKerberosDetail=O bien no est\\u00E1s identificado mediante Kerberos o tu na\nkerberosNotSetUp=Kerberos no est\\u00E1 configurado. No puedes identificarte.\nregisterWithTitle=Reg\\u00EDstrate con {0}\nregisterWithTitleHtml={0}\n+loginAccountTitle=Acceder a tu cuenta\nloginTitle=Inicia sesi\\u00F3n en {0}\nloginTitleHtml={0}\nimpersonateTitle={0}\\u00A0Personificar Usuario\n" } ]

[ { "change_type": "MODIFY", "old_path": "quarkus/pom.xml", "new_path": "quarkus/pom.xml", "diff": "<properties>\n<!-- Quarkus version -->\n- <quarkus.version>2.4.1.Final</quarkus.version>\n+ <quarkus.version>2.4.2.Final</quarkus.version>\n<!--\nOverride versions based on Quarkus dependencies.\nSee https://github.com/quarkusio/quarkus/blob/<versionTag>/bom/application/pom.xml\nfor reference\n-->\n- <resteasy.version>4.7.0.Final</resteasy.version>\n+ <resteasy.version>4.7.3.Final</resteasy.version>\n<jackson.version>2.12.5</jackson.version>\n<jackson.databind.version>${jackson.version}</jackson.databind.version>\n<hibernate.core.version>5.6.1.Final</hibernate.core.version>\n" } ]

[ { "change_type": "MODIFY", "old_path": "SECURITY.md", "new_path": "SECURITY.md", "diff": "# Security Policy\n-## Supported Versions\n-\n-To receive fixes for security vulnerabilities it is required to always upgrade to the latest version of Keycloak.\n-See https://www.keycloak.org/downloads for the latest release.\n+The Keycloak team takes security very seriously, and aim to resolve issues as quickly as possible. Building secure\n+software is a continuous process, and can always be improved. As such we welcome reports on potential security\n+vulnerabilities, as well as suggestions around hardening the software and our process.\n-Fixes will only be released for previous releases under special circumstances.\n+## Reporting a suspected vulnerability\n-## Reporting a Vulnerability\n+It is important that suspected vulnerabilities are disclosed in a responsible way, and are not publicly disclosed until\n+after they have been analysed and a fix is available.\n-To report a security vulnerability:\n+To report a security vulnerability, send an email to [email protected].\n-You can report a security vulnerability either through email, or in our issue tracker. If you are uncertain what you have\n-discovered is a vulnerability or you believe it is a critical issue please report using email (or both).\n+If you would like to work with us on a fix for the security vulnerability, please include your GitHub username\n+in the above email, and we will provide you access to a temporary private fork where we can collaborate on a fix\n+without it being disclosed publicly.\n-To report through email send an email to [email protected].\n+Do *not* open a public issue, send a pull request, or disclose any information about the suspected vulnerability publicly.\n+If you discover any publicly disclosed security vulnerabilities, please notify us *immediately* through\[email protected].\n-To report through issue tracker:\n+## Supported Versions\n-* Go to https://issues.jboss.org/browse/KEYCLOAK\n-* Create a new issue in the Keycloak project\n-* Make sure the \"This issue is security relevant\" checkbox is checked\n+Depending on the severity of a vulnerability the issue may be fixed in the current `major.minor` release of Keycloak, or\n+for lower severity vulnerabilities or hardening in the following `major.minor` release. Refer to\n+`https://www.keycloak.org/downloads` to find the latest release.\n-If you have a patch for the issue please use `git format-patch` and attach to the email or issue. Please do not open a\n-pull request on GitHub as that may disclose sensitive details around the vulnerability.\n+If you are unable to regularly upgrade Keycloak we encourage you to consider\n+[Red Hat Single Sign-On](https://access.redhat.com/products/red-hat-single-sign-on), which offers\n+[long term support](https://access.redhat.com/support/policy/updates/jboss_notes#p_sso) of specific versions of Keycloak.\n\\ No newline at end of file\n" } ]

[ { "change_type": "MODIFY", "old_path": "themes/pom.xml", "new_path": "themes/pom.xml", "diff": "<repository>\n<id>github</id>\n<!-- Do not decode the PAT below, as it will force Github to revoke it. -->\n- <url>https://keycloak-packages:&#103;[email protected]/keycloak/keycloak-admin-ui</url>\n+ <url>https://keycloak-packages:&#103;[email protected]/keycloak/keycloak-admin-ui</url>\n<releases>\n<enabled>false</enabled>\n</releases>\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": "@@ -23,9 +23,7 @@ import java.io.File;\nimport java.io.FilenameFilter;\nimport java.nio.file.Path;\nimport java.nio.file.Paths;\n-import java.util.Arrays;\n-import java.util.Collections;\n-import java.util.Map;\n+import java.util.*;\nimport java.util.function.Function;\nimport java.util.stream.Collectors;\n@@ -41,6 +39,8 @@ public final class Environment {\npublic static final String ENV_PROFILE =\"KC_PROFILE\";\npublic static final String DATA_PATH = \"/data\";\npublic static final String DEFAULT_THEMES_PATH = \"/themes\";\n+ public static final String DEV_PROFILE_VALUE = \"dev\";\n+ public static final String USER_INVOKED_CLI_COMMAND = \"picocli.invoked.command\";\nprivate Environment() {}\n@@ -93,6 +93,29 @@ public final class Environment {\nreturn \"./kc.sh\";\n}\n+ /**\n+ * Sets the originally invoked cli args. Useful to verify the originally invoked command\n+ * when calling another cli command internally (e.g. start-dev calls build internally)\n+ */\n+ public static void setUserInvokedCliArgs(List<String> cliArgs) {\n+ System.setProperty(USER_INVOKED_CLI_COMMAND, String.join(\",\", cliArgs));\n+ }\n+\n+ /**\n+ * Reads the previously set system property for the originally command.\n+ * Use the System variable, when you trigger other command executions internally, but need a reference to the\n+ * actually invoked command.\n+ *\n+ * @return the invoked command from the CLI, or empty List if not set.\n+ */\n+ public static List<String> getUserInvokedCliArgs() {\n+ if(System.getProperty(USER_INVOKED_CLI_COMMAND) == null) {\n+ return Collections.emptyList();\n+ }\n+\n+ return List.of(System.getProperty(USER_INVOKED_CLI_COMMAND).split(\",\"));\n+ }\n+\npublic static String getConfigArgs() {\nreturn System.getProperty(CLI_ARGS, \"\");\n}\n@@ -123,7 +146,7 @@ public final class Environment {\n}\npublic static boolean isDevMode() {\n- if (\"dev\".equalsIgnoreCase(getProfile())) {\n+ if (DEV_PROFILE_VALUE.equalsIgnoreCase(getProfile())) {\nreturn true;\n}\n@@ -132,7 +155,11 @@ public final class Environment {\nreturn true;\n}\n- return \"dev\".equals(getBuiltTimeProperty(PROFILE).orElse(null));\n+ return DEV_PROFILE_VALUE.equals(getBuiltTimeProperty(PROFILE).orElse(null));\n+ }\n+\n+ public static boolean isDevProfile(){\n+ return Optional.ofNullable(getProfile()).orElse(\"\").equalsIgnoreCase(DEV_PROFILE_VALUE);\n}\npublic static boolean isImportExportMode() {\n@@ -144,7 +171,7 @@ public final class Environment {\n}\npublic static void forceDevProfile() {\n- setProfile(\"dev\");\n+ setProfile(DEV_PROFILE_VALUE);\n}\npublic static Map<String, File> getProviderFiles() {\n" }, { "change_type": "MODIFY", "old_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/KeycloakMain.java", "new_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/KeycloakMain.java", "diff": "package org.keycloak.quarkus.runtime;\n-import static org.keycloak.quarkus.runtime.Environment.isDevMode;\n+import static org.keycloak.quarkus.runtime.Environment.isDevProfile;\n+import static org.keycloak.quarkus.runtime.Environment.getProfileOrDefault;\nimport static org.keycloak.quarkus.runtime.cli.Picocli.error;\nimport static org.keycloak.quarkus.runtime.cli.Picocli.parseAndRun;\n-import static org.keycloak.quarkus.runtime.Environment.getProfileOrDefault;\nimport java.io.PrintWriter;\nimport java.util.ArrayList;\n@@ -80,7 +80,7 @@ public class KeycloakMain implements QuarkusApplication {\n*/\n@Override\npublic int run(String... args) throws Exception {\n- if (isDevMode()) {\n+ if (isDevProfile()) {\nLOGGER.warnf(\"Running the server in dev mode. DO NOT use this configuration in production.\");\n}\nQuarkus.waitForExit();\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": "@@ -132,12 +132,13 @@ public final class Picocli {\nprivate static boolean requiresReAugmentation(CommandLine cmd) {\nif (hasConfigChanges()) {\ncmd.getOut().println(\"Changes detected in configuration. Updating the server image.\");\n+ if(!isDevMode()) {\ncmd.getOut().printf(\"For an optional runtime and bypass this step, please run the '%s' command prior to starting the server:%n%n\\t%s %s %s%n\",\nBuild.NAME,\nEnvironment.getCommand(),\nBuild.NAME,\nString.join(\" \", asList(ARG_SPLIT.split(Environment.getConfigArgs()))) + \"\\n\");\n-\n+ }\nreturn true;\n}\n@@ -152,6 +153,8 @@ public final class Picocli {\n// force the server image to be set with the dev profile\nEnvironment.forceDevProfile();\n}\n+\n+ Environment.setUserInvokedCliArgs(cliArgs);\n}\nList<String> configArgsList = new ArrayList<>(cliArgs);\n@@ -166,8 +169,10 @@ public final class Picocli {\ncmd.execute(configArgsList.toArray(new String[0]));\n+ if(!isDevMode()) {\ncmd.getOut().printf(\"Next time you run the server, just run:%n%n\\t%s %s%n%n\", Environment.getCommand(), Start.NAME);\n}\n+ }\nprivate static boolean hasProviderChanges() {\nFile propertiesFile = KeycloakConfigSourceProvider.getPersistedConfigFile().toFile();\n" }, { "change_type": "MODIFY", "old_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/AbstractCommand.java", "new_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/AbstractCommand.java", "diff": "@@ -25,6 +25,8 @@ import picocli.CommandLine.Model.CommandSpec;\nimport picocli.CommandLine.Spec;\nimport picocli.CommandLine.Option;\n+import static org.keycloak.quarkus.runtime.cli.Picocli.error;\n+\npublic abstract class AbstractCommand {\n@Spec\n@@ -49,4 +51,8 @@ public abstract class AbstractCommand {\npublic void setConfigFile(String path) {\nSystem.setProperty(KeycloakConfigSourceProvider.KEYCLOAK_CONFIG_FILE_PROP, path);\n}\n+\n+ protected void showDevNotAllowedErrorAndExit(String cmd) {\n+ error(spec.commandLine(), String.format(\"You can not '%s' the server using the 'dev' configuration profile. Please re-build the server first, using './kc.sh build' for the default production profile, or using '/.kc.sh build --profile=<profile>' with a profile more suitable for production.%n\", cmd));\n+ }\n}\n" }, { "change_type": "MODIFY", "old_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/Build.java", "new_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/Build.java", "diff": "package org.keycloak.quarkus.runtime.cli.command;\n-import static org.keycloak.quarkus.runtime.Environment.getHomePath;\n+import static org.keycloak.quarkus.runtime.Environment.*;\nimport static org.keycloak.quarkus.runtime.cli.Picocli.error;\nimport static org.keycloak.quarkus.runtime.cli.Picocli.println;\n@@ -29,6 +29,8 @@ import io.quarkus.bootstrap.runner.RunnerClassLoader;\nimport io.quarkus.runtime.configuration.ProfileManager;\nimport picocli.CommandLine.Command;\n+import java.util.List;\n+\n@Command(name = Build.NAME,\nheader = \"Creates a new and optimized server image.\",\ndescription = {\n@@ -67,14 +69,19 @@ public final class Build extends AbstractCommand implements Runnable {\n@Override\npublic void run() {\n+ exitWithErrorIfDevProfileIsSetAndNotStartDev();\n+\nSystem.setProperty(\"quarkus.launch.rebuild\", \"true\");\nprintln(spec.commandLine(), \"Updating the configuration and installing your custom providers, if any. Please wait.\");\ntry {\nbeforeReaugmentationOnWindows();\nQuarkusEntryPoint.main();\n+\n+ if (!isDevMode()) {\nprintln(spec.commandLine(), \"Server configuration updated and persisted. Run the following command to review the configuration:\\n\");\nprintln(spec.commandLine(), \"\\t\" + Environment.getCommand() + \" show-config\\n\");\n+ }\n} catch (Throwable throwable) {\nerror(spec.commandLine(), \"Failed to update server configuration.\", throwable);\n} finally {\n@@ -82,6 +89,13 @@ public final class Build extends AbstractCommand implements Runnable {\n}\n}\n+ private void exitWithErrorIfDevProfileIsSetAndNotStartDev() {\n+ List<String> userInvokedCliArgs = Environment.getUserInvokedCliArgs();\n+ if(Environment.isDevProfile() && !userInvokedCliArgs.contains(StartDev.NAME)) {\n+ showDevNotAllowedErrorAndExit(Build.NAME);\n+ }\n+ }\n+\nprivate void beforeReaugmentationOnWindows() {\n// On Windows, files generated during re-augmentation are locked and can't be re-created.\n// To workaround this behavior, we reset the internal cache of the runner classloader and force files\n" }, { "change_type": "MODIFY", "old_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/Start.java", "new_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/Start.java", "diff": "package org.keycloak.quarkus.runtime.cli.command;\n+import static org.keycloak.quarkus.runtime.Environment.isDevProfile;\nimport static org.keycloak.quarkus.runtime.cli.Picocli.NO_PARAM_LABEL;\n+import static org.keycloak.quarkus.runtime.cli.Picocli.error;\n+import static org.keycloak.quarkus.runtime.configuration.Configuration.getBuiltTimeProperty;\n+import org.keycloak.quarkus.runtime.Environment;\nimport picocli.CommandLine;\nimport picocli.CommandLine.Command;\n+import java.util.List;\n+import java.util.Optional;\n+\n@Command(name = Start.NAME,\nheader = \"Start the server.\",\ndescription = {\n@@ -44,4 +51,26 @@ public final class Start extends AbstractStartCommand implements Runnable {\nparamLabel = NO_PARAM_LABEL,\norder = 1)\nBoolean autoConfig;\n+\n+ @Override\n+ protected void doBeforeRun() {\n+ checkIfProfileIsNotDev();\n+ }\n+\n+ /**\n+ * Checks if the profile provided by either the current argument, the system environment or the persisted properties is dev.\n+ * Fails with an error when dev profile is used for the start command, or continues with the found profile if its not the dev profile.\n+ */\n+ private void checkIfProfileIsNotDev() {\n+ List<String> currentCliArgs = spec.commandLine().getParseResult().expandedArgs();\n+\n+ Optional<String> currentProfile = Optional.ofNullable(Environment.getProfile());\n+ Optional<String> persistedProfile = getBuiltTimeProperty(\"kc.profile\");\n+\n+ setProfile(currentProfile.orElse(persistedProfile.orElse(\"prod\")));\n+\n+ if (isDevProfile() && (!currentCliArgs.contains(AUTO_BUILD_OPTION_LONG) || !currentCliArgs.contains(AUTO_BUILD_OPTION_SHORT))) {\n+ showDevNotAllowedErrorAndExit(Start.NAME);\n+ }\n+ }\n}\n" }, { "change_type": "MODIFY", "old_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/Messages.java", "new_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/Messages.java", "diff": "@@ -35,7 +35,7 @@ public final class Messages {\npublic static IllegalStateException httpsConfigurationNotSet() {\nStringBuilder builder = new StringBuilder(\"Key material not provided to setup HTTPS. Please configure your keys/certificates\");\n- if (!\"dev\".equals(Environment.getProfile())) {\n+ if (!Environment.DEV_PROFILE_VALUE.equals(Environment.getProfile())) {\nbuilder.append(\" or start the server in development mode\");\n}\nbuilder.append(\".\");\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/build-processor/src/main/java/org/keycloak/models/map/processor/GenerateEntityImplementationsProcessor.java", "new_path": "model/build-processor/src/main/java/org/keycloak/models/map/processor/GenerateEntityImplementationsProcessor.java", "diff": "@@ -554,8 +554,8 @@ public class GenerateEntityImplementationsProcessor extends AbstractProcessor {\n}\npw.println(\"public class \" + mapSimpleClassName + \" implements \" + className + \" {\");\n- pw.println(\" private final org.keycloak.models.map.common.delegate.DelegateProvider<\" + mapSimpleClassName + \"> delegateProvider;\");\n- pw.println(\" public \" + mapSimpleClassName + \"(org.keycloak.models.map.common.delegate.DelegateProvider<\" + mapSimpleClassName + \"> delegateProvider) {\");\n+ pw.println(\" private final org.keycloak.models.map.common.delegate.DelegateProvider<\" + className + \"> delegateProvider;\");\n+ pw.println(\" public \" + mapSimpleClassName + \"(org.keycloak.models.map.common.delegate.DelegateProvider<\" + className + \"> delegateProvider) {\");\npw.println(\" this.delegateProvider = delegateProvider;\");\npw.println(\" }\");\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": "@@ -47,12 +47,25 @@ final class DatabasePropertyMappers {\n.to(\"quarkus.datasource.jdbc.url\")\n.mapFrom(\"db\")\n.transformer((value, context) -> Database.getDefaultUrl(value).orElse(value))\n- .description(\"The database JDBC URL. If not provided, a default URL is set based on the selected database vendor. \" +\n- \"For instance, if using 'postgres', the JDBC URL would be 'jdbc:postgresql://localhost/keycloak'. \" +\n- \"The host, database and properties can be overridden by setting the following system properties,\" +\n- \" respectively: -Dkc.db.url.host, -Dkc.db.url.database, -Dkc.db.url.properties.\")\n+ .description(\"The full database JDBC URL. If not provided, a default URL is set based on the selected database vendor. \" +\n+ \"For instance, if using 'postgres', the default JDBC URL would be 'jdbc:postgresql://localhost/keycloak'. \")\n.paramLabel(\"jdbc-url\")\n.build(),\n+ builder().from(\"db.url.host\")\n+ .to(\"kc.db.url.host\")\n+ .description(\"Sets the hostname of the default JDBC URL of the chosen vendor. If the `db-url` option is set, this option is ignored.\")\n+ .paramLabel(\"hostname\")\n+ .build(),\n+ builder().from(\"db.url.database\")\n+ .to(\"kc.db.url.database\")\n+ .description(\"Sets the database name of the default JDBC URL of the chosen vendor. If the `db-url` option is set, this option is ignored.\")\n+ .paramLabel(\"dbname\")\n+ .build(),\n+ builder().from(\"db.url.properties\")\n+ .to(\"kc.db.url.properties\")\n+ .description(\"Sets the properties of the default JDBC URL of the chosen vendor. If the `db-url` option is set, this option is ignored.\")\n+ .paramLabel(\"properties\")\n+ .build(),\nbuilder().from(\"db.username\")\n.to(\"quarkus.datasource.username\")\n.description(\"The username of the database user.\")\n" }, { "change_type": "MODIFY", "old_path": "quarkus/runtime/src/test/java/org/keycloak/provider/quarkus/ConfigurationTest.java", "new_path": "quarkus/runtime/src/test/java/org/keycloak/provider/quarkus/ConfigurationTest.java", "diff": "@@ -253,6 +253,26 @@ public class ConfigurationTest {\nassertEquals(\"postgresql\", config.getConfigValue(\"quarkus.datasource.db-kind\").getValue());\n}\n+ @Test\n+ public void testDefaultDbPropertiesGetApplied() {\n+ System.setProperty(CLI_ARGS, \"--db=postgres\" + ARG_SEPARATOR + \"--db-url-host=myhost\" + ARG_SEPARATOR + \"--db-url-database=kcdb\" + ARG_SEPARATOR + \"--db-url-properties=?foo=bar\");\n+ SmallRyeConfig config = createConfig();\n+ assertEquals(\"io.quarkus.hibernate.orm.runtime.dialect.QuarkusPostgreSQL10Dialect\",\n+ config.getConfigValue(\"quarkus.hibernate-orm.dialect\").getValue());\n+ assertEquals(\"jdbc:postgresql://myhost/kcdb?foo=bar\", config.getConfigValue(\"quarkus.datasource.jdbc.url\").getValue());\n+ assertEquals(\"postgresql\", config.getConfigValue(\"quarkus.datasource.db-kind\").getValue());\n+ }\n+\n+ @Test\n+ public void testSetDbUrlOverridesDefaultDataSource() {\n+ System.setProperty(CLI_ARGS, \"--db=mariadb\" + ARG_SEPARATOR + \"--db-url-host=myhost\" + ARG_SEPARATOR + \"--db-url=jdbc:mariadb://localhost/keycloak\");\n+ SmallRyeConfig config = createConfig();\n+ assertEquals(\"org.hibernate.dialect.MariaDBDialect\",\n+ config.getConfigValue(\"quarkus.hibernate-orm.dialect\").getValue());\n+ assertEquals(\"jdbc:mariadb://localhost/keycloak\", config.getConfigValue(\"quarkus.datasource.jdbc.url\").getValue());\n+ assertEquals(\"mariadb\", config.getConfigValue(\"quarkus.datasource.db-kind\").getValue());\n+ }\n+\n@Test\npublic void testDatabaseProperties() {\nSystem.setProperty(\"kc.db.url.properties\", \";;test=test;test1=test1\");\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": "@@ -19,6 +19,7 @@ package org.keycloak.forms.login.freemarker;\nimport org.jboss.logging.Logger;\nimport org.keycloak.OAuth2Constants;\nimport org.keycloak.authentication.AuthenticationFlowContext;\n+import org.keycloak.authentication.authenticators.browser.AbstractUsernameFormAuthenticator;\nimport org.keycloak.authentication.authenticators.browser.OTPFormAuthenticator;\nimport org.keycloak.authentication.requiredactions.util.UpdateProfileContext;\nimport org.keycloak.authentication.requiredactions.util.UserUpdateProfileContext;\n@@ -52,6 +53,7 @@ import org.keycloak.models.KeycloakSession;\nimport org.keycloak.models.RealmModel;\nimport org.keycloak.models.UserModel;\nimport org.keycloak.models.utils.FormMessage;\n+import org.keycloak.protocol.oidc.OIDCLoginProtocol;\nimport org.keycloak.services.Urls;\nimport org.keycloak.services.messages.Messages;\nimport org.keycloak.services.resources.LoginActionsService;\n@@ -69,6 +71,7 @@ import org.keycloak.userprofile.UserProfileContext;\nimport org.keycloak.userprofile.UserProfileProvider;\nimport org.keycloak.utils.MediaType;\n+import javax.ws.rs.core.MultivaluedHashMap;\nimport javax.ws.rs.core.MultivaluedMap;\nimport javax.ws.rs.core.Response;\nimport javax.ws.rs.core.UriBuilder;\n@@ -534,6 +537,10 @@ public class FreeMarkerLoginFormsProvider implements LoginFormsProvider {\n@Override\npublic Response createPasswordReset() {\n+ String loginHint = authenticationSession.getClientNote(OIDCLoginProtocol.LOGIN_HINT_PARAM);\n+ if (loginHint != null && !loginHint.isEmpty()) {\n+ authenticationSession.setAuthNote(AbstractUsernameFormAuthenticator.ATTEMPTED_USERNAME, loginHint);\n+ }\nreturn createResponse(LoginFormsPages.LOGIN_RESET_PASSWORD);\n}\n@@ -549,6 +556,16 @@ public class FreeMarkerLoginFormsProvider implements LoginFormsProvider {\n@Override\npublic Response createRegistration() {\n+ String loginHint = authenticationSession.getClientNote(OIDCLoginProtocol.LOGIN_HINT_PARAM);\n+ if (loginHint != null && !loginHint.isEmpty()) {\n+ this.formData = new MultivaluedHashMap<>();\n+ if(this.realm.isRegistrationEmailAsUsername()) {\n+ this.formData.putSingle(\"email\", loginHint);\n+ } else {\n+ this.formData.putSingle(\"username\", loginHint);\n+ }\n+ }\n+\nreturn createResponse(LoginFormsPages.REGISTER);\n}\n" }, { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/protocol/oidc/OIDCLoginProtocolService.java", "new_path": "services/src/main/java/org/keycloak/protocol/oidc/OIDCLoginProtocolService.java", "diff": "@@ -119,6 +119,11 @@ public class OIDCLoginProtocolService {\nreturn uriBuilder.path(OIDCLoginProtocolService.class, \"auth\");\n}\n+ public static UriBuilder registrationsUrl(UriBuilder baseUriBuilder) {\n+ UriBuilder uriBuilder = tokenServiceBaseUrl(baseUriBuilder);\n+ return uriBuilder.path(OIDCLoginProtocolService.class, \"registrations\");\n+ }\n+\npublic static UriBuilder delegatedUrl(UriInfo uriInfo) {\nUriBuilder uriBuilder = tokenServiceBaseUrl(uriInfo);\nreturn uriBuilder.path(OIDCLoginProtocolService.class, \"kcinitBrowserLoginComplete\");\n@@ -172,7 +177,7 @@ public class OIDCLoginProtocolService {\n* Registration endpoint\n*/\n@Path(\"registrations\")\n- public Object registerPage() {\n+ public Object registrations() {\nAuthorizationEndpoint endpoint = new AuthorizationEndpoint(realm, event);\nResteasyProviderFactory.getInstance().injectProperties(endpoint);\nreturn endpoint.register();\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/RegisterPage.java", "new_path": "testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/RegisterPage.java", "diff": "@@ -19,6 +19,7 @@ package org.keycloak.testsuite.pages;\nimport org.jboss.arquillian.graphene.page.Page;\nimport org.junit.Assert;\n+import org.keycloak.protocol.oidc.OIDCLoginProtocol;\nimport org.keycloak.testsuite.auth.page.AccountFields;\nimport org.keycloak.testsuite.auth.page.PasswordFields;\nimport org.keycloak.testsuite.util.UIUtils;\n@@ -232,7 +233,13 @@ public class RegisterPage extends AbstractPage {\n@Override\npublic void open() {\n- throw new UnsupportedOperationException();\n+ oauth.openRegistrationForm();\n+ assertCurrent();\n+ }\n+\n+ public void openWithLoginHint(String loginHint) {\n+ oauth.addCustomParameter(OIDCLoginProtocol.LOGIN_HINT_PARAM, loginHint).openRegistrationForm();\n+ assertCurrent();\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/OAuthClient.java", "new_path": "testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/OAuthClient.java", "diff": "@@ -1324,6 +1324,10 @@ public class OAuthClient {\ndriver.navigate().to(getLoginFormUrl());\n}\n+ public void openRegistrationForm() {\n+ driver.navigate().to(getRegistrationFormUrl());\n+ }\n+\npublic void openOAuth2DeviceVerificationForm(String verificationUri) {\ndriver.navigate().to(verificationUri);\n}\n@@ -1413,6 +1417,30 @@ public class OAuthClient {\nreturn b.build(realm).toString();\n}\n+ private String getRegistrationFormUrl() {\n+ UriBuilder b = OIDCLoginProtocolService.registrationsUrl(UriBuilder.fromUri(baseUrl));\n+ if (responseType != null) {\n+ b.queryParam(OAuth2Constants.RESPONSE_TYPE, responseType);\n+ }\n+ if (clientId != null) {\n+ b.queryParam(OAuth2Constants.CLIENT_ID, clientId);\n+ }\n+ if (redirectUri != null) {\n+ b.queryParam(OAuth2Constants.REDIRECT_URI, redirectUri);\n+ }\n+\n+ String scopeParam = openid ? TokenUtil.attachOIDCScope(scope) : scope;\n+ if (scopeParam != null && !scopeParam.isEmpty()) {\n+ b.queryParam(OAuth2Constants.SCOPE, scopeParam);\n+ }\n+\n+ if (customParameters != null) {\n+ customParameters.keySet().stream().forEach(i -> b.queryParam(i, customParameters.get(i)));\n+ }\n+\n+ return b.build(realm).toString();\n+ }\n+\npublic Entity getLoginEntityForPOST() {\nForm form = new Form()\n.param(OAuth2Constants.SCOPE, TokenUtil.attachOIDCScope(scope))\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RegisterTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RegisterTest.java", "diff": "@@ -606,6 +606,23 @@ public class RegisterTest extends AbstractTestRealmKeycloakTest {\n}\n}\n+ @Test\n+ public void registerWithLoginHint() throws IOException {\n+\n+ registerPage.openWithLoginHint(\"username_test\");\n+\n+ assertEquals(\"username_test\", registerPage.getUsername());\n+ }\n+\n+ @Test\n+ public void registerWithLoginHint_emailAsUsername() throws IOException {\n+ try (RealmAttributeUpdater rau = configureRealmRegistrationEmailAsUsername(true).update()) {\n+ registerPage.openWithLoginHint(\"[email protected]\");\n+\n+ assertEquals(\"[email protected]\", registerPage.getEmail());\n+ }\n+ }\n+\n//KEYCLOAK-14161\n@Test\npublic void customRegistrationPageFormTest() {\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ResetPasswordTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ResetPasswordTest.java", "diff": "@@ -1209,6 +1209,18 @@ public class ResetPasswordTest extends AbstractTestRealmKeycloakTest {\nassertEquals(\"Invalid email address.\", errorPage.getError());\n}\n+ @Test\n+ public void resetPasswordWithLoginHint() throws IOException {\n+ // Redirect directly to KC \"forgot password\" endpoint instead of \"authenticate\" endpoint\n+ String loginUrl = oauth.getLoginFormUrl();\n+ String forgotPasswordUrl = loginUrl.replace(\"/auth?\", \"/forgot-credentials?\"); // Workaround, but works\n+\n+ driver.navigate().to(forgotPasswordUrl + \"&login_hint=test\");\n+ resetPasswordPage.assertCurrent();\n+\n+ assertEquals(\"test\", resetPasswordPage.getUsername());\n+ }\n+\nprivate void changePasswordOnUpdatePage(WebDriver driver) {\nassertThat(driver.getPageSource(), Matchers.containsString(\"You need to change your password.\"));\n" } ]

[ { "change_type": "MODIFY", "old_path": "server-spi-private/src/main/java/org/keycloak/models/utils/DefaultKeyProviders.java", "new_path": "server-spi-private/src/main/java/org/keycloak/models/utils/DefaultKeyProviders.java", "diff": "@@ -21,6 +21,7 @@ import org.keycloak.common.util.MultivaluedHashMap;\nimport org.keycloak.component.ComponentModel;\nimport org.keycloak.crypto.Algorithm;\nimport org.keycloak.crypto.KeyUse;\n+import org.keycloak.jose.jwe.JWEConstants;\nimport org.keycloak.keys.KeyProvider;\nimport org.keycloak.models.RealmModel;\n@@ -33,15 +34,18 @@ public class DefaultKeyProviders {\npublic static void createProviders(RealmModel realm) {\nif (!hasProvider(realm, \"rsa-generated\")) {\n- createRsaKeyProvider(\"rsa-generated\", KeyUse.SIG, realm);\n- createRsaKeyProvider(\"rsa-enc-generated\", KeyUse.ENC, realm);\n+ createRsaKeyProvider(\"rsa-generated\", realm);\n+ }\n+\n+ if (!hasProvider(realm, \"rsa-enc-generated\")) {\n+ createRsaEncKeyProvider(\"rsa-enc-generated\", realm);\n}\ncreateSecretProvider(realm);\ncreateAesProvider(realm);\n}\n- private static void createRsaKeyProvider(String name, KeyUse keyUse, RealmModel realm) {\n+ private static void createRsaKeyProvider(String name, RealmModel realm) {\nComponentModel generated = new ComponentModel();\ngenerated.setName(name);\ngenerated.setParentId(realm.getId());\n@@ -50,7 +54,23 @@ public class DefaultKeyProviders {\nMultivaluedHashMap<String, String> config = new MultivaluedHashMap<>();\nconfig.putSingle(\"priority\", \"100\");\n- config.putSingle(\"keyUse\", keyUse.getSpecName());\n+ config.putSingle(\"keyUse\", KeyUse.SIG.name());\n+ generated.setConfig(config);\n+\n+ realm.addComponentModel(generated);\n+ }\n+\n+ private static void createRsaEncKeyProvider(String name, RealmModel realm) {\n+ ComponentModel generated = new ComponentModel();\n+ generated.setName(name);\n+ generated.setParentId(realm.getId());\n+ generated.setProviderId(\"rsa-enc-generated\");\n+ generated.setProviderType(KeyProvider.class.getName());\n+\n+ MultivaluedHashMap<String, String> config = new MultivaluedHashMap<>();\n+ config.putSingle(\"priority\", \"100\");\n+ config.putSingle(\"keyUse\", KeyUse.ENC.name());\n+ config.putSingle(\"algorithm\", JWEConstants.RSA_OAEP);\ngenerated.setConfig(config);\nrealm.addComponentModel(generated);\n" }, { "change_type": "ADD", "old_path": null, "new_path": "services/src/main/java/org/keycloak/keys/AbstractGeneratedRsaKeyProviderFactory.java", "diff": "+/*\n+ * Copyright 2021 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.keys;\n+\n+import java.security.KeyPair;\n+import java.security.PrivateKey;\n+import java.security.cert.Certificate;\n+import java.security.interfaces.RSAPrivateKey;\n+\n+import org.jboss.logging.Logger;\n+import org.keycloak.common.util.CertificateUtils;\n+import org.keycloak.common.util.KeyUtils;\n+import org.keycloak.common.util.MultivaluedHashMap;\n+import org.keycloak.common.util.PemUtils;\n+import org.keycloak.component.ComponentModel;\n+import org.keycloak.component.ComponentValidationException;\n+import org.keycloak.crypto.KeyUse;\n+import org.keycloak.models.KeycloakSession;\n+import org.keycloak.models.RealmModel;\n+import org.keycloak.provider.ConfigurationValidationHelper;\n+import org.keycloak.provider.ProviderConfigurationBuilder;\n+\n+public abstract class AbstractGeneratedRsaKeyProviderFactory extends AbstractRsaKeyProviderFactory {\n+\n+ abstract protected Logger getLogger();\n+\n+ public final static ProviderConfigurationBuilder rsaKeyConfigurationBuilder() {\n+ return ProviderConfigurationBuilder.create()\n+ .property(Attributes.PRIORITY_PROPERTY)\n+ .property(Attributes.ENABLED_PROPERTY)\n+ .property(Attributes.ACTIVE_PROPERTY);\n+ }\n+\n+ @Override\n+ public boolean createFallbackKeys(KeycloakSession session, KeyUse keyUse, String algorithm) {\n+ if (isValidKeyUse(keyUse) && isSupportedRsaAlgorithm(algorithm)) {\n+ RealmModel realm = session.getContext().getRealm();\n+\n+ ComponentModel generated = new ComponentModel();\n+ generated.setName(\"fallback-\" + algorithm);\n+ generated.setParentId(realm.getId());\n+ generated.setProviderId(getId());\n+ generated.setProviderType(KeyProvider.class.getName());\n+\n+ MultivaluedHashMap<String, String> config = new MultivaluedHashMap<>();\n+ config.putSingle(Attributes.PRIORITY_KEY, \"-100\");\n+ config.putSingle(Attributes.ALGORITHM_KEY, algorithm);\n+ generated.setConfig(config);\n+\n+ realm.addComponentModel(generated);\n+\n+ return true;\n+ } else {\n+ return false;\n+ }\n+ }\n+\n+ abstract protected boolean isValidKeyUse(KeyUse keyUse);\n+\n+ abstract protected boolean isSupportedRsaAlgorithm(String algorithm);\n+\n+ @Override\n+ public void validateConfiguration(KeycloakSession session, RealmModel realm, ComponentModel model) throws ComponentValidationException {\n+ super.validateConfiguration(session, realm, model);\n+\n+ ConfigurationValidationHelper.check(model).checkList(Attributes.KEY_SIZE_PROPERTY, false);\n+\n+ int size = model.get(Attributes.KEY_SIZE_KEY, 2048);\n+\n+ if (!(model.contains(Attributes.PRIVATE_KEY_KEY) && model.contains(Attributes.CERTIFICATE_KEY))) {\n+ generateKeys(realm, model, size);\n+\n+ getLogger().debugv(\"Generated keys for {0}\", realm.getName());\n+ } else {\n+ PrivateKey privateKey = PemUtils.decodePrivateKey(model.get(Attributes.PRIVATE_KEY_KEY));\n+ int currentSize = ((RSAPrivateKey) privateKey).getModulus().bitLength();\n+ if (currentSize != size) {\n+ generateKeys(realm, model, size);\n+\n+ getLogger().debugv(\"Key size changed, generating new keys for {0}\", realm.getName());\n+ }\n+ }\n+ }\n+\n+ private void generateKeys(RealmModel realm, ComponentModel model, int size) {\n+ KeyPair keyPair;\n+ try {\n+ keyPair = KeyUtils.generateRsaKeyPair(size);\n+ model.put(Attributes.PRIVATE_KEY_KEY, PemUtils.encodeKey(keyPair.getPrivate()));\n+ } catch (Throwable t) {\n+ throw new ComponentValidationException(\"Failed to generate keys\", t);\n+ }\n+\n+ generateCertificate(realm, model, keyPair);\n+ }\n+\n+ private void generateCertificate(RealmModel realm, ComponentModel model, KeyPair keyPair) {\n+ try {\n+ Certificate certificate = CertificateUtils.generateV1SelfSignedCertificate(keyPair, realm.getName());\n+ model.put(Attributes.CERTIFICATE_KEY, PemUtils.encodeCertificate(certificate));\n+ } catch (Throwable t) {\n+ throw new ComponentValidationException(\"Failed to generate certificate\", t);\n+ }\n+ }\n+}\n" }, { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/keys/Attributes.java", "new_path": "services/src/main/java/org/keycloak/keys/Attributes.java", "diff": "@@ -19,6 +19,7 @@ package org.keycloak.keys;\nimport org.keycloak.crypto.Algorithm;\nimport org.keycloak.crypto.KeyUse;\n+import org.keycloak.jose.jwe.JWEConstants;\nimport org.keycloak.provider.ProviderConfigProperty;\nimport static org.keycloak.provider.ProviderConfigProperty.*;\n@@ -69,4 +70,8 @@ public interface Attributes {\nAlgorithm.HS256,\nAlgorithm.HS256, Algorithm.HS384, Algorithm.HS512);\n+ ProviderConfigProperty RS_ENC_ALGORITHM_PROPERTY = new ProviderConfigProperty(ALGORITHM_KEY, \"Algorithm\", \"Intended algorithm for the key encryption\", LIST_TYPE,\n+ JWEConstants.RSA_OAEP,\n+ JWEConstants.RSA1_5, JWEConstants.RSA_OAEP, JWEConstants.RSA_OAEP_256);\n+\n}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "services/src/main/java/org/keycloak/keys/GeneratedRsaEncKeyProviderFactory.java", "diff": "+/*\n+ * Copyright 2021 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.keys;\n+\n+import java.util.List;\n+\n+import org.jboss.logging.Logger;\n+import org.keycloak.component.ComponentModel;\n+import org.keycloak.crypto.KeyUse;\n+import org.keycloak.jose.jwe.JWEConstants;\n+import org.keycloak.models.KeycloakSession;\n+import org.keycloak.provider.ProviderConfigProperty;\n+\n+/**\n+ * @author <a href=\"mailto:[email protected]\">Takashi Norimatsu</a>\n+ */\n+public class GeneratedRsaEncKeyProviderFactory extends AbstractGeneratedRsaKeyProviderFactory {\n+\n+ private static final Logger logger = Logger.getLogger(GeneratedRsaEncKeyProviderFactory.class);\n+\n+ public static final String ID = \"rsa-enc-generated\";\n+\n+ private static final String HELP_TEXT = \"Generates RSA keys for key encryption and creates a self-signed certificate\";\n+\n+ private static final List<ProviderConfigProperty> CONFIG_PROPERTIES = AbstractGeneratedRsaKeyProviderFactory.rsaKeyConfigurationBuilder()\n+ .property(Attributes.KEY_SIZE_PROPERTY)\n+ .property(Attributes.RS_ENC_ALGORITHM_PROPERTY)\n+ .build();\n+\n+ @Override\n+ public KeyProvider create(KeycloakSession session, ComponentModel model) {\n+ model.put(Attributes.KEY_USE, KeyUse.ENC.name());\n+ return new ImportedRsaKeyProvider(session.getContext().getRealm(), model);\n+ }\n+\n+ @Override\n+ public String getHelpText() {\n+ return HELP_TEXT;\n+ }\n+\n+ @Override\n+ public List<ProviderConfigProperty> getConfigProperties() {\n+ return CONFIG_PROPERTIES;\n+ }\n+\n+ @Override\n+ public String getId() {\n+ return ID;\n+ }\n+\n+ @Override\n+ protected boolean isValidKeyUse(KeyUse keyUse) {\n+ return keyUse.equals(KeyUse.ENC);\n+ }\n+\n+ @Override\n+ protected boolean isSupportedRsaAlgorithm(String algorithm) {\n+ return algorithm.equals(JWEConstants.RSA1_5)\n+ || algorithm.equals(JWEConstants.RSA_OAEP)\n+ || algorithm.equals(JWEConstants.RSA_OAEP_256);\n+ }\n+\n+ @Override\n+ protected Logger getLogger() {\n+ return logger;\n+ }\n+\n+}\n" }, { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/keys/GeneratedRsaKeyProviderFactory.java", "new_path": "services/src/main/java/org/keycloak/keys/GeneratedRsaKeyProviderFactory.java", "diff": "package org.keycloak.keys;\nimport org.jboss.logging.Logger;\n-import org.keycloak.common.util.CertificateUtils;\n-import org.keycloak.common.util.KeyUtils;\n-import org.keycloak.common.util.MultivaluedHashMap;\n-import org.keycloak.common.util.PemUtils;\nimport org.keycloak.component.ComponentModel;\n-import org.keycloak.component.ComponentValidationException;\nimport org.keycloak.crypto.Algorithm;\nimport org.keycloak.crypto.KeyUse;\nimport org.keycloak.models.KeycloakSession;\n-import org.keycloak.models.RealmModel;\n-import org.keycloak.provider.ConfigurationValidationHelper;\nimport org.keycloak.provider.ProviderConfigProperty;\n-import java.security.KeyPair;\n-import java.security.PrivateKey;\n-import java.security.cert.Certificate;\n-import java.security.interfaces.RSAPrivateKey;\nimport java.util.List;\n/**\n* @author <a href=\"mailto:[email protected]\">Stian Thorgersen</a>\n*/\n-public class GeneratedRsaKeyProviderFactory extends AbstractRsaKeyProviderFactory {\n+public class GeneratedRsaKeyProviderFactory extends AbstractGeneratedRsaKeyProviderFactory {\nprivate static final Logger logger = Logger.getLogger(GeneratedRsaKeyProviderFactory.class);\npublic static final String ID = \"rsa-generated\";\n- private static final String HELP_TEXT = \"Generates RSA keys and creates a self-signed certificate\";\n+ private static final String HELP_TEXT = \"Generates RSA signature keys and creates a self-signed certificate\";\n- private static final List<ProviderConfigProperty> CONFIG_PROPERTIES = AbstractRsaKeyProviderFactory.configurationBuilder()\n+ private static final List<ProviderConfigProperty> CONFIG_PROPERTIES = AbstractGeneratedRsaKeyProviderFactory.rsaKeyConfigurationBuilder()\n.property(Attributes.KEY_SIZE_PROPERTY)\n- .property(Attributes.KEY_USE_PROPERTY)\n+ .property(Attributes.RS_ALGORITHM_PROPERTY)\n.build();\n@Override\npublic KeyProvider create(KeycloakSession session, ComponentModel model) {\n+ if (model.getConfig().get(Attributes.KEY_USE) == null) {\n+ // for backward compatibility : it allows \"enc\" key use for \"rsa-generated\" provider\n+ model.put(Attributes.KEY_USE, KeyUse.SIG.name());\n+ }\nreturn new ImportedRsaKeyProvider(session.getContext().getRealm(), model);\n}\n@Override\n- public boolean createFallbackKeys(KeycloakSession session, KeyUse keyUse, String algorithm) {\n- if (keyUse.equals(KeyUse.SIG) && isSupportedRsaAlgorithm(algorithm)) {\n- RealmModel realm = session.getContext().getRealm();\n-\n- ComponentModel generated = new ComponentModel();\n- generated.setName(\"fallback-\" + algorithm);\n- generated.setParentId(realm.getId());\n- generated.setProviderId(ID);\n- generated.setProviderType(KeyProvider.class.getName());\n-\n- MultivaluedHashMap<String, String> config = new MultivaluedHashMap<>();\n- config.putSingle(Attributes.PRIORITY_KEY, \"-100\");\n- config.putSingle(Attributes.ALGORITHM_KEY, algorithm);\n- generated.setConfig(config);\n-\n- realm.addComponentModel(generated);\n-\n- return true;\n- } else {\n- return false;\n- }\n- }\n-\n- private boolean isSupportedRsaAlgorithm(String algorithm) {\n- return algorithm.equals(Algorithm.RS256)\n- || algorithm.equals(Algorithm.PS256)\n- || algorithm.equals(Algorithm.RS384)\n- || algorithm.equals(Algorithm.PS384)\n- || algorithm.equals(Algorithm.RS512)\n- || algorithm.equals(Algorithm.PS512);\n+ public String getHelpText() {\n+ return HELP_TEXT;\n}\n@Override\n- public void validateConfiguration(KeycloakSession session, RealmModel realm, ComponentModel model) throws ComponentValidationException {\n- super.validateConfiguration(session, realm, model);\n-\n- ConfigurationValidationHelper.check(model).checkList(Attributes.KEY_SIZE_PROPERTY, false);\n-\n- int size = model.get(Attributes.KEY_SIZE_KEY, 2048);\n-\n- if (!(model.contains(Attributes.PRIVATE_KEY_KEY) && model.contains(Attributes.CERTIFICATE_KEY))) {\n- generateKeys(realm, model, size);\n-\n- logger.debugv(\"Generated keys for {0}\", realm.getName());\n- } else {\n- PrivateKey privateKey = PemUtils.decodePrivateKey(model.get(Attributes.PRIVATE_KEY_KEY));\n- int currentSize = ((RSAPrivateKey) privateKey).getModulus().bitLength();\n- if (currentSize != size) {\n- generateKeys(realm, model, size);\n-\n- logger.debugv(\"Key size changed, generating new keys for {0}\", realm.getName());\n- }\n- }\n- }\n-\n- private void generateKeys(RealmModel realm, ComponentModel model, int size) {\n- KeyPair keyPair;\n- try {\n- keyPair = KeyUtils.generateRsaKeyPair(size);\n- model.put(Attributes.PRIVATE_KEY_KEY, PemUtils.encodeKey(keyPair.getPrivate()));\n- } catch (Throwable t) {\n- throw new ComponentValidationException(\"Failed to generate keys\", t);\n- }\n-\n- generateCertificate(realm, model, keyPair);\n+ public List<ProviderConfigProperty> getConfigProperties() {\n+ return CONFIG_PROPERTIES;\n}\n- private void generateCertificate(RealmModel realm, ComponentModel model, KeyPair keyPair) {\n- try {\n- Certificate certificate = CertificateUtils.generateV1SelfSignedCertificate(keyPair, realm.getName());\n- model.put(Attributes.CERTIFICATE_KEY, PemUtils.encodeCertificate(certificate));\n- } catch (Throwable t) {\n- throw new ComponentValidationException(\"Failed to generate certificate\", t);\n- }\n+ @Override\n+ public String getId() {\n+ return ID;\n}\n@Override\n- public String getHelpText() {\n- return HELP_TEXT;\n+ protected boolean isValidKeyUse(KeyUse keyUse) {\n+ return keyUse.equals(KeyUse.SIG);\n}\n@Override\n- public List<ProviderConfigProperty> getConfigProperties() {\n- return CONFIG_PROPERTIES;\n+ protected boolean isSupportedRsaAlgorithm(String algorithm) {\n+ return algorithm.equals(Algorithm.RS256)\n+ || algorithm.equals(Algorithm.PS256)\n+ || algorithm.equals(Algorithm.RS384)\n+ || algorithm.equals(Algorithm.PS384)\n+ || algorithm.equals(Algorithm.RS512)\n+ || algorithm.equals(Algorithm.PS512);\n}\n@Override\n- public String getId() {\n- return ID;\n+ protected Logger getLogger() {\n+ return logger;\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "services/src/main/resources/META-INF/services/org.keycloak.keys.KeyProviderFactory", "new_path": "services/src/main/resources/META-INF/services/org.keycloak.keys.KeyProviderFactory", "diff": "@@ -21,3 +21,4 @@ org.keycloak.keys.GeneratedRsaKeyProviderFactory\norg.keycloak.keys.JavaKeystoreKeyProviderFactory\norg.keycloak.keys.ImportedRsaKeyProviderFactory\norg.keycloak.keys.GeneratedEcdsaKeyProviderFactory\n+org.keycloak.keys.GeneratedRsaEncKeyProviderFactory\n\\ No newline at end of file\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/keys/GeneratedRsaKeyProviderTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/keys/GeneratedRsaKeyProviderTest.java", "diff": "@@ -22,9 +22,10 @@ import org.junit.Rule;\nimport org.junit.Test;\nimport org.keycloak.common.util.MultivaluedHashMap;\nimport org.keycloak.common.util.PemUtils;\n+import org.keycloak.crypto.KeyUse;\nimport org.keycloak.jose.jws.AlgorithmType;\n+import org.keycloak.keys.GeneratedRsaEncKeyProviderFactory;\nimport org.keycloak.keys.GeneratedRsaKeyProviderFactory;\n-import org.keycloak.keys.KeyMetadata;\nimport org.keycloak.keys.KeyProvider;\nimport org.keycloak.representations.idm.ComponentRepresentation;\nimport org.keycloak.representations.idm.ErrorRepresentation;\n@@ -64,10 +65,19 @@ public class GeneratedRsaKeyProviderTest extends AbstractKeycloakTest {\n}\n@Test\n- public void defaultKeysize() throws Exception {\n+ public void defaultKeysizeForSig() throws Exception {\n+ defaultKeysize(GeneratedRsaKeyProviderFactory.ID, KeyUse.SIG);\n+ }\n+\n+ @Test\n+ public void defaultKeysizeForEnc() throws Exception {\n+ defaultKeysize(GeneratedRsaEncKeyProviderFactory.ID, KeyUse.ENC);\n+ }\n+\n+ private void defaultKeysize(String providerId, KeyUse keyUse) throws Exception {\nlong priority = System.currentTimeMillis();\n- ComponentRepresentation rep = createRep(\"valid\", GeneratedRsaKeyProviderFactory.ID);\n+ ComponentRepresentation rep = createRep(\"valid\", providerId);\nrep.setConfig(new MultivaluedHashMap<>());\nrep.getConfig().putSingle(\"priority\", Long.toString(priority));\n@@ -88,13 +98,23 @@ public class GeneratedRsaKeyProviderTest extends AbstractKeycloakTest {\nassertEquals(AlgorithmType.RSA.name(), key.getType());\nassertEquals(priority, key.getProviderPriority());\nassertEquals(2048, ((RSAPublicKey) PemUtils.decodePublicKey(keys.getKeys().get(0).getPublicKey())).getModulus().bitLength());\n+ assertEquals(keyUse, key.getUse());\n}\n@Test\n- public void largeKeysize() throws Exception {\n+ public void largeKeysizeForSig() throws Exception {\n+ largeKeysize(GeneratedRsaKeyProviderFactory.ID, KeyUse.SIG);\n+ }\n+\n+ @Test\n+ public void largeKeysizeForEnc() throws Exception {\n+ largeKeysize(GeneratedRsaEncKeyProviderFactory.ID, KeyUse.ENC);\n+ }\n+\n+ private void largeKeysize(String providerId, KeyUse keyUse) throws Exception {\nlong priority = System.currentTimeMillis();\n- ComponentRepresentation rep = createRep(\"valid\", GeneratedRsaKeyProviderFactory.ID);\n+ ComponentRepresentation rep = createRep(\"valid\", providerId);\nrep.setConfig(new MultivaluedHashMap<>());\nrep.getConfig().putSingle(\"priority\", Long.toString(priority));\nrep.getConfig().putSingle(\"keySize\", \"4096\");\n@@ -116,13 +136,23 @@ public class GeneratedRsaKeyProviderTest extends AbstractKeycloakTest {\nassertEquals(AlgorithmType.RSA.name(), key.getType());\nassertEquals(priority, key.getProviderPriority());\nassertEquals(4096, ((RSAPublicKey) PemUtils.decodePublicKey(keys.getKeys().get(0).getPublicKey())).getModulus().bitLength());\n+ assertEquals(keyUse, key.getUse());\n+ }\n+\n+ @Test\n+ public void updatePriorityForSig() throws Exception {\n+ updatePriority(GeneratedRsaKeyProviderFactory.ID, KeyUse.SIG);\n}\n@Test\n- public void updatePriority() throws Exception {\n+ public void updatePriorityForEnc() throws Exception {\n+ updatePriority(GeneratedRsaEncKeyProviderFactory.ID, KeyUse.ENC);\n+ }\n+\n+ private void updatePriority(String providerId, KeyUse keyUse) throws Exception {\nlong priority = System.currentTimeMillis();\n- ComponentRepresentation rep = createRep(\"valid\", GeneratedRsaKeyProviderFactory.ID);\n+ ComponentRepresentation rep = createRep(\"valid\", providerId);\nrep.setConfig(new MultivaluedHashMap<>());\nrep.getConfig().putSingle(\"priority\", Long.toString(priority));\n@@ -147,13 +177,23 @@ public class GeneratedRsaKeyProviderTest extends AbstractKeycloakTest {\nString publicKey2 = keys.getKeys().get(0).getPublicKey();\nassertEquals(publicKey, publicKey2);\n+ assertEquals(keyUse, keys.getKeys().get(0).getUse());\n+ }\n+\n+ @Test\n+ public void updateKeysizeForSig() throws Exception {\n+ updateKeysize(GeneratedRsaKeyProviderFactory.ID, KeyUse.SIG);\n}\n@Test\n- public void updateKeysize() throws Exception {\n+ public void updateKeysizeForEnc() throws Exception {\n+ updateKeysize(GeneratedRsaEncKeyProviderFactory.ID, KeyUse.ENC);\n+ }\n+\n+ private void updateKeysize(String providerId, KeyUse keyUse) throws Exception {\nlong priority = System.currentTimeMillis();\n- ComponentRepresentation rep = createRep(\"valid\", GeneratedRsaKeyProviderFactory.ID);\n+ ComponentRepresentation rep = createRep(\"valid\", providerId);\nrep.setConfig(new MultivaluedHashMap<>());\nrep.getConfig().putSingle(\"priority\", Long.toString(priority));\n@@ -177,11 +217,21 @@ public class GeneratedRsaKeyProviderTest extends AbstractKeycloakTest {\nassertNotEquals(publicKey, publicKey2);\nassertEquals(2048, ((RSAPublicKey) PemUtils.decodePublicKey(publicKey)).getModulus().bitLength());\nassertEquals(4096, ((RSAPublicKey) PemUtils.decodePublicKey(publicKey2)).getModulus().bitLength());\n+ assertEquals(keyUse, keys.getKeys().get(0).getUse());\n+ }\n+\n+ @Test\n+ public void invalidKeysizeForSig() throws Exception {\n+ invalidKeysize(GeneratedRsaKeyProviderFactory.ID);\n}\n@Test\n- public void invalidKeysize() throws Exception {\n- ComponentRepresentation rep = createRep(\"invalid\", GeneratedRsaKeyProviderFactory.ID);\n+ public void invalidKeysizeForEnd() throws Exception {\n+ invalidKeysize(GeneratedRsaEncKeyProviderFactory.ID);\n+ }\n+\n+ private void invalidKeysize(String providerId) throws Exception {\n+ ComponentRepresentation rep = createRep(\"invalid\", providerId);\nrep.getConfig().putSingle(\"keySize\", \"1234\");\nResponse response = adminClient.realm(\"test\").components().add(rep);\n" } ]

[ { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/protocol/oidc/grants/device/DeviceGrantType.java", "new_path": "services/src/main/java/org/keycloak/protocol/oidc/grants/device/DeviceGrantType.java", "diff": "@@ -273,15 +273,14 @@ public class DeviceGrantType {\n// Compute client scopes again from scope parameter. Check if user still has them granted\n// (but in device_code-to-token request, it could just theoretically happen that they are not available)\nString scopeParam = deviceCodeModel.getScope();\n- Stream<ClientScopeModel> clientScopes = TokenManager.getRequestedClientScopes(scopeParam, client);\n- if (!TokenManager.verifyConsentStillAvailable(session, user, client, clientScopes)) {\n+ if (!TokenManager.verifyConsentStillAvailable(session, user, client, TokenManager.getRequestedClientScopes(scopeParam, client))) {\nevent.error(Errors.NOT_ALLOWED);\nthrow new CorsErrorResponseException(cors, OAuthErrorException.INVALID_SCOPE,\n\"Client no longer has requested consent from user\", Response.Status.BAD_REQUEST);\n}\nClientSessionContext clientSessionCtx = DefaultClientSessionContext.fromClientSessionAndClientScopes(clientSession,\n- clientScopes, session);\n+ TokenManager.getRequestedClientScopes(scopeParam, client), session);\n// Set nonce as an attribute in the ClientSessionContext. Will be used for the token generation\nclientSessionCtx.setAttribute(OIDCLoginProtocol.NONCE_PARAM, deviceCodeModel.getNonce());\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": "@@ -27,6 +27,7 @@ import org.junit.Rule;\nimport org.junit.Test;\nimport org.keycloak.admin.client.resource.ClientResource;\nimport org.keycloak.admin.client.resource.RealmResource;\n+import org.keycloak.models.ClientScopeModel;\nimport org.keycloak.models.OAuth2DeviceConfig;\nimport org.keycloak.models.utils.KeycloakModelUtils;\nimport org.keycloak.protocol.oidc.OIDCAdvancedConfigWrapper;\n@@ -59,6 +60,7 @@ public class OAuth2DeviceAuthorizationGrantTest extends AbstractKeycloakTest {\npublic static final String REALM_NAME = \"test\";\npublic static final String DEVICE_APP = \"test-device\";\npublic static final String DEVICE_APP_PUBLIC = \"test-device-public\";\n+ public static final String DEVICE_APP_PUBLIC_CUSTOM_CONSENT = \"test-device-public-custom-consent\";\n@Rule\npublic AssertEvents events = new AssertEvents(this);\n@@ -93,6 +95,14 @@ public class OAuth2DeviceAuthorizationGrantTest extends AbstractKeycloakTest {\n.build();\nrealm.client(appPublic);\n+ ClientRepresentation appPublicCustomConsent = ClientBuilder.create().id(KeycloakModelUtils.generateId()).publicClient()\n+ .clientId(DEVICE_APP_PUBLIC_CUSTOM_CONSENT).attribute(OAuth2DeviceConfig.OAUTH2_DEVICE_AUTHORIZATION_GRANT_ENABLED, \"true\")\n+ .consentRequired(true)\n+ .attribute(ClientScopeModel.DISPLAY_ON_CONSENT_SCREEN, \"true\")\n+ .attribute(ClientScopeModel.CONSENT_SCREEN_TEXT, \"This is the custom consent screen text.\")\n+ .build();\n+ realm.client(appPublicCustomConsent);\n+\nuserId = KeycloakModelUtils.generateId();\nUserRepresentation user = UserBuilder.create()\n.id(userId)\n@@ -192,6 +202,42 @@ public class OAuth2DeviceAuthorizationGrantTest extends AbstractKeycloakTest {\nassertNotNull(token);\n}\n+ @Test\n+ public void testPublicClientCustomConsent() throws Exception {\n+ // Device Authorization Request from device\n+ oauth.realm(REALM_NAME);\n+ oauth.clientId(DEVICE_APP_PUBLIC_CUSTOM_CONSENT);\n+ OAuthClient.DeviceAuthorizationResponse response = oauth.doDeviceAuthorizationRequest(DEVICE_APP_PUBLIC_CUSTOM_CONSENT, null);\n+\n+ Assert.assertEquals(200, response.getStatusCode());\n+ assertNotNull(response.getDeviceCode());\n+ assertNotNull(response.getUserCode());\n+ assertNotNull(response.getVerificationUri());\n+ assertNotNull(response.getVerificationUriComplete());\n+ Assert.assertEquals(60, response.getExpiresIn());\n+ Assert.assertEquals(5, response.getInterval());\n+\n+ openVerificationPage(response.getVerificationUriComplete());\n+\n+ // Do Login\n+ oauth.fillLoginForm(\"device-login\", \"password\");\n+\n+ // Consent\n+ Assert.assertTrue(grantPage.getDisplayedGrants().contains(\"This is the custom consent screen text.\"));\n+ grantPage.accept();\n+\n+ // Token request from device\n+ OAuthClient.AccessTokenResponse tokenResponse = oauth.doDeviceTokenRequest(DEVICE_APP_PUBLIC_CUSTOM_CONSENT, null, response.getDeviceCode());\n+\n+ Assert.assertEquals(200, tokenResponse.getStatusCode());\n+\n+ String tokenString = tokenResponse.getAccessToken();\n+ assertNotNull(tokenString);\n+ AccessToken token = oauth.verifyToken(tokenString);\n+\n+ assertNotNull(token);\n+ }\n+\n@Test\npublic void testNoRefreshToken() throws Exception {\nClientResource client = ApiUtil.findClientByClientId(adminClient.realm(REALM_NAME), DEVICE_APP);\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": "@@ -111,6 +111,7 @@ emailLinkIdp5=pour continuer.\nbackToLogin=&laquo; Retour \\u00e0 la connexion\nemailInstruction=Entrez votre nom d''utilisateur ou votre courriel ; un courriel va vous \\u00eatre envoy\\u00e9 vous permettant de cr\\u00e9er un nouveau mot de passe.\n+emailInstructionUsername=Entrez votre nom d''utilisateur ; un courriel va vous \\u00eatre envoy\\u00e9 vous permettant de cr\\u00e9er un nouveau mot de passe.\ncopyCodeInstruction=Copiez le code et recopiez le dans votre application :\n" } ]

[ { "change_type": "MODIFY", "old_path": "server-spi-private/src/main/java/org/keycloak/broker/provider/BrokeredIdentityContext.java", "new_path": "server-spi-private/src/main/java/org/keycloak/broker/provider/BrokeredIdentityContext.java", "diff": "@@ -224,6 +224,21 @@ public class BrokeredIdentityContext {\nreturn roles;\n}\n+ /**\n+ * Obtains the set of groups that were assigned by mappers.\n+ *\n+ * @return a {@link Set} containing the groups.\n+ */\n+ @SuppressWarnings(\"unchecked\")\n+ private Set<String> getMapperAssignedGroups() {\n+ Set<String> groups = (Set<String>) this.contextData.get(Constants.MAPPER_GRANTED_GROUPS);\n+ if (groups == null) {\n+ groups = new HashSet<>();\n+ this.contextData.put(Constants.MAPPER_GRANTED_GROUPS, groups);\n+ }\n+ return groups;\n+ }\n+\n/**\n* Verifies if a mapper has already granted the specified role.\n*\n@@ -234,6 +249,16 @@ public class BrokeredIdentityContext {\nreturn this.getMapperGrantedRoles().contains(roleName);\n}\n+ /**\n+ * Verifies if a mapper has already assigned the specified group.\n+ *\n+ * @param groupId the id of the group.\n+ * @return {@code true} if a mapper has already assigned the group; {@code false} otherwise.\n+ */\n+ public boolean hasMapperAssignedGroup(final String groupId) {\n+ return this.getMapperAssignedGroups().contains(groupId);\n+ }\n+\n/**\n* Adds the specified role to the set of roles granted by mappers.\n*\n@@ -243,6 +268,15 @@ public class BrokeredIdentityContext {\nthis.getMapperGrantedRoles().add(roleName);\n}\n+ /**\n+ * Adds the specified group to the set of groups assigned by mappers.\n+ *\n+ * @param groupId the id of the group.\n+ */\n+ public void addMapperAssignedGroup(final String groupId) {\n+ this.getMapperAssignedGroups().add(groupId);\n+ }\n+\n/**\n* @deprecated use {@link #setFirstName(String)} and {@link #setLastName(String)} instead\n* @param name\n" }, { "change_type": "MODIFY", "old_path": "server-spi-private/src/main/java/org/keycloak/broker/provider/ConfigConstants.java", "new_path": "server-spi-private/src/main/java/org/keycloak/broker/provider/ConfigConstants.java", "diff": "@@ -23,4 +23,5 @@ package org.keycloak.broker.provider;\n*/\npublic interface ConfigConstants {\nString ROLE = \"role\";\n+ String GROUP = \"group\";\n}\n" }, { "change_type": "MODIFY", "old_path": "server-spi-private/src/main/java/org/keycloak/models/Constants.java", "new_path": "server-spi-private/src/main/java/org/keycloak/models/Constants.java", "diff": "@@ -99,6 +99,9 @@ public final class Constants {\n// Roles already granted by a mapper when updating brokered users.\npublic static final String MAPPER_GRANTED_ROLES = \"MAPPER_GRANTED_ROLES\";\n+ // Groups already assigned by a mapper when updating brokered users.\n+ public static final String MAPPER_GRANTED_GROUPS = \"MAPPER_GRANTED_GROUPS\";\n+\n// Indication to admin-rest-endpoint that realm keys should be re-generated\npublic static final String GENERATE = \"GENERATE\";\n" }, { "change_type": "MODIFY", "old_path": "server-spi/src/main/java/org/keycloak/provider/ProviderConfigProperty.java", "new_path": "server-spi/src/main/java/org/keycloak/provider/ProviderConfigProperty.java", "diff": "@@ -38,6 +38,7 @@ public class ProviderConfigProperty {\npublic static final String SCRIPT_TYPE=\"Script\";\npublic static final String FILE_TYPE=\"File\";\npublic static final String ROLE_TYPE=\"Role\";\n+ public static final String GROUP_TYPE=\"Group\";\n/**\n* Possibility to configure single String value, which needs to be chosen from the list of predefined values (HTML select)\n" }, { "change_type": "ADD", "old_path": null, "new_path": "services/src/main/java/org/keycloak/broker/oidc/mappers/AbstractClaimToGroupMapper.java", "diff": "+/*\n+ * Copyright 2016 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.broker.oidc.mappers;\n+\n+import org.keycloak.broker.provider.BrokeredIdentityContext;\n+import org.keycloak.broker.provider.ConfigConstants;\n+import org.keycloak.broker.provider.IdentityBrokerException;\n+import org.keycloak.models.GroupModel;\n+import org.keycloak.models.IdentityProviderMapperModel;\n+import org.keycloak.models.KeycloakSession;\n+import org.keycloak.models.RealmModel;\n+import org.keycloak.models.UserModel;\n+import org.keycloak.models.utils.KeycloakModelUtils;\n+\n+public abstract class AbstractClaimToGroupMapper extends AbstractClaimMapper {\n+\n+ @Override\n+ public void importNewUser(KeycloakSession session, RealmModel realm, UserModel user,\n+ IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {\n+\n+ GroupModel group = this.getGroup(realm, mapperModel);\n+ if (applies(mapperModel, context)) {\n+ user.joinGroup(group);\n+ }\n+ }\n+\n+ @Override\n+ public void updateBrokeredUser(KeycloakSession session, RealmModel realm, UserModel user,\n+ IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {\n+\n+ GroupModel group = this.getGroup(realm, mapperModel);\n+ String groupId = mapperModel.getConfig().get(ConfigConstants.GROUP);\n+\n+ if (!context.hasMapperAssignedGroup(groupId)) {\n+ if (applies(mapperModel, context)) {\n+ context.addMapperAssignedGroup(groupId);\n+ user.joinGroup(group);\n+ } else {\n+ user.leaveGroup(group);\n+ }\n+ }\n+ }\n+\n+ /**\n+ * This method must be implemented by subclasses and they must return {@code true} if their mapping can be applied\n+ * (i.e. user has the OIDC claim that should be mapped) or {@code false} otherwise.\n+ *\n+ * @param mapperModel a reference to the {@link IdentityProviderMapperModel}.\n+ * @param context a reference to the {@link BrokeredIdentityContext}.\n+ * @return {@code true} if the mapping can be applied or {@code false} otherwise.*\n+ */\n+ protected abstract boolean applies(final IdentityProviderMapperModel mapperModel,\n+ final BrokeredIdentityContext context);\n+\n+ /**\n+ * Obtains the {@link GroupModel} corresponding the group configured in the specified\n+ * {@link IdentityProviderMapperModel}.\n+ * If the group doesn't exist, this method throws an {@link IdentityBrokerException}.\n+ *\n+ * @param realm a reference to the realm.\n+ * @param mapperModel a reference to the {@link IdentityProviderMapperModel} containing the configured group.\n+ * @return the {@link GroupModel}\n+ * @throws IdentityBrokerException if the group doesn't exist.\n+ */\n+ private GroupModel getGroup(final RealmModel realm, final IdentityProviderMapperModel mapperModel) {\n+ GroupModel group = KeycloakModelUtils.findGroupByPath(realm, mapperModel.getConfig().get(ConfigConstants.GROUP));\n+\n+ if (group == null) {\n+ throw new IdentityBrokerException(\"Unable to find group: \" + group.getId());\n+ }\n+ return group;\n+ }\n+}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "services/src/main/java/org/keycloak/broker/oidc/mappers/AdvancedClaimToGroupMapper.java", "diff": "+/*\n+ * Copyright 2016 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.broker.oidc.mappers;\n+\n+import org.keycloak.broker.oidc.KeycloakOIDCIdentityProviderFactory;\n+import org.keycloak.broker.oidc.OIDCIdentityProviderFactory;\n+import org.keycloak.broker.provider.BrokeredIdentityContext;\n+import org.keycloak.broker.provider.ConfigConstants;\n+import org.keycloak.models.IdentityProviderMapperModel;\n+import org.keycloak.models.IdentityProviderSyncMode;\n+import org.keycloak.provider.ProviderConfigProperty;\n+\n+import java.util.ArrayList;\n+import java.util.Arrays;\n+import java.util.HashSet;\n+import java.util.List;\n+import java.util.Map;\n+import java.util.Set;\n+\n+import static org.keycloak.utils.RegexUtils.valueMatchesRegex;\n+\n+public class AdvancedClaimToGroupMapper extends AbstractClaimToGroupMapper {\n+\n+ public static final String CLAIM_PROPERTY_NAME = \"claims\";\n+ public static final String ARE_CLAIM_VALUES_REGEX_PROPERTY_NAME = \"are.claim.values.regex\";\n+\n+ public static final String[] COMPATIBLE_PROVIDERS = {KeycloakOIDCIdentityProviderFactory.PROVIDER_ID, OIDCIdentityProviderFactory.PROVIDER_ID};\n+\n+ private static final List<ProviderConfigProperty> configProperties = new ArrayList<>();\n+\n+ static {\n+ ProviderConfigProperty claimsProperty = new ProviderConfigProperty();\n+ claimsProperty.setName(CLAIM_PROPERTY_NAME);\n+ claimsProperty.setLabel(\"Claims\");\n+ claimsProperty.setHelpText(\"Name and value of the claims to search for in token. You can reference nested claims using a '.', i.e. 'address.locality'. To use dot (.) literally, escape it with backslash (\\\\.)\");\n+ claimsProperty.setType(ProviderConfigProperty.MAP_TYPE);\n+ configProperties.add(claimsProperty);\n+ ProviderConfigProperty isClaimValueRegexProperty = new ProviderConfigProperty();\n+ isClaimValueRegexProperty.setName(ARE_CLAIM_VALUES_REGEX_PROPERTY_NAME);\n+ isClaimValueRegexProperty.setLabel(\"Regex Claim Values\");\n+ isClaimValueRegexProperty.setHelpText(\"If enabled claim values are interpreted as regular expressions.\");\n+ isClaimValueRegexProperty.setType(ProviderConfigProperty.BOOLEAN_TYPE);\n+ configProperties.add(isClaimValueRegexProperty);\n+ ProviderConfigProperty groupProperty = new ProviderConfigProperty();\n+ groupProperty.setName(ConfigConstants.GROUP);\n+ groupProperty.setLabel(\"Group\");\n+ groupProperty.setHelpText(\"Group to assign the user to if claim is present.\");\n+ groupProperty.setType(ProviderConfigProperty.GROUP_TYPE);\n+ configProperties.add(groupProperty);\n+ }\n+\n+ public static final String PROVIDER_ID = \"oidc-advanced-group-idp-mapper\";\n+\n+ @Override\n+ public boolean supportsSyncMode(IdentityProviderSyncMode syncMode) {\n+ return true;\n+ }\n+\n+ @Override\n+ public List<ProviderConfigProperty> getConfigProperties() {\n+ return configProperties;\n+ }\n+\n+ @Override\n+ public String getId() {\n+ return PROVIDER_ID;\n+ }\n+\n+ @Override\n+ public String[] getCompatibleProviders() {\n+ return COMPATIBLE_PROVIDERS;\n+ }\n+\n+ @Override\n+ public String getDisplayCategory() {\n+ return \"Group Importer\";\n+ }\n+\n+ @Override\n+ public String getDisplayType() {\n+ return \"Advanced Claim to Group\";\n+ }\n+\n+ @Override\n+ public String getHelpText() {\n+ return \"If all claims exists, assign the user to the specified group.\";\n+ }\n+\n+ @Override\n+ protected boolean applies(IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {\n+ Map<String, String> claims = mapperModel.getConfigMap(CLAIM_PROPERTY_NAME);\n+ boolean areClaimValuesRegex = Boolean.parseBoolean(mapperModel.getConfig().get(ARE_CLAIM_VALUES_REGEX_PROPERTY_NAME));\n+\n+ for (Map.Entry<String, String> claim : claims.entrySet()) {\n+ Object value = getClaimValue(context, claim.getKey());\n+\n+ boolean claimValuesMismatch = !(areClaimValuesRegex ? valueMatchesRegex(claim.getValue(), value) : valueEquals(claim.getValue(), value));\n+ if (claimValuesMismatch) {\n+ return false;\n+ }\n+ }\n+\n+ return true;\n+ }\n+}\n" }, { "change_type": "MODIFY", "old_path": "services/src/main/resources/META-INF/services/org.keycloak.broker.provider.IdentityProviderMapper", "new_path": "services/src/main/resources/META-INF/services/org.keycloak.broker.provider.IdentityProviderMapper", "diff": "@@ -20,6 +20,7 @@ org.keycloak.broker.provider.HardcodedAttributeMapper\norg.keycloak.broker.provider.HardcodedUserSessionAttributeMapper\norg.keycloak.broker.oidc.mappers.ClaimToRoleMapper\norg.keycloak.broker.oidc.mappers.AdvancedClaimToRoleMapper\n+org.keycloak.broker.oidc.mappers.AdvancedClaimToGroupMapper\norg.keycloak.broker.oidc.mappers.ExternalKeycloakRoleToRoleMapper\norg.keycloak.broker.oidc.mappers.UserAttributeMapper\norg.keycloak.broker.oidc.mappers.UsernameTemplateMapper\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/IdentityProviderTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/IdentityProviderTest.java", "diff": "@@ -562,12 +562,12 @@ public class IdentityProviderTest extends AbstractAdminTest {\ncreate(createRep(\"keycloak-oidc\", \"keycloak-oidc\"));\nprovider = realm.identityProviders().get(\"keycloak-oidc\");\nmapperTypes = provider.getMapperTypes();\n- assertMapperTypes(mapperTypes, \"keycloak-oidc-role-to-role-idp-mapper\", \"oidc-user-attribute-idp-mapper\", \"oidc-role-idp-mapper\", \"oidc-username-idp-mapper\", \"oidc-advanced-role-idp-mapper\");\n+ assertMapperTypes(mapperTypes, \"keycloak-oidc-role-to-role-idp-mapper\", \"oidc-user-attribute-idp-mapper\", \"oidc-role-idp-mapper\", \"oidc-username-idp-mapper\", \"oidc-advanced-group-idp-mapper\", \"oidc-advanced-role-idp-mapper\");\ncreate(createRep(\"oidc\", \"oidc\"));\nprovider = realm.identityProviders().get(\"oidc\");\nmapperTypes = provider.getMapperTypes();\n- assertMapperTypes(mapperTypes, \"oidc-user-attribute-idp-mapper\", \"oidc-role-idp-mapper\", \"oidc-username-idp-mapper\", \"oidc-advanced-role-idp-mapper\");\n+ assertMapperTypes(mapperTypes, \"oidc-user-attribute-idp-mapper\", \"oidc-role-idp-mapper\", \"oidc-username-idp-mapper\", \"oidc-advanced-group-idp-mapper\", \"oidc-advanced-role-idp-mapper\");\ncreate(createRep(\"saml\", \"saml\"));\nprovider = realm.identityProviders().get(\"saml\");\n" }, { "change_type": "ADD", "old_path": null, "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractAdvancedGroupMapperTest.java", "diff": "+package org.keycloak.testsuite.broker;\n+\n+import static org.keycloak.models.IdentityProviderMapperSyncMode.FORCE;\n+import static org.keycloak.models.IdentityProviderMapperSyncMode.IMPORT;\n+\n+import org.junit.Before;\n+import org.junit.Test;\n+import org.keycloak.models.IdentityProviderMapperSyncMode;\n+import org.keycloak.representations.idm.GroupRepresentation;\n+import org.keycloak.representations.idm.IdentityProviderRepresentation;\n+import org.keycloak.representations.idm.UserRepresentation;\n+\n+import com.google.common.collect.ImmutableList;\n+import com.google.common.collect.ImmutableMap;\n+\n+import java.util.List;\n+\n+public abstract class AbstractAdvancedGroupMapperTest extends AbstractGroupMapperTest {\n+\n+ private static final String CLAIMS_OR_ATTRIBUTES = \"[\\n\" +\n+ \" {\\n\" +\n+ \" \\\"key\\\": \\\"\" + KcOidcBrokerConfiguration.ATTRIBUTE_TO_MAP_NAME + \"\\\",\\n\" +\n+ \" \\\"value\\\": \\\"value 1\\\"\\n\" +\n+ \" },\\n\" +\n+ \" {\\n\" +\n+ \" \\\"key\\\": \\\"\" + KcOidcBrokerConfiguration.ATTRIBUTE_TO_MAP_NAME_2 + \"\\\",\\n\" +\n+ \" \\\"value\\\": \\\"value 2\\\"\\n\" +\n+ \" }\\n\" +\n+ \"]\";\n+\n+ private static final String CLAIMS_OR_ATTRIBUTES_REGEX = \"[\\n\" +\n+ \" {\\n\" +\n+ \" \\\"key\\\": \\\"\" + KcOidcBrokerConfiguration.ATTRIBUTE_TO_MAP_NAME + \"\\\",\\n\" +\n+ \" \\\"value\\\": \\\"va.*\\\"\\n\" +\n+ \" },\\n\" +\n+ \" {\\n\" +\n+ \" \\\"key\\\": \\\"\" + KcOidcBrokerConfiguration.ATTRIBUTE_TO_MAP_NAME_2 + \"\\\",\\n\" +\n+ \" \\\"value\\\": \\\"value 2\\\"\\n\" +\n+ \" }\\n\" +\n+ \"]\";\n+\n+ private String newValueForAttribute2 = \"\";\n+\n+ @Before\n+ public void addMapperTestGroupToConsumerRealm() {\n+ GroupRepresentation mapperTestGroup = new GroupRepresentation();\n+ mapperTestGroup.setName(MAPPER_TEST_GROUP_NAME);\n+ mapperTestGroup.setPath(MAPPER_TEST_GROUP_PATH);\n+\n+ adminClient.realm(bc.consumerRealmName()).groups().add(mapperTestGroup);\n+ }\n+\n+ @Test\n+ public void allValuesMatch() {\n+ createAdvancedGroupMapper(CLAIMS_OR_ATTRIBUTES, false);\n+ createUserInProviderRealm(ImmutableMap.<String, List<String>>builder()\n+ .put(KcOidcBrokerConfiguration.ATTRIBUTE_TO_MAP_NAME, ImmutableList.<String>builder().add(\"value 1\").build())\n+ .put(KcOidcBrokerConfiguration.ATTRIBUTE_TO_MAP_NAME_2, ImmutableList.<String>builder().add(\"value 2\").build())\n+ .build());\n+\n+ logInAsUserInIDPForFirstTime();\n+\n+ UserRepresentation user = findUser(bc.consumerRealmName(), bc.getUserLogin(), bc.getUserEmail());\n+ assertThatUserHasBeenAssignedToGroup(user);\n+ }\n+\n+ @Test\n+ public void valuesMismatch() {\n+ createAdvancedGroupMapper(CLAIMS_OR_ATTRIBUTES, false);\n+ createUserInProviderRealm(ImmutableMap.<String, List<String>>builder()\n+ .put(KcOidcBrokerConfiguration.ATTRIBUTE_TO_MAP_NAME, ImmutableList.<String>builder().add(\"value 1\").build())\n+ .put(KcOidcBrokerConfiguration.ATTRIBUTE_TO_MAP_NAME_2, ImmutableList.<String>builder().add(\"value mismatch\").build())\n+ .build());\n+\n+ logInAsUserInIDPForFirstTime();\n+\n+ UserRepresentation user = findUser(bc.consumerRealmName(), bc.getUserLogin(), bc.getUserEmail());\n+ assertThatUserHasNotBeenAssignedToGroup(user);\n+ }\n+\n+ @Test\n+ public void valuesMatchIfNoClaimsSpecified() {\n+ createAdvancedGroupMapper(\"[]\", false);\n+ createUserInProviderRealm(ImmutableMap.<String, List<String>>builder()\n+ .put(KcOidcBrokerConfiguration.ATTRIBUTE_TO_MAP_NAME, ImmutableList.<String>builder().add(\"some value\").build())\n+ .put(KcOidcBrokerConfiguration.ATTRIBUTE_TO_MAP_NAME_2, ImmutableList.<String>builder().add(\"some value\").build())\n+ .build());\n+\n+ logInAsUserInIDPForFirstTime();\n+\n+ UserRepresentation user = findUser(bc.consumerRealmName(), bc.getUserLogin(), bc.getUserEmail());\n+ assertThatUserHasBeenAssignedToGroup(user);\n+ }\n+\n+ @Test\n+ public void allValuesMatchRegex() {\n+ createAdvancedGroupMapper(CLAIMS_OR_ATTRIBUTES_REGEX, true);\n+ createUserInProviderRealm(ImmutableMap.<String, List<String>>builder()\n+ .put(KcOidcBrokerConfiguration.ATTRIBUTE_TO_MAP_NAME, ImmutableList.<String>builder().add(\"value 1\").build())\n+ .put(KcOidcBrokerConfiguration.ATTRIBUTE_TO_MAP_NAME_2, ImmutableList.<String>builder().add(\"value 2\").build())\n+ .build());\n+\n+ logInAsUserInIDPForFirstTime();\n+\n+ UserRepresentation user = findUser(bc.consumerRealmName(), bc.getUserLogin(), bc.getUserEmail());\n+ assertThatUserHasBeenAssignedToGroup(user);\n+ }\n+\n+ @Test\n+ public void valuesMismatchRegex() {\n+ createAdvancedGroupMapper(CLAIMS_OR_ATTRIBUTES_REGEX, true);\n+ createUserInProviderRealm(ImmutableMap.<String, List<String>>builder()\n+ .put(KcOidcBrokerConfiguration.ATTRIBUTE_TO_MAP_NAME, ImmutableList.<String>builder().add(\"mismatch\").build())\n+ .put(KcOidcBrokerConfiguration.ATTRIBUTE_TO_MAP_NAME_2, ImmutableList.<String>builder().add(\"value 2\").build())\n+ .build());\n+\n+ logInAsUserInIDPForFirstTime();\n+\n+ UserRepresentation user = findUser(bc.consumerRealmName(), bc.getUserLogin(), bc.getUserEmail());\n+ assertThatUserHasNotBeenAssignedToGroup(user);\n+ }\n+\n+ @Test\n+ public void updateBrokeredUserMismatchLeavesGroup() {\n+ newValueForAttribute2 = \"value mismatch\";\n+ UserRepresentation user = createMapperAndLoginAsUserTwiceWithMapper(FORCE, false);\n+\n+ assertThatUserHasNotBeenAssignedToGroup(user);\n+ }\n+\n+ @Test\n+ public void updateBrokeredUserMismatchDoesNotLeaveGroupInImportMode() {\n+ newValueForAttribute2 = \"value mismatch\";\n+ UserRepresentation user = createMapperAndLoginAsUserTwiceWithMapper(IMPORT, false);\n+\n+ assertThatUserHasBeenAssignedToGroup(user);\n+ }\n+\n+ @Test\n+ public void updateBrokeredUserMatchDoesntLeaveGroup() {\n+ newValueForAttribute2 = \"value 2\";\n+ UserRepresentation user = createMapperAndLoginAsUserTwiceWithMapper(FORCE, false);\n+\n+ assertThatUserHasBeenAssignedToGroup(user);\n+ }\n+\n+ @Test\n+ public void updateBrokeredUserIsAssignedToGroupInForceModeWhenCreatingTheMapperAfterFirstLogin() {\n+ newValueForAttribute2 = \"value 2\";\n+ UserRepresentation user = createMapperAndLoginAsUserTwiceWithMapper(FORCE, true);\n+\n+ assertThatUserHasBeenAssignedToGroup(user);\n+ }\n+\n+ public UserRepresentation createMapperAndLoginAsUserTwiceWithMapper(IdentityProviderMapperSyncMode syncMode, boolean createAfterFirstLogin) {\n+ return loginAsUserTwiceWithMapper(syncMode, createAfterFirstLogin, ImmutableMap.<String, List<String>>builder()\n+ .put(KcOidcBrokerConfiguration.ATTRIBUTE_TO_MAP_NAME, ImmutableList.<String>builder().add(\"value 1\").build())\n+ .put(KcOidcBrokerConfiguration.ATTRIBUTE_TO_MAP_NAME_2, ImmutableList.<String>builder().add(\"value 2\").build())\n+ .build());\n+ }\n+\n+ @Override\n+ protected void updateUser() {\n+ UserRepresentation user = findUser(bc.providerRealmName(), bc.getUserLogin(), bc.getUserEmail());\n+ ImmutableMap<String, List<String>> matchingAttributes = ImmutableMap.<String, List<String>>builder()\n+ .put(KcOidcBrokerConfiguration.ATTRIBUTE_TO_MAP_NAME, ImmutableList.<String>builder().add(\"value 1\").build())\n+ .put(KcOidcBrokerConfiguration.ATTRIBUTE_TO_MAP_NAME_2, ImmutableList.<String>builder().add(newValueForAttribute2).build())\n+ .put(\"some.other.attribute\", ImmutableList.<String>builder().add(\"some value\").build())\n+ .build();\n+ user.setAttributes(matchingAttributes);\n+ adminClient.realm(bc.providerRealmName()).users().get(user.getId()).update(user);\n+ }\n+\n+ @Override\n+ protected void createMapperInIdp(IdentityProviderRepresentation idp, IdentityProviderMapperSyncMode syncMode) {\n+ createMapperInIdp(idp, CLAIMS_OR_ATTRIBUTES, false, syncMode);\n+ }\n+\n+ protected void createAdvancedGroupMapper(String claimsOrAttributeRepresentation, boolean areClaimsOrAttributeValuesRegexes) {\n+ IdentityProviderRepresentation idp = setupIdentityProvider();\n+ createMapperInIdp(idp, claimsOrAttributeRepresentation, areClaimsOrAttributeValuesRegexes, IMPORT);\n+ }\n+\n+ abstract protected void createMapperInIdp(\n+ IdentityProviderRepresentation idp, String claimsOrAttributeRepresentation, boolean areClaimsOrAttributeValuesRegexes, IdentityProviderMapperSyncMode syncMode);\n+}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractGroupMapperTest.java", "diff": "+package org.keycloak.testsuite.broker;\n+\n+import static org.junit.Assert.assertFalse;\n+import static org.junit.Assert.assertTrue;\n+import static org.keycloak.testsuite.broker.BrokerTestTools.getConsumerRoot;\n+\n+import org.keycloak.models.IdentityProviderMapperSyncMode;\n+import org.keycloak.representations.idm.IdentityProviderRepresentation;\n+import org.keycloak.representations.idm.UserRepresentation;\n+\n+import java.util.ArrayList;\n+import java.util.List;\n+import java.util.Map;\n+\n+public abstract class AbstractGroupMapperTest extends AbstractIdentityProviderMapperTest {\n+\n+ public static final String MAPPER_TEST_GROUP_NAME = \"mapper-test\";\n+ public static final String MAPPER_TEST_GROUP_PATH = \"/\" + MAPPER_TEST_GROUP_NAME;\n+\n+ protected abstract void createMapperInIdp(\n+ IdentityProviderRepresentation idp, IdentityProviderMapperSyncMode syncMode);\n+\n+ protected void updateUser() {\n+ }\n+\n+ protected UserRepresentation loginAsUserTwiceWithMapper(\n+ IdentityProviderMapperSyncMode syncMode, boolean createAfterFirstLogin,\n+ Map<String, List<String>> userConfig) {\n+ final IdentityProviderRepresentation idp = setupIdentityProvider();\n+ if (!createAfterFirstLogin) {\n+ createMapperInIdp(idp, syncMode);\n+ }\n+ createUserInProviderRealm(userConfig);\n+\n+ logInAsUserInIDPForFirstTime();\n+\n+ UserRepresentation user = findUser(bc.consumerRealmName(), bc.getUserLogin(), bc.getUserEmail());\n+ if (!createAfterFirstLogin) {\n+ assertThatUserHasBeenAssignedToGroup(user);\n+ } else {\n+ assertThatUserHasNotBeenAssignedToGroup(user);\n+ }\n+\n+ if (createAfterFirstLogin) {\n+ createMapperInIdp(idp, syncMode);\n+ }\n+ logoutFromRealm(getConsumerRoot(), bc.consumerRealmName());\n+\n+ updateUser();\n+\n+ logInAsUserInIDP();\n+ user = findUser(bc.consumerRealmName(), bc.getUserLogin(), bc.getUserEmail());\n+ return user;\n+ }\n+\n+ protected void assertThatUserHasBeenAssignedToGroup(UserRepresentation user) {\n+ List<String> groupNames = new ArrayList<>();\n+\n+ realm.users().get(user.getId()).groups().forEach(group -> {\n+ groupNames.add(group.getName());\n+ });\n+\n+ assertTrue(groupNames.contains(MAPPER_TEST_GROUP_NAME));\n+ }\n+\n+ protected void assertThatUserHasNotBeenAssignedToGroup(UserRepresentation user) {\n+ List<String> groupNames = new ArrayList<>();\n+\n+ realm.users().get(user.getId()).groups().forEach(group -> {\n+ groupNames.add(group.getName());\n+ });\n+\n+ assertFalse(groupNames.contains(MAPPER_TEST_GROUP_NAME));\n+ }\n+}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/OidcAdvancedClaimToGroupMapperTest.java", "diff": "+package org.keycloak.testsuite.broker;\n+\n+import org.keycloak.admin.client.resource.IdentityProviderResource;\n+import org.keycloak.broker.oidc.mappers.AdvancedClaimToGroupMapper;\n+import org.keycloak.broker.provider.ConfigConstants;\n+import org.keycloak.models.IdentityProviderMapperModel;\n+import org.keycloak.models.IdentityProviderMapperSyncMode;\n+import org.keycloak.representations.idm.IdentityProviderMapperRepresentation;\n+import org.keycloak.representations.idm.IdentityProviderRepresentation;\n+\n+import com.google.common.collect.ImmutableMap;\n+\n+public class OidcAdvancedClaimToGroupMapperTest extends AbstractAdvancedGroupMapperTest {\n+ @Override\n+ protected BrokerConfiguration getBrokerConfiguration() {\n+ return new KcOidcBrokerConfiguration();\n+ }\n+\n+ @Override\n+ protected void createMapperInIdp(IdentityProviderRepresentation idp, String claimsOrAttributeRepresentation,\n+ boolean areClaimsOrAttributeValuesRegexes, IdentityProviderMapperSyncMode syncMode) {\n+ IdentityProviderMapperRepresentation advancedClaimToGroupMapper = new IdentityProviderMapperRepresentation();\n+ advancedClaimToGroupMapper.setName(\"advanced-claim-to-group-mapper\");\n+ advancedClaimToGroupMapper.setIdentityProviderMapper(AdvancedClaimToGroupMapper.PROVIDER_ID);\n+ advancedClaimToGroupMapper.setConfig(ImmutableMap.<String, String> builder()\n+ .put(IdentityProviderMapperModel.SYNC_MODE, syncMode.toString())\n+ .put(AdvancedClaimToGroupMapper.CLAIM_PROPERTY_NAME, claimsOrAttributeRepresentation)\n+ .put(AdvancedClaimToGroupMapper.ARE_CLAIM_VALUES_REGEX_PROPERTY_NAME,\n+ areClaimsOrAttributeValuesRegexes ? \"true\" : \"false\")\n+ .put(ConfigConstants.GROUP, MAPPER_TEST_GROUP_PATH)\n+ .build());\n+\n+ IdentityProviderResource idpResource = realm.identityProviders().get(idp.getAlias());\n+ advancedClaimToGroupMapper.setIdentityProviderAlias(bc.getIDPAlias());\n+ idpResource.addMapper(advancedClaimToGroupMapper).close();\n+ }\n+}\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": "@@ -253,6 +253,8 @@ aggregate.attrs.label=Aggregate attribute values\naggregate.attrs.tooltip=Indicates if attribute values should be aggregated with the group attributes. If using OpenID Connect mapper the multivalued option needs to be enabled too in order to get all the values. Duplicated values are discarded and the order of values is not guaranteed with this option.\nselectRole.label=Select Role\nselectRole.tooltip=Enter role in the textbox to the left, or click this button to browse and select the role you want.\n+selectGroup.label=Select Group\n+selectGroup.tooltip=Enter group in the textbox to the left, or click this button to browse and select the group you want.\ntokenClaimName.label=Token Claim Name\ntokenClaimName.tooltip=Name of the claim to insert into the token. This can be a fully qualified name like 'address.street'. In this case, a nested json object will be created. To prevent nesting and use dot literally, escape the dot with backslash (\\\\.).\njsonType.label=Claim JSON Type\n@@ -1061,10 +1063,12 @@ export-clients=Export clients\naction=Action\nrole-selector=Role Selector\n+group-selector=Group Selector\nrealm-roles.tooltip=Realm roles that can be selected.\nselect-a-role=Select a role\nselect-realm-role=Select realm role\n+select-group=Select group\nclient-roles.tooltip=Client roles that can be selected.\nselect-client-role=Select client role\n" }, { "change_type": "MODIFY", "old_path": "themes/src/main/resources/theme/base/admin/resources/js/app.js", "new_path": "themes/src/main/resources/theme/base/admin/resources/js/app.js", "diff": "@@ -3048,6 +3048,154 @@ module.controller('RoleSelectorModalCtrl', function($scope, realm, config, confi\n})\n});\n+module.controller('GroupSelectorModalCtrl', function($scope, $q, realm, config, configName, GroupsCount, Groups, Group, GroupChildren, Notifications, Dialog, ComponentUtils, $modalInstance, $translate) {\n+ $scope.realm = realm;\n+ $scope.groupList = [\n+ {\n+ \"id\" : \"realm\",\n+ \"name\": $translate.instant('groups'),\n+ \"subGroups\" : []\n+ }\n+ ];\n+ $scope.groupSelector = {\n+ searchCriteria: undefined,\n+ currentPage: 1,\n+ pageSize: 20,\n+ numberOfPages: 1\n+ };\n+ $scope.groupSelector.currentPageInput = $scope.groupSelector.currentPage;\n+\n+ var refreshGroups = function (search) {\n+ console.log('refreshGroups');\n+ $scope.groupSelector.currentPageInput = $scope.groupSelector.currentPage;\n+\n+ var first = ($scope.groupSelector.currentPage * $scope.groupSelector.pageSize) - $scope.groupSelector.pageSize;\n+ console.log('first:' + first);\n+ var queryParams = {\n+ realm : realm.realm,\n+ first : first,\n+ max : $scope.groupSelector.pageSize\n+ };\n+ var countParams = {\n+ realm : realm.realm,\n+ top : 'true'\n+ };\n+\n+ if(angular.isDefined(search) && search !== '') {\n+ queryParams.search = search;\n+ countParams.search = search;\n+ }\n+\n+ var promiseGetGroups = $q.defer();\n+ Groups.query(queryParams, function(entry) {\n+ promiseGetGroups.resolve(entry);\n+ }, function() {\n+ promiseGetGroups.reject($translate.instant('group.fetch.fail', {params: queryParams}));\n+ });\n+ promiseGetGroups.promise.then(function(groups) {\n+ $scope.groupList = [\n+ {\n+ \"id\" : \"realm\",\n+ \"name\": $translate.instant('groups'),\n+ \"subGroups\": ComponentUtils.sortGroups('name', groups)\n+ }\n+ ];\n+ if (angular.isDefined(search) && search !== '') {\n+ // Add highlight for concrete text match\n+ setTimeout(function () {\n+ document.querySelectorAll('span').forEach(function (element) {\n+ if (element.textContent.indexOf(search) != -1) {\n+ angular.element(element).addClass('highlight');\n+ }\n+ });\n+ }, 500);\n+ }\n+ }, function (failed) {\n+ Notifications.error(failed);\n+ });\n+\n+ var promiseCount = $q.defer();\n+ console.log('countParams: realm[' + countParams.realm);\n+ GroupsCount.query(countParams, function(entry) {\n+ promiseCount.resolve(entry);\n+ }, function() {\n+ promiseCount.reject($translate.instant('group.fetch.fail', {params: countParams}));\n+ });\n+ promiseCount.promise.then(function(entry) {\n+ if(angular.isDefined(entry.count) && entry.count > $scope.groupSelector.pageSize) {\n+ $scope.groupSelector.numberOfPages = Math.ceil(entry.count/$scope.groupSelector.pageSize);\n+ } else {\n+ $scope.groupSelector.numberOfPages = 1;\n+ }\n+ }, function (failed) {\n+ Notifications.error(failed);\n+ });\n+ };\n+\n+ refreshGroups();\n+\n+ $scope.$watch('groupSelector.currentPage', function(newValue, oldValue) {\n+ if(parseInt(newValue, 10) !== oldValue) {\n+ refreshGroups($scope.groupSelector.searchCriteria);\n+ }\n+ });\n+\n+ $scope.clearSearch = function() {\n+ $scope.groupSelector.searchCriteria = '';\n+ if (parseInt($scope.groupSelector.currentPage, 10) === 1) {\n+ refreshGroups();\n+ } else {\n+ $scope.groupSelector.currentPage = 1;\n+ }\n+ };\n+\n+ $scope.searchGroup = function() {\n+ if (parseInt($scope.groupSelector.currentPage, 10) === 1) {\n+ refreshGroups($scope.groupSelector.searchCriteria);\n+ } else {\n+ $scope.groupSelector.currentPage = 1;\n+ }\n+ };\n+\n+ $scope.selectGroup = function(selected) {\n+ if(!selected || selected.id === \"realm\") return;\n+\n+ config[configName] = selected.path;\n+ $modalInstance.close();\n+ }\n+\n+ $scope.edit = $scope.selectGroup;\n+\n+ $scope.cancel = function() {\n+ $modalInstance.dismiss();\n+ }\n+\n+ var isLeaf = function(node) {\n+ return node.id !== \"realm\" && (!node.subGroups || node.subGroups.length === 0);\n+ };\n+\n+ $scope.getGroupClass = function(node) {\n+ if (node.id === \"realm\") {\n+ return 'pficon pficon-users';\n+ }\n+ if (isLeaf(node)) {\n+ return 'normal';\n+ }\n+ if (node.subGroups.length && node.collapsed) return 'collapsed';\n+ if (node.subGroups.length && !node.collapsed) return 'expanded';\n+ return 'collapsed';\n+\n+ };\n+\n+ $scope.getSelectedClass = function(node) {\n+ if (node.selected) {\n+ return 'selected';\n+ }\n+ return undefined;\n+ }\n+});\n+\n+\nmodule.controller('ProviderConfigCtrl', function ($modal, $scope, $route, ComponentUtils, Client) {\nclientSelectControl($scope, $route.current.params.realm, Client);\n$scope.fileNames = {};\n@@ -3091,6 +3239,24 @@ module.controller('ProviderConfigCtrl', function ($modal, $scope, $route, Compon\n})\n}\n+ $scope.openGroupSelector = function (configName, config) {\n+ $modal.open({\n+ templateUrl: resourceUrl + '/partials/modal/group-selector.html',\n+ controller: 'GroupSelectorModalCtrl',\n+ resolve: {\n+ realm: function () {\n+ return $scope.realm;\n+ },\n+ config: function () {\n+ return config;\n+ },\n+ configName: function () {\n+ return configName;\n+ }\n+ }\n+ })\n+ }\n+\n$scope.changeClient = function(configName, config, client, multivalued) {\nif (!client || !client.id) {\nconfig[configName] = null;\n" }, { "change_type": "ADD", "old_path": null, "new_path": "themes/src/main/resources/theme/base/admin/resources/partials/modal/group-selector.html", "diff": "+<div class=\"modal-header\">\n+ <button type=\"button\" class=\"close\" ng-click=\"cancel()\">\n+ <span class=\"pficon pficon-close\"></span>\n+ </button>\n+ <h4 class=\"modal-title\">{{:: 'group-selector' | translate}}</h4>\n+</div>\n+<div style=\"padding: 0 15px 15px 15px;\">\n+ <form>\n+ <table class=\"table table-striped table-bordered\" style=\"margin-bottom: 0\">\n+ <thead>\n+ <tr>\n+ <th class=\"kc-table-actions\" colspan=\"5\">\n+ <div class=\"form-inline\">\n+ <div class=\"pull-left\">\n+ <div class=\"input-group\">\n+ <input type=\"text\" placeholder=\"{{:: 'search.placeholder' | translate}}\" ng-model=\"groupSelector.searchCriteria\" class=\"form-control search\" onkeydown=\"if (event.keyCode == 13) document.getElementById('groupSearch').click()\">\n+ <div class=\"input-group-addon\">\n+ <i class=\"fa fa-search\" id=\"groupSearch\" ng-click=\"searchGroup()\"></i>\n+ </div>\n+ </div>\n+ </div>\n+\n+ <button id=\"viewAllGroups\" class=\"btn btn-default\" ng-click=\"clearSearch()\">{{:: 'view-all-groups' | translate}}</button>\n+ <div class=\"pull-right\">\n+ <button id=\"selectGroup\" class=\"btn btn-default\" ng-click=\"selectGroup(tree.currentNode)\">{{:: 'selectGroup.label' | translate}}</button>\n+ </div>\n+ </div>\n+ </th>\n+ </tr>\n+ </thead>\n+ <tbody>\n+ <tr>\n+ <td>\n+ <div\n+ tree-id=\"tree\"\n+ angular-treeview=\"true\"\n+ tree-model=\"groupList\"\n+ node-id=\"id\"\n+ node-label=\"name\"\n+ node-children=\"subGroups\" >\n+ </div>\n+ </td>\n+ </tr>\n+ </tbody>\n+ </table>\n+ <div style=\"margin-bottom: 50px\">\n+ <kc-paging current-page=\"groupSelector.currentPage\" number-of-pages=\"groupSelector.numberOfPages\" current-page-input=\"groupSelector.currentPageInput\"></kc-paging>\n+ </div>\n+ </form>\n+</div>\n\\ No newline at end of file\n" }, { "change_type": "MODIFY", "old_path": "themes/src/main/resources/theme/base/admin/resources/templates/kc-provider-config.html", "new_path": "themes/src/main/resources/theme/base/admin/resources/templates/kc-provider-config.html", "diff": "</div>\n</div>\n</div>\n+ <div class=\"col-md-6\" data-ng-if=\"option.type == 'Group'\">\n+ <div class=\"row\">\n+ <div class=\"col-md-8\">\n+ <input class=\"form-control\" type=\"text\" data-ng-model=\"config[ option.name ]\" >\n+ </div>\n+ <div class=\"col-md-2\">\n+ <button type=\"button\" data-ng-click=\"openGroupSelector(option.name, config)\" class=\"btn btn-default\" tooltip-placement=\"top\" tooltip-trigger=\"mouseover mouseout\" tooltip=\"{{:: 'selectGroup.tooltip' | translate}}\">{{:: 'selectGroup.label' | translate}}</button>\n+ </div>\n+ </div>\n+ </div>\n<div class=\"col-md-4\" data-ng-if=\"option.type == 'ClientList'\">\n<input type=\"hidden\" ui-select2=\"clientsUiSelect\" id=\"clients\" data-ng-init=\"initSelectedClient(option.name, config)\" data-ng-model=\"selectedClient\" data-ng-change=\"changeClient(option.name, config, selectedClient, false);\" data-placeholder=\"{{:: 'selectOne' | translate}}...\">\n</input>\n" }, { "change_type": "MODIFY", "old_path": "themes/src/main/resources/theme/keycloak/common/resources/lib/angular/treeview/angular.treeview.js", "new_path": "themes/src/main/resources/theme/keycloak/common/resources/lib/angular/treeview/angular.treeview.js", "diff": "var nodeChildren = attrs.nodeChildren || 'children';\n//tree template\n-\nvar template =\n'<ul>' +\n'<li data-ng-repeat=\"node in ' + treeModel + '\">' +\n'</li>' +\n'</ul>';\n-\n//check tree id, tree model\nif( treeId && treeModel ) {\n//root node\n" } ]

[ { "change_type": "MODIFY", "old_path": "themes/src/main/resources/theme/keycloak.v2/account/index.ftl", "new_path": "themes/src/main/resources/theme/keycloak.v2/account/index.ftl", "diff": "<body>\n<script>\n- const keycloak = Keycloak({\n+ var keycloak = Keycloak({\nauthServerUrl: authUrl,\nrealm: realm,\nclientId: 'account-console'\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate13_0_0_MigrateDefaultRoles.java", "new_path": "model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate13_0_0_MigrateDefaultRoles.java", "diff": "@@ -18,8 +18,8 @@ package org.keycloak.connections.jpa.updater.liquibase.custom;\nimport java.sql.PreparedStatement;\nimport java.sql.ResultSet;\n-import java.util.HashSet;\n-import java.util.Set;\n+import java.util.HashMap;\n+import java.util.Map;\nimport java.util.UUID;\nimport liquibase.exception.CustomChangeException;\nimport liquibase.statement.core.InsertStatement;\n@@ -30,44 +30,44 @@ import org.keycloak.models.Constants;\npublic class JpaUpdate13_0_0_MigrateDefaultRoles extends CustomKeycloakTask {\n- private final Set<String> realmIds = new HashSet<>();\n+ private final Map<String, String> realmIdsAndNames = new HashMap<>();\n@Override\nprotected void generateStatementsImpl() throws CustomChangeException {\n- extractRealmIds(\"SELECT ID FROM \" + getTableName(\"REALM\"));\n+ extractRealmIdsAndNames(\"SELECT ID,NAME FROM \" + getTableName(\"REALM\"));\nString clientTable = getTableName(\"CLIENT\");\nString clientDefaultRolesTable = getTableName(\"CLIENT_DEFAULT_ROLES\");\nString compositeRoleTable = getTableName(\"COMPOSITE_ROLE\");\n- for (String realmId : realmIds) {\n+ for (Map.Entry<String, String> entry : realmIdsAndNames.entrySet()) {\nString id = UUID.randomUUID().toString();\n- String roleName = determineDefaultRoleName(realmId);\n+ String roleName = determineDefaultRoleName(entry.getKey(), entry.getValue());\nstatements.add(\n// create new default role\nnew InsertStatement(null, null, database.correctObjectName(\"KEYCLOAK_ROLE\", Table.class))\n.addColumnValue(\"ID\", id)\n- .addColumnValue(\"CLIENT_REALM_CONSTRAINT\", realmId)\n+ .addColumnValue(\"CLIENT_REALM_CONSTRAINT\", entry.getValue())\n.addColumnValue(\"CLIENT_ROLE\", Boolean.FALSE)\n.addColumnValue(\"DESCRIPTION\", \"${role_\" + roleName + \"}\")\n.addColumnValue(\"NAME\", roleName)\n- .addColumnValue(\"REALM_ID\", realmId)\n- .addColumnValue(\"REALM\", realmId)\n+ .addColumnValue(\"REALM_ID\", entry.getValue())\n+ .addColumnValue(\"REALM\", entry.getValue())\n);\nstatements.add(\n// assign the role to the realm\nnew UpdateStatement(null, null, database.correctObjectName(\"REALM\", Table.class))\n.addNewColumnValue(\"DEFAULT_ROLE\", id)\n.setWhereClause(\"REALM.ID=?\")\n- .addWhereParameter(realmId)\n+ .addWhereParameter(entry.getValue())\n);\nstatements.add(\n// copy data from REALM_DEFAULT_ROLES to COMPOSITE_ROLE\nnew RawSqlStatement(\"INSERT INTO \" + compositeRoleTable + \" (COMPOSITE, CHILD_ROLE) \" +\n\"SELECT '\" + id + \"', ROLE_ID FROM \" + getTableName(\"REALM_DEFAULT_ROLES\") +\n- \" WHERE REALM_ID = '\" + database.escapeStringForDatabase(realmId) + \"'\")\n+ \" WHERE REALM_ID = '\" + database.escapeStringForDatabase(entry.getValue()) + \"'\")\n);\nstatements.add(\n// copy data from CLIENT_DEFAULT_ROLES to COMPOSITE_ROLE\n@@ -75,17 +75,17 @@ public class JpaUpdate13_0_0_MigrateDefaultRoles extends CustomKeycloakTask {\n\"SELECT '\" + id + \"', \" + clientDefaultRolesTable + \".ROLE_ID FROM \" +\nclientDefaultRolesTable + \" INNER JOIN \" + clientTable + \" ON \" +\nclientTable + \".ID = \" + clientDefaultRolesTable + \".CLIENT_ID AND \" +\n- clientTable + \".REALM_ID = '\" + database.escapeStringForDatabase(realmId) + \"'\")\n+ clientTable + \".REALM_ID = '\" + database.escapeStringForDatabase(entry.getValue()) + \"'\")\n);\n}\n}\n- private void extractRealmIds(String sql) throws CustomChangeException {\n+ private void extractRealmIdsAndNames(String sql) throws CustomChangeException {\ntry (PreparedStatement statement = jdbcConnection.prepareStatement(sql);\nResultSet rs = statement.executeQuery()) {\nwhile (rs.next()) {\n- realmIds.add(rs.getString(1));\n+ realmIdsAndNames.put(rs.getString(1), rs.getString(2));\n}\n} catch (Exception e) {\n@@ -93,13 +93,13 @@ public class JpaUpdate13_0_0_MigrateDefaultRoles extends CustomKeycloakTask {\n}\n}\n- private String determineDefaultRoleName(String realmId) throws CustomChangeException {\n- String roleName = Constants.DEFAULT_ROLES_ROLE_PREFIX + \"-\" + realmId.toLowerCase();\n+ private String determineDefaultRoleName(String realmId, String realmName) throws CustomChangeException {\n+ String roleName = Constants.DEFAULT_ROLES_ROLE_PREFIX + \"-\" + realmName.toLowerCase();\nif (isRoleNameAvailable(realmId, roleName)) {\nreturn roleName;\n} else {\nfor (int i = 1; i < Integer.MAX_VALUE; i++) {\n- roleName = Constants.DEFAULT_ROLES_ROLE_PREFIX + \"-\" + realmId.toLowerCase() + \"-\" + i;\n+ roleName = Constants.DEFAULT_ROLES_ROLE_PREFIX + \"-\" + realmName.toLowerCase() + \"-\" + i;\nif (isRoleNameAvailable(realmId, roleName)) return roleName;\n}\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/client/MapClientProvider.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/client/MapClientProvider.java", "diff": "@@ -164,8 +164,11 @@ public class MapClientProvider implements ClientProvider {\n@Override\npublic Stream<ClientModel> getAlwaysDisplayInConsoleClientsStream(RealmModel realm) {\n- return getClientsStream(realm)\n- .filter(ClientModel::isAlwaysDisplayInConsole);\n+ DefaultModelCriteria<ClientModel> mcb = criteria();\n+ mcb = mcb.compare(SearchableFields.REALM_ID, Operator.EQ, realm.getId())\n+ .compare(SearchableFields.ALWAYS_DISPLAY_IN_CONSOLE, Operator.EQ, Boolean.TRUE);\n+ return tx.read(withCriteria(mcb).orderBy(SearchableFields.CLIENT_ID, ASCENDING))\n+ .map(entityToAdapterFunc(realm));\n}\n@Override\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": "@@ -106,6 +106,7 @@ public class MapFieldPredicates {\nput(CLIENT_PREDICATES, ClientModel.SearchableFields.CLIENT_ID, MapClientEntity::getClientId);\nput(CLIENT_PREDICATES, ClientModel.SearchableFields.SCOPE_MAPPING_ROLE, MapFieldPredicates::checkScopeMappingRole);\nput(CLIENT_PREDICATES, ClientModel.SearchableFields.ENABLED, MapClientEntity::isEnabled);\n+ put(CLIENT_PREDICATES, ClientModel.SearchableFields.ALWAYS_DISPLAY_IN_CONSOLE, MapClientEntity::isAlwaysDisplayInConsole);\nput(CLIENT_PREDICATES, ClientModel.SearchableFields.ATTRIBUTE, MapFieldPredicates::checkClientAttributes);\nput(CLIENT_SCOPE_PREDICATES, ClientScopeModel.SearchableFields.REALM_ID, MapClientScopeEntity::getRealmId);\n" }, { "change_type": "MODIFY", "old_path": "server-spi/src/main/java/org/keycloak/models/ClientModel.java", "new_path": "server-spi/src/main/java/org/keycloak/models/ClientModel.java", "diff": "@@ -47,6 +47,7 @@ public interface ClientModel extends ClientScopeModel, RoleContainerModel, Prot\npublic static final SearchableModelField<ClientModel> CLIENT_ID = new SearchableModelField<>(\"clientId\", String.class);\npublic static final SearchableModelField<ClientModel> ENABLED = new SearchableModelField<>(\"enabled\", Boolean.class);\npublic static final SearchableModelField<ClientModel> SCOPE_MAPPING_ROLE = new SearchableModelField<>(\"scopeMappingRole\", String.class);\n+ public static final SearchableModelField<ClientModel> ALWAYS_DISPLAY_IN_CONSOLE = new SearchableModelField<>(\"alwaysDisplayInConsole\", Boolean.class);\n/**\n* Search for attribute value. The parameters is a pair {@code (attribute_name, values...)} where {@code attribute_name}\n" } ]

[ { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/authentication/authenticators/directgrant/ValidateUsername.java", "new_path": "services/src/main/java/org/keycloak/authentication/authenticators/directgrant/ValidateUsername.java", "diff": "@@ -82,7 +82,7 @@ public class ValidateUsername extends AbstractDirectGrantAuthenticator {\ncontext.getEvent().user(user);\ncontext.getEvent().error(bruteForceError);\nResponse challengeResponse = errorResponse(Response.Status.UNAUTHORIZED.getStatusCode(), \"invalid_grant\", \"Invalid user credentials\");\n- context.failure(AuthenticationFlowError.INVALID_USER, challengeResponse);\n+ context.forceChallenge(challengeResponse);\nreturn;\n}\n@@ -90,7 +90,7 @@ public class ValidateUsername extends AbstractDirectGrantAuthenticator {\ncontext.getEvent().user(user);\ncontext.getEvent().error(Errors.USER_DISABLED);\nResponse challengeResponse = errorResponse(Response.Status.BAD_REQUEST.getStatusCode(), \"invalid_grant\", \"Account disabled\");\n- context.failure(AuthenticationFlowError.INVALID_USER, challengeResponse);\n+ context.forceChallenge(challengeResponse);\nreturn;\n}\ncontext.setUser(user);\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BruteForceTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BruteForceTest.java", "diff": "*/\npackage org.keycloak.testsuite.forms;\n+import org.hamcrest.MatcherAssert;\nimport org.jboss.arquillian.graphene.page.Page;\nimport org.junit.After;\nimport org.junit.Assert;\n@@ -98,13 +99,15 @@ public class BruteForceTest extends AbstractTestRealmKeycloakTest {\nprivate int lifespan;\n+ private static final Integer failureFactor= 2;\n+\n@Override\npublic void configureTestRealm(RealmRepresentation testRealm) {\nUserRepresentation user = RealmRepUtil.findUser(testRealm, \"test-user@localhost\");\nUserBuilder.edit(user).totpSecret(\"totpSecret\");\ntestRealm.setBruteForceProtected(true);\n- testRealm.setFailureFactor(2);\n+ testRealm.setFailureFactor(failureFactor);\ntestRealm.setMaxDeltaTimeSeconds(20);\ntestRealm.setMaxFailureWaitSeconds(100);\ntestRealm.setWaitIncrementSeconds(5);\n@@ -122,7 +125,7 @@ public class BruteForceTest extends AbstractTestRealmKeycloakTest {\nclearUserFailures();\nclearAllUserFailures();\nRealmRepresentation realm = adminClient.realm(\"test\").toRepresentation();\n- realm.setFailureFactor(2);\n+ realm.setFailureFactor(failureFactor);\nrealm.setMaxDeltaTimeSeconds(20);\nrealm.setMaxFailureWaitSeconds(100);\nrealm.setWaitIncrementSeconds(5);\n@@ -316,6 +319,73 @@ public class BruteForceTest extends AbstractTestRealmKeycloakTest {\n}\n+ @Test\n+ public void testNumberOfFailuresForDisabledUsersWithPasswordGrantType() throws Exception {\n+ try {\n+ UserRepresentation user = adminClient.realm(\"test\").users().search(\"test-user@localhost\", 0, 1).get(0);\n+ assertUserNumberOfFailures(user.getId(), 0);\n+ user.setEnabled(false);\n+ updateUser(user);\n+\n+ OAuthClient.AccessTokenResponse response = getTestToken(\"invalid\", \"invalid\");\n+ Assert.assertNull(response.getAccessToken());\n+ Assert.assertEquals(response.getError(), \"invalid_grant\");\n+ Assert.assertEquals(response.getErrorDescription(), \"Account disabled\");\n+ events.clear();\n+\n+ assertUserNumberOfFailures(user.getId(), 0);\n+ } finally {\n+ UserRepresentation user = adminClient.realm(\"test\").users().search(\"test-user@localhost\", 0, 1).get(0);\n+ user.setEnabled(true);\n+ updateUser(user);\n+ events.clear();\n+ }\n+ }\n+\n+ @Test\n+ public void testNumberOfFailuresForTemporaryDisabledUsersWithPasswordGrantType() throws Exception {\n+ UserRepresentation user = adminClient.realm(\"test\").users().search(\"test-user@localhost\", 0, 1).get(0);\n+\n+ // Lock user (temporarily) and make sure the number of failures matches failure factor\n+ lockUserWithPasswordGrant();\n+ assertUserNumberOfFailures(user.getId(), failureFactor);\n+\n+ // Try to login with invalid credentials and make sure the number of failures doesn't change during temporary lockout\n+ sendInvalidPasswordPasswordGrant();\n+ assertUserNumberOfFailures(user.getId(), failureFactor);\n+\n+ events.clear();\n+ }\n+\n+ @Test\n+ public void testNumberOfFailuresForPermanentlyDisabledUsersWithPasswordGrantType() throws Exception {\n+ RealmRepresentation realm = testRealm().toRepresentation();\n+ try {\n+ // Set permanent lockout for the test\n+ realm.setPermanentLockout(true);\n+ testRealm().update(realm);\n+\n+ UserRepresentation user = adminClient.realm(\"test\").users().search(\"test-user@localhost\", 0, 1).get(0);\n+\n+ // Lock user (permanently) and make sure the number of failures matches failure factor\n+ lockUserWithPasswordGrant();\n+ assertUserNumberOfFailures(user.getId(), failureFactor);\n+ assertUserDisabledReason(BruteForceProtector.DISABLED_BY_PERMANENT_LOCKOUT);\n+\n+ // Try to login with invalid credentials and make sure the number of failures doesn't change during temporary lockout\n+ sendInvalidPasswordPasswordGrant();\n+ assertUserNumberOfFailures(user.getId(), failureFactor);\n+\n+ events.clear();\n+ } finally {\n+ realm.setPermanentLockout(false);\n+ testRealm().update(realm);\n+ UserRepresentation user = adminClient.realm(\"test\").users().search(\"test-user@localhost\", 0, 1).get(0);\n+ user.setEnabled(true);\n+ updateUser(user);\n+ }\n+ }\n+\n@Test\npublic void testBrowserInvalidPassword() throws Exception {\nloginSuccess();\n@@ -725,4 +795,30 @@ public class BruteForceTest extends AbstractTestRealmKeycloakTest {\n.firstAttribute(UserModel.DISABLED_REASON);\nassertEquals(expected, actual);\n}\n+\n+ private void assertUserNumberOfFailures(String userId, Integer numberOfFailures) {\n+ Map<String, Object> userAttackInfo = adminClient.realm(\"test\").attackDetection().bruteForceUserStatus(userId);\n+ MatcherAssert.assertThat((Integer) userAttackInfo.get(\"numFailures\"), is(numberOfFailures));\n+ }\n+\n+ private void sendInvalidPasswordPasswordGrant() throws Exception {\n+ String totpSecret = totp.generateTOTP(\"totpSecret\");\n+ OAuthClient.AccessTokenResponse response = getTestToken(\"invalid\", totpSecret);\n+ Assert.assertNull(response.getAccessToken());\n+ Assert.assertEquals(response.getError(), \"invalid_grant\");\n+ Assert.assertEquals(response.getErrorDescription(), \"Invalid user credentials\");\n+ events.clear();\n+ }\n+\n+ private void lockUserWithPasswordGrant() throws Exception {\n+ String totpSecret = totp.generateTOTP(\"totpSecret\");\n+ OAuthClient.AccessTokenResponse response = getTestToken(\"password\", totpSecret);\n+ Assert.assertNotNull(response.getAccessToken());\n+ Assert.assertNull(response.getError());\n+ events.clear();\n+\n+ for (int i = 0; i < failureFactor; ++i) {\n+ sendInvalidPasswordPasswordGrant();\n+ }\n+ }\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/authentication/authenticators/browser/AbstractUsernameFormAuthenticator.java", "new_path": "services/src/main/java/org/keycloak/authentication/authenticators/browser/AbstractUsernameFormAuthenticator.java", "diff": "@@ -98,7 +98,7 @@ public abstract class AbstractUsernameFormAuthenticator extends AbstractFormAuth\nprotected void runDefaultDummyHash(AuthenticationFlowContext context) {\nPasswordHashProvider hash = context.getSession().getProvider(PasswordHashProvider.class, PasswordPolicy.HASH_ALGORITHM_DEFAULT);\n- hash.encode(\"dummypassword\", PasswordPolicy.HASH_ITERATIONS_DEFAULT);\n+ hash.encode(\"SlightlyLongerDummyPassword\", PasswordPolicy.HASH_ITERATIONS_DEFAULT);\n}\nprotected void dummyHash(AuthenticationFlowContext context) {\n@@ -113,7 +113,7 @@ public abstract class AbstractUsernameFormAuthenticator extends AbstractFormAuth\nreturn;\n} else {\n- hash.encode(\"dummypassword\", policy.getHashIterations());\n+ hash.encode(\"SlightlyLongerDummyPassword\", policy.getHashIterations());\n}\n}\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": "@@ -26,6 +26,7 @@ import org.keycloak.models.RoleModel;\nimport java.util.Collections;\nimport java.util.List;\nimport java.util.Map;\n+import java.util.Set;\nimport java.util.stream.Stream;\n@@ -83,7 +84,8 @@ public class MapGroupAdapter extends AbstractGroupModel<MapGroupEntity> {\n@Override\npublic Map<String, List<String>> getAttributes() {\n- return entity.getAttributes();\n+ Map<String, List<String>> attrs = entity.getAttributes();\n+ return attrs == null ? Collections.emptyMap() : attrs;\n}\n@Override\n@@ -147,7 +149,8 @@ public class MapGroupAdapter extends AbstractGroupModel<MapGroupEntity> {\n@Override\npublic boolean hasDirectRole(RoleModel role) {\n- return entity.getGrantedRoles().contains(role.getId());\n+ Set<String> grantedRoles = entity.getGrantedRoles();\n+ return grantedRoles != null && grantedRoles.contains(role.getId());\n}\n@Override\n@@ -162,12 +165,13 @@ public class MapGroupAdapter extends AbstractGroupModel<MapGroupEntity> {\n@Override\npublic Stream<RoleModel> getRoleMappingsStream() {\n- return entity.getGrantedRoles().stream()\n+ Set<String> grantedRoles = entity.getGrantedRoles();\n+ return grantedRoles == null ? Stream.empty() : grantedRoles.stream()\n.map(roleId -> session.roles().getRoleById(realm, roleId));\n}\n@Override\npublic void deleteRoleMapping(RoleModel role) {\n- entity.removeRole(role.getId());\n+ entity.removeGrantedRole(role.getId());\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/group/MapGroupEntity.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/group/MapGroupEntity.java", "diff": "/*\n- * Copyright 2020 Red Hat, Inc. and/or its affiliates\n+ * Copyright 2021 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\");\npackage org.keycloak.models.map.group;\n+import org.keycloak.models.map.annotations.GenerateEntityImplementations;\nimport org.keycloak.models.map.common.AbstractEntity;\n-\n+import org.keycloak.models.map.common.DeepCloner;\nimport org.keycloak.models.map.common.UpdatableEntity;\n-import java.util.HashMap;\n-import java.util.HashSet;\n+\nimport java.util.List;\nimport java.util.Map;\n-import java.util.Objects;\nimport java.util.Set;\n-/**\n- *\n- * @author mhajas\n- */\n-public class MapGroupEntity extends UpdatableEntity.Impl implements AbstractEntity {\n-\n- private String id;\n- private String realmId;\n-\n- private String name;\n- private String parentId;\n- private Map<String, List<String>> attributes = new HashMap<>();\n- private Set<String> grantedRoles = new HashSet<>();\n-\n- /**\n- * Flag signalizing that any of the setters has been meaningfully used.\n- */\n+@GenerateEntityImplementations(\n+ inherits = \"org.keycloak.models.map.group.MapGroupEntity.AbstractGroupEntity\"\n+)\[email protected]\n+public interface MapGroupEntity extends UpdatableEntity, AbstractEntity {\n- public MapGroupEntity() {}\n+ public abstract class AbstractGroupEntity extends UpdatableEntity.Impl implements MapGroupEntity {\n- public MapGroupEntity(String id, String realmId) {\n- this.id = id;\n- this.realmId = realmId;\n- }\n+ private String id;\n@Override\npublic String getId() {\n@@ -64,71 +48,25 @@ public class MapGroupEntity extends UpdatableEntity.Impl implements AbstractEnti\nthis.updated |= id != null;\n}\n- public String getName() {\n- return name;\n}\n- public void setName(String name) {\n- this.updated |= ! Objects.equals(this.name, name);\n- this.name = name;\n- }\n+ Map<String, List<String>> getAttributes();\n+ void setAttributes(Map<String, List<String>> attributes);\n+ List<String> getAttribute(String name);\n+ void setAttribute(String name, List<String> value);\n+ void removeAttribute(String name);\n- public String getParentId() {\n- return parentId;\n- }\n+ String getName();\n+ void setName(String name);\n- public void setParentId(String parentId) {\n- this.updated |= !Objects.equals(this.parentId, parentId);\n- this.parentId = parentId;\n- }\n-\n- public Map<String, List<String>> getAttributes() {\n- return attributes;\n- }\n+ String getParentId();\n+ void setParentId(String parentId);\n- public void setAttributes(Map<String, List<String>> attributes) {\n- this.updated |= ! Objects.equals(this.attributes, attributes);\n- this.attributes = attributes;\n- }\n+ String getRealmId();\n+ void setRealmId(String realmId);\n- public void setAttribute(String name, List<String> value) {\n- this.updated |= !this.attributes.containsKey(name) || !this.attributes.get(name).equals(value);\n- this.attributes.put(name, value);\n- }\n-\n- public void removeAttribute(String name) {\n- this.updated |= this.attributes.remove(name) != null;\n- }\n-\n- public List<String> getAttribute(String name) {\n- return this.attributes.get(name);\n- }\n-\n- public String getRealmId() {\n- return this.realmId;\n- }\n-\n- public void setRealmId(String realmId) {\n- this.updated |= !Objects.equals(this.realmId, realmId);\n- this.realmId = realmId;\n- }\n-\n- public Set<String> getGrantedRoles() {\n- return grantedRoles;\n- }\n-\n- public void setGrantedRoles(Set<String> grantedRoles) {\n- this.updated |= !Objects.equals(this.grantedRoles, grantedRoles);\n- this.grantedRoles = grantedRoles;\n- }\n-\n- public void removeRole(String role) {\n- this.updated |= this.grantedRoles.contains(role);\n- this.grantedRoles.remove(role);\n- }\n-\n- public void addGrantedRole(String role) {\n- this.updated |= !this.grantedRoles.contains(role);\n- this.grantedRoles.add(role);\n- }\n+ Set<String> getGrantedRoles();\n+ void setGrantedRoles(Set<String> grantedRoles);\n+ void addGrantedRole(String role);\n+ void removeGrantedRole(String role);\n}\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": "@@ -197,7 +197,9 @@ public class MapGroupProvider implements GroupProvider {\nthrow new ModelDuplicateException(\"Group with name '\" + name + \"' in realm \" + realm.getName() + \" already exists for requested parent\" );\n}\n- MapGroupEntity entity = new MapGroupEntity(id, realm.getId());\n+ MapGroupEntity entity = new MapGroupEntityImpl();\n+ entity.setId(id);\n+ entity.setRealmId(realm.getId());\nentity.setName(name);\nentity.setParentId(toParent == null ? null : toParent.getId());\nif (id != null && tx.read(id) != null) {\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/storage/chm/ConcurrentHashMapStorageProviderFactory.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/storage/chm/ConcurrentHashMapStorageProviderFactory.java", "diff": "@@ -52,6 +52,7 @@ import org.keycloak.models.map.common.DeepCloner;\nimport org.keycloak.models.map.common.Serialization;\nimport org.keycloak.models.map.common.UpdatableEntity;\nimport org.keycloak.models.map.group.MapGroupEntity;\n+import org.keycloak.models.map.group.MapGroupEntityImpl;\nimport org.keycloak.models.map.loginFailure.MapUserLoginFailureEntity;\nimport org.keycloak.models.map.realm.MapRealmEntity;\nimport org.keycloak.models.map.role.MapRoleEntity;\n@@ -104,6 +105,7 @@ public class ConcurrentHashMapStorageProviderFactory implements AmphibianProvide\n.genericCloner(Serialization::from)\n.constructorDC(MapClientEntityImpl.class, MapClientEntityImpl::new)\n.constructor(MapProtocolMapperEntity.class, MapProtocolMapperEntityImpl::new)\n+ .constructor(MapGroupEntityImpl.class, MapGroupEntityImpl::new)\n.build();\npublic static final Map<Class<?>, String> MODEL_TO_NAME = new HashMap<>();\n@@ -153,7 +155,7 @@ public class ConcurrentHashMapStorageProviderFactory implements AmphibianProvide\nINTERFACE_TO_IMPL.put(MapClientEntity.class, MapClientEntityImpl.class);\n// INTERFACE_TO_IMPL.put(MapClientScopeEntity.class, MapClientScopeEntityImpl.class);\n// INTERFACE_TO_IMPL.put(MapClientEntity.class, MapClientEntityImpl.class);\n-// INTERFACE_TO_IMPL.put(MapGroupEntity.class, MapGroupEntityImpl.class);\n+ INTERFACE_TO_IMPL.put(MapGroupEntity.class, MapGroupEntityImpl.class);\n// INTERFACE_TO_IMPL.put(MapRealmEntity.class, MapRealmEntityImpl.class);\n// INTERFACE_TO_IMPL.put(MapRoleEntity.class, MapRoleEntityImpl.class);\n// INTERFACE_TO_IMPL.put(MapRootAuthenticationSessionEntity.class, MapRootAuthenticationSessionEntityImpl.class);\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": "@@ -25,6 +25,7 @@ import static org.keycloak.quarkus.runtime.configuration.Configuration.getBuiltT\nimport static org.keycloak.quarkus.runtime.configuration.Configuration.getConfig;\nimport static org.keycloak.quarkus.runtime.Environment.isDevMode;\nimport static org.keycloak.quarkus.runtime.configuration.Configuration.getRuntimeProperty;\n+import static org.keycloak.quarkus.runtime.configuration.mappers.PropertyMappers.formatValue;\nimport static org.keycloak.quarkus.runtime.configuration.mappers.PropertyMappers.isBuildTimeProperty;\nimport static org.keycloak.utils.StringUtil.isNotBlank;\nimport static picocli.CommandLine.Model.UsageMessageSpec.SECTION_KEY_COMMAND_LIST;\n@@ -34,6 +35,7 @@ import java.io.FileInputStream;\nimport java.io.InputStream;\nimport java.util.ArrayList;\nimport java.util.Arrays;\n+import java.util.Collections;\nimport java.util.Iterator;\nimport java.util.List;\nimport java.util.Map;\n@@ -49,13 +51,13 @@ import org.keycloak.quarkus.runtime.cli.command.Main;\nimport org.keycloak.quarkus.runtime.cli.command.Start;\nimport org.keycloak.quarkus.runtime.cli.command.StartDev;\nimport org.keycloak.common.Profile;\n+import org.keycloak.quarkus.runtime.configuration.MicroProfileConfigProvider;\nimport org.keycloak.quarkus.runtime.configuration.mappers.ConfigCategory;\nimport org.keycloak.quarkus.runtime.configuration.mappers.PropertyMappers;\nimport org.keycloak.quarkus.runtime.configuration.KeycloakConfigSourceProvider;\nimport org.keycloak.quarkus.runtime.configuration.mappers.PropertyMapper;\nimport org.keycloak.quarkus.runtime.Environment;\n-import io.quarkus.runtime.Quarkus;\nimport io.smallrye.config.ConfigValue;\nimport picocli.CommandLine;\nimport picocli.CommandLine.Model.CommandSpec;\n@@ -118,11 +120,12 @@ public final class Picocli {\nif (hasConfigChanges()) {\ncmd.getOut().println(\"Changes detected in configuration. Updating the server image.\");\nif(!isDevMode()) {\n+ List<String> cliInput = getSanitizedCliInput();\ncmd.getOut().printf(\"For an optional runtime and bypass this step, please run the '%s' command prior to starting the server:%n%n\\t%s %s %s%n\",\nBuild.NAME,\nEnvironment.getCommand(),\nBuild.NAME,\n- String.join(\" \", asList(ARG_SPLIT.split(Environment.getConfigArgs()))) + \"\\n\");\n+ String.join(\" \", cliInput) + \"\\n\");\n}\nreturn true;\n}\n@@ -130,6 +133,39 @@ public final class Picocli {\nreturn hasProviderChanges();\n}\n+ /**\n+ * checks the raw cli input for possible credentials / properties which should be masked,\n+ * and masks them.\n+ * @return a list of potentially masked properties in CLI format, e.g. `--db-password=*******`\n+ * instead of the actual passwords value.\n+ */\n+ private static List<String> getSanitizedCliInput() {\n+\n+ if(Environment.getConfigArgs().isEmpty()) {\n+ return Collections.emptyList();\n+ }\n+\n+ List<String> rawCliArgs = asList(ARG_SPLIT.split(Environment.getConfigArgs()));\n+ List<String> properties = new ArrayList<>();\n+\n+ if (!rawCliArgs.isEmpty()) {\n+ for(String rawCliArg : rawCliArgs) {\n+ String rawKey = rawCliArg.split(\"=\")[0];\n+ PropertyMapper mapper = PropertyMappers.getMapper(rawKey);\n+ String value = rawCliArg.split(\"=\")[1];\n+\n+ if (mapper != null) {\n+ value = formatValue(\n+ mapper.getFrom(),\n+ value);\n+ }\n+\n+ properties.add(rawKey + \"=\" + value);\n+ }\n+ }\n+ return properties;\n+ }\n+\nprivate static void runReAugmentation(List<String> cliArgs, CommandLine cmd) {\nList<String> configArgsList = new ArrayList<>(cliArgs);\n" }, { "change_type": "MODIFY", "old_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/PropertyMapper.java", "new_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/PropertyMapper.java", "diff": "@@ -22,6 +22,7 @@ import java.util.function.BiFunction;\nimport io.smallrye.config.ConfigSourceInterceptorContext;\nimport io.smallrye.config.ConfigValue;\n+import org.keycloak.quarkus.runtime.cli.Picocli;\nimport org.keycloak.quarkus.runtime.configuration.MicroProfileConfigProvider;\npublic class PropertyMapper {\n@@ -46,6 +47,8 @@ public class PropertyMapper {\nprivate final ConfigCategory category;\nprivate final String paramLabel;\nprivate final boolean hidden;\n+ private String cliFormat;\n+\nPropertyMapper(String from, String to, String defaultValue, BiFunction<String, ConfigSourceInterceptorContext, String> mapper,\nString mapFrom, boolean buildTime, String description, String paramLabel, boolean mask, Iterable<String> expectedValues,\n@@ -62,6 +65,7 @@ public class PropertyMapper {\nthis.expectedValues = expectedValues == null ? Collections.emptyList() : expectedValues;\nthis.category = category != null ? category : ConfigCategory.GENERAL;\nthis.hidden = hidden;\n+ setCliFormat(this.from);\n}\npublic static PropertyMapper.Builder builder(String fromProp, String toProp) {\n@@ -163,6 +167,26 @@ public class PropertyMapper {\nreturn hidden;\n}\n+ public boolean isBuildTime() {\n+ return buildTime;\n+ }\n+\n+ public String getTo() {\n+ return to;\n+ }\n+\n+ public String getParamLabel() {\n+ return paramLabel;\n+ }\n+\n+ public String getCliFormat() {\n+ return cliFormat;\n+ }\n+\n+ boolean isMask() {\n+ return mask;\n+ }\n+\nprivate ConfigValue transformValue(String value, ConfigSourceInterceptorContext context) {\nif (value == null) {\nreturn null;\n@@ -181,20 +205,8 @@ public class PropertyMapper {\nreturn null;\n}\n- public boolean isBuildTime() {\n- return buildTime;\n- }\n-\n- boolean isMask() {\n- return mask;\n- }\n-\n- public String getTo() {\n- return to;\n- }\n-\n- public String getParamLabel() {\n- return paramLabel;\n+ private void setCliFormat(String from) {\n+ cliFormat = Picocli.ARG_PREFIX + PropertyMappers.toCLIFormat(from).substring(3);\n}\npublic static class Builder {\n" }, { "change_type": "MODIFY", "old_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/PropertyMappers.java", "new_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/PropertyMappers.java", "diff": "@@ -15,6 +15,7 @@ import java.util.stream.Collectors;\npublic final class PropertyMappers {\n+ public static String VALUE_MASK = \"*******\";\nstatic final MappersConfig MAPPERS = new MappersConfig();\nprivate PropertyMappers(){}\n@@ -96,6 +97,7 @@ public final class PropertyMappers {\nif (name.indexOf('.') == -1) {\nreturn name;\n}\n+\nreturn MicroProfileConfigProvider.NS_KEYCLOAK_PREFIX\n.concat(name.substring(3, name.lastIndexOf('.') + 1)\n.replaceAll(\"\\\\.\", \"-\") + name.substring(name.lastIndexOf('.') + 1));\n@@ -116,23 +118,26 @@ public final class PropertyMappers {\n}\npublic static String formatValue(String property, String value) {\n+ property = removeProfilePrefixIfNeeded(property);\nPropertyMapper mapper = getMapper(property);\nif (mapper != null && mapper.isMask()) {\n- return \"*******\";\n+ return VALUE_MASK;\n}\nreturn value;\n}\n- public static PropertyMapper getMapper(String property) {\n- PropertyMapper mapper = MAPPERS.get(property);\n-\n- if (mapper != null) {\n- return mapper;\n+ private static String removeProfilePrefixIfNeeded(String property) {\n+ if(property.startsWith(\"%\")) {\n+ String profilePrefix = property.substring(0, property.indexOf(\".\") +1);\n+ property = property.split(profilePrefix)[1];\n+ }\n+ return property;\n}\n- return null;\n+ public static PropertyMapper getMapper(String property) {\n+ return MAPPERS.get(property);\n}\npublic static Collection<PropertyMapper> getMappers() {\n@@ -164,6 +169,7 @@ public final class PropertyMappers {\nfor (PropertyMapper mapper : mappers) {\nsuper.put(mapper.getTo(), mapper);\nsuper.put(mapper.getFrom(), mapper);\n+ super.put(mapper.getCliFormat(), mapper);\n}\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": "@@ -88,17 +88,18 @@ public class JpaEventStoreProvider implements EventStoreProvider {\nif (KeycloakModelUtils.isRealmProviderJpa(session)) {\n// Group realms by expiration times. This will be effective if different realms have same/similar event expiration times, which will probably be the case in most environments\n- List<Long> eventExpirations = em.createQuery(\"select distinct realm.eventsExpiration from RealmEntity realm\").getResultList();\n+ List<Long> eventExpirations = em.createQuery(\"select distinct realm.eventsExpiration from RealmEntity realm where realm.eventsExpiration > 0\").getResultList();\nfor (Long expiration : eventExpirations) {\n- if (expiration > 0) {\n- int currentNumDeleted = em.createQuery(\"delete from EventEntity where realmId in (select realm.id from RealmEntity realm where realm.eventsExpiration = :expiration) and time < :eventTime\")\n+ List<String> realmIds = em.createQuery(\"select realm.id from RealmEntity realm where realm.eventsExpiration = :expiration\")\n.setParameter(\"expiration\", expiration)\n+ .getResultList();\n+ int currentNumDeleted = em.createQuery(\"delete from EventEntity where realmId in :realmIds and time < :eventTime\")\n+ .setParameter(\"realmIds\", realmIds)\n.setParameter(\"eventTime\", currentTimeMillis - (expiration * 1000))\n.executeUpdate();\nlogger.tracef(\"Deleted %d events for the expiration %d\", currentNumDeleted, expiration);\nnumDeleted += currentNumDeleted;\n}\n- }\nlogger.debugf(\"Cleared %d expired events in all realms\", numDeleted);\n} else {\nsession.realms().getRealmsStream().forEach(realm -> {\n" } ]

[ { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/services/resources/admin/UserResource.java", "new_path": "services/src/main/java/org/keycloak/services/resources/admin/UserResource.java", "diff": "@@ -954,7 +954,7 @@ public class UserResource {\nif (clientSession == null) {\nreturn null;\n}\n- rep.setLastAccess(clientSession.getTimestamp());\n+ rep.setLastAccess(Time.toMillis(clientSession.getTimestamp()));\nreturn rep;\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ClientTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ClientTest.java", "diff": "@@ -19,8 +19,11 @@ package org.keycloak.testsuite.admin;\nimport static java.util.Arrays.asList;\nimport static org.hamcrest.CoreMatchers.is;\n+import static org.hamcrest.Matchers.allOf;\nimport static org.hamcrest.Matchers.containsInAnyOrder;\n+import static org.hamcrest.Matchers.greaterThan;\nimport static org.hamcrest.Matchers.hasItem;\n+import static org.hamcrest.Matchers.lessThan;\nimport static org.hamcrest.Matchers.not;\nimport static org.junit.Assert.assertEquals;\nimport static org.junit.Assert.assertFalse;\n@@ -536,6 +539,8 @@ public class ClientTest extends AbstractAdminTest {\nList<UserSessionRepresentation> offlineUserSessions = realm.clients().get(id).getOfflineUserSessions(0, 100);\nassertEquals(1, offlineUserSessions.size());\nassertEquals(\"testuser\", offlineUserSessions.get(0).getUsername());\n+ org.hamcrest.MatcherAssert.assertThat(offlineUserSessions.get(0).getLastAccess(),\n+ allOf(greaterThan(Time.currentTimeMillis() - 10000L), lessThan(Time.currentTimeMillis())));\nuserSessions = realm.users().get(userId).getOfflineSessions(id);\nassertEquals(\"There should be one offline session\", 1, userSessions.size());\n" } ]

[ { "change_type": "MODIFY", "old_path": "distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/keycloak/keycloak-core/main/module.xml", "new_path": "distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/keycloak/keycloak-core/main/module.xml", "diff": "<module name=\"com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider\"/>\n<module name=\"org.keycloak.keycloak-common\" />\n<module name=\"org.bouncycastle\" />\n+ <module name=\"org.jboss.logging\"/>\n<module name=\"javax.api\"/>\n<module name=\"javax.activation.api\"/>\n<module name=\"sun.jdk\" optional=\"true\" />\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/role/MapRoleAdapter.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/role/MapRoleAdapter.java", "diff": "@@ -21,6 +21,7 @@ import java.util.HashSet;\nimport java.util.List;\nimport java.util.Map;\nimport java.util.Objects;\n+import java.util.Set;\nimport java.util.stream.Stream;\nimport org.jboss.logging.Logger;\nimport static org.keycloak.common.util.StackUtil.getShortStackTrace;\n@@ -65,21 +66,23 @@ public class MapRoleAdapter extends AbstractRoleModel<MapRoleEntity> implements\n@Override\npublic boolean isComposite() {\n- return ! entity.getCompositeRoles().isEmpty();\n+ return ! (entity.getCompositeRoles() == null || entity.getCompositeRoles().isEmpty());\n}\n@Override\npublic Stream<RoleModel> getCompositesStream() {\n- LOG.tracef(\"%% %s(%s).getCompositesStream():%d - %s\", entity.getName(), entity.getId(), entity.getCompositeRoles().size(), getShortStackTrace());\n- return entity.getCompositeRoles().stream()\n+ Set<String> compositeRoles = entity.getCompositeRoles() == null ? Collections.emptySet() : entity.getCompositeRoles();\n+ LOG.tracef(\"%% %s(%s).getCompositesStream():%d - %s\", entity.getName(), entity.getId(), compositeRoles.size(), getShortStackTrace());\n+ return compositeRoles.stream()\n.map(uuid -> session.roles().getRoleById(realm, uuid))\n.filter(Objects::nonNull);\n}\n@Override\npublic Stream<RoleModel> getCompositesStream(String search, Integer first, Integer max) {\n- LOG.tracef(\"%% (%s).getCompositesStream(%s, %d, %d):%d - %s\", this, search, first, max, entity.getCompositeRoles().size(), getShortStackTrace());\n- return session.roles().getRolesStream(realm, entity.getCompositeRoles().stream(), search, first, max);\n+ Set<String> compositeRoles = entity.getCompositeRoles() == null ? Collections.emptySet() : entity.getCompositeRoles();\n+ LOG.tracef(\"%% (%s).getCompositesStream(%s, %d, %d):%d - %s\", this, search, first, max, compositeRoles.size(), getShortStackTrace());\n+ return session.roles().getRolesStream(realm, compositeRoles.stream(), search, first, max);\n}\n@Override\n@@ -96,7 +99,8 @@ public class MapRoleAdapter extends AbstractRoleModel<MapRoleEntity> implements\n@Override\npublic boolean isClientRole() {\n- return entity.isClientRole();\n+ final Boolean clientRole = entity.isClientRole();\n+ return clientRole == null ? false : clientRole;\n}\n@Override\n@@ -126,7 +130,8 @@ public class MapRoleAdapter extends AbstractRoleModel<MapRoleEntity> implements\n@Override\npublic Map<String, List<String>> getAttributes() {\n- return entity.getAttributes();\n+ Map<String, List<String>> attributes = entity.getAttributes();\n+ return attributes == null ? Collections.emptyMap() : attributes;\n}\n@Override\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/role/MapRoleEntity.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/role/MapRoleEntity.java", "diff": "*/\npackage org.keycloak.models.map.role;\n-import java.util.HashMap;\n-import java.util.HashSet;\nimport java.util.List;\nimport java.util.Map;\n-import java.util.Objects;\nimport java.util.Set;\n+import org.keycloak.models.map.annotations.GenerateEntityImplementations;\nimport org.keycloak.models.map.common.AbstractEntity;\n+import org.keycloak.models.map.common.DeepCloner;\nimport org.keycloak.models.map.common.UpdatableEntity;\n-public class MapRoleEntity extends UpdatableEntity.Impl implements AbstractEntity {\n+@GenerateEntityImplementations(\n+ inherits = \"org.keycloak.models.map.role.MapRoleEntity.AbstractRoleEntity\"\n+)\[email protected]\n+public interface MapRoleEntity extends AbstractEntity, UpdatableEntity {\n- private String id;\n- private String realmId;\n-\n- private String name;\n- private String description;\n- private boolean clientRole;\n- private String clientId;\n- private Set<String> compositeRoles = new HashSet<>();\n- private Map<String, List<String>> attributes = new HashMap<>();\n-\n- /**\n- * Flag signalizing that any of the setters has been meaningfully used.\n- */\n+ public abstract class AbstractRoleEntity extends UpdatableEntity.Impl implements MapRoleEntity {\n- public MapRoleEntity() {}\n-\n- public MapRoleEntity(String id, String realmId) {\n- this.id = id;\n- this.realmId = realmId;\n- }\n+ private String id;\n@Override\npublic String getId() {\n@@ -60,87 +46,40 @@ public class MapRoleEntity extends UpdatableEntity.Impl implements AbstractEntit\nthis.updated |= id != null;\n}\n- public String getName() {\n- return name;\n}\n- public void setName(String name) {\n- this.updated |= ! Objects.equals(this.name, name);\n- this.name = name;\n+ default Boolean isComposite() {\n+ return ! (getCompositeRoles() == null || getCompositeRoles().isEmpty());\n}\n- public String getDescription() {\n- return description;\n- }\n+ Boolean isClientRole();\n- public void setDescription(String description) {\n- this.updated |= ! Objects.equals(this.description, description);\n- this.description = description;\n- }\n+ String getRealmId();\n- public Map<String, List<String>> getAttributes() {\n- return attributes;\n- }\n+ String getClientId();\n- public void setAttributes(Map<String, List<String>> attributes) {\n- this.updated |= ! Objects.equals(this.attributes, attributes);\n- this.attributes = attributes;\n- }\n+ String getName();\n- public void setAttribute(String name, List<String> values) {\n- this.updated |= ! Objects.equals(this.attributes.put(name, values), values);\n- }\n+ String getDescription();\n- public void removeAttribute(String name) {\n- this.updated |= this.attributes.remove(name) != null;\n- }\n+ void setClientRole(Boolean clientRole);\n- public String getRealmId() {\n- return realmId;\n- }\n+ void setRealmId(String realmId);\n- public void setRealmId(String realmId) {\n- this.updated |= ! Objects.equals(this.realmId, realmId);\n- this.realmId = realmId;\n- }\n-\n- public boolean isClientRole() {\n- return clientRole;\n- }\n-\n- public void setClientRole(boolean clientRole) {\n- this.updated |= ! Objects.equals(this.clientRole, clientRole);\n- this.clientRole = clientRole;\n- }\n-\n- public boolean isComposite() {\n- return ! (compositeRoles == null || compositeRoles.isEmpty());\n- }\n+ void setClientId(String clientId);\n- public Set<String> getCompositeRoles() {\n- return compositeRoles;\n- }\n+ void setName(String name);\n- public String getClientId() {\n- return clientId;\n- }\n+ void setDescription(String description);\n- public void setClientId(String clientId) {\n- this.updated |= ! Objects.equals(this.clientId, clientId);\n- this.clientId = clientId;\n- }\n+ Set<String> getCompositeRoles();\n+ void setCompositeRoles(Set<String> compositeRoles);\n+ void addCompositeRole(String roleId);\n+ void removeCompositeRole(String roleId);\n- public void setCompositeRoles(Set<String> compositeRoles) {\n- this.updated |= ! Objects.equals(this.compositeRoles, compositeRoles);\n- this.compositeRoles.clear();\n- this.compositeRoles.addAll(compositeRoles);\n- }\n+ Map<String, List<String>> getAttributes();\n+ void setAttributes(Map<String, List<String>> attributes);\n+ void setAttribute(String name, List<String> values);\n+ void removeAttribute(String name);\n- public void addCompositeRole(String roleId) {\n- this.updated |= this.compositeRoles.add(roleId);\n- }\n-\n- public void removeCompositeRole(String roleId) {\n- this.updated |= this.compositeRoles.remove(roleId);\n- }\n}\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/role/MapRoleProvider.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/role/MapRoleProvider.java", "diff": "@@ -66,9 +66,10 @@ public class MapRoleProvider implements RoleProvider {\nLOG.tracef(\"addRealmRole(%s, %s, %s)%s\", realm, id, name, getShortStackTrace());\n- MapRoleEntity entity = new MapRoleEntity(id, realm.getId());\n- entity.setName(name);\n+ MapRoleEntity entity = new MapRoleEntityImpl();\n+ entity.setId(id);\nentity.setRealmId(realm.getId());\n+ entity.setName(name);\nif (tx.read(entity.getId()) != null) {\nthrow new ModelDuplicateException(\"Role exists: \" + id);\n}\n@@ -121,7 +122,9 @@ public class MapRoleProvider implements RoleProvider {\nLOG.tracef(\"addClientRole(%s, %s, %s)%s\", client, id, name, getShortStackTrace());\n- MapRoleEntity entity = new MapRoleEntity(id, client.getRealm().getId());\n+ MapRoleEntity entity = new MapRoleEntityImpl();\n+ entity.setId(id);\n+ entity.setRealmId(client.getRealm().getId());\nentity.setName(name);\nentity.setClientRole(true);\nentity.setClientId(client.getId());\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/storage/chm/ConcurrentHashMapStorageProviderFactory.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/storage/chm/ConcurrentHashMapStorageProviderFactory.java", "diff": "@@ -56,6 +56,7 @@ import org.keycloak.models.map.group.MapGroupEntityImpl;\nimport org.keycloak.models.map.loginFailure.MapUserLoginFailureEntity;\nimport org.keycloak.models.map.realm.MapRealmEntity;\nimport org.keycloak.models.map.role.MapRoleEntity;\n+import org.keycloak.models.map.role.MapRoleEntityImpl;\nimport com.fasterxml.jackson.databind.JavaType;\nimport java.io.File;\nimport java.io.IOException;\n@@ -106,6 +107,7 @@ public class ConcurrentHashMapStorageProviderFactory implements AmphibianProvide\n.constructorDC(MapClientEntityImpl.class, MapClientEntityImpl::new)\n.constructor(MapProtocolMapperEntity.class, MapProtocolMapperEntityImpl::new)\n.constructor(MapGroupEntityImpl.class, MapGroupEntityImpl::new)\n+ .constructor(MapRoleEntityImpl.class, MapRoleEntityImpl::new)\n.build();\npublic static final Map<Class<?>, String> MODEL_TO_NAME = new HashMap<>();\n@@ -154,10 +156,9 @@ public class ConcurrentHashMapStorageProviderFactory implements AmphibianProvide\nstatic {\nINTERFACE_TO_IMPL.put(MapClientEntity.class, MapClientEntityImpl.class);\n// INTERFACE_TO_IMPL.put(MapClientScopeEntity.class, MapClientScopeEntityImpl.class);\n-// INTERFACE_TO_IMPL.put(MapClientEntity.class, MapClientEntityImpl.class);\nINTERFACE_TO_IMPL.put(MapGroupEntity.class, MapGroupEntityImpl.class);\n// INTERFACE_TO_IMPL.put(MapRealmEntity.class, MapRealmEntityImpl.class);\n-// INTERFACE_TO_IMPL.put(MapRoleEntity.class, MapRoleEntityImpl.class);\n+ INTERFACE_TO_IMPL.put(MapRoleEntity.class, MapRoleEntityImpl.class);\n// INTERFACE_TO_IMPL.put(MapRootAuthenticationSessionEntity.class, MapRootAuthenticationSessionEntityImpl.class);\n// INTERFACE_TO_IMPL.put(MapUserLoginFailureEntity.class, MapUserLoginFailureEntityImpl.class);\n// INTERFACE_TO_IMPL.put(MapUserEntity.class, MapUserEntityImpl.class);\n" } ]

[ { "change_type": "MODIFY", "old_path": "distribution/server-x-dist/pom.xml", "new_path": "distribution/server-x-dist/pom.xml", "diff": "</exclusion>\n</exclusions>\n</dependency>\n+ <dependency>\n+ <groupId>org.keycloak</groupId>\n+ <artifactId>keycloak-client-cli-dist</artifactId>\n+ <type>zip</type>\n+ </dependency>\n</dependencies>\n<build>\n" } ]

[ { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/pom.xml", "new_path": "testsuite/integration-arquillian/pom.xml", "diff": "<!--the version of shrinkwrap_resolver should align with the version in arquillian-bom-->\n<shrinkwrap-resolver.version>3.1.4</shrinkwrap-resolver.version>\n<selenium.version>3.14.0</selenium.version>\n- <arquillian-drone.version>2.5.2</arquillian-drone.version>\n+ <arquillian-drone.version>2.5.4</arquillian-drone.version>\n<arquillian-graphene.version>2.3.2</arquillian-graphene.version>\n<arquillian-wildfly-container.version>2.1.1.Final</arquillian-wildfly-container.version>\n<arquillian-wls-container.version>1.0.1.Final</arquillian-wls-container.version>\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AccessTokenTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AccessTokenTest.java", "diff": "@@ -27,7 +27,6 @@ import org.apache.http.client.methods.HttpPost;\nimport org.apache.http.impl.client.CloseableHttpClient;\nimport org.apache.http.impl.client.HttpClientBuilder;\nimport org.apache.http.message.BasicNameValuePair;\n-import org.hamcrest.collection.IsArrayContaining;\nimport org.bouncycastle.jce.provider.BouncyCastleProvider;\nimport org.junit.Assert;\nimport org.junit.Before;\n@@ -98,11 +97,12 @@ import java.util.concurrent.TimeUnit;\nimport static org.hamcrest.Matchers.allOf;\nimport static org.hamcrest.Matchers.greaterThanOrEqualTo;\nimport static org.hamcrest.Matchers.lessThanOrEqualTo;\n+import static org.hamcrest.Matchers.hasItemInArray;\n+import static org.hamcrest.MatcherAssert.assertThat;\nimport static org.junit.Assert.assertEquals;\nimport static org.junit.Assert.assertNotEquals;\nimport static org.junit.Assert.assertNotNull;\nimport static org.junit.Assert.assertNull;\n-import static org.junit.Assert.assertThat;\nimport static org.junit.Assert.assertTrue;\nimport static org.keycloak.testsuite.admin.AbstractAdminTest.loadJson;\nimport static org.keycloak.testsuite.admin.ApiUtil.findClientByClientId;\n@@ -1291,7 +1291,7 @@ public class AccessTokenTest extends AbstractKeycloakTest {\n}\nprivate void validateTokenECDSASignature(String expectedAlg) {\n- assertThat(ECDSASignatureProvider.ECDSA.values(), IsArrayContaining.hasItemInArray(ECDSASignatureProvider.ECDSA.valueOf(expectedAlg)));\n+ assertThat(ECDSASignatureProvider.ECDSA.values(), hasItemInArray(ECDSASignatureProvider.ECDSA.valueOf(expectedAlg)));\ntry {\nTokenSignatureUtil.changeRealmTokenSignatureProvider(adminClient, expectedAlg);\n" } ]

[ { "change_type": "MODIFY", "old_path": "distribution/server-x-dist/src/main/content/bin/kc.sh", "new_path": "distribution/server-x-dist/src/main/content/bin/kc.sh", "diff": "@@ -63,7 +63,7 @@ done\n# Specify options to pass to the Java VM.\n#\nif [ \"x$JAVA_OPTS\" = \"x\" ]; then\n- JAVA_OPTS=\"-Xms64m -Xmx512m -XX:MetaspaceSize=96M -XX:MaxMetaspaceSize=256m -Djava.net.preferIPv4Stack=true -Dquarkus-log-max-startup-records=10000\"\n+ JAVA_OPTS=\"-Xms64m -Xmx512m -XX:MetaspaceSize=96M -XX:MaxMetaspaceSize=256m -Djava.net.preferIPv4Stack=true\"\nelse\necho \"JAVA_OPTS already set in environment; overriding default settings with values: $JAVA_OPTS\"\nfi\n" }, { "change_type": "MODIFY", "old_path": "quarkus/pom.xml", "new_path": "quarkus/pom.xml", "diff": "<properties>\n<!-- Quarkus version -->\n- <quarkus.version>2.4.2.Final</quarkus.version>\n+ <quarkus.version>2.5.1.Final</quarkus.version>\n<!--\nOverride versions based on Quarkus dependencies.\n<jackson.version>2.12.5</jackson.version>\n<jackson.databind.version>${jackson.version}</jackson.databind.version>\n<hibernate.core.version>5.6.1.Final</hibernate.core.version>\n- <mysql.driver.version>8.0.26</mysql.driver.version>\n- <postgresql.version>42.2.24</postgresql.version>\n+ <mysql.driver.version>8.0.27</mysql.driver.version>\n+ <postgresql.version>42.3.1</postgresql.version>\n<microprofile-metrics-api.version>3.0</microprofile-metrics-api.version>\n<wildfly.common.version>1.5.4.Final-format-001</wildfly.common.version>\n<infinispan.version>13.0.0.Final</infinispan.version>\n" }, { "change_type": "MODIFY", "old_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/Build.java", "new_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/Build.java", "diff": "@@ -47,7 +47,7 @@ import picocli.CommandLine.Mixin;\n},\nfooterHeading = \"Examples:\",\nfooter = \" Optimize the server based on a profile configuration:%n%n\"\n- + \" $ ${PARENT-COMMAND-FULL-NAME:-$PARENTCOMMAND} ${COMMAND-NAME} --profile=prod%n%n\"\n+ + \" $ ${PARENT-COMMAND-FULL-NAME:-$PARENTCOMMAND} --profile=prod ${COMMAND-NAME}%n%n\"\n+ \" Change database settings:%n%n\"\n+ \" $ ${PARENT-COMMAND-FULL-NAME:-$PARENTCOMMAND} ${COMMAND-NAME} --db=postgres [--db-url][--db-username][--db-password]%n%n\"\n+ \" Enable a feature:%n%n\"\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": "@@ -61,6 +61,7 @@ public interface CLIResult extends LaunchResult {\nboolean isDistribution();\ndefault void assertStarted() {\n+ assertFalse(getOutput().contains(\"The delayed handler's queue was overrun and log record(s) were lost (Did you forget to configure logging?)\"), () -> \"The standard Output:\\n\" + getOutput() + \"should not contain a warning about log queue overrun.\");\nassertTrue(getOutput().contains(\"Listening on:\"), () -> \"The standard output:\\n\" + getOutput() + \"does include \\\"Listening on:\\\"\");\nassertNotDevMode();\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/common/DeepCloner.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/common/DeepCloner.java", "diff": "@@ -295,6 +295,24 @@ public class DeepCloner {\nreturn res;\n}\n+ /**\n+ * Returns a class type of an instance that would be instantiated by {@link #newInstance(java.lang.Class)} method.\n+ * @param <V> Type (class or a {@code @Root} interface) to create a new instance\n+ * @param clazz Type (class or a {@code @Root} interface) to create a new instance\n+ * @return See description\n+ */\n+ public <V> Class<? extends V> newInstanceType(Class<V> valueType) {\n+ if (valueType == null) {\n+ return null;\n+ }\n+ try {\n+ V v = newInstance(valueType);\n+ return v == null ? null : (Class<? extends V>) v.getClass();\n+ } catch (IllegalStateException ex) {\n+ return null;\n+ }\n+ }\n+\n/**\n* Deeply clones properties from the {@code from} instance to the {@code to} instance.\n* @param <V> Type (class or a {@code @Root} interface) to clone the instance\n" }, { "change_type": "ADD", "old_path": null, "new_path": "model/map/src/main/java/org/keycloak/models/map/storage/ModelEntityUtil.java", "diff": "+/*\n+ * Copyright 2021 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.models.map.storage;\n+\n+import org.keycloak.authorization.model.PermissionTicket;\n+import org.keycloak.authorization.model.Policy;\n+import org.keycloak.authorization.model.Resource;\n+import org.keycloak.authorization.model.ResourceServer;\n+import org.keycloak.models.AuthenticatedClientSessionModel;\n+import org.keycloak.models.ClientModel;\n+import org.keycloak.models.ClientScopeModel;\n+import org.keycloak.models.GroupModel;\n+import org.keycloak.models.RealmModel;\n+import org.keycloak.models.RoleModel;\n+import org.keycloak.models.UserLoginFailureModel;\n+import org.keycloak.models.UserModel;\n+import org.keycloak.models.UserSessionModel;\n+import org.keycloak.models.map.authSession.MapRootAuthenticationSessionEntity;\n+import org.keycloak.models.map.authorization.entity.MapPermissionTicketEntity;\n+import org.keycloak.models.map.authorization.entity.MapPolicyEntity;\n+import org.keycloak.models.map.authorization.entity.MapResourceEntity;\n+import org.keycloak.models.map.authorization.entity.MapResourceServerEntity;\n+import org.keycloak.models.map.authorization.entity.MapScopeEntity;\n+import org.keycloak.models.map.client.MapClientEntity;\n+import org.keycloak.models.map.clientscope.MapClientScopeEntity;\n+import org.keycloak.models.map.common.AbstractEntity;\n+import org.keycloak.models.map.group.MapGroupEntity;\n+import org.keycloak.models.map.loginFailure.MapUserLoginFailureEntity;\n+import org.keycloak.models.map.realm.MapRealmEntity;\n+import org.keycloak.models.map.role.MapRoleEntity;\n+import org.keycloak.models.map.user.MapUserEntity;\n+import org.keycloak.models.map.userSession.MapAuthenticatedClientSessionEntity;\n+import org.keycloak.models.map.userSession.MapUserSessionEntity;\n+import org.keycloak.sessions.RootAuthenticationSessionModel;\n+import java.util.HashMap;\n+import java.util.Map;\n+import java.util.Map.Entry;\n+import java.util.Set;\n+import java.util.stream.Collectors;\n+\n+/**\n+ * Utility class covering various aspects of relationship between model and entity classes.\n+ * @author hmlnarik\n+ */\n+public class ModelEntityUtil {\n+\n+ private static final Map<Class<?>, String> MODEL_TO_NAME = new HashMap<>();\n+ static {\n+ MODEL_TO_NAME.put(AuthenticatedClientSessionModel.class, \"client-sessions\");\n+ MODEL_TO_NAME.put(ClientScopeModel.class, \"client-scopes\");\n+ MODEL_TO_NAME.put(ClientModel.class, \"clients\");\n+ MODEL_TO_NAME.put(GroupModel.class, \"groups\");\n+ MODEL_TO_NAME.put(RealmModel.class, \"realms\");\n+ MODEL_TO_NAME.put(RoleModel.class, \"roles\");\n+ MODEL_TO_NAME.put(RootAuthenticationSessionModel.class, \"auth-sessions\");\n+ MODEL_TO_NAME.put(UserLoginFailureModel.class, \"user-login-failures\");\n+ MODEL_TO_NAME.put(UserModel.class, \"users\");\n+ MODEL_TO_NAME.put(UserSessionModel.class, \"user-sessions\");\n+\n+ // authz\n+ MODEL_TO_NAME.put(PermissionTicket.class, \"authz-permission-tickets\");\n+ MODEL_TO_NAME.put(Policy.class, \"authz-policies\");\n+ MODEL_TO_NAME.put(ResourceServer.class, \"authz-resource-servers\");\n+ MODEL_TO_NAME.put(Resource.class, \"authz-resources\");\n+ MODEL_TO_NAME.put(org.keycloak.authorization.model.Scope.class, \"authz-scopes\");\n+ }\n+ private static final Map<String, Class<?>> NAME_TO_MODEL = MODEL_TO_NAME.entrySet().stream().collect(Collectors.toMap(Entry::getValue, Entry::getKey));\n+\n+ private static final Map<Class<?>, Class<? extends AbstractEntity>> MODEL_TO_ENTITY_TYPE = new HashMap<>();\n+ static {\n+ MODEL_TO_ENTITY_TYPE.put(AuthenticatedClientSessionModel.class, MapAuthenticatedClientSessionEntity.class);\n+ MODEL_TO_ENTITY_TYPE.put(ClientScopeModel.class, MapClientScopeEntity.class);\n+ MODEL_TO_ENTITY_TYPE.put(ClientModel.class, MapClientEntity.class);\n+ MODEL_TO_ENTITY_TYPE.put(GroupModel.class, MapGroupEntity.class);\n+ MODEL_TO_ENTITY_TYPE.put(RealmModel.class, MapRealmEntity.class);\n+ MODEL_TO_ENTITY_TYPE.put(RoleModel.class, MapRoleEntity.class);\n+ MODEL_TO_ENTITY_TYPE.put(RootAuthenticationSessionModel.class, MapRootAuthenticationSessionEntity.class);\n+ MODEL_TO_ENTITY_TYPE.put(UserLoginFailureModel.class, MapUserLoginFailureEntity.class);\n+ MODEL_TO_ENTITY_TYPE.put(UserModel.class, MapUserEntity.class);\n+ MODEL_TO_ENTITY_TYPE.put(UserSessionModel.class, MapUserSessionEntity.class);\n+\n+ // authz\n+ MODEL_TO_ENTITY_TYPE.put(PermissionTicket.class, MapPermissionTicketEntity.class);\n+ MODEL_TO_ENTITY_TYPE.put(Policy.class, MapPolicyEntity.class);\n+ MODEL_TO_ENTITY_TYPE.put(ResourceServer.class, MapResourceServerEntity.class);\n+ MODEL_TO_ENTITY_TYPE.put(Resource.class, MapResourceEntity.class);\n+ MODEL_TO_ENTITY_TYPE.put(org.keycloak.authorization.model.Scope.class, MapScopeEntity.class);\n+ }\n+ private static final Map<Class<?>, Class<?>> ENTITY_TO_MODEL_TYPE = MODEL_TO_ENTITY_TYPE.entrySet().stream().collect(Collectors.toMap(Entry::getValue, Entry::getKey));\n+\n+ @SuppressWarnings(\"unchecked\")\n+ public static <V extends AbstractEntity, M> Class<V> getEntityType(Class<M> modelClass) {\n+ return (Class<V>) MODEL_TO_ENTITY_TYPE.get(modelClass);\n+ }\n+\n+ @SuppressWarnings(\"unchecked\")\n+ public static <V extends AbstractEntity, M> Class<V> getEntityType(Class<M> modelClass, Class<? extends AbstractEntity> defaultClass) {\n+ return (Class<V>) MODEL_TO_ENTITY_TYPE.getOrDefault(modelClass, defaultClass);\n+ }\n+\n+ @SuppressWarnings(\"unchecked\")\n+ public static <V extends AbstractEntity, M> Class<M> getModelType(Class<V> entityClass) {\n+ return (Class<M>) ENTITY_TO_MODEL_TYPE.get(entityClass);\n+ }\n+\n+ @SuppressWarnings(\"unchecked\")\n+ public static <V extends AbstractEntity, M> Class<M> getModelType(Class<V> entityClass, Class<M> defaultClass) {\n+ return (Class<M>) ENTITY_TO_MODEL_TYPE.getOrDefault(entityClass, defaultClass);\n+ }\n+\n+ public static String getModelName(Class<?> key, String defaultValue) {\n+ return MODEL_TO_NAME.getOrDefault(key, defaultValue);\n+ }\n+\n+ public static String getModelName(Class<?> key) {\n+ return MODEL_TO_NAME.get(key);\n+ }\n+\n+ public static Set<String> getModelNames() {\n+ return NAME_TO_MODEL.keySet();\n+ }\n+\n+ @SuppressWarnings(\"unchecked\")\n+ public static <M> Class<M> getModelClass(String key) {\n+ return (Class<M>) NAME_TO_MODEL.get(key);\n+ }\n+\n+\n+\n+}\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/storage/chm/ConcurrentHashMapStorageProviderFactory.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/storage/chm/ConcurrentHashMapStorageProviderFactory.java", "diff": "@@ -19,43 +19,20 @@ package org.keycloak.models.map.storage.chm;\nimport org.keycloak.models.map.common.StringKeyConvertor;\nimport org.keycloak.component.AmphibianProviderFactory;\nimport org.keycloak.Config.Scope;\n-import org.keycloak.authorization.model.PermissionTicket;\n-import org.keycloak.authorization.model.Policy;\n-import org.keycloak.authorization.model.Resource;\n-import org.keycloak.authorization.model.ResourceServer;\nimport org.keycloak.common.Profile;\nimport org.keycloak.component.ComponentModelScope;\nimport org.keycloak.models.AuthenticatedClientSessionModel;\n-import org.keycloak.models.ClientModel;\n-import org.keycloak.models.ClientScopeModel;\n-import org.keycloak.models.GroupModel;\nimport org.keycloak.models.KeycloakSession;\nimport org.keycloak.models.KeycloakSessionFactory;\n-import org.keycloak.models.RealmModel;\n-import org.keycloak.models.RoleModel;\n-import org.keycloak.models.UserLoginFailureModel;\n-import org.keycloak.models.UserModel;\nimport org.keycloak.models.UserSessionModel;\n-import org.keycloak.models.map.authSession.MapRootAuthenticationSessionEntity;\n-import org.keycloak.models.map.authorization.entity.MapPermissionTicketEntity;\n-import org.keycloak.models.map.authorization.entity.MapPolicyEntity;\n-import org.keycloak.models.map.authorization.entity.MapResourceEntity;\n-import org.keycloak.models.map.authorization.entity.MapResourceServerEntity;\n-import org.keycloak.models.map.authorization.entity.MapScopeEntity;\n-import org.keycloak.models.map.client.MapClientEntity;\nimport org.keycloak.models.map.client.MapClientEntityImpl;\nimport org.keycloak.models.map.client.MapProtocolMapperEntity;\nimport org.keycloak.models.map.client.MapProtocolMapperEntityImpl;\n-import org.keycloak.models.map.clientscope.MapClientScopeEntity;\nimport org.keycloak.models.map.common.AbstractEntity;\nimport org.keycloak.models.map.common.DeepCloner;\nimport org.keycloak.models.map.common.Serialization;\nimport org.keycloak.models.map.common.UpdatableEntity;\n-import org.keycloak.models.map.group.MapGroupEntity;\nimport org.keycloak.models.map.group.MapGroupEntityImpl;\n-import org.keycloak.models.map.loginFailure.MapUserLoginFailureEntity;\n-import org.keycloak.models.map.realm.MapRealmEntity;\n-import org.keycloak.models.map.role.MapRoleEntity;\nimport org.keycloak.models.map.role.MapRoleEntityImpl;\nimport com.fasterxml.jackson.databind.JavaType;\nimport java.io.File;\n@@ -67,18 +44,17 @@ import java.util.concurrent.ConcurrentHashMap;\nimport org.jboss.logging.Logger;\nimport org.keycloak.models.map.storage.MapStorageProvider;\nimport org.keycloak.models.map.storage.MapStorageProviderFactory;\n-import org.keycloak.models.map.userSession.MapAuthenticatedClientSessionEntity;\n-import org.keycloak.models.map.user.MapUserEntity;\n-import org.keycloak.models.map.userSession.MapUserSessionEntity;\n+import org.keycloak.models.map.storage.ModelEntityUtil;\nimport org.keycloak.provider.EnvironmentDependentProviderFactory;\nimport org.keycloak.provider.ProviderConfigProperty;\nimport org.keycloak.models.map.storage.criteria.DefaultModelCriteria;\n-import org.keycloak.sessions.RootAuthenticationSessionModel;\nimport java.util.Collections;\nimport java.util.HashMap;\nimport java.util.LinkedList;\nimport java.util.Map;\n+import static org.keycloak.models.map.storage.ModelEntityUtil.getModelName;\n+import static org.keycloak.models.map.storage.ModelEntityUtil.getModelNames;\nimport static org.keycloak.models.map.storage.QueryParameters.withCriteria;\nimport static org.keycloak.models.map.storage.criteria.DefaultModelCriteria.criteria;\n@@ -110,68 +86,6 @@ public class ConcurrentHashMapStorageProviderFactory implements AmphibianProvide\n.constructor(MapRoleEntityImpl.class, MapRoleEntityImpl::new)\n.build();\n- public static final Map<Class<?>, String> MODEL_TO_NAME = new HashMap<>();\n- static {\n- MODEL_TO_NAME.put(AuthenticatedClientSessionModel.class, \"client-sessions\");\n- MODEL_TO_NAME.put(ClientScopeModel.class, \"client-scopes\");\n- MODEL_TO_NAME.put(ClientModel.class, \"clients\");\n- MODEL_TO_NAME.put(GroupModel.class, \"groups\");\n- MODEL_TO_NAME.put(RealmModel.class, \"realms\");\n- MODEL_TO_NAME.put(RoleModel.class, \"roles\");\n- MODEL_TO_NAME.put(RootAuthenticationSessionModel.class, \"auth-sessions\");\n- MODEL_TO_NAME.put(UserLoginFailureModel.class, \"user-login-failures\");\n- MODEL_TO_NAME.put(UserModel.class, \"users\");\n- MODEL_TO_NAME.put(UserSessionModel.class, \"user-sessions\");\n-\n- // authz\n- MODEL_TO_NAME.put(PermissionTicket.class, \"authz-permission-tickets\");\n- MODEL_TO_NAME.put(Policy.class, \"authz-policies\");\n- MODEL_TO_NAME.put(ResourceServer.class, \"authz-resource-servers\");\n- MODEL_TO_NAME.put(Resource.class, \"authz-resources\");\n- MODEL_TO_NAME.put(org.keycloak.authorization.model.Scope.class, \"authz-scopes\");\n- }\n-\n- public static final Map<Class<?>, Class<? extends AbstractEntity>> MODEL_TO_VALUE_TYPE = new HashMap<>();\n- static {\n- MODEL_TO_VALUE_TYPE.put(AuthenticatedClientSessionModel.class, MapAuthenticatedClientSessionEntity.class);\n- MODEL_TO_VALUE_TYPE.put(ClientScopeModel.class, MapClientScopeEntity.class);\n- MODEL_TO_VALUE_TYPE.put(ClientModel.class, MapClientEntity.class);\n- MODEL_TO_VALUE_TYPE.put(GroupModel.class, MapGroupEntity.class);\n- MODEL_TO_VALUE_TYPE.put(RealmModel.class, MapRealmEntity.class);\n- MODEL_TO_VALUE_TYPE.put(RoleModel.class, MapRoleEntity.class);\n- MODEL_TO_VALUE_TYPE.put(RootAuthenticationSessionModel.class, MapRootAuthenticationSessionEntity.class);\n- MODEL_TO_VALUE_TYPE.put(UserLoginFailureModel.class, MapUserLoginFailureEntity.class);\n- MODEL_TO_VALUE_TYPE.put(UserModel.class, MapUserEntity.class);\n- MODEL_TO_VALUE_TYPE.put(UserSessionModel.class, MapUserSessionEntity.class);\n-\n- // authz\n- MODEL_TO_VALUE_TYPE.put(PermissionTicket.class, MapPermissionTicketEntity.class);\n- MODEL_TO_VALUE_TYPE.put(Policy.class, MapPolicyEntity.class);\n- MODEL_TO_VALUE_TYPE.put(ResourceServer.class, MapResourceServerEntity.class);\n- MODEL_TO_VALUE_TYPE.put(Resource.class, MapResourceEntity.class);\n- MODEL_TO_VALUE_TYPE.put(org.keycloak.authorization.model.Scope.class, MapScopeEntity.class);\n- }\n-\n- public static final Map<Class<?>, Class<?>> INTERFACE_TO_IMPL = new HashMap<>();\n- static {\n- INTERFACE_TO_IMPL.put(MapClientEntity.class, MapClientEntityImpl.class);\n-// INTERFACE_TO_IMPL.put(MapClientScopeEntity.class, MapClientScopeEntityImpl.class);\n- INTERFACE_TO_IMPL.put(MapGroupEntity.class, MapGroupEntityImpl.class);\n-// INTERFACE_TO_IMPL.put(MapRealmEntity.class, MapRealmEntityImpl.class);\n- INTERFACE_TO_IMPL.put(MapRoleEntity.class, MapRoleEntityImpl.class);\n-// INTERFACE_TO_IMPL.put(MapRootAuthenticationSessionEntity.class, MapRootAuthenticationSessionEntityImpl.class);\n-// INTERFACE_TO_IMPL.put(MapUserLoginFailureEntity.class, MapUserLoginFailureEntityImpl.class);\n-// INTERFACE_TO_IMPL.put(MapUserEntity.class, MapUserEntityImpl.class);\n-// INTERFACE_TO_IMPL.put(MapUserSessionEntity.class, MapUserSessionEntityImpl.class);\n-//\n-// // authz\n-// INTERFACE_TO_IMPL.put(MapPermissionTicketEntity.class, MapPermissionTicketEntityImpl.class);\n-// INTERFACE_TO_IMPL.put(MapPolicyEntity.class, MapPolicyEntityImpl.class);\n-// INTERFACE_TO_IMPL.put(MapResourceServerEntity.class, MapResourceServerEntityImpl.class);\n-// INTERFACE_TO_IMPL.put(MapResourceEntity.class, MapResourceEntityImpl.class);\n-// INTERFACE_TO_IMPL.put(MapScopeEntity.class, MapScopeEntityImpl.class);\n- }\n-\nprivate static final Map<String, StringKeyConvertor> KEY_CONVERTORS = new HashMap<>();\nstatic {\nKEY_CONVERTORS.put(\"uuid\", StringKeyConvertor.UUIDKey.INSTANCE);\n@@ -195,7 +109,7 @@ public class ConcurrentHashMapStorageProviderFactory implements AmphibianProvide\nfinal String keyType = config.get(\"keyType\", \"uuid\");\ndefaultKeyConvertor = getKeyConvertor(keyType);\n- for (String name : MODEL_TO_NAME.values()) {\n+ for (String name : getModelNames()) {\nkeyConvertors.put(name, getKeyConvertor(config.get(\"keyType.\" + name, keyType)));\n}\n@@ -259,7 +173,7 @@ public class ConcurrentHashMapStorageProviderFactory implements AmphibianProvide\nprivate <K, V extends AbstractEntity & UpdatableEntity, M> ConcurrentHashMapStorage<K, V, M> loadMap(String mapName,\nClass<M> modelType, EnumSet<Flag> flags) {\nfinal StringKeyConvertor kc = keyConvertors.getOrDefault(mapName, defaultKeyConvertor);\n- Class<?> valueType = MODEL_TO_VALUE_TYPE.get(modelType);\n+ Class<?> valueType = ModelEntityUtil.getEntityType(modelType);\nLOG.debugf(\"Initializing new map storage: %s\", mapName);\nConcurrentHashMapStorage<K, V, M> store;\n@@ -285,7 +199,10 @@ public class ConcurrentHashMapStorageProviderFactory implements AmphibianProvide\nif (f != null && f.exists()) {\ntry {\nLOG.debugf(\"Restoring contents from %s\", f.getCanonicalPath());\n- Class<?> valueImplType = INTERFACE_TO_IMPL.getOrDefault(valueType, valueType);\n+ Class<?> valueImplType = CLONER.newInstanceType(valueType);\n+ if (valueImplType == null) {\n+ valueImplType = valueType;\n+ }\nJavaType type = Serialization.MAPPER.getTypeFactory().constructCollectionType(LinkedList.class, valueImplType);\nList<V> values = Serialization.MAPPER.readValue(f, type);\n@@ -308,7 +225,7 @@ public class ConcurrentHashMapStorageProviderFactory implements AmphibianProvide\npublic <K, V extends AbstractEntity & UpdatableEntity, M> ConcurrentHashMapStorage<K, V, M> getStorage(\nClass<M> modelType, Flag... flags) {\nEnumSet<Flag> f = flags == null || flags.length == 0 ? EnumSet.noneOf(Flag.class) : EnumSet.of(flags[0], flags);\n- String name = MODEL_TO_NAME.getOrDefault(modelType, modelType.getSimpleName());\n+ String name = getModelName(modelType, modelType.getSimpleName());\n/* From ConcurrentHashMapStorage.computeIfAbsent javadoc:\n*\n* \"... the computation [...] must not attempt to update any other mappings of this map.\"\n" } ]

[ { "change_type": "MODIFY", "old_path": "server-spi-private/src/main/java/org/keycloak/models/utils/KeycloakModelUtils.java", "new_path": "server-spi-private/src/main/java/org/keycloak/models/utils/KeycloakModelUtils.java", "diff": "@@ -306,7 +306,7 @@ public final class KeycloakModelUtils {\nString componentId = config.get(\"componentId\");\nif (realmId == null || componentId == null) {\nrealmId = \"ROOT\";\n- ComponentModel cm = new ScopeComponentModel(providerClass, config, spiName);\n+ ComponentModel cm = new ScopeComponentModel(providerClass, config, spiName, realmId);\nreturn factory.getProviderFactory(providerClass, realmId, cm.getId(), k -> cm);\n} else {\nreturn factory.getProviderFactory(providerClass, realmId, componentId, componentModelGetter(realmId, componentId));\n@@ -318,14 +318,16 @@ public final class KeycloakModelUtils {\nprivate final String componentId;\nprivate final String providerId;\nprivate final String providerType;\n+ private final String realmId;\nprivate final Scope config;\n- public ScopeComponentModel(Class<?> providerClass, Scope baseConfiguration, String spiName) {\n+ public ScopeComponentModel(Class<?> providerClass, Scope baseConfiguration, String spiName, String realmId) {\nfinal String pr = baseConfiguration.get(\"provider\", Config.getProvider(spiName));\nthis.providerId = pr == null ? \"default\" : pr;\nthis.config = baseConfiguration.scope(this.providerId);\n- this.componentId = spiName + \"-\" + this.providerId;\n+ this.componentId = spiName + \"- \" + (realmId == null ? \"\" : \"f:\" + realmId + \":\") + this.providerId;\n+ this.realmId = realmId;\nthis.providerType = providerClass.getName();\n}\n@@ -349,6 +351,11 @@ public final class KeycloakModelUtils {\nreturn componentId;\n}\n+ @Override\n+ public String getParentId() {\n+ return realmId;\n+ }\n+\n@Override\npublic boolean get(String key, boolean defaultValue) {\nreturn config.getBoolean(key, defaultValue);\n@@ -366,7 +373,6 @@ public final class KeycloakModelUtils {\n@Override\npublic String get(String key, String defaultValue) {\n-\nreturn config.get(key, defaultValue);\n}\n" }, { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/services/DefaultComponentFactoryProviderFactory.java", "new_path": "services/src/main/java/org/keycloak/services/DefaultComponentFactoryProviderFactory.java", "diff": "@@ -143,7 +143,12 @@ public class DefaultComponentFactoryProviderFactory implements ComponentFactoryP\nnewFactory.init(configScope);\nnewFactory.postInit(factory);\n+ if (realmId == null) {\n+ realmId = configScope.getComponentParentId();\n+ }\n+ if (realmId != null) {\ndependentInvalidations.computeIfAbsent(realmId, k -> ConcurrentHashMap.newKeySet()).add(componentId);\n+ }\ndependentInvalidations.computeIfAbsent(newFactory.getClass(), k -> ConcurrentHashMap.newKeySet()).add(componentId);\nreturn newFactory;\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": "@@ -354,15 +354,12 @@ public class DefaultKeycloakSession implements KeycloakSession {\nInteger hash = clazz.hashCode() + componentId.hashCode();\nT provider = (T) providers.get(hash);\nfinal RealmModel realm = getContext().getRealm();\n- if (realm == null) {\n- throw new IllegalArgumentException(\"Realm not set in the context.\");\n- }\n// KEYCLOAK-11890 - Avoid using HashMap.computeIfAbsent() to implement logic in outer if() block below,\n// since per JDK-8071667 the remapping function should not modify the map during computation. While\n// allowed on JDK 1.8, attempt of such a modification throws ConcurrentModificationException with JDK 9+\nif (provider == null) {\n- final String realmId = realm.getId();\n+ final String realmId = realm == null ? null : realm.getId();\nProviderFactory<T> providerFactory = factory.getProviderFactory(clazz, realmId, componentId, modelGetter);\nif (providerFactory != null) {\nprovider = providerFactory.create(this);\n" } ]

[ { "change_type": "MODIFY", "old_path": "server-spi-private/src/main/java/org/keycloak/component/ComponentModelScope.java", "new_path": "server-spi-private/src/main/java/org/keycloak/component/ComponentModelScope.java", "diff": "@@ -119,4 +119,8 @@ public class ComponentModelScope implements Scope {\nthrow new UnsupportedOperationException(\"Not implemented\");\n}\n+ public ComponentModel getComponentModel() {\n+ return componentConfig;\n+ }\n+\n}\n" }, { "change_type": "MODIFY", "old_path": "server-spi/src/main/java/org/keycloak/component/ComponentModel.java", "new_path": "server-spi/src/main/java/org/keycloak/component/ComponentModel.java", "diff": "@@ -85,22 +85,22 @@ public class ComponentModel implements Serializable {\n}\npublic String get(String key, String defaultValue) {\n- String s = config.getFirst(key);\n+ String s = get(key);\nreturn s != null ? s : defaultValue;\n}\npublic int get(String key, int defaultValue) {\n- String s = config.getFirst(key);\n+ String s = get(key);\nreturn s != null ? Integer.parseInt(s) : defaultValue;\n}\npublic long get(String key, long defaultValue) {\n- String s = config.getFirst(key);\n+ String s = get(key);\nreturn s != null ? Long.parseLong(s) : defaultValue;\n}\npublic boolean get(String key, boolean defaultValue) {\n- String s = config.getFirst(key);\n+ String s = get(key);\nreturn s != null ? Boolean.parseBoolean(s) : defaultValue;\n}\n@@ -109,15 +109,15 @@ public class ComponentModel implements Serializable {\n}\npublic void put(String key, int value) {\n- config.putSingle(key, Integer.toString(value));\n+ put(key, Integer.toString(value));\n}\npublic void put(String key, long value) {\n- config.putSingle(key, Long.toString(value));\n+ put(key, Long.toString(value));\n}\npublic void put(String key, boolean value) {\n- config.putSingle(key, Boolean.toString(value));\n+ put(key, Boolean.toString(value));\n}\npublic boolean hasNote(String key) {\n" } ]

[ { "change_type": "MODIFY", "old_path": "server-spi/src/main/java/org/keycloak/storage/StorageId.java", "new_path": "server-spi/src/main/java/org/keycloak/storage/StorageId.java", "diff": "@@ -21,35 +21,52 @@ import org.keycloak.models.ClientModel;\nimport org.keycloak.models.UserModel;\nimport java.io.Serializable;\n+import java.util.Objects;\n/**\n* @author <a href=\"mailto:[email protected]\">Bill Burke</a>\n* @version $Revision: 1 $\n*/\npublic class StorageId implements Serializable {\n- private String id;\n- private String providerId;\n- private String externalId;\n+ private final String providerId;\n+ private final String externalId;\npublic StorageId(String id) {\n- this.id = id;\nif (!id.startsWith(\"f:\")) {\n+ providerId = null;\nexternalId = id;\n- return;\n- }\n+ } else {\nint providerIndex = id.indexOf(':', 2);\nproviderId = id.substring(2, providerIndex);\nexternalId = id.substring(providerIndex + 1);\n-\n+ }\n}\npublic StorageId(String providerId, String externalId) {\n- this.id = \"f:\" + providerId + \":\" + externalId;\n+ if (providerId != null && providerId.contains(\":\")) {\n+ throw new IllegalArgumentException(\"Provider must not contain a colon (:) character\");\n+ }\nthis.providerId = providerId;\nthis.externalId = externalId;\n}\n+ public boolean isLocal() {\n+ return getProviderId() == null;\n+ }\n+\n+ public String getId() {\n+ return providerId == null ? externalId : (\"f:\" + providerId + \":\" + externalId);\n+ }\n+\n+ public String getProviderId() {\n+ return providerId;\n+ }\n+\n+ public String getExternalId() {\n+ return externalId;\n+ }\n+\n/**\n* generate the id string that should be returned by UserModel.getId()\n*\n@@ -68,40 +85,67 @@ public class StorageId implements Serializable {\nreturn new StorageId(keycloakId).getProviderId();\n}\n+ public static boolean isLocalStorage(String id) {\n+ return new StorageId(id).getProviderId() == null;\n+ }\n-\n+ /**\n+ * @deprecated Use {@link #providerId(String)} instead.\n+ */\npublic static String resolveProviderId(UserModel user) {\n- return new StorageId(user.getId()).getProviderId();\n+ return providerId(user.getId());\n}\n+\n+ /**\n+ * @deprecated Use {@link #isLocalStorage(String)} instead.\n+ */\npublic static boolean isLocalStorage(UserModel user) {\n- return new StorageId(user.getId()).getProviderId() == null;\n- }\n- public static boolean isLocalStorage(String id) {\n- return new StorageId(id).getProviderId() == null;\n+ return isLocalStorage(user.getId());\n}\n+ /**\n+ * @deprecated Use {@link #providerId(String)} instead.\n+ */\npublic static String resolveProviderId(ClientModel client) {\n- return new StorageId(client.getId()).getProviderId();\n+ return providerId(client.getId());\n}\n+\n+ /**\n+ * @deprecated Use {@link #isLocalStorage(String)} instead.\n+ */\npublic static boolean isLocalStorage(ClientModel client) {\n- return new StorageId(client.getId()).getProviderId() == null;\n+ return isLocalStorage(client.getId());\n}\n- public boolean isLocal() {\n- return getProviderId() == null;\n+ @Override\n+ public int hashCode() {\n+ return Objects.hash(providerId, externalId);\n}\n- public String getId() {\n- return id;\n+ @Override\n+ public boolean equals(Object obj) {\n+ if (this == obj) {\n+ return true;\n}\n-\n- public String getProviderId() {\n- return providerId;\n+ if (obj == null) {\n+ return false;\n}\n-\n- public String getExternalId() {\n- return externalId;\n+ if (getClass() != obj.getClass()) {\n+ return false;\n+ }\n+ final StorageId other = (StorageId) obj;\n+ if ( ! Objects.equals(this.providerId, other.providerId)) {\n+ return false;\n+ }\n+ if ( ! Objects.equals(this.externalId, other.externalId)) {\n+ return false;\n+ }\n+ return true;\n}\n+ @Override\n+ public String toString() {\n+ return getId();\n+ }\n}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "server-spi/src/test/java/org/keycloak/storage/StorageIdTest.java", "diff": "+/*\n+ * Copyright 2021 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.component.ComponentModel;\n+import org.junit.Test;\n+import static org.hamcrest.CoreMatchers.equalTo;\n+import static org.hamcrest.CoreMatchers.is;\n+import static org.hamcrest.CoreMatchers.not;\n+import static org.hamcrest.CoreMatchers.notNullValue;\n+import static org.hamcrest.CoreMatchers.nullValue;\n+import static org.hamcrest.MatcherAssert.assertThat;\n+import static org.junit.Assert.assertFalse;\n+import static org.junit.Assert.assertTrue;\n+\n+/**\n+ *\n+ * @author hmlnarik\n+ */\n+public class StorageIdTest {\n+\n+ @Test\n+ public void testStatic() {\n+ final String localId = \"123\";\n+ assertThat(StorageId.externalId(localId), is(\"123\"));\n+ assertThat(StorageId.providerId(localId), nullValue());\n+ assertTrue(StorageId.isLocalStorage(localId));\n+\n+ final String remoteId = \"f:abc:123\";\n+ assertThat(StorageId.externalId(remoteId), is(\"123\"));\n+ assertThat(StorageId.providerId(remoteId), is(\"abc\"));\n+ assertFalse(StorageId.isLocalStorage(remoteId));\n+\n+ final ComponentModel cm = new ComponentModel();\n+ cm.setId(\"localId\");\n+ assertThat(StorageId.keycloakId(cm, localId), is(\"f:localId:123\"));\n+ }\n+\n+ @Test\n+ public void testLocalId() {\n+ StorageId id = new StorageId(\"123\");\n+ assertThat(id, notNullValue());\n+ assertThat(id.getExternalId(), is(\"123\"));\n+ assertThat(id.getProviderId(), nullValue());\n+ assertThat(id.getId(), is(\"123\"));\n+ assertTrue(id.isLocal());\n+ }\n+\n+ @Test\n+ public void testExternalIdString() {\n+ StorageId id = new StorageId(\"f:abc:123\");\n+ assertThat(id, notNullValue());\n+ assertThat(id.getExternalId(), is(\"123\"));\n+ assertThat(id.getProviderId(), is(\"abc\"));\n+ assertThat(id.getId(), is(\"f:abc:123\"));\n+ assertFalse(id.isLocal());\n+ }\n+\n+ @Test\n+ public void testExternalIdTwoStrings() {\n+ StorageId id = new StorageId(\"abc\", \"123\");\n+ assertThat(id, notNullValue());\n+ assertThat(id.getExternalId(), is(\"123\"));\n+ assertThat(id.getProviderId(), is(\"abc\"));\n+ assertThat(id.getId(), is(\"f:abc:123\"));\n+ assertFalse(id.isLocal());\n+ }\n+\n+ @Test\n+ public void testEquals() {\n+ assertThat(new StorageId(\"abc\", \"123\"), equalTo(new StorageId(\"f:abc:123\")));\n+ assertThat(new StorageId(\"abc\", \"123\"), not(equalTo(new StorageId(\"f:abc:1234\"))));\n+ }\n+}\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/build-processor/src/main/java/org/keycloak/models/map/processor/AbstractGenerateEntityImplementationsProcessor.java", "new_path": "model/build-processor/src/main/java/org/keycloak/models/map/processor/AbstractGenerateEntityImplementationsProcessor.java", "diff": "@@ -47,6 +47,7 @@ import java.util.stream.Stream;\nimport static org.keycloak.models.map.processor.FieldAccessorType.GETTER;\nimport static org.keycloak.models.map.processor.Util.getGenericsDeclaration;\n+import static org.keycloak.models.map.processor.Util.isMapType;\npublic abstract class AbstractGenerateEntityImplementationsProcessor extends AbstractProcessor {\n@@ -157,7 +158,7 @@ public abstract class AbstractGenerateEntityImplementationsProcessor extends Abs\nprotected boolean isKnownCollectionOfImmutableFinalTypes(TypeMirror fieldType) {\nList<TypeMirror> res = getGenericsDeclaration(fieldType);\n- return isCollection(fieldType) && res.stream().allMatch(tm -> isImmutableFinalType(tm) || isKnownCollectionOfImmutableFinalTypes(tm));\n+ return isCollection(fieldType) && res.stream().allMatch(this::isImmutableFinalType);\n}\nprotected boolean isCollection(TypeMirror fieldType) {\n@@ -175,12 +176,24 @@ public abstract class AbstractGenerateEntityImplementationsProcessor extends Abs\n}\nprotected String deepClone(TypeMirror fieldType, String parameterName) {\n- if (isKnownCollectionOfImmutableFinalTypes(fieldType)) {\nTypeElement typeElement = elements.getTypeElement(types.erasure(fieldType).toString());\n+ if (isKnownCollectionOfImmutableFinalTypes(fieldType)) {\nreturn parameterName + \" == null ? null : \" + interfaceToImplementation(typeElement, parameterName);\n- } else {\n- return \"deepClone(\" + parameterName + \")\";\n+ } else if (isMapType(typeElement)) {\n+ List<TypeMirror> mapTypes = getGenericsDeclaration(fieldType);\n+ boolean isKeyImmutable = isImmutableFinalType(mapTypes.get(0));\n+ boolean isValueImmutable = isImmutableFinalType(mapTypes.get(1));\n+\n+ return parameterName + \" == null ? null : \" + parameterName + \".entrySet().stream().collect(\" +\n+ \"java.util.stream.Collectors.toMap(\" +\n+ (isKeyImmutable ? \"java.util.Map.Entry::getKey\" : \"entry -> \" + deepClone(mapTypes.get(0), \"entry.getKey()\")) +\n+ \", \" +\n+ (isValueImmutable ? \"java.util.Map.Entry::getValue\" : \"entry -> \" + deepClone(mapTypes.get(1), \"entry.getValue()\")) +\n+ \", (o1, o2) -> o1\" +\n+ \", java.util.HashMap::new\" +\n+ \"))\";\n}\n+ return \"deepClone(\" + parameterName + \")\";\n}\nprotected boolean isPrimitiveType(TypeMirror fieldType) {\n" }, { "change_type": "MODIFY", "old_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/common/HotRodTypesUtils.java", "new_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/common/HotRodTypesUtils.java", "diff": "@@ -44,6 +44,10 @@ public class HotRodTypesUtils {\nreturn new HotRodPair<>(entry.getKey(), entry.getValue());\n}\n+ public static HotRodAttributeEntity createHotRodAttributeEntityFromMapEntry(Map.Entry<String, List<String>> entry) {\n+ return new HotRodAttributeEntity(entry.getKey(), entry.getValue());\n+ }\n+\npublic static <SetType, KeyType> boolean removeFromSetByMapKey(Set<SetType> set, KeyType key, Function<SetType, KeyType> keyGetter) {\nif (set == null || set.isEmpty()) { return false; }\nreturn set.stream()\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/authorization/adapter/MapResourceAdapter.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/authorization/adapter/MapResourceAdapter.java", "diff": "@@ -136,7 +136,8 @@ public class MapResourceAdapter extends AbstractResourceModel<MapResourceEntity>\n@Override\npublic String getSingleAttribute(String name) {\n- return entity.getSingleAttribute(name);\n+ List<String> attributeValues = entity.getAttribute(name);\n+ return attributeValues == null || attributeValues.isEmpty() ? null : attributeValues.get(0);\n}\n@Override\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/authorization/entity/MapResourceEntity.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/authorization/entity/MapResourceEntity.java", "diff": "@@ -19,6 +19,7 @@ package org.keycloak.models.map.authorization.entity;\nimport org.keycloak.models.map.common.AbstractEntity;\n+import org.keycloak.models.map.common.EntityWithAttributes;\nimport org.keycloak.models.map.common.UpdatableEntity;\nimport java.util.HashMap;\nimport java.util.HashSet;\n@@ -27,7 +28,7 @@ import java.util.Map;\nimport java.util.Objects;\nimport java.util.Set;\n-public class MapResourceEntity extends UpdatableEntity.Impl implements AbstractEntity {\n+public class MapResourceEntity extends UpdatableEntity.Impl implements AbstractEntity, EntityWithAttributes {\nprivate String id;\nprivate String name;\n@@ -156,23 +157,29 @@ public class MapResourceEntity extends UpdatableEntity.Impl implements AbstractE\nreturn policyIds;\n}\n+ @Override\npublic Map<String, List<String>> getAttributes() {\nreturn attributes;\n}\n- public List<String> getAttribute(String name) {\n- return attributes.get(name);\n+ @Override\n+ public void setAttributes(Map<String, List<String>> attributes) {\n+ this.updated |= ! Objects.equals(this.attributes, attributes);\n+ this.attributes.clear();\n+ this.attributes.putAll(attributes);\n}\n- public String getSingleAttribute(String name) {\n- List<String> attributeValues = attributes.get(name);\n- return attributeValues == null || attributeValues.isEmpty() ? null : attributeValues.get(0);\n+ @Override\n+ public List<String> getAttribute(String name) {\n+ return attributes.get(name);\n}\n+ @Override\npublic void setAttribute(String name, List<String> value) {\nthis.updated |= !Objects.equals(this.attributes.put(name, value), value);\n}\n+ @Override\npublic void removeAttribute(String name) {\nthis.updated |= this.attributes.remove(name) != null;\n}\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": "package org.keycloak.models.map.client;\nimport org.keycloak.models.map.common.AbstractEntity;\n+import org.keycloak.models.map.common.EntityWithAttributes;\nimport org.keycloak.models.map.common.UpdatableEntity;\nimport java.util.Collection;\n-import java.util.List;\nimport java.util.Map;\nimport java.util.Map.Entry;\nimport java.util.Objects;\n@@ -36,7 +36,7 @@ import org.keycloak.models.map.common.DeepCloner;\ninherits = \"org.keycloak.models.map.client.MapClientEntity.AbstractClientEntity\"\n)\[email protected]\n-public interface MapClientEntity extends AbstractEntity, UpdatableEntity {\n+public interface MapClientEntity extends AbstractEntity, UpdatableEntity, EntityWithAttributes {\npublic abstract class AbstractClientEntity extends UpdatableEntity.Impl implements MapClientEntity {\n@@ -87,11 +87,6 @@ public interface MapClientEntity extends AbstractEntity, UpdatableEntity {\nvoid removeWebOrigin(String webOrigin);\nvoid setWebOrigins(Set<String> webOrigins);\n- default List<String> getAttribute(String name) { return getAttributes() == null ? null : getAttributes().get(name); }\n- Map<String, List<String>> getAttributes();\n- void removeAttribute(String name);\n- void setAttribute(String name, List<String> values);\n-\nString getAuthenticationFlowBindingOverride(String binding);\nMap<String, String> getAuthenticationFlowBindingOverrides();\nvoid removeAuthenticationFlowBindingOverride(String binding);\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/clientscope/MapClientScopeEntity.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/clientscope/MapClientScopeEntity.java", "diff": "@@ -29,9 +29,10 @@ import java.util.stream.Collectors;\nimport java.util.stream.Stream;\nimport org.keycloak.models.ProtocolMapperModel;\nimport org.keycloak.models.map.common.AbstractEntity;\n+import org.keycloak.models.map.common.EntityWithAttributes;\nimport org.keycloak.models.map.common.UpdatableEntity;\n-public class MapClientScopeEntity extends UpdatableEntity.Impl implements AbstractEntity {\n+public class MapClientScopeEntity extends UpdatableEntity.Impl implements AbstractEntity, EntityWithAttributes {\nprivate String id;\nprivate String realmId;\n@@ -94,10 +95,19 @@ public class MapClientScopeEntity extends UpdatableEntity.Impl implements Abstra\nthis.protocol = protocol;\n}\n+ @Override\npublic Map<String, List<String>> getAttributes() {\nreturn attributes;\n}\n+ @Override\n+ public void setAttributes(Map<String, List<String>> attributes) {\n+ this.attributes.clear();\n+ this.attributes.putAll(attributes);\n+ this.updated = true;\n+ }\n+\n+ @Override\npublic void setAttribute(String name, List<String> values) {\nthis.updated |= ! Objects.equals(this.attributes.put(name, values), values);\n}\n@@ -132,10 +142,12 @@ public class MapClientScopeEntity extends UpdatableEntity.Impl implements Abstra\nreturn id == null ? null : protocolMappers.get(id);\n}\n+ @Override\npublic void removeAttribute(String name) {\nthis.updated |= this.attributes.remove(name) != null;\n}\n+ @Override\npublic List<String> getAttribute(String name) {\nreturn attributes.getOrDefault(name, Collections.EMPTY_LIST);\n}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "model/map/src/main/java/org/keycloak/models/map/common/EntityWithAttributes.java", "diff": "+/*\n+ * Copyright 2021 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 java.util.List;\n+import java.util.Map;\n+\n+public interface EntityWithAttributes {\n+ Map<String, List<String>> getAttributes();\n+ void setAttributes(Map<String, List<String>> attributes);\n+ List<String> getAttribute(String name);\n+ void setAttribute(String name, List<String> value);\n+ void removeAttribute(String name);\n+\n+}\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/group/MapGroupEntity.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/group/MapGroupEntity.java", "diff": "@@ -20,17 +20,16 @@ package org.keycloak.models.map.group;\nimport org.keycloak.models.map.annotations.GenerateEntityImplementations;\nimport org.keycloak.models.map.common.AbstractEntity;\nimport org.keycloak.models.map.common.DeepCloner;\n+import org.keycloak.models.map.common.EntityWithAttributes;\nimport org.keycloak.models.map.common.UpdatableEntity;\n-import java.util.List;\n-import java.util.Map;\nimport java.util.Set;\n@GenerateEntityImplementations(\ninherits = \"org.keycloak.models.map.group.MapGroupEntity.AbstractGroupEntity\"\n)\[email protected]\n-public interface MapGroupEntity extends UpdatableEntity, AbstractEntity {\n+public interface MapGroupEntity extends UpdatableEntity, AbstractEntity, EntityWithAttributes {\npublic abstract class AbstractGroupEntity extends UpdatableEntity.Impl implements MapGroupEntity {\n@@ -50,12 +49,6 @@ public interface MapGroupEntity extends UpdatableEntity, AbstractEntity {\n}\n- Map<String, List<String>> getAttributes();\n- void setAttributes(Map<String, List<String>> attributes);\n- List<String> getAttribute(String name);\n- void setAttribute(String name, List<String> value);\n- void removeAttribute(String name);\n-\nString getName();\nvoid setName(String name);\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": "@@ -30,6 +30,7 @@ import org.keycloak.common.util.Time;\nimport org.keycloak.models.ModelDuplicateException;\nimport org.keycloak.models.OTPPolicy;\nimport org.keycloak.models.map.common.AbstractEntity;\n+import org.keycloak.models.map.common.EntityWithAttributes;\nimport org.keycloak.models.map.common.UpdatableEntity;\nimport org.keycloak.models.map.realm.entity.MapAuthenticationExecutionEntity;\nimport org.keycloak.models.map.realm.entity.MapAuthenticationFlowEntity;\n@@ -43,7 +44,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;\n-public class MapRealmEntity extends UpdatableEntity.Impl implements AbstractEntity {\n+public class MapRealmEntity extends UpdatableEntity.Impl implements AbstractEntity, EntityWithAttributes {\nprivate String id;\nprivate String name;\n@@ -669,22 +670,33 @@ public class MapRealmEntity extends UpdatableEntity.Impl implements AbstractEnti\nthis.webAuthnPolicyPasswordless = webAuthnPolicyPasswordless;\n}\n+ @Override\npublic void setAttribute(String name, List<String> values) {\nthis.updated |= ! Objects.equals(this.attributes.put(name, values), values);\n}\n+ @Override\npublic void removeAttribute(String name) {\nthis.updated |= attributes.remove(name) != null;\n}\n+ @Override\npublic List<String> getAttribute(String name) {\nreturn attributes.getOrDefault(name, Collections.EMPTY_LIST);\n}\n+ @Override\npublic Map<String, List<String>> getAttributes() {\nreturn attributes;\n}\n+ @Override\n+ public void setAttributes(Map<String, List<String>> attributes) {\n+ this.attributes.clear();\n+ this.attributes.putAll(attributes);\n+ this.updated = true;\n+ }\n+\npublic void addDefaultClientScope(String scopeId) {\nthis.updated |= this.defaultClientScopes.add(scopeId);\n}\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/role/MapRoleEntity.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/role/MapRoleEntity.java", "diff": "@@ -22,13 +22,14 @@ import java.util.Set;\nimport org.keycloak.models.map.annotations.GenerateEntityImplementations;\nimport org.keycloak.models.map.common.AbstractEntity;\nimport org.keycloak.models.map.common.DeepCloner;\n+import org.keycloak.models.map.common.EntityWithAttributes;\nimport org.keycloak.models.map.common.UpdatableEntity;\n@GenerateEntityImplementations(\ninherits = \"org.keycloak.models.map.role.MapRoleEntity.AbstractRoleEntity\"\n)\[email protected]\n-public interface MapRoleEntity extends AbstractEntity, UpdatableEntity {\n+public interface MapRoleEntity extends AbstractEntity, UpdatableEntity, EntityWithAttributes {\npublic abstract class AbstractRoleEntity extends UpdatableEntity.Impl implements MapRoleEntity {\n@@ -76,10 +77,4 @@ public interface MapRoleEntity extends AbstractEntity, UpdatableEntity {\nvoid setCompositeRoles(Set<String> compositeRoles);\nvoid addCompositeRole(String roleId);\nvoid removeCompositeRole(String roleId);\n-\n- Map<String, List<String>> getAttributes();\n- void setAttributes(Map<String, List<String>> attributes);\n- void setAttribute(String name, List<String> values);\n- void removeAttribute(String name);\n-\n}\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": "@@ -19,12 +19,12 @@ package org.keycloak.models.map.user;\nimport org.keycloak.models.ModelDuplicateException;\nimport org.keycloak.models.map.common.AbstractEntity;\n+import org.keycloak.models.map.common.EntityWithAttributes;\nimport org.keycloak.models.map.common.UpdatableEntity;\nimport org.keycloak.models.utils.KeycloakModelUtils;\nimport java.util.Collection;\nimport java.util.Collections;\n-import java.util.Comparator;\nimport java.util.HashMap;\nimport java.util.HashSet;\nimport java.util.LinkedList;\n@@ -40,7 +40,7 @@ import java.util.stream.Stream;\n*\n* @author mhajas\n*/\n-public class MapUserEntity extends UpdatableEntity.Impl implements AbstractEntity {\n+public class MapUserEntity extends UpdatableEntity.Impl implements AbstractEntity, EntityWithAttributes {\nprivate String id;\nprivate String realmId;\n@@ -183,19 +183,23 @@ public class MapUserEntity extends UpdatableEntity.Impl implements AbstractEntit\nreturn attributes;\n}\n+ @Override\npublic List<String> getAttribute(String name) {\nreturn attributes.getOrDefault(name, Collections.emptyList());\n}\n+ @Override\npublic void setAttributes(Map<String, List<String>> attributes) {\nthis.updated |= !Objects.equals(this.attributes, attributes);\nthis.attributes = attributes;\n}\n+ @Override\npublic void setAttribute(String name, List<String> value) {\nthis.updated |= !Objects.equals(this.attributes.put(name, value), value);\n}\n+ @Override\npublic void removeAttribute(String name) {\nthis.updated |= this.attributes.remove(name) != null;\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "themes/src/main/resources/theme/keycloak/login/resources/css/login.css", "new_path": "themes/src/main/resources/theme/keycloak/login/resources/css/login.css", "diff": "+/* Patternfly CSS places a \"bg-login.jpg\" as the background on this \".login-pf\" class.\n+ This clashes with the \"keycloak-bg.png' background defined on the body below.\n+ Therefore the Patternfly background must be set to none. */\n+.login-pf {\n+ background: none;\n+}\n+\n.login-pf body {\nbackground: url(\"../img/keycloak-bg.png\") no-repeat center center fixed;\nbackground-size: cover;\n" } ]

[ { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/authentication/authenticators/challenge/NoCookieFlowRedirectAuthenticatorFactory.java", "new_path": "services/src/main/java/org/keycloak/authentication/authenticators/challenge/NoCookieFlowRedirectAuthenticatorFactory.java", "diff": "@@ -82,7 +82,7 @@ public class NoCookieFlowRedirectAuthenticatorFactory implements AuthenticatorFa\n@Override\npublic String getDisplayType() {\n- return \"Browser Redirect/Refresh\";\n+ return \"Browser Redirect for Cookie free authentication\";\n}\n@Override\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/InitialFlowsTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/InitialFlowsTest.java", "diff": "@@ -195,7 +195,7 @@ public class InitialFlowsTest extends AbstractAuthenticationTest {\naddExecExport(flow, \"Authentication Options\", false, null, true, null, REQUIRED, 20);\nexecs = new LinkedList<>();\n- addExecInfo(execs, \"Browser Redirect/Refresh\", \"no-cookie-redirect\", false, 0, 0, REQUIRED, null, new String[]{REQUIRED});\n+ addExecInfo(execs, \"Browser Redirect for Cookie free authentication\", \"no-cookie-redirect\", false, 0, 0, REQUIRED, null, new String[]{REQUIRED});\naddExecInfo(execs, \"Authentication Options\", null, false, 0, 1, REQUIRED, true, new String[]{REQUIRED, ALTERNATIVE, DISABLED, CONDITIONAL});\naddExecInfo(execs, \"Basic Auth Challenge\", \"basic-auth\", false, 1, 0, REQUIRED, null, new String[]{REQUIRED, ALTERNATIVE, DISABLED});\naddExecInfo(execs, \"Basic Auth Password+OTP\", \"basic-auth-otp\", false, 1, 1, DISABLED, null, new String[]{REQUIRED, ALTERNATIVE, DISABLED});\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/ProvidersTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/ProvidersTest.java", "diff": "@@ -182,7 +182,7 @@ public class ProvidersTest extends AbstractAuthenticationTest {\n\"User reviews and updates profile data retrieved from Identity Provider in the displayed form\");\naddProviderInfo(result, \"idp-username-password-form\", \"Username Password Form for identity provider reauthentication\",\n\"Validates a password from login form. Username may be already known from identity provider authentication\");\n- addProviderInfo(result, \"no-cookie-redirect\", \"Browser Redirect/Refresh\", \"Perform a 302 redirect to get user agent's current URI on authenticate path with an auth_session_id query parameter. This is for client's that do not support cookies.\");\n+ addProviderInfo(result, \"no-cookie-redirect\", \"Browser Redirect for Cookie free authentication\", \"Perform a 302 redirect to get user agent's current URI on authenticate path with an auth_session_id query parameter. This is for client's that do not support cookies.\");\naddProviderInfo(result, \"push-button-authenticator\", \"TEST: Button Login\",\n\"Just press the button to login.\");\naddProviderInfo(result, \"reset-credential-email\", \"Send Reset Email\", \"Send email to user and wait for response.\");\n" } ]

[ { "change_type": "MODIFY", "old_path": "adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/KeycloakHttpServerAuthenticationMechanism.java", "new_path": "adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/KeycloakHttpServerAuthenticationMechanism.java", "diff": "@@ -173,7 +173,13 @@ class KeycloakHttpServerAuthenticationMechanism implements HttpServerAuthenticat\nString path = uri.getPath();\nString relativePath = exchange.getRequest().getRelativePath();\nString contextPath = path.substring(0, path.indexOf(relativePath));\n- String loc = exchange.getURI().getScheme() + \"://\" + exchange.getURI().getHost() + \":\" + exchange.getURI().getPort() + contextPath + location;\n+ String loc;\n+ int port = uri.getPort();\n+ if (port == -1) {\n+ loc = uri.getScheme() + \"://\" + uri.getHost() + contextPath + location;\n+ } else {\n+ loc = uri.getScheme() + \"://\" + uri.getHost() + \":\" + port + contextPath + location;\n+ }\nexchange.getResponse().setHeader(\"Location\", loc);\n}\nexchange.getResponse().setStatus(HttpServletResponse.SC_FOUND);\n" } ]

[ { "change_type": "MODIFY", "old_path": "quarkus/deployment/pom.xml", "new_path": "quarkus/deployment/pom.xml", "diff": "</dependency>\n<dependency>\n<groupId>io.quarkus</groupId>\n- <artifactId>quarkus-vertx-web-deployment</artifactId>\n+ <artifactId>quarkus-reactive-routes-deployment</artifactId>\n</dependency>\n<dependency>\n<groupId>io.quarkus</groupId>\n" }, { "change_type": "MODIFY", "old_path": "quarkus/runtime/pom.xml", "new_path": "quarkus/runtime/pom.xml", "diff": "</dependency>\n<dependency>\n<groupId>io.quarkus</groupId>\n- <artifactId>quarkus-vertx-web</artifactId>\n+ <artifactId>quarkus-reactive-routes</artifactId>\n</dependency>\n<dependency>\n<groupId>io.quarkus</groupId>\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/storage/tree/TreeNode.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/storage/tree/TreeNode.java", "diff": "@@ -19,7 +19,9 @@ package org.keycloak.models.map.storage.tree;\nimport java.util.List;\nimport java.util.Map;\nimport java.util.Optional;\n+import java.util.function.Consumer;\nimport java.util.function.Predicate;\n+import java.util.stream.Stream;\n/**\n* Interface representing a node in a tree that has ID.\n@@ -166,4 +168,29 @@ public interface TreeNode<Self extends TreeNode<? extends Self>> {\n* @return\n*/\nList<Self> getPathToRoot(PathOrientation orientation);\n+\n+ /**\n+ * Returns a stream of the nodes laying on the path from this node (exclusive) to the root of the tree (inclusive).\n+ * @return\n+ */\n+ Stream<Self> getParentsStream();\n+\n+ /**\n+ * Calls the given {@code visitor} on each node laying on the path from this node (exclusive) to the root of the tree (inclusive).\n+ * @param visitor\n+ */\n+ void forEachParent(Consumer<Self> visitor);\n+\n+ /**\n+ * Walks the tree with the given visitor in depth-first search manner.\n+ * @param visitorUponEntry Visitor called upon entry of the node. May be {@code null}, in that case no action is performed.\n+ * @param visitorAfterChildrenVisited Visitor called before exit of the node. May be {@code null}, in that case no action is performed.\n+ */\n+ void walkDfs(Consumer<Self> visitorUponEntry, Consumer<Self> visitorAfterChildrenVisited);\n+\n+ /**\n+ * Walks the tree with the given visitor in breadth-first search manner.\n+ * @param visitor\n+ */\n+ void walkBfs(Consumer<Self> visitor);\n}\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/test/java/org/keycloak/models/map/storage/tree/DefaultTreeNodeTest.java", "new_path": "model/map/src/test/java/org/keycloak/models/map/storage/tree/DefaultTreeNodeTest.java", "diff": "@@ -31,6 +31,7 @@ import static org.hamcrest.Matchers.empty;\nimport static org.hamcrest.Matchers.hasKey;\nimport static org.hamcrest.Matchers.hasSize;\nimport static org.hamcrest.Matchers.is;\n+import static org.hamcrest.Matchers.lessThan;\nimport static org.hamcrest.Matchers.not;\nimport static org.hamcrest.Matchers.notNullValue;\n@@ -41,13 +42,16 @@ import static org.hamcrest.Matchers.notNullValue;\npublic class DefaultTreeNodeTest {\nprivate class Node extends DefaultTreeNode<Node> {\n+\npublic Node() {\nsuper(treeProperties);\n}\n+\npublic Node(String id) {\nsuper(treeProperties);\nsetId(id);\n}\n+\npublic Node(Node parent, String id) {\nsuper(treeProperties);\nsetId(id);\n@@ -55,7 +59,7 @@ public class DefaultTreeNodeTest {\n}\n@Override\n- public String toString() {\n+ public String getLabel() {\nreturn this.getId() == null ? \"Node:\" + System.identityHashCode(this) : this.getId();\n}\n}\n@@ -68,6 +72,7 @@ public class DefaultTreeNodeTest {\nprivate static final Integer VALUE_3 = 12345;\npublic Map<String, Object> treeProperties = new HashMap<>();\n+\n{\ntreeProperties.put(KEY_1, VALUE_1);\ntreeProperties.put(KEY_2, VALUE_2);\n@@ -341,11 +346,17 @@ public class DefaultTreeNodeTest {\nNode child1121 = new Node(child112, \"1.1.2.1\");\nList<Node> res = new LinkedList<>();\n- assertThat(root.findFirstDfs(n -> { res.add(n); return false; }), is(Optional.empty()));\n+ assertThat(root.findFirstDfs(n -> {\n+ res.add(n);\n+ return false;\n+ }), is(Optional.empty()));\nassertThat(res, contains(root, child11, child111, child112, child1121, child12, child121, child122, child123));\nres.clear();\n- assertThat(root.findFirstDfs(n -> { res.add(n); return n == child12; }), is(Optional.of(child12)));\n+ assertThat(root.findFirstDfs(n -> {\n+ res.add(n);\n+ return n == child12;\n+ }), is(Optional.of(child12)));\nassertThat(res, contains(root, child11, child111, child112, child1121, child12));\n}\n@@ -365,15 +376,24 @@ public class DefaultTreeNodeTest {\nNode child132 = new Node(child13, \"1.3.2\");\nList<Node> res = new LinkedList<>();\n- assertThat(root.findFirstBottommostDfs(n -> { res.add(n); return false; }), is(Optional.empty()));\n+ assertThat(root.findFirstBottommostDfs(n -> {\n+ res.add(n);\n+ return false;\n+ }), is(Optional.empty()));\nassertThat(res, contains(root, child11, child111, child112, child1121, child12, child121, child122, child123, child13, child131, child132));\nres.clear();\n- assertThat(root.findFirstBottommostDfs(n -> { res.add(n); return n == child12; }), is(Optional.of(child12)));\n+ assertThat(root.findFirstBottommostDfs(n -> {\n+ res.add(n);\n+ return n == child12;\n+ }), is(Optional.of(child12)));\nassertThat(res, contains(root, child11, child111, child112, child1121, child12, child121, child122, child123));\nres.clear();\n- assertThat(root.findFirstBottommostDfs(n -> { res.add(n); return n.getId().startsWith(\"1.1.2\"); }), is(Optional.of(child1121)));\n+ assertThat(root.findFirstBottommostDfs(n -> {\n+ res.add(n);\n+ return n.getId().startsWith(\"1.1.2\");\n+ }), is(Optional.of(child1121)));\nassertThat(res, contains(root, child11, child111, child112, child1121));\n}\n@@ -390,14 +410,82 @@ public class DefaultTreeNodeTest {\nNode child1121 = new Node(child112, \"1.1.2.1\");\nList<Node> res = new LinkedList<>();\n- assertThat(root.findFirstBfs(n -> { res.add(n); return false; }), is(Optional.empty()));\n+ assertThat(root.findFirstBfs(n -> {\n+ res.add(n);\n+ return false;\n+ }), is(Optional.empty()));\nassertThat(res, contains(root, child11, child12, child111, child112, child121, child122, child123, child1121));\nres.clear();\n- assertThat(root.findFirstBfs(n -> { res.add(n); return n == child12; }), is(Optional.of(child12)));\n+ assertThat(root.findFirstBfs(n -> {\n+ res.add(n);\n+ return n == child12;\n+ }), is(Optional.of(child12)));\nassertThat(res, contains(root, child11, child12));\n}\n+ @Test\n+ public void testWalkBfs() {\n+ Node root = new Node(\"1\");\n+ Node child11 = new Node(root, \"1.1\");\n+ Node child12 = new Node(root, \"1.2\");\n+ Node child111 = new Node(child11, \"1.1.1\");\n+ Node child112 = new Node(child11, \"1.1.2\");\n+ Node child121 = new Node(child12, \"1.2.1\");\n+ Node child122 = new Node(child12, \"1.2.2\");\n+ Node child123 = new Node(child12, \"1.2.3\");\n+ Node child1121 = new Node(child112, \"1.1.2.1\");\n+\n+ List<Node> res = new LinkedList<>();\n+ root.walkBfs(res::add);\n+ assertThat(res, contains(root, child11, child12, child111, child112, child121, child122, child123, child1121));\n+ }\n+\n+ @Test\n+ public void testWalkDfs() {\n+ Node root = new Node(\"1\");\n+ Node child11 = new Node(root, \"1.1\");\n+ Node child12 = new Node(root, \"1.2\");\n+ Node child111 = new Node(child11, \"1.1.1\");\n+ Node child112 = new Node(child11, \"1.1.2\");\n+ Node child121 = new Node(child12, \"1.2.1\");\n+ Node child122 = new Node(child12, \"1.2.2\");\n+ Node child123 = new Node(child12, \"1.2.3\");\n+ Node child1121 = new Node(child112, \"1.1.2.1\");\n+\n+ List<Node> uponEntry = new LinkedList<>();\n+ List<Node> afterChildren = new LinkedList<>();\n+ root.walkDfs(uponEntry::add, afterChildren::add);\n+ assertThat(uponEntry, contains(root, child11, child111, child112, child1121, child12, child121, child122, child123));\n+ assertThat(afterChildren, contains(child111, child1121, child112, child11, child121, child122, child123, child12, root));\n+ }\n+\n+ @Test\n+ public void testForEachParent() {\n+ Node root = new Node(\"1\");\n+ Node child11 = new Node(root, \"1.1\");\n+ Node child12 = new Node(root, \"1.2\");\n+ Node child111 = new Node(child11, \"1.1.1\");\n+ Node child112 = new Node(child11, \"1.1.2\");\n+ Node child121 = new Node(child12, \"1.2.1\");\n+ Node child122 = new Node(child12, \"1.2.2\");\n+ Node child123 = new Node(child12, \"1.2.3\");\n+ Node child1121 = new Node(child112, \"1.1.2.1\");\n+\n+ List<Node> res = new LinkedList<>();\n+ res.clear();\n+ root.forEachParent(res::add);\n+ assertThat(res, empty());\n+\n+ res.clear();\n+ child1121.forEachParent(res::add);\n+ assertThat(res, contains(child112, child11, root));\n+\n+ res.clear();\n+ child123.forEachParent(res::add);\n+ assertThat(res, contains(child12, root));\n+ }\n+\n@Test\npublic void testPathToRoot() {\nNode root = new Node(\"1\");\n@@ -419,6 +507,13 @@ public class DefaultTreeNodeTest {\nassertThat(root.getPathToRoot(PathOrientation.BOTTOM_FIRST), contains(root));\n}\n+ @Test\n+ public void testToStringStackOverflow() {\n+ Node n = new Node(\"1\");\n+ n.setNodeProperty(\"prop\", n);\n+ assertThat(n.toString().length(), lessThan(255));\n+ }\n+\nprivate void assertTreeProperties(Node node) {\nassertThat(node.getTreeProperty(KEY_1, String.class), notNullValue());\nassertThat(node.getTreeProperty(KEY_1, Date.class), notNullValue());\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": "@@ -111,7 +111,7 @@ public class HotRodMapStorage<K, E extends AbstractHotRodEntity, V extends HotRo\n@Override\npublic Stream<V> read(QueryParameters<M> queryParameters) {\n- IckleQueryMapModelCriteriaBuilder<K, V, M> iqmcb = queryParameters.getModelCriteriaBuilder()\n+ IckleQueryMapModelCriteriaBuilder<E, M> iqmcb = queryParameters.getModelCriteriaBuilder()\n.flashToModelCriteriaBuilder(createCriteriaBuilder());\nString queryString = iqmcb.getIckleQuery();\n@@ -137,7 +137,7 @@ public class HotRodMapStorage<K, E extends AbstractHotRodEntity, V extends HotRo\n@Override\npublic long getCount(QueryParameters<M> queryParameters) {\n- IckleQueryMapModelCriteriaBuilder<K, V, M> iqmcb = queryParameters.getModelCriteriaBuilder()\n+ IckleQueryMapModelCriteriaBuilder<E, M> iqmcb = queryParameters.getModelCriteriaBuilder()\n.flashToModelCriteriaBuilder(createCriteriaBuilder());\nString queryString = iqmcb.getIckleQuery();\n@@ -153,7 +153,7 @@ public class HotRodMapStorage<K, E extends AbstractHotRodEntity, V extends HotRo\n@Override\npublic long delete(QueryParameters<M> queryParameters) {\n- IckleQueryMapModelCriteriaBuilder<K, V, M> iqmcb = queryParameters.getModelCriteriaBuilder()\n+ IckleQueryMapModelCriteriaBuilder<E, M> iqmcb = queryParameters.getModelCriteriaBuilder()\n.flashToModelCriteriaBuilder(createCriteriaBuilder());\nString queryString = \"SELECT id \" + iqmcb.getIckleQuery();\n@@ -183,8 +183,8 @@ public class HotRodMapStorage<K, E extends AbstractHotRodEntity, V extends HotRo\nreturn result.get();\n}\n- public IckleQueryMapModelCriteriaBuilder<K, V, M> createCriteriaBuilder() {\n- return new IckleQueryMapModelCriteriaBuilder<>();\n+ public IckleQueryMapModelCriteriaBuilder<E, M> createCriteriaBuilder() {\n+ return new IckleQueryMapModelCriteriaBuilder<>(storedEntityDescriptor.getEntityTypeClass());\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": "@@ -22,8 +22,10 @@ import org.keycloak.Config;\nimport org.keycloak.common.Profile;\nimport org.keycloak.component.AmphibianProviderFactory;\nimport org.keycloak.models.ClientModel;\n+import org.keycloak.models.GroupModel;\nimport org.keycloak.models.KeycloakSession;\nimport org.keycloak.models.KeycloakSessionFactory;\n+import org.keycloak.models.map.group.MapGroupEntity;\nimport org.keycloak.models.map.storage.hotRod.client.HotRodClientEntity;\nimport org.keycloak.models.map.storage.hotRod.client.HotRodClientEntityDelegate;\nimport org.keycloak.models.map.storage.hotRod.client.HotRodProtocolMapperEntityDelegate;\n@@ -34,6 +36,8 @@ import org.keycloak.models.map.storage.hotRod.common.HotRodEntityDescriptor;\nimport org.keycloak.models.map.storage.hotRod.connections.HotRodConnectionProvider;\nimport org.keycloak.models.map.storage.MapStorageProvider;\nimport org.keycloak.models.map.storage.MapStorageProviderFactory;\n+import org.keycloak.models.map.storage.hotRod.group.HotRodGroupEntity;\n+import org.keycloak.models.map.storage.hotRod.group.HotRodGroupEntityDelegate;\nimport org.keycloak.provider.EnvironmentDependentProviderFactory;\nimport java.util.HashMap;\n@@ -47,6 +51,7 @@ public class HotRodMapStorageProviderFactory implements AmphibianProviderFactory\nprivate final static DeepCloner CLONER = new DeepCloner.Builder()\n.constructorDC(MapClientEntity.class, HotRodClientEntityDelegate::new)\n.constructor(MapProtocolMapperEntity.class, HotRodProtocolMapperEntityDelegate::new)\n+ .constructor(MapGroupEntity.class, HotRodGroupEntityDelegate::new)\n.build();\npublic static final Map<Class<?>, HotRodEntityDescriptor<?, ?>> ENTITY_DESCRIPTOR_MAP = new HashMap<>();\n@@ -56,6 +61,12 @@ public class HotRodMapStorageProviderFactory implements AmphibianProviderFactory\nnew HotRodEntityDescriptor<>(ClientModel.class,\nHotRodClientEntity.class,\nHotRodClientEntityDelegate::new));\n+\n+ // Groups descriptor\n+ ENTITY_DESCRIPTOR_MAP.put(GroupModel.class,\n+ new HotRodEntityDescriptor<>(GroupModel.class,\n+ HotRodGroupEntity.class,\n+ HotRodGroupEntityDelegate::new));\n}\n@Override\n@@ -95,6 +106,6 @@ public class HotRodMapStorageProviderFactory implements AmphibianProviderFactory\n@Override\npublic String getHelpText() {\n- return \"HotRod client storage\";\n+ return \"HotRod map storage\";\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/IckleQueryMapModelCriteriaBuilder.java", "new_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/IckleQueryMapModelCriteriaBuilder.java", "diff": "package org.keycloak.models.map.storage.hotRod;\nimport org.keycloak.models.ClientModel;\n-import org.keycloak.models.map.common.AbstractEntity;\n+import org.keycloak.models.GroupModel;\nimport org.keycloak.models.map.storage.ModelCriteriaBuilder;\n+import org.keycloak.models.map.storage.hotRod.common.AbstractHotRodEntity;\nimport org.keycloak.storage.SearchableModelField;\nimport java.util.Arrays;\n@@ -32,10 +33,12 @@ import java.util.stream.Collectors;\nimport static org.keycloak.models.map.storage.hotRod.IckleQueryOperators.C;\nimport static org.keycloak.models.map.storage.hotRod.IckleQueryOperators.findAvailableNamedParam;\n+import static org.keycloak.models.map.storage.hotRod.common.ProtoSchemaInitializer.HOT_ROD_ENTITY_PACKAGE;\n-public class IckleQueryMapModelCriteriaBuilder<K, V extends AbstractEntity, M> implements ModelCriteriaBuilder<M, IckleQueryMapModelCriteriaBuilder<K, V, M>> {\n+public class IckleQueryMapModelCriteriaBuilder<E extends AbstractHotRodEntity, M> implements ModelCriteriaBuilder<M, IckleQueryMapModelCriteriaBuilder<E, M>> {\nprivate static final int INITIAL_BUILDER_CAPACITY = 250;\n+ private final Class<E> hotRodEntityClass;\nprivate final StringBuilder whereClauseBuilder = new StringBuilder(INITIAL_BUILDER_CAPACITY);\nprivate final Map<String, Object> parameters;\npublic static final Map<SearchableModelField<?>, String> INFINISPAN_NAME_OVERRIDES = new HashMap<>();\n@@ -43,14 +46,19 @@ public class IckleQueryMapModelCriteriaBuilder<K, V extends AbstractEntity, M> i\nstatic {\nINFINISPAN_NAME_OVERRIDES.put(ClientModel.SearchableFields.SCOPE_MAPPING_ROLE, \"scopeMappings\");\nINFINISPAN_NAME_OVERRIDES.put(ClientModel.SearchableFields.ATTRIBUTE, \"attributes\");\n+\n+ INFINISPAN_NAME_OVERRIDES.put(GroupModel.SearchableFields.PARENT_ID, \"parentId\");\n+ INFINISPAN_NAME_OVERRIDES.put(GroupModel.SearchableFields.ASSIGNED_ROLE, \"grantedRoles\");\n}\n- public IckleQueryMapModelCriteriaBuilder(StringBuilder whereClauseBuilder, Map<String, Object> parameters) {\n+ public IckleQueryMapModelCriteriaBuilder(Class<E> hotRodEntityClass, StringBuilder whereClauseBuilder, Map<String, Object> parameters) {\n+ this.hotRodEntityClass = hotRodEntityClass;\nthis.whereClauseBuilder.append(whereClauseBuilder);\nthis.parameters = parameters;\n}\n- public IckleQueryMapModelCriteriaBuilder() {\n+ public IckleQueryMapModelCriteriaBuilder(Class<E> hotRodEntityClass) {\n+ this.hotRodEntityClass = hotRodEntityClass;\nthis.parameters = new HashMap<>();\n}\n@@ -63,7 +71,7 @@ public class IckleQueryMapModelCriteriaBuilder<K, V extends AbstractEntity, M> i\n}\n@Override\n- public IckleQueryMapModelCriteriaBuilder<K, V, M> compare(SearchableModelField<? super M> modelField, Operator op, Object... value) {\n+ public IckleQueryMapModelCriteriaBuilder<E, M> compare(SearchableModelField<? super M> modelField, Operator op, Object... value) {\nStringBuilder newBuilder = new StringBuilder(INITIAL_BUILDER_CAPACITY);\nnewBuilder.append(\"(\");\n@@ -78,17 +86,17 @@ public class IckleQueryMapModelCriteriaBuilder<K, V extends AbstractEntity, M> i\nnewBuilder.append(\")\");\n}\n- return new IckleQueryMapModelCriteriaBuilder<>(newBuilder.append(\")\"), newParameters);\n+ return new IckleQueryMapModelCriteriaBuilder<>(hotRodEntityClass, newBuilder.append(\")\"), newParameters);\n}\n- private StringBuilder joinBuilders(IckleQueryMapModelCriteriaBuilder<K, V, M>[] builders, String delimiter) {\n+ private StringBuilder joinBuilders(IckleQueryMapModelCriteriaBuilder<E, M>[] builders, String delimiter) {\nreturn new StringBuilder(INITIAL_BUILDER_CAPACITY).append(\"(\").append(Arrays.stream(builders)\n.map(IckleQueryMapModelCriteriaBuilder::getWhereClauseBuilder)\n.filter(IckleQueryMapModelCriteriaBuilder::notEmpty)\n.collect(Collectors.joining(delimiter))).append(\")\");\n}\n- private Map<String, Object> joinParameters(IckleQueryMapModelCriteriaBuilder<K, V, M>[] builders) {\n+ private Map<String, Object> joinParameters(IckleQueryMapModelCriteriaBuilder<E, M>[] builders) {\nreturn Arrays.stream(builders)\n.map(IckleQueryMapModelCriteriaBuilder::getParameters)\n.map(Map::entrySet)\n@@ -97,7 +105,7 @@ public class IckleQueryMapModelCriteriaBuilder<K, V extends AbstractEntity, M> i\n}\n@SuppressWarnings(\"unchecked\")\n- private IckleQueryMapModelCriteriaBuilder<K, V, M>[] resolveNamedQueryConflicts(IckleQueryMapModelCriteriaBuilder<K, V, M>[] builders) {\n+ private IckleQueryMapModelCriteriaBuilder<E, M>[] resolveNamedQueryConflicts(IckleQueryMapModelCriteriaBuilder<E, M>[] builders) {\nfinal Set<String> existingKeys = new HashSet<>();\nreturn Arrays.stream(builders).map(builder -> {\n@@ -123,36 +131,36 @@ public class IckleQueryMapModelCriteriaBuilder<K, V extends AbstractEntity, M> i\n}\n}\n- return new IckleQueryMapModelCriteriaBuilder<>(new StringBuilder(newWhereClause), newParameters);\n+ return new IckleQueryMapModelCriteriaBuilder<>(hotRodEntityClass, new StringBuilder(newWhereClause), newParameters);\n}).toArray(IckleQueryMapModelCriteriaBuilder[]::new);\n}\n@Override\n- public IckleQueryMapModelCriteriaBuilder<K, V, M> and(IckleQueryMapModelCriteriaBuilder<K, V, M>... builders) {\n+ public IckleQueryMapModelCriteriaBuilder<E, M> and(IckleQueryMapModelCriteriaBuilder<E, M>... builders) {\nif (builders.length == 0) {\n- return new IckleQueryMapModelCriteriaBuilder<>();\n+ return new IckleQueryMapModelCriteriaBuilder<>(hotRodEntityClass);\n}\nbuilders = resolveNamedQueryConflicts(builders);\n- return new IckleQueryMapModelCriteriaBuilder<>(joinBuilders(builders, \" AND \"),\n+ return new IckleQueryMapModelCriteriaBuilder<>(hotRodEntityClass, joinBuilders(builders, \" AND \"),\njoinParameters(builders));\n}\n@Override\n- public IckleQueryMapModelCriteriaBuilder<K, V, M> or(IckleQueryMapModelCriteriaBuilder<K, V, M>... builders) {\n+ public IckleQueryMapModelCriteriaBuilder<E, M> or(IckleQueryMapModelCriteriaBuilder<E, M>... builders) {\nif (builders.length == 0) {\n- return new IckleQueryMapModelCriteriaBuilder<>();\n+ return new IckleQueryMapModelCriteriaBuilder<>(hotRodEntityClass);\n}\nbuilders = resolveNamedQueryConflicts(builders);\n- return new IckleQueryMapModelCriteriaBuilder<>(joinBuilders(builders, \" OR \"),\n+ return new IckleQueryMapModelCriteriaBuilder<>(hotRodEntityClass, joinBuilders(builders, \" OR \"),\njoinParameters(builders));\n}\n@Override\n- public IckleQueryMapModelCriteriaBuilder<K, V, M> not(IckleQueryMapModelCriteriaBuilder<K, V, M> builder) {\n+ public IckleQueryMapModelCriteriaBuilder<E, M> not(IckleQueryMapModelCriteriaBuilder<E, M> builder) {\nStringBuilder newBuilder = new StringBuilder(INITIAL_BUILDER_CAPACITY);\nStringBuilder originalBuilder = builder.getWhereClauseBuilder();\n@@ -160,7 +168,7 @@ public class IckleQueryMapModelCriteriaBuilder<K, V extends AbstractEntity, M> i\nnewBuilder.append(\"not\").append(originalBuilder);\n}\n- return new IckleQueryMapModelCriteriaBuilder<>(newBuilder, builder.getParameters());\n+ return new IckleQueryMapModelCriteriaBuilder<>(hotRodEntityClass, newBuilder, builder.getParameters());\n}\nprivate StringBuilder getWhereClauseBuilder() {\n@@ -172,7 +180,7 @@ public class IckleQueryMapModelCriteriaBuilder<K, V extends AbstractEntity, M> i\n* @return Ickle query that represents this QueryBuilder\n*/\npublic String getIckleQuery() {\n- return \"FROM org.keycloak.models.map.storage.hotrod.HotRodClientEntity \" + C + ((whereClauseBuilder.length() != 0) ? \" WHERE \" + whereClauseBuilder : \"\");\n+ return \"FROM \" + HOT_ROD_ENTITY_PACKAGE + \".\" + hotRodEntityClass.getSimpleName() + \" \" + C + ((whereClauseBuilder.length() != 0) ? \" WHERE \" + whereClauseBuilder : \"\");\n}\n/**\n" }, { "change_type": "MODIFY", "old_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/IckleQueryOperators.java", "new_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/IckleQueryOperators.java", "diff": "@@ -112,7 +112,7 @@ public class IckleQueryOperators {\noperands = new HashSet<>(Arrays.asList(values));\n}\n- return C + \".\" + modelField + \" IN (\" + operands.stream()\n+ return operands.isEmpty() ? \"false\" : C + \".\" + modelField + \" IN (\" + operands.stream()\n.map(operand -> {\nString namedParam = findAvailableNamedParam(parameters.keySet(), modelField);\nparameters.put(namedParam, operand);\n@@ -149,9 +149,13 @@ public class IckleQueryOperators {\nreturn (modelFieldName, values, parameters) -> {\nif (values.length != 1) throw new RuntimeException(\"Invalid arguments, expected (\" + modelFieldName + \"), got: \" + Arrays.toString(values));\n- String namedParameter = findAvailableNamedParam(parameters.keySet(), modelFieldName);\n+ if (values[0] == null && op.equals(ModelCriteriaBuilder.Operator.EQ)) {\n+ return C + \".\" + modelFieldName + \" IS NULL\";\n+ }\n+ String namedParameter = findAvailableNamedParam(parameters.keySet(), modelFieldName);\nparameters.put(namedParameter, values[0]);\n+\nreturn C + \".\" + modelFieldName + \" \" + IckleQueryOperators.operatorToString(op) + \" :\" + namedParameter;\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": "@@ -22,20 +22,29 @@ import org.infinispan.protostream.annotations.AutoProtoSchemaBuilder;\nimport org.keycloak.models.map.storage.hotRod.client.HotRodAttributeEntity;\nimport org.keycloak.models.map.storage.hotRod.client.HotRodClientEntity;\nimport org.keycloak.models.map.storage.hotRod.client.HotRodProtocolMapperEntity;\n+import org.keycloak.models.map.storage.hotRod.group.HotRodGroupEntity;\n/**\n* @author <a href=\"mailto:[email protected]\">Martin Kanis</a>\n*/\n@AutoProtoSchemaBuilder(\nincludeClasses = {\n- HotRodAttributeEntity.class,\n+ // Clients\nHotRodClientEntity.class,\n+ HotRodAttributeEntity.class,\nHotRodProtocolMapperEntity.class,\n+\n+ // Groups\n+ HotRodGroupEntity.class,\n+\n+ // Common\nHotRodPair.class\n},\nschemaFileName = \"KeycloakHotRodMapStorage.proto\",\nschemaFilePath = \"proto/\",\n- schemaPackageName = \"org.keycloak.models.map.storage.hotrod\")\n+ schemaPackageName = ProtoSchemaInitializer.HOT_ROD_ENTITY_PACKAGE)\npublic interface ProtoSchemaInitializer extends GeneratedSchema {\n+ String HOT_ROD_ENTITY_PACKAGE = \"kc\";\n+\nProtoSchemaInitializer INSTANCE = new ProtoSchemaInitializerImpl();\n}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/group/HotRodGroupEntity.java", "diff": "+/*\n+ * Copyright 2021 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.group;\n+\n+import org.infinispan.protostream.annotations.ProtoField;\n+import org.keycloak.models.map.annotations.GenerateHotRodEntityImplementation;\n+import org.keycloak.models.map.common.UpdatableEntity;\n+import org.keycloak.models.map.group.MapGroupEntity;\n+import org.keycloak.models.map.storage.hotRod.client.HotRodAttributeEntity;\n+import org.keycloak.models.map.storage.hotRod.common.AbstractHotRodEntity;\n+import org.keycloak.models.map.storage.hotRod.common.HotRodEntityDelegate;\n+\n+import java.util.Set;\n+\n+@GenerateHotRodEntityImplementation(\n+ implementInterface = \"org.keycloak.models.map.group.MapGroupEntity\",\n+ inherits = \"org.keycloak.models.map.storage.hotRod.group.HotRodGroupEntity.AbstractHotRodGroupEntityDelegate\"\n+)\n+public class HotRodGroupEntity implements AbstractHotRodEntity {\n+\n+ public static abstract class AbstractHotRodGroupEntityDelegate extends UpdatableEntity.Impl implements HotRodEntityDelegate<HotRodGroupEntity>, MapGroupEntity {\n+\n+ @Override\n+ public String getId() {\n+ return getHotRodEntity().id;\n+ }\n+\n+ @Override\n+ public void setId(String id) {\n+ HotRodGroupEntity entity = getHotRodEntity();\n+ if (entity.id != null) throw new IllegalStateException(\"Id cannot be changed\");\n+ entity.id = id;\n+ this.updated |= id != null;\n+ }\n+ }\n+\n+ @ProtoField(number = 1, required = true)\n+ public int entityVersion = 1;\n+\n+ @ProtoField(number = 2, required = true)\n+ public String id;\n+\n+ @ProtoField(number = 3)\n+ public String realmId;\n+\n+ @ProtoField(number = 4)\n+ public String name;\n+\n+ @ProtoField(number = 5)\n+ public String parentId;\n+\n+ @ProtoField(number = 6)\n+ public Set<HotRodAttributeEntity> attributes;\n+\n+ @ProtoField(number = 7)\n+ public Set<String> grantedRoles;\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": "<distributed-cache name=\"clients\" mode=\"SYNC\">\n<encoding media-type=\"application/x-protostream\"/>\n</distributed-cache>\n+ <distributed-cache name=\"groups\" mode=\"SYNC\">\n+ <encoding media-type=\"application/x-protostream\"/>\n+ </distributed-cache>\n</cache-container>\n</infinispan>\n\\ No newline at end of file\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": "<distributed-cache name=\"clients\" mode=\"SYNC\">\n<encoding media-type=\"application/x-protostream\"/>\n</distributed-cache>\n+ <distributed-cache name=\"groups\" mode=\"SYNC\">\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/test/java/org/keycloak/models/map/storage/hotRod/IckleQueryMapModelCriteriaBuilderTest.java", "new_path": "model/map-hot-rod/src/test/java/org/keycloak/models/map/storage/hotRod/IckleQueryMapModelCriteriaBuilderTest.java", "diff": "@@ -37,9 +37,9 @@ import static org.keycloak.models.map.storage.criteria.DefaultModelCriteria.crit\npublic class IckleQueryMapModelCriteriaBuilderTest {\n@Test\npublic void testSimpleIckleQuery() {\n- IckleQueryMapModelCriteriaBuilder<String, HotRodClientEntityDelegate, ClientModel> v = new IckleQueryMapModelCriteriaBuilder<>();\n- IckleQueryMapModelCriteriaBuilder<String, HotRodClientEntityDelegate, ClientModel> mcb = v.compare(CLIENT_ID, ModelCriteriaBuilder.Operator.EQ, 3);\n- assertThat(mcb.getIckleQuery(), is(equalTo(\"FROM org.keycloak.models.map.storage.hotrod.HotRodClientEntity c WHERE (c.clientId = :clientId0)\")));\n+ IckleQueryMapModelCriteriaBuilder<HotRodClientEntity, ClientModel> v = new IckleQueryMapModelCriteriaBuilder<>(HotRodClientEntity.class);\n+ IckleQueryMapModelCriteriaBuilder<HotRodClientEntity, ClientModel> mcb = v.compare(CLIENT_ID, ModelCriteriaBuilder.Operator.EQ, 3);\n+ assertThat(mcb.getIckleQuery(), is(equalTo(\"FROM kc.HotRodClientEntity c WHERE (c.clientId = :clientId0)\")));\nassertThat(mcb.getParameters().entrySet(), hasSize(1));\nassertThat(mcb.getParameters(), hasEntry(\"clientId0\", 3));\n@@ -47,7 +47,7 @@ public class IckleQueryMapModelCriteriaBuilderTest {\nmcb = v.compare(CLIENT_ID, ModelCriteriaBuilder.Operator.EQ, 4)\n.compare(ID, ModelCriteriaBuilder.Operator.EQ, 5);\n- assertThat(mcb.getIckleQuery(), is(equalTo(\"FROM org.keycloak.models.map.storage.hotrod.HotRodClientEntity c WHERE ((c.clientId = :clientId0) AND (c.id = :id0))\")));\n+ assertThat(mcb.getIckleQuery(), is(equalTo(\"FROM kc.HotRodClientEntity c WHERE ((c.clientId = :clientId0) AND (c.id = :id0))\")));\nassertThat(mcb.getParameters().entrySet(), hasSize(2));\nassertThat(mcb.getParameters(), allOf(hasEntry(\"clientId0\", 4), hasEntry(\"id0\", 5)));\n}\n@@ -56,16 +56,16 @@ public class IckleQueryMapModelCriteriaBuilderTest {\n@Test\npublic void testSimpleIckleQueryFlashedFromDefault() {\nDefaultModelCriteria<ClientModel> v = criteria();\n- IckleQueryMapModelCriteriaBuilder<String, HotRodClientEntityDelegate, ClientModel> mcb = v.compare(CLIENT_ID, ModelCriteriaBuilder.Operator.EQ, 3).flashToModelCriteriaBuilder(new IckleQueryMapModelCriteriaBuilder<>());\n- assertThat(mcb.getIckleQuery(), is(equalTo(\"FROM org.keycloak.models.map.storage.hotrod.HotRodClientEntity c WHERE (c.clientId = :clientId0)\")));\n+ IckleQueryMapModelCriteriaBuilder<HotRodClientEntity, ClientModel> mcb = v.compare(CLIENT_ID, ModelCriteriaBuilder.Operator.EQ, 3).flashToModelCriteriaBuilder(new IckleQueryMapModelCriteriaBuilder<>(HotRodClientEntity.class));\n+ assertThat(mcb.getIckleQuery(), is(equalTo(\"FROM kc.HotRodClientEntity c WHERE (c.clientId = :clientId0)\")));\nassertThat(mcb.getParameters().entrySet(), hasSize(1));\nassertThat(mcb.getParameters(), hasEntry(\"clientId0\", 3));\nmcb = v.compare(CLIENT_ID, ModelCriteriaBuilder.Operator.EQ, 4)\n- .compare(ID, ModelCriteriaBuilder.Operator.EQ, 5).flashToModelCriteriaBuilder(new IckleQueryMapModelCriteriaBuilder<>());\n+ .compare(ID, ModelCriteriaBuilder.Operator.EQ, 5).flashToModelCriteriaBuilder(new IckleQueryMapModelCriteriaBuilder<>(HotRodClientEntity.class));\n- assertThat(mcb.getIckleQuery(), is(equalTo(\"FROM org.keycloak.models.map.storage.hotrod.HotRodClientEntity c WHERE ((c.clientId = :clientId0) AND (c.id = :id0))\")));\n+ assertThat(mcb.getIckleQuery(), is(equalTo(\"FROM kc.HotRodClientEntity c WHERE ((c.clientId = :clientId0) AND (c.id = :id0))\")));\nassertThat(mcb.getParameters().entrySet(), hasSize(2));\nassertThat(mcb.getParameters(), allOf(hasEntry(\"clientId0\", 4), hasEntry(\"id0\", 5)));\n}\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/pom.xml", "new_path": "testsuite/integration-arquillian/tests/pom.xml", "diff": "<configuration>\n<systemPropertyVariables>\n<keycloak.client.map.storage.provider>hotrod</keycloak.client.map.storage.provider>\n+ <keycloak.group.map.storage.provider>hotrod</keycloak.group.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": "<infinispan>\n<cache-container>\n<transport stack=\"udp\"/>\n-\n<distributed-cache name=\"clients\" mode=\"SYNC\">\n<encoding media-type=\"application/x-protostream\"/>\n</distributed-cache>\n+ <distributed-cache name=\"groups\" mode=\"SYNC\">\n+ <encoding media-type=\"application/x-protostream\"/>\n+ </distributed-cache>\n</cache-container>\n</infinispan>\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": "@@ -36,6 +36,7 @@ import java.io.File;\nimport java.io.PrintWriter;\nimport java.util.ArrayList;\nimport java.util.Arrays;\n+import java.util.Collections;\nimport java.util.Iterator;\nimport java.util.List;\nimport java.util.Map;\n@@ -305,12 +306,12 @@ public final class Picocli {\n.order(ConfigCategory.FEATURE.getOrder())\n.validate(false);\n- Set<String> featuresExpectedValues = Arrays.stream(Profile.Type.values()).map(type -> type.name().toLowerCase()).collect(Collectors.toSet());\n+ String previewName = Profile.Type.PREVIEW.name().toLowerCase();\nfeatureGroupBuilder.addArg(OptionSpec.builder(new String[] {\"-ft\", \"--features\"})\n- .description(\"Enables a group of features. Possible values are: \" + String.join(\",\", featuresExpectedValues))\n- .paramLabel(\"feature\")\n- .completionCandidates(featuresExpectedValues)\n+ .description(\"Enables all tech preview features.\")\n+ .paramLabel(previewName)\n+ .completionCandidates(Collections.singleton(previewName))\n.parameterConsumer(PropertyMapperParameterConsumer.INSTANCE)\n.type(String.class)\n.build());\n" }, { "change_type": "ADD", "old_path": null, "new_path": "quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/FeaturesDistTest.java", "diff": "+package org.keycloak.it.cli.dist;\n+\n+import io.quarkus.test.junit.main.Launch;\n+import io.quarkus.test.junit.main.LaunchResult;\n+import org.hamcrest.CoreMatchers;\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.quarkus.runtime.cli.command.StartDev;\n+\n+import static org.hamcrest.CoreMatchers.containsString;\n+import static org.hamcrest.MatcherAssert.assertThat;\n+\n+@DistributionTest\n+public class FeaturesDistTest {\n+\n+ @Test\n+ @Launch({StartDev.NAME, \"--features=preview\"})\n+ public void testPreviewFeaturesGetEnabledWhenCliArgIsSet(LaunchResult result) {\n+ CLIResult cliResult = (CLIResult) result;\n+ cliResult.assertStartedDevMode();\n+ assertThat(cliResult.getOutput(), CoreMatchers.allOf(\n+ containsString(\"Preview feature enabled: admin_fine_grained_authz\"),\n+ containsString(\"Preview feature enabled: openshift_integration\"),\n+ containsString(\"Preview feature enabled: scripts\"),\n+ containsString(\"Preview feature enabled: token_exchange\"),\n+ containsString(\"Preview feature enabled: declarative_user_profile\")));\n+ }\n+}\n" } ]

[ { "change_type": "MODIFY", "old_path": "quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/KeycloakProcessor.java", "new_path": "quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/KeycloakProcessor.java", "diff": "@@ -53,6 +53,8 @@ import java.util.jar.JarFile;\nimport io.quarkus.agroal.spi.JdbcDataSourceBuildItem;\nimport io.quarkus.deployment.IsDevelopment;\n+import io.quarkus.deployment.IsNormal;\n+import io.quarkus.deployment.IsTest;\nimport io.quarkus.deployment.annotations.Consume;\nimport io.quarkus.deployment.builditem.CombinedIndexBuildItem;\nimport io.quarkus.deployment.builditem.GeneratedResourceBuildItem;\n@@ -265,11 +267,16 @@ class KeycloakProcessor {\n*\n* @param configSources\n*/\n- @BuildStep\n+ @BuildStep(onlyIf = IsNormal.class)\nvoid configureConfigSources(BuildProducer<StaticInitConfigSourceProviderBuildItem> configSources) {\nconfigSources.produce(new StaticInitConfigSourceProviderBuildItem(KeycloakConfigSourceProvider.class.getName()));\n}\n+ @BuildStep(onlyIf = IsTest.class)\n+ void prepareTestEnvironment(BuildProducer<StaticInitConfigSourceProviderBuildItem> configSources) {\n+ configSources.produce(new StaticInitConfigSourceProviderBuildItem(\"org.keycloak.quarkus.runtime.configuration.test.TestKeycloakConfigSourceProvider\"));\n+ }\n+\n/**\n* <p>Make the build time configuration available at runtime so that the server can run without having to specify some of\n* the properties again.\n" }, { "change_type": "MODIFY", "old_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/ConfigArgsConfigSource.java", "new_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/ConfigArgsConfigSource.java", "diff": "package org.keycloak.quarkus.runtime.configuration;\nimport static java.util.Arrays.asList;\n-import static org.keycloak.quarkus.runtime.Environment.isTestLaunchMode;\nimport static org.keycloak.quarkus.runtime.cli.Picocli.ARG_SHORT_PREFIX;\nimport static org.keycloak.quarkus.runtime.cli.command.AbstractStartCommand.AUTO_BUILD_OPTION_LONG;\nimport static org.keycloak.quarkus.runtime.cli.command.AbstractStartCommand.AUTO_BUILD_OPTION_SHORT;\n@@ -58,16 +57,13 @@ public class ConfigArgsConfigSource extends PropertiesConfigSource {\nprivate static final ConfigArgsConfigSource INSTANCE = new ConfigArgsConfigSource();\nprivate static List<String> IGNORED_ARGS;\n- private final boolean alwaysParseArgs;\n-\npublic static ConfigArgsConfigSource getInstance() {\nreturn INSTANCE;\n}\n- ConfigArgsConfigSource() {\n+ protected ConfigArgsConfigSource() {\n// higher priority over default Quarkus config sources\nsuper(parseArgument(), \"CliConfigSource\", 500);\n- alwaysParseArgs = isTestLaunchMode();\n}\npublic static void setCliArgs(String[] args) {\n@@ -96,11 +92,6 @@ public class ConfigArgsConfigSource extends PropertiesConfigSource {\n@Override\npublic String getValue(String propertyName) {\nMap<String, String> properties = getProperties();\n-\n- if (alwaysParseArgs) {\n- properties = parseArgument();\n- }\n-\nString value = properties.get(propertyName);\nif (value != null) {\n" }, { "change_type": "ADD", "old_path": null, "new_path": "quarkus/tests/integration/src/main/java/org/keycloak/quarkus/runtime/configuration/test/TestConfigArgsConfigSource.java", "diff": "+/*\n+ * Copyright 2021 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.quarkus.runtime.configuration.test;\n+\n+import org.keycloak.quarkus.runtime.configuration.ConfigArgsConfigSource;\n+\n+public class TestConfigArgsConfigSource extends ConfigArgsConfigSource {\n+\n+}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "quarkus/tests/integration/src/main/java/org/keycloak/quarkus/runtime/configuration/test/TestKeycloakConfigSourceProvider.java", "diff": "+/*\n+ * Copyright 2021 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.quarkus.runtime.configuration.test;\n+\n+import java.util.HashMap;\n+import java.util.Map;\n+import java.util.function.Function;\n+import java.util.function.Supplier;\n+import java.util.stream.Collectors;\n+import java.util.stream.StreamSupport;\n+import org.eclipse.microprofile.config.spi.ConfigSource;\n+import org.keycloak.quarkus.runtime.configuration.ConfigArgsConfigSource;\n+import org.keycloak.quarkus.runtime.configuration.KeycloakConfigSourceProvider;\n+\n+public class TestKeycloakConfigSourceProvider extends KeycloakConfigSourceProvider {\n+\n+ private static final Map<Class<? extends ConfigSource>, Supplier<? extends ConfigSource>> REPLACEABLE_CONFIG_SOURCES = new HashMap<>();\n+\n+ static {\n+ REPLACEABLE_CONFIG_SOURCES.put(ConfigArgsConfigSource.class, TestConfigArgsConfigSource::new);\n+ }\n+\n+ @Override\n+ public Iterable<ConfigSource> getConfigSources(ClassLoader forClassLoader) {\n+ reload();\n+ return StreamSupport.stream(super.getConfigSources(forClassLoader).spliterator(), false)\n+ .map(new Function<ConfigSource, ConfigSource>() {\n+ @Override\n+ public ConfigSource apply(ConfigSource configSource) {\n+ return REPLACEABLE_CONFIG_SOURCES.getOrDefault(configSource.getClass(), () -> configSource).get();\n+ }\n+ }).collect(Collectors.toList());\n+ }\n+}\n\\ No newline at end of file\n" } ]

[ { "change_type": "ADD", "old_path": null, "new_path": "quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/IsIntegrationTest.java", "diff": "+package org.keycloak.quarkus.deployment;\n+\n+import io.quarkus.deployment.IsTest;\n+import io.quarkus.runtime.LaunchMode;\n+\n+import static org.keycloak.quarkus.runtime.Environment.LAUNCH_MODE;\n+\n+public class IsIntegrationTest extends IsTest {\n+\n+ public IsIntegrationTest(LaunchMode launchMode) {\n+ super(launchMode);\n+ }\n+\n+ @Override\n+ public boolean getAsBoolean() {\n+ return super.getAsBoolean() && (System.getProperty(LAUNCH_MODE) != null && System.getProperty(LAUNCH_MODE).equals(\"test\"));\n+ }\n+\n+}\n" }, { "change_type": "RENAME", "old_path": "quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/isReAugmentation.java", "new_path": "quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/IsReAugmentation.java", "diff": "@@ -20,7 +20,7 @@ package org.keycloak.quarkus.deployment;\nimport java.util.function.BooleanSupplier;\nimport org.keycloak.quarkus.runtime.Environment;\n-public class isReAugmentation implements BooleanSupplier {\n+public class IsReAugmentation implements BooleanSupplier {\n@Override\npublic boolean getAsBoolean() {\n" }, { "change_type": "MODIFY", "old_path": "quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/KeycloakProcessor.java", "new_path": "quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/KeycloakProcessor.java", "diff": "@@ -267,12 +267,12 @@ class KeycloakProcessor {\n*\n* @param configSources\n*/\n- @BuildStep(onlyIf = IsNormal.class)\n+ @BuildStep(onlyIfNot = IsIntegrationTest.class )\nvoid configureConfigSources(BuildProducer<StaticInitConfigSourceProviderBuildItem> configSources) {\nconfigSources.produce(new StaticInitConfigSourceProviderBuildItem(KeycloakConfigSourceProvider.class.getName()));\n}\n- @BuildStep(onlyIf = IsTest.class)\n+ @BuildStep(onlyIf = IsIntegrationTest.class)\nvoid prepareTestEnvironment(BuildProducer<StaticInitConfigSourceProviderBuildItem> configSources) {\nconfigSources.produce(new StaticInitConfigSourceProviderBuildItem(\"org.keycloak.quarkus.runtime.configuration.test.TestKeycloakConfigSourceProvider\"));\n}\n@@ -281,7 +281,7 @@ class KeycloakProcessor {\n* <p>Make the build time configuration available at runtime so that the server can run without having to specify some of\n* the properties again.\n*/\n- @BuildStep(onlyIf = isReAugmentation.class)\n+ @BuildStep(onlyIf = IsReAugmentation.class)\nvoid persistBuildTimeProperties(BuildProducer<GeneratedResourceBuildItem> resources) {\nProperties properties = new Properties();\n" }, { "change_type": "MODIFY", "old_path": "quarkus/deployment/src/test/java/test/org/keycloak/quarkus/services/health/KeycloakReadyHealthCheckTest.java", "new_path": "quarkus/deployment/src/test/java/test/org/keycloak/quarkus/services/health/KeycloakReadyHealthCheckTest.java", "diff": "@@ -52,13 +52,4 @@ public class KeycloakReadyHealthCheckTest {\n.statusCode(200)\n.body(Matchers.containsString(\"UP\"));\n}\n-\n- @Test\n- @Disabled // Temporarily disabled. See KEYCLOAK-16382 and https://github.com/quarkusio/quarkus/issues/14705\n- public void testMetricsUp() {\n- given()\n- .when().get(\"/metrics\")\n- .then()\n- .statusCode(200);\n- }\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "themes/src/main/resources/theme/base/admin/resources/js/controllers/realm.js", "new_path": "themes/src/main/resources/theme/base/admin/resources/js/controllers/realm.js", "diff": "@@ -280,7 +280,10 @@ module.controller('RealmDetailCtrl', function($scope, Current, Realm, realm, ser\n}\n}\n$scope.realm = angular.copy(realm);\n+\n+ if ($scope.realm.attributes != null) {\n$scope.realm.attributes['userProfileEnabled'] = $scope.realm.attributes['userProfileEnabled'] == 'true';\n+ }\nvar oldCopy = angular.copy($scope.realm);\n$scope.realmCopy = oldCopy;\n" } ]

[ { "change_type": "MODIFY", "old_path": "themes/src/main/resources-community/theme/keycloak.v2/account/messages/messages_fr.properties", "new_path": "themes/src/main/resources-community/theme/keycloak.v2/account/messages/messages_fr.properties", "diff": "@@ -12,9 +12,19 @@ password-display-name=Mot de passe\npassword-help-text=Authentifiez-vous en saisissant votre mot de passe\ncredentialCreatedAt=Cr\\u00e9\\u00e9 le\ntwo-factor=Authentification \\u00e0 Deux Facteurs\n+passwordless=Authentification Sans Mot de Passe\notp-display-name=Application d''authentification\notp-help-text=Entrez un code de v\\u00e9rification \\u00e0 usage unique fourni par l''application d''authentification.\n+webauthn-display-name=Cl\\u00e9 de S\\u00e9curit\\u00e9\n+webauthn-help-text=Utilisez votre cl\\u00e9 de s\\u00e9curit\\u00e9 pour vous authentifier.\n+webauthn-passwordless-display-name=Cl\\u00e9 de S\\u00e9curit\\u00e9\n+webauthn-passwordless-help-text=Utilisez votre cl\\u00e9 de s\\u00e9curit\\u00e9 pour une authentification sans mot de passe.\nnotSetUp={0} non configur\\u00e9(e).\n+remove=Supprimer\n+refreshPage=Rafra\\u00eechir la page\n+client_security-admin-console=Console d''administration de la s\\u00e9curit\\u00e9\n+client_account-console=Console de gestion du compte\n+\n# Device Activity page\nsignedInDevices=Appareils Connect\\u00e9s\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedRealm.java", "new_path": "model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedRealm.java", "diff": "@@ -725,17 +725,17 @@ public class CachedRealm extends AbstractExtendableRevisioned {\npublic Integer getAttribute(String name, Integer defaultValue) {\nString v = getAttribute(name);\n- return v != null ? Integer.parseInt(v) : defaultValue;\n+ return v != null ? Integer.valueOf(v) : defaultValue;\n}\npublic Long getAttribute(String name, Long defaultValue) {\nString v = getAttribute(name);\n- return v != null ? Long.parseLong(v) : defaultValue;\n+ return v != null ? Long.valueOf(v) : defaultValue;\n}\npublic Boolean getAttribute(String name, Boolean defaultValue) {\nString v = getAttribute(name);\n- return v != null ? Boolean.parseBoolean(v) : defaultValue;\n+ return v != null ? Boolean.valueOf(v) : defaultValue;\n}\npublic Map<String, String> getAttributes() {\n" }, { "change_type": "MODIFY", "old_path": "model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/SessionEntityWrapper.java", "new_path": "model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/SessionEntityWrapper.java", "diff": "@@ -112,7 +112,7 @@ public class SessionEntityWrapper<S extends SessionEntity> {\npublic Integer getLocalMetadataNoteInt(String key) {\nString note = getLocalMetadataNote(key);\n- return note==null ? null : Integer.parseInt(note);\n+ return note==null ? null : Integer.valueOf(note);\n}\npublic void putLocalMetadataNoteInt(String key, int value) {\n" }, { "change_type": "MODIFY", "old_path": "model/infinispan/src/test/java/org/keycloak/cluster/infinispan/ConcurrencyJDGCachePutTest.java", "new_path": "model/infinispan/src/test/java/org/keycloak/cluster/infinispan/ConcurrencyJDGCachePutTest.java", "diff": "@@ -165,7 +165,7 @@ public class ConcurrencyJDGCachePutTest {\n}\npublic static int getClusterStartupTime(Cache<String, Integer> cache, String cacheKey, EntryInfo wrapper, int myThreadId) {\n- Integer startupTime = myThreadId==1 ? Integer.parseInt(cacheKey.substring(4)) : Integer.parseInt(cacheKey.substring(4)) * 2;\n+ Integer startupTime = myThreadId==1 ? Integer.valueOf(cacheKey.substring(4)) : Integer.valueOf(cacheKey.substring(4)) * 2;\n// Concurrency doesn't work correctly with this\n//Integer existingClusterStartTime = (Integer) cache.putIfAbsent(cacheKey, startupTime);\n" }, { "change_type": "MODIFY", "old_path": "server-spi-private/src/main/java/org/keycloak/component/ComponentModelScope.java", "new_path": "server-spi-private/src/main/java/org/keycloak/component/ComponentModelScope.java", "diff": "@@ -84,7 +84,7 @@ public class ComponentModelScope implements Scope {\n@Override\npublic Integer getInt(String key, Integer defaultValue) {\nfinal String res = componentConfig.get(prefix + key, null);\n- return (res == null) ? origScope.getInt(key, defaultValue) : Integer.parseInt(res);\n+ return (res == null) ? origScope.getInt(key, defaultValue) : Integer.valueOf(res);\n}\n@Override\n@@ -95,7 +95,7 @@ public class ComponentModelScope implements Scope {\n@Override\npublic Long getLong(String key, Long defaultValue) {\nfinal String res = componentConfig.get(prefix + key, null);\n- return (res == null) ? origScope.getLong(key, defaultValue) : Long.parseLong(res);\n+ return (res == null) ? origScope.getLong(key, defaultValue) : Long.valueOf(res);\n}\n@Override\n@@ -106,7 +106,7 @@ public class ComponentModelScope implements Scope {\n@Override\npublic Boolean getBoolean(String key, Boolean defaultValue) {\nfinal String res = componentConfig.get(prefix + key, null);\n- return (res == null) ? origScope.getBoolean(key, defaultValue) : Boolean.parseBoolean(res);\n+ return (res == null) ? origScope.getBoolean(key, defaultValue) : Boolean.valueOf(res);\n}\n@Override\n" }, { "change_type": "MODIFY", "old_path": "server-spi-private/src/main/java/org/keycloak/policy/DigitsPasswordPolicyProvider.java", "new_path": "server-spi-private/src/main/java/org/keycloak/policy/DigitsPasswordPolicyProvider.java", "diff": "@@ -53,7 +53,7 @@ public class DigitsPasswordPolicyProvider implements PasswordPolicyProvider {\n@Override\npublic Object parseConfig(String value) {\n- return value != null ? Integer.parseInt(value) : 1;\n+ return value != null ? Integer.valueOf(value) : Integer.valueOf(1);\n}\n@Override\n" }, { "change_type": "MODIFY", "old_path": "server-spi-private/src/main/java/org/keycloak/policy/ForceExpiredPasswordPolicyProviderFactory.java", "new_path": "server-spi-private/src/main/java/org/keycloak/policy/ForceExpiredPasswordPolicyProviderFactory.java", "diff": "@@ -29,7 +29,7 @@ import org.keycloak.models.UserModel;\n*/\npublic class ForceExpiredPasswordPolicyProviderFactory implements PasswordPolicyProviderFactory, PasswordPolicyProvider {\n- public static final int DEFAULT_VALUE = 365;\n+ public static final Integer DEFAULT_VALUE = 365;\n@Override\npublic PasswordPolicyProvider create(KeycloakSession session) {\n@@ -85,7 +85,7 @@ public class ForceExpiredPasswordPolicyProviderFactory implements PasswordPolicy\n@Override\npublic Object parseConfig(String value) {\n- return value != null ? Integer.parseInt(value) : DEFAULT_VALUE;\n+ return value != null ? Integer.valueOf(value) : DEFAULT_VALUE;\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "server-spi/src/main/java/org/keycloak/component/ComponentModel.java", "new_path": "server-spi/src/main/java/org/keycloak/component/ComponentModel.java", "diff": "@@ -91,17 +91,17 @@ public class ComponentModel implements Serializable {\npublic int get(String key, int defaultValue) {\nString s = get(key);\n- return s != null ? Integer.parseInt(s) : defaultValue;\n+ return s != null ? Integer.valueOf(s) : defaultValue;\n}\npublic long get(String key, long defaultValue) {\nString s = get(key);\n- return s != null ? Long.parseLong(s) : defaultValue;\n+ return s != null ? Long.valueOf(s) : defaultValue;\n}\npublic boolean get(String key, boolean defaultValue) {\nString s = get(key);\n- return s != null ? Boolean.parseBoolean(s) : defaultValue;\n+ return s != null ? Boolean.valueOf(s) : defaultValue;\n}\npublic void put(String key, String value) {\n" }, { "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": "@@ -143,15 +143,15 @@ public interface RealmModel extends RoleContainerModel {\nString getAttribute(String name);\ndefault Integer getAttribute(String name, Integer defaultValue) {\nString v = getAttribute(name);\n- return v != null ? Integer.parseInt(v) : defaultValue;\n+ return v != null ? Integer.valueOf(v) : defaultValue;\n}\ndefault Long getAttribute(String name, Long defaultValue) {\nString v = getAttribute(name);\n- return v != null ? Long.parseLong(v) : defaultValue;\n+ return v != null ? Long.valueOf(v) : defaultValue;\n}\ndefault Boolean getAttribute(String name, Boolean defaultValue) {\nString v = getAttribute(name);\n- return v != null ? Boolean.parseBoolean(v) : defaultValue;\n+ return v != null ? Boolean.valueOf(v) : defaultValue;\n}\nMap<String, String> getAttributes();\n" }, { "change_type": "MODIFY", "old_path": "server-spi/src/main/java/org/keycloak/policy/PasswordPolicyProvider.java", "new_path": "server-spi/src/main/java/org/keycloak/policy/PasswordPolicyProvider.java", "diff": "@@ -35,7 +35,7 @@ public interface PasswordPolicyProvider extends Provider {\ndefault Integer parseInteger(String value, Integer defaultValue) {\ntry {\n- return value != null ? Integer.parseInt(value) : defaultValue;\n+ return value != null ? Integer.valueOf(value) : defaultValue;\n} catch (NumberFormatException e) {\nthrow new PasswordPolicyConfigException(\"Not a valid number\");\n}\n" }, { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/protocol/oidc/endpoints/request/AuthzEndpointQueryStringParser.java", "new_path": "services/src/main/java/org/keycloak/protocol/oidc/endpoints/request/AuthzEndpointQueryStringParser.java", "diff": "@@ -46,7 +46,7 @@ class AuthzEndpointQueryStringParser extends AuthzEndpointRequestParser {\nprotected Integer getIntParameter(String paramName) {\ncheckDuplicated(requestParams, paramName);\nString paramVal = requestParams.getFirst(paramName);\n- return paramVal==null ? null : Integer.parseInt(paramVal);\n+ return paramVal==null ? null : Integer.valueOf(paramVal);\n}\npublic String getInvalidRequestMessage() {\n" }, { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/protocol/oidc/endpoints/request/AuthzEndpointRequestObjectParser.java", "new_path": "services/src/main/java/org/keycloak/protocol/oidc/endpoints/request/AuthzEndpointRequestObjectParser.java", "diff": "@@ -81,7 +81,7 @@ public class AuthzEndpointRequestObjectParser extends AuthzEndpointRequestParser\n@Override\nprotected Integer getIntParameter(String paramName) {\nObject val = this.requestParams.get(paramName);\n- return val==null ? null : Integer.parseInt(getParameter(paramName));\n+ return val==null ? null : Integer.valueOf(getParameter(paramName));\n}\n@Override\n" }, { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/request/BackchannelAuthenticationEndpointRequestBodyParser.java", "new_path": "services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/request/BackchannelAuthenticationEndpointRequestBodyParser.java", "diff": "@@ -46,7 +46,7 @@ class BackchannelAuthenticationEndpointRequestBodyParser extends BackchannelAuth\nprotected Integer getIntParameter(String paramName) {\ncheckDuplicated(requestParams, paramName);\nString paramVal = requestParams.getFirst(paramName);\n- return paramVal==null ? null : Integer.parseInt(paramVal);\n+ return paramVal==null ? null : Integer.valueOf(paramVal);\n}\npublic String getInvalidRequestMessage() {\n" }, { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/request/BackchannelAuthenticationEndpointSignedRequestParser.java", "new_path": "services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/request/BackchannelAuthenticationEndpointSignedRequestParser.java", "diff": "@@ -95,7 +95,7 @@ class BackchannelAuthenticationEndpointSignedRequestParser extends BackchannelAu\n@Override\nprotected Integer getIntParameter(String paramName) {\nObject val = this.requestParams.get(paramName);\n- return val==null ? null : Integer.parseInt(getParameter(paramName));\n+ return val==null ? null : Integer.valueOf(getParameter(paramName));\n}\n@Override\n" }, { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/protocol/oidc/par/endpoints/request/AuthzEndpointParParser.java", "new_path": "services/src/main/java/org/keycloak/protocol/oidc/par/endpoints/request/AuthzEndpointParParser.java", "diff": "@@ -95,7 +95,7 @@ public class AuthzEndpointParParser extends AuthzEndpointRequestParser {\n@Override\nprotected Integer getIntParameter(String paramName) {\nString paramVal = requestParams.get(paramName);\n- return paramVal == null ? null : Integer.parseInt(paramVal);\n+ return paramVal == null ? null : Integer.valueOf(paramVal);\n}\npublic String getInvalidRequestMessage() {\n" }, { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/services/util/JsonConfigProvider.java", "new_path": "services/src/main/java/org/keycloak/services/util/JsonConfigProvider.java", "diff": "@@ -129,7 +129,7 @@ public class JsonConfigProvider implements Config.ConfigProvider {\n}\nif (n.isTextual()) {\nString v = replaceProperties(n.textValue());\n- return !v.isEmpty() ? Integer.parseInt(v) : defaultValue;\n+ return !v.isEmpty() ? Integer.valueOf(v) : defaultValue;\n} else {\nreturn n.intValue();\n}\n@@ -151,7 +151,7 @@ public class JsonConfigProvider implements Config.ConfigProvider {\n}\nif (n.isTextual()) {\nString v = replaceProperties(n.textValue());\n- return !v.isEmpty() ? Long.parseLong(v) : defaultValue;\n+ return !v.isEmpty() ? Long.valueOf(v) : defaultValue;\n} else {\nreturn n.longValue();\n}\n@@ -173,7 +173,7 @@ public class JsonConfigProvider implements Config.ConfigProvider {\n}\nif (n.isTextual()) {\nString v = replaceProperties(n.textValue());\n- return !v.isEmpty() ? Boolean.parseBoolean(v) : defaultValue;\n+ return !v.isEmpty() ? Boolean.valueOf(v) : defaultValue;\n} else {\nreturn n.booleanValue();\n}\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": "@@ -51,7 +51,7 @@ public class HotRodMapStorageProviderFactory implements AmphibianProviderFactory\nprivate final static DeepCloner CLONER = new DeepCloner.Builder()\n.constructorDC(MapClientEntity.class, HotRodClientEntityDelegate::new)\n.constructor(MapProtocolMapperEntity.class, HotRodProtocolMapperEntityDelegate::new)\n- .constructor(MapGroupEntity.class, HotRodGroupEntityDelegate::new)\n+ .constructorDC(MapGroupEntity.class, HotRodGroupEntityDelegate::new)\n.build();\npublic static final Map<Class<?>, HotRodEntityDescriptor<?, ?>> ENTITY_DESCRIPTOR_MAP = new HashMap<>();\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/storage/chm/ConcurrentHashMapStorageProviderFactory.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/storage/chm/ConcurrentHashMapStorageProviderFactory.java", "diff": "@@ -82,8 +82,8 @@ public class ConcurrentHashMapStorageProviderFactory implements AmphibianProvide\n.genericCloner(Serialization::from)\n.constructorDC(MapClientEntityImpl.class, MapClientEntityImpl::new)\n.constructor(MapProtocolMapperEntity.class, MapProtocolMapperEntityImpl::new)\n- .constructor(MapGroupEntityImpl.class, MapGroupEntityImpl::new)\n- .constructor(MapRoleEntityImpl.class, MapRoleEntityImpl::new)\n+ .constructorDC(MapGroupEntityImpl.class, MapGroupEntityImpl::new)\n+ .constructorDC(MapRoleEntityImpl.class, MapRoleEntityImpl::new)\n.build();\nprivate static final Map<String, StringKeyConvertor> KEY_CONVERTORS = new HashMap<>();\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate13_0_0_MigrateDefaultRoles.java", "new_path": "model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate13_0_0_MigrateDefaultRoles.java", "diff": "@@ -48,26 +48,26 @@ public class JpaUpdate13_0_0_MigrateDefaultRoles extends CustomKeycloakTask {\n// create new default role\nnew InsertStatement(null, null, database.correctObjectName(\"KEYCLOAK_ROLE\", Table.class))\n.addColumnValue(\"ID\", id)\n- .addColumnValue(\"CLIENT_REALM_CONSTRAINT\", entry.getValue())\n+ .addColumnValue(\"CLIENT_REALM_CONSTRAINT\", entry.getKey())\n.addColumnValue(\"CLIENT_ROLE\", Boolean.FALSE)\n.addColumnValue(\"DESCRIPTION\", \"${role_\" + roleName + \"}\")\n.addColumnValue(\"NAME\", roleName)\n- .addColumnValue(\"REALM_ID\", entry.getValue())\n- .addColumnValue(\"REALM\", entry.getValue())\n+ .addColumnValue(\"REALM_ID\", entry.getKey())\n+ .addColumnValue(\"REALM\", entry.getKey())\n);\nstatements.add(\n// assign the role to the realm\nnew UpdateStatement(null, null, database.correctObjectName(\"REALM\", Table.class))\n.addNewColumnValue(\"DEFAULT_ROLE\", id)\n.setWhereClause(\"REALM.ID=?\")\n- .addWhereParameter(entry.getValue())\n+ .addWhereParameter(entry.getKey())\n);\nstatements.add(\n// copy data from REALM_DEFAULT_ROLES to COMPOSITE_ROLE\nnew RawSqlStatement(\"INSERT INTO \" + compositeRoleTable + \" (COMPOSITE, CHILD_ROLE) \" +\n\"SELECT '\" + id + \"', ROLE_ID FROM \" + getTableName(\"REALM_DEFAULT_ROLES\") +\n- \" WHERE REALM_ID = '\" + database.escapeStringForDatabase(entry.getValue()) + \"'\")\n+ \" WHERE REALM_ID = '\" + database.escapeStringForDatabase(entry.getKey()) + \"'\")\n);\nstatements.add(\n// copy data from CLIENT_DEFAULT_ROLES to COMPOSITE_ROLE\n@@ -75,7 +75,7 @@ public class JpaUpdate13_0_0_MigrateDefaultRoles extends CustomKeycloakTask {\n\"SELECT '\" + id + \"', \" + clientDefaultRolesTable + \".ROLE_ID FROM \" +\nclientDefaultRolesTable + \" INNER JOIN \" + clientTable + \" ON \" +\nclientTable + \".ID = \" + clientDefaultRolesTable + \".CLIENT_ID AND \" +\n- clientTable + \".REALM_ID = '\" + database.escapeStringForDatabase(entry.getValue()) + \"'\")\n+ clientTable + \".REALM_ID = '\" + database.escapeStringForDatabase(entry.getKey()) + \"'\")\n);\n}\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/crossdc/BruteForceCrossDCTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/crossdc/BruteForceCrossDCTest.java", "diff": "@@ -91,6 +91,8 @@ public class BruteForceCrossDCTest extends AbstractAdminCrossDCTest {\n.bruteForceProtected(true)\n.build();\n+ realmRep.setQuickLoginCheckMilliSeconds(0L); // This is necessary so user is not locked out for too fast consecutive login attempts; when user is locked out failure count stops increasing\n+\nadminClient.realms().create(realmRep);\n}\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/crossdc/SessionsPreloadCrossDCTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/crossdc/SessionsPreloadCrossDCTest.java", "diff": "@@ -30,6 +30,7 @@ import org.keycloak.testsuite.Assert;\nimport org.keycloak.testsuite.admin.ApiUtil;\nimport org.keycloak.testsuite.arquillian.CrossDCTestEnricher;\nimport org.keycloak.testsuite.arquillian.annotation.InitialDcState;\n+import org.keycloak.testsuite.updaters.RealmAttributeUpdater;\nimport org.keycloak.testsuite.util.OAuthClient;\nimport java.util.Set;\nimport org.hamcrest.Matchers;\n@@ -142,10 +143,11 @@ public class SessionsPreloadCrossDCTest extends AbstractAdminCrossDCTest {\n@Test\npublic void loginFailuresPreloadTest() throws Exception {\n// Enable brute force protector\n- RealmRepresentation realmRep = getAdminClientForStartedNodeInDc(0).realms().realm(\"test\").toRepresentation();\n- realmRep.setBruteForceProtected(true);\n- getAdminClientForStartedNodeInDc(0).realms().realm(\"test\").update(realmRep);\n-\n+ try (RealmAttributeUpdater rau = new RealmAttributeUpdater(getAdminClientForStartedNodeInDc(0).realms().realm(\"test\"))\n+ .updateWith(r -> r.setBruteForceProtected(true))\n+ .updateWith(r -> r.setQuickLoginCheckMilliSeconds(20L)) // This is necessary so user is not locked out for too fast consecutive login attempts; when user is locked out failure count stops increasing\n+ .update()\n+ ) {\nString userId = ApiUtil.findUserByUsername(getAdminClientForStartedNodeInDc(0).realms().realm(\"test\"), \"test-user@localhost\").getId();\nint loginFailuresBefore = (Integer) getAdminClientForStartedNodeInDc(0).realm(\"test\").attackDetection().bruteForceUserStatus(userId).get(\"numFailures\");\n@@ -176,11 +178,7 @@ public class SessionsPreloadCrossDCTest extends AbstractAdminCrossDCTest {\n// On DC2 sessions were preloaded from remoteCache\nAssert.assertTrue(getTestingClientForStartedNodeInDc(1).testing().cache(InfinispanConnectionProvider.WORK_CACHE_NAME).contains(\"distributed::remoteCacheLoad::loginFailures\"));\n-\n- // Disable brute force protector\n- realmRep = getAdminClientForStartedNodeInDc(0).realms().realm(\"test\").toRepresentation();\n- realmRep.setBruteForceProtected(true);\n- getAdminClientForStartedNodeInDc(0).realms().realm(\"test\").update(realmRep);\n+ }\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/role/MapRoleProvider.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/role/MapRoleProvider.java", "diff": "@@ -200,7 +200,7 @@ public class MapRoleProvider implements RoleProvider {\nDefaultModelCriteria<RoleModel> mcb = criteria();\nmcb = mcb.compare(SearchableFields.REALM_ID, Operator.EQ, realm.getId())\n- .compare(SearchableFields.NAME, Operator.ILIKE, name);\n+ .compare(SearchableFields.NAME, Operator.EQ, name);\nString roleId = tx.read(withCriteria(mcb))\n.map(entityToAdapterFunc(realm))\n@@ -221,7 +221,7 @@ public class MapRoleProvider implements RoleProvider {\nDefaultModelCriteria<RoleModel> mcb = criteria();\nmcb = mcb.compare(SearchableFields.REALM_ID, Operator.EQ, client.getRealm().getId())\n.compare(SearchableFields.CLIENT_ID, Operator.EQ, client.getId())\n- .compare(SearchableFields.NAME, Operator.ILIKE, name);\n+ .compare(SearchableFields.NAME, Operator.EQ, name);\nString roleId = tx.read(withCriteria(mcb))\n.map(entityToAdapterFunc(client.getRealm()))\n" } ]

[ { "change_type": "MODIFY", "old_path": "pom.xml", "new_path": "pom.xml", "diff": "<packaging>pom</packaging>\n<properties>\n- <quarkus.version>2.5.2.Final</quarkus.version>\n+ <quarkus.version>2.5.3.Final</quarkus.version>\n<!--\nPerforming a Wildfly upgrade? Run the:\n" }, { "change_type": "MODIFY", "old_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/Tools.java", "new_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/Tools.java", "diff": "@@ -20,7 +20,7 @@ package org.keycloak.quarkus.runtime.cli.command;\nimport picocli.CommandLine.Command;\n@Command(name = \"tools\",\n- description = \"%nUtilities for use and interaction with the server.\",\n+ description = \"Utilities for use and interaction with the server.\",\nsubcommands = {Completion.class})\npublic class Tools {\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": "@@ -53,12 +53,12 @@ public interface CLIResult extends LaunchResult {\ndefault void assertNotDevMode() {\nassertFalse(getOutput().contains(\"Running the server in dev mode.\"),\n- () -> \"The standard output:\\n\" + getOutput() + \"does include the Start Dev output\");\n+ () -> \"The standard output:\\n\" + getOutput() + \"\\ndoes include the Start Dev output\");\n}\ndefault void assertStartedDevMode() {\nassertTrue(getOutput().contains(\"Running the server in dev mode.\"),\n- () -> \"The standard output:\\n\" + getOutput() + \"doesn't include the Start Dev output\");\n+ () -> \"The standard output:\\n\" + getOutput() + \"\\ndoesn't include the Start Dev output\");\n}\ndefault void assertError(String msg) {\n" }, { "change_type": "MODIFY", "old_path": "quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testDefaultToHelp.approved.txt", "new_path": "quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testDefaultToHelp.approved.txt", "diff": "Binary files a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testDefaultToHelp.approved.txt and b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testDefaultToHelp.approved.txt differ\n" }, { "change_type": "MODIFY", "old_path": "quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testHelp.approved.txt", "new_path": "quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testHelp.approved.txt", "diff": "Binary files a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testHelp.approved.txt and b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testHelp.approved.txt differ\n" }, { "change_type": "MODIFY", "old_path": "quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testHelpShort.approved.txt", "new_path": "quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testHelpShort.approved.txt", "diff": "Binary files a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testHelpShort.approved.txt and b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testHelpShort.approved.txt differ\n" } ]

[ { "change_type": "MODIFY", "old_path": "distribution/server-x-dist/src/main/content/bin/kc.bat", "new_path": "distribution/server-x-dist/src/main/content/bin/kc.bat", "diff": "@@ -72,6 +72,11 @@ if not \"x%JAVA_OPTS%\" == \"x\" (\nset \"JAVA_OPTS=-Xms64m -Xmx512m -XX:MetaspaceSize=96M -XX:MaxMetaspaceSize=256m -Djava.net.preferIPv4Stack=true\"\n)\n+if not \"x%JAVA_OPTS_APPEND%\" == \"x\" (\n+ echo \"Appending additional Java properties to JAVA_OPTS: %JAVA_OPTS_APPEND%\"\n+ set \"JAVA_OPTS=%JAVA_OPTS% %JAVA_OPTS_APPEND%\"\n+)\n+\nif NOT \"x%DEBUG%\" == \"x\" (\nset \"DEBUG_MODE=%DEBUG%\n)\n" }, { "change_type": "MODIFY", "old_path": "distribution/server-x-dist/src/main/content/bin/kc.sh", "new_path": "distribution/server-x-dist/src/main/content/bin/kc.sh", "diff": "@@ -68,6 +68,11 @@ else\necho \"JAVA_OPTS already set in environment; overriding default settings with values: $JAVA_OPTS\"\nfi\n+if [ \"x$JAVA_OPTS_APPEND\" != \"x\" ]; then\n+ echo \"Appending additional Java properties to JAVA_OPTS: $JAVA_OPTS_APPEND\"\n+ JAVA_OPTS=\"$JAVA_OPTS $JAVA_OPTS_APPEND\"\n+fi\n+\n# Set debug settings if not already set\nif [ \"$DEBUG_MODE\" = \"true\" ]; then\nDEBUG_OPT=`echo $JAVA_OPTS | $GREP \"\\-agentlib:jdwp\"`\n" } ]

[ { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AppServerTestEnricher.java", "new_path": "testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AppServerTestEnricher.java", "diff": "@@ -58,7 +58,7 @@ import java.util.Set;\nimport java.util.concurrent.TimeoutException;\nimport java.util.stream.Collectors;\n-import static org.keycloak.testsuite.arquillian.ServerTestEnricherUtil.addHttpsListener;\n+import static org.keycloak.testsuite.arquillian.ServerTestEnricherUtil.addHttpsListenerAppServer;\nimport static org.keycloak.testsuite.arquillian.ServerTestEnricherUtil.reloadOrRestartTimeoutClient;\nimport static org.keycloak.testsuite.arquillian.ServerTestEnricherUtil.removeHttpsListener;\nimport static org.keycloak.testsuite.util.ServerURLs.getAppServerContextRoot;\n@@ -250,7 +250,7 @@ public class AppServerTestEnricher {\n}\n} else {\nremoveHttpsListener(client, administration);\n- addHttpsListener(client);\n+ addHttpsListenerAppServer(client);\n}\nreloadOrRestartTimeoutClient(administration);\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/ServerTestEnricherUtil.java", "new_path": "testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/ServerTestEnricherUtil.java", "diff": "package org.keycloak.testsuite.arquillian;\nimport org.jboss.logging.Logger;\n+import org.wildfly.extras.creaper.commands.undertow.AddUndertowListener;\nimport org.wildfly.extras.creaper.commands.undertow.RemoveUndertowListener;\n+import org.wildfly.extras.creaper.commands.undertow.SslVerifyClient;\nimport org.wildfly.extras.creaper.commands.undertow.UndertowListenerType;\nimport org.wildfly.extras.creaper.core.CommandFailedException;\nimport org.wildfly.extras.creaper.core.online.OnlineManagementClient;\n@@ -60,6 +62,23 @@ public class ServerTestEnricherUtil {\n}\n}\n+ /**\n+ * Add Undertow HTTPS listener for Wildfly 23\n+ */\n+ public static boolean addHttpsListenerAppServer(OnlineManagementClient client) {\n+ try {\n+ LOG.debug(\"Add Undertow HTTPS listener 'https'\");\n+ client.apply(new AddUndertowListener.HttpsBuilder(\"https\", \"default-server\", \"https\")\n+ .securityRealm(\"UndertowRealm\")\n+ .verifyClient(SslVerifyClient.REQUESTED)\n+ .build());\n+ return true;\n+ } catch (CommandFailedException e) {\n+ LOG.warn(\"Cannot add HTTPS listener 'https'\");\n+ return false;\n+ }\n+ }\n+\n/**\n* Restart client after timeout for reloading\n*/\n" } ]

[ { "change_type": "MODIFY", "old_path": "themes/pom.xml", "new_path": "themes/pom.xml", "diff": "<repository>\n<id>github</id>\n<!-- Do not decode the PAT below, as it will force Github to revoke it. -->\n- <url>https://keycloak-packages:&#103;[email protected]/keycloak/keycloak-admin-ui</url>\n+ <url>https://keycloak-packages:&#103;[email protected]/keycloak/keycloak-admin-ui</url>\n<releases>\n<enabled>false</enabled>\n</releases>\n" } ]

[ { "change_type": "ADD", "old_path": null, "new_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/hibernate/jsonb/JpaEntityMigration.java", "diff": "+/*\n+ * Copyright 2021 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.models.map.storage.jpa.hibernate.jsonb;\n+\n+import com.fasterxml.jackson.databind.node.ObjectNode;\n+import java.util.HashMap;\n+import java.util.List;\n+import java.util.Map;\n+import java.util.function.BiFunction;\n+import java.util.function.Function;\n+import org.keycloak.models.map.storage.jpa.client.JpaClientMapStorage;\n+import org.keycloak.models.map.storage.jpa.client.entity.JpaClientMetadata;\n+import org.keycloak.models.map.storage.jpa.hibernate.jsonb.migration.JpaClientMigration;\n+\n+public class JpaEntityMigration {\n+\n+ static final Map<Class<?>, BiFunction<ObjectNode, Integer, ObjectNode>> MIGRATIONS = new HashMap<>();\n+ static {\n+ MIGRATIONS.put(JpaClientMetadata.class, (tree, entityVersion) -> migrateTreeTo(entityVersion, JpaClientMapStorage.SUPPORTED_VERSION, tree, JpaClientMigration.MIGRATORS));\n+ }\n+\n+ private static ObjectNode migrateTreeTo(int entityVersion, Integer supportedVersion, ObjectNode node, List<Function<ObjectNode, ObjectNode>> migrators) {\n+ if (entityVersion > supportedVersion + 1) throw new IllegalArgumentException(\"Incompatible entity version: \" + entityVersion + \", supportedVersion: \" + supportedVersion);\n+\n+ if (entityVersion < supportedVersion) {\n+ while (entityVersion < supportedVersion) {\n+ Function<ObjectNode, ObjectNode> migrator = migrators.get(entityVersion);\n+ if (migrator != null) {\n+ node = migrator.apply(node);\n+ }\n+ entityVersion++;\n+ }\n+ }\n+ return node;\n+ }\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": "@@ -36,6 +36,7 @@ import java.sql.Types;\nimport java.util.List;\nimport java.util.Map;\nimport java.util.Objects;\n+import java.util.Properties;\nimport org.hibernate.HibernateException;\nimport org.hibernate.type.AbstractSingleColumnStandardBasicType;\nimport org.hibernate.type.descriptor.ValueBinder;\n@@ -47,17 +48,17 @@ import org.hibernate.type.descriptor.java.MutableMutabilityPlan;\nimport org.hibernate.type.descriptor.sql.BasicBinder;\nimport org.hibernate.type.descriptor.sql.BasicExtractor;\nimport org.hibernate.type.descriptor.sql.SqlTypeDescriptor;\n-import org.keycloak.models.map.client.MapClientEntity;\n+import org.hibernate.usertype.DynamicParameterizedType;\nimport org.keycloak.models.map.client.MapProtocolMapperEntity;\nimport org.keycloak.models.map.client.MapProtocolMapperEntityImpl;\nimport org.keycloak.models.map.common.DeepCloner;\n+import org.keycloak.models.map.common.EntityWithAttributes;\nimport org.keycloak.models.map.common.Serialization.IgnoreUpdatedMixIn;\nimport org.keycloak.models.map.common.Serialization.IgnoredTypeMixIn;\nimport org.keycloak.models.map.common.UpdatableEntity;\n-import org.keycloak.models.map.storage.jpa.client.entity.JpaClientMetadata;\n-import org.keycloak.models.map.storage.jpa.client.JpaClientMapStorage;\n+import static org.keycloak.models.map.storage.jpa.hibernate.jsonb.JpaEntityMigration.MIGRATIONS;\n-public class JsonbType extends AbstractSingleColumnStandardBasicType<Object> {\n+public class JsonbType extends AbstractSingleColumnStandardBasicType<Object> implements DynamicParameterizedType {\npublic static final JsonbType INSTANCE = new JsonbType();\npublic static final ObjectMapper MAPPER = new ObjectMapper()\n@@ -70,15 +71,20 @@ public class JsonbType extends AbstractSingleColumnStandardBasicType<Object> {\n.registerModule(new SimpleModule().addAbstractTypeMapping(MapProtocolMapperEntity.class, MapProtocolMapperEntityImpl.class))\n.addMixIn(UpdatableEntity.class, IgnoreUpdatedMixIn.class)\n.addMixIn(DeepCloner.class, IgnoredTypeMixIn.class)\n- .addMixIn(MapClientEntity.class, IgnoredClientFieldsMixIn.class);\n+ .addMixIn(EntityWithAttributes.class, IgnoredMetadataFieldsMixIn.class);\n- abstract class IgnoredClientFieldsMixIn {\n+ abstract class IgnoredMetadataFieldsMixIn {\n@JsonIgnore public abstract String getId();\n@JsonIgnore public abstract Map<String, List<String>> getAttributes();\n}\npublic JsonbType() {\n- super(JsonbSqlTypeDescriptor.INSTANCE, JsonbJavaTypeDescriptor.INSTANCE);\n+ super(JsonbSqlTypeDescriptor.INSTANCE, new JsonbJavaTypeDescriptor());\n+ }\n+\n+ @Override\n+ public void setParameterValues(Properties parameters) {\n+ ((JsonbJavaTypeDescriptor) getJavaTypeDescriptor()).setParameterValues(parameters);\n}\n@Override\n@@ -148,9 +154,14 @@ public class JsonbType extends AbstractSingleColumnStandardBasicType<Object> {\n}\n}\n- private static class JsonbJavaTypeDescriptor extends AbstractTypeDescriptor<Object> {\n+ private static class JsonbJavaTypeDescriptor extends AbstractTypeDescriptor<Object> implements DynamicParameterizedType {\n- private static final JsonbJavaTypeDescriptor INSTANCE = new JsonbJavaTypeDescriptor();\n+ private Class valueType;\n+\n+ @Override\n+ public void setParameterValues(Properties parameters) {\n+ valueType = ((ParameterType) parameters.get(PARAMETER_TYPE)).getReturnedClass();\n+ }\npublic JsonbJavaTypeDescriptor() {\nsuper(Object.class, new MutableMutabilityPlan<Object>() {\n@@ -166,26 +177,29 @@ public class JsonbType extends AbstractSingleColumnStandardBasicType<Object> {\n}\n@Override\n+ @SuppressWarnings(\"unchecked\")\npublic Object fromString(String json) {\ntry {\nObjectNode tree = MAPPER.readValue(json, ObjectNode.class);\nJsonNode ev = tree.get(\"entityVersion\");\nif (ev == null || ! ev.isInt()) throw new IllegalArgumentException(\"unable to read entity version from \" + json);\n- int entityVersion = ev.asInt();\n+ Integer entityVersion = ev.asInt();\n- if (entityVersion > JpaClientMapStorage.SUPPORTED_VERSION + 1) throw new IllegalArgumentException(\"Incompatible entity version: \" + entityVersion + \", supportedVersion: \" + JpaClientMapStorage.SUPPORTED_VERSION);\n+ tree = migrate(tree, entityVersion);\n- if (entityVersion < JpaClientMapStorage.SUPPORTED_VERSION) {\n- tree = JpaClientMigration.migrateTreeTo(entityVersion, JpaClientMapStorage.SUPPORTED_VERSION, tree);\n- }\n- return MAPPER.treeToValue(tree, JpaClientMetadata.class);\n+ return MAPPER.treeToValue(tree, valueType);\n} catch (IOException e) {\nthrow new HibernateException(\"unable to read\", e);\n}\n}\n+ private ObjectNode migrate(ObjectNode tree, Integer entityVersion) {\n+ return MIGRATIONS.getOrDefault(valueType, (node, version) -> node).apply(tree, entityVersion);\n+ }\n+\n@Override\n+ @SuppressWarnings(\"unchecked\")\npublic <X> X unwrap(Object value, Class<X> type, WrapperOptions options) {\nif (value == null) return null;\n" }, { "change_type": "RENAME", "old_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/hibernate/jsonb/JpaClientMigration.java", "new_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/hibernate/jsonb/migration/JpaClientMigration.java", "diff": "* See the License for the specific language governing permissions and\n* limitations under the License.\n*/\n-package org.keycloak.models.map.storage.jpa.hibernate.jsonb;\n+package org.keycloak.models.map.storage.jpa.hibernate.jsonb.migration;\nimport com.fasterxml.jackson.databind.node.ObjectNode;\nimport java.util.Arrays;\n@@ -23,19 +23,7 @@ import java.util.function.Function;\npublic class JpaClientMigration {\n- private static final List<Function<ObjectNode, ObjectNode>> MIGRATORS = Arrays.asList(\n+ public static final List<Function<ObjectNode, ObjectNode>> MIGRATORS = Arrays.asList(\no -> o // no migration yet\n);\n-\n- public static ObjectNode migrateTreeTo(int currentVersion, int targetVersion, ObjectNode node) {\n- while (currentVersion < targetVersion) {\n- Function<ObjectNode, ObjectNode> migrator = MIGRATORS.get(currentVersion);\n- if (migrator != null) {\n- node = migrator.apply(node);\n- }\n- currentVersion++;\n- }\n- return node;\n- }\n-\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcFirstBrokerLoginDetectExistingUserTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcFirstBrokerLoginDetectExistingUserTest.java", "diff": "@@ -107,7 +107,7 @@ public class KcOidcFirstBrokerLoginDetectExistingUserTest extends AbstractInitia\nloginPage.assertCurrent(bc.consumerRealmName());\n- assertEquals(\"User \" + username + \" authenticated with identity provider \" + bc.getIDPAlias() + \" does not exists. Please contact your administrator.\", loginPage.getInstruction());\n+ assertEquals(\"User \" + username + \" authenticated with identity provider \" + bc.getIDPAlias() + \" does not exist. Please contact your administrator.\", loginPage.getInstruction());\n}\n@Test\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": "@@ -243,7 +243,7 @@ usernameExistsMessage=Username already exists.\nemailExistsMessage=Email already exists.\nfederatedIdentityExistsMessage=User with {0} {1} already exists. Please login to account management to link the account.\n-federatedIdentityUnavailableMessage=User {0} authenticated with identity provider {1} does not exists. Please contact your administrator.\n+federatedIdentityUnavailableMessage=User {0} authenticated with identity provider {1} does not exist. Please contact your administrator.\nconfirmLinkIdpTitle=Account already exists\nfederatedIdentityConfirmLinkMessage=User with {0} {1} already exists. How do you want to continue?\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/build-processor/src/main/java/org/keycloak/models/map/processor/AbstractGenerateEntityImplementationsProcessor.java", "new_path": "model/build-processor/src/main/java/org/keycloak/models/map/processor/AbstractGenerateEntityImplementationsProcessor.java", "diff": "@@ -50,6 +50,7 @@ import javax.lang.model.SourceVersion;\nimport static org.keycloak.models.map.processor.FieldAccessorType.GETTER;\nimport static org.keycloak.models.map.processor.Util.getGenericsDeclaration;\nimport static org.keycloak.models.map.processor.Util.isMapType;\n+import static org.keycloak.models.map.processor.Util.singularToPlural;\n@SupportedSourceVersion(SourceVersion.RELEASE_8)\npublic abstract class AbstractGenerateEntityImplementationsProcessor extends AbstractProcessor {\n@@ -123,11 +124,11 @@ public abstract class AbstractGenerateEntityImplementationsProcessor extends Abs\n// Merge plurals with singulars\nmethodsPerAttribute.keySet().stream()\n- .filter(key -> methodsPerAttribute.containsKey(key + \"s\"))\n+ .filter(key -> methodsPerAttribute.containsKey(singularToPlural(key)))\n.collect(Collectors.toSet())\n.forEach(key -> {\nHashSet<ExecutableElement> removed = methodsPerAttribute.remove(key);\n- methodsPerAttribute.get(key + \"s\").addAll(removed);\n+ methodsPerAttribute.get(singularToPlural(key)).addAll(removed);\n});\nreturn methodsPerAttribute;\n" }, { "change_type": "MODIFY", "old_path": "model/build-processor/src/main/java/org/keycloak/models/map/processor/FieldAccessorType.java", "new_path": "model/build-processor/src/main/java/org/keycloak/models/map/processor/FieldAccessorType.java", "diff": "@@ -26,6 +26,7 @@ import javax.lang.model.element.Name;\nimport javax.lang.model.type.TypeMirror;\nimport javax.lang.model.util.Types;\nimport static org.keycloak.models.map.processor.Util.getGenericsDeclaration;\n+import static org.keycloak.models.map.processor.Util.pluralToSingular;\n/**\n*\n@@ -52,7 +53,7 @@ enum FieldAccessorType {\nCOLLECTION_ADD {\n@Override\npublic boolean is(ExecutableElement method, String fieldName, Types types, TypeMirror fieldType) {\n- String fieldNameSingular = fieldName.endsWith(\"s\") ? fieldName.substring(0, fieldName.length() - 1) : fieldName;\n+ String fieldNameSingular = pluralToSingular(fieldName);\nString methodName = \"add\" + fieldNameSingular;\nList<TypeMirror> res = getGenericsDeclaration(fieldType);\nreturn Objects.equals(methodName, method.getSimpleName().toString())\n@@ -63,7 +64,7 @@ enum FieldAccessorType {\nCOLLECTION_DELETE {\n@Override\npublic boolean is(ExecutableElement method, String fieldName, Types types, TypeMirror fieldType) {\n- String fieldNameSingular = fieldName.endsWith(\"s\") ? fieldName.substring(0, fieldName.length() - 1) : fieldName;\n+ String fieldNameSingular = pluralToSingular(fieldName);\nString removeFromCollection = \"remove\" + fieldNameSingular;\nList<TypeMirror> res = getGenericsDeclaration(fieldType);\nreturn Objects.equals(removeFromCollection, method.getSimpleName().toString())\n@@ -74,7 +75,7 @@ enum FieldAccessorType {\nMAP_ADD {\n@Override\npublic boolean is(ExecutableElement method, String fieldName, Types types, TypeMirror fieldType) {\n- String fieldNameSingular = fieldName.endsWith(\"s\") ? fieldName.substring(0, fieldName.length() - 1) : fieldName;\n+ String fieldNameSingular = pluralToSingular(fieldName);\nString methodName = \"set\" + fieldNameSingular;\nList<TypeMirror> res = getGenericsDeclaration(fieldType);\nreturn Objects.equals(methodName, method.getSimpleName().toString())\n@@ -86,7 +87,7 @@ enum FieldAccessorType {\nMAP_GET {\n@Override\npublic boolean is(ExecutableElement method, String fieldName, Types types, TypeMirror fieldType) {\n- String fieldNameSingular = fieldName.endsWith(\"s\") ? fieldName.substring(0, fieldName.length() - 1) : fieldName;\n+ String fieldNameSingular = pluralToSingular(fieldName);\nString methodName = \"get\" + fieldNameSingular;\nList<TypeMirror> res = getGenericsDeclaration(fieldType);\nreturn Objects.equals(methodName, method.getSimpleName().toString())\n" }, { "change_type": "MODIFY", "old_path": "model/build-processor/src/main/java/org/keycloak/models/map/processor/GenerateEntityImplementationsProcessor.java", "new_path": "model/build-processor/src/main/java/org/keycloak/models/map/processor/GenerateEntityImplementationsProcessor.java", "diff": "@@ -265,6 +265,7 @@ public class GenerateEntityImplementationsProcessor extends AbstractGenerateEnti\nboolean needsDeepClone = fieldGetters(methodsPerAttribute)\n.map(ExecutableElement::getReturnType)\n.anyMatch(fieldType -> ! isKnownCollectionOfImmutableFinalTypes(fieldType) && ! isImmutableFinalType(fieldType));\n+ boolean usingGeneratedCloner = ! hasDeepClone && needsDeepClone;\nJavaFileObject file = processingEnv.getFiler().createSourceFile(mapImplClassName);\ntry (PrintWriter pw = new PrintWriterNoJavaLang(file.openWriter())) {\n@@ -283,27 +284,25 @@ public class GenerateEntityImplementationsProcessor extends AbstractGenerateEnti\n.map(ExecutableElement.class::cast)\n.filter((ExecutableElement ee) -> ee.getKind() == ElementKind.CONSTRUCTOR)\n.forEach((ExecutableElement ee) -> {\n- if (hasDeepClone || ! needsDeepClone) {\n- pw.println(\" \"\n- + ee.getModifiers().stream().map(Object::toString).collect(Collectors.joining(\" \"))\n- + \" \" + mapSimpleClassName + \"(\" + methodParameters(ee.getParameters()) + \") { super(\" + ee.getParameters() + \"); }\"\n- );\n- } else if (needsDeepClone) {\n+ // Create constructor and initialize cloner to DUMB_CLONER if necessary\n+ if (usingGeneratedCloner) {\npw.println(\" /**\");\npw.println(\" * @deprecated This constructor uses a {@link DeepCloner#DUMB_CLONER} that does not clone anything. Use {@link #\" + mapSimpleClassName + \"(DeepCloner)} variant instead\");\npw.println(\" */\");\n+ }\npw.println(\" \"\n+ ee.getModifiers().stream().map(Object::toString).collect(Collectors.joining(\" \"))\n- + \" \"\n- + mapSimpleClassName + \"(\" + methodParameters(ee.getParameters()) + \") { this(DeepCloner.DUMB_CLONER\" + (ee.getParameters().isEmpty() ? \"\" : \", \") + ee.getParameters() + \"); }\"\n+ + \" \" + mapSimpleClassName + \"(\" + methodParameters(ee.getParameters()) + \") {\"\n);\n+ pw.println(\" super(\" + ee.getParameters() + \");\");\n+ if (usingGeneratedCloner) pw.println(\" this.cloner = DeepCloner.DUMB_CLONER;\");\n+ pw.println(\" }\");\n+ });\n+\npw.println(\" \"\n- + ee.getModifiers().stream().map(Object::toString).collect(Collectors.joining(\" \"))\n- + \" \"\n- + mapSimpleClassName + \"(DeepCloner cloner\" + (ee.getParameters().isEmpty() ? \"\" : \", \") + methodParameters(ee.getParameters()) + \") { super(\" + ee.getParameters() + \"); this.cloner = cloner; }\"\n+ + \"public \"\n+ + mapSimpleClassName + \"(DeepCloner cloner) { super(); \" + (!usingGeneratedCloner ? \"\" : \"this.cloner = cloner;\") + \"}\"\n);\n- }\n- });\n// equals, hashCode, toString\npw.println(\" @Override public boolean equals(Object o) {\");\n@@ -339,7 +338,7 @@ public class GenerateEntityImplementationsProcessor extends AbstractGenerateEnti\npw.println(\" }\");\n// deepClone\n- if (! hasDeepClone && needsDeepClone) {\n+ if (usingGeneratedCloner) {\npw.println(\" private final DeepCloner cloner;\");\npw.println(\" public <V> V deepClone(V obj) {\");\npw.println(\" return cloner.from(obj);\");\n@@ -363,7 +362,7 @@ public class GenerateEntityImplementationsProcessor extends AbstractGenerateEnti\nif (parentMethod.isPresent()) {\nprocessingEnv.getMessager().printMessage(Kind.OTHER, \"Method \" + method + \" is declared in a parent class.\", method);\n- } else if (fat != FieldAccessorType.UNKNOWN && ! printMethodBody(pw, fat, method, \"f\" + me.getKey(), fieldType)) {\n+ } else if (fat == FieldAccessorType.UNKNOWN || ! printMethodBody(pw, fat, method, \"f\" + me.getKey(), fieldType)) {\nprocessingEnv.getMessager().printMessage(Kind.WARNING, \"Could not determine desired semantics of method from its signature\", method);\n}\n}\n@@ -446,10 +445,12 @@ public class GenerateEntityImplementationsProcessor extends AbstractGenerateEnti\npw.println(\" }\");\nreturn true;\ncase COLLECTION_DELETE:\n+ boolean needsReturn = method.getReturnType().getKind() != TypeKind.VOID;\npw.println(\" @SuppressWarnings(\\\"unchecked\\\") @Override public \" + method.getReturnType() + \" \" + method.getSimpleName() + \"(\" + firstParameterType + \" p0) {\");\n- pw.println(\" if (\" + fieldName + \" == null) { return; }\");\n+ pw.println(\" if (\" + fieldName + \" == null) { return\" + (needsReturn ? \" false\" : \"\") + \"; }\");\npw.println(\" boolean removed = \" + fieldName + \".remove(p0)\" + (\"java.util.Map\".equals(typeElement.getQualifiedName().toString()) ? \" != null\" : \"\") + \";\");\npw.println(\" updated |= removed;\");\n+ if (needsReturn) pw.println(\" return removed;\");\npw.println(\" }\");\nreturn true;\ncase MAP_ADD:\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": "@@ -104,6 +104,7 @@ public class GenerateHotRodEntityImplementationsProcessor extends AbstractGenera\nboolean needsDeepClone = fieldGetters(methodsPerAttribute)\n.map(ExecutableElement::getReturnType)\n.anyMatch(fieldType -> ! isKnownCollectionOfImmutableFinalTypes(fieldType) && ! isImmutableFinalType(fieldType));\n+ boolean usingGeneratedCloner = ! hasDeepClone && needsDeepClone;\nboolean hasId = methodsPerAttribute.containsKey(\"Id\") || allMembers.stream().anyMatch(el -> \"getId\".equals(el.getSimpleName().toString()));\nJavaFileObject file = processingEnv.getFiler().createSourceFile(hotRodImplClassName);\n@@ -132,45 +133,43 @@ public class GenerateHotRodEntityImplementationsProcessor extends AbstractGenera\n.map(ExecutableElement.class::cast)\n.filter((ExecutableElement ee) -> ee.getKind() == ElementKind.CONSTRUCTOR)\n.forEach((ExecutableElement ee) -> {\n- if (hasDeepClone || ! needsDeepClone) {\n- pw.println(\" \"\n- + ee.getModifiers().stream().map(Object::toString).collect(Collectors.joining(\" \"))\n- + \" \" + hotRodSimpleClassName + \"(\" + methodParameters(ee.getParameters()) + \") {\"\n- );\n- pw.println(\" super(\" + ee.getParameters() + \");\");\n- pw.println(\" this.\" + ENTITY_VARIABLE + \" = new \" + className + \"();\");\n- pw.println(\" }\");\n- } else if (needsDeepClone) {\n+ // Create constructor and initialize cloner to DUMB_CLONER if necessary\n+ if (usingGeneratedCloner) {\npw.println(\" /**\");\npw.println(\" * @deprecated This constructor uses a {@link DeepCloner#DUMB_CLONER} that does not clone anything. Use {@link #\" + hotRodSimpleClassName + \"(DeepCloner)} variant instead\");\npw.println(\" */\");\n+ }\npw.println(\" \"\n+ ee.getModifiers().stream().map(Object::toString).collect(Collectors.joining(\" \"))\n- + \" \"\n- + hotRodSimpleClassName + \"(\" + methodParameters(ee.getParameters()) + \") { this(DeepCloner.DUMB_CLONER\" + (ee.getParameters().isEmpty() ? \"\" : \", \") + ee.getParameters() + \"); }\"\n- );\n- pw.println(\" \"\n- + ee.getModifiers().stream().map(Object::toString).collect(Collectors.joining(\" \"))\n- + \" \"\n- + hotRodSimpleClassName + \"(DeepCloner cloner\" + (ee.getParameters().isEmpty() ? \"\" : \", \") + methodParameters(ee.getParameters()) + \") {\"\n+ + \" \" + hotRodSimpleClassName + \"(\" + methodParameters(ee.getParameters()) + \") {\"\n);\npw.println(\" super(\" + ee.getParameters() + \");\");\n- pw.println(\" this.cloner = cloner;\");\n+ if (usingGeneratedCloner) pw.println(\" this.cloner = DeepCloner.DUMB_CLONER;\");\npw.println(\" this.\" + ENTITY_VARIABLE + \" = new \" + className + \"();\");\npw.println(\" }\");\n- }\n});\n// Add constructor for setting HotRodEntity\n+ if (usingGeneratedCloner) {\n+ pw.println(\" /**\");\n+ pw.println(\" * @deprecated This constructor uses a {@link DeepCloner#DUMB_CLONER} that does not clone anything. Use {@link #\" + hotRodSimpleClassName + \"(DeepCloner)} variant instead\");\n+ pw.println(\" */\");\n+ }\npw.println(\" \" +\n\"public \" + hotRodSimpleClassName + \"(\" + className + \" \" + ENTITY_VARIABLE + \") {\"\n);\npw.println(\" this.\" + ENTITY_VARIABLE + \" = \" + ENTITY_VARIABLE + \";\");\n- if (! hasDeepClone && needsDeepClone) {\n+ if (usingGeneratedCloner) {\npw.println(\" this.cloner = DeepCloner.DUMB_CLONER;\");\n}\npw.println(\" }\");\n+ pw.println(\" public \" + hotRodSimpleClassName + \"(DeepCloner cloner) {\");\n+ pw.println(\" super();\");\n+ pw.println(\" this.\" + ENTITY_VARIABLE + \" = new \" + className + \"();\");\n+ if (usingGeneratedCloner) pw.println(\" this.cloner = cloner;\");\n+ pw.println(\" }\");\n+\n// equals, hashCode, toString\npw.println(\" @Override public boolean equals(Object o) {\");\npw.println(\" if (o == this) return true; \");\n" }, { "change_type": "MODIFY", "old_path": "model/build-processor/src/main/java/org/keycloak/models/map/processor/Util.java", "new_path": "model/build-processor/src/main/java/org/keycloak/models/map/processor/Util.java", "diff": "@@ -99,4 +99,11 @@ public class Util {\n.findAny();\n}\n+ public static String singularToPlural(String word) {\n+ return word.endsWith(\"y\") ? word.substring(0, word.length() -1) + \"ies\" : word + \"s\";\n+ }\n+\n+ public static String pluralToSingular(String word) {\n+ return word.endsWith(\"ies\") ? word.substring(0, word.length() - 3) + \"y\" : word.endsWith(\"s\") ? word.substring(0, word.length() - 1) : word;\n+ }\n}\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": "@@ -49,9 +49,9 @@ public class HotRodMapStorageProviderFactory implements AmphibianProviderFactory\nprivate static final Logger LOG = Logger.getLogger(HotRodMapStorageProviderFactory.class);\nprivate final static DeepCloner CLONER = new DeepCloner.Builder()\n- .constructorDC(MapClientEntity.class, HotRodClientEntityDelegate::new)\n+ .constructor(MapClientEntity.class, HotRodClientEntityDelegate::new)\n.constructor(MapProtocolMapperEntity.class, HotRodProtocolMapperEntityDelegate::new)\n- .constructorDC(MapGroupEntity.class, HotRodGroupEntityDelegate::new)\n+ .constructor(MapGroupEntity.class, HotRodGroupEntityDelegate::new)\n.build();\npublic static final Map<Class<?>, HotRodEntityDescriptor<?, ?>> ENTITY_DESCRIPTOR_MAP = new HashMap<>();\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": "@@ -42,6 +42,8 @@ import org.hibernate.annotations.TypeDefs;\nimport org.keycloak.models.map.client.MapClientEntity.AbstractClientEntity;\nimport org.keycloak.models.map.client.MapProtocolMapperEntity;\nimport static org.keycloak.models.map.storage.jpa.client.JpaClientMapStorage.SUPPORTED_VERSION;\n+\n+import org.keycloak.models.map.common.DeepCloner;\nimport org.keycloak.models.map.storage.jpa.hibernate.jsonb.JsonbType;\n@Entity\n@@ -87,6 +89,10 @@ public class JpaClientEntity extends AbstractClientEntity implements Serializabl\nthis.metadata = new JpaClientMetadata();\n}\n+ public JpaClientEntity(DeepCloner cloner) {\n+ this.metadata = new JpaClientMetadata(cloner);\n+ }\n+\n/**\n* Used by hibernate when calling cb.construct from read(QueryParameters) method.\n* It is used to select client without metadata(json) field.\n" }, { "change_type": "MODIFY", "old_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/client/entity/JpaClientMetadata.java", "new_path": "model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/client/entity/JpaClientMetadata.java", "diff": "@@ -18,9 +18,18 @@ package org.keycloak.models.map.storage.jpa.client.entity;\nimport java.io.Serializable;\nimport org.keycloak.models.map.client.MapClientEntityImpl;\n+import org.keycloak.models.map.common.DeepCloner;\npublic class JpaClientMetadata extends MapClientEntityImpl implements Serializable {\n+ public JpaClientMetadata(DeepCloner cloner) {\n+ super(cloner);\n+ }\n+\n+ public JpaClientMetadata() {\n+ super();\n+ }\n+\nprivate Integer entityVersion;\npublic Integer getEntityVersion() {\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/common/DeepCloner.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/common/DeepCloner.java", "diff": "@@ -111,7 +111,6 @@ public class DeepCloner {\n* Builder for the {@code DeepCloner} helper class.\n*/\npublic static class Builder {\n- private final Map<Class<?>, Supplier<?>> parameterlessConstructors = new HashMap<>();\nprivate final Map<Class<?>, Function<DeepCloner, ?>> constructors = new HashMap<>();\nprivate final Map<Class<?>, Cloner<?>> clonersWithId = new HashMap<>(org.keycloak.models.map.common.AutogeneratedCloners.CLONERS_WITH_ID);\nprivate final Map<Class<?>, Cloner<?>> clonersWithoutId = new HashMap<>(org.keycloak.models.map.common.AutogeneratedCloners.CLONERS_WITHOUT_ID);\n@@ -124,7 +123,7 @@ public class DeepCloner {\n* @return\n*/\npublic DeepCloner build() {\n- return new DeepCloner(parameterlessConstructors, constructors, delegateCreators, entityFieldDelegateCreators, clonersWithId, clonersWithoutId, genericCloner);\n+ return new DeepCloner(constructors, delegateCreators, entityFieldDelegateCreators, clonersWithId, clonersWithoutId, genericCloner);\n}\nprivate <V> void forThisClassAndAllMarkedParentsAndInterfaces(Class<V> rootClazz, Consumer<Class<?>> action) {\n@@ -149,22 +148,6 @@ public class DeepCloner {\n}\n}\n- /**\n- * Adds a method, often a constructor, that instantiates a record of type {@code V}.\n- *\n- * @param <V> Class or interface that would be instantiated by the given methods\n- * @param clazz Class or interface that would be instantiated by the given methods\n- * @param constructorNoParameters Parameterless function that creates a new instance of class {@code V}.\n- * If {@code null}, parameterless constructor is not available.\n- * @return This builder.\n- */\n- public <V> Builder constructor(Class<V> clazz, Supplier<? extends V> constructorNoParameters) {\n- if (constructorNoParameters != null) {\n- forThisClassAndAllMarkedParentsAndInterfaces(clazz, cl -> this.parameterlessConstructors.put(cl, constructorNoParameters));\n- }\n- return this;\n- }\n-\n/**\n* Adds a method, often a constructor, that instantiates a record of type {@code V}.\n*\n@@ -174,7 +157,7 @@ public class DeepCloner {\n* If {@code null}, such a single-parameter constructor is not available.\n* @return This builder.\n*/\n- public <V> Builder constructorDC(Class<V> clazz, Function<DeepCloner, ? extends V> constructor) {\n+ public <V> Builder constructor(Class<V> clazz, Function<DeepCloner, ? extends V> constructor) {\nif (constructor != null) {\nforThisClassAndAllMarkedParentsAndInterfaces(clazz, cl -> this.constructors.put(cl, constructor));\n}\n@@ -267,7 +250,6 @@ public class DeepCloner {\nprivate static final Logger LOG = Logger.getLogger(DeepCloner.class);\n- private final Map<Class<?>, Supplier<?>> parameterlessConstructors;\nprivate final Map<Class<?>, Function<DeepCloner, ?>> constructors;\nprivate final Map<Class<?>, Cloner<?>> clonersWithId;\nprivate final Map<Class<?>, Cloner<?>> clonersWithoutId;\n@@ -276,14 +258,12 @@ public class DeepCloner {\nprivate final Cloner<?> genericCloner;\nprivate final Map<Class<?>, Object> emptyInstances = new HashMap<>(AutogeneratedCloners.EMPTY_INSTANCES);\n- private DeepCloner(Map<Class<?>, Supplier<?>> parameterlessConstructors,\n- Map<Class<?>, Function<DeepCloner, ?>> constructors,\n+ private DeepCloner(Map<Class<?>, Function<DeepCloner, ?>> constructors,\nMap<Class<?>, DelegateCreator<?>> delegateCreators,\nMap<Class<?>, EntityFieldDelegateCreator<?>> entityFieldDelegateCreators,\nMap<Class<?>, Cloner<?>> clonersWithId,\nMap<Class<?>, Cloner<?>> clonersWithoutId,\nCloner<?> genericCloner) {\n- this.parameterlessConstructors = parameterlessConstructors;\nthis.constructors = constructors;\nthis.clonersWithId = clonersWithId;\nthis.clonersWithoutId = clonersWithoutId;\n@@ -377,17 +357,11 @@ public class DeepCloner {\n@SuppressWarnings(\"unchecked\")\nFunction<DeepCloner, V> c = (Function<DeepCloner, V>) getFromClassRespectingHierarchy(this.constructors, clazz);\nif (c == null) {\n- @SuppressWarnings(\"unchecked\")\n- Supplier<V> s = (Supplier<V>) getFromClassRespectingHierarchy(this.parameterlessConstructors, clazz);\n- if (s == null) {\ntry {\nres = clazz.newInstance();\n} catch (InstantiationException | IllegalAccessException ex) {\nres = null;\n}\n- } else {\n- res = s.get();\n- }\n} else {\nres = c.apply(this);\n}\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/storage/chm/ConcurrentHashMapStorageProviderFactory.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/storage/chm/ConcurrentHashMapStorageProviderFactory.java", "diff": "@@ -80,10 +80,10 @@ public class ConcurrentHashMapStorageProviderFactory implements AmphibianProvide\nprivate final static DeepCloner CLONER = new DeepCloner.Builder()\n.genericCloner(Serialization::from)\n- .constructorDC(MapClientEntityImpl.class, MapClientEntityImpl::new)\n+ .constructor(MapClientEntityImpl.class, MapClientEntityImpl::new)\n.constructor(MapProtocolMapperEntity.class, MapProtocolMapperEntityImpl::new)\n- .constructorDC(MapGroupEntityImpl.class, MapGroupEntityImpl::new)\n- .constructorDC(MapRoleEntityImpl.class, MapRoleEntityImpl::new)\n+ .constructor(MapGroupEntityImpl.class, MapGroupEntityImpl::new)\n+ .constructor(MapRoleEntityImpl.class, MapRoleEntityImpl::new)\n.build();\nprivate static final Map<String, StringKeyConvertor> KEY_CONVERTORS = new HashMap<>();\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": "@@ -38,7 +38,7 @@ import static org.keycloak.models.map.common.DeepCloner.DUMB_CLONER;\npublic class MapClientEntityClonerTest {\nprivate final static DeepCloner CLONER = new DeepCloner.Builder()\n- .constructorDC(MapClientEntityImpl.class, MapClientEntityImpl::new)\n+ .constructor(MapClientEntityImpl.class, MapClientEntityImpl::new)\n.constructor(MapProtocolMapperEntity.class, MapProtocolMapperEntityImpl::new)\n.build();\n" } ]

[ { "change_type": "MODIFY", "old_path": "adapters/oidc/tomcat/tomcat/src/main/java/org/keycloak/adapters/tomcat/KeycloakAuthenticatorValve.java", "new_path": "adapters/oidc/tomcat/tomcat/src/main/java/org/keycloak/adapters/tomcat/KeycloakAuthenticatorValve.java", "diff": "@@ -110,4 +110,9 @@ public class KeycloakAuthenticatorValve extends AbstractKeycloakAuthenticatorVal\nprotected AbstractAuthenticatedActionsValve createAuthenticatedActionsValve(AdapterDeploymentContext deploymentContext, Valve next, Container container) {\nreturn new AuthenticatedActionsValve(deploymentContext, next, container);\n}\n+\n+ @Override\n+ protected CatalinaRequestAuthenticator createRequestAuthenticator(Request request, CatalinaHttpFacade facade, KeycloakDeployment deployment, AdapterTokenStore tokenStore) {\n+ return new TomcatRequestAuthenticator(deployment, tokenStore, facade, request, createPrincipalFactory());\n+ }\n}\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": "@@ -1332,7 +1332,9 @@ otp-hash-algorithm.tooltip=What hashing algorithm should be used to generate the\nnumber-of-digits=Number of Digits\notp.number-of-digits.tooltip=How many digits should the OTP have?\nlook-ahead-window=Look Ahead Window\n-otp.look-ahead-window.tooltip=How far ahead should the server look just in case the token generator and server are out of time sync or counter sync?\n+otp.look-ahead-window.tooltip=How far ahead should the server look just in case the token generator and server are out of counter sync?\n+look-around-window=Look Around Window\n+otp.look-around-window.tooltip=How far should the server look around just in case the token generator and server are out of time sync?\ninitial-counter=Initial Counter\notp.initial-counter.tooltip=What should the initial counter value be?\notp-token-period=OTP Token Period\n" }, { "change_type": "MODIFY", "old_path": "themes/src/main/resources/theme/base/admin/resources/partials/otp-policy.html", "new_path": "themes/src/main/resources/theme/base/admin/resources/partials/otp-policy.html", "diff": "<kc-tooltip>{{:: 'otp.number-of-digits.tooltip' | translate}}</kc-tooltip>\n</div>\n- <div class=\"form-group\">\n+ <div class=\"form-group\" data-ng-if=\"realm.otpPolicyType == 'hotp'\">\n<label class=\"col-md-2 control-label\" for=\"lookAhead\">{{:: 'look-ahead-window' | translate}}</label>\n<div class=\"col-md-6\">\n- <input class=\"form-control\" type=\"number\" required min=\"0\" max=\"120\" id=\"lookAhead\" name=\"lookAhead\" data-ng-model=\"realm.otpPolicyLookAheadWindow\" autofocus>\n+ <input class=\"form-control\" type=\"number\" data-ng-required=\"realm.otpPolicyType == 'hotp'\" min=\"0\" max=\"120\" id=\"lookAhead\" name=\"lookAhead\" data-ng-model=\"realm.otpPolicyLookAheadWindow\">\n</div>\n<kc-tooltip>{{:: 'otp.look-ahead-window.tooltip' | translate}}</kc-tooltip>\n</div>\n+ <div class=\"form-group\" data-ng-if=\"realm.otpPolicyType == 'totp'\">\n+ <label class=\"col-md-2 control-label\" for=\"lookAhead\">{{:: 'look-around-window' | translate}}</label>\n+ <div class=\"col-md-6\">\n+ <input class=\"form-control\" type=\"number\" data-ng-required=\"realm.otpPolicyType == 'totp'\" min=\"0\" max=\"120\" id=\"lookAround\" name=\"lookAround\" data-ng-model=\"realm.otpPolicyLookAheadWindow\">\n+ </div>\n+ <kc-tooltip>{{:: 'otp.look-around-window.tooltip' | translate}}</kc-tooltip>\n+ </div>\n+\n<div class=\"form-group\" data-ng-if=\"realm.otpPolicyType == 'hotp'\">\n<label class=\"col-md-2 control-label\" for=\"counter\">{{:: 'initial-counter' | translate}}</label>\n<div class=\"col-md-6\">\n" } ]

[ { "change_type": "ADD", "old_path": null, "new_path": "docs/guides/src/GENERATE-DOCS.md", "diff": "+To generate the docs, we use a maven plugin that transforms the guides from FreeMarker enabled AsciiDoc to pure AsciiDoc. This includes linking the options from the Configuration to expose them to FreeMarker templates.\n+\n+FreeMarker macros are used heavily here to keep consistency throughout the guides, and to make the guides themselves as slim as possible.\n+\n+To help debugging, for now use the `DocsBuildDebugUtil.java` which has a main method that allows running this step outside of Maven.\n+\n+To build the guides, run:\n+```\n+cd docs\n+mvn clean install\n+```\n+After that you will have the following artifacts:\n+\n+- `docs/guides/target/generated-guides`: pure asciidoc generated versions of the guides\n+- `docs/guides/target/generated-docs/index.html`: all guides in a single html file generated with asciidoc maven plugins.\n+\n+_Note:_ The layout primarily serves as an example for now and is not how we will eventually present the documentation.\n\\ No newline at end of file\n" }, { "change_type": "ADD", "old_path": null, "new_path": "docs/guides/src/main/server/proxy.adoc", "diff": "+<#import \"/templates/guide.adoc\" as tmpl>\n+<#import \"/templates/kc.adoc\" as kc>\n+<#import \"/templates/options.adoc\" as opts>\n+\n+<@tmpl.guide\n+title=\"Configuring Keycloak to run behind a reverse proxy\"\n+summary=\"Understand how to configure Keycloak when using a reverse proxy\"\n+includedOptions=\"proxy proxy.*\">\n+\n+It is pretty common nowadays to use a reverse proxy in distributed environments. If you want to use Keycloak together with such a proxy, you can use different proxy modes depending on the proxy and TLS termination in your specific environment:\n+\n+The `none` mode disables proxy support. It is the default mode.\n+\n+The `edge` mode enables communication through HTTP between the proxy and Keycloak. This mode is suitable for deployments with a highly secure internal network where the reverse proxy keeps a secure connection (HTTP over TLS) with clients while communicating with Keycloak using HTTP.\n+\n+The `reencrypt` mode requires communication through HTTPS between the proxy and Keycloak. This mode is suitable for deployments where internal communication between the reverse proxy and Keycloak should also be protected, and different keys and certificates are used on the reverse proxy as well as on Keycloak.\n+\n+The `passthrough` mode enables communication through HTTP or HTTPS between the proxy and Keycloak. This mode is suitable for deployments where the reverse proxy is not terminating TLS, but only forwarding the requests to the Keycloak server so that secure connections between the server and clients are based on the keys and certificates used by the Keycloak server itself.\n+\n+Selecting the reverse proxy mode is done at runtime via:\n+\n+<@kc.all parameters=\"--proxy <mode>\"/>\n+\n+Please make sure your reverse proxy is configured correctly. To do so, please:\n+\n+* Configure your reverse proxy to properly set X-Forwarded-For and X-Forwarded-Proto HTTP headers.\n+\n+* Configure your reverse proxy to preserve the original 'Host' HTTP header.\n+\n+Please consult the documentation of your specific reverse proxy on how to set these headers.\n+\n+_Note_: Take extra precautions to ensure that the X-Forwarded-For header is set by your reverse proxy. If it is not configured correctly, rogue clients can set this header themselves and trick Keycloak into thinking the client is connecting from a different IP address than it actually does. This may become really important if you are doing any black or white listing of IP addresses.\n+\n+Valid options for the proxy mode include:\n+\n+<@opts.expectedValues option=\"proxy\"/>\n+\n+</@tmpl.guide>\n\\ No newline at end of file\n" }, { "change_type": "MODIFY", "old_path": "docs/guides/src/main/templates/kc.adoc", "new_path": "docs/guides/src/main/templates/kc.adoc", "diff": "@@ -11,3 +11,10 @@ bin/kc.[sh|bat] build ${parameters}\nbin/kc.[sh|bat] start ${parameters}\n----\n</#macro>\n+\n+<#macro all parameters>\n+[source,bash]\n+----\n+bin/kc.[sh|bat] [build|start|start-dev] ${parameters}\n+----\n+</#macro>\n\\ No newline at end of file\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/infinispan/src/main/java/org/keycloak/connections/infinispan/DefaultInfinispanConnectionProviderFactory.java", "new_path": "model/infinispan/src/main/java/org/keycloak/connections/infinispan/DefaultInfinispanConnectionProviderFactory.java", "diff": "@@ -384,6 +384,10 @@ public class DefaultInfinispanConnectionProviderFactory implements InfinispanCon\nString jdgServer = config.get(\"remoteStoreHost\", \"localhost\");\nInteger jdgPort = config.getInt(\"remoteStorePort\", 11222);\n+ // After upgrade to Infinispan 12.1.7.Final it's required that both remote store and embedded cache use\n+ // the same key media type to allow segmentation. Also, the number of segments in an embedded cache needs to match number of segments in the remote store.\n+ boolean segmented = config.getBoolean(\"segmented\", false);\n+\nbuilder.persistence()\n.passivation(false)\n.addStore(RemoteStoreConfigurationBuilder.class)\n@@ -393,6 +397,7 @@ public class DefaultInfinispanConnectionProviderFactory implements InfinispanCon\n.preload(false)\n.shared(true)\n.remoteCacheName(cacheName)\n+ .segmented(segmented)\n.rawValues(true)\n.forceReturnValues(false)\n.marshaller(KeycloakHotRodMarshallerFactory.class.getName())\n@@ -408,6 +413,10 @@ public class DefaultInfinispanConnectionProviderFactory implements InfinispanCon\nString jdgServer = config.get(\"remoteStoreHost\", \"localhost\");\nInteger jdgPort = config.getInt(\"remoteStorePort\", 11222);\n+ // After upgrade to Infinispan 12.1.7.Final it's required that both remote store and embedded cache use\n+ // the same key media type to allow segmentation. Also, the number of segments in an embedded cache needs to match number of segments in the remote store.\n+ boolean segmented = config.getBoolean(\"segmented\", false);\n+\nbuilder.persistence()\n.passivation(false)\n.addStore(RemoteStoreConfigurationBuilder.class)\n@@ -417,6 +426,7 @@ public class DefaultInfinispanConnectionProviderFactory implements InfinispanCon\n.preload(true)\n.shared(true)\n.remoteCacheName(InfinispanConnectionProvider.ACTION_TOKEN_CACHE)\n+ .segmented(segmented)\n.rawValues(true)\n.forceReturnValues(false)\n.marshaller(KeycloakHotRodMarshallerFactory.class.getName())\n" }, { "change_type": "MODIFY", "old_path": "pom.xml", "new_path": "pom.xml", "diff": "<jakarta.persistence.version>2.2.3</jakarta.persistence.version>\n<hibernate.core.version>5.3.20.Final</hibernate.core.version>\n<hibernate.c3p0.version>5.3.20.Final</hibernate.c3p0.version>\n- <infinispan.version>11.0.9.Final</infinispan.version>\n- <infinispan.protostream.processor.version>4.3.4.Final</infinispan.protostream.processor.version>\n+ <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>${jackson.version}</jackson.databind.version>\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/IckleQueryOperators.java", "new_path": "model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/IckleQueryOperators.java", "diff": "@@ -26,6 +26,7 @@ import java.util.HashMap;\nimport java.util.HashSet;\nimport java.util.Map;\nimport java.util.Set;\n+import java.util.regex.Pattern;\nimport java.util.stream.Collectors;\nimport java.util.stream.IntStream;\nimport java.util.stream.Stream;\n@@ -35,10 +36,10 @@ import java.util.stream.Stream;\n* <p/>\n* For example,\n* <p/>\n- * for operator {@link ModelCriteriaBuilder.Operator.EQ} we concatenate left operand and right operand with equal sign:\n+ * for operator {@link ModelCriteriaBuilder.Operator#EQ} we concatenate left operand and right operand with equal sign:\n* {@code fieldName = :parameterName}\n* <p/>\n- * however, for operator {@link ModelCriteriaBuilder.Operator.EXISTS} we add following:\n+ * however, for operator {@link ModelCriteriaBuilder.Operator#EXISTS} we add following:\n* <p/>\n* {@code fieldName IS NOT NULL AND fieldName IS NOT EMPTY\"}.\n*\n@@ -46,7 +47,7 @@ import java.util.stream.Stream;\n* corresponding value is then saved into {@code Map<String, Object>} that is passed to each {@link ExpressionCombinator}.\n*/\npublic class IckleQueryOperators {\n- private static final String UNWANTED_CHARACTERS_REGEX = \"[^a-zA-Z\\\\d]\";\n+ private static final Pattern UNWANTED_CHARACTERS_REGEX = Pattern.compile(\"[^a-zA-Z\\\\d]\");\npublic static final String C = \"c\";\nprivate static final Map<ModelCriteriaBuilder.Operator, String> OPERATOR_TO_STRING = new HashMap<>();\nprivate static final Map<ModelCriteriaBuilder.Operator, ExpressionCombinator> OPERATOR_TO_EXPRESSION_COMBINATORS = new HashMap<>();\n@@ -123,14 +124,18 @@ public class IckleQueryOperators {\n}\nprivate static String removeForbiddenCharactersFromNamedParameter(String name) {\n- return name.replaceAll(UNWANTED_CHARACTERS_REGEX, \"\");\n+ return UNWANTED_CHARACTERS_REGEX.matcher(name).replaceAll( \"\");\n}\n/**\n* Maps {@code namePrefix} to next available parameter name. For example, if {@code namePrefix == \"id\"}\n* and {@code existingNames} set already contains {@code id0} and {@code id1} it returns {@code id2}.\n+ * Any character that is not an alphanumeric will be stripped, so that it works for prefixes like\n+ * {@code \"attributes.name\"} as well.\n*\n- * This method is used for computing available names for name query parameters\n+ * This method is used for computing available names for name query parameters.\n+ * Instead of creating generic named parameters that would be hard to debug and read by humans, it creates readable\n+ * named parameters from the prefix.\n*\n* @param existingNames set of parameter names that are already used in this Ickle query\n* @param namePrefix name of the parameter\n" }, { "change_type": "ADD", "old_path": null, "new_path": "model/map-hot-rod/src/test/java/org/keycloak/models/map/storage/hotRod/IckleQueryOperatorsTest.java", "diff": "+package org.keycloak.models.map.storage.hotRod;\n+\n+import org.hamcrest.Matchers;\n+import org.junit.Test;\n+\n+import java.util.HashSet;\n+import java.util.Set;\n+\n+import static org.hamcrest.MatcherAssert.assertThat;\n+\n+public class IckleQueryOperatorsTest {\n+\n+ @Test\n+ public void testFindAvailableNamedParamSimple() {\n+ Set<String> existingNames = new HashSet<>();\n+\n+ String param = IckleQueryOperators.findAvailableNamedParam(existingNames, \"clientId\");\n+\n+ assertThat(\"should create the first ID\", param, Matchers.equalTo(\"clientId0\"));\n+ }\n+\n+ @Test\n+ public void testFindAvailableNamedParamAlreadyExists() {\n+ Set<String> existingNames = new HashSet<>();\n+ existingNames.add(\"clientId0\");\n+\n+ String param = IckleQueryOperators.findAvailableNamedParam(existingNames, \"clientId\");\n+\n+ assertThat(\"should create the next ID as clientId0 is already taken\", param, Matchers.equalTo(\"clientId1\"));\n+ }\n+\n+ @Test\n+ public void testFindAvailableNamedParamIllegalCharacterInPrefix() {\n+ Set<String> existingNames = new HashSet<>();\n+ existingNames.add(\"clientid0\");\n+\n+ String param = IckleQueryOperators.findAvailableNamedParam(existingNames, \"client.id\");\n+\n+ assertThat(\"should remove non-characters and non-numbers from the ID\", param, Matchers.equalTo(\"clientid1\"));\n+ }\n+\n+}\n\\ No newline at end of file\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/build-processor/src/main/java/org/keycloak/models/map/processor/GenerateEntityImplementationsProcessor.java", "new_path": "model/build-processor/src/main/java/org/keycloak/models/map/processor/GenerateEntityImplementationsProcessor.java", "diff": "@@ -59,7 +59,7 @@ import javax.lang.model.type.TypeKind;\n@SupportedSourceVersion(SourceVersion.RELEASE_8)\npublic class GenerateEntityImplementationsProcessor extends AbstractGenerateEntityImplementationsProcessor {\n- private final Collection<String> autogenerated = new TreeSet<>();\n+ private static final Collection<String> autogenerated = new TreeSet<>();\nprivate final Generator[] generators = new Generator[] {\nnew ClonerGenerator(),\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": "@@ -279,7 +279,7 @@ public class MapFieldPredicates {\nString providerId = ensureEqSingleValue(UserModel.SearchableFields.CONSENT_CLIENT_FEDERATION_LINK, \"provider_id\", op, values);\nString providerIdS = new StorageId((String) providerId, \"\").getId();\nFunction<MapUserEntity, ?> getter;\n- getter = ue -> Optional.ofNullable(ue.getUserConsents()).orElseGet(Collections::emptyMap).values().stream().map(MapUserConsentEntity::getClientId).anyMatch(v -> v != null && v.startsWith(providerIdS));\n+ getter = ue -> Optional.ofNullable(ue.getUserConsents()).orElseGet(Collections::emptySet).stream().map(MapUserConsentEntity::getClientId).anyMatch(v -> v != null && v.startsWith(providerIdS));\nreturn mcb.fieldCompare(Boolean.TRUE::equals, getter);\n}\n@@ -445,7 +445,7 @@ public class MapFieldPredicates {\nprivate static MapModelCriteriaBuilder<Object, MapUserEntity, UserModel> checkUserClientConsent(MapModelCriteriaBuilder<Object, MapUserEntity, UserModel> mcb, Operator op, Object[] values) {\nString clientIdS = ensureEqSingleValue(UserModel.SearchableFields.CONSENT_FOR_CLIENT, \"client_id\", op, values);\nFunction<MapUserEntity, ?> getter;\n- getter = ue -> ue.getUserConsent(clientIdS);\n+ getter = ue -> ue.getUserConsent(clientIdS).orElse(null);\nreturn mcb.fieldCompare(Operator.EXISTS, getter, null);\n}\n@@ -453,7 +453,7 @@ public class MapFieldPredicates {\nprivate static MapModelCriteriaBuilder<Object, MapUserEntity, UserModel> checkUserConsentsWithClientScope(MapModelCriteriaBuilder<Object, MapUserEntity, UserModel> mcb, Operator op, Object[] values) {\nString clientScopeIdS = ensureEqSingleValue(UserModel.SearchableFields.CONSENT_FOR_CLIENT, \"client_scope_id\", op, values);\nFunction<MapUserEntity, ?> getter;\n- getter = ue -> Optional.ofNullable(ue.getUserConsents()).orElseGet(Collections::emptyMap).values().stream().anyMatch(consent -> Optional.ofNullable(consent.getGrantedClientScopesIds()).orElseGet(Collections::emptySet).contains(clientScopeIdS));\n+ getter = ue -> Optional.ofNullable(ue.getUserConsents()).orElseGet(Collections::emptySet).stream().anyMatch(consent -> Optional.ofNullable(consent.getGrantedClientScopesIds()).orElseGet(Collections::emptySet).contains(clientScopeIdS));\nreturn mcb.fieldCompare(Boolean.TRUE::equals, getter);\n}\n@@ -469,15 +469,15 @@ public class MapFieldPredicates {\nfinal Object idpAlias = values[0];\nFunction<MapUserEntity, ?> getter;\nif (values.length == 1) {\n- getter = ue -> Optional.ofNullable(ue.getFederatedIdentities()).orElseGet(Collections::emptyMap).values().stream()\n+ getter = ue -> Optional.ofNullable(ue.getFederatedIdentities()).orElseGet(Collections::emptySet).stream()\n.anyMatch(aue -> Objects.equals(idpAlias, aue.getIdentityProvider()));\n} else if (idpAlias == null) {\nfinal Object idpUserId = values[1];\n- getter = ue -> Optional.ofNullable(ue.getFederatedIdentities()).orElseGet(Collections::emptyMap).values().stream()\n+ getter = ue -> Optional.ofNullable(ue.getFederatedIdentities()).orElseGet(Collections::emptySet).stream()\n.anyMatch(aue -> Objects.equals(idpUserId, aue.getUserId()));\n} else {\nfinal Object idpUserId = values[1];\n- getter = ue -> Optional.ofNullable(ue.getFederatedIdentities()).orElseGet(Collections::emptyMap).values().stream()\n+ getter = ue -> Optional.ofNullable(ue.getFederatedIdentities()).orElseGet(Collections::emptySet).stream()\n.anyMatch(aue -> Objects.equals(idpAlias, aue.getIdentityProvider()) && Objects.equals(idpUserId, aue.getUserId()));\n}\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/user/MapUserCredentialEntity.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/user/MapUserCredentialEntity.java", "diff": "@@ -29,8 +29,6 @@ import java.util.Comparator;\[email protected]\npublic interface MapUserCredentialEntity extends UpdatableEntity {\n- Comparator<MapUserCredentialEntity> ORDER_BY_PRIORITY = Comparator.comparing(MapUserCredentialEntity::getPriority);\n-\npublic static MapUserCredentialEntity fromModel(CredentialModel model) {\nMapUserCredentialEntity credentialEntity = new MapUserCredentialEntityImpl();\nString id = model.getId() == null ? KeycloakModelUtils.generateId() : model.getId();\n@@ -72,7 +70,4 @@ public interface MapUserCredentialEntity extends UpdatableEntity {\nString getCredentialData();\nvoid setCredentialData(String credentialData);\n-\n- Integer getPriority();\n- void setPriority(Integer priority);\n}\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": "package org.keycloak.models.map.user;\n+import org.jboss.logging.Logger;\nimport org.keycloak.models.map.annotations.GenerateEntityImplementations;\nimport org.keycloak.models.map.annotations.IgnoreForEntityImplementationGenerator;\nimport org.keycloak.models.map.common.AbstractEntity;\n@@ -26,12 +27,11 @@ import org.keycloak.models.map.common.UpdatableEntity;\nimport org.keycloak.models.utils.KeycloakModelUtils;\nimport java.util.Collections;\n-import java.util.Comparator;\nimport java.util.List;\nimport java.util.Map;\n+import java.util.Objects;\nimport java.util.Optional;\nimport java.util.Set;\n-import java.util.stream.Stream;\n@GenerateEntityImplementations(\ninherits = \"org.keycloak.models.map.user.MapUserEntity.AbstractUserEntity\"\n@@ -41,22 +41,23 @@ public interface MapUserEntity extends UpdatableEntity, AbstractEntity, EntityWi\npublic abstract class AbstractUserEntity extends UpdatableEntity.Impl implements MapUserEntity {\n+ private static final Logger LOG = Logger.getLogger(MapUserProvider.class);\nprivate String id;\n@Override\npublic boolean isUpdated() {\nreturn this.updated\n- || Optional.ofNullable(getUserConsents()).orElseGet(Collections::emptyMap).values().stream().anyMatch(MapUserConsentEntity::isUpdated)\n- || Optional.ofNullable(getCredentials()).orElseGet(Collections::emptyMap).values().stream().anyMatch(MapUserCredentialEntity::isUpdated)\n- || Optional.ofNullable(getFederatedIdentities()).orElseGet(Collections::emptyMap).values().stream().anyMatch(MapUserFederatedIdentityEntity::isUpdated);\n+ || Optional.ofNullable(getUserConsents()).orElseGet(Collections::emptySet).stream().anyMatch(MapUserConsentEntity::isUpdated)\n+ || Optional.ofNullable(getCredentials()).orElseGet(Collections::emptyList).stream().anyMatch(MapUserCredentialEntity::isUpdated)\n+ || Optional.ofNullable(getFederatedIdentities()).orElseGet(Collections::emptySet).stream().anyMatch(MapUserFederatedIdentityEntity::isUpdated);\n}\n@Override\npublic void clearUpdatedFlag() {\nthis.updated = false;\n- Optional.ofNullable(getUserConsents()).orElseGet(Collections::emptyMap).values().forEach(UpdatableEntity::clearUpdatedFlag);\n- Optional.ofNullable(getCredentials()).orElseGet(Collections::emptyMap).values().forEach(UpdatableEntity::clearUpdatedFlag);\n- Optional.ofNullable(getFederatedIdentities()).orElseGet(Collections::emptyMap).values().forEach(UpdatableEntity::clearUpdatedFlag);\n+ Optional.ofNullable(getUserConsents()).orElseGet(Collections::emptySet).forEach(UpdatableEntity::clearUpdatedFlag);\n+ Optional.ofNullable(getCredentials()).orElseGet(Collections::emptyList).forEach(UpdatableEntity::clearUpdatedFlag);\n+ Optional.ofNullable(getFederatedIdentities()).orElseGet(Collections::emptySet).forEach(UpdatableEntity::clearUpdatedFlag);\n}\n@@ -77,6 +78,97 @@ public interface MapUserEntity extends UpdatableEntity, AbstractEntity, EntityWi\nthis.setEmail(email);\nthis.setEmailConstraint(email == null || duplicateEmailsAllowed ? KeycloakModelUtils.generateId() : email);\n}\n+\n+ @Override\n+ public Optional<MapUserConsentEntity> getUserConsent(String clientId) {\n+ Set<MapUserConsentEntity> ucs = getUserConsents();\n+ if (ucs == null || ucs.isEmpty()) return Optional.empty();\n+\n+ return ucs.stream().filter(uc -> Objects.equals(uc.getClientId(), clientId)).findFirst();\n+ }\n+\n+ @Override\n+ public Boolean removeUserConsent(String clientId) {\n+ Set<MapUserConsentEntity> consents = getUserConsents();\n+ boolean removed = consents != null && consents.removeIf(uc -> Objects.equals(uc.getClientId(), clientId));\n+ this.updated |= removed;\n+ return removed;\n+ }\n+\n+ @Override\n+ public Optional<MapUserCredentialEntity> getCredential(String id) {\n+ List<MapUserCredentialEntity> uce = getCredentials();\n+ if (uce == null || uce.isEmpty()) return Optional.empty();\n+\n+ return uce.stream().filter(uc -> Objects.equals(uc.getId(), id)).findFirst();\n+ }\n+\n+ @Override\n+ public Boolean removeCredential(String id) {\n+ List<MapUserCredentialEntity> credentials = getCredentials();\n+ boolean removed = credentials != null && credentials.removeIf(c -> Objects.equals(c.getId(), id));\n+ this.updated |= removed;\n+ return removed;\n+ }\n+\n+ @Override\n+ public Boolean moveCredential(String credentialId, String newPreviousCredentialId) {\n+ // 1 - Get all credentials from the entity.\n+ List<MapUserCredentialEntity> credentialsList = getCredentials();\n+\n+ // 2 - Find indexes of our and newPrevious credential\n+ int ourCredentialIndex = -1;\n+ int newPreviousCredentialIndex = -1;\n+ MapUserCredentialEntity ourCredential = null;\n+ int i = 0;\n+ for (MapUserCredentialEntity credential : credentialsList) {\n+ if (credentialId.equals(credential.getId())) {\n+ ourCredentialIndex = i;\n+ ourCredential = credential;\n+ } else if(newPreviousCredentialId != null && newPreviousCredentialId.equals(credential.getId())) {\n+ newPreviousCredentialIndex = i;\n+ }\n+ i++;\n+ }\n+\n+ if (ourCredentialIndex == -1) {\n+ LOG.warnf(\"Not found credential with id [%s] of user [%s]\", credentialId, getUsername());\n+ return false;\n+ }\n+\n+ if (newPreviousCredentialId != null && newPreviousCredentialIndex == -1) {\n+ LOG.warnf(\"Can't move up credential with id [%s] of user [%s]\", credentialId, getUsername());\n+ return false;\n+ }\n+\n+ // 3 - Compute index where we move our credential\n+ int toMoveIndex = newPreviousCredentialId==null ? 0 : newPreviousCredentialIndex + 1;\n+\n+ // 4 - Insert our credential to new position, remove it from the old position\n+ if (toMoveIndex == ourCredentialIndex) return true;\n+ credentialsList.add(toMoveIndex, ourCredential);\n+ int indexToRemove = toMoveIndex < ourCredentialIndex ? ourCredentialIndex + 1 : ourCredentialIndex;\n+ credentialsList.remove(indexToRemove);\n+\n+ this.updated = true;\n+ return true;\n+ }\n+\n+ @Override\n+ public Optional<MapUserFederatedIdentityEntity> getFederatedIdentity(String identityProviderId) {\n+ Set<MapUserFederatedIdentityEntity> fes = getFederatedIdentities();\n+ if (fes == null || fes.isEmpty()) return Optional.empty();\n+\n+ return fes.stream().filter(fi -> Objects.equals(fi.getIdentityProvider(), identityProviderId)).findFirst();\n+ }\n+\n+ @Override\n+ public Boolean removeFederatedIdentity(String identityProviderId) {\n+ Set<MapUserFederatedIdentityEntity> federatedIdentities = getFederatedIdentities();\n+ boolean removed = federatedIdentities != null && federatedIdentities.removeIf(fi -> Objects.equals(fi.getIdentityProvider(), identityProviderId));\n+ this.updated |= removed;\n+ return removed;\n+ }\n}\nString getRealmId();\n@@ -119,20 +211,27 @@ public interface MapUserEntity extends UpdatableEntity, AbstractEntity, EntityWi\nvoid addRequiredAction(String requiredAction);\nvoid removeRequiredAction(String requiredAction);\n- Map<String, MapUserCredentialEntity> getCredentials();\n- void setCredential(String id, MapUserCredentialEntity credentialEntity);\n- Boolean removeCredential(String credentialId);\n- MapUserCredentialEntity getCredential(String id);\n-\n- Map<String, MapUserFederatedIdentityEntity> getFederatedIdentities();\n- void setFederatedIdentities(Map<String, MapUserFederatedIdentityEntity> federatedIdentities);\n- void setFederatedIdentity(String id, MapUserFederatedIdentityEntity federatedIdentity);\n- MapUserFederatedIdentityEntity getFederatedIdentity(String federatedIdentity);\n- Boolean removeFederatedIdentity(String providerId);\n-\n- Map<String, MapUserConsentEntity> getUserConsents();\n- MapUserConsentEntity getUserConsent(String clientId);\n- void setUserConsent(String id, MapUserConsentEntity userConsentEntity);\n+ List<MapUserCredentialEntity> getCredentials();\n+ Optional<MapUserCredentialEntity> getCredential(String id);\n+ void setCredentials(List<MapUserCredentialEntity> credentials);\n+ void addCredential(MapUserCredentialEntity credentialEntity);\n+ Boolean removeCredential(MapUserCredentialEntity credentialEntity);\n+ Boolean removeCredential(String id);\n+ @IgnoreForEntityImplementationGenerator\n+ Boolean moveCredential(String credentialId, String newPreviousCredentialId);\n+\n+ Set<MapUserFederatedIdentityEntity> getFederatedIdentities();\n+ Optional<MapUserFederatedIdentityEntity> getFederatedIdentity(String identityProviderId);\n+ void setFederatedIdentities(Set<MapUserFederatedIdentityEntity> federatedIdentities);\n+ void addFederatedIdentity(MapUserFederatedIdentityEntity federatedIdentity);\n+ Boolean removeFederatedIdentity(MapUserFederatedIdentityEntity providerId);\n+ Boolean removeFederatedIdentity(String identityProviderId);\n+\n+ Set<MapUserConsentEntity> getUserConsents();\n+ Optional<MapUserConsentEntity> getUserConsent(String clientId);\n+ void setUserConsents(Set<MapUserConsentEntity> userConsentEntity);\n+ void addUserConsent(MapUserConsentEntity userConsentEntity);\n+ Boolean removeUserConsent(MapUserConsentEntity userConsentEntity);\nBoolean removeUserConsent(String clientId);\nSet<String> getGroupsMembership();\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/user/MapUserProvider.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/user/MapUserProvider.java", "diff": "@@ -51,11 +51,9 @@ import org.keycloak.storage.UserStorageProvider;\nimport org.keycloak.storage.client.ClientStorageProvider;\nimport java.util.Collection;\n-import java.util.Comparator;\nimport java.util.EnumMap;\nimport java.util.HashMap;\nimport java.util.HashSet;\n-import java.util.LinkedList;\nimport java.util.List;\nimport java.util.Map;\nimport java.util.Objects;\n@@ -79,8 +77,6 @@ import static org.keycloak.models.map.storage.criteria.DefaultModelCriteria.crit\npublic class MapUserProvider implements UserProvider.Streams, UserCredentialStore.Streams {\n- // Typical priority difference between 2 credentials\n- public static final int PRIORITY_DIFFERENCE = 10;\nprivate static final Logger LOG = Logger.getLogger(MapUserProvider.class);\nprivate final KeycloakSession session;\nfinal MapKeycloakTransaction<MapUserEntity, UserModel> tx;\n@@ -145,7 +141,7 @@ public class MapUserProvider implements UserProvider.Streams, UserCredentialStor\ngetEntityById(realm, user.getId())\n.ifPresent(userEntity ->\n- userEntity.setFederatedIdentity(socialLink.getIdentityProvider(), MapUserFederatedIdentityEntity.fromModel(socialLink)));\n+ userEntity.addFederatedIdentity(MapUserFederatedIdentityEntity.fromModel(socialLink)));\n}\n@Override\n@@ -175,7 +171,12 @@ public class MapUserProvider implements UserProvider.Streams, UserCredentialStor\npublic void updateFederatedIdentity(RealmModel realm, UserModel federatedUser, FederatedIdentityModel federatedIdentityModel) {\nLOG.tracef(\"updateFederatedIdentity(%s, %s, %s)%s\", realm, federatedUser.getId(), federatedIdentityModel.getIdentityProvider(), getShortStackTrace());\ngetEntityById(realm, federatedUser.getId())\n- .ifPresent(entity -> entity.setFederatedIdentity(federatedIdentityModel.getIdentityProvider(), MapUserFederatedIdentityEntity.fromModel(federatedIdentityModel)));\n+ .flatMap(u -> u.getFederatedIdentity(federatedIdentityModel.getIdentityProvider()))\n+ .ifPresent(fi -> {\n+ fi.setUserId(federatedIdentityModel.getUserId());\n+ fi.setUserName(federatedIdentityModel.getUserName());\n+ fi.setToken(federatedIdentityModel.getToken());\n+ });\n}\n@Override\n@@ -183,7 +184,6 @@ public class MapUserProvider implements UserProvider.Streams, UserCredentialStor\nLOG.tracef(\"getFederatedIdentitiesStream(%s, %s)%s\", realm, user.getId(), getShortStackTrace());\nreturn getEntityById(realm, user.getId())\n.map(MapUserEntity::getFederatedIdentities)\n- .map(Map::values)\n.map(Collection::stream)\n.orElseGet(Stream::empty)\n.map(MapUserFederatedIdentityEntity::toModel);\n@@ -193,7 +193,7 @@ public class MapUserProvider implements UserProvider.Streams, UserCredentialStor\npublic FederatedIdentityModel getFederatedIdentity(RealmModel realm, UserModel user, String socialProvider) {\nLOG.tracef(\"getFederatedIdentity(%s, %s, %s)%s\", realm, user.getId(), socialProvider, getShortStackTrace());\nreturn getEntityById(realm, user.getId())\n- .map(userEntity -> userEntity.getFederatedIdentity(socialProvider))\n+ .flatMap(userEntity -> userEntity.getFederatedIdentity(socialProvider))\n.map(MapUserFederatedIdentityEntity::toModel)\n.orElse(null);\n}\n@@ -225,14 +225,14 @@ public class MapUserProvider implements UserProvider.Streams, UserCredentialStor\nLOG.tracef(\"addConsent(%s, %s, %s)%s\", realm, userId, consent, getShortStackTrace());\ngetEntityByIdOrThrow(realm, userId)\n- .setUserConsent(consent.getClient().getId(), MapUserConsentEntity.fromModel(consent));\n+ .addUserConsent(MapUserConsentEntity.fromModel(consent));\n}\n@Override\npublic UserConsentModel getConsentByClient(RealmModel realm, String userId, String clientInternalId) {\nLOG.tracef(\"getConsentByClient(%s, %s, %s)%s\", realm, userId, clientInternalId, getShortStackTrace());\nreturn getEntityById(realm, userId)\n- .map(userEntity -> userEntity.getUserConsent(clientInternalId))\n+ .flatMap(userEntity -> userEntity.getUserConsent(clientInternalId))\n.map(consent -> MapUserConsentEntity.toModel(realm, consent))\n.orElse(null);\n}\n@@ -242,9 +242,8 @@ public class MapUserProvider implements UserProvider.Streams, UserCredentialStor\nLOG.tracef(\"getConsentByClientStream(%s, %s)%s\", realm, userId, getShortStackTrace());\nreturn getEntityById(realm, userId)\n.map(MapUserEntity::getUserConsents)\n- .map(Map::values)\n.map(Collection::stream)\n- .orElse(Stream.empty())\n+ .orElseGet(Stream::empty)\n.map(consent -> MapUserConsentEntity.toModel(realm, consent));\n}\n@@ -253,10 +252,8 @@ public class MapUserProvider implements UserProvider.Streams, UserCredentialStor\nLOG.tracef(\"updateConsent(%s, %s, %s)%s\", realm, userId, consent, getShortStackTrace());\nMapUserEntity user = getEntityByIdOrThrow(realm, userId);\n- MapUserConsentEntity userConsentEntity = user.getUserConsent(consent.getClient().getId());\n- if (userConsentEntity == null) {\n- throw new ModelException(\"Consent not found for client [\" + consent.getClient().getId() + \"] and user [\" + userId + \"]\");\n- }\n+ MapUserConsentEntity userConsentEntity = user.getUserConsent(consent.getClient().getId())\n+ .orElseThrow(() -> new ModelException(\"Consent not found for client [\" + consent.getClient().getId() + \"] and user [\" + userId + \"]\"));\nuserConsentEntity.setGrantedClientScopesIds(\nconsent.getGrantedClientScopes().stream()\n@@ -447,7 +444,6 @@ public class MapUserProvider implements UserProvider.Streams, UserCredentialStor\ntry (Stream<MapUserEntity> s = tx.read(withCriteria(mcb))) {\ns.map(MapUserEntity::getUserConsents)\n.filter(Objects::nonNull)\n- .map(Map::values)\n.flatMap(Collection::stream)\n.forEach(consent -> consent.removeGrantedClientScopesId(clientScopeId));\n}\n@@ -474,9 +470,9 @@ public class MapUserProvider implements UserProvider.Streams, UserCredentialStor\nprivate Consumer<MapUserEntity> removeConsentsForExternalClient(String idPrefix) {\nreturn userEntity -> {\n- Map<String, MapUserConsentEntity> userConsents = userEntity.getUserConsents();\n+ Set<MapUserConsentEntity> userConsents = userEntity.getUserConsents();\nif (userConsents == null || userConsents.isEmpty()) return;\n- List<String> consentClientIds = userConsents.values().stream()\n+ List<String> consentClientIds = userConsents.stream()\n.map(MapUserConsentEntity::getClientId)\n.filter(clientId -> clientId != null && clientId.startsWith(idPrefix))\n.collect(Collectors.toList());\n@@ -756,16 +752,13 @@ public class MapUserProvider implements UserProvider.Streams, UserCredentialStor\n}\nprivate Consumer<MapUserEntity> updateCredential(CredentialModel credentialModel) {\n- return user -> {\n- MapUserCredentialEntity credentialEntity = user.getCredential(credentialModel.getId());\n- if (credentialEntity == null) return;\n-\n- credentialEntity.setCreatedDate(credentialModel.getCreatedDate());\n- credentialEntity.setUserLabel(credentialModel.getUserLabel());\n- credentialEntity.setType(credentialModel.getType());\n- credentialEntity.setSecretData(credentialModel.getSecretData());\n- credentialEntity.setCredentialData(credentialModel.getCredentialData());\n- };\n+ return user -> user.getCredential(credentialModel.getId()).ifPresent(c -> {\n+ c.setCreatedDate(credentialModel.getCreatedDate());\n+ c.setUserLabel(credentialModel.getUserLabel());\n+ c.setType(credentialModel.getType());\n+ c.setSecretData(credentialModel.getSecretData());\n+ c.setCredentialData(credentialModel.getCredentialData());\n+ });\n}\n@Override\n@@ -774,19 +767,11 @@ public class MapUserProvider implements UserProvider.Streams, UserCredentialStor\nMapUserEntity userEntity = getEntityByIdOrThrow(realm, user.getId());\nMapUserCredentialEntity credentialEntity = MapUserCredentialEntity.fromModel(cred);\n- if (userEntity.getCredential(cred.getId()) != null) {\n+ if (userEntity.getCredential(cred.getId()).isPresent()) {\nthrow new ModelDuplicateException(\"A CredentialModel with given id already exists\");\n}\n- Map<String, MapUserCredentialEntity> credentials = userEntity.getCredentials();\n- int priority = PRIORITY_DIFFERENCE;\n-\n- if (credentials != null && !credentials.isEmpty()) {\n- priority = credentials.values().stream().max(MapUserCredentialEntity.ORDER_BY_PRIORITY).map(MapUserCredentialEntity::getPriority).orElse(0) + PRIORITY_DIFFERENCE;\n- }\n-\n- credentialEntity.setPriority(priority);\n- userEntity.setCredential(credentialEntity.getId(), credentialEntity);\n+ userEntity.addCredential(credentialEntity);\nreturn MapUserCredentialEntity.toModel(credentialEntity);\n}\n@@ -806,7 +791,7 @@ public class MapUserProvider implements UserProvider.Streams, UserCredentialStor\npublic CredentialModel getStoredCredentialById(RealmModel realm, UserModel user, String id) {\nLOG.tracef(\"getStoredCredentialById(%s, %s, %s)%s\", realm, user.getId(), id, getShortStackTrace());\nreturn getEntityById(realm, user.getId())\n- .map(mapUserEntity -> mapUserEntity.getCredential(id))\n+ .flatMap(mapUserEntity -> mapUserEntity.getCredential(id))\n.map(MapUserCredentialEntity::toModel)\n.orElse(null);\n}\n@@ -817,10 +802,8 @@ public class MapUserProvider implements UserProvider.Streams, UserCredentialStor\nreturn getEntityById(realm, user.getId())\n.map(MapUserEntity::getCredentials)\n- .map(Map::values)\n.map(Collection::stream)\n.orElseGet(Stream::empty)\n- .sorted(MapUserCredentialEntity.ORDER_BY_PRIORITY)\n.map(MapUserCredentialEntity::toModel);\n}\n@@ -841,60 +824,8 @@ public class MapUserProvider implements UserProvider.Streams, UserCredentialStor\n@Override\npublic boolean moveCredentialTo(RealmModel realm, UserModel user, String id, String newPreviousCredentialId) {\n-\n- MapUserEntity userEntity = getEntityByIdOrThrow(realm, user.getId());\n-\n- // 1 - Create new list and move everything to it.\n- Map<String, MapUserCredentialEntity> credentialEntityMap = userEntity.getCredentials();\n- List<MapUserCredentialEntity> newList = credentialEntityMap == null ? new LinkedList<>()\n- : credentialEntityMap.values().stream()\n- .sorted(MapUserCredentialEntity.ORDER_BY_PRIORITY)\n- .collect(Collectors.toList());\n-\n- // 2 - Find indexes of our and newPrevious credential\n- int ourCredentialIndex = -1;\n- int newPreviousCredentialIndex = -1;\n- MapUserCredentialEntity ourCredential = null;\n- int i = 0;\n- for (MapUserCredentialEntity credential : newList) {\n- if (id.equals(credential.getId())) {\n- ourCredentialIndex = i;\n- ourCredential = credential;\n- } else if(newPreviousCredentialId != null && newPreviousCredentialId.equals(credential.getId())) {\n- newPreviousCredentialIndex = i;\n- }\n- i++;\n- }\n-\n- if (ourCredentialIndex == -1) {\n- LOG.warnf(\"Not found credential with id [%s] of user [%s]\", id, user.getUsername());\n- return false;\n- }\n-\n- if (newPreviousCredentialId != null && newPreviousCredentialIndex == -1) {\n- LOG.warnf(\"Can't move up credential with id [%s] of user [%s]\", id, user.getUsername());\n- return false;\n- }\n-\n- // 3 - Compute index where we move our credential\n- int toMoveIndex = newPreviousCredentialId==null ? 0 : newPreviousCredentialIndex + 1;\n-\n- // 4 - Insert our credential to new position, remove it from the old position\n- newList.add(toMoveIndex, ourCredential);\n- int indexToRemove = toMoveIndex < ourCredentialIndex ? ourCredentialIndex + 1 : ourCredentialIndex;\n- newList.remove(indexToRemove);\n-\n- // 5 - newList contains credentials in requested order now. Iterate through whole list and change priorities accordingly.\n- int expectedPriority = 0;\n- for (MapUserCredentialEntity credential : newList) {\n- expectedPriority += PRIORITY_DIFFERENCE;\n- if (credential.getPriority() != expectedPriority) {\n- credential.setPriority(expectedPriority);\n-\n- LOG.tracef(\"Priority of credential [%s] of user [%s] changed to [%d]\", credential.getId(), user.getUsername(), expectedPriority);\n- }\n- }\n- return true;\n+ LOG.tracef(\"moveCredentialTo(%s, %s, %s, %s)%s\", realm, user, id, newPreviousCredentialId, getShortStackTrace());\n+ return getEntityByIdOrThrow(realm, user.getId()).moveCredential(id, newPreviousCredentialId);\n}\n@Override\n" }, { "change_type": "ADD", "old_path": null, "new_path": "model/map/src/test/java/org/keycloak/models/map/user/MapUserEntityImplCredentialsOrderTest.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.user;\n+\n+import org.junit.Before;\n+import org.junit.Test;\n+import org.hamcrest.Matchers;\n+\n+import static org.hamcrest.CoreMatchers.is;\n+import static org.hamcrest.MatcherAssert.assertThat;\n+\n+import org.keycloak.models.map.common.DeepCloner;\n+\n+import java.util.List;\n+import java.util.stream.Collectors;\n+\n+public class MapUserEntityImplCredentialsOrderTest {\n+\n+ private MapUserEntity user;\n+ private final static DeepCloner CLONER = new DeepCloner.Builder()\n+ .constructor(MapUserCredentialEntityImpl.class, MapUserCredentialEntityImpl::new)\n+ .build();\n+\n+ @Before\n+ public void init() {\n+ user = new MapUserEntityImpl(CLONER);\n+\n+ for (int i = 1; i <= 5; i++) {\n+ MapUserCredentialEntity credentialModel = new MapUserCredentialEntityImpl();\n+ credentialModel.setId(Integer.toString(i));\n+\n+ user.addCredential(credentialModel);\n+ }\n+\n+ user.clearUpdatedFlag();\n+ }\n+\n+ private void assertOrder(Integer... ids) {\n+ List<Integer> currentList = user.getCredentials().stream().map(entity -> Integer.valueOf(entity.getId())).collect(Collectors.toList());\n+ assertThat(currentList, Matchers.contains(ids));\n+ }\n+\n+ @Test\n+ public void testCorrectOrder() {\n+ assertOrder(1, 2, 3, 4, 5);\n+ }\n+\n+ @Test\n+ public void testMoveToZero() {\n+ user.moveCredential(\"3\", null);\n+ assertOrder(3, 1, 2, 4, 5);\n+ assertThat(user.isUpdated(), is(true));\n+ }\n+\n+ @Test\n+ public void testMoveBack() {\n+ user.moveCredential(\"4\", \"1\");\n+ assertOrder(1, 4, 2, 3, 5);\n+ assertThat(user.isUpdated(), is(true));\n+ }\n+\n+ @Test\n+ public void testMoveForward() {\n+ user.moveCredential(\"2\", \"4\");\n+ assertOrder(1, 3, 4, 2, 5);\n+ assertThat(user.isUpdated(), is(true));\n+ }\n+\n+ @Test\n+ public void testSamePosition() {\n+ user.moveCredential(\"2\", \"1\");\n+ assertOrder(1, 2, 3, 4, 5);\n+ assertThat(user.isUpdated(), is(false));\n+ }\n+\n+ @Test\n+ public void testSamePositionZero() {\n+ user.moveCredential(\"1\", null);\n+ assertOrder(1, 2, 3, 4, 5);\n+ assertThat(user.isUpdated(), is(false));\n+ }\n+}\n\\ No newline at end of file\n" } ]

[ { "change_type": "MODIFY", "old_path": "core/src/main/java/org/keycloak/OAuthErrorException.java", "new_path": "core/src/main/java/org/keycloak/OAuthErrorException.java", "diff": "@@ -53,6 +53,9 @@ public class OAuthErrorException extends Exception {\npublic static final String SLOW_DOWN = \"slow_down\";\npublic static final String EXPIRED_TOKEN = \"expired_token\";\n+ // CIBA\n+ public static final String INVALID_BINDING_MESSAGE = \"invalid_binding_message\";\n+\n// Others\npublic static final String INVALID_CLIENT = \"invalid_client\";\npublic static final String INVALID_GRANT = \"invalid_grant\";\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": "@@ -54,6 +54,7 @@ import javax.ws.rs.core.Response;\nimport java.util.Collections;\nimport java.util.Optional;\n+import java.util.regex.Pattern;\nimport static org.keycloak.protocol.oidc.OIDCLoginProtocol.ID_TOKEN_HINT;\nimport static org.keycloak.protocol.oidc.OIDCLoginProtocol.LOGIN_HINT_PARAM;\n@@ -62,6 +63,8 @@ public class BackchannelAuthenticationEndpoint extends AbstractCibaEndpoint {\nprivate final RealmModel realm;\n+ private static final Pattern BINDING_MESSAGE_VALIDATION = Pattern.compile(\"^[a-zA-Z0-9-._+/!?#]{1,50}$\");\n+\npublic BackchannelAuthenticationEndpoint(KeycloakSession session, EventBuilder event) {\nsuper(session, event);\nthis.realm = session.getContext().getRealm();\n@@ -172,7 +175,10 @@ public class BackchannelAuthenticationEndpoint extends AbstractCibaEndpoint {\nrequest.setScope(scope);\n// optional parameters\n- if (endpointRequest.getBindingMessage() != null) request.setBindingMessage(endpointRequest.getBindingMessage());\n+ if (endpointRequest.getBindingMessage() != null) {\n+ validateBindingMessage(endpointRequest.getBindingMessage());\n+ request.setBindingMessage(endpointRequest.getBindingMessage());\n+ }\nif (endpointRequest.getAcr() != null) request.setAcrValues(endpointRequest.getAcr());\nCibaConfig policy = realm.getCibaPolicy();\n@@ -228,6 +234,13 @@ public class BackchannelAuthenticationEndpoint extends AbstractCibaEndpoint {\n}\n}\n+ protected void validateBindingMessage(String bindingMessage) {\n+ if (!BINDING_MESSAGE_VALIDATION.matcher(bindingMessage).matches()) {\n+ throw new ErrorResponseException(OAuthErrorException.INVALID_BINDING_MESSAGE, \"the binding_message value has to be max 50 characters in length and must contain only basic plain-text characters without spaces\",\n+ Response.Status.BAD_REQUEST);\n+ }\n+ }\n+\nprivate UserModel resolveUser(BackchannelAuthenticationEndpointRequest endpointRequest, String authRequestedUserHint) {\nCIBALoginUserResolver resolver = session.getProvider(CIBALoginUserResolver.class);\n" } ]

[ { "change_type": "MODIFY", "old_path": "distribution/server-x-dist/src/main/README.md", "new_path": "distribution/server-x-dist/src/main/README.md", "diff": "Keycloak.X\n==========\n-To run on Linux/Unix:\n+To get help configuring Keycloak via the CLI, run:\n+\n+on Linux/Unix:\n$ bin/kc.sh\n-To run on Windows:\n+on Windows:\n$ bin\\kc.bat\n+To try Keycloak out in development mode, run:\n+\n+on Linux/Unix:\n+\n+ $ bin/kc.sh start-dev\n+\n+on Windows:\n+\n+ $ bin\\kc.bat start-dev\n+\nAfter the server boots, open http://localhost:8080 in your web browser. The welcome page will indicate that the server is running.\nTo get started, check the [Server Administration Guide](https://www.keycloak.org/docs/latest/server_admin).\n\\ No newline at end of file\n" }, { "change_type": "MODIFY", "old_path": "distribution/server-x-dist/src/main/content/providers/README.md", "new_path": "distribution/server-x-dist/src/main/content/providers/README.md", "diff": "Installing Custom Providers\n===========================\n-You should add to this directory your custom provider JAR files.\n+Add your custom provider JAR files in this directory.\n-Once you have your providers in this directory you should run the following command to complete the installation:\n+Once you have your providers in this directory, run the following command to complete the installation:\n```\n-${kc.home.dir}/bin/kc.sh config\n+${kc.home.dir}/bin/kc.sh build\n```\n\\ No newline at end of file\n" }, { "change_type": "MODIFY", "old_path": "distribution/server-x-dist/src/main/content/themes/README.md", "new_path": "distribution/server-x-dist/src/main/content/themes/README.md", "diff": "@@ -4,10 +4,10 @@ Creating Themes\nThemes are used to configure the look and feel of login pages and the account management console.\nCustom themes packaged in a JAR file should be deployed to the `${kc.home.dir}/providers` directory and you should run\n-the `config` command to install them prior to running the server.\n+the `build` command to install them prior to running the server.\n-You should also be able to create your custom themes in this directory, directly. Themes within this directory do not require\n-the `config` command to install them.\n+You are also able to create your custom themes in this directory, directly. Themes within this directory do not require\n+the `build` command to install them.\nWhen running the server in development mode, themes are not cached so that you can easily work on them without any need to restart\nthe server when making changes.\n" } ]

[ { "change_type": "MODIFY", "old_path": "distribution/server-x-dist/assembly.xml", "new_path": "distribution/server-x-dist/assembly.xml", "diff": "<source>target/keycloak-quarkus-server/cache-ispn.xml</source>\n<outputDirectory>conf</outputDirectory>\n</file>\n- <file>\n- <source>../../quarkus/runtime/src/main/resources/META-INF/keycloak.properties</source>\n- <outputDirectory>conf</outputDirectory>\n- </file>\n</files>\n</assembly>\n" }, { "change_type": "ADD", "old_path": null, "new_path": "distribution/server-x-dist/src/main/content/conf/keycloak.properties", "diff": "+# Basic settings for running in production. Change accordingly before deploying the server.\n+# Database\n+#%prod.db=postgres\n+#%prod.db.username=keycloak\n+#%prod.db.password=password\n+#%prod.db.url=jdbc:postgresql://localhost/keycloak\n+# Observability\n+#%prod.metrics.enabled=true\n+# HTTP\n+#%prod.spi.hostname.frontend-url=https://localhost:8443\n+#%prod.https.certificate.file=${kc.home.dir}conf/server.crt.pem\n+#%prod.https.certificate.key-file=${kc.home.dir}conf/server.key.pem\n+#%prod.proxy=reencrypt\n+#%prod.hostname=myhostname\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": "package org.keycloak.quarkus.runtime;\nimport static org.keycloak.quarkus.runtime.configuration.Configuration.getBuildTimeProperty;\n+import static org.keycloak.quarkus.runtime.configuration.Configuration.getConfig;\nimport java.io.File;\nimport java.io.FilenameFilter;\n@@ -108,6 +109,13 @@ public final class Environment {\nSystem.setProperty(ProfileManager.QUARKUS_TEST_PROFILE_PROP, profile);\n}\n}\n+ public static String getCurrentOrPersistedProfile() {\n+ String profile = getProfile();\n+ if(profile == null) {\n+ profile = getConfig().getRawValue(PROFILE);\n+ }\n+ return profile;\n+ }\npublic static String getProfileOrDefault(String defaultProfile) {\nString profile = getProfile();\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;\n-import static org.keycloak.quarkus.runtime.configuration.Configuration.getBuildTimeProperty;\n+import static org.keycloak.quarkus.runtime.Environment.getCurrentOrPersistedProfile;\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.canonicalFormat;\n@@ -33,7 +33,6 @@ import java.util.stream.StreamSupport;\nimport org.keycloak.quarkus.runtime.configuration.MicroProfileConfigProvider;\nimport org.keycloak.quarkus.runtime.configuration.PersistedConfigSource;\n-import org.keycloak.quarkus.runtime.Environment;\nimport io.quarkus.runtime.Quarkus;\nimport io.smallrye.config.ConfigValue;\n@@ -59,7 +58,7 @@ public final class ShowConfig extends AbstractCommand implements Runnable {\nif (configArgs != null) {\nMap<String, Set<String>> properties = getPropertiesByGroup();\n- String profile = getProfile();\n+ String profile = getCurrentOrPersistedProfile();\nprintRunTimeConfig(properties, profile);\n@@ -83,6 +82,7 @@ public final class ShowConfig extends AbstractCommand implements Runnable {\nspec.commandLine().getOut().printf(\"Current Profile: %s%n\", profile == null ? \"none\" : profile);\nspec.commandLine().getOut().println(\"Runtime Configuration:\");\n+\nproperties.get(MicroProfileConfigProvider.NS_KEYCLOAK).stream().sorted()\n.filter(name -> {\nString canonicalFormat = canonicalFormat(name);\n@@ -115,16 +115,6 @@ public final class ShowConfig extends AbstractCommand implements Runnable {\n}\n}\n- private static String getProfile() {\n- String profile = Environment.getProfile();\n-\n- if (profile == null) {\n- return getBuildTimeProperty(\"quarkus.profile\").orElse(null);\n- }\n-\n- return profile;\n- }\n-\nprivate static Map<String, Set<String>> getPropertiesByGroup() {\nMap<String, Set<String>> properties = StreamSupport\n.stream(getPropertyNames().spliterator(), false)\n" }, { "change_type": "MODIFY", "old_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/ConfigArgsConfigSource.java", "new_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/ConfigArgsConfigSource.java", "diff": "@@ -62,8 +62,7 @@ public class ConfigArgsConfigSource extends PropertiesConfigSource {\n}\nprotected ConfigArgsConfigSource() {\n- // higher priority over default Quarkus config sources\n- super(parseArgument(), \"CliConfigSource\", 500);\n+ super(parseArgument(), \"CliConfigSource\", 600);\n}\npublic static void setCliArgs(String[] args) {\n" }, { "change_type": "MODIFY", "old_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/KcEnvConfigSource.java", "new_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/KcEnvConfigSource.java", "diff": "@@ -27,6 +27,10 @@ import io.smallrye.config.EnvConfigSource;\npublic class KcEnvConfigSource extends EnvConfigSource {\n+ public KcEnvConfigSource() {\n+ super(buildProperties(), 500);\n+ }\n+\nprivate static Map<String, String> buildProperties() {\nMap<String, String> properties = new HashMap<>();\n@@ -40,10 +44,7 @@ public class KcEnvConfigSource extends EnvConfigSource {\nreturn properties;\n}\n- public KcEnvConfigSource() {\n- super(buildProperties(), 350);\n- }\n-\n+ @Override\npublic String getName() {\nreturn \"KcEnvVarConfigSource\";\n}\n" }, { "change_type": "MODIFY", "old_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/KeycloakPropertiesConfigSource.java", "new_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/KeycloakPropertiesConfigSource.java", "diff": "@@ -68,7 +68,7 @@ public class KeycloakPropertiesConfigSource extends AbstractLocationConfigSource\n@Override\npublic List<ConfigSource> getConfigSources(final ClassLoader classLoader) {\n- return loadConfigSources(\"META-INF/keycloak.properties\", 240, classLoader);\n+ return loadConfigSources(\"META-INF/keycloak.properties\", 150, classLoader);\n}\n@Override\n@@ -104,7 +104,7 @@ public class KeycloakPropertiesConfigSource extends AbstractLocationConfigSource\nreturn Collections.emptyList();\n}\n- return loadConfigSources(configFile.toUri().toString(), 250, classLoader);\n+ return loadConfigSources(configFile.toUri().toString(), 450, classLoader);\n}\n@Override\n" }, { "change_type": "MODIFY", "old_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/MicroProfileConfigProvider.java", "new_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/MicroProfileConfigProvider.java", "diff": "@@ -32,7 +32,6 @@ public class MicroProfileConfigProvider implements Config.ConfigProvider {\npublic static final String NS_KEYCLOAK = \"kc\";\npublic static final String NS_KEYCLOAK_PREFIX = NS_KEYCLOAK + \".\";\npublic static final String NS_QUARKUS = \"quarkus\";\n- public static final String NS_QUARKUS_PREFIX = NS_QUARKUS + \".\";\nprivate final org.eclipse.microprofile.config.Config config;\n" }, { "change_type": "MODIFY", "old_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/PersistedConfigSource.java", "new_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/PersistedConfigSource.java", "diff": "@@ -44,7 +44,7 @@ public final class PersistedConfigSource extends PropertiesConfigSource {\nprivate static final PersistedConfigSource INSTANCE = new PersistedConfigSource();\nprivate PersistedConfigSource() {\n- super(readProperties(), \"\", 300);\n+ super(readProperties(), \"\", 200);\n}\npublic static PersistedConfigSource getInstance() {\n" }, { "change_type": "MODIFY", "old_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/SysPropConfigSource.java", "new_path": "quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/SysPropConfigSource.java", "diff": "@@ -60,6 +60,6 @@ public class SysPropConfigSource implements ConfigSource {\n@Override\npublic int getOrdinal() {\n- return 400;\n+ return 550;\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "quarkus/runtime/src/main/resources/META-INF/keycloak.properties", "new_path": "quarkus/runtime/src/main/resources/META-INF/keycloak.properties", "diff": "@@ -9,21 +9,6 @@ http.enabled=false\n# Metrics and healthcheck are disabled by default\nmetrics.enabled=false\n-# Basic settings for running in production. Change accordingly before deploying the server.\n-# Database\n-#%prod.db=postgres\n-#%prod.db.username=keycloak\n-#%prod.db.password=password\n-#%prod.db.url=jdbc:postgresql://localhost/keycloak\n-# Observability\n-#%prod.metrics.enabled=true\n-# HTTP\n-#%prod.spi.hostname.frontend-url=https://localhost:8443\n-#%prod.https.certificate.file=${kc.home.dir}conf/server.crt.pem\n-#%prod.https.certificate.key-file=${kc.home.dir}conf/server.key.pem\n-#%prod.proxy=reencrypt\n-#%prod.hostname=myhostname\n-\n# Default, and insecure, and non-production grade configuration for the development profile\n%dev.http.enabled=true\n%dev.hostname.strict=false\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/jpa/src/main/java/org/keycloak/models/jpa/UserAdapter.java", "new_path": "model/jpa/src/main/java/org/keycloak/models/jpa/UserAdapter.java", "diff": "@@ -175,10 +175,12 @@ public class UserAdapter implements UserModel.Streams, JpaModel<UserEntity> {\n}\n// Remove all existing\nremoveAttribute(name);\n+ if (values != null) {\nfor (Iterator<String> it = values.stream().filter(Objects::nonNull).iterator(); it.hasNext();) {\npersistAttributeValue(name, it.next());\n}\n}\n+ }\nprivate void persistAttributeValue(String name, String value) {\nUserAttributeEntity attr = new UserAttributeEntity();\n" } ]

[ { "change_type": "MODIFY", "old_path": "common/src/main/java/org/keycloak/common/Profile.java", "new_path": "common/src/main/java/org/keycloak/common/Profile.java", "diff": "@@ -64,7 +64,8 @@ public class Profile {\nCIBA(Type.DEFAULT),\nMAP_STORAGE(Type.EXPERIMENTAL),\nPAR(Type.DEFAULT),\n- DECLARATIVE_USER_PROFILE(Type.PREVIEW);\n+ DECLARATIVE_USER_PROFILE(Type.PREVIEW),\n+ DYNAMIC_SCOPES(Type.EXPERIMENTAL);\nprivate final Type typeProject;\nprivate final Type typeProduct;\n" }, { "change_type": "MODIFY", "old_path": "common/src/test/java/org/keycloak/common/ProfileTest.java", "new_path": "common/src/test/java/org/keycloak/common/ProfileTest.java", "diff": "@@ -21,7 +21,7 @@ public class ProfileTest {\n@Test\npublic void checkDefaultsKeycloak() {\nAssert.assertEquals(\"community\", Profile.getName());\n- assertEquals(Profile.getDisabledFeatures(), Profile.Feature.ADMIN_FINE_GRAINED_AUTHZ, Profile.Feature.ADMIN2, Profile.Feature.DOCKER, Profile.Feature.SCRIPTS, Profile.Feature.TOKEN_EXCHANGE, Profile.Feature.OPENSHIFT_INTEGRATION, Profile.Feature.UPLOAD_SCRIPTS, Profile.Feature.MAP_STORAGE, Profile.Feature.DECLARATIVE_USER_PROFILE);\n+ assertEquals(Profile.getDisabledFeatures(), Profile.Feature.ADMIN_FINE_GRAINED_AUTHZ, Profile.Feature.DYNAMIC_SCOPES, Profile.Feature.ADMIN2, Profile.Feature.DOCKER, Profile.Feature.SCRIPTS, Profile.Feature.TOKEN_EXCHANGE, Profile.Feature.OPENSHIFT_INTEGRATION, Profile.Feature.UPLOAD_SCRIPTS, Profile.Feature.MAP_STORAGE, Profile.Feature.DECLARATIVE_USER_PROFILE);\nassertEquals(Profile.getPreviewFeatures(), Profile.Feature.ADMIN_FINE_GRAINED_AUTHZ, Profile.Feature.SCRIPTS, Profile.Feature.TOKEN_EXCHANGE, Profile.Feature.OPENSHIFT_INTEGRATION, Profile.Feature.DECLARATIVE_USER_PROFILE);\nassertEquals(Profile.getDeprecatedFeatures(), Profile.Feature.UPLOAD_SCRIPTS);\n@@ -37,7 +37,7 @@ public class ProfileTest {\nProfile.init();\nAssert.assertEquals(\"product\", Profile.getName());\n- assertEquals(Profile.getDisabledFeatures(), Profile.Feature.ADMIN_FINE_GRAINED_AUTHZ, Profile.Feature.ADMIN2, Profile.Feature.DOCKER, Profile.Feature.SCRIPTS, Profile.Feature.TOKEN_EXCHANGE, Profile.Feature.OPENSHIFT_INTEGRATION, Profile.Feature.UPLOAD_SCRIPTS, Profile.Feature.WEB_AUTHN, Profile.Feature.MAP_STORAGE, Profile.Feature.DECLARATIVE_USER_PROFILE);\n+ assertEquals(Profile.getDisabledFeatures(), Profile.Feature.ADMIN_FINE_GRAINED_AUTHZ, Profile.Feature.DYNAMIC_SCOPES, Profile.Feature.ADMIN2, Profile.Feature.DOCKER, Profile.Feature.SCRIPTS, Profile.Feature.TOKEN_EXCHANGE, Profile.Feature.OPENSHIFT_INTEGRATION, Profile.Feature.UPLOAD_SCRIPTS, Profile.Feature.WEB_AUTHN, Profile.Feature.MAP_STORAGE, Profile.Feature.DECLARATIVE_USER_PROFILE);\nassertEquals(Profile.getPreviewFeatures(), Profile.Feature.ADMIN_FINE_GRAINED_AUTHZ, Profile.Feature.SCRIPTS, Profile.Feature.TOKEN_EXCHANGE, Profile.Feature.OPENSHIFT_INTEGRATION, Profile.Feature.WEB_AUTHN, Profile.Feature.DECLARATIVE_USER_PROFILE);\nassertEquals(Profile.getDeprecatedFeatures(), Profile.Feature.UPLOAD_SCRIPTS);\n" }, { "change_type": "MODIFY", "old_path": "quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testBuildHelp.approved.txt", "new_path": "quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testBuildHelp.approved.txt", "diff": "Binary files a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testBuildHelp.approved.txt and b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testBuildHelp.approved.txt differ\n" }, { "change_type": "MODIFY", "old_path": "quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testBuildHelpAll.approved.txt", "new_path": "quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testBuildHelpAll.approved.txt", "diff": "Binary files a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testBuildHelpAll.approved.txt and b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testBuildHelpAll.approved.txt differ\n" }, { "change_type": "MODIFY", "old_path": "quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testStartDevHelpAll.approved.txt", "new_path": "quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testStartDevHelpAll.approved.txt", "diff": "Binary files a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testStartDevHelpAll.approved.txt and b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/approvals/cli/help/HelpCommandTest.testStartDevHelpAll.approved.txt differ\n" }, { "change_type": "MODIFY", "old_path": "server-spi-private/src/main/java/org/keycloak/models/delegate/ClientModelLazyDelegate.java", "new_path": "server-spi-private/src/main/java/org/keycloak/models/delegate/ClientModelLazyDelegate.java", "diff": "@@ -508,6 +508,21 @@ public class ClientModelLazyDelegate implements ClientModel {\ngetDelegate().setIncludeInTokenScope(includeInTokenScope);\n}\n+ @Override\n+ public boolean isDynamicScope() {\n+ return getDelegate().isDynamicScope();\n+ }\n+\n+ @Override\n+ public void setIsDynamicScope(boolean isDynamicScope) {\n+ getDelegate().setIsDynamicScope(isDynamicScope);\n+ }\n+\n+ @Override\n+ public String getDynamicScopeRegexp() {\n+ return getDelegate().getDynamicScopeRegexp();\n+ }\n+\n@Override\npublic Set<RoleModel> getScopeMappings() {\nreturn getDelegate().getScopeMappings();\n" }, { "change_type": "MODIFY", "old_path": "server-spi/src/main/java/org/keycloak/models/ClientScopeModel.java", "new_path": "server-spi/src/main/java/org/keycloak/models/ClientScopeModel.java", "diff": "package org.keycloak.models;\nimport java.util.Map;\n+import java.util.Optional;\nimport org.keycloak.common.util.ObjectUtil;\nimport org.keycloak.provider.ProviderEvent;\n@@ -67,6 +68,8 @@ public interface ClientScopeModel extends ProtocolMapperContainerModel, ScopeCon\nString CONSENT_SCREEN_TEXT = \"consent.screen.text\";\nString GUI_ORDER = \"gui.order\";\nString INCLUDE_IN_TOKEN_SCOPE = \"include.in.token.scope\";\n+ String IS_DYNAMIC_SCOPE = \"is.dynamic.scope\";\n+ String DYNAMIC_SCOPE_REGEXP = \"dynamic.scope.regexp\";\ndefault boolean isDisplayOnConsentScreen() {\nString displayVal = getAttribute(DISPLAY_ON_CONSENT_SCREEN);\n@@ -107,4 +110,16 @@ public interface ClientScopeModel extends ProtocolMapperContainerModel, ScopeCon\ndefault void setIncludeInTokenScope(boolean includeInTokenScope) {\nsetAttribute(INCLUDE_IN_TOKEN_SCOPE, String.valueOf(includeInTokenScope));\n}\n+\n+ default boolean isDynamicScope() {\n+ return Optional.ofNullable(getAttribute(IS_DYNAMIC_SCOPE)).isPresent();\n+ }\n+\n+ default void setIsDynamicScope(boolean isDynamicScope) {\n+ setAttribute(IS_DYNAMIC_SCOPE, String.valueOf(isDynamicScope));\n+ }\n+\n+ default String getDynamicScopeRegexp() {\n+ return getAttribute(DYNAMIC_SCOPE_REGEXP);\n+ }\n}\n" }, { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/services/resources/admin/ClientScopeResource.java", "new_path": "services/src/main/java/org/keycloak/services/resources/admin/ClientScopeResource.java", "diff": "@@ -19,6 +19,8 @@ package org.keycloak.services.resources.admin;\nimport org.jboss.logging.Logger;\nimport org.jboss.resteasy.annotations.cache.NoCache;\nimport org.jboss.resteasy.spi.ResteasyProviderFactory;\n+import org.keycloak.common.Profile;\n+import org.keycloak.events.Errors;\nimport org.keycloak.events.admin.OperationType;\nimport org.keycloak.events.admin.ResourceType;\nimport org.keycloak.models.ClientScopeModel;\n@@ -29,7 +31,9 @@ import org.keycloak.models.RealmModel;\nimport org.keycloak.models.utils.ModelToRepresentation;\nimport org.keycloak.models.utils.RepresentationToModel;\nimport org.keycloak.representations.idm.ClientScopeRepresentation;\n+import org.keycloak.saml.common.util.StringUtil;\nimport org.keycloak.services.ErrorResponse;\n+import org.keycloak.services.ErrorResponseException;\nimport org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator;\nimport javax.ws.rs.Consumes;\n@@ -41,6 +45,10 @@ import javax.ws.rs.Produces;\nimport javax.ws.rs.core.MediaType;\nimport javax.ws.rs.core.Response;\n+import java.util.Map;\n+import java.util.Optional;\n+import java.util.regex.Pattern;\n+\n/**\n* Base resource class for managing one particular client of a realm.\n@@ -56,6 +64,7 @@ public class ClientScopeResource {\nprivate AdminEventBuilder adminEvent;\nprotected ClientScopeModel clientScope;\nprotected KeycloakSession session;\n+ protected static Pattern dynamicScreenPattern = Pattern.compile(\"[^\\\\s\\\\*]*\\\\*{1}[^\\\\s\\\\*]*\");\npublic ClientScopeResource(RealmModel realm, AdminPermissionEvaluator auth, ClientScopeModel clientScope, KeycloakSession session, AdminEventBuilder adminEvent) {\nthis.realm = realm;\n@@ -96,7 +105,7 @@ public class ClientScopeResource {\n@Consumes(MediaType.APPLICATION_JSON)\npublic Response update(final ClientScopeRepresentation rep) {\nauth.clients().requireManageClientScopes();\n-\n+ validateDynamicClientScope(rep);\ntry {\nRepresentationToModel.updateClientScope(rep, clientScope);\nadminEvent.operation(OperationType.UPDATE).resourcePath(session.getContext().getUri()).representation(rep).success();\n@@ -143,4 +152,41 @@ public class ClientScopeResource {\nreturn ErrorResponse.error(me.getMessage(), Response.Status.BAD_REQUEST);\n}\n}\n+\n+ /**\n+ * Performs some validation based on attributes combinations and format.\n+ * Validations differ based on whether the DYNAMIC_SCOPES feature is enabled or not\n+ * @param clientScope\n+ * @throws ErrorResponseException\n+ */\n+ public static void validateDynamicClientScope(ClientScopeRepresentation clientScope) throws ErrorResponseException {\n+ if(clientScope.getAttributes() == null) {\n+ return;\n+ }\n+ boolean isDynamic = Boolean.parseBoolean(clientScope.getAttributes().get(ClientScopeModel.IS_DYNAMIC_SCOPE));\n+ String regexp = clientScope.getAttributes().get(ClientScopeModel.DYNAMIC_SCOPE_REGEXP);\n+ if(Profile.isFeatureEnabled(Profile.Feature.DYNAMIC_SCOPES)) {\n+ // if the scope is dynamic but the regexp is empty, it's not considered valid\n+ if(isDynamic && StringUtil.isNullOrEmpty(regexp)) {\n+ throw new ErrorResponseException(ErrorResponse.error(\"Dynamic scope regexp must not be null or empty\", Response.Status.BAD_REQUEST));\n+ }\n+ // Always validate the dynamic scope regexp to avoid inserting a wrong value even when the feature is disabled\n+ if(!StringUtil.isNullOrEmpty(regexp) && !dynamicScreenPattern.matcher(regexp).matches()) {\n+ throw new ErrorResponseException(ErrorResponse.error(String.format(\"Invalid format for the Dynamic Scope regexp %1s\", regexp), Response.Status.BAD_REQUEST));\n+ }\n+ } else {\n+ // if the value is not null or empty we won't accept the request as the feature is disabled\n+ Optional.ofNullable(regexp).ifPresent(s -> {\n+ if(!s.isEmpty()) {\n+ throw new ErrorResponseException(ErrorResponse.error(String.format(\"Unexpected value \\\"%1s\\\" for attribute %2s in ClientScope\",\n+ regexp, ClientScopeModel.DYNAMIC_SCOPE_REGEXP), Response.Status.BAD_REQUEST));\n+ }\n+ });\n+ // If isDynamic is true, we won't accept the request as the feature is disabled\n+ if(isDynamic) {\n+ throw new ErrorResponseException(ErrorResponse.error(String.format(\"Unexpected value \\\"%1s\\\" for attribute %2s in ClientScope\",\n+ isDynamic, ClientScopeModel.IS_DYNAMIC_SCOPE), Response.Status.BAD_REQUEST));\n+ }\n+ }\n+ }\n}\n" }, { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/services/resources/admin/ClientScopesResource.java", "new_path": "services/src/main/java/org/keycloak/services/resources/admin/ClientScopesResource.java", "diff": "@@ -94,7 +94,7 @@ public class ClientScopesResource {\n@NoCache\npublic Response createClientScope(ClientScopeRepresentation rep) {\nauth.clients().requireManageClientScopes();\n-\n+ ClientScopeResource.validateDynamicClientScope(rep);\ntry {\nClientScopeModel clientModel = RepresentationToModel.createClientScope(session, realm, rep);\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/ClientScopeTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/ClientScopeTest.java", "diff": "@@ -24,10 +24,12 @@ import org.keycloak.admin.client.resource.ClientScopesResource;\nimport org.keycloak.admin.client.resource.ProtocolMappersResource;\nimport org.keycloak.admin.client.resource.RealmResource;\nimport org.keycloak.admin.client.resource.RoleMappingResource;\n+import org.keycloak.common.Profile;\nimport org.keycloak.common.util.ObjectUtil;\nimport org.keycloak.events.admin.OperationType;\nimport org.keycloak.events.admin.ResourceType;\nimport org.keycloak.models.AccountRoles;\n+import org.keycloak.models.ClientScopeModel;\nimport org.keycloak.models.Constants;\nimport org.keycloak.protocol.oidc.OIDCLoginProtocol;\nimport org.keycloak.protocol.saml.SamlProtocol;\n@@ -38,15 +40,19 @@ import org.keycloak.representations.idm.MappingsRepresentation;\nimport org.keycloak.representations.idm.ProtocolMapperRepresentation;\nimport org.keycloak.representations.idm.RoleRepresentation;\nimport org.keycloak.testsuite.admin.ApiUtil;\n+import org.keycloak.testsuite.arquillian.annotation.DisableFeature;\n+import org.keycloak.testsuite.arquillian.annotation.EnableFeature;\nimport org.keycloak.testsuite.util.AdminEventPaths;\nimport org.keycloak.testsuite.util.ClientBuilder;\nimport org.keycloak.testsuite.util.Matchers;\nimport org.keycloak.testsuite.util.RoleBuilder;\n+import org.keycloak.util.JsonSerialization;\nimport javax.ws.rs.ClientErrorException;\nimport javax.ws.rs.NotFoundException;\nimport javax.ws.rs.core.Response;\nimport javax.ws.rs.core.Response.Status;\n+import java.io.IOException;\nimport java.util.Collections;\nimport java.util.HashMap;\nimport java.util.List;\n@@ -58,6 +64,7 @@ import static org.junit.Assert.assertEquals;\nimport static org.junit.Assert.assertFalse;\nimport static org.junit.Assert.assertThat;\nimport static org.junit.Assert.assertTrue;\n+import static org.junit.Assert.fail;\nimport static org.keycloak.testsuite.Assert.assertNames;\n/**\n@@ -653,6 +660,99 @@ public class ClientScopeTest extends AbstractClientTest {\ntestRealmResource().clients().get(clientUuid).update(clientRep);\n}\n+ @Test\n+ @EnableFeature(value = Profile.Feature.DYNAMIC_SCOPES, skipRestart = true)\n+ public void testCreateValidDynamicScope() {\n+ ClientScopeRepresentation scopeRep = new ClientScopeRepresentation();\n+ scopeRep.setName(\"dynamic-scope-def\");\n+ scopeRep.setProtocol(\"openid-connect\");\n+ scopeRep.setAttributes(new HashMap<String, String>(){{\n+ put(ClientScopeModel.IS_DYNAMIC_SCOPE, \"true\");\n+ put(ClientScopeModel.DYNAMIC_SCOPE_REGEXP, \"dynamic-scope-def:*\");\n+ }});\n+ String scopeDefId = createClientScope(scopeRep);\n+ getCleanup().addClientScopeId(scopeDefId);\n+\n+ // Assert updated attributes\n+ scopeRep = clientScopes().get(scopeDefId).toRepresentation();\n+ assertEquals(\"dynamic-scope-def\", scopeRep.getName());\n+ assertEquals(\"true\", scopeRep.getAttributes().get(ClientScopeModel.IS_DYNAMIC_SCOPE));\n+ assertEquals(\"dynamic-scope-def:*\", scopeRep.getAttributes().get(ClientScopeModel.DYNAMIC_SCOPE_REGEXP));\n+ }\n+\n+ @Test\n+ @EnableFeature(value = Profile.Feature.DYNAMIC_SCOPES, skipRestart = true)\n+ public void testCreateNonDynamicScopeWithFeatureEnabled() {\n+ ClientScopeRepresentation scopeRep = new ClientScopeRepresentation();\n+ scopeRep.setName(\"non-dynamic-scope-def\");\n+ scopeRep.setProtocol(\"openid-connect\");\n+ scopeRep.setAttributes(new HashMap<String, String>(){{\n+ put(ClientScopeModel.IS_DYNAMIC_SCOPE, \"false\");\n+ put(ClientScopeModel.DYNAMIC_SCOPE_REGEXP, \"\");\n+ }});\n+ String scopeDefId = createClientScope(scopeRep);\n+ getCleanup().addClientScopeId(scopeDefId);\n+\n+ // Assert updated attributes\n+ scopeRep = clientScopes().get(scopeDefId).toRepresentation();\n+ assertEquals(\"non-dynamic-scope-def\", scopeRep.getName());\n+ assertEquals(\"false\", scopeRep.getAttributes().get(ClientScopeModel.IS_DYNAMIC_SCOPE));\n+ assertEquals(\"\", scopeRep.getAttributes().get(ClientScopeModel.DYNAMIC_SCOPE_REGEXP));\n+ }\n+\n+ @Test\n+ @DisableFeature(value = Profile.Feature.DYNAMIC_SCOPES, skipRestart = true)\n+ public void testCreateDynamicScopeWithFeatureDisabledAndIsDynamicScopeTrue() {\n+ ClientScopeRepresentation scopeRep = new ClientScopeRepresentation();\n+ scopeRep.setName(\"non-dynamic-scope-def2\");\n+ scopeRep.setProtocol(\"openid-connect\");\n+ scopeRep.setAttributes(new HashMap<String, String>(){{\n+ put(ClientScopeModel.IS_DYNAMIC_SCOPE, \"true\");\n+ put(ClientScopeModel.DYNAMIC_SCOPE_REGEXP, \"\");\n+ }});\n+ handleExpectedCreateFailure(scopeRep, 400, \"Unexpected value \\\"true\\\" for attribute is.dynamic.scope in ClientScope\");\n+ }\n+\n+ @Test\n+ @DisableFeature(value = Profile.Feature.DYNAMIC_SCOPES, skipRestart = true)\n+ public void testCreateDynamicScopeWithFeatureDisabledAndNonEmptyDynamicScopeRegexp() {\n+ ClientScopeRepresentation scopeRep = new ClientScopeRepresentation();\n+ scopeRep.setName(\"non-dynamic-scope-def3\");\n+ scopeRep.setProtocol(\"openid-connect\");\n+ scopeRep.setAttributes(new HashMap<String, String>(){{\n+ put(ClientScopeModel.IS_DYNAMIC_SCOPE, \"false\");\n+ put(ClientScopeModel.DYNAMIC_SCOPE_REGEXP, \"not-empty\");\n+ }});\n+ handleExpectedCreateFailure(scopeRep, 400, \"Unexpected value \\\"not-empty\\\" for attribute dynamic.scope.regexp in ClientScope\");\n+ }\n+\n+ @Test\n+ @EnableFeature(value = Profile.Feature.DYNAMIC_SCOPES, skipRestart = true)\n+ public void testCreateInvalidRegexpDynamicScope() {\n+ ClientScopeRepresentation scopeRep = new ClientScopeRepresentation();\n+ scopeRep.setName(\"dynamic-scope-def4\");\n+ scopeRep.setProtocol(\"openid-connect\");\n+ scopeRep.setAttributes(new HashMap<String, String>(){{\n+ put(ClientScopeModel.IS_DYNAMIC_SCOPE, \"true\");\n+ put(ClientScopeModel.DYNAMIC_SCOPE_REGEXP, \"dynamic-scope-def:*:*\");\n+ }});\n+ handleExpectedCreateFailure(scopeRep, 400, \"Invalid format for the Dynamic Scope regexp dynamic-scope-def:*:*\");\n+ }\n+\n+ private void handleExpectedCreateFailure(ClientScopeRepresentation scopeRep, int expectedErrorCode, String expectedErrorMessage) {\n+ try(Response resp = clientScopes().create(scopeRep)) {\n+ Assert.assertEquals(expectedErrorCode, resp.getStatus());\n+ String respBody = resp.readEntity(String.class);\n+ Map<String, String> responseJson = null;\n+ try {\n+ responseJson = JsonSerialization.readValue(respBody, Map.class);\n+ Assert.assertEquals(expectedErrorMessage, responseJson.get(\"errorMessage\"));\n+ } catch (IOException e) {\n+ fail(\"Failed to extract the errorMessage from a CreateScope Response\");\n+ }\n+ }\n+ }\n+\nprivate ClientScopesResource clientScopes() {\nreturn testRealmResource().clientScopes();\n}\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": "@@ -1163,6 +1163,10 @@ client-scope.gui-order=GUI order\nclient-scope.gui-order.tooltip=Specify order of the provider in GUI (such as in Consent page) as integer\nclient-scope.include-in-token-scope=Include In Token Scope\nclient-scope.include-in-token-scope.tooltip=If on, the name of this client scope will be added to the access token property 'scope' as well as to the Token Introspection Endpoint response. If off, this client scope will be omitted from the token and from the Token Introspection Endpoint response.\n+client-scope.is-dynamic-scope=Dynamic Scope\n+client-scope.is-dynamic-scope.tooltip=If on, this scope will be considered a Dynamic Scope, which will be comprised of a static and a variable portion.\n+client-scope.dynamic-scope-regexp=Dynamic Scope Format\n+client-scope.dynamic-scope-regexp.tooltip=This is the regular expression that the system will use to extract the scope name and variable.\nadd-user-federation-provider=Add user federation provider\nadd-user-storage-provider=Add user storage provider\n" }, { "change_type": "MODIFY", "old_path": "themes/src/main/resources/theme/base/admin/resources/js/controllers/clients.js", "new_path": "themes/src/main/resources/theme/base/admin/resources/js/controllers/clients.js", "diff": "@@ -3262,6 +3262,20 @@ module.controller('ClientScopeDetailCtrl', function($scope, realm, clientScope,\n$scope.displayOnConsentScreen = true;\n}\n+ if(serverInfo.featureEnabled(\"DYNAMIC_SCOPES\")) {\n+ if ($scope.clientScope.attributes[\"is.dynamic.scope\"]) {\n+ if ($scope.clientScope.attributes[\"is.dynamic.scope\"] === \"true\") {\n+ $scope.isDynamicScope = true;\n+ } else {\n+ $scope.isDynamicScope = false;\n+ }\n+ } else {\n+ $scope.isDynamicScope = false;\n+ }\n+\n+ $scope.clientScope.attributes[\"dynamic.scope.regexp\"] = $scope.clientScope.name + \":*\";\n+ }\n+\nif ($scope.clientScope.attributes[\"include.in.token.scope\"]) {\nif ($scope.clientScope.attributes[\"include.in.token.scope\"] == \"true\") {\n$scope.includeInTokenScope = true;\n@@ -3320,6 +3334,14 @@ module.controller('ClientScopeDetailCtrl', function($scope, realm, clientScope,\n$scope.clientScope.attributes[\"display.on.consent.screen\"] = \"false\";\n}\n+ if(serverInfo.featureEnabled(\"DYNAMIC_SCOPES\")) {\n+ if ($scope.isDynamicScope === true) {\n+ $scope.clientScope.attributes[\"is.dynamic.scope\"] = \"true\";\n+ } else {\n+ $scope.clientScope.attributes[\"is.dynamic.scope\"] = \"false\";\n+ }\n+ }\n+\nif ($scope.includeInTokenScope == true) {\n$scope.clientScope.attributes[\"include.in.token.scope\"] = \"true\";\n} else {\n" }, { "change_type": "MODIFY", "old_path": "themes/src/main/resources/theme/base/admin/resources/partials/client-scope-detail.html", "new_path": "themes/src/main/resources/theme/base/admin/resources/partials/client-scope-detail.html", "diff": "</div>\n<kc-tooltip>{{:: 'client-scope.name.tooltip' | translate}}</kc-tooltip>\n</div>\n+ <div class=\"form-group clearfix block\" data-ng-show=\"serverInfo.featureEnabled('DYNAMIC_SCOPES') && protocol === 'openid-connect'\">\n+ <label class=\"col-md-2 control-label\" for=\"isDynamicScope\">{{:: 'client-scope.is-dynamic-scope' | translate}}</label>\n+ <div class=\"col-sm-6\">\n+ <input ng-model=\"isDynamicScope\" ng-click=\"switchChange()\" name=\"isDynamicScope\" id=\"isDynamicScope\" onoffswitch on-text=\"{{:: 'onText' | translate}}\" off-text=\"{{:: 'offText' | translate}}\"/>\n+ </div>\n+ <kc-tooltip>{{:: 'client-scope.is-dynamic-scope.tooltip' | translate}}</kc-tooltip>\n+ </div>\n+ <div class=\"form-group\" data-ng-show=\"protocol === 'openid-connect' && isDynamicScope && serverInfo.featureEnabled('DYNAMIC_SCOPES')\">\n+ <label class=\"col-md-2 control-label\" for=\"dynamicScopeRegExp\">{{:: 'client-scope.dynamic-scope-regexp' | translate}} <span class=\"required\">*</span></label>\n+ <div class=\"col-sm-6\">\n+ <input class=\"form-control\" ng-readonly=\"true\" type=\"text\"\n+ ng-value=\"(isDynamicScope && serverInfo.featureEnabled('DYNAMIC_SCOPES')) ? clientScope.attributes['dynamic.scope.regexp'] = clientScope.name+':*' : ''\"\n+ id=\"dynamicScopeRegExp\" name=\"dynamicScopeRegExp\"\n+ data-ng-model=\"clientScope.attributes['dynamic.scope.regexp']\" autofocus ng-disabled=\"!isDynamicScope\"\n+ ng-required=\"isDynamicScope\">\n+ </div>\n+ <kc-tooltip>{{:: 'client-scope.dynamic-scope-regexp.tooltip' | translate}}</kc-tooltip>\n+ </div>\n<div class=\"form-group\">\n<label class=\"col-md-2 control-label\" for=\"description\">{{:: 'description' | translate}} </label>\n<div class=\"col-sm-6\">\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/lock/LiquibaseDBLockProviderFactory.java", "new_path": "model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/lock/LiquibaseDBLockProviderFactory.java", "diff": "@@ -30,6 +30,7 @@ import org.keycloak.models.dblock.DBLockProviderFactory;\npublic class LiquibaseDBLockProviderFactory implements DBLockProviderFactory {\nprivate static final Logger logger = Logger.getLogger(LiquibaseDBLockProviderFactory.class);\n+ public static final int PROVIDER_PRIORITY = 1;\nprivate long lockWaitTimeoutMillis;\n@@ -68,4 +69,9 @@ public class LiquibaseDBLockProviderFactory implements DBLockProviderFactory {\npublic String getId() {\nreturn \"jpa\";\n}\n+\n+ @Override\n+ public int order() {\n+ return PROVIDER_PRIORITY;\n+ }\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "core/src/main/java/org/keycloak/TokenVerifier.java", "new_path": "core/src/main/java/org/keycloak/TokenVerifier.java", "diff": "@@ -224,7 +224,7 @@ public class TokenVerifier<T extends JsonWebToken> {\n* @return\n*/\npublic static <T extends JsonWebToken> TokenVerifier<T> create(String tokenString, Class<T> clazz) {\n- return new TokenVerifier(tokenString, clazz);\n+ return new TokenVerifier<>(tokenString, clazz);\n}\n/**\n@@ -237,7 +237,7 @@ public class TokenVerifier<T extends JsonWebToken> {\n* @return\n*/\npublic static <T extends JsonWebToken> TokenVerifier<T> createWithoutSignature(T token) {\n- return new TokenVerifier(token);\n+ return new TokenVerifier<>(token);\n}\n/**\n@@ -271,6 +271,7 @@ public class TokenVerifier<T extends JsonWebToken> {\nchecks.remove(check);\n}\n+ @SuppressWarnings(\"unchecked\")\nprivate <P extends Predicate<? super T>> TokenVerifier<T> replaceCheck(Class<? extends Predicate<?>> checkClass, boolean active, P... predicate) {\nremoveCheck(checkClass);\nif (active) {\n@@ -279,6 +280,7 @@ public class TokenVerifier<T extends JsonWebToken> {\nreturn this;\n}\n+ @SuppressWarnings(\"unchecked\")\nprivate <P extends Predicate<? super T>> TokenVerifier<T> replaceCheck(Predicate<? super T> check, boolean active, P... predicate) {\nremoveCheck(check);\nif (active) {\n@@ -292,7 +294,8 @@ public class TokenVerifier<T extends JsonWebToken> {\n* @param checks\n* @return\n*/\n- public TokenVerifier<T> withChecks(Predicate<? super T>... checks) {\n+ @SafeVarargs\n+ public final TokenVerifier<T> withChecks(Predicate<? super T>... checks) {\nif (checks != null) {\nthis.checks.addAll(Arrays.asList(checks));\n}\n@@ -509,6 +512,7 @@ public class TokenVerifier<T extends JsonWebToken> {\n* @param predicates\n* @return\n*/\n+ @SafeVarargs\npublic static <T extends JsonWebToken> Predicate<T> alternative(final Predicate<? super T>... predicates) {\nreturn new Predicate<T>() {\n@Override\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": "@@ -128,11 +128,7 @@ public class MapGroupProvider implements GroupProvider {\n@Override\npublic Long getGroupsCountByNameContaining(RealmModel realm, String search) {\n- DefaultModelCriteria<GroupModel> mcb = criteria();\n- mcb = mcb.compare(SearchableFields.REALM_ID, Operator.EQ, realm.getId())\n- .compare(SearchableFields.NAME, Operator.ILIKE, \"%\" + search + \"%\");\n-\n- return tx.getCount(withCriteria(mcb));\n+ return searchForGroupByNameStream(realm, search, null, null).count();\n}\n@Override\n" }, { "change_type": "MODIFY", "old_path": "server-spi/src/main/java/org/keycloak/models/GroupProvider.java", "new_path": "server-spi/src/main/java/org/keycloak/models/GroupProvider.java", "diff": "@@ -124,7 +124,7 @@ public interface GroupProvider extends Provider, GroupLookupProvider {\nLong getGroupsCount(RealmModel realm, Boolean onlyTopGroups);\n/**\n- * Returns number of groups with the given string in name for the given realm.\n+ * Returns the number of top level groups containing groups with the given string in name for the given realm.\n*\n* @param realm Realm.\n* @param search Case insensitive string which will be searched for.\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/group/GroupTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/group/GroupTest.java", "diff": "package org.keycloak.testsuite.admin.group;\nimport com.google.common.collect.Comparators;\n+import org.hamcrest.Matchers;\nimport org.junit.Assert;\nimport org.junit.Assume;\nimport org.junit.Test;\n@@ -62,6 +63,8 @@ import java.util.LinkedList;\nimport java.util.List;\nimport java.util.Map;\nimport java.util.UUID;\n+import java.util.stream.Collectors;\n+\nimport javax.ws.rs.ClientErrorException;\nimport javax.ws.rs.core.Response.Status;\nimport static org.hamcrest.Matchers.*;\n@@ -1117,6 +1120,18 @@ public class GroupTest extends AbstractGroupTest {\nassertEquals(new Long(allGroups.size()), realm.groups().count(true).get(\"count\"));\nassertEquals(new Long(allGroups.size() + 1), realm.groups().count(false).get(\"count\"));\n+ //add another subgroup\n+ GroupRepresentation level2Group2 = new GroupRepresentation();\n+ level2Group2.setName(\"group111111\");\n+ realm.groups().group(firstGroupId).subGroup(level2Group2);\n+ //search and count for group with string group11 -> return 2 top level group, group11 and group0 having subgroups group1111 and group111111\n+ search = realm.groups().groups(\"group11\",0,10);\n+ assertEquals(2, search.size());\n+ GroupRepresentation group0 = search.stream().filter(group -> \"group0\".equals(group.getName())).findAny().orElseGet(null);\n+ assertNotNull(group0);\n+ assertEquals(2,group0.getSubGroups().size());\n+ assertThat(group0.getSubGroups().stream().map(GroupRepresentation::getName).collect(Collectors.toList()), Matchers.containsInAnyOrder(\"group1111\", \"group111111\"));\n+ assertEquals(new Long(search.size()), realm.groups().count(\"group11\").get(\"count\"));\n}\n@Test\n" } ]

[ { "change_type": "MODIFY", "old_path": "docs/guides/src/main/server/proxy.adoc", "new_path": "docs/guides/src/main/server/proxy.adoc", "diff": "<#import \"/templates/options.adoc\" as opts>\n<@tmpl.guide\n-title=\"Configuring Keycloak to run behind a reverse proxy\"\n-summary=\"Understand how to configure Keycloak when using a reverse proxy\"\n+title=\"Configuring a reverse proxy\"\n+summary=\"Learn how to configure Keycloak together with a reverse proxy, api gateway or load balancer.\"\npriority=20\nincludedOptions=\"proxy proxy.*\">\n-It is pretty common nowadays to use a reverse proxy in distributed environments. If you want to use Keycloak together with such a proxy, you can use different proxy modes depending on the proxy and TLS termination in your specific environment:\n+It is pretty common nowadays to use a reverse proxy in distributed environments. If you want to use Keycloak together with such a proxy, you can use different proxy modes depending on the TLS termination in your specific environment:\n+== Available proxy modes\nThe `none` mode disables proxy support. It is the default mode.\nThe `edge` mode enables communication through HTTP between the proxy and Keycloak. This mode is suitable for deployments with a highly secure internal network where the reverse proxy keeps a secure connection (HTTP over TLS) with clients while communicating with Keycloak using HTTP.\n@@ -18,22 +19,20 @@ The `reencrypt` mode requires communication through HTTPS between the proxy and\nThe `passthrough` mode enables communication through HTTP or HTTPS between the proxy and Keycloak. This mode is suitable for deployments where the reverse proxy is not terminating TLS, but only forwarding the requests to the Keycloak server so that secure connections between the server and clients are based on the keys and certificates used by the Keycloak server itself.\n-Selecting the reverse proxy mode is done at runtime via:\n+== Configure the proxy mode in Keycloak\n+To select the proxy mode, run:\n-<@kc.all parameters=\"--proxy <mode>\"/>\n+<@kc.start parameters=\"--proxy <mode>\"/>\n-Please make sure your reverse proxy is configured correctly. To do so, please:\n+== Configure the reverse proxy\n+Make sure your reverse proxy is configured correctly. To do so, please:\n-* Configure your reverse proxy to properly set X-Forwarded-For and X-Forwarded-Proto HTTP headers.\n+* Properly set X-Forwarded-For and X-Forwarded-Proto HTTP headers.\n-* Configure your reverse proxy to preserve the original 'Host' HTTP header.\n+* Preserve the original 'Host' HTTP header.\n-Please consult the documentation of your specific reverse proxy on how to set these headers.\n+Please consult the documentation of your reverse proxy on how to set these headers.\n-_Note_: Take extra precautions to ensure that the X-Forwarded-For header is set by your reverse proxy. If it is not configured correctly, rogue clients can set this header themselves and trick Keycloak into thinking the client is connecting from a different IP address than it actually does. This may become really important if you are doing any black or white listing of IP addresses.\n-\n-Valid options for the proxy mode include:\n-\n-<@opts.expectedValues option=\"proxy\"/>\n+Take extra precautions to ensure that the X-Forwarded-For header is set by your reverse proxy. If it is not configured correctly, rogue clients can set this header themselves and trick Keycloak into thinking the client is connecting from a different IP address than it actually does. This may become really important if you are doing any black or white listing of IP addresses.\n</@tmpl.guide>\n" }, { "change_type": "MODIFY", "old_path": "docs/guides/src/main/templates/kc.adoc", "new_path": "docs/guides/src/main/templates/kc.adoc", "diff": "@@ -11,10 +11,3 @@ bin/kc.[sh|bat] build ${parameters}\nbin/kc.[sh|bat] start ${parameters}\n----\n</#macro>\n\\ No newline at end of file\n-\n-<#macro all parameters>\n-[source,bash]\n-----\n-bin/kc.[sh|bat] [build|start|start-dev] ${parameters}\n-----\n-</#macro>\n\\ No newline at end of file\n" } ]

[ { "change_type": "ADD", "old_path": null, "new_path": "docs/guides/src/main/server/enabletls.adoc", "diff": "+<#import \"/templates/guide.adoc\" as tmpl>\n+<#import \"/templates/kc.adoc\" as kc>\n+\n+<@tmpl.guide\n+title=\"Configure TLS\"\n+summary=\"Learn how to configure Keycloak's https certificates for in- and outgoing requests as well as mTLS.\"\n+includedOptions=\"https.* http.enabled\">\n+\n+Transport Layer Security (short: TLS) is crucial to exchange data over a secured channel. For production environments, you should never expose Keycloak endpoints through HTTP, as sensitive data is at the core of what Keycloak exchanges with other applications. In this guide you will learn how to configure Keycloak to use HTTPS/TLS.\n+\n+== Configure TLS in Keycloak\n+Keycloak can be configured to load the needed certificate infrastructure using files in PEM format or from a Java KeyStore. When both alternatives are set up, the PEM files takes precedence over the Java KeyStores.\n+\n+=== Providing certificates in PEM format\n+When you use a pair of matching certificate / private key files in PEM format, configure Keycloak to use them by running:\n+\n+<@kc.start parameters=\"--https-certificate-file=/path/to/certfile.pem --https-certificate-key-file=/path/to/keyfile.pem\"/>\n+\n+Keycloak creates a keystore out of these files in memory and uses this keystore afterwards.\n+\n+=== Providing a Java KeyStore\n+When no keystore file is configured explicitly, but `http.enabled` is set to false, Keycloak looks for a `conf/server.keystore` file by default.\n+\n+As an alternative, you can use an existing keystore by running:\n+<@kc.start parameters=\"--https-key-store-file=/path/to/existing-keystore-file\"/>\n+\n+==== Setting the KeyStore password\n+You can set a secure password for your keystore using the `https.key-store.password` option:\n+<@kc.start parameters=\"--https-key-store-password=<value>\"/>\n+If no password is set, the default password `password` is used.\n+\n+== Configure TLS protocols\n+By default, Keycloak does not enable deprecated TLS protocols. In situations where clients only support deprecated protocols, first consider upgrading the client, but as a temporary work-around you can enable deprecated protocols with:\n+\n+<@kc.start parameters=\"--https-protocols=<protocol>[,<protocol>]\"/>\n+\n+To also allow TLSv1.2, use for example `kc.sh start --http-protocols=TLSv1.3,TLSv1.2`.\n+\n+== Switch the HTTPS port\n+Keycloak listens for HTTPS traffic on port `8443` by default. To change this port, use:\n+<@kc.start parameters=\"--https-port=<port>\"/>\n+\n+== Using a truststore\n+Keycloak uses a truststore to store certificates to verify clients that are communicating with Keycloak, e.g. to use mutualTLS, certificate-bound tokens or X.509 authentication. This truststore is used for outgoing https requests as well as mTLS requests.\n+\n+You can configure the location of this truststore by running:\n+<@kc.start parameters=\"--https-trust-store-file=/path/to/file\"/>\n+\n+=== Setting the truststore password\n+You can set a secure password for your truststore using the `https.trust-store.password` option:\n+<@kc.start parameters=\"--https.trust-store.password=<value>\"/>\n+If no password is set, the default password `password` is used.\n+\n+== Securing credentials\n+We recommend to not set any password in plaintext via the CLI or in `conf/keycloak.properties`, but instead using good practices such as using a vault / mounted secret. Please refer to the Vault Guide / Production deployment guide for more advice.\n+\n+</@tmpl.guide>\n\\ No newline at end of file\n" } ]

[ { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/role/MapRoleProvider.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/role/MapRoleProvider.java", "diff": "@@ -70,6 +70,7 @@ public class MapRoleProvider implements RoleProvider {\nentity.setId(id);\nentity.setRealmId(realm.getId());\nentity.setName(name);\n+ entity.setClientRole(false);\nif (tx.read(entity.getId()) != null) {\nthrow new ModelDuplicateException(\"Role exists: \" + id);\n}\n@@ -200,6 +201,7 @@ public class MapRoleProvider implements RoleProvider {\nDefaultModelCriteria<RoleModel> mcb = criteria();\nmcb = mcb.compare(SearchableFields.REALM_ID, Operator.EQ, realm.getId())\n+ .compare(SearchableFields.IS_CLIENT_ROLE, Operator.NE, true)\n.compare(SearchableFields.NAME, Operator.EQ, name);\nString roleId = tx.read(withCriteria(mcb))\n@@ -254,6 +256,7 @@ public class MapRoleProvider implements RoleProvider {\n}\nDefaultModelCriteria<RoleModel> mcb = criteria();\nmcb = mcb.compare(SearchableFields.REALM_ID, Operator.EQ, realm.getId())\n+ .compare(SearchableFields.IS_CLIENT_ROLE, Operator.NE, true)\n.or(\nmcb.compare(SearchableFields.NAME, Operator.ILIKE, \"%\" + search + \"%\"),\nmcb.compare(SearchableFields.DESCRIPTION, Operator.ILIKE, \"%\" + search + \"%\")\n" }, { "change_type": "MODIFY", "old_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/realm/RealmRolesTest.java", "new_path": "testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/realm/RealmRolesTest.java", "diff": "@@ -371,6 +371,12 @@ public class RealmRolesTest extends AbstractAdminTest {\nassertThat(expectedMembers, containsInAnyOrder(\"test-role-member\", \"test-role-member2\"));\n}\n+ // issue #9587\n+ @Test\n+ public void testSearchForRealmRoles() {\n+ resource.list(\"role-\", true).stream().forEach(role -> assertThat(\"There is client role '\" + role.getName() + \"' among realm roles.\", role.getClientRole(), is(false)));\n+ }\n+\n@Test\npublic void testSearchForRoles() {\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": "@@ -295,7 +295,7 @@ public class DeviceEndpoint extends AuthorizationEndpointBase implements RealmRe\nprivate Response processVerification(OAuth2DeviceCodeModel deviceCode, String userCode) {\nClientModel client = realm.getClientByClientId(deviceCode.getClientId());\n- AuthenticationSessionModel authenticationSession = createAuthenticationSession(client);\n+ AuthenticationSessionModel authenticationSession = createAuthenticationSession(client, deviceCode.getScope());\n// Verification OK\nauthenticationSession.setClientNote(DeviceGrantType.OAUTH2_DEVICE_VERIFIED_USER_CODE, userCode);\n@@ -383,13 +383,15 @@ public class DeviceEndpoint extends AuthorizationEndpointBase implements RealmRe\nreturn client;\n}\n- protected AuthenticationSessionModel createAuthenticationSession(ClientModel client) {\n+ protected AuthenticationSessionModel createAuthenticationSession(ClientModel client, String scope) {\nAuthenticationSessionModel authenticationSession = super.createAuthenticationSession(client, null);\nauthenticationSession.setProtocol(OIDCLoginProtocol.LOGIN_PROTOCOL);\nauthenticationSession.setAction(AuthenticationSessionModel.Action.AUTHENTICATE.name());\nauthenticationSession.setClientNote(OIDCLoginProtocol.ISSUER,\nUrls.realmIssuer(session.getContext().getUri().getBaseUri(), realm.getName()));\n+ if ( scope != null)\n+ authenticationSession.setClientNote(OIDCLoginProtocol.SCOPE_PARAM, scope);\nreturn authenticationSession;\n}\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": "@@ -33,6 +33,7 @@ import org.keycloak.models.utils.KeycloakModelUtils;\nimport org.keycloak.protocol.oidc.OIDCAdvancedConfigWrapper;\nimport org.keycloak.protocol.oidc.OIDCConfigAttributes;\nimport org.keycloak.representations.AccessToken;\n+import org.keycloak.representations.UserInfo;\nimport org.keycloak.representations.idm.ClientRepresentation;\nimport org.keycloak.representations.idm.RealmRepresentation;\nimport org.keycloak.representations.idm.UserRepresentation;\n@@ -109,6 +110,7 @@ public class OAuth2DeviceAuthorizationGrantTest extends AbstractKeycloakTest {\n.username(\"device-login\")\n.email(\"device-login@localhost\")\n.password(\"password\")\n+ .addAttribute(\"phoneNumber\",\"211211211\")\n.build();\nrealm.user(user);\n@@ -202,6 +204,56 @@ public class OAuth2DeviceAuthorizationGrantTest extends AbstractKeycloakTest {\nassertNotNull(token);\n}\n+ @Test\n+ public void testPublicClientOptionalScope() throws Exception {\n+ // Device Authorization Request from device - check giving optional scope phone\n+ oauth.realm(REALM_NAME);\n+ oauth.clientId(DEVICE_APP_PUBLIC);\n+ OAuthClient.DeviceAuthorizationResponse response = null;\n+ try {\n+ oauth.scope(\"phone\");\n+ response = oauth.doDeviceAuthorizationRequest(DEVICE_APP_PUBLIC, null);\n+ } finally {\n+ oauth.scope(null);\n+ }\n+\n+ Assert.assertEquals(200, response.getStatusCode());\n+ assertNotNull(response.getDeviceCode());\n+ assertNotNull(response.getUserCode());\n+ assertNotNull(response.getVerificationUri());\n+ assertNotNull(response.getVerificationUriComplete());\n+ Assert.assertEquals(60, response.getExpiresIn());\n+ Assert.assertEquals(5, response.getInterval());\n+\n+ openVerificationPage(response.getVerificationUriComplete());\n+\n+ // Do Login\n+ oauth.fillLoginForm(\"device-login\", \"password\");\n+\n+ // Consent\n+ grantPage.assertCurrent();\n+ grantPage.assertGrants(OAuthGrantPage.PROFILE_CONSENT_TEXT, OAuthGrantPage.EMAIL_CONSENT_TEXT, OAuthGrantPage.ROLES_CONSENT_TEXT, OAuthGrantPage.PHONE_CONSENT_TEXT);\n+ grantPage.accept();\n+\n+ // Token request from device\n+ OAuthClient.AccessTokenResponse tokenResponse = oauth.doDeviceTokenRequest(DEVICE_APP_PUBLIC, null, response.getDeviceCode());\n+\n+ Assert.assertEquals(200, tokenResponse.getStatusCode());\n+\n+ String tokenString = tokenResponse.getAccessToken();\n+ assertNotNull(tokenString);\n+ AccessToken token = oauth.verifyToken(tokenString);\n+\n+ assertNotNull(token);\n+\n+ UserInfo userInfo = oauth.doUserInfoRequest(tokenString);\n+ assertNotNull(userInfo);\n+ //UserInfo consists preferredUsername, email( required scopes) and phoneNumber(given optional scope)\n+ Assert.assertEquals(\"device-login\", userInfo.getPreferredUsername());\n+ Assert.assertEquals(\"device-login@localhost\", userInfo.getEmail());\n+ Assert.assertEquals(\"211211211\", userInfo.getPhoneNumber());\n+ }\n+\n@Test\npublic void testPublicClientCustomConsent() throws Exception {\n// Device Authorization Request from device\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": "@@ -36,6 +36,7 @@ import javax.persistence.FetchType;\nimport javax.persistence.Id;\nimport javax.persistence.OneToMany;\nimport javax.persistence.Table;\n+import javax.persistence.Version;\nimport org.hibernate.annotations.Type;\nimport org.hibernate.annotations.TypeDef;\nimport org.hibernate.annotations.TypeDefs;\n@@ -54,6 +55,11 @@ public class JpaClientEntity extends AbstractClientEntity implements Serializabl\n@Column\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 JpaClientMetadata metadata;\n@@ -131,6 +137,10 @@ public class JpaClientEntity extends AbstractClientEntity implements Serializabl\nmetadata.setEntityVersion(entityVersion);\n}\n+ public int getVersion() {\n+ return version;\n+ }\n+\n@Override\npublic String getId() {\nreturn id == null ? null : id.toString();\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": "@@ -29,6 +29,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=\"metadata\" type=\"json\"/>\n</createTable>\n<ext:addGeneratedColumn tableName=\"client\">\n" } ]

[ { "change_type": "MODIFY", "old_path": "testsuite/model/test-all-profiles.sh", "new_path": "testsuite/model/test-all-profiles.sh", "diff": "@@ -15,9 +15,10 @@ for I in `perl -ne 'print \"$1\\n\" if (m,<id>([^<]+)</id>,)' pom.xml`; do\necho \"========\"\necho \"======== Profile $I\"\necho \"========\"\n- mvn -B test \"-P$I\" \"$@\"\n- EXIT_CODE=$[$EXIT_CODE + $?]\n+ mvn -B -Dsurefire.timeout=600 test \"-P$I\" \"$@\" 2>&1 | tee /tmp/surefire.out\n+ EXIT_CODE=$[$EXIT_CODE + ${PIPESTATUS[0]}]\nmv target/surefire-reports \"target/surefire-reports-$I\"\n+ perl -ne \"print '::error::| $I | Timed out.' . \\\"\\n\\\" if (/There was a timeout in the fork/)\" /tmp/surefire.out\ndone\n## If the jacoco file is present, generate reports in each of the model projects\n" } ]

[ { "change_type": "MODIFY", "old_path": "services/src/main/java/org/keycloak/authentication/AuthenticatorUtil.java", "new_path": "services/src/main/java/org/keycloak/authentication/AuthenticatorUtil.java", "diff": "package org.keycloak.authentication;\n+import org.keycloak.models.AuthenticatedClientSessionModel;\nimport org.keycloak.models.Constants;\nimport org.keycloak.sessions.AuthenticationSessionModel;\n+import org.keycloak.sessions.CommonClientSessionModel;\npublic class AuthenticatorUtil {\n@@ -40,4 +42,9 @@ public class AuthenticatorUtil {\nreturn AuthenticatorUtil.getRequestedLevelOfAuthentication(authSession)\n<= AuthenticatorUtil.getCurrentLevelOfAuthentication(authSession);\n}\n+\n+ public static int getCurrentLevelOfAuthentication(AuthenticatedClientSessionModel clientSession) {\n+ String clientSessionLoaNote = clientSession.getNote(Constants.LEVEL_OF_AUTHENTICATION);\n+ return clientSessionLoaNote == null ? Constants.NO_LOA : Integer.parseInt(clientSessionLoaNote);\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": "@@ -854,7 +854,7 @@ public class TokenManager {\n}\nprivate String getAcr(AuthenticatedClientSessionModel clientSession) {\n- int loa = Integer.parseInt(clientSession.getNote(Constants.LEVEL_OF_AUTHENTICATION));\n+ int loa = AuthenticatorUtil.getCurrentLevelOfAuthentication(clientSession);\nif (loa < Constants.MINIMUM_LOA) {\nloa = AuthenticationManager.isSSOAuthentication(clientSession) ? 0 : 1;\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "federation/ldap/src/main/java/org/keycloak/storage/ldap/idm/store/ldap/LDAPOperationManager.java", "new_path": "federation/ldap/src/main/java/org/keycloak/storage/ldap/idm/store/ldap/LDAPOperationManager.java", "diff": "@@ -530,6 +530,13 @@ public class LDAPOperationManager {\n}\nthrow ae;\n+ } catch(RuntimeException re){\n+ if (logger.isDebugEnabled()) {\n+ logger.debugf(re, \"LDAP Connection TimeOut for DN [%s]\", dn);\n+ }\n+\n+ throw re;\n+\n} catch (Exception e) {\nlogger.errorf(e, \"Unexpected exception when validating password of DN [%s]\", dn);\nthrow new AuthenticationException(\"Unexpected exception when validating password of user\");\n" } ]

[ { "change_type": "MODIFY", "old_path": "docs/guides/src/main/server/db.adoc", "new_path": "docs/guides/src/main/server/db.adoc", "diff": "@@ -23,5 +23,5 @@ Valid options for database vendors include:\nOnce configured you can easily connect to the database with:\n-<@kc.start parameters=\"--db-host <hostname> --db-schema <schema> --db-user <username> --db-password <password>\"/>\n+<@kc.start parameters=\"--db-url-host <hostname> --db-schema <schema> --db-username <username> --db-password <password>\"/>\n</@tmpl.guide>\n\\ No newline at end of file\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": "@@ -39,8 +39,11 @@ import java.util.stream.Stream;\n*/\npublic abstract class MapClientAdapter extends AbstractClientModel<MapClientEntity> implements ClientModel {\n+ private final MapProtocolMapperUtils pmUtils;\n+\npublic MapClientAdapter(KeycloakSession session, RealmModel realm, MapClientEntity entity) {\nsuper(session, realm, entity);\n+ pmUtils = MapProtocolMapperUtils.instanceFor(safeGetProtocol());\n}\n@Override\n@@ -503,35 +506,15 @@ public abstract class MapClientAdapter extends AbstractClientModel<MapClientEnti\n/*************** Protocol mappers ****************/\n- private static MapProtocolMapperEntity fromModel(ProtocolMapperModel model) {\n- MapProtocolMapperEntity res = new MapProtocolMapperEntityImpl();\n- res.setId(model.getId());\n- res.setName(model.getName());\n- res.setProtocolMapper(model.getProtocolMapper());\n- res.setConfig(model.getConfig());\n- return res;\n- }\n-\n- private ProtocolMapperModel toModel(MapProtocolMapperEntity entity) {\n- ProtocolMapperModel res = new ProtocolMapperModel();\n- res.setId(entity.getId());\n- res.setName(entity.getName());\n- res.setProtocolMapper(entity.getProtocolMapper());\n- res.setConfig(entity.getConfig());\n-\n- res.setProtocol(safeGetProtocol());\n- return res;\n+ private String safeGetProtocol() {\n+ return entity.getProtocol() == null ? \"openid-connect\" : entity.getProtocol();\n}\n@Override\npublic Stream<ProtocolMapperModel> getProtocolMappersStream() {\nfinal Map<String, MapProtocolMapperEntity> protocolMappers = entity.getProtocolMappers();\nreturn protocolMappers == null ? Stream.empty() : protocolMappers.values().stream().distinct()\n- .map(this::toModel);\n- }\n-\n- private String safeGetProtocol() {\n- return entity.getProtocol() == null ? \"openid-connect\" : entity.getProtocol();\n+ .map(pmUtils::toModel);\n}\n@Override\n@@ -540,7 +523,7 @@ public abstract class MapClientAdapter extends AbstractClientModel<MapClientEnti\nreturn null;\n}\n- MapProtocolMapperEntity pm = fromModel(model);\n+ MapProtocolMapperEntity pm = MapProtocolMapperUtils.fromModel(model);\nif (pm.getId() == null) {\nString id = KeycloakModelUtils.generateId();\npm.setId(id);\n@@ -550,7 +533,7 @@ public abstract class MapClientAdapter extends AbstractClientModel<MapClientEnti\n}\nentity.setProtocolMapper(pm.getId(), pm);\n- return toModel(pm);\n+ return pmUtils.toModel(pm);\n}\n@Override\n@@ -565,14 +548,14 @@ 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, fromModel(mapping));\n+ entity.setProtocolMapper(id, MapProtocolMapperUtils.fromModel(mapping));\n}\n}\n@Override\npublic ProtocolMapperModel getProtocolMapperById(String id) {\nMapProtocolMapperEntity protocolMapper = entity.getProtocolMapper(id);\n- return protocolMapper == null ? null : toModel(protocolMapper);\n+ return protocolMapper == null ? null : pmUtils.toModel(protocolMapper);\n}\n@Override\n@@ -583,7 +566,7 @@ public abstract class MapClientAdapter extends AbstractClientModel<MapClientEnti\n}\nreturn protocolMappers == null ? null : protocolMappers.values().stream()\n.filter(pm -> Objects.equals(pm.getName(), name))\n- .map(this::toModel)\n+ .map(pmUtils::toModel)\n.findAny()\n.orElse(null);\n}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "model/map/src/main/java/org/keycloak/models/map/client/MapProtocolMapperUtils.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.models.map.client;\n+\n+import java.util.HashMap;\n+import java.util.Objects;\n+import java.util.concurrent.ConcurrentHashMap;\n+import java.util.concurrent.ConcurrentMap;\n+import org.keycloak.models.ProtocolMapperModel;\n+\n+public class MapProtocolMapperUtils {\n+\n+ private final String protocol;\n+ private static final ConcurrentMap<String, MapProtocolMapperUtils> INSTANCES = new ConcurrentHashMap<>();\n+\n+ private MapProtocolMapperUtils(String protocol) {\n+ this.protocol = protocol;\n+ }\n+\n+ public static MapProtocolMapperUtils instanceFor(String protocol) {\n+ Objects.requireNonNull(protocol);\n+ return INSTANCES.computeIfAbsent(protocol, MapProtocolMapperUtils::new);\n+ }\n+\n+ public static MapProtocolMapperEntity fromModel(ProtocolMapperModel model) {\n+ MapProtocolMapperEntity res = new MapProtocolMapperEntityImpl();\n+ res.setId(model.getId());\n+ res.setName(model.getName());\n+ res.setProtocolMapper(model.getProtocolMapper());\n+ res.setConfig(model.getConfig());\n+ return res;\n+ }\n+\n+ public ProtocolMapperModel toModel(MapProtocolMapperEntity entity) {\n+ ProtocolMapperModel res = new ProtocolMapperModel();\n+ res.setId(entity.getId());\n+ res.setName(entity.getName());\n+ res.setProtocolMapper(entity.getProtocolMapper());\n+ res.setConfig(entity.getConfig());\n+\n+ res.setProtocol(protocol);\n+ return res;\n+ }\n+\n+}\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/clientscope/MapClientScopeAdapter.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/clientscope/MapClientScopeAdapter.java", "diff": "*/\npackage org.keycloak.models.map.clientscope;\n+import java.util.Collection;\nimport java.util.Collections;\nimport java.util.HashMap;\nimport java.util.List;\nimport java.util.Map;\nimport java.util.Objects;\n+import java.util.Set;\nimport java.util.stream.Collectors;\nimport java.util.stream.Stream;\nimport org.keycloak.models.ClientScopeModel;\n@@ -28,13 +30,18 @@ import org.keycloak.models.KeycloakSession;\nimport org.keycloak.models.ProtocolMapperModel;\nimport org.keycloak.models.RealmModel;\nimport org.keycloak.models.RoleModel;\n+import org.keycloak.models.map.client.MapProtocolMapperEntity;\n+import org.keycloak.models.map.client.MapProtocolMapperUtils;\nimport org.keycloak.models.utils.KeycloakModelUtils;\nimport org.keycloak.models.utils.RoleUtils;\npublic class MapClientScopeAdapter extends AbstractClientScopeModel<MapClientScopeEntity> implements ClientScopeModel {\n+ private final MapProtocolMapperUtils pmUtils;\n+\npublic MapClientScopeAdapter(KeycloakSession session, RealmModel realm, MapClientScopeEntity entity) {\nsuper(session, realm, entity);\n+ pmUtils = MapProtocolMapperUtils.instanceFor(safeGetProtocol());\n}\n@Override\n@@ -72,8 +79,21 @@ public class MapClientScopeAdapter extends AbstractClientScopeModel<MapClientSco\nentity.setProtocol(protocol);\n}\n+ @Override\n+ public RealmModel getRealm() {\n+ return realm;\n+ }\n+\n@Override\npublic void setAttribute(String name, String value) {\n+// TODO: https://github.com/keycloak/keycloak/issues/9741\n+// boolean valueUndefined = value == null || \"\".equals(value.trim());\n+//\n+// if (valueUndefined) {\n+// removeAttribute(name);\n+// return;\n+// }\n+\nentity.setAttribute(name, Collections.singletonList(value));\n}\n@@ -85,13 +105,15 @@ public class MapClientScopeAdapter extends AbstractClientScopeModel<MapClientSco\n@Override\npublic String getAttribute(String name) {\nList<String> attribute = entity.getAttribute(name);\n- if (attribute.isEmpty()) return null;\n+ if (attribute == null || attribute.isEmpty()) return null;\nreturn attribute.get(0);\n}\n@Override\npublic Map<String, String> getAttributes() {\n- return entity.getAttributes().entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey,\n+ final Map<String, List<String>> attributes = entity.getAttributes();\n+ final Map<String, List<String>> a = attributes == null ? Collections.emptyMap() : attributes;\n+ return a.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey,\nentry -> {\nif (entry.getValue().isEmpty()) return null;\nreturn entry.getValue().get(0);\n@@ -99,14 +121,16 @@ public class MapClientScopeAdapter extends AbstractClientScopeModel<MapClientSco\n);\n}\n- @Override\n- public RealmModel getRealm() {\n- return realm;\n+ /*************** Protocol mappers ****************/\n+\n+ private String safeGetProtocol() {\n+ return entity.getProtocol() == null ? \"openid-connect\" : entity.getProtocol();\n}\n@Override\npublic Stream<ProtocolMapperModel> getProtocolMappersStream() {\n- return entity.getProtocolMappers().distinct();\n+ final Set<MapProtocolMapperEntity> protocolMappers = entity.getProtocolMappers();\n+ return protocolMappers == null ? Stream.empty() : protocolMappers.stream().distinct().map(pmUtils::toModel);\n}\n@Override\n@@ -115,19 +139,17 @@ public class MapClientScopeAdapter extends AbstractClientScopeModel<MapClientSco\nreturn null;\n}\n- ProtocolMapperModel pm = new ProtocolMapperModel();\n- pm.setId(KeycloakModelUtils.generateId());\n- pm.setName(model.getName());\n- pm.setProtocol(model.getProtocol());\n- pm.setProtocolMapper(model.getProtocolMapper());\n-\n- if (model.getConfig() != null) {\n- pm.setConfig(new HashMap<>(model.getConfig()));\n- } else {\n+ MapProtocolMapperEntity pm = MapProtocolMapperUtils.fromModel(model);\n+ if (pm.getId() == null) {\n+ String id = KeycloakModelUtils.generateId();\n+ pm.setId(id);\n+ }\n+ if (model.getConfig() == null) {\npm.setConfig(new HashMap<>());\n}\n- return entity.addProtocolMapper(pm);\n+ entity.addProtocolMapper(pm);\n+ return pmUtils.toModel(pm);\n}\n@Override\n@@ -142,26 +164,37 @@ public class MapClientScopeAdapter extends AbstractClientScopeModel<MapClientSco\npublic void updateProtocolMapper(ProtocolMapperModel mapping) {\nfinal String id = mapping == null ? null : mapping.getId();\nif (id != null) {\n- entity.updateProtocolMapper(id, 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- return entity.getProtocolMapperById(id);\n+ return entity.getProtocolMapper(id).map(pmUtils::toModel).orElse(null);\n}\n@Override\npublic ProtocolMapperModel getProtocolMapperByName(String protocol, String name) {\n- return entity.getProtocolMappers()\n- .filter(pm -> Objects.equals(pm.getProtocol(), protocol) && Objects.equals(pm.getName(), name))\n+ final Set<MapProtocolMapperEntity> protocolMappers = entity.getProtocolMappers();\n+ if (! Objects.equals(protocol, safeGetProtocol())) {\n+ return null;\n+ }\n+ return protocolMappers == null ? null : protocolMappers.stream()\n+ .filter(pm -> Objects.equals(pm.getName(), name))\n+ .map(pmUtils::toModel)\n.findAny()\n.orElse(null);\n}\n+ /*************** Scopes mappings ****************/\n+\n@Override\npublic Stream<RoleModel> getScopeMappingsStream() {\n- return this.entity.getScopeMappings()\n+ final Collection<String> scopeMappings = this.entity.getScopeMappings();\n+ return scopeMappings == null ? Stream.empty() : scopeMappings.stream()\n.map(realm::getRoleById)\n.filter(Objects::nonNull);\n}\n@@ -183,7 +216,7 @@ public class MapClientScopeAdapter extends AbstractClientScopeModel<MapClientSco\npublic void deleteScopeMapping(RoleModel role) {\nfinal String id = role == null ? null : role.getId();\nif (id != null) {\n- this.entity.deleteScopeMapping(id);\n+ this.entity.removeScopeMapping(id);\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/clientscope/MapClientScopeEntity.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/clientscope/MapClientScopeEntity.java", "diff": "package org.keycloak.models.map.clientscope;\nimport java.util.Collection;\n-import java.util.Collections;\n-import java.util.HashMap;\n-import java.util.LinkedHashSet;\n-import java.util.List;\n-import java.util.Map;\nimport java.util.Objects;\n+import java.util.Optional;\nimport java.util.Set;\n-import java.util.function.Function;\n-import java.util.stream.Collectors;\n-import java.util.stream.Stream;\n-import org.keycloak.models.ProtocolMapperModel;\n+import org.keycloak.models.map.annotations.GenerateEntityImplementations;\n+import org.keycloak.models.map.client.MapProtocolMapperEntity;\nimport org.keycloak.models.map.common.AbstractEntity;\n+import org.keycloak.models.map.common.DeepCloner;\nimport org.keycloak.models.map.common.EntityWithAttributes;\nimport org.keycloak.models.map.common.UpdatableEntity;\n-public class MapClientScopeEntity extends UpdatableEntity.Impl implements AbstractEntity, EntityWithAttributes {\n+@GenerateEntityImplementations(\n+ inherits = \"org.keycloak.models.map.clientscope.MapClientScopeEntity.AbstractClientScopeEntity\"\n+)\[email protected]\n+public interface MapClientScopeEntity extends AbstractEntity, UpdatableEntity, EntityWithAttributes {\n- private String id;\n- private String realmId;\n-\n- private String name;\n- private String protocol;\n- private String description;\n-\n- private final Set<String> scopeMappings = new LinkedHashSet<>();\n- private final Map<String, ProtocolMapperModel> protocolMappers = new HashMap<>();\n- private final Map<String, List<String>> attributes = new HashMap<>();\n-\n- /**\n- * Flag signalizing that any of the setters has been meaningfully used.\n- */\n-\n- public MapClientScopeEntity() {}\n+ public abstract class AbstractClientScopeEntity extends UpdatableEntity.Impl implements MapClientScopeEntity {\n- public MapClientScopeEntity(String id, String realmId) {\n- this.id = id;\n- this.realmId = realmId;\n- }\n+ private String id;\n@Override\npublic String getId() {\n@@ -68,111 +49,43 @@ public class MapClientScopeEntity extends UpdatableEntity.Impl implements Abstra\nthis.updated |= id != null;\n}\n- public String getName() {\n- return name;\n- }\n-\n- public void setName(String name) {\n- this.updated |= ! Objects.equals(this.name, name);\n- this.name = name;\n- }\n-\n- public String getDescription() {\n- return description;\n- }\n-\n- public void setDescription(String description) {\n- this.updated |= ! Objects.equals(this.description, description);\n- this.description = description;\n- }\n-\n- public String getProtocol() {\n- return protocol;\n- }\n-\n- public void setProtocol(String protocol) {\n- this.updated |= ! Objects.equals(this.protocol, protocol);\n- this.protocol = protocol;\n- }\n-\n@Override\n- public Map<String, List<String>> getAttributes() {\n- return attributes;\n- }\n+ public Optional<MapProtocolMapperEntity> getProtocolMapper(String id) {\n+ Set<MapProtocolMapperEntity> mappers = getProtocolMappers();\n+ if (mappers == null || mappers.isEmpty()) return Optional.empty();\n- @Override\n- public void setAttributes(Map<String, List<String>> attributes) {\n- this.attributes.clear();\n- this.attributes.putAll(attributes);\n- this.updated = true;\n+ return mappers.stream().filter(m -> Objects.equals(m.getId(), id)).findFirst();\n}\n@Override\n- public void setAttribute(String name, List<String> values) {\n- this.updated |= ! Objects.equals(this.attributes.put(name, values), values);\n+ public void removeProtocolMapper(String id) {\n+ Set<MapProtocolMapperEntity> mappers = getProtocolMappers();\n+ this.updated |= mappers != null && mappers.removeIf(m -> Objects.equals(m.getId(), id));\n}\n-\n- public ProtocolMapperModel addProtocolMapper(ProtocolMapperModel model) {\n- Objects.requireNonNull(model.getId(), \"protocolMapper.id\");\n- updated = true;\n- this.protocolMappers.put(model.getId(), model);\n- return model;\n}\n- public Stream<ProtocolMapperModel> getProtocolMappers() {\n- return protocolMappers.values().stream();\n- }\n+ String getName();\n- public void updateProtocolMapper(String id, ProtocolMapperModel mapping) {\n- updated = true;\n- protocolMappers.put(id, mapping);\n- }\n+ String getDescription();\n- public void removeProtocolMapper(String id) {\n- updated |= protocolMappers.remove(id) != null;\n- }\n+ String getProtocol();\n- public void setProtocolMappers(Collection<ProtocolMapperModel> protocolMappers) {\n- this.updated |= ! Objects.equals(this.protocolMappers, protocolMappers);\n- this.protocolMappers.clear();\n- this.protocolMappers.putAll(protocolMappers.stream().collect(Collectors.toMap(ProtocolMapperModel::getId, Function.identity())));\n- }\n+ String getRealmId();\n- public ProtocolMapperModel getProtocolMapperById(String id) {\n- return id == null ? null : protocolMappers.get(id);\n- }\n+ void setName(String name);\n- @Override\n- public void removeAttribute(String name) {\n- this.updated |= this.attributes.remove(name) != null;\n- }\n+ void setDescription(String description);\n- @Override\n- public List<String> getAttribute(String name) {\n- return attributes.getOrDefault(name, Collections.EMPTY_LIST);\n- }\n-\n- public String getRealmId() {\n- return this.realmId;\n- }\n-\n- public void setRealmId(String realmId) {\n- this.updated |= !Objects.equals(this.realmId, realmId);\n- this.realmId = realmId;\n- }\n+ void setProtocol(String protocol);\n- public Stream<String> getScopeMappings() {\n- return scopeMappings.stream();\n- }\n+ void setRealmId(String realmId);\n- public void addScopeMapping(String id) {\n- if (id != null) {\n- updated = true;\n- scopeMappings.add(id);\n- }\n- }\n+ Optional<MapProtocolMapperEntity> getProtocolMapper(String id);\n+ Set<MapProtocolMapperEntity> getProtocolMappers();\n+ void addProtocolMapper(MapProtocolMapperEntity mapping);\n+ void removeProtocolMapper(String id);\n- public void deleteScopeMapping(String id) {\n- updated |= scopeMappings.remove(id);\n- }\n+ void addScopeMapping(String id);\n+ void removeScopeMapping(String id);\n+ Collection<String> getScopeMappings();\n}\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/clientscope/MapClientScopeProvider.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/clientscope/MapClientScopeProvider.java", "diff": "@@ -77,7 +77,6 @@ public class MapClientScopeProvider implements ClientScopeProvider {\n@Override\npublic ClientScopeModel addClientScope(RealmModel realm, String id, String name) {\n- // Check Db constraint: @UniqueConstraint(columnNames = {\"REALM_ID\", \"NAME\"})\nDefaultModelCriteria<ClientScopeModel> mcb = criteria();\nmcb = mcb.compare(SearchableFields.REALM_ID, Operator.EQ, realm.getId())\n.compare(SearchableFields.NAME, Operator.EQ, name);\n@@ -86,13 +85,17 @@ public class MapClientScopeProvider implements ClientScopeProvider {\nthrow new ModelDuplicateException(\"Client scope with name '\" + name + \"' in realm \" + realm.getName());\n}\n- LOG.tracef(\"addClientScope(%s, %s, %s)%s\", realm, id, name, getShortStackTrace());\n-\n- MapClientScopeEntity entity = new MapClientScopeEntity(id, realm.getId());\n- entity.setName(KeycloakModelUtils.convertClientScopeName(name));\nif (id != null && tx.read(id) != null) {\nthrow new ModelDuplicateException(\"Client scope exists: \" + id);\n}\n+\n+ LOG.tracef(\"addClientScope(%s, %s, %s)%s\", realm, id, name, getShortStackTrace());\n+\n+ MapClientScopeEntity entity = new MapClientScopeEntityImpl();\n+ entity.setId(id);\n+ entity.setRealmId(realm.getId());\n+ entity.setName(KeycloakModelUtils.convertClientScopeName(name));\n+\nentity = tx.create(entity);\nreturn entityToAdapterFunc(realm).apply(entity);\n}\n" }, { "change_type": "MODIFY", "old_path": "model/map/src/main/java/org/keycloak/models/map/storage/chm/ConcurrentHashMapStorageProviderFactory.java", "new_path": "model/map/src/main/java/org/keycloak/models/map/storage/chm/ConcurrentHashMapStorageProviderFactory.java", "diff": "@@ -28,6 +28,7 @@ import org.keycloak.models.UserSessionModel;\nimport org.keycloak.models.map.client.MapClientEntityImpl;\nimport org.keycloak.models.map.client.MapProtocolMapperEntity;\nimport org.keycloak.models.map.client.MapProtocolMapperEntityImpl;\n+import org.keycloak.models.map.clientscope.MapClientScopeEntityImpl;\nimport org.keycloak.models.map.common.AbstractEntity;\nimport org.keycloak.models.map.common.DeepCloner;\nimport org.keycloak.models.map.common.Serialization;\n@@ -44,12 +45,9 @@ import java.util.concurrent.ConcurrentHashMap;\nimport org.jboss.logging.Logger;\nimport org.keycloak.models.map.storage.MapStorageProvider;\nimport org.keycloak.models.map.storage.MapStorageProviderFactory;\n-import org.keycloak.models.map.user.MapUserConsentEntity;\nimport org.keycloak.models.map.user.MapUserConsentEntityImpl;\n-import org.keycloak.models.map.user.MapUserCredentialEntity;\nimport org.keycloak.models.map.user.MapUserCredentialEntityImpl;\nimport org.keycloak.models.map.user.MapUserEntityImpl;\n-import org.keycloak.models.map.user.MapUserFederatedIdentityEntity;\nimport org.keycloak.models.map.user.MapUserFederatedIdentityEntityImpl;\nimport org.keycloak.models.map.storage.ModelEntityUtil;\nimport org.keycloak.provider.EnvironmentDependentProviderFactory;\n@@ -95,6 +93,7 @@ public class ConcurrentHashMapStorageProviderFactory implements AmphibianProvide\n.constructor(MapUserCredentialEntityImpl.class, MapUserCredentialEntityImpl::new)\n.constructor(MapUserFederatedIdentityEntityImpl.class, MapUserFederatedIdentityEntityImpl::new)\n.constructor(MapUserConsentEntityImpl.class, MapUserConsentEntityImpl::new)\n+ .constructor(MapClientScopeEntityImpl.class, MapClientScopeEntityImpl::new)\n.build();\nprivate static final Map<String, StringKeyConvertor> KEY_CONVERTORS = new HashMap<>();\n" }, { "change_type": "MODIFY", "old_path": "server-spi-private/src/main/java/org/keycloak/migration/migrators/MigrationUtils.java", "new_path": "server-spi-private/src/main/java/org/keycloak/migration/migrators/MigrationUtils.java", "diff": "package org.keycloak.migration.migrators;\n+import java.util.stream.Collectors;\nimport org.keycloak.Config;\nimport org.keycloak.OAuth2Constants;\nimport org.keycloak.OAuthErrorException;\n@@ -70,6 +71,7 @@ public class MigrationUtils {\nclient.getProtocolMappersStream()\n.filter(mapper -> !mapper.getConfig().containsKey(\"userinfo.token.claim\") && mapper.getConfig().containsKey(\"id.token.claim\"))\n.peek(mapper -> mapper.getConfig().put(\"userinfo.token.claim\", mapper.getConfig().get(\"id.token.claim\")))\n+ .collect(Collectors.toSet()).stream() // to avoid ConcurrentModificationException\n.forEach(client::updateProtocolMapper);\n}\n" } ]