Outgoing Payment implementation and enhancements

.gitignore

@@ -6,3 +6,9 @@ coveragereport/
 **/Generated/AuthServerClient.cs*
 **/Generated/WalletAddressClient.cs*
 **/Generated/ResourceServerClient.cs*
+
+.env
+.idea/
+OpenPayments.sln.DotSettings.user
+
+

Makefile

@@ -2,21 +2,21 @@
 
 auth-server-generate:
 	npx swagger-cli bundle open-payments-specifications/openapi/auth-server.yaml -o OpenPayments.Sdk/tmp/auth-bundled.json -t json && \
-	nswag openapi2csclient /input:OpenPayments.Sdk/tmp/auth-bundled.json /output:OpenPayments.Sdk/Generated/AuthServerClient.cs /namespace:OpenPayments.Sdk.Generated.Auth /classname:AuthServerClient /injectHttpClient:true && \
+	nswag openapi2csclient /input:OpenPayments.Sdk/tmp/auth-bundled.json /output:OpenPayments.Sdk/Generated/Auth/AuthServerClient.g.cs /namespace:OpenPayments.Sdk.Generated.Auth /classname:AuthServerClient /injectHttpClient:true && \
 	rm -rf OpenPayments.Sdk/tmp/auth-bundled.json
 
 as-models: auth-server-generate
 
 resource-server-generate:
 	npx swagger-cli bundle open-payments-specifications/openapi/resource-server.yaml -o OpenPayments.Sdk/tmp/resource-bundled.json -t json && \
-	nswag openapi2csclient /input:OpenPayments.Sdk/tmp/resource-bundled.json /output:OpenPayments.Sdk/Generated/ResourceServerClient.cs /namespace:OpenPayments.Sdk.Generated.Resource /classname:ResourceServerClient /injectHttpClient:true && \
+	nswag openapi2csclient /input:OpenPayments.Sdk/tmp/resource-bundled.json /output:OpenPayments.Sdk/Generated/Resource/ResourceServerClient.g.cs /namespace:OpenPayments.Sdk.Generated.Resource /classname:ResourceServerClient /injectHttpClient:true /GenerateOptionalPropertiesAsNullable:true /GenerateNullableReferenceTypes:true && \
 	rm -rf OpenPayments.Sdk/tmp/resource-bundled.json
 
 rs-models: resource-server-generate
 
 wallet-address-models:
 	npx swagger-cli bundle open-payments-specifications/openapi/wallet-address-server.yaml -o OpenPayments.Sdk/tmp/wallet-bundled.json -t json && \
-	nswag openapi2csclient /input:OpenPayments.Sdk/tmp/wallet-bundled.json /output:OpenPayments.Sdk/Generated/WalletAddressClient.cs /namespace:OpenPayments.Sdk.Generated.Wallet /classname:WalletAddressClient /injectHttpClient:true && \
+	nswag openapi2csclient /input:OpenPayments.Sdk/tmp/wallet-bundled.json /output:OpenPayments.Sdk/Generated/Wallet/WalletAddressClient.g.cs /namespace:OpenPayments.Sdk.Generated.Wallet /classname:WalletAddressClient /injectHttpClient:true && \
 	rm -rf OpenPayments.Sdk/tmp/wallet-bundled.json
 
 wa-models: wallet-address-models

OpenPayments.Sdk.HttpSignatureUtils/Extensions/HttpClientSignatureExtensions.cs

@@ -1,5 +1,9 @@
 using OpenPayments.Sdk.HttpSignatureUtils;
 
