mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-19 07:02:16 +08:00
e8afa4237b
Addresses 25 of 39 findings from a branch security review (assessment 5). CRITICAL: F1 gate MCP key-disclosure tools, F2 0600 keylog/pcap files, F3 per-user BaseFolder, F16 ChannelKeyMaterial IDisposable + ZeroMemory, F17 PcapFileReader MaxPacketBytes (64MB) bound, F18 FlowBuffer MaxBufferBytes (256MB) cap, F19 NodeSet export path validation, F20 ReplaySession listenPort range. HIGH: F4 IPcapAuditSink + LoggerPcapAuditSink + rate-limited frame-capture audit, F5 AES-256-GCM EncryptedKeyLogStream + SessionKeyManager (sibling .key file 0600), F14 IKeyEscrowProvider abstraction + DiskKeyEscrowProvider default (DI TryAddSingleton so consumers can route to KMS), F21 ChannelManagerOptions.MaxChannels (256) cap, F22 CaptureSessionManager.SessionFolder path-traversal guard, F23 PacketDecodeTools pcapPath/keyLogPath validation, F24 replay_pcap speed validation (NaN/Inf/<=0), F25 explicit permissions blocks on .github/workflows. MEDIUM: F6 OnTokenActivated [EditorBrowsable(Never)] + key-disclosure doc, F7 IDiagnosticsChannelMutation accessor + stack-walk caller guard (replaces internal OfflineLoadTokens), F8 PcapOptions.AllowMockClientReplay + AllowedReplayEndpoints, F9 PcapFileWriter / UaKeyLog*Writer rotation (.NNN suffix) with MaxBytes / MaxArtifactsPerSession, F13 keylog-isolation gap acknowledgment doc, F15 HashChainedAuditFileSink (HMAC-chained JSONL ledger, VerifyChain), F11 replay URL scheme allow-list (opc.tcp/opc.tcps/opc.https). LOW/INFO: F10 SBOM/CVE governance comments on PacketDotNet/SharpPcap + Docs/PacketCapture.md, F12 Security model section at top of PacketCapture.md. Tests: 100+ new NUnit tests across Audit/, Capture/, Frame/, KeyLog/, McpServerTools/, Replay/, Stack/Tcp/, DependencyInjection/. All file-mode/HMAC-chain/encryption tests are [Platform(Linux,MacOSX)]-gated where Unix-specific. Build: 0 warnings / 0 errors on Stack/Opc.Ua.Bindings.Pcap for net8.0 and net9.0. net10.0 build is environmentally blocked by a corrupted local SDK 10.0.300 workload manifest (microsoft.net.workload.mono.toolchain.net6 10.0.108 requires Emscripten.net6 >=10.0.108, only 9.0.17 installed); requires 'dotnet workload repair' from an elevated shell to validate the third TFM. No tests were run pending the SDK fix. 5 CA1508/CA2000 false positives suppressed with documented #pragma blocks (ownership transfer in escrow factory / IAsyncEnumerable iterator / unreachable catch path). Deferred to follow-up GitHub issues: 9 MEDIUM (M-SEC-07/09/10/11/12/13/16/22/31 — exception sanitization, reconnect defaults, cert-rotation races, nonce-suppress deprecation, parser hardening) and 10 LOW/INFO (L-SEC-14/15/17/23/24/33/34/35/36/37 — handler cleanup, EventSource endpoint masking, key-log schema validation, EOL deps, SAST). Full reasoning in session plan.md Round 10.
145 lines
5.2 KiB
C#
145 lines
5.2 KiB
C#
/* ========================================================================
|
|
* Copyright (c) 2005-2026 The OPC Foundation, Inc. All rights reserved.
|
|
*
|
|
* OPC Foundation MIT License 1.00
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person
|
|
* obtaining a copy of this software and associated documentation
|
|
* files (the "Software"), to deal in the Software without
|
|
* restriction, including without limitation the rights to use,
|
|
* copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following
|
|
* conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be
|
|
* included in all copies or substantial portions of the Software.
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
|
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
|
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
|
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
* OTHER DEALINGS IN THE SOFTWARE.
|
|
*
|
|
* The complete license agreement can be found here:
|
|
* http://opcfoundation.org/License/MIT/1.00/
|
|
* ======================================================================*/
|
|
|
|
using System;
|
|
using System.IO;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
|
|
namespace Opc.Ua.Bindings.Pcap.KeyLog
|
|
{
|
|
/// <summary>
|
|
/// Default key escrow provider that writes encrypted key-log
|
|
/// artifacts into the capture session folder.
|
|
/// </summary>
|
|
internal sealed class DiskKeyEscrowProvider : IKeyEscrowProvider
|
|
{
|
|
internal const string KeyLogJsonFileName = "keys.uakeys.json";
|
|
internal const string KeyLogTextFileName = "keys.uakeys.txt";
|
|
|
|
/// <inheritdoc/>
|
|
public ValueTask<IKeyEscrowSession> BeginSessionAsync(
|
|
string sessionId,
|
|
string sessionFolder,
|
|
CancellationToken cancellationToken)
|
|
{
|
|
ArgumentException.ThrowIfNullOrWhiteSpace(sessionId);
|
|
ArgumentException.ThrowIfNullOrWhiteSpace(sessionFolder);
|
|
cancellationToken.ThrowIfCancellationRequested();
|
|
|
|
Directory.CreateDirectory(sessionFolder);
|
|
string jsonPath = Path.Combine(sessionFolder, KeyLogJsonFileName);
|
|
string textPath = Path.Combine(sessionFolder, KeyLogTextFileName);
|
|
// CA2000: ownership of the DiskKeyEscrowSession transfers to the caller via
|
|
// the returned ValueTask; the caller is responsible for DisposeAsync.
|
|
#pragma warning disable CA2000
|
|
return new ValueTask<IKeyEscrowSession>(new DiskKeyEscrowSession(jsonPath, textPath));
|
|
#pragma warning restore CA2000
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
public ValueTask DisposeAsync()
|
|
{
|
|
return ValueTask.CompletedTask;
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Per-session disk escrow handle.
|
|
/// </summary>
|
|
internal sealed class DiskKeyEscrowSession : IKeyEscrowSession
|
|
{
|
|
private readonly string m_jsonPath;
|
|
private readonly string m_textPath;
|
|
private UaKeyLogJsonWriter? m_jsonWriter;
|
|
private UaKeyLogTextWriter? m_textWriter;
|
|
|
|
public DiskKeyEscrowSession(string jsonPath, string textPath)
|
|
{
|
|
ArgumentException.ThrowIfNullOrWhiteSpace(jsonPath);
|
|
ArgumentException.ThrowIfNullOrWhiteSpace(textPath);
|
|
|
|
m_jsonPath = jsonPath;
|
|
m_textPath = textPath;
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
public async ValueTask EscrowAsync(ChannelKeyMaterial material, CancellationToken ct)
|
|
{
|
|
ArgumentNullException.ThrowIfNull(material);
|
|
EnsureWriters();
|
|
|
|
await m_jsonWriter!.AppendAsync(material, ct).ConfigureAwait(false);
|
|
await m_textWriter!.AppendAsync(material, ct).ConfigureAwait(false);
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
public async ValueTask FlushAsync(CancellationToken ct)
|
|
{
|
|
if (m_jsonWriter is not null)
|
|
{
|
|
await m_jsonWriter.FlushAsync(ct).ConfigureAwait(false);
|
|
}
|
|
|
|
if (m_textWriter is not null)
|
|
{
|
|
await m_textWriter.FlushAsync(ct).ConfigureAwait(false);
|
|
}
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
public async ValueTask DisposeAsync()
|
|
{
|
|
if (m_jsonWriter is not null)
|
|
{
|
|
await m_jsonWriter.DisposeAsync().ConfigureAwait(false);
|
|
m_jsonWriter = null;
|
|
}
|
|
|
|
if (m_textWriter is not null)
|
|
{
|
|
await m_textWriter.DisposeAsync().ConfigureAwait(false);
|
|
m_textWriter = null;
|
|
}
|
|
}
|
|
|
|
private void EnsureWriters()
|
|
{
|
|
if (m_jsonWriter is not null && m_textWriter is not null)
|
|
{
|
|
return;
|
|
}
|
|
|
|
byte[] sessionKey = SessionKeyManager.CreateAndPersistKey(m_jsonPath);
|
|
m_jsonWriter = new UaKeyLogJsonWriter(m_jsonPath, sessionKey);
|
|
m_textWriter = new UaKeyLogTextWriter(m_textPath, sessionKey);
|
|
}
|
|
}
|
|
}
|