From ed033b4105eec8c00189729bd4b38b17c6b40509 Mon Sep 17 00:00:00 2001
From: Alexander Marsalek <amarsalek@iaik.tugraz.at>
Date: Thu, 7 Jan 2021 18:16:45 +0100
Subject: Resolve merge comments

---
 connector/src/main/resources/properties/status_messages_en.properties | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'connector/src/main/resources')

diff --git a/connector/src/main/resources/properties/status_messages_en.properties b/connector/src/main/resources/properties/status_messages_en.properties
index 80228a47..c430fc90 100644
--- a/connector/src/main/resources/properties/status_messages_en.properties
+++ b/connector/src/main/resources/properties/status_messages_en.properties
@@ -6,6 +6,9 @@ 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}
+eidas.08=An unexpected error occurred.
+eidas.09=An error occurred while loading your data from official registers. Please contact the support.
+
 
 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)
-- 
cgit v1.2.3


From 9bb8ba415faee8bd454da6def37daf545bb559e1 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <thomas.lenz@egiz.gv.at>
Date: Tue, 26 Jan 2021 07:40:01 +0100
Subject: update SAML2 IDP elements of MS-specific Connector to current
 snapshot version (1.1.12-SNAPSHOT) of eaaf_module_pvp2_idp

---
 .../resources/specific_eIDAS_connector.beans.xml   | 74 ++++++++++------------
 1 file changed, 34 insertions(+), 40 deletions(-)

(limited to 'connector/src/main/resources')

diff --git a/connector/src/main/resources/specific_eIDAS_connector.beans.xml b/connector/src/main/resources/specific_eIDAS_connector.beans.xml
index f6fdeefe..c59496b4 100644
--- a/connector/src/main/resources/specific_eIDAS_connector.beans.xml
+++ b/connector/src/main/resources/specific_eIDAS_connector.beans.xml
@@ -14,106 +14,100 @@
   <import resource="common_gui.beans.xml"/>
 
   <bean id="WebResourceConfiguration"
-    class="at.asitplus.eidas.specific.connector.config.StaticResourceConfiguration" />
+        class="at.asitplus.eidas.specific.connector.config.StaticResourceConfiguration" />
 
   <bean id="processEngineSignalController"
-    class="at.asitplus.eidas.specific.connector.controller.ProcessEngineSignalController" />
+        class="at.asitplus.eidas.specific.connector.controller.ProcessEngineSignalController" />
 
   <bean id="saml2MetadataGeneration"
         class="at.asitplus.eidas.specific.connector.health.Saml2MetadataHealthIndicator">
-    <property name="pvpIdpCredentials">
-      <ref bean="PVPEndPointCredentialProvider" />
-    </property>
+    <property name="pvpIdpCredentials" ref="PVPEndPointCredentialProvider" />
   </bean>
 
   <bean id="eidasNodeMetadata"
         class="at.asitplus.eidas.specific.connector.health.EidasNodeMetadataHealthIndicator" />
 
   <bean id="AuthenticationManager"
-    class="at.asitplus.eidas.specific.connector.auth.AuthenticationManager" />
+        class="at.asitplus.eidas.specific.connector.auth.AuthenticationManager" />
 
   <bean id="AuthenticationDataBuilder"
-    class="at.asitplus.eidas.specific.connector.builder.AuthenticationDataBuilder" />
+        class="at.asitplus.eidas.specific.connector.builder.AuthenticationDataBuilder" />
 
   <bean id="PVPEndPointConfiguration"
-    class="at.asitplus.eidas.specific.connector.config.PvpEndPointConfiguration" />
+        class="at.asitplus.eidas.specific.connector.config.PvpEndPointConfiguration" />
 
   <bean id="PVPEndPointCredentialProvider"
-    class="at.asitplus.eidas.specific.connector.provider.PvpEndPointCredentialProvider" />
+        class="at.asitplus.eidas.specific.connector.provider.PvpEndPointCredentialProvider" />
 
   <bean id="PVPMetadataConfigurationFactory"
-    class="at.asitplus.eidas.specific.connector.provider.PvpMetadataConfigurationFactory" />
+        class="at.asitplus.eidas.specific.connector.provider.PvpMetadataConfigurationFactory" />
 
   <bean id="pvp2SProfileEndpoint"
-    class="at.asitplus.eidas.specific.connector.controller.Pvp2SProfileEndpoint">
-    <property name="pvpIdpCredentials">
-      <ref bean="PVPEndPointCredentialProvider" />
-    </property>
+        class="at.asitplus.eidas.specific.connector.controller.Pvp2SProfileEndpoint">
+    <property name="pvpIdpCredentials" ref="PVPEndPointCredentialProvider" />
+    <property name="metadataProvider" ref="PVPMetadataProvider" />
   </bean>
 
   <bean id="AuthnRequestValidator"
