You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ru...@apache.org on 2006/12/01 19:57:44 UTC
svn commit: r481336 - in /webservices/axis2/branches/java/1_1: etc/
modules/rahas/src/org/apache/rahas/client/ modules/samples/security/
modules/security/src/org/apache/rampart/
modules/security/src/org/apache/rampart/handler/
Author: ruchithf
Date: Fri Dec 1 10:57:42 2006
New Revision: 481336
URL: http://svn.apache.org/viewvc?view=rev&rev=481336
Log:
- Updated STSClient to be able to set the SOAP version
- updated the readme to reflect the available samples
- Updated RampartEngine to not to enforce security on fault messages
- Change rampart versions to SNAPSHOT
Modified:
webservices/axis2/branches/java/1_1/etc/project.properties
webservices/axis2/branches/java/1_1/modules/rahas/src/org/apache/rahas/client/STSClient.java
webservices/axis2/branches/java/1_1/modules/samples/security/README.txt
webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/RampartEngine.java
webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/handler/RampartReceiver.java
Modified: webservices/axis2/branches/java/1_1/etc/project.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/etc/project.properties?view=diff&rev=481336&r1=481335&r2=481336
==============================================================================
--- webservices/axis2/branches/java/1_1/etc/project.properties (original)
+++ webservices/axis2/branches/java/1_1/etc/project.properties Fri Dec 1 10:57:42 2006
@@ -22,9 +22,9 @@
#version_affix=
axis2_version=${version_number}
addressing_version=${axis2_version}
-rampart_version=1.1-RC1
-rahas_version=1.1-RC1
-secpolicy_version=1.1-RC1
+rampart_version=1.1-SNAPSHOT
+rahas_version=1.1-SNAPSHOT
+secpolicy_version=1.1-SNAPSHOT
rampart_module_version=1.1
rahas_module_version=1.1
soapmonitor_version=${axis2_version}
Modified: webservices/axis2/branches/java/1_1/modules/rahas/src/org/apache/rahas/client/STSClient.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/rahas/src/org/apache/rahas/client/STSClient.java?view=diff&rev=481336&r1=481335&r2=481336
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/rahas/src/org/apache/rahas/client/STSClient.java (original)
+++ webservices/axis2/branches/java/1_1/modules/rahas/src/org/apache/rahas/client/STSClient.java Fri Dec 1 10:57:42 2006
@@ -87,6 +87,8 @@
private String addressingNs = AddressingConstants.Final.WSA_NAMESPACE;
private int keySize;
+
+ private String soapVersion = SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI;
/**
* Life time in seconds
@@ -117,8 +119,7 @@
ServiceClient client = getServiceClient(rstQn, issuerAddress);
client.getOptions().setProperty(RAMPART_POLICY, issuerPolicy);
- client.getOptions().setSoapVersionURI(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
- //TODO : Get the soap version from config
+ client.getOptions().setSoapVersionURI(this.soapVersion);
//Process the STS and service policy policy
this.processPolicy(issuerPolicy, servicePolicy);
@@ -146,8 +147,6 @@
String action) throws TrustException {
try {
QName rstQn = new QName("cancelSecurityToken");
- String requestType =
- TrustUtil.getWSTNamespace(version) + RahasConstants.REQ_TYPE_CANCEL;
ServiceClient client = getServiceClient(rstQn, issuerAddress);
if(action != null) {
client.getOptions().setAction(action);
@@ -610,6 +609,10 @@
*/
public void setVersion(int version) {
this.version = version;
+ }
+
+ public void setSoapVersion(String soapVersion) {
+ this.soapVersion = soapVersion;
}
}
Modified: webservices/axis2/branches/java/1_1/modules/samples/security/README.txt
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/samples/security/README.txt?view=diff&rev=481336&r1=481335&r2=481336
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/samples/security/README.txt (original)
+++ webservices/axis2/branches/java/1_1/modules/samples/security/README.txt Fri Dec 1 10:57:42 2006
@@ -9,5 +9,3 @@
- policy - A set of samples that uses rampart with WS-SecurityPolicy
- - rahas - A set of samples demonstrating WS-Trust features provided by Rahas
-
Modified: webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/RampartEngine.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/RampartEngine.java?view=diff&rev=481336&r1=481335&r2=481336
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/RampartEngine.java (original)
+++ webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/RampartEngine.java Fri Dec 1 10:57:42 2006
@@ -25,6 +25,7 @@
import org.apache.ws.secpolicy.WSSPolicyException;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSSecurityException;
+import org.apache.ws.security.util.WSSecurityUtil;
import java.util.Vector;
@@ -35,8 +36,14 @@
RampartException, WSSecurityException, AxisFault {
RampartMessageData rmd = new RampartMessageData(msgCtx, false);
+
+
+ //If there is no policy information or if the message is a fault
RampartPolicyData rpd = rmd.getPolicyData();
- if(rpd == null) {
+ if(rpd == null ||
+ WSSecurityUtil.findElement(rmd.getDocument().getDocumentElement(),
+ "Fault",
+ rmd.getSoapConstants().getEnvelopeURI()) != null) {
SOAPEnvelope env = Axis2Util.getSOAPEnvelopeFromDOOMDocument(rmd.getDocument());
//Convert back to llom since the inflow cannot use llom
@@ -44,6 +51,7 @@
Axis2Util.useDOOM(false);
return null;
}
+
Vector results = null;
WSSecurityEngine engine = new WSSecurityEngine();
Modified: webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/handler/RampartReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/handler/RampartReceiver.java?view=diff&rev=481336&r1=481335&r2=481336
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/handler/RampartReceiver.java (original)
+++ webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/handler/RampartReceiver.java Fri Dec 1 10:57:42 2006
@@ -26,7 +26,6 @@
import org.apache.axis2.engine.Handler;
import org.apache.rampart.RampartEngine;
import org.apache.rampart.RampartException;
-import org.apache.rampart.util.Axis2Util;
import org.apache.ws.secpolicy.WSSPolicyException;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSSecurityException;
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org