Skip to content
Permalink
Browse files
Disallow setting the TrustManagers to null
  • Loading branch information
coheigea committed Jun 18, 2019
1 parent 2a10bd4 commit 0a967efa7deb06ec6f58177e3aaf790187f861bb
Show file tree
Hide file tree
Showing 3 changed files with 63 additions and 8 deletions.
@@ -352,9 +352,15 @@ public TrustManager[] getTrustManagers()
* 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;
}

@@ -4848,14 +4848,7 @@ private void addSslFilter() throws LdapException
{
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 );
@@ -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());
}
}

0 comments on commit 0a967ef

Please sign in to comment.