-    class="at.asitplus.eidas.specific.connector.verification.AuthnRequestValidator" />
+        class="at.asitplus.eidas.specific.connector.verification.AuthnRequestValidator" />
 
-  <bean id="SAMLVerificationEngine"
-    class="at.gv.egiz.eaaf.modules.pvp2.impl.verification.SamlVerificationEngine" />
+  <!-- bean id="SAMLVerificationEngine"
+        class="at.gv.egiz.eaaf.modules.pvp2.impl.verification.SamlVerificationEngine" /-->
 
   <bean id="pvpMetadataService"
-    class="at.gv.egiz.eaaf.modules.pvp2.idp.impl.MetadataAction">
-    <property name="pvpIdpCredentials">
-      <ref bean="PVPEndPointCredentialProvider" />
-    </property>
+        class="at.gv.egiz.eaaf.modules.pvp2.idp.impl.MetadataAction">
+    <property name="pvpIdpCredentials" ref="PVPEndPointCredentialProvider" />
   </bean>
 
   <bean id="PVPAuthenticationRequestAction"
-    class="at.gv.egiz.eaaf.modules.pvp2.idp.impl.AuthenticationAction">
-    <property name="pvpIdpCredentials">
-      <ref bean="PVPEndPointCredentialProvider" />
-    </property>
+        class="at.gv.egiz.eaaf.modules.pvp2.idp.impl.AuthenticationAction">
+    <property name="pvpIdpCredentials" ref="PVPEndPointCredentialProvider" />
+    <property name="metadataProvider" ref="PVPMetadataProvider" />
   </bean>
 
   <bean id="eaafProtocolAuthenticationService"
-    class="at.gv.egiz.eaaf.core.impl.idp.auth.services.ProtocolAuthenticationService">
+        class="at.gv.egiz.eaaf.core.impl.idp.auth.services.ProtocolAuthenticationService">
     <property name="guiBuilder" ref="mvcGUIBuilderImpl" />
   </bean>
 
   <bean id="securePendingRequestIdGeneration"
-    class="at.gv.egiz.eaaf.core.impl.utils.SecurePendingRequestIdGenerationStrategy" />
+        class="at.gv.egiz.eaaf.core.impl.utils.SecurePendingRequestIdGenerationStrategy" />
 
   <bean id="PVPMetadataProvider"
-    class="at.asitplus.eidas.specific.connector.provider.PvpMetadataProvider" />
+        class="at.asitplus.eidas.specific.connector.provider.PvpMetadataProvider" />
 
   <bean id="PVPSubjectNameGenerator"
-    class="at.asitplus.eidas.specific.connector.builder.PvpSubjectNameGenerator" />
+        class="at.asitplus.eidas.specific.connector.builder.PvpSubjectNameGenerator" />
 
   <bean id="LoALevelMapper"
-    class="at.asitplus.eidas.specific.connector.mapper.LoALevelMapper" />
+        class="at.asitplus.eidas.specific.connector.mapper.LoALevelMapper" />
 
   <bean id="GUIBuilderConfigurationFactory"
-    class="at.asitplus.eidas.specific.connector.gui.GuiBuilderConfigurationFactory" />
+        class="at.asitplus.eidas.specific.connector.gui.GuiBuilderConfigurationFactory" />
 
   <bean id="velocityGUIBuilderImpl"
-    class="at.asitplus.eidas.specific.connector.gui.DefaultVelocityGuiBuilderImpl" />
+        class="at.asitplus.eidas.specific.connector.gui.DefaultVelocityGuiBuilderImpl" />
 
   <bean id="mvcGUIBuilderImpl"
-    class="at.asitplus.eidas.specific.connector.gui.SpringMvcGuiFormBuilderImpl" />
+        class="at.asitplus.eidas.specific.connector.gui.SpringMvcGuiFormBuilderImpl" />
 
   <bean id="StatusMessageProvider"
-    class="at.asitplus.eidas.specific.connector.provider.StatusMessageProvider" />
+        class="at.asitplus.eidas.specific.connector.provider.StatusMessageProvider" />
 
   <bean id="eidasRevisionLogger"
-    class="at.asitplus.eidas.specific.connector.logger.RevisionLogger" />
+        class="at.asitplus.eidas.specific.connector.logger.RevisionLogger" />
 
   <bean id="eidasStatisticLogger"
-    class="at.asitplus.eidas.specific.connector.logger.StatisticLogger" />
+        class="at.asitplus.eidas.specific.connector.logger.StatisticLogger" />
 
 
   <!-- Tasks -->
   <bean id="GenerateCountrySelectionFrameTask"
-    class="at.asitplus.eidas.specific.connector.processes.tasks.GenerateCountrySelectionFrameTask"
-    scope="prototype" />
+        class="at.asitplus.eidas.specific.connector.processes.tasks.GenerateCountrySelectionFrameTask"
+        scope="prototype" />
 
   <bean id="EvaluateCountrySelectionTask"
