libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

KEYCLOAK-18050 Client Policies : Rename "secure-redirecturi-enforce-executor" to indicate what this executor does

Browse source
This commit is contained in:
Takashi Norimatsu 2021-05-08 08:15:46 +09:00 committed by Marek Posolda
parent 6397671c88
commit 5dced05591
5 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureRedirectUriEnforceExecutor.java → services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureClientRegisteringUriEnforceExecutor.java
View file

@ -40,19 +40,19 @@ import org.keycloak.services.clientpolicy.context.DynamicClientUpdateContext;
/**
* @author <a href="mailto:takashi.norimatsu.ws@hitachi.com">Takashi Norimatsu</a>
*/
public class SecureRedirectUriEnforceExecutor implements ClientPolicyExecutorProvider<ClientPolicyExecutorConfiguration> {
public class SecureClientRegisteringUriEnforceExecutor implements ClientPolicyExecutorProvider<ClientPolicyExecutorConfiguration> {
private static final Logger logger = Logger.getLogger(SecureRedirectUriEnforceExecutor.class);
private static final Logger logger = Logger.getLogger(SecureClientRegisteringUriEnforceExecutor.class);
private final KeycloakSession session;
public SecureRedirectUriEnforceExecutor(KeycloakSession session) {
public SecureClientRegisteringUriEnforceExecutor(KeycloakSession session) {
this.session = session;
}
@Override
public String getProviderId() {
return SecureRedirectUriEnforceExecutorFactory.PROVIDER_ID;
return SecureClientRegisteringUriEnforceExecutorFactory.PROVIDER_ID;
}
@Override

6
services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureRedirectUriEnforceExecutorFactory.java → services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureClientRegisteringUriEnforceExecutorFactory.java
View file

@ -28,13 +28,13 @@ import org.keycloak.provider.ProviderConfigProperty;
/**
* @author <a href="mailto:takashi.norimatsu.ws@hitachi.com">Takashi Norimatsu</a>
*/
public class SecureRedirectUriEnforceExecutorFactory implements ClientPolicyExecutorProviderFactory {
public class SecureClientRegisteringUriEnforceExecutorFactory implements ClientPolicyExecutorProviderFactory {
public static final String PROVIDER_ID = "secure-redirecturi-enforce-executor";
public static final String PROVIDER_ID = "secure-clienturi-enforce-executor";
@Override
public ClientPolicyExecutorProvider create(KeycloakSession session) {
return new SecureRedirectUriEnforceExecutor(session);
return new SecureClientRegisteringUriEnforceExecutor(session);
}
@Override

2
services/src/main/resources/META-INF/services/org.keycloak.services.clientpolicy.executor.ClientPolicyExecutorProviderFactory
View file

@ -4,7 +4,7 @@ org.keycloak.services.clientpolicy.executor.SecureClientAuthEnforceExecutorFacto
org.keycloak.services.clientpolicy.executor.PKCEEnforceExecutorFactory
org.keycloak.services.clientpolicy.executor.SecureSessionEnforceExecutorFactory
org.keycloak.services.clientpolicy.executor.SecureSigningAlgorithmEnforceExecutorFactory
org.keycloak.services.clientpolicy.executor.SecureRedirectUriEnforceExecutorFactory
org.keycloak.services.clientpolicy.executor.SecureClientRegisteringUriEnforceExecutorFactory
org.keycloak.services.clientpolicy.executor.SecureSigningAlgorithmForSignedJwtEnforceExecutorFactory
org.keycloak.services.clientpolicy.executor.HolderOfKeyEnforceExecutorFactory
org.keycloak.services.clientpolicy.executor.ConfidentialClientAcceptExecutorFactory

8
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/AbstractClientPoliciesTest.java
View file

@ -122,7 +122,7 @@ import org.keycloak.services.clientpolicy.executor.PKCEEnforceExecutor;
import org.keycloak.services.clientpolicy.executor.PKCEEnforceExecutorFactory;
import org.keycloak.services.clientpolicy.executor.SecureClientAuthEnforceExecutor;
import org.keycloak.services.clientpolicy.executor.SecureClientAuthEnforceExecutorFactory;
import org.keycloak.services.clientpolicy.executor.SecureRedirectUriEnforceExecutorFactory;
import org.keycloak.services.clientpolicy.executor.SecureClientRegisteringUriEnforceExecutorFactory;
import org.keycloak.services.clientpolicy.executor.SecureRequestObjectExecutor;
import org.keycloak.services.clientpolicy.executor.SecureRequestObjectExecutorFactory;
import org.keycloak.services.clientpolicy.executor.SecureResponseTypeExecutorFactory;
@ -207,7 +207,7 @@ public abstract class AbstractClientPoliciesTest extends AbstractKeycloakTest {
JWTClientAuthenticator.PROVIDER_ID))
.addExecutor(HolderOfKeyEnforceExecutorFactory.PROVIDER_ID,
createHolderOfKeyEnforceExecutorConfig(Boolean.TRUE))
.addExecutor(SecureRedirectUriEnforceExecutorFactory.PROVIDER_ID, null)
.addExecutor(SecureClientRegisteringUriEnforceExecutorFactory.PROVIDER_ID, null)
.addExecutor(SecureRequestObjectExecutorFactory.PROVIDER_ID, null)
.addExecutor(SecureResponseTypeExecutorFactory.PROVIDER_ID, null)
.addExecutor(SecureSessionEnforceExecutorFactory.PROVIDER_ID, null)
@ -297,7 +297,7 @@ public abstract class AbstractClientPoliciesTest extends AbstractKeycloakTest {
assertExpectedExecutors(Arrays.asList(
SecureClientAuthEnforceExecutorFactory.PROVIDER_ID,
HolderOfKeyEnforceExecutorFactory.PROVIDER_ID,
SecureRedirectUriEnforceExecutorFactory.PROVIDER_ID,
SecureClientRegisteringUriEnforceExecutorFactory.PROVIDER_ID,
SecureRequestObjectExecutorFactory.PROVIDER_ID,
SecureResponseTypeExecutorFactory.PROVIDER_ID,
SecureSessionEnforceExecutorFactory.PROVIDER_ID,
@ -1368,7 +1368,7 @@ public abstract class AbstractClientPoliciesTest extends AbstractKeycloakTest {
}
protected void assertExpectedSecureRedirectUriEnforceExecutor(ClientProfileRepresentation profileRep) {
assertExpectedNoConfigElement(SecureRedirectUriEnforceExecutorFactory.PROVIDER_ID, profileRep, (ClientProfileRepresentation i)->i.getExecutors());
assertExpectedNoConfigElement(SecureClientRegisteringUriEnforceExecutorFactory.PROVIDER_ID, profileRep, (ClientProfileRepresentation i)->i.getExecutors());
}
protected void assertExpectedSecureRequestObjectExecutor(ClientProfileRepresentation profileRep) {

6
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientPoliciesTest.java
View file

@ -92,7 +92,7 @@ import org.keycloak.services.clientpolicy.executor.ConsentRequiredExecutorFactor
import org.keycloak.services.clientpolicy.executor.HolderOfKeyEnforceExecutorFactory;
import org.keycloak.services.clientpolicy.executor.PKCEEnforceExecutorFactory;
import org.keycloak.services.clientpolicy.executor.SecureClientAuthEnforceExecutorFactory;
import org.keycloak.services.clientpolicy.executor.SecureRedirectUriEnforceExecutorFactory;
import org.keycloak.services.clientpolicy.executor.SecureClientRegisteringUriEnforceExecutorFactory;
import org.keycloak.services.clientpolicy.executor.SecureRequestObjectExecutorFactory;
import org.keycloak.services.clientpolicy.executor.SecureResponseTypeExecutorFactory;
import org.keycloak.services.clientpolicy.executor.SecureSessionEnforceExecutorFactory;
@ -1280,11 +1280,11 @@ public class ClientPoliciesTest extends AbstractClientPoliciesTest {
}
@Test
public void testSecureRedirectUriEnforceExecutor() throws Exception {
public void testSecureClientRegisteringUriEnforceExecutor() throws Exception {
// register profiles
String json = (new ClientProfilesBuilder()).addProfile(
(new ClientProfileBuilder()).createProfile(PROFILE_NAME, "Ensimmainen Profiili", Boolean.FALSE, null)
.addExecutor(SecureRedirectUriEnforceExecutorFactory.PROVIDER_ID, null)
.addExecutor(SecureClientRegisteringUriEnforceExecutorFactory.PROVIDER_ID, null)
.toRepresentation()
).toString();
updateProfiles(json);