You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by co...@apache.org on 2019/06/18 11:25:36 UTC
[directory-ldap-api] branch trustmanagers created (now 0a967ef)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch trustmanagers
in repository https://gitbox.apache.org/repos/asf/directory-ldap-api.git.
at 0a967ef Disallow setting the TrustManagers to null
This branch includes the following new commits:
new 0a967ef Disallow setting the TrustManagers to null
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[directory-ldap-api] 01/01: Disallow setting the TrustManagers to
null
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch trustmanagers
in repository https://gitbox.apache.org/repos/asf/directory-ldap-api.git
commit 0a967efa7deb06ec6f58177e3aaf790187f861bb
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Jun 18 12:25:11 2019 +0100
Disallow setting the TrustManagers to null
---
.../ldap/client/api/LdapConnectionConfig.java | 6 +++
.../ldap/client/api/LdapNetworkConnection.java | 9 +---
.../ldap/client/api/LdapConnectionConfigTest.java | 56 ++++++++++++++++++++++
3 files changed, 63 insertions(+), 8 deletions(-)
diff --git a/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnectionConfig.java b/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnectionConfig.java
index 7d4675a..0120ba7 100644
--- a/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnectionConfig.java
+++ b/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnectionConfig.java
@@ -352,9 +352,15 @@ public class LdapConnectionConfig
* Sets the trust managers.
*
* @param trustManagers the new trust managers
+ * @throws IllegalArgumentException if the trustManagers parameter is null or empty
*/
public void setTrustManagers( TrustManager... trustManagers )
{
+ if ( ( trustManagers == null ) || ( trustManagers.length == 0 )
+ || ( trustManagers.length == 1 && trustManagers[0] == null ) )
+ {
+ throw new IllegalArgumentException( "TrustManagers must not be null or empty" );
+ }
this.trustManagers = trustManagers;
}
diff --git a/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java b/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
index 24ef1a2..537f196 100644
--- a/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
+++ b/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
@@ -4848,14 +4848,7 @@ public class LdapNetworkConnection extends AbstractLdapConnection implements Lda
{
SSLContext sslContext = SSLContext.getInstance( config.getSslProtocol() );
- TrustManager[] trustManagers = config.getTrustManagers();
-
- if ( ( trustManagers == null ) || ( trustManagers.length == 0 ) )
- {
- trustManagers = new TrustManager[] { new NoVerificationTrustManager() };
- }
-
- sslContext.init( config.getKeyManagers(), trustManagers, config.getSecureRandom() );
+ sslContext.init( config.getKeyManagers(), config.getTrustManagers(), config.getSecureRandom() );
SslFilter sslFilter = new SslFilter( sslContext );
sslFilter.setUseClientMode( true );
diff --git a/ldap/client/api/src/test/java/org/apache/directory/ldap/client/api/LdapConnectionConfigTest.java b/ldap/client/api/src/test/java/org/apache/directory/ldap/client/api/LdapConnectionConfigTest.java
new file mode 100644
index 0000000..f430160
--- /dev/null
+++ b/ldap/client/api/src/test/java/org/apache/directory/ldap/client/api/LdapConnectionConfigTest.java
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.directory.ldap.client.api;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import javax.net.ssl.TrustManager;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class LdapConnectionConfigTest {
+
+ @Test
+ public void testNullTrustManagers() {
+ LdapConnectionConfig config = new LdapConnectionConfig();
+
+ Assertions.assertThrows(IllegalArgumentException.class, () -> {
+ config.setTrustManagers((TrustManager)null);
+ });
+ }
+
+ @Test
+ public void testNullTrustManagers2() {
+ LdapConnectionConfig config = new LdapConnectionConfig();
+
+ Assertions.assertThrows(IllegalArgumentException.class, () -> {
+ config.setTrustManagers(null);
+ });
+ }
+
+ @Test
+ public void testValidTrustManagers() {
+ LdapConnectionConfig config = new LdapConnectionConfig();
+ config.setTrustManagers(new NoVerificationTrustManager());
+ assertNotNull(config.getTrustManagers());
+ }
+}
+