-    class="at.asitplus.eidas.specific.connector.processes.tasks.EvaluateCountrySelectionTask"
-    scope="prototype" />
+        class="at.asitplus.eidas.specific.connector.processes.tasks.EvaluateCountrySelectionTask"
+        scope="prototype" />
 
 </beans>
\ No newline at end of file
-- 
cgit v1.2.3


From de03adfbe79968f65bb711d7b3a583eeb1054140 Mon Sep 17 00:00:00 2001
From: Alexander Marsalek <amarsalek@iaik.tugraz.at>
Date: Mon, 1 Feb 2021 09:42:38 +0100
Subject: more transitions & tests

---
 connector/src/main/resources/properties/status_messages_en.properties | 1 +
 1 file changed, 1 insertion(+)

(limited to 'connector/src/main/resources')

diff --git a/connector/src/main/resources/properties/status_messages_en.properties b/connector/src/main/resources/properties/status_messages_en.properties
index c430fc90..9dcbe1a1 100644
--- a/connector/src/main/resources/properties/status_messages_en.properties
+++ b/connector/src/main/resources/properties/status_messages_en.properties
@@ -8,6 +8,7 @@ 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}
 eidas.08=An unexpected error occurred.
 eidas.09=An error occurred while loading your data from official registers. Please contact the support.
+eidas.10=Invalid user input.
 
 
 config.01=No configuration-file parameter found. Maybe Java SystemD parameter is missing
-- 
cgit v1.2.3


From ebd7e620fca36b0b545ebcaaaff8d092e1c42e22 Mon Sep 17 00:00:00 2001
From: Christian Kollmann <christian.kollmann@a-sit.at>
Date: Mon, 22 Feb 2021 10:17:20 +0100
Subject: Fix type in property "gui.countryselection.cancel"

---
 .../main/resources/templates/countrySelection.html | 170 ++++++++++-----------
 1 file changed, 85 insertions(+), 85 deletions(-)

(limited to 'connector/src/main/resources')

diff --git a/connector/src/main/resources/templates/countrySelection.html b/connector/src/main/resources/templates/countrySelection.html
index 3937b464..b15234eb 100644
--- a/connector/src/main/resources/templates/countrySelection.html
+++ b/connector/src/main/resources/templates/countrySelection.html
@@ -3,12 +3,12 @@
       xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
       layout:decorator="fragments/base"
       th:with="lang=${#locale.language}" th:lang="${lang}">
-      
+
 <head>
   <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="stylesheet" href="$contextPath/static/css/css_country.css" th:href="@{/static/css/css_country.css}"/>
-  <script type="text/javascript" src="$contextPath/static/js/js_country.js" th:attr="src=@{/static/static/js/js_country.js}"></script>  
+  <script type="text/javascript" src="$contextPath/static/js/js_country.js" th:attr="src=@{/static/static/js/js_country.js}"></script>
   <title th:text="#{gui.countryselection.title}">eIDAS-Login Länderauswahl</title>
 </head>
 
@@ -17,236 +17,236 @@
       <div class="languageselection" th:include="language_selection :: selectlanguage">
           LanguageSelectionBlock
       </div>
-    
+
         <h2 th:text="#{gui.countryselection.header.selection}"> Select your country </h2>
         <div id="country">
-                        
-            <form class="block" method="post" action="$contextPath$submitEndpoint"> 
+
+            <form class="block" method="post" action="$contextPath$submitEndpoint">
                 <a><img class="countryimage" src="$contextPath/img/countries/Belgium-EU.png" alt="Belgium-eID"
                         th:attr="src=@{img/countries/Belgium-EU.png},alt=#{gui.countryselection.country.be.logo.alt}"/></a>
-                <input type="submit" value="Belgium" th:attr="value=#{gui.countryselection.country.be}"> 
+                <input type="submit" value="Belgium" th:attr="value=#{gui.countryselection.country.be}">
                 <input type="hidden" name="selectedCountry" value="BE">
-                <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}" /> 
+                <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}" />
             </form>
-            
-            <form class="block" method="post" action="$contextPath$submitEndpoint"> 
+
+            <form class="block" method="post" action="$contextPath$submitEndpoint">
                 <a><img class="countryimage" src="$contextPath/img/countries/Bulgaria-EU.png" alt="Bulgaria-eID"
                         th:attr="src=@{img/countries/Bulgaria-EU.png},alt=#{gui.countryselection.country.bg.logo.alt}"/></a>
                 <input type="submit" value="Bulgaria" th:attr="value=#{gui.countryselection.country.bg}" >
                 <input type="hidden" name="selectedCountry" value="BG">
-                <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}" /> 
+                <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}" />
             </form>
