You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2010/02/19 18:55:38 UTC
svn commit: r911879 - in /cxf/branches/2.2.x-fixes: ./
rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/
rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/
Author: dkulp
Date: Fri Feb 19 17:55:38 2010
New Revision: 911879
URL: http://svn.apache.org/viewvc?rev=911879&view=rev
Log:
Merged revisions 911873 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r911873 | dkulp | 2010-02-19 12:42:07 -0500 (Fri, 19 Feb 2010) | 2 lines
If policy just wants a username token (and not https protection or
anything), allow that.
........
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/WSSecurityInterceptorProvider.java
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/WSSecurityPolicyInterceptorProvider.java
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.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/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=911879&r1=911878&r2=911879&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 Fri Feb 19 17:55:38 2010
@@ -25,7 +25,6 @@
import javax.xml.namespace.QName;
import org.apache.cxf.ws.policy.AbstractPolicyInterceptorProvider;
-import org.apache.cxf.ws.security.policy.SP11Constants;
import org.apache.cxf.ws.security.policy.SP12Constants;
import org.apache.cxf.ws.security.wss4j.PolicyBasedWSS4JInInterceptor;
import org.apache.cxf.ws.security.wss4j.PolicyBasedWSS4JOutInterceptor;
@@ -38,14 +37,11 @@
static {
ASSERTION_TYPES = new ArrayList<QName>();
- ASSERTION_TYPES.add(SP11Constants.TRANSPORT_BINDING);
ASSERTION_TYPES.add(SP12Constants.TRANSPORT_BINDING);
-
- ASSERTION_TYPES.add(SP11Constants.ASYMMETRIC_BINDING);
ASSERTION_TYPES.add(SP12Constants.ASYMMETRIC_BINDING);
-
- ASSERTION_TYPES.add(SP11Constants.SYMMETRIC_BINDING);
ASSERTION_TYPES.add(SP12Constants.SYMMETRIC_BINDING);
+
+ ASSERTION_TYPES.add(SP12Constants.USERNAME_TOKEN);
}
public WSSecurityInterceptorProvider() {
Modified: cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/WSSecurityPolicyInterceptorProvider.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/WSSecurityPolicyInterceptorProvider.java?rev=911879&r1=911878&r2=911879&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/WSSecurityPolicyInterceptorProvider.java (original)
+++ cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/WSSecurityPolicyInterceptorProvider.java Fri Feb 19 17:55:38 2010
@@ -46,7 +46,6 @@
ASSERTION_TYPES.add(SP12Constants.X509_TOKEN);
ASSERTION_TYPES.add(SP12Constants.ENCRYPTION_TOKEN);
ASSERTION_TYPES.add(SP12Constants.SIGNATURE_TOKEN);
- ASSERTION_TYPES.add(SP12Constants.USERNAME_TOKEN);
ASSERTION_TYPES.add(SP12Constants.TRANSPORT_TOKEN);
ASSERTION_TYPES.add(SP12Constants.SIGNED_PARTS);
ASSERTION_TYPES.add(SP12Constants.REQUIRED_PARTS);
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=911879&r1=911878&r2=911879&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 Fri Feb 19 17:55:38 2010
@@ -109,7 +109,9 @@
ai.setAsserted(true);
}
}
-
+ if (transport == null && isRequestor(message)) {
+ transport = new TransportBinding(SP12Constants.INSTANCE);
+ }
if (transport != null) {
WSSecHeader secHeader = new WSSecHeader(actor, mustUnderstand);