1 files changed, 180 insertions, 71 deletions
diff --git a/src/main/java/at/gv/egiz/pdfas/impl/api/PdfAsObject.java b/src/main/java/at/gv/egiz/pdfas/impl/api/PdfAsObject.java
index 90e7986..e630aa3 100644
--- a/src/main/java/at/gv/egiz/pdfas/impl/api/PdfAsObject.java
+++ b/src/main/java/at/gv/egiz/pdfas/impl/api/PdfAsObject.java
@@ -26,6 +26,7 @@ import at.gv.egiz.pdfas.api.commons.SignatureInformation;
 import at.gv.egiz.pdfas.api.exceptions.PdfAsException;
 import at.gv.egiz.pdfas.api.sign.SignParameters;
 import at.gv.egiz.pdfas.api.sign.SignResult;
+import at.gv.egiz.pdfas.api.sign.SignatureDetailInformation;
 import at.gv.egiz.pdfas.api.verify.VerifyAfterAnalysisParameters;
 import at.gv.egiz.pdfas.api.verify.VerifyAfterReconstructXMLDsigParameters;
 import at.gv.egiz.pdfas.api.verify.VerifyParameters;
@@ -38,10 +39,12 @@ import at.gv.egiz.pdfas.api.xmldsig.ReconstructXMLDsigResult;
 import at.gv.egiz.pdfas.api.xmldsig.XMLDsigData;
 import at.gv.egiz.pdfas.commandline.CommandlineConnectorChooser;
 import at.gv.egiz.pdfas.exceptions.ErrorCode;
+import at.gv.egiz.pdfas.framework.ConnectorParameters;
 import at.gv.egiz.pdfas.framework.DataSourceHolder;
 import at.gv.egiz.pdfas.framework.config.SettingsHelper;
 import at.gv.egiz.pdfas.framework.input.ExtractionStage;
 import at.gv.egiz.pdfas.framework.input.PdfDataSource;
+import at.gv.egiz.pdfas.framework.signator.Signator;
 import at.gv.egiz.pdfas.framework.signator.SignatorInformation;
 import at.gv.egiz.pdfas.framework.vfilter.VerificationFilterParameters;
 import at.gv.egiz.pdfas.impl.api.analyze.AnalyzeResultImpl;
@@ -52,6 +55,7 @@ import at.gv.egiz.pdfas.impl.api.commons.SignatureProfileImpl;
 import at.gv.egiz.pdfas.impl.api.commons.TextDataSourceAdapter;
 import at.gv.egiz.pdfas.impl.api.sign.ActualSignaturePositionAdapter;
 import at.gv.egiz.pdfas.impl.api.sign.SignResultImpl;
+import at.gv.egiz.pdfas.impl.api.sign.SignatureDetailInformationImpl;
 import at.gv.egiz.pdfas.impl.api.verify.VerifyResultAdapter;
 import at.gv.egiz.pdfas.impl.api.verify.VerifyResultsImpl;
 import at.gv.egiz.pdfas.impl.input.DelimitedPdfDataSource;
@@ -63,11 +67,13 @@ import at.gv.egiz.pdfas.placeholder.SignaturePlaceholderExtractor;
 import at.gv.egiz.pdfas.utils.ConfigUtils;
 import at.knowcenter.wag.egov.egiz.PdfAS;
 import at.knowcenter.wag.egov.egiz.PdfASID;
+import at.knowcenter.wag.egov.egiz.cfg.OverridePropertyHolder;
 import at.knowcenter.wag.egov.egiz.cfg.SettingsReader;
 import at.knowcenter.wag.egov.egiz.exceptions.ConnectorException;
 import at.knowcenter.wag.egov.egiz.exceptions.OutOfMemoryException;
 import at.knowcenter.wag.egov.egiz.exceptions.PDFDocumentException;
 import at.knowcenter.wag.egov.egiz.exceptions.PresentableException;
+import at.knowcenter.wag.egov.egiz.exceptions.SignatorFactoryException;
 import at.knowcenter.wag.egov.egiz.exceptions.SignatureException;
 import at.knowcenter.wag.egov.egiz.framework.SignatorFactory;
 import at.knowcenter.wag.egov.egiz.pdf.BinarySignatureHolder;