-            
-            <form class="block" method="post" action="$contextPath$submitEndpoint"> 
+
+            <form class="block" method="post" action="$contextPath$submitEndpoint">
                <a><img class="countryimage" src="$contextPath/img/countries/Croatia-EU.png" alt="Croatia-eID"
                         th:attr="src=@{img/countries/Croatia-EU.png},alt=#{gui.countryselection.country.hr.logo.alt}"/></a>
                 <input type="submit" value="Croatia" th:attr="value=#{gui.countryselection.country.hr}">
                 <input type="hidden" name="selectedCountry" value="HR">
-                <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}" /> 
+                <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}" />
             </form>
-            
-            <form class="block" method="post" action="$contextPath$submitEndpoint"> 
+
+            <form class="block" method="post" action="$contextPath$submitEndpoint">
                 <a><img class="countryimage" src="$contextPath/img/countries/Cyprus-EU.png" alt="Cyprus-eID"
-                        th:attr="src=@{img/countries/Cyprus-EU.png},alt=#{gui.countryselection.country.cy.logo.alt}"/></a> 
+                        th:attr="src=@{img/countries/Cyprus-EU.png},alt=#{gui.countryselection.country.cy.logo.alt}"/></a>
                 <input type="submit" value="Cyprus" th:attr="value=#{gui.countryselection.country.cy}">
                 <input type="hidden" name="selectedCountry" value="CY">
-                <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}" /> 
+                <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}" />
             </form>
-            
-            <form class="block" method="post" action="$contextPath$submitEndpoint"> 
+
+            <form class="block" method="post" action="$contextPath$submitEndpoint">
                 <a><img class="countryimage" src="$contextPath/img/countries/CzechRepublic-EU.png" alt="CzechRepublic-eID"
                         th:attr="src=@{img/countries/CzechRepublic-EU.png},alt=#{gui.countryselection.country.cz.logo.alt}"/></a>
                 <input type="submit" value="CzechRepublic" th:attr="value=#{gui.countryselection.country.cz}">
                 <input type="hidden" name="selectedCountry" value="CZ">
-                <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}" /> 
+                <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}" />
             </form>
-            
-            <form class="block" method="post" action="$contextPath$submitEndpoint"> 
+
+            <form class="block" method="post" action="$contextPath$submitEndpoint">
                <a><img class="countryimage" src="$contextPath/img/countries/Denmark-EU.png" alt="Denmark-eID"
                         th:attr="src=@{img/countries/Denmark-EU.png},alt=#{gui.countryselection.country.dk.logo.alt}"/></a>
                 <input type="submit" value="Denmark" th:attr="value=#{gui.countryselection.country.dk}">
                 <input type="hidden" name="selectedCountry" value="DK">
-                <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}" />    
+                <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}" />
             </form>
 
-            <form class="block" method="post" action="$contextPath$submitEndpoint"> 
+            <form class="block" method="post" action="$contextPath$submitEndpoint">
             	 <a><img class="countryimage" src="$contextPath/img/countries/germany-eu_.png" alt="Germany-eID"
                         th:attr="src=@{img/countries/germany-eu_.png},alt=#{gui.countryselection.country.de.logo.alt}"/></a>
                 <input type="submit" role="button" value="Deutschland / Germany" th:attr="value=#{gui.countryselection.country.de}" />
                 <input type="hidden" name="selectedCountry" value="DE">
                 <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}" />
             </form>
-            
-            <form class="block" method="post" action="$contextPath$submitEndpoint"> 
+
+            <form class="block" method="post" action="$contextPath$submitEndpoint">
                 <a><img class="countryimage" src="$contextPath/img/countries/Estonia-EU.png" alt="Estonia-eID"
                         th:attr="src=@{img/countries/Estonia-EU.png},alt=#{gui.countryselection.country.ee.logo.alt}"/></a>
                 <input type="submit" value="Estonia" th:attr="value=#{gui.countryselection.country.ee}">
                 <input type="hidden" name="selectedCountry" value="EE">
                 <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}" />
             </form>
-            
-            <form class="block" method="post" action="$contextPath$submitEndpoint"> 
+
+            <form class="block" method="post" action="$contextPath$submitEndpoint">
                  <a><img class="countryimage" src="$contextPath/img/countries/Finland-EU.png" alt="Finland-eID"
                         th:attr="src=@{img/countries/Finland-EU.png},alt=#{gui.countryselection.country.fi.logo.alt}"/></a>
                 <input type="submit" value="Finland" th:attr="value=#{gui.countryselection.country.fi}">
                 <input type="hidden" name="selectedCountry" value="FI">
                 <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}" />
             </form>
