Skip to content

Commit 4527935

Browse files
BARCO\FIRDUCyrille Le Clerc
BARCO\FIRDU
authored and
Cyrille Le Clerc
committed
Use user-provided SSLContext to create secure socket
1 parent 18f5923 commit 4527935

File tree

1 file changed

+15
-1
lines changed

1 file changed

+15
-1
lines changed

src/main/java/com/cloudbees/syslog/sender/TcpSyslogMessageSender.java

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import javax.annotation.Nullable;
2424
import javax.annotation.concurrent.ThreadSafe;
2525
import javax.net.SocketFactory;
26+
import javax.net.ssl.SSLContext;
2627
import javax.net.ssl.SSLSession;
2728
import javax.net.ssl.SSLSocket;
2829
import javax.net.ssl.SSLSocketFactory;
@@ -68,6 +69,7 @@ public class TcpSyslogMessageSender extends AbstractSyslogMessageSender implemen
6869
private Writer writer;
6970
private int socketConnectTimeoutInMillis = SETTING_SOCKET_CONNECT_TIMEOUT_IN_MILLIS_DEFAULT_VALUE;
7071
private boolean ssl;
72+
private SSLContext sslContext;
7173
/**
7274
* Number of retries to send a message before throwing an exception.
7375
*/
@@ -144,7 +146,11 @@ private synchronized void ensureSyslogServerConnection() throws IOException {
144146
writer = null;
145147
try {
146148
if (ssl) {
147-
socket = SSLSocketFactory.getDefault().createSocket();
149+
if(sslContext == null) {
150+
socket = SSLSocketFactory.getDefault().createSocket();
151+
} else {
152+
socket = sslContext.getSocketFactory().createSocket();
153+
}
148154
} else {
149155
socket = SocketFactory.getDefault().createSocket();
150156
}
@@ -226,6 +232,14 @@ public boolean isSsl() {
226232
public void setSsl(boolean ssl) {
227233
this.ssl = ssl;
228234
}
235+
236+
public synchronized void setSSLContext(SSLContext sslContext) {
237+
this.sslContext = sslContext;
238+
}
239+
240+
public synchronized SSLContext getSSLContext() {
241+
return this.sslContext;
242+
}
229243

230244
public int getSocketConnectTimeoutInMillis() {
231245
return socketConnectTimeoutInMillis;

0 commit comments

Comments
 (0)