[Neuclear-develop] neuclear-xmlsig/src/test/org/neuclear/xml/xmlsec InteropTests.java,NONE,1.1 RefTest.java,1.8,1.9 SimpleXMLSigTest.java,1.11,1.12 SignatureTests.java,1.5,NONE XMLSignerTest.java,1.3,NONE

[Pelle B. <pe...@us...>]

Update of /cvsroot/neuclear/neuclear-xmlsig/src/test/org/neuclear/xml/xmlsec
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19896/src/test/org/neuclear/xml/xmlsec

Modified Files:
	RefTest.java SimpleXMLSigTest.java 
Added Files:
	InteropTests.java 
Removed Files:
	SignatureTests.java XMLSignerTest.java 
Log Message:
Changes in the XMLSignature class, which is now Abstract there are currently 3 implementations for:
- Enveloped
- DataObjects - (Enveloping)
- Any for interop testing mainly.

Index: RefTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/test/org/neuclear/xml/xmlsec/RefTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** RefTest.java	8 Mar 2004 23:51:04 -0000	1.8
--- RefTest.java	19 Mar 2004 22:21:51 -0000	1.9
***************
*** 33,36 ****
--- 33,42 ----
  $Id$
  $Log$
+ Revision 1.9  2004/03/19 22:21:51  pelle
+ Changes in the XMLSignature class, which is now Abstract there are currently 3 implementations for:
+ - Enveloped
+ - DataObjects - (Enveloping)
+ - Any for interop testing mainly.
+ 
  Revision 1.8  2004/03/08 23:51:04  pelle
  More improvements on the XMLSignature. Now uses the Transforms properly, References properly.
