Skip to content

Commit 5462cfb

Browse files
committed
Add test for issue
1 parent 75e366f commit 5462cfb

File tree

2 files changed

+45
-1
lines changed

2 files changed

+45
-1
lines changed
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to you under the Apache License, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* the License. You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
package org.apache.logging.log4j.core.net;
18+
19+
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
20+
import static org.junit.jupiter.api.Assertions.assertNotNull;
21+
22+
import javax.net.ssl.SSLSocketFactory;
23+
import org.apache.logging.log4j.core.net.ssl.SslConfiguration;
24+
import org.apache.logging.log4j.core.net.ssl.SslKeyStoreConstants;
25+
import org.apache.logging.log4j.core.net.ssl.TrustStoreConfiguration;
26+
import org.junit.jupiter.api.Test;
27+
import org.junitpioneer.jupiter.Issue;
28+
29+
class SslSocketManagerTest {
30+
@Issue("https://github.com/apache/logging-log4j2/issues/3947")
31+
@Test
32+
void shouldNotThrowExceptionWhenConfiguringTrustStore() {
33+
TrustStoreConfiguration trustStoreConfiguration = assertDoesNotThrow(() -> new TrustStoreConfiguration(
34+
SslKeyStoreConstants.TRUSTSTORE_LOCATION,
35+
SslKeyStoreConstants::TRUSTSTORE_PWD,
36+
SslKeyStoreConstants.TRUSTSTORE_TYPE,
37+
null));
38+
SslConfiguration sslConfiguration =
39+
assertDoesNotThrow(() -> SslConfiguration.createSSLConfiguration(null, null, trustStoreConfiguration));
40+
SSLSocketFactory sslSocketFactory =
41+
assertDoesNotThrow(() -> SslSocketManager.createSslSocketFactory(sslConfiguration));
42+
assertNotNull(sslSocketFactory);
43+
}
44+
}

log4j-core/src/main/java/org/apache/logging/log4j/core/net/SslSocketManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ protected Socket createSocket(final InetSocketAddress socketAddress) throws IOEx
291291
return newSocket;
292292
}
293293

294-
private static SSLSocketFactory createSslSocketFactory(final SslConfiguration sslConf) {
294+
static SSLSocketFactory createSslSocketFactory(final SslConfiguration sslConf) {
295295
if (sslConf != null) {
296296
final SSLContext sslContext = sslConf.getSslContext();
297297
if (sslContext != null) {

0 commit comments

Comments
 (0)