From 6cf5a479716c48ebef547c33f684b46de848f9a6 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sat, 27 Aug 2016 11:43:33 -0400 Subject: [PATCH] re-added the check for https that was accidentally removed --- .../utils/URLConnectionFactory.java | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/URLConnectionFactory.java b/dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/URLConnectionFactory.java index ebba4f536..1d0f9db2f 100644 --- a/dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/URLConnectionFactory.java +++ b/dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/URLConnectionFactory.java @@ -28,6 +28,7 @@ import java.net.PasswordAuthentication; import java.net.Proxy; import java.net.SocketAddress; import java.net.URL; +import java.net.URLConnection; import java.security.KeyManagementException; import java.security.NoSuchAlgorithmException; import javax.net.ssl.HttpsURLConnection; @@ -188,15 +189,17 @@ public final class URLConnectionFactory { * @param url the URL * @param conn the connection */ - private static void configureTLS(URL url, HttpURLConnection conn) { - try { - final HttpsURLConnection secCon = (HttpsURLConnection) conn; - final SSLSocketFactoryEx factory = new SSLSocketFactoryEx(); - secCon.setSSLSocketFactory(factory); - } catch (NoSuchAlgorithmException ex) { - LOGGER.debug("Unsupported algorithm in SSLSocketFactoryEx", ex); - } catch (KeyManagementException ex) { - LOGGER.debug("Key mnagement eception in SSLSocketFactoryEx", ex); + private static void configureTLS(URL url, URLConnection conn) { + if ("https".equals(url.getProtocol())) { + try { + final HttpsURLConnection secCon = (HttpsURLConnection) conn; + final SSLSocketFactoryEx factory = new SSLSocketFactoryEx(); + secCon.setSSLSocketFactory(factory); + } catch (NoSuchAlgorithmException ex) { + LOGGER.debug("Unsupported algorithm in SSLSocketFactoryEx", ex); + } catch (KeyManagementException ex) { + LOGGER.debug("Key mnagement eception in SSLSocketFactoryEx", ex); + } } } }