Release eumw-1.2.9

Governikus · May 16, 2022 · f0e0d25 · f0e0d25
1 parent 5be422f
commit f0e0d25
Show file tree

Hide file tree

Showing 25 changed files with 57 additions and 40 deletions.
diff --git a/.hgtags b/.hgtags
@@ -40,3 +40,5 @@ c32fa044d6546fbcff28c1ab2591d0268fcd8f83 eumw-1.2.5-RC4
 093ee8cbd455748b198c964bbb0e6d7c4097b93c eumw-1.2.5
 7fede4cd9eee0795c892fac8e6fce78a2b12c0a6 eumw-1.2.6
 8cfe5f501056bdde4b8ffe028b69600274632815 eumw-1.2.7
+d4f0cafd746f40445e0cf2f3a1ee005b197e63c1 eumw-1.2.8
+0a959c0df52e7a4ee4999bd1fb6b254ce2bea4bc eumw-1.2.9-RC1
diff --git a/configuration-checker/pom.xml b/configuration-checker/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <artifactId>eumw</artifactId>
         <groupId>de.governikus.eumw</groupId>
-        <version>1.2.8</version>
+        <version>1.2.9</version>
     </parent>
 
     <artifactId>configuration-checker</artifactId>

diff --git a/configuration-wizard/pom.xml b/configuration-wizard/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>de.governikus.eumw</groupId>
         <artifactId>eumw</artifactId>
-        <version>1.2.8</version>
+        <version>1.2.9</version>
     </parent>
     <artifactId>configuration-wizard</artifactId>
 

diff --git a/databasemigration/pom.xml b/databasemigration/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<artifactId>eumw</artifactId>
 		<groupId>de.governikus.eumw</groupId>
-		<version>1.2.8</version>
+		<version>1.2.9</version>
 	</parent>
 	<artifactId>database-migration</artifactId>
 

diff --git a/doc/source/chapter/Changelog.rst b/doc/source/chapter/Changelog.rst
@@ -104,3 +104,7 @@ Changelog
 * 1.2.8
 
     - eIDAS Middleware: Update log4j to version 2.17.1.
+
+* 1.2.9
+
+    - eIDAS Middleware: Security Patch.
diff --git a/doc/source/chapter/Configuration.rst b/doc/source/chapter/Configuration.rst
@@ -56,7 +56,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-1.2.8.jar
+    java -jar configuration-wizard-1.2.9.jar
 
 This way the configuration wizard will be available at ``http://localhost:8080/config-wizard.``
 
@@ -81,7 +81,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:1.2.8
+    docker run --rm -it -v eidas-configuration:/opt/eidas-middleware/configuration -p 8080:8080 --name eidas-configuration-wizard governikus/eidas-configuration-wizard:1.2.9
 
 Running this command the configuration wizard will be available on http://localhost:8080/config-wizard.
 
@@ -95,7 +95,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:1.2.8
+    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:1.2.9
 
 Because the application is now bound to the host in port 443,
 the configuration wizard is available at https://localhost/config-wizard.

diff --git a/doc/source/chapter/DemoApplication.rst b/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-1.2.8.jar`` file in this directory.
-#. Start the application by executing ``java -jar eidas-demo-1.2.8.jar``.
+#. If not present, copy the ``eidas-demo-1.2.9.jar`` file in this directory.
+#. Start the application by executing ``java -jar eidas-demo-1.2.9.jar``.
 
 Now you must configure your eIDAS Middleware to communicate with the eIDAS Demo Application.
 
@@ -88,7 +88,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:1.2.8
+    docker run --rm -it -v /path/to/your/config-directory:/opt/eidas-middleware/config -p 8080:8080 governikus/eidas-demo-application:1.2.9
 
 Now you can follow the steps above to configure and test the eIDAS Middleware.
 

diff --git a/doc/source/chapter/Operating.rst b/doc/source/chapter/Operating.rst
@@ -86,13 +86,13 @@ 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:1.2.8
+    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:1.2.9
 
 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:1.2.8