***************
*** 92,98 ****
  
      public void testEnvelopedReference() throws DocumentException, XMLException, CryptoException {
!         Document doc = DocumentHelper.parseText("<test>hello<Signature xmlns=\"http://www.w3.org/2000/09/xmldsig#\"><SignedInfo/></Signature></test>");
          Reference ref = new Reference(doc.getRootElement(), true);
!         doc.getRootElement().element("Signature").element("SignedInfo").add(ref.getElement());
  
          assertNotNull(ref);
--- 98,104 ----
  
      public void testEnvelopedReference() throws DocumentException, XMLException, CryptoException {
!         Document doc = DocumentHelper.parseText("<test>hello<ds:Signature xmlns:ds=\"http://www.w3.org/2000/09/xmldsig#\"><ds:SignedInfo/></ds:Signature></test>");
          Reference ref = new Reference(doc.getRootElement(), true);
!         XMLSecTools.getSignatureElement(doc.getRootElement()).element("SignedInfo").add(ref.getElement());
  
          assertNotNull(ref);

Index: SimpleXMLSigTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/test/org/neuclear/xml/xmlsec/SimpleXMLSigTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** SimpleXMLSigTest.java	8 Mar 2004 23:51:04 -0000	1.11
--- SimpleXMLSigTest.java	19 Mar 2004 22:21:51 -0000	1.12
***************
*** 16,19 ****
--- 16,20 ----
  import java.security.KeyPair;
  import java.security.NoSuchAlgorithmException;
+ import java.security.interfaces.DSAPublicKey;
  
  /**
***************
*** 24,31 ****
   * $Id$
   * $Log$
   * Revision 1.11  2004/03/08 23:51:04  pelle
   * More improvements on the XMLSignature. Now uses the Transforms properly, References properly.
   * All the major elements have been refactored to be cleaner and more correct.
!  *
   * Revision 1.10  2004/03/02 23:30:44  pelle
   * Renamed SignatureInfo to SignedInfo as that is the name of the Element.
--- 25,38 ----
   * $Id$
   * $Log$
+  * Revision 1.12  2004/03/19 22:21:51  pelle
+  * Changes in the XMLSignature class, which is now Abstract there are currently 3 implementations for:
+  * - Enveloped
+  * - DataObjects - (Enveloping)
+  * - Any for interop testing mainly.
+  *
   * Revision 1.11  2004/03/08 23:51:04  pelle
   * More improvements on the XMLSignature. Now uses the Transforms properly, References properly.
   * All the major elements have been refactored to be cleaner and more correct.
!  * <p/>
   * Revision 1.10  2004/03/02 23:30:44  pelle
   * Renamed SignatureInfo to SignedInfo as that is the name of the Element.
***************
*** 136,180 ****
      }
  
      public final void testEnvelopedUsignRSAKeyPair() throws DocumentException, XMLException, CryptoException {
          Document doc = DocumentHelper.parseText(TESTXML);
!         final XMLSignature sig = new XMLSignature(rsa, doc.getRootElement());
          final File outputFile = new File("target/testdata/homegrown/signature-enveloped-rsa.xml");
          XMLTools.writeFile(outputFile, doc);
  
          doc = XMLTools.loadDocument(outputFile);
!         assertTrue("Test if Signature is valid", XMLSecTools.verifySignature(doc.getRootElement()));
      }
  
!     public final void testEnvelopingUsignRSAKeyPair() throws DocumentException, XMLException, CryptoException {
          Document doc = DocumentHelper.parseText(TESTXML);
!         final XMLSignature sig = new XMLSignature(rsa, doc.getRootElement(), false);
!         final File outputFile = new File("target/testdata/homegrown/signature-enveloping-rsa.xml");
!         XMLTools.writeFile(outputFile, sig.getElement());
  
          doc = XMLTools.loadDocument(outputFile);
!         assertTrue("Test if Signature is valid", XMLSecTools.verifySignature(doc.getRootElement()));
      }
  
!     public final void testEnvelopingUsignDSAKeyPair() throws DocumentException, XMLException, CryptoException {
          Document doc = DocumentHelper.parseText(TESTXML);
!         final XMLSignature sig = new XMLSignature(dsa, doc.getRootElement(), false);
!         final File outputFile = new File("target/testdata/homegrown/signature-enveloping-dsa.xml");
          XMLTools.writeFile(outputFile, sig.getElement());
  
          doc = XMLTools.loadDocument(outputFile);
!         assertTrue("Test if Signature is valid", XMLSecTools.verifySignature(doc.getRootElement()));
      }
  
!     public final void testEnvelopedUsignDSAKeyPair()
!             throws DocumentException, XMLException, CryptoException {
! //        assertTrue("Test if public key is really DSA", dsa.getPublic() instanceof DSAPublicKey);
          Document doc = DocumentHelper.parseText(TESTXML);
!         final XMLSignature sig = new XMLSignature(dsa, doc.getRootElement());
! 
!         final File outputFile = new File("target/testdata/homegrown/signature-enveloped-dsa.xml");
!         XMLTools.writeFile(outputFile, doc);
  
          doc = XMLTools.loadDocument(outputFile);
!         assertTrue("Test if DSA Signature is valid", XMLSecTools.verifySignature(doc.getRootElement()));
      }
  
--- 143,212 ----
      }
  
+     private void assertValidEnvelopedSignature(Document doc) throws XMLSecurityException {
+         try {
+             XMLSignature sig = new EnvelopedSignature(doc.getRootElement());
+         } catch (InvalidSignatureException e) {
+             assertTrue("Signature Failed: " + e.getLocalizedMessage(), false);
+         }
+     }
+ 
+     private void assertInvalidEnvelopedSignature(Document doc) throws XMLSecurityException {
+         try {
+             XMLSignature sig = new EnvelopedSignature(doc.getRootElement());
+             assertTrue("Invalid Signature Verified", false);
+         } catch (InvalidSignatureException e) {
+             assertTrue("Signature Failed", true);
+         }
+     }
+ 
+     private void assertValidEnvelopingSignature(Document doc) throws XMLSecurityException {
+         try {
+             XMLSignature sig = new DataObjectSignature(doc.getRootElement());
+         } catch (InvalidSignatureException e) {
+             assertTrue("Signature Failed: " + e.getLocalizedMessage(), false);
+         }
+     }
+ 
      public final void testEnvelopedUsignRSAKeyPair() throws DocumentException, XMLException, CryptoException {
          Document doc = DocumentHelper.parseText(TESTXML);
!         final XMLSignature sig = new EnvelopedSignature(rsa, doc.getRootElement());
          final File outputFile = new File("target/testdata/homegrown/signature-enveloped-rsa.xml");
          XMLTools.writeFile(outputFile, doc);
  
          doc = XMLTools.loadDocument(outputFile);
!         assertValidEnvelopedSignature(doc);
      }
  
!     public final void testEnvelopedUsignDSAKeyPair()
!             throws DocumentException, XMLException, CryptoException {
!         assertTrue("Test if public key is really DSA", dsa.getPublic() instanceof DSAPublicKey);
          Document doc = DocumentHelper.parseText(TESTXML);
!         final XMLSignature sig = new EnvelopedSignature(dsa, doc.getRootElement());
! 
!         final File outputFile = new File("target/testdata/homegrown/signature-enveloped-dsa.xml");
!         XMLTools.writeFile(outputFile, doc);
  
          doc = XMLTools.loadDocument(outputFile);
!         assertValidEnvelopedSignature(doc);
      }
  
!     public final void testEnvelopingUsignRSAKeyPair() throws DocumentException, XMLException, CryptoException {
          Document doc = DocumentHelper.parseText(TESTXML);
!         final XMLSignature sig = new DataObjectSignature(rsa, doc.getRootElement());
!         final File outputFile = new File("target/testdata/homegrown/signature-enveloping-rsa.xml");
          XMLTools.writeFile(outputFile, sig.getElement());
  
          doc = XMLTools.loadDocument(outputFile);
!         assertValidEnvelopingSignature(doc);
      }
  
!     public final void testEnvelopingUsignDSAKeyPair() throws DocumentException, XMLException, CryptoException {
          Document doc = DocumentHelper.parseText(TESTXML);
!         final XMLSignature sig = new DataObjectSignature(dsa, doc.getRootElement());
!         final File outputFile = new File("target/testdata/homegrown/signature-enveloping-dsa.xml");
!         XMLTools.writeFile(outputFile, sig.getElement());
  
          doc = XMLTools.loadDocument(outputFile);
!         assertValidEnvelopingSignature(doc);
      }
  
***************
*** 183,190 ****
          final Document doc = DocumentHelper.parseText(TESTXML);
  
!         XMLSecTools.signElement(doc.getRootElement(), rsa);
!         assertTrue("Test if Signature is valid", XMLSecTools.verifySignature(doc.getRootElement(), rsa.getPublic()));
          doc.getRootElement().addElement("BadElement");
!         assertTrue("Test that Signature is invalid", !XMLSecTools.verifySignature(doc.getRootElement(), rsa.getPublic()));
  
      }
--- 215,222 ----
          final Document doc = DocumentHelper.parseText(TESTXML);
  
!         final XMLSignature sig = new EnvelopedSignature(rsa, doc.getRootElement());
!         assertValidEnvelopedSignature(doc);
          doc.getRootElement().addElement("BadElement");
!         assertInvalidEnvelopedSignature(doc);
  
      }
***************
*** 194,241 ****
          final Document doc = DocumentHelper.parseText(TESTXML);
  
!         XMLSecTools.signElement(doc.getRootElement(), dsa);
!         assertTrue("Test if DSA Signature is valid", XMLSecTools.verifySignature(doc.getRootElement(), dsa.getPublic()));
          doc.getRootElement().addElement("BadElement");
!         assertTrue("Test that DSA Signature is invalid", !XMLSecTools.verifySignature(doc.getRootElement(), rsa.getPublic()));
      }
  
      public final void testEnvelopedUsingSigner() throws DocumentException, XMLException, CryptoException, UserCancellationException {
          Document doc = DocumentHelper.parseText(TESTXML);
!         final XMLSignature sig = new XMLSignature("neu://test", signer, doc.getRootElement(), true);
          final File outputFile = new File("target/testdata/homegrown/signature-enveloped-signer.xml");
          XMLTools.writeFile(outputFile, doc);
  
          doc = XMLTools.loadDocument(outputFile);
!         assertTrue("Test if Signature is valid", XMLSecTools.verifySignature(doc.getRootElement()));
      }
  
      public final void testEnvelopingUsingSigner() throws DocumentException, XMLException, CryptoException, UserCancellationException {
          Document doc = DocumentHelper.parseText(TESTXML);
!         final XMLSignature sig = new XMLSignature("neu://test", signer, doc.getRootElement(), false);
          final File outputFile = new File("target/testdata/homegrown/signature-enveloping-signer.xml");
          XMLTools.writeFile(outputFile, sig.getElement());
  
          doc = XMLTools.loadDocument(outputFile);
!         assertTrue("Test if Signature is valid", XMLSecTools.verifySignature(doc.getRootElement()));
      }
  
      public final void testComplexEnvelopedUsingSigner() throws DocumentException, XMLException, CryptoException, UserCancellationException {
          Document doc = DocumentHelper.parseText(COMPLEX_XML);
!         final XMLSignature sig = new XMLSignature("neu://test", signer, doc.getRootElement(), true);
          final File outputFile = new File("target/testdata/homegrown/signature-complex-enveloped-signer.xml");
          XMLTools.writeFile(outputFile, doc);
  
          doc = XMLTools.loadDocument(outputFile);
!         assertTrue("Test if Signature is valid", XMLSecTools.verifySignature(doc.getRootElement()));
      }
  
      public final void testComplexEnvelopingUsingSigner() throws DocumentException, XMLException, CryptoException, UserCancellationException {
          Document doc = DocumentHelper.parseText(COMPLEX_XML);
!         final XMLSignature sig = new XMLSignature("neu://test", signer, doc.getRootElement(), false);
          final File outputFile = new File("target/testdata/homegrown/signature-complex-enveloping-signer.xml");
          XMLTools.writeFile(outputFile, sig.getElement());
  
          doc = XMLTools.loadDocument(outputFile);
!         assertTrue("Test if Signature is valid", XMLSecTools.verifySignature(doc.getRootElement()));
      }
  
--- 226,273 ----
          final Document doc = DocumentHelper.parseText(TESTXML);
  
!         final XMLSignature sig = new EnvelopedSignature(dsa, doc.getRootElement());
!         assertValidEnvelopedSignature(doc);
          doc.getRootElement().addElement("BadElement");
!         assertInvalidEnvelopedSignature(doc);
      }
  
      public final void testEnvelopedUsingSigner() throws DocumentException, XMLException, CryptoException, UserCancellationException {
          Document doc = DocumentHelper.parseText(TESTXML);
!         final XMLSignature sig = new EnvelopedSignature("neu://test", signer, doc.getRootElement());
          final File outputFile = new File("target/testdata/homegrown/signature-enveloped-signer.xml");
          XMLTools.writeFile(outputFile, doc);
  
          doc = XMLTools.loadDocument(outputFile);
!         assertValidEnvelopedSignature(doc);
      }
  
      public final void testEnvelopingUsingSigner() throws DocumentException, XMLException, CryptoException, UserCancellationException {
          Document doc = DocumentHelper.parseText(TESTXML);
!         final XMLSignature sig = new DataObjectSignature("neu://test", signer, doc.getRootElement());
          final File outputFile = new File("target/testdata/homegrown/signature-enveloping-signer.xml");
          XMLTools.writeFile(outputFile, sig.getElement());
  
          doc = XMLTools.loadDocument(outputFile);
!         assertValidEnvelopingSignature(doc);
      }
  
      public final void testComplexEnvelopedUsingSigner() throws DocumentException, XMLException, CryptoException, UserCancellationException {
          Document doc = DocumentHelper.parseText(COMPLEX_XML);
!         final XMLSignature sig = new EnvelopedSignature("neu://test", signer, doc.getRootElement());
          final File outputFile = new File("target/testdata/homegrown/signature-complex-enveloped-signer.xml");
          XMLTools.writeFile(outputFile, doc);
  
          doc = XMLTools.loadDocument(outputFile);
!         assertValidEnvelopedSignature(doc);
      }
  
      public final void testComplexEnvelopingUsingSigner() throws DocumentException, XMLException, CryptoException, UserCancellationException {
          Document doc = DocumentHelper.parseText(COMPLEX_XML);
!         final XMLSignature sig = new DataObjectSignature("neu://test", signer, doc.getRootElement());
          final File outputFile = new File("target/testdata/homegrown/signature-complex-enveloping-signer.xml");
          XMLTools.writeFile(outputFile, sig.getElement());
  
          doc = XMLTools.loadDocument(outputFile);
!         assertValidEnvelopingSignature(doc);
      }
  

--- NEW FILE: InteropTests.java ---
package org.neuclear.xml.xmlsec;

/**
 * (C) 2003 Antilles Software Ventures SA
 * User: pelleb
 * Date: Feb 3, 2003
 * Time: 6:54:20 AM
 * $Id: InteropTests.java,v 1.1 2004/03/19 22:21:51 pelle Exp $
 * $Log: InteropTests.java,v $
 * Revision 1.1  2004/03/19 22:21:51  pelle
 * Changes in the XMLSignature class, which is now Abstract there are currently 3 implementations for:
 * - Enveloped
 * - DataObjects - (Enveloping)
 * - Any for interop testing mainly.
 *
 * Revision 1.5  2004/02/19 00:28:00  pelle
 * Discovered several incompatabilities with the xmlsig implementation. Have been working on getting it working.
 * Currently there is still a problem with enveloping signatures and it seems enveloped signatures done via signers.
 *
 * Revision 1.4  2004/01/14 17:07:59  pelle
 * KeyInfo containing X509Certificates now work correctly.
 * 10 out of 16 of merlin's tests now work. The missing ones are largely due to key resolution issues. (Read X509)
 *
 * Revision 1.3  2004/01/14 16:34:27  pelle
 * New model of references and signatures now pretty much works.
 * I am still not 100% sure on the created enveloping signatures. I need to do more testing.
 *
 * Revision 1.2  2003/11/21 04:44:31  pelle
 * EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
 * Otherwise You will Finaliate.
 * Anything that can be final has been made final throughout everyting. We've used IDEA's Inspector tool to find all instance of variables that could be final.
 * This should hopefully make everything more stable (and secure).
 *
 * Revision 1.1.1.1  2003/11/11 16:33:32  pelle
 * Moved over from neudist.org
 * Moved remaining common utilities into commons
 *
 * Revision 1.6  2003/10/21 22:30:33  pelle
 * Renamed NeudistException to NeuClearException and moved it to org.neuclear.commons where it makes more sense.
 * Unhooked the XMLException in the xmlsig library from NeuClearException to make all of its exceptions an independent hierarchy.
 * Obviously had to perform many changes throughout the code to support these changes.
 *
 * Revision 1.5  2003/02/24 14:20:02  pelle
 * Minor adjustments
 *
 * Revision 1.4  2003/02/23 23:21:47  pelle
 * Yeah. We figured it out. We now have interop.
 * Granted not on all features as yet, but definitely on simple signatures.
 * I'm checking in Ramses' fix to QuickEmbeddedSignature and my fixes to the verification process.
 *
 * Revision 1.3  2003/02/22 23:19:10  pelle
 * Additional fixes to the encoding problem.
 *
 * Revision 1.2  2003/02/22 16:54:30  pelle
 * Major structural changes in the whole processing framework.
 * Verification now supports Enveloping and detached signatures.
 * The reference element is a lot more important at the moment and handles much of the logic.
 * Replaced homegrown Base64 with Blackdowns.
 * Still experiencing problems with decoding foreign signatures. I reall dont understand it. I'm going to have
 * to reread the specs a lot more and study other implementations sourcecode.
 *
 * Revision 1.1  2003/02/21 22:48:19  pelle
 * New Test Infrastructure
 * Added test keys in src/testdata/keys
 * Modified tools to handle these keys
 *
 * Revision 1.4  2003/02/11 14:50:25  pelle
 * Trying onemore time. Added the benchmarking code.
 * Now generates DigestValue and optionally adds KeyInfo to Signature.
 *
 * Revision 1.3  2003/02/08 18:48:38  pelle
 * The Signature phase has been rewritten.
 * There now is a new Class called QuickEmbeddedSignature which is more in line with my original idea for this library.
 * It simply has a template of the xml and signs it in a standard way.
 * The original XMLSignature class is still used for verification and will in the future handle more thoroughly
 * all the various flavours of XMLSig.
 * XMLSecTools has got different flavours of canonicalize now. Including one where you can pass it a Canonicaliser to use.
 * Of the new Canonicalizer's are CanonicalizerWithComments, which I accidently left out of the last commit.
 * And CanonicalizerWithoutSignature which leaves out the Signature in the Canonicalization phase and is thus
 * a lot more efficient than the previous approach.
 *
 * Revision 1.2  2003/02/07 22:33:48  pelle
 * Compliance mostly working.
 * Merlin's Example 7 hasn't been implemented, but mainly because we havent written the test case yet.
 * A few of the example c14n files had trailing new lines. I'm not sure what the spec says about that, but I
 * got rid of them as my implementation doesnt support those. Who is right?
 * Example 4 has problems with the final element. This seems to be causing problems for lots of people.
 * To workaround it, I've removed the offending lines from all the files.
 * TBH I dont understand whats going on with it. Will put it on the back burner and come back.
 *
 * Revision 1.1  2003/02/07 21:15:19  pelle
 * Much improved Canonicalizer and Test Suite.
 * I've added the merlin-xmldsig-eight Canonicalization test suite.
 * All tests still dont work.
 *
 */

import junit.framework.TestCase;
import org.dom4j.Document;
import org.dom4j.DocumentException;
import org.dom4j.io.SAXReader;
import org.neuclear.commons.NeuClearException;
import org.neuclear.commons.RegexFileNameFilter;

import java.io.File;
import java.io.FileNotFoundException;
import java.io.FilenameFilter;
import java.io.IOException;

public final class InteropTests extends TestCase {
    public InteropTests(final String s) {
        super(s);
        reader = new SAXReader(false);
        reader.setMergeAdjacentText(false);
        reader.setStripWhitespaceText(false);
        reader.setIncludeExternalDTDDeclarations(true);
        reader.setIncludeInternalDTDDeclarations(true);
    }

//    public final void testHomeGrown() throws IOException, DocumentException, NeuClearException {
//        runDirectoryTest("src/testdata/homegrown");
//    }

    public final void testMerlin23() throws IOException, DocumentException, NeuClearException {
        runDirectoryTest("src/testdata/merlin-xmldsig-twenty-three", 10);//,"signature-enveloping-dsa\\.xml");
    }

    public final void testPhaos() throws IOException, DocumentException, NeuClearException {
        runDirectoryTest("src/testdata/phaos-xmldsig-two", 29);
    }

    public final void runDirectoryTest(final String path, final int pass) throws DocumentException, IOException, FileNotFoundException, NeuClearException {
        runDirectoryTest(path, null, pass);
    }

    public final void runDirectoryTest(final String path, final String regex, final int pass) throws DocumentException, IOException, FileNotFoundException, NeuClearException {
        final File dir = new File(path);
        if (!dir.exists()) {
            System.out.println("Doesnt exist");
            return;
        }
        final FilenameFilter filter;
        if (regex == null)
            filter = new FilenameFilter() {
                public boolean accept(final File dirf, final String name) {
                    return name.endsWith(".xml");
                }
            };
        else
            filter = new RegexFileNameFilter(regex);

        final File[] xmlfiles = dir.listFiles(filter);
        System.out.println("There are " + xmlfiles.length + " files in the directory");
        int errors = 0;
        int i = 0;
        for (i = 0; i < xmlfiles.length; i++) {

            final File xmlfile = xmlfiles[i];
            System.out.print("Testing file: " + xmlfile.getName() + "... ");
            final Document doc = reader.read(xmlfile);
            System.out.print("root element: " + doc.getRootElement().getQualifiedName() + " ...");
            try {
                if (verifySignature(doc))
                    System.out.println("Verified");
                else
                    System.out.println("FAILED: " + (errors++));
            } catch (Exception e) {
                System.out.println("ERROR: " + (errors++) + e.getMessage());
                e.printStackTrace();  //To change body of catch statement use Options | File Templates.
            }
        }
        System.out.println(errors + " out of " + i + " documents failed");
        assertTrue("Acheived Pass rate: ", errors <= pass);


    }

    private boolean verifySignature(Document doc) throws XMLSecurityException {
        try {
            new AnyXMLSignature(doc.getRootElement());
            return true;
        } catch (InvalidSignatureException e) {
            return false;
        }
    }

    final SAXReader reader;

}

--- SignatureTests.java DELETED ---

--- XMLSignerTest.java DELETED ---