docs: complete XML-doc coverage and strip internal tracking IDs from code comments
Resolve all CommentChecker findings across the gateway server, worker, tests, and .NET client (314 -> 0 real issues): add missing <returns>/<summary>/<param> on public and test members, convert Stream/interface overrides to <inheritdoc/>, and remove internal task/issue tracking IDs (SEC-*, IPC-*, WRK-*, GWC-*, TST-*, Client.Dotnet-*) from shipped code documentation while preserving the design rationale prose. Shipped comments should not carry internal bookkeeping, and complete XML docs keep the analyzer/TreatWarningsAsErrors gate and generated API docs clean. The 6 remaining flags are heuristic false positives (MD5, UTC-4, capacity-1, near-1601) left intact so real documentation is not corrupted. Claude-Session: https://claude.ai/code/session_01DMXXvNuPekkkrTEyPNxEkW
This commit is contained in:
@@ -228,7 +228,7 @@ public sealed class GatewayAlarmMonitor : BackgroundService, IGatewayAlarmServic
|
||||
// Consume mapped MxEvents through the session's single distributor pump (as an
|
||||
// internal, non-counted subscriber) rather than opening a second raw drain of the
|
||||
// worker event channel — a second drain would split events with the dashboard
|
||||
// mirror pump and silently lose Acknowledge/mode-change transitions (GWC-01).
|
||||
// mirror pump and silently lose Acknowledge/mode-change transitions.
|
||||
await foreach (MxEvent mxEvent in _sessionManager
|
||||
.ReadAlarmEventsAsync(session.SessionId, linked.Token)
|
||||
.ConfigureAwait(false))
|
||||
|
||||
+6
-2
@@ -15,8 +15,8 @@ public static class GatewayConfigurationServiceCollectionExtensions
|
||||
public static IServiceCollection AddGatewayConfiguration(
|
||||
this IServiceCollection services, IConfiguration configuration)
|
||||
{
|
||||
// GatewayOptionsValidator depends on IHostEnvironment to gate the production-only rules
|
||||
// (SEC-04/06). The real host and the apikey CLI both build through WebApplicationBuilder,
|
||||
// GatewayOptionsValidator depends on IHostEnvironment to gate the production-only rules.
|
||||
// The real host and the apikey CLI both build through WebApplicationBuilder,
|
||||
// which registers IHostEnvironment before this call — so TryAdd is a no-op there. Minimal
|
||||
// containers (unit tests, tooling) have none; fall back to a non-production environment so
|
||||
// the validator still activates and the production guards stay off outside a real
|
||||
@@ -37,12 +37,16 @@ public static class GatewayConfigurationServiceCollectionExtensions
|
||||
/// </summary>
|
||||
private sealed class FallbackHostEnvironment : IHostEnvironment
|
||||
{
|
||||
/// <summary>Gets or sets the name of the environment; defaults to <see cref="Environments.Development"/>.</summary>
|
||||
public string EnvironmentName { get; set; } = Environments.Development;
|
||||
|
||||
/// <summary>Gets or sets the name of the application.</summary>
|
||||
public string ApplicationName { get; set; } = typeof(FallbackHostEnvironment).Assembly.GetName().Name ?? "MxGateway";
|
||||
|
||||
/// <summary>Gets or sets the absolute path to the content root directory.</summary>
|
||||
public string ContentRootPath { get; set; } = AppContext.BaseDirectory;
|
||||
|
||||
/// <summary>Gets or sets the file provider for the content root.</summary>
|
||||
public IFileProvider ContentRootFileProvider { get; set; } = new NullFileProvider();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -470,7 +470,7 @@ public sealed class GatewayOptionsValidator : OptionsValidatorBase<GatewayOption
|
||||
|
||||
// The worker-frame (pipe) maximum must stay above the public gRPC cap by the envelope-overhead
|
||||
// reserve, otherwise a maximally-sized accepted gRPC payload does not fit one worker frame once
|
||||
// wrapped in a WorkerEnvelope and the outbound write faults the whole session (IPC-03). Fail fast
|
||||
// wrapped in a WorkerEnvelope and the outbound write faults the whole session. Fail fast
|
||||
// at startup rather than mid-traffic. Only checked when both knobs are themselves in range so the
|
||||
// message is not doubled up with the individual range errors.
|
||||
private static void ValidateFrameSizeHeadroom(
|
||||
|
||||
@@ -2,8 +2,8 @@ namespace ZB.MOM.WW.MxGateway.Server.Configuration;
|
||||
|
||||
/// <summary>
|
||||
/// Security hot-path options bound from <c>MxGateway:Security</c>. Groups the API-key verification
|
||||
/// cache and <c>last_used</c> write-coalescing knobs (SEC-08) with the login and API-key
|
||||
/// rate-limiting knobs (SEC-11). Defaults preserve safe, low-overhead behaviour without requiring
|
||||
/// cache and <c>last_used</c> write-coalescing knobs with the login and API-key
|
||||
/// rate-limiting knobs. Defaults preserve safe, low-overhead behaviour without requiring
|
||||
/// operators to configure anything.
|
||||
/// </summary>
|
||||
public sealed class SecurityOptions
|
||||
|
||||
@@ -37,8 +37,8 @@ public sealed class WorkerOptions
|
||||
/// The maximum worker-frame (pipe) message size in bytes. Must stay at least
|
||||
/// <see cref="Workers.WorkerFrameProtocolOptions.EnvelopeOverheadReserveBytes"/> above
|
||||
/// <see cref="ProtocolOptions.MaxGrpcMessageBytes"/> so a maximally-sized accepted gRPC payload
|
||||
/// still fits one worker frame (IPC-03); the gateway conveys this value to the worker in the
|
||||
/// handshake (<c>GatewayHello.max_frame_bytes</c>, IPC-02). Default is the 16 MB public gRPC cap
|
||||
/// still fits one worker frame; the gateway conveys this value to the worker in the
|
||||
/// handshake (<c>GatewayHello.max_frame_bytes</c>). Default is the 16 MB public gRPC cap
|
||||
/// plus that reserve.
|
||||
/// </summary>
|
||||
public int MaxMessageBytes { get; init; } =
|
||||
|
||||
@@ -101,8 +101,6 @@ public sealed class DashboardApiKeyManagementService(
|
||||
.RevokeKeyAsync(normalizedKeyId, RemoteAddress(), cancellationToken)
|
||||
.ConfigureAwait(false);
|
||||
|
||||
// SEC-08: drop any cached verification for this key in THIS gateway process so the revoke
|
||||
// takes effect immediately rather than after the verification-cache TTL elapses.
|
||||
cacheInvalidator?.Invalidate(normalizedKeyId);
|
||||
|
||||
await WriteDashboardAuditAsync(
|
||||
@@ -143,8 +141,6 @@ public sealed class DashboardApiKeyManagementService(
|
||||
.RotateKeyAsync(normalizedKeyId, RemoteAddress(), cancellationToken)
|
||||
.ConfigureAwait(false);
|
||||
|
||||
// SEC-08: the old secret's cached verification must not outlive the rotate — evict it so
|
||||
// the superseded secret stops authenticating within this process immediately.
|
||||
cacheInvalidator?.Invalidate(normalizedKeyId);
|
||||
|
||||
bool succeeded = rotated.Token is not null;
|
||||
@@ -191,8 +187,6 @@ public sealed class DashboardApiKeyManagementService(
|
||||
.DeleteAsync(normalizedKeyId, cancellationToken)
|
||||
.ConfigureAwait(false);
|
||||
|
||||
// SEC-08: a deleted key is only reachable after a prior revoke, but evict defensively so no
|
||||
// cached verification survives the delete.
|
||||
cacheInvalidator?.Invalidate(normalizedKeyId);
|
||||
|
||||
await WriteDashboardAuditAsync(
|
||||
|
||||
@@ -12,7 +12,7 @@ namespace ZB.MOM.WW.MxGateway.Server.Dashboard;
|
||||
public static class DashboardEndpointRouteBuilderExtensions
|
||||
{
|
||||
/// <summary>
|
||||
/// The named rate-limiter policy applied to the <c>POST /auth/login</c> route (SEC-11). Registered
|
||||
/// The named rate-limiter policy applied to the <c>POST /auth/login</c> route. Registered
|
||||
/// in <c>GatewayApplication</c> via <see cref="GetLoginRateLimitPartition"/>.
|
||||
/// </summary>
|
||||
internal const string LoginRateLimiterPolicy = "dashboard-login";
|
||||
@@ -40,8 +40,12 @@ public static class DashboardEndpointRouteBuilderExtensions
|
||||
});
|
||||
}
|
||||
|
||||
// Test seam: a standalone partitioned limiter over the production partition logic, so a test can
|
||||
// acquire leases and assert the (permit+1)th is rejected without an HTTP server.
|
||||
/// <summary>
|
||||
/// Test seam: builds a standalone partitioned limiter over the production partition logic, so a
|
||||
/// test can acquire leases and assert the (permit+1)th is rejected without an HTTP server.
|
||||
/// </summary>
|
||||
/// <param name="security">The bound security options carrying the login-limit knobs.</param>
|
||||
/// <returns>A partitioned rate limiter keyed the same way as the production login policy.</returns>
|
||||
internal static PartitionedRateLimiter<HttpContext> CreateLoginRateLimiter(SecurityOptions security)
|
||||
=> PartitionedRateLimiter.Create<HttpContext, string>(
|
||||
ctx => GetLoginRateLimitPartition(ctx, security));
|
||||
@@ -76,7 +80,6 @@ public static class DashboardEndpointRouteBuilderExtensions
|
||||
(HttpContext httpContext, IAntiforgery antiforgery, IDashboardAuthenticator authenticator) =>
|
||||
PostLoginAsync(httpContext, antiforgery, authenticator))
|
||||
.AllowAnonymous()
|
||||
// SEC-11: throttle credential stuffing before the LDAP bind is relayed to the directory.
|
||||
.RequireRateLimiting(LoginRateLimiterPolicy)
|
||||
.WithName("DashboardLoginPost");
|
||||
|
||||
|
||||
@@ -33,7 +33,7 @@ public sealed class HubTokenService
|
||||
// bounds how long a stale role set survives a role change. Five minutes is transparent to
|
||||
// clients because DashboardHubConnectionFactory mints a fresh token on every (re)connect;
|
||||
// see docs/GatewayDashboardDesign.md. Heavier jti-denylist revocation is deliberately
|
||||
// deferred until per-session hub ACLs land (SEC-25), when tokens gain session binding.
|
||||
// deferred until per-session hub ACLs land, when tokens gain session binding.
|
||||
internal static readonly TimeSpan TokenLifetime = TimeSpan.FromMinutes(5);
|
||||
|
||||
private readonly ITimeLimitedDataProtector _protector;
|
||||
|
||||
@@ -41,7 +41,7 @@ public static class GatewayApplication
|
||||
app.UseStaticFiles();
|
||||
app.UseAuthentication();
|
||||
app.UseAuthorization();
|
||||
// SEC-11: the rate limiter must run after routing has selected the endpoint (so its
|
||||
// The rate limiter must run after routing has selected the endpoint (so its
|
||||
// RequireRateLimiting policy metadata is visible) and before the endpoint executes.
|
||||
app.UseRateLimiter();
|
||||
app.UseAntiforgery();
|
||||
@@ -105,7 +105,7 @@ public static class GatewayApplication
|
||||
return builder;
|
||||
}
|
||||
|
||||
// SEC-11: register the named fixed-window rate-limiter policy applied to POST /auth/login. The
|
||||
// Registers the named fixed-window rate-limiter policy applied to POST /auth/login. The
|
||||
// limit knobs are read from MxGateway:Security at startup; the per-request partition is keyed on
|
||||
// the remote IP (see DashboardEndpointRouteBuilderExtensions.GetLoginRateLimitPartition).
|
||||
private static void AddLoginRateLimiter(WebApplicationBuilder builder)
|
||||
|
||||
@@ -14,43 +14,33 @@ public sealed class EventStreamService(
|
||||
GatewayMetrics metrics) : IEventStreamService
|
||||
{
|
||||
/// <inheritdoc />
|
||||
/// <remarks>
|
||||
/// <para>
|
||||
/// This reads the subscriber's lease channel fed by the session's single
|
||||
/// <see cref="SessionEventDistributor"/> pump. The pump owns the single drain of
|
||||
/// the worker event stream and the worker→public mapping (mirroring the former
|
||||
/// <c>ProduceEventsAsync</c>); this loop is the per-subscriber boundary that
|
||||
/// applies the per-RPC filter (<c>AfterWorkerSequence</c>), queue-depth metrics,
|
||||
/// and the backpressure/overflow policy.
|
||||
/// </para>
|
||||
/// <para>
|
||||
/// The dashboard mirror runs OFF this per-RPC loop. The dashboard is a
|
||||
/// first-class internal subscriber on the session's
|
||||
/// <see cref="SessionEventDistributor"/> (see <c>GatewaySession.StartDashboardMirror</c>),
|
||||
/// so it receives session events even when no gRPC client is streaming. This loop
|
||||
/// does not mirror to the dashboard. One deliberate consequence: the dashboard sees
|
||||
/// RAW session events, not the per-gRPC-subscriber <c>AfterWorkerSequence</c>-filtered
|
||||
/// view this loop applies — the dashboard is a separate LDAP-authenticated monitoring
|
||||
/// view that should see the session's full event activity.
|
||||
/// </para>
|
||||
/// <para>
|
||||
/// Overflow handling: the distributor's per-subscriber channel is bounded
|
||||
/// and the pump writes non-blocking. When this subscriber's channel is full the pump
|
||||
/// applies the per-subscriber backpressure policy and completes this subscriber's
|
||||
/// channel with a <see cref="SessionManagerException"/>
|
||||
/// (<see cref="SessionManagerErrorCode.EventQueueOverflow"/>). That terminal fault
|
||||
/// surfaces here when the reader's <c>MoveNextAsync</c> throws, and it propagates to
|
||||
/// the gRPC client unchanged. The overflow metric, and (in the legacy
|
||||
/// single-subscriber FailFast case) the session fault + fault metric, are recorded by
|
||||
/// the distributor's overflow handler so the session, the pump, and other subscribers
|
||||
/// are isolated from this subscriber's slowness.
|
||||
/// </para>
|
||||
/// </remarks>
|
||||
public async IAsyncEnumerable<MxEvent> StreamEventsAsync(
|
||||
StreamEventsRequest request,
|
||||
string? callerKeyId,
|
||||
[EnumeratorCancellation] CancellationToken cancellationToken)
|
||||
{
|
||||
// This reads the subscriber's lease channel fed by the session's single
|
||||
// SessionEventDistributor pump. The pump owns the single drain of the worker event
|
||||
// stream and the worker->public mapping (mirroring the former ProduceEventsAsync); this
|
||||
// loop is the per-subscriber boundary that applies the per-RPC filter (AfterWorkerSequence),
|
||||
// queue-depth metrics, and the backpressure/overflow policy.
|
||||
//
|
||||
// The dashboard mirror runs OFF this per-RPC loop. The dashboard is a first-class internal
|
||||
// subscriber on the session's SessionEventDistributor (see GatewaySession.StartDashboardMirror),
|
||||
// so it receives session events even when no gRPC client is streaming. This loop does not
|
||||
// mirror to the dashboard. One deliberate consequence: the dashboard sees RAW session events,
|
||||
// not the per-gRPC-subscriber AfterWorkerSequence-filtered view this loop applies — the
|
||||
// dashboard is a separate LDAP-authenticated monitoring view that should see the session's
|
||||
// full event activity.
|
||||
//
|
||||
// Overflow handling: the distributor's per-subscriber channel is bounded and the pump writes
|
||||
// non-blocking. When this subscriber's channel is full the pump applies the per-subscriber
|
||||
// backpressure policy and completes this subscriber's channel with a SessionManagerException
|
||||
// (SessionManagerErrorCode.EventQueueOverflow). That terminal fault surfaces here when the
|
||||
// reader's MoveNextAsync throws, and it propagates to the gRPC client unchanged. The overflow
|
||||
// metric, and (in the legacy single-subscriber FailFast case) the session fault + fault metric,
|
||||
// are recorded by the distributor's overflow handler so the session, the pump, and other
|
||||
// subscribers are isolated from this subscriber's slowness.
|
||||
if (!sessionManager.TryGetSession(request.SessionId, out GatewaySession? session) || session is null)
|
||||
{
|
||||
throw new SessionManagerException(
|
||||
@@ -58,7 +48,7 @@ public sealed class EventStreamService(
|
||||
$"Session {request.SessionId} was not found.");
|
||||
}
|
||||
|
||||
// Owner-scoped attach (TST-02, security control): a session's event stream may be
|
||||
// Owner-scoped attach (security control): a session's event stream may be
|
||||
// attached or reattached ONLY by the API key that opened the session. The detach-grace
|
||||
// and fan-out retention windows are on by default, so without this check any event-scoped
|
||||
// key that learns a session id could attach to another key's retained session and receive
|
||||
|
||||
@@ -7,7 +7,7 @@ public sealed class MxAccessGrpcRequestValidator
|
||||
{
|
||||
// Upper bound on a single DrainEvents request. DrainEvents is a diagnostics RPC that returns
|
||||
// buffered events in one non-streaming reply, so an unbounded max_events could pack the whole
|
||||
// queue into a session-killing frame (IPC-04). The worker independently caps each reply at its
|
||||
// queue into a session-killing frame. The worker independently caps each reply at its
|
||||
// own MaxDrainEventsPerReply; this public bound rejects an obviously-abusive request loudly at
|
||||
// the boundary. max_events = 0 is allowed and means "the worker's default batch cap".
|
||||
private const uint MaxDrainEventsPerRequest = 10_000;
|
||||
|
||||
+1
-1
@@ -236,7 +236,7 @@ public static class ApiKeyAdminCommandLineParser
|
||||
ReadHistorizedOnly: HasFlag(options, "read-historized-only"));
|
||||
}
|
||||
|
||||
// Parses the optional --expires value into an absolute UTC expiry (SEC-10). Accepts a relative
|
||||
// Parses the optional --expires value into an absolute UTC expiry. Accepts a relative
|
||||
// "<N>d"/"<N>h" duration from now (operator-friendly) or an absolute ISO-8601 instant/date
|
||||
// (assumed UTC). Null/blank means no expiry — expiry stays opt-in, preserving prior behaviour.
|
||||
private static DateTimeOffset? ParseExpiry(string? value)
|
||||
|
||||
+2
-2
@@ -69,7 +69,7 @@ public static class AuthStoreServiceCollectionExtensions
|
||||
// migrator and the migration hosted service.
|
||||
services.AddZbApiKeyAuth(effectiveConfig, AuthenticationSectionPath);
|
||||
|
||||
// SEC-08 hot-path decorators. Every gRPC call previously did a SQLite read plus a
|
||||
// Hot-path decorators. Every gRPC call previously did a SQLite read plus a
|
||||
// last_used_utc WRITE via IApiKeyVerifier.VerifyAsync (the library verifier couples the
|
||||
// mark into verification). Two gateway-side decorators cut that cost without editing the
|
||||
// external library:
|
||||
@@ -138,7 +138,7 @@ public static class AuthStoreServiceCollectionExtensions
|
||||
/// <summary>
|
||||
/// Replaces the last registration of <typeparamref name="TService"/> with a singleton that wraps
|
||||
/// it. The wrapped (inner) service is created once, preserving singleton semantics. Used to layer
|
||||
/// the SEC-08 store decorator over the external library's registration without editing it.
|
||||
/// the store decorator over the external library's registration without editing it.
|
||||
/// </summary>
|
||||
private static void DecorateSingleton<TService>(
|
||||
IServiceCollection services,
|
||||
|
||||
@@ -30,7 +30,7 @@ public interface IApiKeyCacheInvalidator
|
||||
/// <para>
|
||||
/// Only successful verifications are cached. Failures and unparseable headers always fall through
|
||||
/// to the inner verifier — caching a failure risks pinning a transiently-wrong negative, and the
|
||||
/// SEC-11 per-peer failure counter (not this cache) is what bounds brute-force cost.
|
||||
/// per-peer failure counter (not this cache) is what bounds brute-force cost.
|
||||
/// </para>
|
||||
/// <para>
|
||||
/// The cache key is the hex SHA-256 of the presented token (which embeds both the key id and the
|
||||
@@ -71,7 +71,11 @@ public sealed class CachingApiKeyVerifier : IApiKeyVerifier, IApiKeyCacheInvalid
|
||||
{
|
||||
}
|
||||
|
||||
// Test/explicit-TTL seam.
|
||||
/// <summary>Initializes a new instance of the <see cref="CachingApiKeyVerifier"/> class with an explicit TTL.</summary>
|
||||
/// <param name="inner">The wrapped verifier (the library verifier) reached on a cache miss.</param>
|
||||
/// <param name="cache">The shared memory cache.</param>
|
||||
/// <param name="ttl">The verification-cache TTL; a zero or negative value disables caching.</param>
|
||||
/// <remarks>Test/explicit-TTL seam.</remarks>
|
||||
internal CachingApiKeyVerifier(IApiKeyVerifier inner, IMemoryCache cache, TimeSpan ttl)
|
||||
{
|
||||
ArgumentNullException.ThrowIfNull(inner);
|
||||
@@ -81,7 +85,14 @@ public sealed class CachingApiKeyVerifier : IApiKeyVerifier, IApiKeyCacheInvalid
|
||||
_ttl = ttl;
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
/// <summary>
|
||||
/// Verifies the given authorization header, returning a cached successful result when one is
|
||||
/// still within TTL, or falling through to the inner verifier on a cache miss or non-cacheable
|
||||
/// header.
|
||||
/// </summary>
|
||||
/// <param name="authorizationHeader">The raw <c>Authorization</c> header value to verify.</param>
|
||||
/// <param name="ct">Token to cancel the asynchronous operation.</param>
|
||||
/// <returns>The verification result, cached or freshly computed.</returns>
|
||||
public async Task<ApiKeyVerification> VerifyAsync(string authorizationHeader, CancellationToken ct)
|
||||
{
|
||||
if (_ttl <= TimeSpan.Zero || !TryComputeCacheKey(authorizationHeader, out string cacheKey))
|
||||
|
||||
+17
-4
@@ -41,7 +41,10 @@ public sealed class CoalescingMarkApiKeyStore : IApiKeyStore
|
||||
{
|
||||
}
|
||||
|
||||
// Test/explicit-window seam.
|
||||
/// <summary>Initializes a new instance of the <see cref="CoalescingMarkApiKeyStore"/> class with an explicit coalescing window (test/explicit-window seam).</summary>
|
||||
/// <param name="inner">The wrapped store.</param>
|
||||
/// <param name="window">The coalescing window; marks within this window of the last forwarded mark for a key are dropped.</param>
|
||||
/// <param name="clock">The time provider.</param>
|
||||
internal CoalescingMarkApiKeyStore(IApiKeyStore inner, TimeSpan window, TimeProvider clock)
|
||||
{
|
||||
ArgumentNullException.ThrowIfNull(inner);
|
||||
@@ -51,15 +54,25 @@ public sealed class CoalescingMarkApiKeyStore : IApiKeyStore
|
||||
_clock = clock;
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
/// <summary>Looks up an API key record by key id, delegating to the wrapped store unchanged.</summary>
|
||||
/// <param name="keyId">The API key id to look up.</param>
|
||||
/// <param name="ct">The cancellation token.</param>
|
||||
/// <returns>The matching <see cref="ApiKeyRecord"/>, or <see langword="null"/> if none exists.</returns>
|
||||
public Task<ApiKeyRecord?> FindByKeyIdAsync(string keyId, CancellationToken ct)
|
||||
=> _inner.FindByKeyIdAsync(keyId, ct);
|
||||
|
||||
/// <inheritdoc />
|
||||
/// <summary>Looks up an active API key record by key id, delegating to the wrapped store unchanged.</summary>
|
||||
/// <param name="keyId">The API key id to look up.</param>
|
||||
/// <param name="ct">The cancellation token.</param>
|
||||
/// <returns>The matching active <see cref="ApiKeyRecord"/>, or <see langword="null"/> if none exists or is inactive.</returns>
|
||||
public Task<ApiKeyRecord?> FindActiveByKeyIdAsync(string keyId, CancellationToken ct)
|
||||
=> _inner.FindActiveByKeyIdAsync(keyId, ct);
|
||||
|
||||
/// <inheritdoc />
|
||||
/// <summary>Marks the key as used, coalescing writes so at most one reaches the wrapped store per key per window.</summary>
|
||||
/// <param name="keyId">The API key id being marked as used.</param>
|
||||
/// <param name="whenUtc">The UTC timestamp of the use.</param>
|
||||
/// <param name="ct">The cancellation token.</param>
|
||||
/// <returns>A task that represents the asynchronous operation.</returns>
|
||||
public Task MarkUsedAsync(string keyId, DateTimeOffset whenUtc, CancellationToken ct)
|
||||
{
|
||||
ArgumentNullException.ThrowIfNull(keyId);
|
||||
|
||||
@@ -19,11 +19,6 @@ namespace ZB.MOM.WW.MxGateway.Server.Security.Authentication;
|
||||
/// </remarks>
|
||||
public static class GatewayApiKeyIdentityMapper
|
||||
{
|
||||
// SEC-08: memoize the constraints deserialization keyed by the raw JSON blob so the per-call
|
||||
// JSON parse on the auth hot path collapses to a dictionary lookup. Distinct blobs are bounded
|
||||
// by the number of API keys (small); ApiKeyConstraints is an immutable record, so a parsed
|
||||
// instance is safe to share across callers. The cap is a defensive backstop against a pathological
|
||||
// spread of distinct blobs — past it, we simply parse without caching rather than grow unbounded.
|
||||
private const int MaxCachedConstraintBlobs = 1024;
|
||||
private static readonly ConcurrentDictionary<string, ApiKeyConstraints> ConstraintCache =
|
||||
new(StringComparer.Ordinal);
|
||||
|
||||
@@ -4,7 +4,7 @@ using ZB.MOM.WW.MxGateway.Server.Configuration;
|
||||
namespace ZB.MOM.WW.MxGateway.Server.Security.Authorization;
|
||||
|
||||
/// <summary>
|
||||
/// Cheap, in-process per-peer sliding-window failure counter for the gRPC auth path (SEC-11). It is
|
||||
/// Cheap, in-process per-peer sliding-window failure counter for the gRPC auth path. It is
|
||||
/// checked BEFORE the API-key verification store read and short-circuits a peer that has exceeded
|
||||
/// <see cref="SecurityOptions.ApiKeyFailureLimit"/> failed attempts within
|
||||
/// <see cref="SecurityOptions.ApiKeyFailureWindowSeconds"/>; a successful verification resets the
|
||||
@@ -45,7 +45,11 @@ public sealed class ApiKeyFailureLimiter
|
||||
{
|
||||
}
|
||||
|
||||
// Test/explicit seam.
|
||||
/// <summary>Initializes a new instance of the <see cref="ApiKeyFailureLimiter"/> class. Test/explicit seam.</summary>
|
||||
/// <param name="limit">The maximum number of failures allowed within <paramref name="window"/>.</param>
|
||||
/// <param name="window">The sliding window over which failures are counted.</param>
|
||||
/// <param name="maxPeers">The maximum number of tracked peers before least-recently-active eviction kicks in.</param>
|
||||
/// <param name="clock">The time provider.</param>
|
||||
internal ApiKeyFailureLimiter(int limit, TimeSpan window, int maxPeers, TimeProvider clock)
|
||||
{
|
||||
ArgumentNullException.ThrowIfNull(clock);
|
||||
@@ -145,6 +149,7 @@ public sealed class ApiKeyFailureLimiter
|
||||
|
||||
private sealed class PeerState
|
||||
{
|
||||
/// <summary>Timestamps (in ticks) of failures still within the sliding window.</summary>
|
||||
public Queue<long> FailureTicks { get; } = new();
|
||||
|
||||
public long LastActivityTicks;
|
||||
|
||||
+1
-1
@@ -64,7 +64,7 @@ public sealed class GatewayGrpcAuthorizationInterceptor(
|
||||
|
||||
string? authorizationHeader = context.RequestHeaders.GetValue("authorization");
|
||||
|
||||
// SEC-11: short-circuit a peer that has already failed too many times inside the sliding
|
||||
// Short-circuit a peer that has already failed too many times inside the sliding
|
||||
// window BEFORE the verification store read, so online guessing cannot spend a SQLite read
|
||||
// per attempt. The peer key prefers the presented key id over the transport address (NAT
|
||||
// caveat). ResourceExhausted signals throttling without revealing whether any particular
|
||||
|
||||
+1
-1
@@ -19,7 +19,7 @@ public static class GrpcAuthorizationServiceCollectionExtensions
|
||||
services.AddSingleton<GatewayGrpcScopeResolver>();
|
||||
services.AddSingleton<IGatewayRequestIdentityAccessor, GatewayRequestIdentityAccessor>();
|
||||
services.AddSingleton<IConstraintEnforcer, ConstraintEnforcer>();
|
||||
// SEC-11 per-peer failure counter, checked before the verification store read. Bind the knobs
|
||||
// Per-peer failure counter, checked before the verification store read. Bind the knobs
|
||||
// from IConfiguration directly (not IOptions<GatewayOptions>) to avoid coupling this
|
||||
// registration to the whole-options validation pipeline.
|
||||
services.AddSingleton(sp => new ApiKeyFailureLimiter(
|
||||
|
||||
@@ -222,11 +222,6 @@ public sealed class SessionManager : ISessionManager
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
/// <remarks>
|
||||
/// Mirrors the registry/metrics cleanup that <see cref="CloseSessionCoreAsync"/>
|
||||
/// performs after a successful close, but skips the <c>WorkerClient.ShutdownAsync</c>
|
||||
/// step that <see cref="GatewaySession.CloseAsync"/> would otherwise attempt.
|
||||
/// </remarks>
|
||||
public async Task<SessionCloseResult> KillWorkerAsync(
|
||||
string sessionId,
|
||||
string reason,
|
||||
|
||||
@@ -27,7 +27,7 @@ public sealed class WorkerClient : IWorkerClient
|
||||
|
||||
// Staging hand-off between the read loop and the dedicated event writer. The read loop writes
|
||||
// here with a non-blocking TryWrite so a full consumer channel (_events) can never stall the read
|
||||
// loop behind an event — replies and heartbeats keep flowing (GWC-04). Unbounded, but only fills
|
||||
// loop behind an event — replies and heartbeats keep flowing. Unbounded, but only fills
|
||||
// during the bounded EventChannelFullModeTimeout window before EventWriteLoopAsync faults on a
|
||||
// sustained backlog, after which the read loop stops.
|
||||
private readonly Channel<WorkerEvent> _eventStaging;
|
||||
@@ -208,7 +208,7 @@ public sealed class WorkerClient : IWorkerClient
|
||||
|
||||
// Reject an oversized command at the enqueue boundary so only this correlation fails
|
||||
// (ResourceExhausted) rather than the frame reaching the write loop and faulting the whole
|
||||
// session (IPC-03). Command envelopes are the only gateway-authored outbound payload whose
|
||||
// session. Command envelopes are the only gateway-authored outbound payload whose
|
||||
// size the caller controls; checking here keeps a MessageTooLarge in the write loop a
|
||||
// genuine desync signal.
|
||||
int envelopeSize = commandEnvelope.CalculateSize();
|
||||
@@ -269,7 +269,7 @@ public sealed class WorkerClient : IWorkerClient
|
||||
// The event channel is SingleReader: only one enumerator may ever drain it, otherwise
|
||||
// the two readers would each receive a random subset of events. Claim the reader at CALL
|
||||
// time (not lazily on first MoveNext) and fail loudly on a second consumer rather than
|
||||
// silently splitting the stream (see GWC-01). The distributor pump is the only intended
|
||||
// silently splitting the stream. The distributor pump is the only intended
|
||||
// caller; the alarm monitor and dashboard mirror attach to the distributor instead.
|
||||
if (Interlocked.CompareExchange(ref _eventsReaderClaimed, 1, 0) != 0)
|
||||
{
|
||||
@@ -519,7 +519,7 @@ public sealed class WorkerClient : IWorkerClient
|
||||
/// Routes a received envelope to its handler. Every branch dispatches synchronously and
|
||||
/// immediately — the event branch only stages the event for the dedicated writer — so a full
|
||||
/// event channel can never delay a command reply, heartbeat, fault, or shutdown ack behind an
|
||||
/// event backlog (GWC-04).
|
||||
/// event backlog.
|
||||
/// </summary>
|
||||
/// <param name="envelope">The envelope to dispatch.</param>
|
||||
private void DispatchEnvelope(WorkerEnvelope envelope)
|
||||
@@ -559,7 +559,7 @@ public sealed class WorkerClient : IWorkerClient
|
||||
/// succeeds unless the channel has been completed during shutdown — in which case the event is
|
||||
/// safely dropped because the client is closing. Backpressure and the sustained-overflow fault
|
||||
/// are applied by <see cref="EventWriteLoopAsync"/> against the bounded consumer channel,
|
||||
/// off the read loop (GWC-04).
|
||||
/// off the read loop.
|
||||
/// </summary>
|
||||
/// <param name="workerEvent">The event received from the worker.</param>
|
||||
private void StageWorkerEvent(WorkerEvent workerEvent)
|
||||
@@ -575,7 +575,7 @@ public sealed class WorkerClient : IWorkerClient
|
||||
/// <summary>
|
||||
/// Drains staged worker events and applies the bounded-channel backpressure (and
|
||||
/// sustained-overflow fault) on a dedicated task, so the timed <see cref="Channel"/> write
|
||||
/// never runs on the read loop (GWC-04). Mirrors <see cref="WriteLoopAsync"/> for events.
|
||||
/// never runs on the read loop. Mirrors <see cref="WriteLoopAsync"/> for events.
|
||||
/// </summary>
|
||||
private async Task EventWriteLoopAsync()
|
||||
{
|
||||
@@ -984,7 +984,7 @@ public sealed class WorkerClient : IWorkerClient
|
||||
GatewayVersion = typeof(GatewayContractInfo).Assembly.GetName().Version?.ToString() ?? GatewayVersionFallback,
|
||||
|
||||
// Convey the negotiated worker-frame maximum so the worker adopts it instead of a
|
||||
// hard-coded default (IPC-02). Sits above the public gRPC cap by the envelope reserve.
|
||||
// hard-coded default. Sits above the public gRPC cap by the envelope reserve.
|
||||
MaxFrameBytes = (uint)_connection.FrameOptions.MaxMessageBytes,
|
||||
});
|
||||
}
|
||||
|
||||
@@ -15,6 +15,6 @@ public enum WorkerClientErrorCode
|
||||
|
||||
// The serialized command envelope exceeds the negotiated worker-frame maximum. Rejected at the
|
||||
// enqueue boundary so only the offending command fails (mapped to ResourceExhausted) instead of
|
||||
// the oversized frame reaching the write loop and faulting the whole session (IPC-03).
|
||||
// the oversized frame reaching the write loop and faulting the whole session.
|
||||
CommandTooLarge,
|
||||
}
|
||||
|
||||
@@ -15,7 +15,7 @@ public sealed class WorkerFrameProtocolOptions
|
||||
/// gRPC payload accepted at the public boundary always fits inside one worker frame once wrapped
|
||||
/// in a <c>WorkerEnvelope</c> (correlation id, timestamps, oneof framing). Without this headroom
|
||||
/// the pipe max equals the gRPC max and a maximally-sized accepted request faults the whole
|
||||
/// session on the outbound write (IPC-03). 64 KiB is far larger than the fixed envelope overhead.
|
||||
/// session on the outbound write. 64 KiB is far larger than the fixed envelope overhead.
|
||||
/// </summary>
|
||||
public const int EnvelopeOverheadReserveBytes = 64 * 1024;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user