diff options
Diffstat (limited to 'basicConfig')
| -rw-r--r-- | basicConfig/default_config.properties | 6 | ||||
| -rw-r--r-- | basicConfig/eIDAS/igniteSpecificCommunication.xml | 19 | ||||
| -rw-r--r-- | basicConfig/properties/messages.properties | 2 | ||||
| -rw-r--r-- | basicConfig/templates/error_message.html | 10 |
4 files changed, 28 insertions, 9 deletions
diff --git a/basicConfig/default_config.properties b/basicConfig/default_config.properties index 8a1bc3a0..2ea12b17 100644 --- a/basicConfig/default_config.properties +++ b/basicConfig/default_config.properties @@ -1,6 +1,5 @@ ## Basic service configuration eidas.ms.context.url.prefix= -eidas.ms.context.url.request.validation=false eidas.ms.core.configRootDir=file:./ @@ -19,6 +18,8 @@ eidas.ms.core.pendingrequestid.digist.secret=pendingReqIdSecret ## eIDAS Ref. Implementation connector ### +eidas.ms.auth.eIDAS.eid.testidentity.default=false + eidas.ms.auth.eIDAS.node_v2.entityId=ownSpecificConnector eidas.ms.auth.eIDAS.node_v2.forward.endpoint= @@ -31,6 +32,9 @@ eidas.ms.auth.eIDAS.szrclient.ssl.keyStore.password= eidas.ms.auth.eIDAS.szrclient.ssl.trustStore.path= eidas.ms.auth.eIDAS.szrclient.ssl.trustStore.password= +## eIDAS Request configuration +eidas.ms.auth.eIDAS.node_v2.staticProviderNameForPublicSPs=Austria + ## E-AuthBlock configuration eidas.ms.auth.eIDAS.authblock.keystore.type=jks diff --git a/basicConfig/eIDAS/igniteSpecificCommunication.xml b/basicConfig/eIDAS/igniteSpecificCommunication.xml index f817f5a4..da61cbf1 100644 --- a/basicConfig/eIDAS/igniteSpecificCommunication.xml +++ b/basicConfig/eIDAS/igniteSpecificCommunication.xml @@ -53,30 +53,35 @@ <property name="name" value="specificNodeConnectorRequestCache"/> <property name="atomicityMode" value="ATOMIC"/> <property name="backups" value="1"/> + <property name="expiryPolicyFactory" ref="7_minutes_duration"/> </bean> <!-- Partitioned cache example configuration (Atomic mode). --> <bean class="org.apache.ignite.configuration.CacheConfiguration"> <property name="name" value="nodeSpecificProxyserviceRequestCache"/> <property name="atomicityMode" value="ATOMIC"/> <property name="backups" value="1"/> + <property name="expiryPolicyFactory" ref="7_minutes_duration"/> </bean> <!-- Partitioned cache example configuration (Atomic mode). --> <bean class="org.apache.ignite.configuration.CacheConfiguration"> <property name="name" value="specificNodeProxyserviceResponseCache"/> <property name="atomicityMode" value="ATOMIC"/> <property name="backups" value="1"/> - </bean> + <property name="expiryPolicyFactory" ref="7_minutes_duration"/> + </bean> <!-- Partitioned cache example configuration (Atomic mode). --> <bean class="org.apache.ignite.configuration.CacheConfiguration"> <property name="name" value="nodeSpecificConnectorResponseCache"/> <property name="atomicityMode" value="ATOMIC"/> <property name="backups" value="1"/> + <property name="expiryPolicyFactory" ref="7_minutes_duration"/> </bean> <!-- Partitioned cache example configuration (Atomic mode). --> <bean class="org.apache.ignite.configuration.CacheConfiguration"> <property name="name" value="msConnectorCache"/> <property name="atomicityMode" value="ATOMIC"/> <property name="backups" value="1"/> + <property name="expiryPolicyFactory" ref="7_minutes_duration"/> </bean> </list> @@ -106,4 +111,16 @@ <property name="searchSystemEnvironment" value="true"/> </bean> + <!-- + Defines expiry policy based on moment of creation for ignite cache. + --> + <bean id="7_minutes_duration" class="javax.cache.expiry.CreatedExpiryPolicy" factory-method="factoryOf" scope="prototype"> + <constructor-arg> + <bean class="javax.cache.expiry.Duration"> + <constructor-arg value="MINUTES"/> + <constructor-arg value="7"/> + </bean> + </constructor-arg> + </bean> + </beans> diff --git a/basicConfig/properties/messages.properties b/basicConfig/properties/messages.properties index 60ab474e..3ea204dd 100644 --- a/basicConfig/properties/messages.properties +++ b/basicConfig/properties/messages.properties @@ -87,6 +87,8 @@ gui.countryselection.country.lu=Luxembourg gui.countryselection.country.lu.logo.alt=Luxembourg-eID gui.countryselection.country.mt=Malta gui.countryselection.country.mt.logo.alt=Malta-eID +gui.countryselection.country.no=Norway +gui.countryselection.country.no.logo.alt=Norway-eID gui.countryselection.country.ro=Romania gui.countryselection.country.ro.logo.alt=Romania-eID gui.countryselection.country.sk=Slovakia diff --git a/basicConfig/templates/error_message.html b/basicConfig/templates/error_message.html index f9788f6a..b1367962 100644 --- a/basicConfig/templates/error_message.html +++ b/basicConfig/templates/error_message.html @@ -21,16 +21,12 @@ <div id="alert_area" class="hell" role="application" > <p th:text="#{gui.errorpage.msg.information}">Error Information</p> <br/> - <p><b th:text="#{gui.errorpage.msg.errorcode}">Code :</b> <span th:text="${errorCode}"></span></p> + <p><b th:text="#{gui.errorpage.msg.errorcode}">Code :</b> <span th:text="${extErrorCode}"></span></p> <p><b th:text="#{gui.errorpage.msg.errormsg}">Msg :</b > <span th:text="${#messages.msgWithParams('__${errorCode}__', '__${errorParams}__')}"></span></p> </div> </div> - - <div th:if="${msg.stacktrace}"> - <p><b th:text="#{gui.errorpage.msg.stacktrace}">fullError</b> <span th:text="${msg.stacktrace}"></span></p> - </div> - + </div> </div> </body> -</html>
\ No newline at end of file +</html> |