You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2017/01/30 17:08:20 UTC
svn commit: r1780946 [2/5] - in
/axis/axis2/java/rampart/branches/RAMPART-289: ./ modules/distribution/
modules/documentation/src/site/ modules/documentation/src/site/resources/
modules/documentation/src/site/resources/css/ modules/documentation/src/si...
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java Mon Jan 30 17:08:19 2017
@@ -18,6 +18,8 @@ package org.apache.rampart;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.soap.*;
+import org.apache.axiom.soap.SOAP11Constants;
+import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
import org.apache.commons.logging.Log;
@@ -30,10 +32,7 @@ import org.apache.rampart.policy.Rampart
import org.apache.rampart.util.Axis2Util;
import org.apache.rampart.util.RampartUtil;
import org.apache.ws.secpolicy.WSSPolicyException;
-import org.apache.ws.security.WSConstants;
-import org.apache.ws.security.WSSecurityEngine;
-import org.apache.ws.security.WSSecurityEngineResult;
-import org.apache.ws.security.WSSecurityException;
+import org.apache.ws.security.*;
import org.apache.ws.security.components.crypto.Crypto;
import org.apache.ws.security.saml.SAMLKeyInfo;
import org.apache.ws.security.saml.SAMLUtil;
@@ -41,6 +40,7 @@ import org.opensaml.SAMLAssertion;
import org.opensaml.saml2.core.Assertion;
import org.opensaml.saml2.core.Subject;
import org.opensaml.saml2.core.SubjectConfirmationData;
+import org.opensaml.saml2.core.Conditions;
import javax.xml.namespace.QName;
import java.security.Principal;
@@ -53,7 +53,8 @@ import java.util.Vector;
public class RampartEngine {
private static Log log = LogFactory.getLog(RampartEngine.class);
- private static Log tlog = LogFactory.getLog(RampartConstants.TIME_LOG);
+ private static Log tlog = LogFactory.getLog(RampartConstants.TIME_LOG);
+ private static ServiceNonceCache serviceNonceCache = new ServiceNonceCache();
public Vector process(MessageContext msgCtx) throws WSSPolicyException,
RampartException, WSSecurityException, AxisFault {
@@ -182,10 +183,29 @@ public class RampartEngine {
final Assertion assertion = (Assertion) wser.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
String id = assertion.getID();
Subject subject = assertion.getSubject();
- SubjectConfirmationData scData = subject.getSubjectConfirmations()
- .get(0).getSubjectConfirmationData();
- Date dateOfCreation = scData.getNotBefore().toDate();
- Date dateOfExpiration = scData.getNotOnOrAfter().toDate();
+
+ Date dateOfCreation = null;
+ Date dateOfExpiration = null;
+
+ //Read the validity period from the 'Conditions' element, else read it from SC Data
+ if (assertion.getConditions() != null) {
+ Conditions conditions = assertion.getConditions();
+ if (conditions.getNotBefore() != null) {
+ dateOfCreation = conditions.getNotBefore().toDate();
+ }
+ if (conditions.getNotOnOrAfter() != null) {
+ dateOfExpiration = conditions.getNotOnOrAfter().toDate();
+ }
+ } else {
+ SubjectConfirmationData scData = subject.getSubjectConfirmations()
+ .get(0).getSubjectConfirmationData();
+ if (scData.getNotBefore() != null) {
+ dateOfCreation = scData.getNotBefore().toDate();
+ }
+ if (scData.getNotOnOrAfter() != null) {
+ dateOfExpiration = scData.getNotOnOrAfter().toDate();
+ }
+ }
// TODO : SAML2KeyInfo element needs to be moved to WSS4J.
SAML2KeyInfo saml2KeyInfo = SAML2Utils.
@@ -230,9 +250,42 @@ public class RampartEngine {
}
} else if (WSConstants.UT == actInt.intValue()) {
- String username = ((Principal) wser.get(WSSecurityEngineResult.TAG_PRINCIPAL))
- .getName();
+
+ WSUsernameTokenPrincipal userNameTokenPrincipal = (WSUsernameTokenPrincipal)wser.get(WSSecurityEngineResult.TAG_PRINCIPAL);
+
+ String username = userNameTokenPrincipal.getName();
msgCtx.setProperty(RampartMessageData.USERNAME, username);
+
+ if (userNameTokenPrincipal.getNonce() != null) {
+ // Check whether this is a replay attack. To verify that we need to check whether nonce value
+ // is a repeating one
+ int nonceLifeTimeInSeconds = 0;
+
+ if (rpd.getRampartConfig() != null) {
+
+ String stringLifeTime = rpd.getRampartConfig().getNonceLifeTime();
+
+ try {
+ nonceLifeTimeInSeconds = Integer.parseInt(stringLifeTime);
+
+ } catch (NumberFormatException e) {
+ log.error("Invalid value for nonceLifeTime in rampart configuration file.", e);
+ throw new RampartException(
+ "invalidNonceLifeTime", e);
+
+ }
+ }
+
+ String serviceEndpointName = msgCtx.getAxisService().getEndpointName();
+
+ boolean valueRepeating = serviceNonceCache.isNonceRepeatingForService(serviceEndpointName, username, userNameTokenPrincipal.getNonce());
+
+ if (valueRepeating){
+ throw new RampartException("repeatingNonceValue", new Object[]{ userNameTokenPrincipal.getNonce(), username} );
+ }
+
+ serviceNonceCache.addNonceForService(serviceEndpointName, username, userNameTokenPrincipal.getNonce(), nonceLifeTimeInSeconds);
+ }
} else if (WSConstants.SIGN == actInt.intValue()) {
X509Certificate cert = (X509Certificate) wser.get(WSSecurityEngineResult.TAG_X509_CERTIFICATE);
msgCtx.setProperty(RampartMessageData.X509_CERT, cert);
@@ -274,46 +327,41 @@ public class RampartEngine {
private boolean isSecurityFault(RampartMessageData rmd) {
-
- SOAPEnvelope soapEnvelope = rmd.getMsgContext().getEnvelope();
-
- SOAPFault soapFault = soapEnvelope.getBody().getFault();
-
- // This is not a soap fault
- if (soapFault == null) {
- return false;
- }
-
- String soapVersionURI = rmd.getMsgContext().getEnvelope().getNamespace().getNamespaceURI();
-
- if (soapVersionURI.equals(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI) ) {
-
- SOAPFaultCode faultCode = soapFault.getCode();
-
- // This is a fault processing the security header
- if (faultCode.getTextAsQName().getNamespaceURI().equals(WSConstants.WSSE_NS)) {
- return true;
- }
-
-
- } else if (soapVersionURI.equals(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI)) {
-
- //TODO AXIOM API returns only one fault sub code, there can be many
- SOAPFaultSubCode faultSubCode = soapFault.getCode().getSubCode();
-
- if (faultSubCode != null) {
- SOAPFaultValue faultSubCodeValue = faultSubCode.getValue();
-
- // This is a fault processing the security header
- if (faultSubCodeValue != null &&
- faultSubCodeValue.getTextAsQName().getNamespaceURI().equals(WSConstants.WSSE_NS)) {
- return true;
- }
- }
-
- }
-
- return false;
- }
+ SOAPEnvelope soapEnvelope = rmd.getMsgContext().getEnvelope();
+ SOAPFault soapFault = soapEnvelope.getBody().getFault();
+
+ // This is not a soap fault
+ if (soapFault == null) {
+ return false;
+ }
+
+ String soapVersionURI = rmd.getMsgContext().getEnvelope().getNamespace().getNamespaceURI();
+ SOAPFaultCode faultCode = soapFault.getCode();
+ if(faultCode == null){
+ //If no fault code is given, then it can't be security fault
+ return false;
+ }
+
+ if (soapVersionURI.equals(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI)) {
+ // This is a fault processing the security header
+ if (faultCode.getTextAsQName().getNamespaceURI().equals(WSConstants.WSSE_NS)) {
+ return true;
+ }
+ } else if (soapVersionURI.equals(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI)) {
+ // TODO AXIOM API returns only one fault sub code, there can be many
+ SOAPFaultSubCode faultSubCode = faultCode.getSubCode();
+ if (faultSubCode != null) {
+ SOAPFaultValue faultSubCodeValue = faultSubCode.getValue();
+
+ // This is a fault processing the security header
+ if (faultSubCodeValue != null && faultSubCodeValue.getTextAsQName().
+ getNamespaceURI().equals(WSConstants.WSSE_NS)) {
+ return true;
+ }
+ }
+ }
+
+ return false;
+ }
}
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java Mon Jan 30 17:08:19 2017
@@ -56,6 +56,7 @@ import org.apache.ws.security.util.WSSec
import org.opensaml.SAMLAssertion;
import org.w3c.dom.Document;
+import java.util.Date;
import java.util.List;
import java.util.Vector;
import java.util.ArrayList;
@@ -369,7 +370,9 @@ public class RampartMessageData {
// To handle scenarios where password type is not set by default.
this.config.setHandleCustomPasswordTypes(true);
- this.customClassLoader = msgCtx.getAxisService().getClassLoader();
+ if (axisService != null) {
+ this.customClassLoader = axisService.getClassLoader();
+ }
if(this.sender && this.policyData != null) {
this.secHeader = new WSSecHeader();
@@ -621,21 +624,19 @@ public class RampartMessageData {
return this.tokenStorage;
}
- TokenStorage storage = (TokenStorage) this.msgContext.getProperty(
+ TokenStorage storage = (TokenStorage) this.msgContext.getConfigurationContext().getProperty(
TokenStorage.TOKEN_STORAGE_KEY);
if (storage != null) {
this.tokenStorage = storage;
} else {
-
if (this.policyData.getRampartConfig() != null &&
this.policyData.getRampartConfig().getTokenStoreClass() != null) {
Class stClass = null;
String storageClass = this.policyData.getRampartConfig()
- .getTokenStoreClass();
+ .getTokenStoreClass();
try {
- stClass = Loader.loadClass(msgContext.getAxisService()
- .getClassLoader(), storageClass);
+ stClass = Loader.loadClass(this.customClassLoader, storageClass);
} catch (ClassNotFoundException e) {
throw new RampartException(
"WSHandler: cannot load token storage class: "
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java Mon Jan 30 17:08:19 2017
@@ -175,7 +175,7 @@ public class AsymmetricBindingBuilder ex
encr.setDocument(doc);
RampartUtil.setEncryptionUser(rmd, encr);
encr.setSymmetricEncAlgorithm(rpd.getAlgorithmSuite().getEncryption());
- RampartUtil.setKeyIdentifierType(rpd,encr, encryptionToken);
+ RampartUtil.setKeyIdentifierType(rmd, encr, encryptionToken);
encr.setKeyEncAlgo(rpd.getAlgorithmSuite().getAsymmetricKeyWrap());
encr.prepare(doc, RampartUtil.getEncryptionCrypto(config, rmd.getCustomClassLoader()));
@@ -528,7 +528,7 @@ public class AsymmetricBindingBuilder ex
WSSecEncrypt encr = new WSSecEncrypt();
- RampartUtil.setKeyIdentifierType(rpd, encr, encrToken);
+ RampartUtil.setKeyIdentifierType(rmd, encr, encrToken);
encr.setWsConfig(rmd.getConfig());
@@ -616,7 +616,7 @@ public class AsymmetricBindingBuilder ex
if (!(supportingSigToken instanceof X509Token)) {
return;
}
- supportingSig = this.getSignatureBuider(rmd, supportingSigToken,
+ supportingSig = this.getSignatureBuilder(rmd, supportingSigToken,
((X509Token) supportingSigToken).getUserCertAlias());
Element bstElem = supportingSig.getBinarySecurityTokenElement();
if (bstElem != null) {
@@ -719,7 +719,7 @@ public class AsymmetricBindingBuilder ex
}
} else {
- sig = this.getSignatureBuider(rmd, sigToken);
+ sig = this.getSignatureBuilder(rmd, sigToken);
Element bstElem = sig.getBinarySecurityTokenElement();
if(bstElem != null) {
bstElem = RampartUtil.insertSiblingAfter(rmd, this
@@ -765,7 +765,7 @@ public class AsymmetricBindingBuilder ex
WSSecEncrypt encr = new WSSecEncrypt();
- RampartUtil.setKeyIdentifierType(rpd, encr, encrToken);
+ RampartUtil.setKeyIdentifierType(rmd, encr, encrToken);
encr.setWsConfig(rmd.getConfig());
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java Mon Jan 30 17:08:19 2017
@@ -218,7 +218,7 @@ public abstract class BindingBuilder {
WSSecEncryptedKey encrKey = new WSSecEncryptedKey();
try {
- RampartUtil.setKeyIdentifierType(rpd, encrKey, token);
+ RampartUtil.setKeyIdentifierType(rmd, encrKey, token);
RampartUtil.setEncryptionUser(rmd, encrKey);
encrKey.setKeySize(rpd.getAlgorithmSuite().getMaximumSymmetricKeyLength());
encrKey.setKeyEncAlgo(rpd.getAlgorithmSuite().getAsymmetricKeyWrap());
@@ -231,13 +231,27 @@ public abstract class BindingBuilder {
}
}
- protected WSSecSignature getSignatureBuider(RampartMessageData rmd, Token token)
- throws RampartException {
- return getSignatureBuider(rmd, token, null);
+ //Deprecated after 1.5 release
+ @Deprecated
+ protected WSSecSignature getSignatureBuider(RampartMessageData rmd,
+ Token token) throws RampartException {
+ return getSignatureBuilder(rmd, token, null);
}
-
+
+ //Deprecated after 1.5 release
+ @Deprecated
protected WSSecSignature getSignatureBuider(RampartMessageData rmd, Token token,
- String userCertAlias) throws RampartException {
+ String userCertAlias) throws RampartException {
+ return getSignatureBuilder(rmd, token, userCertAlias);
+ }
+
+ protected WSSecSignature getSignatureBuilder(RampartMessageData rmd,
+ Token token)throws RampartException {
+ return getSignatureBuilder(rmd, token, null);
+ }
+
+ protected WSSecSignature getSignatureBuilder(RampartMessageData rmd, Token token,
+ String userCertAlias) throws RampartException {
RampartPolicyData rpd = rmd.getPolicyData();
@@ -247,7 +261,7 @@ public abstract class BindingBuilder {
log.debug("Token inclusion: " + token.getInclusion());
- RampartUtil.setKeyIdentifierType(rpd, sig, token);
+ RampartUtil.setKeyIdentifierType(rmd, sig, token);
String user = null;
@@ -370,7 +384,7 @@ public abstract class BindingBuilder {
//We have to use a cert
//Prepare X509 signature
- WSSecSignature sig = this.getSignatureBuider(rmd, token);
+ WSSecSignature sig = this.getSignatureBuilder(rmd, token);
Element bstElem = sig.getBinarySecurityTokenElement();
if(bstElem != null) {
bstElem = RampartUtil.insertSiblingAfter(rmd,
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java Mon Jan 30 17:08:19 2017
@@ -256,7 +256,7 @@ public class TransportBindingBuilder ext
} else {
try {
- WSSecSignature sig = this.getSignatureBuider(rmd, token);
+ WSSecSignature sig = this.getSignatureBuilder(rmd, token);
sig.appendBSTElementToHeader(rmd.getSecHeader());
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/errors.properties
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/errors.properties?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/errors.properties (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/errors.properties Mon Jan 30 17:08:19 2017
@@ -95,4 +95,7 @@ signedElementNotSigned = Element must be
bodyNotSigned = Soap Body must be signed
unexprectedSignature = Unexpected signature
invalidTransport = Expected transport is "https" but incoming transport found : \"{0}\"
-requiredElementsMissing = Required Elements not found in the incoming message : {0}
\ No newline at end of file
+requiredElementsMissing = Required Elements not found in the incoming message : {0}
+repeatingNonceValue = Nonce value : {0}, already seen before for user name : {1}. Possibly this could be a replay attack.
+invalidNonceLifeTime = Invalid value for nonceLifeTime in rampart configuration file.
+invalidIssuerAddress = Invalid value for Issuer
\ No newline at end of file
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartReceiver.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartReceiver.java?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartReceiver.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartReceiver.java Mon Jan 30 17:08:19 2017
@@ -159,16 +159,30 @@ public class RampartReceiver implements
msgContext.setProperty(RampartConstants.SEC_FAULT, Boolean.TRUE);
String soapVersionURI = msgContext.getEnvelope().getNamespace().getNamespaceURI();
- QName invalidSecurity = new QName(WSConstants.INVALID_SECURITY.getNamespaceURI(),WSConstants.INVALID_SECURITY.getLocalPart(),"wsse");
+ QName faultCode = null;
+ /*
+ * Get the faultCode from the thrown WSSecurity exception, if there is one
+ */
+ if (e instanceof WSSecurityException)
+ {
+ faultCode = ((WSSecurityException)e).getFaultCode();
+ }
+ /*
+ * Otherwise default to InvalidSecurity
+ */
+ if (faultCode == null)
+ {
+ faultCode = new QName(WSConstants.INVALID_SECURITY.getNamespaceURI(),WSConstants.INVALID_SECURITY.getLocalPart(),"wsse");
+ }
if (soapVersionURI.equals(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI) ) {
- throw new AxisFault(invalidSecurity,e.getMessage(),e);
+ throw new AxisFault(faultCode,e.getMessage(),e);
} else if (soapVersionURI.equals(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI)) {
List subfaultCodes = new ArrayList();
- subfaultCodes.add(invalidSecurity);
+ subfaultCodes.add(faultCode);
throw new AxisFault(Constants.FAULT_SOAP12_SENDER,subfaultCodes,e.getMessage(),e);
}
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSDoAllSender.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSDoAllSender.java?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSDoAllSender.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSDoAllSender.java Mon Jan 30 17:08:19 2017
@@ -257,7 +257,7 @@ public class WSDoAllSender extends WSDoA
// of the same handler
repetition++;
msgContext.setProperty(WSSHandlerConstants.CURRENT_REPETITON,
- new Integer(repetition));
+ Integer.valueOf(repetition));
this.invoke(msgContext);
}
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java Mon Jan 30 17:08:19 2017
@@ -127,6 +127,7 @@ public class RampartPolicyBuilder {
private static void processTransportBinding(TransportBinding binding, RampartPolicyData rpd) {
binding(binding, rpd);
rpd.setTransportBinding(true);
+ rpd.setTokenProtection(binding.isTokenProtection());
TransportToken transportToken = binding.getTransportToken();
if ( transportToken != null ) {
rpd.setTransportToken(transportToken.getTransportToken());
@@ -233,6 +234,7 @@ public class RampartPolicyBuilder {
if (sep.isSignedParts()) {
rpd.setSignBody(sep.isBody());
rpd.setSignAttachments(sep.isAttachments());
+ rpd.setSignAllHeaders(sep.isSignAllHeaders());
rpd.setSignBodyOptional(sep.isOptional());
rpd.setSignAttachmentsOptional(sep.isOptional());
while (it.hasNext()) {
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyData.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyData.java?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyData.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyData.java Mon Jan 30 17:08:19 2017
@@ -107,6 +107,8 @@ public class RampartPolicyData {
private boolean encryptAttachmentsOptional;
+ private boolean signAllHeaders;
+
private Vector signedParts = new Vector();
private Vector signedElements = new Vector();
@@ -926,6 +928,14 @@ public class RampartPolicyData {
public MTOMAssertion getMTOMAssertion(){
return mtomAssertion;
}
+
+ public boolean isSignAllHeaders() {
+ return signAllHeaders;
+ }
+
+ public void setSignAllHeaders(boolean signAllHeaders) {
+ this.signAllHeaders = signAllHeaders;
+ }
public boolean isMTOMSerialize(){
if(mtomAssertion == null){
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/policy/builders/RampartConfigBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/policy/builders/RampartConfigBuilder.java?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/policy/builders/RampartConfigBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/policy/builders/RampartConfigBuilder.java Mon Jan 30 17:08:19 2017
@@ -103,6 +103,13 @@ public class RampartConfigBuilder implem
}
childElement = element.getFirstChildWithName(new QName(
+ RampartConfig.NS, RampartConfig.DEC_CRYPTO_LN));
+ if (childElement != null) {
+ rampartConfig.setDecCryptoConfig((CryptoConfig) factory
+ .build(childElement.getFirstElement()));
+ }
+
+ childElement = element.getFirstChildWithName(new QName(
RampartConfig.NS, RampartConfig.STS_CRYPTO_LN));
if (childElement != null) {
rampartConfig.setStsCryptoConfig((CryptoConfig) factory
@@ -126,6 +133,18 @@ public class RampartConfigBuilder implem
if (childElement != null) {
rampartConfig.setTimestampMaxSkew(childElement.getText().trim());
}
+
+ childElement = element.getFirstChildWithName(new QName(
+ RampartConfig.NS, RampartConfig.NONCE_LIFE_TIME));
+ if (childElement != null) {
+ rampartConfig.setNonceLifeTime(childElement.getText().trim());
+ }
+
+ childElement = element.getFirstChildWithName(new QName(
+ RampartConfig.NS, RampartConfig.TOKEN_STORE_CLASS_LN));
+ if (childElement != null) {
+ rampartConfig.setTokenStoreClass(childElement.getText().trim());
+ }
childElement = element.getFirstChildWithName(new QName(
RampartConfig.NS, RampartConfig.OPTIMISE_PARTS));
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/policy/model/OptimizePartsConfig.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/policy/model/OptimizePartsConfig.java?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/policy/model/OptimizePartsConfig.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/policy/model/OptimizePartsConfig.java Mon Jan 30 17:08:19 2017
@@ -100,6 +100,7 @@ public class OptimizePartsConfig impleme
while(ite.hasNext()){
String strPrefix = (String)ite.next();
String strURI = (String) namespaces.get(strPrefix);
+ writer.writeStartElement(RampartConfig.NS, NAMESPACE_LN);
writer.writeAttribute(URI_ATTR , strURI);
writer.writeAttribute(PREFIX_ATTR, strPrefix);
writer.writeEndElement();
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/policy/model/RampartConfig.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/policy/model/RampartConfig.java?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/policy/model/RampartConfig.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/policy/model/RampartConfig.java Mon Jan 30 17:08:19 2017
@@ -39,6 +39,7 @@ import javax.xml.stream.XMLStreamWriter;
* <ramp:timestampTTL>300</ramp:timestampTTL>
* <ramp:timestampMaxSkew>0</ramp:timestampMaxSkew>
* <ramp:tokenStoreClass>org.apache.rahas.StorageImpl</ramp:tokenStoreClass>
+ * <ramp:nonceLifeTime>org.apache.rahas.StorageImpl</ramp:nonceLifeTime>
*
* <ramp:signatureCrypto>
* <ramp:crypto provider="org.apache.ws.security.components.crypto.Merlin">
@@ -67,6 +68,8 @@ public class RampartConfig implements As
public static final int DEFAULT_TIMESTAMP_MAX_SKEW = 300;
+ public static final int DEFAULT_NONCE_LIFE_TIME = 60 * 5; // Default life time of a nonce is 5 minutes
+
public final static String NS = "http://ws.apache.org/rampart/policy";
public final static String PREFIX = "rampart";
@@ -102,6 +105,8 @@ public class RampartConfig implements As
public final static String TS_MAX_SKEW_LN = "timestampMaxSkew";
public final static String TOKEN_STORE_CLASS_LN = "tokenStoreClass";
+
+ public final static String NONCE_LIFE_TIME = "nonceLifeTime";
public final static String OPTIMISE_PARTS = "optimizeParts";
@@ -138,6 +143,8 @@ public class RampartConfig implements As
private OptimizePartsConfig optimizeParts;
private String tokenStoreClass;
+
+ private String nonceLifeTime = Integer.toString(DEFAULT_NONCE_LIFE_TIME);
private SSLConfig sslConfig;
@@ -165,6 +172,21 @@ public class RampartConfig implements As
this.tokenStoreClass = tokenStoreClass;
}
+ /**
+ * @return Returns the life time of a nonce in seconds.
+ */
+ public String getNonceLifeTime() {
+ return this.nonceLifeTime;
+ }
+
+ /**
+ * @param nonceLife
+ * The life time of a nonce to set (in seconds).
+ */
+ public void setNonceLifeTime(String nonceLife) {
+ this.nonceLifeTime = nonceLife;
+ }
+
public CryptoConfig getDecCryptoConfig() {
return decCryptoConfig;
}
@@ -327,6 +349,12 @@ public class RampartConfig implements As
writer.writeCharacters(getTokenStoreClass());
writer.writeEndElement();
}
+
+ if (getNonceLifeTime() != null) {
+ writer.writeStartElement(NS, NONCE_LIFE_TIME);
+ writer.writeCharacters(getNonceLifeTime());
+ writer.writeEndElement();
+ }
if (encrCryptoConfig != null) {
writer.writeStartElement(NS, ENCR_CRYPTO_LN);
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java Mon Jan 30 17:08:19 2017
@@ -163,7 +163,13 @@ public class Axis2Util {
}
}
-
+ /**
+ * Builds a SOAPEnvelope from DOM Document.
+ * @param doc - The dom document that contains a SOAP message
+ * @param useDoom
+ * @return
+ * @throws WSSecurityException
+ */
public static SOAPEnvelope getSOAPEnvelopeFromDOMDocument(Document doc, boolean useDoom)
throws WSSecurityException {
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/util/HandlerParameterDecoder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/util/HandlerParameterDecoder.java?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/util/HandlerParameterDecoder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/util/HandlerParameterDecoder.java Mon Jan 30 17:08:19 2017
@@ -149,7 +149,7 @@ public class HandlerParameterDecoder {
}
msgCtx.setProperty(WSSHandlerConstants.SENDER_REPEAT_COUNT,
- new Integer(repetitionCount));
+ Integer.valueOf(repetitionCount));
}
}
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java Mon Jan 30 17:08:19 2017
@@ -438,18 +438,18 @@ public class RampartUtil {
*/
public static String processIssuerAddress(OMElement issuerAddress)
throws RampartException {
- if(issuerAddress != null && issuerAddress.getText() != null &&
- !"".equals(issuerAddress.getText())) {
- return issuerAddress.getText().trim();
- } else {
- if(issuerAddress != null) {
- throw new RampartException("invalidIssuerAddress",
- new String[] { issuerAddress.toString() });
- } else {
- throw new RampartException("invalidIssuerAddress",
- new String[] { "Issuer address null" });
- }
+
+ if(issuerAddress == null){
+ throw new RampartException("invalidIssuerAddress",
+ new String[] { "Issuer address null" });
+ }
+
+ if(issuerAddress.getText() == null || "".equals(issuerAddress.getText())) {
+ throw new RampartException("invalidIssuerAddress",
+ new String[] { issuerAddress.toString() });
}
+
+ return issuerAddress.getText().trim();
}
/**
@@ -881,6 +881,19 @@ public class RampartUtil {
public static Vector getSignedParts(RampartMessageData rmd) {
RampartPolicyData rpd = rmd.getPolicyData();
SOAPEnvelope envelope = rmd.getMsgContext().getEnvelope();
+
+ //"signAllHeaders" indicates that all the headers should be signed.
+ if (rpd.isSignAllHeaders()) {
+ Iterator childHeaders = envelope.getHeader().getChildElements();
+ while (childHeaders.hasNext()) {
+ OMElement hb = (OMElement) childHeaders.next();
+ if (!(hb.getLocalName().equals(WSConstants.WSSE_LN)
+ && hb.getNamespace().getNamespaceURI().equals(WSConstants.WSSE_NS))) {
+ rpd.addSignedPart(hb.getNamespace().getNamespaceURI(),hb.getLocalName());
+ }
+ }
+ }
+
return getPartsAndElements(true, envelope, rpd.isSignBody()
&& !rpd.isSignBodyOptional(), rpd.getSignedParts(), rpd
.getSignedElements(), rpd.getDeclaredNamespaces());
@@ -1151,9 +1164,12 @@ public class RampartUtil {
* @return
*/
public static boolean checkRequiredElements(SOAPEnvelope envelope, HashMap decNamespaces, String expression ) {
+
+ // The XPath expression must be evaluated against the SOAP header
+ // http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/ws-securitypolicy-1.2-spec-os.html#_Toc161826519
+ SOAPHeader header = envelope.getHeader();
-
- Set namespaces = findAllPrefixNamespaces(envelope, decNamespaces);
+ Set namespaces = findAllPrefixNamespaces(header, decNamespaces);
try {
XPath xp = new AXIOMXPath(expression);
@@ -1165,7 +1181,7 @@ public class RampartUtil {
xp.addNamespace(tmpNs.getPrefix(), tmpNs.getNamespaceURI());
}
- List selectedNodes = xp.selectNodes(envelope);
+ List selectedNodes = xp.selectNodes(header);
if (selectedNodes.size() == 0 ) {
return false;
@@ -1288,10 +1304,16 @@ public class RampartUtil {
* the WSS11 and WSS10 assertions
*/
- public static void setKeyIdentifierType(RampartPolicyData rpd, WSSecBase secBase,org.apache.ws.secpolicy.model.Token token) {
-
- if (token.getInclusion() == SPConstants.INCLUDE_TOKEN_NEVER) {
-
+ public static void setKeyIdentifierType(RampartMessageData rmd, WSSecBase secBase,org.apache.ws.secpolicy.model.Token token) {
+
+ // Use a reference rather than the binary security token if: the policy never allows the token to be
+ // included; or this is the recipient and the token should only be included in requests; or this is
+ // the initiator and the token should only be included in responses.
+ final boolean useReference = token.getInclusion() == SPConstants.INCLUDE_TOKEN_NEVER
+ || !rmd.isInitiator() && token.getInclusion() == SPConstants.INCLUDE_TOEKN_ALWAYS_TO_RECIPIENT
+ || rmd.isInitiator() && token.getInclusion() == SPConstants.INCLUDE_TOEKN_ALWAYS_TO_INITIATOR;
+ if (useReference) {
+
boolean tokenTypeSet = false;
if(token instanceof X509Token) {
@@ -1310,6 +1332,7 @@ public class RampartUtil {
}
if (!tokenTypeSet) {
+ final RampartPolicyData rpd = rmd.getPolicyData();
Wss10 wss = rpd.getWss11();
if (wss == null) {
wss = rpd.getWss10();
@@ -1555,7 +1578,26 @@ public class RampartUtil {
if (supportingTokens != null && supportingTokens.getTokens().size() != 0) {
return true;
}
-
+
+ supportingTokens = rpd.getEncryptedSupportingTokens();
+ if (supportingTokens != null && supportingTokens.getTokens().size() != 0) {
+ return true;
+ }
+
+ supportingTokens = rpd.getSignedEncryptedSupportingTokens();
+ if (supportingTokens != null && supportingTokens.getTokens().size() != 0) {
+ return true;
+ }
+
+ supportingTokens = rpd.getEndorsingEncryptedSupportingTokens();
+ if (supportingTokens != null && supportingTokens.getTokens().size() != 0) {
+ return true;
+ }
+
+ supportingTokens = rpd.getSignedEndorsingEncryptedSupportingTokens();
+ if (supportingTokens != null && supportingTokens.getTokens().size() != 0) {
+ return true;
+ }
}
return false;
@@ -1731,4 +1773,4 @@ public class RampartUtil {
}
-}
\ No newline at end of file
+}
Propchange: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jan 30 17:08:19 2017
@@ -0,0 +1,4 @@
+.settings
+target
+.classpath
+.project
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/pom.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/pom.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/pom.xml Mon Jan 30 17:08:19 2017
@@ -48,7 +48,7 @@
<artifactItem>
<groupId>org.apache.axis2</groupId>
<artifactId>addressing</artifactId>
- <version>${addressing.mar.version}</version>
+ <version>${axis2.version}</version>
<type>mar</type>
<overWrite>true</overWrite>
<outputDirectory>target/artifacts</outputDirectory>
@@ -119,9 +119,9 @@
<phase>process-test-resources</phase>
<configuration>
<tasks>
- <property name="addressing.mar" value="addressing-${addressing.mar.version}.mar"/>
- <copy file="target/artifacts/addressing-${addressing.mar.version}.mar"
- tofile="target/test-classes/modules/addressing-${addressing.mar.version}.mar"/>
+ <property name="addressing.mar" value="addressing-${axis2.version}.mar"/>
+ <copy file="target/artifacts/addressing-${axis2.version}.mar"
+ tofile="target/test-classes/modules/addressing-${axis2.version}.mar"/>
<copy file="target/artifacts/rampart-${rampart.mar.version}.mar"
tofile="target/test-classes/modules/rampart-${rampart.mar.version}.mar"/>
@@ -145,8 +145,8 @@
tofile="target/test-resources/rampart_client_repo/modules/rampart-${rampart.mar.version}.mar"/>
<copy file="target/artifacts/rahas-${rahas.mar.version}.mar"
tofile="target/test-resources/rampart_client_repo/modules/rahas-${rahas.mar.version}.mar"/>
- <copy file="target/artifacts/addressing-${addressing.mar.version}.mar"
- tofile="target/test-resources/rampart_client_repo/modules/addressing-${addressing.mar.version}.mar"/>
+ <copy file="target/artifacts/addressing-${axis2.version}.mar"
+ tofile="target/test-resources/rampart_client_repo/modules/addressing-${axis2.version}.mar"/>
<mkdir dir="target/test-resources/rampart_service_repo"/>
<mkdir dir="target/test-resources/rampart_service_repo/conf"/>
<mkdir dir="target/test-resources/rampart_service_repo/services"/>
@@ -155,8 +155,8 @@
tofile="target/test-resources/rampart_service_repo/modules/rampart-${rampart.mar.version}.mar"/>
<copy file="target/artifacts/rahas-${rahas.mar.version}.mar"
tofile="target/test-resources/rampart_service_repo/modules/rahas-${rahas.mar.version}.mar"/>
- <copy file="target/artifacts/addressing-${addressing.mar.version}.mar"
- tofile="target/test-resources/rampart_service_repo/modules/addressing-${addressing.mar.version}.mar"/>
+ <copy file="target/artifacts/addressing-${axis2.version}.mar"
+ tofile="target/test-resources/rampart_service_repo/modules/addressing-${axis2.version}.mar"/>
<!-- Service 1 -->
<copy overwrite="yes"
@@ -332,6 +332,12 @@
tofile="target/temp-ramp/META-INF/services.xml"/>
<jar jarfile="target/test-resources/rampart_service_repo/services/SecureService29.aar"
basedir="target/temp-ramp"/>
+ <!-- Service 30 -->
+ <copy overwrite="yes"
+ file="src/test/resources/rampart/services-30.xml"
+ tofile="target/temp-ramp/META-INF/services.xml"/>
+ <jar jarfile="target/test-resources/rampart_service_repo/services/SecureService30.aar"
+ basedir="target/temp-ramp"/>
<!-- Service SC-1 -->
@@ -386,8 +392,8 @@
<mkdir dir="target/test-resources/rahas_client_repo"/>
<mkdir dir="target/test-resources/rahas_client_repo/conf"/>
<mkdir dir="target/test-resources/rahas_client_repo/modules"/>
- <copy file="target/artifacts/addressing-${addressing.mar.version}.mar"
- tofile="target/test-resources/rahas_client_repo/modules/addressing-${addressing.mar.version}.mar"/>
+ <copy file="target/artifacts/addressing-${axis2.version}.mar"
+ tofile="target/test-resources/rahas_client_repo/modules/addressing-${axis2.version}.mar"/>
<copy file="target/artifacts/rampart-${rampart.mar.version}.mar"
tofile="target/test-resources/rahas_client_repo/modules/rampart-${rampart.mar.version}.mar"/>
<!-- Rahas Test1: SAML Token test -->
@@ -399,8 +405,8 @@
tofile="target/test-resources/rahas_service_repo_1/modules/rampart-${rampart.mar.version}.mar"/>
<copy file="target/artifacts/rahas-${rahas.mar.version}.mar"
tofile="target/test-resources/rahas_service_repo_1/modules/rahas-${rahas.mar.version}.mar"/>
- <copy file="target/artifacts/addressing-${addressing.mar.version}.mar"
- tofile="target/test-resources/rahas_service_repo_1/modules/addressing-${addressing.mar.version}.mar"/>
+ <copy file="target/artifacts/addressing-${axis2.version}.mar"
+ tofile="target/test-resources/rahas_service_repo_1/modules/addressing-${axis2.version}.mar"/>
<!-- copy the services.xml and create the aar -->
<copy overwrite="yes"
file="src/test/resources/rahas/s1-services.xml"
@@ -419,8 +425,8 @@
tofile="target/test-resources/rahas_service_repo_3/modules/rampart-${rampart.mar.version}.mar"/>
<copy file="target/artifacts/rahas-${rahas.mar.version}.mar"
tofile="target/test-resources/rahas_service_repo_3/modules/rahas-${rahas.mar.version}.mar"/>
- <copy file="target/artifacts/addressing-${addressing.mar.version}.mar"
- tofile="target/test-resources/rahas_service_repo_3/modules/addressing-${addressing.mar.version}.mar"/>
+ <copy file="target/artifacts/addressing-${axis2.version}.mar"
+ tofile="target/test-resources/rahas_service_repo_3/modules/addressing-${axis2.version}.mar"/>
<!-- copy the services.xml and create the aar -->
<copy overwrite="yes"
file="src/test/resources/rahas/s3-services.xml"
@@ -435,8 +441,8 @@
<mkdir dir="target/test-resources/default_security_client_repo/modules"/>
<copy file="target/artifacts/rampart-${rampart.mar.version}.mar"
tofile="target/test-resources/default_security_client_repo/modules/rampart-${rampart.mar.version}.mar"/>
- <copy file="target/artifacts/addressing-${addressing.mar.version}.mar"
- tofile="target/test-resources/default_security_client_repo/modules/addressing-${addressing.mar.version}.mar"/>
+ <copy file="target/artifacts/addressing-${axis2.version}.mar"
+ tofile="target/test-resources/default_security_client_repo/modules/addressing-${axis2.version}.mar"/>
<copy file="src/test/resources/conf/axis2.xml"
tofile="target/test-resources/default_security_client_repo/conf/axis2.xml"/>
<!--
@@ -450,8 +456,8 @@
tofile="target/test-resources/rahas_service_repo_5/modules/rampart-${rampart.mar.version}.mar"/>
<copy file="target/artifacts/rahas-${rahas.mar.version}.mar"
tofile="target/test-resources/rahas_service_repo_5/modules/rahas-${rahas.mar.version}.mar"/>
- <copy file="target/artifacts/addressing-${addressing.mar.version}.mar"
- tofile="target/test-resources/rahas_service_repo_5/modules/addressing-${addressing.mar.version}.mar"/>
+ <copy file="target/artifacts/addressing-${axis2.version}.mar"
+ tofile="target/test-resources/rahas_service_repo_5/modules/addressing-${axis2.version}.mar"/>
<!-- copy the services.xml and create the aar -->
<copy overwrite="yes"
file="src/test/resources/rahas/s5-services.xml"
@@ -698,15 +704,15 @@
tofile="target/test-resources/complete_client_repo/conf/axis2.xml"/>
<copy file="target/artifacts/rampart-${rampart.mar.version}.mar"
tofile="target/test-resources/complete_client_repo/modules/rampart-${rampart.mar.version}.mar"/>
- <copy file="target/artifacts/addressing-${addressing.mar.version}.mar"
- tofile="target/test-resources/complete_client_repo/modules/addressing-${addressing.mar.version}.mar"/>
+ <copy file="target/artifacts/addressing-${axis2.version}.mar"
+ tofile="target/test-resources/complete_client_repo/modules/addressing-${axis2.version}.mar"/>
<!-- Test with addressing and MTOMservice repository-->
<copy file="src/test/resources/security/complete.service.axis2.xml"
tofile="target/test-resources/complete_service_repo/conf/axis2.xml"/>
<copy file="target/artifacts/rampart-${rampart.mar.version}.mar"
tofile="target/test-resources/complete_service_repo/modules/rampart-${rampart.mar.version}.mar"/>
- <copy file="target/artifacts/addressing-${addressing.mar.version}.mar"
- tofile="target/test-resources/complete_service_repo/modules/addressing-${addressing.mar.version}.mar"/>
+ <copy file="target/artifacts/addressing-${axis2.version}.mar"
+ tofile="target/test-resources/complete_service_repo/modules/addressing-${axis2.version}.mar"/>
<copy file="src/test/resources/security/complete.service.xml"
tofile="target/temp-interop/META-INF/services.xml"
overwrite="true"/>
@@ -765,11 +771,6 @@
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
- <artifactId>axis2-transport-tcp</artifactId>
- <version>${axis2.transport.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-local</artifactId>
<version>${axis2.version}</version>
</dependency>
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java Mon Jan 30 17:08:19 2017
@@ -77,7 +77,7 @@ public class RampartTest extends TestCas
"Unlimited Strength Jurisdiction Policy !!!");
}
- for (int i = 1; i <= 29; i++) { //<-The number of tests we have
+ for (int i = 1; i <= 30; i++) { //<-The number of tests we have
if(!basic256Supported && (i == 3 || i == 4 || i == 5)) {
//Skip the Basic256 tests
continue;
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/conf/axis2.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/conf/axis2.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/conf/axis2.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/conf/axis2.xml Mon Jan 30 17:08:19 2017
@@ -138,20 +138,10 @@
<!--<parameter name="transport.mail.replyToAddress" locked="false">axis2@127.0.0.1</parameter>-->
<!--</transportReceiver>-->
- <transportReceiver name="tcp"
- class="org.apache.axis2.transport.tcp.TCPServer">
- <parameter name="port" locked="false">6060</parameter>
- <!--If you want to give your own host address for EPR generation-->
- <!--uncommet following paramter , and set as you required.-->
- <!--<parameter name="hostname" locked="false">tcp://myApp.com/ws</parameter>-->
- </transportReceiver>
-
<!-- ================================================= -->
<!-- Transport Outs -->
<!-- ================================================= -->
- <transportSender name="tcp"
- class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
<transportSender name="local"
class="org.apache.axis2.transport.local.LocalTransportSender"/>
<transportSender name="http"
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rahas/policy/service-policy-symm-binding-saml2-publicKey.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rahas/policy/service-policy-symm-binding-saml2-publicKey.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rahas/policy/service-policy-symm-binding-saml2-publicKey.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rahas/policy/service-policy-symm-binding-saml2-publicKey.xml Mon Jan 30 17:08:19 2017
@@ -20,7 +20,7 @@
</sp:ProtectionToken>
<sp:AlgorithmSuite>
<wsp:Policy>
- <sp:Basic256/>
+ <sp:Basic128/>
</wsp:Policy>
</sp:AlgorithmSuite>
<sp:Layout>
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rahas/policy/service-policy-symm-binding-saml2.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rahas/policy/service-policy-symm-binding-saml2.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rahas/policy/service-policy-symm-binding-saml2.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rahas/policy/service-policy-symm-binding-saml2.xml Mon Jan 30 17:08:19 2017
@@ -20,7 +20,7 @@
</sp:ProtectionToken>
<sp:AlgorithmSuite>
<wsp:Policy>
- <sp:Basic256/>
+ <sp:Basic128/>
</wsp:Policy>
</sp:AlgorithmSuite>
<sp:Layout>
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rahas/policy/service-policy-symm-binding.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rahas/policy/service-policy-symm-binding.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rahas/policy/service-policy-symm-binding.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rahas/policy/service-policy-symm-binding.xml Mon Jan 30 17:08:19 2017
@@ -20,7 +20,7 @@
</sp:ProtectionToken>
<sp:AlgorithmSuite>
<wsp:Policy>
- <sp:Basic256/>
+ <sp:Basic128/>
</wsp:Policy>
</sp:AlgorithmSuite>
<sp:Layout>
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rahas/policy/service-policy-transport-binding.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rahas/policy/service-policy-transport-binding.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rahas/policy/service-policy-transport-binding.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rahas/policy/service-policy-transport-binding.xml Mon Jan 30 17:08:19 2017
@@ -10,7 +10,7 @@
</sp:TransportToken>
<sp:AlgorithmSuite>
<wsp:Policy>
- <sp:Basic256/>
+ <sp:Basic128/>
</wsp:Policy>
</sp:AlgorithmSuite>
<sp:Layout>
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rahas/policy/sts-policy-asymm-binding.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rahas/policy/sts-policy-asymm-binding.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rahas/policy/sts-policy-asymm-binding.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rahas/policy/sts-policy-asymm-binding.xml Mon Jan 30 17:08:19 2017
@@ -23,7 +23,7 @@
</sp:RecipientToken>
<sp:AlgorithmSuite>
<wsp:Policy>
- <sp:Basic256/>
+ <sp:Basic128/>
</wsp:Policy>
</sp:AlgorithmSuite>
<sp:Layout>
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rahas/policy/sts-policy-symm-binding.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rahas/policy/sts-policy-symm-binding.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rahas/policy/sts-policy-symm-binding.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rahas/policy/sts-policy-symm-binding.xml Mon Jan 30 17:08:19 2017
@@ -16,7 +16,7 @@
</sp:ProtectionToken>
<sp:AlgorithmSuite>
<wsp:Policy>
- <sp:Basic256/>
+ <sp:Basic128/>
</wsp:Policy>
</sp:AlgorithmSuite>
<sp:Layout>
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rahas/policy/sts-policy-transport-binding.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rahas/policy/sts-policy-transport-binding.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rahas/policy/sts-policy-transport-binding.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rahas/policy/sts-policy-transport-binding.xml Mon Jan 30 17:08:19 2017
@@ -10,7 +10,7 @@
</sp:TransportToken>
<sp:AlgorithmSuite>
<wsp:Policy>
- <sp:Basic256/>
+ <sp:Basic128/>
</wsp:Policy>
</sp:AlgorithmSuite>
<sp:Layout>
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/1.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/1.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/1.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/1.xml Mon Jan 30 17:08:19 2017
@@ -10,7 +10,7 @@
</sp:TransportToken>
<sp:AlgorithmSuite>
<wsp:Policy>
- <sp:Basic256/>
+ <sp:Basic128/>
</wsp:Policy>
</sp:AlgorithmSuite>
<sp:Layout>
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/10.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/10.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/10.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/10.xml Mon Jan 30 17:08:19 2017
@@ -1,4 +1,4 @@
-<wsp:Policy wsu:Id="SigOnly" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+<wsp:Policy wsu:Id="SigOnly" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
<!--No timestamp test-->
<wsp:ExactlyOne>
<wsp:All>
@@ -24,7 +24,7 @@
</sp:RecipientToken>
<sp:AlgorithmSuite>
<wsp:Policy>
- <sp:Basic256/>
+ <sp:Basic128/>
</wsp:Policy>
</sp:AlgorithmSuite>
<sp:Layout>
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/13.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/13.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/13.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/13.xml Mon Jan 30 17:08:19 2017
@@ -10,7 +10,7 @@
</sp:TransportToken>
<sp:AlgorithmSuite>
<wsp:Policy>
- <sp:Basic256/>
+ <sp:Basic128/>
</wsp:Policy>
</sp:AlgorithmSuite>
<sp:Layout>
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/14.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/14.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/14.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/14.xml Mon Jan 30 17:08:19 2017
@@ -18,7 +18,7 @@
</sp:ProtectionToken>
<sp:AlgorithmSuite>
<wsp:Policy>
- <sp:Basic256/>
+ <sp:Basic128/>
</wsp:Policy>
</sp:AlgorithmSuite>
<sp:Layout>
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/15.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/15.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/15.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/15.xml Mon Jan 30 17:08:19 2017
@@ -19,7 +19,7 @@
</sp:ProtectionToken>
<sp:AlgorithmSuite>
<wsp:Policy>
- <sp:Basic256/>
+ <sp:Basic128/>
</wsp:Policy>
</sp:AlgorithmSuite>
<sp:Layout>
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/17.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/17.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/17.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/17.xml Mon Jan 30 17:08:19 2017
@@ -19,7 +19,7 @@
</sp:ProtectionToken>
<sp:AlgorithmSuite>
<wsp:Policy>
- <sp:Basic256/>
+ <sp:Basic128/>
</wsp:Policy>
</sp:AlgorithmSuite>
<sp:Layout>
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/18.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/18.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/18.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/18.xml Mon Jan 30 17:08:19 2017
@@ -19,7 +19,7 @@
</sp:ProtectionToken>
<sp:AlgorithmSuite>
<wsp:Policy>
- <sp:Basic256/>
+ <sp:Basic128/>
</wsp:Policy>
</sp:AlgorithmSuite>
<sp:Layout>
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/19.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/19.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/19.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/19.xml Mon Jan 30 17:08:19 2017
@@ -19,7 +19,7 @@
</sp:ProtectionToken>
<sp:AlgorithmSuite>
<wsp:Policy>
- <sp:Basic256/>
+ <sp:Basic128/>
</wsp:Policy>
</sp:AlgorithmSuite>
<sp:Layout>
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/2.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/2.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/2.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/2.xml Mon Jan 30 17:08:19 2017
@@ -23,7 +23,7 @@
</sp:RecipientToken>
<sp:AlgorithmSuite>
<wsp:Policy>
- <sp:Basic256/>
+ <sp:Basic128/>
</wsp:Policy>
</sp:AlgorithmSuite>
<sp:Layout>
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/20.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/20.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/20.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/20.xml Mon Jan 30 17:08:19 2017
@@ -19,7 +19,7 @@
</sp:ProtectionToken>
<sp:AlgorithmSuite>
<wsp:Policy>
- <sp:Basic256/>
+ <sp:Basic128/>
</wsp:Policy>
</sp:AlgorithmSuite>
<sp:Layout>
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/21.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/21.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/21.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/21.xml Mon Jan 30 17:08:19 2017
@@ -23,7 +23,7 @@
</sp:RecipientToken>
<sp:AlgorithmSuite>
<wsp:Policy>
- <sp:Basic256/>
+ <sp:Basic128/>
</wsp:Policy>
</sp:AlgorithmSuite>
<sp:Layout>
@@ -46,7 +46,7 @@
</sp:SignedParts>
<ramp:RampartConfig xmlns:ramp="http://ws.apache.org/rampart/policy">
<ramp:user>not-used</ramp:user>
- <ramp:encryptionUser>bob</ramp:encryptionUser>
+ <ramp:encryptionUser>bob</ramp:encryptionUser>
<ramp:rampartConfigCallbackClass>org.apache.rampart.RampartConfigUpdater</ramp:rampartConfigCallbackClass>
<ramp:passwordCallbackClass>org.apache.rampart.PWCallback</ramp:passwordCallbackClass>
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/22.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/22.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/22.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/22.xml Mon Jan 30 17:08:19 2017
@@ -20,7 +20,7 @@
</sp:ProtectionToken>
<sp:AlgorithmSuite>
<wsp:Policy>
- <sp:Basic256/>
+ <sp:Basic128/>
</wsp:Policy>
</sp:AlgorithmSuite>
<sp:Layout>
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/23.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/23.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/23.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/23.xml Mon Jan 30 17:08:19 2017
@@ -20,7 +20,7 @@
</sp:ProtectionToken>
<sp:AlgorithmSuite>
<wsp:Policy>
- <sp:Basic256/>
+ <sp:Basic128/>
</wsp:Policy>
</sp:AlgorithmSuite>
<sp:Layout>
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/24.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/24.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/24.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/24.xml Mon Jan 30 17:08:19 2017
@@ -20,7 +20,7 @@
</sp:ProtectionToken>
<sp:AlgorithmSuite>
<wsp:Policy>
- <sp:Basic256/>
+ <sp:Basic128/>
</wsp:Policy>
</sp:AlgorithmSuite>
<sp:Layout>
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/25.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/25.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/25.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/25.xml Mon Jan 30 17:08:19 2017
@@ -20,7 +20,7 @@
</sp:ProtectionToken>
<sp:AlgorithmSuite>
<wsp:Policy>
- <sp:Basic256/>
+ <sp:Basic128/>
</wsp:Policy>
</sp:AlgorithmSuite>
<sp:Layout>
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/26.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/26.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/26.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/26.xml Mon Jan 30 17:08:19 2017
@@ -24,7 +24,7 @@
</sp:RecipientToken>
<sp:AlgorithmSuite>
<wsp:Policy>
- <sp:Basic256/>
+ <sp:Basic128/>
</wsp:Policy>
</sp:AlgorithmSuite>
<sp:Layout>
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/27.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/27.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/27.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/27.xml Mon Jan 30 17:08:19 2017
@@ -24,7 +24,7 @@
</sp:RecipientToken>
<sp:AlgorithmSuite>
<wsp:Policy>
- <sp:Basic256/>
+ <sp:Basic128/>
</wsp:Policy>
</sp:AlgorithmSuite>
<sp:Layout>
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/28.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/28.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/28.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/28.xml Mon Jan 30 17:08:19 2017
@@ -28,7 +28,7 @@
</sp:RecipientToken>
<sp:AlgorithmSuite>
<wsp:Policy>
- <sp:Basic256/>
+ <sp:Basic128/>
</wsp:Policy>
</sp:AlgorithmSuite>
<sp:Layout>
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/3.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/3.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/3.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/3.xml Mon Jan 30 17:08:19 2017
@@ -23,7 +23,7 @@
</sp:RecipientToken>
<sp:AlgorithmSuite>
<wsp:Policy>
- <sp:Basic256/>
+ <sp:Basic128/>
</wsp:Policy>
</sp:AlgorithmSuite>
<sp:Layout>
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/4.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/4.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/4.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/4.xml Mon Jan 30 17:08:19 2017
@@ -23,7 +23,7 @@
</sp:RecipientToken>
<sp:AlgorithmSuite>
<wsp:Policy>
- <sp:Basic256/>
+ <sp:Basic128/>
</wsp:Policy>
</sp:AlgorithmSuite>
<sp:Layout>
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/5.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/5.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/5.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/5.xml Mon Jan 30 17:08:19 2017
@@ -25,7 +25,7 @@
</sp:RecipientToken>
<sp:AlgorithmSuite>
<wsp:Policy>
- <sp:Basic256/>
+ <sp:Basic128/>
</wsp:Policy>
</sp:AlgorithmSuite>
<sp:Layout>
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/sc-1.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/sc-1.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/sc-1.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/sc-1.xml Mon Jan 30 17:08:19 2017
@@ -68,7 +68,7 @@
</sp:ProtectionToken>
<sp:AlgorithmSuite>
<wsp:Policy>
- <sp:Basic256/>
+ <sp:Basic128/>
</wsp:Policy>
</sp:AlgorithmSuite>
<sp:Layout>
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/sc-3.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/sc-3.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/sc-3.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/sc-3.xml Mon Jan 30 17:08:19 2017
@@ -19,7 +19,7 @@
</sp:TransportToken>
<sp:AlgorithmSuite>
<wsp:Policy>
- <sp:Basic256/>
+ <sp:Basic128/>
</wsp:Policy>
</sp:AlgorithmSuite>
<sp:Layout>
@@ -43,7 +43,7 @@
</sp:ProtectionToken>
<sp:AlgorithmSuite>
<wsp:Policy>
- <sp:Basic256/>
+ <sp:Basic128/>
</wsp:Policy>
</sp:AlgorithmSuite>
<sp:Layout>
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-1.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-1.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-1.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-1.xml Mon Jan 30 17:08:19 2017
@@ -27,7 +27,7 @@
</sp:TransportToken>
<sp:AlgorithmSuite>
<wsp:Policy>
- <sp:Basic256/>
+ <sp:Basic128/>
</wsp:Policy>
</sp:AlgorithmSuite>
<sp:Layout>