You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2017/02/06 10:05:38 UTC
svn commit: r1781857 [1/7] - in
/axis/axis2/java/rampart/branches/RAMPART-390: ./ apidocs/ code-coverage/
etc/ modules/distribution/ modules/distribution/src/ modules/documentation/
modules/rampart-core/ modules/rampart-core/src/main/java/META-INF/ mod...
Author: veithen
Date: Mon Feb 6 10:05:36 2017
New Revision: 1781857
URL: http://svn.apache.org/viewvc?rev=1781857&view=rev
Log:
Merge changes from trunk.
Added:
axis/axis2/java/rampart/branches/RAMPART-390/LICENSE
- copied unchanged from r1781856, axis/axis2/java/rampart/trunk/LICENSE
axis/axis2/java/rampart/branches/RAMPART-390/NOTICE
- copied unchanged from r1781856, axis/axis2/java/rampart/trunk/NOTICE
axis/axis2/java/rampart/branches/RAMPART-390/README
- copied unchanged from r1781856, axis/axis2/java/rampart/trunk/README
axis/axis2/java/rampart/branches/RAMPART-390/apidocs/
- copied from r1781856, axis/axis2/java/rampart/trunk/apidocs/
axis/axis2/java/rampart/branches/RAMPART-390/code-coverage/
- copied from r1781856, axis/axis2/java/rampart/trunk/code-coverage/
axis/axis2/java/rampart/branches/RAMPART-390/etc/
- copied from r1781856, axis/axis2/java/rampart/trunk/etc/
axis/axis2/java/rampart/branches/RAMPART-390/modules/distribution/src/
- copied from r1781856, axis/axis2/java/rampart/trunk/modules/distribution/src/
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartUsernameTokenValidator.java
- copied unchanged from r1781856, axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartUsernameTokenValidator.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/main/java/org/apache/rampart/policy/builders/KerberosConfigBuilder.java
- copied unchanged from r1781856, axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/builders/KerberosConfigBuilder.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/main/java/org/apache/rampart/policy/model/KerberosConfig.java
- copied unchanged from r1781856, axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/model/KerberosConfig.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/main/resources/
- copied from r1781856, axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/resources/
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/test/
- copied from r1781856, axis/axis2/java/rampart/trunk/modules/rampart-core/src/test/
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-integration/src/main/java/org/apache/axis2/integration/TestConstants.java
- copied unchanged from r1781856, axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/java/org/apache/axis2/integration/TestConstants.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-integration/src/test/java/org/apache/rampart/KerberosDelegationService.java
- copied unchanged from r1781856, axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/java/org/apache/rampart/KerberosDelegationService.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-integration/src/test/java/org/apache/rampart/KerberosDelegationServiceValidator.java
- copied unchanged from r1781856, axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/java/org/apache/rampart/KerberosDelegationServiceValidator.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-integration/src/test/java/org/apache/rampart/RampartKerberosTest.java
- copied unchanged from r1781856, axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/java/org/apache/rampart/RampartKerberosTest.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-integration/src/test/java/org/apache/rampart/util/
- copied from r1781856, axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/java/org/apache/rampart/util/
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-integration/src/test/resources/kerberos/
- copied from r1781856, axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/kerberos/
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-integration/src/test/resources/rahas/1.xml
- copied unchanged from r1781856, axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rahas/1.xml
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-integration/src/test/resources/rahas/3.xml
- copied unchanged from r1781856, axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rahas/3.xml
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-integration/src/test/resources/rampart/kerberos/
- copied from r1781856, axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rampart/kerberos/
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-integration/src/test/resources/rampart/policy/35.xml
- copied unchanged from r1781856, axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rampart/policy/35.xml
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-integration/src/test/resources/rampart/services-35.xml
- copied unchanged from r1781856, axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rampart/services-35.xml
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/KerberosToken.java
- copied unchanged from r1781856, axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/KerberosToken.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptionTokenBuilder.java
- copied unchanged from r1781856, axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptionTokenBuilder.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/KerberosTokenBuilder.java
- copied unchanged from r1781856, axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/KerberosTokenBuilder.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignatureTokenBuilder.java
- copied unchanged from r1781856, axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignatureTokenBuilder.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptionTokenBuilder.java
- copied unchanged from r1781856, axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptionTokenBuilder.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/KerberosTokenBuilder.java
- copied unchanged from r1781856, axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/KerberosTokenBuilder.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignatureTokenBuilder.java
- copied unchanged from r1781856, axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignatureTokenBuilder.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/resources/
- copied from r1781856, axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/resources/
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/test/
- copied from r1781856, axis/axis2/java/rampart/trunk/modules/rampart-policy/src/test/
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-samples/policy/sample09/
- copied from r1781856, axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample09/
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-samples/src/
- copied from r1781856, axis/axis2/java/rampart/trunk/modules/rampart-samples/src/
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-tests/test-resources/policy-symm-binding-fault1.xml
- copied unchanged from r1781856, axis/axis2/java/rampart/trunk/modules/rampart-tests/test-resources/policy-symm-binding-fault1.xml
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-tests/test-resources/policy/rampart-hashed-password.xml
- copied unchanged from r1781856, axis/axis2/java/rampart/trunk/modules/rampart-tests/test-resources/policy/rampart-hashed-password.xml
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-tests/test-resources/policy/rampart-plaintext-password.xml
- copied unchanged from r1781856, axis/axis2/java/rampart/trunk/modules/rampart-tests/test-resources/policy/rampart-plaintext-password.xml
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-tests/test-resources/policy/soapmessage12.xml
- copied unchanged from r1781856, axis/axis2/java/rampart/trunk/modules/rampart-tests/test-resources/policy/soapmessage12.xml
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-trust/src/main/resources/
- copied from r1781856, axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/resources/
axis/axis2/java/rampart/branches/RAMPART-390/src/
- copied from r1781856, axis/axis2/java/rampart/trunk/src/
Removed:
axis/axis2/java/rampart/branches/RAMPART-390/build.xml
axis/axis2/java/rampart/branches/RAMPART-390/modules/documentation/
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/main/java/META-INF/
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/main/java/org/apache/rampart/errors.properties
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSDoAllHandler.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSDoAllReceiver.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSDoAllSender.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/main/java/org/apache/rampart/handler/config/
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/main/java/org/apache/rampart/util/HandlerParameterDecoder.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-integration/src/main/java/org/apache/axis2/integration/UtilServer.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-integration/src/main/java/org/apache/axis2/integration/UtilServerBasedTestCase.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-integration/src/main/java/org/apache/axis2/security/
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-integration/src/main/resources/ping/
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-integration/src/test/java/org/apache/axis2/
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-integration/src/test/resources/rahas/issuer.properties
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-integration/src/test/resources/rahas/rahas-sec.properties
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-integration/src/test/resources/rahas/saml.s1.properties
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-integration/src/test/resources/rahas/samlIssuer.properties
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-integration/src/test/resources/security/
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/META-INF/
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-samples/basic/
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-samples/build.xml
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-tests/src/test/java/org/apache/rampart/handler/config/
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-trust/src/main/java/META-INF/
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-trust/src/main/java/org/apache/rahas/errors.properties
axis/axis2/java/rampart/branches/RAMPART-390/release-docs/
Modified:
axis/axis2/java/rampart/branches/RAMPART-390/ (props changed)
axis/axis2/java/rampart/branches/RAMPART-390/modules/distribution/ (props changed)
axis/axis2/java/rampart/branches/RAMPART-390/modules/distribution/bin.xml
axis/axis2/java/rampart/branches/RAMPART-390/modules/distribution/pom.xml
axis/axis2/java/rampart/branches/RAMPART-390/modules/distribution/src.xml
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/pom.xml
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/main/java/org/apache/rampart/ExtendedPolicyValidatorCallbackHandler.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/main/java/org/apache/rampart/NonceCache.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/main/java/org/apache/rampart/handler/PostDispatchVerificationHandler.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyData.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/main/java/org/apache/rampart/policy/SupportingPolicyData.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/main/java/org/apache/rampart/policy/builders/RampartConfigBuilder.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/main/java/org/apache/rampart/policy/model/RampartConfig.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-integration/pom.xml
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-integration/src/main/java/org/apache/rahas/PWCallback.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-integration/src/main/java/org/apache/rahas/TestClient.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-integration/src/test/java/org/apache/rahas/RahasSAML2TokenCertForHoKTest.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-integration/src/test/java/org/apache/rahas/RahasSAML2TokenTest.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-integration/src/test/java/org/apache/rahas/RahasSAML2TokenUTForBearerTest.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-integration/src/test/java/org/apache/rahas/RahasSAMLTokenAttributeTest.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-integration/src/test/java/org/apache/rahas/RahasSAMLTokenCertForHoKTest.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-integration/src/test/java/org/apache/rahas/RahasSAMLTokenCertForHoKV1205Test.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-integration/src/test/java/org/apache/rahas/RahasSAMLTokenTest.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-integration/src/test/java/org/apache/rahas/RahasSAMLTokenUTForBearerTest.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-integration/src/test/java/org/apache/rahas/RahasSAMLTokenUTForBearerV1205Test.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-integration/src/test/java/org/apache/rahas/RahasSAMLTokenUTForHoKTest.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-integration/src/test/java/org/apache/rahas/RahasSAMLTokenUTForHoKV1205Test.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-integration/src/test/java/org/apache/rahas/RahasSAMLTokenV1205Test.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-integration/src/test/resources/conf/axis2.xml
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-integration/src/test/resources/log4j.properties
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-integration/src/test/resources/rahas/s1-services.xml
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-integration/src/test/resources/rahas/s3-services.xml
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-integration/src/test/resources/rahas/s5-services.xml
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-mar/module.xml
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-mar/pom.xml
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/pom.xml
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/Constants.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/SP11Constants.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/SP12Constants.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/SPConstants.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AbstractConfigurableSecurityAssertion.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AbstractSecurityAssertion.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AsymmetricBinding.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/ContentEncryptedElements.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/RequiredElements.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/RequiredParts.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedElements.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedParts.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SupportingToken.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SymmetricBinding.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/TransportBinding.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Trust10.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Trust13.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/UsernameToken.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/AlgorithmSuiteBuilder.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/AsymmetricBindingBuilder.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/InitiatorTokenBuilder.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/IssuedTokenBuilder.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/LayoutBuilder.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/ProtectionTokenBuilder.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/RecipientTokenBuilder.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedPartsBuilder.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SupportingTokensBuilder.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SymmetricBindingBuilder.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/TransportBindingBuilder.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/TransportTokenBuilder.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilder.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/WSS10Builder.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/WSS11Builder.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/X509TokenBuilder.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/AlgorithmSuiteBuilder.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/AsymmetricBindingBuilder.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/HttpsTokenBuilder.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/InitiatorTokenBuilder.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/IssuedTokenBuilder.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/LayoutBuilder.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/ProtectionTokenBuilder.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/RecipientTokenBuilder.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedPartsBuilder.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SupportingTokensBuilder.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SymmetricBindingBuilder.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/TransportBindingBuilder.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/TransportTokenBuilder.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/UsernameTokenBuilder.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/WSS10Builder.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/WSS11Builder.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/X509TokenBuilder.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-samples/ (props changed)
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-samples/README.txt
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-samples/keys/service.jks
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-samples/policy/build.xml
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-samples/policy/sample01/README.txt
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-samples/policy/sample01/services.xml
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-samples/policy/sample01/src/org/apache/rampart/samples/policy/sample01/Client.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-samples/policy/sample02/src/org/apache/rampart/samples/policy/sample02/Client.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-samples/policy/sample03/src/org/apache/rampart/samples/policy/sample03/Client.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-samples/policy/sample04/src/org/apache/rampart/samples/policy/sample04/Client.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-samples/policy/sample05/policy.xml
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-samples/policy/sample05/src/org/apache/rampart/samples/policy/sample05/Client.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-samples/policy/sample06/policy.xml
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-samples/policy/sample06/services.xml
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-samples/policy/sample06/src/org/apache/rampart/samples/policy/sample06/Client.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-samples/policy/sample06/src/org/apache/rampart/samples/policy/sample06/MexService.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-samples/policy/sample07/src/org/apache/rampart/samples/policy/sample07/Client.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-samples/policy/sample08/policy.xml
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-samples/policy/sample08/src/org/apache/rampart/samples/policy/sample08/Client.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-samples/pom.xml
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-tests/pom.xml
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-tests/src/test/java/org/apache/rahas/SimpleTokenStoreTest.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-tests/src/test/java/org/apache/rampart/AsymmetricBindingBuilderTest.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-tests/src/test/java/org/apache/rampart/MessageBuilderTestBase.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-tests/src/test/java/org/apache/rampart/PolicyAssertionsTest.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-tests/src/test/java/org/apache/rampart/RampartEngineTest.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-tests/src/test/java/org/apache/rampart/SymmetricBindingBuilderTest.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-tests/src/test/java/org/apache/rampart/TransportBindingBuilderTest.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-tests/src/test/java/org/apache/ws/secpolicy/model/SecpolicyModelTest.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-tests/test-resources/axis2.xml
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-trust-mar/pom.xml
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-trust/pom.xml
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-trust/src/main/java/org/apache/rahas/RahasData.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-trust/src/main/java/org/apache/rahas/STSMessageReceiver.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-trust/src/main/java/org/apache/rahas/SimpleTokenStore.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAML2TokenIssuer.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SCTIssuerConfig.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-trust/src/main/java/org/apache/rahas/impl/TokenCancelerConfig.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-trust/src/main/java/org/apache/rahas/impl/TokenIssuerUtil.java
axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/SAMLUtils.java
axis/axis2/java/rampart/branches/RAMPART-390/pom.xml
Propchange: axis/axis2/java/rampart/branches/RAMPART-390/
------------------------------------------------------------------------------
--- svn:auto-props (added)
+++ svn:auto-props Mon Feb 6 10:05:36 2017
@@ -0,0 +1,2 @@
+*.java = svn:eol-style=native
+*.xml = svn:eol-style=native
Propchange: axis/axis2/java/rampart/branches/RAMPART-390/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Feb 6 10:05:36 2017
@@ -1 +1,3 @@
+.project
+.settings
target
Propchange: axis/axis2/java/rampart/branches/RAMPART-390/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Feb 6 10:05:36 2017
@@ -0,0 +1,4 @@
+/axis/axis2/java/rampart/branches/RAMPART-339:1780859-1780938
+/axis/axis2/java/rampart/branches/RAMPART-423:1778774-1781006
+/axis/axis2/java/rampart/branches/RAMPART-433:1778760-1780751
+/axis/axis2/java/rampart/trunk:1357263-1781856
Propchange: axis/axis2/java/rampart/branches/RAMPART-390/modules/distribution/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Feb 6 10:05:36 2017
@@ -1 +1,3 @@
+.project
+.settings
target
Modified: axis/axis2/java/rampart/branches/RAMPART-390/modules/distribution/bin.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-390/modules/distribution/bin.xml?rev=1781857&r1=1781856&r2=1781857&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-390/modules/distribution/bin.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-390/modules/distribution/bin.xml Mon Feb 6 10:05:36 2017
@@ -1,23 +1,23 @@
<assembly>
<id>bin</id>
- <includeBaseDirectory>false</includeBaseDirectory>
+ <baseDirectory>rampart-${version}</baseDirectory>
<formats>
<format>zip</format>
</formats>
<dependencySets>
<dependencySet>
- <outputDirectory>${dist.dir}/modules</outputDirectory>
+ <outputDirectory>modules</outputDirectory>
<includes>
<include>org.apache.rampart:rampart:mar</include>
<include>org.apache.rampart:rahas:mar</include>
</includes>
</dependencySet>
<dependencySet>
- <outputDirectory>${dist.dir}/lib</outputDirectory>
+ <outputDirectory>lib</outputDirectory>
<includes>
<include>org.apache.santuario:xmlsec:jar</include>
<include>org.apache.ws.security:wss4j:jar</include>
- <include>bouncycastle:bcprov-jdk15:jar</include>
+ <include>org.bouncycastle:bcprov-jdk15on:jar</include>
<include>org.apache.rampart:rampart-core:jar</include>
<include>org.apache.rampart:rampart-policy:jar</include>
<include>org.apache.rampart:rampart-trust:jar</include>
@@ -37,46 +37,48 @@
<include>org.owasp.esapi:esapi:jar</include>
</includes>
</dependencySet>
+ <dependencySet>
+ <outputDirectory>docs/apidocs</outputDirectory>
+ <includes>
+ <include>*:apidocs:zip</include>
+ </includes>
+ <useProjectArtifact>false</useProjectArtifact>
+ <unpack>true</unpack>
+ </dependencySet>
</dependencySets>
<fileSets>
<fileSet>
- <directory>target/apidocs</directory>
- <outputDirectory>${dist.dir}/docs/apidocs</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>../documentation/target/site</directory>
- <outputDirectory>${dist.dir}/docs</outputDirectory>
- </fileSet>
- <fileSet>
<directory>../rampart-samples</directory>
- <outputDirectory>${dist.dir}/samples</outputDirectory>
+ <outputDirectory>samples</outputDirectory>
+ <excludes>
+ <exclude>pom.xml</exclude>
+ <exclude>target/**</exclude>
+ </excludes>
</fileSet>
<fileSet>
<directory>../../legal</directory>
- <outputDirectory>${dist.dir}/lib</outputDirectory>
+ <outputDirectory>lib</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/files</directory>
+ <outputDirectory>.</outputDirectory>
</fileSet>
</fileSets>
<files>
<file>
- <source>../../release-docs/README.txt</source>
- <outputDirectory>${dist.dir}</outputDirectory>
- <destName>README</destName>
+ <source>../../README</source>
<filtered>true</filtered>
</file>
<file>
- <source>../../release-docs/LICENSE.txt</source>
- <outputDirectory>${dist.dir}</outputDirectory>
- <destName>LICENSE</destName>
+ <source>../../LICENSE</source>
</file>
<file>
- <source>../../release-docs/NOTICE.txt</source>
- <outputDirectory>${dist.dir}</outputDirectory>
- <destName>NOTICE</destName>
+ <source>../../NOTICE</source>
</file>
<file>
- <source>../../release-docs/release-notes.html</source>
- <outputDirectory>${dist.dir}</outputDirectory>
+ <source>../../src/site/markdown/release-notes/${release_version}.md</source>
+ <destName>RELEASE-NOTE</destName>
</file>
</files>
Modified: axis/axis2/java/rampart/branches/RAMPART-390/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-390/modules/distribution/pom.xml?rev=1781857&r1=1781856&r2=1781857&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-390/modules/distribution/pom.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-390/modules/distribution/pom.xml Mon Feb 6 10:05:36 2017
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-project</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -36,42 +36,8 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <id>build-javadoc</id>
- <phase>package</phase>
- <configuration>
- <tasks>
- <javadoc packagenames="org.apache.rampart.*,org.apache.rahas.*" destdir="target/apidocs" author="true" breakiterator="true" version="true" use="true" windowtitle="Apache Rampart API">
-
- <sourcepath>
- <dirset dir="../..">
- <include name="**/rampart-core/src/main/java" />
- <include name="**/rampart-policy/src/main/java" />
- <include name="**/rampart-trust/src/main/java" />
- </dirset>
- </sourcepath>
-
- <classpath refid="maven.dependency.classpath" />
- <classpath refid="maven.compile.classpath" />
- <classpath refid="maven.runtime.classpath" />
-
- </javadoc>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>gmaven-plugin</artifactId>
- <version>1.2</version>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
<executions>
<execution>
<id>generate-timestamp</id>
@@ -80,11 +46,14 @@
<goal>execute</goal>
</goals>
<configuration>
- <source>
- import java.util.Date
- import java.text.MessageFormat
- project.properties['buildTimestamp'] = MessageFormat.format("{0,date,MMM dd, yyyy}", new Date())
- </source>
+ <scripts>
+ <script>
+ import java.util.Date
+ import java.text.MessageFormat
+ project.properties['buildTimestamp'] = MessageFormat.format("{0,date,MMM dd, yyyy}", new Date())
+ project.properties['release_version'] = project.version.replaceAll("-SNAPSHOT", "")
+ </script>
+ </scripts>
</configuration>
</execution>
</executions>
@@ -108,6 +77,24 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>net.ju-n.maven.plugins</groupId>
+ <artifactId>checksum-maven-plugin</artifactId>
+ <version>1.2</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>artifacts</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -140,14 +127,20 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk15</artifactId>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
<version>${bcprov.jdk15.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jcl</artifactId>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apidocs</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
</dependencies>
</project>
Modified: axis/axis2/java/rampart/branches/RAMPART-390/modules/distribution/src.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-390/modules/distribution/src.xml?rev=1781857&r1=1781856&r2=1781857&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-390/modules/distribution/src.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-390/modules/distribution/src.xml Mon Feb 6 10:05:36 2017
@@ -1,6 +1,6 @@
<assembly>
<id>src</id>
- <includeBaseDirectory>false</includeBaseDirectory>
+ <baseDirectory>rampart-src-${project.version}</baseDirectory>
<formats>
<format>zip</format>
</formats>
@@ -8,36 +8,56 @@
<fileSets>
<fileSet>
<directory>../..</directory>
- <outputDirectory>rampart-src-${project.version}</outputDirectory>
- <includes>
- <include>**/modules/**/*</include>
- <include>**/pom.xml</include>
- <include>src</include>
- <include>release-docs/*</include>
- </includes>
+ <useDefaultExcludes>true</useDefaultExcludes>
<excludes>
- <exclude>**/target</exclude>
- <exclude>**/target/**/*</exclude>
- <exclude>**/build</exclude>
- <exclude>**/build/**/*</exclude>
- <exclude>**/.settings</exclude>
- <exclude>**/.classpath</exclude>
- <exclude>**/.project</exclude>
- <exclude>**/.wtpmodules</exclude>
- <exclude>**/*.iml</exclude>
- <exclude>**/.settings</exclude>
- <exclude>**/.settings/**/*</exclude>
- <exclude>**/.svn/**</exclude>
- <exclude>release-docs/README.txt</exclude>
+ <!-- build output -->
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/).*${project.build.directory}.*]</exclude>
+
+ <!-- NOTE: Most of the following excludes should not be required
+ if the standard release process is followed. This is because the
+ release plugin checks out project sources into a location like
+ target/checkout, then runs the build from there. The result is
+ a source-release archive that comes from a pretty clean directory
+ structure.
+
+ HOWEVER, if the release plugin is configured to run extra goals
+ or generate a project website, it's definitely possible that some
+ of these files will be present. So, it's safer to exclude them.
+ -->
+
+ <!-- IDEs -->
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?maven-eclipse\.xml]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.project]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.classpath]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iws]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.idea(/.*)?]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?out(/.*)?]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.ipr]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iml]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.settings(/.*)?]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.externalToolBuilders(/.*)?]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.deployables(/.*)?]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.wtpmodules(/.*)?]</exclude>
+
+ <!-- misc -->
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?cobertura\.ser]</exclude>
+
+ <!-- release-plugin temp files -->
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?pom\.xml\.releaseBackup]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?release\.properties]</exclude>
+
+ <exclude>README</exclude>
</excludes>
</fileSet>
- <fileSet>
- <directory>../..</directory>
- <outputDirectory>rampart-src-${project.version}</outputDirectory>
- <filtered>true</filtered>
- <includes>
- <include>release-docs/README.txt</include>
- </includes>
- </fileSet>
</fileSets>
+ <files>
+ <file>
+ <source>../../README</source>
+ <filtered>true</filtered>
+ </file>
+ <file>
+ <source>../../src/site/markdown/release-notes/${release_version}.md</source>
+ <destName>RELEASE-NOTE</destName>
+ </file>
+ </files>
</assembly>
Modified: axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/pom.xml?rev=1781857&r1=1781856&r2=1781857&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/pom.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/pom.xml Mon Feb 6 10:05:36 2017
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-project</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -34,30 +34,38 @@
<packaging>jar</packaging>
<name>Rampart - Core</name>
- <build>
- <sourceDirectory>src/main/java</sourceDirectory>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-kernel</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-mtompolicy</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>mex</artifactId>
+ <classifier>impl</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.security</groupId>
+ <artifactId>wss4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.opensaml</groupId>
+ <artifactId>opensaml</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-policy</artifactId>
<version>${project.version}</version>
@@ -72,19 +80,15 @@
<artifactId>axiom-dom</artifactId>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-truth</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-5</version>
- <configuration>
- <templateDirectory>${basedir}</templateDirectory>
- <menu ref="parent" />
- </configuration>
- </plugin>
- </plugins>
- </reporting>
</project>
Modified: axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/main/java/org/apache/rampart/ExtendedPolicyValidatorCallbackHandler.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/main/java/org/apache/rampart/ExtendedPolicyValidatorCallbackHandler.java?rev=1781857&r1=1781856&r2=1781857&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/main/java/org/apache/rampart/ExtendedPolicyValidatorCallbackHandler.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/main/java/org/apache/rampart/ExtendedPolicyValidatorCallbackHandler.java Mon Feb 6 10:05:36 2017
@@ -3,7 +3,6 @@ package org.apache.rampart;
import org.apache.ws.security.WSSecurityEngineResult;
import java.util.List;
-import java.util.Vector;
/**
* This is an extension of the PolicyValidatorCallbackHandler. PolicyValidatorCallbackHandler uses Vector
Modified: axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/main/java/org/apache/rampart/NonceCache.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/main/java/org/apache/rampart/NonceCache.java?rev=1781857&r1=1781856&r2=1781857&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/main/java/org/apache/rampart/NonceCache.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/main/java/org/apache/rampart/NonceCache.java Mon Feb 6 10:05:36 2017
@@ -140,12 +140,12 @@ public class NonceCache extends Abstract
rightNow.add(Calendar.SECOND, -(maxLifeTime));
long timeBeforeMaxLifeTime = rightNow.getTimeInMillis();
- Iterator iterator = mapIdNonce.entrySet().iterator();
+ Iterator<Map.Entry<Nonce, Calendar>> iterator = mapIdNonce.entrySet().iterator();
while (iterator.hasNext()) {
- Map.Entry pair = (Map.Entry)iterator.next();
- Calendar itemDate = (Calendar)pair.getValue();
+ Map.Entry<Nonce, Calendar> pair = iterator.next();
+ Calendar itemDate = pair.getValue();
long itemAddedTime = itemDate.getTimeInMillis();
Modified: axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java?rev=1781857&r1=1781856&r2=1781857&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java Mon Feb 6 10:05:36 2017
@@ -39,7 +39,6 @@ import org.jaxen.JaxenException;
import javax.xml.namespace.QName;
import java.math.BigInteger;
-import java.security.KeyStore;
import java.security.cert.X509Certificate;
import java.util.*;
@@ -317,13 +316,34 @@ public class PolicyBasedResultsValidator
UsernameToken ut = (UsernameToken) token;
//Check presence of a UsernameToken
WSSecurityEngineResult utResult = WSSecurityUtil.fetchActionResult(results, WSConstants.UT);
+
if (utResult == null && !ut.isOptional()) {
throw new RampartException("usernameTokenMissing");
}
+
+ org.apache.ws.security.message.token.UsernameToken wssUt =
+ (org.apache.ws.security.message.token.UsernameToken) utResult.get(WSSecurityEngineResult.TAG_USERNAME_TOKEN);
+
+ if(ut.isNoPassword() && wssUt.getPassword() != null) {
+ throw new RampartException("invalidUsernameTokenType");
+ }
+
+ if(ut.isHashPassword() && !wssUt.isHashed()) {
+ throw new RampartException("invalidUsernameTokenType");
+ } else if (!ut.isHashPassword() && (wssUt.getPassword() == null ||
+ !wssUt.getPasswordType().equals(WSConstants.PASSWORD_TEXT))) {
+ throw new RampartException("invalidUsernameTokenType");
+ }
+
+
} else if (token instanceof IssuedToken) {
- //TODO is is enough to check for ST_UNSIGNED results ??
- WSSecurityEngineResult samlResult = WSSecurityUtil.fetchActionResult(results, WSConstants.ST_UNSIGNED);
+ WSSecurityEngineResult samlResult = WSSecurityUtil.fetchActionResult(results, WSConstants.ST_SIGNED);
+ // Then check for unsigned saml tokens
+ if (samlResult == null) {
+ log.debug("No signed SAMLToken found. Looking for unsigned SAMLTokens");
+ samlResult = WSSecurityUtil.fetchActionResult(results, WSConstants.ST_UNSIGNED);
+ }
if (samlResult == null) {
throw new RampartException("samlTokenMissing");
}
Modified: axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java?rev=1781857&r1=1781856&r2=1781857&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java Mon Feb 6 10:05:36 2017
@@ -16,13 +16,8 @@
package org.apache.rampart;
-import org.apache.axiom.soap.SOAP11Constants;
-import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFault;
-import org.apache.axiom.soap.SOAPFaultCode;
-import org.apache.axiom.soap.SOAPFaultSubCode;
-import org.apache.axiom.soap.SOAPFaultValue;
import org.apache.axiom.soap.SOAPHeader;
import org.apache.axiom.soap.SOAPHeaderBlock;
import org.apache.axis2.AxisFault;
@@ -32,17 +27,39 @@ import org.apache.commons.logging.LogFac
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.ws.secpolicy.WSSPolicyException;
-import org.apache.ws.security.*;
+import org.apache.ws.secpolicy.model.KerberosToken;
+import org.apache.ws.secpolicy.model.SupportingToken;
+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.apache.ws.security.WSUsernameTokenPrincipal;
import org.apache.ws.security.components.crypto.Crypto;
+import org.apache.ws.security.validate.KerberosTokenDecoder;
+import org.apache.ws.security.validate.KerberosTokenValidator;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.UnsupportedCallbackException;
import javax.xml.namespace.QName;
+
+import java.io.IOException;
import java.security.cert.X509Certificate;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Vector;
public class RampartEngine {
@@ -88,8 +105,93 @@ public class RampartEngine {
List<WSSecurityEngineResult> results;
WSSecurityEngine engine = new WSSecurityEngine();
+
+ //Set rampart's configuration of WSS4J
+ engine.setWssConfig(rmd.getConfig());
+
+ RampartConfig rampartConfig = rpd.getRampartConfig();
+ if (rampartConfig != null) {
+ WSSConfig config = engine.getWssConfig();
+
+ // Inbound Kerberos authentication for web services
+ // Check the service policy for Kerberos token and add KerberosTokenValidator for BINARY_TOKEN validation
+ SupportingToken endSupptokens = rpd.getEndorsingSupportingTokens();
+ if (endSupptokens != null && endSupptokens.getTokens() != null &&
+ endSupptokens.getTokens().size() > 0) {
+
+ log.debug("Processing endorsing supporting tokens");
+
+ for (org.apache.ws.secpolicy.model.Token token : endSupptokens.getTokens()) {
+ if (token instanceof KerberosToken) {
+ log.debug("KerberosToken is found as part of the endorsing supporting tokens.Check for KerberosConfig.");
+ KerberosConfig kerberosConfig = rampartConfig.getKerberosConfig();
+
+ if (null != kerberosConfig){
+ log.debug("KerberosConfig is found.");
+ log.debug("Creating KerberosTokenValidor with the available KerberosConfig.");
+ KerberosTokenValidator kerberosValidator = new KerberosTokenValidator();
+
+ KerberosTokenDecoder kerberosTokenDecoder = RampartUtil.getKerberosTokenDecoder(msgCtx, kerberosConfig);
+ if (kerberosTokenDecoder != null) {
+ kerberosValidator.setKerberosTokenDecoder(kerberosTokenDecoder);
+ }
+ kerberosValidator.setContextName(kerberosConfig.getJaasContext());
+ kerberosValidator.setServiceName(kerberosConfig.getServicePrincipalName());
+ String serviceNameForm = kerberosConfig.getServicePrincipalNameForm();
+
+ if (KerberosConfig.USERNAME_NAME_FORM.equals(serviceNameForm)) {
+ kerberosValidator.setUsernameServiceNameForm(true);
+ }
+
+ String principalName = kerberosConfig.getPrincipalName();
+ if (null == principalName){
+ log.debug("Principal name is not available in the KerberosConfig.Using the Rampart configuration's user.");
+ principalName = rampartConfig.getUser();
+ }
+
+ String password = kerberosConfig.getPrincipalPassword();
+ if (password == null) {
+ log.debug("Principal password is not available in the KerberosConfig.Trying with the configured Rampart password callback.");
+ CallbackHandler handler = RampartUtil.getPasswordCB(rmd);
+
+ if (handler != null) {
+ WSPasswordCallback[] cb = {
+ new WSPasswordCallback(principalName, WSPasswordCallback.CUSTOM_TOKEN)
+ };
+
+ try {
+ handler.handle(cb);
+ if (cb[0].getPassword() != null && !"".equals(cb[0].getPassword())) {
+ password = cb[0].getPassword();
+ }
+ } catch (IOException e) {
+ throw new RampartException("errorInGettingPasswordForUser", new String[] { principalName }, e);
+ } catch (UnsupportedCallbackException e) {
+ throw new RampartException("errorInGettingPasswordForUser", new String[] { principalName }, e);
+ }
+ } else{
+ log.debug("No Rampart password handler is configured.");
+ }
+ }
+
+ if (principalName != null && password != null) {
+ NamePasswordCallbackHandler cb = new NamePasswordCallbackHandler(principalName, password);
+ kerberosValidator.setCallbackHandler(cb);
+ }
+
+ config.setValidator(WSSecurityEngine.BINARY_TOKEN, kerberosValidator);
+ log.debug("KerberosTokenValidator is configured and set for BINARY_TOKEN.");
+ } else {
+ log.debug("KerberosConfig is not found.Skipping configurating and setting of a Kerberos validator.");
+ }
+ }
+ }
+ }
+
+ engine.setWssConfig(config);
+ }
- ValidatorData data = new ValidatorData(rmd);
+ ValidatorData data = new ValidatorData(rmd);
SOAPHeader header = rmd.getMsgContext().getEnvelope().getHeader();
if(header == null) {
@@ -119,8 +221,20 @@ public class RampartEngine {
t0 = System.currentTimeMillis();
}
- String actorValue = secHeader.getAttributeValue(new QName(rmd
- .getSoapConstants().getEnvelopeURI(), "actor"));
+ //wss4j does not allow username tokens with no password per default, see https://issues.apache.org/jira/browse/WSS-420
+ //configure it to allow them explicitly if at least one username token assertion with no password requirement is found
+ if (!rmd.isInitiator()) {
+ Collection<UsernameToken> usernameTokens = RampartUtil.getUsernameTokens(rpd);
+ for (UsernameToken usernameTok : usernameTokens) {
+ if (usernameTok.isNoPassword()) {
+ log.debug("Found UsernameToken with no password assertion in policy, configuring ws security processing to allow username tokens without password." );
+ engine.getWssConfig().setAllowUsernameTokenNoPassword(true);
+ break;
+ }
+ }
+ }
+
+ String actorValue = secHeader.getRole();
Crypto signatureCrypto = RampartUtil.getSignatureCrypto(rpd.getRampartConfig(),
msgCtx.getAxisService().getClassLoader());
@@ -165,89 +279,90 @@ public class RampartEngine {
//Store username in MessageContext property
- 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()) {
+ if (results != null) {
+ 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);
+ Object samlAssertion = wser.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
- SAMLAssertionHandler samlAssertionHandler
- = SAMLAssertionHandlerFactory.createAssertionHandler(samlAssertion);
+ 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);
+ if (samlAssertionHandler.isBearerAssertion()) {
+ break;
}
- } catch (Exception e) {
- throw new RampartException(
- "errorInAddingTokenIntoStore", e);
- }
- } else if (WSConstants.UT == actInt) {
+ //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);
+ 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;
+ 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);
- if (rpd.getRampartConfig() != null) {
-
- String stringLifeTime = rpd.getRampartConfig().getNonceLifeTime();
+ }
+ }
- try {
- nonceLifeTimeInSeconds = Integer.parseInt(stringLifeTime);
+ String serviceEndpointName = msgCtx.getAxisService().getEndpointName();
- } catch (NumberFormatException e) {
- log.error("Invalid value for nonceLifeTime in rampart configuration file.", e);
- throw new RampartException(
- "invalidNonceLifeTime", e);
+ boolean valueRepeating = serviceNonceCache.isNonceRepeatingForService(serviceEndpointName, username, userNameTokenPrincipal.getNonce());
+ if (valueRepeating){
+ throw new RampartException("repeatingNonceValue", new Object[]{ userNameTokenPrincipal.getNonce(), username} );
}
- }
-
- String serviceEndpointName = msgCtx.getAxisService().getEndpointName();
-
- boolean valueRepeating = serviceNonceCache.isNonceRepeatingForService(serviceEndpointName, username, userNameTokenPrincipal.getNonce());
- if (valueRepeating){
- throw new RampartException("repeatingNonceValue", new Object[]{ userNameTokenPrincipal.getNonce(), username} );
+ serviceNonceCache.addNonceForService(serviceEndpointName, username, userNameTokenPrincipal.getNonce(), nonceLifeTimeInSeconds);
}
+ } else if (WSConstants.SIGN == actInt) {
+ X509Certificate cert = (X509Certificate) wser.get(WSSecurityEngineResult.TAG_X509_CERTIFICATE);
- serviceNonceCache.addNonceForService(serviceEndpointName, username, userNameTokenPrincipal.getNonce(), nonceLifeTimeInSeconds);
- }
- } else if (WSConstants.SIGN == actInt) {
- X509Certificate cert = (X509Certificate) wser.get(WSSecurityEngineResult.TAG_X509_CERTIFICATE);
+ if (rpd.isAsymmetricBinding() && cert == null && rpd.getInitiatorToken() != null
+ && !rpd.getInitiatorToken().isDerivedKeys()) {
- if (rpd.isAsymmetricBinding() && cert == null && rpd.getInitiatorToken() != null
- && !rpd.getInitiatorToken().isDerivedKeys()) {
+ // If symmetric binding is used, the certificate should be null.
+ // If certificate is not null then probably initiator and
+ // recipient are using 2 different bindings.
+ throw new RampartException("invalidSignatureAlgo");
+ }
- // If symmetric binding is used, the certificate should be null.
- // If certificate is not null then probably initiator and
- // recipient are using 2 different bindings.
- throw new RampartException("invalidSignatureAlgo");
+ msgCtx.setProperty(RampartMessageData.X509_CERT, cert);
}
-
- msgCtx.setProperty(RampartMessageData.X509_CERT, cert);
}
-
}
SOAPEnvelope env = Axis2Util.getSOAPEnvelopeFromDOMDocument(rmd.getDocument(), true);
@@ -290,41 +405,7 @@ public class RampartEngine {
private boolean isSecurityFault(RampartMessageData rmd) {
-
- SOAPEnvelope soapEnvelope = rmd.getMsgContext().getEnvelope();
- SOAPFault soapFault = soapEnvelope.getBody().getFault();
-
- // This is not a soap fault
- if (soapFault == null) {
- return false;
- }
-
- String soapVersionURI = rmd.getMsgContext().getEnvelope().getNamespace().getNamespaceURI();
- SOAPFaultCode faultCode = soapFault.getCode();
- if(faultCode == null){
- //If no fault code is given, then it can't be security fault
- return false;
- }
-
- if (soapVersionURI.equals(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI)) {
- // This is a fault processing the security header
- if (faultCode.getTextAsQName().getNamespaceURI().equals(WSConstants.WSSE_NS)) {
- return true;
- }
- } else if (soapVersionURI.equals(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI)) {
- // TODO AXIOM API returns only one fault sub code, there can be many
- SOAPFaultSubCode faultSubCode = faultCode.getSubCode();
- if (faultSubCode != null) {
- SOAPFaultValue faultSubCodeValue = faultSubCode.getValue();
-
- // This is a fault processing the security header
- if (faultSubCodeValue != null && faultSubCodeValue.getTextAsQName().
- getNamespaceURI().equals(WSConstants.WSSE_NS)) {
- return true;
- }
- }
- }
-
- return false;
+ SOAPFault soapFault = rmd.getMsgContext().getEnvelope().getBody().getFault();
+ return soapFault == null ? false : RampartUtil.isSecurityFault(soapFault);
}
}
Modified: axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java?rev=1781857&r1=1781856&r2=1781857&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java Mon Feb 6 10:05:36 2017
@@ -26,12 +26,14 @@ import org.apache.axis2.description.Para
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.util.PolicyUtil;
import org.apache.axis2.wsdl.WSDLConstants;
+import org.apache.neethi.Assertion;
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyComponent;
import org.apache.neethi.PolicyEngine;
import org.apache.rahas.RahasConstants;
import org.apache.rahas.SimpleTokenStore;
import org.apache.rahas.TokenStorage;
+import org.apache.rampart.handler.RampartUsernameTokenValidator;
import org.apache.rampart.handler.WSSHandlerConstants;
import org.apache.rampart.policy.RampartPolicyBuilder;
import org.apache.rampart.policy.RampartPolicyData;
@@ -46,6 +48,7 @@ import org.apache.ws.secpolicy.WSSPolicy
import org.apache.ws.security.SOAPConstants;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSSConfig;
+import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSSecurityEngineResult;
import org.apache.ws.security.WSSecurityException;
import org.apache.ws.security.conversation.ConversationConstants;
@@ -175,6 +178,9 @@ public class RampartMessageData {
// Set the WSSConfig
this.config = WSSConfig.getNewInstance();
+ //Update the UsernameToken validator
+ this.config.setValidator(WSSecurityEngine.USERNAME_TOKEN, RampartUsernameTokenValidator.class);
+
// First obtain the axis service as we have to do a null check, there can be situations
// where Axis Service is null
AxisService axisService = msgCtx.getAxisService();
@@ -256,7 +262,7 @@ public class RampartMessageData {
}
if(this.servicePolicy != null){
- List it = (List)this.servicePolicy.getAlternatives().next();
+ List<Assertion> it = this.servicePolicy.getAlternatives().next();
//Process policy and build policy data
this.policyData = RampartPolicyBuilder.build(it);
@@ -384,7 +390,7 @@ public class RampartMessageData {
private void setWSSecurityVersions(String namespace) throws RampartException {
if (namespace == null || namespace.equals("")) {
- throw new RampartException("Security policy namespace cannot be null.");
+ throw new RampartException("securityPolicyNamespaceCannotBeNull");
}
if (SP11Constants.SP_NS.equals(namespace)) {
@@ -425,7 +431,7 @@ public class RampartMessageData {
this.servicePolicy.addAssertion(rc);
}
- List it = (List) this.servicePolicy.getAlternatives().next();
+ List<Assertion> it = this.servicePolicy.getAlternatives().next();
//Process policy and build policy data
try {
@@ -444,14 +450,6 @@ public class RampartMessageData {
}
/**
- * @param document The document to set.
- * @deprecated document is derived from MessageContext passed in constructor
- */
- public void setDocument(Document document) {
- this.document = document;
- }
-
- /**
* @return Returns the timeToLive.
*/
public int getTimeToLive() {
@@ -502,14 +500,6 @@ public class RampartMessageData {
}
/**
- * @param msgContext The msgContext to set.
- * @deprecated MessageContext is set in constructor
- */
- public void setMsgContext(MessageContext msgContext) {
- this.msgContext = msgContext;
- }
-
- /**
* @return Returns the policyData.
*/
public RampartPolicyData getPolicyData() {
@@ -517,28 +507,6 @@ public class RampartMessageData {
}
/**
- * @param policyData The policyData to set.
- * @deprecated Policy data determined within constructor
- */
- public void setPolicyData(RampartPolicyData policyData) throws RampartException {
- this.policyData = policyData;
-
- try {
- //if client side then check whether sig conf enabled
- //and get hold of the stored signature values
- if(this.isInitiator && !this.sender && policyData.isSignatureConfirmation()) {
- OperationContext opCtx = msgContext.getOperationContext();
- MessageContext outMsgCtx = opCtx
- .getMessageContext(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
- msgContext.setProperty(WSHandlerConstants.SEND_SIGV, outMsgCtx
- .getProperty(WSHandlerConstants.SEND_SIGV));
- }
- } catch (AxisFault e) {
- throw new RampartException("errorGettingSignatureValuesForSigconf", e);
- }
- }
-
- /**
* @return Returns the secHeader.
*/
public WSSecHeader getSecHeader() {
@@ -720,14 +688,6 @@ public class RampartMessageData {
}
/**
- * @param wstVersion The wstVersion to set.
- * @deprecated This is defined by the class.
- */
- public void setWstVersion(int wstVersion) {
- this.wstVersion = wstVersion;
- }
-
- /**
* @return Returns the secConvVersion.
*/
public int getSecConvVersion() {
@@ -741,13 +701,6 @@ public class RampartMessageData {
return servicePolicy;
}
- /**
- * @param servicePolicy The servicePolicy to set.
- * @deprecated servicePolicy determined in constructor
- */
- public void setServicePolicy(Policy servicePolicy) {
- this.servicePolicy = servicePolicy;
- }
/**
* @return Returns the timestampId.
Modified: axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java?rev=1781857&r1=1781856&r2=1781857&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-390/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java Mon Feb 6 10:05:36 2017
@@ -27,14 +27,12 @@ import org.apache.rampart.policy.Rampart
import org.apache.rampart.policy.SupportingPolicyData;
import org.apache.rampart.policy.model.RampartConfig;
import org.apache.rampart.util.RampartUtil;
-import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.model.AlgorithmSuite;
import org.apache.ws.secpolicy.model.SupportingToken;
import org.apache.ws.secpolicy.model.Token;
import org.apache.ws.secpolicy.model.X509Token;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSEncryptionPart;
-import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityException;
import org.apache.ws.security.conversation.ConversationException;
import org.apache.ws.security.handler.WSHandlerConstants;
@@ -202,12 +200,12 @@ public class AsymmetricBindingBuilder ex
// TODO may contain deifferent types of objects as values, therefore cannot use strongly type maps
// need to figure out a way
- HashMap sigSuppTokMap = null;
- HashMap endSuppTokMap = null;
- HashMap sgndEndSuppTokMap = null;
- HashMap sgndEncSuppTokMap = null;
- HashMap endEncSuppTokMap = null;
- HashMap sgndEndEncSuppTokMap = null;
+ HashMap<Token,Object> sigSuppTokMap = null;
+ HashMap<Token,Object> endSuppTokMap = null;
+ HashMap<Token,Object> sgndEndSuppTokMap = null;
+ HashMap<Token,Object> sgndEncSuppTokMap = null;
+ HashMap<Token,Object> endEncSuppTokMap = null;
+ HashMap<Token,Object> sgndEndEncSuppTokMap = null;
if(this.timestampElement != null){
sigParts.add(RampartUtil.createEncryptionPart(WSConstants.TIMESTAMP_TOKEN_LN,