[Neuclear-develop] neuclear-id/src/test-cactus/org/neuclear/id/receiver MockReceiver.java,1.1,1.2 ReceiverServletTest.java,1.1,1.2

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

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

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

Index: ReceiverServletTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/test-cactus/org/neuclear/id/receiver/ReceiverServletTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ReceiverServletTest.java	2 Mar 2004 18:59:13 -0000	1.1
--- ReceiverServletTest.java	14 Apr 2004 23:44:46 -0000	1.2
***************
*** 3,11 ****
  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.crypto.Base64;
  import org.neuclear.commons.crypto.signers.JCESigner;
  import org.neuclear.commons.crypto.signers.TestCaseSigner;
  import org.neuclear.id.builders.AuthenticationTicketBuilder;
  import org.neuclear.xml.XMLException;
--- 3,14 ----
  import org.apache.cactus.ServletTestCase;
  import org.apache.cactus.WebRequest;
  import org.neuclear.commons.NeuClearException;
+ 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.auth.AuthenticationTicket;
  import org.neuclear.id.builders.AuthenticationTicketBuilder;
  import org.neuclear.xml.XMLException;
***************
*** 36,39 ****
--- 39,45 ----
  $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.
***************
*** 74,81 ****
      public void beginReceiveBase64(WebRequest theRequest) throws GeneralSecurityException, NeuClearException, XMLException {
  
!         AuthenticationTicketBuilder builder = new AuthenticationTicketBuilder("neu://bob@test", "neu://test", "http://localhost");
!         AuthenticationTicket ticket = (AuthenticationTicket) builder.convert("neu://bob@test",signer);
          theRequest.setContentType("application/x-www-form-urlencoded");
!         String b64 =Base64.encode(ticket.getEncoded().getBytes());
          theRequest.addParameter("neuclear-request", b64, "POST");
          theRequest.setURL("http://users.neuclear.org", "/test", "/Receiver",
--- 80,87 ----
      public void beginReceiveBase64(WebRequest theRequest) throws GeneralSecurityException, NeuClearException, XMLException {
  
!         AuthenticationTicketBuilder builder = new AuthenticationTicketBuilder("http://localhost");
!         AuthenticationTicket ticket = (AuthenticationTicket) builder.convert("neu://bob@test", signer);
          theRequest.setContentType("application/x-www-form-urlencoded");
!         String b64 = Base64.encode(ticket.getEncoded().getBytes());
          theRequest.addParameter("neuclear-request", b64, "POST");
          theRequest.setURL("http://users.neuclear.org", "/test", "/Receiver",
***************
*** 83,89 ****
      }
  
!     public void testReceiveBase64() throws ServletException, IOException {
          assertEquals(request.getContentType(), "application/x-www-form-urlencoded");
!         assertEquals(request.getMethod(),"POST");
          ReceiverServlet servlet = new ReceiverServlet();
          MockReceiver receiver = new MockReceiver();
--- 89,99 ----
      }
  
!     protected String getPublicKeyName(String alias) throws NonExistingSignerException {
!         return Base32.encode(CryptoTools.digest(signer.getPublicKey(alias).getEncoded()));
!     }
! 
!     public void testReceiveBase64() throws ServletException, IOException, NonExistingSignerException {
          assertEquals(request.getContentType(), "application/x-www-form-urlencoded");
!         assertEquals(request.getMethod(), "POST");
          ReceiverServlet servlet = new ReceiverServlet();
          MockReceiver receiver = new MockReceiver();
***************
*** 92,111 ****
          servlet.service(request, response);
          assertNotNull(receiver.getLastReceived());
!         assertEquals(receiver.getLastReceived().getSignatory().getName(), "neu://bob@test");
  
      }
-    public void beginReceiveSOAP(WebRequest theRequest) throws GeneralSecurityException, NeuClearException, XMLException, IOException {
  
!         AuthenticationTicketBuilder builder = new AuthenticationTicketBuilder("neu://alice@test", "neu://test", "http://localhost");
!         AuthenticationTicket ticket = (AuthenticationTicket) builder.convert("neu://bob@test",signer);
          theRequest.setContentType("text/xml");
          theRequest.setURL("http://users.neuclear.org", "/test", "/Service",
                  null, null);
!        theRequest.setUserData(new ByteArrayInputStream(ticket.getEncoded().getBytes()));
!      }
  
!     public void testReceiveSOAP() throws ServletException, IOException {
          assertEquals(request.getContentType(), "text/xml");
!         assertEquals(request.getMethod(),"POST");
          ReceiverServlet servlet = new ReceiverServlet();
          MockReceiver receiver = new MockReceiver();
--- 102,122 ----
          servlet.service(request, response);
          assertNotNull(receiver.getLastReceived());
!         assertEquals(getPublicKeyName("neu://bob@test"), receiver.getLastReceived().getSignatory().getName());
  
      }
  
!     public void beginReceiveSOAP(WebRequest theRequest) throws GeneralSecurityException, NeuClearException, XMLException, IOException {
! 
!         AuthenticationTicketBuilder builder = new AuthenticationTicketBuilder("http://localhost");
!         AuthenticationTicket ticket = (AuthenticationTicket) builder.convert("neu://bob@test", signer);
          theRequest.setContentType("text/xml");
          theRequest.setURL("http://users.neuclear.org", "/test", "/Service",
                  null, null);
!         theRequest.setUserData(new ByteArrayInputStream(ticket.getEncoded().getBytes()));
!     }
  
!     public void testReceiveSOAP() throws ServletException, IOException, NonExistingSignerException {
          assertEquals(request.getContentType(), "text/xml");
!         assertEquals(request.getMethod(), "POST");
          ReceiverServlet servlet = new ReceiverServlet();
          MockReceiver receiver = new MockReceiver();
***************
*** 114,120 ****
          servlet.service(request, response);
          assertNotNull(receiver.getLastReceived());
!         assertEquals(receiver.getLastReceived().getSignatory().getName(), "neu://alice@test");
  
      }
      JCESigner signer;
  }
--- 125,132 ----
          servlet.service(request, response);
          assertNotNull(receiver.getLastReceived());
!         assertEquals(getPublicKeyName("neu://bob@test"), receiver.getLastReceived().getSignatory().getName());
  
      }
+ 
      JCESigner signer;
  }

