1 files changed, 44 insertions, 2 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
index 89d02c183..80364a2ab 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
@@ -53,6 +53,7 @@ import java.io.IOException;
 import java.math.BigInteger;
 import java.net.MalformedURLException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -1007,6 +1008,39 @@ public class AuthConfigurationProvider extends ConfigurationProvider {
 		  return null;
   }
   
+  /**
+   * Checks if is fakeIdL is activated.
+   *
+   * @return true, if fake IdLs are available for stork
+   */
+  public boolean isStorkFakeIdLActive() {
+	  String prop = props.getProperty("stork.fakeIdL.active", "false");
+	  return Boolean.valueOf(prop);
+  }
+
+  /**
+   * Gets the countries which will receive a fake IdL
+   *
+   * @return the countries
+   */
+  public List<String> getStorkFakeIdLCountries() {
+	  String prop = props.getProperty("stork.fakeIdL.countries", "");
+	  return Arrays.asList(prop.replaceAll(" ", "").split(","));
+  }
+
+  /**
+   * Gets the resigning key (group) for the stork fake IdL.
+   *
+   * @return the resigning key
+   */
+  public String getStorkFakeIdLResigningKey() {
+	  String prop = props.getProperty("stork.fakeIdL.keygroup");
+	  if (MiscUtil.isNotEmpty(prop))
+		  return prop;
+	  else
+		  return null;
+  }
+
   public boolean isMonitoringActive() {
 	  String prop = props.getProperty("configuration.monitoring.active", "false");
 	  return Boolean.valueOf(prop);
@@ -1047,12 +1081,19 @@ public class AuthConfigurationProvider extends ConfigurationProvider {
 	  return !Boolean.valueOf(prop);	  
   }
   
+
   //Load document service url from moa properties
   public String getDocumentServiceUrl() {
 	  String prop = props.getProperty("stork.documentservice.url", "false");
 	  return prop;  
   }
   
+
+  public boolean isPVPSchemaValidationActive() {
+	  String prop = props.getProperty("protocols.pvp2.schemavalidation", "true");
+	  return Boolean.valueOf(prop);	  
+  }
+  
   /**
    * Returns the STORK Configuration
    * @return STORK Configuration
@@ -1084,10 +1125,11 @@ private void setCertStoreDirectory() throws ConfigurationException {
   private void setTrustManagerRevocationChecking() throws ConfigurationException {
 	  AuthComponentGeneral auth = getAuthComponentGeneral();
 	  
-	  if (auth.getGeneralConfiguration() != null)		  
+	  if (auth.getGeneralConfiguration() != null &&
+			  auth.getGeneralConfiguration().isTrustManagerRevocationChecking() != null)		  
 		  trustmanagerrevoationchecking = auth.getGeneralConfiguration().isTrustManagerRevocationChecking();
 	  else {
-		  Logger.warn("Error in MOA-ID Configuration. No CertStoreDirectory defined.");
+		  Logger.warn("No TrustMangerRevoationChecking defined. Use default value = TRUE");
 		  throw new ConfigurationException("config.02", null);
 	  } 
   }