R2.1.5

Author: Gematik-Entwicklung

ReleaseNotes.md

@@ -2,16 +2,22 @@
 
 # Release Notes popp-sample-code
 
-## Release 2.1.4
+## Release 2.1.5
 
 ### 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
+- Updated ZETA version to 0.4.2
+- Removed static key id for signing PoPP token and JWKS endpoint, instead we calculate the correct key id now
+
+## Release 2.1.4
 
+### changed
+
+- Introduce static key id for signing PoPP token and JWKS endpoint
 
 ## Release 2.1.3
 

pom.xml

@@ -7,7 +7,7 @@
   </parent>
   <groupId>de.gematik.refpopp</groupId>
   <artifactId>popp-example-impl-global</artifactId>
-  <version>2.1.4</version>
+  <version>2.1.5</version>
   <packaging>pom</packaging>
   <name>popp-sample-code</name>
   <description>PoPP - example implementation</description>
@@ -91,7 +91,7 @@
     <version.spotless-maven-plugin>3.4.0</version.spotless-maven-plugin>
     <version.spotless.google-java-format>1.27.0</version.spotless.google-java-format>
     <version.spring-boot-maven-plugin>3.3.2</version.spring-boot-maven-plugin>
-    <version.zeta-sdk-jvm>0.2.12</version.zeta-sdk-jvm>
+    <version.zeta-sdk-jvm>0.4.2</version.zeta-sdk-jvm>
     <jackson-2-bom.version>2.21.1</jackson-2-bom.version>
     <jackson-bom.version>3.1.0</jackson-bom.version>
     <mockito.agent.jar>${settings.localRepository}/org/mockito/mockito-core/${mockito.version}/mockito-core-${mockito.version}.jar</mockito.agent.jar>

popp-client/pom.xml

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

popp-client/src/main/java/de/gematik/refpopp/popp_client/client/SecureWebSocketClient.java

@@ -31,7 +31,7 @@
 import de.gematik.zeta.sdk.WsClientExtension;
 import de.gematik.zeta.sdk.ZetaSdk;
 import de.gematik.zeta.sdk.ZetaSdkClient;
-import de.gematik.zeta.sdk.attestation.model.ClientSelfAssessment;
+import de.gematik.zeta.sdk.attestation.model.AttestationConfig;
 import de.gematik.zeta.sdk.attestation.model.PlatformProductId;
 import de.gematik.zeta.sdk.authentication.AuthConfig;
 import de.gematik.zeta.sdk.authentication.SubjectTokenProvider;
@@ -46,8 +46,11 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
 import kotlin.Unit;
 import lombok.extern.slf4j.Slf4j;
 import org.java_websocket.handshake.ServerHandshake;
