Release eumw-2.2.5

.hgtags

@@ -60,3 +60,5 @@ f0a7904ab43d36580ae5452ec536a1aba1d6b629 eumw-2.2.1
 d14cac49af140383c0e21a6d5321af9e093277b6 eumw-2.2.2
 22f43397b2011d9ee14fe3a0bbade0e719cb8355 eumw-2.2.3-RC1
 d2932df2e87d2e2c9e4a11180f4b794c19ceea20 eumw-2.2.3-RC2
+4e9da5cfcfd457536c4b1dc963c8ecb5cc3c2f26 eumw-2.2.3
+eebce4e024fdcf705d1ea6baef62e86e3f2eb947 eumw-2.2.4

configuration-checker/pom.xml

@@ -14,7 +14,7 @@
     <parent>
         <artifactId>eumw</artifactId>
         <groupId>de.governikus.eumw</groupId>
-        <version>2.2.3</version>
+        <version>2.2.5</version>
     </parent>
 
     <artifactId>configuration-checker</artifactId>

configuration-wizard/pom.xml

@@ -14,7 +14,7 @@
     <parent>
         <groupId>de.governikus.eumw</groupId>
         <artifactId>eumw</artifactId>
-        <version>2.2.3</version>
+        <version>2.2.5</version>
     </parent>
     <artifactId>configuration-wizard</artifactId>
 

configuration-wizard/src/main/java/de/governikus/eumw/configuration/wizard/web/model/GlobalModelAttribute.java

@@ -0,0 +1,64 @@
+package de.governikus.eumw.configuration.wizard.web.model;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ModelAttribute;
+
+import de.governikus.eumw.configuration.wizard.identifier.HSMTypeIdentifier;
+import de.governikus.eumw.configuration.wizard.web.utils.WizardPage;
+
+
+@ControllerAdvice
+public class GlobalModelAttribute
+{
+
+  @ModelAttribute("BASE_PATH_VIEW")
+  public WizardPage basePathView()
+  {
+    return WizardPage.BASE_PATH_VIEW;
+  }
+
+  @ModelAttribute("UPLOAD_CONFIG_PROPERTIES_VIEW")
+  public WizardPage uploadConfigPropertiesView()
+  {
+    return WizardPage.UPLOAD_CONFIG_PROPERTIES_VIEW;
+  }
+
+  @ModelAttribute("APPLICATION_PROPERTIES_VIEW")
+  public WizardPage applicationPropertiesView()
+  {
+    return WizardPage.APPLICATION_PROPERTIES_VIEW;
+  }
+
+  @ModelAttribute("POSEIDAS_CORE_VIEW")
+  public WizardPage poseidasCoreView()
+  {
+    return WizardPage.POSEIDAS_CORE_VIEW;
+  }
+
+  @ModelAttribute("EIDAS_PROPERTIES_VIEW")
+  public WizardPage eidasPropertiesView()
+  {
+    return WizardPage.EIDAS_PROPERTIES_VIEW;
+  }
+
+  @ModelAttribute("SAVE_LOCATION_VIEW")
+  public WizardPage saveLocationView()
+  {
+    return WizardPage.SAVE_LOCATION_VIEW;
+  }
+
+  @ModelAttribute("NUMBER_OF_PAGES")
+  public int numberOfPages()
+  {
+    return WizardPage.values().length;
+  }
+
+  @ModelAttribute("HSM_TYPE_IDENTIFIER")
+  public List<HSMTypeIdentifier> hsmTypeIdentifier()
+  {
+    return Arrays.asList(HSMTypeIdentifier.values());
+  }
+}

configuration-wizard/src/main/resources/application.properties

@@ -7,13 +7,11 @@
 # OF ANY KIND, either express or implied. See the Licence for the specific language governing permissions and
 # limitations under the Licence.
 #
-
 # Server settings
 server.port=8080
 server.servlet.context-path=/config-wizard
-
 # Thymeleaf settings
 spring.thymeleaf.prefix=classpath:views/
 spring.thymeleaf.cache=false
