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
@@ -2,19 +2,13 @@ using OpenIddict.Abstractions;
|
||||
|
||||
namespace PrivaPub.Api.Mastodon.Auth
|
||||
{
|
||||
public class OAuthPruner : BackgroundService
|
||||
public class OAuthPruner(
|
||||
IServiceProvider services,
|
||||
ILogger<OAuthPruner> logger) : BackgroundService
|
||||
{
|
||||
static readonly TimeSpan Interval = TimeSpan.FromHours(6);
|
||||
static readonly TimeSpan Threshold = TimeSpan.FromDays(14);
|
||||
|
||||
readonly IServiceProvider _services;
|
||||
readonly ILogger<OAuthPruner> _logger;
|
||||
|
||||
public OAuthPruner(IServiceProvider services, ILogger<OAuthPruner> logger)
|
||||
{
|
||||
_services = services;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
|
||||
{
|
||||
@@ -25,7 +19,7 @@ namespace PrivaPub.Api.Mastodon.Auth
|
||||
await Task.Delay(Interval, stoppingToken);
|
||||
var (tokens, authorizations) = await Prune(DateTimeOffset.UtcNow - Threshold, stoppingToken);
|
||||
if (tokens + authorizations > 0)
|
||||
_logger.LogInformation("{Service} removed {Tokens} tokens and {Authorizations} authorizations", nameof(OAuthPruner), tokens, authorizations);
|
||||
logger.LogInformation("{Service} removed {Tokens} tokens and {Authorizations} authorizations", nameof(OAuthPruner), tokens, authorizations);
|
||||
}
|
||||
catch (OperationCanceledException) when (stoppingToken.IsCancellationRequested)
|
||||
{
|
||||
@@ -33,7 +27,7 @@ namespace PrivaPub.Api.Mastodon.Auth
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogWarning(ex, "{Service} pass failed", nameof(OAuthPruner));
|
||||
logger.LogWarning(ex, "{Service} pass failed", nameof(OAuthPruner));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -41,7 +35,7 @@ namespace PrivaPub.Api.Mastodon.Auth
|
||||
//one pass: tokens and authorizations created before the threshold that are no longer valid
|
||||
public async Task<(long Tokens, long Authorizations)> Prune(DateTimeOffset threshold, CancellationToken token)
|
||||
{
|
||||
using var scope = _services.CreateScope();
|
||||
using var scope = services.CreateScope();
|
||||
var tokens = await scope.ServiceProvider.GetRequiredService<IOpenIddictTokenManager>().PruneAsync(threshold, token);
|
||||
var authorizations = await scope.ServiceProvider.GetRequiredService<IOpenIddictAuthorizationManager>().PruneAsync(threshold, token);
|
||||
return (tokens, authorizations);
|
||||
|
||||
@@ -112,6 +112,7 @@ namespace PrivaPub.Api.Mastodon.Auth
|
||||
return services;
|
||||
}
|
||||
|
||||
[System.Diagnostics.CodeAnalysis.SuppressMessage("HouseRules", "HR0003", Justification = "An OpenIddict inline handler: its signature is fixed and the request's token travels on the context.")]
|
||||
static async ValueTask OutOfBandCode(ApplyAuthorizationResponseContext context)
|
||||
{
|
||||
if (context.RedirectUri != OutOfBand || context.Response.Code == default)
|
||||
|
||||
@@ -66,7 +66,9 @@ namespace PrivaPub.Api.Mastodon.Auth
|
||||
// Validates a root JWT given as a token exchange subject token, before OpenIddict tries it as one of its own tokens.
|
||||
// The principal it builds names the root under PersonaExchange.RootClaim for TokenController, which signs in a fresh
|
||||
// identity for the avatar.
|
||||
public sealed class RootJwtSubjectToken : IOpenIddictServerHandler<ValidateTokenContext>
|
||||
public sealed class RootJwtSubjectToken(
|
||||
IConfiguration configuration,
|
||||
DbEntities dbEntities) : IOpenIddictServerHandler<ValidateTokenContext>
|
||||
{
|
||||
public static OpenIddictServerHandlerDescriptor Descriptor { get; } = OpenIddictServerHandlerDescriptor.CreateBuilder<ValidateTokenContext>()
|
||||
.UseScopedHandler<RootJwtSubjectToken>()
|
||||
@@ -74,21 +76,13 @@ namespace PrivaPub.Api.Mastodon.Auth
|
||||
.SetType(OpenIddictServerHandlerType.Custom)
|
||||
.Build();
|
||||
|
||||
readonly IConfiguration _configuration;
|
||||
readonly DbEntities _dbEntities;
|
||||
|
||||
public RootJwtSubjectToken(IConfiguration configuration, DbEntities dbEntities)
|
||||
{
|
||||
_configuration = configuration;
|
||||
_dbEntities = dbEntities;
|
||||
}
|
||||
|
||||
public async ValueTask HandleAsync(ValidateTokenContext context)
|
||||
{
|
||||
if (context.ValidTokenTypes.Count != 1 || !context.ValidTokenTypes.Contains(PersonaExchange.SubjectTokenType))
|
||||
return;
|
||||
|
||||
var root = await RootJwt.Root(context.Token, _configuration, _dbEntities, context.Transaction.CancellationToken);
|
||||
var root = await RootJwt.Root(context.Token, configuration, dbEntities, context.Transaction.CancellationToken);
|
||||
if (root == default)
|
||||
{
|
||||
context.Reject(Errors.InvalidGrant, "The session token is not valid.");
|
||||
|
||||
@@ -15,15 +15,9 @@ using static OpenIddict.Abstractions.OpenIddictConstants;
|
||||
namespace PrivaPub.Api.Mastodon.Auth
|
||||
{
|
||||
[ApiController]
|
||||
public class TokenController : ControllerBase
|
||||
public class TokenController(
|
||||
DbEntities dbEntities) : ControllerBase
|
||||
{
|
||||
readonly DbEntities _dbEntities;
|
||||
|
||||
public TokenController(DbEntities dbEntities)
|
||||
{
|
||||
_dbEntities = dbEntities;
|
||||
}
|
||||
|
||||
[HttpPost("/oauth/token"), IgnoreAntiforgeryToken, Produces("application/json")]
|
||||
public async Task<IActionResult> Exchange(CancellationToken token)
|
||||
{
|
||||
@@ -62,8 +56,8 @@ namespace PrivaPub.Api.Mastodon.Auth
|
||||
var avatarId = (string)request[PersonaExchange.AvatarParameter];
|
||||
if (string.IsNullOrEmpty(rootId) || string.IsNullOrEmpty(avatarId))
|
||||
return Refuse(Errors.InvalidGrant, "The persona can no longer be used.");
|
||||
var owns = await _dbEntities.RootToAvatars.Match(r => r.RootId == rootId && r.AvatarId == avatarId).ExecuteAnyAsync(token);
|
||||
var avatar = owns ? await _dbEntities.Avatars.MatchID(avatarId).ExecuteFirstAsync(token) : default;
|
||||
var owns = await dbEntities.RootToAvatars.Match(r => r.RootId == rootId && r.AvatarId == avatarId).ExecuteAnyAsync(token);
|
||||
var avatar = owns ? await dbEntities.Avatars.MatchID(avatarId).ExecuteFirstAsync(token) : default;
|
||||
if (avatar == default || !await Usable(avatarId, token))
|
||||
return Refuse(Errors.InvalidGrant, "The persona can no longer be used.");
|
||||
|
||||
@@ -79,9 +73,9 @@ namespace PrivaPub.Api.Mastodon.Auth
|
||||
{
|
||||
if (string.IsNullOrEmpty(avatarId))
|
||||
return false;
|
||||
var link = await _dbEntities.RootToAvatars.Match(r => r.AvatarId == avatarId).ExecuteFirstAsync(token);
|
||||
var root = link == default ? default : await _dbEntities.RootUsers.MatchID(link.RootId).ExecuteFirstAsync(token);
|
||||
var avatar = await _dbEntities.Avatars.MatchID(avatarId).ExecuteFirstAsync(token);
|
||||
var link = await dbEntities.RootToAvatars.Match(r => r.AvatarId == avatarId).ExecuteFirstAsync(token);
|
||||
var root = link == default ? default : await dbEntities.RootUsers.MatchID(link.RootId).ExecuteFirstAsync(token);
|
||||
var avatar = await dbEntities.Avatars.MatchID(avatarId).ExecuteFirstAsync(token);
|
||||
// a suspended persona gets no token (R6), as its tokens were revoked when it was suspended
|
||||
return root is { IsBanned: false, DeletedAt: null } && avatar is { DeletionAt: null, SuspendedAt: null };
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user