notfire/Iceshrimp.NET
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Proper JSON-LD canonicalization

Browse source
This commit is contained in:
Laura Hausmann 2024-01-19 18:51:20 +01:00
parent 9118cc3265
commit 16f7f89802
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
3 changed files with 10 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Iceshrimp.Backend/Core/Federation/ActivityPub/ActivityPubService.cs
View file

@ -10,11 +10,13 @@ namespace Iceshrimp.Backend.Core.Federation.ActivityPub;
//TODO: enforce @type values
public class ActivityPubService(HttpClient client, HttpRequestService httpRqSvc) {
private async Task<JArray> FetchActivity(string url) {
private static readonly JsonSerializerSettings JsonSerializerSettings = new() { DateParseHandling = DateParseHandling.None };
public async Task<JArray> FetchActivity(string url) {
var request = httpRqSvc.Get(url, ["application/activity+json"]);
var response = await client.SendAsync(request);
var input = await response.Content.ReadAsStringAsync();
var json = JsonConvert.DeserializeObject<JObject?>(input);
var json = JsonConvert.DeserializeObject<JObject?>(input, JsonSerializerSettings);
var res = LDHelpers.Expand(json);
if (res == null) throw new Exception("Failed to expand JSON-LD object");

5
Iceshrimp.Backend/Core/Federation/ActivityPub/UserResolver.cs
View file

@ -6,11 +6,6 @@ using Iceshrimp.Backend.Core.Services;
namespace Iceshrimp.Backend.Core.Federation.ActivityPub;
public class UserResolver(ILogger<UserResolver> logger, UserService userSvc, WebFingerService webFingerSvc, DatabaseContext db) {
private static string AcctToDomain(string acct) =>
acct.StartsWith("acct:") && acct.Contains('@')
? acct[5..].Split('@')[1]
: throw new Exception("Invalid acct");
/*
* The full web finger algorithm:
*

38
Iceshrimp.Backend/Core/Federation/ActivityStreams/LDHelpers.cs
View file

@ -1,5 +1,6 @@
using System.Collections;
using System.Globalization;
using Iceshrimp.Backend.Core.Helpers;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using VDS.RDF;
@ -43,8 +44,7 @@ public static class LDHelpers {
private static RemoteDocument CustomLoader(Uri uri, JsonLdLoaderOptions jsonLdLoaderOptions) {
//TODO: cache in redis
RemoteDocument? result;
ContextCache.TryGetValue(uri.ToString(), out result);
ContextCache.TryGetValue(uri.ToString(), out var result);
if (result != null) return result;
result = DefaultDocumentLoader.LoadJson(uri, jsonLdLoaderOptions);
ContextCache.Add(uri.ToString(), result);
@ -52,34 +52,8 @@ public static class LDHelpers {
return result;
}
private static string NormalizeForSignature(IEnumerable input) {
//TODO: Find a way to convert JSON-LD to RDF directly
//TODO: Fix XMLSchema#string thingy /properly/
var store = new TripleStore();
new JsonLdParser(new JsonLdProcessorOptions { DocumentLoader = CustomLoader, PruneBlankNodeIdentifiers = true })
.Load(store, new StringReader(JsonConvert.SerializeObject(input)));
//Console.WriteLine(store.Triples.SkipLast(1).Last().Object);
var formatter = new NQuadsFormatter(NQuadsSyntax.Rdf11);
Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
var ordered = store.Triples
.Select(p => formatter.Format(p).Replace("^^<http://www.w3.org/2001/XMLSchema#string>", ""))
.Order().ToList();
var processedP1 = ordered.Where(p => p.StartsWith('_')).ToList();
var processedP2 = ordered.Except(processedP1);
return string.Join('\n', processedP2.Union(processedP1));
}
public static JArray? Expand(JToken? json) {
return JsonLdProcessor.Expand(json, Options);
}
public static JObject? Compact(JToken? json) {
return JsonLdProcessor.Compact(json, DefaultContext, Options);
}
public static JObject? Compact(object obj) {
return Compact(JToken.FromObject(obj));
}
public static JObject? Compact(object obj) => Compact(JToken.FromObject(obj));
public static JObject? Compact(JToken? json) => JsonLdProcessor.Compact(json, DefaultContext, Options);
public static JArray? Expand(JToken? json) => JsonLdProcessor.Expand(json, Options);
public static string Canonicalize(JArray json) => JsonLdProcessor.Canonicalize(json);
}