cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [1/2] cxf git commit: Some stuff left out of the last commit
Date Fri, 10 Apr 2015 14:32:12 GMT
Repository: cxf
Updated Branches:
  refs/heads/master e3624e62b -> 577ccc51c


Some stuff left out of the last commit


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/577ccc51
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/577ccc51
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/577ccc51

Branch: refs/heads/master
Commit: 577ccc51c269c66e7810eb4aad9f93cb23c78f8e
Parents: 731d7df
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Fri Apr 10 15:31:39 2015 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Fri Apr 10 15:32:05 2015 +0100

----------------------------------------------------------------------
 .../cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java  |  9 ++++++---
 .../ws/security/wss4j/AbstractWSS4JStaxInterceptor.java  | 11 +++++++----
 .../cxf/sts/token/validator/UsernameTokenValidator.java  |  2 +-
 3 files changed, 14 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/577ccc51/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java
index d520907..5d96f2d 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java
@@ -20,7 +20,6 @@ package org.apache.cxf.ws.security.wss4j;
 
 import java.net.URI;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
@@ -47,8 +46,12 @@ import org.apache.wss4j.dom.handler.WSHandlerConstants;
 public abstract class AbstractWSS4JInterceptor extends WSHandler implements SoapInterceptor,

     PhaseInterceptor<SoapMessage> {
 
-    private static final Set<QName> HEADERS = 
-        Collections.singleton(new QName(WSConstants.WSSE_NS, "Security"));
+    private static final Set<QName> HEADERS = new HashSet<>();
+    
+    static {
+        HEADERS.add(new QName(WSConstants.WSSE_NS, "Security"));
+        HEADERS.add(new QName(WSConstants.ENC_NS, "EncryptedData"));
+    }
 
     private Map<String, Object> properties = new ConcurrentHashMap<>();
     private final Set<String> before = new HashSet<>();

http://git-wip-us.apache.org/repos/asf/cxf/blob/577ccc51/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JStaxInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JStaxInterceptor.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JStaxInterceptor.java
index fbce336..27737f8 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JStaxInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JStaxInterceptor.java
@@ -64,11 +64,14 @@ import org.apache.wss4j.stax.ext.WSSSecurityProperties;
 public abstract class AbstractWSS4JStaxInterceptor implements SoapInterceptor, 
     PhaseInterceptor<SoapMessage> {
 
-    private static final Set<QName> HEADERS = 
-        Collections.singleton(new QName(WSConstants.WSSE_NS, "Security"));
-    
     private static final Logger LOG = LogUtils.getL7dLogger(AbstractWSS4JStaxInterceptor.class);
-
+    private static final Set<QName> HEADERS = new HashSet<>();
+    
+    static {
+        HEADERS.add(new QName(WSConstants.WSSE_NS, "Security"));
+        HEADERS.add(new QName(WSConstants.ENC_NS, "EncryptedData"));
+    }
+    
     private final Map<String, Object> properties;
     private final WSSSecurityProperties userSecurityProperties;
     private Map<String, Crypto> cryptos = new ConcurrentHashMap<>();

http://git-wip-us.apache.org/repos/asf/cxf/blob/577ccc51/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/UsernameTokenValidator.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/UsernameTokenValidator.java
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/UsernameTokenValidator.java
index cc9907c..5d0a80c 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/UsernameTokenValidator.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/UsernameTokenValidator.java
@@ -165,7 +165,7 @@ public class UsernameTokenValidator implements TokenValidator {
         //
         try {
             boolean allowNamespaceQualifiedPasswordTypes = 
-                wssConfig.getAllowNamespaceQualifiedPasswordTypes();
+                requestData.isAllowNamespaceQualifiedPasswordTypes();
             UsernameToken ut = 
                 new UsernameToken(usernameTokenElement, allowNamespaceQualifiedPasswordTypes,

                                   new BSPEnforcer());


Mime
View raw message