-            
-            <form class="block" method="post" action="$contextPath$submitEndpoint"> 
+
+            <form class="block" method="post" action="$contextPath$submitEndpoint">
                 <a><img class="countryimage" src="$contextPath/img/countries/France-EU.png" alt="France-eID"
                         th:attr="src=@{img/countries/France-EU.png},alt=#{gui.countryselection.country.fr.logo.alt}"/></a>
                 <input type="submit" value="France" th:attr="value=#{gui.countryselection.country.fr}">
                 <input type="hidden" name="selectedCountry" value="FR">
                 <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}" />
             </form>
-            
-            <form class="block" method="post" action="$contextPath$submitEndpoint"> 
+
+            <form class="block" method="post" action="$contextPath$submitEndpoint">
                <a><img class="countryimage" src="$contextPath/img/countries/Greece-EU.png" alt="Greece-eID"
-                        th:attr="src=@{img/countries/Greece-EU.png},alt=#{gui.countryselection.country.gr.logo.alt}"/></a> 
+                        th:attr="src=@{img/countries/Greece-EU.png},alt=#{gui.countryselection.country.gr.logo.alt}"/></a>
                 <input type="submit" value="Greece" th:attr="value=#{gui.countryselection.country.gr}">
                 <input type="hidden" name="selectedCountry" value="GR">
-                <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}" />    
+                <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}" />
             </form>
-            
-            <form class="block" method="post" action="$contextPath$submitEndpoint"> 
+
+            <form class="block" method="post" action="$contextPath$submitEndpoint">
                <a><img class="countryimage" src="$contextPath/img/countries/Hungary-EU.png" alt="Hungary-eID"
-                        th:attr="src=@{img/countries/Hungary-EU.png},alt=#{gui.countryselection.country.hu.logo.alt}"/></a> 
+                        th:attr="src=@{img/countries/Hungary-EU.png},alt=#{gui.countryselection.country.hu.logo.alt}"/></a>
                 <input type="submit" value="Hungary" th:attr="value=#{gui.countryselection.country.hu}">
                 <input type="hidden" name="selectedCountry" value="HU">
                 <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}" />
             </form>
-            
-            <form class="block" method="post" action="$contextPath$submitEndpoint"> 
+
+            <form class="block" method="post" action="$contextPath$submitEndpoint">
                 <a><img  class="countryimage" src="$contextPath/img/countries/Ireland-EU.png" alt="Ireland-eID"
                         th:attr="src=@{img/countries/Iceland.png},alt=#{gui.countryselection.country.is.logo.alt}"/></a>
                 <input type="submit" value="Ireland" th:attr="value=#{gui.countryselection.country.is}"/>
                 <input type="hidden" name="selectedCountry" value="IS">
                 <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}" />
             </form>
-            
-            <form class="block" method="post" action="$contextPath$submitEndpoint"> 
+
+            <form class="block" method="post" action="$contextPath$submitEndpoint">
                 <a><img class="countryimage" src="$contextPath/img/countries/Ireland-EU.png" alt="Ireland-eID"
                         th:attr="src=@{img/countries/Ireland-EU.png},alt=#{gui.countryselection.country.ir.logo.alt}"/></a>
                 <input type="submit" value="Ireland" th:attr="value=#{gui.countryselection.country.ir}">
                 <input type="hidden" name="selectedCountry" value="IE">
                 <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}" />
             </form>
-                        
-            <form class="block" method="post" action="$contextPath$submitEndpoint"> 
+
+            <form class="block" method="post" action="$contextPath$submitEndpoint">
                <a><img class="countryimage" src="$contextPath/img/countries/Italy-EU.png" alt="Italy-eID"
                         th:attr="src=@{img/countries/Italy-EU.png},alt=#{gui.countryselection.country.it.logo.alt}"/></a>
                 <input type="submit" value="Italy" th:attr="value=#{gui.countryselection.country.it}">
                 <input type="hidden" name="selectedCountry" value="IT">
                 <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}" />
             </form>
-            
-            <form class="block" method="post" action="$contextPath$submitEndpoint"> 
+
+            <form class="block" method="post" action="$contextPath$submitEndpoint">
                 <a><img class="countryimage" src="$contextPath/img/countries/Latvia-EU.png" alt="Latvia-eID"
                         th:attr="src=@{img/countries/Latvia-EU.png},alt=#{gui.countryselection.country.lv.logo.alt}"/></a>
                 <input type="submit" value="Latvia" th:attr="value=#{gui.countryselection.country.lv}">
                 <input type="hidden" name="selectedCountry" value="LV">
-                <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}" />   
+                <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}" />
             </form>
-            
-            <form class="block" method="post" action="$contextPath$submitEndpoint"> 
+
+            <form class="block" method="post" action="$contextPath$submitEndpoint">
                 <a><img class="countryimage" src="$contextPath/img/countries/Luxembourg-EU.png" alt="Luxembourg-eID"
                         th:attr="src=@{img/countries/Luxembourg-EU.png},alt=#{gui.countryselection.country.lu.logo.alt}"/></a>
                 <input type="submit" value="Luxembourg" th:attr="value=#{gui.countryselection.country.lu}">
                 <input type="hidden" name="selectedCountry" value="LT">
