Author: werner
Date: Mon Sep 5 11:35:41 2005
New Revision: 278807
URL: http://svn.apache.org/viewcvs?rev=278807&view=rev
Log:
Disable handling of old (draft) namespaces, clean up code and WSSConfig usage,
prepare to
add WSS 1.1 features. See also E-mail, Subject "Re: Extending WSS4J to the new
OASIS specs"
from Sep, 5th.
Modified:
webservices/wss4j/trunk/src/org/apache/ws/axis/security/WSDoAllReceiver.java
webservices/wss4j/trunk/src/org/apache/ws/axis/security/WSDoAllSender.java
webservices/wss4j/trunk/src/org/apache/ws/axis/security/handler/WSDoAllHandler.java
Modified:
webservices/wss4j/trunk/src/org/apache/ws/axis/security/WSDoAllReceiver.java
URL:
http://svn.apache.org/viewcvs/webservices/wss4j/trunk/src/org/apache/ws/axis/security/WSDoAllReceiver.java?rev=278807&r1=278806&r2=278807&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/axis/security/WSDoAllReceiver.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/axis/security/WSDoAllReceiver.java
Mon Sep 5 11:35:41 2005
@@ -1,5 +1,5 @@
/*
-* Copyright 2003-2004 The Apache Software Foundation.
+* Copyright 2003-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -65,7 +65,7 @@
*/
public void invoke(MessageContext msgContext) throws AxisFault {
- doDebug = log.isDebugEnabled();
+ boolean doDebug = log.isDebugEnabled();
if (doDebug) {
log.debug("WSDoAllReceiver: enter invoke() with msg type: "
@@ -142,14 +142,7 @@
* Get and check the Signature specific parameters first because
* they may be used for encryption too.
*/
-
- if ((doAction & WSConstants.SIGN) == WSConstants.SIGN) {
- decodeSignatureParameter2(reqData);
- }
-
- if ((doAction & WSConstants.ENCR) == WSConstants.ENCR) {
- decodeDecryptionParameter(reqData);
- }
+ doReceiverAction(doAction, reqData);
Vector wsResult = null;
try {
@@ -169,6 +162,9 @@
}
}
+ if (reqData.getWssConfig().isEnableSignatureConfirmation() &&
msgContext.getPastPivot()) {
+ checkSignatureConfirmation(reqData, wsResult);
+ }
/*
* save the processed-header flags
*/
Modified:
webservices/wss4j/trunk/src/org/apache/ws/axis/security/WSDoAllSender.java
URL:
http://svn.apache.org/viewcvs/webservices/wss4j/trunk/src/org/apache/ws/axis/security/WSDoAllSender.java?rev=278807&r1=278806&r2=278807&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/axis/security/WSDoAllSender.java
(original)
+++ webservices/wss4j/trunk/src/org/apache/ws/axis/security/WSDoAllSender.java
Mon Sep 5 11:35:41 2005
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation.
+ * Copyright 2003-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -50,15 +50,15 @@
*/
public void invoke(MessageContext mc) throws AxisFault {
- doDebug = log.isDebugEnabled();
- if (doDebug && mc.getCurrentMessage() != null &&
mc.getCurrentMessage().getMessageType() != null) {
+ boolean doDebug = log.isDebugEnabled();
+ if (doDebug && mc.getCurrentMessage() != null
+ && mc.getCurrentMessage().getMessageType() != null) {
log.debug("WSDoAllSender: enter invoke() with msg type: "
+ mc.getCurrentMessage().getMessageType());
}
RequestData reqData = new RequestData();
- reqData.setNoSerialization(false);
reqData.setMsgContext(mc);
/*
* The overall try, just to have a finally at the end to perform some
@@ -132,7 +132,7 @@
* Now we can perform our security operations on this request.
*/
Document doc = null;
- Message message =
((MessageContext)reqData.getMsgContext()).getCurrentMessage();
+ Message message = mc.getCurrentMessage();
/**
* There is nothing to send...Usually happens when the provider
needs to
@@ -158,7 +158,7 @@
+ e);
}
}
- doSenderAction(doAction, doc, reqData, actions);
+ doSenderAction(doAction, doc, reqData, actions,
!mc.getPastPivot());
/*
* If required convert the resulting document into a message
first.
Modified:
webservices/wss4j/trunk/src/org/apache/ws/axis/security/handler/WSDoAllHandler.java
URL:
http://svn.apache.org/viewcvs/webservices/wss4j/trunk/src/org/apache/ws/axis/security/handler/WSDoAllHandler.java?rev=278807&r1=278806&r2=278807&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/axis/security/handler/WSDoAllHandler.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/axis/security/handler/WSDoAllHandler.java
Mon Sep 5 11:35:41 2005
@@ -176,6 +176,10 @@
public Object getProperty(Object msgContext, String key) {
return ((MessageContext)msgContext).getProperty(key);
}
+
+ public void setProperty(Object msgContext, String key, Object value) {
+ ((MessageContext)msgContext).setProperty(key, value);
+ }
public String getPassword(Object msgContext) {
return ((MessageContext)msgContext).getPassword();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
