PDF-AS API

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

1 files changed, 22 insertions, 19 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 6fc7b84..9aef071 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/PdfAS.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/PdfAS.java
@@ -17,31 +17,27 @@
  */

 package at.knowcenter.wag.egov.egiz;

 

-import java.io.ByteArrayInputStream;

 import java.io.IOException;

 import java.io.InputStream;

 import java.util.ArrayList;

 import java.util.Collections;

 import java.util.Comparator;

+import java.util.Date;

 import java.util.List;

 import java.util.Vector;

 

+import org.apache.commons.logging.Log;

+import org.apache.commons.logging.LogFactory;

+

 import at.gv.egiz.pdfas.commandline.CommandlineConnectorChooser;

 import at.gv.egiz.pdfas.exceptions.ErrorCode;

-import at.gv.egiz.pdfas.impl.input.ByteArrayPdfDataSourceImpl;

-import at.gv.egiz.pdfas.impl.input.DelimitedInputStream;

-import at.gv.egiz.pdfas.impl.input.TextDataSourceImpl;

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

-import at.gv.egiz.pdfas.framework.input.DataSource;

+import at.gv.egiz.pdfas.framework.ConnectorParameters;

 import at.gv.egiz.pdfas.framework.input.PdfDataSource;

-import at.gv.egiz.pdfas.framework.input.TextDataSource;

 import at.gv.egiz.pdfas.framework.output.DataSink;

 import at.gv.egiz.pdfas.framework.signator.SignatorInformation;

+import at.gv.egiz.pdfas.impl.input.ByteArrayPdfDataSourceImpl;

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

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

-

-import org.apache.commons.logging.Log;

-import org.apache.commons.logging.LogFactory;

-

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

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

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

@@ -62,7 +58,6 @@ import at.knowcenter.wag.egov.egiz.pdf.SignatureHolder;
 import at.knowcenter.wag.egov.egiz.pdf.TablePos;

 import at.knowcenter.wag.egov.egiz.pdf.TextualSignature;

 import at.knowcenter.wag.egov.egiz.pdf.TextualSignatureHolder;

-import at.knowcenter.wag.egov.egiz.sig.ConnectorFactory;

 import at.knowcenter.wag.egov.egiz.sig.SignatureData;

 import at.knowcenter.wag.egov.egiz.sig.SignatureDataImpl;

 import at.knowcenter.wag.egov.egiz.sig.SignatureObject;

@@ -740,7 +735,7 @@ public abstract class PdfAS
     return true;

   }

 

-  public static List verifySignatureHolders(List signature_holders, String connectorType) throws PDFDocumentException, NormalizeException, SignatureException, ConnectorException, ConnectorFactoryException

+  public static List verifySignatureHolders(List signature_holders, String connectorType, boolean returnHashInputData, Date verificationTime) throws PDFDocumentException, NormalizeException, SignatureException, ConnectorException, ConnectorFactoryException

   {

     List results = new ArrayList();

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

@@ -757,7 +752,7 @@ public abstract class PdfAS
       // (holder.signature_object.isTextual() ? "textual" : "binary"));

       // logger_.debug(holder.signature_object.toString());

 

-      SignatureResponse result = verify(holder, connectorType);

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

       results.add(result);

 

       // logger_.debug();

@@ -809,7 +804,7 @@ public abstract class PdfAS
    * @throws ConnectorException 

    * @throws ConnectorFactoryException 

    */

-  public static SignatureResponse verify(SignatureHolder signature_holder, String connectorType) throws NormalizeException, PDFDocumentException, SignatureException, ConnectorException, ConnectorFactoryException

+  public static SignatureResponse verify(SignatureHolder signature_holder, String connectorType, boolean returnHashInputData, Date verificationTime) throws NormalizeException, PDFDocumentException, SignatureException, ConnectorException, ConnectorFactoryException

   {

     // String text_to_be_verified = signature_holder.getSignedText();

     // logger_.debug("verify text_to_be_verified"+text_to_be_verified);

@@ -844,10 +839,14 @@ public abstract class PdfAS
     String profile = so_to_be_verified.getSignatureTypeDefinition().getType();

 //    Connector c = ConnectorChooser.chooseCommandlineConnectorForVerify(connector, so_to_be_verified.getKZ(), so.id, profile);

     String connectorId = CommandlineConnectorChooser.chooseCommandlineConnectorForVerify(connectorType, so_to_be_verified.getKZ(), so.id, profile);

-    Connector c = at.gv.egiz.pdfas.framework.ConnectorFactory.createConnector(connectorId, profile, null);

+    

+    ConnectorParameters cp = new ConnectorParameters();

+    cp.setProfileId(profile);

+    cp.setReturnHashInputData(returnHashInputData);

+    cp.setVerificationTime(verificationTime);

+    Connector c = at.gv.egiz.pdfas.framework.ConnectorFactory.createConnector(connectorId, cp);

 

     return c.doVerify(sd, so);

-

   }

 

   public static SignatureResponse verifyWeb(SignatureHolder signature_holder, String connector, String loc_ref) throws NormalizeException, PDFDocumentException, SignatureException, ConnectorException

@@ -992,11 +991,13 @@ public abstract class PdfAS
 //    signCommandline(pdfDataSource, dataSink, signatorId, connectorId, profile, pos);

 //  }

   

-  public static void signCommandline(PdfDataSource pdfDataSource, DataSink dataSink, PdfASID signatorId, String connectorId, final String profile, TablePos pos) throws PresentableException

+  public static SignatorInformation signCommandline(PdfDataSource pdfDataSource, DataSink dataSink, PdfASID signatorId, String connectorId, final String profile, TablePos pos) throws PresentableException

   {

     at.gv.egiz.pdfas.framework.signator.Signator signator = at.gv.egiz.pdfas.framework.SignatorFactory.createSignator(signatorId);

 

-    Connector c = at.gv.egiz.pdfas.framework.ConnectorFactory.createConnector(connectorId, profile, null);

+    ConnectorParameters cp = new ConnectorParameters();

+    cp.setProfileId(profile);

+    Connector c = at.gv.egiz.pdfas.framework.ConnectorFactory.createConnector(connectorId, cp);

 

     // SignatorInformation si = signator.prepareSign(pdfDataSource, profile, pos, ConnectorFactory.needsSIG_ID(connector));

     SignatorInformation si = signator.prepareSign(pdfDataSource, profile, pos, CommandlineConnectorChooser.needsSigId(connectorId));

@@ -1006,6 +1007,8 @@ public abstract class PdfAS
     si.setSignSignatureObject(sso);

 

     signator.finishSign(si, dataSink);

+    

+    return si;

   }

   

   /**