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

[backend/federation] Handle invalid activities in InboxValidationMiddleware more gracefully

Browse source
This commit is contained in:
Laura Hausmann 2024-06-16 19:48:32 +02:00
parent 8ebef17938
commit 58e9d343ac
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
1 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Iceshrimp.Backend/Core/Middleware/InboxValidationMiddleware.cs
View file

@ -60,7 +60,29 @@ public class InboxValidationMiddleware(
var body = await new StreamReader(request.Body).ReadToEndAsync(ct); var body = await new StreamReader(request.Body).ReadToEndAsync(ct);
request.Body.Seek(0, SeekOrigin.Begin); request.Body.Seek(0, SeekOrigin.Begin);
var expanded = LdHelpers.Expand(JToken.Parse(body));
JToken parsed;
try
{
parsed = JToken.Parse(body);
}
catch (Exception e)
{
logger.LogDebug("Failed to parse ASObject ({error}), skipping", e.Message);
return;
}
JArray? expanded;
try
{
expanded = LdHelpers.Expand(parsed);
}
catch (Exception e)
{
logger.LogDebug("Failed to expand ASObject ({error}), skipping", e.Message);
return;
}
if (expanded == null) if (expanded == null)
throw new Exception("Failed to expand ASObject"); throw new Exception("Failed to expand ASObject");
var obj = ASObject.Deserialize(expanded); var obj = ASObject.Deserialize(expanded);