[java-identity-provider] 03/04: IDP-1418 Fail if no truststore provided to LDAP

[Rod Widdowson]

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

rdw pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=5b7f5dd759793cc5dc5a8e7a4018e91709243fa9

commit 5b7f5dd759793cc5dc5a8e7a4018e91709243fa9
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Apr 11 17:29:02 2019 +0100

    IDP-1418 Fail if no truststore provided to LDAP
    
    https://issues.shibboleth.net/jira/browse/IDP-1418
    
    Turn existing deprecation warning into a component exception.
---
 .../resolver/dc/ldap/impl/LDAPDataConnector.java   | 29 ++++++++++------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnector.java b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnector.java
index f36133b..4ad038a 100644
--- a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnector.java
+++ b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnector.java
@@ -22,29 +22,27 @@ import java.util.Map;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import net.shibboleth.idp.attribute.IdPAttribute;
-import net.shibboleth.idp.attribute.resolver.ResolutionException;
-import net.shibboleth.idp.attribute.resolver.dc.ValidationException;
-import net.shibboleth.idp.attribute.resolver.dc.Validator;
-import net.shibboleth.idp.attribute.resolver.dc.impl.AbstractSearchDataConnector;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.component.ComponentSupport;
-import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
-
 import org.ldaptive.Connection;
 import org.ldaptive.ConnectionConfig;
 import org.ldaptive.ConnectionFactory;
 import org.ldaptive.LdapException;
 import org.ldaptive.SearchExecutor;
 import org.ldaptive.SearchResult;
-import org.ldaptive.ssl.X509SSLContextInitializer;
-import org.ldaptive.ssl.SslConfig;
 import org.ldaptive.ssl.SSLContextInitializer;
+import org.ldaptive.ssl.SslConfig;
+import org.ldaptive.ssl.X509SSLContextInitializer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import net.shibboleth.idp.attribute.IdPAttribute;
+import net.shibboleth.idp.attribute.resolver.ResolutionException;
+import net.shibboleth.idp.attribute.resolver.dc.ValidationException;
+import net.shibboleth.idp.attribute.resolver.dc.Validator;
+import net.shibboleth.idp.attribute.resolver.dc.impl.AbstractSearchDataConnector;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.component.ComponentSupport;
+import net.shibboleth.utilities.java.support.logic.Constraint;
+
 /**
  * A {@link net.shibboleth.idp.attribute.resolver.DataConnector} that queries an LDAP in order to retrieve attribute
  * data.
@@ -167,9 +165,8 @@ public class LDAPDataConnector extends AbstractSearchDataConnector<ExecutableSea
                         sslConfig.getCredentialConfig().createSSLContextInitializer() : null;
                     if (cxtInit instanceof X509SSLContextInitializer) {
                         if (((X509SSLContextInitializer) cxtInit).getTrustCertificates() == null) {
-                            DeprecationSupport.warn(
-                                ObjectType.CONFIGURATION, "Use of default JVM trust store",
-                                    getLogPrefix(), "trustFile attribute");
+                            throw new ComponentInitializationException("Cannot use the default JVM trust store for "+
+                                    getLogPrefix());
                         }
                     }
                 }

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