mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-21 00:56:28 +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>
294 lines
12 KiB
C#
294 lines
12 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.Collections.Generic;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
using Microsoft.Extensions.Configuration;
|
|
using Microsoft.Extensions.Configuration.Memory;
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.Identity;
|
|
using Opc.Ua.Security.Certificates;
|
|
using Opc.Ua.Tests;
|
|
|
|
namespace Opc.Ua.Client.Tests.ClientBuilder
|
|
{
|
|
[TestFixture]
|
|
[Category("ClientBuilder")]
|
|
[Category("Identity")]
|
|
[Parallelizable]
|
|
[SetCulture("en-us")]
|
|
[SetUICulture("en-us")]
|
|
public sealed class IdentityProviderConfigurationTests
|
|
{
|
|
[Test]
|
|
public async Task AnonymousOnlyBuildsAnonymousProvider()
|
|
{
|
|
IConfiguration configuration = BuildConfiguration(new Dictionary<string, string?>
|
|
{
|
|
["OpcUa:Client:Identity:EnableAnonymous"] = "true"
|
|
});
|
|
var services = new ServiceCollection();
|
|
services.AddOpcUa()
|
|
.AddClient(_ => { })
|
|
.AddIdentityProvider(configuration.GetSection("OpcUa:Client:Identity"));
|
|
|
|
using ServiceProvider sp = services.BuildServiceProvider();
|
|
IClientIdentityProvider provider = sp.GetRequiredService<IClientIdentityProvider>();
|
|
|
|
Assert.That(provider.SupportedTokenTypes, Is.EqualTo([UserTokenType.Anonymous]));
|
|
CanSatisfyResult anon = await provider
|
|
.CanSatisfyAsync(CreatePolicy(UserTokenType.Anonymous), CreateContext())
|
|
.ConfigureAwait(false);
|
|
CanSatisfyResult user = await provider
|
|
.CanSatisfyAsync(CreatePolicy(UserTokenType.UserName), CreateContext())
|
|
.ConfigureAwait(false);
|
|
CanSatisfyResult cert = await provider
|
|
.CanSatisfyAsync(CreatePolicy(UserTokenType.Certificate), CreateContext())
|
|
.ConfigureAwait(false);
|
|
CanSatisfyResult issued = await provider
|
|
.CanSatisfyAsync(CreateIssuedTokenPolicy(), CreateContext())
|
|
.ConfigureAwait(false);
|
|
Assert.That(anon.CanSatisfy, Is.True);
|
|
Assert.That(user.CanSatisfy, Is.False);
|
|
Assert.That(cert.CanSatisfy, Is.False);
|
|
Assert.That(issued.CanSatisfy, Is.False);
|
|
}
|
|
|
|
[Test]
|
|
public void ConfiguredOrderControlsCompositePreference()
|
|
{
|
|
IConfiguration configuration = BuildConfiguration(CreateFullIdentityConfiguration(order: true));
|
|
var services = new ServiceCollection();
|
|
AddIdentityDependencies(services);
|
|
services.AddOpcUa()
|
|
.AddClient(_ => { })
|
|
.AddIdentityProvider(configuration.GetSection("OpcUa:Client:Identity"));
|
|
|
|
using ServiceProvider sp = services.BuildServiceProvider();
|
|
IClientIdentityProvider provider = sp.GetRequiredService<IClientIdentityProvider>();
|
|
|
|
Assert.That(provider.SupportedTokenTypes, Is.EqualTo(
|
|
[
|
|
UserTokenType.IssuedToken,
|
|
UserTokenType.Certificate,
|
|
UserTokenType.UserName
|
|
]));
|
|
}
|
|
|
|
[Test]
|
|
public void EmptyOrderPreservesRegistrationOrder()
|
|
{
|
|
IConfiguration configuration = BuildConfiguration(CreateFullIdentityConfiguration(order: false));
|
|
var services = new ServiceCollection();
|
|
AddIdentityDependencies(services);
|
|
services.AddOpcUa()
|
|
.AddClient(_ => { })
|
|
.AddIdentityProvider(configuration.GetSection("OpcUa:Client:Identity"));
|
|
|
|
using ServiceProvider sp = services.BuildServiceProvider();
|
|
IClientIdentityProvider provider = sp.GetRequiredService<IClientIdentityProvider>();
|
|
|
|
Assert.That(provider.SupportedTokenTypes, Is.EqualTo(
|
|
[
|
|
UserTokenType.UserName,
|
|
UserTokenType.Certificate,
|
|
UserTokenType.IssuedToken
|
|
]));
|
|
}
|
|
|
|
[Test]
|
|
public void MissingIssuedTokenAuthorityThrowsDuringProviderConstruction()
|
|
{
|
|
IConfiguration configuration = BuildConfiguration(new Dictionary<string, string?>
|
|
{
|
|
["OpcUa:Client:Identity:EnableAnonymous"] = "false",
|
|
["OpcUa:Client:Identity:IssuedToken:AuthorityUri"] = "https://missing.example",
|
|
["OpcUa:Client:Identity:IssuedToken:ProfileUri"] = Profiles.JwtUserToken
|
|
});
|
|
var services = new ServiceCollection();
|
|
services.AddOpcUa()
|
|
.AddClient(_ => { })
|
|
.AddAccessTokenProvider(new StubAccessTokenProvider("https://issuer.example"))
|
|
.AddIdentityProvider(configuration.GetSection("OpcUa:Client:Identity"));
|
|
|
|
InvalidOperationException ex = Assert.Throws<InvalidOperationException>(() =>
|
|
{
|
|
using ServiceProvider sp = services.BuildServiceProvider();
|
|
_ = sp.GetRequiredService<IClientIdentityProvider>();
|
|
});
|
|
|
|
Assert.That(ex.Message, Does.Contain("https://missing.example"));
|
|
Assert.That(ex.Message, Does.Contain("IAccessTokenProvider"));
|
|
}
|
|
|
|
private static Dictionary<string, string?> CreateFullIdentityConfiguration(bool order)
|
|
{
|
|
var data = new Dictionary<string, string?>
|
|
{
|
|
["OpcUa:Client:Identity:EnableAnonymous"] = "false",
|
|
["OpcUa:Client:Identity:UserName:UserName"] = "operator",
|
|
["OpcUa:Client:Identity:UserName:SecretName"] = "operator-password",
|
|
["OpcUa:Client:Identity:UserName:SecretStoreType"] = "Fake",
|
|
["OpcUa:Client:Identity:X509:StoreType"] = CertificateStoreType.Directory,
|
|
["OpcUa:Client:Identity:X509:StorePath"] = "pki/user",
|
|
["OpcUa:Client:Identity:X509:SubjectName"] = "CN=Operator",
|
|
["OpcUa:Client:Identity:IssuedToken:AuthorityUri"] = "https://issuer.example",
|
|
["OpcUa:Client:Identity:IssuedToken:ProfileUri"] = Profiles.JwtUserToken
|
|
};
|
|
if (order)
|
|
{
|
|
data["OpcUa:Client:Identity:Order:0"] = "IssuedToken";
|
|
data["OpcUa:Client:Identity:Order:1"] = "X509";
|
|
data["OpcUa:Client:Identity:Order:2"] = "UserName";
|
|
}
|
|
return data;
|
|
}
|
|
|
|
private static IConfiguration BuildConfiguration(Dictionary<string, string?> data)
|
|
{
|
|
var source = new MemoryConfigurationSource
|
|
{
|
|
InitialData = data
|
|
};
|
|
return new ConfigurationBuilder()
|
|
.Add(source)
|
|
.Build();
|
|
}
|
|
|
|
private static void AddIdentityDependencies(IServiceCollection services)
|
|
{
|
|
services.AddSingleton<ISecretRegistry>(new FakeSecretRegistry());
|
|
services.AddSingleton<ICertificateProvider>(new FakeCertificateProvider());
|
|
services.AddSingleton<ICertificatePasswordProvider>(new FakeCertificatePasswordProvider());
|
|
services.AddSingleton<IAccessTokenProvider>(
|
|
new StubAccessTokenProvider("https://issuer.example"));
|
|
}
|
|
|
|
private static UserTokenPolicy CreatePolicy(UserTokenType tokenType)
|
|
{
|
|
return new UserTokenPolicy
|
|
{
|
|
PolicyId = tokenType.ToString(),
|
|
TokenType = tokenType,
|
|
SecurityPolicyUri = SecurityPolicies.None
|
|
};
|
|
}
|
|
|
|
private static UserTokenPolicy CreateIssuedTokenPolicy()
|
|
{
|
|
UserTokenPolicy policy = CreatePolicy(UserTokenType.IssuedToken);
|
|
policy.IssuedTokenType = Profiles.JwtUserToken;
|
|
return policy;
|
|
}
|
|
|
|
private static IdentitySelectionContext CreateContext()
|
|
{
|
|
var endpoint = new EndpointDescription
|
|
{
|
|
SecurityPolicyUri = SecurityPolicies.None,
|
|
UserIdentityTokens = []
|
|
};
|
|
return new IdentitySelectionContext(
|
|
endpoint,
|
|
[],
|
|
ServiceMessageContext.CreateEmpty(NUnitTelemetryContext.Create()));
|
|
}
|
|
|
|
private sealed class FakeSecretRegistry : ISecretRegistry
|
|
{
|
|
public void RegisterStore(ISecretStore store)
|
|
{
|
|
}
|
|
|
|
public ISecret TryGet(SecretIdentifier id)
|
|
{
|
|
return null!;
|
|
}
|
|
|
|
public ValueTask<ISecret?> GetAsync(
|
|
SecretIdentifier id,
|
|
CancellationToken ct = default)
|
|
{
|
|
return new ValueTask<ISecret?>((ISecret?)null);
|
|
}
|
|
}
|
|
|
|
private sealed class FakeCertificateProvider : ICertificateProvider
|
|
{
|
|
public Certificate TryGetPrivateKeyCertificate(string thumbprint)
|
|
{
|
|
return null!;
|
|
}
|
|
|
|
public ValueTask<Certificate?> GetPrivateKeyCertificateAsync(
|
|
CertificateIdentifier identifier,
|
|
ICertificatePasswordProvider? passwordProvider = null,
|
|
string? applicationUri = null,
|
|
CancellationToken ct = default)
|
|
{
|
|
return new ValueTask<Certificate?>((Certificate?)null);
|
|
}
|
|
}
|
|
|
|
private sealed class FakeCertificatePasswordProvider : ICertificatePasswordProvider
|
|
{
|
|
public char[] GetPassword(CertificateIdentifier certificateIdentifier)
|
|
{
|
|
return [];
|
|
}
|
|
}
|
|
|
|
private sealed class StubAccessTokenProvider : IAccessTokenProvider
|
|
{
|
|
public StubAccessTokenProvider(string authorityUri)
|
|
{
|
|
AuthorityUri = authorityUri;
|
|
}
|
|
|
|
public string AuthorityUri { get; }
|
|
|
|
public ValueTask<AccessToken> AcquireAsync(
|
|
AuthorizationServerMetadata metadata,
|
|
CancellationToken ct = default)
|
|
{
|
|
#pragma warning disable CA2000 // ownership of the AccessToken transfers to the caller via the returned ValueTask
|
|
return new ValueTask<AccessToken>(new AccessToken(
|
|
Profiles.JwtUserToken,
|
|
[1],
|
|
DateTime.MaxValue,
|
|
AuthorityUri));
|
|
#pragma warning restore CA2000
|
|
}
|
|
}
|
|
}
|
|
}
|