fix bug in eIDAS SAML-engine to allow 2 minutes time jitter in Assertion->Conditions element

1 files changed, 18 insertions, 2 deletions

diff --git a/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/utils/SAMLEngineUtils.java b/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/utils/SAMLEngineUtils.java
index b95d4359f..eb50c113f 100644
--- a/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/utils/SAMLEngineUtils.java
+++ b/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/utils/SAMLEngineUtils.java
@@ -22,9 +22,13 @@
  */
 package at.gv.egovernment.moa.id.auth.modules.eidas.utils;
 
+import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.opensaml.xml.ConfigurationException;
+import org.opensaml.xml.XMLConfigurator;
+
 import at.gv.egovernment.moa.id.auth.modules.eidas.Constants;
 import at.gv.egovernment.moa.id.auth.modules.eidas.config.MOAIDCertificateManagerConfigurationImpl;
 import at.gv.egovernment.moa.id.auth.modules.eidas.config.MOASWSigner;
@@ -38,6 +42,7 @@ import eu.eidas.auth.engine.ProtocolEngineI;
 import eu.eidas.auth.engine.SamlEngineSystemClock;
 import eu.eidas.auth.engine.metadata.MetadataFetcherI;
 import eu.eidas.auth.engine.metadata.MetadataSignerI;
+import eu.eidas.auth.engine.xml.opensaml.SAMLBootstrap;
 import eu.eidas.engine.exceptions.EIDASSAMLEngineException;
 import eu.eidas.samlengineconfig.CertificateConfigurationManager;
 
@@ -76,10 +81,15 @@ public class SAMLEngineUtils {
 				//build a map with all actually supported attributes
 				for (AttributeDefinition<?> el : engine.getProtocolProcessor().getAllSupportedAttributes())
 					allSupportedAttributeMap.put(el.getFriendlyName(), el);
-														
+
+				//TODO: check if bug is fixed in next eIDAS SAML-engine version
+				//overwrite eIDAS response validator suite because Condition-Valitator has not time jitter
+				initOpenSAMLConfig("own-saml-eidasnode-config.xml");
+				
+				
 				eIDASEngine = engine;
 				
-			} catch (EIDASSAMLEngineException e) {
+			} catch (EIDASSAMLEngineException | ConfigurationException e) {
 				Logger.error("eIDAS SAMLengine initialization FAILED!", e);
 				throw new EIDASEngineException("eIDAS.00", new Object[]{e.getMessage()}, e);
 				
@@ -127,6 +137,12 @@ public class SAMLEngineUtils {
 		}
 	}
 	
+	 private static void initOpenSAMLConfig(String xmlConfig) throws ConfigurationException {
+	        XMLConfigurator configurator = new XMLConfigurator();
+	        InputStream is = SAMLBootstrap.class.getClassLoader().getResourceAsStream(xmlConfig);
+	        configurator.load(is);
+	        
+	    }
 	
 	
 }