[java-shib-attribute] branch main updated: Account for removal of failFast.
Scott Cantor
cantor.2 at osu.edu
Tue Jan 24 16:06:10 UTC 2023
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-shib-attribute.
View the commit online:
http://git.shibboleth.net/view/?p=java-shib-attribute.git;a=commit;h=95de778f3e590e8f5a547c6272fb9fcd99cbf8f1
The following commit(s) were added to refs/heads/main by this push:
new 95de778f3 Account for removal of failFast.
95de778f3 is described below
commit 95de778f3e590e8f5a547c6272fb9fcd99cbf8f1
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Jan 24 11:06:07 2023 -0500
Account for removal of failFast.
---
.../idp/attribute/resolver/spring/dc/ldap/ldap-v2.properties | 2 +-
.../idp/attribute/resolver/spring/dc/ldap/ldap-v3.properties | 3 ++-
.../dc/ldap/resolver/ldap-attribute-resolver-v2-hybrid.xml | 4 ++--
.../spring/dc/ldap/resolver/ldap-attribute-resolver-v2-multi.xml | 6 +++---
.../spring/dc/ldap/resolver/ldap-attribute-resolver-v2-nosec.xml | 9 ++++-----
.../spring/dc/ldap/resolver/ldap-attribute-resolver-v2-props.xml | 6 +++---
.../spring/dc/ldap/resolver/ldap-attribute-resolver-v2.xml | 6 ++----
.../idp/attribute/resolver/spring/dc/resolver/storedNoSalt.xml | 2 +-
8 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-v2.properties b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-v2.properties
index 9493c5183..949294546 100644
--- a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-v2.properties
+++ b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-v2.properties
@@ -5,6 +5,7 @@ connectionConfig.responseTimeout=PT4S
connectionConfig.bindDn=cn=Directory Manager
connectionConfig.bindCredential=password
connectionConfig.connectStrategy=RANDOM
+connectionConfig.failFastInitialize=false
noResultIsError=true
multipleResultsIsError=true
@@ -25,7 +26,6 @@ connectionPool.validateOnCheckout=false
connectionPool.validatePeriod=PT15M
connectionPool.validator.baseDn=dc=shibboleth,dc=net
connectionPool.validator.filter=(ou=people)
-connectionPool.failFastInitialize=false
cache.TTL=PT10S
cache.maxSize=25
diff --git a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-v3.properties b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-v3.properties
index 8d90f8fc1..12291bfcc 100644
--- a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-v3.properties
+++ b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-v3.properties
@@ -4,6 +4,7 @@ connectionConfig.connectTimeout=PT2S
connectionConfig.responseTimeout=PT4S
connectionConfig.bindDn=cn=Directory Manager
connectionConfig.bindCredential=password
+connectionConfig.failFastInitialize=false
noResultIsError=true
multipleResultsIsError=true
@@ -23,6 +24,6 @@ connectionPool.validator.baseDn=dc=shibboleth,dc=net
connectionPool.validator.filter=(ou=people)
connectionPool.pruneStrategy.prunePeriod=PT5M
connectionPool.pruneStrategy.idleTime=PT10M
-connectionPool.failFastInitialize=false
+
cache.cacheBuilderSpec=expireAfterAccess=10s,maximumSize=25
diff --git a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2-hybrid.xml b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2-hybrid.xml
index 34a13c350..7f3020e92 100644
--- a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2-hybrid.xml
+++ b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2-hybrid.xml
@@ -6,7 +6,7 @@
baseDN="ou=people,dc=shibboleth,dc=net" principal="cn=Directory Manager" principalCredential="password"
useStartTLS="true" disableHostnameVerification="true" searchTimeLimit="PT7S"
executableSearchBuilderRef="filter" mappingStrategyRef="mappings" validatorRef="validator" noRetryDelay="PT5M"
- connectTimeout="PT2S" responseTimeout="PT4S">
+ connectTimeout="PT2S" responseTimeout="PT4S" failFastInitialize="false">
<StartTLSTrustCredential xsi:type="security:X509Inline" xmlns:security="urn:mace:shibboleth:2.0:security"
id="LDAPtoIdPCredential">
<security:Certificate>
@@ -24,7 +24,7 @@
</security:Certificate>
</StartTLSTrustCredential>
<ConnectionPool minPoolSize="5" maxPoolSize="10" blockWaitTime="PT5S" expirationTime="PT10M"
- validatePeriodically="true" validateTimerPeriod="PT15M" validateDN="dc=shibboleth,dc=net" validateFilter="(ou=people)" failFastInitialize="false" />
+ validatePeriodically="true" validateTimerPeriod="PT15M" validateDN="dc=shibboleth,dc=net" validateFilter="(ou=people)"/>
<Column columnName="homephone" attributeID="phonenumber" />
<ResultCacheBean>cache</ResultCacheBean>
</DataConnector>
diff --git a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2-multi.xml b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2-multi.xml
index c0ee48283..41b1a5bd3 100644
--- a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2-multi.xml
+++ b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2-multi.xml
@@ -14,7 +14,8 @@
noResultIsError="true"
multipleResultsIsError="true"
connectTimeout="PT2S"
- responseTimeout="PT4S">
+ responseTimeout="PT4S"
+ failFastInitialize="false">
<ResultCache expireAfterAccess="PT10S" maximumCachedElements="25"/>
@@ -28,8 +29,7 @@
validatePeriodically="true"
validateTimerPeriod="PT15M"
validateDN="dc=shibboleth,dc=net"
- validateFilter="(ou=people)"
- failFastInitialize="false" />
+ validateFilter="(ou=people)" />
<StartTLSTrustCredential xsi:type="sec:X509Inline"
diff --git a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2-nosec.xml b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2-nosec.xml
index b0d1a51cb..a0a8e61bc 100644
--- a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2-nosec.xml
+++ b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2-nosec.xml
@@ -17,7 +17,8 @@
authKey="src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/client.key"
authCert="src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/client.crt"
connectTimeout="PT2S"
- responseTimeout="PT4S">
+ responseTimeout="PT4S"
+ failFastInitialize="false">
<FailoverDataConnector ref="2123"/>
@@ -33,8 +34,7 @@
validatePeriodically="true"
validateTimerPeriod="PT15M"
validateDN="dc=shibboleth,dc=net"
- validateFilter="(ou=people)"
- failFastInitialize="false" />
+ validateFilter="(ou=people)"/>
<StartTLSAuthenticationCredential xsi:type="sec:X509ResourceBacked" id="IdPtoLDAPCredential">
@@ -68,8 +68,7 @@
validatePeriodically="true"
validateTimerPeriod="PT15M"
validateDN="dc=shibboleth,dc=net"
- validateFilter="(ou=people)"
- failFastInitialize="false" />
+ validateFilter="(ou=people)"/>
</DataConnector>
diff --git a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2-props.xml b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2-props.xml
index b4a76064d..d50bb0f8f 100644
--- a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2-props.xml
+++ b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2-props.xml
@@ -15,7 +15,8 @@
noRetryDelay="%{noRetryDelay}"
connectTimeout="%{connectionConfig.connectTimeout}"
connectionStrategy="%{connectionConfig.connectStrategy}"
- responseTimeout="%{connectionConfig.responseTimeout}">
+ responseTimeout="%{connectionConfig.responseTimeout}"
+ failFastInitialize="%{connectionConfig.failFastInitialize}">
<FilterTemplate>
<![CDATA[
%{search.filter}
@@ -51,8 +52,7 @@
validateOnCheckout="%{connectionPool.validateOnCheckout}"
validateDN="%{connectionPool.validator.baseDn}"
validateFilter="%{connectionPool.validator.filter}"
- prunePeriod="%{connectionPool.prunePeriod}"
- failFastInitialize="%{connectionPool.failFastInitialize}"/>
+ prunePeriod="%{connectionPool.prunePeriod}"/>
<ResultCache
expireAfterAccess="%{cache.TTL}"
maximumCachedElements="%{cache.maxSize}"/>
diff --git a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2.xml b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2.xml
index 58df71143..80f284a1c 100644
--- a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2.xml
+++ b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2.xml
@@ -32,8 +32,7 @@
validatePeriodically="true"
validateTimerPeriod="PT15M"
validateDN="dc=shibboleth,dc=net"
- validateFilter="(ou=people)"
- failFastInitialize="false" />
+ validateFilter="(ou=people)" />
<StartTLSAuthenticationCredential xsi:type="sec:X509ResourceBacked" id="IdPtoLDAPCredential">
@@ -86,8 +85,7 @@
validatePeriodically="true"
validateTimerPeriod="PT15M"
validateDN="dc=shibboleth,dc=net"
- validateFilter="(ou=people)"
- failFastInitialize="false" />
+ validateFilter="(ou=people)"/>
</DataConnector>
diff --git a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/storedNoSalt.xml b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/storedNoSalt.xml
index 808896095..cb0186bff 100644
--- a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/storedNoSalt.xml
+++ b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/storedNoSalt.xml
@@ -3,7 +3,7 @@
xsi:type="StoredId" xmlns="urn:mace:shibboleth:2.0:resolver"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- failFast="false"
+ failFastInitialize="false"
queryTimeout="PT5S"
transactionRetries="5"
retryableErrors="25000 25001"
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list