add SZR client

add different logging backends
define errorcodes and error messages
update to eIDAS Ref. impl 2.1

5 files changed, 202 insertions, 9 deletions

diff --git a/connector/src/main/resources/applicationContext.xml b/connector/src/main/resources/applicationContext.xml
index 5ede0b7f..c44c903e 100644
--- a/connector/src/main/resources/applicationContext.xml
+++ b/connector/src/main/resources/applicationContext.xml
@@ -25,6 +25,8 @@
   	<bean class="at.gv.egovernment.moa.id.auth.servlet.interceptor.UniqueSessionIdentifierInterceptor" />
   </mvc:interceptors> --> 
 
+	<context:property-placeholder location="${eidas.ms.configuration}"/>
+
  	<bean id="BasicMSSpecificNodeConfig" 
  			class="at.gv.egiz.eidas.specific.connector.config.BasicConfigurationProvider">
 		<constructor-arg value="#{systemProperties['eidas.ms.configuration']}"/>
diff --git a/connector/src/main/resources/properties/external_statuscodes_map.properties b/connector/src/main/resources/properties/external_statuscodes_map.properties
new file mode 100644
index 00000000..45f622c8
--- /dev/null
+++ b/connector/src/main/resources/properties/external_statuscodes_map.properties
@@ -0,0 +1,71 @@
+eidas.00=1302 
+eidas.01=1302 
+eidas.02=1301
+eidas.03=1300
+eidas.04=1100
+eidas.05=1302
+eidas.06=1302
+eidas.07=1302
+
+config.01=9099
+config.03=9099
+config.18=9099
+config.24=9099
+
+
+ernb.00=4601
+ernb.01=4601
+ernb.02=4600
+
+auth.00=1100     
+
+auth.21=1005
+auth.26=1100
+auth.28=1100  
+
+auth.37=1101
+auth.38=1101
+auth.39=1099
+
+process.01=9105
+process.02=9104
+process.03=9104
+process.04=9105
+
+builder.00=9102
+builder.11=1099
+
+parser.01=1101
+
+gui.00=9103
+
+pvp2.01=6100
+pvp2.02=6100
+pvp2.05=6105
+pvp2.07=6104
+pvp2.09=6199
+pvp2.10=6100
+pvp2.11=6105
+pvp2.12=6105 
+pvp2.13=6199
+pvp2.14=6199
+pvp2.15=6103
+pvp2.16=6101
+pvp2.17=6102   
+pvp2.20=6103
+pvp2.21=6104
+pvp2.22=6105
+pvp2.23=6105
+pvp2.24=6105
+pvp2.26=6103
+pvp2.27=6199
+pvp2.28=6105
+
+
+internal.00=9105 
+internal.01=9199
+internal.02=9101
+internal.03=9199
+internal.04=9101
+
+config.27=9008 
\ No newline at end of file
diff --git a/connector/src/main/resources/properties/status_messages_en.properties b/connector/src/main/resources/properties/status_messages_en.properties
new file mode 100644
index 00000000..7499f99d
--- /dev/null
+++ b/connector/src/main/resources/properties/status_messages_en.properties
@@ -0,0 +1,69 @@
+eidas.00=eIDAS Attribute {0} not found. Can not finish authentication process 
+eidas.01=NO eIDAS response-message found. Can not finish authentication process 
+eidas.02=eIDAS response-message contains an error. ErrorCode: {0}, ErrorMsg: {1}
+eidas.03=No CitizenCountry available. Can not start eIDAS authentication process
+eidas.04=Request contains no sessionToken. Authentication process stops
+eidas.05=Received eIDAS response-message is not valid. Reason: {0}
+eidas.06=LoA from eIDAS response-message {0} does not match to requested LoA
+eidas.07=eIDAS Response attribute-validation FAILED. Attribute:{0} Reason: {1}
+
+config.01=No configuration-file parameter found. Maybe Java SystemD parameter is missing
+config.03=Can not load configuration from path {0} (See logs for more details)
+config.18=Configuration file {0} is not available on filesystem
+config.24=Configuration file {1} does not start with {0} prefix.
+
+
+ernb.00=Receive no identity-link from SZR
+ernb.01=Receive no bPK from SZR
+ernb.02=SZR response contains an error. ErrorMsg: {0}
+
+auth.00=Service provider: {0} is unknown   
+auth.21=The authentication process was stopped by user
+auth.26=No transaction identifier
+auth.28=Found no active transaction with Id: {0}. Maybe, the transaction was removed after timeout  
+auth.37=Requested bPK-Target: {0} does not match allowed targets for service provider: {1}
+auth.38=Passive authentication was requested but user as no active session
+auth.39=Error: '{0}' in post-processing of authentication data. Can not finish authentication process
+
+process.01=Can not execute authentication process
+process.02=Find no applicable authentication process for transaction with Id: {0}
+process.03=Can not resume the authentication process. Reason: {0}
+process.04=Can not execute authentication process. Problem with an internal state
+
+builder.00=Can not generate data structure "{0}": {1}
+builder.11=Error: '{0}' in post-processing of authentication data. Can not finish authentication process
+
+parser.01=Error during eID-data processing. Reason: {0}
+
+gui.00=Can not build GUI component. Reason: {0}
+
+pvp2.01=General error during SAML2 response encoding
+pvp2.02=SAML2 attribute contains an wrong encoded value
+pvp2.05=LoA from SAML2 Authn. request: {0} is not supported
+pvp2.07=SAML2 Authn. request contains is not signed
+pvp2.09=SAML2 request contains an unsupported operation. (OperationId: {0})
+pvp2.10=SAML2 Attribute: {0} is not available
+pvp2.11=SAML2 Binding: {0} is not supported
+pvp2.12=SAML2 NameID Format {0} is not supported 
+pvp2.13=Internal server error during SAML2 processing
+pvp2.14=SAML2 authentication not available
+pvp2.15=No SAML2 metadata available or metadata processing failed
+pvp2.16=Encryption of SAML2 assertion failed
+pvp2.17=LoA from SAML2 Authn. request: {1} does not match to authenticated LoA: {0} by using matching-mode: {2}   
+pvp2.20=SAML2 Authn. request contains an unknown or empty EntityID.
+pvp2.21=Signature validation of SAML2 Authn. request failed. Reason: {0}
+pvp2.22=Validation of SAML2 Authn. request failed. Reason: {0}
+pvp2.23=Validation of SAML2 Authn. request failed. Reason: AssertionConsumerServiceURL {0} is not valid.
+pvp2.24=General error during SAML2 Auth. request pre-processing. Reason: {0}
+pvp2.26=SAML2 metadata validation failed. Reason: {0}
+pvp2.27=General error during SAML2 metadata generation
+pvp2.28=Validation of SAML2 Authn. request failed. Reason: AssertionConsumerServiceIndex {0} is not valid.
+
+
+internal.00=The authentication process stops by reason of an internal problem 
+internal.01=The LogOut process stops by reason of an internal problem
+internal.02=Internal error. Can not access data cache.
+internal.03=Internal error. Can not initialize a cryptographic method.
+internal.04=Internal error. Can not access data cache (Reason: {0}).
+
+config.27=Configuration parameter processing failed. Reason:{0} 
diff --git a/connector/src/main/resources/specific_eIDAS_connector.beans.xml b/connector/src/main/resources/specific_eIDAS_connector.beans.xml
index 16a1cae7..275c79b8 100644
--- a/connector/src/main/resources/specific_eIDAS_connector.beans.xml
+++ b/connector/src/main/resources/specific_eIDAS_connector.beans.xml
@@ -17,11 +17,7 @@
 	
 	<bean id="ProcessEngineSignalController"
 			class="at.gv.egiz.eidas.specific.connector.controller.ProcessEngineSignalController"/>	
