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 2016/02/11 12:43:37 UTC
cxf git commit: Enabling a test
Repository: cxf
Updated Branches:
refs/heads/master c6fb2db07 -> 5fb017cfd
Enabling a test
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5fb017cf
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5fb017cf
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5fb017cf
Branch: refs/heads/master
Commit: 5fb017cfd91f9dc8887589cfc60b52a8207feca2
Parents: c6fb2db
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Feb 11 11:41:46 2016 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Feb 11 11:41:46 2016 +0000
----------------------------------------------------------------------
.../org/apache/cxf/systest/sts/rest/STSRESTTest.java | 12 ++----------
.../org/apache/cxf/systest/sts/rest/cxf-rest-sts.xml | 3 +++
2 files changed, 5 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/5fb017cf/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/rest/STSRESTTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/rest/STSRESTTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/rest/STSRESTTest.java
index baddaae..b25a204 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/rest/STSRESTTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/rest/STSRESTTest.java
@@ -917,7 +917,6 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
}
@org.junit.Test
- @org.junit.Ignore
public void testValidateJWTAndIssueSAML() throws Exception {
SpringBusFactory bf = new SpringBusFactory();
URL busFile = STSRESTTest.class.getResource("cxf-client.xml");
@@ -981,21 +980,14 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
}
}
assertNotNull(status);
- /*
+
// Check the token was valid
String validCode = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/status/valid";
assertEquals(validCode, status.getCode());
// Check the token
- RequestedSecurityTokenType requestedSecurityToken = getRequestedSecurityToken(securityResponse);
- assertNotNull(requestedSecurityToken);
-
- String token = ((Element)requestedSecurityToken.getAny()).getTextContent();
- assertNotNull(token);
+ validateSAMLSecurityTokenResponse(securityResponse, true);
- validateJWTToken(token, null);
- */
-
bus.shutdown(true);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/5fb017cf/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/rest/cxf-rest-sts.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/rest/cxf-rest-sts.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/rest/cxf-rest-sts.xml
index 87d4855..6736f10 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/rest/cxf-rest-sts.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/rest/cxf-rest-sts.xml
@@ -64,6 +64,7 @@
<util:list id="transportTokenValidators">
<ref bean="transportSamlTokenValidator"/>
<ref bean="transportUTTokenValidator"/>
+ <ref bean="transportJWTTokenValidator"/>
</util:list>
<util:list id="transportTokenProviders">
<ref bean="transportSamlTokenProvider"/>
@@ -78,6 +79,8 @@
</bean>
<bean id="transportJWTTokenProvider" class="org.apache.cxf.sts.token.provider.jwt.JWTTokenProvider">
</bean>
+ <bean id="transportJWTTokenValidator" class="org.apache.cxf.sts.token.validator.jwt.JWTTokenValidator">
+ </bean>
<bean id="transportSamlTokenRenewer" class="org.apache.cxf.sts.token.renewer.SAMLTokenRenewer">
<property name="verifyProofOfPossession" value="false"/>
<property name="allowRenewalAfterExpiry" value="true"/>