+    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:1.2.9
 
 For more information on starting and stopping containers and viewing the logs,
 see the `Docker Docs <https://docs.docker.com/engine/reference/run/>`_.
@@ -137,7 +137,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-1.2.8.jar`` for 8 GB.
+e.g. ``java -Xmx8g -jar eidas-middleware-1.2.9.jar`` for 8 GB.
 
 
 Monitoring
@@ -192,5 +192,5 @@ Before running the migration tool, please create a backup of your database.
 Stop the eIDAS Middleware Application and copy the database file to your backup location, 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-1.2.8.jar``.
+configuration file is available and execute the command ``java -jar database-migration-1.2.9.jar``.
 If there are errors in the log output, please send the complete log output and some information on your environment to [email protected].
diff --git a/doc/source/chapter/Requirements.rst b/doc/source/chapter/Requirements.rst
@@ -10,7 +10,7 @@ Software Requirements
 
 The eIDAS Middleware is a Spring Boot Application. This means that you can start the application with a JRE,
 there is no need for an application server. We support the latest available Zulu JDK in Version 8,
-at the time of this release this is 8u222.
+at the time of this release this is 8u331.
 
 For the operating system we support Debian 9.
 

diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -55,9 +55,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.2.8'
+version = '1.2.9'
 # The full version, including alpha/beta/rc tags.
-release = '1.2.8'
+release = '1.2.9'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/dvca-connection-configurator/pom.xml b/dvca-connection-configurator/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>de.governikus.eumw</groupId>
         <artifactId>eumw</artifactId>
-        <version>1.2.8</version>
+        <version>1.2.9</version>
     </parent>
     <artifactId>dvca-connection-configurator</artifactId>
     <name>dvca-connection-configurator</name>

diff --git a/eidas-base-container/pom.xml b/eidas-base-container/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <artifactId>eumw</artifactId>
         <groupId>de.governikus.eumw</groupId>
-        <version>1.2.8</version>
+        <version>1.2.9</version>
     </parent>
 
     <artifactId>eidas-base-container</artifactId>

diff --git a/eidas-base-container/src/main/docker/Dockerfile b/eidas-base-container/src/main/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM governikus/zulu-openjdk:8u212
+FROM azul/zulu-openjdk-alpine:8u332
 
 MAINTAINER Benny Prange <[email protected]>
 

diff --git a/eidas-common/pom.xml b/eidas-common/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>de.governikus.eumw</groupId>
 		<artifactId>eumw</artifactId>
-		<version>1.2.8</version>
+		<version>1.2.9</version>
 	</parent>
 	<artifactId>eidas-common</artifactId>
 

diff --git a/eidas-demo/pom.xml b/eidas-demo/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>de.governikus.eumw</groupId>
         <artifactId>eumw</artifactId>
-        <version>1.2.8</version>
+        <version>1.2.9</version>
     </parent>
     <artifactId>eidas-demo</artifactId>
 

diff --git a/eidas-middleware/pom.xml b/eidas-middleware/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>de.governikus.eumw</groupId>
         <artifactId>eumw</artifactId>
-        <version>1.2.8</version>
+        <version>1.2.9</version>
     </parent>
     <artifactId>eidas-middleware</artifactId>
 

diff --git a/...eware/src/main/java/de/governikus/eumw/eidasmiddleware/controller/AusweisappRedirect.java b/...eware/src/main/java/de/governikus/eumw/eidasmiddleware/controller/AusweisappRedirect.java
@@ -48,7 +48,7 @@ public ModelAndView redirect(@RequestHeader("User-Agent") String userAgentHeader
     {
       stringBuilder.append("en/");
     }
-    stringBuilder.append("download/windows-und-mac/");
+    stringBuilder.append("download");
     return new ModelAndView("redirect:" + stringBuilder.toString());
   }
 }
