aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Lenz <thomas.lenz@egiz.gv.at>2019-12-11 12:45:34 +0100
committerThomas Lenz <thomas.lenz@egiz.gv.at>2019-12-11 12:45:34 +0100
commit7bdb891ffe9e14e86b23a10579c8d97759ba4830 (patch)
treed97c54cf418fe97e401c1513ff43f47e0d5ea938
parent06b089b1898307d68de8eee0d1054d7db84c6cdf (diff)
downloadNational_eIDAS_Gateway-7bdb891ffe9e14e86b23a10579c8d97759ba4830.tar.gz
National_eIDAS_Gateway-7bdb891ffe9e14e86b23a10579c8d97759ba4830.tar.bz2
National_eIDAS_Gateway-7bdb891ffe9e14e86b23a10579c8d97759ba4830.zip
update default configuration again
Diffstat
-rw-r--r--basicConfig/eIDAS/specificCommunicationDefinitionConnector.xml11
-rw-r--r--basicConfig/eIDAS/specificCommunicationDefinitionProxyservice.xml5
-rw-r--r--basicConfig/templates/countrySelection.html15
-rw-r--r--basicConfig/templates/error_message.html4
-rw-r--r--connector/src/main/java/at/asitplus/eidas/specific/connector/config/StaticResourceConfiguration.java2
-rw-r--r--infos/eIDAS_Ref_Impl/eIDAS-Node Migration Guide 2.3.pdfbin0 -> 988328 bytes
6 files changed, 23 insertions, 14 deletions
diff --git a/basicConfig/eIDAS/specificCommunicationDefinitionConnector.xml b/basicConfig/eIDAS/specificCommunicationDefinitionConnector.xml
index cdd428d1..d1fc042d 100644
--- a/basicConfig/eIDAS/specificCommunicationDefinitionConnector.xml
+++ b/basicConfig/eIDAS/specificCommunicationDefinitionConnector.xml
@@ -16,17 +16,22 @@
<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
<properties>
- <entry key="distributedCommunicationMaps">true</entry>
+ <!-- issuer name -->
+ <entry key="lightToken.connector.request.issuer.name">specificCommunicationDefinitionConnectorRequest</entry>
+ <entry key="lightToken.connector.request.node.id">specificConnector</entry>
- <!-- issuer name -->
- <entry key="lightToken.connector.request.issuer.name">specificCommunicationDefinitionConnectorRequest</entry>
<!--secrets and algorithms for request consent token-->
<entry key="lightToken.connector.request.secret">mySecretConnectorRequest</entry>
<entry key="lightToken.connector.request.algorithm">SHA-256</entry>
<!-- issuer name -->
<entry key="lightToken.connector.response.issuer.name">specificCommunicationDefinitionConnectorResponse</entry>
+ <entry key="lightToken.connector.response.node.id">specificConnector</entry>
+
<!--secrets and algorithms for response consent token-->
<entry key="lightToken.connector.response.secret">mySecretConnectorResponse</entry>
<entry key="lightToken.connector.response.algorithm">SHA-256</entry>
+
+ <!--The value of incoming lightRequest maximum number characters allowed-->
+ <entry key="incoming.lightRequest.max.number.characters">65535</entry>
</properties>
diff --git a/basicConfig/eIDAS/specificCommunicationDefinitionProxyservice.xml b/basicConfig/eIDAS/specificCommunicationDefinitionProxyservice.xml
index 4b82191e..c8caf16b 100644
--- a/basicConfig/eIDAS/specificCommunicationDefinitionProxyservice.xml
+++ b/basicConfig/eIDAS/specificCommunicationDefinitionProxyservice.xml
@@ -20,13 +20,18 @@
<!-- issuer name -->
<entry key="lightToken.proxyservice.request.issuer.name">specificCommunicationDefinitionProxyserviceRequest</entry>
+ <entry key="lightToken.proxyservice.request.node.id">specificProxyService</entry>
<!--secrets and algorithms for request consent token-->
<entry key="lightToken.proxyservice.request.secret">mySecretProxyserviceRequest</entry>
<entry key="lightToken.proxyservice.request.algorithm">SHA-256</entry>
<!-- issuer name -->
<entry key="lightToken.proxyservice.response.issuer.name">specificCommunicationDefinitionProxyserviceResponse</entry>
+ <entry key="lightToken.proxyservice.response.node.id">specificProxyService</entry>
<!--secrets and algorithms for response consent token-->
<entry key="lightToken.proxyservice.response.secret">mySecretProxyserviceResponse</entry>
<entry key="lightToken.proxyservice.response.algorithm">SHA-256</entry>
+
+ <!--The value of incoming Light Response maximum number characters allowed-->
+ <entry key="incoming.lightResponse.max.number.characters">65535</entry>
</properties>
diff --git a/basicConfig/templates/countrySelection.html b/basicConfig/templates/countrySelection.html
index 0c9b42bf..7fbc9464 100644
--- a/basicConfig/templates/countrySelection.html
+++ b/basicConfig/templates/countrySelection.html
@@ -2,8 +2,7 @@
<html xmlns:th="http://www.thymeleaf.org"
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
layout:decorator="fragments/base"
- th:with="lang=${#locale.language}" th:lang="${lang}">
-
+ 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">
@@ -211,21 +210,21 @@ function clickCountryFlag(element) {
<h2 th:text="#{gui.countryselection.infos.general.header}" > Information zur Anmeldung über Europäische eIDs </h2>
<p>
- <span th:text="#{gui.countryselection.infos.general.part.1}" > first part </span>
+ <span th:text="#{gui.countryselection.infos.general.part.1}"> first part </span>
<a href="https://www.bmi.gv.at/" target="_blank" th:text="#{gui.countryselection.header1}" > Bundesministerium für Inneres </a>
- <span th:text="#{gui.countryselection.infos.general.part.2}" > second part </span>
+ <span th:text="#{gui.countryselection.infos.general.part.2}"> second part </span>
</p>
<p>
- <span th:text="#{gui.countryselection.infos.general.part.3}" > third part </span>
+ <span th:text="#{gui.countryselection.infos.general.part.3}"> third part </span>
<a href="https://eur-lex.europa.eu/legal-content/DE/TXT/HTML/?uri=CELEX:32014R0910&from=DE" target="_blank" th:text="#{gui.countryselection.infos.general.link.1}"> eIDAS-Verordnung der Europäischen Union </a>
- <span th:text="#{gui.countryselection.infos.general.part.4}" > fourth part </span>
+ <span th:text="#{gui.countryselection.infos.general.part.4}"> fourth part </span>
</p>
<p
- <span th:text="#{gui.countryselection.infos.general.part.5}" > fived part </span>
+ <span th:text="#{gui.countryselection.infos.general.part.5}"> fived part </span>
<a href="https://www.dsb.gv.at/-/das-erganzungsregister-fur-naturliche-personen-ernp-" target="_blank" th:text="#{gui.countryselection.infos.general.link.2}" ></a>
- <span th:text="#{gui.countryselection.infos.general.part.6}" > sixed part </span>
+ <span th:text="#{gui.countryselection.infos.general.part.6}"> sixed part </span>
</p>
</div>
diff --git a/basicConfig/templates/error_message.html b/basicConfig/templates/error_message.html
index 86f9d29d..da423592 100644
--- a/basicConfig/templates/error_message.html
+++ b/basicConfig/templates/error_message.html
@@ -21,8 +21,8 @@
<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.errormsg}">Msg :</b > <span th:text="${#messages.msgWithParams('__${errorCode}__', '__${errorParams}__')}"></span></p>
+ <p><b th:text="#{gui.errorpage.msg.errorcode}">Code :</b> <span th:text="${msg.errorCode}"></span></p>
+ <p><b th:text="#{gui.errorpage.msg.errormsg}">Msg :</b > <span th:text="${#messages.msgWithParams('__${msg.errorCode}__', '__${msg.errorParams}__')}"></span></p>
</div>
<!-- errorMsg -->
</div>
diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/config/StaticResourceConfiguration.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/config/StaticResourceConfiguration.java
index e3931afe..2a10031b 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/config/StaticResourceConfiguration.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/config/StaticResourceConfiguration.java
@@ -176,7 +176,7 @@ public class StaticResourceConfiguration implements WebMvcConfigurer {
final FileTemplateResolver viewResolver = new FileTemplateResolver();
viewResolver.setPrefix(absPath);
viewResolver.setSuffix(".html");
- viewResolver.setTemplateMode("HTML5");
+ viewResolver.setTemplateMode("HTML");
viewResolver.setCacheable(false);
log.info("Add Ressourcefolder: " + absPath + " for dynamic Web content templates");
diff --git a/infos/eIDAS_Ref_Impl/eIDAS-Node Migration Guide 2.3.pdf b/infos/eIDAS_Ref_Impl/eIDAS-Node Migration Guide 2.3.pdf
new file mode 100644
index 00000000..dc6ddbc5
--- /dev/null
+++ b/infos/eIDAS_Ref_Impl/eIDAS-Node Migration Guide 2.3.pdf
Binary files differ
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 21:17:54 +0000