@@ -76,9 +82,13 @@ import at.knowcenter.wag.egov.egiz.pdf.ObjectExtractor;
 import at.knowcenter.wag.egov.egiz.pdf.SignatureHolder;
 import at.knowcenter.wag.egov.egiz.pdf.TablePos;
 import at.knowcenter.wag.egov.egiz.pdf.TextualSignatureHolder;
+import at.knowcenter.wag.egov.egiz.sig.SignatureData;
+import at.knowcenter.wag.egov.egiz.sig.SignatureDataImpl;
 import at.knowcenter.wag.egov.egiz.sig.SignatureResponse;
 import at.knowcenter.wag.egov.egiz.sig.SignatureTypeDefinition;
 import at.knowcenter.wag.egov.egiz.sig.SignatureTypes;
+import at.knowcenter.wag.egov.egiz.sig.connectors.Connector;
+import at.knowcenter.wag.egov.egiz.sig.connectors.bku.SignSignatureObject;
 
 /**
  * Implementation of the {@link PdfAs} interface.
@@ -180,6 +190,8 @@ public class PdfAsObject implements PdfAs
 
     List profileInformation = new ArrayList(profiles.size());
 
+    String default_type = settings.getValueFromKey(SignatureTypes.DEFAULT_TYPE);
+    
     Iterator it = profiles.iterator();
     while (it.hasNext())
     {
@@ -190,8 +202,9 @@ public class PdfAsObject implements PdfAs
       final String moaKeyIdentifier = settings.getSetting("sig_obj." + profileId + "." + MOA_SIGN_KEY_IDENTIFIER_KEY, defaultMoaKeyIdentifiert);
       final String profileDescription = settings.getSetting("sig_obj." + profileId + "." + SignatureTypes.SIG_DESCR, null);
 
+      boolean isDefault = (default_type != null && default_type.equals(profileId));
       // modified by tknall
-      SignatureProfileImpl signatureProfile = new SignatureProfileImpl(profileId, profileDescription, moaKeyIdentifier);
+      SignatureProfileImpl signatureProfile = new SignatureProfileImpl(profileId, profileDescription, moaKeyIdentifier, isDefault);
 
       // start - added by tknall
       
@@ -262,68 +275,13 @@ public class PdfAsObject implements PdfAs
    */
   public SignResult sign(SignParameters signParameters) throws PdfAsException
   {
-    CheckHelper.checkSignParameters(signParameters);
-    
-    signParameters.setDocument(PdfAS.applyStrictMode(signParameters.getDocument()));
-    
-    SignaturePlaceholderData spd = null;
-    SignaturePlaceholderContext.setSignaturePlaceholderData(null);
-    if (signParameters.isCheckForPlaceholder()) {
-       spd = SignaturePlaceholderExtractor.extract(signParameters.getDocument().createInputStream(), signParameters.getPlaceholderId(), signParameters.getPlaceholderMatchMode());
-       if (spd != null){
-          if (spd.getProfile() != null)
-             signParameters.setSignatureProfileId(spd.getProfile());
-          if (spd.getType() != null)
-             signParameters.setSignatureType(spd.getType());
-          if (spd.getKey() != null)
-             signParameters.setSignatureKeyIdentifier(spd.getKey());
-       }
-    }
-    CheckHelper.checkSignParameters(signParameters);
+    CheckHelper.checkSignParameters(signParameters, false);
     
-    if (signParameters.getSignatureProfileId() == null)
-    {
-      SettingsReader settings = SettingsReader.getInstance();
-      String defaultProfile = settings.getValueFromKey(SignatureTypes.DEFAULT_TYPE);
-      signParameters.setSignatureProfileId(defaultProfile);
-    }
-
-    PdfASID signatorId = null;
-    if (signParameters.getSignatureType().equals(Constants.SIGNATURE_TYPE_BINARY))
-    {
-      signatorId = SignatorFactory.MOST_RECENT_BINARY_SIGNATOR_ID;
-    }
-    if (signParameters.getSignatureType().equals(Constants.SIGNATURE_TYPE_TEXTUAL))
-    {
-      signatorId = SignatorFactory.MOST_RECENT_TEXTUAL_SIGNATOR_ID;
-    }
-    if (signParameters.getSignatureType().equals(Constants.SIGNATURE_TYPE_DETACHEDTEXTUAL))
-    {
-      signatorId = SignatorFactory.MOST_RECENT_DETACHEDTEXT_SIGNATOR_ID;
-    }
-
-    TablePos pos = null;
-    if (spd != null && spd.getTablePos() != null)
-       pos = spd.getTablePos();
-    else
-       pos = PosHelper.formTablePos(signParameters.getSignaturePositioning());
-
-    String connectorId = CommandlineConnectorChooser.chooseCommandlineConnectorForSign(signParameters.getSignatureDevice());
-
     try {
-       SignatorInformation si = PdfAS.signCommandline(
-             new PdfDataSourceAdapter(signParameters.getDocument()),
-             new DataSinkAdapter(signParameters.getOutput()),
-             signatorId,
-             connectorId,
-             signParameters.getSignatureProfileId(),
-             signParameters.getSignatureKeyIdentifier(),
-             pos,
-             signParameters.getTimeStamperImpl(),
-             signParameters.getProfileOverrideProperties()
-       );
-       return new SignResultImpl(signParameters.getOutput(), si.getSignSignatureObject().getX509Certificate(),
-             new ActualSignaturePositionAdapter(si.getActualTablePos()), si.getNonTextualObjects());
+       SignatureDetailInformation signatorInfo = prepareSign(signParameters);
+       
+       return sign(signParameters, signatorInfo);
+       
     } catch (java.lang.OutOfMemoryError e) {
        throw new OutOfMemoryException(ErrorCode.OUT_OF_MEMORY_ERROR, "Insufficient memory allocated to virtual machine. Start Java with parameters \"-Xms128m -Xmx786m -XX:MaxPermSize=256m\".", e);
     }
@@ -538,8 +496,12 @@ public class PdfAsObject implements PdfAs
     varxp.setReturnHashInputData(verifyAfterAnalysisParameters.isReturnHashInputData());
     varxp.setSignatureDevice(verifyAfterAnalysisParameters.getSignatureDevice());
     varxp.setVerificationTime(verifyAfterAnalysisParameters.getVerificationTime());
+    varxp.setVerifySignatureIndex(verifyAfterAnalysisParameters.getVerifySignatureIndex());
   }
 
