Author: dkulp
Date: Tue Oct 5 19:34:05 2010
New Revision: 1004781
URL: http://svn.apache.org/viewvc?rev=1004781&view=rev
Log:
Merged revisions 1004779 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1004779 | dkulp | 2010-10-05 15:28:15 -0400 (Tue, 05 Oct 2010) | 1 line
[CXF-2890] Allow supporting token without transportbinding.
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/WSSecurityInterceptorProvider.java
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java
cxf/branches/2.2.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWss4JInOutTest.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java?rev=1004781&r1=1004780&r2=1004781&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
Tue Oct 5 19:34:05 2010
@@ -44,6 +44,8 @@ import org.apache.cxf.ws.security.tokens
import org.apache.cxf.ws.security.tokenstore.SecurityToken;
import org.apache.cxf.ws.security.tokenstore.TokenStore;
import org.apache.cxf.ws.security.trust.STSClient;
+import org.apache.cxf.ws.security.wss4j.PolicyBasedWSS4JInInterceptor;
+import org.apache.cxf.ws.security.wss4j.PolicyBasedWSS4JOutInterceptor;
import org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor;
import org.apache.ws.security.handler.WSHandlerConstants;
import org.apache.ws.security.handler.WSHandlerResult;
@@ -55,6 +57,14 @@ public class IssuedTokenInterceptorProvi
public IssuedTokenInterceptorProvider() {
super(Arrays.asList(SP11Constants.ISSUED_TOKEN,
SP12Constants.ISSUED_TOKEN));
+
+ //issued tokens can be attached as a supporting token without
+ //any type of binding. Make sure we can support that.
+ this.getOutInterceptors().add(PolicyBasedWSS4JOutInterceptor.INSTANCE);
+
this.getOutFaultInterceptors().add(PolicyBasedWSS4JOutInterceptor.INSTANCE);
+ this.getInInterceptors().add(PolicyBasedWSS4JInInterceptor.INSTANCE);
+
this.getInFaultInterceptors().add(PolicyBasedWSS4JInInterceptor.INSTANCE);
+
this.getOutInterceptors().add(new IssuedTokenOutInterceptor());
this.getOutFaultInterceptors().add(new IssuedTokenOutInterceptor());
this.getInInterceptors().add(new IssuedTokenInInterceptor());
@@ -186,6 +196,7 @@ public class IssuedTokenInterceptorProvi
public IssuedTokenInInterceptor() {
super(Phase.PRE_PROTOCOL);
addAfter(WSS4JInInterceptor.class.getName());
+ addAfter(PolicyBasedWSS4JInInterceptor.class.getName());
}
public void handleMessage(Message message) throws Fault {
Modified:
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/WSSecurityInterceptorProvider.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/WSSecurityInterceptorProvider.java?rev=1004781&r1=1004780&r2=1004781&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/WSSecurityInterceptorProvider.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/WSSecurityInterceptorProvider.java
Tue Oct 5 19:34:05 2010
@@ -44,9 +44,9 @@ public class WSSecurityInterceptorProvid
public WSSecurityInterceptorProvider() {
super(ASSERTION_TYPES);
- this.getOutInterceptors().add(new PolicyBasedWSS4JOutInterceptor());
- this.getOutFaultInterceptors().add(new
PolicyBasedWSS4JOutInterceptor());
- this.getInInterceptors().add(new PolicyBasedWSS4JInInterceptor());
- this.getInFaultInterceptors().add(new PolicyBasedWSS4JInInterceptor());
+ this.getOutInterceptors().add(PolicyBasedWSS4JOutInterceptor.INSTANCE);
+
this.getOutFaultInterceptors().add(PolicyBasedWSS4JOutInterceptor.INSTANCE);
+ this.getInInterceptors().add(PolicyBasedWSS4JInInterceptor.INSTANCE);
+
this.getInFaultInterceptors().add(PolicyBasedWSS4JInInterceptor.INSTANCE);
}
}
Modified:
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java?rev=1004781&r1=1004780&r2=1004781&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
Tue Oct 5 19:34:05 2010
@@ -86,6 +86,8 @@ import org.apache.ws.security.handler.WS
*/
public class PolicyBasedWSS4JInInterceptor extends WSS4JInInterceptor {
public static final String PROPERTIES_CACHE =
"ws-security.properties.cache";
+ public static final PolicyBasedWSS4JInInterceptor INSTANCE
+ = new PolicyBasedWSS4JInInterceptor();
/**
*
Modified:
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java?rev=1004781&r1=1004780&r2=1004781&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java
Tue Oct 5 19:34:05 2010
@@ -47,7 +47,8 @@ import org.apache.ws.security.message.WS
public class PolicyBasedWSS4JOutInterceptor extends
AbstractPhaseInterceptor<SoapMessage> {
public static final String SECURITY_PROCESSED =
PolicyBasedWSS4JOutInterceptor.class.getName() + ".DONE";
-
+ public static final PolicyBasedWSS4JOutInterceptor INSTANCE = new
PolicyBasedWSS4JOutInterceptor();
+
private PolicyBasedWSS4JOutInterceptorInternal ending;
private SAAJOutInterceptor saajOut = new SAAJOutInterceptor();
Modified:
cxf/branches/2.2.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWss4JInOutTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWss4JInOutTest.java?rev=1004781&r1=1004780&r2=1004781&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWss4JInOutTest.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWss4JInOutTest.java
Tue Oct 5 19:34:05 2010
@@ -873,7 +873,7 @@ public class PolicyBasedWss4JInOutTest e
}
private PolicyBasedWSS4JOutInterceptorInternal getOutInterceptor() {
- return (new
PolicyBasedWSS4JOutInterceptor()).createEndingInterceptor();
+ return
PolicyBasedWSS4JOutInterceptor.INSTANCE.createEndingInterceptor();
}
private PolicyBasedWSS4JInInterceptor getInInterceptor(List<CoverageType>
types) {
