Author: coheigea
Date: Fri Jul 3 10:18:53 2009
New Revision: 790847
URL: http://svn.apache.org/viewvc?rev=790847&view=rev
Log:
Enabled setting signature confirmation through the "action" String
- In this way subclasses of WSHandler can override
decodeSignatureConfirmationAction to be false by default, but allow enabling it
via the action String
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/handler/WSHandler.java
webservices/wss4j/trunk/src/org/apache/ws/security/util/WSSecurityUtil.java
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/handler/WSHandler.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/handler/WSHandler.java?rev=790847&r1=790846&r2=790847&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/handler/WSHandler.java
(original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/handler/WSHandler.java
Fri Jul 3 10:18:53 2009
@@ -93,8 +93,9 @@
wssConfig = WSSConfig.getNewInstance();
}
+ boolean enableSigConf = decodeEnableSignatureConfirmation(reqData);
wssConfig.setEnableSignatureConfirmation(
- decodeEnableSignatureConfirmation(reqData)
+ enableSigConf || ((doAction & WSConstants.SC) != 0)
);
wssConfig.setPrecisionInMilliSeconds(
@@ -249,8 +250,9 @@
if (wssConfig == null) {
wssConfig = WSSConfig.getNewInstance();
}
+ boolean enableSigConf = decodeEnableSignatureConfirmation(reqData);
wssConfig.setEnableSignatureConfirmation(
- decodeEnableSignatureConfirmation(reqData)
+ enableSigConf || ((doAction & WSConstants.SC) != 0)
);
wssConfig.setTimeStampStrict(decodeTimestampStrict(reqData));
wssConfig.setTimeStampTTL(decodeTimeToLive(reqData));
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/util/WSSecurityUtil.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/util/WSSecurityUtil.java?rev=790847&r1=790846&r2=790847&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/util/WSSecurityUtil.java
(original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/util/WSSecurityUtil.java
Fri Jul 3 10:18:53 2009
@@ -853,6 +853,9 @@
} else if (single[i].equals(WSHandlerConstants.SIGN_WITH_UT_KEY)) {
doAction |= WSConstants.UT_SIGN;
actions.add(new Integer(WSConstants.UT_SIGN));
+ } else if
(single[i].equals(WSHandlerConstants.ENABLE_SIGNATURE_CONFIRMATION)) {
+ doAction |= WSConstants.SC;
+ actions.add(new Integer(WSConstants.SC));
} else {
throw new WSSecurityException(
"Unknown action defined: " + single[i]
@@ -910,6 +913,9 @@
} else if (single[i].equals(WSHandlerConstants.SIGN_WITH_UT_KEY)) {
doAction |= WSConstants.UT_SIGN;
actions.add(new Integer(WSConstants.UT_SIGN));
+ } else if
(single[i].equals(WSHandlerConstants.ENABLE_SIGNATURE_CONFIRMATION)) {
+ doAction |= WSConstants.SC;
+ actions.add(new Integer(WSConstants.SC));
} else {
try {
int parsedAction = Integer.parseInt(single[i]);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
