From db52e4d66d60184d53a27ba4d6772461daacc03d Mon Sep 17 00:00:00 2001
From: tknall <tknall@7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c>
Date: Fri, 22 Mar 2013 08:57:51 +0000
Subject: Maintenance update (bugfixes, new features, cleanup...) Refer to
 /dok/RELEASE_NOTES-3.3.txt for further information.

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/pdf-as/trunk@931 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c
---
 .../wag/egov/egiz/sig/sigkz/SigKZIDHelper.java     | 53 ++++++++++++----------
 1 file changed, 28 insertions(+), 25 deletions(-)

(limited to 'pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/sig/sigkz/SigKZIDHelper.java')

diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/sig/sigkz/SigKZIDHelper.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/sig/sigkz/SigKZIDHelper.java
index 094880d..03bf931 100644
--- a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/sig/sigkz/SigKZIDHelper.java
+++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/sig/sigkz/SigKZIDHelper.java
@@ -50,49 +50,52 @@ import at.knowcenter.wag.egov.egiz.sig.sigid.HotfixIdFormatter;
  */
 public final class SigKZIDHelper
 {
-  
+
    /**
     * The Logger.
     */
    protected static Log logger = LogFactory.getLog(SigKZIDHelper.class);
-   
+
   public static boolean isTextual(PdfASID sig_kz)
   {
     if (sig_kz == null)
     {
       // Old signature -> must be textual.
-      
+
       return true;
     }
-    
+
     // new signauture -> sig_kz decides
     return sig_kz.getType().equals(SignatorFactory.TYPE_TEXTUAL);
   }
-  
+
   public static boolean isBinary(PdfASID sig_kz)
   {
     return ! isTextual(sig_kz);
   }
-  
-  
+
+
   public static boolean isMOASigned(PdfASID sig_kz, String sig_id)
   {
     if (sig_kz == null || sig_kz.getVersion().equals(SignatorFactory.VERSION_1_0_0))
     {
       // old signature - if sig_id is null this means MOA
-      
+
       return sig_id == null;
     }
-    
-    if(sig_id == null)
+
+    // According to the specification no signature parameter means MOA signature.
+    // Fixed: empty ("") or blank ("   "), non-null signature parameter should also be regarded as "no signature parameter"
+//    if (sig_id != null)
+    if (StringUtils.isBlank(sig_id))
     	return true;
-    
+
     // new signature - sig_id decides
     String [] ids = sig_id.split("@");
     // dferbas
     String prefix = (ids[0].split(":"))[0];
-    
-    
+
+
     if (prefix.equals(DetachedLocRefMOAIdFormatter.SIG_ID_PREFIX))
     {
       return true;
@@ -116,10 +119,10 @@ public final class SigKZIDHelper
          logger.error(e.getMessage(), e);
       }
     }
-    
+
     return isMOASigned(kz, sig_id);
   }
-  
+
   /**
    * @author tknall
    */
@@ -128,7 +131,7 @@ public final class SigKZIDHelper
      if (StringUtils.isEmpty(sig_id)) {
         return false;
      }
-     String[] ids = sig_id.split("@");     
+     String[] ids = sig_id.split("@");
      if (ArrayUtils.isEmpty(ids)) {
         return false;
      }
@@ -136,7 +139,7 @@ public final class SigKZIDHelper
      if (algorithmId == null) {
         return false;
      } else {
-        return algorithmId.startsWith("etsi-moc-1.0") || algorithmId.startsWith("etsi-moc-1.1");
+        return algorithmId.startsWith("etsi-moc-1.0") || algorithmId.startsWith("etsi-moc-1.1") || algorithmId.startsWith("etsi-moc-1.2");
      }
   }
 
@@ -203,16 +206,16 @@ public final class SigKZIDHelper
         logger.error(e.getMessage(), e);
       }
     }
-    
+
     return isOldBKU(kz, sig_id);
   }
-  
+
   public static String getAlgorithmId(String bkuIdentifier) throws SettingsException, SettingNotFoundException, ConnectorException {
     SettingsReader sr = SettingsReader.getInstance();
 
     String base = "signaturelayout.pattern";
     Vector v = sr.getSettingKeys(base);
-    
+
     Iterator it = v.iterator();
     while (it.hasNext()) {
        String subKey = (String) it.next();
@@ -225,7 +228,7 @@ public final class SigKZIDHelper
           return algValue;
        }
     }
-    
+
     if ("true".equalsIgnoreCase(sr.getSetting("signaturelayout.strict", "false"))) {
        logger.debug("Enforcing bku support check.");
        throw new ConnectorException(ErrorCode.BKU_NOT_SUPPORTED, "Unsupported BKU: " + bkuIdentifier);
@@ -233,7 +236,7 @@ public final class SigKZIDHelper
        logger.debug("bku support check disabled.");
        return null;
     }
-    
+
   }
 
    public static boolean isATrustSigned(SignSignatureObject so) {
@@ -241,7 +244,7 @@ public final class SigKZIDHelper
       if (sig_id == null && StringUtils.isEmpty(sig_id)) {
          return false;
       }
-      return sig_id.startsWith("etsi-bka-atrust-1.0");      
+      return sig_id.startsWith("etsi-bka-atrust-1.0");
    }
 
    /**
@@ -251,11 +254,11 @@ public final class SigKZIDHelper
     */
    public static boolean isBKUSigned(SignSignatureObject so) throws ConnectorException {
       if (isOldBKU(so)) return true;
-      
+
       if (so.id.startsWith("etsi-bka-1.0")) {
          return true;
       }
-            
+
       return false;
    }
 
-- 
cgit v1.2.3