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

[backend/federation] Improve local instance detection in WebFingerService

Browse source
This commit is contained in:
Laura Hausmann 2024-04-19 01:21:12 +02:00
parent e23fc63906
commit f185a061dc
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,8 +2,10 @@ using System.Net;
using System.Text.Encodings.Web; using System.Text.Encodings.Web;
using System.Xml; using System.Xml;
using Iceshrimp.Backend.Controllers.Federation.Schemas; using Iceshrimp.Backend.Controllers.Federation.Schemas;
using Iceshrimp.Backend.Core.Configuration;
using Iceshrimp.Backend.Core.Middleware; using Iceshrimp.Backend.Core.Middleware;
using Iceshrimp.Backend.Core.Services; using Iceshrimp.Backend.Core.Services;
using Microsoft.Extensions.Options;
namespace Iceshrimp.Backend.Core.Federation.WebFinger; namespace Iceshrimp.Backend.Core.Federation.WebFinger;
@ -18,13 +20,20 @@ namespace Iceshrimp.Backend.Core.Federation.WebFinger;
*/ */
//FIXME: handle cursed person/group acct collisions like https://lemmy.ml/.well-known/webfinger?resource=acct:linux@lemmy.ml //FIXME: handle cursed person/group acct collisions like https://lemmy.ml/.well-known/webfinger?resource=acct:linux@lemmy.ml
//FIXME: also check if the query references the local instance in other ways (e.g. @user@{WebDomain}, @user@{AccountDomain}, https://{WebDomain}/..., etc)
public class WebFingerService(HttpClient client, HttpRequestService httpRqSvc, IHostApplicationLifetime appLifetime) public class WebFingerService(
HttpClient client,
HttpRequestService httpRqSvc,
IHostApplicationLifetime appLifetime,
IOptions<Config.InstanceSection> config
)
{ {
public async Task<WebFingerResponse?> ResolveAsync(string query) public async Task<WebFingerResponse?> ResolveAsync(string query)
{ {
(query, var proto, var domain) = ParseQuery(query); (query, var proto, var domain) = ParseQuery(query);
if (domain == config.Value.WebDomain || domain == config.Value.AccountDomain)
throw new GracefulException(HttpStatusCode.BadRequest, "Can't run WebFinger for local user");
var webFingerUrl = await GetWebFingerUrlAsync(query, proto, domain); var webFingerUrl = await GetWebFingerUrlAsync(query, proto, domain);
using var cts = CancellationTokenSource.CreateLinkedTokenSource(appLifetime.ApplicationStopping); using var cts = CancellationTokenSource.CreateLinkedTokenSource(appLifetime.ApplicationStopping);