From ea2a2ee43a9b5179ff390445e0e6f750d2120f88 Mon Sep 17 00:00:00 2001
From: AFaust <axel.faust@acosix.org>
Date: Sat, 2 Jan 2021 19:21:01 +0100
Subject: [PATCH] Add reasonable default timeouts

- KeycloakDeployment.resolveUrls() blocks otherwise e.g. if realm is
  misconfigured
---
 .../keycloak/keycloak-authentication.properties               | 4 ++--
 share/src/main/config/default-config.xml                      | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/repository/src/main/globalConfig/subsystems/Authentication/keycloak/keycloak-authentication.properties b/repository/src/main/globalConfig/subsystems/Authentication/keycloak/keycloak-authentication.properties
index d698064..4098007 100644
--- a/repository/src/main/globalConfig/subsystems/Authentication/keycloak/keycloak-authentication.properties
+++ b/repository/src/main/globalConfig/subsystems/Authentication/keycloak/keycloak-authentication.properties
@@ -19,8 +19,8 @@ keycloak.authentication.bodyBufferLimit=10485760
 # useful primarily for Docker-ized deployments where container running Alfresco cannot resolve the auth server via the public DNS name
 keycloak.adapter.directAuthHost=
 # other custom adapter properties not part of default Keycloak adapter library
-keycloak.adapter.connectionTimeout=-1
-keycloak.adapter.socketTimeout=-1
+keycloak.adapter.connectionTimeout=5000
+keycloak.adapter.socketTimeout=5000
 
 keycloak.adapter.auth-server-url=http://localhost:8180/auth
 keycloak.adapter.realm=alfresco
diff --git a/share/src/main/config/default-config.xml b/share/src/main/config/default-config.xml
index 1cad220..1abcf14 100644
--- a/share/src/main/config/default-config.xml
+++ b/share/src/main/config/default-config.xml
@@ -51,6 +51,8 @@
             </credentials>
             <!-- for some reason, this is not a sane default in Keycloak Adapter config -->
             <verify-token-audience>true</verify-token-audience>
+            <connectionTimeout>5000</connectionTimeout>
+            <socketTimeout>5000</socketTimeout>
         </keycloak-adapter-config>
     </config>