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>
265 lines
10 KiB
C#
265 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.Threading;
|
|
using System.Threading.Tasks;
|
|
using Moq;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.Identity;
|
|
|
|
namespace Opc.Ua.Client.Tests.Identity
|
|
{
|
|
[TestFixture]
|
|
[Category("Client")]
|
|
[Category("Identity")]
|
|
public sealed class CompositeClientIdentityProviderBuilderTests
|
|
{
|
|
[Test]
|
|
public void AddRejectsNullProvider()
|
|
{
|
|
var builder = new CompositeClientIdentityProviderBuilder();
|
|
|
|
Assert.That(
|
|
() => builder.Add(null!),
|
|
Throws.TypeOf<ArgumentNullException>());
|
|
}
|
|
|
|
[Test]
|
|
public async Task BuildPreservesAddedProviderOrderAsync()
|
|
{
|
|
UserTokenPolicy policy = CreatePolicy(UserTokenType.UserName);
|
|
IdentitySelectionContext context = CreateContext(policy);
|
|
var first = new StubProvider("first", UserTokenType.UserName);
|
|
var second = new StubProvider("second", UserTokenType.UserName);
|
|
|
|
CompositeClientIdentityProvider provider = new CompositeClientIdentityProviderBuilder()
|
|
.Add(first)
|
|
.Add(second)
|
|
.Build();
|
|
|
|
IUserIdentity identity = await provider.GetIdentityAsync(policy, context).ConfigureAwait(false);
|
|
|
|
Assert.That(identity.DisplayName, Is.EqualTo("first"));
|
|
Assert.That(first.GetIdentityCallCount, Is.EqualTo(1));
|
|
Assert.That(second.GetIdentityCallCount, Is.Zero);
|
|
}
|
|
|
|
[Test]
|
|
public void AddUserNameOptionsValidatesInputs()
|
|
{
|
|
var builder = new CompositeClientIdentityProviderBuilder();
|
|
var registry = new Mock<ISecretRegistry>();
|
|
|
|
Assert.That(
|
|
() => builder.AddUserName(null!, registry.Object),
|
|
Throws.TypeOf<ArgumentNullException>());
|
|
Assert.That(
|
|
() => builder.AddUserName(_ => { }, null!),
|
|
Throws.TypeOf<ArgumentNullException>());
|
|
Assert.That(
|
|
() => builder.AddUserName(_ => { }, registry.Object),
|
|
Throws.TypeOf<InvalidOperationException>());
|
|
Assert.That(
|
|
() => builder.AddUserName(
|
|
options =>
|
|
{
|
|
options.UserName = "user";
|
|
options.SecretName = "password";
|
|
options.SecretStoreType = "memory";
|
|
},
|
|
registry.Object),
|
|
Throws.Nothing);
|
|
}
|
|
|
|
[Test]
|
|
public void AddX509OptionsValidatesInputsAndAcceptsSubjectOrThumbprint()
|
|
{
|
|
var builder = new CompositeClientIdentityProviderBuilder();
|
|
var provider = new Mock<ICertificateProvider>();
|
|
var passwords = new Mock<ICertificatePasswordProvider>();
|
|
|
|
Assert.That(
|
|
() => builder.AddX509(null!, provider.Object, passwords.Object),
|
|
Throws.TypeOf<ArgumentNullException>());
|
|
Assert.That(
|
|
() => builder.AddX509(_ => { }, null!, passwords.Object),
|
|
Throws.TypeOf<ArgumentNullException>());
|
|
Assert.That(
|
|
() => builder.AddX509(_ => { }, provider.Object, null!),
|
|
Throws.TypeOf<ArgumentNullException>());
|
|
Assert.That(
|
|
() => builder.AddX509(
|
|
options =>
|
|
{
|
|
options.StoreType = "Directory";
|
|
options.StorePath = "pki";
|
|
},
|
|
provider.Object,
|
|
passwords.Object),
|
|
Throws.TypeOf<InvalidOperationException>());
|
|
Assert.That(
|
|
() => builder.AddX509(
|
|
options =>
|
|
{
|
|
options.StoreType = "Directory";
|
|
options.StorePath = "pki";
|
|
options.SubjectName = "CN=test";
|
|
options.Thumbprint = "thumb";
|
|
},
|
|
provider.Object,
|
|
passwords.Object),
|
|
Throws.TypeOf<InvalidOperationException>());
|
|
Assert.That(
|
|
() => builder.AddX509(
|
|
options =>
|
|
{
|
|
options.StoreType = "Directory";
|
|
options.StorePath = "pki";
|
|
options.SubjectName = "CN=test";
|
|
},
|
|
provider.Object,
|
|
passwords.Object),
|
|
Throws.Nothing);
|
|
}
|
|
|
|
[Test]
|
|
public void AddIssuedTokenOptionsValidatesInputsAndProfileUri()
|
|
{
|
|
var builder = new CompositeClientIdentityProviderBuilder();
|
|
var tokenProvider = new Mock<IAccessTokenProvider>();
|
|
|
|
Assert.That(
|
|
() => builder.AddIssuedToken(null!, tokenProvider.Object),
|
|
Throws.TypeOf<ArgumentNullException>());
|
|
Assert.That(
|
|
() => builder.AddIssuedToken(_ => { }, null!),
|
|
Throws.TypeOf<ArgumentNullException>());
|
|
Assert.That(
|
|
() => builder.AddIssuedToken(_ => { }, tokenProvider.Object),
|
|
Throws.Nothing);
|
|
Assert.That(
|
|
() => builder.AddIssuedToken(
|
|
options => options.ProfileUri = Profiles.JwtUserToken,
|
|
tokenProvider.Object),
|
|
Throws.Nothing);
|
|
}
|
|
|
|
[Test]
|
|
public void AddConvenienceProvidersReturnBuilderForChaining()
|
|
{
|
|
var registry = new Mock<ISecretRegistry>();
|
|
var passwords = new Mock<ICertificatePasswordProvider>();
|
|
var certProvider = new Mock<ICertificateProvider>();
|
|
var tokenProvider = new Mock<IAccessTokenProvider>();
|
|
|
|
var builder = new CompositeClientIdentityProviderBuilder();
|
|
CompositeClientIdentityProviderBuilder returned = builder
|
|
.AddAnonymous()
|
|
.AddUserName("user", registry.Object, new SecretIdentifier("name", "store"))
|
|
.AddX509(new CertificateIdentifier(), passwords.Object, certProvider.Object)
|
|
.AddIssuedToken(tokenProvider.Object);
|
|
|
|
Assert.That(returned, Is.SameAs(builder));
|
|
Assert.That(builder.Build(), Is.Not.Null);
|
|
}
|
|
|
|
private static UserTokenPolicy CreatePolicy(UserTokenType tokenType)
|
|
{
|
|
return new UserTokenPolicy
|
|
{
|
|
PolicyId = tokenType.ToString(),
|
|
TokenType = tokenType,
|
|
SecurityPolicyUri = SecurityPolicies.None
|
|
};
|
|
}
|
|
|
|
private static IdentitySelectionContext CreateContext(UserTokenPolicy policy)
|
|
{
|
|
var endpoint = new EndpointDescription
|
|
{
|
|
SecurityPolicyUri = SecurityPolicies.None,
|
|
UserIdentityTokens = [policy]
|
|
};
|
|
return new IdentitySelectionContext(
|
|
endpoint,
|
|
new[] { policy },
|
|
ServiceMessageContext.CreateEmpty(Opc.Ua.Tests.NUnitTelemetryContext.Create()));
|
|
}
|
|
|
|
private sealed class StubProvider : IClientIdentityProvider
|
|
{
|
|
public StubProvider(string displayName, UserTokenType tokenType)
|
|
{
|
|
DisplayName = displayName;
|
|
TokenType = tokenType;
|
|
}
|
|
|
|
public string DisplayName { get; }
|
|
|
|
public UserTokenType TokenType { get; }
|
|
|
|
public int GetIdentityCallCount { get; private set; }
|
|
|
|
public System.Collections.Generic.IReadOnlyList<UserTokenType> SupportedTokenTypes => [TokenType];
|
|
|
|
public System.Collections.Generic.IReadOnlyList<string> SupportedIssuedTokenProfileUris => [];
|
|
|
|
public DateTime ExpiresAt => DateTime.MaxValue;
|
|
|
|
public ValueTask<CanSatisfyResult> CanSatisfyAsync(
|
|
UserTokenPolicy policy,
|
|
IdentitySelectionContext context,
|
|
CancellationToken ct = default)
|
|
{
|
|
_ = context;
|
|
_ = ct;
|
|
return new ValueTask<CanSatisfyResult>(
|
|
policy.TokenType == TokenType
|
|
? CanSatisfyResult.Yes
|
|
: CanSatisfyResult.No("Not supported."));
|
|
}
|
|
|
|
public ValueTask<IUserIdentity> GetIdentityAsync(
|
|
UserTokenPolicy policy,
|
|
IdentitySelectionContext context,
|
|
CancellationToken ct = default)
|
|
{
|
|
_ = context;
|
|
_ = ct;
|
|
GetIdentityCallCount++;
|
|
return new ValueTask<IUserIdentity>(new UserIdentity(DisplayName, "password"u8)
|
|
{
|
|
PolicyId = policy.PolicyId!
|
|
});
|
|
}
|
|
}
|
|
}
|
|
}
|