40fb459040
Ships Stream B.1-B.6 — the data-plane authorization engine Phase 6.2 runs on.
Integration into OPC UA dispatch (Stream C — Read / Write / HistoryRead /
Subscribe / Browse / Call etc.) is the next PR on this branch.
New Core.Abstractions:
- OpcUaOperation enum enumerates every OPC UA surface the evaluator gates:
Browse, Read, WriteOperate/Tune/Configure (split by SecurityClassification),
HistoryRead, HistoryUpdate, CreateMonitoredItems, TransferSubscriptions,
Call, AlarmAcknowledge/Confirm/Shelve. Stream C maps each one back to its
dispatch call site.
New Core.Authorization namespace:
- NodeScope record + NodeHierarchyKind — 6-level scope addressing for
Equipment-kind (UNS) namespaces, folder-segment walk for SystemPlatform-kind
(Galaxy). NodeScope carries a Kind selector so the evaluator knows which
hierarchy to descend.
- AuthorizationDecision { Verdict, Provenance } + AuthorizationVerdict
{Allow, NotGranted, Denied} + MatchedGrant. Tri-state per decision #149;
Phase 6.2 only produces Allow + NotGranted, Denied stays reserved for v2.1
Explicit Deny without API break.
- IPermissionEvaluator.Authorize(session, operation, scope).
- PermissionTrie + PermissionTrieNode + TrieGrant. In-memory trie keyed on
the ACL scope hierarchy. CollectMatches walks Cluster → Namespace →
UnsArea → UnsLine → Equipment → Tag (or → FolderSegment(s) → Tag on
Galaxy). Pure additive union — matches that share an LDAP group with the
session contribute flags; OR across levels.
- PermissionTrieBuilder static factory. Build(clusterId, generationId, rows,
scopePaths?) returns a trie for one generation. Cross-cluster rows are
filtered out so the trie is cluster-coherent. Stream C follow-up wires a
real scopePaths lookup from the live DB; tests supply hand-built paths.
- PermissionTrieCache — process-singleton, keyed on (ClusterId, GenerationId).
Install(trie) adds a generation + promotes to "current" when the id is
highest-known (handles out-of-order installs gracefully). Prior generations
retained so an in-flight request against a prior trie still succeeds; GC
via Prune(cluster, keepLatest).
- UserAuthorizationState — per-session cache of resolved LDAP groups +
AuthGenerationId + MembershipVersion + MembershipResolvedUtc. Bounded by
MembershipFreshnessInterval (default 15 min per decision #151) +
AuthCacheMaxStaleness (default 5 min per decision #152).
- TriePermissionEvaluator — default IPermissionEvaluator. Fails closed on
stale sessions (IsStale check short-circuits to NotGranted), on cross-
cluster requests, on empty trie cache. Maps OpcUaOperation → NodePermissions
via MapOperationToPermission (total — every enum value has a mapping; tested).
Tests (27 new, all pass):
- PermissionTrieTests (7): cluster-level grant cascades to every tag;
equipment-level grant doesn't leak to sibling equipment; multi-group union
ORs flags; no-matching-group returns empty; Galaxy folder-segment grant
doesn't leak to sibling folder; cross-cluster rows don't land in this
cluster's trie; build is idempotent (B.6 invariants).
- TriePermissionEvaluatorTests (8): allow when flag matches; NotGranted when
no matching group; NotGranted when flags insufficient; HistoryRead requires
its own bit (decision-level requirement); cross-cluster session denied;
stale session fails closed; no cached trie denied; MapOperationToPermission
is total across every OpcUaOperation.
- PermissionTrieCacheTests (8): empty cache returns null; install-then-get
round-trips; new generation becomes current; out-of-order install doesn't
downgrade current; invalidate drops one cluster; prune retains most recent;
prune no-op when fewer than keep; cluster isolation.
- UserAuthorizationStateTests (4): fresh is not stale; IsStale after 5 min
default; NeedsRefresh true between freshness + staleness windows.
Full solution dotnet test: 1078 passing (baseline 906, Phase 6.1 = 1042,
Phase 6.2 Stream A = +9, Stream B = +27 = 1078). Pre-existing Client.CLI
Subscribe flake unchanged.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
59 lines
2.8 KiB
C#
59 lines
2.8 KiB
C#
namespace ZB.MOM.WW.OtOpcUa.Core.Authorization;
|
|
|
|
/// <summary>
|
|
/// Address of a node in the 6-level scope hierarchy the Phase 6.2 evaluator walks.
|
|
/// Assembled by the dispatch layer from the node's namespace + UNS path + tag; passed
|
|
/// to <see cref="IPermissionEvaluator"/> which walks the matching trie path.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// <para>Per decision #129 and the Phase 6.2 Stream B plan the hierarchy is
|
|
/// <c>Cluster → Namespace → UnsArea → UnsLine → Equipment → Tag</c> for UNS
|
|
/// (Equipment-kind) namespaces. Galaxy (SystemPlatform-kind) namespaces instead use
|
|
/// <c>Cluster → Namespace → FolderSegment(s) → Tag</c>, and each folder segment takes
|
|
/// one trie level — so a deeply-nested Galaxy folder implicitly reaches the same
|
|
/// depth as a full UNS path.</para>
|
|
///
|
|
/// <para>Unset mid-path levels (e.g. a Cluster-scoped request with no UnsArea) leave
|
|
/// the corresponding id <c>null</c>. The evaluator walks as far as the scope goes +
|
|
/// stops at the first null.</para>
|
|
/// </remarks>
|
|
public sealed record NodeScope
|
|
{
|
|
/// <summary>Cluster the node belongs to. Required.</summary>
|
|
public required string ClusterId { get; init; }
|
|
|
|
/// <summary>Namespace within the cluster. Null is not allowed for a request against a real node.</summary>
|
|
public string? NamespaceId { get; init; }
|
|
|
|
/// <summary>For Equipment-kind namespaces: UNS area (e.g. "warsaw-west"). Null on Galaxy.</summary>
|
|
public string? UnsAreaId { get; init; }
|
|
|
|
/// <summary>For Equipment-kind namespaces: UNS line below the area. Null on Galaxy.</summary>
|
|
public string? UnsLineId { get; init; }
|
|
|
|
/// <summary>For Equipment-kind namespaces: equipment row below the line. Null on Galaxy.</summary>
|
|
public string? EquipmentId { get; init; }
|
|
|
|
/// <summary>
|
|
/// For Galaxy (SystemPlatform-kind) namespaces only: the folder path segments from
|
|
/// namespace root to the target tag, in order. Empty on Equipment namespaces.
|
|
/// </summary>
|
|
public IReadOnlyList<string> FolderSegments { get; init; } = [];
|
|
|
|
/// <summary>Target tag id when the scope addresses a specific tag; null for folder / equipment-level scopes.</summary>
|
|
public string? TagId { get; init; }
|
|
|
|
/// <summary>Which hierarchy applies — Equipment-kind (UNS) or SystemPlatform-kind (Galaxy).</summary>
|
|
public required NodeHierarchyKind Kind { get; init; }
|
|
}
|
|
|
|
/// <summary>Selector between the two scope-hierarchy shapes.</summary>
|
|
public enum NodeHierarchyKind
|
|
{
|
|
/// <summary><c>Cluster → Namespace → UnsArea → UnsLine → Equipment → Tag</c> — UNS / Equipment kind.</summary>
|
|
Equipment,
|
|
|
|
/// <summary><c>Cluster → Namespace → FolderSegment(s) → Tag</c> — Galaxy / SystemPlatform kind.</summary>
|
|
SystemPlatform,
|
|
}
|