-                <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}" />   
+                <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}" />
             </form>
-                        
-            <form class="block" method="post" action="$contextPath$submitEndpoint"> 
+
+            <form class="block" method="post" action="$contextPath$submitEndpoint">
                 <a><img class="countryimage" src="$contextPath/img/countries/Luxembourg-EU.png" alt="Luxembourg-eID"
                         th:attr="src=@{img/countries/Luxembourg-EU.png},alt=#{gui.countryselection.country.lu.logo.alt}"/></a>
                 <input type="submit" value="Luxembourg" th:attr="value=#{gui.countryselection.country.lu}">
                 <input type="hidden" name="selectedCountry" value="LU">
                 <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}" />
             </form>
-            
-            <form class="block" method="post" action="$contextPath$submitEndpoint"> 
+
+            <form class="block" method="post" action="$contextPath$submitEndpoint">
                 <a><img class="countryimage" src="$contextPath/img/countries/Malta-EU.png" alt="Malta-eID"
                         th:attr="src=@{img/countries/Malta-EU.png},alt=#{gui.countryselection.country.mt.logo.alt}"/></a>
                 <input type="submit" value="Malta" th:attr="value=#{gui.countryselection.country.mt}">
                 <input type="hidden" name="selectedCountry" value="MT">
                 <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}" />
             </form>
-            
-			<form class="block" method="post" action="$contextPath$submitEndpoint"> 
+
+			<form class="block" method="post" action="$contextPath$submitEndpoint">
                 <a><img class="countryimage" src="$contextPath/img/countries/TheNetherlands-EU_.png" alt="Netherlands-eID"
                         th:attr="src=@{img/countries/TheNetherlands-EU_.png},alt=#{gui.countryselection.country.nl.logo.alt}"/></a>
-                <input type="submit" value="Netherlands" th:attr="value=#{gui.countryselection.country.nl}">                
+                <input type="submit" value="Netherlands" th:attr="value=#{gui.countryselection.country.nl}">
                 <input type="hidden" name="selectedCountry" value="NL">
-                <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}" />   
+                <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}" />
             </form>
-            
-            <form class="block" method="post" action="$contextPath$submitEndpoint"> 
+
+            <form class="block" method="post" action="$contextPath$submitEndpoint">
                 <a><img class="countryimage" src="$contextPath/img/countries/Poland-EU.png" alt="Poland-eID"
                         th:attr="src=@{img/countries/Poland-EU.png},alt=#{gui.countryselection.country.pl.logo.alt}"/></a>
                 <input type="submit" value="Poland" th:attr="value=#{gui.countryselection.country.pl}">
-				<input type="hidden" name="selectedCountry" value="PL">                                
+				<input type="hidden" name="selectedCountry" value="PL">
                 <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}" />
             </form>
-            
-            <form class="block" method="post" action="$contextPath$submitEndpoint"> 
+
+            <form class="block" method="post" action="$contextPath$submitEndpoint">
                <a><img class="countryimage" src="$contextPath/img/countries/Portugal-EU.png" alt="Portugal-eID"
-                        th:attr="src=@{img/countries/Portugal-EU.png},alt=#{gui.countryselection.country.pt.logo.alt}"/></a> 
+                        th:attr="src=@{img/countries/Portugal-EU.png},alt=#{gui.countryselection.country.pt.logo.alt}"/></a>
                 <input type="submit" value="Portugal" th:attr="value=#{gui.countryselection.country.pt}">
                 <input type="hidden" name="selectedCountry" value="PT">
-                <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}" />   
+                <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}" />
             </form>
-            
-            <form class="block" method="post" action="$contextPath$submitEndpoint"> 
+
+            <form class="block" method="post" action="$contextPath$submitEndpoint">
                 <a><img class="countryimage" src="$contextPath/img/countries/Romania-EU.png" alt="Romania-eID"
-                        th:attr="src=@{img/countries/Romania-EU.png},alt=#{gui.countryselection.country.ro.logo.alt}"/></a> 
+                        th:attr="src=@{img/countries/Romania-EU.png},alt=#{gui.countryselection.country.ro.logo.alt}"/></a>
                 <input type="submit" value="Romania" th:attr="value=#{gui.countryselection.country.ro}">
                 <input type="hidden" name="selectedCountry" value="RO">
-                <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}" />   
+                <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}" />
             </form>
-            
-            <form class="block" method="post" action="$contextPath$submitEndpoint"> 
+
+            <form class="block" method="post" action="$contextPath$submitEndpoint">
                 <a><img class="countryimage" src="$contextPath/img/countries/Slovakia-EU.png" alt="Slovakia-eID"
                         th:attr="src=@{img/countries/Slovakia-EU.png},alt=#{gui.countryselection.country.sk.logo.alt}"/></a>
                 <input type="submit" value="Slovakia" th:attr="value=#{gui.countryselection.country.sk}">
                 <input type="hidden" name="selectedCountry" value="SK">
