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 <veit...@apache.org>
AuthorDate: Sun Jan 29 15:16:02 2017 +0000
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 | 2 +-
.../src/test/resources/rampart/policy/30.xml | 4 +-
.../resources/rampart/policy/{3.xml => 31.xml} | 148 ++--
.../resources/rampart/policy/{30.xml => 32.xml} | 63 +-
.../src/test/resources/rampart/policy/33.xml | 103 +++
.../src/test/resources/rampart/policy/34.xml | 102 +++
.../src/test/resources/rampart/policy/sc-4.xml | 123 +++
.../src/test/resources/rampart/policy/sc-5.xml | 131 +++
.../src/test/resources/rampart/policy/sc-6.xml | 98 +++
.../src/test/resources/rampart/services-16.xml | 4 +-
.../src/test/resources/rampart/services-3.xml | 2 +-
.../src/test/resources/rampart/services-30.xml | 4 +-
.../rampart/{policy/3.xml => services-31.xml} | 184 +++--
.../src/test/resources/rampart/services-32.xml | 128 +++
.../src/test/resources/rampart/services-33.xml | 140 ++++
.../rampart/{services-30.xml => services-34.xml} | 79 +-
.../src/test/resources/rampart/services-sc-4.xml | 177 ++++
.../src/test/resources/rampart/services-sc-5.xml | 186 +++++
.../src/test/resources/rampart/services-sc-6.xml | 154 ++++
modules/rampart-mar/module.xml | 6 +
modules/rampart-mar/pom.xml | 242 +++---
modules/rampart-policy/pom.xml | 31 +-
.../org.apache.neethi.builders.AssertionBuilder | 3 +-
.../java/org/apache/ws/secpolicy/SPConstants.java | 6 +
.../secpolicy/model/AbstractSecurityAssertion.java | 50 +-
.../apache/ws/secpolicy/model/AlgorithmSuite.java | 40 +-
.../ws/secpolicy/model/AsymmetricBinding.java | 44 +-
.../secpolicy/model/ContentEncryptedElements.java | 25 +-
.../apache/ws/secpolicy/model/EncryptionToken.java | 42 +-
.../org/apache/ws/secpolicy/model/HttpsToken.java | 20 +-
.../apache/ws/secpolicy/model/InitiatorToken.java | 20 +-
.../org/apache/ws/secpolicy/model/IssuedToken.java | 50 +-
.../java/org/apache/ws/secpolicy/model/Layout.java | 23 +-
.../apache/ws/secpolicy/model/ProtectionToken.java | 42 +-
.../apache/ws/secpolicy/model/RecipientToken.java | 20 +-
.../ws/secpolicy/model/RequiredElements.java | 25 +-
.../apache/ws/secpolicy/model/RequiredParts.java | 15 +-
.../secpolicy/model/SecureConversationToken.java | 52 +-
.../apache/ws/secpolicy/model/SignatureToken.java | 44 +-
.../secpolicy/model/SignedEncryptedElements.java | 17 +-
.../ws/secpolicy/model/SignedEncryptedParts.java | 21 +-
.../apache/ws/secpolicy/model/SupportingToken.java | 23 +-
.../ws/secpolicy/model/SymmetricBinding.java | 40 +-
.../ws/secpolicy/model/TransportBinding.java | 25 +-
.../apache/ws/secpolicy/model/TransportToken.java | 22 +-
.../org/apache/ws/secpolicy/model/Trust10.java | 34 +-
.../org/apache/ws/secpolicy/model/Trust13.java | 41 +-
.../apache/ws/secpolicy/model/UsernameToken.java | 42 +-
.../java/org/apache/ws/secpolicy/model/Wss10.java | 33 +-
.../java/org/apache/ws/secpolicy/model/Wss11.java | 40 +-
.../org/apache/ws/secpolicy/model/X509Token.java | 39 +-
.../builders/AlgorithmSuiteBuilder.java | 2 +-
.../builders/AsymmetricBindingBuilder.java | 2 +-
.../builders/EncryptedElementsBuilder.java | 4 +-
.../builders/EncryptedPartsBuilder.java | 2 +-
.../builders/InitiatorTokenBuilder.java | 2 +-
.../secpolicy11/builders/IssuedTokenBuilder.java | 2 +-
.../ws/secpolicy11/builders/LayoutBuilder.java | 2 +-
.../builders/ProtectionTokenBuilder.java | 2 +-
.../builders/RecipientTokenBuilder.java | 2 +-
.../builders/RequiredElementsBuilder.java | 4 +-
.../builders/SecureConversationTokenBuilder.java | 2 +-
.../builders/SecurityContextTokenBuilder.java | 2 +-
.../builders/SignedElementsBuilder.java | 4 +-
.../secpolicy11/builders/SignedPartsBuilder.java | 2 +-
.../builders/SupportingTokensBuilder.java | 2 +-
.../builders/SymmetricBindingBuilder.java | 2 +-
.../builders/TransportBindingBuilder.java | 2 +-
.../builders/TransportTokenBuilder.java | 10 +-
.../ws/secpolicy11/builders/Trust10Builder.java | 2 +-
.../secpolicy11/builders/UsernameTokenBuilder.java | 2 +-
.../ws/secpolicy11/builders/WSS10Builder.java | 2 +-
.../ws/secpolicy11/builders/WSS11Builder.java | 2 +-
.../ws/secpolicy11/builders/X509TokenBuilder.java | 2 +-
.../builders/AlgorithmSuiteBuilder.java | 2 +-
.../builders/AsymmetricBindingBuilder.java | 2 +-
.../builders/ContentEncryptedElementsBuilder.java | 4 +-
.../builders/EncryptedElementsBuilder.java | 4 +-
.../builders/EncryptedPartsBuilder.java | 2 +-
.../ws/secpolicy12/builders/HttpsTokenBuilder.java | 34 +-
.../builders/InitiatorTokenBuilder.java | 2 +-
.../secpolicy12/builders/IssuedTokenBuilder.java | 2 +-
.../ws/secpolicy12/builders/LayoutBuilder.java | 2 +-
.../builders/ProtectionTokenBuilder.java | 2 +-
.../builders/RecipientTokenBuilder.java | 2 +-
.../builders/RequiredElementsBuilder.java | 4 +-
.../secpolicy12/builders/RequiredPartsBuilder.java | 2 +-
.../builders/SecureConversationTokenBuilder.java | 2 +-
.../builders/SecurityContextTokenBuilder.java | 2 +-
.../builders/SignedElementsBuilder.java | 4 +-
.../secpolicy12/builders/SignedPartsBuilder.java | 2 +-
.../builders/SupportingTokensBuilder.java | 2 +-
.../builders/SymmetricBindingBuilder.java | 2 +-
.../builders/TransportBindingBuilder.java | 2 +-
.../builders/TransportTokenBuilder.java | 52 +-
.../ws/secpolicy12/builders/Trust13Builder.java | 2 +-
.../secpolicy12/builders/UsernameTokenBuilder.java | 2 +-
.../ws/secpolicy12/builders/WSS10Builder.java | 2 +-
.../ws/secpolicy12/builders/WSS11Builder.java | 2 +-
.../ws/secpolicy12/builders/X509TokenBuilder.java | 2 +-
modules/rampart-samples/basic/build.xml | 40 +-
modules/rampart-samples/policy/build.xml | 62 +-
modules/rampart-tests/pom.xml | 45 +-
.../rahas/TokenRequestDispatcherConfigTest.java | 28 +-
.../rampart/AsymmetricBindingBuilderTest.java | 357 ++++----
.../org/apache/rampart/MessageBuilderTestBase.java | 14 +-
.../rampart/SymmetricBindingBuilderTest.java | 233 +++---
.../rampart/TransportBindingBuilderTest.java | 132 ++-
.../rampart/policy/model/RampartPolicyTest.java | 89 +-
.../ws/secpolicy/model/SecpolicyModelTest.java | 82 +-
.../test-resources/log4j.properties} | 55 +-
modules/rampart-trust-mar/module.xml | 17 +-
modules/rampart-trust-mar/pom.xml | 108 +--
modules/rampart-trust/pom.xml | 51 +-
.../java/org/apache/rahas/EncryptedKeyToken.java | 48 +-
.../src/main/java/org/apache/rahas/Rahas.java | 61 ++
.../main/java/org/apache/rahas/RahasConstants.java | 15 +-
.../src/main/java/org/apache/rahas/RahasData.java | 40 +-
.../org/apache/rahas/RampartSAMLBootstrap.java | 102 +++
.../java/org/apache/rahas/STSMessageReceiver.java | 2 +-
.../java/org/apache/rahas/SimpleTokenStore.java | 15 +-
.../src/main/java/org/apache/rahas/Token.java | 54 +-
.../org/apache/rahas/TokenRequestDispatcher.java | 37 +-
.../main/java/org/apache/rahas/TokenStorage.java | 8 +-
.../src/main/java/org/apache/rahas/TrustUtil.java | 145 ++--
.../java/org/apache/rahas/client/STSClient.java | 103 ++-
.../main/java/org/apache/rahas/errors.properties | 12 +-
.../org/apache/rahas/impl/SAML2TokenIssuer.java | 141 ++--
.../org/apache/rahas/impl/SAMLTokenIssuer.java | 774 ++++++++---------
.../apache/rahas/impl/SAMLTokenIssuerConfig.java | 123 ++-
.../org/apache/rahas/impl/SAMLTokenRenewer.java | 192 ++---
.../org/apache/rahas/impl/SAMLTokenValidator.java | 292 ++++---
.../main/java/org/apache/rahas/impl/SCTIssuer.java | 23 +-
.../org/apache/rahas/impl/TokenCancelerConfig.java | 14 +-
.../apache/rahas/impl/util/AxiomParserPool.java | 52 ++
.../org/apache/rahas/impl/util/CommonUtil.java | 48 ++
.../org/apache/rahas/impl/util/SAML2Utils.java | 24 +-
.../rahas/impl/util/SAMLAttributeCallback.java | 77 +-
.../org/apache/rahas/impl/util/SAMLCallback.java | 32 +-
.../rahas/impl/util/SAMLCallbackHandler.java | 28 +-
.../impl/util/SAMLNameIdentifierCallback.java | 58 +-
.../java/org/apache/rahas/impl/util/SAMLUtils.java | 768 ++++++++++++++++-
.../org/apache/rahas/impl/util/SignKeyHolder.java | 2 +-
.../org/apache/rahas/impl/util/SAMLUtilsTest.java | 375 +++++++++
.../rampart-trust/src/test/resources/crypto.config | 5 +
.../rampart-trust/src/test/resources/keystore.jks | Bin 0 -> 2191 bytes
pom.xml | 336 ++++----
release-docs/ChangeLog.txt | 21 +
release-docs/README.txt | 48 +-
release-docs/release-notes.html | 18 +-
225 files changed, 7654 insertions(+), 4391 deletions(-)
diff --cc
modules/rampart-core/src/main/java/org/apache/rampart/errors.properties
index 3ea99a2,cdbbc4a..f8ac898
--- a/modules/rampart-core/src/main/java/org/apache/rampart/errors.properties
+++ b/modules/rampart-core/src/main/java/org/apache/rampart/errors.properties
@@@ -99,5 -100,4 +100,6 @@@ requiredElementsMissing = Required Elem
repeatingNonceValue = Nonce value : {0}, already seen before for user name :
{1}. Possibly this could be a replay attack.
invalidNonceLifeTime = Invalid value for nonceLifeTime in rampart
configuration file.
invalidIssuerAddress = Invalid value for Issuer
-invalidSignatureAlgo=Invalid signature algorithm for Asymmetric binding
+algorithmNotFound = Couldn't find the algorithm used
+invalidAlgorithm = Algorithm verification failed. Required Algorithm : {0},
Algorithm found {1}
++invalidSignatureAlgo=Invalid signature algorithm for Asymmetric binding
