harden redemption, expiry limits and token storage
Findings from a pass over the plugin, smallest first: Redemptions now run one at a time behind a gate. The status checks and the status write that follows them were not atomic, so two requests arriving together with the same one-use token could both mint a guest session. The spent-link check also moved above the tagging step, so hammering an already-used link no longer re-tags a whole series on every hit. The configured maximum expiry is actually respected. Both the API and the picker did Math.max(configured, 720), so setting the ceiling to anything under 30 days was silently ignored. The picker now also hides the quick-pick durations that sit above the ceiling. The share URL, which carries the raw token, is dropped from the record when the link is revoked or expires. Records are never deleted, so dead tokens were accumulating in the store forever. Live links keep it so the dashboard can still copy them, and the README claim that no token is ever written to disk is corrected to say what the code actually does. The HMAC key file is created 0600 instead of inheriting the default mask.
Cette révision appartient à :
@@ -24,6 +24,7 @@ public sealed class ShareLinkRedemptionService
|
||||
private readonly ShareLinkCleanupService _cleanupService;
|
||||
private readonly ISessionManager _sessionManager;
|
||||
private readonly ILogger<ShareLinkRedemptionService> _logger;
|
||||
private readonly SemaphoreSlim _redeemGate = new(1, 1);
|
||||
|
||||
/// <summary>Initializes a new instance of the <see cref="ShareLinkRedemptionService"/> class.</summary>
|
||||
public ShareLinkRedemptionService(
|
||||
@@ -48,6 +49,23 @@ public sealed class ShareLinkRedemptionService
|
||||
|
||||
/// <summary>Redeems a token and returns the bootstrap HTML, or null if the token is unusable.</summary>
|
||||
public async Task<string?> RedeemAsync(string rawToken, HttpRequest request, CancellationToken cancellationToken)
|
||||
{
|
||||
// One redemption at a time: the status checks below and the status write
|
||||
// that follows them are not atomic, so two requests arriving together with
|
||||
// the same one-use token would otherwise both mint a guest session.
|
||||
await _redeemGate.WaitAsync(cancellationToken).ConfigureAwait(false);
|
||||
try
|
||||
{
|
||||
return await RedeemInternalAsync(rawToken, request, cancellationToken).ConfigureAwait(false);
|
||||
}
|
||||
finally
|
||||
{
|
||||
_redeemGate.Release();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>Runs a single redemption; callers must hold the redemption gate.</summary>
|
||||
private async Task<string?> RedeemInternalAsync(string rawToken, HttpRequest request, CancellationToken cancellationToken)
|
||||
{
|
||||
var tokenHash = await _tokenService.HashTokenAsync(rawToken, cancellationToken).ConfigureAwait(false);
|
||||
if (tokenHash is null)
|
||||
@@ -73,6 +91,13 @@ public sealed class ShareLinkRedemptionService
|
||||
return null;
|
||||
}
|
||||
|
||||
// Checked before any library write: re-tagging the whole tree on every hit
|
||||
// to an already-spent link would be a pointless metadata write storm.
|
||||
if (record.OneUse && record.Status == ShareLinkStatus.Redeemed)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
if (!Guid.TryParse(record.ItemId, out var itemId))
|
||||
{
|
||||
await HandleFailureAsync(record, "Shared item snapshot is invalid.", cancellationToken).ConfigureAwait(false);
|
||||
@@ -92,11 +117,6 @@ public sealed class ShareLinkRedemptionService
|
||||
record.MetadataTouched = true;
|
||||
}
|
||||
|
||||
if (record.OneUse && record.Status == ShareLinkStatus.Redeemed)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
if (string.IsNullOrWhiteSpace(record.DeviceId))
|
||||
{
|
||||
record.DeviceId = Guid.NewGuid().ToString("N");
|
||||
|
||||
Référencer dans un nouveau ticket
Bloquer un utilisateur