[axis-axis2-java-rampart] 01/02: Create development branch for RAMPART-402.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch RAMPART-402 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git commit 3bf910e8fe6d8fa1c383db91c15f1896cc6266a7 Author: Andreas Veithen AuthorDate: Mon Feb 6 10:26:22 2017 + Create development branch for RAMPART-402.
[axis-axis2-java-rampart] 02/02: RAMPART-402: Apply patch provided by Nathan Clement.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch RAMPART-402
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit f4990fe8f85cced64f14fb08ca13fd5b5ebeb972
Author: Andreas Veithen
AuthorDate: Mon Feb 6 10:28:16 2017 +
RAMPART-402: Apply patch provided by Nathan Clement.
---
.../rampart/PolicyBasedResultsValidator.java | 6 +-
.../org/apache/rampart/PolicyAssertionsTest.java | 64 ++
.../policy/rampart-asymm-signed-parts-2.xml| 78 ++
.../policy/rampart-asymm-signed-parts.xml | 72
4 files changed, 215 insertions(+), 5 deletions(-)
diff --git
a/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
b/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
index b6e605f..1b5bd3c 100644
---
a/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
+++
b/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
@@ -627,11 +627,7 @@ public class PolicyBasedResultsValidator implements
ExtendedPolicyValidatorCallb
throw new RampartException("bodyNotSigned");
}
-} else if (wsep.getName().equals(WSConstants.ELEM_HEADER) ||
-wsep.getXpath() != null) {
-// TODO earlier this was wsep.getType() ==
WSConstants.PART_TYPE_ELEMENT
-// This means that encrypted element of an XPath expression
type. Therefore we are checking
-// now whether an XPath expression exists. - Verify
+} else {
Element element = WSSecurityUtil.findElement(
envelope, wsep.getName(), wsep.getNamespace());
diff --git
a/modules/rampart-tests/src/test/java/org/apache/rampart/PolicyAssertionsTest.java
b/modules/rampart-tests/src/test/java/org/apache/rampart/PolicyAssertionsTest.java
index 29c62be..5951013 100644
---
a/modules/rampart-tests/src/test/java/org/apache/rampart/PolicyAssertionsTest.java
+++
b/modules/rampart-tests/src/test/java/org/apache/rampart/PolicyAssertionsTest.java
@@ -83,6 +83,70 @@ public class PolicyAssertionsTest extends
MessageBuilderTestBase {
}
+public void testSignedPartsValid() throws Exception {
+
+MessageContext ctx = getMsgCtx();
+
+String policyXml =
"test-resources/policy/rampart-asymm-signed-parts.xml";
+Policy policy = loadPolicy(policyXml);
+
+ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
+
+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);
+
+RampartEngine engine = new RampartEngine();
+engine.process(ctx);
+
+}
+
+public void testSignedPartsInvalid() throws Exception {
+
+MessageContext ctx = getMsgCtx();
+
+String policyXml =
"test-resources/policy/rampart-asymm-signed-parts.xml";
+Policy policy = loadPolicy(policyXml);
+
+ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
+
+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));
+
+policyXml = "test-resources/policy/rampart-asymm-signed-parts-2.xml";
+policy = loadPolicy(policyXml);
+
+ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
+
+RampartEngine engine = new RampartEngine();
+
+try {
+engine.process(ctx);
+fail(" This should have thrown RampartException: " +
+"Element must be signed :
http://schemas.xmlsoap.org/ws/2004/08/addressing:From";);
+} catch (RampartException expected) {
+// Ignore intentionally as the test is supposed to throw an
exception
+}
+
+}
+
public void testHashedPasswordRequiredValid() throws Exception {
MessageContext ctx = getMsgCtx();
diff --git
a/modules/rampart-tests/test-re
[axis-axis2-java-rampart] 03/03: Merge changes from trunk.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch RAMPART-385 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git commit eb1ead9f24ce4679a7528b2ccded84e566929423 Merge: 9a1991b 071 Author: Andreas Veithen AuthorDate: Tue Jan 31 00:17:19 2017 + Merge changes from trunk. release-docs/LICENSE.txt => LICENSE| 0 release-docs/NOTICE.txt => NOTICE | 0 release-docs/README.txt => README | 0 apidocs/pom.xml| 117 apidocs/src/main/assembly/apidocs.xml | 32 ++ build.xml | 181 -- code-coverage/pom.xml | 188 +++ etc/dist.py| 45 ++ modules/distribution/bin.xml | 52 +- modules/distribution/pom.xml | 81 ++- modules/distribution/src.xml | 78 ++- .../distribution/src/main/files}/build.xml | 2 +- modules/documentation/pom.xml | 52 -- .../src/site/resources/css/maven-base.css | 143 - .../src/site/resources/css/maven-theme.css | 129 - .../documentation/src/site/resources/css/print.css | 7 - .../documentation/src/site/resources/css/site.css | 272 - .../documentation/src/site/resources/css/style.css | 184 -- .../src/site/resources/download/1.1/download.cgi | 6 - .../src/site/resources/download/1.2/download.cgi | 6 - .../src/site/resources/download/1.3/download.cgi | 6 - .../src/site/resources/download/1.4/download.cgi | 6 - .../src/site/resources/download/1.5.1/download.cgi | 6 - .../src/site/resources/download/1.5.2/download.cgi | 6 - .../src/site/resources/download/1.5/download.cgi | 6 - .../src/site/resources/download/1.6.0/download.cgi | 6 - .../src/site/resources/download/1.6.1/download.cgi | 6 - .../images/apache-rampart-banner-background.jpg| Bin 373 -> 0 bytes .../resources/images/apache-rampart-banner.jpg | Bin 27612 -> 0 bytes .../images/apache-rampart-content-back.jpg | Bin 309 -> 0 bytes .../images/apache-rampart-menu-bottom.jpg | Bin 381 -> 0 bytes .../images/apache-rampart-menu-button.gif | Bin 192 -> 0 bytes .../resources/images/apache-rampart-menu-top.jpg | Bin 633 -> 0 bytes .../site/resources/images/apache-rampart-menu.jpg | Bin 1221 -> 0 bytes .../resources/images/apache-rampart-spliter.jpg| Bin 650 -> 0 bytes .../src/site/resources/images/breadcrumbs-bg.gif | Bin 198 -> 0 bytes .../src/site/resources/images/external.png | Bin 230 -> 0 bytes .../src/site/resources/images/h2-bg.gif| Bin 202 -> 0 bytes .../src/site/resources/images/home-top.gif | Bin 804 -> 0 bytes .../src/site/resources/images/leftcolumn-bg.gif| Bin 523 -> 0 bytes .../images/logos/build-by-maven-black.png | Bin 2294 -> 0 bytes .../images/logos/build-by-maven-white.png | Bin 2260 -> 0 bytes .../site/resources/images/logos/maven-feather.png | Bin 3330 -> 0 bytes .../src/site/resources/images/menu-back.gif| Bin 827 -> 0 bytes modules/documentation/src/site/site.xml| 79 --- modules/documentation/src/site/xdoc/download.xml | 135 - .../src/site/xdoc/download/1.1/download.xml| 97 .../src/site/xdoc/download/1.2/download.xml| 97 .../src/site/xdoc/download/1.3/download.xml| 97 .../src/site/xdoc/download/1.4/download.xml| 82 --- .../src/site/xdoc/download/1.5.1/download.xml | 115 .../src/site/xdoc/download/1.5.2/download.xml | 115 .../src/site/xdoc/download/1.5/download.xml| 82 --- .../src/site/xdoc/download/1.6.0/download.xml | 115 .../src/site/xdoc/download/1.6.1/download.xml | 115 .../src/site/xdoc/download/1.6.2/download.xml | 115 modules/documentation/src/site/xdoc/index.xml | 102 modules/rampart-core/pom.xml | 78 +-- .../ExtendedPolicyValidatorCallbackHandler.java| 1 - .../main/java/org/apache/rampart/NonceCache.java | 6 +- .../rampart/PolicyBasedResultsValidator.java | 26 +- .../java/org/apache/rampart/RampartEngine.java | 256 ++--- .../org/apache/rampart/RampartMessageData.java | 65 +-- .../rampart/builder/AsymmetricBindingBuilder.java | 14 +- .../org/apache/rampart/builder/BindingBuilder.java | 138 - .../rampart/builder/TransportBindingBuilder.java | 80 +++ .../handler/PostDispatchVerificationHandler.java | 9 +- .../handler/RampartUsernameTokenValidator.java | 71 +++ .../org/apache/rampart/handler/WSDoAllHandler.java | 210 --- .../apache/rampart/handler/WSDoAllReceiver.java| 388 - .../org/apache/rampart/handler/WSDoAllSender.java | 281 -- .../handler/confi
[axis-axis2-java-rampart] branch RAMPART-385 created (now eb1ead9)
This is an automated email from the ASF dual-hosted git repository. billblough pushed a change to branch RAMPART-385 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git. at eb1ead9 Merge changes from trunk. This branch includes the following new commits: new 56bed65 Create development branch for RAMPART-385. new 9a1991b RAMPART-385: Apply patch provided by Suresh Attanayake. new eb1ead9 Merge changes from trunk. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[axis-axis2-java-rampart] 01/03: Create development branch for RAMPART-385.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch RAMPART-385 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git commit 56bed656ed45090165916caf570d4eb2d83858bd Author: Andreas Veithen AuthorDate: Mon Jan 30 18:21:00 2017 + Create development branch for RAMPART-385.
[axis-axis2-java-rampart] branch RAMPART-402 created (now f4990fe)
This is an automated email from the ASF dual-hosted git repository. billblough pushed a change to branch RAMPART-402 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git. at f4990fe RAMPART-402: Apply patch provided by Nathan Clement. This branch includes the following new commits: new 3bf910e Create development branch for RAMPART-402. new f4990fe RAMPART-402: Apply patch provided by Nathan Clement. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[axis-axis2-java-rampart] 02/03: RAMPART-385: Apply patch provided by Suresh Attanayake.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch RAMPART-385
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit 9a1991b214f494d33292ae9bcbb6830b2b0a87c2
Author: Andreas Veithen
AuthorDate: Mon Jan 30 18:25:09 2017 +
RAMPART-385: Apply patch provided by Suresh Attanayake.
---
.../secpolicy11/builders/UsernameTokenBuilder.java | 16 -
.../secpolicy12/builders/UsernameTokenBuilder.java | 32 -
.../builders/UsernameTokenBuilderTest.java | 47 ++
.../builders/UsernameTokenBuilderTest.java | 75 ++
.../username-token-assertion-1.1-nopolicy.xml | 2 +
.../username-token-assertion-1.1-ut11prof.xml | 6 ++
.../username-token-assertion-1.2-hashpwd.xml | 8 +++
.../username-token-assertion-1.2-nopolicy.xml | 4 ++
.../username-token-assertion-1.2-nopwd.xml | 9 +++
9 files changed, 196 insertions(+), 3 deletions(-)
diff --git
a/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilder.java
b/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilder.java
index 74a70e7..9b76ff5 100644
---
a/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilder.java
+++
b/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilder.java
@@ -22,6 +22,8 @@ import javax.xml.namespace.QName;
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.neethi.Assertion;
import org.apache.neethi.AssertionBuilderFactory;
import org.apache.neethi.Constants;
@@ -34,6 +36,7 @@ import org.apache.ws.secpolicy.model.UsernameToken;
public class UsernameTokenBuilder implements AssertionBuilder {
+private static Log log = LogFactory.getLog(UsernameTokenBuilder.class);
public Assertion build(OMElement element, AssertionBuilderFactory factory)
throws IllegalArgumentException {
UsernameToken usernameToken = new UsernameToken(SPConstants.SP_V11);
@@ -53,7 +56,7 @@ public class UsernameTokenBuilder implements
AssertionBuilder {
OMElement policyElement = element.getFirstElement();
-if (policyElement != null &&
!policyElement.getQName().equals(org.apache.neethi.Constants.Q_ELEM_POLICY)) {
+if (policyElement != null &&
policyElement.getQName().equals(org.apache.neethi.Constants.Q_ELEM_POLICY)) {
Policy policy = PolicyEngine.getPolicy(element.getFirstElement());
policy = (Policy) policy.normalize(false);
@@ -76,6 +79,10 @@ public class UsernameTokenBuilder implements
AssertionBuilder {
}
private void processAlternative(List assertions, UsernameToken parent) {
+
+ // UT profile version
+boolean usernameToken10Set = false;
+boolean usernameToken11Set = false;
for (Iterator iterator = assertions.iterator(); iterator.hasNext();) {
Assertion assertion = (Assertion) iterator.next();
@@ -83,10 +90,17 @@ public class UsernameTokenBuilder implements
AssertionBuilder {
if (SP11Constants.WSS_USERNAME_TOKEN10.equals(qname)) {
parent.setUseUTProfile10(true);
+usernameToken10Set = true;
} else if (SP11Constants.WSS_USERNAME_TOKEN11.equals(qname)) {
parent.setUseUTProfile11(true);
+usernameToken11Set = true;
}
}
+
+// doing a policy validation
+if(usernameToken10Set && usernameToken11Set) {
+log.warn("Invalid UsernameToken Assertion in the policy. This may
result an unexpected behaviour!");
+}
}
}
diff --git
a/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/UsernameTokenBuilder.java
b/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/UsernameTokenBuilder.java
index f3d901b..c593ecd 100755
---
a/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/UsernameTokenBuilder.java
+++
b/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/UsernameTokenBuilder.java
@@ -22,6 +22,8 @@ import javax.xml.namespace.QName;
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.neethi.Assertion;
import org.apache.neethi.AssertionBuilderFactory;
import org.apache.neethi.Constants;
@@ -33,7 +35,8 @@ import org.apache.ws.secpolicy.SP12Constants;
import org.apache.ws.secpolicy.model.UsernameToken;
public class UsernameTokenBuilder implements AssertionBuilder {
-
+
+private static Log log = LogFactory.getLog(UsernameT
[axis-axis2-java-rampart] branch RAMPART-389 created (now dcb6780)
This is an automated email from the ASF dual-hosted git repository. billblough pushed a change to branch RAMPART-389 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git. at dcb6780 Merge changes from trunk. This branch includes the following new commits: new 5191c0a Create development branch for RAMPART-389. new 48a569d RAMPART-389: Apply patch provided by Stefan Vladov. new dcb6780 Merge changes from trunk. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[axis-axis2-java-rampart] 03/03: Merge changes from trunk.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch RAMPART-389 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git commit dcb678020aa931cd3bb26fd8340c836bebabad09 Merge: 48a569d c613012 Author: Andreas Veithen AuthorDate: Mon Feb 6 10:16:45 2017 + Merge changes from trunk. release-docs/LICENSE.txt => LICENSE| 0 release-docs/NOTICE.txt => NOTICE | 0 release-docs/README.txt => README | 0 apidocs/pom.xml| 117 apidocs/src/main/assembly/apidocs.xml | 32 ++ build.xml | 181 -- code-coverage/pom.xml | 207 +++ etc/dist.py| 45 ++ modules/distribution/bin.xml | 52 +- modules/distribution/pom.xml | 81 ++- modules/distribution/src.xml | 78 ++- .../distribution/src/main/files}/build.xml | 2 +- modules/documentation/pom.xml | 52 -- .../src/site/resources/css/maven-base.css | 143 - .../src/site/resources/css/maven-theme.css | 129 - .../documentation/src/site/resources/css/print.css | 7 - .../documentation/src/site/resources/css/site.css | 272 - .../documentation/src/site/resources/css/style.css | 184 -- .../src/site/resources/download/1.1/download.cgi | 6 - .../src/site/resources/download/1.2/download.cgi | 6 - .../src/site/resources/download/1.3/download.cgi | 6 - .../src/site/resources/download/1.4/download.cgi | 6 - .../src/site/resources/download/1.5.1/download.cgi | 6 - .../src/site/resources/download/1.5.2/download.cgi | 6 - .../src/site/resources/download/1.5/download.cgi | 6 - .../src/site/resources/download/1.6.0/download.cgi | 6 - .../src/site/resources/download/1.6.1/download.cgi | 6 - .../images/apache-rampart-banner-background.jpg| Bin 373 -> 0 bytes .../resources/images/apache-rampart-banner.jpg | Bin 27612 -> 0 bytes .../images/apache-rampart-content-back.jpg | Bin 309 -> 0 bytes .../images/apache-rampart-menu-bottom.jpg | Bin 381 -> 0 bytes .../images/apache-rampart-menu-button.gif | Bin 192 -> 0 bytes .../resources/images/apache-rampart-menu-top.jpg | Bin 633 -> 0 bytes .../site/resources/images/apache-rampart-menu.jpg | Bin 1221 -> 0 bytes .../resources/images/apache-rampart-spliter.jpg| Bin 650 -> 0 bytes .../src/site/resources/images/breadcrumbs-bg.gif | Bin 198 -> 0 bytes .../src/site/resources/images/external.png | Bin 230 -> 0 bytes .../src/site/resources/images/h2-bg.gif| Bin 202 -> 0 bytes .../src/site/resources/images/home-top.gif | Bin 804 -> 0 bytes .../src/site/resources/images/leftcolumn-bg.gif| Bin 523 -> 0 bytes .../images/logos/build-by-maven-black.png | Bin 2294 -> 0 bytes .../images/logos/build-by-maven-white.png | Bin 2260 -> 0 bytes .../site/resources/images/logos/maven-feather.png | Bin 3330 -> 0 bytes .../src/site/resources/images/menu-back.gif| Bin 827 -> 0 bytes modules/documentation/src/site/site.xml| 79 --- modules/documentation/src/site/xdoc/download.xml | 135 - .../src/site/xdoc/download/1.1/download.xml| 97 .../src/site/xdoc/download/1.2/download.xml| 97 .../src/site/xdoc/download/1.3/download.xml| 97 .../src/site/xdoc/download/1.4/download.xml| 82 --- .../src/site/xdoc/download/1.5.1/download.xml | 115 .../src/site/xdoc/download/1.5.2/download.xml | 115 .../src/site/xdoc/download/1.5/download.xml| 82 --- .../src/site/xdoc/download/1.6.0/download.xml | 115 .../src/site/xdoc/download/1.6.1/download.xml | 115 .../src/site/xdoc/download/1.6.2/download.xml | 115 modules/documentation/src/site/xdoc/index.xml | 102 modules/rampart-core/pom.xml | 78 +-- .../ExtendedPolicyValidatorCallbackHandler.java| 1 - .../main/java/org/apache/rampart/NonceCache.java | 6 +- .../rampart/PolicyBasedResultsValidator.java | 26 +- .../java/org/apache/rampart/RampartEngine.java | 256 ++--- .../org/apache/rampart/RampartMessageData.java | 65 +-- .../rampart/builder/AsymmetricBindingBuilder.java | 14 +- .../org/apache/rampart/builder/BindingBuilder.java | 138 - .../rampart/builder/TransportBindingBuilder.java | 80 +++ .../handler/PostDispatchVerificationHandler.java | 9 +- .../handler/RampartUsernameTokenValidator.java | 71 +++ .../org/apache/rampart/handler/WSDoAllHandler.java | 210 --- .../apache/rampart/handler/WSDoAllReceiver.java| 388 - .../org/apache/rampart/handler/WSDoAllSender.java | 281 -- .../handler/config
[axis-axis2-java-rampart] 04/12: Update Axis2 version.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch 1_7 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git commit 8da5552cd40276c7c2288ddfd31085fd1002c5c5 Author: Andreas Veithen AuthorDate: Thu Nov 30 21:56:12 2017 + Update Axis2 version. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d87acf8..f5ae9c9 100644 --- a/pom.xml +++ b/pom.xml @@ -604,7 +604,7 @@ -1.7.7-SNAPSHOT +1.7.8-SNAPSHOT 1.2.21-SNAPSHOT 1.6.16
[axis-axis2-java-rampart] 01/12: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch 1_7 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git commit 223a789e391355fe578be2bac26149a4ab57d823 Author: Andreas Veithen AuthorDate: Sun Jul 30 22:32:43 2017 + [maven-release-plugin] prepare for next development iteration --- apidocs/pom.xml | 2 +- code-coverage/pom.xml | 2 +- modules/distribution/pom.xml| 2 +- modules/rampart-core/pom.xml| 2 +- modules/rampart-integration/pom.xml | 2 +- modules/rampart-mar/pom.xml | 2 +- modules/rampart-policy/pom.xml | 2 +- modules/rampart-samples/pom.xml | 2 +- modules/rampart-tests/pom.xml | 2 +- modules/rampart-trust-mar/pom.xml | 2 +- modules/rampart-trust/pom.xml | 2 +- pom.xml | 8 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/apidocs/pom.xml b/apidocs/pom.xml index bac66a4..8c8c064 100644 --- a/apidocs/pom.xml +++ b/apidocs/pom.xml @@ -22,7 +22,7 @@ org.apache.rampart rampart-project -1.7.1 +1.7.2-SNAPSHOT ../pom.xml apidocs diff --git a/code-coverage/pom.xml b/code-coverage/pom.xml index eabce0b..47eaf36 100644 --- a/code-coverage/pom.xml +++ b/code-coverage/pom.xml @@ -22,7 +22,7 @@ org.apache.rampart rampart-project -1.7.1 +1.7.2-SNAPSHOT ../pom.xml code-coverage diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 19283be..22b5b57 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.7.1 +1.7.2-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/rampart-core/pom.xml b/modules/rampart-core/pom.xml index bedd145..885794a 100644 --- a/modules/rampart-core/pom.xml +++ b/modules/rampart-core/pom.xml @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.7.1 +1.7.2-SNAPSHOT ../../pom.xml diff --git a/modules/rampart-integration/pom.xml b/modules/rampart-integration/pom.xml index f42ad99..d303d48 100644 --- a/modules/rampart-integration/pom.xml +++ b/modules/rampart-integration/pom.xml @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.7.1 +1.7.2-SNAPSHOT ../../pom.xml diff --git a/modules/rampart-mar/pom.xml b/modules/rampart-mar/pom.xml index e5c8719..fae6799 100644 --- a/modules/rampart-mar/pom.xml +++ b/modules/rampart-mar/pom.xml @@ -24,7 +24,7 @@ org.apache.rampart rampart-project -1.7.1 +1.7.2-SNAPSHOT ../../pom.xml diff --git a/modules/rampart-policy/pom.xml b/modules/rampart-policy/pom.xml index a3ef33d..f072ede 100644 --- a/modules/rampart-policy/pom.xml +++ b/modules/rampart-policy/pom.xml @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.7.1 +1.7.2-SNAPSHOT ../../pom.xml diff --git a/modules/rampart-samples/pom.xml b/modules/rampart-samples/pom.xml index a9e5bc2..34f9da1 100644 --- a/modules/rampart-samples/pom.xml +++ b/modules/rampart-samples/pom.xml @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.7.1 +1.7.2-SNAPSHOT ../../pom.xml diff --git a/modules/rampart-tests/pom.xml b/modules/rampart-tests/pom.xml index 0187d70..464af67 100644 --- a/modules/rampart-tests/pom.xml +++ b/modules/rampart-tests/pom.xml @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.7.1 +1.7.2-SNAPSHOT ../../pom.xml diff --git a/modules/rampart-trust-mar/pom.xml b/modules/rampart-trust-mar/pom.xml index bbfdfe3..571437b 100644 --- a/modules/rampart-trust-mar/pom.xml +++ b/modules/rampart-trust-mar/pom.xml @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.7.1 +1.7.2-SNAPSHOT ../../pom.xml diff --git a/modules/rampart-trust/pom.xml b/modules/rampart-trust/pom.xml index 2b0314a..d25f939 100644 --- a/modules/rampart-trust/pom.xml +++ b/modules/rampart-trust/pom.xml @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.7.1 +1.7.2-SNAPSHOT ../../pom.xml diff --git a/pom.xml b/pom.xml index deeed91..301379a 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ rampart-project pom WS-Security, WS-Trust and WS-SecureConversation implementaion for Apache Axis2 -1.7.1 +1.7.2-SNAPSHOT Apache Rampart http://axis.apache.org/axis2/java/rampart @@ -110,12 +110,12 @@ - scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/rampart/tags/v1.7.1 + scm:svn:http://svn
[axis-axis2-java-rampart] 11/12: Update Axiom version.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch 1_7 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git commit 6996e2b8ce8bedf3dc1a2c6b0d2033da7b634653 Author: Andreas Veithen AuthorDate: Thu Mar 7 23:10:14 2019 + Update Axiom version. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 603fafd..a885a40 100644 --- a/pom.xml +++ b/pom.xml @@ -622,7 +622,7 @@ 1.7.10-SNAPSHOT -1.2.22-SNAPSHOT +1.2.23-SNAPSHOT 1.6.16 2.5.1-1
[axis-axis2-java-rampart] 02/12: Switch Axiom and Axis2 to snapshot versions.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch 1_7 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git commit b9a734eeb00318cfb1fe4e3d6535de18fd7aff25 Author: Andreas Veithen AuthorDate: Sun Jul 30 22:59:34 2017 + Switch Axiom and Axis2 to snapshot versions. --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 301379a..d87acf8 100644 --- a/pom.xml +++ b/pom.xml @@ -604,8 +604,8 @@ -1.7.6 -1.2.20 +1.7.7-SNAPSHOT +1.2.21-SNAPSHOT 1.6.16 2.5.1-1
[axis-axis2-java-rampart] branch 1_7 created (now cea448b)
This is an automated email from the ASF dual-hosted git repository. billblough pushed a change to branch 1_7 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git. at cea448b RAMPART-446: Merge r1778769 to the 1.7 branch. This branch includes the following new commits: new 223a789 [maven-release-plugin] prepare for next development iteration new b9a734e Switch Axiom and Axis2 to snapshot versions. new 13d4c4f Add empty release note for 1.7.2. new 8da5552 Update Axis2 version. new 6fa2758 Merge r1806320 and r1826038 to the 1.7 branch. new ebe2624 Update Axis2 version. new f3ace87 Merge r1837550 and r1837559 to the 1.7 branch. new 926de4f Merge r1837565 to the 1.7 branch. new e47d5d8 Merge r1837564 and r1838386 to the 1.7 branch. new 98948a1 Update snapshot versions. new 6996e2b Update Axiom version. new cea448b RAMPART-446: Merge r1778769 to the 1.7 branch. The 12 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[axis-axis2-java-rampart] 06/12: Update Axis2 version.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch 1_7 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git commit ebe2624f384e39046e93e80857378c5b05e8eb94 Author: Andreas Veithen AuthorDate: Mon Aug 6 20:24:18 2018 + Update Axis2 version. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f5ae9c9..e94081c 100644 --- a/pom.xml +++ b/pom.xml @@ -604,7 +604,7 @@ -1.7.8-SNAPSHOT +1.7.9-SNAPSHOT 1.2.21-SNAPSHOT 1.6.16
[axis-axis2-java-rampart] 09/12: Merge r1837564 and r1838386 to the 1.7 branch.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_7
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit e47d5d8a0b7ebcc65624280f5c7452f88d3a0e05
Author: Andreas Veithen
AuthorDate: Sun Aug 19 17:04:29 2018 +
Merge r1837564 and r1838386 to the 1.7 branch.
---
.travis-settings.xml | 13 +
.travis.yml | 17 +
2 files changed, 30 insertions(+)
diff --git a/.travis-settings.xml b/.travis-settings.xml
new file mode 100644
index 000..ab1e4a6
--- /dev/null
+++ b/.travis-settings.xml
@@ -0,0 +1,13 @@
+
+http://maven.apache.org/SETTINGS/1.0.0";
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+http://maven.apache.org/xsd/settings-1.0.0.xsd";>
+
+
+apache.snapshots.https
+${env.REPO_USERNAME}
+${env.REPO_PASSWORD}
+
+
+
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000..d2a3fee
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,17 @@
+dist: trusty
+language: java
+jdk:
+ - openjdk8
+install: true
+script: '[ "$TRAVIS_REPO_SLUG" == apache/rampart ] && [ "$TRAVIS_BRANCH" ==
1_7 ] && [ "$TRAVIS_PULL_REQUEST" == false ] && goal=deploy || goal=verify ;
mvn -B -s .travis-settings.xml -Papache-release -Dgpg.skip=true $goal'
+env:
+ global:
+- secure:
"EdhUKPgSqlyvV1WTzEhe91zTiTFzcQCG4FcdgN73j5VRYYU08hDuv7NeOTR7ks2iIhhVRBsKVJ6HdHlr5x7KDLKxelhP9J1zE+wHwQToQoL+pGSHS12h5pTRHwioy9nzCvCcZNM0nkN2w6M3Lbql8UOOjGjzdsOzWhVqYhpDc8c="
+- secure:
"G0DkdCmLgsnwqDsHexziUWiDQ33wvUreMLCl4tQYmp25AGDi5YtVaqzlZrQbZGI6KiaH3Ud2DO3oBaxi553H/LeJMqalDIwQcQPs+xjBru4HfPV3umuIMz+A9DRQ6x/274E9n25H7AwA49JLGmqpcL94vVbwE7ZgQ81Jh4txzWw="
+cache:
+ directories:
+- $HOME/.m2
+notifications:
+ email:
+# java-...@axis.apache.org doesn't work here because it's not an address
registered on GitHub.
+- veit...@apache.org
[axis-axis2-java-rampart] 02/03: RAMPART-389: Apply patch provided by Stefan Vladov.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch RAMPART-389
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit 48a569d57c10f861ff069c976823fdaa7268228e
Author: Andreas Veithen
AuthorDate: Tue Jan 31 19:55:18 2017 +
RAMPART-389: Apply patch provided by Stefan Vladov.
---
.../main/java/org/apache/rampart/PolicyBasedResultsValidator.java | 7 +++
1 file changed, 7 insertions(+)
diff --git
a/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
b/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
index 0bc9c32..c0f62bd 100644
---
a/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
+++
b/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
@@ -149,6 +149,13 @@ public class PolicyBasedResultsValidator implements
ExtendedPolicyValidatorCallb
}
}
}
+} else {
+if (rpd.isSignatureConfirmation()) {
+WSEncryptionPart part = new
WSEncryptionPart(WSConstants.SIGNATURE_CONFIRMATION_LN,
+
WSConstants.WSSE11_NS,
+ "Element");
+signatureParts.add(part);
+}
}
validateEncrSig(data,encryptedParts, signatureParts, results);
[axis-axis2-java-rampart] 05/12: Merge r1806320 and r1826038 to the 1.7 branch.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_7
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit 6fa2758747e9bde0893f7148965c9b07079b66e0
Author: Andreas Veithen
AuthorDate: Tue Mar 6 20:30:58 2018 +
Merge r1806320 and r1826038 to the 1.7 branch.
---
etc/dist.py | 2 +-
modules/distribution/pom.xml | 9 +++--
src/site/markdown/download.md.vm | 12 +---
3 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/etc/dist.py b/etc/dist.py
index 2f17490..1904041 100644
--- a/etc/dist.py
+++ b/etc/dist.py
@@ -35,7 +35,7 @@ if exists(dist_root):
call(["svn", "checkout",
"https://dist.apache.org/repos/dist/dev/axis/axis2/java/rampart/";, dist_root])
mkdir(dist_dir)
for classifier in [ "bin", "src" ]:
-for suffix in [ "zip", "zip.asc", "zip.md5", "zip.sha1" ]:
+for suffix in [ "zip", "zip.asc", "zip.sha512" ]:
file = "rampart-dist-" + release + "-" + classifier + "." + suffix
copyfile(join(root_dir, "modules", "distribution", "target", file),
join(dist_dir, file))
call(["svn", "add", dist_dir])
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 22b5b57..f9fe12b 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -78,14 +78,19 @@
-net.ju-n.maven.plugins
+net.nicoulaj.maven.plugins
checksum-maven-plugin
-1.2
+1.5
artifacts
+
+
+SHA-512
+
+
diff --git a/src/site/markdown/download.md.vm b/src/site/markdown/download.md.vm
index b970037..32832bc 100644
--- a/src/site/markdown/download.md.vm
+++ b/src/site/markdown/download.md.vm
@@ -26,9 +26,9 @@ release can be found
[here](release-notes/${release_version}.html).
The following distributions are available for download:
| Link | Checksums
and signatures
-|--|
-Binary distribution | [rampart-dist-${release_version}-bin.zip][1] | [MD5][2]
[SHA1][3] [PGP][4]
-Source distribution | [rampart-dist-${release_version}-src.zip][5] | [MD5][6]
[SHA1][7] [PGP][8]
+|--|-
+Binary distribution | [rampart-dist-${release_version}-bin.zip][1] |
[SHA512][3] [PGP][4]
+Source distribution | [rampart-dist-${release_version}-src.zip][5] |
[SHA512][7] [PGP][8]
The binary distribution contains the following Axis2 modules:
@@ -46,12 +46,10 @@ Distributions for older releases can be found in the
[archive][12].
All releases are also available as Maven artifacts in the [central
repository][13].
[1]:
http://www.apache.org/dyn/closer.lua/axis/axis2/java/rampart/${release_version}/rampart-dist-${release_version}-bin.zip
-[2]:
https://www.apache.org/dist/axis/axis2/java/rampart/${release_version}/rampart-dist-${release_version}-bin.zip.md5
-[3]:
https://www.apache.org/dist/axis/axis2/java/rampart/${release_version}/rampart-dist-${release_version}-bin.zip.sha1
+[3]:
https://www.apache.org/dist/axis/axis2/java/rampart/${release_version}/rampart-dist-${release_version}-bin.zip.sha512
[4]:
https://www.apache.org/dist/axis/axis2/java/rampart/${release_version}/rampart-dist-${release_version}-bin.zip.asc
[5]:
http://www.apache.org/dyn/closer.lua/axis/axis2/java/rampart/${release_version}/rampart-dist-${release_version}-src.zip
-[6]:
https://www.apache.org/dist/axis/axis2/java/rampart/${release_version}/rampart-dist-${release_version}-src.zip.md5
-[7]:
https://www.apache.org/dist/axis/axis2/java/rampart/${release_version}/rampart-dist-${release_version}-src.zip.sha1
+[7]:
https://www.apache.org/dist/axis/axis2/java/rampart/${release_version}/rampart-dist-${release_version}-src.zip.sha512
[8]:
https://www.apache.org/dist/axis/axis2/java/rampart/${release_version}/rampart-dist-${release_version}-src.zip.asc
[9]: http://www.apache.org/dev/release-signing#verifying-signature
[10]: https://www.apache.org/dist/axis/axis2/java/rampart/KEYS
[axis-axis2-java-rampart] 07/12: Merge r1837550 and r1837559 to the 1.7 branch.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_7
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit f3ace87c292567022ef5a3b31b74d5fb61494743
Author: Andreas Veithen
AuthorDate: Mon Aug 6 20:31:33 2018 +
Merge r1837550 and r1837559 to the 1.7 branch.
---
modules/rampart-integration/pom.xml| 29 -
modules/rampart-tests/pom.xml | 33 ++
modules/rampart-testutils/pom.xml | 39 +
.../testutils/FakeValidationDateAspect.java| 50 ++
.../src/main/resources/META-INF/aop.xml| 28
pom.xml| 17
6 files changed, 195 insertions(+), 1 deletion(-)
diff --git a/modules/rampart-integration/pom.xml
b/modules/rampart-integration/pom.xml
index d303d48..7af8813 100644
--- a/modules/rampart-integration/pom.xml
+++ b/modules/rampart-integration/pom.xml
@@ -464,10 +464,31 @@
+com.github.veithen.alta
+alta-maven-plugin
+
+
+
+generate-properties
+
+
+aspectjweaver
+%file%
+
+
+org.aspectj
+aspectjweaver
+
+
+
+
+
+
+
maven-surefire-plugin
-${jacoco.surefireArgLine}
-Xbootclasspath/p:${project.build.directory}/endorsed/xml-apis.jar${path.separator}${project.build.directory}/endorsed/xercesImpl.jar${path.separator}${project.build.directory}/endorsed/resolver.jar${path.separator}${project.build.directory}/endorsed/serializer.jar${path.separator}${project.build.directory}/endorsed/xalan.jar
+${jacoco.surefireArgLine}
-Xbootclasspath/p:${project.build.directory}/endorsed/xml-apis.jar${path.separator}${project.build.directory}/endorsed/xercesImpl.jar${path.separator}${project.build.directory}/endorsed/resolver.jar${path.separator}${project.build.directory}/endorsed/serializer.jar${path.separator}${project.build.directory}/endorsed/xalan.jar
-javaagent:${aspectjweaver}
@@ -517,6 +538,12 @@
+org.apache.rampart
+rampart-testutils
+${project.version}
+test
+
+
org.apache.axis2
axis2-transport-http
${axis2.version}
diff --git a/modules/rampart-tests/pom.xml b/modules/rampart-tests/pom.xml
index 464af67..cf5febc 100644
--- a/modules/rampart-tests/pom.xml
+++ b/modules/rampart-tests/pom.xml
@@ -53,6 +53,33 @@
true
+
+com.github.veithen.alta
+alta-maven-plugin
+
+
+
+generate-properties
+
+
+aspectjweaver
+%file%
+
+
+org.aspectj
+aspectjweaver
+
+
+
+
+
+
+
+maven-surefire-plugin
+
+${jacoco.surefireArgLine}
-javaagent:${aspectjweaver}
+
+
@@ -73,6 +100,12 @@
${project.version}
+org.apache.rampart
+rampart-testutils
+${project.version}
+test
+
+
org.slf4j
slf4j-log4j12
diff --git a/modules/rampart-testutils/pom.xml
b/modules/rampart-testutils/pom.xml
new file mode 100644
index 000..8cfb432
--- /dev/null
+++ b/modules/rampart-testutils/pom.xml
@@ -0,0 +1,39 @@
+
+
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+4.0.0
+
+
+org.apache.rampart
+rampart-project
+1.7.2-SNAPSHOT
+../../pom.xml
+
+
+rampart-testutils
+jar
+
+
+
+org.aspectj
+aspectjrt
+
+
+
diff --git
a/modules/rampart-testutils/src/main/jav
[axis-axis2-java-rampart] 03/12: Add empty release note for 1.7.2.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch 1_7 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git commit 13d4c4fe752fbba5f4927293a8759d7e415d6661 Author: Andreas Veithen AuthorDate: Mon Jul 31 07:07:05 2017 + Add empty release note for 1.7.2. --- src/site/markdown/release-notes/1.7.2.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/site/markdown/release-notes/1.7.2.md b/src/site/markdown/release-notes/1.7.2.md new file mode 100644 index 000..e69de29
[axis-axis2-java-rampart] 12/12: RAMPART-446: Merge r1778769 to the 1.7 branch.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch 1_7 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git commit cea448b4f336e0646c335aaafbfe8ae66c5cc738 Author: Andreas Veithen AuthorDate: Thu Mar 7 23:13:41 2019 + RAMPART-446: Merge r1778769 to the 1.7 branch. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a885a40..4ef9c0d 100644 --- a/pom.xml +++ b/pom.xml @@ -624,7 +624,7 @@ 1.7.10-SNAPSHOT 1.2.23-SNAPSHOT -1.6.16 +1.6.19 2.5.1-1 1.49
[axis-axis2-java-rampart] branch 1_1 created (now bf99f7c)
This is an automated email from the ASF dual-hosted git repository. billblough pushed a change to branch 1_1 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git. at bf99f7c Moving axis svn, part of TLP move INFRA-2441 This branch includes the following new commits: new bf99f7c Moving axis svn, part of TLP move INFRA-2441 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[axis-axis2-java-rampart] 08/12: Merge r1837565 to the 1.7 branch.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch 1_7 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git commit 926de4f27e9f4338767cec8b3c4cf27097844a67 Author: Andreas Veithen AuthorDate: Mon Aug 6 21:43:12 2018 + Merge r1837565 to the 1.7 branch. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ce58e43..4e7b20a 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ org.apache apache -17 +20 org.apache.rampart
[axis-axis2-java-rampart] 01/03: Create development branch for RAMPART-389.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch RAMPART-389 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git commit 5191c0a37fef95faf4902cfb339d129059322fb1 Author: Andreas Veithen AuthorDate: Tue Jan 31 19:54:01 2017 + Create development branch for RAMPART-389.
[axis-axis2-java-rampart] 10/12: Update snapshot versions.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch 1_7 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git commit 98948a1e8ef894f6827f332ef280d5013314bb6e Author: Andreas Veithen AuthorDate: Fri Nov 16 20:29:05 2018 + Update snapshot versions. --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4e7b20a..603fafd 100644 --- a/pom.xml +++ b/pom.xml @@ -621,8 +621,8 @@ -1.7.9-SNAPSHOT -1.2.21-SNAPSHOT +1.7.10-SNAPSHOT +1.2.22-SNAPSHOT 1.6.16 2.5.1-1
[axis-axis2-java-rampart] 01/09: Create development branch for RAMPART-252.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch RAMPART-252 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git commit a9ff0435cc08255c29f6477e34130a7dc3330169 Author: Andreas Veithen AuthorDate: Sun Jan 29 13:59:55 2017 + Create development branch for RAMPART-252.
[axis-axis2-java-rampart] 09/09: Adapt to changes in the WSS4J API.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch RAMPART-252
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit aea8fbb5423d3d7c2d203de5e04205127354409b
Author: Andreas Veithen
AuthorDate: Sun Jan 29 16:44:39 2017 +
Adapt to changes in the WSS4J API.
---
.../src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
b/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
index cb33730..52bba58 100644
---
a/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
+++
b/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
@@ -1090,8 +1090,8 @@ public class PolicyBasedResultsValidator implements
ExtendedPolicyValidatorCallb
continue;
}
-if (!(algorithmSuite.getEncryption().equals(dataRef.getAlgo( {
-throw new RampartException("invalidAlgorithm", new
String[]{algorithmSuite.getEncryption(), dataRef.getAlgo()});
+if
(!(algorithmSuite.getEncryption().equals(dataRef.getAlgorithm( {
+throw new RampartException("invalidAlgorithm", new
String[]{algorithmSuite.getEncryption(), dataRef.getAlgorithm()});
}
}
}
[axis-axis2-java-rampart] 01/10: Create development branch for RAMPART-289.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch RAMPART-289 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git commit 5f0e39d017ec11ad04c8b63663007d476ac7455d Author: Andreas Veithen AuthorDate: Sun Jan 29 20:56:27 2017 + Create development branch for RAMPART-289.
[axis-axis2-java-rampart] branch RAMPART-289 created (now ad4f59f)
This is an automated email from the ASF dual-hosted git repository. billblough pushed a change to branch RAMPART-289 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git. at ad4f59f Make the patch compile. This branch includes the following new commits: new 5f0e39d Create development branch for RAMPART-289. new 64584cc Create development branch for RAMPART-289. new f2febb5 RAMPART-289: Apply patch provided by Todd Wolff. new f64557f Merge changes up to r1052171 from trunk. new 0190820 Rename variable to match the code on the trunk. new 82fe90d Merge r1052172 from the trunk. new ef0ad87 Merge changes up to r1240267 from trunk. new dbb633e Merge r1240268 from trunk. new 27ac5d2 Merge remaining changes from trunk. new ad4f59f Make the patch compile. The 10 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[axis-axis2-java-rampart] 05/09: Merge changes up to r1240267 from trunk.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch RAMPART-252
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit 1d944fb18fe49ae8d07d98be0b446f3e8499d37d
Merge: 6090351 cd88d0d
Author: Andreas Veithen
AuthorDate: Sun Jan 29 15:16:02 2017 +
Merge changes up to r1240267 from trunk.
build.xml | 21 +
legal/bcprov-LICENSE.txt | 19 +
legal/commons-lang-LICENSE.txt | 202 +
...f4j-jdk14-LICENSE.txt => slf4j-jcl-LICENSE.txt} | 0
modules/distribution/bin.xml | 7 +-
modules/distribution/pom.xml | 93 ++-
modules/distribution/src.xml | 11 +-
modules/documentation/pom.xml | 31 +-
.../1.5 => resources/download/1.1}/download.cgi| 0
.../1.5.1 => resources/download/1.2}/download.cgi | 0
.../1.4 => resources/download/1.3}/download.cgi| 0
.../1.3 => resources/download/1.4}/download.cgi| 0
.../1.2 => resources/download/1.5.1}/download.cgi | 0
.../1.1 => resources/download/1.5.2}/download.cgi | 0
.../{xdoc => resources}/download/1.5/download.cgi | 0
.../1.5 => resources/download/1.6.0}/download.cgi | 0
.../1.5 => resources/download/1.6.1}/download.cgi | 0
.../src/site/xdoc/developer-guide.xml | 4 +-
modules/documentation/src/site/xdoc/download.xml | 35 +-
.../src/site/xdoc/download/1.5.1/download.xml | 51 +-
.../xdoc/download/{1.5.1 => 1.5.2}/download.xml| 55 +-
.../xdoc/download/{1.5.1 => 1.6.0}/download.xml| 55 +-
.../xdoc/download/{1.5.1 => 1.6.1}/download.xml| 55 +-
modules/documentation/src/site/xdoc/index.xml | 54 +-
.../src/site/xdoc/rampartconfig-guide.xml | 14 +
modules/documentation/src/site/xdoc/svn.xml| 2 +-
modules/rampart-core/pom.xml | 39 +-
.../java/org/apache/rampart/MessageBuilder.java| 14 +-
.../rampart/PolicyBasedResultsValidator.java | 8 +-
.../java/org/apache/rampart/RampartConstants.java | 3 +-
.../java/org/apache/rampart/RampartEngine.java | 160 ++--
.../java/org/apache/rampart/RampartException.java | 2 +-
.../org/apache/rampart/RampartMessageData.java | 168 ++--
.../org/apache/rampart/TokenCallbackHandler.java | 22 +-
.../rampart/builder/AsymmetricBindingBuilder.java | 33 +-
.../org/apache/rampart/builder/BindingBuilder.java | 78 +-
.../rampart/builder/SymmetricBindingBuilder.java | 82 +-
.../rampart/builder/TransportBindingBuilder.java | 38 +-
.../main/java/org/apache/rampart/errors.properties | 2 +
.../handler/PostDispatchVerificationHandler.java | 1 -
.../org/apache/rampart/handler/RampartSender.java | 17 +-
.../rampart/handler/WSSHandlerConstants.java | 2 +
.../rampart/policy/RampartPolicyBuilder.java | 31 +-
.../apache/rampart/policy/RampartPolicyData.java | 15 +-
.../policy/builders/CryptoConfigBuilder.java | 8 +-
.../policy/builders/OptimizePartsBuilder.java | 2 +-
.../policy/builders/RampartConfigBuilder.java | 2 +-
.../rampart/policy/builders/SSLConfigBuilder.java | 2 +-
.../apache/rampart/policy/model/CryptoConfig.java | 27 +-
.../rampart/policy/model/OptimizePartsConfig.java | 4 +-
.../apache/rampart/policy/model/RampartConfig.java | 3 +
.../org/apache/rampart/policy/model/SSLConfig.java | 3 +
.../apache/rampart/saml/SAML1AssertionHandler.java | 84 ++
.../apache/rampart/saml/SAML2AssertionHandler.java | 111 +++
.../apache/rampart/saml/SAMLAssertionHandler.java | 92 +++
.../rampart/saml/SAMLAssertionHandlerFactory.java | 37 +
.../java/org/apache/rampart/util/Axis2Util.java| 66 +-
.../java/org/apache/rampart/util/RampartUtil.java | 272 +++---
modules/rampart-integration/pom.xml| 918 +
.../rahas/RahasSAML2TokenCertForHoKTest.java | 1 -
.../java/org/apache/rahas/RahasSAML2TokenTest.java | 1 -
...st.java => RahasSAML2TokenUTForBearerTest.java} | 82 +-
.../apache/rahas/RahasSAMLTokenAttributeTest.java | 4 +-
.../apache/rahas/RahasSAMLTokenCertForHoKTest.java | 6 +-
.../rahas/RahasSAMLTokenCertForHoKV1205Test.java | 4 +-
.../java/org/apache/rahas/RahasSAMLTokenTest.java | 5 +-
.../rahas/RahasSAMLTokenUTForBearerTest.java | 59 +-
.../rahas/RahasSAMLTokenUTForBearerV1205Test.java | 4 +-
.../apache/rahas/RahasSAMLTokenUTForHoKTest.java | 4 +-
.../rahas/RahasSAMLTokenUTForHoKV1205Test.java | 4 +-
.../org/apache/rahas/RahasSAMLTokenV1205Test.java | 5 +-
.../java/org/apache/rahas/SAMLDataProvider.java| 36 +-
.../test/java/org/apache/rampart/RampartTest.java | 99 ++-
.../log4j.properties} | 55 +-
.../src/test/resources/rampart/policy/16.xml | 4 +-
.../src/test/resources/rampart/policy/3.xml
[axis-axis2-java-rampart] 02/02: RAMPART-401: Apply patch provided by Nathan Clement.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch RAMPART-401
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit ac43b5139717eae61b1cd38d828655b25cb0843b
Author: Andreas Veithen
AuthorDate: Mon Feb 6 10:24:19 2017 +
RAMPART-401: Apply patch provided by Nathan Clement.
---
.../rampart/PolicyBasedResultsValidator.java | 54 +++---
.../main/java/org/apache/rampart/errors.properties | 1 +
.../org/apache/rampart/PolicyAssertionsTest.java | 37 +++
.../policy/rampart-hashed-password.xml | 18
.../policy/soapmessage-stale-username-token.xml| 17 +++
5 files changed, 120 insertions(+), 7 deletions(-)
diff --git
a/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
b/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
index da258a7..02783b2 100644
---
a/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
+++
b/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
@@ -31,6 +31,7 @@ import org.apache.ws.security.components.crypto.Crypto;
import org.apache.ws.security.components.crypto.CryptoType;
import org.apache.ws.security.message.token.Timestamp;
import org.apache.ws.security.util.WSSecurityUtil;
+import org.apache.ws.security.util.XmlSchemaDateFormat;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -39,7 +40,10 @@ import org.jaxen.JaxenException;
import javax.xml.namespace.QName;
import java.math.BigInteger;
+import java.security.KeyStore;
import java.security.cert.X509Certificate;
+import java.text.DateFormat;
+import java.text.ParseException;
import java.util.*;
public class PolicyBasedResultsValidator implements
ExtendedPolicyValidatorCallbackHandler {
@@ -285,17 +289,18 @@ public class PolicyBasedResultsValidator implements
ExtendedPolicyValidatorCallb
throws RampartException {
//Check for UsernameToken
-RampartPolicyData rpd = data.getRampartMessageData().getPolicyData();
+RampartMessageData rmd = data.getRampartMessageData();
+RampartPolicyData rpd = rmd.getPolicyData();
List supportingTokens = rpd.getSupportingTokensList();
for (SupportingToken suppTok : supportingTokens) {
-handleSupportingTokens(results, suppTok);
+handleSupportingTokens(results, suppTok, rmd);
}
SupportingToken signedSuppToken = rpd.getSignedSupportingTokens();
-handleSupportingTokens(results, signedSuppToken);
+handleSupportingTokens(results, signedSuppToken, rmd);
SupportingToken signedEndSuppToken =
rpd.getSignedEndorsingSupportingTokens();
-handleSupportingTokens(results, signedEndSuppToken);
+handleSupportingTokens(results, signedEndSuppToken, rmd);
SupportingToken endSuppToken = rpd.getEndorsingSupportingTokens();
-handleSupportingTokens(results, endSuppToken);
+handleSupportingTokens(results, endSuppToken, rmd);
}
/**
@@ -303,7 +308,10 @@ public class PolicyBasedResultsValidator implements
ExtendedPolicyValidatorCallb
* @param suppTok
* @throws RampartException
*/
-protected void handleSupportingTokens(List
results, SupportingToken suppTok) throws RampartException {
+protected void handleSupportingTokens(List
results,
+ SupportingToken suppTok,
+ RampartMessageData rmd)
+throws RampartException {
if(suppTok == null) {
return;
@@ -335,7 +343,9 @@ public class PolicyBasedResultsValidator implements
ExtendedPolicyValidatorCallb
throw new RampartException("invalidUsernameTokenType");
}
-
+if (!verifyUsernameTokenTimestamp(wssUt, rmd)) {
+throw new RampartException("cannotValidateTimestamp");
+}
} else if (token instanceof IssuedToken) {
//TODO is is enough to check for ST_UNSIGNED results ??
@@ -710,7 +720,37 @@ public class PolicyBasedResultsValidator implements
ExtendedPolicyValidatorCallb
return true;
}
+
+/*
+ * Verify that ut->Created is not before or after 'now' (accounting for
clock skew)
+ */
+protected boolean verifyUsernameTokenTimestamp(
+org.apache.ws.security.message.token.UsernameToken token,
RampartMessageData rmd) throws RampartException {
+
+String createdString = token.getCreated();
+if (createdString != null && createdString.length() > 0) {
+try {
+DateFormat zulu = new XmlSchemaDateFormat();
+Date createdTime = zulu.parse(createdString);
+
+
[axis-axis2-java-rampart] 08/09: Removing the part of the patch related to SAML processing. The necessary change proposed in WSS-206 has never been applied.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch RAMPART-252
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit 6f929c51de135888fc0cf2a552902a5a8da9
Author: Andreas Veithen
AuthorDate: Sun Jan 29 16:35:55 2017 +
Removing the part of the patch related to SAML processing. The necessary
change proposed in WSS-206 has never been applied.
---
.../rampart/builder/SymmetricBindingBuilder.java | 39 ++
1 file changed, 3 insertions(+), 36 deletions(-)
diff --git
a/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilder.java
b/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilder.java
index 7cc40d7..acb2b73 100644
---
a/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilder.java
+++
b/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilder.java
@@ -17,9 +17,6 @@
package org.apache.rampart.builder;
import org.apache.axiom.om.OMElement;
-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.axis2.context.MessageContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -58,8 +55,6 @@ import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.*;
-import javax.xml.stream.XMLStreamReader;
-
public class SymmetricBindingBuilder extends BindingBuilder {
@@ -538,12 +533,6 @@ public class SymmetricBindingBuilder extends
BindingBuilder {
//Encryption
Token encrToken = rpd.getEncryptionToken();
-
-boolean isIssuedToken = false;
-if (encrToken instanceof IssuedToken) {
-isIssuedToken = true;
-}
-
Element encrTokElem = null;
if(sigToken.equals(encrToken)) {
//Use the same token
@@ -666,23 +655,13 @@ public class SymmetricBindingBuilder extends
BindingBuilder {
encr.setSymmetricEncAlgorithm(rpd.getAlgorithmSuite().getEncryption());
// Use key identifier in the KeyInfo in server side
if (!rmd.isInitiator()) {
-if (encrTok instanceof EncryptedKeyToken) {
+if(encrTok instanceof EncryptedKeyToken) {
// TODO was encr.setUseKeyIdentifier(true); verify
encr.setEncKeyIdDirectId(true);
-encr.setCustomReferenceValue(((EncryptedKeyToken)
encrTok).getSHA1());
+
encr.setCustomReferenceValue(((EncryptedKeyToken)encrTok).getSHA1());
encr.setKeyIdentifierType(WSConstants.ENCRYPTED_KEY_SHA1_IDENTIFIER);
-}
-} else if (isIssuedToken) {
-encr.setUseKeyIdentifier(true);
-encr.setCustomReferenceValue(encrTokId);
-
encr.setKeyIdentifierType(WSConstants.SAML_ASSERTION_IDENTIFIER);
-try {
-//
RampartUtil.insertSiblingAfter(rmd,this.timestampElement,getLLOMfromOM(encrTok.getToken()));
-} catch (Exception e) {
-log.debug("error while converting SAML issued
token to a dom element");
-}
+}
}
-
encr.prepare(doc, RampartUtil.getEncryptionCrypto(rpd
.getRampartConfig(), rmd.getCustomClassLoader()));
@@ -714,18 +693,6 @@ public class SymmetricBindingBuilder extends
BindingBuilder {
}
-private Element getLLOMfromOM(OMElement element) {
-// Get the StAX reader from the created element
-XMLStreamReader llomReader = element.getXMLStreamReader();
-// Create the DOOM OMFactory
-OMFactory doomFactory = DOOMAbstractFactory.getOMFactory();
-// Create the new builder
-StAXOMBuilder doomBuilder = new StAXOMBuilder(doomFactory, llomReader);
-// Get the document element
-OMElement newElem = doomBuilder.getDocumentElement();
-return (Element) newElem;
-}
-
/**
* @param rmd
* @param sigToken
[axis-axis2-java-rampart] 06/10: Merge r1052172 from the trunk.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch RAMPART-289
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit 82fe90d5e5c7c176a0c2be2786630842d7fce9d8
Author: Andreas Veithen
AuthorDate: Mon Jan 30 17:21:48 2017 +
Merge r1052172 from the trunk.
---
.../rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
a/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
b/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
index 8d686d4..0db238a 100644
--- a/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
+++ b/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
@@ -205,7 +205,9 @@ public class Axis2Util {
OMNamespace ns = (OMNamespace)
nsIter.next();
header.declareNamespace(ns);
}
- Iterator children = element.getChildElements();
+ // retrieve all child nodes (including any text
nodes)
+ // and re-attach to header block
+ Iterator children = element.getChildren();
while (children.hasNext()) {
OMNode child = (OMNode)children.next();
child.detach();
[axis-axis2-java-rampart] 03/10: RAMPART-289: Apply patch provided by Todd Wolff.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch RAMPART-289
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit f2febb5a5c26cd59cf68df8351b241d89ea1b39a
Author: Andreas Veithen
AuthorDate: Sun Jan 29 21:00:00 2017 +
RAMPART-289: Apply patch provided by Todd Wolff.
---
.../rampart/PolicyBasedResultsValidator.java | 157 ++---
1 file changed, 139 insertions(+), 18 deletions(-)
diff --git
a/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
b/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
index 4d5aa35..a0d24c5 100644
---
a/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
+++
b/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
@@ -31,6 +31,7 @@ import org.apache.ws.security.message.token.Timestamp;
import org.apache.ws.security.util.WSSecurityUtil;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import org.jaxen.XPath;
import org.jaxen.JaxenException;
@@ -116,7 +117,23 @@ public class PolicyBasedResultsValidator implements
PolicyValidatorCallbackHandl
new
WSEncryptionPart("SignedEndorsingSupportingTokens"));
}
}
-
+//Add an indicator for Encrypted Supporting Tokens
+SupportingToken encryptedSupportingToken =
rpd.getEncryptedSupportingTokens();
+if(encryptedSupportingToken != null) {
+encryptedParts.add(new
WSEncryptionPart("EncryptedSupportingToken"));
+}
+encryptedSupportingToken =
rpd.getSignedEncryptedSupportingTokens();
+if(encryptedSupportingToken != null) {
+encryptedParts.add(new
WSEncryptionPart("EncryptedSupportingToken"));
+}
+encryptedSupportingToken =
rpd.getSignedEndorsingEncryptedSupportingTokens();
+if(encryptedSupportingToken != null) {
+encryptedParts.add(new
WSEncryptionPart("EncryptedSupportingToken"));
+}
+encryptedSupportingToken =
rpd.getEndorsingEncryptedSupportingTokens();
+if(encryptedSupportingToken != null) {
+encryptedParts.add(new
WSEncryptionPart("EncryptedSupportingToken"));
+}
Vector supportingToks = rpd.getSupportingTokensList();
for (int i = 0; i < supportingToks.size(); i++) {
SupportingToken supportingToken = (SupportingToken)
supportingToks.get(i);
@@ -127,12 +144,61 @@ public class PolicyBasedResultsValidator implements
PolicyValidatorCallbackHandl
signatureParts.addAll(RampartUtil.getSupportingSignedParts(rmd, policyData));
}
}
+SupportingToken supportingToken =
rpd.getEncryptedSupportingTokens();
+if (supportingToken != null) {
+SupportingPolicyData policyData = new SupportingPolicyData();
+policyData.build(supportingToken);
+
encryptedParts.addAll(RampartUtil.getSupportingEncryptedParts(rmd, policyData));
+
signatureParts.addAll(RampartUtil.getSupportingSignedParts(rmd, policyData));
+}
+supportingToken = rpd.getSignedSupportingTokens();
+if (supportingToken != null) {
+SupportingPolicyData policyData = new SupportingPolicyData();
+policyData.build(supportingToken);
+
encryptedParts.addAll(RampartUtil.getSupportingEncryptedParts(rmd, policyData));
+
signatureParts.addAll(RampartUtil.getSupportingSignedParts(rmd, policyData));
+}
+supportingToken = rpd.getSignedEndorsingSupportingTokens();
+if (supportingToken != null) {
+SupportingPolicyData policyData = new SupportingPolicyData();
+policyData.build(supportingToken);
+
encryptedParts.addAll(RampartUtil.getSupportingEncryptedParts(rmd, policyData));
+
signatureParts.addAll(RampartUtil.getSupportingSignedParts(rmd, policyData));
+}
+supportingToken = rpd.getSignedEncryptedSupportingTokens();
+if (supportingToken != null) {
+SupportingPolicyData policyData = new SupportingPolicyData();
+policyData.build(supportingToken);
+
encryptedParts.addAll(RampartUtil.getSupportingEncryptedParts(rmd, policyData));
+
signatureParts.addAll(RampartUtil.getSupportingSignedParts(rmd, policyData));
+}
+supportingToken =
rpd.getSignedEndorsingEncryptedSupportingTokens();
+if (supportingToken != null) {
+SupportingPolicyData policyData = new SupportingPolicyData();
+policyData.build(s
[axis-axis2-java-rampart] 01/02: Create development branch for RAMPART-401.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch RAMPART-401 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git commit ecd4606dcfe0c7a39580d74f2fa4908cba38dbe9 Author: Andreas Veithen AuthorDate: Mon Feb 6 10:19:09 2017 + Create development branch for RAMPART-401.
[axis-axis2-java-rampart] 06/09: Merge r1240268 from trunk.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch RAMPART-252
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit b258a530dd3cd3c6bef1aba7ef0007168c968a48
Merge: 1d944fb c92232d
Author: Andreas Veithen
AuthorDate: Sun Jan 29 15:45:48 2017 +
Merge r1240268 from trunk.
.../ExtendedPolicyValidatorCallbackHandler.java| 24 +
.../rampart/PolicyBasedResultsValidator.java | 694 ++-
.../java/org/apache/rampart/RampartConstants.java | 3 +
.../java/org/apache/rampart/RampartEngine.java | 33 +-
.../org/apache/rampart/RampartMessageData.java | 54 +-
.../org/apache/rampart/TokenCallbackHandler.java | 4 +-
.../rampart/builder/AsymmetricBindingBuilder.java | 238 ---
.../org/apache/rampart/builder/BindingBuilder.java | 318 +
.../rampart/builder/SymmetricBindingBuilder.java | 152 +++--
.../rampart/builder/TransportBindingBuilder.java | 194 +++---
.../main/java/org/apache/rampart/errors.properties | 3 +
.../rampart/handler/CertificateValidator.java | 45 ++
.../handler/PostDispatchVerificationHandler.java | 4 +-
.../apache/rampart/handler/RampartReceiver.java| 10 +-
.../apache/rampart/handler/WSDoAllReceiver.java| 39 +-
.../org/apache/rampart/handler/WSDoAllSender.java | 27 +-
.../handler/config/InflowConfiguration.java| 21 +
.../handler/config/OutflowConfiguration.java | 21 +
.../apache/rampart/policy/RampartPolicyData.java | 62 +-
.../rampart/policy/model/OptimizePartsConfig.java | 11 +-
.../apache/rampart/saml/SAML1AssertionHandler.java | 12 +-
.../org/apache/rampart/util/MessageOptimizer.java | 25 +-
.../java/org/apache/rampart/util/RampartUtil.java | 750 -
.../src/main/java/org/apache/rahas/PWCallback.java | 14 +-
.../main/java/org/apache/rampart/PWCallback.java | 18 +-
.../apache/axis2/oasis/ping/PingPortSkeleton.java | 31 +-
.../axis2/security/InteropScenarioClient.java | 7 +-
.../src/org/apache/axis2/security/PWCallback.java | 10 +-
.../org/apache/axis2/security/Scenario4Test.java | 9 +-
.../org/apache/axis2/security/Scenario5Test.java | 4 +-
.../test/java/org/apache/rampart/RampartTest.java | 4 +-
.../src/test/resources/security/s2a.service.xml| 2 +-
.../test/resources/security/s4.client.axis2.xml| 5 +-
.../src/test/resources/security/s4.service.xml | 5 +-
.../test/resources/security/s5.client.axis2.xml| 4 +-
.../org/apache/rampart/MessageBuilderTestBase.java | 3 +-
.../java/org/apache/rampart/RampartEngineTest.java | 33 +-
.../java/org/apache/rampart/TestCBHandler.java | 44 +-
.../rampart-tests/test-resources/PWCallback.java | 8 +-
.../src/main/java/org/apache/rahas/RahasData.java | 31 +-
.../java/org/apache/rahas/client/STSClient.java| 30 +-
.../main/java/org/apache/rahas/errors.properties | 5 +-
.../org/apache/rahas/impl/SAML2TokenIssuer.java| 19 +-
.../org/apache/rahas/impl/SAMLTokenIssuer.java | 49 +-
.../apache/rahas/impl/SAMLTokenIssuerConfig.java | 11 +-
.../org/apache/rahas/impl/SAMLTokenRenewer.java| 11 +-
.../org/apache/rahas/impl/SAMLTokenValidator.java | 6 +-
.../org/apache/rahas/impl/TokenIssuerUtil.java | 13 +-
.../org/apache/rahas/impl/util/CommonUtil.java | 140
.../org/apache/rahas/impl/util/SAML2Utils.java | 13 +-
.../java/org/apache/rahas/impl/util/SAMLUtils.java | 22 +-
.../apache/rahas/impl/SAML2TokenIssuerTest.java| 73 ++
.../org/apache/rahas/impl/util/SAMLUtilsTest.java | 37 +-
.../java/org/apache/rahas/test/util/TestUtil.java | 61 ++
pom.xml| 22 +-
55 files changed, 2059 insertions(+), 1429 deletions(-)
diff --cc
modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
index 9cd2a2b,774bf38..1eab066
---
a/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
+++
b/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
@@@ -556,39 -561,12 +565,37 @@@ public class PolicyBasedResultsValidato
WSSecurityEngineResult[] actionResults = fetchActionResults(results,
WSConstants.SIGN);
// Find elements that are signed
- Vector actuallySigned = new Vector();
+ List actuallySigned = new ArrayList();
-if (actionResults != null) {
+if (actionResults != null) {
+
+AlgorithmSuite suite = rpd.getAlgorithmSuite();
+
- for (int j = 0; j < actionResults.length; j++) {
-
- WSSecurityEngineResult actionResult = actionResults[j];
+ for (WSSecurityEngineResult actionResult : actionResults) {
+// Validate signature algorithms
+String sigMethod = null;
+
[axis-axis2-java-rampart] branch RAMPART-252 created (now aea8fbb)
This is an automated email from the ASF dual-hosted git repository. billblough pushed a change to branch RAMPART-252 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git. at aea8fbb Adapt to changes in the WSS4J API. This branch includes the following new commits: new a9ff043 Create development branch for RAMPART-252. new 0455173 RAMPART-252: Commit patch provided by Prabath Siriwardena. new f20bf07 Merge changes up to r1052171 from trunk. new 6090351 Merge r1052172 from trunk. new 1d944fb Merge changes up to r1240267 from trunk. new b258a53 Merge r1240268 from trunk. new f505eb5 Merge latest changes from trunk. new 6f9 Removing the part of the patch related to SAML processing. The necessary change proposed in WSS-206 has never been applied. new aea8fbb Adapt to changes in the WSS4J API. The 9 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[axis-axis2-java-rampart] 04/09: Merge r1052172 from trunk.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch RAMPART-252
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit 609035130e561170310bbfedafa526ba044c430a
Merge: f20bf07 465a881
Author: Andreas Veithen
AuthorDate: Sun Jan 29 15:06:54 2017 +
Merge r1052172 from trunk.
.../rampart/PolicyBasedResultsValidator.java | 46 --
.../java/org/apache/rampart/util/Axis2Util.java| 4 +-
2 files changed, 36 insertions(+), 14 deletions(-)
diff --cc
modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
index 5f4ddff,24db745..f362f26
---
a/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
+++
b/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
@@@ -556,44 -554,36 +557,62 @@@ public class PolicyBasedResultsValidato
// Find elements that are signed
Vector actuallySigned = new Vector();
-if (actionResults != null) {
+if (actionResults != null) {
+
+AlgorithmSuite suite = rpd.getAlgorithmSuite();
+
for (int j = 0; j < actionResults.length; j++) {
+
WSSecurityEngineResult actionResult = actionResults[j];
+
+// Validate signature algorithms
+String sigMethod = null;
+String canonMethod = null;
+sigMethod = (String)
actionResult.get(WSSecurityEngineResult.TAG_SIGNATURE_METHOD);
+canonMethod = (String) actionResult
+
.get(WSSecurityEngineResult.TAG_CANONICALIZATION_METHOD);
+
+if (sigMethod == null || canonMethod == null) {
+throw new RampartException("algorithmNotFound");
+}
+// Check whether signature algorithm is correct
+if (!(sigMethod.equals(suite.getAsymmetricSignature()) ||
sigMethod.equals(suite
+.getSymmetricSignature( {
+throw new RampartException("invalidAlgorithm", new
String[] {
+suite.getAsymmetricSignature(), sigMethod });
+}
+// Check whether the canonicalization algorithm is correct
+if (!canonMethod.equals(suite.getInclusiveC14n())) {
+throw new RampartException("invalidAlgorithm", new
String[] {
+suite.getInclusiveC14n(), canonMethod });
+}
+
- Set signedIDs = (Set) actionResult
- .get(WSSecurityEngineResult.TAG_SIGNED_ELEMENT_IDS);
- for (Iterator i = signedIDs.iterator(); i.hasNext();) {
- String e = (String) i.next();
-
- Element element =
WSSecurityUtil.findElementById(envelope, e,
- WSConstants.WSU_NS);
- actuallySigned.add(element);
+ List wsDataRefs =
(List)actionResult.get(WSSecurityEngineResult.TAG_DATA_REF_URIS);
+
+ // if header was encrypted before it was signed, protected
+ // element is 'EncryptedHeader.' the actual element is
+ // first child element
+
+ for (Iterator k = wsDataRefs.iterator(); k.hasNext();) {
+ WSDataRef wsDataRef = (WSDataRef)k.next();
+ Element protectedElement =
wsDataRef.getProtectedElement();
+ if
(protectedElement.getLocalName().equals("EncryptedHeader")) {
+ NodeList nodeList = protectedElement.getChildNodes();
+ for (int x = 0; x < nodeList.getLength(); x++) {
+ if (nodeList.item(x).getNodeType() ==
Node.ELEMENT_NODE) {
+ String ns =
((Element)nodeList.item(x)).getNamespaceURI();
+ String ln =
((Element)nodeList.item(x)).getLocalName();
+ actuallySigned.add(new QName(ns,ln));
+ break;
+ }
+ }
+ } else {
+ String ns = protectedElement.getNamespaceURI();
+ String ln = protectedElement.getLocalName();
+ actuallySigned.add(new QName(ns,ln));
+ }
}
+
}
}
[axis-axis2-java-rampart] 05/10: Rename variable to match the code on the trunk.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch RAMPART-289
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit 019082001a321d444648c739c8f16cf97062e31b
Author: Andreas Veithen
AuthorDate: Mon Jan 30 17:19:23 2017 +
Rename variable to match the code on the trunk.
---
.../main/java/org/apache/rampart/PolicyBasedResultsValidator.java | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git
a/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
b/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
index 3f69f8e..9684b3c 100644
---
a/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
+++
b/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
@@ -693,15 +693,15 @@ public class PolicyBasedResultsValidator implements
PolicyValidatorCallbackHandl
if (wsep.getType() == WSConstants.PART_TYPE_BODY) {
-QName body;
+QName bodyQName;
if
(WSConstants.URI_SOAP11_ENV.equals(envelope.getNamespaceURI())) {
-body = new SOAP11Constants().getBodyQName();
+bodyQName = new SOAP11Constants().getBodyQName();
} else {
-body = new SOAP12Constants().getBodyQName();
+bodyQName = new SOAP12Constants().getBodyQName();
}
-if (!actuallySigned.contains(body) &&
!rmd.getPolicyData().isSignBodyOptional()) {
+if (!actuallySigned.contains(bodyQName) &&
!rmd.getPolicyData().isSignBodyOptional()) {
// soap body is not signed
throw new RampartException("bodyNotSigned");
}
[axis-axis2-java-rampart] branch RAMPART-401 created (now ac43b51)
This is an automated email from the ASF dual-hosted git repository. billblough pushed a change to branch RAMPART-401 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git. at ac43b51 RAMPART-401: Apply patch provided by Nathan Clement. This branch includes the following new commits: new ecd4606 Create development branch for RAMPART-401. new ac43b51 RAMPART-401: Apply patch provided by Nathan Clement. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[axis-axis2-java-rampart] 02/09: RAMPART-252: Commit patch provided by Prabath Siriwardena.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch RAMPART-252
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit 0455173a88c41265e65842259e7757dda9bd0188
Author: Andreas Veithen
AuthorDate: Sun Jan 29 14:00:51 2017 +
RAMPART-252: Commit patch provided by Prabath Siriwardena.
---
.../rampart/PolicyBasedResultsValidator.java | 47 +-
.../rampart/builder/SymmetricBindingBuilder.java | 39 --
.../main/java/org/apache/rampart/errors.properties | 4 +-
pom.xml| 2 +-
4 files changed, 86 insertions(+), 6 deletions(-)
diff --git
a/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
b/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
index 4d5aa35..a64e287 100644
---
a/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
+++
b/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
@@ -453,6 +453,8 @@ public class PolicyBasedResultsValidator implements
PolicyValidatorCallbackHandl
}
+//validate the algorithms
+validateEncryptionAlgorithm(encrRefs, rpd.getAlgorithmSuite());
//Check for encrypted body
if(rpd.isEncryptBody()&& !rpd.isEncryptBodyOptional()) {
@@ -546,6 +548,7 @@ public class PolicyBasedResultsValidator implements
PolicyValidatorCallbackHandl
throws RampartException {
RampartMessageData rmd = data.getRampartMessageData();
+RampartPolicyData rpd = rmd.getPolicyData();
Node envelope = rmd.getDocument().getFirstChild();
@@ -553,9 +556,35 @@ public class PolicyBasedResultsValidator implements
PolicyValidatorCallbackHandl
// Find elements that are signed
Vector actuallySigned = new Vector();
-if (actionResults != null) {
+if (actionResults != null) {
+
+AlgorithmSuite suite = rpd.getAlgorithmSuite();
+
for (int j = 0; j < actionResults.length; j++) {
WSSecurityEngineResult actionResult = actionResults[j];
+
+// Validate signature algorithms
+String sigMethod = null;
+String canonMethod = null;
+sigMethod = (String)
actionResult.get(WSSecurityEngineResult.TAG_SIGNATURE_METHOD);
+canonMethod = (String) actionResult
+
.get(WSSecurityEngineResult.TAG_CANONICALIZATION_METHOD);
+
+if (sigMethod == null || canonMethod == null) {
+throw new RampartException("algorithmNotFound");
+}
+// Check whether signature algorithm is correct
+if (!(sigMethod.equals(suite.getAsymmetricSignature()) ||
sigMethod.equals(suite
+.getSymmetricSignature( {
+throw new RampartException("invalidAlgorithm", new
String[] {
+suite.getAsymmetricSignature(), sigMethod });
+}
+// Check whether the canonicalization algorithm is correct
+if (!canonMethod.equals(suite.getInclusiveC14n())) {
+throw new RampartException("invalidAlgorithm", new
String[] {
+suite.getInclusiveC14n(), canonMethod });
+}
+
Set signedIDs = (Set) actionResult
.get(WSSecurityEngineResult.TAG_SIGNED_ELEMENT_IDS);
for (Iterator i = signedIDs.iterator(); i.hasNext();) {
@@ -942,6 +971,22 @@ public class PolicyBasedResultsValidator implements
PolicyValidatorCallbackHandl
.size()]);
}
+private void validateEncryptionAlgorithm(ArrayList refList, AlgorithmSuite
algorithmSuite) throws RampartException {
+
+for (int i = 0; i < refList.size(); i++) {
+WSDataRef dataRef = (WSDataRef) refList.get(i);
+
+//ArrayList can contain null elements
+if (dataRef == null) {
+continue;
+}
+
+if (!(algorithmSuite.getEncryption().equals(dataRef.getAlgo( {
+throw new RampartException("invalidAlgorithm", new
String[]{algorithmSuite.getEncryption(), dataRef.getAlgo()});
+}
+}
+}
+
private boolean isRefIdPresent(ArrayList refList , QName qname) {
for (int i = 0; i < refList.size() ; i++) {
diff --git
a/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilder.java
b/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilder.java
index abc7e27..4bdd2ed 100644
---
a/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilde
[axis-axis2-java-rampart] 02/10: Create development branch for RAMPART-289.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch RAMPART-289 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git commit 64584cc76509a8183bc7cc7c1ed5d870286ed2b8 Merge: 5f0e39d 4b544ad Author: Andreas Veithen AuthorDate: Sun Jan 29 20:58:27 2017 + Create development branch for RAMPART-289. NOTICE |9 - apidocs/pom.xml| 117 -- apidocs/src/main/assembly/apidocs.xml | 32 - build.xml | 160 +++ code-coverage/pom.xml | 188 --- etc/dist.py| 45 - legal/bcprov-LICENSE.txt | 19 - legal/commons-lang-LICENSE.txt | 202 legal/esapi-LICENSE.txt| 12 - ...f4j-jcl-LICENSE.txt => slf4j-jdk14-LICENSE.txt} |0 modules/distribution/bin.xml | 76 +- modules/distribution/pom.xml | 124 +- modules/distribution/src.xml | 69 +- modules/documentation/pom.xml | 33 + .../src/site/resources/css/maven-base.css | 143 +++ .../src/site/resources/css/maven-theme.css | 129 ++ .../documentation/src/site/resources/css/print.css |7 + .../documentation/src/site/resources/css/site.css | 297 + .../documentation/src/site/resources/css/style.css | 184 +++ .../images/apache-rampart-banner-background.jpg| Bin 0 -> 373 bytes .../resources/images/apache-rampart-banner.jpg | Bin 0 -> 14840 bytes .../images/apache-rampart-content-back.jpg | Bin 0 -> 309 bytes .../site/resources/images/apache-rampart-logo.jpg | Bin 0 -> 4906 bytes .../images/apache-rampart-menu-bottom.jpg | Bin 0 -> 381 bytes .../images/apache-rampart-menu-button.gif | Bin 0 -> 192 bytes .../resources/images/apache-rampart-menu-top.jpg | Bin 0 -> 633 bytes .../site/resources/images/apache-rampart-menu.jpg | Bin 0 -> 1221 bytes .../resources/images/apache-rampart-spliter.jpg| Bin 0 -> 650 bytes .../src/site/resources/images/external.png | Bin 0 -> 230 bytes .../site/resources/images/logos/asf_logo_wide.png | Bin .../images/logos/build-by-maven-black.png | Bin 0 -> 2294 bytes .../images/logos/build-by-maven-white.png | Bin 0 -> 2260 bytes .../site/resources/images/logos/maven-feather.png | Bin 0 -> 3330 bytes .../src}/site/resources/images/message-builder.jpg | Bin .../src}/site/resources/images/rampart-engine.jpg | Bin .../site/resources/images/rampart-handlers.jpg | Bin .../src}/site/resources/images/rampart-trust.jpg | Bin .../src}/site/resources/images/security-stack.jpg | Bin .../src}/site/resources/rampart-config.xsd | 27 +- .../src}/site/resources/samples/msgs/creq04.xml|0 .../src}/site/resources/samples/msgs/cres04.xml|0 .../src}/site/resources/samples/msgs/req01.xml |0 .../src}/site/resources/samples/msgs/req02.xml |0 .../src}/site/resources/samples/msgs/req03.xml |0 .../src}/site/resources/samples/msgs/req04.xml |0 .../src}/site/resources/samples/msgs/res01.xml |0 .../src}/site/resources/samples/msgs/res02.xml |0 .../src}/site/resources/samples/msgs/res03.xml |0 .../src}/site/resources/samples/msgs/res04.xml |0 .../src}/site/resources/samples/msgs/rst04.xml |0 .../src}/site/resources/samples/msgs/rstr04.xml|0 .../site/resources/samples/policy/sample01.xml |2 +- .../site/resources/samples/policy/sample02.xml |0 .../site/resources/samples/policy/sample03.xml |0 .../site/resources/samples/policy/sample04.xml |0 .../site/resources/samples/policy/sample05.xml |2 +- .../site/resources/samples/policy/sample06.xml |2 +- modules/documentation/src/site/site.xml| 80 ++ .../documentation/src}/site/xdoc/articles.xml |0 .../src}/site/xdoc/developer-guide.xml |4 +- modules/documentation/src/site/xdoc/download.xml | 81 ++ .../src/site/xdoc/download/1.1/download.cgi|6 + .../src/site/xdoc/download/1.1/download.xml| 125 ++ .../src/site/xdoc/download/1.2/download.cgi|6 + .../src/site/xdoc/download/1.2/download.xml| 125 ++ .../src/site/xdoc/download/1.3/download.cgi|6 + .../src/site/xdoc/download/1.3/download.xml| 125 ++ modules/documentation/src/site/xdoc/index.xml | 73 ++ .../documentation/src}/site/xdoc/quick-start.xml |2 +- .../src/site/xdoc/rampartconfig-guide.xml | 76 ++ .../documentation/src}/site/xdoc/samples.xml |1 - .../src}/site/xdoc/setting-up-sts.xml |2 +- .../documentation/src}/site/xdoc/siteHowTo.xml |0
[axis-axis2-java-rampart] 10/10: Make the patch compile.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch RAMPART-289
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit ad4f59f45a8d0f88f046e7854dd93291e38965d3
Author: Andreas Veithen
AuthorDate: Mon Jan 30 18:00:58 2017 +
Make the patch compile.
---
.../src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
b/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
index b821854..f31591e 100644
---
a/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
+++
b/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
@@ -433,7 +433,7 @@ public class PolicyBasedResultsValidator implements
ExtendedPolicyValidatorCallb
* @param data
* @param results
*/
-protected void validateProtectionOrder(ValidatorData data,
List results), Vector encryptedParts)
+protected void validateProtectionOrder(ValidatorData data,
List results, List encryptedParts)
throws RampartException {
String protectionOrder =
data.getRampartMessageData().getPolicyData().getProtectionOrder();
@@ -600,7 +600,7 @@ public class PolicyBasedResultsValidator implements
ExtendedPolicyValidatorCallb
// ignore place holders for encrypted supporting
// tokens
-if (encPart.getId() != null &&
encPart.getId().equals("EncryptedSupportingToken")) {
+if (encryptedPart.getId() != null &&
encryptedPart.getId().equals("EncryptedSupportingToken")) {
continue;
}
[axis-axis2-java-rampart] branch 1_4 created (now 9c5767a)
This is an automated email from the ASF dual-hosted git repository. billblough pushed a change to branch 1_4 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git. at 9c5767a Moving axis svn, part of TLP move INFRA-2441 This branch includes the following new commits: new 9c5767a Moving axis svn, part of TLP move INFRA-2441 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[axis-axis2-java-rampart] 07/09: Merge latest changes from trunk.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch RAMPART-252 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git commit f505eb58bd4b003850dd07f82bac8f1732c84889 Merge: b258a53 397cc84 Author: Andreas Veithen AuthorDate: Sun Jan 29 15:59:32 2017 + Merge latest changes from trunk. release-docs/LICENSE.txt => LICENSE|0 release-docs/NOTICE.txt => NOTICE |0 release-docs/README.txt => README |0 apidocs/pom.xml| 117 +++ apidocs/src/main/assembly/apidocs.xml | 32 + build.xml | 181 code-coverage/pom.xml | 188 etc/dist.py| 45 + legal/esapi-LICENSE.txt| 12 + modules/distribution/bin.xml | 56 +- modules/distribution/pom.xml | 81 +- modules/distribution/src.xml | 78 +- .../distribution/src/main/files}/build.xml |2 +- modules/documentation/pom.xml | 52 - .../src/site/resources/css/maven-base.css | 143 --- .../src/site/resources/css/maven-theme.css | 129 --- .../documentation/src/site/resources/css/print.css |7 - .../documentation/src/site/resources/css/site.css | 272 -- .../documentation/src/site/resources/css/style.css | 184 .../src/site/resources/download/1.1/download.cgi |6 - .../src/site/resources/download/1.2/download.cgi |6 - .../src/site/resources/download/1.3/download.cgi |6 - .../src/site/resources/download/1.4/download.cgi |6 - .../src/site/resources/download/1.5.1/download.cgi |6 - .../src/site/resources/download/1.5.2/download.cgi |6 - .../src/site/resources/download/1.5/download.cgi |6 - .../src/site/resources/download/1.6.0/download.cgi |6 - .../src/site/resources/download/1.6.1/download.cgi |6 - .../images/apache-rampart-banner-background.jpg| Bin 373 -> 0 bytes .../resources/images/apache-rampart-banner.jpg | Bin 27612 -> 0 bytes .../images/apache-rampart-content-back.jpg | Bin 309 -> 0 bytes .../site/resources/images/apache-rampart-logo.jpg | Bin 10154 -> 0 bytes .../images/apache-rampart-menu-bottom.jpg | Bin 381 -> 0 bytes .../images/apache-rampart-menu-button.gif | Bin 192 -> 0 bytes .../resources/images/apache-rampart-menu-top.jpg | Bin 633 -> 0 bytes .../site/resources/images/apache-rampart-menu.jpg | Bin 1221 -> 0 bytes .../resources/images/apache-rampart-spliter.jpg| Bin 650 -> 0 bytes .../src/site/resources/images/axis.jpg | Bin 13887 -> 0 bytes .../src/site/resources/images/axis.png | Bin 13745 -> 0 bytes .../src/site/resources/images/breadcrumbs-bg.gif | Bin 198 -> 0 bytes .../src/site/resources/images/external.png | Bin 230 -> 0 bytes .../src/site/resources/images/h2-bg.gif| Bin 202 -> 0 bytes .../src/site/resources/images/home-top.gif | Bin 804 -> 0 bytes .../src/site/resources/images/leftcolumn-bg.gif| Bin 523 -> 0 bytes .../images/logos/build-by-maven-black.png | Bin 2294 -> 0 bytes .../images/logos/build-by-maven-white.png | Bin 2260 -> 0 bytes .../site/resources/images/logos/maven-feather.png | Bin 3330 -> 0 bytes .../src/site/resources/images/menu-back.gif| Bin 827 -> 0 bytes modules/documentation/src/site/site.xml| 79 -- modules/documentation/src/site/xdoc/download.xml | 126 --- .../src/site/xdoc/download/1.1/download.xml| 97 -- .../src/site/xdoc/download/1.2/download.xml| 97 -- .../src/site/xdoc/download/1.3/download.xml| 97 -- .../src/site/xdoc/download/1.4/download.xml| 82 -- .../src/site/xdoc/download/1.5.1/download.xml | 115 --- .../src/site/xdoc/download/1.5.2/download.xml | 115 --- .../src/site/xdoc/download/1.5/download.xml| 82 -- .../src/site/xdoc/download/1.6.0/download.xml | 115 --- .../src/site/xdoc/download/1.6.1/download.xml | 115 --- modules/documentation/src/site/xdoc/index.xml | 99 -- modules/rampart-core/pom.xml | 79 +- .../ExtendedPolicyValidatorCallbackHandler.java|1 - .../main/java/org/apache/rampart/NonceCache.java |6 +- .../rampart/PolicyBasedResultsValidator.java | 69 +- .../java/org/apache/rampart/RampartEngine.java | 296 -- .../org/apache/rampart/RampartMessageData.java | 109 +-- .../rampart/builder/AsymmetricBindingBuilder.java | 14 +- .../org/apache/rampart/builder/BindingBuilder.java | 138 ++- .../rampart/builder/TransportBindingBuilder.java | 80 ++ .../handler/PostDispatchVerificationHandler.java |9 +- .../handler/RampartUsernameToke
[axis-axis2-java-rampart] 09/10: Merge remaining changes from trunk.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch RAMPART-289 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git commit 27ac5d2f588da50605f2ee63d714b57c028cea3a Merge: dbb633e ec0ce32 Author: Andreas Veithen AuthorDate: Mon Jan 30 17:50:58 2017 + Merge remaining changes from trunk. release-docs/LICENSE.txt => LICENSE|0 release-docs/NOTICE.txt => NOTICE |0 release-docs/README.txt => README |0 apidocs/pom.xml| 117 +++ apidocs/src/main/assembly/apidocs.xml | 32 + build.xml | 181 code-coverage/pom.xml | 188 etc/dist.py| 45 + legal/esapi-LICENSE.txt| 12 + modules/distribution/bin.xml | 56 +- modules/distribution/pom.xml | 81 +- modules/distribution/src.xml | 78 +- .../distribution/src/main/files}/build.xml |2 +- modules/documentation/pom.xml | 52 - .../src/site/resources/css/maven-base.css | 143 --- .../src/site/resources/css/maven-theme.css | 129 --- .../documentation/src/site/resources/css/print.css |7 - .../documentation/src/site/resources/css/site.css | 272 -- .../documentation/src/site/resources/css/style.css | 184 .../src/site/resources/download/1.1/download.cgi |6 - .../src/site/resources/download/1.2/download.cgi |6 - .../src/site/resources/download/1.3/download.cgi |6 - .../src/site/resources/download/1.4/download.cgi |6 - .../src/site/resources/download/1.5.1/download.cgi |6 - .../src/site/resources/download/1.5.2/download.cgi |6 - .../src/site/resources/download/1.5/download.cgi |6 - .../src/site/resources/download/1.6.0/download.cgi |6 - .../src/site/resources/download/1.6.1/download.cgi |6 - .../images/apache-rampart-banner-background.jpg| Bin 373 -> 0 bytes .../resources/images/apache-rampart-banner.jpg | Bin 27612 -> 0 bytes .../images/apache-rampart-content-back.jpg | Bin 309 -> 0 bytes .../site/resources/images/apache-rampart-logo.jpg | Bin 10154 -> 0 bytes .../images/apache-rampart-menu-bottom.jpg | Bin 381 -> 0 bytes .../images/apache-rampart-menu-button.gif | Bin 192 -> 0 bytes .../resources/images/apache-rampart-menu-top.jpg | Bin 633 -> 0 bytes .../site/resources/images/apache-rampart-menu.jpg | Bin 1221 -> 0 bytes .../resources/images/apache-rampart-spliter.jpg| Bin 650 -> 0 bytes .../src/site/resources/images/axis.jpg | Bin 13887 -> 0 bytes .../src/site/resources/images/axis.png | Bin 13745 -> 0 bytes .../src/site/resources/images/breadcrumbs-bg.gif | Bin 198 -> 0 bytes .../src/site/resources/images/external.png | Bin 230 -> 0 bytes .../src/site/resources/images/h2-bg.gif| Bin 202 -> 0 bytes .../src/site/resources/images/home-top.gif | Bin 804 -> 0 bytes .../src/site/resources/images/leftcolumn-bg.gif| Bin 523 -> 0 bytes .../images/logos/build-by-maven-black.png | Bin 2294 -> 0 bytes .../images/logos/build-by-maven-white.png | Bin 2260 -> 0 bytes .../site/resources/images/logos/maven-feather.png | Bin 3330 -> 0 bytes .../src/site/resources/images/menu-back.gif| Bin 827 -> 0 bytes modules/documentation/src/site/site.xml| 79 -- modules/documentation/src/site/xdoc/download.xml | 126 --- .../src/site/xdoc/download/1.1/download.xml| 97 -- .../src/site/xdoc/download/1.2/download.xml| 97 -- .../src/site/xdoc/download/1.3/download.xml| 97 -- .../src/site/xdoc/download/1.4/download.xml| 82 -- .../src/site/xdoc/download/1.5.1/download.xml | 115 --- .../src/site/xdoc/download/1.5.2/download.xml | 115 --- .../src/site/xdoc/download/1.5/download.xml| 82 -- .../src/site/xdoc/download/1.6.0/download.xml | 115 --- .../src/site/xdoc/download/1.6.1/download.xml | 115 --- modules/documentation/src/site/xdoc/index.xml | 99 -- modules/rampart-core/pom.xml | 79 +- .../ExtendedPolicyValidatorCallbackHandler.java|1 - .../main/java/org/apache/rampart/NonceCache.java |6 +- .../rampart/PolicyBasedResultsValidator.java | 69 +- .../java/org/apache/rampart/RampartEngine.java | 299 +++--- .../org/apache/rampart/RampartMessageData.java | 109 +-- .../rampart/builder/AsymmetricBindingBuilder.java | 14 +- .../org/apache/rampart/builder/BindingBuilder.java | 138 ++- .../rampart/builder/TransportBindingBuilder.java | 80 ++ .../handler/PostDispatchVerificationHandler.java |9 +- .../handler/RampartUsernameT
[axis-axis2-java-rampart] 03/09: Merge changes up to r1052171 from trunk.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch RAMPART-252
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit f20bf073a374763840ebaf2b09de79ef8b5f0758
Merge: 0455173 3ca0909
Author: Andreas Veithen
AuthorDate: Sun Jan 29 15:02:12 2017 +
Merge changes up to r1052171 from trunk.
modules/distribution/bin.xml | 17 +-
.../documentation/src/site/resources/css/site.css | 535 ++---
.../resources/images/apache-rampart-banner.jpg | Bin 14840 -> 27612 bytes
.../site/resources/images/apache-rampart-logo.jpg | Bin 4906 -> 10154 bytes
.../src/site/resources/images/axis.jpg | Bin 0 -> 13887 bytes
.../src/site/resources/images/axis.png | Bin 0 -> 13745 bytes
.../src/site/resources/images/breadcrumbs-bg.gif | Bin 0 -> 198 bytes
.../src/site/resources/images/h2-bg.gif| Bin 0 -> 202 bytes
.../src/site/resources/images/home-top.gif | Bin 0 -> 804 bytes
.../src/site/resources/images/leftcolumn-bg.gif| Bin 0 -> 523 bytes
.../src/site/resources/images/menu-back.gif| Bin 0 -> 827 bytes
.../src/site/resources/rampart-config.xsd | 27 +-
modules/documentation/src/site/site.xml| 61 ++-
modules/documentation/src/site/xdoc/download.xml | 124 +++--
.../src/site/xdoc/download/1.1/download.xml| 64 +--
.../src/site/xdoc/download/1.2/download.xml| 64 +--
.../src/site/xdoc/download/1.3/download.xml| 64 +--
.../src/site/xdoc/download/1.4/download.cgi| 6 +
.../src/site/xdoc/download/1.4/download.xml| 82
.../src/site/xdoc/download/1.5.1/download.cgi | 6 +
.../site/xdoc/download/{1.2 => 1.5.1}/download.xml | 235 +
.../src/site/xdoc/download/1.5/download.cgi| 6 +
.../src/site/xdoc/download/1.5/download.xml| 82
.../src/site/xdoc/rampartconfig-guide.xml | 68 ++-
modules/documentation/src/site/xdoc/svn.xml| 8 +-
.../main/java/org/apache/rampart/NonceCache.java | 25 +-
.../rampart/PolicyBasedResultsValidator.java | 2 +-
.../src/main/java/org/apache/rampart/Rampart.java | 19 +-
.../java/org/apache/rampart/RampartEngine.java | 77 ++-
.../org/apache/rampart/RampartMessageData.java | 13 +-
.../rampart/builder/AsymmetricBindingBuilder.java | 10 +-
.../org/apache/rampart/builder/BindingBuilder.java | 30 +-
.../rampart/builder/TransportBindingBuilder.java | 2 +-
.../main/java/org/apache/rampart/errors.properties | 1 +
.../apache/rampart/handler/RampartReceiver.java| 20 +-
.../org/apache/rampart/handler/WSDoAllSender.java | 2 +-
.../rampart/policy/RampartPolicyBuilder.java | 2 +
.../apache/rampart/policy/RampartPolicyData.java | 10 +
.../policy/builders/RampartConfigBuilder.java | 13 +
.../rampart/policy/model/OptimizePartsConfig.java | 1 +
.../java/org/apache/rampart/util/Axis2Util.java| 8 +-
.../rampart/util/HandlerParameterDecoder.java | 2 +-
.../java/org/apache/rampart/util/RampartUtil.java | 82 +++-
modules/rampart-integration/pom.xml| 50 +-
.../test/java/org/apache/rampart/RampartTest.java | 2 +-
.../src/test/resources/rampart/policy/30.xml | 77 +++
.../src/test/resources/rampart/services-30.xml | 90
.../secpolicy/model/AbstractSecurityAssertion.java | 4 +-
.../secpolicy/model/SignedEncryptedElements.java | 6 +-
.../ws/secpolicy/model/SignedEncryptedParts.java | 10 +
.../ws/secpolicy/model/TransportBinding.java | 18 +
.../builders/EncryptedElementsBuilder.java | 4 +-
.../builders/EncryptedPartsBuilder.java| 4 +-
.../builders/SignedElementsBuilder.java| 4 +-
.../secpolicy11/builders/SignedPartsBuilder.java | 12 +-
.../builders/SupportingTokensBuilder.java | 4 +-
.../secpolicy11/builders/UsernameTokenBuilder.java | 4 +-
.../ws/secpolicy11/builders/X509TokenBuilder.java | 4 +-
.../builders/EncryptedElementsBuilder.java | 4 +-
.../builders/EncryptedPartsBuilder.java| 4 +-
.../builders/SignedElementsBuilder.java| 4 +-
.../secpolicy12/builders/SignedPartsBuilder.java | 10 +-
.../builders/SupportingTokensBuilder.java | 4 +-
.../builders/TransportBindingBuilder.java | 3 +
.../secpolicy12/builders/UsernameTokenBuilder.java | 4 +-
.../ws/secpolicy12/builders/X509TokenBuilder.java | 4 +-
modules/rampart-samples/README.txt | 4 +
modules/rampart-samples/keys/client.jks| Bin 4008 -> 4014 bytes
modules/rampart-samples/keys/service.jks | Bin 2675 -> 2683 bytes
modules/rampart-samples/keys/sts.jks | Bin 2677 -> 2683 bytes
modules/rampart-samples/policy/build.xml | 11 +
modules/rampart-samples/policy/sample06/policy.xml | 3 -
.../rampart-samples/po
[axis-axis2-java-rampart] 08/18: Merged r1190533 and r1190600 to the 1.5 branch.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_5_x
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit 1a599e8d1990392af8e40896bdf735701174f661
Author: Andreas Veithen
AuthorDate: Fri Oct 28 22:23:10 2011 +
Merged r1190533 and r1190600 to the 1.5 branch.
---
.../main/java/org/apache/rampart/util/Axis2Util.java | 2 +-
modules/rampart-integration/pom.xml | 19 +++
pom.xml | 4
release-docs/README.txt | 10 +++---
4 files changed, 31 insertions(+), 4 deletions(-)
diff --git
a/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
b/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
index b974cdb..4d719e1 100644
--- a/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
+++ b/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
@@ -131,7 +131,7 @@ public class Axis2Util {
env.getXMLStreamReader(), factory, nsURI);
SOAPEnvelope envelope = (stAXSOAPModelBuilder)
.getSOAPEnvelope();
-((OMNode) envelope.getParent()).build();
+envelope.getParent().build();
//Set the processed flag of the processed headers
SOAPHeader header = envelope.getHeader();
diff --git a/modules/rampart-integration/pom.xml
b/modules/rampart-integration/pom.xml
index dc3eeec..a6e613d 100644
--- a/modules/rampart-integration/pom.xml
+++ b/modules/rampart-integration/pom.xml
@@ -75,6 +75,18 @@
+
+copy-endorsed
+process-resources
+
+copy-dependencies
+
+
+
org.apache.xerces,org.apache.xalan
+
${project.build.directory}/endorsed
+true
+
+
@@ -548,6 +560,13 @@
+
+maven-surefire-plugin
+
+
+
-Xbootclasspath/p:${project.build.directory}/endorsed/xml-apis.jar${path.separator}${project.build.directory}/endorsed/xercesImpl.jar${path.separator}${project.build.directory}/endorsed/resolver.jar${path.separator}${project.build.directory}/endorsed/serializer.jar${path.separator}${project.build.directory}/endorsed/xalan.jar
+
+
diff --git a/pom.xml b/pom.xml
index 295044d..f4afdfa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -147,6 +147,10 @@
axis2-mar-maven-plugin
1.5.4
+
+maven-surefire-plugin
+2.10
+
diff --git a/release-docs/README.txt b/release-docs/README.txt
index b79bbb9..e9f7512 100644
--- a/release-docs/README.txt
+++ b/release-docs/README.txt
@@ -64,14 +64,18 @@ http://www.bouncycastle.org/latest_releases.html
lib/security directory as the last line.
security.provider.X=org.bouncycastle.jce.provider.BouncyCastleProvider
-Test cases written for SAML 2.0 support requires endorsing the JDK's default
JAXP
+On older JDKs, the SAML 2.0 support requires endorsing the JDK's default JAXP
implementation with Xerces(http://xerces.apache.org/mirrors.cgi#binary) and
-Xalan(http://xml.apache.org/xalan-j/downloads.html#latest-release). So before
building Rampart from the
-source distribution, you need to copy resolver-x.x.x.jar,
serializer-x.x.x.jar, xercesImpl-x.x.x.jar
+Xalan(http://xml.apache.org/xalan-j/downloads.html#latest-release). To do that,
+you need to copy resolver-x.x.x.jar, serializer-x.x.x.jar,
xercesImpl-x.x.x.jar
and xml-apis-x.x.x.jar from the Xerces binary distribution and xalan-x.x.x.jar
from the xalan binary
distribution to the endorsed directory. If you are using Sun JDK, endorsed
directory is located at
$JAVA_HOME/jre/lib/endorsed.
+Note that during the build these JARs are added automatically to the boot
classpath
+of the JVM running the unit tests. Therefore this is only necessary at
runtime, not
+when building Rampart.
+
When Rampart is deployed in a particular application server, please refer to
the endorsing mechanism
recommended for that server and endorse the JAXP implementation using the set
of jars mentioned above.
[axis-axis2-java-rampart] 07/18: Merged r1186491 to the 1.5 branch.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_5_x
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit da94a7de268bb9cda46315ce55db7f0c614a6d42
Author: Andreas Veithen
AuthorDate: Wed Oct 19 21:14:49 2011 +
Merged r1186491 to the 1.5 branch.
---
modules/distribution/bin.xml | 1 +
modules/distribution/pom.xml | 21 +
modules/distribution/src.xml | 9 +
release-docs/README.txt | 6 +++---
4 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/modules/distribution/bin.xml b/modules/distribution/bin.xml
index 2a075a7..bc32fdf 100644
--- a/modules/distribution/bin.xml
+++ b/modules/distribution/bin.xml
@@ -59,6 +59,7 @@
../../release-docs/README.txt
${dist.dir}
README
+true
../../release-docs/LICENSE.txt
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 0da00fd..3f5b5bc 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -69,6 +69,27 @@
+org.codehaus.gmaven
+gmaven-plugin
+1.2
+
+
+generate-timestamp
+prepare-package
+
+execute
+
+
+
+import java.util.Date
+import java.text.MessageFormat
+project.properties['buildTimestamp'] =
MessageFormat.format("{0,date,MMM dd, }", new Date())
+
+
+
+
+
+
org.apache.maven.plugins
maven-assembly-plugin
diff --git a/modules/distribution/src.xml b/modules/distribution/src.xml
index b4802d7..9c3575c 100644
--- a/modules/distribution/src.xml
+++ b/modules/distribution/src.xml
@@ -28,7 +28,16 @@
**/.settings
**/.settings/**/*
**/.svn/**
+release-docs/README.txt
+
+../..
+rampart-src-${project.version}
+true
+
+release-docs/README.txt
+
+
diff --git a/release-docs/README.txt b/release-docs/README.txt
index 27acc24..b79bbb9 100644
--- a/release-docs/README.txt
+++ b/release-docs/README.txt
@@ -1,5 +1,5 @@
==
-Apache Rampart-1.5.1 build (Jan 04, 2011)
+Apache Rampart-${project.version} build (${buildTimestamp})
http://axis.apache.org/axis2/java/rampart
--
@@ -13,8 +13,8 @@ lib - This directory contains all the libraries required
by rampart
release.
-rampart-1.5.1.mar - WS-Security and WS-SecureConversation support for Axis2
-rahas-1.5.1.mar - STS module - to be used to add STS operations to a
service
+rampart-${project.version}.mar - WS-Security and WS-SecureConversation
support for Axis2
+rahas-${project.version}.mar - STS module - to be used to add STS
operations to a service
samples - This contains samples on using Apache Rampart and configuring
different components to carryout different WS-Sec* operations.
[axis-axis2-java-rampart] 06/18: * RAMPART-324: Merged r1178193 to the 1.5 branch. * Also merged r1075676 (addition of a test case) to avoid a merge conflict.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_5_x
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit 51ed229fbfee75971e9af6c939b3492fa918025a
Author: Andreas Veithen
AuthorDate: Wed Oct 19 19:13:50 2011 +
* RAMPART-324: Merged r1178193 to the 1.5 branch.
* Also merged r1075676 (addition of a test case) to avoid a merge conflict.
---
modules/rampart-integration/pom.xml| 8 ++
.../test/java/org/apache/rampart/RampartTest.java | 9 +-
.../src/test/resources/rampart/policy/32.xml | 90 +
.../src/test/resources/rampart/policy/33.xml | 103 +++
.../src/test/resources/rampart/services-32.xml | 128 +++
.../src/test/resources/rampart/services-33.xml | 140 +
.../builders/EncryptedElementsBuilder.java | 2 +-
.../builders/RequiredElementsBuilder.java | 2 +-
.../builders/SignedElementsBuilder.java| 2 +-
.../builders/ContentEncryptedElementsBuilder.java | 2 +-
.../builders/EncryptedElementsBuilder.java | 2 +-
.../builders/RequiredElementsBuilder.java | 2 +-
.../builders/SignedElementsBuilder.java| 2 +-
13 files changed, 479 insertions(+), 13 deletions(-)
diff --git a/modules/rampart-integration/pom.xml
b/modules/rampart-integration/pom.xml
index 68b1e0d..dc3eeec 100644
--- a/modules/rampart-integration/pom.xml
+++ b/modules/rampart-integration/pom.xml
@@ -256,6 +256,14 @@
+
+
+
+
+
+
+
+
diff --git
a/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
b/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
index 34c8f2b..a06b31f 100644
---
a/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
+++
b/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
@@ -16,6 +16,7 @@
package org.apache.rampart;
+import junit.framework.TestCase;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
@@ -23,21 +24,17 @@ import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.axiom.om.util.AXIOMUtil;
import org.apache.axiom.soap.SOAPHeaderBlock;
-import org.apache.axis2.Constants;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.Constants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.context.ServiceContext;
-import org.apache.axis2.context.MessageContext;
import org.apache.axis2.integration.UtilServer;
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyEngine;
-import org.apache.ws.security.handler.WSHandlerConstants;
-
-import junit.framework.TestCase;
public class RampartTest extends TestCase {
@@ -79,7 +76,7 @@ public class RampartTest extends TestCase {
"Unlimited Strength Jurisdiction Policy !!!");
}
-for (int i = 1; i <= 31; i++) { //<-The number of tests we have
+for (int i = 1; i <= 33; i++) { //<-The number of tests we have
if(!basic256Supported && (i == 3 || i == 4 || i == 5)) {
//Skip the Basic256 tests
continue;
diff --git
a/modules/rampart-integration/src/test/resources/rampart/policy/32.xml
b/modules/rampart-integration/src/test/resources/rampart/policy/32.xml
new file mode 100644
index 000..66e613a
--- /dev/null
+++ b/modules/rampart-integration/src/test/resources/rampart/policy/32.xml
@@ -0,0 +1,90 @@
+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";>
+
+
+http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702";>
+
+
+
+http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient";>
+
+
+
+
+
+
+
+
+http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never";>
+
[axis-axis2-java-rampart] 02/18: Partial merge of r1131278 to the 1.5 branch to avoid a minor issue when building the documentation module.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch 1_5_x in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git commit 1142211d68e236cc79a2dbf912d3844f890b7c74 Author: Andreas Veithen AuthorDate: Sun Sep 25 09:54:45 2011 + Partial merge of r1131278 to the 1.5 branch to avoid a minor issue when building the documentation module. --- modules/documentation/src/site/xdoc/download/1.5.1/download.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/documentation/src/site/xdoc/download/1.5.1/download.xml b/modules/documentation/src/site/xdoc/download/1.5.1/download.xml index e33362c..725810e 100644 --- a/modules/documentation/src/site/xdoc/download/1.5.1/download.xml +++ b/modules/documentation/src/site/xdoc/download/1.5.1/download.xml @@ -96,7 +96,7 @@ Other mirrors: [if-any backup] [for backup][backup] (backup)[end] [end] -You may also consult the http://www.apache.org/mirrors/";>complete list of mirrors +You may also consult the http://www.apache.org/mirrors/";>complete list of mirrors . Note: when downloading from a mirror please check the
[axis-axis2-java-rampart] 09/14: Merge latest changes from trunk.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch RAMPART-426 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git commit 338ac2be10e0b670efa2fe1ac341f17e5d8f0510 Merge: bccd0db 5b46f7c Author: Andreas Veithen AuthorDate: Sun Jan 29 01:16:46 2017 + Merge latest changes from trunk. .../java/org/apache/rampart/RampartEngine.java | 127 +++-- 1 file changed, 64 insertions(+), 63 deletions(-)
[axis-axis2-java-rampart] 07/14: Remove extra null check from patch.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch RAMPART-426
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit 1632238ae5ca7cd9b751d5ad02103626e44394d7
Author: Andreas Veithen
AuthorDate: Sat Jan 28 23:52:27 2017 +
Remove extra null check from patch.
---
.../java/org/apache/rampart/RampartEngine.java | 170 ++---
1 file changed, 84 insertions(+), 86 deletions(-)
diff --git
a/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
b/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
index e43f2b6..f4c17fa 100644
--- a/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
+++ b/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
@@ -293,92 +293,90 @@ public class RampartEngine {
//Store username in MessageContext property
- if(null != results){
- for (int j = 0; j < results.size(); j++) {
- WSSecurityEngineResult wser = (WSSecurityEngineResult)
results.get(j);
- final Integer actInt =
- (Integer)
wser.get(WSSecurityEngineResult.TAG_ACTION);
- if (WSConstants.ST_UNSIGNED == actInt.intValue()) {
-
- Object samlAssertion =
wser.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
-
- SAMLAssertionHandler samlAssertionHandler
- =
SAMLAssertionHandlerFactory.createAssertionHandler(samlAssertion);
-
- if (samlAssertionHandler.isBearerAssertion()) {
- break;
- }
- //Store the token
- try {
- TokenStorage store = rmd.getTokenStorage();
- if
(store.getToken(samlAssertionHandler.getAssertionId()) == null) {
- Token token = new
Token(samlAssertionHandler.getAssertionId(),
-
samlAssertionHandler.getAssertionElement(),
- samlAssertionHandler.getDateNotBefore(),
-
samlAssertionHandler.getDateNotOnOrAfter());
-
- token.setSecret(samlAssertionHandler.
-
getAssertionKeyInfoSecret(signatureCrypto, tokenCallbackHandler));
- store.add(token);
- }
- } catch (Exception e) {
- throw new RampartException(
- "errorInAddingTokenIntoStore", e);
- }
- } else if (WSConstants.UT == actInt) {
-
- 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 (WSConstant
[axis-axis2-java-rampart] 08/14: Some cleanup.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch RAMPART-426
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit bccd0db570adb62fe8dc82099faa034abea50e98
Author: Andreas Veithen
AuthorDate: Sun Jan 29 01:03:30 2017 +
Some cleanup.
---
.../java/org/apache/rampart/RampartEngine.java | 3 +-
.../org/apache/rampart/RampartMessageData.java | 27 +++
.../policy/builders/RampartConfigBuilder.java | 8 +-
.../apache/rampart/policy/model/RampartConfig.java | 88 +++---
modules/rampart-integration/pom.xml| 2 +-
.../rampart/AsymmetricBindingBuilderTest.java | 8 +-
.../java/org/apache/rampart/RampartEngineTest.java | 16 ++--
7 files changed, 74 insertions(+), 78 deletions(-)
diff --git
a/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
b/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
index f4c17fa..131a7df 100644
--- a/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
+++ b/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
@@ -292,7 +292,7 @@ public class RampartEngine {
//get the sec context id from the req msg ctx
//Store username in MessageContext property
-
+
for (int j = 0; j < results.size(); j++) {
WSSecurityEngineResult wser = (WSSecurityEngineResult)
results.get(j);
final Integer actInt =
@@ -378,7 +378,6 @@ public class RampartEngine {
}
-
SOAPEnvelope env =
Axis2Util.getSOAPEnvelopeFromDOMDocument(rmd.getDocument(), true);
if(dotDebug){
diff --git
a/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
b/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
index af4be4d..b061ff6 100644
---
a/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
+++
b/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
@@ -16,10 +16,6 @@
package org.apache.rampart;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
import org.apache.axiom.om.OMElement;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axis2.AxisFault;
@@ -64,6 +60,10 @@ import org.apache.ws.security.util.Loader;
import org.apache.ws.security.util.WSSecurityUtil;
import org.w3c.dom.Document;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
public class RampartMessageData {
/**
@@ -374,17 +374,14 @@ public class RampartMessageData {
// set 'actor' of the WSSecHeader with the value from the rampart
config
if (this.sender && this.policyData != null) {
-
- this.secHeader = new WSSecHeader();
-
- RampartConfig rampartConfig =
this.policyData.getRampartConfig();
- if(null != rampartConfig){
- String actor = rampartConfig.getOutboundActor();
- if(null != actor){
- this.secHeader = new WSSecHeader(actor,true);
- }
- }
-
+this.secHeader = new WSSecHeader();
+RampartConfig rampartConfig =
this.policyData.getRampartConfig();
+if(null != rampartConfig){
+String actor = rampartConfig.getOutboundActor();
+if(null != actor){
+this.secHeader = new WSSecHeader(actor,true);
+}
+}
secHeader.insertSecurityHeader(this.document);
}
diff --git
a/modules/rampart-core/src/main/java/org/apache/rampart/policy/builders/RampartConfigBuilder.java
b/modules/rampart-core/src/main/java/org/apache/rampart/policy/builders/RampartConfigBuilder.java
index 0a74551..a308972 100644
---
a/modules/rampart-core/src/main/java/org/apache/rampart/policy/builders/RampartConfigBuilder.java
+++
b/modules/rampart-core/src/main/java/org/apache/rampart/policy/builders/RampartConfigBuilder.java
@@ -49,15 +49,15 @@ public class RampartConfigBuilder implements
AssertionBuilder {
}
childElement = element.getFirstChildWithName(new
QName(RampartConfig.NS,
- RampartConfig.INBOUND_ACTOR_LN));
+RampartConfig.INBOUND_ACTOR_LN));
if (childElement != null) {
- rampartConfig.setInboundActor(childElement.getText().trim());
+rampartConfig.setInboundActor(childElement.getText().trim());
}
childElement = element.getFirstChildWithName(new
QName(RampartConfig.NS,
- RampartConfig.OUTBOUND_ACTOR_LN));
+RampartConfig.O
[axis-axis2-java-rampart] 01/02: Create development branch for RAMPART-287.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch RAMPART-287 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git commit c25bef8ec66c3787caf4bd54b9af5bf7d1759612 Author: Andreas Veithen AuthorDate: Sun Jan 29 17:05:23 2017 + Create development branch for RAMPART-287.
[axis-axis2-java-rampart] 09/18: Merged r1194848 to the 1.5 branch.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_5_x
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit 87298a8216c0a9c9df73fedbc97bfaa5a5fb4160
Author: Andreas Veithen
AuthorDate: Sat Oct 29 09:46:26 2011 +
Merged r1194848 to the 1.5 branch.
---
modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java | 7 +++
1 file changed, 7 insertions(+)
diff --git a/modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java
b/modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java
index 72f2316..80b410e 100644
--- a/modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java
+++ b/modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java
@@ -26,11 +26,18 @@ import org.apache.neethi.Policy;
import org.apache.rampart.policy.model.RampartConfig;
import org.apache.ws.secpolicy.SP11Constants;
import org.apache.ws.secpolicy.SP12Constants;
+import org.opensaml.DefaultBootstrap;
+import org.opensaml.xml.ConfigurationException;
public class Rampart implements Module /* , ModulePolicyExtension */ {
public void init(ConfigurationContext configContext, AxisModule module)
throws AxisFault {
+try {
+DefaultBootstrap.bootstrap();
+} catch (ConfigurationException ex) {
+throw new AxisFault("Failed to bootstrap OpenSAML", ex);
+}
}
public void engageNotify(AxisDescription axisDescription) throws AxisFault
{
[axis-axis2-java-rampart] branch 1_5_x created (now 91567ea)
This is an automated email from the ASF dual-hosted git repository. billblough pushed a change to branch 1_5_x in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git. at 91567ea Switched the Rampart 1.5 branch to Axiom 1.2.13. This branch includes the following new commits: new 3fb814d [maven-release-plugin] prepare for next development iteration new 1142211 Partial merge of r1131278 to the 1.5 branch to avoid a minor issue when building the documentation module. new c3c59c8 Committing the patch provided by AmilaJ for RAMPART-336. new eacfeb5 RAMPART-336: Merged r1177413 to the 1.5 branch and updated the dependencies. new 2b0e5e8 RAMPART-278: Merged r1052172 and r1052173 to the 1.5 branch. new 51ed229 * RAMPART-324: Merged r1178193 to the 1.5 branch. * Also merged r1075676 (addition of a test case) to avoid a merge conflict. new da94a7d Merged r1186491 to the 1.5 branch. new 1a599e8 Merged r1190533 and r1190600 to the 1.5 branch. new 87298a8 Merged r1194848 to the 1.5 branch. new 42e65c4 Merged r1194994 to the 1.5 branch. new a06889c RAMPART-338: Merged r1221926 to the 1.5 branch. new 703a018 Merged r1221940 (with changes) to the 1.5 branch to get log4j working in the samples. new 51acc3c Merged r1221937 to the 1.5 branch to make OpenSAML work in the samples. new cb786b0 Merged r1090540 and r1235059 to the 1.5 branch. new 9223665 Merged r1299342, r1299389 and r1299390 to the 1.5 branch. new 14e0182 Merged r1303198 to the 1.5 branch for debugging purposes. new bf35d2b Compensate for change r1299894 in Axiom. new 91567ea Switched the Rampart 1.5 branch to Axiom 1.2.13. The 18 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[axis-axis2-java-rampart] 06/14: Merge latest changes from trunk.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch RAMPART-426 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git commit e84f18b4b9f17dc746bb895776cf1919becd463e Merge: ecaa028 c145a4c Author: Andreas Veithen AuthorDate: Sat Jan 28 23:39:27 2017 + Merge latest changes from trunk. modules/rampart-core/pom.xml | 5 + .../java/org/apache/rampart/RampartEngine.java | 96 +- .../org/apache/rampart/builder/BindingBuilder.java | 98 +- .../rampart/builder/TransportBindingBuilder.java | 80 + .../policy/builders/KerberosConfigBuilder.java | 100 ++ .../policy/builders/RampartConfigBuilder.java | 11 + .../rampart/policy/model/KerberosConfig.java | 361 + .../apache/rampart/policy/model/RampartConfig.java | 18 + .../java/org/apache/rampart/util/RampartUtil.java | 61 .../org.apache.neethi.builders.AssertionBuilder| 3 +- .../resources/org/apache/rampart/errors.properties | 8 + .../policy/builders/KerberosConfigBuilderTest.java | 121 +++ .../rampart/policy/builders/kerberosConfig.policy | 22 ++ modules/rampart-integration/pom.xml| 90 - .../apache/rampart/KerberosDelegationService.java | 78 + .../KerberosDelegationServiceValidator.java| 46 +++ .../org/apache/rampart/RampartKerberosTest.java| 296 + .../org/apache/rampart/util/KerberosServer.java| 207 .../rampart/util/KerberosTokenDecoderImpl.java | 156 + .../src/test/resources/kerberos/alice.keytab | Bin 0 -> 666 bytes .../src/test/resources/kerberos/bob.keytab | Bin 0 -> 328 bytes .../src/test/resources/kerberos/jaas.conf | 49 +++ .../src/test/resources/kerberos/krb5.conf.template | 8 + .../src/test/resources/kerberos/readme | 9 + .../src/test/resources/kerberos/users.ldif | 60 .../rampart/kerberos/KerberosDelegation.xml| 86 + .../kerberos/KerberosOverTransportKeytab.xml | 85 + .../rampart/kerberos/KerberosOverTransportPWCB.xml | 88 + modules/rampart-policy/pom.xml | 10 + .../java/org/apache/ws/secpolicy/Constants.java| 4 + .../org/apache/ws/secpolicy/SP11Constants.java | 9 + .../org/apache/ws/secpolicy/SP12Constants.java | 9 + .../java/org/apache/ws/secpolicy/SPConstants.java | 5 +- .../apache/ws/secpolicy/model/KerberosToken.java | 152 + .../secpolicy11/builders/KerberosTokenBuilder.java | 84 + .../secpolicy12/builders/KerberosTokenBuilder.java | 84 + .../org.apache.neethi.builders.AssertionBuilder| 4 +- .../apache/ws/secpolicy/KerberosPolicyTest.java| 212 .../src/test/resources/policy/kerberos-11.xml | 16 + .../src/test/resources/policy/kerberos-12.xml | 16 + .../src/test/resources/policy/kerberos-gss-11.xml | 16 + .../src/test/resources/policy/kerberos-gss-12.xml | 16 + .../resources/policy/kerberos-gss-keyref-11.xml| 18 + .../resources/policy/kerberos-gss-keyref-12.xml| 17 + .../test/resources/policy/kerberos-keyref-11.xml | 17 + .../test/resources/policy/kerberos-keyref-12.xml | 17 + pom.xml| 9 + 47 files changed, 2946 insertions(+), 11 deletions(-) diff --cc modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java index f9dbbe7,66b5648..e43f2b6 --- a/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java +++ b/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java @@@ -27,28 -27,28 +27,39 @@@ import org.apache.commons.logging.LogFa import org.apache.rahas.Token; import org.apache.rahas.TokenStorage; import org.apache.rampart.policy.RampartPolicyData; ++import org.apache.rampart.policy.model.KerberosConfig; +import org.apache.rampart.policy.model.RampartConfig; import org.apache.rampart.saml.SAMLAssertionHandler; import org.apache.rampart.saml.SAMLAssertionHandlerFactory; import org.apache.rampart.util.Axis2Util; import org.apache.rampart.util.RampartUtil; -import org.apache.rampart.policy.model.KerberosConfig; -import org.apache.rampart.policy.model.RampartConfig; import org.apache.ws.secpolicy.WSSPolicyException; -import org.apache.ws.secpolicy.model.UsernameToken; + import org.apache.ws.secpolicy.model.KerberosToken; + import org.apache.ws.secpolicy.model.SupportingToken; -import org.apache.ws.security.*; +import org.apache.ws.secpolicy.model.UsernameToken; ++import org.apache.ws.security.NamePasswordCallbackHandler; +import org.apache.ws.security.WSConstants; ++import org.apache.ws.security.WSPasswordCallback; ++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.
[axis-axis2-java-rampart] 04/14: Merge latest changes from trunk.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch RAMPART-426 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git commit b55bc5683c925beb3a8c9642c638c78da3462cea Merge: 98737e4 9d3edc5 Author: Andreas Veithen AuthorDate: Sat Jan 28 18:26:39 2017 + Merge latest changes from trunk. modules/rampart-integration/pom.xml| 15 -- .../org/apache/axis2/integration/JettyServer.java | 297 - .../src/main/java/org/apache/rahas/TestClient.java | 42 +-- .../test/java/org/apache/rampart/RampartTest.java | 72 +++-- pom.xml| 2 - 5 files changed, 37 insertions(+), 391 deletions(-)
[axis-axis2-java-rampart] 13/14: Replace tabs with spaces.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch RAMPART-426 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git commit 86c6db76f4b2e44162ad6757401b9cb6b4913336 Author: Andreas Veithen AuthorDate: Sun Jan 29 18:32:21 2017 + Replace tabs with spaces. --- .../src/test/resources/rampart/services-36.xml| 6 +++--- .../src/test/resources/rampart/services-37.xml| 6 +++--- .../src/test/resources/rampart/services-38.xml| 8 .../src/test/resources/rampart/services-39.xml| 6 +++--- .../src/test/resources/rampart/services-40.xml| 6 +++--- .../src/test/resources/rampart/services-41.xml| 6 +++--- .../src/test/resources/rampart/services-42.xml| 6 +++--- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/rampart-integration/src/test/resources/rampart/services-36.xml b/modules/rampart-integration/src/test/resources/rampart/services-36.xml index 2e810e9..df20f39 100644 --- a/modules/rampart-integration/src/test/resources/rampart/services-36.xml +++ b/modules/rampart-integration/src/test/resources/rampart/services-36.xml @@ -1,9 +1,9 @@ - - + + - org.apache.rampart.Service +org.apache.rampart.Service diff --git a/modules/rampart-integration/src/test/resources/rampart/services-37.xml b/modules/rampart-integration/src/test/resources/rampart/services-37.xml index 042758c..3da8aae 100644 --- a/modules/rampart-integration/src/test/resources/rampart/services-37.xml +++ b/modules/rampart-integration/src/test/resources/rampart/services-37.xml @@ -1,9 +1,9 @@ - - + + - org.apache.rampart.Service +org.apache.rampart.Service diff --git a/modules/rampart-integration/src/test/resources/rampart/services-38.xml b/modules/rampart-integration/src/test/resources/rampart/services-38.xml index 5262628..dce607d 100644 --- a/modules/rampart-integration/src/test/resources/rampart/services-38.xml +++ b/modules/rampart-integration/src/test/resources/rampart/services-38.xml @@ -1,9 +1,9 @@ - - + + - org.apache.rampart.Service +org.apache.rampart.Service @@ -70,7 +70,7 @@ bob org.apache.rampart.PWCallback outboundActor - inboundActor +inboundActor diff --git a/modules/rampart-integration/src/test/resources/rampart/services-39.xml b/modules/rampart-integration/src/test/resources/rampart/services-39.xml index 16eb59a..11eee7e 100644 --- a/modules/rampart-integration/src/test/resources/rampart/services-39.xml +++ b/modules/rampart-integration/src/test/resources/rampart/services-39.xml @@ -1,9 +1,9 @@ - - + + - org.apache.rampart.Service +org.apache.rampart.Service diff --git a/modules/rampart-integration/src/test/resources/rampart/services-40.xml b/modules/rampart-integration/src/test/resources/rampart/services-40.xml index 039d902..4a1b2de 100644 --- a/modules/rampart-integration/src/test/resources/rampart/services-40.xml +++ b/modules/rampart-integration/src/test/resources/rampart/services-40.xml @@ -1,9 +1,9 @@ - - + + - org.apache.rampart.Service +org.apache.rampart.Service diff --git a/modules/rampart-integration/src/test/resources/rampart/services-41.xml b/modules/rampart-integration/src/test/resources/rampart/services-41.xml index f1540db..fe76dbb 100644 --- a/modules/rampart-integration/src/test/resources/rampart/services-41.xml +++ b/modules/rampart-integration/src/test/resources/rampart/services-41.xml @@ -1,9 +1,9 @@ - - + + - org.apache.rampart.Service +org.apache.rampart.Service diff --git a/modules/rampart-integration/src/test/resources/rampart/services-42.xml b/modules/rampart-integration/src/test/resources/rampart/services-42.xml index 31d98ae..84dd441 100644 --- a/modules/rampart-integration/src/test/resources/rampart/services-42.xml +++ b/modules/rampart-integration/src/test/resources/rampart/services-42.xml @@ -1,9 +1,9 @@ - - + + - org.apache.rampart.Service +org.apache.rampart.Service
[axis-axis2-java-rampart] 13/18: Merged r1221937 to the 1.5 branch to make OpenSAML work in the samples.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_5_x
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit 51acc3c001fc3c8f07efce978fc623b6e9fb8267
Author: Andreas Veithen
AuthorDate: Thu Dec 22 11:18:42 2011 +
Merged r1221937 to the 1.5 branch to make OpenSAML work in the samples.
---
legal/{slf4j-jdk14-LICENSE.txt => slf4j-jcl-LICENSE.txt} | 0
modules/distribution/bin.xml | 2 +-
modules/distribution/pom.xml | 4
pom.xml | 5 +
4 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/legal/slf4j-jdk14-LICENSE.txt b/legal/slf4j-jcl-LICENSE.txt
similarity index 100%
rename from legal/slf4j-jdk14-LICENSE.txt
rename to legal/slf4j-jcl-LICENSE.txt
diff --git a/modules/distribution/bin.xml b/modules/distribution/bin.xml
index bc32fdf..729b121 100644
--- a/modules/distribution/bin.xml
+++ b/modules/distribution/bin.xml
@@ -27,7 +27,7 @@
org.opensaml:xmltooling:jar
joda-time:joda-time:jar
org.slf4j:slf4j-api:jar
-org.slf4j:slf4j-jdk14:jar
+org.slf4j:slf4j-jcl:jar
velocity:velocity:jar
commons-collections:commons-collections:jar
org.opensaml:openws:jar
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 3f5b5bc..fa61489 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -144,6 +144,10 @@
bcprov-jdk15
${bcprov.jdk15.version}
+
+org.slf4j
+slf4j-jcl
+
diff --git a/pom.xml b/pom.xml
index f4afdfa..2773bb8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -295,6 +295,11 @@
1.5.5
+org.slf4j
+slf4j-jcl
+1.5.5
+
+
log4j
log4j
1.2.15
[axis-axis2-java-rampart] 11/18: RAMPART-338: Merged r1221926 to the 1.5 branch.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch 1_5_x in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git commit a06889cb25114b31fbc7d69427d04e362a88f421 Author: Andreas Veithen AuthorDate: Thu Dec 22 10:16:50 2011 + RAMPART-338: Merged r1221926 to the 1.5 branch. --- modules/rampart-samples/basic/build.xml | 19 --- modules/rampart-samples/policy/build.xml | 32 2 files changed, 32 insertions(+), 19 deletions(-) diff --git a/modules/rampart-samples/basic/build.xml b/modules/rampart-samples/basic/build.xml index 830b5e0..7f3b690 100644 --- a/modules/rampart-samples/basic/build.xml +++ b/modules/rampart-samples/basic/build.xml @@ -23,9 +23,6 @@ - - - @@ -165,8 +162,12 @@ - - + + + + + + @@ -221,8 +222,12 @@ - - + + + + + + diff --git a/modules/rampart-samples/policy/build.xml b/modules/rampart-samples/policy/build.xml index cab2149..b913e69 100644 --- a/modules/rampart-samples/policy/build.xml +++ b/modules/rampart-samples/policy/build.xml @@ -24,10 +24,6 @@ - - - - @@ -137,9 +133,13 @@ - - - + + + + + + + @@ -192,9 +192,13 @@ - - - + + + + + + + @@ -248,8 +252,12 @@ - - + + + + + +
[axis-axis2-java-rampart] 02/02: RAMPART-287: Apply patch provided by Suresh Attanayake.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch RAMPART-287
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit 7eb53caa19a037d52a9f032d4c9823b9cfbc64e8
Merge: c25bef8 df5ff7f
Author: Andreas Veithen
AuthorDate: Sun Jan 29 18:16:17 2017 +
RAMPART-287: Apply patch provided by Suresh Attanayake.
.../rampart/builder/AsymmetricBindingBuilder.java | 74 +++---
.../org/apache/rampart/builder/BindingBuilder.java | 4 +-
2 files changed, 39 insertions(+), 39 deletions(-)
diff --cc
modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
index 0572cd6,0572cd6..2708a99
---
a/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
+++
b/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
@@@ -284,8 -284,8 +284,8 @@@ public class AsymmetricBindingBuilder e
+", Signature tool :" + (t2 - t1) );
}
--// Check for signature protection
--if (rpd.isSignatureProtection() && this.mainSigId != null) {
++// Check for signature protection and encrypted supporting tokens
++if (rpd.isSignatureProtection() && this.mainSigId != null ||
!encryptedTokensIdList.isEmpty()) {
long t3 = 0, t4 = 0;
if(tlog.isDebugEnabled()){
t3 = System.currentTimeMillis();
@@@ -293,9 -293,9 +293,10 @@@
List secondEncrParts = new
ArrayList();
--// Now encrypt the signature using the above token
--secondEncrParts.add(new WSEncryptionPart(this.mainSigId,
--"Element"));
++ if (rpd.isSignatureProtection() &&
this.mainSigId != null) {
++ // Now encrypt the signature using the
above token
++ secondEncrParts.add(new
WSEncryptionPart(this.mainSigId, "Element"));
++ }
if(rmd.isInitiator()) {
for (String anEncryptedTokensIdList :
encryptedTokensIdList) {
@@@ -303,38 -303,38 +304,37 @@@
}
}
--Element secondRefList = null;
--
--if (encryptionToken.isDerivedKeys()) {
--try {
--
--secondRefList = dkEncr.encryptForExternalRef(null,
--secondEncrParts);
--RampartUtil.insertSiblingAfter(rmd, encrDKTokenElem,
--secondRefList);
--
--} catch (WSSecurityException e) {
--throw new
RampartException("errorCreatingEncryptedKey",
--e);
--}
--} else {
--try {
--// Encrypt, get hold of the ref list and add it
--secondRefList = encr.encryptForExternalRef(null,
--secondEncrParts);
--
--// Insert the ref list after the encrypted key elem
--this.setInsertionLocation(RampartUtil
--.insertSiblingAfter(rmd, encrTokenElement,
--secondRefList));
--} catch (WSSecurityException e) {
--throw new RampartException("errorInEncryption", e);
--}
--}
--if(tlog.isDebugEnabled()){
-- t4 = System.currentTimeMillis();
-- tlog.debug("Signature protection took :" + (t4 - t3));
-- }
++ if (!secondEncrParts.isEmpty()) {
++
++ Element secondRefList = null;
++
++ if (encryptionToken.isDerivedKeys()) {
++ try {
++
++ secondRefList =
dkEncr.encryptForExternalRef(null, secondEncrParts);
++
RampartUtil.insertSiblingAfter(rmd, encrDKTokenElem, secondRefList);
++
++ } catch (WSSecurityException e)
{
++ throw new
RampartException("errorCreatingEncryptedKey", e);
++ }
++ } else {
++ try {
++ // Encrypt, get hold of
the ref list and add it
++ secondRefList =
encr.encryptForRef(null, secondEncrParts);
++
[axis-axis2-java-rampart] 03/18: Committing the patch provided by AmilaJ for RAMPART-336.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_5_x
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit c3c59c88d62831488757e58930e8a5666c68b053
Author: Thilina Mahesh Buddhika
AuthorDate: Thu Sep 29 11:12:10 2011 +
Committing the patch provided by AmilaJ for RAMPART-336.
---
.../src/main/java/org/apache/rampart/util/Axis2Util.java | 15 +++
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git
a/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
b/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
index 2de1406..7874475 100644
--- a/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
+++ b/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
@@ -194,6 +194,10 @@ public class Axis2Util {
// it is a header we have added in rampart eg.
EncryptedHeader and should
// be converted to SOAPHeaderBlock for processing
} else {
+// First detach element from soap header
+element.detach();
+
+// add new element
header =
soapHeader.addHeaderBlock(element.getLocalName(), element.getNamespace());
Iterator attrIter = element.getAllAttributes();
while (attrIter.hasNext()) {
@@ -206,14 +210,17 @@ public class Axis2Util {
header.declareNamespace(ns);
}
Iterator children = element.getChildElements();
- while (children.hasNext()) {
+
+// Element is a composite element, in which it has
many siblings.
+// All siblings will be added when we add a single
node.
+// See ParentNode.insertBefore(Node newChild, Node
refChild) for
+// more information.
+ if (children.hasNext()) {
OMNode child = (OMNode)children.next();
children.remove();
header.addChild(child);
}
-
- element.detach();
-
+
soapHeader.build();
header.setProcessed();
[axis-axis2-java-rampart] branch RAMPART-287 created (now 7eb53ca)
This is an automated email from the ASF dual-hosted git repository. billblough pushed a change to branch RAMPART-287 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git. at 7eb53ca RAMPART-287: Apply patch provided by Suresh Attanayake. This branch includes the following new commits: new c25bef8 Create development branch for RAMPART-287. new 7eb53ca RAMPART-287: Apply patch provided by Suresh Attanayake. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[axis-axis2-java-rampart] 14/14: Merge latest changes from trunk.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch RAMPART-426
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit 8d31bd875af9e799ff93b902cccb3c196f622457
Merge: 86c6db7 fc03dfe
Author: Andreas Veithen
AuthorDate: Sun Jan 29 18:40:26 2017 +
Merge latest changes from trunk.
.../src/main/java/org/apache/rampart/RampartEngine.java| 7 +--
.../src/main/java/org/apache/rahas/STSMessageReceiver.java | 10 +++---
2 files changed, 4 insertions(+), 13 deletions(-)
diff --cc
modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
index 0c302ac,a4d612b..1b6fa29
--- a/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
+++ b/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
@@@ -234,21 -234,7 +234,16 @@@ public class RampartEngine
}
}
- String actorValue = secHeader.getRole();
+ // get the configured 'actor' value and if it is NOT set
+ // then fallback to the one in the security header
+ String actorValue = null;
+ if(null != rampartConfig){
+ actorValue = rampartConfig.getInboundActor();
+ }
+
+ if(null == actorValue){
- String actorAttribute = WSConstants.ATTR_ACTOR;
- if
(WSConstants.URI_SOAP12_ENV.equals(rmd.getSoapConstants().getEnvelopeURI())) {
- actorAttribute = WSConstants.ATTR_ROLE;
- }
-
- actorValue = secHeader.getAttributeValue(new
QName(rmd.getSoapConstants().getEnvelopeURI(), actorAttribute));
++ actorValue = secHeader.getRole();
+ }
Crypto signatureCrypto =
RampartUtil.getSignatureCrypto(rpd.getRampartConfig(),
msgCtx.getAxisService().getClassLoader());
[axis-axis2-java-rampart] 05/14: Avoid unnecessary reordering of imports.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch RAMPART-426
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit ecaa0286045620b7ab770d2e9b8255cb78fc3e19
Author: Andreas Veithen
AuthorDate: Sat Jan 28 23:29:44 2017 +
Avoid unnecessary reordering of imports.
---
.../main/java/org/apache/rampart/RampartEngine.java| 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git
a/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
b/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
index 8e73be1..f9dbbe7 100644
--- a/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
+++ b/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
@@ -16,15 +16,6 @@
package org.apache.rampart;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import javax.xml.namespace.QName;
-
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFault;
import org.apache.axiom.soap.SOAPHeader;
@@ -50,6 +41,15 @@ import org.apache.ws.security.WSSecurityException;
import org.apache.ws.security.WSUsernameTokenPrincipal;
import org.apache.ws.security.components.crypto.Crypto;
+import javax.xml.namespace.QName;
+
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Vector;
+
public class RampartEngine {
private static Log log = LogFactory.getLog(RampartEngine.class);
[axis-axis2-java-rampart] 01/18: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch 1_5_x in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git commit 3fb814d71ed148d26fcbcbad4b4f24711b66cc81 Author: Andreas Veithen AuthorDate: Sun Sep 25 09:22:21 2011 + [maven-release-plugin] prepare for next development iteration --- modules/distribution/pom.xml| 2 +- modules/documentation/pom.xml | 2 +- modules/rampart-core/pom.xml| 2 +- modules/rampart-integration/pom.xml | 2 +- modules/rampart-mar/pom.xml | 8 modules/rampart-policy/pom.xml | 2 +- modules/rampart-tests/pom.xml | 2 +- modules/rampart-trust-mar/pom.xml | 8 modules/rampart-trust/pom.xml | 2 +- pom.xml | 8 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 67f907c..0da00fd 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.5.2 +1.5.3-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/documentation/pom.xml b/modules/documentation/pom.xml index ac73a7d..2af12bc 100644 --- a/modules/documentation/pom.xml +++ b/modules/documentation/pom.xml @@ -24,7 +24,7 @@ org.apache.rampart rampart-project -1.5.2 +1.5.3-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/rampart-core/pom.xml b/modules/rampart-core/pom.xml index 3f8e6e8..3f4b99c 100644 --- a/modules/rampart-core/pom.xml +++ b/modules/rampart-core/pom.xml @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.5.2 +1.5.3-SNAPSHOT ../../pom.xml diff --git a/modules/rampart-integration/pom.xml b/modules/rampart-integration/pom.xml index 4ba6883..b465196 100644 --- a/modules/rampart-integration/pom.xml +++ b/modules/rampart-integration/pom.xml @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.5.2 +1.5.3-SNAPSHOT ../../pom.xml diff --git a/modules/rampart-mar/pom.xml b/modules/rampart-mar/pom.xml index e758e44..9cb5579 100644 --- a/modules/rampart-mar/pom.xml +++ b/modules/rampart-mar/pom.xml @@ -24,7 +24,7 @@ org.apache.rampart rampart-project -1.5.2 +1.5.3-SNAPSHOT ../../pom.xml @@ -35,11 +35,11 @@ Rampart - Mar - scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/rampart/tags/v1.5.2 + scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/rampart/branches/1_5_x - scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/rampart/tags/v1.5.2 + scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/rampart/branches/1_5_x - http://svn.apache.org/viewvc/axis/axis2/java/rampart/tags/v1.5.2 + http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x diff --git a/modules/rampart-policy/pom.xml b/modules/rampart-policy/pom.xml index 407bbed..ee766b4 100644 --- a/modules/rampart-policy/pom.xml +++ b/modules/rampart-policy/pom.xml @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.5.2 +1.5.3-SNAPSHOT ../../pom.xml diff --git a/modules/rampart-tests/pom.xml b/modules/rampart-tests/pom.xml index bc49c58..22c3d48 100644 --- a/modules/rampart-tests/pom.xml +++ b/modules/rampart-tests/pom.xml @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.5.2 +1.5.3-SNAPSHOT ../../pom.xml diff --git a/modules/rampart-trust-mar/pom.xml b/modules/rampart-trust-mar/pom.xml index 63b21bd..12a4f94 100644 --- a/modules/rampart-trust-mar/pom.xml +++ b/modules/rampart-trust-mar/pom.xml @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.5.2 +1.5.3-SNAPSHOT ../../pom.xml @@ -36,10 +36,10 @@ Rampart - Trust-Mar - scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/rampart/tags/v1.5.2 + scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/rampart/branches/1_5_x - scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/rampart/tags/v1.5.2 - http://svn.apache.org/viewvc/axis/axis2/java/rampart/tags/v1.5.2 + scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/rampart/branches/1_5_x + http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x diff --git a/modules/rampart-trust/pom.xml b/modules/rampart-trust/pom.xml index 2431ece..c97964b 100644 --- a/modules/rampart-trust/pom.xml +++ b/modules/rampart-trust/pom.xml @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.5.2 +1.5
[axis-axis2-java-rampart] 10/18: Merged r1194994 to the 1.5 branch.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_5_x
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit 42e65c43fff71232fcc7d9bceba5292a14e5f440
Author: Andreas Veithen
AuthorDate: Sun Oct 30 11:45:15 2011 +
Merged r1194994 to the 1.5 branch.
---
.../src/main/java/org/apache/rampart/Rampart.java | 7 ---
modules/rampart-trust-mar/module.xml | 2 +-
.../src/main/java/org/apache/rahas/Rahas.java | 55 ++
3 files changed, 56 insertions(+), 8 deletions(-)
diff --git a/modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java
b/modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java
index 80b410e..72f2316 100644
--- a/modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java
+++ b/modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java
@@ -26,18 +26,11 @@ import org.apache.neethi.Policy;
import org.apache.rampart.policy.model.RampartConfig;
import org.apache.ws.secpolicy.SP11Constants;
import org.apache.ws.secpolicy.SP12Constants;
-import org.opensaml.DefaultBootstrap;
-import org.opensaml.xml.ConfigurationException;
public class Rampart implements Module /* , ModulePolicyExtension */ {
public void init(ConfigurationContext configContext, AxisModule module)
throws AxisFault {
-try {
-DefaultBootstrap.bootstrap();
-} catch (ConfigurationException ex) {
-throw new AxisFault("Failed to bootstrap OpenSAML", ex);
-}
}
public void engageNotify(AxisDescription axisDescription) throws AxisFault
{
diff --git a/modules/rampart-trust-mar/module.xml
b/modules/rampart-trust-mar/module.xml
index c24682f..bfc5119 100644
--- a/modules/rampart-trust-mar/module.xml
+++ b/modules/rampart-trust-mar/module.xml
@@ -1,4 +1,4 @@
-
+
This module is used to STS enable a service where it adds
the RequestSecurityToken operation to a service that the module is
engaged to
diff --git a/modules/rampart-trust/src/main/java/org/apache/rahas/Rahas.java
b/modules/rampart-trust/src/main/java/org/apache/rahas/Rahas.java
new file mode 100644
index 000..6130ffb
--- /dev/null
+++ b/modules/rampart-trust/src/main/java/org/apache/rahas/Rahas.java
@@ -0,0 +1,55 @@
+/*
+ * 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.rahas;
+
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.description.AxisDescription;
+import org.apache.axis2.description.AxisModule;
+import org.apache.axis2.modules.Module;
+import org.apache.neethi.Assertion;
+import org.apache.neethi.Policy;
+import org.opensaml.DefaultBootstrap;
+import org.opensaml.xml.ConfigurationException;
+
+public class Rahas implements Module {
+public void init(ConfigurationContext configContext, AxisModule module)
+throws AxisFault {
+try {
+DefaultBootstrap.bootstrap();
+} catch (ConfigurationException ex) {
+throw new AxisFault("Failed to bootstrap OpenSAML", ex);
+}
+}
+
+public void engageNotify(AxisDescription axisDescription) throws AxisFault
{
+}
+
+public boolean canSupportAssertion(Assertion assertion) {
+return false;
+}
+
+public void applyPolicy(Policy policy, AxisDescription axisDescription)
+throws AxisFault {
+}
+
+public void shutdown(ConfigurationContext configurationContext)
+throws AxisFault {
+}
+}
[axis-axis2-java-rampart] 12/18: Merged r1221940 (with changes) to the 1.5 branch to get log4j working in the samples.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_5_x
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit 703a0181392ebdd46c00217d149c614e3b1f69ef
Author: Andreas Veithen
AuthorDate: Thu Dec 22 10:29:15 2011 +
Merged r1221940 (with changes) to the 1.5 branch to get log4j working in
the samples.
---
modules/rampart-samples/basic/build.xml | 21 +++--
modules/rampart-samples/policy/build.xml | 30 +-
2 files changed, 24 insertions(+), 27 deletions(-)
diff --git a/modules/rampart-samples/basic/build.xml
b/modules/rampart-samples/basic/build.xml
index 7f3b690..6517093 100644
--- a/modules/rampart-samples/basic/build.xml
+++ b/modules/rampart-samples/basic/build.xml
@@ -30,6 +30,15 @@
+
+
+
+
+
+
+
+
+
@@ -155,7 +164,6 @@
-
@@ -196,11 +204,7 @@
-
-
-
-
-
+
@@ -211,7 +215,6 @@
-
@@ -250,9 +253,7 @@
-
-
-
+
diff --git a/modules/rampart-samples/policy/build.xml
b/modules/rampart-samples/policy/build.xml
index b913e69..af91b66 100644
--- a/modules/rampart-samples/policy/build.xml
+++ b/modules/rampart-samples/policy/build.xml
@@ -30,7 +30,16 @@
http://localhost:${client.port}/axis2/services"/>
-
+
+
+
+
+
+
+
+
+
+
@@ -126,7 +135,6 @@
-
@@ -169,11 +177,7 @@
-
-
-
-
-
+
@@ -185,7 +189,6 @@
-
@@ -229,11 +232,7 @@
-
-
-
-
-
+
@@ -244,7 +243,6 @@
-
@@ -281,9 +279,7 @@
-
-
-
+
[axis-axis2-java-rampart] 10/14: Merge latest changes from trunk.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch RAMPART-426 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git commit c3dd4a056fd5c64bad8375ff3891e0fdffeac6a6 Merge: 338ac2b e3fd292 Author: Andreas Veithen AuthorDate: Sun Jan 29 10:13:59 2017 + Merge latest changes from trunk. .../java/org/apache/rampart/MessageBuilderTestBase.java| 14 -- .../test/java/org/apache/rampart/RampartEngineTest.java| 2 +- 2 files changed, 1 insertion(+), 15 deletions(-)
[axis-axis2-java-rampart] branch RAMPART-426 created (now 8d31bd8)
This is an automated email from the ASF dual-hosted git repository. billblough pushed a change to branch RAMPART-426 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git. at 8d31bd8 Merge latest changes from trunk. This branch includes the following new commits: new a7aa3be Create a development branch to work on the patch for RAMPART-426. new 48a0422 Apply the patch provided by Boris Dushanov for RAMPART-426. new 98737e4 Merge latest changes from trunk. new b55bc56 Merge latest changes from trunk. new ecaa028 Avoid unnecessary reordering of imports. new e84f18b Merge latest changes from trunk. new 1632238 Remove extra null check from patch. new bccd0db Some cleanup. new 338ac2b Merge latest changes from trunk. new c3dd4a0 Merge latest changes from trunk. new 7516f46 Normalize whitespace. new a14e720 Merge latest changes from trunk. new 86c6db7 Replace tabs with spaces. new 8d31bd8 Merge latest changes from trunk. The 14 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[axis-axis2-java-rampart] 14/18: Merged r1090540 and r1235059 to the 1.5 branch.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_5_x
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit cb786b055433f3dbdce1066753d28b51b299be83
Author: Andreas Veithen
AuthorDate: Tue Jan 24 07:16:43 2012 +
Merged r1090540 and r1235059 to the 1.5 branch.
---
.../java/org/apache/rampart/util/Axis2Util.java| 31 +-
1 file changed, 30 insertions(+), 1 deletion(-)
diff --git
a/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
b/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
index 4d719e1..8eb0b55 100644
--- a/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
+++ b/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
@@ -35,6 +35,7 @@ import org.apache.axiom.soap.impl.dom.factory.DOMSOAPFactory;
import org.apache.rampart.handler.WSSHandlerConstants;
import org.apache.ws.security.WSSecurityException;
import org.apache.xml.security.utils.XMLUtils;
+import org.w3c.dom.DOMConfiguration;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -89,7 +90,35 @@ public class Axis2Util {
throws WSSecurityException {
try {
if(env instanceof Element) {
-return ((Element)env).getOwnerDocument();
+Element element = (Element)env;
+Document document = element.getOwnerDocument();
+// For outgoing messages, Axis2 only creates the SOAPEnvelope,
but no document. If
+// the Axiom implementation also supports DOM, then the
envelope (seen as a DOM
+// element) will have an owner document, but the document and
the envelope have no
+// parent-child relationship. On the other hand, the input
expected by WSS4J is
+// a document with the envelope as document element. Therefore
we need to set the
+// envelope as document element on the owner document.
+if (element.getParentNode() != document) {
+document.appendChild(element);
+}
+// If the Axiom implementation supports DOM, then it is
possible/likely that the
+// DOM API was used to create the object model (or parts of
it). In this case, the
+// object model is not necessarily well formed with respect to
namespaces because
+// DOM doesn't generate namespace declarations automatically.
This is an issue
+// because WSS4J/Santuario expects that all namespace
declarations are present.
+// If this is not the case, then signature values or
encryptions will be incorrect.
+// To avoid this, we normalize the document. Note that if we
disable the other
+// normalizations supported by DOM, this is generally not a
heavy operation.
+// In particular, the Axiom implementation is not required to
expand the object
+// model (including OMSourcedElements) because the Axiom
builder is required to
+// perform namespace repairing, so that no modifications to
unexpanded parts of
+// the message are required.
+DOMConfiguration domConfig = document.getDomConfig();
+domConfig.setParameter("split-cdata-sections", Boolean.FALSE);
+domConfig.setParameter("well-formed", Boolean.FALSE);
+domConfig.setParameter("namespaces", Boolean.TRUE);
+document.normalizeDocument();
+return document;
}
if (useDoom) {
[axis-axis2-java-rampart] 02/14: Apply the patch provided by Boris Dushanov for RAMPART-426.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch RAMPART-426
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit 48a0422d73e8b5706d5c8798e64a3db1d16b9fac
Author: Andreas Veithen
AuthorDate: Sat Jan 14 14:24:52 2017 +
Apply the patch provided by Boris Dushanov for RAMPART-426.
---
.../java/org/apache/rampart/RampartEngine.java | 209 -
.../org/apache/rampart/RampartMessageData.java | 23 ++-
.../policy/builders/RampartConfigBuilder.java | 12 ++
.../apache/rampart/policy/model/RampartConfig.java | 60 ++
modules/rampart-integration/pom.xml| 27 +++
.../test/java/org/apache/rampart/RampartTest.java | 6 +-
.../src/test/resources/rampart/policy/36.xml | 70 +++
.../src/test/resources/rampart/policy/37.xml | 70 +++
.../src/test/resources/rampart/policy/38.xml | 71 +++
.../src/test/resources/rampart/policy/39.xml | 70 +++
.../src/test/resources/rampart/policy/40.xml | 70 +++
.../src/test/resources/rampart/policy/41.xml | 69 +++
.../src/test/resources/rampart/policy/42.xml | 69 +++
.../src/test/resources/rampart/services-36.xml | 87 +
.../src/test/resources/rampart/services-37.xml | 87 +
.../src/test/resources/rampart/services-38.xml | 89 +
.../src/test/resources/rampart/services-39.xml | 88 +
.../src/test/resources/rampart/services-40.xml | 88 +
.../src/test/resources/rampart/services-41.xml | 88 +
.../src/test/resources/rampart/services-42.xml | 88 +
.../rampart/AsymmetricBindingBuilderTest.java | 59 +-
.../org/apache/rampart/MessageBuilderTestBase.java | 2 +-
.../java/org/apache/rampart/RampartEngineTest.java | 80
.../rampart/policy/model/RampartPolicyTest.java| 3 +
...part-asymm-binding-6-3des-r15-inbound-actor.xml | 75
...m-binding-6-3des-r15-inbound-outbound-actor.xml | 76
...art-asymm-binding-6-3des-r15-outbound-actor.xml | 75
.../test-resources/policy/rampart-policy-1.xml | 2 +
.../test-resources/policy/soapmessage12.xml| 57 ++
29 files changed, 1720 insertions(+), 150 deletions(-)
diff --git
a/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
b/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
index dda31b0..8e73be1 100644
--- a/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
+++ b/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
@@ -16,6 +16,15 @@
package org.apache.rampart;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Vector;
+
+import javax.xml.namespace.QName;
+
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFault;
import org.apache.axiom.soap.SOAPHeader;
@@ -27,19 +36,20 @@ import org.apache.commons.logging.LogFactory;
import org.apache.rahas.Token;
import org.apache.rahas.TokenStorage;
import org.apache.rampart.policy.RampartPolicyData;
+import org.apache.rampart.policy.model.RampartConfig;
import org.apache.rampart.saml.SAMLAssertionHandler;
import org.apache.rampart.saml.SAMLAssertionHandlerFactory;
import org.apache.rampart.util.Axis2Util;
import org.apache.rampart.util.RampartUtil;
import org.apache.ws.secpolicy.WSSPolicyException;
import org.apache.ws.secpolicy.model.UsernameToken;
-import org.apache.ws.security.*;
+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.WSUsernameTokenPrincipal;
import org.apache.ws.security.components.crypto.Crypto;
-import javax.xml.namespace.QName;
-import java.security.cert.X509Certificate;
-import java.util.*;
-
public class RampartEngine {
private static Log log = LogFactory.getLog(RampartEngine.class);
@@ -131,8 +141,22 @@ public class RampartEngine {
}
}
- String actorValue = secHeader.getAttributeValue(new QName(rmd
- .getSoapConstants().getEnvelopeURI(), "actor"));
+ // get the configured 'actor' value and if it is NOT set
+ // then fallback to the one in the security header
+ String actorValue = null;
+ RampartConfig rampartConfig = rpd.getRampartConfig();
+ if(null != rampartConfig){
+ actorValue = rampartConfig.getInboundActor();
+ }
+
+ if(null == actorValue){
+ String actorAttribute = WSConstants.ATTR_ACTOR;
+
[axis-axis2-java-rampart] 17/18: Compensate for change r1299894 in Axiom.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_5_x
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit bf35d2b17371ec72a1d100fd40b0ecaac3d62ff8
Author: Andreas Veithen
AuthorDate: Tue Mar 20 23:38:55 2012 +
Compensate for change r1299894 in Axiom.
---
.../rampart-trust/src/main/java/org/apache/rahas/TrustUtil.java| 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git
a/modules/rampart-trust/src/main/java/org/apache/rahas/TrustUtil.java
b/modules/rampart-trust/src/main/java/org/apache/rahas/TrustUtil.java
index c52d355..6f3b1b0 100644
--- a/modules/rampart-trust/src/main/java/org/apache/rahas/TrustUtil.java
+++ b/modules/rampart-trust/src/main/java/org/apache/rahas/TrustUtil.java
@@ -421,12 +421,15 @@ public class TrustUtil {
* @return SOAPEnvelope
*/
public static SOAPEnvelope createSOAPEnvelope(String nsUri) {
+SOAPEnvelope env;
if (nsUri != null
&& SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(nsUri)) {
-return DOOMAbstractFactory.getSOAP11Factory().getDefaultEnvelope();
+env = DOOMAbstractFactory.getSOAP11Factory().getDefaultEnvelope();
} else {
-return DOOMAbstractFactory.getSOAP12Factory().getDefaultEnvelope();
+env = DOOMAbstractFactory.getSOAP12Factory().getDefaultEnvelope();
}
+((Element)env).getOwnerDocument().appendChild((Element)env);
+return env;
}
[axis-axis2-java-rampart] 03/14: Merge latest changes from trunk.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch RAMPART-426 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git commit 98737e4b2ee72441decd37a48bac58ab495db8a7 Merge: 48a0422 4b70d3b Author: Andreas Veithen AuthorDate: Sat Jan 28 16:09:03 2017 + Merge latest changes from trunk. modules/rampart-integration/pom.xml| 90 +- .../org/apache/axis2/integration/JettyServer.java | 328 +++-- .../apache/axis2/integration/TestConstants.java| 25 ++ .../src/main/java/org/apache/rahas/TestClient.java | 29 +- .../rahas/RahasSAML2TokenCertForHoKTest.java | 6 +- .../java/org/apache/rahas/RahasSAML2TokenTest.java | 10 +- .../rahas/RahasSAML2TokenUTForBearerTest.java | 9 +- .../apache/rahas/RahasSAMLTokenAttributeTest.java | 7 +- .../apache/rahas/RahasSAMLTokenCertForHoKTest.java | 8 +- .../rahas/RahasSAMLTokenCertForHoKV1205Test.java | 8 +- .../java/org/apache/rahas/RahasSAMLTokenTest.java | 11 +- .../rahas/RahasSAMLTokenUTForBearerTest.java | 9 +- .../rahas/RahasSAMLTokenUTForBearerV1205Test.java | 10 +- .../apache/rahas/RahasSAMLTokenUTForHoKTest.java | 7 +- .../rahas/RahasSAMLTokenUTForHoKV1205Test.java | 9 +- .../org/apache/rahas/RahasSAMLTokenV1205Test.java | 10 +- .../test/java/org/apache/rampart/RampartTest.java | 93 ++ 17 files changed, 275 insertions(+), 394 deletions(-) diff --cc modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java index 923595a,064d197..e0aec1d --- a/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java +++ b/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java @@@ -16,12 -16,10 +16,11 @@@ package org.apache.rampart; - import static org.apache.axis2.integration.JettyServer.getHttpPort; - import static org.apache.axis2.integration.JettyServer.getHttpsPort; - import static org.apache.axis2.integration.JettyServer.CLIENT_KEYSTORE; - import static org.apache.axis2.integration.JettyServer.KEYSTORE_PASSWORD; + import static org.apache.axis2.integration.TestConstants.TESTING_PATH; + import static org.junit.Assert.assertEquals; ++import static org.junit.Assert.assertNotNull; + import static org.junit.Assert.fail; - import junit.framework.TestCase; import org.apache.axiom.om.OMAbstractFactory; import org.apache.axiom.om.OMElement; import org.apache.axiom.om.OMFactory;
[axis-axis2-java-rampart] 04/18: RAMPART-336: Merged r1177413 to the 1.5 branch and updated the dependencies.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_5_x
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit eacfeb5e78e02ea834a598561a51260ab24a3f10
Author: Andreas Veithen
AuthorDate: Sat Oct 1 22:56:53 2011 +
RAMPART-336: Merged r1177413 to the 1.5 branch and updated the dependencies.
---
.../src/main/java/org/apache/rampart/util/Axis2Util.java | 15 ---
pom.xml | 4 ++--
2 files changed, 6 insertions(+), 13 deletions(-)
diff --git
a/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
b/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
index 7874475..2de1406 100644
--- a/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
+++ b/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
@@ -194,10 +194,6 @@ public class Axis2Util {
// it is a header we have added in rampart eg.
EncryptedHeader and should
// be converted to SOAPHeaderBlock for processing
} else {
-// First detach element from soap header
-element.detach();
-
-// add new element
header =
soapHeader.addHeaderBlock(element.getLocalName(), element.getNamespace());
Iterator attrIter = element.getAllAttributes();
while (attrIter.hasNext()) {
@@ -210,17 +206,14 @@ public class Axis2Util {
header.declareNamespace(ns);
}
Iterator children = element.getChildElements();
-
-// Element is a composite element, in which it has
many siblings.
-// All siblings will be added when we add a single
node.
-// See ParentNode.insertBefore(Node newChild, Node
refChild) for
-// more information.
- if (children.hasNext()) {
+ while (children.hasNext()) {
OMNode child = (OMNode)children.next();
children.remove();
header.addChild(child);
}
-
+
+ element.detach();
+
soapHeader.build();
header.setProcessed();
diff --git a/pom.xml b/pom.xml
index 169142c..295044d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -382,8 +382,8 @@
-1.5.6
-1.2.12
+1.5.7-SNAPSHOT
+1.2.13-SNAPSHOT
1.5.12
1.1
[axis-axis2-java-rampart] 15/18: Merged r1299342, r1299389 and r1299390 to the 1.5 branch.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_5_x
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit 922366589c9f2528659b3eba9ab2bc3b707301c0
Author: Andreas Veithen
AuthorDate: Sun Mar 11 18:08:33 2012 +
Merged r1299342, r1299389 and r1299390 to the 1.5 branch.
---
.../src/main/java/org/apache/rampart/util/Axis2Util.java | 2 +-
.../src/main/java/org/apache/rahas/client/STSClient.java | 12 +---
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git
a/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
b/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
index 8eb0b55..07840f1 100644
--- a/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
+++ b/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
@@ -243,7 +243,7 @@ public class Axis2Util {
header.addChild(child);
}
- element.detach();
+ headerBlocs.remove();
soapHeader.build();
diff --git
a/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java
b/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java
index 01ad8ad..3803148 100644
--- a/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java
+++ b/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java
@@ -661,18 +661,16 @@ public class STSClient {
Iterator templateChildren = rstTemplate.getChildElements();
while (templateChildren.hasNext()) {
-OMNode child = (OMNode) templateChildren.next();
-rst.addChild(child);
+OMElement child = (OMElement) templateChildren.next();
+rst.addChild(child.cloneOMElement());
//Look for the key size element
-if (child instanceof OMElement
-&& ((OMElement) child).getQName().equals(
+if (child.getQName().equals(
new QName(TrustUtil.getWSTNamespace(this.version),
RahasConstants.IssuanceBindingLocalNames.KEY_SIZE))) {
log.debug("Extracting key size from the RSTTemplate: ");
-OMElement childElem = (OMElement) child;
this.keySize =
-(childElem.getText() != null &&
!"".equals(childElem.getText())) ?
-Integer.parseInt(childElem.getText()) :
+(child.getText() != null &&
!"".equals(child.getText())) ?
+Integer.parseInt(child.getText()) :
-1;
log.debug("Key size from RSTTemplate: " + this.keySize);
}
[axis-axis2-java-rampart] 11/14: Normalize whitespace.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch RAMPART-426 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git commit 7516f46d132fc5e503ad068fd8670d34ced0483e Author: Andreas Veithen AuthorDate: Sun Jan 29 10:22:06 2017 + Normalize whitespace. --- .../src/test/resources/rampart/policy/36.xml | 135 ++- .../src/test/resources/rampart/policy/37.xml | 135 ++- .../src/test/resources/rampart/policy/38.xml | 137 ++- .../src/test/resources/rampart/policy/39.xml | 135 ++- .../src/test/resources/rampart/policy/40.xml | 135 ++- .../src/test/resources/rampart/policy/41.xml | 133 ++- .../src/test/resources/rampart/policy/42.xml | 134 +-- ...part-asymm-binding-6-3des-r15-inbound-actor.xml | 143 ++-- ...m-binding-6-3des-r15-inbound-outbound-actor.xml | 145 ++--- ...art-asymm-binding-6-3des-r15-outbound-actor.xml | 143 ++-- 10 files changed, 680 insertions(+), 695 deletions(-) diff --git a/modules/rampart-integration/src/test/resources/rampart/policy/36.xml b/modules/rampart-integration/src/test/resources/rampart/policy/36.xml index d1c239d..b2ea940 100644 --- a/modules/rampart-integration/src/test/resources/rampart/policy/36.xml +++ b/modules/rampart-integration/src/test/resources/rampart/policy/36.xml @@ -1,70 +1,69 @@ 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";> - - - http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";> - - - - http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient";> - - - - - - - - - http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never";> - - - - - - - - - - - - - - - - - - - - - http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";> - - - - - - http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";> - - - http://ws.apache.org/rampart/policy";> - alice - bob - org.apache.rampart.PWCallback - outboundActor - - - - JKS - rampart/store.jks - password - - - - - JKS - rampart/store.jks - password - - - - - + + +http://sc
[axis-axis2-java-rampart] 01/14: Create a development branch to work on the patch for RAMPART-426.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch RAMPART-426 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git commit a7aa3be6aff82bfac54e7f1258a64428463211db Author: Andreas Veithen AuthorDate: Sat Jan 14 14:23:43 2017 + Create a development branch to work on the patch for RAMPART-426.
[axis-axis2-java-rampart] 12/14: Merge latest changes from trunk.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch RAMPART-426
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit a14e7203a1566e011cb2791bd1606cc0b84d5fd4
Merge: 7516f46 d7fea53
Author: Andreas Veithen
AuthorDate: Sun Jan 29 10:45:09 2017 +
Merge latest changes from trunk.
.../java/org/apache/rampart/RampartEngineTest.java | 62 +++---
1 file changed, 31 insertions(+), 31 deletions(-)
diff --cc
modules/rampart-tests/src/test/java/org/apache/rampart/RampartEngineTest.java
index 603dae1,77e54d7..05f14c9
---
a/modules/rampart-tests/src/test/java/org/apache/rampart/RampartEngineTest.java
+++
b/modules/rampart-tests/src/test/java/org/apache/rampart/RampartEngineTest.java
@@@ -26,63 -26,42 +26,63 @@@ import org.apache.axis2.context.Message
import org.apache.neethi.Policy;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSSecurityEngineResult;
+ import org.junit.Test;
+ import org.junit.runner.RunWith;
+ import org.junit.runners.JUnit4;
+ @RunWith(JUnit4.class)
public class RampartEngineTest extends MessageBuilderTestBase {
-
- public RampartEngineTest(String name) {
- super(name);
- }
-
+ /**
+ * Tests that Rampart complains about missing security header in request.
+ *
+ * @throws Exception
+ */
+ @Test(expected=RampartException.class)
public void testEmptySOAPMessage() throws Exception {
+ MessageContext ctx = getMsgCtx();
- try {
- MessageContext ctx = getMsgCtx();
+ String policyXml =
"test-resources/policy/rampart-asymm-binding-6-3des-r15.xml";
+ Policy policy = this.loadPolicy(policyXml);
- String policyXml =
"test-resources/policy/rampart-asymm-binding-6-3des-r15.xml";
- Policy policy = this.loadPolicy(policyXml);
-
- ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
+ ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
- RampartEngine engine = new RampartEngine();
- engine.process(ctx);
- }
- catch (RampartException e) {
- assertEquals("Expected rampart to complain about missing security
header",
- "Missing wsse:Security header in request",
e.getMessage());
- }
+ RampartEngine engine = new RampartEngine();
+ engine.process(ctx);
}
+ @Test
public void testValidSOAPMessage() throws Exception {
- runValidRampartProcessing(getMsgCtx(),
"test-resources/policy/rampart-asymm-binding-6-3des-r15.xml");
+ runRampartEngine(getMsgCtx(),
"test-resources/policy/rampart-asymm-binding-6-3des-r15.xml");
}
+ @Test
public void testValidSOAP12Message() throws Exception {
- runValidRampartProcessing(getMsgCtx12(),
"test-resources/policy/rampart-asymm-binding-6-3des-r15.xml");
+ runRampartEngine(getMsgCtx12(),
"test-resources/policy/rampart-asymm-binding-6-3des-r15.xml");
}
-
+
++@Test
+public void testValidSOAPMessageWithActor() throws Exception {
- runValidRampartProcessing(getMsgCtx(),
"test-resources/policy/rampart-asymm-binding-6-3des-r15-inbound-outbound-actor.xml");
++runRampartEngine(getMsgCtx(),
"test-resources/policy/rampart-asymm-binding-6-3des-r15-inbound-outbound-actor.xml");
+}
+
++@Test
+public void testValidSOAP12MessageWithRole() throws Exception {
- runValidRampartProcessing(getMsgCtx12(),
"test-resources/policy/rampart-asymm-binding-6-3des-r15-inbound-outbound-actor.xml");
++runRampartEngine(getMsgCtx12(),
"test-resources/policy/rampart-asymm-binding-6-3des-r15-inbound-outbound-actor.xml");
+}
+
++@Test
+public void testMissingSOAPInboundActor() throws Exception {
- runValidRampartProcessing(getMsgCtx(),
"test-resources/policy/rampart-asymm-binding-6-3des-r15-outbound-actor.xml");
++runRampartEngine(getMsgCtx(),
"test-resources/policy/rampart-asymm-binding-6-3des-r15-outbound-actor.xml");
+}
+
++// Failure is expected because no outbound actor is set.
++@Test(expected=RampartException.class)
+public void testMissingSOAPOutboundActor() throws Exception {
- try{
- runValidRampartProcessing(getMsgCtx(),
"test-resources/policy/rampart-asymm-binding-6-3des-r15-inbound-actor.xml");
- fail("Failure is expected because no outbound actor is set.");
- }catch(RampartException e){
- assertNotNull(e);
- }
++runRampartEngine(getMsgCtx(),
"test-resources/policy/rampart-asymm-binding-6-3des-r15-inbound-actor.xml");
+}
+
- private void runValidRampartProcessing(MessageContext ctx, String
policyXmlPath) throws Exception{
- Policy policy = loadPolicy(policyXmlPath);
+ private void runRampartEn
[axis-axis2-java-rampart] 18/18: Switched the Rampart 1.5 branch to Axiom 1.2.13.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch 1_5_x in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git commit 91567ea045bbb61f2f51e1e076d1b11d16cba5de Author: Andreas Veithen AuthorDate: Mon Apr 9 14:22:20 2012 + Switched the Rampart 1.5 branch to Axiom 1.2.13. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2773bb8..013c19a 100644 --- a/pom.xml +++ b/pom.xml @@ -392,7 +392,7 @@ 1.5.7-SNAPSHOT -1.2.13-SNAPSHOT +1.2.13 1.5.12 1.1
[axis-axis2-java-rampart] 16/18: Merged r1303198 to the 1.5 branch for debugging purposes.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_5_x
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit 14e01826290f5f62cefbcb7e858957c809fbf03b
Author: Andreas Veithen
AuthorDate: Tue Mar 20 23:13:35 2012 +
Merged r1303198 to the 1.5 branch for debugging purposes.
---
.../src/main/java/org/apache/rahas/TestClient.java | 116 ++---
1 file changed, 55 insertions(+), 61 deletions(-)
diff --git
a/modules/rampart-integration/src/main/java/org/apache/rahas/TestClient.java
b/modules/rampart-integration/src/main/java/org/apache/rahas/TestClient.java
index 3fdb63c..bedca63 100644
--- a/modules/rampart-integration/src/main/java/org/apache/rahas/TestClient.java
+++ b/modules/rampart-integration/src/main/java/org/apache/rahas/TestClient.java
@@ -54,68 +54,62 @@ public abstract class TestClient extends TestCase {
/**
*/
-public void testRequest() {
-try {
-
-// Get the repository location from the args
-String repo = Constants.TESTING_PATH + "rahas_client_repo";
-
-ConfigurationContext configContext =
ConfigurationContextFactory.createConfigurationContextFromFileSystem(repo,
-
null);
-ServiceClient serviceClient = new ServiceClient(configContext,
null);
-Options options = new Options();
-
-System.setProperty("javax.net.ssl.keyStorePassword", "password");
-System.setProperty("javax.net.ssl.keyStoreType", "JKS");
-System.setProperty("javax.net.ssl.trustStore",
"/home/ruchith/Desktop/interop/certs/interop2.jks");
-System.setProperty("javax.net.ssl.trustStorePassword", "password");
-System.setProperty("javax.net.ssl.trustStoreType","JKS");
-
-options.setTo(new EndpointReference("http://127.0.0.1:"; + port +
"/axis2/services/SecureService"));
-//options.setTo(new EndpointReference("http://127.0.0.1:"; + 9090 +
"/axis2/services/UTSAMLHoK"));
-//options.setTo(new
EndpointReference("https://www-lk.wso2.com:8443/axis2/services/UTSAMLHoK";));
-//options.setTo(new
EndpointReference("https://192.18.49.133:2343/jaxws-s1-sts/sts";));
-//options.setTo(new
EndpointReference("https://207.200.37.116/SxSts/Scenario_1_IssuedTokenOverTransport_UsernameOverTransport";));
-//options.setTo(new
EndpointReference("http://localhost:9090/SxSts/Scenario_4_IssuedToken_MutualCertificate10";));
-
-//options.setTo(new EndpointReference("http://127.0.0.1:"; + 9090 +
"/axis2/services/MutualCertsSAMLHoK"));
-//options.setTo(new
EndpointReference("http://www-lk.wso2.com:/axis2/services/MutualCertsSAMLHoK";));
-//options.setTo(new
EndpointReference("https://131.107.72.15/trust/Addressing2004/UserName";));
-//options.setTo(new
EndpointReference("https://131.107.72.15/trust/UserName";));
-//options.setTo(new EndpointReference("http://127.0.0.1:"; + 9090 +
"/trust/X509WSS10"));
-//options.setTo(new
EndpointReference("https://131.107.72.15/trust/UserName";));
-//options.setTo(new EndpointReference("http://127.0.0.1:"; + 9090 +
"/jaxws-s4-sts/sts"));
-//options.setTo(new
EndpointReference("http://127.0.0.1:9090/jaxws-s4/simple";));
-//options.setTo(new EndpointReference("http://127.0.0.1:"; + 9090 +
"/axis2/services/UTSAMLBearer"));
-
-options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
-options.setAction(this.getRequestAction());
-//options.setProperty(AddressingConstants.WS_ADDRESSING_VERSION,
this.getWSANamespace());
-
-options.setTimeOutInMilliSeconds(200 * 1000);
-OutflowConfiguration clientOutflowConfiguration =
getClientOutflowConfiguration();
-if (clientOutflowConfiguration != null) {
-
configContext.setProperty(WSSHandlerConstants.OUTFLOW_SECURITY,
clientOutflowConfiguration.getProperty());
-}
-InflowConfiguration clientInflowConfiguration =
getClientInflowConfiguration();
-if (clientInflowConfiguration != null) {
-configContext.setProperty(WSSHandlerConstants.INFLOW_SECURITY,
clientInflowConfiguration.getProperty());
-}
-
-serviceClient.engageModule(new QName("addressing"));
-serviceClient.engageModule(new QName("rampart"));
-
-serviceClient.setOptions(options);
-
-//Blocking invocation
-
-OMElement result = serviceClient.sendReceive(getRequest());
-
-this.validateRsponse(result);
-} catch (Exception e) {
-e.printStackTrace();
-fail(e.getMessage());
+public void testRequest() throws Exception {
+//
[axis-axis2-java-rampart] 05/18: RAMPART-278: Merged r1052172 and r1052173 to the 1.5 branch.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_5_x
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit 2b0e5e8f30bcfd051294efec65f227376de806b2
Author: Andreas Veithen
AuthorDate: Tue Oct 18 22:04:37 2011 +
RAMPART-278: Merged r1052172 and r1052173 to the 1.5 branch.
---
.../rampart/PolicyBasedResultsValidator.java | 46 ++---
.../java/org/apache/rampart/util/Axis2Util.java| 4 +-
modules/rampart-integration/pom.xml| 6 ++
.../test/java/org/apache/rampart/RampartTest.java | 15 ++-
.../src/test/resources/rampart/policy/31.xml | 75 ++
.../src/test/resources/rampart/services-31.xml | 111 +
6 files changed, 241 insertions(+), 16 deletions(-)
diff --git
a/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
b/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
index 4cc430b..24db745 100644
---
a/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
+++
b/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
@@ -31,6 +31,7 @@ import org.apache.ws.security.message.token.Timestamp;
import org.apache.ws.security.util.WSSecurityUtil;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import org.jaxen.XPath;
import org.jaxen.JaxenException;
@@ -555,16 +556,34 @@ public class PolicyBasedResultsValidator implements
PolicyValidatorCallbackHandl
Vector actuallySigned = new Vector();
if (actionResults != null) {
for (int j = 0; j < actionResults.length; j++) {
+
WSSecurityEngineResult actionResult = actionResults[j];
-Set signedIDs = (Set) actionResult
-.get(WSSecurityEngineResult.TAG_SIGNED_ELEMENT_IDS);
-for (Iterator i = signedIDs.iterator(); i.hasNext();) {
-String e = (String) i.next();
-
-Element element = WSSecurityUtil.findElementById(envelope,
e,
-WSConstants.WSU_NS);
-actuallySigned.add(element);
+List wsDataRefs =
(List)actionResult.get(WSSecurityEngineResult.TAG_DATA_REF_URIS);
+
+// if header was encrypted before it was signed, protected
+// element is 'EncryptedHeader.' the actual element is
+// first child element
+
+for (Iterator k = wsDataRefs.iterator(); k.hasNext();) {
+WSDataRef wsDataRef = (WSDataRef)k.next();
+Element protectedElement = wsDataRef.getProtectedElement();
+if
(protectedElement.getLocalName().equals("EncryptedHeader")) {
+NodeList nodeList = protectedElement.getChildNodes();
+for (int x = 0; x < nodeList.getLength(); x++) {
+if (nodeList.item(x).getNodeType() ==
Node.ELEMENT_NODE) {
+String ns =
((Element)nodeList.item(x)).getNamespaceURI();
+String ln =
((Element)nodeList.item(x)).getLocalName();
+actuallySigned.add(new QName(ns,ln));
+break;
+}
+}
+} else {
+String ns = protectedElement.getNamespaceURI();
+String ln = protectedElement.getLocalName();
+actuallySigned.add(new QName(ns,ln));
+}
}
+
}
}
@@ -573,15 +592,15 @@ public class PolicyBasedResultsValidator implements
PolicyValidatorCallbackHandl
if (wsep.getType() == WSConstants.PART_TYPE_BODY) {
-Element body;
+QName bodyQName;
if
(WSConstants.URI_SOAP11_ENV.equals(envelope.getNamespaceURI())) {
-body = WSSecurityUtil.findBodyElement(rmd.getDocument(),
new SOAP11Constants());
+bodyQName = new SOAP11Constants().getBodyQName();
} else {
-body = WSSecurityUtil.findBodyElement(rmd.getDocument(),
new SOAP12Constants());
+bodyQName = new SOAP12Constants().getBodyQName();
}
-if (!actuallySigned.contains(body) &&
!rmd.getPolicyData().isSignBodyOptional()) {
+if (!actuallySigned.contains(bodyQName) &&
!rmd.getPolicyData().isSignBodyOptional()) {
// soap body is not signed
throw new RampartException("bodyNotSigned");
}
@@ -591,6 +610,7 @@ public class Po
[axis-axis2-java-rampart] 02/03: Add empty release note for Rampart 1.6.5 and switch to Axis2 snapshot.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch 1_6 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git commit 27325c5c72111003bc3870cfdb84829f929f1205 Author: Andreas Veithen AuthorDate: Mon Dec 28 23:42:49 2015 + Add empty release note for Rampart 1.6.5 and switch to Axis2 snapshot. --- pom.xml | 2 +- src/site/markdown/release-notes/1.6.5.md | 0 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 45b307e..064048f 100644 --- a/pom.xml +++ b/pom.xml @@ -609,7 +609,7 @@ -1.6.4 +1.6.5-SNAPSHOT 1.2.15 1.6.16 diff --git a/src/site/markdown/release-notes/1.6.5.md b/src/site/markdown/release-notes/1.6.5.md new file mode 100644 index 000..e69de29
[axis-axis2-java-rampart] branch RAMPART-433 created (now 211b6ff)
This is an automated email from the ASF dual-hosted git repository. billblough pushed a change to branch RAMPART-433 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git. at 211b6ff Fix license headers. No new revisions were added by this update.
[axis-axis2-java-rampart] 03/03: Upgrade the 1.6 branch to Axiom 1.2.17.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch 1_6 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git commit 5c6eaa39d3b12704bf996ecd7cac9ef8d5fe1272 Author: Andreas Veithen AuthorDate: Sun Feb 14 23:03:40 2016 + Upgrade the 1.6 branch to Axiom 1.2.17. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 064048f..b2f818f 100644 --- a/pom.xml +++ b/pom.xml @@ -610,7 +610,7 @@ 1.6.5-SNAPSHOT -1.2.15 +1.2.17 1.6.16 2.5.1-1
[axis-axis2-java-rampart] branch RAMPART-423 created (now 3c651a9)
This is an automated email from the ASF dual-hosted git repository. billblough pushed a change to branch RAMPART-423 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git. at 3c651a9 Clean up the patch. No new revisions were added by this update.
[axis-axis2-java-rampart] branch RAMPART-390 created (now 5fcc553)
This is an automated email from the ASF dual-hosted git repository. billblough pushed a change to branch RAMPART-390 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git. at 5fcc553 Merge changes from trunk. No new revisions were added by this update.
[axis-axis2-java-rampart] branch RAMPART-339 created (now 597ca87)
This is an automated email from the ASF dual-hosted git repository. billblough pushed a change to branch RAMPART-339 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git. at 597ca87 Final cleanup of the patch. No new revisions were added by this update.
[axis-axis2-java-rampart] 01/03: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch 1_6 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git commit 870093446427ff12aac8f571132ab6259cd0358a Author: Andreas Veithen AuthorDate: Mon Dec 28 23:03:43 2015 + [maven-release-plugin] prepare for next development iteration --- apidocs/pom.xml | 2 +- code-coverage/pom.xml | 2 +- modules/distribution/pom.xml| 2 +- modules/rampart-core/pom.xml| 2 +- modules/rampart-integration/pom.xml | 2 +- modules/rampart-mar/pom.xml | 2 +- modules/rampart-policy/pom.xml | 2 +- modules/rampart-samples/pom.xml | 2 +- modules/rampart-tests/pom.xml | 2 +- modules/rampart-trust-mar/pom.xml | 2 +- modules/rampart-trust/pom.xml | 2 +- pom.xml | 8 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/apidocs/pom.xml b/apidocs/pom.xml index 14c36f3..e1b3561 100644 --- a/apidocs/pom.xml +++ b/apidocs/pom.xml @@ -22,7 +22,7 @@ org.apache.rampart rampart-project -1.6.4 +1.6.5-SNAPSHOT ../pom.xml apidocs diff --git a/code-coverage/pom.xml b/code-coverage/pom.xml index 2b12450..8dac731 100644 --- a/code-coverage/pom.xml +++ b/code-coverage/pom.xml @@ -22,7 +22,7 @@ org.apache.rampart rampart-project -1.6.4 +1.6.5-SNAPSHOT ../pom.xml code-coverage diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 3f619e1..836a33b 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.6.4 +1.6.5-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/rampart-core/pom.xml b/modules/rampart-core/pom.xml index 79fe473..124c4ba 100644 --- a/modules/rampart-core/pom.xml +++ b/modules/rampart-core/pom.xml @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.6.4 +1.6.5-SNAPSHOT ../../pom.xml diff --git a/modules/rampart-integration/pom.xml b/modules/rampart-integration/pom.xml index 5c933db..3e432a9 100644 --- a/modules/rampart-integration/pom.xml +++ b/modules/rampart-integration/pom.xml @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.6.4 +1.6.5-SNAPSHOT ../../pom.xml diff --git a/modules/rampart-mar/pom.xml b/modules/rampart-mar/pom.xml index b272bd0..d9f0370 100644 --- a/modules/rampart-mar/pom.xml +++ b/modules/rampart-mar/pom.xml @@ -24,7 +24,7 @@ org.apache.rampart rampart-project -1.6.4 +1.6.5-SNAPSHOT ../../pom.xml diff --git a/modules/rampart-policy/pom.xml b/modules/rampart-policy/pom.xml index 36d85c4..997236e 100644 --- a/modules/rampart-policy/pom.xml +++ b/modules/rampart-policy/pom.xml @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.6.4 +1.6.5-SNAPSHOT ../../pom.xml diff --git a/modules/rampart-samples/pom.xml b/modules/rampart-samples/pom.xml index 584c44a..1fec691 100644 --- a/modules/rampart-samples/pom.xml +++ b/modules/rampart-samples/pom.xml @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.6.4 +1.6.5-SNAPSHOT ../../pom.xml diff --git a/modules/rampart-tests/pom.xml b/modules/rampart-tests/pom.xml index 978db73..0835425 100644 --- a/modules/rampart-tests/pom.xml +++ b/modules/rampart-tests/pom.xml @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.6.4 +1.6.5-SNAPSHOT ../../pom.xml diff --git a/modules/rampart-trust-mar/pom.xml b/modules/rampart-trust-mar/pom.xml index 756521b..f82354b 100644 --- a/modules/rampart-trust-mar/pom.xml +++ b/modules/rampart-trust-mar/pom.xml @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.6.4 +1.6.5-SNAPSHOT ../../pom.xml diff --git a/modules/rampart-trust/pom.xml b/modules/rampart-trust/pom.xml index abf0487..90110ae 100644 --- a/modules/rampart-trust/pom.xml +++ b/modules/rampart-trust/pom.xml @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.6.4 +1.6.5-SNAPSHOT ../../pom.xml diff --git a/pom.xml b/pom.xml index 4cd9a67..45b307e 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ rampart-project pom WS-Security, WS-Trust and WS-SecureConversation implementaion for Apache Axis2 -1.6.4 +1.6.5-SNAPSHOT Apache Rampart http://axis.apache.org/axis2/java/rampart @@ -110,12 +110,12 @@ - scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/rampart/tags/v1.6.4 + scm:svn:http://svn
[axis-axis2-java-rampart] branch 1_5 created (now 763d33d)
This is an automated email from the ASF dual-hosted git repository. billblough pushed a change to branch 1_5 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git. at 763d33d RAMPART-375 - Merged r1350592 to 1.5 branch. This branch includes the following new commits: new de88d8b Moving axis svn, part of TLP move INFRA-2441 new 763d33d RAMPART-375 - Merged r1350592 to 1.5 branch. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[axis-axis2-java-rampart] 02/02: RAMPART-375 - Merged r1350592 to 1.5 branch.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_5
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit 763d33d2992ef6057dcdcf3237a5dadfdd1cda45
Author: Sagara Gunathunga
AuthorDate: Fri Jun 15 12:11:02 2012 +
RAMPART-375 - Merged r1350592 to 1.5 branch.
---
modules/rampart-samples/policy/build.xml | 9 +
1 file changed, 9 insertions(+)
diff --git a/modules/rampart-samples/policy/build.xml
b/modules/rampart-samples/policy/build.xml
index caabbf3..1322ff4 100644
--- a/modules/rampart-samples/policy/build.xml
+++ b/modules/rampart-samples/policy/build.xml
@@ -23,6 +23,7 @@
+
@@ -119,6 +120,12 @@
+
+
+http://repo2.maven.org/maven2/xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar";
+ dest="${endorsed.dir}/xercesImpl-2.9.1.jar" verbose="true"/>
+
+
@@ -174,6 +181,7 @@
+
@@ -230,6 +238,7 @@
+
[axis-axis2-java-rampart] branch 1_3 created (now 56c5181)
This is an automated email from the ASF dual-hosted git repository. billblough pushed a change to branch 1_3 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git. at 56c5181 Moving axis svn, part of TLP move INFRA-2441 This branch includes the following new commits: new 56c5181 Moving axis svn, part of TLP move INFRA-2441 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[axis-axis2-java-rampart] branch 1_6 created (now 5c6eaa3)
This is an automated email from the ASF dual-hosted git repository. billblough pushed a change to branch 1_6 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git. at 5c6eaa3 Upgrade the 1.6 branch to Axiom 1.2.17. This branch includes the following new commits: new 8700934 [maven-release-plugin] prepare for next development iteration new 27325c5 Add empty release note for Rampart 1.6.5 and switch to Axis2 snapshot. new 5c6eaa3 Upgrade the 1.6 branch to Axiom 1.2.17. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[axis-axis2-java-rampart] branch 1_2 created (now 016d478)
This is an automated email from the ASF dual-hosted git repository. billblough pushed a change to branch 1_2 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git. at 016d478 Moving axis svn, part of TLP move INFRA-2441 This branch includes the following new commits: new 016d478 Moving axis svn, part of TLP move INFRA-2441 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[axis-axis2-java-rampart] 03/05: Avoid unnecessary variable renaming (with respect to trunk).
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch RAMPART-234
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit e37512dfc1b53eae9238649107471b8d5951bc7e
Author: Andreas Veithen
AuthorDate: Sun Jan 29 14:21:05 2017 +
Avoid unnecessary variable renaming (with respect to trunk).
---
.../src/main/java/org/apache/rampart/util/RampartUtil.java | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git
a/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
b/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
index 50b96eb..2de0201 100644
---
a/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
+++
b/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
@@ -1819,17 +1819,17 @@ public class RampartUtil {
* attribute of the servlet request. No further trust verification is done
for the client
* certificate - the transport listener should have already verified this.
*
- * @param messageData
+ * @param rmd
* @throws RampartException
*/
-public static void validateTransport(RampartMessageData messageData)
throws RampartException {
+public static void validateTransport(RampartMessageData rmd) throws
RampartException {
-MessageContext msgContext = messageData.getMsgContext();
-RampartPolicyData policyData = messageData.getPolicyData();
+MessageContext msgContext = rmd.getMsgContext();
+RampartPolicyData rpd = rmd.getPolicyData();
AxisConfiguration axisConf =
msgContext.getConfigurationContext().getAxisConfiguration();
-if(policyData != null && policyData.isTransportBinding() &&
!messageData.isInitiator()){
-if (policyData.getTransportToken() instanceof HttpsToken) {
+if(rpd != null && rpd.isTransportBinding() && !rmd.isInitiator()){
+if (rpd.getTransportToken() instanceof HttpsToken) {
try {
TransportInDescription transportIn =
msgContext.getTransportIn();
if (transportIn == null) {
@@ -1868,7 +1868,7 @@ public class RampartUtil {
// verify client certificate used
// try to obtain the client certificate chain directly from
the message context
// and then from the servlet request
-HttpsToken token = (HttpsToken)policyData.getTransportToken();
+HttpsToken token = (HttpsToken)rpd.getTransportToken();
if (token.isRequireClientCertificate()) {
Object certificateChainProperty =
msgContext.getProperty(RampartConstants.HTTPS_CLIENT_CERT_KEY);
if (certificateChainProperty instanceof X509Certificate[])
{
[axis-axis2-java-rampart] 04/05: Avoid unnecessary code changes with respect to trunk.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch RAMPART-234
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit ef34b1004aad1d22ef6c9f9c2b706156d0515dbf
Author: Andreas Veithen
AuthorDate: Sun Jan 29 15:30:18 2017 +
Avoid unnecessary code changes with respect to trunk.
---
.../src/main/java/org/apache/rampart/util/RampartUtil.java | 14 +-
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git
a/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
b/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
index 2de0201..0bfda53 100644
---
a/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
+++
b/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
@@ -1823,12 +1823,16 @@ public class RampartUtil {
* @throws RampartException
*/
public static void validateTransport(RampartMessageData rmd) throws
RampartException {
-
+
MessageContext msgContext = rmd.getMsgContext();
RampartPolicyData rpd = rmd.getPolicyData();
AxisConfiguration axisConf =
msgContext.getConfigurationContext().getAxisConfiguration();
-
-if(rpd != null && rpd.isTransportBinding() && !rmd.isInitiator()){
+
+if (rpd == null) {
+return;
+}
+
+if (rpd.isTransportBinding() && !rmd.isInitiator()) {
if (rpd.getTransportToken() instanceof HttpsToken) {
try {
TransportInDescription transportIn =
msgContext.getTransportIn();
@@ -1868,8 +1872,7 @@ public class RampartUtil {
// verify client certificate used
// try to obtain the client certificate chain directly from
the message context
// and then from the servlet request
-HttpsToken token = (HttpsToken)rpd.getTransportToken();
-if (token.isRequireClientCertificate()) {
+if
(((HttpsToken)rpd.getTransportToken()).isRequireClientCertificate()) {
Object certificateChainProperty =
msgContext.getProperty(RampartConstants.HTTPS_CLIENT_CERT_KEY);
if (certificateChainProperty instanceof X509Certificate[])
{
// HTTPS client certificate chain found
@@ -1889,6 +1892,7 @@ public class RampartUtil {
// HTTPS client certificate chain NOT found
throw new
RampartException("httpsClientCertValidationFailed");
}
+
}
}
}
[axis-axis2-java-rampart] 01/05: Create development branch for RAMPART-234.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch RAMPART-234 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git commit bfb7a1da2bf4901ad820a8949c080bc93dac5f51 Author: Andreas Veithen AuthorDate: Sun Jan 29 13:33:19 2017 + Create development branch for RAMPART-234.
[axis-axis2-java-rampart] 02/05: RAMPART-234: Commit patch provided by Stefan Vladov.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch RAMPART-234
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit 82605dd9646ad089ac7e5ce7cf866c52586d5f37
Author: Andreas Veithen
AuthorDate: Sun Jan 29 13:34:11 2017 +
RAMPART-234: Commit patch provided by Stefan Vladov.
---
.../java/org/apache/rampart/RampartConstants.java | 6 ++
.../java/org/apache/rampart/util/RampartUtil.java | 105 -
.../resources/org/apache/rampart/errors.properties | 2 +
3 files changed, 92 insertions(+), 21 deletions(-)
diff --git
a/modules/rampart-core/src/main/java/org/apache/rampart/RampartConstants.java
b/modules/rampart-core/src/main/java/org/apache/rampart/RampartConstants.java
index e280d74..3b980d3 100644
---
a/modules/rampart-core/src/main/java/org/apache/rampart/RampartConstants.java
+++
b/modules/rampart-core/src/main/java/org/apache/rampart/RampartConstants.java
@@ -10,4 +10,10 @@ public class RampartConstants {
public static final String XML_ENCRYPTION_MODIFIER_CONTENT = "Content";
public static final String XML_ENCRYPTION_MODIFIER_ELEMENT = "Element";
+
+/**
+ * The key under which the HTTPS client certificate, determened by the
https listener, may
+ * be populated as a property of the message context.
+ */
+public static final String HTTPS_CLIENT_CERT_KEY = "https.client.cert.key";
}
diff --git
a/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
b/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
index 6035981..50b96eb 100644
---
a/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
+++
b/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
@@ -31,11 +31,14 @@ import org.apache.axis2.dataretrieval.DRConstants;
import org.apache.axis2.dataretrieval.client.MexClient;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.Parameter;
+import org.apache.axis2.description.TransportInDescription;
+import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.mex.MexConstants;
import org.apache.axis2.mex.MexException;
import org.apache.axis2.mex.om.Metadata;
import org.apache.axis2.mex.om.MetadataReference;
import org.apache.axis2.mex.om.MetadataSection;
+import org.apache.axis2.transport.TransportListener;
import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.commons.httpclient.protocol.Protocol;
import org.apache.commons.logging.Log;
@@ -1801,31 +1804,91 @@ public class RampartUtil {
return wssConfig;
}
+
-public static void validateTransport(RampartMessageData rmd) throws
RampartException {
-
-RampartPolicyData rpd = rmd.getPolicyData();
-
-if (rpd == null) {
-return;
-}
-
-if (rpd.isTransportBinding() && !rmd.isInitiator()) {
-if (rpd.getTransportToken() instanceof HttpsToken) {
-String incomingTransport =
rmd.getMsgContext().getIncomingTransportName();
-if
(!incomingTransport.equals(org.apache.axis2.Constants.TRANSPORT_HTTPS)) {
-throw new RampartException("invalidTransport",
-new String[]{incomingTransport});
+/**
+ * Validate transport binding policy assertions.
+ * In case an HttpsToken is required by the security policy the method
will verify that the
+ * HTTPS transport was used indeed. Furthermore if the assertion requires
a client certificate
+ * being used, the method will try to obtain the client certificate chain
first from the
+ * message context properties directly under the key {@link
RampartConstants#HTTPS_CLIENT_CERT_KEY}
+ * and, if the property is not available, will try to get the
HttpsServletRequest from the
+ * message context properties (populated there by the AxisServlet if axis2
is running inside a servlet
+ * engine) and retrieve the https client certificate chain from its
attributes. The client certificate
+ * chain is expected to be available under the
javax.servlet.request.X509Certificate
+ * attribute of the servlet request. No further trust verification is done
for the client
+ * certificate - the transport listener should have already verified this.
+ *
+ * @param messageData
+ * @throws RampartException
+ */
+public static void validateTransport(RampartMessageData messageData)
throws RampartException {
+
+MessageContext msgContext = messageData.getMsgContext();
+RampartPolicyData policyData = messageData.getPolicyData();
+AxisConfiguration axisConf =
msgContext.getConfigurationContext().getAxisConfiguration();
+
+if(policyData != null && policyData.isTransportBinding() &&
!messageData.isInitiator()){
+if (policyData.getTransportToken() instance
