cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1524715 - in /cxf/branches/2.7.x-fixes: rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/ systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/client/ systests/ws-security/src/test/resources/org/apache/cxf/...
Date Thu, 19 Sep 2013 12:41:34 GMT
Author: coheigea
Date: Thu Sep 19 12:41:34 2013
New Revision: 1524715

URL: http://svn.apache.org/r1524715
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

Modified:
    cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
    cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/client/client.xml
    cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server/server.xml

Modified: cxf/branches/2.7.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.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java?rev=1524715&r1=1524714&r2=1524715&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
(original)
+++ cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
Thu Sep 19 12:41:34 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.

Modified: cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/client/client.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/client/client.xml?rev=1524715&r1=1524714&r2=1524715&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/client/client.xml
(original)
+++ cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/client/client.xml
Thu Sep 19 12:41:34 2013
@@ -117,7 +117,7 @@
                <constructor-arg>
                    <map>
                         <entry key="action" value="Signature Timestamp"/> 
-                        <entry key="user" value="alice"/>
+                        <entry key="signatureUser" value="alice"/>
                         <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
                         <entry key="signatureKeyIdentifier" value="DirectReference"/>
                         <entry key="signatureParts"

Modified: cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server/server.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server/server.xml?rev=1524715&r1=1524714&r2=1524715&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server/server.xml
(original)
+++ cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server/server.xml
Thu Sep 19 12:41:34 2013
@@ -135,7 +135,7 @@
                <constructor-arg>
                    <map>
                         <entry key="action" value="Signature"/> 
-                        <entry key="user" value="bob"/> 
+                        <entry key="signatureUser" value="bob"/> 
                         <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/wssec10/server/bob.properties"/>
                         <entry key="signatureKeyIdentifier" value="DirectReference"/>
                         <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.wssec10.server.KeystorePasswordCallback"/>



Mime
View raw message