SolarNetwork/Swarm
2
3
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🐛 Fix signature in AP again...

Browse Source
This commit is contained in:
LittleSheep
2025-12-29 23:28:49 +08:00
parent e7bf760888
commit d8d94d0aec
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DysonNetwork.Sphere/ActivityPub/ActivityPubDeliveryService.cs
View File

@@ -234,7 +234,7 @@ public class ActivityPubDeliveryService(
var request = new HttpRequestMessage(HttpMethod.Post, inboxUrl); var request = new HttpRequestMessage(HttpMethod.Post, inboxUrl);
request.Content = new StringContent(json, Encoding.UTF8, "application/activity+json"); request.Content = new StringContent(json, Encoding.UTF8, "application/activity+json");
request.Headers.Date = DateTimeOffset.UtcNow; request.Headers.Date = DateTimeOffset.UtcNow.ToString("r");
var bodyBytes = Encoding.UTF8.GetBytes(json); var bodyBytes = Encoding.UTF8.GetBytes(json);
using var sha256 = SHA256.Create(); using var sha256 = SHA256.Create();

6
DysonNetwork.Sphere/ActivityPub/ActivityPubKeyService.cs
View File

@@ -55,9 +55,9 @@ public class ActivityPubKeyService(ILogger<ActivityPubKeyService> logger)
private static string ConvertToPem(byte[] keyData, string keyType) private static string ConvertToPem(byte[] keyData, string keyType)
{ {
var sb = new StringBuilder(); var sb = new StringBuilder();
sb.AppendLine($"-----BEGIN {keyType}-----"); sb.Append($"-----BEGIN {keyType}-----\n");
sb.AppendLine(Convert.ToBase64String(keyData)); sb.Append(Convert.ToBase64String(keyData) + "\n");
sb.AppendLine($"-----END {keyType}-----"); sb.Append($"-----END {keyType}-----");
return sb.ToString(); return sb.ToString();
} }

5
DysonNetwork.Sphere/ActivityPub/ActivityPubSignatureService.cs
View File

@@ -15,6 +15,7 @@ public class ActivityPubSignatureService(
IConfiguration configuration IConfiguration configuration
) )
{ {
private const string RequestTarget = "(request-target)";
private string Domain => configuration["ActivityPub:Domain"] ?? "localhost"; private string Domain => configuration["ActivityPub:Domain"] ?? "localhost";
public bool VerifyIncomingRequest(HttpContext context, out string? actorUri) public bool VerifyIncomingRequest(HttpContext context, out string? actorUri)
@@ -209,7 +210,7 @@ public class ActivityPubSignatureService(
foreach (var header in headers) foreach (var header in headers)
{ {
if (sb.Length > 0) if (sb.Length > 0)
sb.AppendLine(); sb.Append("\n");
sb.Append(header.ToLower()); sb.Append(header.ToLower());
sb.Append(": "); sb.Append(": ");
@@ -243,7 +244,7 @@ public class ActivityPubSignatureService(
foreach (var header in headers) foreach (var header in headers)
{ {
if (sb.Length > 0) if (sb.Length > 0)
sb.AppendLine(); sb.Append("\n");
sb.Append(header.ToLower()); sb.Append(header.ToLower());
sb.Append(": "); sb.Append(": ");