ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1814830 - /webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SAMLTokenSignedAction.java
Date Fri, 10 Nov 2017 11:23:51 GMT
Author: coheigea
Date: Fri Nov 10 11:23:50 2017
New Revision: 1814830

URL: http://svn.apache.org/viewvc?rev=1814830&view=rev
Log:
WSS-617 - Allow to configure the SAML Signed Action with "signatureUser"

(cherry picked from commit 712f514f4215356c3453247e65d3a0c0a9018dbf)

Modified:
    webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SAMLTokenSignedAction.java

Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SAMLTokenSignedAction.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SAMLTokenSignedAction.java?rev=1814830&r1=1814829&r2=1814830&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SAMLTokenSignedAction.java
(original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SAMLTokenSignedAction.java
Fri Nov 10 11:23:50 2017
@@ -90,9 +90,6 @@ public class SAMLTokenSignedAction imple
 
         CallbackHandler callbackHandler =
             handler.getPasswordCallbackHandler(reqData);
-        WSPasswordCallback passwordCallback =
-            handler.getPasswordCB(reqData.getUsername(), WSConstants.ST_SIGNED, callbackHandler,
reqData);
-        wsSign.setUserInfo(reqData.getUsername(), passwordCallback.getPassword());
 
         SignatureActionToken signatureToken = null;
         if (actionToken instanceof SignatureActionToken) {
@@ -102,6 +99,10 @@ public class SAMLTokenSignedAction imple
             signatureToken = reqData.getSignatureToken();
         }
 
+        WSPasswordCallback passwordCallback =
+            handler.getPasswordCB(signatureToken.getUser(), WSConstants.ST_SIGNED, callbackHandler,
reqData);
+        wsSign.setUserInfo(signatureToken.getUser(), passwordCallback.getPassword());
+
         if (signatureToken.getKeyIdentifierId() != 0) {
             wsSign.setKeyIdentifierType(signatureToken.getKeyIdentifierId());
         }



Mime
View raw message