+  /**
+   * @see PdfAs#reconstructXMLDSIG(ReconstructXMLDsigParameters)
+   */
   public ReconstructXMLDsigResult reconstructXMLDSIG(
       ReconstructXMLDsigParameters reconstructXMLDsigParameters)
       throws PdfAsException {
@@ -563,6 +525,9 @@ public class PdfAsObject implements PdfAs
     rxaap.setVerificationTime(reconstructXMLDsigParameters.getVerificationTime());
   }
 
+  /**
+   * @see PdfAs#reconstructXMLDSIG(ReconstructXMLDsigAfterAnalysisParameters)
+   */
   public ReconstructXMLDsigResult reconstructXMLDSIG(
       ReconstructXMLDsigAfterAnalysisParameters reconstructXMLDsigParameters)
       throws PdfAsException {
@@ -585,6 +550,9 @@ public class PdfAsObject implements PdfAs
     return new ReconstructXMLDsigResult().setExtendedSignatures(extendedSignatureInfos);
   }
 
+  /**
+   * @see PdfAs#verify(VerifyAfterReconstructXMLDsigParameters)
+   */
   public VerifyResults verify(
       VerifyAfterReconstructXMLDsigParameters verifyAfterReconstructXMLDsigParameters)
       throws PdfAsException {
@@ -594,22 +562,33 @@ public class PdfAsObject implements PdfAs
         List results = PdfAS.verifyExtendedSignatureHolders(extSignatures, 
               verifyAfterReconstructXMLDsigParameters.getSignatureDevice(), 
               verifyAfterReconstructXMLDsigParameters.isReturnHashInputData(), 
-              verifyAfterReconstructXMLDsigParameters.getVerificationTime());
+              verifyAfterReconstructXMLDsigParameters.getVerificationTime(), verifyAfterReconstructXMLDsigParameters.getVerifySignatureIndex());
         
         List vrs = new ArrayList(results.size());
         
