add more test cases

doxthree · doxthree · commit fb761c3203e4 · 2024-12-17T08:22:32.000Z
diff --git a/.github/workflows/ci-java.yaml b/.github/workflows/ci-java.yaml
@@ -28,7 +28,7 @@ on:
 env:
   CLIENT_ID: ${{ secrets.CLIENT_ID }}
   CLIENT_SECRET: ${{secrets.CLIENT_SECRET}}
-  VAAS_URL: "wss://gateway.production.vaas.gdatasecurity.de"
+  VAAS_URL: "https://gateway.production.vaas.gdatasecurity.de"
   TOKEN_URL: "https://account.gdata.de/realms/vaas-production/protocol/openid-connect/token"
   VAAS_CLIENT_ID: ${{ secrets.VAAS_CLIENT_ID }}
   VAAS_USER_NAME: ${{ secrets.VAAS_USER_NAME }}
@@ -54,7 +54,7 @@ jobs:
         run: |
           echo "CLIENT_ID=${{ secrets.STAGING_CLIENT_ID }}" >> $GITHUB_ENV
           echo "CLIENT_SECRET=${{ secrets.STAGING_CLIENT_SECRET }}" >> $GITHUB_ENV
-          echo "VAAS_URL=wss://gateway.staging.vaas.gdatasecurity.de" >> $GITHUB_ENV
+          echo "VAAS_URL=https://gateway.staging.vaas.gdatasecurity.de" >> $GITHUB_ENV
           echo "TOKEN_URL=https://account-staging.gdata.de/realms/vaas-staging/protocol/openid-connect/token" >> $GITHUB_ENV
           echo "VAAS_CLIENT_ID=${{ secrets.STAGING_VAAS_CLIENT_ID }}" >> $GITHUB_ENV
           echo "VAAS_USER_NAME=${{ secrets.STAGING_VAAS_USER_NAME }}" >> $GITHUB_ENV
@@ -65,7 +65,7 @@ jobs:
         run: |
           echo "CLIENT_ID=${{ secrets.DEVELOP_CLIENT_ID }}" >> $GITHUB_ENV
           echo "CLIENT_SECRET=${{ secrets.DEVELOP_CLIENT_SECRET }}" >> $GITHUB_ENV
-          echo "VAAS_URL=wss://gateway.develop.vaas.gdatasecurity.de" >> $GITHUB_ENV
+          echo "VAAS_URL=https://gateway.develop.vaas.gdatasecurity.de" >> $GITHUB_ENV
           echo "TOKEN_URL=https://account-staging.gdata.de/realms/vaas-develop/protocol/openid-connect/token" >> $GITHUB_ENV
           echo "VAAS_CLIENT_ID=${{ secrets.DEVELOP_VAAS_CLIENT_ID }}" >> $GITHUB_ENV
           echo "VAAS_USER_NAME=${{ secrets.DEVELOP_VAAS_USER_NAME }}" >> $GITHUB_ENV