-spring.resources.static-locations=classpath:resources/
-spring.resources.cache.period=0
+spring.web.resources.static-locations=classpath:resources/
+spring.web.resources.cache.period=0

configuration-wizard/src/main/resources/views/config-wizard.html

@@ -22,13 +22,13 @@
 	<div data-th-replace="fragments/layout.html :: header()"></div>
 
 	<form data-th-action="@{/}" method="post" enctype="multipart/form-data"
-		data-th-with="basePathConfigPage=${T(de.governikus.eumw.configuration.wizard.web.utils.WizardPage).BASE_PATH_VIEW},
-                    uploadConfigPage=${T(de.governikus.eumw.configuration.wizard.web.utils.WizardPage).UPLOAD_CONFIG_PROPERTIES_VIEW},
-                    appPropertiesPage=${T(de.governikus.eumw.configuration.wizard.web.utils.WizardPage).APPLICATION_PROPERTIES_VIEW},
-                    poseidasCorePage=${T(de.governikus.eumw.configuration.wizard.web.utils.WizardPage).POSEIDAS_CORE_VIEW},
-                    contactInfoPage=${T(de.governikus.eumw.configuration.wizard.web.utils.WizardPage).EIDAS_PROPERTIES_VIEW},,
-                    saveLocationPage=${T(de.governikus.eumw.configuration.wizard.web.utils.WizardPage).SAVE_LOCATION_VIEW},
-                    numberOfPages=${T(de.governikus.eumw.configuration.wizard.web.utils.WizardPage).values().length},
+		data-th-with="basePathConfigPage=${BASE_PATH_VIEW},
+                    uploadConfigPage=${UPLOAD_CONFIG_PROPERTIES_VIEW},
+                    appPropertiesPage=${APPLICATION_PROPERTIES_VIEW},
+                    poseidasCorePage=${POSEIDAS_CORE_VIEW},
+                    contactInfoPage=${EIDAS_PROPERTIES_VIEW},
+                    saveLocationPage=${SAVE_LOCATION_VIEW},
+                    numberOfPages=${NUMBER_OF_PAGES}
                     ">
 
 		<p id="configurationLoaded"
@@ -246,7 +246,7 @@ <h3 data-th-text="#{hsm}"></h3>
                                               fieldName     = hsmType,
                                               description   = #{hsm.type},
                                               message       = #{hsm.type.desc},
-                                              staticEnum	= ${T(de.governikus.eumw.configuration.wizard.identifier.HSMTypeIdentifier)})"></div>
+                                              enumList	= ${HSM_TYPE_IDENTIFIER})"></div>
 				<div
 					data-th-replace="fragments/view-components.html :: textInputRow(
                                               idBase        = applicationProperties,

configuration-wizard/src/main/resources/views/fragments/view-components.html

@@ -112,7 +112,7 @@
     </div>
 </div>
 <!-- -------------------------------------------------------------------------------------------------------------- -->
-<div data-th-fragment="staticDropDownRow(idBase, fieldName, description, message, staticEnum)"
+<div data-th-fragment="staticDropDownRow(idBase, fieldName, description, message, enumList)"
      class="table-row">
     <label data-th-for="${#strings.isEmpty(idBase) ? '' : idBase + '-'} + ${fieldName}"
            class="table-cell description" data-th-text="${description}"></label>
@@ -126,7 +126,7 @@
            class="field-description-message"></p>
 		<select  data-th-id="${#strings.isEmpty(idBase) ? '' : idBase + '-'} + ${fieldName}"
                data-th-field="*{__${fieldName}__}">
-			<option th:each="state : ${staticEnum.values()}"
+			<option th:each="state : ${enumList}"
 				th:value="${state}" th:text="${state}"></option>
 		</select>
     </div>

