[KEYCLOAK-17872] Add missing HTTPClient properties

Signed-off-by: ruromero <rromerom@redhat.com>
tsaarni · Jul 22, 2021 · 464475c · 464475c
1 parent 23e3bc5
commit 464475c
Show file tree

Hide file tree

Showing 35 changed files with 322 additions and 21 deletions.
diff --git a/adapters/oidc/adapter-core/src/main/java/org/keycloak/adapters/HttpClientBuilder.java b/adapters/oidc/adapter-core/src/main/java/org/keycloak/adapters/HttpClientBuilder.java
@@ -384,6 +384,10 @@ public HttpClient build(AdapterHttpClientConfig adapterConfig) {
             establishConnectionTimeout(adapterConfig.getConnectionTimeout(), TimeUnit.MILLISECONDS);
         }
 
+        if (connectionTTL == -1 && adapterConfig.getConnectionTTL() > 0) {
+            connectionTTL(adapterConfig.getConnectionTTL(), TimeUnit.MILLISECONDS);
+        }
+
         return build();
     }
 

diff --git a/...dc/as7-eap6/as7-subsystem/src/main/java/org/keycloak/subsystem/as7/KeycloakExtension.java b/...dc/as7-eap6/as7-subsystem/src/main/java/org/keycloak/subsystem/as7/KeycloakExtension.java
@@ -37,7 +37,7 @@
 public class KeycloakExtension implements Extension {
 
     public static final String SUBSYSTEM_NAME = "keycloak";
-    public static final String NAMESPACE = "urn:jboss:domain:keycloak:1.1";
+    public static final String NAMESPACE = "urn:jboss:domain:keycloak:1.2";
     private static final KeycloakSubsystemParser PARSER = new KeycloakSubsystemParser();
     static final PathElement PATH_SUBSYSTEM = PathElement.pathElement(SUBSYSTEM, SUBSYSTEM_NAME);
     private static final String RESOURCE_NAME = KeycloakExtension.class.getPackage().getName() + ".LocalDescriptions";

diff --git a/...ap6/as7-subsystem/src/main/java/org/keycloak/subsystem/as7/SharedAttributeDefinitons.java b/...ap6/as7-subsystem/src/main/java/org/keycloak/subsystem/as7/SharedAttributeDefinitons.java
@@ -19,6 +19,7 @@
 import org.jboss.as.controller.SimpleAttributeDefinition;
 import org.jboss.as.controller.SimpleAttributeDefinitionBuilder;
 import org.jboss.as.controller.operations.validation.IntRangeValidator;
+import org.jboss.as.controller.operations.validation.LongRangeValidator;
 import org.jboss.as.controller.operations.validation.StringLengthValidator;
 import org.jboss.dmr.ModelNode;
 import org.jboss.dmr.ModelType;
@@ -81,6 +82,24 @@ class SharedAttributeDefinitons {
                     .setAllowExpression(true)
                     .setValidator(new IntRangeValidator(0, true))
                     .build();
+    protected static final SimpleAttributeDefinition SOCKET_TIMEOUT =
+            new SimpleAttributeDefinitionBuilder("socket-timeout", ModelType.LONG, true)
+                    .setXmlName("socket-timeout")
+                    .setAllowExpression(true)
+                    .setValidator(new LongRangeValidator(-1L, true))
+                    .build();
+    protected static final SimpleAttributeDefinition CONNECTION_TTL =
+            new SimpleAttributeDefinitionBuilder("connection-ttl", ModelType.LONG, true)
+                    .setXmlName("connection-ttl")
+                    .setAllowExpression(true)
+                    .setValidator(new LongRangeValidator(-1L, true))
+                    .build();
+    protected static final SimpleAttributeDefinition CONNECTION_TIMEOUT =
+            new SimpleAttributeDefinitionBuilder("connection-timeout", ModelType.LONG, true)
+                    .setXmlName("connection-timeout")
+                    .setAllowExpression(true)
+                    .setValidator(new LongRangeValidator(-1L, true))
+                    .build();
 
     protected static final SimpleAttributeDefinition ENABLE_CORS =
             new SimpleAttributeDefinitionBuilder("enable-cors", ModelType.BOOLEAN, true)
@@ -192,6 +211,9 @@ class SharedAttributeDefinitons {
         ATTRIBUTES.add(ALLOW_ANY_HOSTNAME);
         ATTRIBUTES.add(DISABLE_TRUST_MANAGER);
         ATTRIBUTES.add(CONNECTION_POOL_SIZE);
+        ATTRIBUTES.add(SOCKET_TIMEOUT);
+        ATTRIBUTES.add(CONNECTION_TTL);
+        ATTRIBUTES.add(CONNECTION_TIMEOUT);
         ATTRIBUTES.add(ENABLE_CORS);
         ATTRIBUTES.add(CLIENT_KEYSTORE);
         ATTRIBUTES.add(CLIENT_KEYSTORE_PASSWORD);

diff --git a/.../as7-subsystem/src/main/resources/org/keycloak/subsystem/as7/LocalDescriptions.properties b/.../as7-subsystem/src/main/resources/org/keycloak/subsystem/as7/LocalDescriptions.properties
@@ -32,6 +32,9 @@ 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
 keycloak.realm.connection-pool-size=Connection pool size for the client used by the adapter
+keycloak.realm.socket-timeout=Timeout for socket waiting for data in milliseconds
+keycloak.realm.connection-ttl=Connection time to live in milliseconds
+keycloak.realm.connection-timeout=Timeout for establishing the connection with the remote host in milliseconds
 keycloak.realm.enable-cors=Enable Keycloak CORS support 
 keycloak.realm.client-keystore=n/a
 keycloak.realm.client-keystore-password=n/a
@@ -61,6 +64,9 @@ 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
 keycloak.secure-deployment.connection-pool-size=Connection pool size for the client used by the adapter
+keycloak.secure-deployment.socket-timeout=Timeout for socket waiting for data in milliseconds
+keycloak.secure-deployment.connection-ttl=Connection time to live in milliseconds
+keycloak.secure-deployment.connection-timeout=Timeout for establishing the connection with the remote host in milliseconds
 keycloak.secure-deployment.resource=Application name
 keycloak.secure-deployment.use-resource-role-mappings=Use resource level permissions from token
 keycloak.secure-deployment.credentials=Adapter credentials

diff --git a/...y-subsystem/src/main/java/org/keycloak/subsystem/adapter/extension/KeycloakExtension.java b/...y-subsystem/src/main/java/org/keycloak/subsystem/adapter/extension/KeycloakExtension.java
@@ -38,7 +38,7 @@
 public class KeycloakExtension implements Extension {
 
     public static final String SUBSYSTEM_NAME = "keycloak";
-    public static final String NAMESPACE = "urn:jboss:domain:keycloak:1.1";
+    public static final String NAMESPACE = "urn:jboss:domain:keycloak:1.2";
     private static final KeycloakSubsystemParser PARSER = new KeycloakSubsystemParser();
     static final PathElement PATH_SUBSYSTEM = PathElement.pathElement(SUBSYSTEM, SUBSYSTEM_NAME);
     private static final String RESOURCE_NAME = KeycloakExtension.class.getPackage().getName() + ".LocalDescriptions";

diff --git a/...tem/src/main/java/org/keycloak/subsystem/adapter/extension/SharedAttributeDefinitons.java b/...tem/src/main/java/org/keycloak/subsystem/adapter/extension/SharedAttributeDefinitons.java
@@ -19,6 +19,7 @@
 import org.jboss.as.controller.SimpleAttributeDefinition;
 import org.jboss.as.controller.SimpleAttributeDefinitionBuilder;
 import org.jboss.as.controller.operations.validation.IntRangeValidator;
+import org.jboss.as.controller.operations.validation.LongRangeValidator;
 import org.jboss.as.controller.operations.validation.StringLengthValidator;
 import org.jboss.dmr.ModelNode;
 import org.jboss.dmr.ModelType;
@@ -81,6 +82,24 @@ public class SharedAttributeDefinitons {
                     .setAllowExpression(true)
                     .setValidator(new IntRangeValidator(0, true))
                     .build();
+    protected static final SimpleAttributeDefinition SOCKET_TIMEOUT =
+            new SimpleAttributeDefinitionBuilder("socket-timeout", ModelType.LONG, true)
+                    .setXmlName("socket-timeout")
+                    .setAllowExpression(true)
+                    .setValidator(new LongRangeValidator(-1L, true))
+                    .build();
+    protected static final SimpleAttributeDefinition CONNECTION_TTL =
+            new SimpleAttributeDefinitionBuilder("connection-ttl", ModelType.LONG, true)
+                    .setXmlName("connection-ttl")
+                    .setAllowExpression(true)
+                    .setValidator(new LongRangeValidator(-1L, true))
+                    .build();
+    protected static final SimpleAttributeDefinition CONNECTION_TIMEOUT =
+            new SimpleAttributeDefinitionBuilder("connection-timeout", ModelType.LONG, true)
+                    .setXmlName("connection-timeout")
+                    .setAllowExpression(true)
+                    .setValidator(new LongRangeValidator(-1L, true))
+                    .build();
 
     protected static final SimpleAttributeDefinition ENABLE_CORS =
             new SimpleAttributeDefinitionBuilder("enable-cors", ModelType.BOOLEAN, true)
@@ -219,6 +238,9 @@ public class SharedAttributeDefinitons {
         ATTRIBUTES.add(ALLOW_ANY_HOSTNAME);
         ATTRIBUTES.add(DISABLE_TRUST_MANAGER);
         ATTRIBUTES.add(CONNECTION_POOL_SIZE);
+        ATTRIBUTES.add(SOCKET_TIMEOUT);
+        ATTRIBUTES.add(CONNECTION_TTL);
+        ATTRIBUTES.add(CONNECTION_TIMEOUT);
         ATTRIBUTES.add(ENABLE_CORS);
         ATTRIBUTES.add(CLIENT_KEYSTORE);
         ATTRIBUTES.add(CLIENT_KEYSTORE_PASSWORD);

diff --git a/.../src/main/resources/org/keycloak/subsystem/adapter/extension/LocalDescriptions.properties b/.../src/main/resources/org/keycloak/subsystem/adapter/extension/LocalDescriptions.properties
@@ -35,6 +35,9 @@ 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
 keycloak.realm.connection-pool-size=Connection pool size for the client used by the adapter
+keycloak.realm.socket-timeout=Timeout for socket waiting for data in milliseconds
+keycloak.realm.connection-ttl=Connection time to live in milliseconds
+keycloak.realm.connection-timeout=Timeout for establishing the connection with the remote host in milliseconds
 keycloak.realm.enable-cors=Enable Keycloak CORS support
 keycloak.realm.client-keystore=n/a
 keycloak.realm.client-keystore-password=n/a
@@ -68,6 +71,9 @@ 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
 keycloak.secure-deployment.connection-pool-size=Connection pool size for the client used by the adapter
+keycloak.secure-deployment.socket-timeout=Timeout for socket waiting for data in milliseconds
+keycloak.secure-deployment.connection-ttl=Connection time to live in milliseconds
+keycloak.secure-deployment.connection-timeout=Timeout for establishing the connection with the remote host in milliseconds
 keycloak.secure-deployment.resource=Application name
 keycloak.secure-deployment.use-resource-role-mappings=Use resource level permissions from token
 keycloak.secure-deployment.credentials=Adapter credentials
@@ -113,6 +119,9 @@ 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
 keycloak.secure-server.connection-pool-size=Connection pool size for the client used by the adapter
+keycloak.secure-server.socket-timeout=Timeout for socket waiting for data in milliseconds
+keycloak.secure-server.connection-ttl=Connection time to live in milliseconds
+keycloak.secure-server.connection-timeout=Timeout for establishing the connection with the remote host in milliseconds
 keycloak.secure-server.resource=Application name
 keycloak.secure-server.use-resource-role-mappings=Use resource level permissions from token
 keycloak.secure-server.credentials=Adapter credentials