[java-opensaml COMMIT] in /trunk/opensaml-security-impl: pom.xml src/main/java/org/opensaml/security/ldap/ src/main/j...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Jan 11 20:31:44 2017
New Revision: 4598

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4598&view=rev
Log:
IDP-1106 - Support for key-based authentication of LDAP server

https://issues.shibboleth.net/jira/browse/IDP-1106

Eliminate unneeded class and add unit test.

Added:
    trunk/opensaml-security-impl/src/test/java/org/opensaml/security/trust/impl/InMemoryDirectory.java   (with props)
    trunk/opensaml-security-impl/src/test/java/org/opensaml/security/trust/impl/TrustEngineX509TrustManagerTest.java   (with props)
    trunk/opensaml-security-impl/src/test/resources/org/opensaml/security/ldap/
    trunk/opensaml-security-impl/src/test/resources/org/opensaml/security/ldap/impl/
    trunk/opensaml-security-impl/src/test/resources/org/opensaml/security/ldap/impl/test-ldap.key
    trunk/opensaml-security-impl/src/test/resources/org/opensaml/security/ldap/impl/test-ldap.keystore   (with props)
    trunk/opensaml-security-impl/src/test/resources/org/opensaml/security/ldap/impl/test-ldap.ldif
Modified:
    trunk/opensaml-security-impl/pom.xml
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/ldap/
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/trust/impl/TrustEngineX509TrustManager.java

Modified: trunk/opensaml-security-impl/pom.xml
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-security-impl/pom.xml?rev=4598&r1=4597&r2=4598&view=diff
==============================================================================
--- trunk/opensaml-security-impl/pom.xml	(original)
+++ trunk/opensaml-security-impl/pom.xml	Wed Jan 11 20:31:44 2017
@@ -58,6 +58,12 @@
             <scope>test</scope>
         </dependency>
         
+        <dependency>
+            <groupId>com.unboundid</groupId>
+            <artifactId>unboundid-ldapsdk</artifactId>
+            <scope>test</scope>
+        </dependency>
+        
     </dependencies>
     
     <distributionManagement>

Modified: trunk/opensaml-security-impl/src/main/java/org/opensaml/security/trust/impl/TrustEngineX509TrustManager.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-security-impl/src/main/java/org/opensaml/security/trust/impl/TrustEngineX509TrustManager.java?rev=4598&r1=4597&r2=4598&view=diff
==============================================================================
--- trunk/opensaml-security-impl/src/main/java/org/opensaml/security/trust/impl/TrustEngineX509TrustManager.java	(original)
+++ trunk/opensaml-security-impl/src/main/java/org/opensaml/security/trust/impl/TrustEngineX509TrustManager.java	Wed Jan 11 20:31:44 2017
@@ -52,7 +52,7 @@
     @Nullable private CriteriaSet tlsCriteriaSet;
     
     /**
-     * Sets the optional trust engine used in evaluating server TLS credentials.
+     * Set the trust engine used in evaluating server TLS credentials.
      * 
      * @param engine the trust engine instance to use
      */
@@ -78,6 +78,8 @@
     public void checkServerTrusted(X509Certificate[] arg0, String arg1) throws CertificateException {
         if (arg0 == null || arg0.length < 1) {
             throw new CertificateException("Peer certificate array was null or empty");
+        } else if (tlsTrustEngine == null) {
+            throw new CertificateException("TrustEngine was null");
         }
 
         final ArrayList<X509Certificate> certChain = new ArrayList<>();
@@ -110,7 +112,7 @@
 
     /** {@inheritDoc} */
     public X509Certificate[] getAcceptedIssuers() {
-        return null;
+        return new X509Certificate[] {};
     }
 
 }