fix(acl): per-event visibility for direct folder event items; generation-checked native wiring (#826)
Event items on an equipment / raw device folder were fed by the SDK's MonitoredNode2 fan-out with no ACL decision, so after a deploy moved a scripted alarm (or dropped the reference projecting a native alarm into an equipment) the OLD folder's subscribers kept receiving it - EventId included - until the rebuild landed, indefinitely after a failed apply. - OtOpcUaNodeManager re-implements INodeManager3 so ValidateEventRolePermissions (the SDK's per-event, per-item hook; base not virtual) adds IsNotifierEventVisibleTo: live condition instance, notifier still a legitimate notifier of it, and the #586/#808 Server-object rule (IsConditionVisibleTo over ConditionVisibilityScopes). - The SDK memoizes that verdict per (item, event type, SourceNode): InvalidateFolderEventVerdicts runs on the authority/authorizer setters, RevalidateMonitoredItems (deploy + timer) and CompleteAddressSpaceApply. - ConditionRefresh on direct items goes through RefreshDirectItems (base loop + the same decision). - New generation field TagReferencingEquipment (RawPath -> EquipmentIds, from the artifact's UnsTagReferences via AclScopePathResolver.ResolveTagRawPath): a native alarm's wired equipment folder only counts (folder delivery AND Server-object scopes) while the current generation still references it. - Secondary #808 edge: UNS variables wired UNS->Raw Organizes by AddReference are tracked and always placed as reference variables (an Area named like its equipment's id no longer narrows them). Tests: UnsFolderScopeWireTests (moved alarm on a folder item + ConditionRefresh + rebuild; area named like equipment id), NativeAlarmFolderEventAclWireTests (dropped reference: folder + Server object + refresh + restore), DeploymentArtifactScopePathTests (projection). Rig/event tests now supply tag references.
This commit is contained in:
+109
-2
@@ -210,6 +210,65 @@ public sealed class UnsFolderScopeWireTests
|
||||
await session.CloseAsync(ct);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gitea #826 — the same stale window seen by a DIRECT event item on the old owner's equipment folder, which the
|
||||
/// SDK feeds through its per-folder fan-out rather than the Server object. The old owner's folder subscription
|
||||
/// receives neither the moved alarm's live events nor its ConditionRefresh replay (EventId included), while its
|
||||
/// correctly placed alarm keeps arriving on the same item (positive control). After the rebuild re-materialises
|
||||
/// the alarm under its deployed owner, the new owner's folder subscription receives it.
|
||||
/// </summary>
|
||||
[Fact]
|
||||
public async Task A_moved_alarm_stops_reaching_its_old_folders_subscribers_until_the_rebuild_places_it()
|
||||
{
|
||||
var ct = TestContext.Current.CancellationToken;
|
||||
await using var rig = await ServerEventRig.StartAsync("Uns826FolderMoved", encrypted: false, ct);
|
||||
rig.KeyRoles = [];
|
||||
Topology(rig, pumpLine: Line1);
|
||||
// The key holds the OLD owner (Pump); anonymous holds the NEW one (Fan). The generation already moved Alarm.
|
||||
Install(rig, pumpLine: Line1, Deployed(alarmOwner: Fan),
|
||||
EquipmentGrant(Pump, Operator), AnonymousGrant(NodeAclScopeKind.Equipment, Fan));
|
||||
|
||||
using var oldOwner = await rig.ConnectAsync(anonymous: false, ct);
|
||||
using var newOwner = await rig.ConnectAsync(anonymous: true, ct);
|
||||
var oldEvents = new RecordedEvents();
|
||||
var oldSubscription = await RecordedEvents.SubscribeAsync(oldOwner, oldEvents, ct);
|
||||
var pumpFolder = RecordedEvents.AddEventItem(oldSubscription, Uns(oldOwner, Pump));
|
||||
await oldSubscription.ApplyChangesAsync(ct);
|
||||
pumpFolder.Status.Error.ShouldBeNull();
|
||||
var newEvents = new RecordedEvents();
|
||||
var newSubscription = await RecordedEvents.SubscribeAsync(newOwner, newEvents, ct);
|
||||
var fanFolder = RecordedEvents.AddEventItem(newSubscription, Uns(newOwner, Fan));
|
||||
await newSubscription.ApplyChangesAsync(ct);
|
||||
fanFolder.Status.Error.ShouldBeNull();
|
||||
|
||||
var pre = new AlarmConditionSnapshot(true, false, false, true, AlarmShelvingKind.Unshelved, 700, "base");
|
||||
Project(rig, Alarm, pre with { Message = "moved" }); // reported first: the control arrives after its verdict
|
||||
Project(rig, PumpLo, pre with { Message = "control" });
|
||||
await RecordedEvents.WaitUntilAsync(() => oldEvents.Has(pumpFolder, "control"));
|
||||
await Task.Delay(TimeSpan.FromMilliseconds(700), ct);
|
||||
oldEvents.Has(pumpFolder, "moved").ShouldBeFalse("the moved alarm must not reach its old owner's folder item");
|
||||
|
||||
// ConditionRefresh on the folder item replays the placed alarm and withholds the moved one.
|
||||
await RefreshAsync(oldOwner, oldSubscription, ct);
|
||||
await RecordedEvents.WaitUntilAsync(() =>
|
||||
oldEvents.HasType(pumpFolder, ObjectTypeIds.RefreshEndEventType)
|
||||
&& oldEvents.ConditionEvents(pumpFolder, "control").Count == 2);
|
||||
oldEvents.Has(pumpFolder, "moved").ShouldBeFalse("a refresh must not replay the moved alarm to the old folder");
|
||||
|
||||
// The rebuild places it under its deployed owner.
|
||||
((ISurgicalAddressSpaceSink)rig.Sink).RemoveAlarmConditionNode(Alarm, AddressSpaceRealm.Uns).ShouldBeTrue();
|
||||
rig.Sink.MaterialiseAlarmCondition(Alarm, Fan, "hi", "AlarmCondition", 500, AddressSpaceRealm.Uns);
|
||||
rig.Nm.CompleteAddressSpaceApply();
|
||||
Project(rig, Alarm, pre with { Message = "placed" });
|
||||
Project(rig, PumpLo, pre with { Message = "control-2" });
|
||||
await RecordedEvents.WaitUntilAsync(() =>
|
||||
newEvents.Has(fanFolder, "placed") && oldEvents.Has(pumpFolder, "control-2"));
|
||||
oldEvents.Has(pumpFolder, "placed").ShouldBeFalse();
|
||||
|
||||
await oldOwner.CloseAsync(ct);
|
||||
await newOwner.CloseAsync(ct);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// An EQUIPMENT moved to another line by the generation while its folder still hangs under the old line: the live
|
||||
/// folder ancestry disagrees with the generation's, so the folder, everything it owns, its scripted alarm (read
|
||||
@@ -294,6 +353,34 @@ public sealed class UnsFolderScopeWireTests
|
||||
await session.CloseAsync(ct);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gitea #826 (secondary edge of #808): an Area NAMED exactly like one of its equipment's opaque ids. That
|
||||
/// equipment's reference variable (<c>s=<AreaName>/Line/Equipment/Name</c>) then starts with the
|
||||
/// equipment's own id, which the id rule alone read as folder-owned — losing its Tag-grant match. The variable
|
||||
/// is now known to be a reference by the Organizes edge the reference pass wires to its raw node, so the Tag
|
||||
/// grant reaches it; the equipment folder itself stays denied to that grant (control).
|
||||
/// </summary>
|
||||
[Fact]
|
||||
public async Task A_reference_variable_under_an_area_named_like_its_equipment_id_keeps_its_tag_grant()
|
||||
{
|
||||
var ct = TestContext.Current.CancellationToken;
|
||||
await using var rig = await ServerEventRig.StartAsync("Uns826AreaNamedLikeId", encrypted: false, ct);
|
||||
rig.KeyRoles = [];
|
||||
Topology(rig, pumpLine: Line1);
|
||||
var raw = rig.EnsureRawVariable("flow", "Double", writable: false);
|
||||
var reference = $"{Pump}/Line1/Pump/Flow"; // the Area's NAME is Pump's id
|
||||
rig.Sink.EnsureVariable(reference, Pump, "Flow", "Double", writable: false, AddressSpaceRealm.Uns);
|
||||
rig.Sink.AddReference(reference, AddressSpaceRealm.Uns, raw, AddressSpaceRealm.Raw);
|
||||
Install(rig, pumpLine: Line1, Deployed(), areaName: Pump, tagArea: Pump, TagGrant());
|
||||
|
||||
using var session = await rig.ConnectAsync(anonymous: false, ct);
|
||||
(await ReadAsync(session, Uns(session, reference), Attributes.DisplayName, ct)).ShouldBe(StatusCodes.Good);
|
||||
(await ReadAsync(session, Uns(session, Pump), Attributes.DisplayName, ct)).ShouldBe(StatusCodes.BadUserAccessDenied);
|
||||
(await ReadAsync(session, Uns(session, PumpSpeed), Attributes.DisplayName, ct)).ShouldBe(StatusCodes.BadUserAccessDenied);
|
||||
|
||||
await session.CloseAsync(ct);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Review of #808 (cache poisoning): the resolved-scope cache keys are NUL-prefixed, so a client that first
|
||||
/// Reads the nonexistent <c>s="\0Area1\0Line1\0Pump"</c> — the exact cache key of the real Pump folder — must
|
||||
@@ -481,13 +568,19 @@ public sealed class UnsFolderScopeWireTests
|
||||
/// has not caught up with when it differs from the live <c>Area1</c>).</summary>
|
||||
private static void Install(
|
||||
ServerEventRig rig, string pumpLine, IReadOnlyDictionary<string, string> deployedOwners, string areaName,
|
||||
params NodeAcl[] grants)
|
||||
params NodeAcl[] grants) =>
|
||||
Install(rig, pumpLine, deployedOwners, areaName, tagArea: "Area1", grants);
|
||||
|
||||
/// <summary>As above, with the Tag grant's UNS projection under the Area NAMED <paramref name="tagArea"/>.</summary>
|
||||
private static void Install(
|
||||
ServerEventRig rig, string pumpLine, IReadOnlyDictionary<string, string> deployedOwners, string areaName,
|
||||
string tagArea, params NodeAcl[] grants)
|
||||
{
|
||||
var resolver = Resolver(pumpLine, areaName);
|
||||
var scopePaths = new Dictionary<AclScopeRef, IReadOnlyList<NodeAclPath>>(resolver.Resolve(grants))
|
||||
{
|
||||
// A Tag grant's UNS projection (the resolver would derive it from raw rows this rig does not model).
|
||||
[new AclScopeRef(NodeAclScopeKind.Tag, FlowTagId)] = [new NodeAclPath([NodeAclRealms.Uns, "Area1", "Line1", "Pump", "Flow"])],
|
||||
[new AclScopeRef(NodeAclScopeKind.Tag, FlowTagId)] = [new NodeAclPath([NodeAclRealms.Uns, tagArea, "Line1", "Pump", "Flow"])],
|
||||
};
|
||||
NodeAclPath One(NodeAclScopeKind kind, string id) => resolver.ResolveOne(kind, id).ShouldHaveSingleItem();
|
||||
|
||||
@@ -535,6 +628,20 @@ public sealed class UnsFolderScopeWireTests
|
||||
PermissionFlags = flags,
|
||||
};
|
||||
|
||||
private static NodeAcl AnonymousGrant(NodeAclScopeKind kind, string scopeId) => new()
|
||||
{
|
||||
NodeAclId = $"anon-{scopeId}",
|
||||
ClusterId = ServerEventRig.Cluster,
|
||||
Principal = OpcUaPrincipals.Anonymous,
|
||||
ScopeKind = kind,
|
||||
ScopeId = scopeId,
|
||||
PermissionFlags = NodePermissions.ReadOnly,
|
||||
};
|
||||
|
||||
private static async Task RefreshAsync(ISession session, Subscription subscription, CancellationToken ct) =>
|
||||
await session.CallAsync(
|
||||
ObjectTypeIds.ConditionType, MethodIds.ConditionType_ConditionRefresh, ct, subscription.Id);
|
||||
|
||||
private static List<AlarmCommand> Route(ServerEventRig rig)
|
||||
{
|
||||
var routed = new List<AlarmCommand>();
|
||||
|
||||
Reference in New Issue
Block a user