diff --git a/eidas-middleware/src/main/resources/i18n/messages_de.properties b/eidas-middleware/src/main/resources/i18n/messages_de.properties
@@ -21,7 +21,7 @@ content.requirements.device.hint=Eine Übersicht geeigneter Kartenlesegeräte od
 content.requirements.app=3. Die AusweisApp2
 content.requirements.app.hint=Um den Vorgang fortzusetzen, muss die AusweisApp2 gestartet sein<br /> Diese können Sie kostenlos hier herunterladen: <br> <a href="/eidas-middleware/ausweisapp-redirect?lang=de" title="Zum Download der AusweisApp2"><b>Zur Downloadseite</b></a>
 content.help=<p class="font-weight-bold">&#9432;  Woran erkenne ich, ob die Online-Ausweisfunktion freigeschaltet ist?</p> <br>Die AusweisApp2 teilt Ihnen mit, wenn dies bei Ihnen nicht der Fall sein sollte. Sie können die Online-Ausweisfunktion bei Ihrer für die Ausgabe Ihres Ausweisdokumentes zuständigen Behörde freischalten lassen. </br></br>
-content.help.link=Nähere Informationen zum Start der AusweisApp2 finden Sie <a href="https://www.ausweisapp.bund.de/fragen-und-antworten/online-hilfe/" target="_blank" title="Link führt zur Online-Hilfe der AusweisApp2"><b>in der Online-Hilfe.</b></a>
+content.help.link=Nähere Informationen zum Start der AusweisApp2 finden Sie <a href="https://www.ausweisapp.bund.de/online-hilfe/" target="_blank" title="Link führt zur Online-Hilfe der AusweisApp2"><b>in der Online-Hilfe.</b></a>
 content.start=Verstanden, jetzt online ausweisen &#8594;
 # error
 error.title=Es ist ein Fehler aufgetreten

diff --git a/eidas-middleware/src/main/resources/i18n/messages_en.properties b/eidas-middleware/src/main/resources/i18n/messages_en.properties
@@ -21,7 +21,7 @@ content.requirements.device.hint=An overview of suitable card readers or mobile
 content.requirements.app=3. The AusweisApp2
 content.requirements.app.hint=To continue the identification process the AusweisApp2 must be running<br />The App can be downloaded for free here: <br> <a href="/eidas-middleware/ausweisapp-redirect?lang=en" title="Redirect to download page"><b>To download page</b></a>
 content.help=<p class="font-weight-bold">&#9432; How can I tell if the online ID function is activated?</p> <br>The AusweisApp2 will inform you if this is not the case. You can have the online ID function enabled by the authority responsible for issuing your ID document.</br></br>
-content.help.link=Find further information on starting of AusweisApp2 <a href="https://www.ausweisapp.bund.de/en/qa/online-help/" target="_blank" title="Link leads to the help pages of AusweisApp2"><b>on the help pages.</b></a>
+content.help.link=Find further information on starting of AusweisApp2 <a href="https://www.ausweisapp.bund.de/en/online-help/" target="_blank" title="Link leads to the help pages of AusweisApp2"><b>on the help pages.</b></a>
 content.start=Understood, identify online now &#8594;
 # error
 error.title=An error occurred

diff --git a/eidas-starterkit/pom.xml b/eidas-starterkit/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>de.governikus.eumw</groupId>
 		<artifactId>eumw</artifactId>
-		<version>1.2.8</version>
+		<version>1.2.9</version>
 	</parent>
 	<artifactId>eidas-starterkit</artifactId>
 

diff --git a/password-generator/pom.xml b/password-generator/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>de.governikus.eumw</groupId>
         <artifactId>eumw</artifactId>
-        <version>1.2.8</version>
+        <version>1.2.9</version>
     </parent>
     <artifactId>password-generator</artifactId>
 

diff --git a/pom.xml b/pom.xml
@@ -14,7 +14,7 @@
 
     <groupId>de.governikus.eumw</groupId>
     <artifactId>eumw</artifactId>
