Deprecated webapp-folder removed from svn repository.

New DefaultConfiguration.zip integrated in order to allow mocca signatures.
Minor bug concerning choice of cce within the web application fixed.
Signature with new online bku MOCCA integrated (new signature device "moc" created).
Configuration keys for mocca added.
New error codes (371 = signature verification not supported by this connector, 372 = invalid signing time) introduced.
Optional check of the signing time for the web application implemented. At signature creation time the signing time is checked for plausibility. This is a workaround for the ITS:mac-linux signing time bug. New configuration key ("signing_time_tolerance") added (applies to web application only) to overcome invalid signing times. A signature is only accepted if its signing time is within a time frame of [current time - signing_time_tolerance, current time + signing_time_tolerance] where signing_time_tolerance is interpreted as seconds.
Bugfix: Correct extraction of signatures with wrong signing times implemented. (The order of the signatures is still invalid in case of false signing times.)
Optional override of the dynamic creation of the signature retrieval url (locrefcontent) implemented in order to overcome ssl problems (retrieve_signature_data_url_override). Note: Assure that this URL is accessible from the citizen card environment.
Download of signed pdf-file for external application interface adjusted.
Verification of mocca signed documents implemented.
Retrieval of xml response via multipart implemented (mocca strictly follows security layer spec)


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

1 files changed, 39 insertions, 5 deletions

diff --git a/src/main/java/at/gv/egiz/pdfas/impl/vfilter/VerificationFilterImpl.java b/src/main/java/at/gv/egiz/pdfas/impl/vfilter/VerificationFilterImpl.java
index 3ca497b..d9549b0 100644
--- a/src/main/java/at/gv/egiz/pdfas/impl/vfilter/VerificationFilterImpl.java
+++ b/src/main/java/at/gv/egiz/pdfas/impl/vfilter/VerificationFilterImpl.java
@@ -413,11 +413,12 @@ public class VerificationFilterImpl implements VerificationFilter
       {

         assert partitionResult.size() >= prevPartitionResult.size();

 

-        for (int i = prevPartitionResult.size(); i < partitionResult.size(); i++)

-        {

-          SignatureHolder sh = (SignatureHolder) partitionResult.get(i);

-          extractedSignatures.add(sh);

-        }

+//        for (int i = prevPartitionResult.size(); i < partitionResult.size(); i++)

+//        {

+//          SignatureHolder sh = (SignatureHolder) partitionResult.get(i);

+//          extractedSignatures.add(sh);

+//        }

+        mergeSignatures(prevPartitionResult, partitionResult, extractedSignatures);

       }

 

       prevPartitionResult = partitionResult;

@@ -436,6 +437,39 @@ public class VerificationFilterImpl implements VerificationFilter
     return signatureHolderChain;

   }

   

+  private void mergeSignatures(List oldList, List newList, List result) {

+    

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

+      

+      SignatureHolder currentNewSh = (SignatureHolder)newList.get(i);

+      

+      boolean shAlreadyPresentInOldList = false;

+      int pos = -1;

+      

+      for(int j=0; j<oldList.size(); j++) {

+        

+        SignatureHolder currentOldSh = (SignatureHolder)oldList.get(j);

+        

+        if(currentNewSh.getSignatureObject().getSignationValue().equals(currentOldSh.getSignatureObject().getSignationValue())) {

+          

+          shAlreadyPresentInOldList = true;

+          pos = j;

+        }

+      }

+      

+      if(!shAlreadyPresentInOldList) {

+        

+        // signature holder has not been found earlier -> add

+        result.add(currentNewSh);

+      }

+      

+    }

+    

+  

+    return;

+  }

+  

+  

   protected List flattenOutTextPartitions (List partitions, List blocks)

   {