jbossweb-commits July 2014

jbossweb-commits@lists.jboss.org

1 participants
14 discussions

JBossWeb SVN: r2474 - in branches: 7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/openssl and 1 other directory.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2014-07-10 10:03:20 -0400 (Thu, 10 Jul 2014) New Revision: 2474 Modified: branches/7.4.x/src/main/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java Log: BZ1117821: Add sync to deal with parallel initialization of more than one SSL connector. Patch by Emmanuel Hugonnet. Modified: branches/7.4.x/src/main/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java =================================================================== --- branches/7.4.x/src/main/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java 2014-07-03 12:20:03 UTC (rev 2473) +++ branches/7.4.x/src/main/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java 2014-07-10 14:03:20 UTC (rev 2474) @@ -30,6 +30,7 @@ import java.util.List; import java.util.Map; import java.util.Set; + import org.apache.tomcat.util.net.jsse.JSSELogger; /** @@ -598,8 +599,10 @@ } static LinkedHashSet<Ciphers> parse(String expression) { - if (!initialized) { - init(); + synchronized (OpenSSLCipherConfigurationParser.class) { + if (!initialized) { + init(); + } } String[] elements = expression.split(SEPARATOR); LinkedHashSet<Ciphers> ciphers = new LinkedHashSet<Ciphers>(); Modified: branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java =================================================================== --- branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java 2014-07-03 12:20:03 UTC (rev 2473) +++ branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java 2014-07-10 14:03:20 UTC (rev 2474) @@ -599,8 +599,10 @@ } static LinkedHashSet<Ciphers> parse(String expression) { - if (!initialized) { - init(); + synchronized (OpenSSLCipherConfigurationParser.class) { + if (!initialized) { + init(); + } } String[] elements = expression.split(SEPARATOR); LinkedHashSet<Ciphers> ciphers = new LinkedHashSet<Ciphers>();

9 years, 10 months

1
0
0 / 0

JBossWeb SVN: r2473 - branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/openssl.

by jbossweb-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-07-03 08:20:03 -0400 (Thu, 03 Jul 2014) New Revision: 2473 Modified: branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/openssl/Ciphers.java Log: Typo submitted by Radim Hatlapatka. Modified: branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/openssl/Ciphers.java =================================================================== --- branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/openssl/Ciphers.java 2014-07-03 12:14:04 UTC (rev 2472) +++ branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/openssl/Ciphers.java 2014-07-03 12:20:03 UTC (rev 2473) @@ -52,7 +52,7 @@ 0, 0), // Cipher 03 - SL_RSA_EXPORT_WITH_RC4_40_MD5("EXP-RC4-MD5", + SSL_RSA_EXPORT_WITH_RC4_40_MD5("EXP-RC4-MD5", KeyExchange.RSA, Authentication.RSA, Encryption.RC4,

9 years, 10 months

1
0
0 / 0

JBossWeb SVN: r2472 - branches/7.4.x/src/main/java/org/apache/tomcat/util/net/jsse/openssl.

by jbossweb-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-07-03 08:14:04 -0400 (Thu, 03 Jul 2014) New Revision: 2472 Modified: branches/7.4.x/src/main/java/org/apache/tomcat/util/net/jsse/openssl/Ciphers.java Log: Typo submitted by Radim Hatlapatka. Modified: branches/7.4.x/src/main/java/org/apache/tomcat/util/net/jsse/openssl/Ciphers.java =================================================================== --- branches/7.4.x/src/main/java/org/apache/tomcat/util/net/jsse/openssl/Ciphers.java 2014-07-02 11:09:31 UTC (rev 2471) +++ branches/7.4.x/src/main/java/org/apache/tomcat/util/net/jsse/openssl/Ciphers.java 2014-07-03 12:14:04 UTC (rev 2472) @@ -52,7 +52,7 @@ 0, 0), // Cipher 03 - SL_RSA_EXPORT_WITH_RC4_40_MD5("EXP-RC4-MD5", + SSL_RSA_EXPORT_WITH_RC4_40_MD5("EXP-RC4-MD5", KeyExchange.RSA, Authentication.RSA, Encryption.RC4,

9 years, 10 months

1
0
0 / 0

JBossWeb SVN: r2471 - branches/7.5.x/src/main/java/org/apache/catalina/valves.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2014-07-02 07:09:31 -0400 (Wed, 02 Jul 2014) New Revision: 2471 Modified: branches/7.5.x/src/main/java/org/apache/catalina/valves/SSLValve.java Log: EAP6-228: Add SSLValve header configuration. Modified: branches/7.5.x/src/main/java/org/apache/catalina/valves/SSLValve.java =================================================================== --- branches/7.5.x/src/main/java/org/apache/catalina/valves/SSLValve.java 2014-06-30 14:14:27 UTC (rev 2470) +++ branches/7.5.x/src/main/java/org/apache/catalina/valves/SSLValve.java 2014-07-02 11:09:31 UTC (rev 2471) @@ -28,7 +28,6 @@ import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; import org.apache.tomcat.util.buf.EncodingToCharset; -import org.jboss.logging.Logger; import org.jboss.web.CatalinaLogger; /** @@ -62,6 +61,11 @@ */ public class SSLValve extends ValveBase { + protected String sslClientCertHeader = "ssl_client_cert"; + protected String sslCipherHeader = "ssl_cipher"; + protected String sslSessionIdHeader = "ssl_session_id"; + protected String sslCipherUserKeySizeHeader = "ssl_cipher_usekeysize"; + //------------------------------------------------------ Constructor public SSLValve() { } @@ -82,7 +86,7 @@ public void invoke(Request request, Response response) throws IOException, ServletException { /* mod_header converts the '\n' into ' ' so we have to rebuild the client certificate */ - String strcert0 = mygetHeader(request, "ssl_client_cert"); + String strcert0 = mygetHeader(request, sslClientCertHeader); if (strcert0 != null && strcert0.length()>28) { String strcert1 = strcert0.replace(' ', '\n'); String strcert2 = strcert1.substring(28, strcert1.length()-26); @@ -110,19 +114,51 @@ } request.setAttribute(Globals.CERTIFICATES_ATTR, jsseCerts); } - strcert0 = mygetHeader(request, "ssl_cipher"); + strcert0 = mygetHeader(request, sslCipherHeader); if (strcert0 != null) { request.setAttribute(Globals.CIPHER_SUITE_ATTR, strcert0); } - strcert0 = mygetHeader(request, "ssl_session_id"); + strcert0 = mygetHeader(request, sslSessionIdHeader); if (strcert0 != null) { request.setAttribute(Globals.SSL_SESSION_ID_ATTR, strcert0); } - strcert0 = mygetHeader(request, "ssl_cipher_usekeysize"); + strcert0 = mygetHeader(request, sslCipherUserKeySizeHeader); if (strcert0 != null) { request.setAttribute(Globals.KEY_SIZE_ATTR, Integer.valueOf(strcert0)); } getNext().invoke(request, response); } + public String getSslClientCertHeader() { + return sslClientCertHeader; + } + + public void setSslClientCertHeader(String sslClientCertHeader) { + this.sslClientCertHeader = sslClientCertHeader; + } + + public String getSslCipherHeader() { + return sslCipherHeader; + } + + public void setSslCipherHeader(String sslCipherHeader) { + this.sslCipherHeader = sslCipherHeader; + } + + public String getSslSessionIdHeader() { + return sslSessionIdHeader; + } + + public void setSslSessionIdHeader(String sslSessionIdHeader) { + this.sslSessionIdHeader = sslSessionIdHeader; + } + + public String getSslCipherUserKeySizeHeader() { + return sslCipherUserKeySizeHeader; + } + + public void setSslCipherUserKeySizeHeader(String sslCipherUserKeySizeHeader) { + this.sslCipherUserKeySizeHeader = sslCipherUserKeySizeHeader; + } + }

9 years, 10 months

1
0
0 / 0

← Newer
1
2
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbossweb-commits July 2014