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.
36 lines
1.8 KiB
C#
36 lines
1.8 KiB
C#
using Microsoft.Extensions.DependencyInjection;
|
|
using ZB.MOM.WW.ScadaBridge.CentralUI.ScriptAnalysis;
|
|
namespace ZB.MOM.WW.ScadaBridge.CentralUI.Tests.ScriptAnalysis;
|
|
[Collection("Sandbox worker processes")]
|
|
public class BoundedSandboxOutputTests
|
|
{
|
|
[Theory]
|
|
[InlineData("block")]
|
|
[InlineData("new { Data = block }")]
|
|
public async Task Worker_OversizedConsoleAndReturn_AreExplicitlyBounded(string returnExpression)
|
|
{
|
|
using var services = new Microsoft.Extensions.DependencyInjection.ServiceCollection().BuildServiceProvider();
|
|
using var cache = new Microsoft.Extensions.Caching.Memory.MemoryCache(new Microsoft.Extensions.Caching.Memory.MemoryCacheOptions());
|
|
var runner = new ScriptAnalysisService(NSubstitute.Substitute.For<ISharedScriptCatalog>(), cache, services);
|
|
var result = await runner.RunInSandboxAsync(new SandboxRunRequest(
|
|
"var block = new string('x', 100000); for (int i=0; i<1000; i++) System.Console.Write(block); return " + returnExpression + ";", null, 10), CancellationToken.None);
|
|
Assert.True(result.Success, result.Error);
|
|
Assert.True(result.ConsoleOutput.Length < 32100);
|
|
Assert.Contains("truncated", result.ConsoleOutput);
|
|
Assert.Contains("truncated", result.ReturnValueJson!);
|
|
Assert.True(System.Text.Encoding.UTF8.GetByteCount(result.ReturnValueJson!) < 32000);
|
|
}
|
|
|
|
[Fact]
|
|
public void ConcurrentRepeatedLargeWrites_RetainOnlyBudget()
|
|
{
|
|
var writer = new BoundedSandboxWriter(32000);
|
|
var block = new string('x', 100000);
|
|
Parallel.For(0, 1000, _ => writer.WriteLine(block));
|
|
Assert.Equal(32000, writer.RetainedCharacters);
|
|
Assert.True(writer.DroppedCharacters >= 99968000);
|
|
Assert.True(writer.ToString().Length < 32100);
|
|
Assert.Contains("truncated", writer.ToString());
|
|
}
|
|
}
|