9a87d7a328
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.
99 lines
4.9 KiB
C#
99 lines
4.9 KiB
C#
using Microsoft.AspNetCore.DataProtection;
|
|
using Microsoft.EntityFrameworkCore;
|
|
using ZB.MOM.WW.ScadaBridge.Commons.Entities.Instances;
|
|
using ZB.MOM.WW.ScadaBridge.Commons.Entities.Sites;
|
|
|
|
namespace ZB.MOM.WW.ScadaBridge.ConfigurationDatabase.Tests;
|
|
|
|
public class MediumPersistenceRegressionTests
|
|
{
|
|
private static ScadaBridgeDbContext Create(bool protectedWrites = true)
|
|
{
|
|
var options = new DbContextOptionsBuilder<ScadaBridgeDbContext>()
|
|
.UseSqlite("Data Source=:memory:;Foreign Keys=False").Options;
|
|
var db = protectedWrites ? new ScadaBridgeDbContext(options, new EphemeralDataProtectionProvider())
|
|
: new ScadaBridgeDbContext(options);
|
|
db.Database.OpenConnection();
|
|
db.Database.EnsureCreated();
|
|
return db;
|
|
}
|
|
|
|
[Fact]
|
|
public async Task DL1_UniqueNameCannotExistAtTwoSites()
|
|
{
|
|
await using var db = Create();
|
|
db.Instances.Add(new Instance("shared-pump") { SiteId = 1, TemplateId = 1 });
|
|
await db.SaveChangesAsync();
|
|
db.Instances.Add(new Instance("shared-pump") { SiteId = 2, TemplateId = 1 });
|
|
await Assert.ThrowsAsync<InstanceNameConflictException>(() => db.SaveChangesAsync());
|
|
}
|
|
|
|
[Fact]
|
|
public async Task DL2_ConvertersDoNotShareKeysAcrossProviders()
|
|
{
|
|
await using var connection = new Microsoft.Data.Sqlite.SqliteConnection("Data Source=:memory:;Foreign Keys=False");
|
|
await connection.OpenAsync();
|
|
var options = new DbContextOptionsBuilder<ScadaBridgeDbContext>().UseSqlite(connection).Options;
|
|
await using (var first = new ScadaBridgeDbContext(options, new EphemeralDataProtectionProvider()))
|
|
{
|
|
await first.Database.EnsureCreatedAsync();
|
|
first.DataConnections.Add(new DataConnection("key-isolation", "OpcUa", 1) { PrimaryConfiguration = "{}" });
|
|
await first.SaveChangesAsync();
|
|
}
|
|
await using var wrongKey = new ScadaBridgeDbContext(options, new EphemeralDataProtectionProvider());
|
|
await Assert.ThrowsAsync<System.Security.Cryptography.CryptographicException>(() =>
|
|
wrongKey.DataConnections.SingleAsync(c => c.Name == "key-isolation"));
|
|
}
|
|
|
|
[Fact]
|
|
public async Task DL2_LegacyUpgradeProtectsBothColumnsAndIsIdempotent()
|
|
{
|
|
await using var db = Create();
|
|
await db.Database.ExecuteSqlRawAsync("INSERT INTO DataConnections (SiteId, Name, Protocol, PrimaryConfiguration, BackupConfiguration, FailoverRetryCount) VALUES (1, 'legacy', 'OpcUa', {0}, {1}, 3)",
|
|
"""{"Password":"primary-secret"}""", """{"Password":"backup-secret"}""");
|
|
await DataConnectionSecretUpgrade.UpgradeAsync(db);
|
|
await using var command = db.Database.GetDbConnection().CreateCommand();
|
|
command.CommandText = "SELECT PrimaryConfiguration FROM DataConnections WHERE Name = 'legacy'";
|
|
var first = (string)(await command.ExecuteScalarAsync())!;
|
|
Assert.DoesNotContain("primary-secret", first);
|
|
await DataConnectionSecretUpgrade.UpgradeAsync(db);
|
|
Assert.Equal(first, (string)(await command.ExecuteScalarAsync())!);
|
|
var row = await db.DataConnections.SingleAsync(c => c.Name == "legacy");
|
|
Assert.Contains("primary-secret", row.PrimaryConfiguration);
|
|
Assert.Contains("backup-secret", row.BackupConfiguration);
|
|
}
|
|
|
|
[Theory]
|
|
[InlineData(false)]
|
|
[InlineData(true)]
|
|
public async Task DL2_DataConnectionConfigurationIsEncryptedAndRoundTrips(bool backup)
|
|
{
|
|
await using var db = Create();
|
|
const string secret = "{\"Password\":\"medium-secret-never-plaintext\"}";
|
|
var connection = new DataConnection("test", "OpcUa", 1);
|
|
if (backup) connection.BackupConfiguration = secret; else connection.PrimaryConfiguration = secret;
|
|
db.DataConnections.Add(connection);
|
|
await db.SaveChangesAsync();
|
|
db.ChangeTracker.Clear();
|
|
await using var cmd = db.Database.GetDbConnection().CreateCommand();
|
|
cmd.CommandText = $"SELECT {(backup ? "BackupConfiguration" : "PrimaryConfiguration")} FROM DataConnections WHERE Id = {connection.Id}";
|
|
var raw = Assert.IsType<string>(await cmd.ExecuteScalarAsync());
|
|
Assert.DoesNotContain("medium-secret", raw);
|
|
var loaded = await db.DataConnections.SingleAsync(c => c.Id == connection.Id);
|
|
Assert.Equal(secret, backup ? loaded.BackupConfiguration : loaded.PrimaryConfiguration);
|
|
}
|
|
|
|
[Theory]
|
|
[InlineData(false)]
|
|
[InlineData(true)]
|
|
public async Task DL2_SchemaOnlyContextCannotWriteProtocolCredentials(bool backup)
|
|
{
|
|
await using var db = Create(false);
|
|
var connection = new DataConnection("test", "OpcUa", 1);
|
|
if (backup) connection.BackupConfiguration = "{}"; else connection.PrimaryConfiguration = "{}";
|
|
db.DataConnections.Add(connection);
|
|
var error = await Assert.ThrowsAsync<InvalidOperationException>(() => db.SaveChangesAsync());
|
|
Assert.Contains("Data Protection", error.Message);
|
|
}
|
|
}
|