diff --git a/adapters/oidc/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/extension/SharedAttributeDefinitons.java b/adapters/oidc/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/extension/SharedAttributeDefinitons.java index 4d693db490..8125521473 100755 --- a/adapters/oidc/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/extension/SharedAttributeDefinitons.java +++ b/adapters/oidc/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/extension/SharedAttributeDefinitons.java @@ -186,7 +186,12 @@ public class SharedAttributeDefinitons { .setDefaultValue(new ModelNode(false)) .build(); - + protected static final SimpleAttributeDefinition CONFIDENTIAL_PORT = + new SimpleAttributeDefinitionBuilder("confidential-port", ModelType.INT, true) + .setXmlName("confidential-port") + .setAllowExpression(true) + .setDefaultValue(new ModelNode(8443)) + .build(); protected static final List ATTRIBUTES = new ArrayList(); @@ -196,6 +201,7 @@ public class SharedAttributeDefinitons { ATTRIBUTES.add(TRUSTSTORE); ATTRIBUTES.add(TRUSTSTORE_PASSWORD); ATTRIBUTES.add(SSL_REQUIRED); + ATTRIBUTES.add(CONFIDENTIAL_PORT); ATTRIBUTES.add(ALLOW_ANY_HOSTNAME); ATTRIBUTES.add(DISABLE_TRUST_MANAGER); ATTRIBUTES.add(CONNECTION_POOL_SIZE); diff --git a/adapters/oidc/wildfly/wildfly-subsystem/src/main/resources/org/keycloak/subsystem/adapter/extension/LocalDescriptions.properties b/adapters/oidc/wildfly/wildfly-subsystem/src/main/resources/org/keycloak/subsystem/adapter/extension/LocalDescriptions.properties index f6097ae5cf..9d488cddcc 100755 --- a/adapters/oidc/wildfly/wildfly-subsystem/src/main/resources/org/keycloak/subsystem/adapter/extension/LocalDescriptions.properties +++ b/adapters/oidc/wildfly/wildfly-subsystem/src/main/resources/org/keycloak/subsystem/adapter/extension/LocalDescriptions.properties @@ -30,6 +30,7 @@ keycloak.realm.realm-public-key=Public key of the realm keycloak.realm.auth-server-url=Base URL of the Realm Auth Server keycloak.realm.disable-trust-manager=Adapter will not use a trust manager when making adapter HTTPS requests keycloak.realm.ssl-required=Specify if SSL is required (valid values are all, external and none) +keycloak.realm.confidential-port=Specify the confidential port (SSL/TLS) used by the Realm Auth Server keycloak.realm.allow-any-hostname=SSL Setting keycloak.realm.truststore=Truststore used for adapter client HTTPS requests keycloak.realm.truststore-password=Password of the Truststore @@ -60,6 +61,7 @@ keycloak.secure-deployment.realm-public-key=Public key of the realm keycloak.secure-deployment.auth-server-url=Base URL of the Realm Auth Server keycloak.secure-deployment.disable-trust-manager=Adapter will not use a trust manager when making adapter HTTPS requests keycloak.secure-deployment.ssl-required=Specify if SSL is required (valid values are all, external and none) +keycloak.secure-deployment.confidential-port=Specify the confidential port (SSL/TLS) used by the Realm Auth Server keycloak.secure-deployment.allow-any-hostname=SSL Setting keycloak.secure-deployment.truststore=Truststore used for adapter client HTTPS requests keycloak.secure-deployment.truststore-password=Password of the Truststore @@ -100,6 +102,7 @@ keycloak.secure-server.realm-public-key=Public key of the realm keycloak.secure-server.auth-server-url=Base URL of the Realm Auth Server keycloak.secure-server.disable-trust-manager=Adapter will not use a trust manager when making adapter HTTPS requests keycloak.secure-server.ssl-required=Specify if SSL is required (valid values are all, external and none) +keycloak.secure-server.confidential-port=Specify the confidential port (SSL/TLS) used by the Realm Auth Server keycloak.secure-server.allow-any-hostname=SSL Setting keycloak.secure-server.truststore=Truststore used for adapter client HTTPS requests keycloak.secure-server.truststore-password=Password of the Truststore diff --git a/adapters/oidc/wildfly/wildfly-subsystem/src/main/resources/schema/wildfly-keycloak_1_1.xsd b/adapters/oidc/wildfly/wildfly-subsystem/src/main/resources/schema/wildfly-keycloak_1_1.xsd index caa147d821..d614efbacb 100755 --- a/adapters/oidc/wildfly/wildfly-subsystem/src/main/resources/schema/wildfly-keycloak_1_1.xsd +++ b/adapters/oidc/wildfly/wildfly-subsystem/src/main/resources/schema/wildfly-keycloak_1_1.xsd @@ -58,6 +58,7 @@ + @@ -100,6 +101,7 @@ + diff --git a/adapters/oidc/wildfly/wildfly-subsystem/src/test/java/org/keycloak/subsystem/adapter/extension/SubsystemParsingTestCase.java b/adapters/oidc/wildfly/wildfly-subsystem/src/test/java/org/keycloak/subsystem/adapter/extension/SubsystemParsingTestCase.java index 4adad9f21a..afe95041b4 100755 --- a/adapters/oidc/wildfly/wildfly-subsystem/src/test/java/org/keycloak/subsystem/adapter/extension/SubsystemParsingTestCase.java +++ b/adapters/oidc/wildfly/wildfly-subsystem/src/test/java/org/keycloak/subsystem/adapter/extension/SubsystemParsingTestCase.java @@ -51,6 +51,7 @@ public class SubsystemParsingTestCase extends AbstractSubsystemBaseTest { node.get("auth-url").set("http://localhost:8080/auth-server/rest/realms/demo/protocol/openid-connect/login"); node.get("code-url").set("http://localhost:8080/auth-server/rest/realms/demo/protocol/openid-connect/access/codes"); node.get("ssl-required").set("external"); + node.get("confidential-port").set(443); node.get("expose-token").set(true); ModelNode jwtCredential = new ModelNode(); diff --git a/adapters/oidc/wildfly/wildfly-subsystem/src/test/resources/org/keycloak/subsystem/adapter/extension/keycloak-1.1.xml b/adapters/oidc/wildfly/wildfly-subsystem/src/test/resources/org/keycloak/subsystem/adapter/extension/keycloak-1.1.xml index fce5c41dae..19a800ecb3 100755 --- a/adapters/oidc/wildfly/wildfly-subsystem/src/test/resources/org/keycloak/subsystem/adapter/extension/keycloak-1.1.xml +++ b/adapters/oidc/wildfly/wildfly-subsystem/src/test/resources/org/keycloak/subsystem/adapter/extension/keycloak-1.1.xml @@ -22,6 +22,7 @@ truststore.jks secret EXTERNAL + 443 false true 20 @@ -56,6 +57,7 @@ http://localhost:8080/auth EXTERNAL + 443 0aa31d98-e0aa-404c-b6e0-e771dba1e798 api/$1/ @@ -84,5 +86,7 @@ jboss-infra wildfly-console true + EXTERNAL + 443 \ No newline at end of file