Resolve Server-044..050: KillWorker accounting + admin service hardening
Server-044 KillWorkerAsync catch path now calls _metrics.SessionRemoved
so the open-session gauge does not leak when KillWorker throws.
Server-045 KillWorkerAsync routes through a new
GatewaySession.KillWorkerWithCloseGateAsync that takes the
per-session close lock, so concurrent kills count SessionsClosed
exactly once.
Server-046 CloseSessionCoreAsync's SessionCloseStartedException branch and
ShutdownAsync's kill fallback both increment SessionsClosed (not
just the gauge), so the counter and gauge stay consistent.
Server-047 ApiKeysPage.ConfirmPendingAsync holds PendingAction across the
awaited action and clears it in finally, matching the sessions
pages.
Server-048 Closed: the 044/045 regression tests cover the previously-
untested kill paths.
Server-049 IDashboardSessionAdminService + DashboardSessionAdminService
now carry XML docs that pin the Admin gate, missing-session
return-Fail semantics, and the dashboard-admin-kill reason.
Server-050 CloseSessionAsync and KillWorkerAsync catch unexpected
exceptions after the SessionManagerException catches and return
a friendly Fail; OperationCanceledException tied to the caller
token still propagates.
All resolved at 2026-05-24; 503/503 gateway tests pass.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -328,9 +328,18 @@ else
|
||||
return;
|
||||
}
|
||||
|
||||
// Server-047: align the pending-action lifecycle with SessionsPage / SessionDetailsPage —
|
||||
// hold PendingAction while the awaited action runs so the shared ConfirmDialog can render
|
||||
// its in-flight (IsBusy) state, then clear in finally regardless of outcome.
|
||||
Func<System.Security.Claims.ClaimsPrincipal, Task<DashboardApiKeyManagementResult>> action = PendingAction.Action;
|
||||
PendingAction = null;
|
||||
await RunManagementActionAsync(action).ConfigureAwait(false);
|
||||
try
|
||||
{
|
||||
await RunManagementActionAsync(action).ConfigureAwait(false);
|
||||
}
|
||||
finally
|
||||
{
|
||||
PendingAction = null;
|
||||
}
|
||||
}
|
||||
|
||||
private sealed record PendingConfirm(
|
||||
|
||||
@@ -5,6 +5,19 @@ using ZB.MOM.WW.MxGateway.Server.Sessions;
|
||||
|
||||
namespace ZB.MOM.WW.MxGateway.Server.Dashboard;
|
||||
|
||||
/// <summary>
|
||||
/// Default implementation of <see cref="IDashboardSessionAdminService"/>: gates
|
||||
/// destructive session actions on the <see cref="DashboardRoles.Admin"/> role,
|
||||
/// audit-logs successful operations, and converts <see cref="SessionManagerException"/>
|
||||
/// (and any other unexpected exceptions) into <see cref="DashboardSessionAdminResult.Fail(string)"/>
|
||||
/// so the Blazor pages never see a raw exception.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// The constant <c>dashboard-admin-kill</c> is the reason passed to
|
||||
/// <see cref="ISessionManager.KillWorkerAsync"/> and forwarded as the
|
||||
/// <c>reason</c> tag on the <c>mxgateway.workers.killed</c> counter and in
|
||||
/// the worker-kill audit log entries.
|
||||
/// </remarks>
|
||||
public sealed class DashboardSessionAdminService(
|
||||
ISessionManager sessionManager,
|
||||
IHttpContextAccessor httpContextAccessor,
|
||||
@@ -16,6 +29,7 @@ public sealed class DashboardSessionAdminService(
|
||||
private readonly ILogger<DashboardSessionAdminService> _logger =
|
||||
logger ?? NullLogger<DashboardSessionAdminService>.Instance;
|
||||
|
||||
/// <inheritdoc />
|
||||
public bool CanManage(ClaimsPrincipal user)
|
||||
{
|
||||
ArgumentNullException.ThrowIfNull(user);
|
||||
@@ -24,6 +38,7 @@ public sealed class DashboardSessionAdminService(
|
||||
&& user.IsInRole(DashboardRoles.Admin);
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public async Task<DashboardSessionAdminResult> CloseSessionAsync(
|
||||
ClaimsPrincipal user,
|
||||
string sessionId,
|
||||
@@ -72,8 +87,27 @@ public sealed class DashboardSessionAdminService(
|
||||
return DashboardSessionAdminResult.Fail(
|
||||
$"Close failed: {exception.Message}");
|
||||
}
|
||||
catch (OperationCanceledException) when (cancellationToken.IsCancellationRequested)
|
||||
{
|
||||
throw;
|
||||
}
|
||||
catch (Exception exception)
|
||||
{
|
||||
// Server-050: any non-SessionManagerException (e.g. an IOException or
|
||||
// InvalidOperationException from the session DisposeAsync / pipe teardown
|
||||
// path) used to propagate raw into Blazor's error boundary. Convert it to
|
||||
// a friendly failure so the Razor pages see only DashboardSessionAdminResult.
|
||||
_logger.LogWarning(
|
||||
exception,
|
||||
"Dashboard admin {Actor} close failed unexpectedly for session {SessionId}.",
|
||||
actor,
|
||||
sessionId);
|
||||
return DashboardSessionAdminResult.Fail(
|
||||
$"Close failed unexpectedly for session {sessionId}. See the gateway log for details.");
|
||||
}
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public async Task<DashboardSessionAdminResult> KillWorkerAsync(
|
||||
ClaimsPrincipal user,
|
||||
string sessionId,
|
||||
@@ -122,6 +156,26 @@ public sealed class DashboardSessionAdminService(
|
||||
return DashboardSessionAdminResult.Fail(
|
||||
$"Kill failed: {exception.Message}");
|
||||
}
|
||||
catch (OperationCanceledException) when (cancellationToken.IsCancellationRequested)
|
||||
{
|
||||
throw;
|
||||
}
|
||||
catch (Exception exception)
|
||||
{
|
||||
// Server-050: any non-SessionManagerException (e.g. an IOException from
|
||||
// worker pipe teardown surfacing through session.DisposeAsync, or an
|
||||
// InvalidOperationException from a corrupted worker handle) used to
|
||||
// propagate raw into Blazor's error boundary. Convert it to a friendly
|
||||
// failure so the page renders the ResultMessage rather than the circuit
|
||||
// error page.
|
||||
_logger.LogWarning(
|
||||
exception,
|
||||
"Dashboard admin {Actor} kill failed unexpectedly for session {SessionId}.",
|
||||
actor,
|
||||
sessionId);
|
||||
return DashboardSessionAdminResult.Fail(
|
||||
$"Kill failed unexpectedly for session {sessionId}. See the gateway log for details.");
|
||||
}
|
||||
}
|
||||
|
||||
private static string ResolveActor(ClaimsPrincipal user)
|
||||
|
||||
@@ -2,15 +2,82 @@ using System.Security.Claims;
|
||||
|
||||
namespace ZB.MOM.WW.MxGateway.Server.Dashboard;
|
||||
|
||||
/// <summary>
|
||||
/// Dashboard surface for the destructive session-management actions —
|
||||
/// Close (graceful shutdown) and Kill (force-terminate) — exposed by the
|
||||
/// Admin role.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// The dashboard binds the destructive Close/Kill UI to this service so
|
||||
/// the underlying <see cref="Sessions.ISessionManager"/> calls flow through
|
||||
/// a single audited and role-gated entry point. All operations are gated
|
||||
/// by <see cref="CanManage"/>; non-Admin callers are rejected with a
|
||||
/// <c>Succeeded = false</c> result rather than throwing. Missing sessions
|
||||
/// also surface as <see cref="DashboardSessionAdminResult.Fail(string)"/> so
|
||||
/// Razor pages can render the message without an error boundary. Each
|
||||
/// successful call is logged at Information including the acting user
|
||||
/// (from <see cref="ClaimsPrincipal.Identity"/>'s name) and the remote
|
||||
/// address resolved from <see cref="IHttpContextAccessor"/>.
|
||||
/// </remarks>
|
||||
public interface IDashboardSessionAdminService
|
||||
{
|
||||
/// <summary>
|
||||
/// Returns whether the given principal is authorized to perform
|
||||
/// destructive session-management actions.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Requires <see cref="System.Security.Principal.IIdentity.IsAuthenticated"/>
|
||||
/// to be true and membership in the
|
||||
/// <see cref="DashboardRoles.Admin"/> role. Pages typically gate the
|
||||
/// Close/Kill buttons on this value at render time so non-Admin
|
||||
/// viewers never see them.
|
||||
/// </remarks>
|
||||
/// <param name="user">Caller principal.</param>
|
||||
/// <returns><c>true</c> when the caller may close or kill sessions; otherwise <c>false</c>.</returns>
|
||||
bool CanManage(ClaimsPrincipal user);
|
||||
|
||||
/// <summary>
|
||||
/// Closes the given session gracefully (worker is given the configured
|
||||
/// shutdown grace period before being terminated).
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Returns <see cref="DashboardSessionAdminResult.Fail(string)"/>
|
||||
/// when the caller is not Admin, when the session id is blank, or when
|
||||
/// <see cref="Sessions.ISessionManager.CloseSessionAsync"/> raises a
|
||||
/// <see cref="Sessions.SessionManagerException"/> (including the
|
||||
/// <see cref="Sessions.SessionManagerErrorCode.SessionNotFound"/>
|
||||
/// case). Successful closes are audit-logged with the caller name,
|
||||
/// session id, and remote address.
|
||||
/// </remarks>
|
||||
/// <param name="user">Caller principal.</param>
|
||||
/// <param name="sessionId">Session identifier to close.</param>
|
||||
/// <param name="cancellationToken">Cancellation token.</param>
|
||||
/// <returns>Result describing success/failure and a user-facing message.</returns>
|
||||
Task<DashboardSessionAdminResult> CloseSessionAsync(
|
||||
ClaimsPrincipal user,
|
||||
string sessionId,
|
||||
CancellationToken cancellationToken);
|
||||
|
||||
/// <summary>
|
||||
/// Force-terminates the worker process backing the given session without
|
||||
/// attempting a graceful shutdown.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Invoked from the dashboard Kill button. Uses the
|
||||
/// <c>dashboard-admin-kill</c> reason constant — that string reaches
|
||||
/// the audit log and the <c>mxgateway.workers.killed</c> metric tag.
|
||||
/// Returns <see cref="DashboardSessionAdminResult.Fail(string)"/> for
|
||||
/// non-Admin callers, blank session ids, or any
|
||||
/// <see cref="Sessions.SessionManagerException"/> from the underlying
|
||||
/// manager (the <see cref="Sessions.SessionManagerErrorCode.SessionNotFound"/>
|
||||
/// case is recognized and reported as "not found"). Successful kills
|
||||
/// are audit-logged with the caller name, session id, and remote
|
||||
/// address.
|
||||
/// </remarks>
|
||||
/// <param name="user">Caller principal.</param>
|
||||
/// <param name="sessionId">Session identifier to kill.</param>
|
||||
/// <param name="cancellationToken">Cancellation token.</param>
|
||||
/// <returns>Result describing success/failure and a user-facing message.</returns>
|
||||
Task<DashboardSessionAdminResult> KillWorkerAsync(
|
||||
ClaimsPrincipal user,
|
||||
string sessionId,
|
||||
|
||||
Reference in New Issue
Block a user