[java-identity-provider COMMIT] in /trunk: idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/r...

[noreply at shibboleth.net]

Author: dfisher
Date: Wed May 11 01:45:48 2016
New Revision: 8238

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8238&view=rev
Log:
IDP-938 connect and response timeouts

Update LDAPDirectory schema to include connect and response timeouts.
Update LDAPDataConnectorParser to parse connect and response timeouts.
Update unit tests.

Modified:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParserTest.java
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-spring-context.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-spring-props-context.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-v2-hybrid.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-v2-props.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-v2.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-v2.properties
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-v3.properties
    trunk/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver-dc.xsd

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java?rev=8238&r1=8237&r2=8238&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java	(original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java	Wed May 11 01:45:48 2016
@@ -260,12 +260,34 @@
                     AttributeSupport.getAttributeValue(configElement, new QName("principalCredential"));
             final String authenticationType =
                     AttributeSupport.getAttributeValue(configElement, new QName("authenticationType"));
+            final String connectTimeout =
+                    AttributeSupport.getAttributeValue(configElement, new QName("connectTimeout"));
+            final String responseTimeout =
+                    AttributeSupport.getAttributeValue(configElement, new QName("responseTimeout"));
 
             final BeanDefinitionBuilder connectionConfig =
                     BeanDefinitionBuilder.genericBeanDefinition(ConnectionConfig.class);
             connectionConfig.addPropertyValue("ldapUrl", url);
             if (useStartTLS != null) {
                 connectionConfig.addPropertyValue("useStartTLS", useStartTLS);
+            }
+            if (connectTimeout != null) {
+                final BeanDefinitionBuilder timeout =
+                        BeanDefinitionBuilder.rootBeanDefinition(V2Parser.class, "buildDuration");
+                timeout.addConstructorArgValue(connectTimeout);
+                timeout.addConstructorArgValue(1);
+                connectionConfig.addPropertyValue("connectTimeout", timeout.getBeanDefinition());
+            } else {
+                connectionConfig.addPropertyValue("connectTimeout", 3000);
+            }
+            if (responseTimeout != null) {
+                final BeanDefinitionBuilder timeout =
+                        BeanDefinitionBuilder.rootBeanDefinition(V2Parser.class, "buildDuration");
+                timeout.addConstructorArgValue(responseTimeout);
+                timeout.addConstructorArgValue(1);
+                connectionConfig.addPropertyValue("responseTimeout", timeout.getBeanDefinition());
+            } else {
+                connectionConfig.addPropertyValue("responseTimeout", 3000);
             }
             final BeanDefinitionBuilder sslConfig = BeanDefinitionBuilder.genericBeanDefinition(SslConfig.class);
             sslConfig.addPropertyValue("credentialConfig", createCredentialConfig(parserContext));

Modified: trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParserTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParserTest.java?rev=8238&r1=8237&r2=8238&view=diff

[... 153 lines stripped ...]