git commit: [CXF-6087] - Add a way to exclude (multiple) SSL/TLS protocols in the HTTPJ namespace
Repository: cxf
Updated Branches:
refs/heads/master 79916d34d - 1701e6c8d
[CXF-6087] - Add a way to exclude (multiple) SSL/TLS protocols in the HTTPJ
namespace
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1701e6c8
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1701e6c8
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1701e6c8
Branch: refs/heads/master
Commit: 1701e6c8d4e794f25d69781e3f69357723ad7fcf
Parents: 79916d3
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Wed Nov 5 17:12:31 2014 +
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Nov 5 17:12:47 2014 +
--
.../configuration/jsse/TLSServerParameters.java | 22 +++
.../jsse/TLSServerParametersConfig.java | 3 +
.../schemas/configuration/security.xsd | 19 ++
.../http_jetty/JettyHTTPServerEngine.java | 7 +-
.../osgi/HTTPJettyTransportActivator.java | 5 ++
...ttyHTTPServerEngineBeanDefinitionParser.java | 5 +-
.../org/apache/cxf/systest/ws/ssl/SSLTest.java | 67
.../apache/cxf/systest/ws/ssl/DoubleItSSL.wsdl | 3 +
.../apache/cxf/systest/ws/ssl/client-ssl3.xml | 34 ++
.../org/apache/cxf/systest/ws/ssl/server.xml| 26
10 files changed, 189 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/1701e6c8/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParameters.java
--
diff --git
a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParameters.java
b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParameters.java
index ab94d38..52884c3 100644
---
a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParameters.java
+++
b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParameters.java
@@ -18,6 +18,9 @@
*/
package org.apache.cxf.configuration.jsse;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.cxf.configuration.security.ClientAuthentication;
/**
@@ -28,6 +31,7 @@ import
org.apache.cxf.configuration.security.ClientAuthentication;
public class TLSServerParameters extends TLSParameterBase {
ClientAuthentication clientAuthentication;
+ListString excludeProtocols = new ArrayListString();
/**
* This parameter configures the server side to request and/or
@@ -43,4 +47,22 @@ public class TLSServerParameters extends TLSParameterBase {
public ClientAuthentication getClientAuthentication() {
return clientAuthentication;
}
+
+/**
+ * This parameter sets the protocol list to exclude.
+ */
+public final void setExcludeProtocols(ListString protocols) {
+excludeProtocols = protocols;
+}
+
+/**
+ * Returns the protocols to exclude that are associated with this endpoint.
+ */
+public ListString getExcludeProtocols() {
+if (excludeProtocols == null) {
+excludeProtocols = new ArrayListString();
+}
+return excludeProtocols;
+}
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/1701e6c8/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParametersConfig.java
--
diff --git
a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParametersConfig.java
b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParametersConfig.java
index 13d84e8..a9c9cd6 100644
---
a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParametersConfig.java
+++
b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParametersConfig.java
@@ -54,6 +54,9 @@ public class TLSServerParametersConfig
if (params.isSetCipherSuites()) {
this.setCipherSuites(params.getCipherSuites().getCipherSuite());
}
+if (params.isSetExcludeProtocols()) {
+
this.setExcludeProtocols(params.getExcludeProtocols().getExcludeProtocol());
+}
if (params.isSetJsseProvider()) {
this.setJsseProvider(params.getJsseProvider());
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/1701e6c8/core/src/main/resources/schemas/configuration/security.xsd
--
diff --git a/core/src/main/resources/schemas/configuration/security.xsd
b/core/src/main/resources/schemas/configuration/security.xsd
index 4cfa92a..d53d3e6 100644
--- a/core/src/main/resources/schemas/configuration/security.xsd
+++ b/core/src/main/resources/schemas/configuration/security.xsd
@@ -350,6 +350,18 @@
/xs:sequence
/xs:complexType
+xs:complexType name=ExcludeProtocols
+ xs:annotation
+
[1/3] git commit: [CXF-6087] - Add a way to exclude (multiple) SSL/TLS protocols in the HTTPJ namespace
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes d6b88f980 - 11725278a
[CXF-6087] - Add a way to exclude (multiple) SSL/TLS protocols in the HTTPJ
namespace
Conflicts:
rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4199a30e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4199a30e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4199a30e
Branch: refs/heads/3.0.x-fixes
Commit: 4199a30e43e7fa90801fb4aafcfa3dc397f0c262
Parents: d6b88f9
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Wed Nov 5 17:12:31 2014 +
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Nov 5 17:13:19 2014 +
--
.../configuration/jsse/TLSServerParameters.java | 22 ++
.../jsse/TLSServerParametersConfig.java | 3 +
.../schemas/configuration/security.xsd | 19 ++
.../http_jetty/JettyHTTPServerEngine.java | 242 +++
.../osgi/HTTPJettyTransportActivator.java | 5 +
...ttyHTTPServerEngineBeanDefinitionParser.java | 5 +-
.../org/apache/cxf/systest/ws/ssl/SSLTest.java | 67 +
.../apache/cxf/systest/ws/ssl/DoubleItSSL.wsdl | 3 +
.../apache/cxf/systest/ws/ssl/client-ssl3.xml | 34 +++
.../org/apache/cxf/systest/ws/ssl/server.xml| 26 ++
10 files changed, 425 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/4199a30e/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParameters.java
--
diff --git
a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParameters.java
b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParameters.java
index ab94d38..52884c3 100644
---
a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParameters.java
+++
b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParameters.java
@@ -18,6 +18,9 @@
*/
package org.apache.cxf.configuration.jsse;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.cxf.configuration.security.ClientAuthentication;
/**
@@ -28,6 +31,7 @@ import
org.apache.cxf.configuration.security.ClientAuthentication;
public class TLSServerParameters extends TLSParameterBase {
ClientAuthentication clientAuthentication;
+ListString excludeProtocols = new ArrayListString();
/**
* This parameter configures the server side to request and/or
@@ -43,4 +47,22 @@ public class TLSServerParameters extends TLSParameterBase {
public ClientAuthentication getClientAuthentication() {
return clientAuthentication;
}
+
+/**
+ * This parameter sets the protocol list to exclude.
+ */
+public final void setExcludeProtocols(ListString protocols) {
+excludeProtocols = protocols;
+}
+
+/**
+ * Returns the protocols to exclude that are associated with this endpoint.
+ */
+public ListString getExcludeProtocols() {
+if (excludeProtocols == null) {
+excludeProtocols = new ArrayListString();
+}
+return excludeProtocols;
+}
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/4199a30e/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParametersConfig.java
--
diff --git
a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParametersConfig.java
b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParametersConfig.java
index 13d84e8..a9c9cd6 100644
---
a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParametersConfig.java
+++
b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParametersConfig.java
@@ -54,6 +54,9 @@ public class TLSServerParametersConfig
if (params.isSetCipherSuites()) {
this.setCipherSuites(params.getCipherSuites().getCipherSuite());
}
+if (params.isSetExcludeProtocols()) {
+
this.setExcludeProtocols(params.getExcludeProtocols().getExcludeProtocol());
+}
if (params.isSetJsseProvider()) {
this.setJsseProvider(params.getJsseProvider());
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/4199a30e/core/src/main/resources/schemas/configuration/security.xsd
--
diff --git a/core/src/main/resources/schemas/configuration/security.xsd
b/core/src/main/resources/schemas/configuration/security.xsd
index e68e65a..56fe888 100644
--- a/core/src/main/resources/schemas/configuration/security.xsd
+++ b/core/src/main/resources/schemas/configuration/security.xsd
@@ -341,6 +341,18 @@
[1/4] git commit: [CXF-6087] - Add a way to exclude (multiple) SSL/TLS protocols in the HTTPJ namespace
Repository: cxf
Updated Branches:
refs/heads/2.7.x-fixes 41545eea4 - 5c2d36d20
[CXF-6087] - Add a way to exclude (multiple) SSL/TLS protocols in the HTTPJ
namespace
Conflicts:
rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f1212884
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f1212884
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f1212884
Branch: refs/heads/2.7.x-fixes
Commit: f12128845e7f69ad8b7f1718dab5319af41f2138
Parents: 41545ee
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Wed Nov 5 17:12:31 2014 +
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Nov 5 17:31:26 2014 +
--
.../configuration/jsse/TLSServerParameters.java | 22 ++
.../jsse/TLSServerParametersConfig.java | 3 +
.../schemas/configuration/security.xsd | 19 ++
.../http_jetty/JettyHTTPServerEngine.java | 242 +++
.../osgi/HTTPJettyTransportActivator.java | 5 +
...ttyHTTPServerEngineBeanDefinitionParser.java | 5 +-
.../org/apache/cxf/systest/ws/ssl/SSLTest.java | 67 +
.../apache/cxf/systest/ws/ssl/DoubleItSSL.wsdl | 3 +
.../apache/cxf/systest/ws/ssl/client-ssl3.xml | 34 +++
.../org/apache/cxf/systest/ws/ssl/server.xml| 26 ++
10 files changed, 425 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/f1212884/api/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParameters.java
--
diff --git
a/api/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParameters.java
b/api/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParameters.java
index ab94d38..52884c3 100644
---
a/api/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParameters.java
+++
b/api/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParameters.java
@@ -18,6 +18,9 @@
*/
package org.apache.cxf.configuration.jsse;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.cxf.configuration.security.ClientAuthentication;
/**
@@ -28,6 +31,7 @@ import
org.apache.cxf.configuration.security.ClientAuthentication;
public class TLSServerParameters extends TLSParameterBase {
ClientAuthentication clientAuthentication;
+ListString excludeProtocols = new ArrayListString();
/**
* This parameter configures the server side to request and/or
@@ -43,4 +47,22 @@ public class TLSServerParameters extends TLSParameterBase {
public ClientAuthentication getClientAuthentication() {
return clientAuthentication;
}
+
+/**
+ * This parameter sets the protocol list to exclude.
+ */
+public final void setExcludeProtocols(ListString protocols) {
+excludeProtocols = protocols;
+}
+
+/**
+ * Returns the protocols to exclude that are associated with this endpoint.
+ */
+public ListString getExcludeProtocols() {
+if (excludeProtocols == null) {
+excludeProtocols = new ArrayListString();
+}
+return excludeProtocols;
+}
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/f1212884/api/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParametersConfig.java
--
diff --git
a/api/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParametersConfig.java
b/api/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParametersConfig.java
index 13d84e8..a9c9cd6 100644
---
a/api/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParametersConfig.java
+++
b/api/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParametersConfig.java
@@ -54,6 +54,9 @@ public class TLSServerParametersConfig
if (params.isSetCipherSuites()) {
this.setCipherSuites(params.getCipherSuites().getCipherSuite());
}
+if (params.isSetExcludeProtocols()) {
+
this.setExcludeProtocols(params.getExcludeProtocols().getExcludeProtocol());
+}
if (params.isSetJsseProvider()) {
this.setJsseProvider(params.getJsseProvider());
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/f1212884/api/src/main/resources/schemas/configuration/security.xsd
--
diff --git a/api/src/main/resources/schemas/configuration/security.xsd
b/api/src/main/resources/schemas/configuration/security.xsd
index e68e65a..56fe888 100644
--- a/api/src/main/resources/schemas/configuration/security.xsd
+++ b/api/src/main/resources/schemas/configuration/security.xsd
@@ -341,6 +341,18 @@
/xs:sequence
