Skip to content

Commit 50a0e80

Browse files
CPVM: use X509ExtendedTrustManager (apache#5419)
1 parent 7d5393d commit 50a0e80

File tree

1 file changed

+23
-9
lines changed

1 file changed

+23
-9
lines changed

services/console-proxy/server/src/main/java/com/cloud/consoleproxy/websocket/WebSocketReverseProxy.java

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,14 @@
2525
import org.java_websocket.protocols.Protocol;
2626

2727
import javax.net.ssl.SSLContext;
28+
import javax.net.ssl.SSLEngine;
2829
import javax.net.ssl.SSLSocketFactory;
2930
import javax.net.ssl.TrustManager;
30-
import javax.net.ssl.X509TrustManager;
31+
import javax.net.ssl.X509ExtendedTrustManager;
3132
import java.io.IOException;
33+
import java.net.Socket;
3234
import java.net.URI;
3335
import java.nio.ByteBuffer;
34-
import java.security.cert.CertificateException;
3536
import java.security.cert.X509Certificate;
3637
import java.util.Collections;
3738

@@ -54,15 +55,28 @@ public class WebSocketReverseProxy extends WebSocketClient {
5455
private Session remoteSession;
5556

5657
private void acceptAllCerts() {
57-
TrustManager[] trustAllCerts = new TrustManager[]{new X509TrustManager() {
58-
public java.security.cert.X509Certificate[] getAcceptedIssuers() {
59-
return new java.security.cert.X509Certificate[]{};
58+
TrustManager[] trustAllCerts = new TrustManager[]{new X509ExtendedTrustManager() {
59+
@Override
60+
public void checkClientTrusted (X509Certificate [] chain, String authType, Socket socket) {
6061
}
61-
public void checkClientTrusted(X509Certificate[] chain,
62-
String authType) throws CertificateException {
62+
@Override
63+
public void checkServerTrusted (X509Certificate [] chain, String authType, Socket socket) {
6364
}
64-
public void checkServerTrusted(X509Certificate[] chain,
65-
String authType) throws CertificateException {
65+
@Override
66+
public void checkClientTrusted (X509Certificate [] chain, String authType, SSLEngine engine) {
67+
}
68+
@Override
69+
public void checkServerTrusted (X509Certificate [] chain, String authType, SSLEngine engine) {
70+
}
71+
@Override
72+
public java.security.cert.X509Certificate [] getAcceptedIssuers () {
73+
return null;
74+
}
75+
@Override
76+
public void checkClientTrusted (X509Certificate [] certs, String authType) {
77+
}
78+
@Override
79+
public void checkServerTrusted (X509Certificate [] certs, String authType) {
6680
}
6781
}};
6882
SSLContext sc;

0 commit comments

Comments
 (0)