github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-03-21 08:39:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

update for issue #523 - removed specific algorithm list to support differences in JDKs (ibm); just setting the protocol resolves the issue

Browse Source
This commit is contained in:
Jeremy Long
2016-08-27 07:26:59 -04:00
parent 7091e10795
commit 56da53c700
2 changed files with 10 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/SSLSocketFactoryEx.java
View File

@@ -78,7 +78,7 @@ public class SSLSocketFactoryEx extends SSLSocketFactory {
*/ */
@Override @Override
public String[] getDefaultCipherSuites() { public String[] getDefaultCipherSuites() {
return Arrays.copyOf(ciphers, ciphers.length); return sslCtxt.getSocketFactory().getDefaultCipherSuites();
} }
/** /**
@@ -88,7 +88,7 @@ public class SSLSocketFactoryEx extends SSLSocketFactory {
*/ */
@Override @Override
public String[] getSupportedCipherSuites() { public String[] getSupportedCipherSuites() {
return Arrays.copyOf(ciphers, ciphers.length); return sslCtxt.getSocketFactory().getSupportedCipherSuites();
} }
/** /**
@@ -125,7 +125,6 @@ public class SSLSocketFactoryEx extends SSLSocketFactory {
final SSLSocket ss = (SSLSocket) factory.createSocket(s, host, port, autoClose); final SSLSocket ss = (SSLSocket) factory.createSocket(s, host, port, autoClose);
ss.setEnabledProtocols(protocols); ss.setEnabledProtocols(protocols);
ss.setEnabledCipherSuites(ciphers);
return ss; return ss;
} }
@@ -146,7 +145,6 @@ public class SSLSocketFactoryEx extends SSLSocketFactory {
final SSLSocket ss = (SSLSocket) factory.createSocket(address, port, localAddress, localPort); final SSLSocket ss = (SSLSocket) factory.createSocket(address, port, localAddress, localPort);
ss.setEnabledProtocols(protocols); ss.setEnabledProtocols(protocols);
ss.setEnabledCipherSuites(ciphers);
return ss; return ss;
} }
@@ -167,7 +165,6 @@ public class SSLSocketFactoryEx extends SSLSocketFactory {
final SSLSocket ss = (SSLSocket) factory.createSocket(host, port, localHost, localPort); final SSLSocket ss = (SSLSocket) factory.createSocket(host, port, localHost, localPort);
ss.setEnabledProtocols(protocols); ss.setEnabledProtocols(protocols);
ss.setEnabledCipherSuites(ciphers);
return ss; return ss;
} }
@@ -186,7 +183,6 @@ public class SSLSocketFactoryEx extends SSLSocketFactory {
final SSLSocket ss = (SSLSocket) factory.createSocket(host, port); final SSLSocket ss = (SSLSocket) factory.createSocket(host, port);
ss.setEnabledProtocols(protocols); ss.setEnabledProtocols(protocols);
ss.setEnabledCipherSuites(ciphers);
return ss; return ss;
} }
@@ -205,7 +201,6 @@ public class SSLSocketFactoryEx extends SSLSocketFactory {
final SSLSocket ss = (SSLSocket) factory.createSocket(host, port); final SSLSocket ss = (SSLSocket) factory.createSocket(host, port);
ss.setEnabledProtocols(protocols); ss.setEnabledProtocols(protocols);
ss.setEnabledCipherSuites(ciphers);
return ss; return ss;
} }
@@ -226,7 +221,6 @@ public class SSLSocketFactoryEx extends SSLSocketFactory {
sslCtxt.init(km, tm, random); sslCtxt.init(km, tm, random);
protocols = getProtocolList(); protocols = getProtocolList();
ciphers = getCipherList();
} }
/** /**
@@ -240,9 +234,7 @@ public class SSLSocketFactoryEx extends SSLSocketFactory {
private void initSSLSocketFactoryEx(SSLContext ctx) private void initSSLSocketFactoryEx(SSLContext ctx)
throws NoSuchAlgorithmException, KeyManagementException { throws NoSuchAlgorithmException, KeyManagementException {
sslCtxt = ctx; sslCtxt = ctx;
protocols = getProtocolList(); protocols = getProtocolList();
ciphers = getCipherList();
} }
/** /**
@@ -286,98 +278,10 @@ public class SSLSocketFactoryEx extends SSLSocketFactory {
return aa.toArray(new String[0]); return aa.toArray(new String[0]);
} }
/**
* Returns the cipher list.
*
* @return the cipher list
*/
protected String[] getCipherList() {
final String[] preferredCiphers = {
// *_CHACHA20_POLY1305 are 3x to 4x faster than existing cipher suites.
// http://googleonlinesecurity.blogspot.com/2014/04/speeding-up-and-strengthening-https.html
// Use them if available. Normative names can be found at (TLS spec depends on IPSec spec):
// http://tools.ietf.org/html/draft-nir-ipsecme-chacha20-poly1305-01
// http://tools.ietf.org/html/draft-mavrogiannopoulos-chacha-tls-02
"TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305",
"TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305",
"TLS_ECDHE_ECDSA_WITH_CHACHA20_SHA",
"TLS_ECDHE_RSA_WITH_CHACHA20_SHA",
"TLS_DHE_RSA_WITH_CHACHA20_POLY1305",
"TLS_RSA_WITH_CHACHA20_POLY1305",
"TLS_DHE_RSA_WITH_CHACHA20_SHA",
"TLS_RSA_WITH_CHACHA20_SHA",
// Done with bleeding edge, back to TLS v1.2 and below
"TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384",
"TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384",
"TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256",
"TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256",
"TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384",
"TLS_DHE_DSS_WITH_AES_256_GCM_SHA384",
"TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
"TLS_DHE_DSS_WITH_AES_128_GCM_SHA256",
// TLS v1.0 (with some SSLv3 interop)
"TLS_DHE_RSA_WITH_AES_256_CBC_SHA384",
"TLS_DHE_DSS_WITH_AES_256_CBC_SHA256",
"TLS_DHE_RSA_WITH_AES_128_CBC_SHA",
"TLS_DHE_DSS_WITH_AES_128_CBC_SHA",
"TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA",
"TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA",
"SSL_DH_RSA_WITH_3DES_EDE_CBC_SHA",
"SSL_DH_DSS_WITH_3DES_EDE_CBC_SHA",
// RSA key transport sucks, but they are needed as a fallback.
// For example, microsoft.com fails under all versions of TLS
// if they are not included. If only TLS 1.0 is available at
// the client, then google.com will fail too. TLS v1.3 is
// trying to deprecate them, so it will be interesteng to see
// what happens.
"TLS_RSA_WITH_AES_256_CBC_SHA256",
"TLS_RSA_WITH_AES_256_CBC_SHA",
"TLS_RSA_WITH_AES_128_CBC_SHA256",
"TLS_RSA_WITH_AES_128_CBC_SHA",
};
String[] availableCiphers;
try {
final SSLSocketFactory factory = sslCtxt.getSocketFactory();
availableCiphers = factory.getSupportedCipherSuites();
Arrays.sort(availableCiphers);
} catch (Exception e) {
LOGGER.debug("Error retrieving ciphers", e);
return new String[]{
"TLS_DHE_DSS_WITH_AES_128_CBC_SHA",
"TLS_DHE_DSS_WITH_AES_256_CBC_SHA",
"TLS_DHE_RSA_WITH_AES_128_CBC_SHA",
"TLS_DHE_RSA_WITH_AES_256_CBC_SHA",
"TLS_RSA_WITH_AES_256_CBC_SHA256",
"TLS_RSA_WITH_AES_256_CBC_SHA",
"TLS_RSA_WITH_AES_128_CBC_SHA256",
"TLS_RSA_WITH_AES_128_CBC_SHA",
"TLS_EMPTY_RENEGOTIATION_INFO_SCSV",
};
}
final List<String> aa = new ArrayList<String>();
for (String preferredCipher : preferredCiphers) {
final int idx = Arrays.binarySearch(availableCiphers, preferredCipher);
if (idx >= 0) {
aa.add(preferredCipher);
}
}
aa.add("TLS_EMPTY_RENEGOTIATION_INFO_SCSV");
return aa.toArray(new String[0]);
}
/** /**
* The SSL context. * The SSL context.
*/ */
private SSLContext sslCtxt; private SSLContext sslCtxt;
/**
* The cipher suites.
*/
private String[] ciphers;
/** /**
* The protocols. * The protocols.
*/ */

20
dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/URLConnectionFactory.java
View File

@@ -31,8 +31,6 @@ import java.net.URL;
import java.security.KeyManagementException; import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.HttpsURLConnection;
import org.apache.commons.lang3.JavaVersion;
import org.apache.commons.lang3.SystemUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -191,16 +189,14 @@ public final class URLConnectionFactory {
* @param conn the connection * @param conn the connection
*/ */
private static void configureTLS(URL url, HttpURLConnection conn) { private static void configureTLS(URL url, HttpURLConnection conn) {
if ("https".equals(url.getProtocol()) && !SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_8)) { try {
try { final HttpsURLConnection secCon = (HttpsURLConnection) conn;
final HttpsURLConnection secCon = (HttpsURLConnection) conn; final SSLSocketFactoryEx factory = new SSLSocketFactoryEx();
final SSLSocketFactoryEx factory = new SSLSocketFactoryEx(); secCon.setSSLSocketFactory(factory);
secCon.setSSLSocketFactory(factory); } catch (NoSuchAlgorithmException ex) {
} catch (NoSuchAlgorithmException ex) { LOGGER.debug("Unsupported algorithm in SSLSocketFactoryEx", ex);
LOGGER.debug("Unsupported algorithm in SSLSocketFactoryEx", ex); } catch (KeyManagementException ex) {
} catch (KeyManagementException ex) { LOGGER.debug("Key mnagement eception in SSLSocketFactoryEx", ex);
LOGGER.debug("Key mnagement eception in SSLSocketFactoryEx", ex);
}
} }
} }
} }