-    <version>1.2.8</version>
+    <version>1.2.9</version>
     <packaging>pom</packaging>
 
     <name>EU Middleware</name>
@@ -37,7 +37,7 @@
     <scm>
         <url>https://github.com/Governikus/${project.artifactId}</url>
         <connection>${governikus.scm.connection}</connection>
-      <tag>eumw-1.2.8</tag>
+        <tag>eumw-1.2.9</tag>
   </scm>
 
     <developers>
@@ -118,11 +118,11 @@
         <version.javasupport>7.3.0</version.javasupport>
         <version.opensaml>3.3.1-GOV6</version.opensaml>
         <version.cryptacular>1.1.4</version.cryptacular>
-        <version.xmlsec>2.3.0</version.xmlsec>
+        <version.xmlsec>2.3.1</version.xmlsec>
 
-        <version.cxf>3.4.5</version.cxf>
-        <version.spring>5.3.15</version.spring>
-        <version.springboot>2.6.3</version.springboot>
+        <version.cxf>3.4.7</version.cxf>
+        <version.spring>5.3.20</version.spring>
+        <version.springboot>2.6.7</version.springboot>
         <version.thymeleaf>3.0.15.RELEASE</version.thymeleaf>
         <version.thymeleaf-layout-dialect>2.4.1</version.thymeleaf-layout-dialect>
 
@@ -136,17 +136,17 @@
         <version.guava>31.0.1-jre</version.guava>
         <version.h2>1.4.199</version.h2>
         <version.istack-commons-runtime>3.0.12</version.istack-commons-runtime>
-        <version.jackson>2.13.1</version.jackson>
+        <version.jackson>2.13.2</version.jackson>
         <version.jaxb2-basics>1.11.1</version.jaxb2-basics>
         <version.jsr305>3.0.2</version.jsr305>
         <version.snmp4j>2.6.3</version.snmp4j>
 
         <!-- IDE helper -->
-        <version.lombok>1.18.22</version.lombok>
+        <version.lombok>1.18.24</version.lombok>
 
         <!-- logging dependencies -->
-        <version.log4j2>2.17.1</version.log4j2>
-        <version.slf4j>1.7.35</version.slf4j>
+        <version.log4j2>2.17.2</version.log4j2>
+        <version.slf4j>1.7.36</version.slf4j>
 
         <!-- test dependencies -->
         <version.htmlunit>2.31</version.htmlunit>
@@ -463,6 +463,17 @@
                 <scope>import</scope>
             </dependency>
 
+            <!-- Import spring-framework-bom to manage newer spring version. Could be removed when a version of
+            spring-boot is released with the same spring-framework version. This dependency must be declared before
+             spring-boot-dependencies-->
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-framework-bom</artifactId>
+                <version>${version.spring}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
             <dependency>
                 <!-- Import dependency management from Spring Boot -->
                 <groupId>org.springframework.boot</groupId>

diff --git a/poseidas-configuration/pom.xml b/poseidas-configuration/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <artifactId>eumw</artifactId>
         <groupId>de.governikus.eumw</groupId>
-        <version>1.2.8</version>
+        <version>1.2.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/poseidas/pom.xml b/poseidas/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>de.governikus.eumw</groupId>
         <artifactId>eumw</artifactId>
-        <version>1.2.8</version>
+        <version>1.2.9</version>
     </parent>
     <artifactId>poseidas</artifactId>
 

diff --git a/utils/pom.xml b/utils/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>de.governikus.eumw</groupId>
         <artifactId>eumw</artifactId>
-        <version>1.2.8</version>
+        <version>1.2.9</version>
     </parent>
     <artifactId>utils</artifactId>
-Original file line number
+Diff line change
@@ Expand Up / @@ -104,3 +104,7 @@ Changelog @@
     * 1.2.8
         - eIDAS Middleware: Update log4j to version 2.17.1.
+    * 1.2.9
+        - eIDAS Middleware: Security Patch.