-        assert extSignatures.size() == results.size() : "Not all signatures were verified.";
-    
-        for (int i = 0; i < extSignatures.size(); i++)
+        int verifySignatureIndex = verifyAfterReconstructXMLDsigParameters.getVerifySignatureIndex();
+        if (verifySignatureIndex < 0)
         {
-          SignatureResponse response = (SignatureResponse) results.get(i);
-          ExtendedSignatureInformation extSigInfo = (ExtendedSignatureInformation)extSignatures.get(i);
-          SignatureHolder holder = (SignatureHolder) extSigInfo.getSignatureInformation().getInternalSignatureInformation();
+          for (int i = 0; i < extSignatures.size(); i++)
+          {
+            SignatureResponse response = (SignatureResponse) results.get(i);
+            ExtendedSignatureInformation extSigInfo = (ExtendedSignatureInformation)extSignatures.get(i);
+            SignatureHolder holder = (SignatureHolder) extSigInfo.getSignatureInformation().getInternalSignatureInformation();
     
-          VerifyResult vr = new VerifyResultAdapter(response, holder, verifyAfterReconstructXMLDsigParameters.getVerificationTime());
-          vr.setNonTextualObjects( extSigInfo.getSignatureInformation().getNonTextualObjects());
+            VerifyResult vr = new VerifyResultAdapter(response, holder, verifyAfterReconstructXMLDsigParameters.getVerificationTime());
+            vr.setNonTextualObjects( extSigInfo.getSignatureInformation().getNonTextualObjects());
     
-          vrs.add(vr);
+            vrs.add(vr);
+          }
+        }else{
+           SignatureResponse response = (SignatureResponse) results.get(0);
+           ExtendedSignatureInformation extSigInfo = (ExtendedSignatureInformation)extSignatures.get(verifySignatureIndex);
+           SignatureHolder holder = (SignatureHolder) extSigInfo.getSignatureInformation().getInternalSignatureInformation();
+   
+           VerifyResult vr = new VerifyResultAdapter(response, holder, verifyAfterReconstructXMLDsigParameters.getVerificationTime());
+           vr.setNonTextualObjects( extSigInfo.getSignatureInformation().getNonTextualObjects());
+   
+           vrs.add(vr);
         }
         
         VerifyResultsImpl verifyResults = new VerifyResultsImpl(vrs); 
@@ -640,6 +619,136 @@ public class PdfAsObject implements PdfAs
          DynamicSignatureLifetimeEnum mode) {
       return DynamicSignatureProfileImpl.createEmptyProfile(myUniqueName, mode);     
    }
