[java-identity-provider] branch main updated: IDP-2102 update ldaptive to v2.1.2
Daniel Fisher
dfisher at vt.edu
Mon May 15 13:46:22 UTC 2023
This is an automated email from the git hooks/post-receive script.
dfisher 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=3ba578c4f0fe292ca4c9ac7f72ed1ef0de8fb9c5
The following commit(s) were added to refs/heads/main by this push:
new 3ba578c4f IDP-2102 update ldaptive to v2.1.2
3ba578c4f is described below
commit 3ba578c4f0fe292ca4c9ac7f72ed1ef0de8fb9c5
Author: Daniel Fisher <dfisher at vt.edu>
AuthorDate: Mon May 15 00:05:48 2023 -0400
IDP-2102 update ldaptive to v2.1.2
Add new configuration property for startTLSTimeout.
Include netty aarch_64 native jars in signature checking.
https://shibboleth.atlassian.net/browse/IDP-2102
---
.../idp/authn/config/LDAPAuthenticationFactoryBean.java | 14 +++++++++++++-
.../authn/config/LDAPAuthenticationFactoryBeanTest.java | 3 ++-
.../shibboleth/idp/flows/authn/password-authn-beans.xml | 1 +
.../idp/module/conf/examples/attribute-resolver-ldap.xml | 1 +
.../net/shibboleth/idp/module/conf/ldap.properties | 7 +++++--
idp-distribution/pom.xml | 2 +-
6 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/idp-authn-api/src/main/java/net/shibboleth/idp/authn/config/LDAPAuthenticationFactoryBean.java b/idp-authn-api/src/main/java/net/shibboleth/idp/authn/config/LDAPAuthenticationFactoryBean.java
index d086ce235..060a97589 100644
--- a/idp-authn-api/src/main/java/net/shibboleth/idp/authn/config/LDAPAuthenticationFactoryBean.java
+++ b/idp-authn-api/src/main/java/net/shibboleth/idp/authn/config/LDAPAuthenticationFactoryBean.java
@@ -317,6 +317,9 @@ public class LDAPAuthenticationFactoryBean extends AbstractFactoryBean<Authentic
/** Whether to use startTLS for connections. */
private boolean useStartTLS;
+ /** Wait time for startTLS responses. */
+ private Duration startTLSTimeout;
+
/** Whether to use the allow-all hostname verifier. */
private boolean disableHostnameVerification;
@@ -479,6 +482,13 @@ public class LDAPAuthenticationFactoryBean extends AbstractFactoryBean<Authentic
useStartTLS = b;
}
+ /** Set {@link #startTLSTimeout}.
+ * @param timeout what to set
+ */
+ public void setStartTLSTimeout(@Nullable final Duration timeout) {
+ startTLSTimeout = timeout;
+ }
+
/** Set {@link #disableHostnameVerification}.
* @param b what to set
*/
@@ -790,6 +800,7 @@ public class LDAPAuthenticationFactoryBean extends AbstractFactoryBean<Authentic
final ConnectionConfig config = new ConnectionConfig();
config.setLdapUrl(ldapUrl);
config.setUseStartTLS(useStartTLS);
+ config.setStartTLSTimeout(startTLSTimeout);
config.setConnectTimeout(connectTimeout);
config.setResponseTimeout(responseTimeout);
switch (connectionStrategyType) {
@@ -1023,7 +1034,8 @@ public class LDAPAuthenticationFactoryBean extends AbstractFactoryBean<Authentic
public String toString() {
return MoreObjects.toStringHelper(this).add("authenticatorType", authenticatorType).add("trustType", trustType)
.add("connectionStrategyType", connectionStrategyType).add("ldapUrl", ldapUrl)
- .add("useStartTLS", useStartTLS).add("disableHostnameVerification", disableHostnameVerification)
+ .add("useStartTLS", useStartTLS).add("startTLSTimeout", startTLSTimeout)
+ .add("disableHostnameVerification", disableHostnameVerification)
.add("connectTimeout", connectTimeout).add("responseTimeout", responseTimeout)
.add("trustCertificatesCredentialConfig", trustCertificatesCredentialConfig)
.add("truststoreCredentialConfig", truststoreCredentialConfig).add("disablePooling", disablePooling)
diff --git a/idp-authn-api/src/test/java/net/shibboleth/idp/authn/config/LDAPAuthenticationFactoryBeanTest.java b/idp-authn-api/src/test/java/net/shibboleth/idp/authn/config/LDAPAuthenticationFactoryBeanTest.java
index 55daa7a8c..a99e0adf6 100644
--- a/idp-authn-api/src/test/java/net/shibboleth/idp/authn/config/LDAPAuthenticationFactoryBeanTest.java
+++ b/idp-authn-api/src/test/java/net/shibboleth/idp/authn/config/LDAPAuthenticationFactoryBeanTest.java
@@ -86,6 +86,7 @@ public class LDAPAuthenticationFactoryBeanTest {
factoryBean.setTrustType("disabled");
factoryBean.setConnectionStrategyType("ACTIVE_PASSIVE");
factoryBean.setUseStartTLS(false);
+ factoryBean.setStartTLSTimeout(Duration.ofSeconds(3));
factoryBean.setConnectTimeout(Duration.ofSeconds(3));
factoryBean.setResponseTimeout(Duration.ofSeconds(3));
factoryBean.setDisablePooling(false);
@@ -129,4 +130,4 @@ public class LDAPAuthenticationFactoryBeanTest {
new User(upc.getUsername(), new VelocityContext(Map.of("usernamePasswordContext", upc))),
new Credential(upc.getPassword()));
}
-}
\ No newline at end of file
+}
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/password-authn-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/password-authn-beans.xml
index 42b3ca409..8914e738e 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/password-authn-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/password-authn-beans.xml
@@ -135,6 +135,7 @@
p:connectionStrategyType="#{'%{idp.authn.LDAP.connectionStrategy:ACTIVE_PASSIVE}'.trim()}"
p:ldapUrl="%{idp.authn.LDAP.ldapURL:ldap://localhost:10389}"
p:useStartTLS="%{idp.authn.LDAP.useStartTLS:true}"
+ p:startTLSTimeout="%{idp.authn.LDAP.startTLSTimeout:PT3S}"
p:connectTimeout="%{idp.authn.LDAP.connectTimeout:PT3S}"
p:responseTimeout="%{idp.authn.LDAP.responseTimeout:PT3S}"
p:trustCertificatesCredentialConfig-ref="shibboleth.authn.LDAP.trustCertificates"
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/examples/attribute-resolver-ldap.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/examples/attribute-resolver-ldap.xml
index bf4123a30..74b303385 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/examples/attribute-resolver-ldap.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/examples/attribute-resolver-ldap.xml
@@ -59,6 +59,7 @@
principal="%{idp.attribute.resolver.LDAP.bindDN}"
principalCredential="%{idp.attribute.resolver.LDAP.bindDNCredential}"
useStartTLS="%{idp.attribute.resolver.LDAP.useStartTLS:true}"
+ startTLSTimeout="%{idp.attribute.resolver.LDAP.startTLSTimeout}"
connectTimeout="%{idp.attribute.resolver.LDAP.connectTimeout}"
trustFile="%{idp.attribute.resolver.LDAP.trustCertificates}"
responseTimeout="%{idp.attribute.resolver.LDAP.responseTimeout}"
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/ldap.properties b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/ldap.properties
index 5792a3eaa..badb1712a 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/ldap.properties
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/ldap.properties
@@ -7,9 +7,11 @@
## Connection properties ##
idp.authn.LDAP.ldapURL = ldap://localhost:10389
#idp.authn.LDAP.useStartTLS = true
-# Time in milliseconds that connects will block
+# Time to wait for startTLS responses
+#idp.authn.LDAP.startTLSTimeout = PT3S
+# Time to wait for connections to open
#idp.authn.LDAP.connectTimeout = PT3S
-# Time in milliseconds to wait for responses
+# Time to wait for operation responses (e.g. search, bind)
#idp.authn.LDAP.responseTimeout = PT3S
# Connection strategy to use when multiple URLs are supplied, either ACTIVE_PASSIVE, ROUND_ROBIN, RANDOM
#idp.authn.LDAP.connectionStrategy = ACTIVE_PASSIVE
@@ -51,6 +53,7 @@ idp.attribute.resolver.LDAP.connectionStrategy = %{idp.authn.LDAP.connectionStr
idp.attribute.resolver.LDAP.baseDN = %{idp.authn.LDAP.baseDN:undefined}
idp.attribute.resolver.LDAP.bindDN = %{idp.authn.LDAP.bindDN:undefined}
idp.attribute.resolver.LDAP.useStartTLS = %{idp.authn.LDAP.useStartTLS:true}
+idp.attribute.resolver.LDAP.startTLSTimeout = %{idp.authn.LDAP.startTLSTimeout:PT3S}
idp.attribute.resolver.LDAP.trustCertificates = %{idp.authn.LDAP.trustCertificates:undefined}
idp.attribute.resolver.LDAP.searchFilter = (uid=$resolutionContext.principal)
diff --git a/idp-distribution/pom.xml b/idp-distribution/pom.xml
index addcf317d..01d5bc7bd 100644
--- a/idp-distribution/pom.xml
+++ b/idp-distribution/pom.xml
@@ -300,7 +300,7 @@
<checkDependencies>false</checkDependencies>
<compileRuntimeArtifactFatal>false</compileRuntimeArtifactFatal>
<versionExtensions>-SNAPSHOT -GA -jre -empty-to-avoid-conflict-with-guava -M6</versionExtensions>
- <classifiers>-linux-x86_64 -osx-x86_64</classifiers>
+ <classifiers>-linux-x86_64 -osx-x86_64 -linux-aarch_64 -osx-aarch_64</classifiers>
<listJarSources>false</listJarSources>
<checkM2>false</checkM2>
</jarEnforcer>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list