Index: MockReceiver.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/test-cactus/org/neuclear/id/receiver/MockReceiver.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MockReceiver.java	2 Mar 2004 18:59:13 -0000	1.1
--- MockReceiver.java	14 Apr 2004 23:44:46 -0000	1.2
***************
*** 2,11 ****
  
  import org.neuclear.commons.NeuClearException;
  import org.neuclear.commons.crypto.signers.Signer;
  import org.neuclear.commons.crypto.signers.TestCaseSigner;
- import org.neuclear.commons.crypto.signers.InvalidPassphraseException;
  import org.neuclear.id.SignedNamedObject;
  import org.neuclear.id.builders.AuthenticationTicketBuilder;
- import org.neuclear.xml.ElementProxy;
  
  /*
--- 2,10 ----
  
  import org.neuclear.commons.NeuClearException;
+ import org.neuclear.commons.crypto.signers.InvalidPassphraseException;
  import org.neuclear.commons.crypto.signers.Signer;
  import org.neuclear.commons.crypto.signers.TestCaseSigner;
  import org.neuclear.id.SignedNamedObject;
  import org.neuclear.id.builders.AuthenticationTicketBuilder;
  
  /*
***************
*** 29,32 ****
--- 28,34 ----
  $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.
***************
*** 53,66 ****
      public MockReceiver() {
          try {
!             signer=new TestCaseSigner();
          } catch (InvalidPassphraseException e) {
              throw new RuntimeException(e);
          }
      }
      /**
       * Add your main transaction processing logic within this method.
       * Remember you must check the validity of the SignedNamedObject here. Until you do so
       * you can not trust it.
!      * 
       * @param obj
       * @throws UnsupportedTransaction
--- 55,69 ----
      public MockReceiver() {
          try {
!             signer = new TestCaseSigner();
          } catch (InvalidPassphraseException e) {
              throw new RuntimeException(e);
          }
      }
+ 
      /**
       * Add your main transaction processing logic within this method.
       * Remember you must check the validity of the SignedNamedObject here. Until you do so
       * you can not trust it.
!      *
       * @param obj
       * @throws UnsupportedTransaction
***************
*** 68,72 ****
      public SignedNamedObject receive(SignedNamedObject obj) throws UnsupportedTransaction, NeuClearException {
          received = obj;
!         return new AuthenticationTicketBuilder("neu://test", obj.getName(), "http://localhost").convert("neu://bob@test",signer);//Just some dummy
      }
  
--- 71,75 ----
      public SignedNamedObject receive(SignedNamedObject obj) throws UnsupportedTransaction, NeuClearException {
          received = obj;
!         return new AuthenticationTicketBuilder("http://localhost").convert("neu://bob@test", signer);//Just some dummy
      }
  
***************
*** 74,77 ****
--- 77,81 ----
          return received;
      }
+ 
      private Signer signer;
      private SignedNamedObject received = null;