[java-idp-plugin-duo] branch main updated: Fix up defaults, add HttpClient settings.

[Scott Cantor]

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

scantor pushed a commit to branch main
in repository java-idp-plugin-duo.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-duo.git;a=commit;h=0222cb17214c287464747ceb608fc63cc3b61a19

The following commit(s) were added to refs/heads/main by this push:
       new  0222cb1   Fix up defaults, add HttpClient settings.
0222cb1 is described below

commit 0222cb17214c287464747ceb608fc63cc3b61a19
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Oct 6 11:34:27 2020 -0400

    Fix up defaults, add HttpClient settings.
---
 .../authn/duo/module/conf/authn/duo-oidc.properties   | 19 ++++++++++++++-----
 .../idp/plugin/authn/duo/duo-client-factory-bean.xml  | 12 ++++++------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/idp-duo-impl/src/main/resources/net/shibboleth/idp/plugin/authn/duo/module/conf/authn/duo-oidc.properties b/idp-duo-impl/src/main/resources/net/shibboleth/idp/plugin/authn/duo/module/conf/authn/duo-oidc.properties
index e7eea13..696a9b5 100644
--- a/idp-duo-impl/src/main/resources/net/shibboleth/idp/plugin/authn/duo/module/conf/authn/duo-oidc.properties
+++ b/idp-duo-impl/src/main/resources/net/shibboleth/idp/plugin/authn/duo/module/conf/authn/duo-oidc.properties
@@ -1,13 +1,22 @@
 ## DuoOIDC default integration settings
 
-#idp.duo.oidc.endpoint.health = /oauth/v1/health_check
-#idp.duo.oidc.endpoint.token = /oauth/v1/token
-#idp.duo.oidc.endpoint.authorize = /oauth/v1/authorize
-
+# Configure for your particular integration settings
 idp.duo.oidc.apiHost = hostname
 idp.duo.oidc.clientId = clientid
 idp.duo.oidc.redirectURL = https://something
-idp.duo.oidc.integrationKey = key
 
 # We suggest defining this in credentials/secrets.properties
 #idp.duo.oidc.secretKey = key
+
+# Shouldn't need changing
+#idp.duo.oidc.endpoint.health = /oauth/v1/health_check
+#idp.duo.oidc.endpoint.token = /oauth/v1/token
+#idp.duo.oidc.endpoint.authorize = /oauth/v1/authorize
+
+# With the Nimbus "client" impl, controls for HttpClient behavior
+# These default to the global HttpClient options in services.properties
+#idp.duo.oidc.connectionTimeout = PT1M
+#idp.duo.oidc.connectionRequestTimeout = PT1M
+#idp.duo.oidc.socketTimeout = PT1M
+#idp.duo.oidc.maxConnectionsTotal = 100
+#idp.duo.oidc.maxConnectionsPerRoute = 100
diff --git a/idp-duo-nimbus-client-impl/src/main/resources/net/shibboleth/idp/plugin/authn/duo/duo-client-factory-bean.xml b/idp-duo-nimbus-client-impl/src/main/resources/net/shibboleth/idp/plugin/authn/duo/duo-client-factory-bean.xml
index a499b15..5d58225 100644
--- a/idp-duo-nimbus-client-impl/src/main/resources/net/shibboleth/idp/plugin/authn/duo/duo-client-factory-bean.xml
+++ b/idp-duo-nimbus-client-impl/src/main/resources/net/shibboleth/idp/plugin/authn/duo/duo-client-factory-bean.xml
@@ -19,12 +19,12 @@
     <!-- Create a default HTTP Client using the global http settings overrides -->
     <bean id="shibboleth.authn.DuoOIDC.InternalHttpClient" class="net.shibboleth.idp.plugin.authn.duo.nimbus.DuoHttpClientFactoryBean" lazy-init="true"
         p:tLSSocketFactory-ref="shibboleth.SecurityEnhancedTLSSocketFactory"
-        p:connectionDisregardTLSCertificate="%{idp.httpclient.connectionDisregardTLSCertificate:false}"
-        p:connectionTimeout="%{idp.httpclient.connectionTimeout:PT1M}"
-        p:connectionRequestTimeout="%{idp.httpclient.connectionRequestTimeout:PT1M}"
-        p:socketTimeout="%{idp.httpclient.socketTimeout:PT1M}" 
-        p:maxConnectionsTotal="%{idp.httpclient.maxConnectionsTotal:100}"
-        p:maxConnectionsPerRoute="%{idp.httpclient.maxConnectionsPerRoute:100}" />
+        p:connectionDisregardTLSCertificate="%{idp.duo.oidc.connectionDisregardTLSCertificate:false}"
+        p:connectionTimeout="%{idp.duo.oidc.connectionTimeout:%{idp.httpclient.connectionTimeout:PT1M}}"
+        p:connectionRequestTimeout="%{idp.duo.oidc.connectionRequestTimeout:%{idp.httpclient.connectionRequestTimeout:PT1M}}"
+        p:socketTimeout="%{idp.duo.oidc.socketTimeout:%{idp.httpclient.socketTimeout:PT1M}}" 
+        p:maxConnectionsTotal="%{idp.duo.oidc.maxConnectionsTotal:%{idp.httpclient.maxConnectionsTotal:100}}"
+        p:maxConnectionsPerRoute="%{idp.duo.oidc.maxConnectionsPerRoute:%{idp.httpclient.maxConnectionsPerRoute:100}}" />
     
     <!-- Create a default object mapper. Setup should not change once injected -->
     <bean id="shibboleth.authn.DuoOIDC.JSONObjectMapper" class="com.fasterxml.jackson.databind.ObjectMapper" />

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