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>
283 lines
13 KiB
C#
283 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.IO;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.Security.Certificates;
|
|
using Opc.Ua.Tests;
|
|
|
|
namespace Opc.Ua.Server.Tests
|
|
{
|
|
/// <summary>
|
|
/// Exercises the <see cref="IPendingCertificateKeyStore"/> implementations
|
|
/// used to persist a regenerated <c>CreateSigningRequest</c> private key
|
|
/// (OPC 10000-12 §7.10.10): the certificate-store-backed production
|
|
/// default <see cref="DirectoryPendingCertificateKeyStore"/> and the
|
|
/// process-memory-only <see cref="InMemoryPendingCertificateKeyStore"/>
|
|
/// used only for deterministic unit tests.
|
|
/// </summary>
|
|
[TestFixture]
|
|
[Category("ConfigurationNodeManager")]
|
|
[Parallelizable]
|
|
[FixtureLifeCycle(LifeCycle.InstancePerTestCase)]
|
|
public class PendingCertificateKeyStoreTests
|
|
{
|
|
private ITelemetryContext m_telemetry;
|
|
private string m_basePath;
|
|
|
|
[SetUp]
|
|
public void SetUp()
|
|
{
|
|
m_telemetry = NUnitTelemetryContext.Create();
|
|
m_basePath = Path.Combine(
|
|
TestContext.CurrentContext.WorkDirectory,
|
|
"pks",
|
|
Guid.NewGuid().ToString("N")[..8]);
|
|
}
|
|
|
|
[TearDown]
|
|
public void TearDown()
|
|
{
|
|
if (Directory.Exists(m_basePath))
|
|
{
|
|
Directory.Delete(m_basePath, true);
|
|
}
|
|
}
|
|
|
|
[Test]
|
|
public async Task DirectoryStoreSaveThenTryTakeRoundTripsTheCertificateAsync()
|
|
{
|
|
var store = new DirectoryPendingCertificateKeyStore();
|
|
PendingCertificateKeyContext context = CreateContext();
|
|
using Certificate original = CreateTestCertificateWithKey();
|
|
|
|
bool saved = await store.SaveAsync(context, original, CancellationToken.None).ConfigureAwait(false);
|
|
Assert.That(saved, Is.True);
|
|
|
|
using Certificate taken = (await store.TryTakeAsync(context, CancellationToken.None).ConfigureAwait(false))!;
|
|
Assert.That(taken, Is.Not.Null);
|
|
Assert.That(taken!.Thumbprint, Is.EqualTo(original.Thumbprint));
|
|
Assert.That(taken.HasPrivateKey, Is.True);
|
|
|
|
// TryTakeAsync consumes the entry.
|
|
using Certificate? takenAgain = await store.TryTakeAsync(context, CancellationToken.None).ConfigureAwait(false);
|
|
Assert.That(takenAgain, Is.Null);
|
|
}
|
|
|
|
[Test]
|
|
public async Task DirectoryStoreSaveTwiceReplacesThePreviousEntryAsync()
|
|
{
|
|
var store = new DirectoryPendingCertificateKeyStore();
|
|
PendingCertificateKeyContext context = CreateContext();
|
|
using Certificate first = CreateTestCertificateWithKey();
|
|
using Certificate second = CreateTestCertificateWithKey();
|
|
|
|
Assert.That(await store.SaveAsync(context, first, CancellationToken.None).ConfigureAwait(false), Is.True);
|
|
Assert.That(await store.SaveAsync(context, second, CancellationToken.None).ConfigureAwait(false), Is.True);
|
|
|
|
using Certificate taken = (await store.TryTakeAsync(context, CancellationToken.None).ConfigureAwait(false))!;
|
|
Assert.That(taken, Is.Not.Null);
|
|
Assert.That(taken!.Thumbprint, Is.EqualTo(second.Thumbprint));
|
|
|
|
using Certificate? takenAgain = await store.TryTakeAsync(context, CancellationToken.None).ConfigureAwait(false);
|
|
Assert.That(takenAgain, Is.Null, "only the most recent entry should remain");
|
|
}
|
|
|
|
[Test]
|
|
public async Task DirectoryStoreRemoveDiscardsThePendingKeyAsync()
|
|
{
|
|
var store = new DirectoryPendingCertificateKeyStore();
|
|
PendingCertificateKeyContext context = CreateContext();
|
|
using Certificate original = CreateTestCertificateWithKey();
|
|
|
|
Assert.That(await store.SaveAsync(context, original, CancellationToken.None).ConfigureAwait(false), Is.True);
|
|
await store.RemoveAsync(context, CancellationToken.None).ConfigureAwait(false);
|
|
|
|
using Certificate? taken = await store.TryTakeAsync(context, CancellationToken.None).ConfigureAwait(false);
|
|
Assert.That(taken, Is.Null);
|
|
}
|
|
|
|
[Test]
|
|
public async Task DirectoryStoreClearsPasswordBuffersAfterSaveAndTakeAsync()
|
|
{
|
|
var store = new DirectoryPendingCertificateKeyStore();
|
|
var passwordProvider = new TrackingPasswordProvider();
|
|
PendingCertificateKeyContext context = CreateContext(passwordProvider: passwordProvider);
|
|
using Certificate original = CreateTestCertificateWithKey();
|
|
|
|
Assert.That(
|
|
await store.SaveAsync(context, original, CancellationToken.None).ConfigureAwait(false),
|
|
Is.True);
|
|
Assert.That(passwordProvider.ReturnedPasswords, Has.Count.EqualTo(1));
|
|
Assert.That(passwordProvider.ReturnedPasswords[0], Is.All.EqualTo('\0'));
|
|
|
|
using Certificate taken = (await store.TryTakeAsync(context, CancellationToken.None)
|
|
.ConfigureAwait(false))!;
|
|
Assert.That(taken, Is.Not.Null);
|
|
Assert.That(passwordProvider.ReturnedPasswords, Has.Count.EqualTo(2));
|
|
Assert.That(passwordProvider.ReturnedPasswords[1], Is.All.EqualTo('\0'));
|
|
}
|
|
|
|
[Test]
|
|
public async Task DirectoryStoreScopesEntriesByGroupAndTypeAsync()
|
|
{
|
|
var store = new DirectoryPendingCertificateKeyStore();
|
|
PendingCertificateKeyContext contextA = CreateContext(
|
|
certificateGroupId: new NodeId(Guid.NewGuid(), 1),
|
|
certificateTypeId: new NodeId(Guid.NewGuid(), 1));
|
|
PendingCertificateKeyContext contextB = CreateContext(
|
|
certificateGroupId: new NodeId(Guid.NewGuid(), 1),
|
|
certificateTypeId: new NodeId(Guid.NewGuid(), 1));
|
|
using Certificate certA = CreateTestCertificateWithKey();
|
|
|
|
Assert.That(await store.SaveAsync(contextA, certA, CancellationToken.None).ConfigureAwait(false), Is.True);
|
|
|
|
using Certificate? takenFromB = await store.TryTakeAsync(contextB, CancellationToken.None).ConfigureAwait(false);
|
|
Assert.That(takenFromB, Is.Null, "a different (group, type) scope must not see another scope's pending key");
|
|
|
|
using Certificate takenFromA = (await store.TryTakeAsync(contextA, CancellationToken.None).ConfigureAwait(false))!;
|
|
Assert.That(takenFromA, Is.Not.Null);
|
|
}
|
|
|
|
[Test]
|
|
public async Task DirectoryStoreReturnsFalseForNonDirectoryStoreTypeAsync()
|
|
{
|
|
var store = new DirectoryPendingCertificateKeyStore();
|
|
var context = new PendingCertificateKeyContext(
|
|
new CertificateStoreIdentifier(@"CurrentUser\My", CertificateStoreType.X509Store),
|
|
new NodeId(Guid.NewGuid(), 1),
|
|
new NodeId(Guid.NewGuid(), 1),
|
|
null,
|
|
m_telemetry);
|
|
using Certificate cert = CreateTestCertificateWithKey();
|
|
|
|
bool saved = await store.SaveAsync(context, cert, CancellationToken.None).ConfigureAwait(false);
|
|
|
|
Assert.That(saved, Is.False,
|
|
"platform certificate stores do not support a dedicated pending-key sub-scope");
|
|
}
|
|
|
|
[Test]
|
|
public async Task InMemoryStoreSaveThenTryTakeRoundTripsTheCertificateAsync()
|
|
{
|
|
var store = new InMemoryPendingCertificateKeyStore();
|
|
PendingCertificateKeyContext context = CreateContext();
|
|
using Certificate original = CreateTestCertificateWithKey();
|
|
|
|
bool saved = await store.SaveAsync(context, original, CancellationToken.None).ConfigureAwait(false);
|
|
Assert.That(saved, Is.True);
|
|
|
|
using Certificate taken = (await store.TryTakeAsync(context, CancellationToken.None).ConfigureAwait(false))!;
|
|
Assert.That(taken, Is.Not.Null);
|
|
Assert.That(taken!.Thumbprint, Is.EqualTo(original.Thumbprint));
|
|
|
|
// The caller retains ownership of `original`; disposing it here
|
|
// must not affect the store's own AddRef'd copy that was
|
|
// already handed out above.
|
|
}
|
|
|
|
[Test]
|
|
public async Task InMemoryStoreSaveTwiceReplacesAndDisposesThePreviousEntryAsync()
|
|
{
|
|
var store = new InMemoryPendingCertificateKeyStore();
|
|
PendingCertificateKeyContext context = CreateContext();
|
|
using Certificate first = CreateTestCertificateWithKey();
|
|
using Certificate second = CreateTestCertificateWithKey();
|
|
|
|
Assert.That(await store.SaveAsync(context, first, CancellationToken.None).ConfigureAwait(false), Is.True);
|
|
Assert.That(await store.SaveAsync(context, second, CancellationToken.None).ConfigureAwait(false), Is.True);
|
|
|
|
using Certificate taken = (await store.TryTakeAsync(context, CancellationToken.None).ConfigureAwait(false))!;
|
|
Assert.That(taken, Is.Not.Null);
|
|
Assert.That(taken!.Thumbprint, Is.EqualTo(second.Thumbprint));
|
|
}
|
|
|
|
[Test]
|
|
public async Task InMemoryStoreRemoveDisposesTheEntryAsync()
|
|
{
|
|
var store = new InMemoryPendingCertificateKeyStore();
|
|
PendingCertificateKeyContext context = CreateContext();
|
|
using Certificate original = CreateTestCertificateWithKey();
|
|
|
|
Assert.That(await store.SaveAsync(context, original, CancellationToken.None).ConfigureAwait(false), Is.True);
|
|
await store.RemoveAsync(context, CancellationToken.None).ConfigureAwait(false);
|
|
|
|
using Certificate? taken = await store.TryTakeAsync(context, CancellationToken.None).ConfigureAwait(false);
|
|
Assert.That(taken, Is.Null);
|
|
}
|
|
|
|
[Test]
|
|
public void InMemoryStoreSaveWithNullContextThrowsArgumentNullException()
|
|
{
|
|
var store = new InMemoryPendingCertificateKeyStore();
|
|
using Certificate cert = CreateTestCertificateWithKey();
|
|
|
|
Assert.ThrowsAsync<ArgumentNullException>(async () =>
|
|
await store.SaveAsync(null!, cert, CancellationToken.None).ConfigureAwait(false));
|
|
}
|
|
|
|
private PendingCertificateKeyContext CreateContext(
|
|
NodeId certificateGroupId = default,
|
|
NodeId certificateTypeId = default,
|
|
ICertificatePasswordProvider? passwordProvider = null)
|
|
{
|
|
return new PendingCertificateKeyContext(
|
|
new CertificateStoreIdentifier(m_basePath, CertificateStoreType.Directory),
|
|
certificateGroupId.IsNull ? new NodeId(Guid.NewGuid(), 1) : certificateGroupId,
|
|
certificateTypeId.IsNull ? new NodeId(Guid.NewGuid(), 1) : certificateTypeId,
|
|
passwordProvider,
|
|
m_telemetry);
|
|
}
|
|
|
|
private static Certificate CreateTestCertificateWithKey()
|
|
{
|
|
return CertificateBuilder
|
|
.Create("CN=PendingKey " + Guid.NewGuid().ToString("N")[..8])
|
|
.SetRSAKeySize(2048)
|
|
.CreateForRSA();
|
|
}
|
|
|
|
private sealed class TrackingPasswordProvider : ICertificatePasswordProvider
|
|
{
|
|
public System.Collections.Generic.List<char[]> ReturnedPasswords { get; } = [];
|
|
|
|
public char[] GetPassword(CertificateIdentifier certificateIdentifier)
|
|
{
|
|
_ = certificateIdentifier;
|
|
char[] password = "pending-key-password".ToCharArray();
|
|
ReturnedPasswords.Add(password);
|
|
return password;
|
|
}
|
|
}
|
|
}
|
|
}
|