cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [1/3] cxf git commit: CXF-7255 - Allow empty ("") passwords when calling a service
Date Mon, 20 Feb 2017 16:53:55 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 030437b55 -> b2bad7f9e


CXF-7255 - Allow empty ("") passwords when calling a service

# Conflicts:
#	rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java


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

Branch: refs/heads/3.1.x-fixes
Commit: 5aaf49b18e4c2962eeb2260ad30072b553838efb
Parents: 030437b
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Mon Feb 20 16:02:13 2017 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Mon Feb 20 16:53:29 2017 +0000

----------------------------------------------------------------------
 .../security/wss4j/policyhandlers/AbstractBindingBuilder.java   | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/5aaf49b1/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
index f187e9c..2b53c20 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
@@ -803,8 +803,13 @@ public abstract class AbstractBindingBuilder extends AbstractCommonBindingHandle
                 if (StringUtils.isEmpty(password)) {
                     password = getPassword(userName, token, WSPasswordCallback.USERNAME_TOKEN);
                 }
+<<<<<<< HEAD
             
                 if (!StringUtils.isEmpty(password)) {
+=======
+
+                if (password != null) {
+>>>>>>> f91541b... CXF-7255 - Allow empty ("") passwords when calling
a service
                     // If the password is available then build the token
                     if (token.getPasswordType() == UsernameToken.PasswordType.HashPassword)
{
                         utBuilder.setPasswordType(WSConstants.PASSWORD_DIGEST);


Mime
View raw message