Resolve all 33 medium-severity architecture review findings

Second slice of the 2026-09-09 whole-system review remediation (docs/plans/2026-09-09-arch-review.md §10), on top of the High slice 146a1323. Runtime/devices: SR-2 alarm on-trigger integration scope; SR-3 correlated NativeAlarmActor subscribe retry; SR-4 immutable audited DB target; SR-5 ordered InstanceActor stop/flush; SR-12 rehydration fence; SR-13 S&F gate recheck per delivery; DC-4 no OPC UA security downgrade; DC-5 alarm snapshot for every new subscriber; ORCH-1 sync-dispose joins the pump. Management/UI: MG-2 site scope on audit tree + Flow Debugger Replay; MG-3 stale-probe memo removed; MG-4 server-owned bulk-deploy deadline; UI-5 sandbox runs in a killable child process (new CentralUI.SandboxWorker project); UI-14 bounded sandbox output/IPC. Edge/audit: EI-1 relay audit ownership; EI-2 SkipBodyCapture suppresses error text; EI-3/EI-11 error-field redaction + caps; EI-4 single relay deadline, pre-execution-only retry; EI-5 authenticated relay provenance; EI-10 body cap before audit read. Persistence/contracts: DL-1 global Instance.UniqueName unique index + conflict translation; DL-2 DataConnection protocol config encrypted at rest (migration 20260909203046_EnforceGlobalInstanceNamesAndProtectProtocolConfiguration — coordinated central upgrade, old binaries cannot read protected rows); DL-3 bounded Replay paging; DL-6 cross-site Overwrite of a deployed instance rejected; XC-4 proto descriptor contract test. Config/hygiene: XC-1 central listener isolation by local port; XC-2/XC-3 inert SMTP + cron keys removed from rig settings; CM-2 env2 bootstrap guard enabled; DC-6 deploy site exit code; DC-7 notifier retries only explicit standby rejection; XC-5 ClusterClient purged from docs. Gates recorded in the report: build 0/0, 9 397 passed / 0 failed, rig redeployed on all eight nodes with the migration applied. 46 Low findings remain open.
2026-09-09 22:05:30 -04:00
parent 146a13238f
commit 9a87d7a328
136 changed files with 5441 additions and 648 deletions
@@ -41,6 +41,7 @@ public sealed class SiteInstanceImportTests : IDisposable
    public SiteInstanceImportTests()
    {
        var services = new ServiceCollection();
+        services.AddSingleton<Microsoft.AspNetCore.DataProtection.IDataProtectionProvider>(new Microsoft.AspNetCore.DataProtection.EphemeralDataProtectionProvider());
        services.AddSingleton<IConfiguration>(
            new ConfigurationBuilder().AddInMemoryCollection().Build());

@@ -611,6 +612,56 @@ public sealed class SiteInstanceImportTests : IDisposable
    // Overwrite an existing instance: child rows replaced from the bundle
    // ──────────────────────────────────────────────────────────────────────

+    [Theory]
+    [InlineData(InstanceState.Enabled)]
+    [InlineData(InstanceState.NotDeployed)]
+    public async Task DL6_OverwriteCannotReassignDeployedInstance(InstanceState state)
+    {
+        await SeedSiteClosureAsync();
+        var sessionId = await ExportAllSitesAndLoadAsync();
+        int oldSiteId;
+        await using (var scope = _provider.CreateAsyncScope())
+        {
+            var db = scope.ServiceProvider.GetRequiredService<ScadaBridgeDbContext>();
+            var oldSite = new Site("Other plant", "other-plant");
+            db.Sites.Add(oldSite);
+            await db.SaveChangesAsync();
+            oldSiteId = oldSite.Id;
+            var instance = await db.Instances.SingleAsync(i => i.UniqueName == "Pump-01");
+            instance.SiteId = oldSiteId;
+            instance.State = state;
+            await db.SaveChangesAsync();
+        }
+        var nameMap = new BundleNameMap(
+            Sites: new[] { new SiteMapping("plant-1", MappingAction.MapToExisting, "plant-1") },
+            Connections: new[] { new ConnectionMapping("plant-1", "OpcUaPrimary", MappingAction.MapToExisting, "OpcUaPrimary") });
+        var resolutions = new List<ImportResolution>
+        {
+            new("Template", "Pump", ResolutionAction.Skip, null),
+            new("Site", "plant-1", ResolutionAction.Skip, null),
+            new("DataConnection", "plant-1/OpcUaPrimary", ResolutionAction.Skip, null),
+            new("Instance", "Pump-01", ResolutionAction.Overwrite, null)
+        };
+        if (state != InstanceState.NotDeployed)
+        {
+            var error = await Assert.ThrowsAsync<InvalidOperationException>(() => ApplyAsync(sessionId, resolutions, nameMap));
+            Assert.Contains("undeploy", error.Message, StringComparison.OrdinalIgnoreCase);
+            await using var scope = _provider.CreateAsyncScope();
+            var db = scope.ServiceProvider.GetRequiredService<ScadaBridgeDbContext>();
+            var instance = await db.Instances.Include(i => i.ConnectionBindings).SingleAsync(i => i.UniqueName == "Pump-01");
+            Assert.Equal(oldSiteId, instance.SiteId);
+            Assert.Equal(state, instance.State);
+            Assert.Single(instance.ConnectionBindings);
+        }
+        else
+        {
+            await ApplyAsync(sessionId, resolutions, nameMap);
+            await using var scope = _provider.CreateAsyncScope();
+            var instance = await scope.ServiceProvider.GetRequiredService<ScadaBridgeDbContext>().Instances.SingleAsync(i => i.UniqueName == "Pump-01");
+            Assert.NotEqual(oldSiteId, instance.SiteId);
+        }
+    }
+
    [Fact]
    public async Task ApplyAsync_Overwrite_existing_instance_replaces_child_rows_and_remaps_binding()
    {