[java-opensaml COMMIT] in /trunk: opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/DecryptionPlusS...

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Jan 18 17:22:44 2013
New Revision: 3153

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3153&view=rev
Log:
OSJ-31: Refactor Signer and SignatureValidator classes

Added:
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/support/SignatureValidationProvider.java   (with props)
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/support/SignatureValidator.java   (with props)
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/support/Signer.java   (with props)
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/support/SignerProvider.java   (with props)
    trunk/opensaml-xmlsec-api/src/test/resources/logback-test.xml   (with props)
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/provider/
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/provider/ApacheSantuarioSignatureValidationProviderImpl.java
      - copied, changed from r3152, trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/SignatureValidator.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/provider/ApacheSantuarioSignerProviderImpl.java
      - copied, changed from r3152, trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/Signer.java
    trunk/opensaml-xmlsec-impl/src/main/resources/META-INF/services/org.opensaml.xmlsec.signature.support.SignatureValidationProvider
    trunk/opensaml-xmlsec-impl/src/main/resources/META-INF/services/org.opensaml.xmlsec.signature.support.SignerProvider
Modified:
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/DecryptionPlusSigningTest.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/SignatureValidator.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/Signer.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/BaseSignatureTrustEngine.java
    trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/DecryptionSignedContentTest.java
    trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/DetachedSignatureTest.java
    trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/EnvelopedSignatureTest.java
    trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/HMACSignatureTest.java

Modified: trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/DecryptionPlusSigningTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/DecryptionPlusSigningTest.java?rev=3153&r1=3152&r2=3153&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/DecryptionPlusSigningTest.java (original)
+++ trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/DecryptionPlusSigningTest.java Fri Jan 18 17:22:44 2013
@@ -161,9 +161,8 @@
             (Response) unmarshallerFactory.getUnmarshaller(parsedResponse).unmarshall(parsedResponse);
         
         // Validate Response signature first time
-        SignatureValidator firstSigValidator = new SignatureValidator(signingCred);
         try {
-            firstSigValidator.validate(newResponse.getSignature());
+            SignatureValidator.validate(newResponse.getSignature(), signingCred);
         } catch (SignatureException e1) {
             Assert.fail("First Response signature validation failed");
         }
@@ -186,9 +185,8 @@
         assertXMLEquals(targetDOM, decryptedAssertion);
         
         // Validate Response signature second time
-        SignatureValidator secondSigValidator = new SignatureValidator(signingCred);
         try {
-            secondSigValidator.validate(newResponse.getSignature());
+            SignatureValidator.validate(newResponse.getSignature(), signingCred);
         } catch (SignatureException e1) {
             Assert.fail("Second Response signature validation failed");
         }

Modified: trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/BaseSignatureTrustEngine.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/BaseSignatureTrustEngine.java?rev=3153&r1=3152&r2=3153&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/BaseSignatureTrustEngine.java (original)
+++ trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/BaseSignatureTrustEngine.java Fri Jan 18 17:22:44 2013
@@ -145,9 +145,8 @@
      * @return true if the signature can be verified using the key from the credential, otherwise false
      */

[... 305 lines stripped ...]