House rules: primary constructors, a cancellation token on every async call, and the rules fail the build
Build / Build (push) Successful in 30s
Build / Build (push) Successful in 30s
- Services, controllers and jobs take their dependencies through primary constructors and use them directly; where a method already named a local after a dependency, the dependency takes its type's name. - Every async method takes a CancellationToken last and passes it down to MongoDB, HTTP and the job queue. The setup claim is still given back when a request is cancelled. - The federation and media options are read through IOptionsMonitor. - The Mastodon entities keep sending "" for empty strings, and every model field where null means something says so. - The inbox's 503 with Retry-After, which other servers retry, is the one server error left, and says why. - Arasaka.HouseRules.Analyzers checks all of this in every build, here and in PrivaPub.ClientModels as decePubClient builds it. Checked against GoToSocial in the pasture: 64 passed, 0 failed. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01W4YtEJrgxG12Pc39Fai8Bd
This commit is contained in:
1 parent
f0a14c737f
commit
0f73f69239
176 files changed
+2789
-3974
No files matched your search
@@ -17,16 +17,11 @@ namespace PrivaPub.Federation.Controllers
|
||||
// answers 410 with a Tombstone. An emoji tells nothing about anyone, so it is served unsigned under SecureMode too, as the
|
||||
// server's own actors are; a browser is sent to the picture.
|
||||
[ApiController]
|
||||
public class EmojisController : ControllerBase
|
||||
public class EmojisController(
|
||||
ILocalActorService localActors) : ControllerBase
|
||||
{
|
||||
const string ActivityContentType = "application/activity+json; charset=utf-8";
|
||||
|
||||
readonly ILocalActorService _localActors;
|
||||
|
||||
public EmojisController(ILocalActorService localActors)
|
||||
{
|
||||
_localActors = localActors;
|
||||
}
|
||||
|
||||
[HttpGet, Route("/" + LocalEmojis.Path + "/{shortcode}")]
|
||||
public async Task<IActionResult> Get(string shortcode, CancellationToken token)
|
||||
@@ -44,7 +39,7 @@ namespace PrivaPub.Federation.Controllers
|
||||
Content = new JsonObject
|
||||
{
|
||||
["@context"] = ActivityPubRenderer.ActivityStreams,
|
||||
["id"] = LocalEmojis.Uri(_localActors.BaseAddress, emoji.Shortcode),
|
||||
["id"] = LocalEmojis.Uri(localActors.BaseAddress, emoji.Shortcode),
|
||||
["type"] = "Tombstone",
|
||||
["formerType"] = "Emoji",
|
||||
["deleted"] = ActivityPubRenderer.Timestamp(deleted)
|
||||
@@ -60,7 +55,7 @@ namespace PrivaPub.Federation.Controllers
|
||||
emoji.ImageUpdatedAt, emoji.Category, emoji.VisibleInPicker);
|
||||
return new ContentResult
|
||||
{
|
||||
Content = LocalEmojis.Document(live, _localActors.BaseAddress).ToJsonString(),
|
||||
Content = LocalEmojis.Document(live, localActors.BaseAddress).ToJsonString(),
|
||||
ContentType = ActivityContentType,
|
||||
StatusCode = StatusCodes.Status200OK
|
||||
};
|
||||
|
||||
@@ -26,34 +26,23 @@ using PrivaPub.Infrastructure;
|
||||
namespace PrivaPub.Federation.Controllers
|
||||
{
|
||||
[ApiController, Route("peasants")]
|
||||
public class PeasantsController : ControllerBase, IAsyncActionFilter
|
||||
public class PeasantsController(
|
||||
ILocalActorService localActors,
|
||||
IInboxReceiver inboxReceiver,
|
||||
DbEntities dbEntities,
|
||||
ILogger<PeasantsController> logger,
|
||||
ISignedFetchAuthorizer fetches,
|
||||
IOptionsMonitor<FederationOptions> federation) : ControllerBase, IAsyncActionFilter
|
||||
{
|
||||
const string ActivityContentType = "application/activity+json; charset=utf-8";
|
||||
const int OutboxSize = 20;
|
||||
|
||||
readonly ILocalActorService _localActors;
|
||||
readonly IInboxReceiver _inbox;
|
||||
readonly DbEntities _dbEntities;
|
||||
readonly ILogger<PeasantsController> _logger;
|
||||
readonly ISignedFetchAuthorizer _fetches;
|
||||
readonly IOptionsMonitor<FederationOptions> _federation;
|
||||
|
||||
public PeasantsController(ILocalActorService localActors, IInboxReceiver inbox, DbEntities dbEntities,
|
||||
ILogger<PeasantsController> logger, ISignedFetchAuthorizer fetches, IOptionsMonitor<FederationOptions> federation)
|
||||
{
|
||||
_fetches = fetches;
|
||||
_federation = federation;
|
||||
_localActors = localActors;
|
||||
_inbox = inbox;
|
||||
_dbEntities = dbEntities;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
[HttpGet, Route("{actor}")]
|
||||
public async Task<IActionResult> GetActor(string actor, CancellationToken token)
|
||||
{
|
||||
var local = await _localActors.FindByUserName(actor, token);
|
||||
if (local == default && await _localActors.Gone(actor, token) is { } gone)
|
||||
var local = await localActors.FindByUserName(actor, token);
|
||||
if (local == default && await localActors.Gone(actor, token) is { } gone)
|
||||
return new ContentResult
|
||||
{
|
||||
Content = new JsonObject
|
||||
@@ -82,14 +71,14 @@ namespace PrivaPub.Federation.Controllers
|
||||
var accept = Request.Headers.Accept.ToString();
|
||||
if (!accept.Contains("activity+json", StringComparison.OrdinalIgnoreCase) && !accept.Contains("ld+json", StringComparison.OrdinalIgnoreCase))
|
||||
return NotFound();
|
||||
return Activity(ActivityPubRenderer.Actor(await _localActors.GetInstanceActor(token)));
|
||||
return Activity(ActivityPubRenderer.Actor(await localActors.GetInstanceActor(token)));
|
||||
}
|
||||
|
||||
[HttpGet, Route("{actor}/anus")]
|
||||
public async Task<IActionResult> Outbox(string actor, [FromQuery] bool page, [FromQuery(Name = "max_id")] string maxId,
|
||||
CancellationToken token)
|
||||
{
|
||||
var local = await _localActors.FindByUserName(actor, token);
|
||||
var local = await localActors.FindByUserName(actor, token);
|
||||
if (local is not { IsFederated: true })
|
||||
return NotFound();
|
||||
|
||||
@@ -101,8 +90,8 @@ namespace PrivaPub.Federation.Controllers
|
||||
}
|
||||
|
||||
var query = local.Kind == LocalActorKind.Group
|
||||
? _dbEntities.Posts.Match(p => p.GroupId == local.Id).Match(VisibilityPolicy.IsPublic)
|
||||
: _dbEntities.Posts.Match(p => p.GroupUserId == local.Id && !p.IsFederatedCopy).Match(VisibilityPolicy.IsPublic);
|
||||
? dbEntities.Posts.Match(p => p.GroupId == local.Id).Match(VisibilityPolicy.IsPublic)
|
||||
: dbEntities.Posts.Match(p => p.GroupUserId == local.Id && !p.IsFederatedCopy).Match(VisibilityPolicy.IsPublic);
|
||||
if (!string.IsNullOrEmpty(maxId))
|
||||
query.Match(f => f.Lt(p => p.ID, maxId));
|
||||
var latest = await query.Sort(p => p.ID, Order.Descending).Limit(OutboxSize).ExecuteAsync(token);
|
||||
@@ -134,11 +123,11 @@ namespace PrivaPub.Federation.Controllers
|
||||
[HttpGet, Route("{actor}/groupies")]
|
||||
public async Task<IActionResult> Followers(string actor, CancellationToken token)
|
||||
{
|
||||
var local = await _localActors.FindByUserName(actor, token);
|
||||
var local = await localActors.FindByUserName(actor, token);
|
||||
if (local is not { IsFederated: true })
|
||||
return NotFound();
|
||||
if (local.IsCircle && !SignedFetchAuthorizer.MayReadCircle(await _dbEntities.Groups.MatchID(local.Id).ExecuteFirstAsync(token),
|
||||
await _fetches.Requester(Request, token)))
|
||||
if (local.IsCircle && !SignedFetchAuthorizer.MayReadCircle(await dbEntities.Groups.MatchID(local.Id).ExecuteFirstAsync(token),
|
||||
await fetches.Requester(Request, token)))
|
||||
return NotFound();
|
||||
var count = await DB.Default.CountAsync<Follower>(
|
||||
f => f.LocalActorId == local.Id && f.LocalActorKind == local.Kind && f.IsAccepted, token);
|
||||
@@ -150,7 +139,7 @@ namespace PrivaPub.Federation.Controllers
|
||||
[HttpGet, Route("{actor}/" + Walls.Path)]
|
||||
public async Task<IActionResult> Wall(string actor, [FromQuery] bool page, [FromQuery(Name = "max_id")] string maxId, CancellationToken token)
|
||||
{
|
||||
var local = await _localActors.FindByUserName(actor, token);
|
||||
var local = await localActors.FindByUserName(actor, token);
|
||||
if (local is not { HasWall: true })
|
||||
return NotFound();
|
||||
var wall = local.Wall;
|
||||
@@ -161,7 +150,7 @@ namespace PrivaPub.Federation.Controllers
|
||||
|| p.GroupUserId == local.Id && !p.IsFederatedCopy && p.ReblogOfPostId == null && p.AnsweringToPostId == null && p.InReplyToURI == null && p.GroupId == null);
|
||||
if (!page)
|
||||
return Activity(ActivityPubRenderer.OrderedCollection(wall, (int)await DB.Default.CountAsync(onWall, token), default, $"{wall}?page=true"));
|
||||
var query = _dbEntities.Posts.Match(onWall);
|
||||
var query = dbEntities.Posts.Match(onWall);
|
||||
if (!string.IsNullOrEmpty(maxId))
|
||||
query.Match(f => f.Lt(p => p.ID, maxId));
|
||||
var latest = await query.Sort(p => p.ID, Order.Descending).Limit(OutboxSize).ExecuteAsync(token);
|
||||
@@ -174,10 +163,10 @@ namespace PrivaPub.Federation.Controllers
|
||||
[HttpGet, Route("{actor}/groupies/roll-call")]
|
||||
public async Task<IActionResult> RollCall(string actor, CancellationToken token)
|
||||
{
|
||||
var local = await _localActors.FindByUserName(actor, token);
|
||||
var local = await localActors.FindByUserName(actor, token);
|
||||
if (local is not { IsFederated: true } || !FollowersSynchronization.Synchronizes(local))
|
||||
return NotFound();
|
||||
var requester = await _fetches.Requester(Request, token);
|
||||
var requester = await fetches.Requester(Request, token);
|
||||
if (requester == default)
|
||||
return StatusCode(StatusCodes.Status401Unauthorized);
|
||||
var there = await FollowersSynchronization.On(local, FollowersSynchronization.Origin(requester.ActorURI), token);
|
||||
@@ -187,7 +176,7 @@ namespace PrivaPub.Federation.Controllers
|
||||
[HttpGet, Route("{actor}/stalking")]
|
||||
public async Task<IActionResult> Following(string actor, CancellationToken token)
|
||||
{
|
||||
var local = await _localActors.FindByUserName(actor, token);
|
||||
var local = await localActors.FindByUserName(actor, token);
|
||||
if (local is not { IsFederated: true })
|
||||
return NotFound();
|
||||
// the count, as following_count says it; who is followed is never listed (FEDERATION.md)
|
||||
@@ -200,11 +189,11 @@ namespace PrivaPub.Federation.Controllers
|
||||
[HttpGet, Route("{actor}/flock")]
|
||||
public async Task<IActionResult> Members(string actor, CancellationToken token)
|
||||
{
|
||||
var local = await _localActors.FindByUserName(actor, token);
|
||||
var local = await localActors.FindByUserName(actor, token);
|
||||
if (local is not { IsFederated: true, Kind: LocalActorKind.Group })
|
||||
return NotFound();
|
||||
var group = await _dbEntities.Groups.MatchID(local.Id).ExecuteFirstAsync(token);
|
||||
if (local.IsCircle && !SignedFetchAuthorizer.MayReadCircle(group, await _fetches.Requester(Request, token)))
|
||||
var group = await dbEntities.Groups.MatchID(local.Id).ExecuteFirstAsync(token);
|
||||
if (local.IsCircle && !SignedFetchAuthorizer.MayReadCircle(group, await fetches.Requester(Request, token)))
|
||||
return NotFound();
|
||||
return Activity(ActivityPubRenderer.OrderedCollection(local.Flock, group.Members.Count, default));
|
||||
}
|
||||
@@ -212,15 +201,15 @@ namespace PrivaPub.Federation.Controllers
|
||||
[HttpGet, Route("{actor}/wardens")]
|
||||
public async Task<IActionResult> Moderators(string actor, CancellationToken token)
|
||||
{
|
||||
var local = await _localActors.FindByUserName(actor, token);
|
||||
var local = await localActors.FindByUserName(actor, token);
|
||||
if (local is not { IsFederated: true, Kind: LocalActorKind.Group })
|
||||
return NotFound();
|
||||
var group = await _dbEntities.Groups.MatchID(local.Id).ExecuteFirstAsync(token);
|
||||
if (local.IsCircle && !SignedFetchAuthorizer.MayReadCircle(group, await _fetches.Requester(Request, token)))
|
||||
var group = await dbEntities.Groups.MatchID(local.Id).ExecuteFirstAsync(token);
|
||||
if (local.IsCircle && !SignedFetchAuthorizer.MayReadCircle(group, await fetches.Requester(Request, token)))
|
||||
return NotFound();
|
||||
var moderators = new List<JsonNode>();
|
||||
foreach (var member in group.Members.Where(m => !m.IsForeign && m.Role is GroupRole.Owner or GroupRole.Moderator))
|
||||
if (await _localActors.FindById(LocalActorKind.Person, member.AvatarId, token) is { } moderator)
|
||||
if (await localActors.FindById(LocalActorKind.Person, member.AvatarId, token) is { } moderator)
|
||||
moderators.Add(moderator.Uri);
|
||||
return Activity(ActivityPubRenderer.OrderedCollection(local.Wardens, moderators.Count, moderators));
|
||||
}
|
||||
@@ -228,14 +217,14 @@ namespace PrivaPub.Federation.Controllers
|
||||
[HttpGet, Route("{actor}/trophies")]
|
||||
public async Task<IActionResult> Featured(string actor, CancellationToken token)
|
||||
{
|
||||
var local = await _localActors.FindByUserName(actor, token);
|
||||
var local = await localActors.FindByUserName(actor, token);
|
||||
if (local is not { IsFederated: true })
|
||||
return NotFound();
|
||||
var pinIds = (await DB.Default.Find<Pin>().Match(p => p.AvatarId == local.Id).Sort(p => p.ID, Order.Descending).ExecuteAsync(token))
|
||||
.Select(p => p.PostId).ToList();
|
||||
var posts = pinIds.Count == 0
|
||||
? new List<PostEntity>()
|
||||
: await _dbEntities.Posts.Match(p => pinIds.Contains(p.ID) && p.GroupUserId == local.Id && p.ReblogOfPostId == null)
|
||||
: await dbEntities.Posts.Match(p => pinIds.Contains(p.ID) && p.GroupUserId == local.Id && p.ReblogOfPostId == null)
|
||||
.Match(VisibilityPolicy.IsPublic).ExecuteAsync(token);
|
||||
var notes = new List<JsonNode>();
|
||||
foreach (var id in pinIds)
|
||||
@@ -249,7 +238,7 @@ namespace PrivaPub.Federation.Controllers
|
||||
[HttpGet, Route("{actor}/tattoos")]
|
||||
public async Task<IActionResult> FeaturedTags(string actor, CancellationToken token)
|
||||
{
|
||||
var local = await _localActors.FindByUserName(actor, token);
|
||||
var local = await localActors.FindByUserName(actor, token);
|
||||
if (local is not { IsFederated: true })
|
||||
return NotFound();
|
||||
var tags = local.Kind == LocalActorKind.Person
|
||||
@@ -278,7 +267,7 @@ namespace PrivaPub.Federation.Controllers
|
||||
if (WantsHtml())
|
||||
return Redirect(local.PostHtmlUrl(post.ID));
|
||||
|
||||
var group = string.IsNullOrEmpty(post.GroupId) ? default : await _localActors.FindById(LocalActorKind.Group, post.GroupId, token);
|
||||
var group = string.IsNullOrEmpty(post.GroupId) ? default : await localActors.FindById(LocalActorKind.Group, post.GroupId, token);
|
||||
var note = ActivityPubRenderer.Note(post, local, group, post.InReplyToURI);
|
||||
note["@context"] = ActivityPubRenderer.Context();
|
||||
return Activity(note);
|
||||
@@ -291,7 +280,7 @@ namespace PrivaPub.Federation.Controllers
|
||||
var (local, post) = await PublicPost(actor, postId, token);
|
||||
if (post == default || post.IsLocalOnly || !string.IsNullOrEmpty(post.GroupId))
|
||||
return NotFound();
|
||||
var replies = await _dbEntities.Posts.Match(p => p.AnsweringToPostId == post.ID && !p.IsLocalOnly && p.ReblogOfPostId == null)
|
||||
var replies = await dbEntities.Posts.Match(p => p.AnsweringToPostId == post.ID && !p.IsLocalOnly && p.ReblogOfPostId == null)
|
||||
.Match(VisibilityPolicy.IsPublic).Sort(p => p.CreationDate, Order.Ascending).Limit(MaxThread).ExecuteAsync(token);
|
||||
replies.RemoveAll(VisibilityPolicy.Barred);
|
||||
return Activity(ActivityPubRenderer.OrderedCollection(local.PostUri(post.ID) + "/replies", replies.Count,
|
||||
@@ -309,7 +298,7 @@ namespace PrivaPub.Federation.Controllers
|
||||
var level = new List<string> { root.ID };
|
||||
for (var depth = 0; depth < PrivaPub.Federation.Inbox.RemotePosts.MaxDepth && level.Count > 0 && thread.Count < MaxThread; depth++)
|
||||
{
|
||||
var next = await _dbEntities.Posts.Match(p => level.Contains(p.AnsweringToPostId) && !p.IsLocalOnly && p.ReblogOfPostId == null)
|
||||
var next = await dbEntities.Posts.Match(p => level.Contains(p.AnsweringToPostId) && !p.IsLocalOnly && p.ReblogOfPostId == null)
|
||||
.Match(VisibilityPolicy.IsPublic).Sort(p => p.CreationDate, Order.Ascending).Limit(MaxThread - thread.Count).ExecuteAsync(token);
|
||||
thread.AddRange(next.Where(p => !VisibilityPolicy.Barred(p)));
|
||||
level = next.Select(p => p.ID).ToList();
|
||||
@@ -324,9 +313,9 @@ namespace PrivaPub.Federation.Controllers
|
||||
[HttpGet, Route("{actor}/parrot-licences/{licenceId}")]
|
||||
public async Task<IActionResult> ParrotLicence(string actor, string licenceId, CancellationToken token)
|
||||
{
|
||||
var author = await _localActors.FindByUserName(actor, token);
|
||||
var author = await localActors.FindByUserName(actor, token);
|
||||
var licence = author == default ? default : await DB.Default.Find<QuoteLicence>().Match(l => l.ID == licenceId && l.AuthorAvatarId == author.Id).ExecuteFirstAsync(token);
|
||||
var quoted = licence == default ? default : await _dbEntities.Posts.MatchID(licence.PostId).ExecuteFirstAsync(token);
|
||||
var quoted = licence == default ? default : await dbEntities.Posts.MatchID(licence.PostId).ExecuteFirstAsync(token);
|
||||
if (quoted == default)
|
||||
return NotFound();
|
||||
var uri = Domain.Statuses.QuoteService.LicenceUri(author, licence.ID);
|
||||
@@ -353,13 +342,13 @@ namespace PrivaPub.Federation.Controllers
|
||||
{
|
||||
if (activityId.StartsWith("announce-", StringComparison.Ordinal))
|
||||
{
|
||||
var booster = await _localActors.FindByUserName(actor, token);
|
||||
var booster = await localActors.FindByUserName(actor, token);
|
||||
var uri = booster?.ActivityUri(activityId);
|
||||
if (booster is { Kind: LocalActorKind.Group, IsCircle: false })
|
||||
return await GroupAnnounce(booster, activityId, uri, token);
|
||||
var reblog = uri == default ? default : await _dbEntities.Posts.Match(p => p.ObjectURI == uri && !p.DeletedAt.HasValue).ExecuteFirstAsync(token);
|
||||
var reblog = uri == default ? default : await dbEntities.Posts.Match(p => p.ObjectURI == uri && !p.DeletedAt.HasValue).ExecuteFirstAsync(token);
|
||||
var rendered = reblog == default ? default : await AnnounceFor(reblog, token);
|
||||
if (rendered != default && WantsHtml() && await _dbEntities.Posts.MatchID(reblog.ReblogOfPostId).ExecuteFirstAsync(token) is { } boosted)
|
||||
if (rendered != default && WantsHtml() && await dbEntities.Posts.MatchID(reblog.ReblogOfPostId).ExecuteFirstAsync(token) is { } boosted)
|
||||
return Redirect(boosted.Url ?? boosted.ObjectURI);//a boost has no page of its own: the boosted post's
|
||||
return rendered == default ? NotFound() : Activity(rendered);
|
||||
}
|
||||
@@ -377,14 +366,14 @@ namespace PrivaPub.Federation.Controllers
|
||||
[HttpGet, Route("{actor}/whispers/{conversationId}")]
|
||||
public async Task<IActionResult> Whispers(string actor, string conversationId, CancellationToken token)
|
||||
{
|
||||
var local = await _localActors.FindByUserName(actor, token);
|
||||
var local = await localActors.FindByUserName(actor, token);
|
||||
if (local is not { IsFederated: true, Kind: LocalActorKind.Person })
|
||||
return NotFound();
|
||||
var uri = local.ConversationUri(conversationId);
|
||||
var conversation = await _dbEntities.DmGroups.Match(g => g.ID == conversationId && g.ConversationURI == uri && !g.DeletionAt.HasValue).ExecuteFirstAsync(token);
|
||||
if (conversation == default || !SignedFetchAuthorizer.MayReadConversation(conversation, await _fetches.Requester(Request, token)))
|
||||
var conversation = await dbEntities.DmGroups.Match(g => g.ID == conversationId && g.ConversationURI == uri && !g.DeletionAt.HasValue).ExecuteFirstAsync(token);
|
||||
if (conversation == default || !SignedFetchAuthorizer.MayReadConversation(conversation, await fetches.Requester(Request, token)))
|
||||
return NotFound();
|
||||
var posts = await _dbEntities.Posts
|
||||
var posts = await dbEntities.Posts
|
||||
.Match(p => p.ConversationId == conversationId && p.Visibility == PostVisibility.Direct && !p.DeletedAt.HasValue)
|
||||
.Sort(p => p.CreationDate, Order.Ascending)
|
||||
.ExecuteAsync(token);
|
||||
@@ -401,28 +390,28 @@ namespace PrivaPub.Federation.Controllers
|
||||
[HttpPost, Route("{actor}/mouth"), EnableRateLimiting(RateLimiting.Inbox)]
|
||||
public async Task<IActionResult> Inbox(string actor, CancellationToken token)
|
||||
{
|
||||
var local = await _localActors.FindByUserName(actor, token);
|
||||
if (local == default && await _localActors.Gone(actor, token) != default)
|
||||
var local = await localActors.FindByUserName(actor, token);
|
||||
if (local == default && await localActors.Gone(actor, token) != default)
|
||||
return StatusCode(StatusCodes.Status410Gone);
|
||||
if (local is not { IsFederated: true })
|
||||
return Answer(_inbox.NoSuchRecipient(Request));
|
||||
return Answer(await _inbox.Receive(Request, local, token));
|
||||
return Answer(inboxReceiver.NoSuchRecipient(Request));
|
||||
return Answer(await inboxReceiver.Receive(Request, local, token));
|
||||
}
|
||||
|
||||
[HttpPost, Route("{actor}/human-centipede"), EnableRateLimiting(RateLimiting.Inbox)]
|
||||
public async Task<IActionResult> ActorSharedInbox(string actor, CancellationToken token) =>
|
||||
Answer(await _inbox.Receive(Request, default, token));
|
||||
Answer(await inboxReceiver.Receive(Request, default, token));
|
||||
|
||||
[HttpPost, Route("/human-centipede"), EnableRateLimiting(RateLimiting.Inbox)]
|
||||
public async Task<IActionResult> SharedInbox(CancellationToken token) =>
|
||||
Answer(await _inbox.Receive(Request, default, token));
|
||||
Answer(await inboxReceiver.Receive(Request, default, token));
|
||||
|
||||
async Task<(LocalActor Actor, PostEntity Post)> PublicPost(string actor, string postId, CancellationToken token)
|
||||
{
|
||||
var local = await _localActors.FindByUserName(actor, token);
|
||||
var local = await localActors.FindByUserName(actor, token);
|
||||
if (local is not { IsFederated: true, Kind: LocalActorKind.Person })
|
||||
return default;
|
||||
var post = await _dbEntities.Posts
|
||||
var post = await dbEntities.Posts
|
||||
.Match(p => p.ID == postId && p.GroupUserId == local.Id && !p.IsFederatedCopy && p.ReblogOfPostId == null)
|
||||
.Match(VisibilityPolicy.IsPublic)
|
||||
.ExecuteFirstAsync(token);
|
||||
@@ -434,24 +423,24 @@ namespace PrivaPub.Federation.Controllers
|
||||
// member, or the members on the requesting instance actor's server.
|
||||
async Task<(LocalActor Author, PostEntity Post, JsonObject Note)?> SignedPost(string actor, string postId, CancellationToken token)
|
||||
{
|
||||
var local = await _localActors.FindByUserName(actor, token);
|
||||
var local = await localActors.FindByUserName(actor, token);
|
||||
if (local is not { IsFederated: true, Kind: LocalActorKind.Person })
|
||||
return default;
|
||||
var post = await _dbEntities.Posts
|
||||
var post = await dbEntities.Posts
|
||||
.Match(p => p.ID == postId && p.GroupUserId == local.Id && !p.IsFederatedCopy && p.ReblogOfPostId == null
|
||||
&& (p.Visibility == PostVisibility.FollowersOnly || p.Visibility == PostVisibility.Direct || p.Visibility == PostVisibility.Circle))
|
||||
.ExecuteFirstAsync(token);
|
||||
if (post == default)
|
||||
return default;
|
||||
var requester = await _fetches.Requester(Request, token);
|
||||
if (!await _fetches.MayRead(post, requester, token))
|
||||
var requester = await fetches.Requester(Request, token);
|
||||
if (!await fetches.MayRead(post, requester, token))
|
||||
return default;
|
||||
if (post.Visibility == PostVisibility.Circle)
|
||||
{
|
||||
var circle = await _dbEntities.Groups.MatchID(post.GroupId).ExecuteFirstAsync(token);
|
||||
var note = ActivityPubRenderer.Note(post, local, _localActors.FromGroup(circle), post.InReplyToURI);
|
||||
var circle = await dbEntities.Groups.MatchID(post.GroupId).ExecuteFirstAsync(token);
|
||||
var note = ActivityPubRenderer.Note(post, local, localActors.FromGroup(circle), post.InReplyToURI);
|
||||
var readers = SignedFetchAuthorizer.CircleReaders(circle, requester);
|
||||
var named = readers.Count == 0 ? new List<Models.User.ForeignAvatar>() : await _dbEntities.ForeignAvatars.Match(a => readers.Contains(a.ActorURI)).ExecuteAsync(token);
|
||||
var named = readers.Count == 0 ? new List<Models.User.ForeignAvatar>() : await dbEntities.ForeignAvatars.Match(a => readers.Contains(a.ActorURI)).ExecuteAsync(token);
|
||||
return (local, post, OutboxPublisher.Naming(note, named));
|
||||
}
|
||||
var rendered = post.Visibility == PostVisibility.Direct
|
||||
@@ -464,10 +453,10 @@ namespace PrivaPub.Federation.Controllers
|
||||
|
||||
async Task<IActionResult> Tombstone(string actor, string postId, CancellationToken token)
|
||||
{
|
||||
var local = await _localActors.FindByUserName(actor, token);
|
||||
var local = await localActors.FindByUserName(actor, token);
|
||||
if (local is not { IsFederated: true, Kind: LocalActorKind.Person })
|
||||
return default;
|
||||
var deleted = await _dbEntities.Posts
|
||||
var deleted = await dbEntities.Posts
|
||||
.Match(p => p.ID == postId && p.GroupUserId == local.Id && !p.IsFederatedCopy && p.DeletedAt.HasValue
|
||||
&& (p.Visibility == PostVisibility.Public || p.Visibility == PostVisibility.Unlisted))
|
||||
.ExecuteFirstAsync(token);
|
||||
@@ -493,7 +482,7 @@ namespace PrivaPub.Federation.Controllers
|
||||
{
|
||||
if (await DB.Default.Find<GroupAnnouncement>().Match(a => a.ActivityURI == uri && a.GroupId == group.Id).ExecuteFirstAsync(token) is { } kept)
|
||||
{
|
||||
var about = await _dbEntities.Posts.Match(p => p.ObjectURI == kept.ObjectURI).ExecuteFirstAsync(token);
|
||||
var about = await dbEntities.Posts.Match(p => p.ObjectURI == kept.ObjectURI).ExecuteFirstAsync(token);
|
||||
if (!VisibilityPolicy.Shown(about) || about.Visibility is not (PostVisibility.Public or PostVisibility.Unlisted))
|
||||
return StatusCode(StatusCodes.Status410Gone);
|
||||
var body = JsonNode.Parse(kept.Body)!.AsObject();
|
||||
@@ -501,13 +490,13 @@ namespace PrivaPub.Federation.Controllers
|
||||
return Activity(body);
|
||||
}
|
||||
var postId = activityId["announce-".Length..];
|
||||
var post = await _dbEntities.Posts.Match(p => p.ID == postId && p.GroupId == group.Id).Match(VisibilityPolicy.IsPublic).ExecuteFirstAsync(token);
|
||||
var post = await dbEntities.Posts.Match(p => p.ID == postId && p.GroupId == group.Id).Match(VisibilityPolicy.IsPublic).ExecuteFirstAsync(token);
|
||||
return post == default ? NotFound() : Activity(ActivityPubRenderer.Announce(group, post.ObjectURI, activityId, post.CreationDate));
|
||||
}
|
||||
|
||||
async Task<JsonObject> AnnounceFor(PostEntity reblog, CancellationToken token)
|
||||
{
|
||||
var original = await _dbEntities.Posts.MatchID(reblog.ReblogOfPostId).ExecuteFirstAsync(token);
|
||||
var original = await dbEntities.Posts.MatchID(reblog.ReblogOfPostId).ExecuteFirstAsync(token);
|
||||
if (!VisibilityPolicy.Shown(original))
|
||||
return default;
|
||||
return new JsonObject
|
||||
@@ -525,7 +514,7 @@ namespace PrivaPub.Federation.Controllers
|
||||
|
||||
async Task<JsonObject> CreateFor(PostEntity post, LocalActor author, CancellationToken token)
|
||||
{
|
||||
var group = string.IsNullOrEmpty(post.GroupId) ? default : await _localActors.FindById(LocalActorKind.Group, post.GroupId, token);
|
||||
var group = string.IsNullOrEmpty(post.GroupId) ? default : await localActors.FindById(LocalActorKind.Group, post.GroupId, token);
|
||||
var note = ActivityPubRenderer.Note(post, author, group, post.InReplyToURI);
|
||||
return ActivityPubRenderer.Create(author, note, $"create-{post.ID}");
|
||||
}
|
||||
@@ -546,9 +535,9 @@ namespace PrivaPub.Federation.Controllers
|
||||
// SecureMode asks every reader of ActivityPub documents for a signature, except for the server's own actors (the
|
||||
// instance actor, the reporter, the reader of feeds), whose keys peers need first, and except for browsers, which
|
||||
// only get redirected to the public pages
|
||||
if (_federation.CurrentValue.SecureMode && HttpMethods.IsGet(Request.Method) && !WantsHtml() && Request.Path.Value != "/"
|
||||
if (federation.CurrentValue.SecureMode && HttpMethods.IsGet(Request.Method) && !WantsHtml() && Request.Path.Value != "/"
|
||||
&& !LocalActorService.IsServerActorName(context.RouteData.Values["actor"] as string)
|
||||
&& await _fetches.Requester(Request, HttpContext.RequestAborted) == default)
|
||||
&& await fetches.Requester(Request, HttpContext.RequestAborted) == default)
|
||||
{
|
||||
context.Result = StatusCode(StatusCodes.Status401Unauthorized);
|
||||
return;
|
||||
@@ -557,7 +546,7 @@ namespace PrivaPub.Federation.Controllers
|
||||
// nothing new is told of it, and lifting the suspension serves it all again (owner decision 2026-10-17)
|
||||
if (HttpMethods.IsGet(Request.Method) && context.RouteData.Values["actor"] is string name
|
||||
&& context.ActionDescriptor is Microsoft.AspNetCore.Mvc.Controllers.ControllerActionDescriptor { ActionName: not nameof(GetActor) }
|
||||
&& await _localActors.FindByUserName(name, HttpContext.RequestAborted) is { Kind: LocalActorKind.Person, Suspended: true })
|
||||
&& await localActors.FindByUserName(name, HttpContext.RequestAborted) is { Kind: LocalActorKind.Person, Suspended: true })
|
||||
{
|
||||
context.Result = NotFound();
|
||||
return;
|
||||
@@ -568,7 +557,7 @@ namespace PrivaPub.Federation.Controllers
|
||||
IActionResult Answer(InboxResult result)
|
||||
{
|
||||
if (result.Error != default)
|
||||
_logger.LogInformation("Inbox refused with {Status} ({Reason}): {Error}", result.StatusCode, result.Reason, result.Error);
|
||||
logger.LogInformation("Inbox refused with {Status} ({Reason}): {Error}", result.StatusCode, result.Reason, result.Error);
|
||||
if (result.RetryAfterSeconds is { } seconds)
|
||||
Response.Headers.RetryAfter = seconds.ToString(System.Globalization.CultureInfo.InvariantCulture);
|
||||
return result.Error == default ? StatusCode(result.StatusCode) : StatusCode(result.StatusCode, result.Error);
|
||||
|
||||
@@ -18,31 +18,20 @@ using PrivaPub.Infrastructure;
|
||||
namespace PrivaPub.Federation.Controllers
|
||||
{
|
||||
[ApiController]
|
||||
public class WellKnownController : ControllerBase
|
||||
public class WellKnownController(
|
||||
ILocalActorService localActors,
|
||||
IOptionsMonitor<RegistrationOptions> registrations,
|
||||
Domain.Instance.IInstanceSettings settings) : ControllerBase
|
||||
{
|
||||
readonly ILocalActorService _localActors;
|
||||
readonly DbEntities _dbEntities;
|
||||
readonly IOptionsMonitor<RegistrationOptions> _registrations;
|
||||
readonly Domain.Instance.IInstanceSettings _settings;
|
||||
|
||||
public WellKnownController(ILocalActorService localActors, DbEntities dbEntities, IOptionsMonitor<RegistrationOptions> registrations,
|
||||
Domain.Instance.IInstanceSettings settings)
|
||||
{
|
||||
_registrations = registrations;
|
||||
_settings = settings;
|
||||
_localActors = localActors;
|
||||
_dbEntities = dbEntities;
|
||||
}
|
||||
|
||||
[HttpGet, Route("/.well-known/webfinger")]
|
||||
public async Task<IActionResult> WebFinger([FromQuery] string resource, CancellationToken token)
|
||||
{
|
||||
if (string.IsNullOrEmpty(resource))
|
||||
return BadRequest();
|
||||
// the server itself (FEP-d556): its instance actor
|
||||
if (resource.TrimEnd('/') == _localActors.BaseAddress)
|
||||
if (resource.TrimEnd('/') == localActors.BaseAddress)
|
||||
{
|
||||
var instance = await _localActors.GetInstanceActor(token);
|
||||
var instance = await localActors.GetInstanceActor(token);
|
||||
return Content(new JsonObject
|
||||
{
|
||||
["subject"] = resource,
|
||||
@@ -53,7 +42,7 @@ namespace PrivaPub.Federation.Controllers
|
||||
}.ToJsonString(), "application/jrd+json; charset=utf-8");
|
||||
}
|
||||
|
||||
LocalActor actor;
|
||||
var actor = default(LocalActor);
|
||||
// Mastodon, GoToSocial and Pleroma also take a bare user@domain or @user@domain, so we do too.
|
||||
var acct = resource.StartsWith("acct:", StringComparison.OrdinalIgnoreCase) ? resource[5..]
|
||||
: !resource.Contains("://", StringComparison.Ordinal) && resource.Contains('@') ? resource
|
||||
@@ -61,15 +50,15 @@ namespace PrivaPub.Federation.Controllers
|
||||
if (acct != default)
|
||||
{
|
||||
var parts = acct.TrimStart('@').Split('@');
|
||||
var domain = new Uri(_localActors.BaseAddress).Authority;
|
||||
var domain = new Uri(localActors.BaseAddress).Authority;
|
||||
if (parts.Length != 2 || !parts[1].Equals(domain, StringComparison.OrdinalIgnoreCase))
|
||||
return NotFound();
|
||||
actor = await _localActors.FindByUserName(parts[0], token);
|
||||
if (actor == default && await _localActors.Gone(parts[0], token) != default)
|
||||
actor = await localActors.FindByUserName(parts[0], token);
|
||||
if (actor == default && await localActors.Gone(parts[0], token) != default)
|
||||
return StatusCode(StatusCodes.Status410Gone);
|
||||
}
|
||||
else
|
||||
actor = await _localActors.FindByUri(resource, token);
|
||||
actor = await localActors.FindByUri(resource, token);
|
||||
|
||||
if (actor is not { IsFederated: true })
|
||||
return NotFound();
|
||||
@@ -96,18 +85,18 @@ namespace PrivaPub.Federation.Controllers
|
||||
new JsonObject
|
||||
{
|
||||
["rel"] = "http://nodeinfo.diaspora.software/ns/schema/2.1",
|
||||
["href"] = $"{_localActors.BaseAddress}/nodeinfo/2.1"
|
||||
["href"] = $"{localActors.BaseAddress}/nodeinfo/2.1"
|
||||
},
|
||||
new JsonObject
|
||||
{
|
||||
["rel"] = "http://nodeinfo.diaspora.software/ns/schema/2.0",
|
||||
["href"] = $"{_localActors.BaseAddress}/nodeinfo/2.0"
|
||||
["href"] = $"{localActors.BaseAddress}/nodeinfo/2.0"
|
||||
},
|
||||
// the application actor (FEP-2677)
|
||||
new JsonObject
|
||||
{
|
||||
["rel"] = "https://www.w3.org/ns/activitystreams#Application",
|
||||
["href"] = (await _localActors.GetInstanceActor(token)).Uri
|
||||
["href"] = (await localActors.GetInstanceActor(token)).Uri
|
||||
})
|
||||
};
|
||||
return Content(document.ToJsonString(), "application/json; charset=utf-8");
|
||||
@@ -130,7 +119,7 @@ namespace PrivaPub.Federation.Controllers
|
||||
["software"] = software,
|
||||
["protocols"] = new JsonArray("activitypub"),
|
||||
["services"] = new JsonObject { ["inbound"] = new JsonArray(), ["outbound"] = new JsonArray() },
|
||||
["openRegistrations"] = _registrations.CurrentValue.IsOpen,
|
||||
["openRegistrations"] = registrations.CurrentValue.IsOpen,
|
||||
["usage"] = new JsonObject
|
||||
{
|
||||
["users"] = new JsonObject
|
||||
@@ -144,8 +133,8 @@ namespace PrivaPub.Federation.Controllers
|
||||
["metadata"] = new JsonObject
|
||||
{
|
||||
// the server's name and short description, as its administrator set them (IInstanceSettings)
|
||||
["nodeName"] = _settings.Current.Title,
|
||||
["nodeDescription"] = _settings.Current.ShortDescription ?? string.Empty,
|
||||
["nodeName"] = settings.Current.Title,
|
||||
["nodeDescription"] = settings.Current.ShortDescription ?? string.Empty,
|
||||
["federation"] = new JsonObject { ["document"] = "https://git.thepra.dev/thepra/SocialPub/src/branch/master/FEDERATION.md" }
|
||||
}
|
||||
};
|
||||
|
||||
Reference in new issue
Block a user