1 files changed, 91 insertions, 42 deletions
diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/RetrieveSignatureDataServlet.java b/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/RetrieveSignatureDataServlet.java
index 402170c..6653a60 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/RetrieveSignatureDataServlet.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/RetrieveSignatureDataServlet.java
@@ -5,22 +5,29 @@ package at.knowcenter.wag.egov.egiz.web.servlets;
 
 import java.io.IOException;
 
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+
+import at.gv.egiz.pdfas.impl.input.TextDataSourceImpl;
+import at.gv.egiz.pdfas.exceptions.web.SessionExpiredException;
+import at.gv.egiz.pdfas.framework.input.DataSource;
+import at.gv.egiz.pdfas.web.SignSessionInformation;
+import at.gv.egiz.pdfas.web.VerifySessionInformation;
+import at.gv.egiz.pdfas.web.helper.SessionHelper;
+import at.gv.egiz.pdfas.utils.StreamUtils;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import at.knowcenter.wag.egov.egiz.PdfAS;
+import at.knowcenter.wag.egov.egiz.pdf.BinarySignatureHolder;
 import at.knowcenter.wag.egov.egiz.pdf.SignatureHolder;
 import at.knowcenter.wag.egov.egiz.sig.SignatureData;
 import at.knowcenter.wag.egov.egiz.sig.SignatureDataImpl;
-import at.knowcenter.wag.egov.egiz.sig.SignatureObject;
-import at.knowcenter.wag.egov.egiz.tools.CodingHelper;
-import at.knowcenter.wag.egov.egiz.web.SessionAttributes;
-import at.knowcenter.wag.egov.egiz.web.SessionInformation;
 
 /**
  * Retrieves the Signature Data from the session and returns it.
@@ -40,61 +47,103 @@ public class RetrieveSignatureDataServlet extends HttpServlet
    */
   private static Log log = LogFactory.getLog(RetrieveSignatureDataServlet.class);
 
+  protected void dispatch(HttpServletRequest request,
+      HttpServletResponse response, String resource) throws ServletException, IOException
+  {
+    dispatch(request, response, resource, getServletContext());
+  }
+  
+  protected static void dispatch(HttpServletRequest request,
+      HttpServletResponse response, String resource, ServletContext context) throws ServletException, IOException
+  {
+    response.setContentType("text/html");
+    response.setCharacterEncoding("UTF-8");
+
+    RequestDispatcher disp = context.getRequestDispatcher(resource);
+    disp.forward(request, response);
+  }
+
   /**
-   * @see javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+   * @see javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest,
+   *      javax.servlet.http.HttpServletResponse)
    */
   protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
   {
     log.debug("Request for receiving signature data."); //$NON-NLS-1$
-    
-    HttpSession session = request.getSession(false);
-    if (session == null)
+
+    try
     {
-      String msg = "There is no session associated with this request."; //$NON-NLS-1$
-      log.error(msg);
-      throw new ServletException(msg);
+    Object sessionObject = SessionHelper.getSession(request);
+
+    if (sessionObject instanceof SignSessionInformation)
+    {
+      SignSessionInformation si = (SignSessionInformation) sessionObject;
+      processSign(request, response, si);
     }
-    
-    SessionInformation si = (SessionInformation) session.getAttribute(SessionAttributes.ATTRIBUTE_SESSION_INFORMATION);
-    if (si == null)
+    else
     {
-      String msg = "The session is not found or no longer valid."; //$NON-NLS-1$
-      log.error(msg);
-      throw new ServletException(msg);
+      VerifySessionInformation si = (VerifySessionInformation) sessionObject;
+      processVerify(request, response, si);
     }
-    
+    }
+    catch (SessionExpiredException e)
+    {
+      log.error(e);
+      SignServlet.prepareDispatchToErrorPage(e, request);
+      dispatch(request, response, "/jsp/error.jsp");
+    }
+  }
+
+  protected void processSign(HttpServletRequest request, HttpServletResponse response, SignSessionInformation si) throws ServletException, IOException
+  {
+    writeSignatureData(si.si.getSignatureData(), response);
+  }
+
+  protected void processVerify(HttpServletRequest request, HttpServletResponse response, VerifySessionInformation si) throws ServletException, IOException
+  {
     SignatureData sd = null;
-    if (si.application.equals("sign"))
+    
+    SignatureHolder holder = null;
+    
+    if (si.currentLocalOperation != null)
     {
-      sd = si.iui.signature_data;
+      holder = si.currentLocalOperation.getCurrentSignatureHolder();
     }
     else
     {
-      SignatureHolder holder = (SignatureHolder) si.signature_holders.get(si.current_operation);
-      SignatureObject s = holder.getSignatureObject();
-      
-      // TODO make better
-      String text_to_be_verified = holder.getSignedText();
-      if (holder.getSignatureObject().isBinary())
-      {
-        byte[] data = CodingHelper.decodeBase64(text_to_be_verified);
-        sd = new SignatureDataImpl(data, "application/pdf");
-      }
-      else
-      {
-        sd = new SignatureDataImpl(text_to_be_verified.getBytes("UTF-8"), "text/plain", "UTF-8");
-      }
-
+      holder = si.moa_holder;
     }
+    
+    log.debug("holder = " + holder.toString());
 
-    log.debug("Writing " + sd.getMimeType() + " data:"); //$NON-NLS-1$ //$NON-NLS-2$
+    sd = PdfAS.convertSignatureHolderToSignatureData(holder);
+//    if (holder.getSignatureObject().isBinary())
+//    {
+//      BinarySignatureHolder bsh = (BinarySignatureHolder) holder;
+//      // byte[] data = CodingHelper.decodeBase64(text_to_be_verified);
+//      sd = new SignatureDataImpl(bsh.getSignedPdf(), "application/pdf");
+//    }
+//    else
+//    {
+//      String text_to_be_verified = holder.getSignedText();
+//      DataSource ds = new TextDataSourceImpl(text_to_be_verified);
+//      sd = new SignatureDataImpl(ds, "text/plain", "UTF-8");
+//    }
     
+    log.debug("sd = " + sd.toString() + ", " + sd.getDataSource().getClass().getName() + ", " + sd.getDataSource().getLength() + ", " + sd.getMimeType() + ", " + sd.getCharacterEncoding());
+
+    writeSignatureData(sd, response);
+  }
+
+  protected void writeSignatureData(SignatureData sd, HttpServletResponse response) throws IOException
+  {
+    log.trace("Writing " + sd.getMimeType() + " data:"); //$NON-NLS-1$ //$NON-NLS-2$
+
     response.setContentType(sd.getMimeType());
     response.setCharacterEncoding(sd.getCharacterEncoding());
-    response.getOutputStream().write(sd.getData());
-    
-    log.debug("Writing SignatureData finished."); //$NON-NLS-1$
-  }
+    StreamUtils.writeInputStreamToOutputStream(sd.getDataSource().createInputStream(), response.getOutputStream());
+    // response.getOutputStream().write(sd.getData());
 
-  
+    log.trace("Writing SignatureData finished."); //$NON-NLS-1$
+  }
 }