mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-17 05:11:13 +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>
213 lines
8.2 KiB
C#
213 lines
8.2 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 System;
|
|
using System.IO;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
|
|
namespace Opc.Ua.Core.TestFramework
|
|
{
|
|
/// <summary>
|
|
/// Test helper that creates a temporary directory-backed PKI store
|
|
/// and exposes an <see cref="ICertificateManager"/> built from it.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// New tests should prefer this helper. The store layout is
|
|
/// (issuer / trusted / rejected directories).
|
|
/// </remarks>
|
|
public sealed class TemporaryCertificateManager : IDisposable
|
|
{
|
|
/// <summary>
|
|
/// Create the PKI store under a fresh temporary path and return
|
|
/// the helper.
|
|
/// </summary>
|
|
public static TemporaryCertificateManager Create(
|
|
ITelemetryContext telemetry,
|
|
bool rejectedStore = false)
|
|
{
|
|
return new TemporaryCertificateManager(telemetry, rejectedStore);
|
|
}
|
|
|
|
private TemporaryCertificateManager(ITelemetryContext telemetry, bool rejectedStore)
|
|
{
|
|
m_pkiRoot = Path.GetTempPath() + Path.GetRandomFileName() + Path.DirectorySeparatorChar;
|
|
m_telemetry = telemetry;
|
|
m_issuerStore = new DirectoryCertificateStore(telemetry);
|
|
m_issuerStore.Open(m_pkiRoot + "issuer", true);
|
|
m_trustedStore = new DirectoryCertificateStore(telemetry);
|
|
m_trustedStore.Open(m_pkiRoot + "trusted", true);
|
|
if (rejectedStore)
|
|
{
|
|
m_rejectedStore = new DirectoryCertificateStore(telemetry);
|
|
m_rejectedStore.Open(m_pkiRoot + "rejected", true);
|
|
}
|
|
}
|
|
|
|
~TemporaryCertificateManager()
|
|
{
|
|
Dispose(false);
|
|
}
|
|
|
|
public void Dispose()
|
|
{
|
|
Dispose(true);
|
|
GC.SuppressFinalize(this);
|
|
}
|
|
|
|
private void Dispose(bool disposing)
|
|
{
|
|
if (disposing && Interlocked.CompareExchange(ref m_disposed, 1, 0) == 0)
|
|
{
|
|
CleanupValidatorAndStoresAsync(true).GetAwaiter().GetResult();
|
|
m_issuerStore = null!;
|
|
m_trustedStore = null!;
|
|
m_rejectedStore = null!;
|
|
string path = Utils.ReplaceSpecialFolderNames(m_pkiRoot)!;
|
|
int retries = 5;
|
|
while (retries-- > 0)
|
|
{
|
|
try
|
|
{
|
|
if (Directory.Exists(path))
|
|
{
|
|
Directory.Delete(path, true);
|
|
}
|
|
retries = 0;
|
|
}
|
|
catch (IOException)
|
|
{
|
|
Thread.Sleep(1000);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// The certificate manager built from the temporary stores. The
|
|
/// instance is created on demand via <see cref="UpdateAsync"/>
|
|
/// (mirroring the legacy <c>TemporaryCertValidator.Update</c>
|
|
/// pattern) and refreshed each time it is called.
|
|
/// </summary>
|
|
public ICertificateManager Manager => m_manager;
|
|
|
|
/// <summary>
|
|
/// Convenience accessor that returns <see cref="Manager"/> typed
|
|
/// as <see cref="ICertificateValidatorEx"/>.
|
|
/// </summary>
|
|
public ICertificateValidatorEx Validator => m_manager;
|
|
|
|
/// <summary>
|
|
/// The issuer store, contains certs used for chain validation.
|
|
/// </summary>
|
|
public ICertificateStore IssuerStore => m_issuerStore;
|
|
|
|
/// <summary>
|
|
/// The trusted store, used for trusted CA, Sub CA and leaf
|
|
/// certificates.
|
|
/// </summary>
|
|
public ICertificateStore TrustedStore => m_trustedStore;
|
|
|
|
/// <summary>
|
|
/// The rejected store, used for rejected certificates.
|
|
/// </summary>
|
|
public ICertificateStore RejectedStore => m_rejectedStore;
|
|
|
|
/// <summary>
|
|
/// (Re)builds the certificate manager from the current state of
|
|
/// the issuer / trusted / rejected directories. Returns the
|
|
/// concrete <see cref="CertificateManager"/> for direct use in
|
|
/// tests that need its full surface (e.g. the
|
|
/// <c>MaxRejectedCertificates</c> setter).
|
|
/// </summary>
|
|
public CertificateManager Update()
|
|
{
|
|
(m_manager as CertificateManager)?.Dispose();
|
|
|
|
var securityConfiguration = new SecurityConfiguration
|
|
{
|
|
TrustedIssuerCertificates = new CertificateTrustList
|
|
{
|
|
StoreType = CertificateStoreType.Directory,
|
|
StorePath = m_issuerStore.Directory!.FullName
|
|
},
|
|
TrustedPeerCertificates = new CertificateTrustList
|
|
{
|
|
StoreType = CertificateStoreType.Directory,
|
|
StorePath = m_trustedStore.Directory!.FullName
|
|
}
|
|
};
|
|
if (m_rejectedStore != null)
|
|
{
|
|
securityConfiguration.RejectedCertificateStore = new CertificateTrustList
|
|
{
|
|
StoreType = CertificateStoreType.Directory,
|
|
StorePath = m_rejectedStore.Directory!.FullName
|
|
};
|
|
}
|
|
|
|
CertificateManager manager = CertificateManagerFactory.Create(
|
|
securityConfiguration,
|
|
m_telemetry);
|
|
m_manager = manager;
|
|
return manager;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Async wrapper around <see cref="Update"/> for parity with
|
|
/// callers that expect an awaitable factory.
|
|
/// </summary>
|
|
public Task<CertificateManager> UpdateAsync()
|
|
{
|
|
return Task.FromResult(Update());
|
|
}
|
|
|
|
/// <summary>
|
|
/// Cleans up (deletes) the contents of the issuer, trusted and
|
|
/// rejected stores. Disposes the underlying manager when
|
|
/// <paramref name="dispose"/> is <see langword="true"/>.
|
|
/// </summary>
|
|
public async Task CleanupValidatorAndStoresAsync(bool dispose = false)
|
|
{
|
|
(m_manager as CertificateManager)?.Dispose();
|
|
await TestUtils.CleanupTrustListAsync(m_issuerStore, dispose).ConfigureAwait(false);
|
|
await TestUtils.CleanupTrustListAsync(m_trustedStore, dispose).ConfigureAwait(false);
|
|
await TestUtils.CleanupTrustListAsync(m_rejectedStore, dispose).ConfigureAwait(false);
|
|
}
|
|
|
|
private int m_disposed;
|
|
private ICertificateManager m_manager = null!;
|
|
private DirectoryCertificateStore m_issuerStore;
|
|
private DirectoryCertificateStore m_trustedStore;
|
|
private DirectoryCertificateStore m_rejectedStore = null!;
|
|
private readonly string m_pkiRoot;
|
|
private readonly ITelemetryContext m_telemetry;
|
|
}
|
|
}
|