Necessary changes for separation of pdf-as-web and rest of the project

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@680 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c

1 files changed, 14 insertions, 30 deletions

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/PdfAS.java b/src/main/java/at/knowcenter/wag/egov/egiz/PdfAS.java
index 9315477..6a19b42 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/PdfAS.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/PdfAS.java
@@ -50,7 +50,6 @@ import at.gv.egiz.pdfas.impl.api.commons.PdfDataSourceAdapter;
 import at.gv.egiz.pdfas.impl.input.ByteArrayPdfDataSourceImpl;

 import at.gv.egiz.pdfas.impl.input.helper.DataSourceHelper;

 import at.gv.egiz.pdfas.utils.PDFASUtils;

-import at.gv.egiz.pdfas.web.VerifySessionInformation;

 import at.knowcenter.wag.egov.egiz.cfg.OverridePropertyHolder;

 import at.knowcenter.wag.egov.egiz.cfg.SettingsReader;

 import at.knowcenter.wag.egov.egiz.exceptions.ConnectorException;

@@ -824,50 +823,35 @@ public abstract class PdfAS
   }

 

   /**

+   * Verify a list of signatures

    * 

-   * @param extended_signature_info

-   * @param connectorType

+   * @param extended_signature_info a list of {@link ExtendedSignatureInformation} to be verified 

+   * @param connectorType the connector to use for verification

    * @param returnHashInputData

    * @param verificationTime

-   * @return

+   * @param verifySignatureAtIndex only verify the signature at the given index in the extended_signature_info list. A value < 0 means to verify all signatures in the list.

+   * @return a list of {@link SignatureResponse}s

    * @throws PDFDocumentException

    * @throws NormalizeException

    * @throws SignatureException

    * @throws ConnectorException

    * @throws ConnectorFactoryException

    */

-  public static List verifyExtendedSignatureHolders(List extended_signature_info, String connectorType, boolean returnHashInputData, Date verificationTime) throws PDFDocumentException, NormalizeException, SignatureException, ConnectorException, ConnectorFactoryException

+  public static List verifyExtendedSignatureHolders(List extended_signature_info, String connectorType, boolean returnHashInputData, Date verificationTime, int verifySignatureAtIndex) throws PDFDocumentException, NormalizeException, SignatureException, ConnectorException, ConnectorFactoryException

   {

     List results = new ArrayList();

     for (int i = 0; i < extended_signature_info.size(); i++)

     {

-      ExtendedSignatureInformation sigInfo = (ExtendedSignatureInformation) extended_signature_info.get(i);

-      SignatureInformation si = sigInfo.getSignatureInformation();

-      SignatureHolder holder = (SignatureHolder) si.getInternalSignatureInformation();

-

-      SignatureResponse result = verify(holder, connectorType, returnHashInputData, verificationTime, sigInfo.getXmlDsigData());

-      results.add(result);

-    }

-    return results;

-  }

-

-  public static List verifySignatureHoldersWeb(List signature_holders,

-      VerifySessionInformation si, String loc_ref) throws PDFDocumentException, NormalizeException, SignatureException, ConnectorException

-  {

-    List results = new ArrayList();

-

-    for (int i = 0; i < signature_holders.size(); i++)

-    {

-      SignatureHolder holder = (SignatureHolder) signature_holders.get(i);

+      if (verifySignatureAtIndex < 0 || verifySignatureAtIndex == i)

+      {

+        ExtendedSignatureInformation sigInfo = (ExtendedSignatureInformation) extended_signature_info.get(i);

+        SignatureInformation si = sigInfo.getSignatureInformation();

+        SignatureHolder holder = (SignatureHolder) si.getInternalSignatureInformation();

 

-      // store the current holder on the session so that moa can obtain

-      // it from the RetrieveSignatureDataServlet.

-      si.moa_holder = holder;

-      

-      SignatureResponse result = verifyWeb(holder, si.connector, loc_ref);

-      results.add(result);

+        SignatureResponse result = verify(holder, connectorType, returnHashInputData, verificationTime, sigInfo.getXmlDsigData());

+        results.add(result);

+      }

     }

-

     return results;

   }