Author: ruchithf
Date: Sat Jul 14 09:17:25 2007
New Revision: 556295
URL: http://svn.apache.org/viewvc?view=rev&rev=556295
Log:
more cleanup
Modified:
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilder.java
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartReceiver.java
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/util/HandlerParameterDecoder.java
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
Modified:
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java?view=diff&rev=556295&r1=556294&r2=556295
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
Sat Jul 14 09:17:25 2007
@@ -80,7 +80,9 @@
//Add the timestamp result
if(rpd.isIncludeTimestamp() && !rpd.isTransportBinding()) {
- signatureParts.add(new
WSEncryptionPart(tsResult.getTimestamp().getID()));
+ Timestamp timestamp = (Timestamp) tsResult
+ .get(WSSecurityEngineResult.TAG_TIMESTAMP);
+ signatureParts.add(new WSEncryptionPart(timestamp.getID()));
}
validateEncrSig(encryptedParts, signatureParts, results);
@@ -110,7 +112,8 @@
results, WSConstants.SIGN);
if (actionResult != null) {
- X509Certificate returnCert = actionResult.getCertificate();
+ X509Certificate returnCert = (X509Certificate) actionResult
+ .get(WSSecurityEngineResult.TAG_X509_CERTIFICATE);
if (returnCert != null) {
if (!verifyTrust(returnCert, rmd)) {
@@ -133,7 +136,8 @@
actionResult = WSSecurityUtil.fetchActionResult(results,
WSConstants.TS);
if (actionResult != null) {
- Timestamp timestamp = actionResult.getTimestamp();
+ Timestamp timestamp = (Timestamp) actionResult
+ .get(WSSecurityEngineResult.TAG_TIMESTAMP);
if (timestamp != null) {
if (!verifyTimestamp(timestamp, rmd)) {
@@ -178,7 +182,7 @@
boolean encrDataFound = false;
for (Iterator iter = list.iterator(); iter.hasNext();) {
WSSecurityEngineResult result = (WSSecurityEngineResult)
iter.next();
- if(result.getDataRefUris() != null) {
+ if(result.get(WSSecurityEngineResult.TAG_DATA_REF_URIS) !=
null) {
encrDataFound = true;
}
}
@@ -298,7 +302,9 @@
private ArrayList getSigEncrActions(Vector results) {
ArrayList sigEncrActions = new ArrayList();
for (Iterator iter = results.iterator(); iter.hasNext();) {
- int action = ((WSSecurityEngineResult) iter.next()).getAction();
+ Integer actInt = (Integer) ((WSSecurityEngineResult) iter.next())
+ .get(WSSecurityEngineResult.TAG_ACTION);
+ int action = actInt.intValue();
if(WSConstants.SIGN == action || WSConstants.ENCR == action) {
sigEncrActions.add(new Integer(action));
}
@@ -349,7 +355,7 @@
// Find elements that are signed
Vector actuallySigned = new Vector();
if( actionResult != null ) {
- Set signedIDs = actionResult.getSignedElements();
+ Set signedIDs =
(Set)actionResult.get(WSSecurityEngineResult.TAG_SIGNED_ELEMENT_IDS);
for (Iterator i = signedIDs.iterator(); i.hasNext();) {
String e = (String) i.next();
@@ -368,7 +374,7 @@
continue;
}
- // header elemement present - verify that it is part of signature
+ // header element present - verify that it is part of signature
if( actuallySigned.contains( headerElement) ) {
continue;
}
@@ -573,7 +579,8 @@
for (Iterator iter = encrResults.iterator(); iter.hasNext();) {
WSSecurityEngineResult engineResult = (WSSecurityEngineResult)
iter.next();
- ArrayList dataRefUris = engineResult.getDataRefUris();
+ ArrayList dataRefUris = (ArrayList) engineResult
+ .get(WSSecurityEngineResult.TAG_DATA_REF_URIS);
//take only the ref list processing results
if(dataRefUris != null) {
@@ -597,7 +604,8 @@
for (int i = 0; i < results.size(); i++) {
// Check the result of every action whether it matches the given
// action
- if (((WSSecurityEngineResult) results.get(i)).getAction() ==
action) {
+ Integer actInt = (Integer)((WSSecurityEngineResult)
results.get(i)).get(WSSecurityEngineResult.TAG_ACTION);
+ if (actInt.intValue() == action) {
list.add((WSSecurityEngineResult) results.get(i));
}
}
Modified:
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java?view=diff&rev=556295&r1=556294&r2=556295
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
Sat Jul 14 09:17:25 2007
@@ -640,7 +640,7 @@
for (int i = 0; i < signatureActions.size(); i++) {
WSSecurityEngineResult wsr = (WSSecurityEngineResult)
signatureActions
.get(i);
- byte[] sigVal = wsr.getSignatureValue();
+ byte[] sigVal = (byte[])
wsr.get(WSSecurityEngineResult.TAG_SIGNATURE_VALUE);
wsc.setSignatureValue(sigVal);
wsc.prepare(doc);
RampartUtil.appendChildToSecHeader(rmd,
wsc.getSignatureConfirmationElement());
Modified:
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilder.java?view=diff&rev=556295&r1=556294&r2=556295
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilder.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilder.java
Sat Jul 14 09:17:25 2007
@@ -23,7 +23,6 @@
import org.apache.rahas.RahasConstants;
import org.apache.rahas.TrustException;
import org.apache.rampart.RampartConstants;
-import org.apache.rampart.RampartEngine;
import org.apache.rampart.RampartException;
import org.apache.rampart.RampartMessageData;
import org.apache.rampart.policy.RampartPolicyData;
Modified:
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartReceiver.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartReceiver.java?view=diff&rev=556295&r1=556294&r2=556295
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartReceiver.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartReceiver.java
Sat Jul 14 09:17:25 2007
@@ -29,7 +29,6 @@
import org.apache.rampart.RampartConstants;
import org.apache.rampart.RampartEngine;
import org.apache.rampart.RampartException;
-import org.apache.rampart.builder.TransportBindingBuilder;
import org.apache.ws.secpolicy.WSSPolicyException;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSSecurityException;
Modified:
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java?view=diff&rev=556295&r1=556294&r2=556295
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
Sat Jul 14 09:17:25 2007
@@ -43,7 +43,6 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.util.ArrayList;
-import java.util.HashSet;
import java.util.Iterator;
/**
Modified:
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/util/HandlerParameterDecoder.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/util/HandlerParameterDecoder.java?view=diff&rev=556295&r1=556294&r2=556295
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/util/HandlerParameterDecoder.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/util/HandlerParameterDecoder.java
Sat Jul 14 09:17:25 2007
@@ -26,6 +26,7 @@
import org.apache.ws.security.handler.WSHandlerConstants;
import javax.xml.namespace.QName;
+
import java.util.Iterator;
/**
@@ -67,7 +68,7 @@
outFlowSecParam =
(Parameter)msgCtx.getProperty(WSSHandlerConstants.OUTFLOW_SECURITY);
}
- //If the configs are not availabale in the file
+ //If the configs are not available in the file
if(inFlowSecParam == null) {
inFlowSecParam =
msgCtx.getParameter(WSSHandlerConstants.INFLOW_SECURITY);
}
@@ -87,8 +88,8 @@
.getFirstChildWithName(new
QName(WSSHandlerConstants.ACTION));
if (actionElem == null) {
throw new Exception(
- "Inflow configurtion must
contain an 'action' "
- + "elementas
the child of 'InflowSecurity' element");
+ "Inflow configuration must
contain an 'action' "
+ + "elements the
child of 'InflowSecurity' element");
}
Iterator childElements = actionElem.getChildElements();
@@ -160,8 +161,8 @@
.getFirstChildWithName(new
QName(WSSHandlerConstants.ACTION));
if (actionElem == null) {
throw new AxisFault(
- "Inflow configurtion must contain an 'action' "
- + "elementas the child of 'InflowSecurity'
element");
+ "Inflow configuration must contain an 'action' "
+ + "elements the child of 'InflowSecurity'
element");
}
OutflowConfiguration outflowConfiguration = new
OutflowConfiguration();
@@ -200,8 +201,8 @@
.getFirstChildWithName(new
QName(WSSHandlerConstants.ACTION));
if (actionElem == null) {
throw new AxisFault(
- "Inflow configurtion must contain an 'action' "
- + "elementas the child of 'InflowSecurity'
element");
+ "Inflow configuration must contain an 'action' "
+ + "elements the child of 'InflowSecurity'
element");
}
InflowConfiguration inflowConfiguration = new
InflowConfiguration();
@@ -251,7 +252,7 @@
Iterator children =
msgCtx.getEnvelope().getHeader().getChildElements();
while (children.hasNext()) {
OMElement element = (OMElement) children.next();
- //Sign only the quilified headers
+ //Sign only the qualified headers
//TODO check whether we can sign the unqualified header
elements
String ns = element.getNamespace().getNamespaceURI();
if(ns != null && ns.length() > 0) {
Modified:
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java?view=diff&rev=556295&r1=556294&r2=556295
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
Sat Jul 14 09:17:25 2007
@@ -16,34 +16,6 @@
package org.apache.rampart.util;
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.Properties;
-import java.util.Vector;
-
-import javax.crypto.KeyGenerator;
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.xml.namespace.QName;
-
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Properties;
-import java.util.Set;
-import java.util.Vector;
-
-import javax.crypto.KeyGenerator;
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.xml.namespace.QName;
-
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
@@ -90,6 +62,22 @@
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+import javax.crypto.KeyGenerator;
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.xml.namespace.QName;
+
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+import java.util.Vector;
+
public class RampartUtil {
private static final String CRYPTO_PROVIDER =
"org.apache.ws.security.crypto.provider";
@@ -604,10 +592,17 @@
private static Set findAllPrefixNamespaces(OMElement currentElement)
{
Set results = new HashSet();
- Iterator iter = null;
+ //Find declared namespaces
findPrefixNamespaces(currentElement,results);
+ //Get all default namespaces
+ List defaultNamespaces =
getDefaultPrefixNamespaces(currentElement.getOMFactory());
+ for (Iterator iterator = defaultNamespaces.iterator(); iterator
+ .hasNext();) {
+ OMNamespace ns = (OMNamespace) iterator.next();
+ results.add(ns);
+ }
return results;
}
@@ -630,10 +625,10 @@
}
}
- private static List findDefaultPrefixNamespaces(OMElement e)
+ private static List getDefaultPrefixNamespaces(OMFactory factory)
{
List namespaces = new ArrayList();
- OMFactory factory = e.getOMFactory();
+
// put default namespaces here (sp, soapenv, wsu, etc...)
namespaces.add(factory.createOMNamespace(WSConstants.ENC_PREFIX,
WSConstants.ENC_NS));
namespaces.add(factory.createOMNamespace(WSConstants.SIG_PREFIX,
WSConstants.SIG_NS));
@@ -841,8 +836,9 @@
for (int j = 0; j < wsSecEngineResults.size(); j++) {
WSSecurityEngineResult wser =
(WSSecurityEngineResult) wsSecEngineResults.get(j);
- if (wser.getAction() == WSConstants.SIGN) {
- return wser.getCertificate();
+ Integer actInt =
(Integer)wser.get(WSSecurityEngineResult.TAG_ACTION);
+ if (actInt.intValue() == WSConstants.SIGN) {
+ return
(X509Certificate)wser.get(WSSecurityEngineResult.TAG_X509_CERTIFICATE);
}
}
}
@@ -865,9 +861,11 @@
for (int j = 0; j < wsSecEngineResults.size(); j++) {
WSSecurityEngineResult wser =
(WSSecurityEngineResult) wsSecEngineResults.get(j);
- if (wser.getAction() == WSConstants.ENCR &&
- wser.getEncryptedKeyId() != null) {
- return wser.getEncryptedKeyId();
+ Integer actInt =
(Integer)wser.get(WSSecurityEngineResult.TAG_ACTION);
+ String encrKeyId =
(String)wser.get(WSSecurityEngineResult.TAG_ENCRYPTED_KEY_ID);
+ if (actInt.intValue() == WSConstants.ENCR &&
+ encrKeyId != null) {
+ return encrKeyId;
}
}
}
@@ -890,9 +888,11 @@
for (int j = 0; j < wsSecEngineResults.size(); j++) {
WSSecurityEngineResult wser =
(WSSecurityEngineResult) wsSecEngineResults.get(j);
- if (wser.getAction() == WSConstants.ENCR &&
- wser.getDecryptedKey() != null) {
- return wser.getDecryptedKey();
+ Integer actInt =
(Integer)wser.get(WSSecurityEngineResult.TAG_ACTION);
+ byte[] decryptedKey =
(byte[])wser.get(WSSecurityEngineResult.TAG_DECRYPTED_KEY);
+ if (actInt.intValue() == WSConstants.ENCR &&
+ decryptedKey != null) {
+ return decryptedKey;
}
}
}