@@ -68,9 +71,11 @@ public class SecureWebSocketClient {
   private final boolean disableServerValidation;
   private final URI serverUri;
   private final ZetaSdkClient zetaSdk;
-  private ExecutorService pool;
-  private WsClientExtension.WsSession session;
+  private final ExecutorService pool;
+  private final CountDownLatch sessionReady = new CountDownLatch(1);
+  private final AtomicReference<WsClientExtension.WsSession> session = new AtomicReference<>();
   private final Map<String, Object> sessionMetadata;
+  private final WsClientWrapper wsClientWrapper;
 
   @Autowired
   public SecureWebSocketClient(
@@ -79,7 +84,8 @@ public SecureWebSocketClient(
       @Value("${zeta.authentication.smb.keyfile}") final String keyfile,
       @Value("${zeta.authentication.smb.alias}") final String alias,
       @Value("${zeta.authentication.smb.password}") final String password,
-      @Value("${zeta.client.disableServerValidation}") final boolean disableServerValidation) {
+      @Value("${zeta.client.disableServerValidation}") final boolean disableServerValidation,
+      final WsClientWrapper wsClientWrapper) {
     this.serverUri = serverUri;
     this.eventPublisher = eventPublisher;
     this.pool = Executors.newFixedThreadPool(1);
@@ -88,6 +94,7 @@ public SecureWebSocketClient(
     this.alias = alias;
     this.password = password;
     this.disableServerValidation = disableServerValidation;
+    this.wsClientWrapper = wsClientWrapper;
     this.zetaSdk =
         ZetaSdk.INSTANCE.build(
             serverUri.toString(),
@@ -98,15 +105,9 @@ public SecureWebSocketClient(
                 new StorageConfig(
                     new InMemoryStorage(), "7aae7xXr8rnzVqjpYbosS0CFMrlprkD7jbVotm0fd+w="),
                 new TpmConfig() {},
-                new AuthConfig(List.of("popp"), 30, true, getTokenProvider()),
-                new ClientSelfAssessment(
-                    "name",
-                    "clientId",
-                    "manufacturerId",
-                    "manufacturerName",
-                    "test@example.com",
-                    0,
-                    new PlatformProductId.AppleProductId("apple", "macos", List.of("bundleX"))),
+                new AuthConfig(
+                    List.of("popp"), 30L, true, getTokenProvider(), AttestationConfig.software()),
+                new PlatformProductId.AppleProductId("apple", "macos", List.of("bundleX")),
                 new ZetaHttpClientBuilder("")
                     .disableServerValidation(disableServerValidation)
                     .logging(LogLevel.ALL, message -> log.info("Ktor HttpClient: {}", message)),
@@ -118,8 +119,9 @@ private SubjectTokenProvider getTokenProvider() {
     if (!Files.isReadable(keyfile)) {
       throw new IllegalStateException("Can't read private key: " + keyfile);
     }
+
     return new SmbTokenProvider(
-        new SmbTokenProvider.Credentials(keyfile.toString(), alias, password));
+        new SmbTokenProvider.Credentials(keyfile.toString(), alias, password, ""));
   }
 
   @PostConstruct
@@ -156,59 +158,56 @@ public void onError(final Exception ex) {
   }
 
   public boolean isClosed() {
-    return session == null;
+    return session.get() == null;
   }
 
   public boolean isOpen() {
-    return session != null;
+    return session.get() != null;
   }
 
   public void connectBlocking() {
-    // Start new thread
-
     pool.submit(
-        () -> {
-          WsClientExtension.ws(
-              zetaSdk,
-              this.serverUri.toString(),
-              builder -> {
-                builder.disableServerValidation(true);
-                return Unit.INSTANCE;
-              },
-              new HashMap<>(),
-              session -> {
-                this.session = session;
-                log.info("Zeta SDK WS connected");
-
-                while (true) {
-                  WsClientExtension.WsMessage incoming = session.receiveNext();
-                  if (incoming == null || incoming instanceof WsClientExtension.WsMessage.Close) {
-                    log.debug("WebSocket closed.");
-                    break;
+        () ->
+            wsClientWrapper.ws(
+                zetaSdk,
+                this.serverUri.toString(),
+                builder -> {
+                  builder.disableServerValidation(true);
+                  return Unit.INSTANCE;
+                },
+                new HashMap<>(),
+                session -> {
+                  this.session.set(session);
+                  log.info("Zeta SDK WS connected");
+                  sessionReady.countDown();
+
+                  while (true) {
+                    WsClientExtension.WsMessage incoming = session.receiveNext();
+                    if (incoming == null || incoming instanceof WsClientExtension.WsMessage.Close) {
+                      log.debug("WebSocket closed.");
+                      break;
+                    }
+                    if (incoming instanceof WsClientExtension.WsMessage.Text text) {
+                      log.debug("WebSocket received: {}", text.getText());
+                      onMessage(text.getText());
+                    } else if (incoming instanceof WsClientExtension.WsMessage.Binary bin) {
+                      log.debug("WebSocket received binary (bytes): {}", bin.getBytes().length);
+                    }
                   }
-                  if (incoming instanceof WsClientExtension.WsMessage.Text text) {
-                    log.debug("WebSocket received: " + text.getText());
-                    onMessage(text.getText());
-                  } else if (incoming instanceof WsClientExtension.WsMessage.Binary bin) {
-                    log.debug("WebSocket received binary (bytes): " + bin.getBytes().length);
-                  }
-                }
-              });
-        });
-
-    // TODO: instead of busy waiting, use semaphor for inter-thread communication or smth similar
-    while (true) {
-      if (this.session != null) break;
-      try {
-        Thread.sleep(1000);
-      } catch (InterruptedException e) {
-        throw new RuntimeException(e);
+                }));
+
+    try {
+      if (!sessionReady.await(10, TimeUnit.SECONDS)) {
+        throw new RuntimeException("Connection timeout");
       }
+    } catch (InterruptedException e) {
+      Thread.currentThread().interrupt();
+      throw new RuntimeException(e);
     }
   }
 
   public void send(String messageAsString) {
-    this.session.sendText(messageAsString);
+    this.session.get().sendText(messageAsString);
   }
 
   public Map<String, Object> getSSLSession() {

popp-client/src/main/java/de/gematik/refpopp/popp_client/client/WsClientWrapper.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright (Date see Readme), gematik GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * *******
+ *
+ * For additional notes and disclaimer from gematik and in case of changes by gematik find details in the "Readme" file.
+ */
+
+package de.gematik.refpopp.popp_client.client;
+
+import de.gematik.zeta.sdk.WsClientExtension;
+import de.gematik.zeta.sdk.ZetaSdkClient;
+import de.gematik.zeta.sdk.network.http.client.ZetaHttpClientBuilder;
+import java.util.Map;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+import org.springframework.stereotype.Component;
+
+@Component
+public class WsClientWrapper {
+
+  void ws(
+      ZetaSdkClient zetaSdk,
+      String targetUrl,
+      Function1<ZetaHttpClientBuilder, Unit> builder,
+      Map<String, String> customHeaders,
+      WsClientExtension.WsSession.WsHandler handler) {
+    WsClientExtension.ws(zetaSdk, targetUrl, builder, customHeaders, handler);
+  }
+}