Performance

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

1 files changed, 60 insertions, 18 deletions

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/framework/signators/BinarySignator_1_0_0.java b/src/main/java/at/knowcenter/wag/egov/egiz/framework/signators/BinarySignator_1_0_0.java
index 2c5ecf5..0ecff57 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/framework/signators/BinarySignator_1_0_0.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/framework/signators/BinarySignator_1_0_0.java
@@ -17,11 +17,17 @@
  */

 package at.knowcenter.wag.egov.egiz.framework.signators;

 

+import java.io.IOException;

+import java.io.InputStream;

 import java.io.UnsupportedEncodingException;

 import java.util.ArrayList;

 import java.util.Iterator;

 import java.util.List;

 

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

+import at.gv.egiz.pdfas.impl.signator.IncrementalUpdateHelper;

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

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

 import at.knowcenter.wag.egov.egiz.PdfAS;

 import at.knowcenter.wag.egov.egiz.PdfASID;

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

@@ -60,6 +66,8 @@ import com.lowagie.text.pdf.PdfPTable;
  * values according to the encoding.

  * </p>

  * 

+ * @deprecated movet to nc-framework

+ * 

  * @author wprinz

  */

 public class BinarySignator_1_0_0 implements Signator

@@ -89,8 +97,7 @@ public class BinarySignator_1_0_0 implements Signator
    * @see at.knowcenter.wag.egov.egiz.framework.Signator#prepareSign(byte[],

    *      String, TablePos, boolean)

    */

-  public IncrementalUpdateInformation prepareSign(byte[] pdf,

-      String signature_type, TablePos pos, boolean has_SIG_ID) throws PresentableException

+  public IncrementalUpdateInformation prepareSign(PdfDataSource pdf, String signature_type, TablePos pos, boolean has_SIG_ID) throws PresentableException

   {

     try

     {

@@ -117,13 +124,12 @@ public class BinarySignator_1_0_0 implements Signator
           variable_field_definitions.add(sfd);

         }

       }

-      IncrementalUpdateInformation iui = BinarySignature.writeIncrementalUpdate(pdf, pdf_table, pi, variable_field_definitions, all_field_definitions);

+      IncrementalUpdateInformation iui = IncrementalUpdateHelper.writeIncrementalUpdate(pdf, pdf_table, pi, variable_field_definitions, all_field_definitions);

 

       String temp_string = iui.temp_ir_number + " " + iui.temp_ir_generation + " obj"; //$NON-NLS-1$//$NON-NLS-2$

       byte[] temp_bytes = temp_string.getBytes("US-ASCII"); //$NON-NLS-1$

       int temp_start = ByteArrayUtils.lastIndexOf(iui.signed_pdf, temp_bytes);

-      byte[] stream_bytes = new byte[] { '>', '>', 's', 't', 'r', 'e', 'a',

-          'm', 0x0A };

+      byte[] stream_bytes = new byte[] { '>', '>', 's', 't', 'r', 'e', 'a', 'm', 0x0A };

       int stream_start = ByteArrayUtils.indexOf(iui.signed_pdf, temp_start, stream_bytes);

       iui.content_stream_start = stream_start + stream_bytes.length;

 

@@ -153,6 +159,8 @@ public class BinarySignator_1_0_0 implements Signator
       // byte [] old_signed_pdf = iui.signed_pdf;

       iui.signed_pdf = BinarySignature.prepareDataToSign(iui.signed_pdf, iui.byte_ranges);

 

+      reduceToIUBlock(iui);

+

       iui.signature_data = formSignatureData(iui);

 

       return iui;

@@ -170,8 +178,11 @@ public class BinarySignator_1_0_0 implements Signator
    */

   public SignResult finishSign(IncrementalUpdateInformation iui) throws PresentableException

   {

+    restoreSignedPdf(iui);

+    

     // PdfAS.prefixID(iui.signed_signature_object, PdfAS.BINARY_ID);

     fillReplacesWithValues(iui);

+    

     BinarySignature.replaceCertificate(iui);

     BinarySignature.replacePlaceholders(iui);

 

@@ -192,11 +203,38 @@ public class BinarySignator_1_0_0 implements Signator
     while (it.hasNext())

     {

       ReplaceInfo ri = (ReplaceInfo) it.next();

-      

+

       ri.value = SignSignatureObjectHelper.retrieveStringValueFromSignatureObject(iui.signed_signature_object, ri.sfd.field_name);

     }

   }

 

+  protected void reduceToIUBlock(IncrementalUpdateInformation iui)

+  {

+    byte[] iu_block = new byte[iui.signed_pdf.length - iui.original_document.getLength()];

+    System.arraycopy(iui.signed_pdf, iui.original_document.getLength(), iu_block, 0, iu_block.length);

+

+    iui.signed_pdf = null;

+    iui.sign_iui_block = iu_block;

+  }

+

+  protected void restoreSignedPdf(IncrementalUpdateInformation iui)

+  {

+    iui.signed_pdf = new byte[iui.original_document.getLength() + iui.sign_iui_block.length];

+

+    try

+    {

+      InputStream is = iui.original_document.createInputStream();

+      is.read(iui.signed_pdf, 0, iui.original_document.getLength());

+      is.close();

+    }

+    catch (IOException e)

+    {

+      throw new RuntimeException(e);

+    }

+

+    System.arraycopy(iui.sign_iui_block, 0, iui.signed_pdf, iui.original_document.getLength(), iui.sign_iui_block.length);

+  }

+

   /**

    * Forms the SignatureData to be used for signing.

    * 

@@ -206,18 +244,22 @@ public class BinarySignator_1_0_0 implements Signator
    */

   protected SignatureData formSignatureData(IncrementalUpdateInformation iui)

   {

-    String document_text = BinarySignature.retrieveSignableTextFromData(iui.signed_pdf, iui.signed_pdf.length); // signed_pdf.length);

-

-    byte[] data;

-    try

-    {

-      data = document_text.getBytes("UTF-8"); //$NON-NLS-1$

-    }

-    catch (UnsupportedEncodingException e)

-    {

-      throw new RuntimeException("Very strange: UTF-8 character encoding not supported.", e); //$NON-NLS-1$

-    }

-    SignatureData signature_data = new SignatureDataImpl(data, PdfAS.PDF_MIME_TYPE);

+    // String document_text =

+    // BinarySignature.retrieveSignableTextFromData(iui.signed_pdf,

+    // iui.signed_pdf.length); // signed_pdf.length);

+    //

+    // byte[] data;

+    // try

+    // {

+    // data = document_text.getBytes("UTF-8"); //$NON-NLS-1$

+    // }

+    // catch (UnsupportedEncodingException e)

+    // {

+    // throw new RuntimeException("Very strange: UTF-8 character encoding not

+    // supported.", e); //$NON-NLS-1$

+    // }

+    DataSource ds = new CompoundPdfDataSourceImpl(iui.original_document, iui.sign_iui_block);

+    SignatureData signature_data = new SignatureDataImpl(ds, PdfAS.PDF_MIME_TYPE);

 

     return signature_data;

   }