Cs/http api

.github/workflows/ci-dotnet.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 }}
@@ -56,7 +56,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
@@ -67,7 +67,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
@@ -101,19 +101,19 @@ jobs:
         run: dotnet test --no-restore --verbosity normal
         working-directory: dotnet/Vaas
 
-      - name: Run example FileScan
-        env:
-          SCAN_PATH: "Program.cs"
-        run: dotnet run FileScan
-        working-directory: dotnet/examples/VaasExample
+      # - name: Run example FileScan
+      #   env:
+      #     SCAN_PATH: "Program.cs"
+      #   run: dotnet run FileScan
+      #   working-directory: dotnet/examples/VaasExample
 
-      - name: Run example UrlScan
-        run: dotnet run UrlScan
-        working-directory: dotnet/examples/VaasExample
+      # - name: Run example UrlScan
+      #   run: dotnet run UrlScan
+      #   working-directory: dotnet/examples/VaasExample
 
-      - name: Run example HashsumScan
-        run: dotnet run HashsumScan
-        working-directory: dotnet/examples/VaasExample
+      # - name: Run example HashsumScan
+      #   run: dotnet run HashsumScan
+      #   working-directory: dotnet/examples/VaasExample
 
       - name: Pack
         if: startsWith(github.ref, 'refs/tags/cs')

.gitignore

@@ -42,6 +42,8 @@ lib/
 
 bin/
 obj/
+.idea/
+.mono/
 
 # Python
 __pycache__/

dotnet/.devcontainer/devcontainer.json

@@ -3,11 +3,12 @@
 {
 	"name": "C# (.NET)",
 	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
-	"image": "mcr.microsoft.com/devcontainers/dotnet:1-6.0-bullseye",
+	"image": "mcr.microsoft.com/devcontainers/dotnet:1-8.0-bookworm",
 	"customizations": {
 		"vscode": {
 			"extensions": [
-				"jcamp.dotnet-test-provider-explorer"
+				"jcamp.dotnet-test-provider-explorer",
+				"ms-dotnettools.csdevkit"
 			]
 		}
 	}

dotnet/Vaas/Vaas.sln

@@ -8,6 +8,9 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vaas", "src\Vaas\Vaas.csproj", "{F83EA992-9DB1-43FF-89F2-836F4B325345}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{59EEE214-8910-4FBC-AA18-F7070B700D49}"
+	ProjectSection(SolutionItems) = preProject
+		test\.env = test\.env
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vaas.Test", "test\Vaas.Test\Vaas.Test.csproj", "{5C11F0F4-1483-4850-BB24-4A04E7EED14A}"
 EndProject

dotnet/Vaas/src/Vaas/Authentication/ClientCredentialsGrantAuthenticator.cs

@@ -0,0 +1,62 @@
+using System;
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Vaas.Authentication;
+
+public class ClientCredentialsGrantAuthenticator : IAuthenticator
+{
+    private readonly TokenReceiver _tokenReceiver;
+
+    private string ClientId { get; }
+    private string ClientSecret { get; }
+
+    public ClientCredentialsGrantAuthenticator(
+        string clientId,
+        string clientSecret,
+        Uri? tokenUrl = null,
+        HttpClient? httpClient = null,
+        ISystemClock? systemClock = null
+    )
+    {
+        _tokenReceiver = new ClientCredentialsTokenReceiver(
+            this,
+            tokenUrl,
+            httpClient,
+            systemClock
+        );
+        ClientId = clientId;
+        ClientSecret = clientSecret;
+    }
+
+    public async Task<string> GetTokenAsync(CancellationToken cancellationToken)
+    {
+        return await _tokenReceiver.GetTokenAsync(cancellationToken);
+    }
+
+    private class ClientCredentialsTokenReceiver(
+        IAuthenticator authenticator,
+        Uri? tokenUrl = null,
+        HttpClient? httpClient = null,
+        ISystemClock? systemClock = null
+    ) : TokenReceiver(authenticator, tokenUrl, httpClient, systemClock)
+    {
+        protected override FormUrlEncodedContent TokenRequestToForm()
+        {
+            var authenticator = (ClientCredentialsGrantAuthenticator)Authenticator;
+            return new FormUrlEncodedContent(
+                new List<KeyValuePair<string, string>>
+                {
+                    new("client_id", authenticator.ClientId),
+                    new(
+                        "client_secret",
+                        authenticator.ClientSecret ?? throw new InvalidOperationException()
+                    ),
+                    new("grant_type", "client_credentials"),
+                }
+            );
+        }
+    }
+}

dotnet/Vaas/src/Vaas/Authentication/ErrorResponse.cs

@@ -0,0 +1,12 @@
+using System.Text.Json.Serialization;
+
+namespace Vaas.Authentication;
+
+public class ErrorResponse
+{
+    [JsonPropertyName("error")]
+    public required string Error { get; init; }
+
+    [JsonPropertyName("error_description")]
+    public string? ErrorDescription { get; init; }
+}

dotnet/Vaas/src/Vaas/Authentication/GrantType.cs

@@ -0,0 +1,7 @@
+namespace Vaas.Authentication;
+
+public enum GrantType
+{
+    ClientCredentials,
+    Password,
+}

dotnet/Vaas/src/Vaas/Authentication/ResourceOwnerPasswordGrantAuthenticator.cs

@@ -0,0 +1,69 @@
+using System;
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Vaas.Authentication;
+
+public class ResourceOwnerPasswordGrantAuthenticator : IAuthenticator
+{
+    private readonly TokenReceiver _tokenReceiver;
+
+    private string ClientId { get; }
+    private string UserName { get; }
+    private string Password { get; }
+
+    public ResourceOwnerPasswordGrantAuthenticator(
+        string clientId,
+        string userName,
+        string password,
+        Uri? tokenUrl = null,
+        HttpClient? httpClient = null,
+        ISystemClock? systemClock = null
+    )
+    {
+        _tokenReceiver = new ResourceOwnerPasswordTokenReceiver(
+            this,
+            tokenUrl,
+            httpClient,
+            systemClock
+        );
+        ClientId = clientId;
+        UserName = userName;
+        Password = password;
+    }
+
+    public async Task<string> GetTokenAsync(CancellationToken cancellationToken)
+    {
+        return await _tokenReceiver.GetTokenAsync(cancellationToken);
+    }
+
+    private class ResourceOwnerPasswordTokenReceiver(
+        IAuthenticator authenticator,
+        Uri? tokenUrl = null,
+        HttpClient? httpClient = null,
+        ISystemClock? systemClock = null
+    ) : TokenReceiver(authenticator, tokenUrl, httpClient, systemClock)
+    {
+        protected override FormUrlEncodedContent TokenRequestToForm()
+        {
+            var authenticator = (ResourceOwnerPasswordGrantAuthenticator)Authenticator;
+            return new FormUrlEncodedContent(
+                new List<KeyValuePair<string, string>>
+                {
+                    new("client_id", authenticator.ClientId),
+                    new(
+                        "username",
+                        authenticator.UserName ?? throw new InvalidOperationException()
+                    ),
+                    new(
+                        "password",
+                        authenticator.Password ?? throw new InvalidOperationException()
+                    ),
+                    new("grant_type", "password"),
+                }
+            );
+        }
+    }
+}

dotnet/Vaas/src/Vaas/Authentication/SystemClock.cs

@@ -10,4 +10,4 @@ public interface ISystemClock
 public class SystemClock : ISystemClock
 {
     public DateTimeOffset UtcNow => DateTimeOffset.UtcNow;
-}
+}