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

[backend/federation] Support resolving actors by aliases not directly resolvable via WebFinger

Browse source 
This fixes resolving pixelfed users by their user-facing uri (instance.tld/username).
This commit is contained in:
Laura Hausmann 2024-05-23 14:05:48 +02:00
parent 9d0ee19922
commit 0f69013224
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
1 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -14,6 +14,7 @@ public class UserResolver(
UserService userSvc,
WebFingerService webFingerSvc,
FollowupTaskService followupTaskSvc,
ActivityFetcherService fetchSvc,
IOptions<Config.InstanceSection> config,
DatabaseContext db
)
@ -35,13 +36,35 @@ public class UserResolver(
* Avoid repeating WebFinger's with same URI for performance, optimize away validation checks when the domain matches
*/
private async Task<(string Acct, string Uri)> WebFingerAsync(string query)
private async Task<(string Acct, string Uri)> WebFingerAsync(string query, bool recurse = true)
{
logger.LogDebug("Running WebFinger for query '{query}'", query);
var responses = new Dictionary<string, WebFingerResponse>();
var fingerRes = await webFingerSvc.ResolveAsync(query);
if (fingerRes == null) throw new GracefulException($"Failed to WebFinger '{query}'");
if (fingerRes == null)
{
if (recurse && query.StartsWith("https://"))
{
logger.LogDebug("WebFinger returned null, fetching actor as fallback");
try
{
var actor = await fetchSvc.FetchActorAsync(query);
if (query != actor.Id)
{
logger.LogDebug("Actor ID differs from query, retrying...");
return await WebFingerAsync(actor.Id, false);
}
}
catch (Exception e)
{
logger.LogDebug("Failed to fetch actor {uri}: {e}", query, e.Message);
}
}
throw new GracefulException($"Failed to WebFinger '{query}'");
}
responses.Add(query, fingerRes);
var apUri = fingerRes.Links.FirstOrDefault(p => p is { Rel: "self", Type: "application/activity+json" })?.Href;