configuration-wizard/src/test/java/de/governikus/eumw/configuration/wizard/springboot/SessionFilter.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2021 Governikus KG. Licensed under the EUPL, Version 1.2 or as soon they will be approved by the
+ * European Commission - subsequent versions of the EUPL (the "Licence"); You may not use this work except in compliance
+ * with the Licence. You may obtain a copy of the Licence at: http://joinup.ec.europa.eu/software/page/eupl Unless
+ * required by applicable law or agreed to in writing, software distributed under the Licence is distributed on an
+ * "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the Licence for the
+ * specific language governing permissions and limitations under the Licence.
+ */
+
+package de.governikus.eumw.configuration.wizard.springboot;
+
+import java.io.IOException;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.stereotype.Component;
+import org.springframework.web.filter.OncePerRequestFilter;
+
+
+/**
+ * While testing with the HTMLUnit-Framework, sometimes the URL parameter JSESSIONID is appended to the RequestURL,
+ * which leads to errors. This filter removes the JSESSIONID parameter.
+ */
+@Component
+public class SessionFilter extends OncePerRequestFilter
+{
+
+  @Override
+  protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
+    throws ServletException, IOException
+  {
+    logger.debug("In SessionFilter");
+    if (request.getRequestURI().contains("jsessionid"))
+    {
+      String newURI = request.getRequestURI().substring(0, request.getRequestURI().indexOf(";"));
+      logger.debug("New RequestURL: " + newURI);
+
+      request.getRequestDispatcher(newURI).forward(request, response);
+      return;
+    }
+    filterChain.doFilter(request, response);
+  }
+}

configuration-wizard/src/test/resources/application.properties

@@ -13,9 +13,10 @@ directory=${java.io.tmpdir}
 spring.thymeleaf.prefix=classpath:/views/
 spring.thymeleaf.cache=false
 # Static resources reloading during development
-spring.resources.static-locations=classpath:/resources/
+spring.web.resources.static-locations=classpath:/resources/
 hsm.type=PKCS11
 hsm.keys.delete=30
 hsm.keys.archive=false
 pkcs11.config=DATEIPFAD
 pkcs11.passwd=PASSWORD
+

databasemigration/pom.xml

@@ -14,7 +14,7 @@
     <parent>
         <artifactId>eumw</artifactId>
         <groupId>de.governikus.eumw</groupId>
-        <version>2.2.3</version>
+        <version>2.2.5</version>
     </parent>
     <artifactId>database-migration</artifactId>
 

distribution/pom.xml

@@ -15,11 +15,11 @@
     <parent>
         <groupId>de.governikus.eumw</groupId>
         <artifactId>eumw</artifactId>
-        <version>2.2.3</version>
+        <version>2.2.5</version>
     </parent>
 
     <artifactId>distribution</artifactId>
-    <version>2.2.3</version>
+    <version>2.2.5</version>
     <packaging>pom</packaging>
 
     <dependencies>

doc/Makefile

@@ -3,7 +3,7 @@
 
 # You can set these variables from the command line.
 SPHINXOPTS    =
-SPHINXBUILD   = python -msphinx
+SPHINXBUILD   = sphinx-build
 SPHINXPROJ    = EUMW
 SOURCEDIR     = source
 BUILDDIR      = _build

doc/source/chapter/Changelog.rst

@@ -141,3 +141,7 @@ Changelog
     - eIDAS Middleware: Change certificate chain building algorithm.
     - eIDAS Middleware: Update xmlsec.
     - eIDAS Middleware: Improve stability in trust anchor management.
+
+* 2.2.5
+
+    - eIDAS Middleware: Fix Log4j security issue.

doc/source/chapter/Configuration.rst

@@ -72,7 +72,7 @@ In case you are using your own environment, copy the JAR file to a folder of you
 
 You can start the application with the following command::
 
-    java -jar configuration-wizard-2.2.3.jar
+    java -jar configuration-wizard-2.2.5.jar
 
 In addition you can define the config folder with adding the parameter ``DconfigDirectory`` and its value to the
 command. This way the configuration wizard will be available at ``http://localhost:8080/config-wizard.``
@@ -102,7 +102,7 @@ to run the wizard again whenever you need it.
 To run the configuration wizard, execute the following command.
 It will mount the named volume in the container so that the configuration wizard can store the configuration in the volume. ::
 
