From c541aeed61777f045bb9d68044f06fcd79a6518f Mon Sep 17 00:00:00 2001 From: Lex Cao Date: Sat, 5 Nov 2022 22:26:18 +0800 Subject: [PATCH] Move init builtin mappers from static init to factory init Closes #15349 --- .../oidc/OIDCLoginProtocolFactory.java | 4 ++- .../testsuite/admin/ServerInfoTest.java | 31 +++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/services/src/main/java/org/keycloak/protocol/oidc/OIDCLoginProtocolFactory.java b/services/src/main/java/org/keycloak/protocol/oidc/OIDCLoginProtocolFactory.java index 23a959e55209..4a12356518ed 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/OIDCLoginProtocolFactory.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/OIDCLoginProtocolFactory.java @@ -117,6 +117,7 @@ public void init(Config.Scope config) { if (providerConfig.suppressLogoutConfirmationScreen()) { logger.warnf("Deprecated switch '%s' is enabled. Please try to disable it and update your clients to use OpenID Connect compliant way for RP-initiated logout.", SUPPRESS_LOGOUT_CONFIRMATION_SCREEN); } + initBuiltin(); } @Override @@ -131,7 +132,8 @@ public Map getBuiltinMappers() { static Map builtins = new HashMap<>(); - static { + // Visible for testing + public void initBuiltin() { ProtocolMapperModel model; model = UserPropertyMapper.createClaimMapper(USERNAME, "username", diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ServerInfoTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ServerInfoTest.java index 442f03c2c122..e44fcf75faa9 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ServerInfoTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ServerInfoTest.java @@ -19,11 +19,14 @@ import org.junit.Test; import org.keycloak.common.Version; +import org.keycloak.protocol.oidc.OIDCLoginProtocolFactory; +import org.keycloak.representations.idm.ProtocolMapperRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.info.ProviderRepresentation; import org.keycloak.representations.info.ServerInfoRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.Assert; +import org.keycloak.testsuite.auth.page.login.Login; import java.util.List; import java.util.Map; @@ -69,6 +72,9 @@ public void testServerInfo() { assertNotNull(info.getSystemInfo().getServerTime()); assertNotNull(info.getSystemInfo().getUptime()); + assertNotNull(info.getBuiltinProtocolMappers()); + assertNotNull(getBuiltinProtocolMapper(info, Login.OIDC, OIDCLoginProtocolFactory.ACR)); + if (isJpaRealmProvider()) { Map jpaProviders = info.getProviders().get("connectionsJpa").getProviders(); ProviderRepresentation jpaProvider = jpaProviders.values().iterator().next(); @@ -76,6 +82,31 @@ public void testServerInfo() { } } + /*@Test + @DisableFeature(value = Profile.Feature.STEP_UP_AUTHENTICATION, skipRestart = true) + public void testDisableStepupAuthenticationFeature() throws Exception { + // refresh builtin based on feature changed + testingClient.server().fetchString(it -> { + ((OIDCLoginProtocolFactory) it.getKeycloakSessionFactory() + .getProviderFactory(LoginProtocol.class, Login.OIDC)) + .initBuiltin(); + return null; + }); + + ServerInfoRepresentation info = adminClient.serverInfo().getInfo(); + assertNotNull(info.getBuiltinProtocolMappers()); + assertNull(getBuiltinProtocolMapper(info, Login.OIDC, OIDCLoginProtocolFactory.ACR)); + }*/ + + private static ProtocolMapperRepresentation getBuiltinProtocolMapper(ServerInfoRepresentation info, String protocol, String name) { + return info.getBuiltinProtocolMappers() + .get(protocol) + .stream() + .filter(it -> name.equals(it.getName())) + .findFirst() + .orElse(null); + } + @Override public void addTestRealms(List testRealms) { }