From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- dev-java/commons-httpclient/Manifest | 6 + .../commons-httpclient-3.1-r1.ebuild | 63 ++++ ...pclient-3.1-SSLProtocolSocketFactory.java.patch | 369 +++++++++++++++++++++ dev-java/commons-httpclient/metadata.xml | 13 + 4 files changed, 451 insertions(+) create mode 100644 dev-java/commons-httpclient/Manifest create mode 100644 dev-java/commons-httpclient/commons-httpclient-3.1-r1.ebuild create mode 100644 dev-java/commons-httpclient/files/commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch create mode 100644 dev-java/commons-httpclient/metadata.xml (limited to 'dev-java/commons-httpclient') diff --git a/dev-java/commons-httpclient/Manifest b/dev-java/commons-httpclient/Manifest new file mode 100644 index 000000000000..f330db5f22e4 --- /dev/null +++ b/dev-java/commons-httpclient/Manifest @@ -0,0 +1,6 @@ +AUX commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch 12400 SHA256 ea7bb36773c12720b3dedbdec6b37bf5d20c07afaad5c8eb599e462808661e0a SHA512 3f20161688bcd40497747fc2e5802d12881d10a071c04a151d56b3603f81b4c14f56962b83ee72cc38d1e7a4e7e43e51426f00d06ec983feb23d8771df237c2a WHIRLPOOL 0bc3353d50be8721244933115fa7a7333e3fa2a6da8d62afd56dd93d723a575ebe0dc715c1434314cccee8e3086b08ca0909fea301d6452d42088b90f914b22f +DIST commons-httpclient-3.1-src.tar.gz 1882664 SHA256 f9a496d3418b0e15894fb351652cd4fa5ca434ebfc3ce3bb8da40defd8b097f2 SHA512 e73ceeba3f34a35c30b24a3c6cb8dfc2102ff21079a5ff9270935908cb2f707d366c2f31a53fbdafa99673cc2b82e05470a2bf40d96767c72b2ab037c0f55490 WHIRLPOOL ea95a7fd7d6dbe0dd2326b12274629eba611014e0d2461dbd75500d3f18188d30962bf132c2a7fea98e51a81aaf44cbe097f27d8b3894a5626680ea893ea51e1 +EBUILD commons-httpclient-3.1-r1.ebuild 1642 SHA256 12ffab46b8099bc8dc40ff82fa25fcee5179582a45fef077bc9eea41536e8f81 SHA512 971b5e1b591d18630f2746ae0110d96438e0f60724863728034c24247de78a4afa93fca2d9e806065c30204250d37ba76f59af9d6297e1b949c178b7e3a3aa01 WHIRLPOOL 35fe461d76198a9866f2683e8d7b54fee720b56d9b06102bb47df965a5829386041445db7ffdb9094ba7d704401abc5fff9634fd40293810b4811041527786bc +MISC ChangeLog 2685 SHA256 502e53d239f4a03d102d6c7fbcd17a77622530198f37005216c98418bbae4d0d SHA512 5afa0211f0e8e08a4ee169498855a98ab99b89618221ad6cb8675b25a764cc92fcfd21dceeb9212d43467a23f37343e605a5a45b59717faa397d5c7c4dd0717a WHIRLPOOL 1d81289b7c5b2a7c4acb6b1e0b010570ca3beeff744705d4604f8b4bbecf5ae28627e7109c172f5109cf47268775b00d0f24ca2a87590f38a3688a50583ae726 +MISC ChangeLog-2015 10832 SHA256 d2089d268976575b4eef72cb9c70c70439e55162b1eed07afc27e3de159471a0 SHA512 511fe7d0eb815c63fd6a14ebb39817fbab788a5a8c7074fd09663c264d86672966990d9e173c003df31d41b5c91720713010300933290005c0a51b06d5cad942 WHIRLPOOL b180d70dc395c04fd17ac4a2ad26e2d6e32f9fe6211f270e0e0223ed0523362618d11e8584682afd7e053fa61d4d070f4f9ce50a0260b855d99fa917caecec88 +MISC metadata.xml 456 SHA256 8be116c0ede52f26ccb58be0ee5bf7ed3d29416b42674e85e8980331d0919cd1 SHA512 27c629a07a007dd4336cd50f4ea32156ec301b02f398b008c057532b36bc0698132282e32007ee31f0dd21f3f5664b3d7c9607fe43a4dfbbffb67d3000c3a661 WHIRLPOOL efb78597d1a783d602aabd42a94270945f71cc89fbd255dcb73b921ee441cf0a4d2b052ca45ffd2a1503649038c51ea64602ba56968966a6b88f21154bd4163f diff --git a/dev-java/commons-httpclient/commons-httpclient-3.1-r1.ebuild b/dev-java/commons-httpclient/commons-httpclient-3.1-r1.ebuild new file mode 100644 index 000000000000..d72a6b096347 --- /dev/null +++ b/dev-java/commons-httpclient/commons-httpclient-3.1-r1.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +JAVA_PKG_IUSE="doc examples source test" + +inherit eutils java-pkg-2 java-ant-2 + +DESCRIPTION="The Jakarta Commons HttpClient library" +HOMEPAGE="http://hc.apache.org/" +SRC_URI="mirror://apache/httpcomponents/${PN}/source/${P}-src.tar.gz" +LICENSE="Apache-2.0" +SLOT="3" +KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +IUSE="" + +# doesn't work with IBM JDK, bug #176133 +RESTRICT="test" + +CDEPEND="dev-java/commons-logging:0 + dev-java/commons-codec:0" +RDEPEND=">=virtual/jre-1.6 + ${CDEPEND}" +DEPEND=">=virtual/jdk-1.6 + test? ( dev-java/ant-junit:0 ) + ${CDEPEND}" + +JAVA_ANT_ENCODING="ISO-8859-1" +JAVA_ANT_REWRITE_CLASSPATH="true" +EANT_GENTOO_CLASSPATH="commons-logging,commons-codec" +EANT_BUILD_TARGET="dist" +EANT_DOC_TARGET="doc" + +java_prepare() { + # patch against CVE-2012-{5783,6153}. See bug 442292. + epatch "${FILESDIR}"/"${P}-SSLProtocolSocketFactory.java.patch" + + # generated docs go into docs/api + rm -rf docs/apidocs + + # remove javadoc task from compile task + sed -i -e 's/depends="compile,doc"/depends="compile"/' build.xml || die + sed -i -e '/link/ d' build.xml || die + + mkdir lib && cd lib + java-pkg_filter-compiler jikes +} + +EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit" +EANT_TEST_TARGET="test" + +src_install() { + java-pkg_dojar dist/${PN}.jar + + # contains both html docs and javadoc in correct subdir + if use doc ; then + java-pkg_dojavadoc dist/docs/api + java-pkg_dohtml -r dist/docs/* + fi + use source && java-pkg_dosrc src/java/* + use examples && java-pkg_doexamples src/examples +} diff --git a/dev-java/commons-httpclient/files/commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch b/dev-java/commons-httpclient/files/commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch new file mode 100644 index 000000000000..45df330092ab --- /dev/null +++ b/dev-java/commons-httpclient/files/commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch @@ -0,0 +1,369 @@ +--- src/java/org/apache/commons/httpclient/protocol/SSLProtocolSocketFactory.java ++++ src/java/org/apache/commons/httpclient/protocol/SSLProtocolSocketFactory.java +@@ -31,10 +31,25 @@ + package org.apache.commons.httpclient.protocol; + + import java.io.IOException; ++import java.io.InputStream; + import java.net.InetAddress; + import java.net.Socket; + import java.net.UnknownHostException; +- ++import java.security.cert.Certificate; ++import java.security.cert.CertificateParsingException; ++import java.security.cert.X509Certificate; ++import java.util.Arrays; ++import java.util.Collection; ++import java.util.Iterator; ++import java.util.LinkedList; ++import java.util.List; ++import java.util.Locale; ++import java.util.StringTokenizer; ++import java.util.regex.Pattern; ++ ++import javax.net.ssl.SSLException; ++import javax.net.ssl.SSLSession; ++import javax.net.ssl.SSLSocket; + import javax.net.ssl.SSLSocketFactory; + + import org.apache.commons.httpclient.ConnectTimeoutException; +@@ -55,6 +70,11 @@ + */ + private static final SSLProtocolSocketFactory factory = new SSLProtocolSocketFactory(); + ++ // This is a a sorted list, if you insert new elements do it orderdered. ++ private final static String[] BAD_COUNTRY_2LDS = ++ {"ac", "co", "com", "ed", "edu", "go", "gouv", "gov", "info", ++ "lg", "ne", "net", "or", "org"}; ++ + /** + * Gets an singleton instance of the SSLProtocolSocketFactory. + * @return a SSLProtocolSocketFactory +@@ -79,12 +99,14 @@ + InetAddress clientHost, + int clientPort) + throws IOException, UnknownHostException { +- return SSLSocketFactory.getDefault().createSocket( ++ Socket sslSocket = SSLSocketFactory.getDefault().createSocket( + host, + port, + clientHost, + clientPort + ); ++ verifyHostName(host, (SSLSocket) sslSocket); ++ return sslSocket; + } + + /** +@@ -124,16 +146,19 @@ + } + int timeout = params.getConnectionTimeout(); + if (timeout == 0) { +- return createSocket(host, port, localAddress, localPort); ++ Socket sslSocket = createSocket(host, port, localAddress, localPort); ++ verifyHostName(host, (SSLSocket) sslSocket); ++ return sslSocket; + } else { + // To be eventually deprecated when migrated to Java 1.4 or above +- Socket socket = ReflectionSocketFactory.createSocket( ++ Socket sslSocket = ReflectionSocketFactory.createSocket( + "javax.net.ssl.SSLSocketFactory", host, port, localAddress, localPort, timeout); +- if (socket == null) { +- socket = ControllerThreadSocketFactory.createSocket( ++ if (sslSocket == null) { ++ sslSocket = ControllerThreadSocketFactory.createSocket( + this, host, port, localAddress, localPort, timeout); + } +- return socket; ++ verifyHostName(host, (SSLSocket) sslSocket); ++ return sslSocket; + } + } + +@@ -142,10 +167,12 @@ + */ + public Socket createSocket(String host, int port) + throws IOException, UnknownHostException { +- return SSLSocketFactory.getDefault().createSocket( ++ Socket sslSocket = SSLSocketFactory.getDefault().createSocket( + host, + port + ); ++ verifyHostName(host, (SSLSocket) sslSocket); ++ return sslSocket; + } + + /** +@@ -157,13 +184,271 @@ + int port, + boolean autoClose) + throws IOException, UnknownHostException { +- return ((SSLSocketFactory) SSLSocketFactory.getDefault()).createSocket( ++ Socket sslSocket = ((SSLSocketFactory) SSLSocketFactory.getDefault()).createSocket( + socket, + host, + port, + autoClose + ); ++ verifyHostName(host, (SSLSocket) sslSocket); ++ return sslSocket; ++ } ++ ++ ++ ++ ++ /** ++ * Verifies that the given hostname in certicifate is the hostname we are trying to connect to ++ * http://www.cvedetails.com/cve/CVE-2012-5783/ ++ * @param host ++ * @param ssl ++ * @throws IOException ++ */ ++ ++ private static void verifyHostName(String host, SSLSocket ssl) ++ throws IOException { ++ if (host == null) { ++ throw new IllegalArgumentException("host to verify was null"); ++ } ++ ++ SSLSession session = ssl.getSession(); ++ if (session == null) { ++ // In our experience this only happens under IBM 1.4.x when ++ // spurious (unrelated) certificates show up in the server's chain. ++ // Hopefully this will unearth the real problem: ++ InputStream in = ssl.getInputStream(); ++ in.available(); ++ /* ++ If you're looking at the 2 lines of code above because you're ++ running into a problem, you probably have two options: ++ ++ #1. Clean up the certificate chain that your server ++ is presenting (e.g. edit "/etc/apache2/server.crt" or ++ wherever it is your server's certificate chain is ++ defined). ++ ++ OR ++ ++ #2. Upgrade to an IBM 1.5.x or greater JVM, or switch to a ++ non-IBM JVM. ++ */ ++ ++ // If ssl.getInputStream().available() didn't cause an exception, ++ // maybe at least now the session is available? ++ session = ssl.getSession(); ++ if (session == null) { ++ // If it's still null, probably a startHandshake() will ++ // unearth the real problem. ++ ssl.startHandshake(); ++ ++ // Okay, if we still haven't managed to cause an exception, ++ // might as well go for the NPE. Or maybe we're okay now? ++ session = ssl.getSession(); ++ } ++ } ++ ++ Certificate[] certs = session.getPeerCertificates(); ++ verifyHostName(host.trim().toLowerCase(Locale.US), (X509Certificate) certs[0]); ++ } ++ /** ++ * Extract the names from the certificate and tests host matches one of them ++ * @param host ++ * @param cert ++ * @throws SSLException ++ */ ++ ++ private static void verifyHostName(final String host, X509Certificate cert) ++ throws SSLException { ++ // I'm okay with being case-insensitive when comparing the host we used ++ // to establish the socket to the hostname in the certificate. ++ // Don't trim the CN, though. ++ ++ String cn = getCN(cert); ++ String[] subjectAlts = getDNSSubjectAlts(cert); ++ verifyHostName(host, cn.toLowerCase(Locale.US), subjectAlts); ++ ++ } ++ ++ /** ++ * Extract all alternative names from a certificate. ++ * @param cert ++ * @return ++ */ ++ private static String[] getDNSSubjectAlts(X509Certificate cert) { ++ LinkedList subjectAltList = new LinkedList(); ++ Collection c = null; ++ try { ++ c = cert.getSubjectAlternativeNames(); ++ } catch (CertificateParsingException cpe) { ++ // Should probably log.debug() this? ++ cpe.printStackTrace(); ++ } ++ if (c != null) { ++ Iterator it = c.iterator(); ++ while (it.hasNext()) { ++ List list = (List) it.next(); ++ int type = ((Integer) list.get(0)).intValue(); ++ // If type is 2, then we've got a dNSName ++ if (type == 2) { ++ String s = (String) list.get(1); ++ subjectAltList.add(s); ++ } ++ } ++ } ++ if (!subjectAltList.isEmpty()) { ++ String[] subjectAlts = new String[subjectAltList.size()]; ++ subjectAltList.toArray(subjectAlts); ++ return subjectAlts; ++ } else { ++ return new String[0]; ++ } ++ ++ } ++ /** ++ * Verifies ++ * @param host ++ * @param cn ++ * @param subjectAlts ++ * @throws SSLException ++ */ ++ ++ private static void verifyHostName(final String host, String cn, String[] subjectAlts)throws SSLException{ ++ StringBuffer cnTested = new StringBuffer(); ++ ++ for (int i = 0; i < subjectAlts.length; i++){ ++ String name = subjectAlts[i]; ++ if (name != null) { ++ name = name.toLowerCase(); ++ if (verifyHostName(host, name)){ ++ return; ++ } ++ cnTested.append("/").append(name); ++ } ++ } ++ if (cn != null && verifyHostName(host, cn)){ ++ return; ++ } ++ cnTested.append("/").append(cn); ++ throw new SSLException("hostname in certificate didn't match: <" ++ + host + "> != <" + cnTested + ">"); ++ ++ } ++ ++ private static boolean verifyHostName(final String host, final String cn){ ++ if (doWildCard(cn) && !isIPAddress(host)) { ++ return matchesWildCard(cn, host); ++ } ++ return host.equalsIgnoreCase(cn); ++ } ++ private static boolean doWildCard(String cn) { ++ // Contains a wildcard ++ // wildcard in the first block ++ // not an ipaddress (ip addres must explicitily be equal) ++ // not using 2nd level common tld : ex: not for *.co.uk ++ String parts[] = cn.split("\\."); ++ return parts.length >= 3 && ++ parts[0].endsWith("*") && ++ acceptableCountryWildcard(cn) && ++ !isIPAddress(cn); + } ++ ++ ++ private static final Pattern IPV4_PATTERN = ++ Pattern.compile("^(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)(\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)){3}$"); ++ ++ private static final Pattern IPV6_STD_PATTERN = ++ Pattern.compile("^(?:[0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$"); ++ ++ private static final Pattern IPV6_HEX_COMPRESSED_PATTERN = ++ Pattern.compile("^((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)::((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)$"); ++ ++ ++ private static boolean isIPAddress(final String hostname) { ++ return hostname != null ++ && ( ++ IPV4_PATTERN.matcher(hostname).matches() ++ || IPV6_STD_PATTERN.matcher(hostname).matches() ++ || IPV6_HEX_COMPRESSED_PATTERN.matcher(hostname).matches() ++ ); ++ ++ } ++ ++ private static boolean acceptableCountryWildcard(final String cn) { ++ // The CN better have at least two dots if it wants wildcard action, ++ // but can't be [*.co.uk] or [*.co.jp] or [*.org.uk], etc... ++ // The [*.co.uk] problem is an interesting one. Should we just ++ // hope that CA's would never foolishly allow such a ++ // certificate to happen? ++ ++ String[] parts = cn.split("\\."); ++ // Only checks for 3 levels, with country code of 2 letters. ++ if (parts.length > 3 || parts[parts.length - 1].length() != 2) { ++ return true; ++ } ++ String countryCode = parts[parts.length - 2]; ++ return Arrays.binarySearch(BAD_COUNTRY_2LDS, countryCode) < 0; ++ } ++ ++ private static boolean matchesWildCard(final String cn, ++ final String hostName) { ++ String parts[] = cn.split("\\."); ++ boolean match = false; ++ String firstpart = parts[0]; ++ if (firstpart.length() > 1) { ++ // server∗ ++ // e.g. server ++ String prefix = firstpart.substring(0, firstpart.length() - 1); ++ // skipwildcard part from cn ++ String suffix = cn.substring(firstpart.length()); ++ // skip wildcard part from host ++ String hostSuffix = hostName.substring(prefix.length()); ++ match = hostName.startsWith(prefix) && hostSuffix.endsWith(suffix); ++ } else { ++ match = hostName.endsWith(cn.substring(1)); ++ } ++ if (match) { ++ // I f we're in strict mode , ++ // [ ∗.foo.com] is not allowed to match [a.b.foo.com] ++ match = countDots(hostName) == countDots(cn); ++ } ++ return match; ++ } ++ ++ private static int countDots(final String data) { ++ int dots = 0; ++ for (int i = 0; i < data.length(); i++) { ++ if (data.charAt(i) == '.') { ++ dots += 1; ++ } ++ } ++ return dots; ++ } ++ ++ private static String getCN(X509Certificate cert) { ++ // Note: toString() seems to do a better job than getName() ++ // ++ // For example, getName() gives me this: ++ // 1.2.840.113549.1.9.1=#16166a756c6975736461766965734063756362632e636f6d ++ // ++ // whereas toString() gives me this: ++ // EMAILADDRESS=juliusdavies@cucbc.com ++ String subjectPrincipal = cert.getSubjectX500Principal().toString(); ++ ++ return getCN(subjectPrincipal); ++ ++ } ++ private static String getCN(String subjectPrincipal) { ++ StringTokenizer st = new StringTokenizer(subjectPrincipal, ","); ++ while(st.hasMoreTokens()) { ++ String tok = st.nextToken().trim(); ++ if (tok.length() > 3) { ++ if (tok.substring(0, 3).equalsIgnoreCase("CN=")) { ++ return tok.substring(3); ++ } ++ } ++ } ++ return null; ++ } + + /** + * All instances of SSLProtocolSocketFactory are the same. diff --git a/dev-java/commons-httpclient/metadata.xml b/dev-java/commons-httpclient/metadata.xml new file mode 100644 index 000000000000..fdd7102a2fc7 --- /dev/null +++ b/dev-java/commons-httpclient/metadata.xml @@ -0,0 +1,13 @@ + + + + + java@gentoo.org + Java + + + The Jakarta Commons HttpClient provides an efficient, up-to-date, + and feature-rich package implementing the client side of the most + recent HTTP standards and recommendations. + + -- cgit v1.2.3