You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2013/09/19 15:06:51 UTC
svn commit: r1524726 -
/cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
Author: coheigea
Date: Thu Sep 19 13:06:51 2013
New Revision: 1524726
URL: http://svn.apache.org/r1524726
Log:
Allow "signatureUser" to be configured instead of "user".
Conflicts:
systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/client/client.xml
systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server/server.xml
Conflicts:
systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/client/client.xml
systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server/server.xml
Modified:
cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
Modified: cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java?rev=1524726&r1=1524725&r2=1524726&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java (original)
+++ cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java Thu Sep 19 13:06:51 2013
@@ -217,8 +217,8 @@ public class WSS4JOutInterceptor extends
* username is available and then get a passowrd.
*/
if ((doAction & (WSConstants.SIGN | WSConstants.UT | WSConstants.UT_SIGN)) != 0
- && (reqData.getUsername() == null
- || reqData.getUsername().equals(""))) {
+ && (reqData.getUsername() == null || reqData.getUsername().equals(""))
+ && (String)getOption(WSHandlerConstants.SIGNATURE_USER) == null) {
/*
* We need a username - if none throw an SoapFault. For
* encryption there is a specific parameter to get a username.