diff --git a/java/build.gradle b/java/build.gradle
@@ -25,6 +25,8 @@ dependencies {
     implementation 'io.github.cdimascio:dotenv-java:3.0.2'
     testImplementation 'org.testng:testng:7.10.2'
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.3'
+    testImplementation 'org.mockito:mockito-core:5.14.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.11.3'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.11.3'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.3'
 
diff --git a/java/src/main/java/de/gdata/vaas/ClientCredentialsGrantAuthenticator.java b/java/src/main/java/de/gdata/vaas/ClientCredentialsGrantAuthenticator.java
@@ -1,6 +1,8 @@
 package de.gdata.vaas;
 
 import com.google.gson.JsonParser;
+
+import de.gdata.vaas.exceptions.VaasAuthenticationException;
 import lombok.Getter;
 import lombok.NonNull;
 import org.jetbrains.annotations.NotNull;
@@ -27,13 +29,21 @@ public class ClientCredentialsGrantAuthenticator implements IAuthenticator {
     @NonNull
     private final URI tokenEndpoint;
 
-    private static final HttpClient httpClient = HttpClient.newHttpClient();
+    private final HttpClient httpClient;
 
 
     public ClientCredentialsGrantAuthenticator(String clientId, String clientSecret, @NotNull URI tokenEndpoint) {
         this.tokenEndpoint = tokenEndpoint;
         this.clientId = clientId;
         this.clientSecret = clientSecret;
+        this.httpClient = HttpClient.newHttpClient();
+    }
+
+    public ClientCredentialsGrantAuthenticator(String clientId, String clientSecret, @NotNull URI tokenEndpoint, HttpClient httpClient) {
+        this.tokenEndpoint = tokenEndpoint;
+        this.clientId = clientId;
+        this.clientSecret = clientSecret;
+        this.httpClient = httpClient;
     }
 
     public ClientCredentialsGrantAuthenticator(String clientId, String clientSecret)
@@ -45,7 +55,7 @@ private String encodeValue(String value) throws UnsupportedEncodingException {
         return URLEncoder.encode(value, StandardCharsets.UTF_8);
     }
 
-    public String getToken() throws IOException, InterruptedException {
+    public String getToken() throws IOException, InterruptedException, VaasAuthenticationException {
         Map<String, String> requestParams = new HashMap<>();
         requestParams.put("client_id", this.clientId);
         requestParams.put("grant_type", "client_credentials");
@@ -69,8 +79,7 @@ public String getToken() throws IOException, InterruptedException {
                 .send(request, HttpResponse.BodyHandlers.ofString());
 
         if (response.statusCode() != 200) {
-            throw new IOException("Failed to upload file. HTTP Status Code: " + response.statusCode() + " Error: "
-                    + response.body());
+            throw new VaasAuthenticationException();
         }
         var bodyJsonObject = JsonParser.parseString(response.body()).getAsJsonObject();
         var tokenJsonElement = bodyJsonObject.get("access_token");
diff --git a/java/src/main/java/de/gdata/vaas/IAuthenticator.java b/java/src/main/java/de/gdata/vaas/IAuthenticator.java
@@ -2,6 +2,8 @@
 
 import java.io.IOException;
 
+import de.gdata.vaas.exceptions.VaasAuthenticationException;
+
 public interface IAuthenticator {
     /**
      * Get access token from identity provider
@@ -10,6 +12,7 @@ public interface IAuthenticator {
      *                              request
      * @throws InterruptedException if the operation is interrupted
      * @return the access token
+     * @throws VaasAuthenticationException 
      */
-    public String getToken() throws IOException, InterruptedException;
+    public String getToken() throws IOException, InterruptedException, VaasAuthenticationException;
 }
diff --git a/java/src/main/java/de/gdata/vaas/IVaas.java b/java/src/main/java/de/gdata/vaas/IVaas.java
@@ -8,20 +8,22 @@
 import java.security.NoSuchAlgorithmException;
 import java.util.concurrent.CompletableFuture;
 
+import de.gdata.vaas.exceptions.VaasAuthenticationException;
+import de.gdata.vaas.exceptions.VaasClientException;
 import de.gdata.vaas.messages.VaasVerdict;
 import de.gdata.vaas.options.ForFileOptions;
 import de.gdata.vaas.options.ForSha256Options;
 import de.gdata.vaas.options.ForStreamOptions;
 import de.gdata.vaas.options.ForUrlOptions;
 
 public interface IVaas {
-    public CompletableFuture<VaasVerdict> forSha256(Sha256 sha256) throws  URISyntaxException, IOException, InterruptedException;
-    public CompletableFuture<VaasVerdict> forSha256(Sha256 sha256, ForSha256Options options) throws URISyntaxException, IOException, InterruptedException;
-    public CompletableFuture<VaasVerdict> forStream(InputStream stream, long contentLength) throws URISyntaxException, IOException, InterruptedException;
-    public CompletableFuture<VaasVerdict> forStream(InputStream stream, long contentLength, ForStreamOptions options) throws URISyntaxException, IOException, InterruptedException;
-    public CompletableFuture<VaasVerdict> forFile(Path file) throws NoSuchAlgorithmException, IOException, URISyntaxException, InterruptedException;
-    public CompletableFuture<VaasVerdict> forFile(Path file, ForFileOptions options) throws NoSuchAlgorithmException, IOException, URISyntaxException, InterruptedException;
-    public CompletableFuture<VaasVerdict> forUrl(URL url) throws URISyntaxException, IOException, InterruptedException;
-    public CompletableFuture<VaasVerdict> forUrl(URL url, ForUrlOptions options) throws URISyntaxException, IOException, InterruptedException;
+    public CompletableFuture<VaasVerdict> forSha256(Sha256 sha256) throws  URISyntaxException, IOException, InterruptedException, VaasClientException, VaasAuthenticationException;
+    public CompletableFuture<VaasVerdict> forSha256(Sha256 sha256, ForSha256Options options) throws URISyntaxException, IOException, InterruptedException, VaasClientException, VaasAuthenticationException;
+    public CompletableFuture<VaasVerdict> forStream(InputStream stream, long contentLength) throws URISyntaxException, IOException, InterruptedException, VaasAuthenticationException;
+    public CompletableFuture<VaasVerdict> forStream(InputStream stream, long contentLength, ForStreamOptions options) throws URISyntaxException, IOException, InterruptedException, VaasAuthenticationException;
+    public CompletableFuture<VaasVerdict> forFile(Path file) throws NoSuchAlgorithmException, IOException, URISyntaxException, InterruptedException, VaasAuthenticationException;
+    public CompletableFuture<VaasVerdict> forFile(Path file, ForFileOptions options) throws NoSuchAlgorithmException, IOException, URISyntaxException, InterruptedException, VaasAuthenticationException;
+    public CompletableFuture<VaasVerdict> forUrl(URL url) throws URISyntaxException, IOException, InterruptedException, VaasAuthenticationException;
+    public CompletableFuture<VaasVerdict> forUrl(URL url, ForUrlOptions options) throws URISyntaxException, IOException, InterruptedException, VaasAuthenticationException;
 
 }
diff --git a/java/src/main/java/de/gdata/vaas/ResourceOwnerPasswordGrantAuthenticator.java b/java/src/main/java/de/gdata/vaas/ResourceOwnerPasswordGrantAuthenticator.java
@@ -1,6 +1,8 @@
 package de.gdata.vaas;
 
 import com.google.gson.JsonParser;
+
+import de.gdata.vaas.exceptions.VaasAuthenticationException;
 import lombok.Getter;
 import lombok.NonNull;
 import org.jetbrains.annotations.NotNull;
@@ -28,13 +30,22 @@ public class ResourceOwnerPasswordGrantAuthenticator implements IAuthenticator {
     @NonNull
     private final URI tokenEndpoint;
 
-    private static final HttpClient httpClient = HttpClient.newHttpClient();
+    private final HttpClient httpClient;
 
     public ResourceOwnerPasswordGrantAuthenticator(String clientId, String username, String password, @NotNull URI tokenEndpoint) {
         this.tokenEndpoint = tokenEndpoint;
         this.clientId = clientId;
         this.username = username;
         this.password = password;
+        this.httpClient = HttpClient.newHttpClient();
+    }
+
+    public ResourceOwnerPasswordGrantAuthenticator(String clientId, String username, String password, @NotNull URI tokenEndpoint, HttpClient httpClient) {
+        this.tokenEndpoint = tokenEndpoint;
+        this.clientId = clientId;
+        this.username = username;
+        this.password = password;
+        this.httpClient = httpClient;
     }
 
     public ResourceOwnerPasswordGrantAuthenticator(String clientId, String username, String password)
@@ -46,7 +57,7 @@ private String encodeValue(String value) throws UnsupportedEncodingException {
         return URLEncoder.encode(value, StandardCharsets.UTF_8);
     }
 
-    public String getToken() throws IOException, InterruptedException {
+    public String getToken() throws IOException, InterruptedException, VaasAuthenticationException {
         Map<String, String> requestParams = new HashMap<>();
         requestParams.put("client_id", this.clientId);
         requestParams.put("grant_type", "password");
@@ -71,8 +82,7 @@ public String getToken() throws IOException, InterruptedException {
                 .send(request, HttpResponse.BodyHandlers.ofString());
 
         if (response.statusCode() != 200) {
-            throw new IOException("Failed to upload file. HTTP Status Code: " + response.statusCode() + " Error: "
-                    + response.body());
+            throw new VaasAuthenticationException();
         }
         var bodyJsonObject = JsonParser.parseString(response.body()).getAsJsonObject();
         var tokenJsonElement = bodyJsonObject.get("access_token");
diff --git a/java/src/main/java/de/gdata/vaas/Vaas.java b/java/src/main/java/de/gdata/vaas/Vaas.java
diff --git a/java/src/test/java/de/gdata/test/integration/VaasTests.java b/java/src/test/java/de/gdata/test/integration/VaasTests.java
