svn commit: r924944 - /axis/axis2/java/core/trunk/modules/documentation/xdocs/modules/index.xml
Author: ruchithf Date: Thu Mar 18 18:44:07 2010 New Revision: 924944 URL: http://svn.apache.org/viewvc?rev=924944&view=rev Log: Fix to point rampart module to the "current" rampart site as pointed out by : http://marc.info/?l=axis-user&m=126650140732299&w=2 Need to update this if/when rampart gets a new URL from the axis project. Modified: axis/axis2/java/core/trunk/modules/documentation/xdocs/modules/index.xml Modified: axis/axis2/java/core/trunk/modules/documentation/xdocs/modules/index.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/documentation/xdocs/modules/index.xml?rev=924944&r1=924943&r2=924944&view=diff == --- axis/axis2/java/core/trunk/modules/documentation/xdocs/modules/index.xml (original) +++ axis/axis2/java/core/trunk/modules/documentation/xdocs/modules/index.xml Thu Mar 18 18:44:07 2010 @@ -112,7 +112,7 @@ here to get the Sandesha2 nightly bu latest Axis2 SNAPSHOT. -Rampart +http://ws.apache.org/rampart/";>Rampart The WS-Security and WS-SecureConversation implementation for axis2. Now with a new configuration model based on WS-SecurityPolicy
svn commit: r1087600 - in /axis/axis2/java/rampart/trunk/modules: rampart-core/src/main/java/org/apache/rampart/builder/ rampart-integration/src/test/java/org/apache/rampart/ rampart-integration/src/t
Author: ruchithf
Date: Fri Apr 1 06:52:26 2011
New Revision: 1087600
URL: http://svn.apache.org/viewvc?rev=1087600&view=rev
Log:
Adding support for digest methods != SHA1.
Enabled one policy(scenario 3) with Basic256 algo suit (Also set
basic256Supported in RampartTest so builds without unlimitted strength key
policy won't fail.
When wss4j version is updated we can fix derived key signatures to set the
correct digest algo
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rampart/policy/3.xml
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rampart/services-3.xml
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/SPConstants.java
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AlgorithmSuite.java
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java?rev=1087600&r1=1087599&r2=1087600&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
Fri Apr 1 06:52:26 2011
@@ -624,6 +624,7 @@ public class AsymmetricBindingBuilder ex
}
try {
+
supportingSig.setDigestAlgo(rmd.getPolicyData().getAlgorithmSuite().getDigest());
supportingSig.addReferencesToSign(supportingSigParts,
rmd.getSecHeader());
supportingSig.computeSignature();
@@ -728,6 +729,7 @@ public class AsymmetricBindingBuilder ex
}
try {
+ sig.setDigestAlgo(rpd.getAlgorithmSuite().getDigest());
sig.addReferencesToSign(sigParts, rmd.getSecHeader());
sig.computeSignature();
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java?rev=1087600&r1=1087599&r2=1087600&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
Fri Apr 1 06:52:26 2011
@@ -30,6 +30,7 @@ import org.apache.rampart.policy.Support
import org.apache.rampart.util.RampartUtil;
import org.apache.ws.secpolicy.Constants;
import org.apache.ws.secpolicy.SPConstants;
+import org.apache.ws.secpolicy.model.AlgorithmSuite;
import org.apache.ws.secpolicy.model.IssuedToken;
import org.apache.ws.secpolicy.model.SecureConversationToken;
import org.apache.ws.secpolicy.model.SupportingToken;
@@ -331,8 +332,10 @@ public abstract class BindingBuilder {
}
sig.setUserInfo(user, password);
-
sig.setSignatureAlgorithm(rpd.getAlgorithmSuite().getAsymmetricSignature());
-sig.setSigCanonicalization(rpd.getAlgorithmSuite().getInclusiveC14n());
+AlgorithmSuite algorithmSuite = rpd.getAlgorithmSuite();
+
sig.setSignatureAlgorithm(algorithmSuite.getAsymmetricSignature());
+sig.setSigCanonicalization(algorithmSuite.getInclusiveC14n());
+sig.setDigestAlgo(algorithmSuite.getDigest());
try {
sig.prepare(rmd.getDocument(), RampartUtil.getSignatureCrypto(rpd
@@ -542,7 +545,8 @@ public abstract class BindingBuilder {
RampartPolicyData rpd = rmd.getPolicyData();
-if(policyToken.isDerivedKeys()) {
+AlgorithmSuite algorithmSuite = rpd.getAlgorithmSuite();
+ if(policyToken.isDerivedKeys()) {
try {
WSSecDKSign dkSign = new WSSecDKSign();
@@ -588,8 +592,9 @@ public abstract class BindingBuilder {
}
//Set the algo info
-
dkSign.setSignatureAlgorithm(rpd.getAlgorithmSuite().getSymmetricSignature());
-
dkSign.setDeriv
svn commit: r1208030 - in /axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas: Token.java TrustUtil.java client/STSClient.java impl/SAML2TokenIssuer.java impl/SAMLToken
Author: ruchithf
Date: Tue Nov 29 19:15:00 2011
New Revision: 1208030
URL: http://svn.apache.org/viewvc?rev=1208030&view=rev
Log:
Replacing deprecated DOOMAbstractFactory with OMAbstractFactory
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/Token.java
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/TrustUtil.java
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAML2TokenIssuer.java
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenRenewer.java
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/Token.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/Token.java?rev=1208030&r1=1208029&r2=1208030&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/Token.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/Token.java
Tue Nov 29 19:15:00 2011
@@ -16,35 +16,33 @@
package org.apache.rahas;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMException;
-import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-import org.apache.axiom.om.impl.dom.DOOMAbstractFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.ws.security.WSConstants;
-import org.apache.ws.security.util.XmlSchemaDateFormat;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-
-import java.io.ByteArrayInputStream;
import java.io.Externalizable;
import java.io.IOException;
-import java.io.InputStream;
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.io.Reader;
import java.io.StringReader;
-import java.io.UnsupportedEncodingException;
import java.text.DateFormat;
import java.text.ParseException;
import java.util.Date;
import java.util.Properties;
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMException;
+import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.OMMetaFactory;
+import org.apache.axiom.om.impl.builder.StAXOMBuilder;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ws.security.WSConstants;
+import org.apache.ws.security.util.XmlSchemaDateFormat;
+
/**
* This represents a security token which can have either one of 4 states.
ISSUED EXPIRED
* CACELLED RENEWED Also this holds the
OMElements representing the token in its
@@ -144,8 +142,9 @@ public class Token implements Externaliz
public Token(String id, OMElement tokenElem, Date created, Date expires)
throws TrustException {
this.id = id;
-StAXOMBuilder stAXOMBuilder =
-new StAXOMBuilder(DOOMAbstractFactory.getOMFactory(),
tokenElem.getXMLStreamReader());
+OMMetaFactory metaFactory =
OMAbstractFactory.getMetaFactory(OMAbstractFactory.FEATURE_DOM);
+ StAXOMBuilder stAXOMBuilder =
+new StAXOMBuilder(metaFactory.getOMFactory(),
tokenElem.getXMLStreamReader());
stAXOMBuilder.setNamespaceURIInterning(true);
this.token = stAXOMBuilder.getDocumentElement();
this.created = created;
@@ -155,8 +154,9 @@ public class Token implements Externaliz
public Token(String id, OMElement tokenElem, OMElement lifetimeElem)
throws TrustException {
this.id = id;
+OMMetaFactory metaFactory =
OMAbstractFactory.getMetaFactory(OMAbstractFactory.FEATURE_DOM);
StAXOMBuilder stAXOMBuilder =
-new StAXOMBuilder(DOOMAbstractFactory.getOMFactory(),
tokenElem.getXMLStreamReader());
+new StAXOMBuilder(metaFactory.getOMFactory(),
tokenElem.getXMLStreamReader());
stAXOMBuilder.setNamespaceURIInterning(true);
this.token = stAXOMBuilder.getDocumentElement();
this.processLifeTime(lifetimeElem);
@@ -258,7 +258,8 @@ public class Token implements Externaliz
* @param presivousToken The presivousToken to set.
*/
public void setPreviousToken(OMElement presivousToken) {
-this.previousToken = new
StAXOMBuilder(DOOMAbstractFactory.getOMFactory(),
presivousToken.getXMLStreamReader())
+ OMMetaFactory metaFactory =
OMAbstractFactor
svn commit: r1220746 - in /axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas: errors.properties impl/SAMLTokenIssuer.java
Author: ruchithf
Date: Mon Dec 19 13:49:05 2011
New Revision: 1220746
URL: http://svn.apache.org/viewvc?rev=1220746&view=rev
Log:
Applying Amila's patch for RAMPART-347
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/errors.properties
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuer.java
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/errors.properties
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/errors.properties?rev=1220746&r1=1220745&r2=1220746&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/errors.properties
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/errors.properties
Mon Dec 19 13:49:05 2011
@@ -49,6 +49,7 @@ notSupported = Not supported: {0}
errorCreatingSymmKey = Error in creating the ephemeral key
badDispatcherConfigMultipleDefaultIssuers = Dispatcher configuration error :
There should be only one default issuer
errorInBuildingTheEncryptedKeyForPrincipal = Error in building encrypted key
for principal : \"{0}\"
+trustedCertNotFoundForEPR = Trusted certificate not found for service address
: \"{0}\"
invlidTTL = timeToLive (in milliseconds) must be a positive long value.
invalidKeysize = Invalid key size
unsupportedWSTVersion = Unsupported WS-Trust version
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuer.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuer.java?rev=1220746&r1=1220745&r2=1220746&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuer.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuer.java
Mon Dec 19 13:49:05 2011
@@ -318,11 +318,21 @@ public class SAMLTokenIssuer implements
// Extract the Encryptedkey DOM element
encryptedKeyElem = encrKeyBuilder.getEncryptedKeyElement();
} catch (WSSecurityException e) {
-throw new TrustException(
-"errorInBuildingTheEncryptedKeyForPrincipal",
-new String[] { serviceCert.getSubjectDN().getName() },
-e);
+
+if (serviceCert != null) {
+throw new TrustException(
+"errorInBuildingTheEncryptedKeyForPrincipal",
+new String[]{serviceCert.getSubjectDN().getName()},
+e);
+} else {
+throw new TrustException(
+"trustedCertNotFoundForEPR",
+new String[]{data.getAppliesToAddress()},
+e);
+}
+
}
+
return this.createAttributeAssertion(doc, data ,encryptedKeyElem,
config,
crypto, creationTime, expirationTime);
} else {
svn commit: r1220888 - in /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2: description/WSDL11ToAxisServiceBuilder.java namespace/Constants.java wsdl/WSDLConstants.java
Author: ruchithf
Date: Mon Dec 19 18:39:05 2011
New Revision: 1220888
URL: http://svn.apache.org/viewvc?rev=1220888&view=rev
Log:
WS-Policy 1.5 namespace URI added. Without this codegen fails with wsdl with
WS-Policy v1.5
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/namespace/Constants.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/wsdl/WSDLConstants.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java?rev=1220888&r1=1220887&r2=1220888&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
Mon Dec 19 18:39:05 2011
@@ -3114,7 +3114,8 @@ public class WSDL11ToAxisServiceBuilder
if (extElement instanceof UnknownExtensibilityElement) {
unknown = (UnknownExtensibilityElement) extElement;
-if
(WSDLConstants.WSDL11Constants.POLICY.equals(unknown.getElementType())) {
+if
(WSDLConstants.WSDL11Constants.POLICY.equals(unknown.getElementType())
+ ||
WSDLConstants.WSDL11Constants.POLICY_15.equals(unknown.getElementType())) {
policy = (Policy)
PolicyUtil.getPolicyComponent(unknown.getElement());
String key;
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/namespace/Constants.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/namespace/Constants.java?rev=1220888&r1=1220887&r2=1220888&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/namespace/Constants.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/namespace/Constants.java
Mon Dec 19 18:39:05 2011
@@ -112,6 +112,9 @@ public class Constants {
public static final String URI_POLICY =
"http://schemas.xmlsoap.org/ws/2004/09/policy";;
+public static final String URI_POLICY_15 =
+"http://www.w3.org/ns/ws-policy";;
+
public static final String FORMAT_BINDING =
"http://schemas.xmlsoap.org/wsdl/formatbinding/";;
public static final String JAVA_NS =
"http://schemas.xmlsoap.org/wsdl/java/";;
/**
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/wsdl/WSDLConstants.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/wsdl/WSDLConstants.java?rev=1220888&r1=1220887&r2=1220888&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/wsdl/WSDLConstants.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/wsdl/WSDLConstants.java
Mon Dec 19 18:39:05 2011
@@ -128,6 +128,8 @@ public interface WSDLConstants {
Constants.URI_WSDL12_SOAP, "binding");
QName POLICY = new QName(
Constants.URI_POLICY, "Policy");
+QName POLICY_15 = new QName(
+Constants.URI_POLICY_15, "Policy");
QName POLICY_REFERENCE = new QName(
Constants.URI_POLICY, "PolicyReference");
}
svn commit: r1220915 - in /axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model: Wss10.java Wss11.java
Author: ruchithf
Date: Mon Dec 19 19:42:33 2011
New Revision: 1220915
URL: http://svn.apache.org/viewvc?rev=1220915&view=rev
Log:
Fixing the incorrect prefix issue, reported in some complaints about working
with generated code
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Wss10.java
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Wss11.java
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Wss10.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Wss10.java?rev=1220915&r1=1220914&r2=1220915&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Wss10.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Wss10.java
Mon Dec 19 19:42:33 2011
@@ -119,7 +119,7 @@ public class Wss10 extends AbstractSecur
}
//
-writer.writeStartElement(prefix, SPConstants.POLICY.getLocalPart(),
SPConstants.POLICY.getNamespaceURI());
+writer.writeStartElement(SPConstants.POLICY.getPrefix(),
SPConstants.POLICY.getLocalPart(), SPConstants.POLICY.getNamespaceURI());
if (isMustSupportRefKeyIdentifier()) {
//
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Wss11.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Wss11.java?rev=1220915&r1=1220914&r2=1220915&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Wss11.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Wss11.java
Mon Dec 19 19:42:33 2011
@@ -101,7 +101,7 @@ public class Wss11 extends Wss10 {
}
//
-writer.writeStartElement(prefix, SPConstants.POLICY.getLocalPart(),
SPConstants.POLICY.getNamespaceURI());
+writer.writeStartElement(SPConstants.POLICY.getPrefix(),
SPConstants.POLICY.getLocalPart(), SPConstants.POLICY.getNamespaceURI());
//
if (isMustSupportRefKeyIdentifier()) {
svn commit: r1221080 - /axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
Author: ruchithf
Date: Tue Dec 20 02:44:58 2011
New Revision: 1221080
URL: http://svn.apache.org/viewvc?rev=1221080&view=rev
Log:
Fix suggested in RAMPART-350
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java?rev=1221080&r1=1221079&r2=1221080&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
Tue Dec 20 02:44:58 2011
@@ -175,10 +175,6 @@ public abstract class BindingBuilder {
password = cb[0].getPassword();
}
-if (log.isDebugEnabled()) {
-log.debug("Password : " + password);
-}
-
if(password != null && !"".equals(password)) {
//If the password is available then build the token
svn commit: r1221102 - in /axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart: builder/BindingBuilder.java errors.properties
Author: ruchithf
Date: Tue Dec 20 05:12:59 2011
New Revision: 1221102
URL: http://svn.apache.org/viewvc?rev=1221102&view=rev
Log:
Getting rid of a possible NPE : Caused when someone forgets to setup
RampartConfig
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/errors.properties
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java?rev=1221102&r1=1221101&r2=1221102&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
Tue Dec 20 05:12:59 2011
@@ -27,6 +27,7 @@ import org.apache.rampart.RampartExcepti
import org.apache.rampart.RampartMessageData;
import org.apache.rampart.policy.RampartPolicyData;
import org.apache.rampart.policy.SupportingPolicyData;
+import org.apache.rampart.policy.model.RampartConfig;
import org.apache.rampart.util.RampartUtil;
import org.apache.ws.secpolicy.Constants;
import org.apache.ws.secpolicy.SPConstants;
@@ -274,14 +275,19 @@ public abstract class BindingBuilder {
}
// Get the user - First check whether userCertAlias present
-if (user == null) {
-user = rpd.getRampartConfig().getUserCertAlias();
+RampartConfig rampartConfig = rpd.getRampartConfig();
+if(rampartConfig == null) {
+ throw new RampartException("rampartConfigMissing");
+}
+
+ if (user == null) {
+user = rampartConfig.getUserCertAlias();
}
// If userCertAlias is not present, use user property as Alias
if (user == null) {
-user = rpd.getRampartConfig().getUser();
+user = rampartConfig.getUser();
}
String password = null;
@@ -334,8 +340,7 @@ public abstract class BindingBuilder {
sig.setDigestAlgo(algorithmSuite.getDigest());
try {
-sig.prepare(rmd.getDocument(), RampartUtil.getSignatureCrypto(rpd
-.getRampartConfig(), rmd.getCustomClassLoader()),
+sig.prepare(rmd.getDocument(),
RampartUtil.getSignatureCrypto(rampartConfig, rmd.getCustomClassLoader()),
rmd.getSecHeader());
} catch (WSSecurityException e) {
throw new RampartException("errorInSignatureWithX509Token", e);
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/errors.properties
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/errors.properties?rev=1221102&r1=1221101&r2=1221102&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/errors.properties
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/errors.properties
Tue Dec 20 05:12:59 2011
@@ -28,6 +28,7 @@ cannotCreatePolicyValidatorCallbackInsta
cannotLoadRampartConfigCallbackClass = Cannot load rampart config callback
class : \"{0}\"
cannotCreateRampartConfigCallbackInstance = Cannot create rampart config
callback class instance : \"{0}\"
missingEncryptionUser=Encryption user not specified (The context is created by
the initiating party)
+rampartConfigMissing = Rampart policy configuration missing
missingSignatureCrypto=Signature crypto information not available
missingEncryptionCrypto=Encryption crypto information not available
svn commit: r1438295 - in /axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws: secpolicy/model/UsernameToken.java secpolicy11/builders/UsernameTokenBuilder.java
Author: ruchithf
Date: Fri Jan 25 02:22:28 2013
New Revision: 1438295
URL: http://svn.apache.org/viewvc?rev=1438295&view=rev
Log:
Fixed RAMPART-384
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/UsernameToken.java
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilder.java
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/UsernameToken.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/UsernameToken.java?rev=1438295&r1=1438294&r2=1438295&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/UsernameToken.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/UsernameToken.java
Fri Jan 25 02:22:28 2013
@@ -109,46 +109,41 @@ public class UsernameToken extends Token
if (inclusion != null) {
writeAttribute(writer, prefix, namespaceURI,
SPConstants.ATTR_INCLUDE_TOKEN, inclusion);
}
-
-if (isUseUTProfile10() || isUseUTProfile11()) {
-//
-writeStartElement(writer, SPConstants.POLICY);
-
-// CHECKME
-if (isUseUTProfile10()) {
-//
-writeStartElement(writer, prefix, SPConstants.USERNAME_TOKEN10
, namespaceURI);
-} else {
-//
-writeStartElement(writer, prefix, SPConstants.USERNAME_TOKEN11
, namespaceURI);
+
+//
+writeStartElement(writer, SPConstants.POLICY);
+
+if (version == SPConstants.SP_V12) {
+
+if (isNoPassword()) {
+writeEmptyElement(writer, prefix, SPConstants.NO_PASSWORD,
namespaceURI);
+} else if (isHashPassword()){
+writeEmptyElement(writer, prefix, SPConstants.HASH_PASSWORD,
namespaceURI);
}
-if (version == SPConstants.SP_V12) {
-
-if (isNoPassword()) {
-writeEmptyElement(writer, prefix, SPConstants.NO_PASSWORD,
namespaceURI);
-} else if (isHashPassword()){
-writeEmptyElement(writer, prefix,
SPConstants.HASH_PASSWORD, namespaceURI);
-}
-
-if (isDerivedKeys()) {
-writeEmptyElement(writer, prefix,
SPConstants.REQUIRE_DERIVED_KEYS, namespaceURI);
-} else if (isExplicitDerivedKeys()) {
-writeEmptyElement(writer, prefix,
SPConstants.REQUIRE_EXPLICIT_DERIVED_KEYS, namespaceURI);
-} else if (isImpliedDerivedKeys()) {
-writeEmptyElement(writer, prefix,
SPConstants.REQUIRE_IMPLIED_DERIVED_KEYS, namespaceURI);
-}
-
+if (isDerivedKeys()) {
+writeEmptyElement(writer, prefix,
SPConstants.REQUIRE_DERIVED_KEYS, namespaceURI);
+} else if (isExplicitDerivedKeys()) {
+writeEmptyElement(writer, prefix,
SPConstants.REQUIRE_EXPLICIT_DERIVED_KEYS, namespaceURI);
+} else if (isImpliedDerivedKeys()) {
+writeEmptyElement(writer, prefix,
SPConstants.REQUIRE_IMPLIED_DERIVED_KEYS, namespaceURI);
}
-writer.writeEndElement();
-
-//
-writer.writeEndElement();
-
+
+}
+
+if (isUseUTProfile10()) {
+//
+ writeEmptyElement(writer, prefix, SPConstants.USERNAME_TOKEN10
, namespaceURI);
+} else if(isUseUTProfile11()) {
+//
+ writeEmptyElement(writer, prefix, SPConstants.USERNAME_TOKEN11
, namespaceURI);
}
+//
writer.writeEndElement();
+
//
+writer.writeEndElement();
}
}
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilder.java?rev=1438295&r1=1438294&r2=1438295&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilder.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilder.java
Fri Jan 25 02:22:28 2013
@@ -53,7 +53,7 @@ public class UsernameTokenBuilder implem
svn commit: r1440274 - in /axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample01: README.txt services.xml
Author: ruchithf
Date: Wed Jan 30 04:22:33 2013
New Revision: 1440274
URL: http://svn.apache.org/viewvc?rev=1440274&view=rev
Log:
- sample01 now runs with the axis2server as expected to demonstrate the use of
a UsernameToken.
- Added some more documentation into README.txt including some that I found in
[1] to make things clearer to the user.
1.
http://svn.apache.org/repos/asf/axis/axis2/java/rampart/branches/1_5/modules/rampart-samples/policy/sample01/README.txt
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample01/README.txt
axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample01/services.xml
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample01/README.txt
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample01/README.txt?rev=1440274&r1=1440273&r2=1440274&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample01/README.txt
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample01/README.txt
Wed Jan 30 04:22:33 2013
@@ -3,6 +3,16 @@ UsernameToken Authentication
The policy uses a TransportBinding and requires a SignedSupportingToken which
is a UsernameToken and the inclusion of a TimeStamp.
-Note that Rampart does not enforce the use of HTTPS transport and that
+Note that Rampart enforces the use of HTTPS transport and that
{http://ws.apache.org/rampart/policy}RampartConfig assertion provides
-additional information required to secure the message.
\ No newline at end of file
+additional information required to secure the message.
+
+The policy included in the services.xml file has the following comment :
+
+
+If you uncomment this and deploy the service you will see the following error
message :
+org.apache.axis2.AxisFault: Expected transport is "https" but incoming
transport found : "http"
+
+You can find a complete tutorial on transport level
+security here:
+http://wso2.org/library/3190
\ No newline at end of file
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample01/services.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample01/services.xml?rev=1440274&r1=1440273&r2=1440274&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample01/services.xml
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample01/services.xml
Wed Jan 30 04:22:33 2013
@@ -32,7 +32,8 @@
-
+
+
svn commit: r1440286 - in /axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart: RampartEngine.java RampartMessageData.java handler/RampartUsernameTokenValidator.java
Author: ruchithf
Date: Wed Jan 30 06:12:39 2013
New Revision: 1440286
URL: http://svn.apache.org/viewvc?rev=1440286&view=rev
Log:
Fixed the issue raised in this [1] discussion.
RampartUsernameTokenValidator overrides the verifyPlaintextPassword method of
org.apache.ws.security.validate.UsernameTokenValidator
The default implementation expects the callback handler to supply the plain
text password (when a username token with a plain text password is used), which
should not be possible in practice.
1.http://marc.info/?t=13582802313&r=1&w=3
Added:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartUsernameTokenValidator.java
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java?rev=1440286&r1=1440285&r2=1440286&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
Wed Jan 30 06:12:39 2013
@@ -83,6 +83,9 @@ public class RampartEngine {
List results;
WSSecurityEngine engine = new WSSecurityEngine();
+
+ //Set rampart's configuration of WSS4J
+ engine.setWssConfig(rmd.getConfig());
ValidatorData data = new ValidatorData(rmd);
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java?rev=1440286&r1=1440285&r2=1440286&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
Wed Jan 30 06:12:39 2013
@@ -32,6 +32,7 @@ import org.apache.neethi.PolicyEngine;
import org.apache.rahas.RahasConstants;
import org.apache.rahas.SimpleTokenStore;
import org.apache.rahas.TokenStorage;
+import org.apache.rampart.handler.RampartUsernameTokenValidator;
import org.apache.rampart.handler.WSSHandlerConstants;
import org.apache.rampart.policy.RampartPolicyBuilder;
import org.apache.rampart.policy.RampartPolicyData;
@@ -46,6 +47,7 @@ import org.apache.ws.secpolicy.WSSPolicy
import org.apache.ws.security.SOAPConstants;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSSConfig;
+import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSSecurityEngineResult;
import org.apache.ws.security.WSSecurityException;
import org.apache.ws.security.conversation.ConversationConstants;
@@ -175,6 +177,9 @@ public class RampartMessageData {
// Set the WSSConfig
this.config = WSSConfig.getNewInstance();
+//Update the UsernameToken validator
+this.config.setValidator(WSSecurityEngine.USERNAME_TOKEN,
RampartUsernameTokenValidator.class);
+
// First obtain the axis service as we have to do a null check,
there can be situations
// where Axis Service is null
AxisService axisService = msgCtx.getAxisService();
Added:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartUsernameTokenValidator.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartUsernameTokenValidator.java?rev=1440286&view=auto
==
---
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartUsernameTokenValidator.java
(added)
+++
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartUsernameTokenValidator.java
Wed Jan 30 06:12:39 2013
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2004,2013 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+
svn commit: r1440287 - /axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartUsernameTokenValidator.java
Author: ruchithf
Date: Wed Jan 30 06:30:48 2013
New Revision: 1440287
URL: http://svn.apache.org/viewvc?rev=1440287&view=rev
Log:
The user exception here is simply used as a flag to indicate success or failure
of authentication.
There's no need to associate any information that the user includes in the
user's exception, in the exception generated by Rampart.
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartUsernameTokenValidator.java
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartUsernameTokenValidator.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartUsernameTokenValidator.java?rev=1440287&r1=1440286&r2=1440287&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartUsernameTokenValidator.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartUsernameTokenValidator.java
Wed Jan 30 06:30:48 2013
@@ -58,13 +58,13 @@ public class RampartUsernameTokenValidat
mlog.debug(e);
}
throw new WSSecurityException(
-
WSSecurityException.FAILED_AUTHENTICATION, null, null, e);
+
WSSecurityException.FAILED_AUTHENTICATION);
} catch (UnsupportedCallbackException e) {
if (mlog.isDebugEnabled()) {
mlog.debug(e);
}
throw new WSSecurityException(
-
WSSecurityException.FAILED_AUTHENTICATION, null, null, e);
+
WSSecurityException.FAILED_AUTHENTICATION);
}
}
svn commit: r1440633 - in /axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart: PolicyBasedResultsValidator.java errors.properties
Author: ruchithf
Date: Wed Jan 30 20:03:41 2013
New Revision: 1440633
URL: http://svn.apache.org/viewvc?rev=1440633&view=rev
Log:
Validating password type included in the username token
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/errors.properties
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java?rev=1440633&r1=1440632&r2=1440633&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
Wed Jan 30 20:03:41 2013
@@ -39,7 +39,6 @@ import org.jaxen.JaxenException;
import javax.xml.namespace.QName;
import java.math.BigInteger;
-import java.security.KeyStore;
import java.security.cert.X509Certificate;
import java.util.*;
@@ -317,9 +316,19 @@ public class PolicyBasedResultsValidator
UsernameToken ut = (UsernameToken) token;
//Check presence of a UsernameToken
WSSecurityEngineResult utResult =
WSSecurityUtil.fetchActionResult(results, WSConstants.UT);
+
if (utResult == null && !ut.isOptional()) {
throw new RampartException("usernameTokenMissing");
}
+
+org.apache.ws.security.message.token.UsernameToken wssUt =
+
(org.apache.ws.security.message.token.UsernameToken)
utResult.get(WSSecurityEngineResult.TAG_USERNAME_TOKEN);
+if(ut.isHashPassword() &&
!wssUt.getPasswordType().equals(WSConstants.PASSWORD_DIGEST)) {
+ throw new RampartException("invalidUsernameTokenType");
+} else if
(!wssUt.getPasswordType().equals(WSConstants.PASSWORD_TEXT)) {
+ throw new RampartException("invalidUsernameTokenType");
+}
+
} else if (token instanceof IssuedToken) {
//TODO is is enough to check for ST_UNSIGNED results ??
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/errors.properties
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/errors.properties?rev=1440633&r1=1440632&r2=1440633&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/errors.properties
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/errors.properties
Wed Jan 30 20:03:41 2013
@@ -103,4 +103,4 @@ repeatingNonceValue = Nonce value : {0},
invalidNonceLifeTime = Invalid value for nonceLifeTime in rampart
configuration file.
invalidIssuerAddress = Invalid value for Issuer
invalidSignatureAlgo=Invalid signature algorithm for Asymmetric binding
-
+invalidUsernameTokenType = Invalid UsernameToken Type.
svn commit: r1440696 - /axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
Author: ruchithf
Date: Wed Jan 30 21:54:46 2013
New Revision: 1440696
URL: http://svn.apache.org/viewvc?rev=1440696&view=rev
Log:
Validate the NoPassword case
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java?rev=1440696&r1=1440695&r2=1440696&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
Wed Jan 30 21:54:46 2013
@@ -323,12 +323,18 @@ public class PolicyBasedResultsValidator
org.apache.ws.security.message.token.UsernameToken wssUt =
(org.apache.ws.security.message.token.UsernameToken)
utResult.get(WSSecurityEngineResult.TAG_USERNAME_TOKEN);
-if(ut.isHashPassword() &&
!wssUt.getPasswordType().equals(WSConstants.PASSWORD_DIGEST)) {
+
+if(ut.isNoPassword() && wssUt.getPassword() != null) {
+ throw new RampartException("invalidUsernameTokenType");
+}
+
+ if(ut.isHashPassword() && !wssUt.isHashed()) {
throw new RampartException("invalidUsernameTokenType");
} else if
(!wssUt.getPasswordType().equals(WSConstants.PASSWORD_TEXT)) {
throw new RampartException("invalidUsernameTokenType");
}
+
} else if (token instanceof IssuedToken) {
//TODO is is enough to check for ST_UNSIGNED results ??
svn commit: r1441298 - in /axis/axis2/java/rampart/trunk/modules: rampart-core/src/main/java/org/apache/rampart/handler/ rampart-integration/ rampart-integration/src/test/java/org/apache/axis2/ rampar
Author: ruchithf Date: Fri Feb 1 02:54:05 2013 New Revision: 1441298 URL: http://svn.apache.org/viewvc?rev=1441298&view=rev Log: Removing the deprecated basic configuration (This was deprecated since version 1.1). Excluded the Rahas tests from the integration tests to update them to work with policy configuration. Removed basic configuration test cases. Added WS-SecurityPolicy 1.2 namespace to supported policy namespaces in the module.xml Removed: axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSDoAllHandler.java axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSDoAllReceiver.java axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSDoAllSender.java axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/java/org/apache/axis2/ axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/ axis/axis2/java/rampart/trunk/modules/rampart-samples/basic/ Modified: axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml axis/axis2/java/rampart/trunk/modules/rampart-mar/module.xml axis/axis2/java/rampart/trunk/modules/rampart-samples/README.txt Modified: axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml?rev=1441298&r1=1441297&r2=1441298&view=diff == --- axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml (original) +++ axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml Fri Feb 1 02:54:05 2013 @@ -363,8 +363,8 @@ +RahasSAMLTokenAttributeTest +-->
svn commit: r1442444 - /axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
Author: ruchithf
Date: Tue Feb 5 00:41:11 2013
New Revision: 1442444
URL: http://svn.apache.org/viewvc?rev=1442444&view=rev
Log:
Additional check and avoiding an NPE
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java?rev=1442444&r1=1442443&r2=1442444&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
Tue Feb 5 00:41:11 2013
@@ -330,7 +330,8 @@ public class PolicyBasedResultsValidator
if(ut.isHashPassword() && !wssUt.isHashed()) {
throw new RampartException("invalidUsernameTokenType");
-} else if
(!wssUt.getPasswordType().equals(WSConstants.PASSWORD_TEXT)) {
+} else if (wssUt.getPassword() == null ||
+
!wssUt.getPasswordType().equals(WSConstants.PASSWORD_TEXT)) {
throw new RampartException("invalidUsernameTokenType");
}
svn commit: r1456077 - in /axis/axis2/java/rampart/trunk/modules: rampart-core/src/main/java/org/apache/rampart/ rampart-tests/src/test/java/org/apache/rampart/ rampart-tests/test-resources/policy/
Author: ruchithf
Date: Wed Mar 13 18:24:42 2013
New Revision: 1456077
URL: http://svn.apache.org/r1456077
Log:
Applied patch provided in RAMPART-400 by Nathan Clement
Added:
axis/axis2/java/rampart/trunk/modules/rampart-tests/test-resources/policy/rampart-hashed-password.xml
axis/axis2/java/rampart/trunk/modules/rampart-tests/test-resources/policy/rampart-plaintext-password.xml
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
axis/axis2/java/rampart/trunk/modules/rampart-tests/src/test/java/org/apache/rampart/PolicyAssertionsTest.java
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java?rev=1456077&r1=1456076&r2=1456077&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
Wed Mar 13 18:24:42 2013
@@ -330,8 +330,8 @@ public class PolicyBasedResultsValidator
if(ut.isHashPassword() && !wssUt.isHashed()) {
throw new RampartException("invalidUsernameTokenType");
-} else if (wssUt.getPassword() == null ||
-
!wssUt.getPasswordType().equals(WSConstants.PASSWORD_TEXT)) {
+} else if (!ut.isHashPassword() && (wssUt.getPassword() ==
null ||
+
!wssUt.getPasswordType().equals(WSConstants.PASSWORD_TEXT))) {
throw new RampartException("invalidUsernameTokenType");
}
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-tests/src/test/java/org/apache/rampart/PolicyAssertionsTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-tests/src/test/java/org/apache/rampart/PolicyAssertionsTest.java?rev=1456077&r1=1456076&r2=1456077&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-tests/src/test/java/org/apache/rampart/PolicyAssertionsTest.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-tests/src/test/java/org/apache/rampart/PolicyAssertionsTest.java
Wed Mar 13 18:24:42 2013
@@ -16,7 +16,9 @@ package org.apache.rampart;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axis2.builder.SOAPBuilder;
import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.description.AxisService;
import org.apache.neethi.Policy;
+import org.apache.ws.security.handler.WSHandlerConstants;
import java.io.ByteArrayInputStream;
@@ -80,4 +82,80 @@ public class PolicyAssertionsTest extend
}
}
+
+public void testHashedPasswordRequiredValid() throws Exception {
+
+MessageContext ctx = getMsgCtx();
+
+String policyXml = "test-resources/policy/rampart-hashed-password.xml";
+Policy policy = loadPolicy(policyXml);
+
+ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
+
+ctx.getOptions().setUserName( "Ron" );
+ctx.getOptions().setPassword( "noR" );
+
+MessageBuilder builder = new MessageBuilder();
+builder.build(ctx);
+
+// Building the SOAP envelope from the OMElement
+SOAPBuilder soapBuilder = new SOAPBuilder();
+SOAPEnvelope env = ctx.getEnvelope();
+ByteArrayInputStream inStream = new
ByteArrayInputStream(env.toString().getBytes());
+env = (SOAPEnvelope) soapBuilder.processDocument(inStream, "text/xml",
ctx);
+ctx.setEnvelope(env);
+
+ctx.setServerSide(true);
+AxisService axisService = ctx.getAxisService();
+
axisService.removeParameter(axisService.getParameter(RampartMessageData.PARAM_CLIENT_SIDE));
+
+ctx.setProperty(WSHandlerConstants.PW_CALLBACK_REF, new
TestCBHandler());
+
+RampartEngine engine = new RampartEngine();
+engine.process(ctx);
+
+}
+
+public void testHashedPasswordRequiredInvalid() throws Exception {
+
+MessageContext ctx = getMsgCtx();
+
+String policyXml =
"test-resources/policy/rampart-plaintext-password.xml";
+Policy policy = loadPolicy(policyXml);
+
+ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
+
+ctx.getOptions().setUserName( "Ron" );
+ctx.getOptions().setPassword( "noR" );
+
+MessageBuilder builder = new MessageBuilder(
svn commit: r1457145 [2/2] - in /axis/axis2/java/rampart/trunk/modules: rampart-policy/src/main/java/META-INF/services/ rampart-policy/src/main/java/org/apache/ws/secpolicy/model/ rampart-policy/src/m
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/IssuedTokenBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/IssuedTokenBuilder.java?rev=1457145&r1=1457144&r2=1457145&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/IssuedTokenBuilder.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/IssuedTokenBuilder.java
Fri Mar 15 22:00:23 2013
@@ -84,9 +84,9 @@ public class IssuedTokenBuilder implemen
Policy policy = PolicyEngine.getPolicy(policyElement);
policy = (Policy) policy.normalize(false);
-for (Iterator iterator = policy.getAlternatives(); iterator
+for (Iterator> iterator =
policy.getAlternatives(); iterator
.hasNext();) {
-processAlternative((List) iterator.next(), issuedToken);
+processAlternative(iterator.next(), issuedToken);
break; // since there should be only one alternative ..
}
}
@@ -98,12 +98,12 @@ public class IssuedTokenBuilder implemen
return new QName[] { SP12Constants.ISSUED_TOKEN };
}
-private void processAlternative(List assertions, IssuedToken parent) {
+private void processAlternative(List assertions, IssuedToken
parent) {
Assertion assertion;
QName name;
-for (Iterator iterator = assertions.iterator(); iterator.hasNext();) {
-assertion = (Assertion) iterator.next();
+for (Iterator iterator = assertions.iterator();
iterator.hasNext();) {
+assertion = iterator.next();
name = assertion.getName();
if (SP12Constants.REQUIRE_DERIVED_KEYS.equals(name)) {
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/LayoutBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/LayoutBuilder.java?rev=1457145&r1=1457144&r2=1457145&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/LayoutBuilder.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/LayoutBuilder.java
Fri Mar 15 22:00:23 2013
@@ -38,8 +38,8 @@ public class LayoutBuilder implements As
Policy policy = PolicyEngine.getPolicy(element.getFirstElement());
policy = (Policy) policy.normalize(false);
-for (Iterator iterator = policy.getAlternatives(); iterator.hasNext();
) {
-processAlternative((List) iterator.next(), layout);
+for (Iterator> iterator = policy.getAlternatives();
iterator.hasNext(); ) {
+processAlternative(iterator.next(), layout);
break; // there should be only one alternative
}
@@ -50,10 +50,10 @@ public class LayoutBuilder implements As
return new QName[] {SP12Constants.LAYOUT};
}
-public void processAlternative(List assertions, Layout parent) {
+public void processAlternative(List assertions, Layout parent) {
-for (Iterator iterator = assertions.iterator(); iterator.hasNext();) {
-Assertion assertion = (Assertion) iterator.next();
+for (Iterator iterator = assertions.iterator();
iterator.hasNext();) {
+Assertion assertion = iterator.next();
QName qname = assertion.getName();
if (SP12Constants.STRICT.equals(qname)) {
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/ProtectionTokenBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/ProtectionTokenBuilder.java?rev=1457145&r1=1457144&r2=1457145&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/ProtectionTokenBuilder.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/ProtectionTokenBuilder.java
Fri Mar 15 22:00:23 2013
@@ -39,8 +39,8 @@ public class ProtectionTokenBuilder impl
Policy policy = PolicyEngine.getPolicy(element.getFirstElement());
policy = (Policy) policy.normalize(false);
-for (Iterator iterator = policy.getAlternatives
svn commit: r1457153 - in /axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws: secpolicy11/builders/ secpolicy12/builders/
Author: ruchithf Date: Fri Mar 15 22:45:26 2013 New Revision: 1457153 URL: http://svn.apache.org/r1457153 Log: license header added to the new files. Modified: axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptionTokenBuilder.java axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignatureTokenBuilder.java axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptionTokenBuilder.java axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignatureTokenBuilder.java Modified: axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptionTokenBuilder.java URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptionTokenBuilder.java?rev=1457153&r1=1457152&r2=1457153&view=diff == --- axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptionTokenBuilder.java (original) +++ axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptionTokenBuilder.java Fri Mar 15 22:45:26 2013 @@ -1,3 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package org.apache.ws.secpolicy11.builders; import java.util.Iterator; Modified: axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignatureTokenBuilder.java URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignatureTokenBuilder.java?rev=1457153&r1=1457152&r2=1457153&view=diff == --- axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignatureTokenBuilder.java (original) +++ axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignatureTokenBuilder.java Fri Mar 15 22:45:26 2013 @@ -1,3 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package org.apache.ws.secpolicy11.builders; import java.util.Iterator; Modified: axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptionTokenBuilder.java URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptionTokenBuilder.java?rev=1457153&r1=1457152&r2=1457153&view=diff == --- axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptionTokenBuilder.java (original) +++ axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptionTokenBuilder.java Fri Mar 15 22:45:26 2013 @@ -1,3 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed
svn commit: r1457297 - in /axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rahas: issuer.properties rahas-sec.properties saml.s1.properties samlIssuer.properties
Author: ruchithf Date: Sat Mar 16 19:37:26 2013 New Revision: 1457297 URL: http://svn.apache.org/r1457297 Log: These files are not required anymore since we use the policy config with rahas tests Removed: axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rahas/issuer.properties axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rahas/rahas-sec.properties axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rahas/saml.s1.properties axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rahas/samlIssuer.properties
svn commit: r1457462 - in /axis/axis2/java/rampart/trunk/modules: rampart-core/src/main/java/org/apache/rampart/handler/ rampart-core/src/main/java/org/apache/rampart/handler/config/ rampart-core/src/
Author: ruchithf Date: Sun Mar 17 15:23:27 2013 New Revision: 1457462 URL: http://svn.apache.org/r1457462 Log: Removed the deprecated basic configuration Removed: axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSDoAllHandler.java axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSDoAllReceiver.java axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSDoAllSender.java axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/config/ axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/HandlerParameterDecoder.java axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/java/org/apache/axis2/security/ axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/resources/ping/ axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/java/org/apache/axis2/ axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/ axis/axis2/java/rampart/trunk/modules/rampart-samples/basic/ axis/axis2/java/rampart/trunk/modules/rampart-tests/src/test/java/org/apache/rampart/handler/config/ Modified: axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/PostDispatchVerificationHandler.java axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml axis/axis2/java/rampart/trunk/modules/rampart-mar/module.xml Modified: axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/PostDispatchVerificationHandler.java URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/PostDispatchVerificationHandler.java?rev=1457462&r1=1457461&r2=1457462&view=diff == --- axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/PostDispatchVerificationHandler.java (original) +++ axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/PostDispatchVerificationHandler.java Sun Mar 17 15:23:27 2013 @@ -30,7 +30,6 @@ import org.apache.neethi.Policy; import org.apache.neethi.PolicyEngine; import org.apache.rampart.RampartMessageData; import org.apache.rampart.policy.RampartPolicyData; -import org.apache.rampart.util.HandlerParameterDecoder; import org.apache.rampart.util.RampartUtil; import org.apache.ws.secpolicy.model.Binding; import org.apache.ws.secpolicy.model.SupportingToken; Modified: axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml?rev=1457462&r1=1457461&r2=1457462&view=diff == --- axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml (original) +++ axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml Sun Mar 17 15:23:27 2013 @@ -147,248 +147,6 @@ target/test-resources/rahas_service_repo_5 - -create-scenario1-client-repo - -create-test-repository - - -rampart - src/test/resources/security/s1.client.axis2.xml - target/test-resources/scenario1_client_repo - - - -create-scenario1-service-repo - -create-test-repository - - -rampart - src/test/resources/security/s1.service.axis2.xml - target/test-resources/scenario1_service_repo - - - -create-scenario2-client-repo - -create-test-repository - - -rampart - src/test/resources/security/s2.client.axis2.xml - target/test-resources/scenario2_client_repo - - - -create-scenario2-service-repo - -create-test-repository - - -rampart - src/test/resources/secur
svn commit: r1459623 - in /axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart: ./ builder/ handler/ policy/
Author: ruchithf
Date: Fri Mar 22 04:16:43 2013
New Revision: 1459623
URL: http://svn.apache.org/r1459623
Log:
- Making sure UsernameTokens are only encrypted when required.
- Removed some deprecated methods.
- Some more code fixes to use generics.
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/PostDispatchVerificationHandler.java
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java?rev=1459623&r1=1459622&r2=1459623&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
Fri Mar 22 04:16:43 2013
@@ -26,6 +26,7 @@ import org.apache.axis2.description.Para
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.util.PolicyUtil;
import org.apache.axis2.wsdl.WSDLConstants;
+import org.apache.neethi.Assertion;
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyComponent;
import org.apache.neethi.PolicyEngine;
@@ -261,7 +262,7 @@ public class RampartMessageData {
}
if(this.servicePolicy != null){
-List it = (List)this.servicePolicy.getAlternatives().next();
+List it =
this.servicePolicy.getAlternatives().next();
//Process policy and build policy data
this.policyData = RampartPolicyBuilder.build(it);
@@ -430,7 +431,7 @@ public class RampartMessageData {
this.servicePolicy.addAssertion(rc);
}
-List it = (List) this.servicePolicy.getAlternatives().next();
+List it = this.servicePolicy.getAlternatives().next();
//Process policy and build policy data
try {
@@ -449,14 +450,6 @@ public class RampartMessageData {
}
/**
- * @param document The document to set.
- * @deprecated document is derived from MessageContext passed in
constructor
- */
-public void setDocument(Document document) {
-this.document = document;
-}
-
-/**
* @return Returns the timeToLive.
*/
public int getTimeToLive() {
@@ -507,14 +500,6 @@ public class RampartMessageData {
}
/**
- * @param msgContext The msgContext to set.
- * @deprecated MessageContext is set in constructor
- */
-public void setMsgContext(MessageContext msgContext) {
-this.msgContext = msgContext;
-}
-
-/**
* @return Returns the policyData.
*/
public RampartPolicyData getPolicyData() {
@@ -522,28 +507,6 @@ public class RampartMessageData {
}
/**
- * @param policyData The policyData to set.
- * @deprecated Policy data determined within constructor
- */
-public void setPolicyData(RampartPolicyData policyData) throws
RampartException {
-this.policyData = policyData;
-
-try {
-//if client side then check whether sig conf enabled
-//and get hold of the stored signature values
-if(this.isInitiator && !this.sender &&
policyData.isSignatureConfirmation()) {
-OperationContext opCtx = msgContext.getOperationContext();
-MessageContext outMsgCtx = opCtx
-
.getMessageContext(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
-msgContext.setProperty(WSHandlerConstants.SEND_SIGV, outMsgCtx
-.getProperty(WSHandlerConstants.SEND_SIGV));
-}
-} catch (AxisFault e) {
-throw new
RampartException("errorGettingSignatureValuesForSigconf", e);
-}
-}
-
-/**
* @return Returns the secHeader.
*/
public WSSecHeader getSecHeader() {
@@ -725,14 +688,6 @@ public class RampartMessageData {
}
/**
- * @param wstVersion The wstVersion to set.
- * @deprecated This is defined by the class.
- */
-public void setWstVersion(int wstVersion) {
-this.wstVersion = wstVersion;
-}
-
-/**
* @return Returns the secConvVersion.
*/
public int getSecConvVersion
svn commit: r1468512 - in /axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rahas: 1.xml s1-services.xml
Author: ruchithf Date: Tue Apr 16 17:15:50 2013 New Revision: 1468512 URL: http://svn.apache.org/r1468512 Log: Switch to Basic128 algo suite to make sure the build won't fail without unlimitted strength crypto policy Modified: axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rahas/1.xml axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rahas/s1-services.xml Modified: axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rahas/1.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rahas/1.xml?rev=1468512&r1=1468511&r2=1468512&view=diff == --- axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rahas/1.xml (original) +++ axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rahas/1.xml Tue Apr 16 17:15:50 2013 @@ -23,7 +23,7 @@ - + @@ -71,4 +71,4 @@ - \ No newline at end of file + Modified: axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rahas/s1-services.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rahas/s1-services.xml?rev=1468512&r1=1468511&r2=1468512&view=diff == --- axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rahas/s1-services.xml (original) +++ axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rahas/s1-services.xml Tue Apr 16 17:15:50 2013 @@ -76,7 +76,7 @@ - +
