You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2015/11/19 18:52:59 UTC
[1/5] cxf git commit: Some changes to the STSTokenOutInterceptor to
make it easier to subclass
Repository: cxf
Updated Branches:
refs/heads/master cd2c481ef -> 826bf21ae
Some changes to the STSTokenOutInterceptor to make it easier to subclass
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a24540a8
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a24540a8
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a24540a8
Branch: refs/heads/master
Commit: a24540a86cc014d34795414199993378d53cb4dd
Parents: cd2c481
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Nov 19 14:27:39 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Nov 19 17:52:47 2015 +0000
----------------------------------------------------------------------
.../policy/interceptors/STSTokenOutInterceptor.java | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/a24540a8/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSTokenOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSTokenOutInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSTokenOutInterceptor.java
index 14b8b5f..f0683e0 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSTokenOutInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSTokenOutInterceptor.java
@@ -51,7 +51,11 @@ public class STSTokenOutInterceptor extends AbstractPhaseInterceptor<Message> {
private TokenRequestParams tokenParams;
public STSTokenOutInterceptor(AuthParams authParams, String stsWsdlLocation, Bus bus) {
- super(Phase.PREPARE_SEND);
+ this(Phase.PREPARE_SEND, authParams, stsWsdlLocation, bus);
+ }
+
+ public STSTokenOutInterceptor(String phase, AuthParams authParams, String stsWsdlLocation, Bus bus) {
+ super(phase);
this.stsClient = configureBasicSTSClient(authParams, stsWsdlLocation, bus);
this.tokenParams = new TokenRequestParams();
}
@@ -79,6 +83,12 @@ public class STSTokenOutInterceptor extends AbstractPhaseInterceptor<Message> {
if (tok == null) {
LOG.warning("Security token was not retrieved from STS");
}
+ processToken(message, tok);
+ }
+
+ // An extension point to allow custom processing of the token
+ protected void processToken(Message message, SecurityToken tok) {
+
}
public STSClient getSTSClient() {
[4/5] cxf git commit: Fixing some failing tests
Posted by co...@apache.org.
Fixing some failing tests
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/826bf21a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/826bf21a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/826bf21a
Branch: refs/heads/master
Commit: 826bf21ae919bc9f2375a798847340b9b0624577
Parents: 92c5c70
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Nov 19 17:52:27 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Nov 19 17:52:48 2015 +0000
----------------------------------------------------------------------
.../jaxrs/security/certs/jwkPublicSet.txt | 6 +++---
.../src/test/resources/sts.jks | Bin 3980 -> 4121 bytes
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/826bf21a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/jwkPublicSet.txt
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/jwkPublicSet.txt b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/jwkPublicSet.txt
index 87f5733..9313284 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/jwkPublicSet.txt
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/jwkPublicSet.txt
@@ -16,15 +16,15 @@
"kty":"RSA",
"kid":"AliceCert",
"x5c": [
- "MIIDojCCAoqgAwIBAgIBIDANBgkqhkiG9w0BAQsFADAzMRMwEQYDVQQKDAphcGFjaGUub3JnMQwwCgYDVQQLDANlbmcxDjAMBgNVBAMMBWN4ZmNhMB4XDTE1MTAyMDA5NTM1N1oXDTI1MTAxNzA5NTM1N1owMzETMBEGA1UEChMKYXBhY2hlLm9yZzEMMAoGA1UECxMDZW5nMQ4wDAYDVQQDEwVhbGljZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMSBK+IlFaDphtJa96Vjt5et9KMEw/dIzDe+OfZQjAUSkZ1FQoWDaIOkrnbXq/7jfz7dgOx0QS9AMrgh7sEMnd0NGm1tmQr12Zxb9CIkIVFKTBQseCnJGn4Qctt24GVROqlogXs8/Og2NeSa8XJhnUwJFPoVG1QDHswVANlE6jS9TOXZG6fN5TyRwZwrzRVrcbDfUxV+t+HOTBeI/hrFlrJLYfPohZsGIckZvO7AwT6BH9A32L04HfZLGHFwtIjFKTXueC2R8BJZl/HQ8ctwr50L4wytowcpiQT1viJU9gj01xMkRR9wJ+ybenpciQw22wNn2BQ48B3t749Xg8h6v1MCAwEAAaOBwDCBvTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUcKtIwhA3fgWTH49HUGN0W2Jlbj8wYwYDVR0jBFwwWoAUf9/5nypuX3z3t7Lo8QRpkvj2uGOhN6Q1MDMxEzARBgNVBAoMCmFwYWNoZS5vcmcxDDAKBgNVBAsMA2VuZzEOMAwGA1UEAwwFY3hmY2GCCQDr8Tla2IcxaDANBgkqhkiG9w0BAQsFAAOCAQEAPnReJBRXZHTyKTt1Z/k+nLjALGO5h8pejvmqoOt8/i9jMghS+5Pdjel8b9+RFofdC7i88pUHt+ZGrZ
vYEFXl/+UJFWjPt/X/QwrWKbDT95iFPJOSJxk0XL15HS7uKqEWaF2O9EOHndg5XR6YFYuSkHLA6PSsWVXsfgQ4WhTHgcSXz7pgeh7gdp8ItLJ7mBcqN1Jk94yd5BiEfo8Woyh+TVaFoWZcIgN2MfRTk9B75EWrkw5UsUoJ6/Dpq3+kqz+81DfUfTsmKgPWoT3y4UBSnPkFhF7uWguVKd/jUb6StXiNEIrwHYDxzJzBXK1nAFPnNQl+OzDE8J1BPf1pi/acAg=="
- ]
+ "MIIDojCCAoqgAwIBAgIBIDANBgkqhkiG9w0BAQsFADAzMRMwEQYDVQQKEwphcGFjaGUub3JnMQwwCgYDVQQLEwNlbmcxDjAMBgNVBAMTBWN4ZmNhMB4XDTE1MTExOTE1MjExN1oXDTI1MTExNjE1MjExN1owMzETMBEGA1UEChMKYXBhY2hlLm9yZzEMMAoGA1UECxMDZW5nMQ4wDAYDVQQDEwVhbGljZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJEtSxj+Fj6DUu8pSm1PaQxWOQLfTjTS3f5S1xD+HZ23oQE9q0gJ1tmcmGoi8EGYd6uC2YTLo8mcAya9pvxiXNPhbkzm6XvQbmvKKjMVe3MOm0OMZu64UgbFcuDxQ5yTHbJbq/sODUUE+AzlvkEiSceibg8LjjVwhWApR39yTDyVoUwtWC3hKUgAaRh1pRkcGJY5/hu9zPiKWxpApvjcRKW8e6EDP5+HJtEfv4FAulXyuN3NWlA+BTzhU3vCcFeUSK8GyJ2EYe7jU7escnn6VOU31YiZlwf4L+nlcShrssBU+QS7t0e1tnx39XwYPnMMfk3IJ5XHrzWELamDFzJUANsCAwEAAaOBwDCBvTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUdtunjeY0on5gtDZ464z81hD/RR4wYwYDVR0jBFwwWoAUIU7wL46HJSo67vTRvPZ3mlfF54mhN6Q1MDMxEzARBgNVBAoTCmFwYWNoZS5vcmcxDDAKBgNVBAsTA2VuZzEOMAwGA1UEAxMFY3hmY2GCCQCs4D589C1IpDANBgkqhkiG9w0BAQsFAAOCAQEAH5/3uv40Hif/AjEgLtCNm+V8B2zszugwJWS/0aCJkb/Qj22XnOSJ6kmBHkBvlJ70el2SmrW+ZysZo+
II+qds663wsfrzBv4egnSNWRFBPeAhYdGNAAaqAbDduRHa4vUdmcYTHEl/EZCabQSr7VH1+L6yCvwbnhDf8LZVDrFLcTeNOqhQnN/vUaG1wu8csrTLuzZzEZ5YF8bBJQmlN9s7J1DzM60TgfrNJcCCYalFBQspQmnlFIqVoJC5n88GOUzcCCQ3YoT1zDqlVuJhasW2PoD3C0NRkFXdu9268xNG/lLgf+mcX2jEzfHAzb8+sxZKReBfE8T8QBIBd+GW6vRshA=="
+ ]
},
{
"kty":"RSA",
"kid":"BobCert",
"x5c": [
- "MIIDoDCCAoigAwIBAgIBIjANBgkqhkiG9w0BAQsFADAzMRMwEQYDVQQKDAphcGFjaGUub3JnMQwwCgYDVQQLDANlbmcxDjAMBgNVBAMMBWN4ZmNhMB4XDTE1MTAyMDA5NTYyNloXDTI1MTAxNzA5NTYyNlowMTETMBEGA1UEChMKYXBhY2hlLm9yZzEMMAoGA1UECxMDZW5nMQwwCgYDVQQDEwNib2IwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCEjgfe3UUVEr7CVA+one1q/CCyU/1gN0jUpXf15hroR45Mhq0yEiStFMjIEfJJKyjRuwnfPrRf8FVMjRPLo9NLe1r1HMcVLaepZzhD1WgqRjAk0nymBN3zpFQDxyc5BGYiZLjgzmM7wlHW7XE+QSSlfjdH0EEoGXgHJitosQ78rq3iJlBgriN7OQuJynkHgRjMM9aKwHRs/y/03BmnMh1yq2PG1ptuWl/GspXrvgY9dfEGWppm1cC9FBPZcF8Y/l0I9kYArtbAGNcfcRpG2pQwSB+sKJAOHrm6ofzIEv+eJW7EX9GfQo5ab99CBDwC5iOSPPSfSW5eKn6+737tFTFPAgMBAAGjgcAwgb0wCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFFEs/7YrIfooE4HF8GgOoZ+N84rbMGMGA1UdIwRcMFqAFH/f+Z8qbl9897ey6PEEaZL49rhjoTekNTAzMRMwEQYDVQQKDAphcGFjaGUub3JnMQwwCgYDVQQLDANlbmcxDjAMBgNVBAMMBWN4ZmNhggkA6/E5WtiHMWgwDQYJKoZIhvcNAQELBQADggEBAEdkew5qevvF0ZcY1LWIoCcvRZwDxxJKJuNCIl25sx9iH+PLm9BZ6Dy/13gckAgguGCHkOAR3+JRnWSnjK
w6s7uw+o8m4cIbVn3sOtJ7L5bMn4cmm4+WeQqEdQQncr1t5Q6xT6zgGTGQcnj1bxPmdrUVoCaoaGizdH9KwLOxSVR3LSZFNg3Z+g2DYNgf0B4rsUGv08Lub3tZ+G38q4r+qmjPceQy7oPA5M5aaKwRoxc66Ek+adkE+ESZb0CfiGq6PxSCxlp0i1tzXYxUE8YcgsOEN+OvCBHUh/GNqp68xBDKtkLkGzpBu8B8SPYrZ9CJH3v9pU8Y2cmv0d1i4o4z/eA="
+ "MIIDoDCCAoigAwIBAgIBITANBgkqhkiG9w0BAQsFADAzMRMwEQYDVQQKEwphcGFjaGUub3JnMQwwCgYDVQQLEwNlbmcxDjAMBgNVBAMTBWN4ZmNhMB4XDTE1MTExOTE1MjM0MloXDTI1MTExNjE1MjM0MlowMTETMBEGA1UEChMKYXBhY2hlLm9yZzEMMAoGA1UECxMDZW5nMQwwCgYDVQQDEwNib2IwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDSn7xdcgI7ijVbVLbqyOM09yYRsVN8mJJQ6RAKoO+6BrFelJ77lag/gPW5XNatl+X/DR12eLCxNzPm20SjUWKxz+kmuWXg4MXQ+b+I6PROqvtg/uRfzBjceFOxOhpNaNmxWcJLOyMa1rfjR4wem5FOgluEt/3YG8prx/b303BkkwXSqD3oRgRRWDWJinHAI7Lfgwi+pjfYq7SYYCYr/thljP+PFfOgeOuMVep8ImYX13SLPPYoQeNcQAYYoM+zM6Uzoj1MX/fYLHXlHpm1n6EWXSTiT82i795PRO5fUcMQzuW1WxHwKATXrdH0yAgIvaCifrs4G3RbUBAXZQ8TsyZXAgMBAAGjgcAwgb0wCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFASycRPWPO+E95GCagdVJHTnUlt2MGMGA1UdIwRcMFqAFCFO8C+OhyUqOu700bz2d5pXxeeJoTekNTAzMRMwEQYDVQQKEwphcGFjaGUub3JnMQwwCgYDVQQLEwNlbmcxDjAMBgNVBAMTBWN4ZmNhggkArOA+fPQtSKQwDQYJKoZIhvcNAQELBQADggEBACnjRa25xluo98MRuUAvdFiIb3/lG2gUfsZcJBYN+TMAvTqqpqm/ITCEf0Je185zZ9Uh4Mbe6IwsaWcdEg
GwXCuct5qcSxzfPyQjcTLb5ZiEBL0xn0KkIjjA5aKWINHoP6Zkadglv3LDSXLnVGLfgU21kkuRpLBaJ+oPhmib8ou7LoeBdV/XEhxN/JVpKyebvsm+kPQPSInA7+OL6pnqdkRU6hMoDokLsk5+JWZpOR7LkH6ZEL+XK1AJbPMnzS7O0OjKyLeZBfO+vDlvEgCJ4Kmf9oIbnYmnQFk93ICr+wkI0J5mdU2AcML3gaSreUaJEXz/9xDHvKLUKLCI5+6o470="
]
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/826bf21a/systests/ws-security-examples/src/test/resources/sts.jks
----------------------------------------------------------------------
diff --git a/systests/ws-security-examples/src/test/resources/sts.jks b/systests/ws-security-examples/src/test/resources/sts.jks
index 3cdccfe..880463d 100644
Binary files a/systests/ws-security-examples/src/test/resources/sts.jks and b/systests/ws-security-examples/src/test/resources/sts.jks differ
[2/5] cxf git commit: Fixing failing test
Posted by co...@apache.org.
Fixing failing test
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f196ceb4
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f196ceb4
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f196ceb4
Branch: refs/heads/master
Commit: f196ceb4a3fd77106e8de183bd0786f1d8dd780b
Parents: 52d2142
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Nov 19 16:41:19 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Nov 19 17:52:48 2015 +0000
----------------------------------------------------------------------
.../test/java/org/apache/cxf/systest/sts/soap12/Soap12Test.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/f196ceb4/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/soap12/Soap12Test.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/soap12/Soap12Test.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/soap12/Soap12Test.java
index de2a9ae..beaf0ce 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/soap12/Soap12Test.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/soap12/Soap12Test.java
@@ -168,7 +168,7 @@ public class Soap12Test extends AbstractBusClientServerTestBase {
try {
String badAddress =
- "https://localhost:" + PORT + "/doubleit/services/doubleitbadtransportsaml1";
+ "https://localhost:" + PORT + "/doubleit/services/baddoubleittransportsaml1";
requestSecurityToken(SAML1_TOKEN_TYPE, BEARER_KEYTYPE, bus, badAddress);
fail("Failure expected on a bad endpoint address");
} catch (SoapFault ex) {
[5/5] cxf git commit: Adding a system test for a JAX-RS service and
JWT/STS
Posted by co...@apache.org.
Adding a system test for a JAX-RS service and JWT/STS
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/52d2142b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/52d2142b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/52d2142b
Branch: refs/heads/master
Commit: 52d2142beb8f4b343258e8c672cb1b241fcc4b2d
Parents: a24540a
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Nov 19 14:40:57 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Nov 19 17:52:48 2015 +0000
----------------------------------------------------------------------
services/sts/systests/advanced/pom.xml | 6 +
.../systest/sts/jwt/DoubleItPortTypeImpl.java | 41 +++++
.../apache/cxf/systest/sts/jwt/JWTUnitTest.java | 2 +-
.../cxf/systest/sts/jwt/JaxrsJWTTest.java | 152 ++++++++++++++++++
.../org/apache/cxf/systest/sts/jwt/Server.java | 46 ++++++
.../cxf/systest/sts/deployment/cxf-sts.xml | 3 +-
.../apache/cxf/systest/sts/jwt/DoubleIt.wsdl | 157 +++++++++++++++++++
.../apache/cxf/systest/sts/jwt/cxf-client.xml | 39 +++++
.../apache/cxf/systest/sts/jwt/cxf-service.xml | 53 +++++++
.../cxf/systest/sts/jwt/cxf-unit-client.xml | 39 -----
.../org/apache/cxf/systest/sts/jwt/jaxrs.xml | 26 +++
11 files changed, 522 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/52d2142b/services/sts/systests/advanced/pom.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/pom.xml b/services/sts/systests/advanced/pom.xml
index c1aa190..27a76d1 100644
--- a/services/sts/systests/advanced/pom.xml
+++ b/services/sts/systests/advanced/pom.xml
@@ -56,6 +56,12 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-security-jose-jaxrs</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>${project.version}</version>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/cxf/blob/52d2142b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/DoubleItPortTypeImpl.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/DoubleItPortTypeImpl.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/DoubleItPortTypeImpl.java
new file mode 100644
index 0000000..e9b50aa
--- /dev/null
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/DoubleItPortTypeImpl.java
@@ -0,0 +1,41 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.systest.sts.jwt;
+
+import javax.annotation.Resource;
+import javax.jws.WebService;
+import javax.xml.ws.WebServiceContext;
+
+import org.apache.cxf.feature.Features;
+import org.example.contract.doubleit.DoubleItPortType;
+
+@WebService(targetNamespace = "http://www.example.org/contract/DoubleIt",
+ serviceName = "DoubleItService",
+ endpointInterface = "org.example.contract.doubleit.DoubleItPortType")
+@Features(features = "org.apache.cxf.feature.LoggingFeature")
+public class DoubleItPortTypeImpl implements DoubleItPortType {
+
+ @Resource
+ WebServiceContext wsContext;
+
+ public int doubleIt(int numberToDouble) {
+ return numberToDouble * 2;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/cxf/blob/52d2142b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/JWTUnitTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/JWTUnitTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/JWTUnitTest.java
index 90da0c3..00ed2b1 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/JWTUnitTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/JWTUnitTest.java
@@ -61,7 +61,7 @@ public class JWTUnitTest extends AbstractBusClientServerTestBase {
@org.junit.Test
public void testIssueJWTToken() throws Exception {
SpringBusFactory bf = new SpringBusFactory();
- URL busFile = JWTUnitTest.class.getResource("cxf-unit-client.xml");
+ URL busFile = JWTUnitTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
SpringBusFactory.setDefaultBus(bus);
http://git-wip-us.apache.org/repos/asf/cxf/blob/52d2142b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/JaxrsJWTTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/JaxrsJWTTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/JaxrsJWTTest.java
new file mode 100644
index 0000000..890a111
--- /dev/null
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/JaxrsJWTTest.java
@@ -0,0 +1,152 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.systest.sts.jwt;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.ws.rs.client.ClientRequestContext;
+import javax.ws.rs.client.ClientRequestFilter;
+import javax.ws.rs.core.HttpHeaders;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.jaxrs.client.WebClient;
+import org.apache.cxf.message.Message;
+import org.apache.cxf.phase.Phase;
+import org.apache.cxf.phase.PhaseInterceptorChain;
+import org.apache.cxf.systest.sts.common.SecurityTestUtil;
+import org.apache.cxf.systest.sts.deployment.STSServer;
+import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+import org.apache.cxf.ws.security.SecurityConstants;
+import org.apache.cxf.ws.security.policy.interceptors.STSTokenOutInterceptor;
+import org.apache.cxf.ws.security.tokenstore.SecurityToken;
+import org.apache.cxf.ws.security.trust.STSClient;
+import org.apache.cxf.ws.security.trust.STSTokenRetriever.TokenRequestParams;
+import org.junit.BeforeClass;
+
+/**
+ * In this test case, a CXF JAX-RS client gets a JWT token from the STS + sends it to the
+ * service provider, which validates it.
+ */
+public class JaxrsJWTTest extends AbstractBusClientServerTestBase {
+
+ public static final String JWT_TOKEN_TYPE = "urn:ietf:params:oauth:token-type:jwt";
+ static final String STSPORT = allocatePort(STSServer.class);
+
+ private static final String PORT = allocatePort(Server.class);
+
+ @BeforeClass
+ public static void startServers() throws Exception {
+ assertTrue(
+ "Server failed to launch",
+ // run the server in the same process
+ // set this to false to fork
+ launchServer(Server.class, true)
+ );
+ assertTrue(
+ "Server failed to launch",
+ // run the server in the same process
+ // set this to false to fork
+ launchServer(STSServer.class, true)
+ );
+ }
+
+ @org.junit.AfterClass
+ public static void cleanup() throws Exception {
+ SecurityTestUtil.cleanup();
+ stopAllServers();
+ }
+
+ @org.junit.Test
+ public void testSuccessfulInvocation() throws Exception {
+
+ SpringBusFactory bf = new SpringBusFactory();
+ URL busFile = JaxrsJWTTest.class.getResource("cxf-client.xml");
+
+ Bus bus = bf.createBus(busFile.toString());
+ SpringBusFactory.setDefaultBus(bus);
+ SpringBusFactory.setThreadDefaultBus(bus);
+
+ final String address = "https://localhost:" + PORT + "/doubleit/services/doubleit-rs";
+ final int numToDouble = 25;
+
+ List<Object> providers = Collections.singletonList(new JwtOutFilter());
+
+ WebClient client = WebClient.create(address, providers);
+ client.type("text/plain").accept("text/plain");
+
+ STSClient stsClient = getSTSClient(JWT_TOKEN_TYPE, bus);
+ STSTokenOutInterceptor stsInterceptor =
+ new STSTokenOutInterceptor(Phase.PRE_LOGICAL, stsClient, new TokenRequestParams());
+ stsInterceptor.getBefore().add(JwtOutFilter.class.getName());
+ WebClient.getConfig(client).getOutInterceptors().add(stsInterceptor);
+
+ int resp = client.post(numToDouble, Integer.class);
+ org.junit.Assert.assertEquals(2 * numToDouble, resp);
+
+ bus.shutdown(true);
+ }
+
+ private STSClient getSTSClient(
+ String tokenType, Bus bus
+ ) throws Exception {
+ STSClient stsClient = new STSClient(bus);
+ String port = STSPORT;
+
+ stsClient.setWsdlLocation("https://localhost:" + port + "/SecurityTokenService/Transport?wsdl");
+ stsClient.setServiceName("{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService");
+ stsClient.setEndpointName("{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port");
+
+ Map<String, Object> properties = new HashMap<String, Object>();
+ properties.put(SecurityConstants.USERNAME, "alice");
+ properties.put(
+ SecurityConstants.CALLBACK_HANDLER,
+ "org.apache.cxf.systest.sts.common.CommonCallbackHandler"
+ );
+
+ stsClient.setProperties(properties);
+ stsClient.setTokenType(tokenType);
+ stsClient.setSendKeyType(false);
+
+ return stsClient;
+ }
+
+ private static class JwtOutFilter implements ClientRequestFilter {
+
+ @Override
+ public void filter(ClientRequestContext requestContext) throws IOException {
+ SecurityToken token =
+ (SecurityToken)requestContext.getProperty(SecurityConstants.TOKEN);
+ if (token == null) {
+ Message m = PhaseInterceptorChain.getCurrentMessage();
+ token = (SecurityToken)m.getContextualProperty(SecurityConstants.TOKEN);
+ }
+
+ if (token != null && token.getToken() != null) {
+ requestContext.getHeaders().putSingle(HttpHeaders.AUTHORIZATION,
+ "JWT" + " " + token.getToken().getTextContent());
+ }
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/cxf/blob/52d2142b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/Server.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/Server.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/Server.java
new file mode 100644
index 0000000..55e1585
--- /dev/null
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/Server.java
@@ -0,0 +1,46 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.systest.sts.jwt;
+
+import java.net.URL;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+
+public class Server extends AbstractBusTestServerBase {
+
+ public Server() {
+
+ }
+
+ protected void run() {
+ URL busFile = Server.class.getResource("cxf-service.xml");
+ Bus busLocal = new SpringBusFactory().createBus(busFile);
+ BusFactory.setDefaultBus(busLocal);
+ setBus(busLocal);
+
+ try {
+ new Server();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/cxf/blob/52d2142b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-sts.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-sts.xml
index f33a137..490d5cf 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-sts.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-sts.xml
@@ -111,8 +111,7 @@
<property name="endpoints" ref="transportEndpoints"/>
</bean>
<util:list id="transportEndpoints">
- <value>https://localhost:(\d)*/doubleit/services/doubleittransport.*
- </value>
+ <value>https://localhost:(\d)*/doubleit/services/doubleit.*</value>
</util:list>
<bean id="transportSTSProperties" class="org.apache.cxf.sts.StaticSTSProperties">
<property name="signaturePropertiesFile" value="stsKeystore.properties"/>
http://git-wip-us.apache.org/repos/asf/cxf/blob/52d2142b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/jwt/DoubleIt.wsdl
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/jwt/DoubleIt.wsdl b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/jwt/DoubleIt.wsdl
new file mode 100644
index 0000000..2166d33
--- /dev/null
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/jwt/DoubleIt.wsdl
@@ -0,0 +1,157 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<wsdl:definitions xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:di="http://www.example.org/schema/DoubleIt" xmlns:tns="http://www.example.org/contract/DoubleIt" xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702" xmlns:t="http://docs.oasis-open.org/ws-sx/ws-trust/200512" xmlns:wsaw="http://www.w3.org/2005/08/addressing" xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex" name="DoubleIt" targetNamespace="http://www.example.org/contract/DoubleIt">
+ <wsdl:import location="src/test/resources/DoubleItLogical.wsdl" namespace="http://www.example.org/contract/DoubleIt"/>
+ <wsdl:binding name="DoubleItBinding" type="tns:DoubleItPortType">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="DoubleIt">
+ <soap:operation soapAction=""/>
+ <wsdl:input>
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="DoubleItService">
+ <wsdl:port name="DoubleItPort" binding="tns:DoubleItBinding">
+ <soap:address location="https://localhost:8081/doubleit/services/doubleit"/>
+ </wsdl:port>
+ </wsdl:service>
+ <wsp:Policy wsu:Id="DoubleItBindingTransportSAML2BearerPolicy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <wsam:Addressing wsp:Optional="false">
+ <wsp:Policy/>
+ </wsam:Addressing>
+ <sp:TransportBinding xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+ <wsp:Policy>
+ <sp:TransportToken>
+ <wsp:Policy>
+ <sp:HttpsToken>
+ <wsp:Policy/>
+ </sp:HttpsToken>
+ </wsp:Policy>
+ </sp:TransportToken>
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:TripleDes/>
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Lax/>
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp/>
+ </wsp:Policy>
+ </sp:TransportBinding>
+ <sp:SignedSupportingTokens xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+ <wsp:Policy>
+ <sp:IssuedToken sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient">
+ <sp:RequestSecurityTokenTemplate>
+ <t:TokenType>http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0</t:TokenType>
+ <t:KeyType>http://docs.oasis-open.org/ws-sx/ws-trust/200512/Bearer</t:KeyType>
+ </sp:RequestSecurityTokenTemplate>
+ <wsp:Policy>
+ <sp:RequireInternalReference/>
+ </wsp:Policy>
+ <sp:Issuer>
+ <wsaw:Address>http://localhost:8080/SecurityTokenService/UT
+ </wsaw:Address>
+ <wsaw:Metadata>
+ <wsx:Metadata>
+ <wsx:MetadataSection>
+ <wsx:MetadataReference>
+ <wsaw:Address>http://localhost:8080/SecurityTokenService/UT/mex
+ </wsaw:Address>
+ </wsx:MetadataReference>
+ </wsx:MetadataSection>
+ </wsx:Metadata>
+ </wsaw:Metadata>
+ </sp:Issuer>
+ </sp:IssuedToken>
+ </wsp:Policy>
+ </sp:SignedSupportingTokens>
+ <sp:Wss11>
+ <wsp:Policy>
+ <sp:MustSupportRefIssuerSerial/>
+ <sp:MustSupportRefThumbprint/>
+ <sp:MustSupportRefEncryptedKey/>
+ </wsp:Policy>
+ </sp:Wss11>
+ <sp:Trust13>
+ <wsp:Policy>
+ <sp:MustSupportIssuedTokens/>
+ <sp:RequireClientEntropy/>
+ <sp:RequireServerEntropy/>
+ </wsp:Policy>
+ </sp:Trust13>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+ <wsp:Policy wsu:Id="DoubleItBinding_DoubleIt_Input_Policy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:EncryptedParts>
+ <sp:Body/>
+ </sp:EncryptedParts>
+ <sp:SignedParts>
+ <sp:Body/>
+ <sp:Header Name="To" Namespace="http://www.w3.org/2005/08/addressing"/>
+ <sp:Header Name="From" Namespace="http://www.w3.org/2005/08/addressing"/>
+ <sp:Header Name="FaultTo" Namespace="http://www.w3.org/2005/08/addressing"/>
+ <sp:Header Name="ReplyTo" Namespace="http://www.w3.org/2005/08/addressing"/>
+ <sp:Header Name="MessageID" Namespace="http://www.w3.org/2005/08/addressing"/>
+ <sp:Header Name="RelatesTo" Namespace="http://www.w3.org/2005/08/addressing"/>
+ <sp:Header Name="Action" Namespace="http://www.w3.org/2005/08/addressing"/>
+ <sp:Header Name="AckRequested" Namespace="http://docs.oasis-open.org/ws-rx/wsrm/200702"/>
+ <sp:Header Name="SequenceAcknowledgement" Namespace="http://docs.oasis-open.org/ws-rx/wsrm/200702"/>
+ <sp:Header Name="Sequence" Namespace="http://docs.oasis-open.org/ws-rx/wsrm/200702"/>
+ <sp:Header Name="CreateSequence" Namespace="http://docs.oasis-open.org/ws-rx/wsrm/200702"/>
+ </sp:SignedParts>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+ <wsp:Policy wsu:Id="DoubleItBinding_DoubleIt_Output_Policy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:EncryptedParts>
+ <sp:Body/>
+ </sp:EncryptedParts>
+ <sp:SignedParts>
+ <sp:Body/>
+ <sp:Header Name="To" Namespace="http://www.w3.org/2005/08/addressing"/>
+ <sp:Header Name="From" Namespace="http://www.w3.org/2005/08/addressing"/>
+ <sp:Header Name="FaultTo" Namespace="http://www.w3.org/2005/08/addressing"/>
+ <sp:Header Name="ReplyTo" Namespace="http://www.w3.org/2005/08/addressing"/>
+ <sp:Header Name="MessageID" Namespace="http://www.w3.org/2005/08/addressing"/>
+ <sp:Header Name="RelatesTo" Namespace="http://www.w3.org/2005/08/addressing"/>
+ <sp:Header Name="Action" Namespace="http://www.w3.org/2005/08/addressing"/>
+ <sp:Header Name="AckRequested" Namespace="http://docs.oasis-open.org/ws-rx/wsrm/200702"/>
+ <sp:Header Name="SequenceAcknowledgement" Namespace="http://docs.oasis-open.org/ws-rx/wsrm/200702"/>
+ <sp:Header Name="Sequence" Namespace="http://docs.oasis-open.org/ws-rx/wsrm/200702"/>
+ <sp:Header Name="CreateSequence" Namespace="http://docs.oasis-open.org/ws-rx/wsrm/200702"/>
+ </sp:SignedParts>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+</wsdl:definitions>
http://git-wip-us.apache.org/repos/asf/cxf/blob/52d2142b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/jwt/cxf-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/jwt/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/jwt/cxf-client.xml
new file mode 100644
index 0000000..924f7d2
--- /dev/null
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/jwt/cxf-client.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
+ <cxf:bus>
+ <cxf:features>
+ <cxf:logging/>
+ </cxf:features>
+ </cxf:bus>
+
+
+ <http:conduit name="https://localhost:.*">
+ <http:tlsClientParameters disableCNCheck="true">
+ <sec:trustManagers>
+ <sec:keyStore type="jks" password="cspass" resource="clientstore.jks"/>
+ </sec:trustManagers>
+ <sec:keyManagers keyPassword="ckpass">
+ <sec:keyStore type="jks" password="cspass" resource="clientstore.jks"/>
+ </sec:keyManagers>
+ </http:tlsClientParameters>
+ </http:conduit>
+
+</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/52d2142b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/jwt/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/jwt/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/jwt/cxf-service.xml
new file mode 100644
index 0000000..4c2ca11
--- /dev/null
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/jwt/cxf-service.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:jaxrs="http://cxf.apache.org/jaxrs" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <cxf:bus>
+ <cxf:features>
+ <cxf:logging/>
+ </cxf:features>
+ </cxf:bus>
+
+ <bean id="jwtFilter" class="org.apache.cxf.rs.security.jose.jaxrs.JwtAuthenticationFilter" />
+
+ <jaxrs:server modelRef="classpath:org/apache/cxf/systest/sts/jwt/jaxrs.xml" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.jwt.Server}/doubleit/services/doubleit-rs">
+ <jaxrs:providers>
+ <ref bean="jwtFilter"/>
+ </jaxrs:providers>
+ <jaxrs:properties>
+ <entry key="rs.security.keystore.type" value="jks" />
+ <entry key="rs.security.keystore.alias" value="mystskey"/>
+ <entry key="rs.security.keystore.password" value="sspass"/>
+ <entry key="rs.security.keystore.file" value="servicestore.jks" />
+ <entry key="rs.security.signature.algorithm" value="RS256" />
+ </jaxrs:properties>
+ </jaxrs:server>
+
+ <httpj:engine-factory id="ClientAuthHttpsSettings" bus="cxf">
+ <httpj:engine port="${testutil.ports.jwt.Server}">
+ <httpj:tlsServerParameters>
+ <sec:keyManagers keyPassword="skpass">
+ <sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/>
+ </sec:keyManagers>
+ <sec:clientAuthentication want="false" required="false"/>
+ </httpj:tlsServerParameters>
+ </httpj:engine>
+ </httpj:engine-factory>
+</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/52d2142b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/jwt/cxf-unit-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/jwt/cxf-unit-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/jwt/cxf-unit-client.xml
deleted file mode 100644
index 924f7d2..0000000
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/jwt/cxf-unit-client.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
- <cxf:bus>
- <cxf:features>
- <cxf:logging/>
- </cxf:features>
- </cxf:bus>
-
-
- <http:conduit name="https://localhost:.*">
- <http:tlsClientParameters disableCNCheck="true">
- <sec:trustManagers>
- <sec:keyStore type="jks" password="cspass" resource="clientstore.jks"/>
- </sec:trustManagers>
- <sec:keyManagers keyPassword="ckpass">
- <sec:keyStore type="jks" password="cspass" resource="clientstore.jks"/>
- </sec:keyManagers>
- </http:tlsClientParameters>
- </http:conduit>
-
-</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/52d2142b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/jwt/jaxrs.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/jwt/jaxrs.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/jwt/jaxrs.xml
new file mode 100644
index 0000000..dc68b35
--- /dev/null
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/jwt/jaxrs.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<model xmlns="http://cxf.apache.org/jaxrs">
+ <resource name="org.apache.cxf.systest.sts.jwt.DoubleItPortTypeImpl" path="/">
+ <operation name="doubleIt" verb="POST" path="/" consumes="text/plain" produces="text/plain">
+ <param name="numberToDouble" type="REQUEST_BODY"/>
+ </operation>
+ </resource>
+</model>
[3/5] cxf git commit: Updating expired certs
Posted by co...@apache.org.
Updating expired certs
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/92c5c700
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/92c5c700
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/92c5c700
Branch: refs/heads/master
Commit: 92c5c700b49f1b7be698363629ccd0034f26a4a5
Parents: f196ceb
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Nov 19 16:41:29 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Nov 19 17:52:48 2015 +0000
----------------------------------------------------------------------
.../saml/sso/SAMLResponseValidatorTest.java | 1 +
.../sso/saml/src/test/resources/alice.jks | Bin 1861 -> 4125 bytes
rt/rs/security/xml/src/test/resources/alice.jks | Bin 1861 -> 4125 bytes
rt/ws/security/src/test/resources/alice.jks | Bin 3984 -> 4125 bytes
rt/ws/security/src/test/resources/cxfca.jks | Bin 891 -> 961 bytes
.../src/test/resources/certs/alice.jks | Bin 2428 -> 4125 bytes
.../xkms-client/src/test/resources/certs/bob.jks | Bin 2422 -> 4122 bytes
.../src/test/resources/certs/cxfca.jks | Bin 1306 -> 961 bytes
systests/kerberos/src/test/resources/alice.jks | Bin 3984 -> 4125 bytes
systests/kerberos/src/test/resources/bob.jks | Bin 3979 -> 4122 bytes
.../cxf/systest/jaxrs/security/certs/alice.jks | Bin 3984 -> 4125 bytes
.../cxf/systest/jaxrs/security/certs/bob.jks | Bin 3979 -> 4122 bytes
.../cxf/systest/jaxrs/security/certs/cxfca.jks | Bin 891 -> 961 bytes
.../src/test/resources/certs/alice.jks | Bin 3984 -> 4125 bytes
.../src/test/resources/certs/bob.jks | Bin 3979 -> 4122 bytes
.../src/test/resources/certs/cxfca.jks | Bin 891 -> 961 bytes
.../src/test/resources/keys/alice.jks | Bin 3984 -> 4125 bytes
.../src/test/resources/keys/bob.jks | Bin 3979 -> 4122 bytes
.../src/test/resources/keys/cxfca.jks | Bin 891 -> 961 bytes
.../transports/src/test/resources/keys/alice.jks | Bin 3984 -> 4125 bytes
.../transports/src/test/resources/keys/bob.jks | Bin 3979 -> 4122 bytes
.../transports/src/test/resources/keys/cxfca.jks | Bin 891 -> 961 bytes
.../ws-rm/src/test/resources/certs/alice.jks | Bin 3984 -> 4125 bytes
systests/ws-rm/src/test/resources/certs/bob.jks | Bin 3979 -> 4122 bytes
.../src/test/resources/alice.jks | Bin 3984 -> 4125 bytes
.../src/test/resources/bob.jks | Bin 3979 -> 4122 bytes
.../src/test/resources/cxfca.jks | Bin 891 -> 961 bytes
.../src/test/resources/certs/alice.jks | Bin 3984 -> 4125 bytes
.../ws-security/src/test/resources/certs/bob.jks | Bin 3979 -> 4122 bytes
.../src/test/resources/certs/cxfca.jks | Bin 891 -> 961 bytes
.../src/test/resources/certs/xkms/bob.crt | Bin 932 -> 932 bytes
.../resources/certs/xkms/trusted_cas/cxfca.crt | Bin 829 -> 899 bytes
32 files changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/92c5c700/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLResponseValidatorTest.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLResponseValidatorTest.java b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLResponseValidatorTest.java
index a5921c2..f33a63b 100644
--- a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLResponseValidatorTest.java
+++ b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLResponseValidatorTest.java
@@ -462,6 +462,7 @@ public class SAMLResponseValidatorTest extends org.junit.Assert {
InputStream input = Merlin.loadInputStream(loader, "alice.jks");
keyStore.load(input, "password".toCharArray());
((Merlin)issuerCrypto).setKeyStore(keyStore);
+ issuerCrypto.setDefaultX509Identifier("alice");
response.getAssertions().add(assertion.getSaml2());
signResponse(response, "alice", "password", issuerCrypto, false);
http://git-wip-us.apache.org/repos/asf/cxf/blob/92c5c700/rt/rs/security/sso/saml/src/test/resources/alice.jks
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/saml/src/test/resources/alice.jks b/rt/rs/security/sso/saml/src/test/resources/alice.jks
index 3a788c2..213b26c 100644
Binary files a/rt/rs/security/sso/saml/src/test/resources/alice.jks and b/rt/rs/security/sso/saml/src/test/resources/alice.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/92c5c700/rt/rs/security/xml/src/test/resources/alice.jks
----------------------------------------------------------------------
diff --git a/rt/rs/security/xml/src/test/resources/alice.jks b/rt/rs/security/xml/src/test/resources/alice.jks
index 3a788c2..213b26c 100644
Binary files a/rt/rs/security/xml/src/test/resources/alice.jks and b/rt/rs/security/xml/src/test/resources/alice.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/92c5c700/rt/ws/security/src/test/resources/alice.jks
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/resources/alice.jks b/rt/ws/security/src/test/resources/alice.jks
index 9b8c450..213b26c 100644
Binary files a/rt/ws/security/src/test/resources/alice.jks and b/rt/ws/security/src/test/resources/alice.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/92c5c700/rt/ws/security/src/test/resources/cxfca.jks
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/resources/cxfca.jks b/rt/ws/security/src/test/resources/cxfca.jks
index 2473611..53ad239 100644
Binary files a/rt/ws/security/src/test/resources/cxfca.jks and b/rt/ws/security/src/test/resources/cxfca.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/92c5c700/services/xkms/xkms-client/src/test/resources/certs/alice.jks
----------------------------------------------------------------------
diff --git a/services/xkms/xkms-client/src/test/resources/certs/alice.jks b/services/xkms/xkms-client/src/test/resources/certs/alice.jks
index 9f47a5c..213b26c 100644
Binary files a/services/xkms/xkms-client/src/test/resources/certs/alice.jks and b/services/xkms/xkms-client/src/test/resources/certs/alice.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/92c5c700/services/xkms/xkms-client/src/test/resources/certs/bob.jks
----------------------------------------------------------------------
diff --git a/services/xkms/xkms-client/src/test/resources/certs/bob.jks b/services/xkms/xkms-client/src/test/resources/certs/bob.jks
index 26df583..5550912 100644
Binary files a/services/xkms/xkms-client/src/test/resources/certs/bob.jks and b/services/xkms/xkms-client/src/test/resources/certs/bob.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/92c5c700/services/xkms/xkms-client/src/test/resources/certs/cxfca.jks
----------------------------------------------------------------------
diff --git a/services/xkms/xkms-client/src/test/resources/certs/cxfca.jks b/services/xkms/xkms-client/src/test/resources/certs/cxfca.jks
index accd45b..53ad239 100644
Binary files a/services/xkms/xkms-client/src/test/resources/certs/cxfca.jks and b/services/xkms/xkms-client/src/test/resources/certs/cxfca.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/92c5c700/systests/kerberos/src/test/resources/alice.jks
----------------------------------------------------------------------
diff --git a/systests/kerberos/src/test/resources/alice.jks b/systests/kerberos/src/test/resources/alice.jks
index 9b8c450..213b26c 100644
Binary files a/systests/kerberos/src/test/resources/alice.jks and b/systests/kerberos/src/test/resources/alice.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/92c5c700/systests/kerberos/src/test/resources/bob.jks
----------------------------------------------------------------------
diff --git a/systests/kerberos/src/test/resources/bob.jks b/systests/kerberos/src/test/resources/bob.jks
index 6744c7c..5550912 100644
Binary files a/systests/kerberos/src/test/resources/bob.jks and b/systests/kerberos/src/test/resources/bob.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/92c5c700/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/alice.jks
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/alice.jks b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/alice.jks
index 9b8c450..213b26c 100644
Binary files a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/alice.jks and b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/alice.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/92c5c700/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/bob.jks
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/bob.jks b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/bob.jks
index 6744c7c..5550912 100644
Binary files a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/bob.jks and b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/bob.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/92c5c700/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/cxfca.jks
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/cxfca.jks b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/cxfca.jks
index 2473611..53ad239 100644
Binary files a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/cxfca.jks and b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/cxfca.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/92c5c700/systests/transport-jms/src/test/resources/certs/alice.jks
----------------------------------------------------------------------
diff --git a/systests/transport-jms/src/test/resources/certs/alice.jks b/systests/transport-jms/src/test/resources/certs/alice.jks
index 9b8c450..213b26c 100644
Binary files a/systests/transport-jms/src/test/resources/certs/alice.jks and b/systests/transport-jms/src/test/resources/certs/alice.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/92c5c700/systests/transport-jms/src/test/resources/certs/bob.jks
----------------------------------------------------------------------
diff --git a/systests/transport-jms/src/test/resources/certs/bob.jks b/systests/transport-jms/src/test/resources/certs/bob.jks
index 6744c7c..5550912 100644
Binary files a/systests/transport-jms/src/test/resources/certs/bob.jks and b/systests/transport-jms/src/test/resources/certs/bob.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/92c5c700/systests/transport-jms/src/test/resources/certs/cxfca.jks
----------------------------------------------------------------------
diff --git a/systests/transport-jms/src/test/resources/certs/cxfca.jks b/systests/transport-jms/src/test/resources/certs/cxfca.jks
index 2473611..53ad239 100644
Binary files a/systests/transport-jms/src/test/resources/certs/cxfca.jks and b/systests/transport-jms/src/test/resources/certs/cxfca.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/92c5c700/systests/transports-ssl3/src/test/resources/keys/alice.jks
----------------------------------------------------------------------
diff --git a/systests/transports-ssl3/src/test/resources/keys/alice.jks b/systests/transports-ssl3/src/test/resources/keys/alice.jks
index 9b8c450..213b26c 100644
Binary files a/systests/transports-ssl3/src/test/resources/keys/alice.jks and b/systests/transports-ssl3/src/test/resources/keys/alice.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/92c5c700/systests/transports-ssl3/src/test/resources/keys/bob.jks
----------------------------------------------------------------------
diff --git a/systests/transports-ssl3/src/test/resources/keys/bob.jks b/systests/transports-ssl3/src/test/resources/keys/bob.jks
index 6744c7c..5550912 100644
Binary files a/systests/transports-ssl3/src/test/resources/keys/bob.jks and b/systests/transports-ssl3/src/test/resources/keys/bob.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/92c5c700/systests/transports-ssl3/src/test/resources/keys/cxfca.jks
----------------------------------------------------------------------
diff --git a/systests/transports-ssl3/src/test/resources/keys/cxfca.jks b/systests/transports-ssl3/src/test/resources/keys/cxfca.jks
index 2473611..53ad239 100644
Binary files a/systests/transports-ssl3/src/test/resources/keys/cxfca.jks and b/systests/transports-ssl3/src/test/resources/keys/cxfca.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/92c5c700/systests/transports/src/test/resources/keys/alice.jks
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/keys/alice.jks b/systests/transports/src/test/resources/keys/alice.jks
index 9b8c450..213b26c 100644
Binary files a/systests/transports/src/test/resources/keys/alice.jks and b/systests/transports/src/test/resources/keys/alice.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/92c5c700/systests/transports/src/test/resources/keys/bob.jks
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/keys/bob.jks b/systests/transports/src/test/resources/keys/bob.jks
index 6744c7c..5550912 100644
Binary files a/systests/transports/src/test/resources/keys/bob.jks and b/systests/transports/src/test/resources/keys/bob.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/92c5c700/systests/transports/src/test/resources/keys/cxfca.jks
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/keys/cxfca.jks b/systests/transports/src/test/resources/keys/cxfca.jks
index 2473611..53ad239 100644
Binary files a/systests/transports/src/test/resources/keys/cxfca.jks and b/systests/transports/src/test/resources/keys/cxfca.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/92c5c700/systests/ws-rm/src/test/resources/certs/alice.jks
----------------------------------------------------------------------
diff --git a/systests/ws-rm/src/test/resources/certs/alice.jks b/systests/ws-rm/src/test/resources/certs/alice.jks
index 9b8c450..213b26c 100644
Binary files a/systests/ws-rm/src/test/resources/certs/alice.jks and b/systests/ws-rm/src/test/resources/certs/alice.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/92c5c700/systests/ws-rm/src/test/resources/certs/bob.jks
----------------------------------------------------------------------
diff --git a/systests/ws-rm/src/test/resources/certs/bob.jks b/systests/ws-rm/src/test/resources/certs/bob.jks
index 6744c7c..5550912 100644
Binary files a/systests/ws-rm/src/test/resources/certs/bob.jks and b/systests/ws-rm/src/test/resources/certs/bob.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/92c5c700/systests/ws-security-examples/src/test/resources/alice.jks
----------------------------------------------------------------------
diff --git a/systests/ws-security-examples/src/test/resources/alice.jks b/systests/ws-security-examples/src/test/resources/alice.jks
index 9b8c450..213b26c 100644
Binary files a/systests/ws-security-examples/src/test/resources/alice.jks and b/systests/ws-security-examples/src/test/resources/alice.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/92c5c700/systests/ws-security-examples/src/test/resources/bob.jks
----------------------------------------------------------------------
diff --git a/systests/ws-security-examples/src/test/resources/bob.jks b/systests/ws-security-examples/src/test/resources/bob.jks
index 6744c7c..5550912 100644
Binary files a/systests/ws-security-examples/src/test/resources/bob.jks and b/systests/ws-security-examples/src/test/resources/bob.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/92c5c700/systests/ws-security-examples/src/test/resources/cxfca.jks
----------------------------------------------------------------------
diff --git a/systests/ws-security-examples/src/test/resources/cxfca.jks b/systests/ws-security-examples/src/test/resources/cxfca.jks
index 2473611..53ad239 100644
Binary files a/systests/ws-security-examples/src/test/resources/cxfca.jks and b/systests/ws-security-examples/src/test/resources/cxfca.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/92c5c700/systests/ws-security/src/test/resources/certs/alice.jks
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/certs/alice.jks b/systests/ws-security/src/test/resources/certs/alice.jks
index 9b8c450..213b26c 100644
Binary files a/systests/ws-security/src/test/resources/certs/alice.jks and b/systests/ws-security/src/test/resources/certs/alice.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/92c5c700/systests/ws-security/src/test/resources/certs/bob.jks
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/certs/bob.jks b/systests/ws-security/src/test/resources/certs/bob.jks
index 6744c7c..5550912 100644
Binary files a/systests/ws-security/src/test/resources/certs/bob.jks and b/systests/ws-security/src/test/resources/certs/bob.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/92c5c700/systests/ws-security/src/test/resources/certs/cxfca.jks
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/certs/cxfca.jks b/systests/ws-security/src/test/resources/certs/cxfca.jks
index 2473611..53ad239 100644
Binary files a/systests/ws-security/src/test/resources/certs/cxfca.jks and b/systests/ws-security/src/test/resources/certs/cxfca.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/92c5c700/systests/ws-security/src/test/resources/certs/xkms/bob.crt
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/certs/xkms/bob.crt b/systests/ws-security/src/test/resources/certs/xkms/bob.crt
index af2032f..aea40a0 100644
Binary files a/systests/ws-security/src/test/resources/certs/xkms/bob.crt and b/systests/ws-security/src/test/resources/certs/xkms/bob.crt differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/92c5c700/systests/ws-security/src/test/resources/certs/xkms/trusted_cas/cxfca.crt
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/certs/xkms/trusted_cas/cxfca.crt b/systests/ws-security/src/test/resources/certs/xkms/trusted_cas/cxfca.crt
index 96d6d7d..99d8164 100644
Binary files a/systests/ws-security/src/test/resources/certs/xkms/trusted_cas/cxfca.crt and b/systests/ws-security/src/test/resources/certs/xkms/trusted_cas/cxfca.crt differ