[Neuclear-develop] neuclear-id/src/java/org/neuclear/id/signers SignatureRequestServlet.java,1.2,1.3 SigningServlet.java,1.6,1.7

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

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

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

Index: SignatureRequestServlet.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/signers/SignatureRequestServlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SignatureRequestServlet.java	1 Apr 2004 23:19:48 -0000	1.2
--- SignatureRequestServlet.java	14 Apr 2004 23:44:44 -0000	1.3
***************
*** 2,6 ****
  
  import org.neuclear.commons.NeuClearException;
! import org.neuclear.commons.Utility;
  import org.neuclear.commons.crypto.signers.ServletSignerFactory;
  import org.neuclear.commons.crypto.signers.Signer;
--- 2,7 ----
  
  import org.neuclear.commons.NeuClearException;
! import org.neuclear.commons.crypto.passphraseagents.UserCancellationException;
! import org.neuclear.commons.crypto.signers.NonExistingSignerException;
  import org.neuclear.commons.crypto.signers.ServletSignerFactory;
  import org.neuclear.commons.crypto.signers.Signer;
***************
*** 9,13 ****
  import org.neuclear.id.builders.Builder;
  import org.neuclear.id.builders.SignatureRequestBuilder;
- import org.neuclear.id.resolver.Resolver;
  import org.neuclear.xml.XMLException;
  import org.neuclear.xml.xmlsec.XMLSecTools;
--- 10,13 ----
***************
*** 44,47 ****
--- 44,50 ----
  $Id$
  $Log$
+ Revision 1.3  2004/04/14 23:44:44  pelle
+ Got the cactus tests working and the sample web app
+ 
  Revision 1.2  2004/04/01 23:19:48  pelle
  Split Identity into Signatory and Identity class.
***************
*** 137,146 ****
  
          try {
!             final Identity user = getUserNS(request);
              final Builder namedreq = createBuilder(request);
!             final SignatureRequestBuilder sigreq = new SignatureRequestBuilder(user.getName(), namedreq, "Login to Site");
!             sigreq.sign(serviceid, signer);
              out.write("<form action=\"");
!             out.print(user.getSigner());
              out.write("\" method=\"POST\" id=\"sigrequest\">\n    ");
              out.write("<input name=\"neuclear-request\" value=\"");
--- 140,158 ----
  
          try {
! //            final Identity user = getUserNS(request);
              final Builder namedreq = createBuilder(request);
!             final SignatureRequestBuilder sigreq = new SignatureRequestBuilder(namedreq, "Login to Site");
!             try {
!                 sigreq.sign(serviceid, signer);
!             } catch (XMLSecurityException e) {
!                 e.printStackTrace();
!             } catch (UserCancellationException e) {
!                 e.printStackTrace();
!             } catch (NonExistingSignerException e) {
!                 e.printStackTrace();
!             }
              out.write("<form action=\"");
!             out.write(Identity.DEFAULT_SIGNER);
! //            out.print(user.getSigner());
              out.write("\" method=\"POST\" id=\"sigrequest\">\n    ");
              out.write("<input name=\"neuclear-request\" value=\"");
***************
*** 166,175 ****
  
      protected Identity getUserNS(final HttpServletRequest request) throws NeuClearException {
!         if (request.getUserPrincipal() != null)
!             return (Identity) request.getUserPrincipal();
!         final String username = request.getParameter("identity");
!         if (Utility.isEmpty(username))
!             throw new NeuClearException("No Identity Provided");
!         return Resolver.resolveIdentity(username);
      }
  
--- 178,187 ----
  
      protected Identity getUserNS(final HttpServletRequest request) throws NeuClearException {
! //        if (request.getUserPrincipal() != null)
!         return (Identity) request.getUserPrincipal();
! //        final String username = request.getParameter("identity");
! //        if (Utility.isEmpty(username))
! //            throw new NeuClearException("No Identity Provided");
! //        return Resolver.resolveIdentity(username);
      }
  

Index: SigningServlet.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/signers/SigningServlet.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SigningServlet.java	14 Apr 2004 00:11:34 -0000	1.6
--- SigningServlet.java	14 Apr 2004 23:44:44 -0000	1.7
***************
*** 2,5 ****
--- 2,8 ----
   * $Id$
   * $Log$
+  * Revision 1.7  2004/04/14 23:44:44  pelle
+  * Got the cactus tests working and the sample web app
+  *
   * Revision 1.6  2004/04/14 00:11:34  pelle
   * Added a MessageLabel for handling errors, validation and info
***************
*** 341,347 ****
              throw new NeuClearException("nothing to sign");
          }
-         if (!signer.canSignFor(sigreq.getUserid()))
-             throw new NonExistingSignerException(sigreq.getUserid());
- 
          response.setHeader("Pragma", "no-cache");
          response.setDateHeader("Expires", 0);
--- 344,347 ----