-                <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}" />   
+                <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}" />
             </form>
-            
-            <form class="block" method="post" action="$contextPath$submitEndpoint"> 
+
+            <form class="block" method="post" action="$contextPath$submitEndpoint">
                  <a><img class="countryimage" src="$contextPath/img/countries/Slovenia-EU.png" alt="Slovenia-eID"
                         th:attr="src=@{img/countries/Slovenia-EU.png},alt=#{gui.countryselection.country.si.logo.alt}"/></a>
                 <input type="submit" value="Slovenia" th:attr="value=#{gui.countryselection.country.si}">
                 <input type="hidden" name="selectedCountry" value="SI">
-                <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}" />   
+                <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}" />
             </form>
-            
-            <form class="block" method="post" action="$contextPath$submitEndpoint"> 
+
+            <form class="block" method="post" action="$contextPath$submitEndpoint">
                  <a><img class="countryimage" src="$contextPath/img/countries/Spain-EU.png" alt="Spain-eID"
                         th:attr="src=@{img/countries/Spain-EU.png},alt=#{gui.countryselection.country.es.logo.alt}"/></a>
                 <input type="submit" value="Spain" th:attr="value=#{gui.countryselection.country.es}">
                 <input type="hidden" name="selectedCountry" value="ES">
-                <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}" />   
+                <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}" />
             </form>
-            
-            <form class="block" method="post" action="$contextPath$submitEndpoint"> 
+
+            <form class="block" method="post" action="$contextPath$submitEndpoint">
                 <a><img class="countryimage" src="$contextPath/img/countries/Sweden-EU.png" alt="Sweden-eID"
                         th:attr="src=@{img/countries/Sweden-EU.png},alt=#{gui.countryselection.country.se.logo.alt}"/></a>
                 <input type="submit" value="Sweden" th:attr="value=#{gui.countryselection.country.se}">
                 <input type="hidden" name="selectedCountry" value="SE">
-                <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}" />   
+                <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}" />
             </form>
-                        
-            <form class="block" method="post" action="$contextPath$submitEndpoint"> 
+
+            <form class="block" method="post" action="$contextPath$submitEndpoint">
                 <a><img class="countryimage" src="$contextPath/img/countries/UnitedKingdom-EU.png" alt="UnitedKingdom-eID"
                         th:attr="src=@{img/countries/UnitedKingdom-EU.png},alt=#{gui.countryselection.country.uk.logo.alt}"/></a>
                 <input type="submit" value="United Kingdom" th:attr="value=#{gui.countryselection.country.uk}">
                 <input type="hidden" name="selectedCountry" value="UK">
                 <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}" />
             </form>
-            
-        	<form   class="block" method="post"  action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}"> 
-	          <input  type="submit" class="btn btn-outline-primary btn-block" value="Abbrechen/Cancel" th:attr="value=#{gui.countryselection.cancle}">                                    
+
+        	<form   class="block" method="post"  action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
+	          <input  type="submit" class="btn btn-outline-primary btn-block" value="Abbrechen/Cancel" th:attr="value=#{gui.countryselection.cancel}">
     	      <input  type="hidden" name="stopAuthProcess" value="true" >
         	  <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}">
         	</form>
-- 
cgit v1.2.3


From 9f0fa316c8f7adeb3529cb4c3b2c553f085f7d95 Mon Sep 17 00:00:00 2001
From: Thomas <>
Date: Tue, 15 Jun 2021 12:14:51 +0200
Subject: add ZMR client, to some re-factoring, and a lot of bug-fixing

---
 connector/src/main/resources/application.properties        | 14 ++++++++++++++
 .../resources/properties/status_messages_en.properties     |  5 +----
 2 files changed, 15 insertions(+), 4 deletions(-)

(limited to 'connector/src/main/resources')

diff --git a/connector/src/main/resources/application.properties b/connector/src/main/resources/application.properties
index b13b6c18..e9c3afd1 100644
--- a/connector/src/main/resources/application.properties
+++ b/connector/src/main/resources/application.properties
@@ -82,6 +82,20 @@ eidas.ms.auth.eIDAS.szrclient.eidasbind.mds.inject=false
 #eidas.ms.auth.eIDAS.authblock.key.password=f/+saJBc3a}*/T^s
 
 
