fix(acl): folder event verdict invalidation reaches orphaned items, decides on the live instance, skips ACL-off; alarm-bearing reference map (#826 review)
1. Orphaned subscriptions (session closed without deleting subs) have Session == null, so the public MonitoredNode2.InvalidatePermissionCacheForSession never reached their items: a cached allow survived a deploy, the moved alarm's events were queued and delivered on TransferSubscriptions. Each notifier's cache is now cleared whole through the SDK's private MonitoredNode2.InvalidatePermissionCaches (reflection, guard-tested; fallback = per-session drop + Remove/Add of session-less items). 2. The verdict is decided on the condition LIVE under the event's NodeId, not the event's own instance: the SDK key has no instance identity, so a replaced instance's late event cached a deny its successor inherited until the next invalidation. 3. Invalidation is skipped while enforcement is off (forced across an on/off authorizer transition) and is one O(cache) clear per node instead of a whole-cache scan per item. 4. TagReferencingEquipment carries alarm-bearing raw tags only (TagConfigIntent.Alarm); the snapshot adopts an OrdinalIgnoreCase set instead of copying it again. Tests (each fails with its fix reverted): FolderEventVerdictInvalidationTests (orphan + deploy + transfer; replaced instance's late event; ACL-off skip; SDK private-method guard), DeploymentArtifactScopePathTests (alarm-bearing projection).
This commit is contained in:
@@ -163,7 +163,7 @@ public sealed class DataPlaneAuthoritySnapshot
|
||||
public IReadOnlyDictionary<string, UnsFolderScope> UnsFolderScopes { get; }
|
||||
|
||||
/// <summary>
|
||||
/// <c>RawPath → the EquipmentIds whose UnsTagReference projects that raw tag</c>, as THIS generation deploys
|
||||
/// <c>RawPath → the EquipmentIds whose UnsTagReference projects that ALARM-BEARING raw tag</c>, as THIS generation deploys
|
||||
/// them (Gitea #826). Keyed <c>Ordinal</c> (a RawPath is a NodeId identifier); the id sets are
|
||||
/// <c>OrdinalIgnoreCase</c> (identifier rule).
|
||||
/// </summary>
|
||||
@@ -395,9 +395,14 @@ public sealed class DataPlaneAuthoritySnapshot
|
||||
foreach (var (rawPath, equipmentIds) in tagReferencingEquipment)
|
||||
{
|
||||
if (string.IsNullOrEmpty(rawPath) || equipmentIds is null) continue;
|
||||
// Re-keyed under the identifier comparer, as the maps above are.
|
||||
referencing[rawPath] = new HashSet<string>(
|
||||
equipmentIds.Where(id => !string.IsNullOrWhiteSpace(id)), StringComparer.OrdinalIgnoreCase);
|
||||
// Re-keyed under the identifier comparer, as the maps above are — but a set already built under it
|
||||
// (what DeploymentArtifact produces) is adopted rather than copied a second time.
|
||||
referencing[rawPath] = equipmentIds is HashSet<string> set
|
||||
&& ReferenceEquals(set.Comparer, StringComparer.OrdinalIgnoreCase)
|
||||
&& !set.Any(string.IsNullOrWhiteSpace)
|
||||
? set
|
||||
: new HashSet<string>(
|
||||
equipmentIds.Where(id => !string.IsNullOrWhiteSpace(id)), StringComparer.OrdinalIgnoreCase);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user