From 1287cb0010cedf3c3603ef6f0b94068d243eed5b Mon Sep 17 00:00:00 2001 From: Erik Jan de Wit Date: Mon, 26 Oct 2026 15:21:43 +0100 Subject: [PATCH 1/5] Restrict defaultRoles and full scope via client registration policies Replace hardcoded manage-realm/RAT checks with Default Roles Disabled and authenticated Full Scope Disabled policies so admins can opt back in. Closes CVE-2026-109081 Closes #54702 Signed-off-by: Erik Jan de Wit --- .../topics/changes/changes-27_0_0.adoc | 19 ++ .../securing-apps/client-registration.adoc | 6 +- .../migration/migrators/MigrateTo26_8_2.java | 34 +++ .../rolling-upgrades-unsupported-changes.json | 6 + ...stentClientIdMetadataDocumentProvider.java | 20 -- .../AbstractClientRegistrationProvider.java | 5 +- .../DefaultClientRegistrationPolicies.java | 7 + .../DefaultRolesClientRegistrationPolicy.java | 97 +++++++ ...tRolesClientRegistrationPolicyFactory.java | 52 ++++ ...ion.policy.ClientRegistrationPolicyFactory | 1 + ...aultRolesClientRegistrationPolicyTest.java | 135 ++++++++++ .../AbstractClientRegistrationTest.java | 14 +- .../tests/client/ClientRegistrationTest.java | 243 +++++++++++++++++- 13 files changed, 607 insertions(+), 32 deletions(-) create mode 100644 model/storage-private/src/main/resources/META-INF/rolling-upgrades-unsupported-changes.json create mode 100644 services/src/main/java/org/keycloak/services/clientregistration/policy/impl/DefaultRolesClientRegistrationPolicy.java create mode 100644 services/src/main/java/org/keycloak/services/clientregistration/policy/impl/DefaultRolesClientRegistrationPolicyFactory.java create mode 100644 services/src/test/java/org/keycloak/services/clientregistration/policy/impl/DefaultRolesClientRegistrationPolicyTest.java diff --git a/docs/documentation/upgrading/topics/changes/changes-27_0_0.adoc b/docs/documentation/upgrading/topics/changes/changes-27_0_0.adoc index d96053e0907..c9480cfa42c 100644 --- a/docs/documentation/upgrading/topics/changes/changes-27_0_0.adoc +++ b/docs/documentation/upgrading/topics/changes/changes-27_0_0.adoc @@ -4,6 +4,25 @@ Breaking changes are identified as those that might require changes for existing users to their configurations or applications. In minor or patch releases, {project_name} will only introduce breaking changes to fix bugs. +=== Client registration policies restrict default roles and full scope (CVE-2026-109081) +// https://github.com/keycloak/keycloak/issues/54702 + +Dynamic Client Registration can no longer change the realm-wide default-role composite through the deprecated `defaultRoles` field, and authenticated registration can no longer enable `fullScopeAllowed`, unless a realm administrator removes the corresponding client registration policies. + +Starting with this release: + +* A *Default Roles Disabled* client registration policy is added to both the anonymous and authenticated client registration policies (including during migration of existing realms). +While this policy is present, create or update requests that would add, change, or remove roles in the realm `default-roles-` composite through `defaultRoles` are rejected with HTTP `403 Forbidden`. +* The existing *Full Scope Disabled* policy (`scope`) is also added to the authenticated client registration policies (it was already present for anonymous registration). +Newly registered clients through authenticated Dynamic Client Registration have `fullScopeAllowed` disabled, and updates that try to enable it are rejected with HTTP `403 Forbidden`. + +Realm administrators who intentionally want Dynamic Client Registration to manage these settings can remove the corresponding policies under *Clients* -> *Client registration* -> *Client registration policies*. +Removing them restores the previous behavior and should be done only when the security implications are understood. +Use the Admin REST API to manage realm default roles and full scope when the policies remain in place. + +This migration installs a new client registration policy provider that earlier nodes do not know. +A rolling upgrade is therefore not supported for this change; shut down the cluster and upgrade all nodes together (or use a recreate update) so that older nodes never process Dynamic Client Registration requests against the new policy components. + === PAR metadata omitted when PAR is disabled When the `par` feature is disabled, OpenID Connect discovery now omits `pushed_authorization_request_endpoint` from both the top-level metadata and `mtls_endpoint_aliases`, and omits `require_pushed_authorization_requests`. diff --git a/docs/guides/securing-apps/client-registration.adoc b/docs/guides/securing-apps/client-registration.adoc index 0c7f16b4c03..3b96fc1ce95 100644 --- a/docs/guides/securing-apps/client-registration.adoc +++ b/docs/guides/securing-apps/client-registration.adoc @@ -264,7 +264,11 @@ Client scopes can contain role scope mappings and various protocol mappers, whic When a client is assigned an allowed client scope, all of those role scope mappings and protocol mappers will be applied. * Full Scope Policy - Newly registered clients will have `Full Scope Allowed` switch disabled. This means they won't have any scoped -realm roles or client roles of other clients. +realm roles or client roles of other clients. This policy is present by default for both anonymous and authenticated client registration. + +* Default Roles Policy - Rejects create or update requests that would change the realm-wide default-role composite through the deprecated +`defaultRoles` field. This policy is present by default for both anonymous and authenticated client registration. +Realm administrators who still need this behaviour through Dynamic Client Registration can remove the policy. * Max Clients Policy - Rejects registration if current number of clients in the realm is same or bigger than specified limit. It's 200 by default for anonymous registrations. diff --git a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo26_8_2.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo26_8_2.java index 23c32dc8bc4..b860a6a845c 100644 --- a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo26_8_2.java +++ b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo26_8_2.java @@ -2,9 +2,11 @@ import java.util.HashMap; import java.util.Map; +import java.util.Objects; import java.util.Set; import org.keycloak.Config; +import org.keycloak.component.ComponentModel; import org.keycloak.migration.MigrationProvider; import org.keycloak.migration.ModelVersion; import org.keycloak.models.ClientModel; @@ -14,10 +16,22 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; +/** + * Migrates realms for 26.8.2: Admin API client scope assignment, plus client registration + * policies that block {@code defaultRoles} and enable {@code Full Scope Disabled} for + * authenticated Dynamic Client Registration. + */ public class MigrateTo26_8_2 extends RealmMigration { public static final ModelVersion VERSION = new ModelVersion("26.8.2"); + private static final String CLIENT_REGISTRATION_POLICY = + "org.keycloak.services.clientregistration.policy.ClientRegistrationPolicy"; + private static final String DEFAULT_ROLES_PROVIDER_ID = "default-roles"; + private static final String SCOPE_PROVIDER_ID = "scope"; + private static final String ANONYMOUS = "anonymous"; + private static final String AUTHENTICATED = "authenticated"; + @Override public ModelVersion getVersion() { return VERSION; @@ -26,6 +40,9 @@ public ModelVersion getVersion() { @Override public void migrateRealm(KeycloakSession session, RealmModel realm) { migrateAdminApiClientScope(session, realm); + addPolicyIfMissing(realm, "Default Roles Disabled", DEFAULT_ROLES_PROVIDER_ID, ANONYMOUS); + addPolicyIfMissing(realm, "Default Roles Disabled", DEFAULT_ROLES_PROVIDER_ID, AUTHENTICATED); + addPolicyIfMissing(realm, "Full Scope Disabled", SCOPE_PROVIDER_ID, AUTHENTICATED); } private void migrateAdminApiClientScope(KeycloakSession session, RealmModel realm) { @@ -58,4 +75,21 @@ private void addAdminApiClientScope(ClientModel client, ClientScopeModel scope) client.addClientScope(scope, true); } } + + private static void addPolicyIfMissing(RealmModel realm, String name, String providerId, String policyType) { + boolean exists = realm.getComponentsStream(realm.getId(), CLIENT_REGISTRATION_POLICY) + .anyMatch(c -> Objects.equals(providerId, c.getProviderId()) + && Objects.equals(policyType, c.getSubType())); + if (exists) { + return; + } + + ComponentModel model = new ComponentModel(); + model.setName(name); + model.setParentId(realm.getId()); + model.setProviderId(providerId); + model.setProviderType(CLIENT_REGISTRATION_POLICY); + model.setSubType(policyType); + realm.addComponentModel(model); + } } diff --git a/model/storage-private/src/main/resources/META-INF/rolling-upgrades-unsupported-changes.json b/model/storage-private/src/main/resources/META-INF/rolling-upgrades-unsupported-changes.json new file mode 100644 index 00000000000..f40242adac8 --- /dev/null +++ b/model/storage-private/src/main/resources/META-INF/rolling-upgrades-unsupported-changes.json @@ -0,0 +1,6 @@ +{ + "changeSets" : [ ], + "migrations" : [ { + "class" : "org.keycloak.migration.migrators.MigrateTo26_8_2" + } ] +} diff --git a/services/src/main/java/org/keycloak/protocol/oauth2/cimd/provider/AbstractPersistentClientIdMetadataDocumentProvider.java b/services/src/main/java/org/keycloak/protocol/oauth2/cimd/provider/AbstractPersistentClientIdMetadataDocumentProvider.java index d8df74c0e04..06320e18008 100644 --- a/services/src/main/java/org/keycloak/protocol/oauth2/cimd/provider/AbstractPersistentClientIdMetadataDocumentProvider.java +++ b/services/src/main/java/org/keycloak/protocol/oauth2/cimd/provider/AbstractPersistentClientIdMetadataDocumentProvider.java @@ -158,12 +158,6 @@ public ClientModel createClientMetadata(AbstractClientIdMetadataDocumentExecutor session.clientPolicy().triggerOnEvent(new CimdClientRegisterContext(clientRep)); ClientModel clientModel = ClientManager.createClient(session, realm, clientRep); - if (clientRep.getDefaultRoles() != null) { - for (String name : clientRep.getDefaultRoles()) { - addDefaultRole(clientModel, name); - } - } - if (clientModel.isServiceAccountsEnabled()) { new ClientManager(new RealmManager(session)).enableServiceAccount(clientModel); } @@ -274,20 +268,6 @@ private static ClientPolicyException invalidClientMetadata(String errorDetail) { return new ClientPolicyException(OAuthErrorException.INVALID_REQUEST, errorDetail); } - // the same as AbstractClientRegistrationProvider.addDefaultRole - private void addDefaultRole(ClientModel client, String name) { - client.getRealm().getDefaultRole().addCompositeRole(getOrAddRoleId(client, name)); - } - - // the same as AbstractClientRegistrationProvider.getOrAddRoleId - private RoleModel getOrAddRoleId(ClientModel client, String name) { - RoleModel role = client.getRole(name); - if (role == null) { - role = client.addRole(name); - } - return role; - } - // the same as AbstractClientRegistrationProvider.getDefaultRolesStream private Stream getDefaultRolesStream(ClientModel client) { return client.getRealm().getDefaultRole().getCompositesStream() diff --git a/services/src/main/java/org/keycloak/services/clientregistration/AbstractClientRegistrationProvider.java b/services/src/main/java/org/keycloak/services/clientregistration/AbstractClientRegistrationProvider.java index 11112248709..e0fabbeca45 100755 --- a/services/src/main/java/org/keycloak/services/clientregistration/AbstractClientRegistrationProvider.java +++ b/services/src/main/java/org/keycloak/services/clientregistration/AbstractClientRegistrationProvider.java @@ -414,9 +414,10 @@ private void updateDefaultRoles(ClientModel client, String... defaultRoles) { removeDefaultRoles(client, remove.toArray(new String[] {})); for (String roleName : defaultRoles) { - if (!already.contains(roleName)) { - addDefaultRole(client, roleName); + if (roleName == null || already.contains(roleName)) { + continue; } + addDefaultRole(client, roleName); } } diff --git a/services/src/main/java/org/keycloak/services/clientregistration/policy/DefaultClientRegistrationPolicies.java b/services/src/main/java/org/keycloak/services/clientregistration/policy/DefaultClientRegistrationPolicies.java index 073e7410cea..27b78c45f61 100644 --- a/services/src/main/java/org/keycloak/services/clientregistration/policy/DefaultClientRegistrationPolicies.java +++ b/services/src/main/java/org/keycloak/services/clientregistration/policy/DefaultClientRegistrationPolicies.java @@ -32,6 +32,7 @@ import org.keycloak.protocol.saml.mappers.UserPropertyAttributeStatementMapper; import org.keycloak.services.clientregistration.policy.impl.ClientScopesClientRegistrationPolicyFactory; import org.keycloak.services.clientregistration.policy.impl.ConsentRequiredClientRegistrationPolicyFactory; +import org.keycloak.services.clientregistration.policy.impl.DefaultRolesClientRegistrationPolicyFactory; import org.keycloak.services.clientregistration.policy.impl.MaxClientsClientRegistrationPolicyFactory; import org.keycloak.services.clientregistration.policy.impl.ProtocolMappersClientRegistrationPolicyFactory; import org.keycloak.services.clientregistration.policy.impl.RegistrationWebOriginsPolicyFactory; @@ -99,10 +100,16 @@ private static void addAnonymousPolicies(RealmModel realm, String policyTypeKey) private static void addAuthPolicies(RealmModel realm, String policyTypeKey) { + ComponentModel scopeModel = createModelInstance("Full Scope Disabled", realm, ScopeClientRegistrationPolicyFactory.PROVIDER_ID, policyTypeKey); + realm.addComponentModel(scopeModel); + addGenericPolicies(realm, policyTypeKey); } private static void addGenericPolicies(RealmModel realm, String policyTypeKey) { + ComponentModel defaultRolesModel = createModelInstance("Default Roles Disabled", realm, DefaultRolesClientRegistrationPolicyFactory.PROVIDER_ID, policyTypeKey); + realm.addComponentModel(defaultRolesModel); + ComponentModel protMapperModel = createModelInstance("Allowed Protocol Mapper Types", realm, ProtocolMappersClientRegistrationPolicyFactory.PROVIDER_ID, policyTypeKey); protMapperModel.getConfig().put(ProtocolMappersClientRegistrationPolicyFactory.ALLOWED_PROTOCOL_MAPPER_TYPES, Arrays.asList(DEFAULT_ALLOWED_PROTOCOL_MAPPERS)); realm.addComponentModel(protMapperModel); diff --git a/services/src/main/java/org/keycloak/services/clientregistration/policy/impl/DefaultRolesClientRegistrationPolicy.java b/services/src/main/java/org/keycloak/services/clientregistration/policy/impl/DefaultRolesClientRegistrationPolicy.java new file mode 100644 index 00000000000..951f4bcbdd7 --- /dev/null +++ b/services/src/main/java/org/keycloak/services/clientregistration/policy/impl/DefaultRolesClientRegistrationPolicy.java @@ -0,0 +1,97 @@ +/* + * Copyright 2026 Red Hat, Inc. and/or its affiliates + * and other contributors as indicated by the @author tags. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.keycloak.services.clientregistration.policy.impl; + +import java.util.Arrays; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Collectors; + +import org.keycloak.models.ClientModel; +import org.keycloak.models.RoleModel; +import org.keycloak.representations.idm.ClientRepresentation; +import org.keycloak.services.clientregistration.ClientRegistrationContext; +import org.keycloak.services.clientregistration.ClientRegistrationProvider; +import org.keycloak.services.clientregistration.policy.ClientRegistrationPolicy; +import org.keycloak.services.clientregistration.policy.ClientRegistrationPolicyException; + +/** + * Rejects Dynamic Client Registration requests that would change the realm-wide default-role + * composite through the deprecated {@code defaultRoles} field. + * + */ +public class DefaultRolesClientRegistrationPolicy implements ClientRegistrationPolicy { + + @Override + public void beforeRegister(ClientRegistrationContext context) throws ClientRegistrationPolicyException { + String[] defaultRoles = context.getClient().getDefaultRoles(); + if (defaultRoles == null || defaultRoles.length == 0) { + return; + } + rejectNullDefaultRoles(defaultRoles); + throw new ClientRegistrationPolicyException("Not permitted to set defaultRoles"); + } + + @Override + public void afterRegister(ClientRegistrationContext context, ClientModel clientModel) { + } + + @Override + public void beforeUpdate(ClientRegistrationContext context, ClientModel clientModel) throws ClientRegistrationPolicyException { + ClientRepresentation rep = context.getClient(); + if (rep.getDefaultRoles() == null) { + return; + } + if (clientModel == null) { + return; + } + + rejectNullDefaultRoles(rep.getDefaultRoles()); + + Set current = getDefaultRoles(clientModel); + Set requested = Arrays.stream(rep.getDefaultRoles()).collect(Collectors.toSet()); + if (!current.equals(requested)) { + throw new ClientRegistrationPolicyException("Not permitted to modify defaultRoles"); + } + } + + private static void rejectNullDefaultRoles(String[] defaultRoles) throws ClientRegistrationPolicyException { + if (Arrays.stream(defaultRoles).anyMatch(Objects::isNull)) { + throw new ClientRegistrationPolicyException("Not permitted to set null defaultRoles"); + } + } + + @Override + public void afterUpdate(ClientRegistrationContext context, ClientModel clientModel) { + } + + @Override + public void beforeView(ClientRegistrationProvider provider, ClientModel clientModel) throws ClientRegistrationPolicyException { + } + + @Override + public void beforeDelete(ClientRegistrationProvider provider, ClientModel clientModel) throws ClientRegistrationPolicyException { + } + + private static Set getDefaultRoles(ClientModel client) { + return client.getRealm().getDefaultRole().getCompositesStream() + .filter(role -> role.isClientRole() && Objects.equals(role.getContainerId(), client.getId())) + .map(RoleModel::getName) + .collect(Collectors.toSet()); + } +} diff --git a/services/src/main/java/org/keycloak/services/clientregistration/policy/impl/DefaultRolesClientRegistrationPolicyFactory.java b/services/src/main/java/org/keycloak/services/clientregistration/policy/impl/DefaultRolesClientRegistrationPolicyFactory.java new file mode 100644 index 00000000000..176ac6e3612 --- /dev/null +++ b/services/src/main/java/org/keycloak/services/clientregistration/policy/impl/DefaultRolesClientRegistrationPolicyFactory.java @@ -0,0 +1,52 @@ +/* + * Copyright 2026 Red Hat, Inc. and/or its affiliates + * and other contributors as indicated by the @author tags. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.keycloak.services.clientregistration.policy.impl; + +import java.util.Collections; +import java.util.List; + +import org.keycloak.component.ComponentModel; +import org.keycloak.models.KeycloakSession; +import org.keycloak.provider.ProviderConfigProperty; +import org.keycloak.services.clientregistration.policy.AbstractClientRegistrationPolicyFactory; +import org.keycloak.services.clientregistration.policy.ClientRegistrationPolicy; + +public class DefaultRolesClientRegistrationPolicyFactory extends AbstractClientRegistrationPolicyFactory { + + public static final String PROVIDER_ID = "default-roles"; + + @Override + public ClientRegistrationPolicy create(KeycloakSession session, ComponentModel model) { + return new DefaultRolesClientRegistrationPolicy(); + } + + @Override + public String getHelpText() { + return "When present, then Dynamic Client Registration cannot change the realm default roles through the deprecated defaultRoles field"; + } + + @Override + public List getConfigProperties() { + return Collections.emptyList(); + } + + @Override + public String getId() { + return PROVIDER_ID; + } +} diff --git a/services/src/main/resources/META-INF/services/org.keycloak.services.clientregistration.policy.ClientRegistrationPolicyFactory b/services/src/main/resources/META-INF/services/org.keycloak.services.clientregistration.policy.ClientRegistrationPolicyFactory index a79b0bfa3f5..d06aab0051c 100644 --- a/services/src/main/resources/META-INF/services/org.keycloak.services.clientregistration.policy.ClientRegistrationPolicyFactory +++ b/services/src/main/resources/META-INF/services/org.keycloak.services.clientregistration.policy.ClientRegistrationPolicyFactory @@ -20,6 +20,7 @@ org.keycloak.services.clientregistration.policy.impl.ConsentRequiredClientRegist org.keycloak.services.clientregistration.policy.impl.ProtocolMappersClientRegistrationPolicyFactory org.keycloak.services.clientregistration.policy.impl.ClientScopesClientRegistrationPolicyFactory org.keycloak.services.clientregistration.policy.impl.ScopeClientRegistrationPolicyFactory +org.keycloak.services.clientregistration.policy.impl.DefaultRolesClientRegistrationPolicyFactory org.keycloak.services.clientregistration.policy.impl.ClientDisabledClientRegistrationPolicyFactory org.keycloak.services.clientregistration.policy.impl.MaxClientsClientRegistrationPolicyFactory org.keycloak.services.clientregistration.policy.impl.RegistrationWebOriginsPolicyFactory \ No newline at end of file diff --git a/services/src/test/java/org/keycloak/services/clientregistration/policy/impl/DefaultRolesClientRegistrationPolicyTest.java b/services/src/test/java/org/keycloak/services/clientregistration/policy/impl/DefaultRolesClientRegistrationPolicyTest.java new file mode 100644 index 00000000000..f539574dc75 --- /dev/null +++ b/services/src/test/java/org/keycloak/services/clientregistration/policy/impl/DefaultRolesClientRegistrationPolicyTest.java @@ -0,0 +1,135 @@ +/* + * Copyright 2026 Red Hat, Inc. and/or its affiliates + * and other contributors as indicated by the @author tags. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.keycloak.services.clientregistration.policy.impl; + +import java.lang.reflect.Proxy; +import java.util.stream.Stream; + +import org.keycloak.models.ClientModel; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.RealmModel; +import org.keycloak.models.RoleModel; +import org.keycloak.representations.idm.ClientRepresentation; +import org.keycloak.services.clientregistration.ClientRegistrationContext; +import org.keycloak.services.clientregistration.ClientRegistrationProvider; +import org.keycloak.services.clientregistration.policy.ClientRegistrationPolicyException; + +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + +public class DefaultRolesClientRegistrationPolicyTest { + + private final DefaultRolesClientRegistrationPolicy policy = new DefaultRolesClientRegistrationPolicy(); + + @Test + public void beforeRegisterRejectsNullElements() { + ClientRepresentation rep = new ClientRepresentation(); + rep.setDefaultRoles(new String[]{null}); + try { + policy.beforeRegister(context(rep)); + fail("Expected ClientRegistrationPolicyException"); + } catch (ClientRegistrationPolicyException expected) { + assertEquals("Not permitted to set null defaultRoles", expected.getMessage()); + } + } + + @Test + public void beforeUpdateRejectsNullElementsEvenWhenCurrentDefaultsAreEmpty() { + ClientRepresentation rep = new ClientRepresentation(); + rep.setDefaultRoles(new String[]{null}); + try { + policy.beforeUpdate(context(rep), clientWithoutDefaultRoles()); + fail("Expected ClientRegistrationPolicyException"); + } catch (ClientRegistrationPolicyException expected) { + assertEquals("Not permitted to set null defaultRoles", expected.getMessage()); + } + } + + @Test + public void beforeRegisterRejectsNonEmptyDefaultRoles() { + ClientRepresentation rep = new ClientRepresentation(); + rep.setDefaultRoles(new String[]{"role-a"}); + try { + policy.beforeRegister(context(rep)); + fail("Expected ClientRegistrationPolicyException"); + } catch (ClientRegistrationPolicyException expected) { + assertEquals("Not permitted to set defaultRoles", expected.getMessage()); + } + } + + private static ClientRegistrationContext context(ClientRepresentation rep) { + return new ClientRegistrationContext() { + @Override + public ClientRepresentation getClient() { + return rep; + } + + @Override + public KeycloakSession getSession() { + return null; + } + + @Override + public ClientRegistrationProvider getProvider() { + return null; + } + }; + } + + private static ClientModel clientWithoutDefaultRoles() { + RoleModel defaultRole = (RoleModel) Proxy.newProxyInstance(RoleModel.class.getClassLoader(), + new Class[]{RoleModel.class}, + (proxy, method, args) -> { + if ("getCompositesStream".equals(method.getName())) { + return Stream.empty(); + } + if (boolean.class.equals(method.getReturnType())) { + return false; + } + return null; + }); + + RealmModel realm = (RealmModel) Proxy.newProxyInstance(RealmModel.class.getClassLoader(), + new Class[]{RealmModel.class}, + (proxy, method, args) -> { + if ("getDefaultRole".equals(method.getName())) { + return defaultRole; + } + if (boolean.class.equals(method.getReturnType())) { + return false; + } + return null; + }); + + return (ClientModel) Proxy.newProxyInstance(ClientModel.class.getClassLoader(), + new Class[]{ClientModel.class}, + (proxy, method, args) -> { + if ("getId".equals(method.getName())) { + return "client-id"; + } + if ("getRealm".equals(method.getName())) { + return realm; + } + if (boolean.class.equals(method.getReturnType())) { + return false; + } + return null; + }); + } +} diff --git a/tests/base/src/test/java/org/keycloak/tests/client/AbstractClientRegistrationTest.java b/tests/base/src/test/java/org/keycloak/tests/client/AbstractClientRegistrationTest.java index 4675e92553a..2f3c95d8cb2 100644 --- a/tests/base/src/test/java/org/keycloak/tests/client/AbstractClientRegistrationTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/client/AbstractClientRegistrationTest.java @@ -115,6 +115,10 @@ void authManageClients() { reg.auth(Auth.token(getToken("manage-clients", "password"))); } + void authManageRealm() { + reg.auth(Auth.token(getToken("manage-realm", "password"))); + } + void authNoAccess() { reg.auth(Auth.token(getToken("no-access", "password"))); } @@ -184,6 +188,14 @@ public RealmBuilder configure(RealmBuilder realm) { .emailVerified(true) .clientRoles(Constants.REALM_MANAGEMENT_CLIENT_ID, AdminRoles.VIEW_CLIENTS); + UserBuilder manageRealmUser = UserBuilder.create() + .username("manage-realm") + .name("manage", "realm") + .password("password") + .email("manage-realm@test.com") + .emailVerified(true) + .clientRoles(Constants.REALM_MANAGEMENT_CLIENT_ID, AdminRoles.MANAGE_CLIENTS, AdminRoles.MANAGE_REALM); + UserBuilder noAccessUser = UserBuilder.create() .username("no-access") .name("no", "access") @@ -191,7 +203,7 @@ public RealmBuilder configure(RealmBuilder realm) { .email("no-access@test.com") .emailVerified(true); - realm.users(manageClientUser, createClientUser, viewClientUser, noAccessUser); + realm.users(manageClientUser, createClientUser, viewClientUser, manageRealmUser, noAccessUser); return realm; } diff --git a/tests/base/src/test/java/org/keycloak/tests/client/ClientRegistrationTest.java b/tests/base/src/test/java/org/keycloak/tests/client/ClientRegistrationTest.java index 5fb5c1193cc..79f799cfe89 100644 --- a/tests/base/src/test/java/org/keycloak/tests/client/ClientRegistrationTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/client/ClientRegistrationTest.java @@ -53,6 +53,7 @@ import org.keycloak.representations.idm.ClientInitialAccessCreatePresentation; import org.keycloak.representations.idm.ClientInitialAccessPresentation; import org.keycloak.representations.idm.ClientRepresentation; +import org.keycloak.representations.idm.ComponentRepresentation; import org.keycloak.representations.idm.OAuth2ErrorRepresentation; import org.keycloak.representations.idm.ProtocolMapperRepresentation; import org.keycloak.representations.idm.RoleRepresentation; @@ -60,6 +61,11 @@ import org.keycloak.representations.idm.authorization.ResourceRepresentation; import org.keycloak.representations.idm.authorization.ResourceServerRepresentation; import org.keycloak.representations.oidc.OIDCClientRepresentation; +import org.keycloak.services.clientregistration.policy.ClientRegistrationPolicy; +import org.keycloak.services.clientregistration.policy.ClientRegistrationPolicyManager; +import org.keycloak.services.clientregistration.policy.RegistrationAuth; +import org.keycloak.services.clientregistration.policy.impl.DefaultRolesClientRegistrationPolicyFactory; +import org.keycloak.services.clientregistration.policy.impl.ScopeClientRegistrationPolicyFactory; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.util.ApiUtil; import org.keycloak.tests.suites.DatabaseTest; @@ -260,21 +266,242 @@ public void registerClientWithNonAsciiChars() throws ClientRegistrationException @Test @DatabaseTest - public void clientWithDefaultRoles() throws ClientRegistrationException { + public void clientWithDefaultRolesRejectedByPolicy() throws ClientRegistrationException { authCreateClients(); ClientRepresentation client = buildClient(); client.setDefaultRoles(new String[]{"test-default-role"}); + assertCreateRejected(client, "Not permitted to set defaultRoles"); - ClientRepresentation createdClient = registerClient(client, true); - assertThat(createdClient.getDefaultRoles(), Matchers.arrayContaining("test-default-role")); + authManageClients(); + ClientRepresentation created = registerClient(buildClient(), true); + created.setDefaultRoles(new String[]{"test-default-role1", "test-default-role2"}); + assertUpdateRejected(created, "Not permitted to modify defaultRoles"); + assertNoDefaultRoles(managedRealm.admin().clients().get(created.getId()).toRepresentation(), + "test-default-role1", "test-default-role2"); + } + + @Test + @DatabaseTest + public void clientWithDefaultRolesAllowedWhenPolicyRemoved() throws ClientRegistrationException { + ComponentRepresentation policy = findPolicyByProviderAndAuth( + DefaultRolesClientRegistrationPolicyFactory.PROVIDER_ID, + ClientRegistrationPolicyManager.getComponentTypeKey(RegistrationAuth.AUTHENTICATED)); + managedRealm.admin().components().component(policy.getId()).remove(); + try { + authManageClients(); + ClientRepresentation client = buildClient(); + client.setDefaultRoles(new String[]{"test-default-role"}); + + ClientRepresentation createdClient = registerClient(client, true); + assertThat(createdClient.getDefaultRoles(), Matchers.arrayContaining("test-default-role")); + + ClientRepresentation obtainedClient = reg.get(CLIENT_ID); + assertThat(obtainedClient.getDefaultRoles(), Matchers.arrayContaining("test-default-role")); + + client.setDefaultRoles(new String[]{"test-default-role1", "test-default-role2"}); + ClientRepresentation updatedClient = reg.update(client); + assertThat(updatedClient.getDefaultRoles(), Matchers.arrayContainingInAnyOrder("test-default-role1", "test-default-role2")); + } finally { + restoreDefaultRolesPolicy(RegistrationAuth.AUTHENTICATED); + } + } + + @Test + @DatabaseTest + public void initialAccessTokenCannotSetDefaultRoles() throws ClientRegistrationException { + reg.auth(Auth.token(createInitialAccessToken())); + + ClientRepresentation client = buildClient(); + client.setDefaultRoles(new String[]{"injected-default-role"}); + assertCreateRejected(client, "Not permitted to set defaultRoles"); + + reg.auth(Auth.token(createInitialAccessToken())); + ClientRepresentation createdClient = registerClient(buildClient(), true); + createdClient.setDefaultRoles(new String[]{"injected-via-rat"}); + reg.auth(Auth.token(createdClient.getRegistrationAccessToken())); + assertUpdateRejected(createdClient, "Not permitted to modify defaultRoles"); + assertNoDefaultRoles(managedRealm.admin().clients().get(createdClient.getId()).toRepresentation(), + "injected-default-role", "injected-via-rat"); + } + + @Test + @DatabaseTest + public void defaultRolesAddedByAdminCannotBeRemovedWhilePolicyPresent() throws ClientRegistrationException { + reg.auth(Auth.token(createInitialAccessToken())); + ClientRepresentation createdClient = registerClient(buildClient(), true); + + String adminDefaultRole = "admin-added-default-role"; + addClientRoleToRealmDefaultRoles(createdClient.getId(), adminDefaultRole); + + // Resending the existing default roles is fine + reg.auth(Auth.token(createdClient.getRegistrationAccessToken())); + ClientRepresentation update = reg.get(CLIENT_ID); + assertThat(update.getDefaultRoles(), Matchers.arrayContaining(adminDefaultRole)); + ClientRepresentation updatedClient = reg.update(update); + assertThat(updatedClient.getDefaultRoles(), Matchers.arrayContaining(adminDefaultRole)); + + // Adding or removing through DCR is rejected + reg.auth(Auth.token(updatedClient.getRegistrationAccessToken())); + update = reg.get(CLIENT_ID); + update.setDefaultRoles(new String[]{adminDefaultRole, "injected-via-rat"}); + assertUpdateRejected(update, "Not permitted to modify defaultRoles"); + + reg.auth(Auth.token(updatedClient.getRegistrationAccessToken())); + update = reg.get(CLIENT_ID); + update.setDefaultRoles(new String[0]); + assertUpdateRejected(update, "Not permitted to modify defaultRoles"); + assertThat(getRealmDefaultRoleComposites(), Matchers.hasItem(adminDefaultRole)); authManageClients(); - ClientRepresentation obtainedClient = reg.get(CLIENT_ID); - assertThat(obtainedClient.getDefaultRoles(), Matchers.arrayContaining("test-default-role")); + update = reg.get(CLIENT_ID); + update.setDefaultRoles(new String[0]); + assertUpdateRejected(update, "Not permitted to modify defaultRoles"); + assertThat(getRealmDefaultRoleComposites(), Matchers.hasItem(adminDefaultRole)); + } - client.setDefaultRoles(new String[]{"test-default-role1","test-default-role2"}); - ClientRepresentation updatedClient = reg.update(client); - assertThat(updatedClient.getDefaultRoles(), Matchers.arrayContainingInAnyOrder("test-default-role1","test-default-role2")); + @Test + @DatabaseTest + public void fullScopeAllowedCannotBeEnabledWithRegistrationAccessToken() throws ClientRegistrationException { + reg.auth(Auth.token(createInitialAccessToken())); + ClientRepresentation createdClient = registerClient(buildClient(), true); + assertFalse(createdClient.isFullScopeAllowed()); + + // Registration access token cannot enable full scope + reg.auth(Auth.token(createdClient.getRegistrationAccessToken())); + ClientRepresentation update = reg.get(CLIENT_ID); + assertFalse(update.isFullScopeAllowed()); + update.setFullScopeAllowed(true); + assertUpdateRejected(update, "Not permitted to enable fullScopeAllowed"); + assertFalse(managedRealm.admin().clients().get(createdClient.getId()).toRepresentation().isFullScopeAllowed()); + + // Sending the unchanged value or omitting it is fine + update.setFullScopeAllowed(false); + ClientRepresentation updatedClient = reg.update(update); + assertFalse(updatedClient.isFullScopeAllowed()); + + reg.auth(Auth.token(updatedClient.getRegistrationAccessToken())); + update = reg.get(CLIENT_ID); + update.setFullScopeAllowed(null); + updatedClient = reg.update(update); + assertFalse(updatedClient.isFullScopeAllowed()); + assertFalse(managedRealm.admin().clients().get(createdClient.getId()).toRepresentation().isFullScopeAllowed()); + } + + @Test + @DatabaseTest + public void fullScopeAllowedCannotBeEnabledWithAuthenticatedBearer() throws ClientRegistrationException { + authManageClients(); + ClientRepresentation createdClient = registerClient(buildClient(), true); + assertFalse(createdClient.isFullScopeAllowed()); + + createdClient.setFullScopeAllowed(true); + assertUpdateRejected(createdClient, "Not permitted to enable fullScopeAllowed"); + + ComponentRepresentation policy = findPolicyByProviderAndAuth( + ScopeClientRegistrationPolicyFactory.PROVIDER_ID, + ClientRegistrationPolicyManager.getComponentTypeKey(RegistrationAuth.AUTHENTICATED)); + managedRealm.admin().components().component(policy.getId()).remove(); + try { + authManageClients(); + ClientRepresentation update = reg.get(CLIENT_ID); + update.setFullScopeAllowed(true); + ClientRepresentation updated = reg.update(update); + assertTrue(updated.isFullScopeAllowed()); + } finally { + restoreScopePolicy(RegistrationAuth.AUTHENTICATED); + } + } + + private String createInitialAccessToken() { + ClientInitialAccessCreatePresentation request = new ClientInitialAccessCreatePresentation(); + request.setCount(1); + request.setExpiration(10000); + ClientInitialAccessPresentation iat = managedRealm.admin().clientInitialAccess().create(request); + return iat.getToken(); + } + + private void addClientRoleToRealmDefaultRoles(String clientUuid, String roleName) { + managedRealm.admin().clients().get(clientUuid).roles().create(new RoleRepresentation(roleName, null, false)); + RoleRepresentation role = managedRealm.admin().clients().get(clientUuid).roles().get(roleName).toRepresentation(); + String defaultRoleId = managedRealm.admin().toRepresentation().getDefaultRole().getId(); + managedRealm.admin().rolesById().addComposites(defaultRoleId, List.of(role)); + assertThat(getRealmDefaultRoleComposites(), Matchers.hasItem(roleName)); + } + + private Set getRealmDefaultRoleComposites() { + String defaultRoleId = managedRealm.admin().toRepresentation().getDefaultRole().getId(); + return managedRealm.admin().rolesById().getRoleComposites(defaultRoleId) + .stream().map(RoleRepresentation::getName).collect(Collectors.toSet()); + } + + private void assertNoDefaultRoles(ClientRepresentation client, String... roleNames) { + List defaultRoles = client.getDefaultRoles() != null ? Arrays.asList(client.getDefaultRoles()) : Collections.emptyList(); + Set composites = getRealmDefaultRoleComposites(); + for (String roleName : roleNames) { + assertThat(defaultRoles, Matchers.not(Matchers.hasItem(roleName))); + assertThat(composites, Matchers.not(Matchers.hasItem(roleName))); + } + } + + private ComponentRepresentation findPolicyByProviderAndAuth(String providerId, String authType) { + String parentId = managedRealm.admin().toRepresentation().getId(); + List reps = managedRealm.admin().components().query(parentId, ClientRegistrationPolicy.class.getName()); + for (ComponentRepresentation rep : reps) { + if (authType.equals(rep.getSubType()) && providerId.equals(rep.getProviderId())) { + return rep; + } + } + return null; + } + + private void restoreDefaultRolesPolicy(RegistrationAuth auth) { + if (findPolicyByProviderAndAuth(DefaultRolesClientRegistrationPolicyFactory.PROVIDER_ID, + ClientRegistrationPolicyManager.getComponentTypeKey(auth)) != null) { + return; + } + ComponentRepresentation rep = new ComponentRepresentation(); + rep.setName("Default Roles Disabled"); + rep.setParentId(managedRealm.admin().toRepresentation().getId()); + rep.setProviderId(DefaultRolesClientRegistrationPolicyFactory.PROVIDER_ID); + rep.setProviderType(ClientRegistrationPolicy.class.getName()); + rep.setSubType(ClientRegistrationPolicyManager.getComponentTypeKey(auth)); + managedRealm.admin().components().add(rep).close(); + } + + private void restoreScopePolicy(RegistrationAuth auth) { + if (findPolicyByProviderAndAuth(ScopeClientRegistrationPolicyFactory.PROVIDER_ID, + ClientRegistrationPolicyManager.getComponentTypeKey(auth)) != null) { + return; + } + ComponentRepresentation rep = new ComponentRepresentation(); + rep.setName("Full Scope Disabled"); + rep.setParentId(managedRealm.admin().toRepresentation().getId()); + rep.setProviderId(ScopeClientRegistrationPolicyFactory.PROVIDER_ID); + rep.setProviderType(ClientRegistrationPolicy.class.getName()); + rep.setSubType(ClientRegistrationPolicyManager.getComponentTypeKey(auth)); + managedRealm.admin().components().add(rep).close(); + } + + private void assertCreateRejected(ClientRepresentation client, String expectedErrorDescription) { + try { + reg.create(client); + fail("Expected the create to be rejected"); + } catch (ClientRegistrationException e) { + HttpErrorException cause = (HttpErrorException) e.getCause(); + assertThat(cause.getStatusLine().getStatusCode(), is(403)); + assertThat(cause.getErrorResponse(), CoreMatchers.containsString(expectedErrorDescription)); + } + } + + private void assertUpdateRejected(ClientRepresentation client, String expectedErrorDescription) { + try { + reg.update(client); + fail("Expected the update to be rejected"); + } catch (ClientRegistrationException e) { + HttpErrorException cause = (HttpErrorException) e.getCause(); + assertThat(cause.getStatusLine().getStatusCode(), is(403)); + assertThat(cause.getErrorResponse(), CoreMatchers.containsString(expectedErrorDescription)); + } } @Test From 75885ef49e4af9be67751804d2315e48c37bdced Mon Sep 17 00:00:00 2001 From: Erik Jan de Wit Date: Mon, 9 Nov 2026 09:12:56 +0100 Subject: [PATCH 2/5] Record MigrateTo26_8_2 as rolling-upgrade unsupported Main requires both supported and unsupported JSON inventories for the db-compatibility verifier; mark the new policy migrator as unsupported. Signed-off-by: Erik Jan de Wit --- .../rolling-upgrades-supported-changes.json | 155 ++++++++++++++++++ .../rolling-upgrades-unsupported-changes.json | 10 +- 2 files changed, 161 insertions(+), 4 deletions(-) create mode 100644 model/storage-private/src/main/resources/META-INF/rolling-upgrades-supported-changes.json diff --git a/model/storage-private/src/main/resources/META-INF/rolling-upgrades-supported-changes.json b/model/storage-private/src/main/resources/META-INF/rolling-upgrades-supported-changes.json new file mode 100644 index 00000000000..9ce81000c89 --- /dev/null +++ b/model/storage-private/src/main/resources/META-INF/rolling-upgrades-supported-changes.json @@ -0,0 +1,155 @@ +{ + "changeSets": [], + "migrations": [ + { + "class": "org.keycloak.migration.migrators.MigrateTo9_0_4" + }, + { + "class": "org.keycloak.migration.migrators.MigrateTo27_0_0" + }, + { + "class": "org.keycloak.migration.migrators.MigrateTo8_0_0" + }, + { + "class": "org.keycloak.migration.migrators.MigrateTo9_0_0" + }, + { + "class": "org.keycloak.migration.migrators.MigrateTo3_1_0" + }, + { + "class": "org.keycloak.migration.migrators.MigrateTo1_8_0" + }, + { + "class": "org.keycloak.migration.migrators.MigrateTo2_3_0" + }, + { + "class": "org.keycloak.migration.migrators.MigrateTo2_5_0" + }, + { + "class": "org.keycloak.migration.migrators.MigrateTo2_1_0" + }, + { + "class": "org.keycloak.migration.migrators.MigrateTo6_0_0" + }, + { + "class": "org.keycloak.migration.migrators.MigrateTo1_7_0" + }, + { + "class": "org.keycloak.migration.migrators.MigrateTo1_5_0" + }, + { + "class": "org.keycloak.migration.migrators.MigrateTo25_0_0" + }, + { + "class": "org.keycloak.migration.migrators.MigrateTo1_3_0" + }, + { + "class": "org.keycloak.migration.migrators.RealmMigration" + }, + { + "class": "org.keycloak.migration.migrators.MigrateTo26_4_3" + }, + { + "class": "org.keycloak.migration.migrators.MigrateTo26_6_1" + }, + { + "class": "org.keycloak.migration.migrators.MigrateTo26_6_2" + }, + { + "class": "org.keycloak.migration.migrators.MigrateTo26_8_0" + }, + { + "class": "org.keycloak.migration.migrators.MigrateTo3_4_2" + }, + { + "class": "org.keycloak.migration.migrators.MigrateTo26_0_0" + }, + { + "class": "org.keycloak.migration.migrators.MigrateTo4_0_0" + }, + { + "class": "org.keycloak.migration.migrators.MigrateTo26_2_0" + }, + { + "class": "org.keycloak.migration.migrators.MigrateTo4_2_0" + }, + { + "class": "org.keycloak.migration.migrators.MigrateTo26_4_0" + }, + { + "class": "org.keycloak.migration.migrators.MigrateTo4_6_0" + }, + { + "class": "org.keycloak.migration.migrators.MigrateTo14_0_0" + }, + { + "class": "org.keycloak.migration.migrators.MigrateTo3_0_0" + }, + { + "class": "org.keycloak.migration.migrators.MigrateTo3_4_1" + }, + { + "class": "org.keycloak.migration.migrators.MigrateTo3_4_0" + }, + { + "class": "org.keycloak.migration.migrators.MigrateTo21_0_0" + }, + { + "class": "org.keycloak.migration.migrators.MigrateTo3_2_0" + }, + { + "class": "org.keycloak.migration.migrators.MigrateTo1_9_2" + }, + { + "class": "org.keycloak.migration.migrators.MigrateTo12_0_0" + }, + { + "class": "org.keycloak.migration.migrators.MigrateTo1_9_0" + }, + { + "class": "org.keycloak.migration.migrators.MigrateTo20_0_0" + }, + { + "class": "org.keycloak.migration.migrators.MigrateTo2_0_0" + }, + { + "class": "org.keycloak.migration.migrators.MigrateTo24_0_3" + }, + { + "class": "org.keycloak.migration.migrators.MigrateTo2_2_0" + }, + { + "class": "org.keycloak.migration.migrators.MigrateTo24_0_0" + }, + { + "class": "org.keycloak.migration.migrators.MigrateTo1_6_0" + }, + { + "class": "org.keycloak.migration.migrators.MigrateTo1_4_0" + }, + { + "class": "org.keycloak.migration.migrators.MigrateTo1_2_0" + }, + { + "class": "org.keycloak.migration.migrators.MigrateTo23_0_0" + }, + { + "class": "org.keycloak.migration.migrators.MigrateTo26_7_0" + }, + { + "class": "org.keycloak.migration.migrators.MigrateTo8_0_2" + }, + { + "class": "org.keycloak.migration.migrators.MigrateTo26_1_0" + }, + { + "class": "org.keycloak.migration.migrators.MigrateTo18_0_0" + }, + { + "class": "org.keycloak.migration.migrators.MigrateTo26_3_0" + }, + { + "class": "org.keycloak.migration.migrators.MigrateTo22_0_0" + } + ] +} diff --git a/model/storage-private/src/main/resources/META-INF/rolling-upgrades-unsupported-changes.json b/model/storage-private/src/main/resources/META-INF/rolling-upgrades-unsupported-changes.json index f40242adac8..baceb5c0307 100644 --- a/model/storage-private/src/main/resources/META-INF/rolling-upgrades-unsupported-changes.json +++ b/model/storage-private/src/main/resources/META-INF/rolling-upgrades-unsupported-changes.json @@ -1,6 +1,8 @@ { - "changeSets" : [ ], - "migrations" : [ { - "class" : "org.keycloak.migration.migrators.MigrateTo26_8_2" - } ] + "changeSets": [], + "migrations": [ + { + "class": "org.keycloak.migration.migrators.MigrateTo26_8_2" + } + ] } From bb235de1d3e8cef55215703fdcf0697c4f353390 Mon Sep 17 00:00:00 2001 From: Erik Jan de Wit Date: Tue, 10 Nov 2026 09:29:30 +0100 Subject: [PATCH 3/5] Complete rolling-upgrade inventory after rebase onto main Include Migration helper classes and OidcIssuerMigration in the supported baseline, and hash unsupported migration-only manifests so recreate upgrades are required. Signed-off-by: Erik Jan de Wit --- .../rolling-upgrades-supported-changes.json | 105 ++++++++++-------- ...DatabaseCompatibilityMetadataProvider.java | 2 +- 2 files changed, 58 insertions(+), 49 deletions(-) diff --git a/model/storage-private/src/main/resources/META-INF/rolling-upgrades-supported-changes.json b/model/storage-private/src/main/resources/META-INF/rolling-upgrades-supported-changes.json index 9ce81000c89..04e4ef7f805 100644 --- a/model/storage-private/src/main/resources/META-INF/rolling-upgrades-supported-changes.json +++ b/model/storage-private/src/main/resources/META-INF/rolling-upgrades-supported-changes.json @@ -2,154 +2,163 @@ "changeSets": [], "migrations": [ { - "class": "org.keycloak.migration.migrators.MigrateTo9_0_4" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo27_0_0" + "class": "org.keycloak.migration.migrators.MigrateTo12_0_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo8_0_0" + "class": "org.keycloak.migration.migrators.MigrateTo14_0_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo9_0_0" + "class": "org.keycloak.migration.migrators.MigrateTo18_0_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo3_1_0" + "class": "org.keycloak.migration.migrators.MigrateTo1_2_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo1_8_0" + "class": "org.keycloak.migration.migrators.MigrateTo1_3_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo2_3_0" + "class": "org.keycloak.migration.migrators.MigrateTo1_4_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo2_5_0" + "class": "org.keycloak.migration.migrators.MigrateTo1_5_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo2_1_0" + "class": "org.keycloak.migration.migrators.MigrateTo1_6_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo6_0_0" + "class": "org.keycloak.migration.migrators.MigrateTo1_7_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo1_7_0" + "class": "org.keycloak.migration.migrators.MigrateTo1_8_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo1_5_0" + "class": "org.keycloak.migration.migrators.MigrateTo1_9_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo25_0_0" + "class": "org.keycloak.migration.migrators.MigrateTo1_9_2" }, { - "class": "org.keycloak.migration.migrators.MigrateTo1_3_0" + "class": "org.keycloak.migration.migrators.MigrateTo20_0_0" }, { - "class": "org.keycloak.migration.migrators.RealmMigration" + "class": "org.keycloak.migration.migrators.MigrateTo21_0_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo26_4_3" + "class": "org.keycloak.migration.migrators.MigrateTo22_0_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo26_6_1" + "class": "org.keycloak.migration.migrators.MigrateTo23_0_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo26_6_2" + "class": "org.keycloak.migration.migrators.MigrateTo24_0_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo26_8_0" + "class": "org.keycloak.migration.migrators.MigrateTo24_0_3" }, { - "class": "org.keycloak.migration.migrators.MigrateTo3_4_2" + "class": "org.keycloak.migration.migrators.MigrateTo25_0_0" }, { "class": "org.keycloak.migration.migrators.MigrateTo26_0_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo4_0_0" + "class": "org.keycloak.migration.migrators.MigrateTo26_1_0" }, { "class": "org.keycloak.migration.migrators.MigrateTo26_2_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo4_2_0" + "class": "org.keycloak.migration.migrators.MigrateTo26_3_0" }, { "class": "org.keycloak.migration.migrators.MigrateTo26_4_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo4_6_0" + "class": "org.keycloak.migration.migrators.MigrateTo26_4_3" }, { - "class": "org.keycloak.migration.migrators.MigrateTo14_0_0" + "class": "org.keycloak.migration.migrators.MigrateTo26_6_1" }, { - "class": "org.keycloak.migration.migrators.MigrateTo3_0_0" + "class": "org.keycloak.migration.migrators.MigrateTo26_6_2" }, { - "class": "org.keycloak.migration.migrators.MigrateTo3_4_1" + "class": "org.keycloak.migration.migrators.MigrateTo26_7_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo3_4_0" + "class": "org.keycloak.migration.migrators.MigrateTo26_8_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo21_0_0" + "class": "org.keycloak.migration.migrators.MigrateTo27_0_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo3_2_0" + "class": "org.keycloak.migration.migrators.MigrateTo2_0_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo1_9_2" + "class": "org.keycloak.migration.migrators.MigrateTo2_1_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo12_0_0" + "class": "org.keycloak.migration.migrators.MigrateTo2_2_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo1_9_0" + "class": "org.keycloak.migration.migrators.MigrateTo2_3_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo20_0_0" + "class": "org.keycloak.migration.migrators.MigrateTo2_5_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo2_0_0" + "class": "org.keycloak.migration.migrators.MigrateTo3_0_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo24_0_3" + "class": "org.keycloak.migration.migrators.MigrateTo3_1_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo2_2_0" + "class": "org.keycloak.migration.migrators.MigrateTo3_2_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo24_0_0" + "class": "org.keycloak.migration.migrators.MigrateTo3_4_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo1_6_0" + "class": "org.keycloak.migration.migrators.MigrateTo3_4_1" }, { - "class": "org.keycloak.migration.migrators.MigrateTo1_4_0" + "class": "org.keycloak.migration.migrators.MigrateTo3_4_2" }, { - "class": "org.keycloak.migration.migrators.MigrateTo1_2_0" + "class": "org.keycloak.migration.migrators.MigrateTo4_0_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo23_0_0" + "class": "org.keycloak.migration.migrators.MigrateTo4_2_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo26_7_0" + "class": "org.keycloak.migration.migrators.MigrateTo4_6_0" + }, + { + "class": "org.keycloak.migration.migrators.MigrateTo6_0_0" + }, + { + "class": "org.keycloak.migration.migrators.MigrateTo8_0_0" }, { "class": "org.keycloak.migration.migrators.MigrateTo8_0_2" }, { - "class": "org.keycloak.migration.migrators.MigrateTo26_1_0" + "class": "org.keycloak.migration.migrators.MigrateTo9_0_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo18_0_0" + "class": "org.keycloak.migration.migrators.MigrateTo9_0_4" }, { - "class": "org.keycloak.migration.migrators.MigrateTo26_3_0" + "class": "org.keycloak.migration.migrators.Migration" }, { - "class": "org.keycloak.migration.migrators.MigrateTo22_0_0" + "class": "org.keycloak.migration.migrators.MigrationUtils" + }, + { + "class": "org.keycloak.migration.migrators.OidcIssuerMigration" + }, + { + "class": "org.keycloak.migration.migrators.RealmMigration" } ] } diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/compatibility/DatabaseCompatibilityMetadataProvider.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/compatibility/DatabaseCompatibilityMetadataProvider.java index 2c2940d9eeb..9d00179d207 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/compatibility/DatabaseCompatibilityMetadataProvider.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/compatibility/DatabaseCompatibilityMetadataProvider.java @@ -88,7 +88,7 @@ public static void addUnsupportedDatabaseChanges(Map metadata) { } } - if (!changeSets.isEmpty()) { + if (!changeSets.isEmpty() || !migrations.isEmpty()) { List sortedChanges = changeSets.stream().sorted( Comparator.comparing(ChangeSet::id) .thenComparing(ChangeSet::author) From cd28a2c10e57a9236777240aa0bd2a2af60ec951 Mon Sep 17 00:00:00 2001 From: Erik Jan de Wit Date: Tue, 10 Nov 2026 09:41:42 +0100 Subject: [PATCH 4/5] Fix rolling-upgrade baseline for storage-private verifier Drop SPI helper classes the Maven plugin does not discover so the supported/unsupported inventories match the module classpath. Signed-off-by: Erik Jan de Wit --- .../rolling-upgrades-supported-changes.json | 105 ++++++++---------- 1 file changed, 48 insertions(+), 57 deletions(-) diff --git a/model/storage-private/src/main/resources/META-INF/rolling-upgrades-supported-changes.json b/model/storage-private/src/main/resources/META-INF/rolling-upgrades-supported-changes.json index 04e4ef7f805..9ce81000c89 100644 --- a/model/storage-private/src/main/resources/META-INF/rolling-upgrades-supported-changes.json +++ b/model/storage-private/src/main/resources/META-INF/rolling-upgrades-supported-changes.json @@ -2,163 +2,154 @@ "changeSets": [], "migrations": [ { - "class": "org.keycloak.migration.migrators.MigrateTo12_0_0" + "class": "org.keycloak.migration.migrators.MigrateTo9_0_4" }, { - "class": "org.keycloak.migration.migrators.MigrateTo14_0_0" + "class": "org.keycloak.migration.migrators.MigrateTo27_0_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo18_0_0" + "class": "org.keycloak.migration.migrators.MigrateTo8_0_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo1_2_0" + "class": "org.keycloak.migration.migrators.MigrateTo9_0_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo1_3_0" + "class": "org.keycloak.migration.migrators.MigrateTo3_1_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo1_4_0" + "class": "org.keycloak.migration.migrators.MigrateTo1_8_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo1_5_0" + "class": "org.keycloak.migration.migrators.MigrateTo2_3_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo1_6_0" + "class": "org.keycloak.migration.migrators.MigrateTo2_5_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo1_7_0" + "class": "org.keycloak.migration.migrators.MigrateTo2_1_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo1_8_0" + "class": "org.keycloak.migration.migrators.MigrateTo6_0_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo1_9_0" + "class": "org.keycloak.migration.migrators.MigrateTo1_7_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo1_9_2" + "class": "org.keycloak.migration.migrators.MigrateTo1_5_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo20_0_0" + "class": "org.keycloak.migration.migrators.MigrateTo25_0_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo21_0_0" + "class": "org.keycloak.migration.migrators.MigrateTo1_3_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo22_0_0" + "class": "org.keycloak.migration.migrators.RealmMigration" }, { - "class": "org.keycloak.migration.migrators.MigrateTo23_0_0" + "class": "org.keycloak.migration.migrators.MigrateTo26_4_3" }, { - "class": "org.keycloak.migration.migrators.MigrateTo24_0_0" + "class": "org.keycloak.migration.migrators.MigrateTo26_6_1" }, { - "class": "org.keycloak.migration.migrators.MigrateTo24_0_3" + "class": "org.keycloak.migration.migrators.MigrateTo26_6_2" }, { - "class": "org.keycloak.migration.migrators.MigrateTo25_0_0" + "class": "org.keycloak.migration.migrators.MigrateTo26_8_0" + }, + { + "class": "org.keycloak.migration.migrators.MigrateTo3_4_2" }, { "class": "org.keycloak.migration.migrators.MigrateTo26_0_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo26_1_0" + "class": "org.keycloak.migration.migrators.MigrateTo4_0_0" }, { "class": "org.keycloak.migration.migrators.MigrateTo26_2_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo26_3_0" + "class": "org.keycloak.migration.migrators.MigrateTo4_2_0" }, { "class": "org.keycloak.migration.migrators.MigrateTo26_4_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo26_4_3" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo26_6_1" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo26_6_2" + "class": "org.keycloak.migration.migrators.MigrateTo4_6_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo26_7_0" + "class": "org.keycloak.migration.migrators.MigrateTo14_0_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo26_8_0" + "class": "org.keycloak.migration.migrators.MigrateTo3_0_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo27_0_0" + "class": "org.keycloak.migration.migrators.MigrateTo3_4_1" }, { - "class": "org.keycloak.migration.migrators.MigrateTo2_0_0" + "class": "org.keycloak.migration.migrators.MigrateTo3_4_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo2_1_0" + "class": "org.keycloak.migration.migrators.MigrateTo21_0_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo2_2_0" + "class": "org.keycloak.migration.migrators.MigrateTo3_2_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo2_3_0" + "class": "org.keycloak.migration.migrators.MigrateTo1_9_2" }, { - "class": "org.keycloak.migration.migrators.MigrateTo2_5_0" + "class": "org.keycloak.migration.migrators.MigrateTo12_0_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo3_0_0" + "class": "org.keycloak.migration.migrators.MigrateTo1_9_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo3_1_0" + "class": "org.keycloak.migration.migrators.MigrateTo20_0_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo3_2_0" + "class": "org.keycloak.migration.migrators.MigrateTo2_0_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo3_4_0" + "class": "org.keycloak.migration.migrators.MigrateTo24_0_3" }, { - "class": "org.keycloak.migration.migrators.MigrateTo3_4_1" + "class": "org.keycloak.migration.migrators.MigrateTo2_2_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo3_4_2" + "class": "org.keycloak.migration.migrators.MigrateTo24_0_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo4_0_0" + "class": "org.keycloak.migration.migrators.MigrateTo1_6_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo4_2_0" + "class": "org.keycloak.migration.migrators.MigrateTo1_4_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo4_6_0" + "class": "org.keycloak.migration.migrators.MigrateTo1_2_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo6_0_0" + "class": "org.keycloak.migration.migrators.MigrateTo23_0_0" }, { - "class": "org.keycloak.migration.migrators.MigrateTo8_0_0" + "class": "org.keycloak.migration.migrators.MigrateTo26_7_0" }, { "class": "org.keycloak.migration.migrators.MigrateTo8_0_2" }, { - "class": "org.keycloak.migration.migrators.MigrateTo9_0_0" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo9_0_4" - }, - { - "class": "org.keycloak.migration.migrators.Migration" + "class": "org.keycloak.migration.migrators.MigrateTo26_1_0" }, { - "class": "org.keycloak.migration.migrators.MigrationUtils" + "class": "org.keycloak.migration.migrators.MigrateTo18_0_0" }, { - "class": "org.keycloak.migration.migrators.OidcIssuerMigration" + "class": "org.keycloak.migration.migrators.MigrateTo26_3_0" }, { - "class": "org.keycloak.migration.migrators.RealmMigration" + "class": "org.keycloak.migration.migrators.MigrateTo22_0_0" } ] } From b8552846fe111f5548c63d7b561c47b0d21d6166 Mon Sep 17 00:00:00 2001 From: Erik Jan de Wit Date: Tue, 10 Nov 2026 14:53:31 +0100 Subject: [PATCH 5/5] Remove rolling-upgrade manifests from main backport These inventories are only used on release branches that support rolling updates between patch releases, so drop them from the main backport along with the related compatibility hashing change. Signed-off-by: Erik Jan de Wit --- .../rolling-upgrades-supported-changes.json | 155 ------------------ .../rolling-upgrades-unsupported-changes.json | 8 - ...DatabaseCompatibilityMetadataProvider.java | 2 +- 3 files changed, 1 insertion(+), 164 deletions(-) delete mode 100644 model/storage-private/src/main/resources/META-INF/rolling-upgrades-supported-changes.json delete mode 100644 model/storage-private/src/main/resources/META-INF/rolling-upgrades-unsupported-changes.json diff --git a/model/storage-private/src/main/resources/META-INF/rolling-upgrades-supported-changes.json b/model/storage-private/src/main/resources/META-INF/rolling-upgrades-supported-changes.json deleted file mode 100644 index 9ce81000c89..00000000000 --- a/model/storage-private/src/main/resources/META-INF/rolling-upgrades-supported-changes.json +++ /dev/null @@ -1,155 +0,0 @@ -{ - "changeSets": [], - "migrations": [ - { - "class": "org.keycloak.migration.migrators.MigrateTo9_0_4" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo27_0_0" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo8_0_0" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo9_0_0" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo3_1_0" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo1_8_0" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo2_3_0" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo2_5_0" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo2_1_0" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo6_0_0" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo1_7_0" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo1_5_0" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo25_0_0" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo1_3_0" - }, - { - "class": "org.keycloak.migration.migrators.RealmMigration" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo26_4_3" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo26_6_1" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo26_6_2" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo26_8_0" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo3_4_2" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo26_0_0" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo4_0_0" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo26_2_0" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo4_2_0" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo26_4_0" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo4_6_0" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo14_0_0" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo3_0_0" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo3_4_1" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo3_4_0" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo21_0_0" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo3_2_0" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo1_9_2" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo12_0_0" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo1_9_0" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo20_0_0" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo2_0_0" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo24_0_3" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo2_2_0" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo24_0_0" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo1_6_0" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo1_4_0" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo1_2_0" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo23_0_0" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo26_7_0" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo8_0_2" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo26_1_0" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo18_0_0" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo26_3_0" - }, - { - "class": "org.keycloak.migration.migrators.MigrateTo22_0_0" - } - ] -} diff --git a/model/storage-private/src/main/resources/META-INF/rolling-upgrades-unsupported-changes.json b/model/storage-private/src/main/resources/META-INF/rolling-upgrades-unsupported-changes.json deleted file mode 100644 index baceb5c0307..00000000000 --- a/model/storage-private/src/main/resources/META-INF/rolling-upgrades-unsupported-changes.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "changeSets": [], - "migrations": [ - { - "class": "org.keycloak.migration.migrators.MigrateTo26_8_2" - } - ] -} diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/compatibility/DatabaseCompatibilityMetadataProvider.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/compatibility/DatabaseCompatibilityMetadataProvider.java index 9d00179d207..2c2940d9eeb 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/compatibility/DatabaseCompatibilityMetadataProvider.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/compatibility/DatabaseCompatibilityMetadataProvider.java @@ -88,7 +88,7 @@ public static void addUnsupportedDatabaseChanges(Map metadata) { } } - if (!changeSets.isEmpty() || !migrations.isEmpty()) { + if (!changeSets.isEmpty()) { List sortedChanges = changeSets.stream().sorted( Comparator.comparing(ChangeSet::id) .thenComparing(ChangeSet::author)