Accepting request 845452 from Java:packages
OBS-URL: https://build.opensuse.org/request/show/845452 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache-commons-httpclient?expand=0&rev=11factory
Dominique Leuenberger
3 years ago
committed by
Git OBS Bridge
commit
b5ea44bcf2
@ -0,0 +1,92 @@
|
||||
From 1bef0d6f6e8f2f68e996737d7be598613e2060b2 Mon Sep 17 00:00:00 2001
|
||||
From: Fabio Valentini <decathorpe@gmail.com>
|
||||
Date: Sat, 18 Jul 2020 19:48:08 +0200
|
||||
Subject: [PATCH 4/6] CVE-2014-3577
|
||||
|
||||
---
|
||||
.../protocol/SSLProtocolSocketFactory.java | 57 ++++++++++++-------
|
||||
1 file changed, 37 insertions(+), 20 deletions(-)
|
||||
|
||||
diff --git a/src/java/org/apache/commons/httpclient/protocol/SSLProtocolSocketFactory.java b/src/java/org/apache/commons/httpclient/protocol/SSLProtocolSocketFactory.java
|
||||
index fa0acc7..e6ce513 100644
|
||||
--- a/src/java/org/apache/commons/httpclient/protocol/SSLProtocolSocketFactory.java
|
||||
+++ b/src/java/org/apache/commons/httpclient/protocol/SSLProtocolSocketFactory.java
|
||||
@@ -44,9 +44,15 @@ import java.util.Iterator;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
-import java.util.StringTokenizer;
|
||||
+import java.util.NoSuchElementException;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
+import javax.naming.InvalidNameException;
|
||||
+import javax.naming.NamingException;
|
||||
+import javax.naming.directory.Attribute;
|
||||
+import javax.naming.directory.Attributes;
|
||||
+import javax.naming.ldap.LdapName;
|
||||
+import javax.naming.ldap.Rdn;
|
||||
import javax.net.ssl.SSLException;
|
||||
import javax.net.ssl.SSLSession;
|
||||
import javax.net.ssl.SSLSocket;
|
||||
@@ -424,28 +430,39 @@ public class SSLProtocolSocketFactory implements SecureProtocolSocketFactory {
|
||||
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(final X509Certificate cert) {
|
||||
+ final String subjectPrincipal = cert.getSubjectX500Principal().toString();
|
||||
+ try {
|
||||
+ return extractCN(subjectPrincipal);
|
||||
+ } catch (SSLException ex) {
|
||||
+ return null;
|
||||
+ }
|
||||
}
|
||||
- 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);
|
||||
+
|
||||
+ private static String extractCN(final String subjectPrincipal) throws SSLException {
|
||||
+ if (subjectPrincipal == null) {
|
||||
+ return null;
|
||||
+ }
|
||||
+ try {
|
||||
+ final LdapName subjectDN = new LdapName(subjectPrincipal);
|
||||
+ final List<Rdn> rdns = subjectDN.getRdns();
|
||||
+ for (int i = rdns.size() - 1; i >= 0; i--) {
|
||||
+ final Rdn rds = rdns.get(i);
|
||||
+ final Attributes attributes = rds.toAttributes();
|
||||
+ final Attribute cn = attributes.get("cn");
|
||||
+ if (cn != null) {
|
||||
+ try {
|
||||
+ final Object value = cn.get();
|
||||
+ if (value != null) {
|
||||
+ return value.toString();
|
||||
+ }
|
||||
+ } catch (NoSuchElementException ignore) {
|
||||
+ } catch (NamingException ignore) {
|
||||
+ }
|
||||
}
|
||||
}
|
||||
+ } catch (InvalidNameException e) {
|
||||
+ throw new SSLException(subjectPrincipal + " is not a valid X500 distinguished name");
|
||||
}
|
||||
return null;
|
||||
}
|
||||
--
|
||||
2.26.2
|
||||
|
||||
@ -0,0 +1,35 @@
|
||||
From a42239d4dbf88dc577061203c234a91d847a8615 Mon Sep 17 00:00:00 2001
|
||||
From: Fabio Valentini <decathorpe@gmail.com>
|
||||
Date: Sat, 18 Jul 2020 19:48:18 +0200
|
||||
Subject: [PATCH 5/6] CVE-2015-5262
|
||||
|
||||
---
|
||||
.../httpclient/protocol/SSLProtocolSocketFactory.java | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/java/org/apache/commons/httpclient/protocol/SSLProtocolSocketFactory.java b/src/java/org/apache/commons/httpclient/protocol/SSLProtocolSocketFactory.java
|
||||
index e6ce513..b7550a2 100644
|
||||
--- a/src/java/org/apache/commons/httpclient/protocol/SSLProtocolSocketFactory.java
|
||||
+++ b/src/java/org/apache/commons/httpclient/protocol/SSLProtocolSocketFactory.java
|
||||
@@ -152,7 +152,9 @@ public class SSLProtocolSocketFactory implements SecureProtocolSocketFactory {
|
||||
}
|
||||
int timeout = params.getConnectionTimeout();
|
||||
if (timeout == 0) {
|
||||
- Socket sslSocket = createSocket(host, port, localAddress, localPort);
|
||||
+ Socket sslSocket = SSLSocketFactory.getDefault().createSocket(
|
||||
+ host, port, localAddress, localPort);
|
||||
+ sslSocket.setSoTimeout(params.getSoTimeout());
|
||||
verifyHostName(host, (SSLSocket) sslSocket);
|
||||
return sslSocket;
|
||||
} else {
|
||||
@@ -163,6 +165,7 @@ public class SSLProtocolSocketFactory implements SecureProtocolSocketFactory {
|
||||
sslSocket = ControllerThreadSocketFactory.createSocket(
|
||||
this, host, port, localAddress, localPort, timeout);
|
||||
}
|
||||
+ sslSocket.setSoTimeout(params.getSoTimeout());
|
||||
verifyHostName(host, (SSLSocket) sslSocket);
|
||||
return sslSocket;
|
||||
}
|
||||
--
|
||||
2.26.2
|
||||
|
||||
Loading…
Reference in New Issue