Skip to content

[JENKINS-75409] SSLContext typo fix and consider it in pingSuccessful method #786

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
timja merged 5 commits into from
Mar 17, 2025
Merged

[JENKINS-75409] SSLContext typo fix and consider it in pingSuccessful method #786

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
31f3427
TLS Certificate passing debug
gbhat618 Mar 11, 2025
d3a13e3
consider ssl context in ping method
gbhat618 Mar 13, 2025
6ea3005
Update src/main/java/hudson/remoting/Engine.java
gbhat618 Mar 17, 2025
3d802b1
Merge branch 'master' into self-signed-tls-cert-param-debug
gbhat618 Mar 17, 2025
765cd6d
Trigger CI: empty commit
gbhat618 Mar 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/main/java/hudson/remoting/Engine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
import java.util.logging.Logger;
import java.util.stream.Collectors;
import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.HttpsURLConnection;
import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSocketFactory;
Expand Down Expand Up @@ -747,6 +748,7 @@ public void closeRead() throws IOException {
}
}
hudsonUrl = candidateUrls.get(0);
SSLContext sslContext = getSSLContext(candidateCertificates, disableHttpsCertValidation);
String wsUrl = hudsonUrl.toString().replaceFirst("^http", "ws");
WebSocketContainer container = ContainerProvider.getWebSocketContainer();
if (container instanceof ClientManager) {
Expand Down Expand Up @@ -777,7 +779,6 @@ public void closeRead() throws IOException {
}
}

SSLContext sslContext = getSSLContext(candidateCertificates, disableHttpsCertValidation);
if (sslContext != null) {
SslEngineConfigurator sslEngineConfigurator = new SslEngineConfigurator(sslContext);
if (hostnameVerifier != null) {
Expand All @@ -786,7 +787,7 @@ public void closeRead() throws IOException {
client.getProperties().put(ClientProperties.SSL_ENGINE_CONFIGURATOR, sslEngineConfigurator);
}
}
if (!succeedsWithRetries(this::pingSuccessful)) {
if (!succeedsWithRetries(() -> this.pingSuccessful(sslContext))) {
return;
}
if (!succeedsWithRetries(() -> {
Expand Down Expand Up @@ -842,12 +843,15 @@ private boolean succeedsWithRetries(java.util.concurrent.Callable<Boolean> condi
@SuppressFBWarnings(
value = {"URLCONNECTION_SSRF_FD"},
justification = "url is provided by the user, and we are trying to connect to it")
private Boolean pingSuccessful() throws MalformedURLException {
private Boolean pingSuccessful(SSLContext sslContext) throws MalformedURLException {
// Unlike JnlpAgentEndpointResolver, we do not use $jenkins/tcpSlaveAgentListener/, as that will be
// a 404 if the TCP port is disabled.
URL ping = new URL(hudsonUrl, "login");
try {
HttpURLConnection conn = (HttpURLConnection) ping.openConnection();
if (conn instanceof HttpsURLConnection httpsConn && sslContext != null) {
httpsConn.setSSLSocketFactory(sslContext.getSocketFactory());
}
int status = conn.getResponseCode();
conn.disconnect();
if (status == 200) {
Expand Down Expand Up @@ -1273,6 +1277,7 @@ private static SSLContext getSSLContext(List<X509Certificate> x509Certificates,
SSLContext ctx = SSLContext.getInstance("TLS");
// now we have our custom socket factory
ctx.init(null, trustManagerFactory.getTrustManagers(), null);
sslContext = ctx;
}
return sslContext;
}
Expand Down
Loading