Author: coheigea
Date: Fri Oct 21 09:36:50 2011
New Revision: 1187255
URL: http://svn.apache.org/viewvc?rev=1187255&view=rev
Log:
[WSS-321] - Added a UsernameTokenNoPassword action for use on the receiving
side.
Modified:
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/handler/WSHandlerConstants.java
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/util/WSSecurityUtil.java
webservices/wss4j/trunk/src/site/xdoc/config.xml
Modified:
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/handler/WSHandlerConstants.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/handler/WSHandlerConstants.java?rev=1187255&r1=1187254&r2=1187255&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/handler/WSHandlerConstants.java
(original)
+++
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/handler/WSHandlerConstants.java
Fri Oct 21 09:36:50 2011
@@ -56,6 +56,11 @@ public class WSHandlerConstants {
* Perform a UsernameToken action.
*/
public static final String USERNAME_TOKEN = "UsernameToken";
+
+ /**
+ * Perform a UsernameToken action with no password.
+ */
+ public static final String USERNAME_TOKEN_NO_PASSWORD =
"UsernameTokenNoPassword";
/**
* Perform an unsigned SAML Token action.
Modified:
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/util/WSSecurityUtil.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/util/WSSecurityUtil.java?rev=1187255&r1=1187254&r2=1187255&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/util/WSSecurityUtil.java
(original)
+++
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/util/WSSecurityUtil.java
Fri Oct 21 09:36:50 2011
@@ -864,6 +864,9 @@ public class WSSecurityUtil {
} else if (single[i].equals(WSHandlerConstants.USERNAME_TOKEN)) {
doAction |= WSConstants.UT;
actions.add(new Integer(WSConstants.UT));
+ } else if
(single[i].equals(WSHandlerConstants.USERNAME_TOKEN_NO_PASSWORD)) {
+ doAction |= WSConstants.UT_NOPASSWORD;
+ actions.add(new Integer(WSConstants.UT_NOPASSWORD));
} else if (single[i].equals(WSHandlerConstants.SIGNATURE)) {
doAction |= WSConstants.SIGN;
actions.add(new Integer(WSConstants.SIGN));
Modified: webservices/wss4j/trunk/src/site/xdoc/config.xml
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/site/xdoc/config.xml?rev=1187255&r1=1187254&r2=1187255&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/site/xdoc/config.xml (original)
+++ webservices/wss4j/trunk/src/site/xdoc/config.xml Fri Oct 21 09:36:50 2011
@@ -180,6 +180,11 @@ The configuration tags for WSHandler Act
<td>Perform a UsernameToken action.</td>
</tr>
<tr>
+<td>USERNAME_TOKEN_NO_PASSWORD</td>
+<td>UsernameTokenNoPassword</td>
+<td>Used on the receiving side to specify a UsernameToken with no password</td>
+</tr>
+<tr>
<td>SAML_TOKEN_UNSIGNED</td>
<td>SAMLTokenUnsigned</td>
<td>Perform an unsigned SAML Token action.</td>