-		
-		
-	<bean id="SimpleInMemoryTransactionStorage"
-			class="at.gv.egiz.eidas.specific.connector.storage.SimpleInMemoryTransactionStorage" />
-	
+					
 	<bean id="AuthenticationManager"
 			class="at.gv.egiz.eidas.specific.connector.auth.AuthenticationManager"  />
 	
@@ -82,11 +78,11 @@
 	<bean id="StatusMessageProvider"
 			class="at.gv.egiz.eidas.specific.connector.provider.StatusMessageProvider"  />
 	 
-	<bean id="DummyRevisionLogger"
-			class="at.gv.egiz.eaaf.core.impl.logging.DummyRevisionsLogger" /> 
+	<bean id="eidasRevisionLogger"
+			class="at.gv.egiz.eidas.specific.connector.logger.RevisionLogger" /> 
 	 
-	<bean id="DummyStatisticLogger"
-			class="at.gv.egiz.eaaf.core.impl.logging.DummyStatisticLogger" /> 
+	<bean id="eidasStatisticLogger"
+			class="at.gv.egiz.eidas.specific.connector.logger.StatisticLogger" /> 
 	 
 	 
 	<!-- Tasks -->
diff --git a/connector/src/main/resources/specific_eIDAS_connector.storage.beans.xml b/connector/src/main/resources/specific_eIDAS_connector.storage.beans.xml
new file mode 100644
index 00000000..be13e0cf
--- /dev/null
+++ b/connector/src/main/resources/specific_eIDAS_connector.storage.beans.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:tx="http://www.springframework.org/schema/tx"
+	xmlns:aop="http://www.springframework.org/schema/aop"
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
+	xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
+		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
+		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+	
+	<import resource="classpath:specificCommunicationDefinitionApplicationContext.xml"/>
+	
+	<bean id="useDistributedMapsSpecificConnector" class="java.lang.String">
+        <constructor-arg value="${eidas.ms.context.use.clustermode}"/>
+    </bean>
+
+    <!-- suffix for some of the beans having two possible implementations - one for development and one for production -->
+    <bean id="distributedEnvSuffixSpecificConnector" class="java.lang.String">
+        <constructor-arg value="#{useDistributedMapsSpecificConnector.toString()=='false'?'Dev':'Prod'}"/>
+    </bean>
+
+						
+<!-- 	<bean id="SimpleInMemoryTransactionStorage"
+			class="at.gv.egiz.eidas.specific.connector.storage.SimpleInMemoryTransactionStorage" /> -->
+			
+	<bean id="eIDASCacheTransactionStoreDecorator"
+			class="at.gv.egiz.eidas.specific.connector.storage.eIDASCacheTransactionStoreDecorator"/>
+
+    <bean id="CacheWitheIDASBackend" class="at.gv.egiz.eidas.specific.connector.storage.CacheWitheIDASBackend">
+        <constructor-arg ref="springServiceCMapspecificMSSpCorProvider#{distributedEnvSuffixSpecificConnector.toString()}"/>
+    </bean>
+	
+    	<bean id="defaultHazelcastInstance" class="java.lang.String">
+        	<constructor-arg value="eidasHazelcastInstance"/>
+    	</bean>
+    
+    	<bean id="eidasHazelcastInstanceInitializer" class=" eu.eidas.auth.commons.cache.HazelcastInstanceInitializer" init-method="initializeInstance" lazy-init="true">
+        	<property name="hazelcastConfigfileName" value="#{eidasConfigRepository}hazelcast.xml"/>
+        	<property name="hazelcastInstanceName" ref="defaultHazelcastInstance"/>
+    	</bean>
+    
+    	<bean id="springServiceCMapspecificMSSpCorProviderProd" class="eu.eidas.auth.commons.cache.ConcurrentMapServiceDistributedImpl" lazy-init="true">
+        	<property name="hazelcastInstanceInitializer" ref="eidasHazelcastInstanceInitializer"/>
+        	<property name="cacheName" value="specificSpRequestCorrelationCacheService"/>
+    	</bean>
+
+    	<bean id="springServiceCMapspecificMSSpCorProviderDev" class="eu.eidas.auth.commons.cache.ConcurrentMapServiceDefaultImpl">
+        	<property name="expireAfterAccess" value="1800"/>
+        	<property name="maximumSize" value="1000"/>
+    	</bean>
+		 
+</beans>
\ No newline at end of file