mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-29 07:07:24 +08:00
## Proposed changes Fixes #4857. The stack's log messages wrote network addresses (endpoint, discovery and reverse connect URLs, host names, IP addresses, ports), application and user identities, file paths and exception texts as plain parameters. Applications had no reliable way to keep them out of general-purpose logs. This PR replaces the stack's own redaction mechanism with the standard .NET [data classification and redaction](https://learn.microsoft.com/dotnet/core/extensions/data-redaction) packages. Each sensitive `[LoggerMessage]` parameter is classified. The application decides per classification what reaches its logs: erase it, replace it with an HMAC token so entries stay correlatable, or pass it through. ### Taxonomy `Opc.Ua.Redaction.OpcUaDataClassifications` defines the `OpcUa` taxonomy and one attribute per classification: | Classification | Used for | Parameters | |---|---|---| | `[NetworkAddress]` | URLs, host and domain names, IP/MAC addresses, end points, ports | 120 | | `[ApplicationIdentity]` | certificates, subject, issuer, thumbprint, ApplicationUri | 103 | | `[FilePath]` | file, directory and certificate store paths | 67 | | `[SensitiveText]` | exception or remote-supplied text passed as a parameter | 55 | | `[UserIdentity]` | user names, token subjects | 7 | Correlation ids (`ChannelId`, `SessionId`, ...), status codes and NodeIds stay unclassified. ### Pipeline and defaults - Opc.Ua.Core now references `Microsoft.Extensions.Telemetry(.Abstractions)` 10.11.0, so every project above Core uses the `Microsoft.Gen.Logging` generator. Opc.Ua.Client already did, through Http.Resilience. The packages ship net462 and netstandard2.0 builds, so net48 is supported. - **A plain `ILoggerFactory` logs `(null)` in place of classified values.** Classified values are only written by the redaction-aware logger. - The new `ILoggingBuilder.EnableOpcUaRedaction()` turns that logger on. It is `EnableRedaction()` with the discriminator off; otherwise every unredacted value gets `:ParamName` appended. `AddOpcUa().AddLogging(...)` and `DefaultTelemetry.Create(...)` call it, as do the samples, so they log the same information as before until redactors are registered. - `services.AddOpcUa()` alone does not change the host's logging. Generic-host apps call `builder.Logging.EnableOpcUaRedaction()`. This is documented as a behavior-breaking change in `docs/migrate/2.0.x/telemetry.md`. ### Obsolete API `Redact`, `RedactionWrapper<T>`, `IRedactionStrategy`, `RedactionStrategies` and `SimpleRedactionStrategy` are `[Obsolete]`. They still work, but the stack no longer uses them. ### Not classified - The `Exception` passed to a log call. Applications can drop exception messages with `LoggerEnrichmentOptions.IncludeExceptionMessage`. - Exception and `ServiceResult` message texts. - `ServiceResult`/`StatusCode` parameters and logged data values. - The few log calls whose level is decided at run time. - `Opc.Ua.Vision.OpenUsd`, which references only Opc.Ua.Types and cannot see the attributes. ### Generator behavior differences These are visible to log consumers and to tests: - `IFormattable` values such as `NodeId` are stored in the structured state as invariant strings, not as objects. - The generated log state is a thread-local object that is cleared after the call. - Classified values are pooled redactor objects, valid only during the `Log` call. Tests that inspected log state after the fact now capture it during the call. The shared `RecordingLoggerProvider` snapshots classified values. ## Related Issues - Fixes #4857 ## Types of changes - [ ] Bugfix (non-breaking change which fixes an issue) - [x] Enhancement (non-breaking change which adds functionality) - [ ] Test enhancement (non-breaking change to increase test coverage) - [x] Breaking change (fix or feature that would cause existing functionality to not work as expected; plain logger factories drop classified values) - [x] Documentation Update (if none of the other choices apply) ## Checklist - [x] I have read the CONTRIBUTING doc. - [x] I have signed the CLA. - [x] I ran tests locally with my changes, all passed. - [x] I fixed all failing tests in the CI pipelines. - [x] I fixed all introduced issues with CodeQL and LGTM. - [x] I have added tests that prove my fix is effective or that my feature works and increased code coverage. - [x] I have added necessary documentation (if appropriate). - [ ] Any dependent changes have been merged and published in downstream modules. ## Further comments New tests: - `LogClassificationCoverageTests` (Tools.Tests) scans all 104 stack assemblies and fails if an address, identity or path parameter of a `[LoggerMessage]` method is unclassified. - `DataClassificationLoggingTests` (Core.Tests) pins erasing and HMAC redaction, pass-through, the plain-factory drop, and both stack defaults. Local results on net10.0: | Suite | Passed | Failed | |---|---|---| | Core.Tests | 6,489 | 0 | | Client.Tests | 3,231 | 0 | | Tools.Tests | 7,210 | 0 | | PubSub.Tests | 1,536 | 0 | | Core.Diagnostics.Tests | 571 | 0 | | Configuration.Tests | 241 | 0 | - **Server.Tests:** the full run predates the final test fixes and had 12 failures. All 12 were in the fixtures fixed afterwards, which now pass: RoleStateBinding (45/45) and the FileDirectory and compatibility-logging fixtures (74/74 in total). The full Core.Tests and Server.Tests runs were not repeated after those fixes. - **Builds:** `UA.slnx` builds with 0 errors for net10.0 and net48, and the whitespace check passes. - **NativeAOT:** not confirmed locally, because the machine has no C++ linker. A trimmed publish of `Opc.Ua.Aot.Tests` reported no trim or AOT warnings from the stack, the new packages or the generated logging code; its only errors come from the TUnit test framework (`FSharp.Core` not found). The `aot-test` CI job has to confirm the native build. 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Marc Schier <marcschier@users.noreply.github.com>
294 lines
13 KiB
C#
294 lines
13 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.Globalization;
|
|
using System.IO;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
using Microsoft.Extensions.Configuration;
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
using Microsoft.Extensions.Hosting;
|
|
using Microsoft.Extensions.Logging;
|
|
using Opc.Ua;
|
|
using Opc.Ua.Client;
|
|
using Opc.Ua.Server.Hosting;
|
|
using Opc.Ua.Wot;
|
|
using Opc.Ua.WotCon.Bindings;
|
|
using Opc.Ua.WotCon.Bindings.OpcUa;
|
|
using Opc.Ua.WotCon.Server;
|
|
using Opc.Ua.WotCon.Server.Materialization;
|
|
|
|
namespace AggregationServer
|
|
{
|
|
/// <summary>
|
|
/// Builds and runs the reusable generic aggregation host.
|
|
/// </summary>
|
|
public static class AggregationServerHost
|
|
{
|
|
/// <summary>
|
|
/// Builds a host from explicit options.
|
|
/// </summary>
|
|
/// <exception cref="ArgumentNullException"></exception>
|
|
public static IHost Build(AggregationServerOptions options)
|
|
{
|
|
if (options is null)
|
|
{
|
|
throw new ArgumentNullException(nameof(options));
|
|
}
|
|
|
|
HostApplicationBuilder builder = Host.CreateApplicationBuilder();
|
|
Configure(builder, options);
|
|
return builder.Build();
|
|
}
|
|
|
|
/// <summary>
|
|
/// Builds and runs a host from explicit options.
|
|
/// </summary>
|
|
public static async Task RunAsync(
|
|
AggregationServerOptions options,
|
|
CancellationToken cancellationToken = default)
|
|
{
|
|
using IHost host = Build(options);
|
|
await host.RunAsync(cancellationToken).ConfigureAwait(false);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Builds a host from command-line configuration without starting its listeners.
|
|
/// </summary>
|
|
/// <exception cref="ArgumentNullException"></exception>
|
|
public static IHost BuildFromCommandLine(ArrayOf<string> args)
|
|
{
|
|
if (args.IsNull)
|
|
{
|
|
throw new ArgumentNullException(nameof(args));
|
|
}
|
|
HostApplicationBuilder builder = Host.CreateApplicationBuilder(args.ToArray());
|
|
var options = new AggregationServerOptions
|
|
{
|
|
EndpointUrl = builder.Configuration["endpoint"],
|
|
Host = builder.Configuration["host"] ?? "127.0.0.1",
|
|
Port = ReadPort(builder.Configuration),
|
|
ApplicationName =
|
|
builder.Configuration["applicationName"] ?? "AggregationServer",
|
|
PkiRoot = builder.Configuration["pkiRoot"],
|
|
StorageFolder = builder.Configuration["storageFolder"] ??
|
|
Path.Combine(AppContext.BaseDirectory, "registry"),
|
|
MaximumDocumentBytes = ReadMaximumDocumentBytes(builder.Configuration)
|
|
};
|
|
Configure(builder, options);
|
|
return builder.Build();
|
|
}
|
|
|
|
/// <summary>
|
|
/// Builds and runs a host from command-line configuration.
|
|
/// </summary>
|
|
public static async Task RunAsync(
|
|
string[] args,
|
|
CancellationToken cancellationToken = default)
|
|
{
|
|
using IHost host = BuildFromCommandLine(args);
|
|
await host.RunAsync(cancellationToken).ConfigureAwait(false);
|
|
}
|
|
|
|
private static void Configure(
|
|
HostApplicationBuilder builder,
|
|
AggregationServerOptions options)
|
|
{
|
|
Validate(options);
|
|
builder.Logging.ClearProviders();
|
|
builder.Logging.EnableOpcUaRedaction();
|
|
builder.Logging.AddConsole();
|
|
builder.Services.AddSingleton(options);
|
|
|
|
string endpoint = options.EndpointUrl ??
|
|
new UriBuilder("opc.tcp", options.Host, options.Port, "AggregationServer").Uri.AbsoluteUri;
|
|
IOpcUaBuilder opcUa = builder.Services.AddOpcUa();
|
|
opcUa.AddOpcTcpTransport();
|
|
opcUa.AddServer(server =>
|
|
{
|
|
server.ApplicationName = options.ApplicationName;
|
|
server.ApplicationUri =
|
|
$"urn:localhost:OPCFoundation:{options.ApplicationName}";
|
|
server.ProductUri = "uri:opcfoundation.org:AggregationServer";
|
|
if (!string.IsNullOrWhiteSpace(options.PkiRoot))
|
|
{
|
|
server.PkiRoot = options.PkiRoot;
|
|
}
|
|
server.AutoAcceptUntrustedCertificates = true;
|
|
server.IncludeUnsecurePolicyNone = true;
|
|
server.EndpointUrls.Add(endpoint);
|
|
});
|
|
builder.Services.AddSingleton(serviceProvider => new WotNodeSetConverterOptions
|
|
{
|
|
MaxJsonDocumentSize = options.MaximumDocumentBytes,
|
|
MaxResolverDocumentBytes = options.MaximumDocumentBytes,
|
|
MaxResolverDocuments = 1024,
|
|
ValueEncodingContext = serviceProvider.GetService<IServiceMessageContext>()
|
|
});
|
|
builder.Services.AddSingleton(serviceProvider =>
|
|
new LinkedNativeDocumentConverter(serviceProvider.GetRequiredService<WotNodeSetConverterOptions>(),
|
|
serviceProvider.GetRequiredService<ITelemetryContext>()));
|
|
builder.Services.AddSingleton<IWotDocumentConverter>(serviceProvider =>
|
|
serviceProvider.GetRequiredService<LinkedNativeDocumentConverter>());
|
|
builder.Services.AddSingleton<IServerStartupTask>(serviceProvider =>
|
|
serviceProvider.GetRequiredService<LinkedNativeDocumentConverter>());
|
|
opcUa.AddWotRegistryServer(registry =>
|
|
{
|
|
registry.AutoRefresh = false;
|
|
registry.StorageFolder = options.StorageFolder;
|
|
registry.ResourceStore = options.ResourceStore;
|
|
registry.Bounds.MaxDocumentBytes = options.MaximumDocumentBytes;
|
|
registry.ManagementAccess = new WotManagementAccessPolicy
|
|
{
|
|
MinimumSecurityMode = MessageSecurityMode.None,
|
|
AllowAnonymous = true,
|
|
RequiredRoleId = ObjectIds.WellKnownRole_Anonymous
|
|
};
|
|
});
|
|
|
|
// The bundled companion registry holds 540 partitioned documents (31 MiB), more than
|
|
// the default 256-document resolver budget, so the sample states a larger budget
|
|
// explicitly. The byte budgets stay at their defaults.
|
|
builder.Services.AddSingleton(new Opc.Ua.Wot.WotNodeSetConverterOptions
|
|
{
|
|
MaxJsonDocumentSize = options.MaximumDocumentBytes,
|
|
MaxResolverDocumentBytes = options.MaximumDocumentBytes,
|
|
MaxResolverDocuments = 1024
|
|
});
|
|
|
|
opcUa.AddClient(client =>
|
|
{
|
|
client.ApplicationName = $"{options.ApplicationName}.Upstream";
|
|
client.ApplicationUri =
|
|
$"urn:localhost:OPCFoundation:{options.ApplicationName}.Upstream";
|
|
client.ProductUri = "uri:opcfoundation.org:AggregationServer";
|
|
if (!string.IsNullOrWhiteSpace(options.PkiRoot))
|
|
{
|
|
client.PkiRoot = Path.Combine(options.PkiRoot, "upstream");
|
|
}
|
|
client.AutoAcceptUntrustedCertificates = true;
|
|
client.Session = new ManagedSessionOptions
|
|
{
|
|
SessionName = $"{options.ApplicationName}.Upstream",
|
|
SessionTimeout = TimeSpan.FromMinutes(30)
|
|
};
|
|
}).AddManagedClientPool();
|
|
|
|
opcUa.AddHttpWotBinding();
|
|
opcUa.AddModbusWotBinding();
|
|
|
|
// The aggregation topology deliberately federates source servers that run on the
|
|
// same host as this server, so the loopback gate the default policy applies must be
|
|
// opened explicitly. Keep every other check (scheme, blocked hosts, private ranges)
|
|
// at its secure default.
|
|
opcUa.AddWotEndpointPolicy(new WotEndpointPolicy { AllowLoopback = true });
|
|
|
|
builder.Services.AddSingleton<IWotBindingExecutor>(serviceProvider =>
|
|
{
|
|
IManagedSessionPool pool =
|
|
serviceProvider.GetRequiredService<IManagedSessionPool>();
|
|
return new OpcUaWotBindingExecutor(new OpcUaWotBindingOptions
|
|
{
|
|
DisposeSession = false,
|
|
SessionFactory = async (url, ct) =>
|
|
{
|
|
var endpointDescription = new EndpointDescription
|
|
{
|
|
EndpointUrl = url,
|
|
SecurityMode = MessageSecurityMode.SignAndEncrypt,
|
|
SecurityPolicyUri = SecurityPolicies.Basic256Sha256
|
|
};
|
|
var configuredEndpoint = new ConfiguredEndpoint(
|
|
null,
|
|
endpointDescription,
|
|
null)
|
|
{
|
|
UpdateBeforeConnect = true
|
|
};
|
|
ManagedSession session = await pool.GetOrConnectAsync(url, configuredEndpoint, ct)
|
|
.ConfigureAwait(false);
|
|
int keepAliveInterval = (int)TimeSpan.FromSeconds(30).TotalMilliseconds;
|
|
if (session.KeepAliveInterval != keepAliveInterval)
|
|
{
|
|
session.KeepAliveInterval = keepAliveInterval;
|
|
}
|
|
return session;
|
|
}
|
|
});
|
|
});
|
|
}
|
|
|
|
private static int ReadPort(ConfigurationManager configuration)
|
|
{
|
|
return int.TryParse(
|
|
configuration["port"],
|
|
NumberStyles.Integer,
|
|
CultureInfo.InvariantCulture,
|
|
out int port)
|
|
? port
|
|
: 62550;
|
|
}
|
|
|
|
private static int ReadMaximumDocumentBytes(ConfigurationManager configuration)
|
|
{
|
|
return int.TryParse(
|
|
configuration["maximumDocumentBytes"],
|
|
NumberStyles.Integer,
|
|
CultureInfo.InvariantCulture,
|
|
out int maximumDocumentBytes)
|
|
? maximumDocumentBytes
|
|
: 32 * 1024 * 1024;
|
|
}
|
|
|
|
private static void Validate(AggregationServerOptions options)
|
|
{
|
|
if (string.IsNullOrWhiteSpace(options.ApplicationName))
|
|
{
|
|
throw new ArgumentException("ApplicationName is required.", nameof(options));
|
|
}
|
|
if (options.MaximumDocumentBytes <= 0)
|
|
{
|
|
throw new ArgumentException(
|
|
"MaximumDocumentBytes must be positive.",
|
|
nameof(options));
|
|
}
|
|
if (string.IsNullOrWhiteSpace(options.StorageFolder))
|
|
{
|
|
throw new ArgumentException("StorageFolder is required.", nameof(options));
|
|
}
|
|
if (options.EndpointUrl is null &&
|
|
(string.IsNullOrWhiteSpace(options.Host) || options.Port is < 1 or > 65535))
|
|
{
|
|
throw new ArgumentException("A valid host and port are required.", nameof(options));
|
|
}
|
|
}
|
|
}
|
|
}
|