feat(pkix): add addition features to validate short-term certificates

1 files changed, 38 insertions, 0 deletions

diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationProvider.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationProvider.java
index 4596109..85930b2 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationProvider.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationProvider.java
@@ -258,6 +258,12 @@ public class ConfigurationProvider {
    */
   private Map crlRetentionIntervals;
 
+  
+  private boolean useShortTimeCertificateEtisExt;
+  private int defaultShortTimeCertificatePeriod;
+  private Map<String, Integer> shortTimeCertificatePeriods;
+  
+  
   /**
    * Indicates wether external URIs are allowed or not
    */
@@ -416,6 +422,10 @@ public class ConfigurationProvider {
       permitFileURIs = builder.getPermitFileURIs();
       crlRetentionIntervals = builder.getCrlRetentionIntervals();
 
+      shortTimeCertificatePeriods = builder.getShotTimeCertIntervals();
+      defaultShortTimeCertificatePeriod = builder.getShotTimeCertDefaultInterval();
+      useShortTimeCertificateEtisExt = builder.isShotTimeCertEtsiExtCheck();
+      
       allowExternalUris_ = builder.allowExternalUris();
 
       if (allowExternalUris_) {
@@ -998,5 +1008,33 @@ public class ConfigurationProvider {
   public TSLConfiguration getTSLConfiguration() {
     return tslconfiguration_;
   }
+  
+  public int getDefaultShortTimeCertificatePeriod() {
+    return defaultShortTimeCertificatePeriod;
+  }
+
+  public boolean isUseShortTimeCertificateEtisExt() {
+    return useShortTimeCertificateEtisExt;
+  }
+
+  public Map<String, Integer> getShortTimeCertificatePeriods() {
+    return shortTimeCertificatePeriods;
+  }
 
+  
+  
+  public static final String normalizeX500Names(String x500Name) {
+    try {
+      final RFC2253NameParser parser = new RFC2253NameParser(x500Name);
+      final Name name = parser.parse();
+      return name.getRFC2253String();
+    
+    } catch (final RFC2253NameParserException e) {
+      Logger.info("X500Name: " + x500Name + " can not be normalized. Use it as it is");
+      return x500Name;
+      
+    }
+    
+  }
+  
 }
\ No newline at end of file