[Neuclear-develop] neuclear-id/src/java/org/neuclear/signers/servlet SigningServlet.java,1.12,1.13

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

Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/signers/servlet
In directory sc8-pr-cvs1:/tmp/cvs-serv4327/src/java/org/neuclear/signers/servlet

Modified Files:
	SigningServlet.java 
Log Message:
Payment Web Application is getting there.

Index: SigningServlet.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/signers/servlet/SigningServlet.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** SigningServlet.java	18 Nov 2003 00:01:55 -0000	1.12
--- SigningServlet.java	18 Nov 2003 23:35:45 -0000	1.13
***************
*** 2,5 ****
--- 2,8 ----
   * $Id$
   * $Log$
+  * Revision 1.13  2003/11/18 23:35:45  pelle
+  * Payment Web Application is getting there.
+  *
   * Revision 1.12  2003/11/18 00:01:55  pelle
   * The sample signing web application for logging in and out is now working.
***************
*** 166,169 ****
--- 169,173 ----
  import org.neuclear.commons.Utility;
  import org.neuclear.commons.crypto.Base64;
+ import org.neuclear.commons.crypto.passphraseagents.PassPhraseAgent;
  import org.neuclear.commons.crypto.signers.InvalidPassphraseException;
  import org.neuclear.commons.crypto.signers.NonExistingSignerException;
***************
*** 188,202 ****
  import java.io.PrintWriter;
  import java.security.GeneralSecurityException;
  
! public class SigningServlet extends ReceiverServlet {
      public void init(ServletConfig config) throws ServletException {
          System.out.println("NEUDIST: Initialising SigningServlet");
          super.init(config);
          context = config.getServletContext();
          try {
              System.out.println("NEUDIST: Initialising SigningServlet");
              title = Utility.denullString(config.getInitParameter("title").toString(), "NeuClear Signing Service");
              if (signer == null) {
!                 signer = new TestCaseSigner();
              }
              System.out.println("NEUDIST: Finished SigningServlet Init ");
--- 192,209 ----
  import java.io.PrintWriter;
  import java.security.GeneralSecurityException;
+ import java.util.HashMap;
+ import java.util.Map;
  
! public class SigningServlet extends ReceiverServlet implements PassPhraseAgent {
      public void init(ServletConfig config) throws ServletException {
          System.out.println("NEUDIST: Initialising SigningServlet");
          super.init(config);
          context = config.getServletContext();
+         reqMap = new HashMap();
          try {
              System.out.println("NEUDIST: Initialising SigningServlet");
              title = Utility.denullString(config.getInitParameter("title").toString(), "NeuClear Signing Service");
              if (signer == null) {
!                 signer = new TestCaseSigner(this);
              }
              System.out.println("NEUDIST: Finished SigningServlet Init ");
***************
*** 223,226 ****
--- 230,234 ----
              return;
          }
+         reqMap.put(Thread.currentThread(), request);
          response.setHeader("Pragma", "no-cache");
          response.setDateHeader("Expires", 0);
***************
*** 305,312 ****
                      out.print(XMLSecTools.encodeElementBase64(named));
                      out.println("\" type=\"hidden\"/>");
!                     out.write("<input type=\"submit\">");
                      out.write("</form>\n");
                      out.write("<script language=\"javascript\">\n");
! //                    out.write("<!--\n   document.forms[0].submit();\n-->\n");
                      out.write("</script>\n");
  
--- 313,320 ----
                      out.print(XMLSecTools.encodeElementBase64(named));
                      out.println("\" type=\"hidden\"/>");
! //                    out.write("<input type=\"submit\">");
                      out.write("</form>\n");
                      out.write("<script language=\"javascript\">\n");
!                     out.write("<!--\n   document.forms[0].submit();\n-->\n");
                      out.write("</script>\n");
  
***************
*** 320,323 ****
--- 328,332 ----
          }
          out.println("<p align\"left\"><img src=\"images/neubia40x40.png\"><br><a href=\"http://www.neubia.com\"><i>&copy; 2002 Antilles Software Ventures SA</i></a></body></html>");
+         reqMap.remove(Thread.currentThread()); //Super Important
      }
  
***************
*** 335,338 ****
--- 344,365 ----
      }
  
+     /**
+      * Retrieve the PassPhrase for a given name/alias
+      * 
+      * @param name 
+      * @return 
+      */
+     public char[] getPassPhrase(String name) {
+         if (reqMap == null)
+             return null;
+         HttpServletRequest request = (HttpServletRequest) reqMap.get(Thread.currentThread());
+         if (request == null)
+             return null;
+         String passphrase = request.getParameter("passphrase");
+         if (passphrase == null)
+             return null;
+         return passphrase.toCharArray();
+     }
+ 
  /*
      public Element receiveNamedObject(SignedNamedObject obj, String soapAction) throws SOAPException {
***************
*** 376,378 ****
--- 403,406 ----
      private String id;
      private String title;
+     private Map reqMap;
  }