R2.1.4

Author: Gematik-Entwicklung

ReleaseNotes.md

@@ -2,14 +2,21 @@
 
 # Release Notes popp-sample-code
 
-## Release 2.1.3
+## Release 2.1.4
 
 ### Known Issues
 - If your eGK has an older CVCA you may get problems while testing with the RÍSE PoPP-Service
 - Standard-Kartenleser with Docker is not supported in this release, we will fix this in an upcoming release
 
+### changed
+
+- Introduce static key id for signing PoPP token and JWKS endpoint
+
+
+## Release 2.1.3
+
 ## added
-- Our PoPP-Service now has a JWSK endpoint
+- Our PoPP-Service now has a JWKS endpoint
 
 ## changed
 - We changed how to start our PoPP-Client and PoPP-Service, please look at the README if you have questions
@@ -69,4 +76,4 @@
 
 ### fixed 
 
-- TLS connection to Konnektor with ECC is working
+- TLS connection to Konnektor with ECC is working

pom.xml

@@ -3,11 +3,11 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>4.0.4</version>
+    <version>4.0.5</version>
   </parent>
   <groupId>de.gematik.refpopp</groupId>
   <artifactId>popp-example-impl-global</artifactId>
-  <version>2.1.3</version>
+  <version>2.1.4</version>
   <packaging>pom</packaging>
   <name>popp-sample-code</name>
   <description>PoPP - example implementation</description>

popp-client/pom.xml

@@ -7,12 +7,12 @@
   <parent>
     <groupId>de.gematik.refpopp</groupId>
     <artifactId>popp-example-impl-global</artifactId>
-    <version>2.1.3</version>
+    <version>2.1.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>popp-client</artifactId>
-  <version>2.1.3</version>
+  <version>2.1.4</version>
   <packaging>jar</packaging>
 
   <name>popp-client</name>

popp-commons/pom.xml

@@ -7,12 +7,12 @@
   <parent>
     <groupId>de.gematik.refpopp</groupId>
     <artifactId>popp-example-impl-global</artifactId>
-    <version>2.1.3</version>
+    <version>2.1.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>popp-commons</artifactId>
-  <version>2.1.3</version>
+  <version>2.1.4</version>
   <name>popp-commons</name>
   <description>popp-commons</description>
 

popp-coverage-report/pom.xml

@@ -7,7 +7,7 @@
   <parent>
     <groupId>de.gematik.refpopp</groupId>
     <artifactId>popp-example-impl-global</artifactId>
-    <version>2.1.3</version>
+    <version>2.1.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

popp-server/pom.xml

@@ -7,12 +7,12 @@
   <parent>
     <groupId>de.gematik.refpopp</groupId>
     <artifactId>popp-example-impl-global</artifactId>
-    <version>2.1.3</version>
+    <version>2.1.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>popp-server</artifactId>
-  <version>2.1.3</version>
+  <version>2.1.4</version>
   <packaging>jar</packaging>
 
   <name>popp-server</name>

popp-server/src/main/java/de/gematik/refpopp/popp_server/configuration/JwksConfiguration.java

@@ -51,7 +51,7 @@ public JsonWebKeySet jwkSource(@Qualifier("poppKeyStore") KeyStore keystore) {
       final PublicKey publicKey = keystore.getCertificate(firstAlias).getPublicKey();
       log.info("Public key: {}", publicKey);
       final JsonWebKey jsonWebKey = JsonWebKey.Factory.newJwk(publicKey);
-      jsonWebKey.setKeyId(firstAlias);
+      jsonWebKey.setKeyId("staticPublicKeyId");
       return new JsonWebKeySet(jsonWebKey);
     } catch (final GeneralSecurityException | JoseException e) {
       throw new IllegalStateException("Failed to initialize keystore", e);

popp-server/src/main/java/de/gematik/refpopp/popp_server/scenario/common/token/TokenHeader.java

@@ -95,7 +95,7 @@ private Map<String, Object> createHeadersForConnectorToken(
   private Map<String, Object> createHeadersForPoppToken(final ECPublicKey publicKey) {
     final var headers = new HashMap<String, Object>();
     headers.put(Header.TYP.value, poppTokenType);
-    headers.put(Header.KID.value, getKeyId(publicKey));
+    headers.put(Header.KID.value, "staticPublicKeyId");
 
     return headers;
   }

popp-server/src/main/resources/application-dev.yaml

@@ -47,13 +47,13 @@ void setUp() {
     this.jsonWebKeySet = jwkConfiguration.jwkSource(keystore);
     assertThat(this.jsonWebKeySet.getJsonWebKeys()).hasSize(1);
     assertThat(this.jsonWebKeySet.getJsonWebKeys().getFirst().getKeyId())
-        .isEqualTo("popp-token-server-nist-komp61");
+        .isEqualTo("staticPublicKeyId");
   }
 
   @Test
   void thatAValidJwkSetIsReturned() {
     final JwksController controller = new JwksController(this.jsonWebKeySet);
     final String jwks = controller.jwks();
-    assertThat(jwks).contains("popp-token-server-nist-komp61");
+    assertThat(jwks).contains("staticPublicKeyId");
   }
 }