v28.0.2

gematik · Jun 26, 2024 · 77e6a41 · 77e6a41
1 parent 902c2d2
commit 77e6a41
Show file tree

Hide file tree

Showing 35 changed files with 1,279 additions and 1,329 deletions.
diff --git a/README.md b/README.md
@@ -52,7 +52,7 @@ or use docker compose:
 
 ```console
 $ mvn clean install -pl idp-server -am -Dskip.unittests -Dskip.inttests
-$ export appVersion=28.0.1
+$ export appVersion=28.0.2
 $ export serverLoglevel=info (default)
 $ docker-compose --project-name myidp -f docker-compose-ref.yml up -d
 ```

diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -1,3 +1,7 @@
+# Release 28.0.2
+
+- update dependencies (unirest-java -> unirest-java-core)
+
 # Release 28.0.1
 
 - remove parent pom from testsuite to avoid dependency conflicts

diff --git a/doc/tokenFlowEgk.html b/doc/tokenFlowEgk.html
diff --git a/doc/tokenFlowPs.html b/doc/tokenFlowPs.html
diff --git a/doc/tokenFlowSso.html b/doc/tokenFlowSso.html
diff --git a/idp-client/pom.xml b/idp-client/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>de.gematik.idp</groupId>
     <artifactId>idp-global</artifactId>
-    <version>28.0.1</version>
+    <version>28.0.2</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>de.gematik.idp</groupId>
   <artifactId>idp-client</artifactId>
 
-  <version>28.0.1</version>
+  <version>28.0.2</version>
   <packaging>jar</packaging>
 
   <dependencies>
@@ -55,7 +55,7 @@
 
     <dependency>
       <groupId>com.konghq</groupId>
-      <artifactId>unirest-java</artifactId>
+      <artifactId>unirest-java-core</artifactId>
     </dependency>
     <dependency>
       <groupId>com.konghq</groupId>
@@ -73,6 +73,11 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpcore</artifactId>
+      <version>4.4.16</version>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/idp-client/src/main/java/de/gematik/idp/client/AuthenticatorClient.java b/idp-client/src/main/java/de/gematik/idp/client/AuthenticatorClient.java
@@ -66,16 +66,16 @@
 import java.util.stream.Collectors;
 import javax.crypto.SecretKey;
 import javax.crypto.spec.SecretKeySpec;
-import kong.unirest.BodyPart;
-import kong.unirest.GetRequest;
-import kong.unirest.Header;
-import kong.unirest.HttpRequest;
-import kong.unirest.HttpResponse;
-import kong.unirest.JsonNode;
-import kong.unirest.MultipartBody;
-import kong.unirest.Unirest;
+import kong.unirest.core.BodyPart;
+import kong.unirest.core.GetRequest;
+import kong.unirest.core.Header;
+import kong.unirest.core.HttpRequest;
+import kong.unirest.core.HttpResponse;
+import kong.unirest.core.JsonNode;
+import kong.unirest.core.MultipartBody;
+import kong.unirest.core.Unirest;
+import kong.unirest.core.json.JSONObject;
 import kong.unirest.jackson.JacksonObjectMapper;
-import kong.unirest.json.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.jose4j.jwt.JwtClaims;
 import org.springframework.http.MediaType;

diff --git a/idp-client/src/main/java/de/gematik/idp/client/BiometrieClient.java b/idp-client/src/main/java/de/gematik/idp/client/BiometrieClient.java
@@ -30,9 +30,9 @@
 import java.security.KeyPair;
 import java.util.Base64;
 import java.util.List;
-import kong.unirest.GenericType;
-import kong.unirest.HttpResponse;
-import kong.unirest.Unirest;
+import kong.unirest.core.GenericType;
+import kong.unirest.core.HttpResponse;
+import kong.unirest.core.Unirest;
 import lombok.Builder;
 import lombok.Data;
 import lombok.SneakyThrows;

diff --git a/idp-client/src/main/java/de/gematik/idp/client/IdpClient.java b/idp-client/src/main/java/de/gematik/idp/client/IdpClient.java
@@ -58,10 +58,10 @@
 import java.util.Set;
 import java.util.function.Consumer;
 import java.util.function.UnaryOperator;
-import kong.unirest.GetRequest;
-import kong.unirest.HttpResponse;
-import kong.unirest.JsonNode;
-import kong.unirest.MultipartBody;
+import kong.unirest.core.GetRequest;
+import kong.unirest.core.HttpResponse;
+import kong.unirest.core.JsonNode;
+import kong.unirest.core.MultipartBody;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

diff --git a/idp-commons/pom.xml b/idp-commons/pom.xml
@@ -6,12 +6,12 @@
   <parent>
     <groupId>de.gematik.idp</groupId>
     <artifactId>idp-global</artifactId>
-    <version>28.0.1</version>
+    <version>28.0.2</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>idp-commons</artifactId>
 
-  <version>28.0.1</version>
+  <version>28.0.2</version>
 
   <dependencies>
 
@@ -38,7 +38,7 @@
 
     <dependency>
       <groupId>com.konghq</groupId>
