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:
+25
@@ -312,4 +312,29 @@ public sealed class DeploymentArtifactScopePathTests
|
||||
|
||||
projection.UnsFolderScopes.Keys.ShouldBe(["UL-ok"]);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gitea #826 — the projection says which equipment each raw tag is projected into, keyed on the RawPath the
|
||||
/// same resolver builds (a native alarm's <c>ConditionId</c>), so the node manager can tell a native alarm's
|
||||
/// still-referenced equipment folders from one whose reference the generation dropped.
|
||||
/// </summary>
|
||||
[Fact]
|
||||
public void The_projection_carries_each_raw_tags_referencing_equipment_under_its_raw_path()
|
||||
{
|
||||
var projection = DeploymentArtifact.ParseDataPlaneAuthority(Encoding.UTF8.GetBytes(Artifact), NodeId);
|
||||
|
||||
const string rawPath = "Plant/Line1/ModbusDrv/dev1/Fast/Speed";
|
||||
projection.TagReferencingEquipment.Keys.ShouldBe([rawPath]);
|
||||
projection.TagReferencingEquipment[rawPath].ShouldBe(["EQ-mixer"]);
|
||||
|
||||
var snapshot = new DataPlaneAuthorityState().Apply(
|
||||
"c1", "rev-1", projection.Keys, projection.Grants, projection.ScopePaths, projection.EquipmentScopePaths,
|
||||
projection.ScriptedAlarmOwners, projection.UnsFolderScopes, projection.TagReferencingEquipment);
|
||||
snapshot.IsTagReferencedBy(rawPath, "EQ-mixer").ShouldBeTrue();
|
||||
snapshot.IsTagReferencedBy(rawPath, "eq-MIXER").ShouldBeTrue("equipment ids compare as identifiers");
|
||||
snapshot.IsTagReferencedBy(rawPath, "EQ-other").ShouldBeFalse();
|
||||
snapshot.IsTagReferencedBy("Plant/Line1/ModbusDrv/dev1/Fast/Other", "EQ-mixer").ShouldBeFalse();
|
||||
new DataPlaneAuthorityState().Apply("c1", "rev-1", [], [], projection.ScopePaths)
|
||||
.IsTagReferencedBy(rawPath, "EQ-mixer").ShouldBeFalse("an absent map references nothing (fail closed)");
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user