1 files changed, 88 insertions, 7 deletions
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java
index 5daf1a6..5f8b46d 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java
@@ -94,6 +94,9 @@ public class ConfigurationPartsBuilder {
   private static final String CM_CHAINING = "chaining";
   private static final String CM_PKIX = "pkix";
 
+  private static final int SHORT_TIME_CERT_DEFAULT_INTERVAL = 0;
+  private static final boolean SHORT_TIME_CERT_DEFAULT_ETSI = true;
+  
   //
   // XPath expressions to select certain parts of the configuration
   //
@@ -205,6 +208,17 @@ public class ConfigurationPartsBuilder {
           + CONF + "RevocationChecking/"
           + CONF + "CrlRetentionIntervals/"
           + CONF + "CA";
+  
+  private static final String SHORT_TIME_CERTS_INTERVALS_XPATH =
+      ROOT + CONF + "SignatureVerification/"
+          + CONF + "CertificateValidation/"
+          + CONF + "RevocationChecking/"
+          + CONF + "ShortTermedCertificates";
+  
+  private static final String SHORT_TIME_CERTS_INTERVALS_CA_XPATH =
+      SHORT_TIME_CERTS_INTERVALS_XPATH + "/"
+          + CONF + "CA";
+  
   private static final String ENABLE_REVOCATION_CHECKING_XPATH_ =
       ROOT + CONF + "SignatureVerification/"
           + CONF + "CertificateValidation/"
@@ -1718,17 +1732,84 @@ public class ConfigurationPartsBuilder {
       final String x509IssuerName = getElementValue(modElem, CONF + "X509IssuerName", null);
       final String i = getElementValue(modElem, CONF + "Interval", null);
       final Integer interval = new Integer(i);
-      try {
-        final RFC2253NameParser parser = new RFC2253NameParser(x509IssuerName);
-        final Name name = parser.parse();
-        map.put(name.getRFC2253String(), interval);
-      } catch (final RFC2253NameParserException e) {
-        map.put(x509IssuerName, interval);
-      }
+      map.put(ConfigurationProvider.normalizeX500Names(x509IssuerName), interval);
 
     }
 
     return map;
   }
 
+  
+  /**
+   * Should ETSI extension should be used for short-time certificate validation.
+   * 
+   * @return <code>true</code> if it is used
+   */
+  public boolean isShotTimeCertEtsiExtCheck() {
+    final NodeIterator modIter = XPathUtils.selectNodeIterator(
+        getConfigElem(),
+        SHORT_TIME_CERTS_INTERVALS_XPATH);
+    
+    Element modElem;
+    if ((modElem = (Element) modIter.nextNode()) != null) {      
+      Boolean value = Boolean.valueOf(modElem.getAttribute("checkETSIValidityAssuredExtension"));      
+      Logger.debug((value ? "Enable" : "Disable") + "shortTime certificate ETSI extension");      
+      return value;
+      
+    }
+    
+    return SHORT_TIME_CERT_DEFAULT_ETSI;    
+  }
+  
+  /**
+   * Get default shortTime certificate interval.
+   * 
+   * @return Time in minutes
+   */
+  public int getShotTimeCertDefaultInterval() {
+    final NodeIterator modIter = XPathUtils.selectNodeIterator(
+        getConfigElem(),
+        SHORT_TIME_CERTS_INTERVALS_XPATH);
+    
+    Element modElem;
+    if ((modElem = (Element) modIter.nextNode()) != null) {
+      String defaultString = modElem.getAttribute("defaultValidityPeriod");
+      Logger.debug("Set default shortTimePeriodInterval to: " + defaultString);
+      return Integer.valueOf(defaultString);
+      
+    }
+    
+    return SHORT_TIME_CERT_DEFAULT_INTERVAL;    
+  }
+  
+  
+  /**
+   * Returns a map of shortTime certificate intervals.
+   * 
+   * <p>
+   * No revocation checks are performed during this interval.
+   * </p>
+   *
+   * @return
+   */
+  public Map<String, Integer> getShotTimeCertIntervals() {
+    final Map map = new HashMap();
+    final NodeIterator modIter = XPathUtils.selectNodeIterator(
+        getConfigElem(),
+        SHORT_TIME_CERTS_INTERVALS_CA_XPATH);
+
+    Element modElem;
+    while ((modElem = (Element) modIter.nextNode()) != null) {
+      final String x509IssuerName = ConfigurationProvider.normalizeX500Names(
+          getElementValue(modElem, CONF + "X509IssuerName", null));
+      final String i = getElementValue(modElem, CONF + "ValidityPeriod", null);
+      final Integer interval = new Integer(i);
+      map.put(x509IssuerName, interval);
+      Logger.debug("Set shortTimePeriodInterval: " + interval + " for Issuer: " + x509IssuerName);
+      
+    }
+
+    return map;
+  }
+  
 }