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

[backend/federation] Log instance blocked failures in inbox queue as debug

Browse source
This commit is contained in:
Laura Hausmann 2024-06-16 22:36:38 +02:00
parent bc270d4fed
commit 0a5e130783
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
4 changed files with 30 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Iceshrimp.Backend/Core/Federation/ActivityPub/ActivityHandlerService.cs
View file

@ -34,7 +34,7 @@ public class ActivityHandlerService(
if (activity.Actor == null) if (activity.Actor == null)
throw GracefulException.UnprocessableEntity("Cannot perform activity as actor 'null'"); throw GracefulException.UnprocessableEntity("Cannot perform activity as actor 'null'");
if (await federationCtrl.ShouldBlockAsync(activity.Actor.Id)) if (await federationCtrl.ShouldBlockAsync(activity.Actor.Id))
throw GracefulException.UnprocessableEntity("Instance is blocked"); throw new InstanceBlockedException(activity.Actor.Id);
if (activity.Object == null && activity is not ASBite) if (activity.Object == null && activity is not ASBite)
throw GracefulException.UnprocessableEntity("Activity object is null"); throw GracefulException.UnprocessableEntity("Activity object is null");

2
Iceshrimp.Backend/Core/Federation/ActivityPub/ObjectResolver.cs
View file

@ -54,7 +54,7 @@ public class ObjectResolver(
if (await federationCtrl.ShouldBlockAsync(baseObj.Id)) if (await federationCtrl.ShouldBlockAsync(baseObj.Id))
{ {
logger.LogDebug("Instance is blocked"); logger.LogDebug("Instance is blocked ({uri})", baseObj.Id);
return null; return null;
} }

15
Iceshrimp.Backend/Core/Middleware/ErrorHandlerMiddleware.cs
View file

@ -207,6 +207,21 @@ public class LocalFetchException(string uri)
public string Uri => uri; public string Uri => uri;
} }
public class InstanceBlockedException(string uri, string? host = null)
: GracefulException(HttpStatusCode.UnprocessableEntity, "Instance is blocked")
{
public string? Host
{
get
{
if (host != null) return host;
return System.Uri.TryCreate(uri, UriKind.Absolute, out var res) ? res.Host : null;
}
}
public string Uri => uri;
}
public enum ExceptionVerbosity public enum ExceptionVerbosity
{ {
[SuppressMessage("ReSharper", "UnusedMember.Global")] [SuppressMessage("ReSharper", "UnusedMember.Global")]

13
Iceshrimp.Backend/Core/Queues/InboxQueue.cs
View file

@ -25,7 +25,18 @@ public class InboxQueue(int parallelism)
throw new GracefulException("Job data is not an ASActivity", $"Type: {obj.Type}"); throw new GracefulException("Job data is not an ASActivity", $"Type: {obj.Type}");
var apHandler = scope.GetRequiredService<ActivityPub.ActivityHandlerService>(); var apHandler = scope.GetRequiredService<ActivityPub.ActivityHandlerService>();
await apHandler.PerformActivityAsync(activity, jobData.InboxUserId, jobData.AuthenticatedUserId); try
{
await apHandler.PerformActivityAsync(activity, jobData.InboxUserId, jobData.AuthenticatedUserId);
}
catch (InstanceBlockedException e)
{
var logger = scope.GetRequiredService<ILogger<InboxQueue>>();
if (e.Host != null)
logger.LogDebug("Refusing to process activity {id}: Instance {host} is blocked", job.Id, e.Host);
else
logger.LogDebug("Refusing to process activity {id}: Instance is blocked ({uri})", job.Id, e.Uri);
}
} }
} }