-    docker run --rm -it -v eidas-configuration:/opt/eidas-middleware/configuration -p 8080:8080 --name eidas-configuration-wizard governikus/eidas-configuration-wizard:2.2.3
+    docker run --rm -it -v eidas-configuration:/opt/eidas-middleware/configuration -p 8080:8080 --name eidas-configuration-wizard governikus/eidas-configuration-wizard:2.2.5
 
 Running this command the configuration wizard will be available on http://localhost:8080/config-wizard.
 
@@ -116,7 +116,7 @@ with the alias ``localhost`` and the password ``123456`` for the keystore and th
 You can also use PKCS12 keystores,
 in this case you must change the value of ``SERVER_SSL_KEY_STORE_TYPE`` to ``PKCS12``. ::
 
-    docker run --rm -it -v eidas-configuration:/opt/eidas-middleware/configuration -v /home/user/keystore.jks:/opt/eidas-middleware/keystore.jks -p 443:8080 -e SERVER_SSL_KEY_STORE=file:/opt/eidas-middleware/keystore.jks -e SERVER_SSL_KEY_STORE_TYPE=JKS -e SERVER_SSL_KEY_STORE_PASSWORD=123456 -e SERVER_SSL_KEY_ALIAS=localhost -e SERVER_SSL_KEY_PASSWORD=123456 --name eidas-configuration-wizard governikus/eidas-configuration-wizard:2.2.3
+    docker run --rm -it -v eidas-configuration:/opt/eidas-middleware/configuration -v /home/user/keystore.jks:/opt/eidas-middleware/keystore.jks -p 443:8080 -e SERVER_SSL_KEY_STORE=file:/opt/eidas-middleware/keystore.jks -e SERVER_SSL_KEY_STORE_TYPE=JKS -e SERVER_SSL_KEY_STORE_PASSWORD=123456 -e SERVER_SSL_KEY_ALIAS=localhost -e SERVER_SSL_KEY_PASSWORD=123456 --name eidas-configuration-wizard governikus/eidas-configuration-wizard:2.2.5
 
 Because the application is now bound to the host in port 443,
 the configuration wizard is available at https://localhost/config-wizard.

doc/source/chapter/DemoApplication.rst

@@ -50,8 +50,8 @@ Using the eIDAS Demo Application
 To use the eIDAS Demo Application, start by running the eIDAS Demo Application.
 
 #. Change to the correct directory where the aforementioned configuration is present.
-#. If not present, copy the ``eidas-demo-2.2.3.jar`` file in this directory.
-#. Start the application by executing ``java -jar eidas-demo-2.2.3.jar``.
+#. If not present, copy the ``eidas-demo-2.2.5.jar`` file in this directory.
+#. Start the application by executing ``java -jar eidas-demo-2.2.5.jar``.
 
 Now you must configure your eIDAS Middleware to communicate with the eIDAS Demo Application.
 
@@ -93,7 +93,7 @@ Also bear in mind that you must use the path of the container file system in the
 
 To run the middleware, execute the following command after you have prepared the configuration, certificate and keystores::
 
-    docker run --rm -it -v /path/to/your/config-directory:/opt/eidas-middleware/config -p 8080:8080 governikus/eidas-demo-application:2.2.3
+    docker run --rm -it -v /path/to/your/config-directory:/opt/eidas-middleware/config -p 8080:8080 governikus/eidas-demo-application:2.2.5
 
 Now you can follow the steps above to configure and test the eIDAS Middleware.
 

doc/source/chapter/Operating.rst

@@ -106,14 +106,14 @@ To run the eIDAS Middleware, execute the following command.
 It will mount the named volumes containing the database and configuration in the container
 and the application will be available on port 8443. ::
 
-    docker run --rm -it -v eidas-configuration:/opt/eidas-middleware/configuration -v eidas-database:/opt/eidas-middleware/database -p 8443:8443 --name eidas-middleware-application governikus/eidas-middleware-application:2.2.3
+    docker run --rm -it -v eidas-configuration:/opt/eidas-middleware/configuration -v eidas-database:/opt/eidas-middleware/database -p 8443:8443 --name eidas-middleware-application governikus/eidas-middleware-application:2.2.5
 
 To stop and remove the container, just hit ``CTRL+C``.
 
 To keep the container running longer without being attached to the STDOUT and STDERR, change the command to
 the following::
 
