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

[backend/federation] Deserialize HostMetaResponse as an object when content type is application/xrd+xml

Browse source
This commit is contained in:
Laura Hausmann 2024-08-14 20:23:53 +02:00
parent 192f3f0312
commit 1637064d60
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
1 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
Iceshrimp.Backend/Core/Federation/WebFinger/WebFingerService.cs
View file

@ -38,7 +38,8 @@ public class WebFingerService(
private static XmlReaderSettings _xmlReaderSettings =
new() { DtdProcessing = DtdProcessing.Ignore, XmlResolver = null };
private static readonly XmlSerializer XmlSerializer = new(typeof(WebFingerResponse));
private static readonly XmlSerializer WebFingerXmlSerializer = new(typeof(WebFingerResponse));
private static readonly XmlSerializer HostMetaXmlSerializer = new(typeof(HostMetaResponse));
public async Task<WebFingerResponse?> ResolveAsync(string query)
{
@ -66,9 +67,9 @@ public class WebFingerService(
_xmlReaderSettings = new XmlReaderSettings { DtdProcessing = DtdProcessing.Ignore, XmlResolver = null };
var reader = XmlReader.Create(await res.Content.ReadAsStreamAsync(cts.Token), _xmlReaderSettings);
using var reader = XmlReader.Create(await res.Content.ReadAsStreamAsync(cts.Token), _xmlReaderSettings);
return XmlSerializer.Deserialize(reader) as WebFingerResponse ??
return WebFingerXmlSerializer.Deserialize(reader) as WebFingerResponse ??
throw new Exception("Failed to deserialize xml payload");
}
@ -124,14 +125,18 @@ public class WebFingerService(
var hostMetaUrl = $"{proto}://{domain}/.well-known/host-meta";
using var res = await client.SendAsync(httpRqSvc.Get(hostMetaUrl, ["application/xrd+xml"]),
HttpCompletionOption.ResponseHeadersRead);
await using var stream = await res.Content.ReadAsStreamAsync();
await using var stream = await res.Content.ReadAsStreamAsync();
using var reader = XmlReader.Create(stream, _xmlReaderSettings);
var deserialized = HostMetaXmlSerializer.Deserialize(reader) as HostMetaResponse;
return XElement.Load(stream)
.Descendants(XName.Get("Link", "http://docs.oasis-open.org/ns/xri/xrd-1.0"))
//.Where(p => Accept.Contains(p.Attribute("type"))?.Value ?? ""))
.FirstOrDefault(p => p.Attribute("rel")?.Value == "lrdd")
?.Attribute("template")
?.Value;
var result = deserialized?.Links.FirstOrDefault(p => p is
{
Rel: "lrdd",
//Type: "application/xrd+xml" or "application/jrd+json",
Template: not null
});
return result?.Template;
}
catch
{
@ -152,7 +157,7 @@ public class WebFingerService(
var result = deserialized?.Links.FirstOrDefault(p => p is
{
Rel: "lrdd",
//Type: "application/jrd+json",
//Type: "application/xrd+xml" or "application/jrd+json",
Template: not null
});