[Neuclear-develop] neuclear-id/src/test-cactus/org/neuclear/id/signers SigningServletTest.java,1.1,1.2

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

Update of /cvsroot/neuclear/neuclear-id/src/test-cactus/org/neuclear/id/signers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3790/src/test-cactus/org/neuclear/id/signers

Modified Files:
	SigningServletTest.java 
Log Message:
Got the cactus tests working and the sample web app

Index: SigningServletTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/test-cactus/org/neuclear/id/signers/SigningServletTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SigningServletTest.java	2 Mar 2004 18:59:13 -0000	1.1
--- SigningServletTest.java	14 Apr 2004 23:44:46 -0000	1.2
***************
*** 4,15 ****
  import org.apache.cactus.ServletTestCase;
  import org.apache.cactus.WebRequest;
- import org.neuclear.id.auth.AuthenticationTicket;
  import org.neuclear.commons.NeuClearException;
  import org.neuclear.commons.Utility;
  import org.neuclear.commons.crypto.Base64;
  import org.neuclear.commons.crypto.signers.JCESigner;
  import org.neuclear.commons.crypto.signers.TestCaseSigner;
  import org.neuclear.id.SignatureRequest;
  import org.neuclear.id.SignedNamedObject;
  import org.neuclear.id.builders.AuthenticationTicketBuilder;
  import org.neuclear.id.builders.SignatureRequestBuilder;
--- 4,18 ----
  import org.apache.cactus.ServletTestCase;
  import org.apache.cactus.WebRequest;
  import org.neuclear.commons.NeuClearException;
  import org.neuclear.commons.Utility;
+ import org.neuclear.commons.crypto.Base32;
  import org.neuclear.commons.crypto.Base64;
+ import org.neuclear.commons.crypto.CryptoTools;
  import org.neuclear.commons.crypto.signers.JCESigner;
+ import org.neuclear.commons.crypto.signers.NonExistingSignerException;
  import org.neuclear.commons.crypto.signers.TestCaseSigner;
  import org.neuclear.id.SignatureRequest;
  import org.neuclear.id.SignedNamedObject;
+ import org.neuclear.id.auth.AuthenticationTicket;
  import org.neuclear.id.builders.AuthenticationTicketBuilder;
  import org.neuclear.id.builders.SignatureRequestBuilder;
***************
*** 43,46 ****
--- 46,52 ----
  $Id$
  $Log$
+ Revision 1.2  2004/04/14 23:44:46  pelle
+ Got the cactus tests working and the sample web app
+ 
  Revision 1.1  2004/03/02 18:59:13  pelle
  Further cleanups in neuclear-id. Moved everything under id.
***************
*** 97,103 ****
      public void beginSign(WebRequest theRequest) throws GeneralSecurityException, NeuClearException, XMLException {
  
!         AuthenticationTicketBuilder authreq = new AuthenticationTicketBuilder("neu://bob@test", "neu://test", "http://localhost");
!         SignatureRequestBuilder sigreq = new SignatureRequestBuilder("neu://bob@test", authreq, "test");
!         SignedNamedObject signed = sigreq.convert("neu://test",signer);
          theRequest.setContentType("application/x-www-form-urlencoded");
          String b64 = Base64.encode(signed.getEncoded().getBytes());
--- 103,109 ----
      public void beginSign(WebRequest theRequest) throws GeneralSecurityException, NeuClearException, XMLException {
  
!         AuthenticationTicketBuilder authreq = new AuthenticationTicketBuilder("http://localhost");
!         SignatureRequestBuilder sigreq = new SignatureRequestBuilder(authreq, "test");
!         SignedNamedObject signed = sigreq.convert("neu://test", signer);
          theRequest.setContentType("application/x-www-form-urlencoded");
          String b64 = Base64.encode(signed.getEncoded().getBytes());
***************
*** 137,143 ****
      public void beginSignatureRequest(WebRequest theRequest) throws GeneralSecurityException, NeuClearException, XMLException {
  
!         AuthenticationTicketBuilder authreq = new AuthenticationTicketBuilder("neu://bob@test", "neu://test", "http://localhost");
!         SignatureRequestBuilder sigreq = new SignatureRequestBuilder( "neu://bob@test", authreq, "test");
!         SignedNamedObject signed = sigreq.convert("neu://test",signer);
          theRequest.setContentType("application/x-www-form-urlencoded");
          String b64 = Base64.encode(signed.getEncoded().getBytes());
--- 143,149 ----
      public void beginSignatureRequest(WebRequest theRequest) throws GeneralSecurityException, NeuClearException, XMLException {
  
!         AuthenticationTicketBuilder authreq = new AuthenticationTicketBuilder("http://localhost");
!         SignatureRequestBuilder sigreq = new SignatureRequestBuilder(authreq, "test");
!         SignedNamedObject signed = sigreq.convert("neu://test", signer);
          theRequest.setContentType("application/x-www-form-urlencoded");
          String b64 = Base64.encode(signed.getEncoded().getBytes());
***************
*** 169,173 ****
          assertTrue(obj instanceof SignatureRequest);
          SignatureRequest sigreq = (SignatureRequest) obj;
!         assertEquals(sigreq.getSignatory().getName(), "neu://test");
          assertTrue(forms[0].hasParameterNamed("endpoint"));
          assertEquals("http://localhost", forms[0].getParameterValue("endpoint"));
--- 175,179 ----
          assertTrue(obj instanceof SignatureRequest);
          SignatureRequest sigreq = (SignatureRequest) obj;
!         assertEquals(getPublicKeyName("neu://test"), sigreq.getSignatory().getName());
          assertTrue(forms[0].hasParameterNamed("endpoint"));
          assertEquals("http://localhost", forms[0].getParameterValue("endpoint"));
***************
*** 175,178 ****
--- 181,188 ----
      }
  
+     protected String getPublicKeyName(String alias) throws NonExistingSignerException {
+         return Base32.encode(CryptoTools.digest(signer.getPublicKey(alias).getEncoded()));
+     }
+ 
      JCESigner signer;
  }