+/// <summary>
+/// Provides extension methods for adding signature-based authentication
+/// to HTTP client requests.
+/// </summary>
 public static class HttpClientSignatureExtensions
 {
     // public static async Task<bool> ValidateRequestSignatureAsync(

OpenPayments.Sdk.HttpSignatureUtils/HttpRequestSigner.cs

@@ -5,26 +5,38 @@
 
 [assembly: InternalsVisibleTo("OpenPayments.Sdk.HttpSignatureUtils.Tests")]
 
-internal class SignatureHeaders
+/// <summary>
+/// Signature headers returned by the HttpRequestSigner.
+/// </summary>
+public class SignatureHeaders
 {
+    /// <summary>
+    /// Signature header value.
+    /// </summary>
     public string Signature { get; set; } = string.Empty;
+    /// <summary>
+    /// Signature input header value.
+    /// </summary>
     public string SignatureInput { get; set; } = string.Empty;
 }
 
-internal static class HttpRequestSigner
+/// <summary>
+/// Signs an HTTP request using the Ed25519 signature algorithm.
+/// </summary>
+public static class HttpRequestSigner
 {
     private static string BuildSignatureInput(List<string> components, string keyId, long created)
     {
-        string fields = string.Join(" ", components.Select(h => $"\"{h}\""));
-        return $"({fields});created={created};keyid=\"{keyId}\"";
+        var fields = string.Join(" ", components.Select(h => $"\"{h}\""));
+        return $"({fields});created={created};keyid=\"{keyId}\";alg=\"ed25519\"";
     }
-
+    
     private static string ComputeContentDigest(string body)
     {
-        byte[] hash = SHA256.HashData(Encoding.UTF8.GetBytes(body));
+        var hash = SHA512.HashData(Encoding.UTF8.GetBytes(body));
         return Convert.ToBase64String(hash);
     }
-
+    
     private static async Task<string> TryGetHeaderValueAsync(HttpRequestMessage request, string name)
     {
         name = name.ToLowerInvariant();
@@ -41,14 +53,15 @@ private static async Task<string> TryGetHeaderValueAsync(HttpRequestMessage requ
 
         if (name == "content-digest" && request.Content != null)
         {
-            string body = await request.Content.ReadAsStringAsync();
-            return $"sha-256=:{ComputeContentDigest(body)}:";
+            var body = await request.Content.ReadAsStringAsync();
+            return $"sha-512=:{ComputeContentDigest(body)}:";
         }
 
         return "";
     }
 
-    private static async Task<string> BuildSignatureBaseAsync(HttpRequestMessage request, List<string> components, long created, string keyId)
+    private static async Task<string> BuildSignatureBaseAsync(HttpRequestMessage request, List<string> components,
+        long created, string keyId)
     {
         var lines = new List<string>();
 
@@ -57,25 +70,34 @@ private static async Task<string> BuildSignatureBaseAsync(HttpRequestMessage req
             switch (component)
             {
                 case "@method":
-                    lines.Add($"@method: {request.Method.Method.ToLower()}");
+                    lines.Add($"\"@method\": {request.Method.Method.ToUpper()}");
                     break;
                 case "@target-uri":
-                    lines.Add($"@target-uri: {request.RequestUri}");
+                    lines.Add($"\"@target-uri\": {request.RequestUri}");
                     break;
                 default:
-                    string value = await TryGetHeaderValueAsync(request, component);
-                    lines.Add($"{component.ToLower()}: {value}");
+                    var value = await TryGetHeaderValueAsync(request, component);
+                    lines.Add($"\"{component.ToLower()}\": {value}");
                     break;
             }
         }
 
-        string fieldList = string.Join(" ", components.Select(c => $"\"{c}\""));
-        lines.Add($"\"@signature-params\": ({fieldList});created={created};keyid=\"{keyId}\"");
+        var fieldList = string.Join(" ", components.Select(c => $"\"{c}\""));
+        lines.Add($"\"@signature-params\": ({fieldList});created={created};keyid=\"{keyId}\";alg=\"ed25519\"");
 
         return string.Join("\n", lines);
     }
 
-    public static async Task<SignatureHeaders> SignHttpRequestAsync(HttpRequestMessage request, Key privateKey, string keyId)
+    /// <summary>
+    /// Signs an HTTP request using the Ed25519 signature algorithm.
+    /// </summary>
+    /// <param name="request"></param>
+    /// <param name="privateKey"></param>
+    /// <param name="keyId"></param>
+    /// <returns></returns>
+    /// <exception cref="ArgumentException"></exception>
+    public static async Task<SignatureHeaders> SignHttpRequestAsync(HttpRequestMessage request, Key privateKey,
+        string keyId)
     {
         ArgumentNullException.ThrowIfNull(request);
         ArgumentNullException.ThrowIfNull(privateKey);
@@ -91,15 +113,20 @@ public static async Task<SignatureHeaders> SignHttpRequestAsync(HttpRequestMessa
 
         if (request.Content != null)
         {
-            string content = await request.Content.ReadAsStringAsync();
+            var content = await request.Content.ReadAsStringAsync();
             if (!string.IsNullOrEmpty(content))
             {
                 components.AddRange(["content-digest", "content-length", "content-type"]);
 
-                string digest = ComputeContentDigest(content);
+                var digest = ComputeContentDigest(content);
+
+                request.Content.Headers.TryAddWithoutValidation("Content-Digest", $"sha-512=:{digest}:");
 
-                request.Content.Headers.TryAddWithoutValidation("Content-Digest", $"sha-256=:{digest}:");
-                request.Content.Headers.TryAddWithoutValidation("Content-Length", Encoding.UTF8.GetByteCount(content).ToString());
+                if (!request.Content.Headers.Contains("Content-Length"))
+                {
+                    request.Content.Headers.TryAddWithoutValidation("Content-Length",
+                        Encoding.UTF8.GetByteCount(content).ToString());
+                }
 
                 if (!request.Content.Headers.Contains("Content-Type"))
                 {
@@ -108,12 +135,11 @@ public static async Task<SignatureHeaders> SignHttpRequestAsync(HttpRequestMessa
             }
         }
 
-        long created = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
-        string signatureInput = BuildSignatureInput(components, keyId, created);
-        string signatureBase = await BuildSignatureBaseAsync(request, components, created, keyId);
-
-        byte[] signatureBytes = SignatureAlgorithm.Ed25519.Sign(privateKey, Encoding.UTF8.GetBytes(signatureBase));
-        string base64Signature = Convert.ToBase64String(signatureBytes);
+        var created = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
+        var signatureInput = BuildSignatureInput(components, keyId, created);
+        var signatureBase = await BuildSignatureBaseAsync(request, components, created, keyId);
+        var signatureBytes = SignatureAlgorithm.Ed25519.Sign(privateKey, Encoding.UTF8.GetBytes(signatureBase));
+        var base64Signature = Convert.ToBase64String(signatureBytes);
 
         return new SignatureHeaders
         {

OpenPayments.Sdk.HttpSignatureUtils/HttpSignatureValidator.cs

@@ -1,15 +1,14 @@
 using System.Text;
 using NSec.Cryptography;
-
 using OpenPayments.Sdk.HttpSignatureUtils;
 
 public class HttpSignatureValidator : IHttpSignatureValidator
 {
     private readonly ISignatureInputParser _parser;
     private readonly ISignatureInputValidator _validator;
     private readonly ISignatureInputBuilder _builder;
 
     public HttpSignatureValidator(
         ISignatureInputParser parser,
         ISignatureInputValidator validator,
         ISignatureInputBuilder builder)
@@ -19,13 +18,13 @@
         _builder = builder;
     }
 
     public bool AreSignatureHeadersPresent(HttpRequestMessage request)
     {
         return TryGetHeader(request, "signature") is not null &&
                TryGetHeader(request, "signature-input") is not null;
     }
 
     public async Task<bool> ValidateSignatureAsync(HttpRequestMessage request, Jwk clientKey)
     {
         var sig = TryGetHeader(request, "signature")!;
         var sigInput = TryGetHeader(request, "signature-input")!;
@@ -38,11 +37,12 @@
             return false;
 
         var challenge = await _builder.BuildBaseAsync(components, request, sigInput);
-        if (challenge is null)
+        if (challenge is null) 
             return false;
 
         var signatureBytes = Convert.FromBase64String(sig.Replace("sig1=", "").Replace(":", ""));
-        var publicKey = PublicKey.Import(SignatureAlgorithm.Ed25519, Base64UrlDecode(clientKey.X), KeyBlobFormat.RawPublicKey);
+        var publicKey = PublicKey.Import(SignatureAlgorithm.Ed25519, Base64UrlDecode(clientKey.X),
+            KeyBlobFormat.RawPublicKey);
 
         return SignatureAlgorithm.Ed25519.Verify(publicKey, Encoding.UTF8.GetBytes(challenge), signatureBytes);
     }

OpenPayments.Sdk.HttpSignatureUtils/KeyUtils.cs

@@ -1,6 +1,9 @@
 using System.Diagnostics;
 using NSec.Cryptography;
 using System.Security.Cryptography;
+using Org.BouncyCastle.Asn1;
+using Org.BouncyCastle.Asn1.Pkcs;
+using Org.BouncyCastle.OpenSsl;
 
 namespace OpenPayments.Sdk.HttpSignatureUtils;
 
@@ -29,7 +32,7 @@ public static class KeyUtils
     /// </exception>
     public static Key LoadBase64Key(string base64Key)
     {
-        byte[] keyBytes = Convert.FromBase64String(base64Key);
+        var keyBytes = Convert.FromBase64String(base64Key);
 
         if (keyBytes.Length != 32 && keyBytes.Length != 64)
         {
@@ -41,6 +44,53 @@ public static Key LoadBase64Key(string base64Key)
         return Key.Import(algorithm, seed, KeyBlobFormat.RawPrivateKey);
     }
 
+    /// <summary>
+    /// Loads an Ed25519 private key from a PEM-encoded PKCS#8 string.
+    /// </summary>
+    /// <param name="pem"></param>
+    /// <returns></returns>
+    /// <exception cref="ArgumentException"></exception>
+    public static Key LoadPem(string pem)
+    {
+        // Read PEM -> DER object
+        using var sr = new StringReader(pem);
+        var pemObj = new PemReader(sr).ReadPemObject();
+        if (pemObj == null)
+            throw new ArgumentException("Invalid PEM");
+
+        // Parse PKCS#8 PrivateKeyInfo
+        var pkInfo = PrivateKeyInfo.GetInstance(Asn1Object.FromByteArray(pemObj.Content));
+
+        // Ensure Ed25519 OID (1.3.101.112)
+        var oid = pkInfo.PrivateKeyAlgorithm.Algorithm.Id;
+        if (oid != "1.3.101.112")
+            throw new ArgumentException($"Unexpected algorithm OID: {oid}. Expected Ed25519 (1.3.101.112).");
+
+        // Extract the inner OCTET STRING (seed). For Ed25519 in PKCS#8, this is 32 bytes.
+        var privateKeyOctets = Asn1OctetString.GetInstance(pkInfo.ParsePrivateKey());
+        var privateKeyBytes = privateKeyOctets.GetOctets();
+
+        // Some toolchains wrap the seed in another OCTET STRING layer:
+        // If lenght is not 32, try one more unwrap.
+        if (privateKeyBytes.Length != 32)
+        {
+            try
+            {
+                var inner = Asn1OctetString.GetInstance(Asn1Object.FromByteArray(privateKeyBytes));
+                privateKeyBytes = inner.GetOctets();
+            }
+            catch { /* ignore */ }
+        }
+
+        if (privateKeyBytes.Length != 32)
+            throw new ArgumentException($"Ed25519 seed must be 32 bytes, got {privateKeyBytes.Length}.");
+
+        // Import into NSec as a raw private key (seed)
+        var algorithm = SignatureAlgorithm.Ed25519;
+        var seed = privateKeyBytes.AsSpan(0, 32);
+        return Key.Import(algorithm, seed, KeyBlobFormat.RawPrivateKey);
+    }
+
     /// <summary>
     /// Generates a JSON Web Key (JWK) representing an Ed25519 public key.
     /// </summary>
@@ -71,7 +121,7 @@ public static Jwk GenerateJwk(string keyId, Key? privateKey = null)
             ExportPolicy = KeyExportPolicies.AllowPlaintextExport
         });
 
-        byte[] publicKeyBytes = privateKey.PublicKey.Export(KeyBlobFormat.RawPublicKey);
+        var publicKeyBytes = privateKey.PublicKey.Export(KeyBlobFormat.RawPublicKey);
 
         return new Jwk
         {
@@ -105,7 +155,7 @@ public static Key LoadKey(string keyFilePath)
             throw new ArgumentException("File was loaded, but key was not a valid Ed25519 private key (must be 32 or 64 bytes).");
         }
 
-        byte[] seed = keyBytes.AsSpan(0, 32).ToArray();
+        var seed = keyBytes.AsSpan(0, 32).ToArray();
 
         try
         {
@@ -132,9 +182,8 @@ public static Key GenerateKey(GenerateKeyArgs? args = null)
         if (args?.Dir is not null)
         {
             Directory.CreateDirectory(args.Dir);
-            string fileName = args.Filename ?? $"private-key-{DateTimeOffset.UtcNow.ToUnixTimeMilliseconds()}.pem";
-
-            string path = Path.Combine(args.Dir, fileName);
+            var fileName = args.Filename ?? $"private-key-{DateTimeOffset.UtcNow.ToUnixTimeMilliseconds()}.pem";
+            var path = Path.Combine(args.Dir, fileName);
 
             key.ToPem(path);
         }

OpenPayments.Sdk.Tests/Clients/AuthenticatedClient_Collection.cs

@@ -0,0 +1,6 @@
+namespace OpenPayments.Sdk.Tests.Clients;
+
+[CollectionDefinition("AuthenticatedClient")]
+public class AuthenticatedClientCollection : ICollectionFixture<AuthenticatedClientFixture> {
+
+}