2ef7b93761
Committed together because the two changes share the same doc paragraphs (the ACL section of GatewayDashboardDesign.md, the GroupToTag / AllowAnonymousLocalhost rows of GatewayConfiguration.md, and CLAUDE.md's authentication paragraph), and splitting them would leave one of the two describing behaviour that does not yet exist. SEC-41 — tag grants no longer trusted from login-stamped claims --------------------------------------------------------------- DashboardSessionAcl read the zb:dashboardtag claims stamped into the cookie at login. GatewayOptions binds once at startup, so applying a GroupToTag edit needs a restart — but the restart does not clear the auth cookie (data-protection keys persist), so a browser returning afterwards re-authenticated with tag claims resolved under the OLD map. A revoked grant therefore survived on the cookie seam for the sliding 8-hour idle life, renewable indefinitely by activity, while the hub-token seam had no such gap because its mint re-resolves. CanViewSession now re-resolves the grant on every subscribe from the caller's mxgateway:ldap_group claims through DashboardGroupTagMapping.MapGroupsToTags against the currently bound map — the same one call HubTokenService.Issue makes. Fallback (documented on the class and in the design doc): a principal carrying NO group claims falls back to its stamped tag claims. That arm exists for the hub-token principal — HubTokenService.Validate rehydrates roles and tags but not groups, so re-resolution already happened at mint, one lifetime ago at worst. It cannot re-open the cookie hole: DashboardAuthenticator stamps group and tag claims from one group list, so a cookie principal holding a tag claim always holds the groups it came from, and a login yielding no groups yields no tags. A principal with neither kind of claim stays an empty-grant Viewer. SEC-40 — the alarm feed requires a real authenticated dashboard role -------------------------------------------------------------------- AlarmsHub sat behind HubClientsPolicy, which the read-only environment bypasses satisfy, so an anonymous-localhost caller or a Mode=Disabled deployment received galaxy-wide alarm metadata — alarm reference (a full tag path), state, severity, category, area, acknowledging operator — for the whole subscription expression. Decided: tighten the gate, keep the scope. New AuthenticatedDashboardRoleRequirement + its handler, and a MxGateway.Dashboard.Alarms policy built from it. Because DashboardAuthorizationHandler is typed to DashboardAuthorizationRequirement, it is never invoked for the new type, so neither Authentication:Mode=Disabled nor anonymous localhost can satisfy the policy — the same structural device the mounted Secrets UI already relies on. The policy keeps both schemes so external hub clients can still authenticate with a bearer token, and DisableLogin auto-login is unaffected (it mints a genuinely authenticated both-roles principal). The /alarms page carries the same policy, not just the hub: it reads the same central monitor in process, so gating only the hub would have left the disclosure one navigation away. The side rail hides the Alarms link for callers the policy denies, matching the Secrets link precedent. AlarmsHubPublisher is unchanged and stays unfiltered by design — audience is decided at hub admission, and the monitor carries no per-session provenance to narrow by. Alarm metadata deliberately remains galaxy-wide for authenticated Viewers: an AlarmFeedMessage has no session id or owning key for the SEC-25 tag intersection to work against, and equating a visibility tag with an alarm-reference prefix would turn GroupToTag into the data-access constraint it explicitly is not. Tests ----- DashboardSessionAclTests: the SEC-41 regression — a cookie-style principal whose stale tag claim is no longer granted by any of its groups under the current map is denied; plus the allowing direction (including with no stamped tag at all, which proves the decision comes from the groups), the ignore-case corner, group claims that map to nothing, and the hub-token fallback asserted against an EMPTY map so dropping the fallback would fail loudly. AlarmFeedAuthorizationTests (new): both handlers run together in the most permissive environment (Mode=Disabled + loopback + AllowAnonymousLocalhost) do not satisfy the alarm requirement, with the bypassable requirement as the control so the negative cannot pass because the bypass was misconfigured; authenticated Viewer/Admin do satisfy it; an unauthenticated role claim does not; the registered policy carries the non-bypassable requirement and both schemes; and both readers — the hub type's [Authorize] and the /alarms endpoint metadata — carry it. SecretsNavRenderTests: registers the new policy (an unregistered policy name throws rather than denying in an AuthorizeView) and gains the Alarms-link negative/control pair. Verified: dotnet build src/ZB.MOM.WW.MxGateway.NonWindows.slnx (zero warnings); filtered run of the touched classes — 92 passed, 0 failed.
137 lines
5.8 KiB
C#
137 lines
5.8 KiB
C#
using Microsoft.AspNetCore.SignalR;
|
|
using Microsoft.Extensions.Options;
|
|
using ZB.MOM.WW.MxGateway.Contracts.Proto;
|
|
using ZB.MOM.WW.MxGateway.Server.Alarms;
|
|
using ZB.MOM.WW.MxGateway.Server.Configuration;
|
|
|
|
namespace ZB.MOM.WW.MxGateway.Server.Dashboard.Hubs;
|
|
|
|
/// <summary>
|
|
/// Background service that subscribes to
|
|
/// <see cref="IGatewayAlarmService.StreamAsync"/> (no filter) and re-broadcasts
|
|
/// every <see cref="AlarmFeedMessage"/> to every <see cref="AlarmsHub"/>
|
|
/// client. The hub itself is session-less; clients filter / route messages
|
|
/// in the browser.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// When <c>MxGateway:Dashboard:ShowTagValues</c> is false (the default), the
|
|
/// alarm value fields are stripped from a redacted copy before the message
|
|
/// reaches any browser client — the same rule
|
|
/// <see cref="DashboardEventBroadcaster"/> applies to the events-hub mirror, so
|
|
/// the two SignalR seams cannot disagree about whether values leave the gateway.
|
|
/// The source message is never mutated: it fans out from one feed to the gRPC
|
|
/// <c>StreamAlarms</c> subscribers and the alarms page as well, and none of
|
|
/// those audiences is subject to this dashboard-display flag.
|
|
/// <para>
|
|
/// The broadcast stays deliberately unfiltered (SEC-40). Audience is decided once, at hub
|
|
/// admission — <see cref="AlarmsHub"/> carries
|
|
/// <see cref="DashboardAuthenticationDefaults.AlarmsPolicy"/>, so only an authenticated caller
|
|
/// with a real dashboard role is ever in <see cref="AlarmsHub.AllAlarmsGroup"/> — and the alarm
|
|
/// monitor is gateway-central with no per-session provenance, so there is no per-connection
|
|
/// narrowing this loop could apply even in principle. Adding a filter here would imply a
|
|
/// per-caller scope the feed does not carry.
|
|
/// </para>
|
|
/// </remarks>
|
|
/// <param name="alarmService">The gateway's central alarm feed.</param>
|
|
/// <param name="hubContext">Hub context used to broadcast to the alarms group.</param>
|
|
/// <param name="options">Gateway options supplying <c>Dashboard:ShowTagValues</c>.</param>
|
|
/// <param name="logger">Logger for best-effort broadcast failures.</param>
|
|
public sealed class AlarmsHubPublisher(
|
|
IGatewayAlarmService alarmService,
|
|
IHubContext<AlarmsHub> hubContext,
|
|
IOptions<GatewayOptions> options,
|
|
ILogger<AlarmsHubPublisher> logger) : BackgroundService
|
|
{
|
|
private readonly bool _showTagValues = options.Value.Dashboard.ShowTagValues;
|
|
|
|
/// <inheritdoc />
|
|
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
|
|
{
|
|
// Loop forever — when StreamAsync completes (monitor restart, etc.)
|
|
// reopen the subscription. The hosted-service lifetime ends only
|
|
// when the host stops.
|
|
while (!stoppingToken.IsCancellationRequested)
|
|
{
|
|
try
|
|
{
|
|
await foreach (AlarmFeedMessage message in alarmService
|
|
.StreamAsync(alarmFilterPrefix: null, stoppingToken)
|
|
.ConfigureAwait(false))
|
|
{
|
|
if (stoppingToken.IsCancellationRequested)
|
|
{
|
|
break;
|
|
}
|
|
|
|
try
|
|
{
|
|
AlarmFeedMessage outbound = _showTagValues ? message : RedactValues(message);
|
|
await hubContext.Clients
|
|
.Group(AlarmsHub.AllAlarmsGroup)
|
|
.SendAsync(AlarmsHub.AlarmMessage, outbound, stoppingToken)
|
|
.ConfigureAwait(false);
|
|
}
|
|
catch (Exception ex) when (ex is not OperationCanceledException)
|
|
{
|
|
logger.LogWarning(ex, "Alarm broadcast failed; continuing.");
|
|
}
|
|
}
|
|
}
|
|
catch (OperationCanceledException)
|
|
{
|
|
return;
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
logger.LogWarning(ex, "Alarm subscription faulted; reconnecting in 5s.");
|
|
try
|
|
{
|
|
await Task.Delay(TimeSpan.FromSeconds(5), stoppingToken).ConfigureAwait(false);
|
|
}
|
|
catch (OperationCanceledException)
|
|
{
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Produces a copy of <paramref name="source"/> with the alarm value fields
|
|
/// cleared, leaving every other field — reference, severity, state, category,
|
|
/// operator, timestamps — intact so the alarms page still renders the row.
|
|
/// </summary>
|
|
/// <param name="source">The message as the alarm feed produced it.</param>
|
|
/// <returns>
|
|
/// A redacted deep clone for the two value-bearing payload arms; the source
|
|
/// instance itself for every other arm, which carries no value to strip.
|
|
/// New payload arms therefore pass through unchanged by default — the switch
|
|
/// names only the arms that have something to redact, so adding a valueless
|
|
/// arm to the contract needs no change here.
|
|
/// </returns>
|
|
private static AlarmFeedMessage RedactValues(AlarmFeedMessage source)
|
|
{
|
|
switch (source.PayloadCase)
|
|
{
|
|
case AlarmFeedMessage.PayloadOneofCase.Transition:
|
|
{
|
|
AlarmFeedMessage redacted = source.Clone();
|
|
redacted.Transition.CurrentValue = null;
|
|
redacted.Transition.LimitValue = null;
|
|
return redacted;
|
|
}
|
|
|
|
case AlarmFeedMessage.PayloadOneofCase.ActiveAlarm:
|
|
{
|
|
AlarmFeedMessage redacted = source.Clone();
|
|
redacted.ActiveAlarm.CurrentValue = null;
|
|
redacted.ActiveAlarm.LimitValue = null;
|
|
return redacted;
|
|
}
|
|
|
|
default:
|
|
return source;
|
|
}
|
|
}
|
|
}
|