+
+   /**
+    * @see PdfAs#prepareSign(SignParameters)
+    */
+   public SignatureDetailInformation prepareSign(SignParameters signParameters) throws PdfAsException {
+      try{
+         CheckHelper.checkSignParameters(signParameters, true);
+         
+         if (signParameters.getProfileOverrideProperties() != null) {
+            OverridePropertyHolder.setOverrideProps(signParameters.getProfileOverrideProperties());
+         }
    
+         signParameters.setDocument(PdfAS.applyStrictMode(signParameters.getDocument()));
+         
+         SignaturePlaceholderData spd = null;
+         SignaturePlaceholderContext.setSignaturePlaceholderData(null);
+         if (signParameters.isCheckForPlaceholder()) {
+            spd = SignaturePlaceholderExtractor.extract(signParameters.getDocument().createInputStream(), signParameters.getPlaceholderId(), signParameters.getPlaceholderMatchMode());
+            if (spd != null){
+               if (spd.getProfile() != null)
+                  signParameters.setSignatureProfileId(spd.getProfile());
+               if (spd.getType() != null)
+                  signParameters.setSignatureType(spd.getType());
+               if (spd.getKey() != null)
+                  signParameters.setSignatureKeyIdentifier(spd.getKey());
+            }
+         }
+         CheckHelper.checkSignParameters(signParameters, true);
+         
+         if (signParameters.getSignatureProfileId() == null)
+         {
+           SettingsReader settings = SettingsReader.getInstance();
+           String defaultProfile = settings.getValueFromKey(SignatureTypes.DEFAULT_TYPE);
+           signParameters.setSignatureProfileId(defaultProfile);
+         }
+   
+         TablePos pos = null;
+         if (spd != null && spd.getTablePos() != null)
+            pos = spd.getTablePos();
+         else
+            pos = PosHelper.formTablePos(signParameters.getSignaturePositioning());
+         
+         Signator signator = createSignator(signParameters.getSignatureType());
+   
+         SignatorInformation signatorInfo = signator.prepareSign(
+               new PdfDataSourceAdapter(signParameters.getDocument()), 
+               signParameters.getSignatureProfileId(), 
+               pos, 
+               signParameters.getTimeStamperImpl());
+         
+         SignatureDetailInformationImpl ret = new SignatureDetailInformationImpl();
+         ret.setSignatorInformation(signatorInfo);
+         return ret;
+      } finally {
+         OverridePropertyHolder.removeProperties();
+         DynamicSignatureProfileImpl.disposeLocalProfile();
+      }
+
+   }
+   
+   private Signator createSignator(String signatureType) throws SignatorFactoryException {
+      PdfASID signatorId = null;
+      if (signatureType.equals(Constants.SIGNATURE_TYPE_BINARY))
+      {
+        signatorId = SignatorFactory.MOST_RECENT_BINARY_SIGNATOR_ID;
+      }
+      if (signatureType.equals(Constants.SIGNATURE_TYPE_TEXTUAL))
+      {
+        signatorId = SignatorFactory.MOST_RECENT_TEXTUAL_SIGNATOR_ID;
+      }
+      if (signatureType.equals(Constants.SIGNATURE_TYPE_DETACHEDTEXTUAL))
+      {
+        signatorId = SignatorFactory.MOST_RECENT_DETACHEDTEXT_SIGNATOR_ID;
+      }
+      
+      return at.gv.egiz.pdfas.framework.SignatorFactory.createSignator(signatorId);
+
+   }
+
+   public SignResult sign(SignParameters signParameters, SignatureDetailInformation signatorInfo)
+         throws PdfAsException {
+      try {
+         CheckHelper.checkSignParametersForSignAfterPrepare(signParameters, false);
+         
+         if (signParameters.getProfileOverrideProperties() != null) {
+            OverridePropertyHolder.setOverrideProps(signParameters.getProfileOverrideProperties());
+         }
+
+         String connectorId = CommandlineConnectorChooser.chooseCommandlineConnectorForSign(signParameters.getSignatureDevice());
+
+         ConnectorParameters cp = new ConnectorParameters();
+         cp.setProfileId(signParameters.getSignatureProfileId());
+         cp.setSignatureKeyIdentifier(signParameters.getSignatureKeyIdentifier());
+         Connector c = at.gv.egiz.pdfas.framework.ConnectorFactory.createConnector(connectorId, cp);
+
+         SignatureData sd = new SignatureDataImpl(new PdfDataSourceAdapter(signatorInfo.getSignatureData()), signatorInfo.getSignatureData().getMimeType());
+         SignSignatureObject sso = PdfAS.sign(sd, c, signParameters.getTimeStamperImpl());
+         ((SignatureDetailInformationImpl)signatorInfo).setSignSignatureObject(sso);
+         
+         return finishSign(signParameters, signatorInfo);
+      } finally {
+         OverridePropertyHolder.removeProperties();
+         DynamicSignatureProfileImpl.disposeLocalProfile();
+      }
+   }
+
+   public SignResult finishSign(SignParameters signParameters, SignatureDetailInformation signatureDetailInformation) 
+         throws PdfAsException {
+      try {
+         CheckHelper.checkSignParametersForSignAfterPrepare(signParameters, true);
+         CheckHelper.checkSignatureDetailInformation(signatureDetailInformation);
+         
+         if (signParameters.getProfileOverrideProperties() != null) {
+            OverridePropertyHolder.setOverrideProps(signParameters.getProfileOverrideProperties());
+         }
+   
+         Signator signator = createSignator(signParameters.getSignatureType());
+
+         SignatorInformation signatorInfo = ((SignatureDetailInformationImpl)signatureDetailInformation).getSignatorInfo();
+         signator.finishSign(signatorInfo, new DataSinkAdapter(signParameters.getOutput()));
+
+         return new SignResultImpl(
+               signParameters.getOutput(), 
+               signatorInfo.getSignSignatureObject().getX509Certificate(),
+               new ActualSignaturePositionAdapter(signatorInfo.getActualTablePos()), 
+               signatorInfo.getNonTextualObjects());
+      } finally {
+         OverridePropertyHolder.removeProperties();
+         DynamicSignatureProfileImpl.disposeLocalProfile();
+      }
+   }
      
 }