+
+#### matching######
+# ZMR communication
+#eidas.ms.auth.eIDAS.zmrclient.endpoint=http://localhost:1234/demozmr
+#eidas.ms.auth.eIDAS.zmrclient.ssl.keyStore.type=jks
+#eidas.ms.auth.eIDAS.zmrclient.ssl.keyStore.path=keys/junit.jks
+#eidas.ms.auth.eIDAS.zmrclient.ssl.keyStore.password=password
+#eidas.ms.auth.eIDAS.zmrclient.ssl.trustStore.path=
+#eidas.ms.auth.eIDAS.zmrclient.ssl.trustStore.password=
+
+#eidas.ms.auth.eIDAS.zmrclient.req.organisation.behoerdennr=jUnit123456
+
+
+
 #Raw eIDAS Id data storage
 eidas.ms.auth.eIDAS.szrclient.workarounds.eidmapping.revisionlog.active=true
 
diff --git a/connector/src/main/resources/properties/status_messages_en.properties b/connector/src/main/resources/properties/status_messages_en.properties
index 9dcbe1a1..f07a8705 100644
--- a/connector/src/main/resources/properties/status_messages_en.properties
+++ b/connector/src/main/resources/properties/status_messages_en.properties
@@ -5,10 +5,7 @@ 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}
-eidas.08=An unexpected error occurred.
-eidas.09=An error occurred while loading your data from official registers. Please contact the support.
-eidas.10=Invalid user input.
+eidas.07=eIDAS Response attribute-validation FAILED. Attribute:{0} Reason: {1}.
 
 
 config.01=No configuration-file parameter found. Maybe Java SystemD parameter is missing
-- 
cgit v1.2.3


From 6e1a69773284177a0f6c7233c4bcdf7f4bd96681 Mon Sep 17 00:00:00 2001
From: Thomas <>
Date: Tue, 15 Jun 2021 18:15:19 +0200
Subject: further optimizations and bug fixing in matching code

---
 connector/src/main/resources/specific_eIDAS_connector.beans.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'connector/src/main/resources')

diff --git a/connector/src/main/resources/specific_eIDAS_connector.beans.xml b/connector/src/main/resources/specific_eIDAS_connector.beans.xml
index c59496b4..4608086e 100644
--- a/connector/src/main/resources/specific_eIDAS_connector.beans.xml
+++ b/connector/src/main/resources/specific_eIDAS_connector.beans.xml
@@ -24,6 +24,9 @@
     <property name="pvpIdpCredentials" ref="PVPEndPointCredentialProvider" />
   </bean>
 
+  <bean id="defaultErrorTicketService"
+        class="at.gv.egiz.eaaf.core.impl.idp.auth.services.DefaultErrorService"/>
+        
   <bean id="eidasNodeMetadata"
         class="at.asitplus.eidas.specific.connector.health.EidasNodeMetadataHealthIndicator" />
 
-- 
cgit v1.2.3


From 249e3805da249afafe164ae7dc43884ba3777727 Mon Sep 17 00:00:00 2001
From: Thomas <>
Date: Wed, 16 Jun 2021 11:51:11 +0200
Subject: add ZMR update process into ZMRClient

---
 connector/src/main/resources/application.properties | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'connector/src/main/resources')

diff --git a/connector/src/main/resources/application.properties b/connector/src/main/resources/application.properties
index e9c3afd1..8263ea82 100644
--- a/connector/src/main/resources/application.properties
+++ b/connector/src/main/resources/application.properties
@@ -93,6 +93,8 @@ eidas.ms.auth.eIDAS.szrclient.eidasbind.mds.inject=false
 #eidas.ms.auth.eIDAS.zmrclient.ssl.trustStore.password=
 
 #eidas.ms.auth.eIDAS.zmrclient.req.organisation.behoerdennr=jUnit123456
+#eidas.ms.auth.eIDAS.zmrclient.req.update.reason.code=EIDAS-KITT
+#eidas.ms.auth.eIDAS.zmrclient.req.update.reason.text=KITT for eIDAS Matching
 
 
 
-- 
cgit v1.2.3


From cbf1d0408519d0763a1a87b733c16a1ba5d022ba Mon Sep 17 00:00:00 2001
From: Thomas <>
Date: Wed, 7 Jul 2021 09:31:43 +0200
Subject: add HTML template for additional eID information

---
 connector/src/main/resources/specific_eIDAS_connector.beans.xml | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'connector/src/main/resources')

diff --git a/connector/src/main/resources/specific_eIDAS_connector.beans.xml b/connector/src/main/resources/specific_eIDAS_connector.beans.xml
index 4608086e..ec16a7d2 100644
--- a/connector/src/main/resources/specific_eIDAS_connector.beans.xml
+++ b/connector/src/main/resources/specific_eIDAS_connector.beans.xml
@@ -13,9 +13,6 @@
 
   <import resource="common_gui.beans.xml"/>
 
-  <bean id="WebResourceConfiguration"
-        class="at.asitplus.eidas.specific.connector.config.StaticResourceConfiguration" />
-
   <bean id="processEngineSignalController"
         class="at.asitplus.eidas.specific.connector.controller.ProcessEngineSignalController" />
 
-- 
cgit v1.2.3