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:42:08 UTC
svn commit: r911873 - in /cxf/trunk/rt:
core/src/main/java/org/apache/cxf/feature/
ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/
ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/
Author: dkulp
Date: Fri Feb 19 17:42:07 2010
New Revision: 911873
URL: http://svn.apache.org/viewvc?rev=911873&view=rev
Log:
If policy just wants a username token (and not https protection or
anything), allow that.
Modified:
cxf/trunk/rt/core/src/main/java/org/apache/cxf/feature/LoggingFeature.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/WSSecurityInterceptorProvider.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/WSSecurityPolicyInterceptorProvider.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java
Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/feature/LoggingFeature.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/feature/LoggingFeature.java?rev=911873&r1=911872&r2=911873&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/feature/LoggingFeature.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/feature/LoggingFeature.java Fri Feb 19 17:42:07 2010
@@ -55,6 +55,18 @@
public LoggingFeature() {
}
+ public LoggingFeature(int lim) {
+ limit = lim;
+ }
+ public LoggingFeature(String in, String out) {
+ inLocation = in;
+ outLocation = out;
+ }
+ public LoggingFeature(String in, String out, int lim) {
+ inLocation = in;
+ outLocation = out;
+ limit = lim;
+ }
public LoggingFeature(Logging annotation) {
inLocation = annotation.inLocation();
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/WSSecurityInterceptorProvider.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/WSSecurityInterceptorProvider.java?rev=911873&r1=911872&r2=911873&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/WSSecurityInterceptorProvider.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/WSSecurityInterceptorProvider.java Fri Feb 19 17:42:07 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/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/WSSecurityPolicyInterceptorProvider.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/WSSecurityPolicyInterceptorProvider.java?rev=911873&r1=911872&r2=911873&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/WSSecurityPolicyInterceptorProvider.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/WSSecurityPolicyInterceptorProvider.java Fri Feb 19 17:42:07 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/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java?rev=911873&r1=911872&r2=911873&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java Fri Feb 19 17:42:07 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);