-    docker run -d -v eidas-configuration:/opt/eidas-middleware/configuration -v eidas-database:/opt/eidas-middleware/database -p 8443:8443 --name eidas-middleware-application governikus/eidas-middleware-application:2.2.3
+    docker run -d -v eidas-configuration:/opt/eidas-middleware/configuration -v eidas-database:/opt/eidas-middleware/database -p 8443:8443 --name eidas-middleware-application governikus/eidas-middleware-application:2.2.5
 
 For more information on starting and stopping containers and viewing the logs,
 see the `Docker Docs <https://docs.docker.com/engine/reference/run/>`_.
@@ -177,7 +177,7 @@ Scalability
 The performance of the eIDAS Middleware improves by adding more memory (RAM) and using a faster CPU.
 In case the memory configuration has changed, the server needs to be restarted.
 To start the JVM with more memory, add ``-Xmx`` with the new maximum memory size to the start command,
-e.g. ``java -Xmx8g -jar eidas-middleware-2.2.3.jar`` for 8 GB.
+e.g. ``java -Xmx8g -jar eidas-middleware-2.2.5.jar`` for 8 GB.
 
 
 Request Signer Certificate
@@ -269,7 +269,7 @@ Optional property for ``TRAP`` is ``poseidas.snmp.managementport`` (port 162 is
 set).
 
 All existing SNMP GET values are explained in detail in the MIB located at
-``https://github.com/Governikus/eidas-middleware/blob/2.2.3/poseidas/snmp/EIDASMW-SNMP-MIB.mib``.
+``https://github.com/Governikus/eidas-middleware/blob/2.2.5/poseidas/snmp/EIDASMW-SNMP-MIB.mib``.
 
 Global GET
 ''''''''''
@@ -369,6 +369,6 @@ Stop the eIDAS Middleware Application and copy the database file to your backup
 e.g. ``cp /opt/eidas-middleware/database/eidasmw.mv.db /path/to/your/backup-location/eidasmw.mv.db``.
 
 To perform the migration, copy the database migration JAR file to the directory where your
-configuration file is available and execute the command ``java -jar database-migration-2.2.3.jar``.
+configuration file is available and execute the command ``java -jar database-migration-2.2.5.jar``.
 If there are errors in the log output, please send the complete log output and some information on your environment to
 [email protected].

doc/source/conf.py

@@ -55,9 +55,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.2.3'
+version = '2.2.5'
 # The full version, including alpha/beta/rc tags.
-release = '2.2.3'
+release = '2.2.5'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

dvca-connection-configurator/pom.xml

@@ -14,7 +14,7 @@
     <parent>
         <groupId>de.governikus.eumw</groupId>
         <artifactId>eumw</artifactId>
-        <version>2.2.3</version>
+        <version>2.2.5</version>
     </parent>
     <artifactId>dvca-connection-configurator</artifactId>
     <name>dvca-connection-configurator</name>

eidas-base-container/pom.xml

@@ -14,7 +14,7 @@
     <parent>
         <artifactId>eumw</artifactId>
         <groupId>de.governikus.eumw</groupId>
-        <version>2.2.3</version>
+        <version>2.2.5</version>
     </parent>
 
     <artifactId>eidas-base-container</artifactId>

eidas-common/pom.xml

@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>de.governikus.eumw</groupId>
 		<artifactId>eumw</artifactId>
-		<version>2.2.3</version>
+		<version>2.2.5</version>
 	</parent>
 	<artifactId>eidas-common</artifactId>
 

eidas-demo/pom.xml

@@ -14,7 +14,7 @@
     <parent>
         <groupId>de.governikus.eumw</groupId>
         <artifactId>eumw</artifactId>
-        <version>2.2.3</version>
+        <version>2.2.5</version>
     </parent>
     <artifactId>eidas-demo</artifactId>