mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-22 01:26:20 +08:00
9b034f8291
# Description Nullable reference types are now enabled once, in `common.props`, and every project in the repository builds warning-clean with them. **Configuration** - `<Nullable>enable</Nullable>` lives in `common.props`. All per-project `<Nullable>` settings are removed: 178 project files (enable, annotations, and the `disable` in the three Aot test projects). - 419 per-file `#nullable enable`/`restore` directives and the 4 `#nullable disable` directives are removed. - Kept on purpose: - The 5 `<auto-generated>` schema files (`UANodeSet.cs`, `UA Type Dictionary.cs`, `OPCBinarySchema.cs`, `SecuredApplication.cs`, `PInvokeHelper.cs`) keep `#nullable enable`. The compiler ignores the project setting in generated code, so the directive is required there. - `tests/Opc.Ua.Interop.LegacyPeer` keeps `disable`. It builds against the 1.5.378 packages and does not import the repository props. - `docs/DeveloperGuide.md` and `.github/copilot-instructions.md` now describe the central setting. **Migration** (the 43 unset and 13 annotations-only projects, roughly 10k diagnostics) - **Production code: annotated at the declarations.** Covers `tools/Opc.Ua.SourceGeneration.Core`, `src/Opc.Ua.Lds.Server` and the LDS sample. - Members, parameters and returns are nullable where null actually flows. - Null-check helpers carry `[NotNullWhen]` (`IsNull`, `IsValidXmlName`, `IsMethodTypeDesign`). - `CoreUtils.Format`, `Utils.Format`, `ITemplateWriter.WriteLine` take `params object?[]`. `Template.AddReplacement` takes `string?` (rendering already skips null replacements). - `IRegisteredServerStore.RegisterAsync` returns `Task<RegistrationEntry?>`: it returns null when a registration is removed. - Dereferences backed by an invariant (for example, the validated model) use `!`, so runtime behaviour is unchanged. - **Behavioural changes in production code** (small, deliberate): - `NodeSetToModelDesign` throws `InvalidOperationException` when the file is not a NodeSet. Before, it threw a NullReferenceException on the next line. - `ModelDesignValidator` starts its lookup tables empty instead of null. A redundant `if (m_nodes == null) return;` guard is gone. - **Test code: minimal annotations.** - `?` on values that can be null, `!` where the test asserts non-null. - `= null!` for fixture members assigned in SetUp. - `TryGetStructure<T>(out T? x)` where the inferred `T?` broke the `IEncodeable` constraint. - A few redundant `== null` checks on structs (`NodeId`, `ArrayOf<T>`) folded into the adjacent `IsNull`/`Count` checks. **Notes for reviewers** - The diff is large (~1,500 files) but almost entirely mechanical: `?`, `!` and directive removal. The non-annotation changes are listed above. - Known follow-up, not done here: `IModelDesign.Namespaces/TargetNamespace/NamespaceUris` stay non-nullable even though the validator returns null before it loads a dictionary. Making them nullable would ripple through every generator call site. ## Related Issues - Fixes #4439 ## Checklist - [ ] I have signed the [CLA](https://opcfoundation.org/license/cla/ContributorLicenseAgreementv1.0.pdf) and read the [CONTRIBUTING](https://github.com/OPCFoundation/UA-.NETStandard/blob/master/CONTRIBUTING.md) doc. - [ ] I have added tests that prove my fix is effective or that my feature works and increased code coverage. - [x] I have added all necessary documentation. - [x] I have verified that my changes do not introduce (new) build or analyzer warnings. - [ ] I ran **all** tests locally using the **UA.slnx** solution against at least .net **framework** and .net **10**, and all passed. - [ ] I fixed **all** failing and flaky tests in the CI pipelines and **all** CodeQL warnings. - [ ] I have addressed **all** PR feedback received. The "no new warnings" box covers net10.0 and net48: full non-incremental builds of `UA.slnx`, `tools/SourceGeneration.slnx`, `tools/MigrationAnalyzer.slnx` and the Aot test projects finished with 0 warnings and 0 errors under the repository's warnings-as-errors settings. net9.0 and net8.0 also had no nullable diagnostics, but they were not rebuilt after the final fixes. Tests have not been run locally yet. 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
229 lines
9.7 KiB
C#
229 lines
9.7 KiB
C#
/* ========================================================================
|
|
* Copyright (c) 2005-2025 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 Microsoft.Extensions.DependencyInjection;
|
|
using Microsoft.Extensions.Options;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.Server.Hosting;
|
|
|
|
namespace Opc.Ua.Server.Tests.Hosting
|
|
{
|
|
/// <summary>
|
|
/// Coverage tests for the new first-class option properties exposed
|
|
/// on <see cref="OpcUaServerOptions"/> (reverse connect, user-token
|
|
/// policies, extended transport quotas, ECC policies, operation
|
|
/// limits, registration endpoint, security hardening).
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// These tests inspect the bound <see cref="IOptions{TOptions}"/>
|
|
/// snapshot after registration — they do not start the hosted
|
|
/// service. The hosted service's projection of each option into the
|
|
/// underlying <see cref="IApplicationConfigurationBuilder"/> chain
|
|
/// is exercised by the existing AOT and combined-host integration
|
|
/// tests.
|
|
/// </remarks>
|
|
[TestFixture]
|
|
[Category("Server")]
|
|
[Category("Hosting")]
|
|
[Parallelizable]
|
|
public sealed class OpcUaServerOptionsCoverageTests
|
|
{
|
|
[Test]
|
|
public void DefaultsForSecurityHardeningArePresent()
|
|
{
|
|
var services = new ServiceCollection();
|
|
services.AddOpcUa().AddServer(_ => { });
|
|
using ServiceProvider sp = services.BuildServiceProvider();
|
|
|
|
OpcUaServerOptions opts = sp.GetRequiredService<IOptions<OpcUaServerOptions>>().Value;
|
|
Assert.That(opts.RejectSHA1Certificates, Is.True);
|
|
Assert.That(opts.MinCertificateKeySize, Is.EqualTo(2048));
|
|
Assert.That(opts.IncludeEccPolicies, Is.False);
|
|
Assert.That(opts.UserTokenPolicies, Is.Empty);
|
|
Assert.That(opts.ReverseConnect, Is.Null);
|
|
Assert.That(opts.OperationLimits, Is.Null);
|
|
Assert.That(opts.RegistrationEndpointUrl, Is.Null);
|
|
Assert.That(opts.MaxMessageSize, Is.Null);
|
|
Assert.That(opts.OperationTimeoutMs, Is.Null);
|
|
}
|
|
|
|
[Test]
|
|
public void ReverseConnectOptionsRoundTrip()
|
|
{
|
|
var services = new ServiceCollection();
|
|
services.AddOpcUa().AddServer(o =>
|
|
{
|
|
o.ReverseConnect = new ServerReverseConnectOptions
|
|
{
|
|
ConnectIntervalMs = 5000,
|
|
ConnectTimeoutMs = 10000,
|
|
RejectTimeoutMs = 20000
|
|
};
|
|
o.ReverseConnect.Clients.Add(new ServerReverseConnectClientOptions
|
|
{
|
|
EndpointUrl = "opc.tcp://client.local:4841",
|
|
Timeout = 7000,
|
|
MaxSessionCount = 2,
|
|
Enabled = true
|
|
});
|
|
});
|
|
using ServiceProvider sp = services.BuildServiceProvider();
|
|
|
|
OpcUaServerOptions opts = sp.GetRequiredService<IOptions<OpcUaServerOptions>>().Value;
|
|
Assert.That(opts.ReverseConnect, Is.Not.Null);
|
|
Assert.That(opts.ReverseConnect!.ConnectIntervalMs, Is.EqualTo(5000));
|
|
Assert.That(opts.ReverseConnect.ConnectTimeoutMs, Is.EqualTo(10000));
|
|
Assert.That(opts.ReverseConnect.RejectTimeoutMs, Is.EqualTo(20000));
|
|
Assert.That(opts.ReverseConnect.Clients, Has.Count.EqualTo(1));
|
|
ServerReverseConnectClientOptions client = opts.ReverseConnect.Clients[0];
|
|
Assert.That(client.EndpointUrl, Is.EqualTo("opc.tcp://client.local:4841"));
|
|
Assert.That(client.Timeout, Is.EqualTo(7000));
|
|
Assert.That(client.MaxSessionCount, Is.EqualTo(2));
|
|
Assert.That(client.Enabled, Is.True);
|
|
}
|
|
|
|
[Test]
|
|
public void UserTokenPoliciesRoundTrip()
|
|
{
|
|
var services = new ServiceCollection();
|
|
services.AddOpcUa().AddServer(o =>
|
|
{
|
|
o.UserTokenPolicies.Add(new OpcUaUserTokenPolicy
|
|
{
|
|
TokenType = UserTokenType.UserName
|
|
});
|
|
o.UserTokenPolicies.Add(new OpcUaUserTokenPolicy
|
|
{
|
|
TokenType = UserTokenType.Certificate
|
|
});
|
|
});
|
|
using ServiceProvider sp = services.BuildServiceProvider();
|
|
|
|
OpcUaServerOptions opts = sp.GetRequiredService<IOptions<OpcUaServerOptions>>().Value;
|
|
Assert.That(opts.UserTokenPolicies, Has.Count.EqualTo(2));
|
|
Assert.That(opts.UserTokenPolicies[0].TokenType, Is.EqualTo(UserTokenType.UserName));
|
|
Assert.That(opts.UserTokenPolicies[1].TokenType, Is.EqualTo(UserTokenType.Certificate));
|
|
}
|
|
|
|
[Test]
|
|
public void ExtendedTransportQuotasRoundTrip()
|
|
{
|
|
var services = new ServiceCollection();
|
|
services.AddOpcUa().AddServer(o =>
|
|
{
|
|
o.MaxMessageSize = 8 * 1024 * 1024;
|
|
o.OperationTimeoutMs = 120_000;
|
|
});
|
|
using ServiceProvider sp = services.BuildServiceProvider();
|
|
|
|
OpcUaServerOptions opts = sp.GetRequiredService<IOptions<OpcUaServerOptions>>().Value;
|
|
Assert.That(opts.MaxMessageSize, Is.EqualTo(8 * 1024 * 1024));
|
|
Assert.That(opts.OperationTimeoutMs, Is.EqualTo(120_000));
|
|
}
|
|
|
|
[Test]
|
|
public void EccPoliciesToggleRoundTrip()
|
|
{
|
|
var services = new ServiceCollection();
|
|
services.AddOpcUa().AddServer(o => o.IncludeEccPolicies = true);
|
|
using ServiceProvider sp = services.BuildServiceProvider();
|
|
|
|
OpcUaServerOptions opts = sp.GetRequiredService<IOptions<OpcUaServerOptions>>().Value;
|
|
Assert.That(opts.IncludeEccPolicies, Is.True);
|
|
}
|
|
|
|
[Test]
|
|
public void OperationLimitsProjectsToOperationLimits()
|
|
{
|
|
var options = new OperationLimitsOptions
|
|
{
|
|
MaxNodesPerRead = 100,
|
|
MaxNodesPerWrite = 200,
|
|
MaxNodesPerBrowse = 300,
|
|
MaxNodesPerMethodCall = 50,
|
|
MaxMonitoredItemsPerCall = 1000
|
|
};
|
|
OperationLimits projected = ProjectionAccessor.Project(options);
|
|
|
|
Assert.That(projected.MaxNodesPerRead, Is.EqualTo(100u));
|
|
Assert.That(projected.MaxNodesPerWrite, Is.EqualTo(200u));
|
|
Assert.That(projected.MaxNodesPerBrowse, Is.EqualTo(300u));
|
|
Assert.That(projected.MaxNodesPerMethodCall, Is.EqualTo(50u));
|
|
Assert.That(projected.MaxMonitoredItemsPerCall, Is.EqualTo(1000u));
|
|
}
|
|
|
|
[Test]
|
|
public void RegistrationEndpointUrlRoundTrip()
|
|
{
|
|
var services = new ServiceCollection();
|
|
services.AddOpcUa().AddServer(o =>
|
|
o.RegistrationEndpointUrl = "opc.tcp://lds.local:4840");
|
|
using ServiceProvider sp = services.BuildServiceProvider();
|
|
|
|
OpcUaServerOptions opts = sp.GetRequiredService<IOptions<OpcUaServerOptions>>().Value;
|
|
Assert.That(opts.RegistrationEndpointUrl, Is.EqualTo("opc.tcp://lds.local:4840"));
|
|
}
|
|
|
|
[Test]
|
|
public void SecurityHardeningOverridesPersistThroughBinding()
|
|
{
|
|
var services = new ServiceCollection();
|
|
services.AddOpcUa().AddServer(o =>
|
|
{
|
|
o.RejectSHA1Certificates = false;
|
|
o.MinCertificateKeySize = 4096;
|
|
});
|
|
using ServiceProvider sp = services.BuildServiceProvider();
|
|
|
|
OpcUaServerOptions opts = sp.GetRequiredService<IOptions<OpcUaServerOptions>>().Value;
|
|
Assert.That(opts.RejectSHA1Certificates, Is.False);
|
|
Assert.That(opts.MinCertificateKeySize, Is.EqualTo((ushort)4096));
|
|
}
|
|
|
|
/// <summary>
|
|
/// Bridge to the internal <c>OperationLimitsOptions.ToOperationLimits</c>
|
|
/// projection method (declared internal so it doesn't pollute the
|
|
/// public API).
|
|
/// </summary>
|
|
private static class ProjectionAccessor
|
|
{
|
|
public static OperationLimits Project(OperationLimitsOptions options)
|
|
{
|
|
System.Reflection.MethodInfo method = typeof(OperationLimitsOptions)
|
|
.GetMethod(
|
|
"ToOperationLimits",
|
|
System.Reflection.BindingFlags.Instance |
|
|
System.Reflection.BindingFlags.NonPublic)
|
|
!;
|
|
return (OperationLimits)method.Invoke(options, null)!;
|
|
}
|
|
}
|
|
}
|
|
}
|