-      <artifactId>unirest-java</artifactId>
+      <artifactId>unirest-java-core</artifactId>
     </dependency>
 
     <dependency>
@@ -74,6 +74,15 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <version>1.17.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.konghq</groupId>
+      <artifactId>unirest-objectmapper-jackson</artifactId>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/idp-commons/src/main/java/de/gematik/idp/token/TokenClaimExtraction.java b/idp-commons/src/main/java/de/gematik/idp/token/TokenClaimExtraction.java
@@ -23,7 +23,7 @@
 import java.time.ZonedDateTime;
 import java.util.Map;
 import java.util.Objects;
-import kong.unirest.json.JSONObject;
+import kong.unirest.core.json.JSONObject;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import org.jose4j.json.JsonUtil;

diff --git a/...mons/src/test/java/de/gematik/idp/authentication/AuthenticationChallengeVerifierTest.java b/...mons/src/test/java/de/gematik/idp/authentication/AuthenticationChallengeVerifierTest.java
@@ -73,8 +73,7 @@ class AuthenticationChallengeVerifierTest {
 
   @BeforeEach
   public void init(
-      @PkiKeyResolver.Filename("idp_sig.p12")
-          final PkiIdentity serverIdentity,
+      @PkiKeyResolver.Filename("idp_sig.p12") final PkiIdentity serverIdentity,
       @PkiKeyResolver.Filename("109500969_X114428530-2_c.ch.aut-ecc.p12")
           final PkiIdentity clientIdentity,
       @PkiKeyResolver.Filename("833621999741600-2_c.hci.aut-apo-rsa.p12")

diff --git a/idp-commons/src/test/java/de/gematik/idp/data/FederationPubKeyTest.java b/idp-commons/src/test/java/de/gematik/idp/data/FederationPubKeyTest.java
@@ -44,8 +44,7 @@ void buildJwkWithX5c() {
     final X509Certificate certificate =
         CryptoLoader.getCertificateFromPem(
             FileUtils.readFileToByteArray(
-                ResourceReader.getFileFromResourceAsTmpFile(
-                    "idp_sig.pem")));
+                ResourceReader.getFileFromResourceAsTmpFile("idp_sig.pem")));
     final FederationPubKey federationPubKey = new FederationPubKey();
     federationPubKey.setCertificate(Optional.of(certificate));
 

diff --git a/idp-crypto/pom.xml b/idp-crypto/pom.xml
@@ -6,12 +6,12 @@
   <parent>
     <groupId>de.gematik.idp</groupId>
     <artifactId>idp-global</artifactId>
-    <version>28.0.1</version>
+    <version>28.0.2</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>idp-crypto</artifactId>
-  <version>28.0.1</version>
+  <version>28.0.2</version>
 
   <dependencies>
     <dependency>

diff --git a/idp-report/pom.xml b/idp-report/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>de.gematik.idp</groupId>
     <artifactId>idp-global</artifactId>
-    <version>28.0.1</version>
+    <version>28.0.2</version>
   </parent>
   <artifactId>idp-report</artifactId>
 

diff --git a/idp-sektoral/pom.xml b/idp-sektoral/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>de.gematik.idp</groupId>
     <artifactId>idp-global</artifactId>
-    <version>28.0.1</version>
+    <version>28.0.2</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>idp-sektoral</artifactId>
-  <version>28.0.1</version>
+  <version>28.0.2</version>
   <packaging>jar</packaging>
 
   <properties>
@@ -72,6 +72,11 @@
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-slf4j2-impl</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+      <version>4.5.14</version>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/idp-server/pom.xml b/idp-server/pom.xml
@@ -7,19 +7,19 @@
   <parent>
     <groupId>de.gematik.idp</groupId>
     <artifactId>idp-global</artifactId>
-    <version>28.0.1</version>
+    <version>28.0.2</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>idp-server</artifactId>
-  <version>28.0.1</version>
+  <version>28.0.2</version>
   <packaging>jar</packaging>
 
   <properties>
     <commit_hash>undefined</commit_hash>
     <version.jaxb-api>2.4.0-b180830.0359</version.jaxb-api>
     <version.jaxb-impl>4.0.5</version.jaxb-impl>
-    <version.tiger-rbel>3.0.5</version.tiger-rbel>
+    <version.tiger-rbel>3.1.1</version.tiger-rbel>
   </properties>
 
   <dependencies>
@@ -110,6 +110,10 @@
           <groupId>org.bouncycastle</groupId>
           <artifactId>bcpkix-jdk15on</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>com.konghq</groupId>
+          <artifactId>unirest-java</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -141,7 +145,7 @@
     <dependency>
       <groupId>org.wiremock</groupId>
       <artifactId>wiremock-standalone</artifactId>
-      <version>3.6.0</version>
+      <version>3.7.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -186,6 +190,7 @@
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-slf4j2-impl</artifactId>
     </dependency>
+
   </dependencies>
 
   <build>

diff --git a/idp-server/src/main/java/de/gematik/idp/server/controllers/IdpController.java b/idp-server/src/main/java/de/gematik/idp/server/controllers/IdpController.java
@@ -51,9 +51,9 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.NoSuchElementException;
-import kong.unirest.HttpResponse;
-import kong.unirest.JsonNode;
-import kong.unirest.Unirest;
+import kong.unirest.core.HttpResponse;
+import kong.unirest.core.JsonNode;
+import kong.unirest.core.Unirest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;

diff --git a/idp-server/src/test/java/de/gematik/idp/server/AppListTest.java b/idp-server/src/test/java/de/gematik/idp/server/AppListTest.java
@@ -19,9 +19,9 @@
 import static de.gematik.idp.IdpConstants.APPLIST_ENDPOINT;
 import static org.assertj.core.api.Assertions.assertThat;
 
-import kong.unirest.HttpResponse;
-import kong.unirest.Unirest;
-import kong.unirest.UnirestException;
+import kong.unirest.core.HttpResponse;
+import kong.unirest.core.Unirest;
+import kong.unirest.core.UnirestException;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;

diff --git a/idp-server/src/test/java/de/gematik/idp/server/AuthenticationCallTest.java b/idp-server/src/test/java/de/gematik/idp/server/AuthenticationCallTest.java
@@ -32,8 +32,8 @@
 import de.gematik.idp.server.controllers.IdpKey;
 import de.gematik.idp.tests.PkiKeyResolver;
 import de.gematik.idp.token.IdpJwe;
-import kong.unirest.MultipartBody;
-import kong.unirest.UnirestException;
+import kong.unirest.core.MultipartBody;
+import kong.unirest.core.UnirestException;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;

diff --git a/idp-server/src/test/java/de/gematik/idp/server/ClientSystemValidationTest.java b/idp-server/src/test/java/de/gematik/idp/server/ClientSystemValidationTest.java
@@ -22,8 +22,8 @@
 import de.gematik.idp.server.configuration.IdpConfiguration;
 import de.gematik.idp.tests.Afo;
 import jakarta.ws.rs.core.HttpHeaders;
-import kong.unirest.HttpResponse;
-import kong.unirest.Unirest;
+import kong.unirest.core.HttpResponse;
+import kong.unirest.core.Unirest;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;

diff --git a/idp-server/src/test/java/de/gematik/idp/server/DiscoveryDocumentTest.java b/idp-server/src/test/java/de/gematik/idp/server/DiscoveryDocumentTest.java
@@ -33,9 +33,9 @@
 import java.time.ZonedDateTime;
 import java.util.List;
 import java.util.Map;
-import kong.unirest.HttpResponse;
-import kong.unirest.Unirest;
-import kong.unirest.UnirestException;
+import kong.unirest.core.HttpResponse;
+import kong.unirest.core.Unirest;
+import kong.unirest.core.UnirestException;
 import org.apache.http.HttpStatus;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

diff --git a/idp-server/src/test/java/de/gematik/idp/server/FederationIdpListControllerTest.java b/idp-server/src/test/java/de/gematik/idp/server/FederationIdpListControllerTest.java
@@ -22,9 +22,9 @@
 import de.gematik.idp.server.data.FedIdpListEntry;
 import de.gematik.idp.token.JsonWebToken;
 import java.util.List;
-import kong.unirest.HttpResponse;
-import kong.unirest.Unirest;
-import kong.unirest.UnirestException;
+import kong.unirest.core.HttpResponse;
+import kong.unirest.core.Unirest;
+import kong.unirest.core.UnirestException;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;

diff --git a/idp-server/src/test/java/de/gematik/idp/server/IdpControllerExceptionHandlerTest.java b/idp-server/src/test/java/de/gematik/idp/server/IdpControllerExceptionHandlerTest.java
@@ -31,10 +31,10 @@
 import de.gematik.idp.server.exceptions.handler.IdpServerExceptionHandler;
 import de.gematik.idp.server.services.IdpAuthenticator;
 import de.gematik.idp.tests.PkiKeyResolver;
-import kong.unirest.HttpResponse;
-import kong.unirest.JsonNode;
-import kong.unirest.Unirest;
-import kong.unirest.json.JSONObject;
+import kong.unirest.core.HttpResponse;
+import kong.unirest.core.JsonNode;
+import kong.unirest.core.Unirest;
+import kong.unirest.core.json.JSONObject;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;

diff --git a/idp-server/src/test/java/de/gematik/idp/server/IdpControllerParameterValidationTest.java b/idp-server/src/test/java/de/gematik/idp/server/IdpControllerParameterValidationTest.java
@@ -48,12 +48,12 @@
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.UnaryOperator;
-import kong.unirest.GetRequest;
-import kong.unirest.HttpRequest;
-import kong.unirest.HttpResponse;
-import kong.unirest.JsonNode;
-import kong.unirest.MultipartBody;
-import kong.unirest.Unirest;
+import kong.unirest.core.GetRequest;
+import kong.unirest.core.HttpRequest;
+import kong.unirest.core.HttpResponse;
+import kong.unirest.core.JsonNode;
+import kong.unirest.core.MultipartBody;
+import kong.unirest.core.Unirest;
 import lombok.SneakyThrows;
 import org.apache.commons.lang3.tuple.Pair;
 import org.assertj.core.api.AssertionsForClassTypes;