[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources/conf: attribute-resolver-full.xml attribute-res...

[noreply at shibboleth.net]

Author: dfisher
Date: Fri Jun 24 00:45:10 2016
New Revision: 8274

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8274&view=rev
Log:
IDP-986 add responseTimeout 

Also updated sample LDAP attribute resolver to include connect and response timeouts
.

Modified:
    trunk/idp-conf/src/main/resources/conf/attribute-resolver-full.xml
    trunk/idp-conf/src/main/resources/conf/attribute-resolver-ldap.xml
    trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml
    trunk/idp-conf/src/main/resources/conf/ldap.properties

Modified: trunk/idp-conf/src/main/resources/conf/attribute-resolver-full.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/attribute-resolver-full.xml?rev=8274&r1=8273&r2=8274&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/attribute-resolver-full.xml	(original)
+++ trunk/idp-conf/src/main/resources/conf/attribute-resolver-full.xml	Fri Jun 24 00:45:10 2016
@@ -280,7 +280,9 @@
         baseDN="%{idp.attribute.resolver.LDAP.baseDN}" 
         principal="%{idp.attribute.resolver.LDAP.bindDN}"
         principalCredential="%{idp.attribute.resolver.LDAP.bindDNCredential}"
-        useStartTLS="%{idp.attribute.resolver.LDAP.useStartTLS:true}">
+        useStartTLS="%{idp.attribute.resolver.LDAP.useStartTLS:true}"
+        connectTimeout="%{idp.attribute.resolver.LDAP.connectTimeout}"
+        responseTimeout="%{idp.attribute.resolver.LDAP.responseTimeout}">
         <dc:FilterTemplate>
             <![CDATA[
                 %{idp.attribute.resolver.LDAP.searchFilter}

Modified: trunk/idp-conf/src/main/resources/conf/attribute-resolver-ldap.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/attribute-resolver-ldap.xml?rev=8274&r1=8273&r2=8274&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/attribute-resolver-ldap.xml	(original)
+++ trunk/idp-conf/src/main/resources/conf/attribute-resolver-ldap.xml	Fri Jun 24 00:45:10 2016
@@ -82,7 +82,9 @@
         baseDN="%{idp.attribute.resolver.LDAP.baseDN}" 
         principal="%{idp.attribute.resolver.LDAP.bindDN}"
         principalCredential="%{idp.attribute.resolver.LDAP.bindDNCredential}"
-        useStartTLS="%{idp.attribute.resolver.LDAP.useStartTLS:true}">
+        useStartTLS="%{idp.attribute.resolver.LDAP.useStartTLS:true}"
+        connectTimeout="%{idp.attribute.resolver.LDAP.connectTimeout}"
+        responseTimeout="%{idp.attribute.resolver.LDAP.responseTimeout}">
         <dc:FilterTemplate>
             <![CDATA[
                 %{idp.attribute.resolver.LDAP.searchFilter}

Modified: trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml?rev=8274&r1=8273&r2=8274&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml	(original)
+++ trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml	Fri Jun 24 00:45:10 2016
@@ -22,6 +22,7 @@
         p:useStartTLS="%{idp.authn.LDAP.useStartTLS:true}"
         p:useSSL="%{idp.authn.LDAP.useSSL:false}"
         p:connectTimeout="%{idp.authn.LDAP.connectTimeout:3000}"
+        p:responseTimeout="%{idp.authn.LDAP.responseTimeout:3000}"
         p:sslConfig-ref="sslConfig" />
 
     <alias name="%{idp.authn.LDAP.sslConfig:certificateTrust}" alias="sslConfig" />

Modified: trunk/idp-conf/src/main/resources/conf/ldap.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/ldap.properties?rev=8274&r1=8273&r2=8274&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/ldap.properties	(original)
+++ trunk/idp-conf/src/main/resources/conf/ldap.properties	Fri Jun 24 00:45:10 2016
@@ -9,6 +9,7 @@
 #idp.authn.LDAP.useStartTLS                     = true
 #idp.authn.LDAP.useSSL                          = false
 #idp.authn.LDAP.connectTimeout                  = 3000
+#idp.authn.LDAP.responseTimeout                 = 3000
 
 ## SSL configuration, either jvmTrust, certificateTrust, or keyStoreTrust
 #idp.authn.LDAP.sslConfig                       = certificateTrust
@@ -40,6 +41,8 @@
 # LDAP attribute configuration, see attribute-resolver.xml
 # Note, this likely won't apply to the use of legacy V2 resolver configurations
 idp.attribute.resolver.LDAP.ldapURL             = %{idp.authn.LDAP.ldapURL}
+idp.attribute.resolver.LDAP.connectTimeout      = %{idp.authn.LDAP.connectTimeout:undefined}
+idp.attribute.resolver.LDAP.responseTimeout     = %{idp.authn.LDAP.responseTimeout:undefined}
 idp.attribute.resolver.LDAP.baseDN              = %{idp.authn.LDAP.baseDN:undefined}
 idp.attribute.resolver.LDAP.bindDN              = %{idp.authn.LDAP.bindDN:undefined}

[... 2 lines stripped ...]