mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-22 17:50:03 +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>
256 lines
10 KiB
C#
256 lines
10 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.Reflection;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
using Moq;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.Tests;
|
|
|
|
namespace Opc.Ua.Client.Tests
|
|
{
|
|
/// <summary>
|
|
/// Proves that the security policy registry an application composes is the
|
|
/// policy set the client session resolves against, rather than the
|
|
/// process-wide <see cref="SecurityPolicies.Default"/> fallback.
|
|
/// </summary>
|
|
[TestFixture]
|
|
[Category("Client")]
|
|
[Category("Security")]
|
|
[SetCulture("en-us")]
|
|
[SetUICulture("en-us")]
|
|
[Parallelizable]
|
|
public sealed class SessionSecurityPolicyRegistryTests
|
|
{
|
|
/// <summary>
|
|
/// The session rejects an endpoint policy its own registry does not
|
|
/// carry, even though the built-in set does. Before the registry was
|
|
/// injected, the session always answered from
|
|
/// <see cref="SecurityPolicies.Default"/>.
|
|
/// </summary>
|
|
[Test]
|
|
public void OpenAsyncResolvesTheEndpointPolicyThroughTheInjectedRegistry()
|
|
{
|
|
var registry = new Mock<ISecurityPolicyRegistry>();
|
|
registry
|
|
.Setup(r => r.GetDisplayName(SecurityPolicies.None))
|
|
.Returns((string?)null)
|
|
.Verifiable(Times.Once);
|
|
|
|
Assert.That(
|
|
SecurityPolicies.Default.GetDisplayName(SecurityPolicies.None),
|
|
Is.Not.Null,
|
|
"The built-in policy set carries the endpoint's policy.");
|
|
|
|
using Session session = CreateSession(registry.Object);
|
|
|
|
ServiceResultException exception = Assert.ThrowsAsync<ServiceResultException>(
|
|
() => session.OpenAsync(
|
|
"test",
|
|
60000,
|
|
new UserIdentity(),
|
|
default,
|
|
false,
|
|
false,
|
|
CancellationToken.None))!;
|
|
|
|
Assert.That(exception.StatusCode, Is.EqualTo(StatusCodes.BadSecurityChecksFailed));
|
|
registry.Verify();
|
|
}
|
|
|
|
/// <summary>
|
|
/// The same endpoint opens past the policy gate when no registry is
|
|
/// injected, so the rejection above is caused by the registry and not
|
|
/// by the endpoint.
|
|
/// </summary>
|
|
[Test]
|
|
public void OpenAsyncAcceptsTheEndpointPolicyWhenNoRegistryIsInjected()
|
|
{
|
|
using Session session = CreateSession(securityPolicies: null);
|
|
|
|
ServiceResultException exception = Assert.ThrowsAsync<ServiceResultException>(
|
|
() => session.OpenAsync(
|
|
"test",
|
|
60000,
|
|
new UserIdentity(),
|
|
default,
|
|
false,
|
|
false,
|
|
CancellationToken.None))!;
|
|
|
|
Assert.That(
|
|
exception.StatusCode,
|
|
Is.Not.EqualTo(StatusCodes.BadSecurityChecksFailed),
|
|
"The built-in policy set accepts the endpoint's policy.");
|
|
}
|
|
|
|
[Test]
|
|
public void ChannelManagerSessionFactoryCarriesTheSecurityPolicyRegistry()
|
|
{
|
|
ITelemetryContext telemetry = NUnitTelemetryContext.Create();
|
|
var manager = new Mock<IClientChannelManager>();
|
|
using var registry = new SecurityPolicies(telemetry);
|
|
|
|
var factory = new ChannelManagerSessionFactory(
|
|
manager.Object,
|
|
telemetry,
|
|
securityPolicies: registry);
|
|
|
|
Assert.Multiple(() =>
|
|
{
|
|
Assert.That(factory.SecurityPolicyRegistry, Is.SameAs(registry));
|
|
Assert.That(
|
|
new ChannelManagerSessionFactory(manager.Object, telemetry)
|
|
.SecurityPolicyRegistry,
|
|
Is.Null,
|
|
"A factory with no registry falls back to the built-in policy set.");
|
|
});
|
|
}
|
|
|
|
[Test]
|
|
public void ManagedSessionReadsTheRegistryFromCustomFactoryProviders()
|
|
{
|
|
var registry = new Mock<ISecurityPolicyRegistry>();
|
|
var factory = new Mock<ISessionFactory>();
|
|
factory
|
|
.As<ISecurityPolicyRegistryProvider>()
|
|
.SetupGet(provider => provider.SecurityPolicyRegistry)
|
|
.Returns(registry.Object);
|
|
|
|
MethodInfo resolver = typeof(Opc.Ua.Client.ManagedSession).GetMethod(
|
|
"ResolveSecurityPolicies",
|
|
BindingFlags.NonPublic | BindingFlags.Static)!;
|
|
|
|
Assert.That(
|
|
resolver.Invoke(null, [factory.Object]),
|
|
Is.SameAs(registry.Object));
|
|
}
|
|
|
|
[Test]
|
|
public void UseSecurityPoliciesRejectsNull()
|
|
{
|
|
ITelemetryContext telemetry = NUnitTelemetryContext.Create();
|
|
var builder = new ManagedSessionBuilder(CreateConfiguration(telemetry), telemetry);
|
|
|
|
Assert.Throws<ArgumentNullException>(() => builder.UseSecurityPolicies(null!));
|
|
}
|
|
|
|
/// <summary>
|
|
/// A container that registers an application policy hands the composed
|
|
/// registry to the session factory it resolves, so a session created
|
|
/// from the container can negotiate that policy.
|
|
/// </summary>
|
|
[Test]
|
|
public void ContainerHandsTheComposedRegistryToTheSessionFactory()
|
|
{
|
|
var policy = new SecurityPolicyInfo(SecurityPolicyInfo.Basic256Sha256)
|
|
{
|
|
Name = "InjectedClientPolicy",
|
|
Uri = SecurityPolicies.BaseUri + "InjectedClientPolicy",
|
|
IsDefault = false
|
|
};
|
|
|
|
var services = new ServiceCollection();
|
|
services.AddOpcUa()
|
|
.AddSecurityPolicy(policy)
|
|
.AddClient(options => options.Configuration = CreateConfiguration(
|
|
NUnitTelemetryContext.Create()));
|
|
|
|
using ServiceProvider provider = services.BuildServiceProvider();
|
|
var registry = provider.GetRequiredService<ISecurityPolicyRegistry>();
|
|
var factory = provider.GetRequiredService<ISessionFactory>() as DefaultSessionFactory;
|
|
|
|
Assert.That(factory, Is.Not.Null);
|
|
Assert.Multiple(() =>
|
|
{
|
|
Assert.That(factory!.SecurityPolicyRegistry, Is.SameAs(registry));
|
|
Assert.That(registry.GetInfo(policy.Uri), Is.SameAs(policy));
|
|
Assert.That(
|
|
SecurityPolicies.Default.GetInfo(policy.Uri),
|
|
Is.Null,
|
|
"The policy must be unknown outside the application that registered it.");
|
|
});
|
|
}
|
|
|
|
/// <summary>
|
|
/// Builds a session bound to a channel that never answers, so the open
|
|
/// call fails at the first check that rejects it.
|
|
/// </summary>
|
|
private static Session CreateSession(
|
|
ISecurityPolicyRegistry? securityPolicies)
|
|
{
|
|
ITelemetryContext telemetry = NUnitTelemetryContext.Create();
|
|
var channel = new Mock<ITransportChannel>();
|
|
channel
|
|
.SetupGet(c => c.MessageContext)
|
|
.Returns(ServiceMessageContext.Create(telemetry));
|
|
channel
|
|
.SetupGet(c => c.SupportedFeatures)
|
|
.Returns(TransportChannelFeatures.Reconnect);
|
|
channel
|
|
.Setup(c => c.SendRequestAsync(
|
|
It.IsAny<IServiceRequest>(),
|
|
It.IsAny<CancellationToken>()))
|
|
.Returns<IServiceRequest, CancellationToken>((_, _) =>
|
|
throw new ServiceResultException(StatusCodes.BadNotConnected));
|
|
|
|
var endpoint = new ConfiguredEndpoint(
|
|
collection: null,
|
|
new EndpointDescription
|
|
{
|
|
SecurityMode = MessageSecurityMode.None,
|
|
SecurityPolicyUri = SecurityPolicies.None,
|
|
EndpointUrl = "opc.tcp://localhost:4840",
|
|
UserIdentityTokens = [new UserTokenPolicy()]
|
|
},
|
|
configuration: null);
|
|
|
|
return new Session(
|
|
channel.Object,
|
|
CreateConfiguration(telemetry),
|
|
endpoint,
|
|
clientCertificate: null,
|
|
securityPolicies: securityPolicies);
|
|
}
|
|
|
|
private static ApplicationConfiguration CreateConfiguration(ITelemetryContext telemetry)
|
|
{
|
|
return new ApplicationConfiguration(telemetry)
|
|
{
|
|
ApplicationUri = "urn:test:client",
|
|
ApplicationName = "test",
|
|
ClientConfiguration = new ClientConfiguration()
|
|
};
|
|
}
|
|
}
|
|
}
|