[java-identity-provider] 01/02: IDP-2388 Add timeout to the "update check" in the IdP and plugins

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch main
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=a761f34509b2816d9a157fd3c06cfdb77b04e751

commit a761f34509b2816d9a157fd3c06cfdb77b04e751
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Jul 12 13:53:27 2025 +0100

    IDP-2388 Add timeout to the "update check" in the IdP and plugins
    
    https://shibboleth.atlassian.net/browse/IDP-2388
    
    Grow a new http client shibboleth.CallHomeHttpClient which is used
    in the ReportUpdateStatus and metrics call back configuration
---
 .../src/main/resources/net/shibboleth/idp/conf/admin-system.xml  | 2 +-
 .../src/main/resources/net/shibboleth/idp/conf/http-client.xml   | 9 +++++++++
 .../main/resources/net/shibboleth/idp/conf/metrics-system.xml    | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/admin-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/admin-system.xml
index 464d2347f..d1ea01b18 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/admin-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/admin-system.xml
@@ -236,7 +236,7 @@
        depends-on="shibboleth.LoggingService"
        p:updateUrls-ref="%{idp.updateCheck.urls:shibboleth.IdPUpdateCheckUrls}"
        p:enabled="%{idp.updateCheck.enable:true}"
-       p:httpClient-ref="%{idp.updateCheck.httpClient:shibboleth.InternalHttpClient}"
+       p:httpClient-ref="%{idp.updateCheck.httpClient:shibboleth.CallHomeHttpClient}"
        p:securityParams="#{ environment.containsProperty('idp.updateCheck.httpSecurityParameters') ? getObject('idp.updateCheck.httpSecurityParameters') :null}"/>
 
     <!-- Used to check module enabled state -->
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/http-client.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/http-client.xml
index 98293c3be..ad40441fd 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/http-client.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/http-client.xml
@@ -62,5 +62,14 @@
         p:requestTimeoutCorePoolSize="%{idp.httpclient.requestTimeoutCorePoolSize:20}" 
         p:maxConnectionsTotal="%{idp.httpclient.maxConnectionsTotal:100}"
         p:maxConnectionsPerRoute="%{idp.httpclient.maxConnectionsPerRoute:100}" />
+    <!--
+    This client is used for the "call home" services (mostly plugin and IdP status)
+    -->
+    <bean id="shibboleth.CallHomeHttpClient" parent="shibboleth.InternalHttpClient" lazy-init="true" destroy-method=""
+        p:connectionTimeout="%{idp.callhomeclient.connectionTimeout:PT1M}"
+        p:connectionRequestTimeout="%{idp.callhomeclient.connectionRequestTimeout:PT1M}"
+        p:socketTimeout="%{idp.callhomeclient.socketTimeout:PT1M}"
+        p:responseTimeout="%{idp.callhomeclient.responseTimeout:PT1M}"
+        p:requestTimeout="%{idp.callhomeclient.requestTimeout:#{null}}" />
 
 </beans>
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/metrics-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/metrics-system.xml
index 86884e7c5..23f4b24b9 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/metrics-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/metrics-system.xml
@@ -83,7 +83,7 @@
     <bean id="shibboleth.metrics.InstallableComponents"
         class="net.shibboleth.idp.admin.impl.InstallableComponentGaugeSet" lazy-init="true"
        p:idpUpdateUrls-ref="%{idp.updateCheck.urls:shibboleth.IdPUpdateCheckUrls}"
-       p:httpClient-ref="%{idp.updateCheck.httpClient:shibboleth.InternalHttpClient}"
+       p:httpClient-ref="%{idp.updateCheck.httpClient:shibboleth.CallHomeHttpClient}"
        p:securityParams="#{ environment.containsProperty('idp.updateCheck.httpSecurityParameters') ? getObject('idp.updateCheck.httpSecurityParameters') :null}"/>
     
     <bean id="shibboleth.metrics.LoggingGaugeSet"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.