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>
217 lines
8.3 KiB
C#
217 lines
8.3 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;
|
|
using Opc.Ua.Client;
|
|
using Opc.Ua.Configuration;
|
|
using Opc.Ua.Security.Certificates;
|
|
|
|
namespace Opc.Ua.Core.Security.Tests
|
|
{
|
|
/// <summary>
|
|
/// Helper that opens an OPC UA session against the in-process
|
|
/// reference server using a custom client application instance
|
|
/// certificate. Used by the
|
|
/// <see cref="SecurityCertValidationTests"/> and
|
|
/// <see cref="SecurityNoneSession10Tests"/> conformance fixtures
|
|
/// to verify the server's behaviour when the client presents a
|
|
/// flawed certificate (expired, not-yet-valid, weak crypto,
|
|
/// wrong host name, etc.).
|
|
/// </summary>
|
|
internal sealed class CertSessionContext : IAsyncDisposable
|
|
{
|
|
private readonly string m_pkiRoot;
|
|
|
|
/// <summary>
|
|
/// Owns the client application services that must stop before the temporary PKI directory is removed.
|
|
/// </summary>
|
|
private readonly ApplicationInstance m_application;
|
|
private bool m_disposed;
|
|
public ApplicationConfiguration ClientConfig { get; }
|
|
public Certificate ClientCertificate { get; }
|
|
|
|
/// <summary>
|
|
/// Retains the configured client, its certificate, and the application responsible for its lifetime.
|
|
/// </summary>
|
|
private CertSessionContext(
|
|
ApplicationConfiguration clientConfig,
|
|
Certificate clientCertificate,
|
|
string pkiRoot,
|
|
ApplicationInstance application)
|
|
{
|
|
ClientConfig = clientConfig;
|
|
ClientCertificate = clientCertificate;
|
|
m_pkiRoot = pkiRoot;
|
|
m_application = application;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Builds an <see cref="ApplicationConfiguration"/> that uses
|
|
/// the supplied client certificate as its application instance
|
|
/// certificate. The certificate is persisted to a temporary
|
|
/// PKI directory which is cleaned up when the context is
|
|
/// disposed.
|
|
/// </summary>
|
|
/// <exception cref="ArgumentNullException"><paramref name="clientCertificate"/> is <c>null</c>.</exception>
|
|
public static async Task<CertSessionContext> CreateAsync(
|
|
Certificate clientCertificate,
|
|
string applicationUri,
|
|
ITelemetryContext telemetry)
|
|
{
|
|
if (clientCertificate == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(clientCertificate));
|
|
}
|
|
if (applicationUri == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(applicationUri));
|
|
}
|
|
if (telemetry == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(telemetry));
|
|
}
|
|
|
|
string pkiRoot = Path.GetTempPath() + Path.GetRandomFileName();
|
|
Directory.CreateDirectory(pkiRoot);
|
|
ApplicationInstance? clientApp = null;
|
|
|
|
try
|
|
{
|
|
string ownStorePath = Path.Combine(pkiRoot, "own");
|
|
Directory.CreateDirectory(ownStorePath);
|
|
|
|
using (ICertificateStore store = CertificateStoreIdentifier.CreateStore(
|
|
CertificateStoreType.Directory, telemetry))
|
|
{
|
|
store.Open(ownStorePath, false);
|
|
await store.AddAsync(clientCertificate).ConfigureAwait(false);
|
|
}
|
|
|
|
var certIdentifier = new CertificateIdentifier
|
|
{
|
|
StoreType = CertificateStoreType.Directory,
|
|
StorePath = ownStorePath,
|
|
RawData = clientCertificate.RawData,
|
|
Thumbprint = clientCertificate.Thumbprint
|
|
};
|
|
|
|
clientApp = new ApplicationInstance(telemetry)
|
|
{
|
|
ApplicationName = "ConformanceTestClient",
|
|
ApplicationType = ApplicationType.Client
|
|
};
|
|
|
|
ApplicationConfiguration clientConfig = await clientApp
|
|
.Build(applicationUri, "urn:opcfoundation.org:ConformanceTestClient")
|
|
.AsClient()
|
|
.AddSecurityConfiguration(new[] { certIdentifier }.ToArrayOf(), pkiRoot)
|
|
.SetMinimumCertificateKeySize(1024)
|
|
.SetAutoAcceptUntrustedCertificates(true)
|
|
.SetRejectSHA1SignedCertificates(false)
|
|
.CreateAsync()
|
|
.ConfigureAwait(false);
|
|
|
|
return new CertSessionContext(clientConfig, clientCertificate, pkiRoot, clientApp);
|
|
}
|
|
catch
|
|
{
|
|
if (clientApp != null)
|
|
{
|
|
await clientApp.DisposeAsync().ConfigureAwait(false);
|
|
}
|
|
TryDeleteDirectory(pkiRoot);
|
|
throw;
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Creates and opens a session against the supplied configured
|
|
/// endpoint using the certificate provided to
|
|
/// <see cref="CreateAsync"/>. Bypasses the retry wrapper so
|
|
/// the caller observes the first error directly.
|
|
/// </summary>
|
|
/// <exception cref="ArgumentNullException"><paramref name="endpoint"/> is <c>null</c>.</exception>
|
|
public async Task<ISession> OpenSessionAsync(
|
|
ConfiguredEndpoint endpoint,
|
|
ITelemetryContext telemetry,
|
|
CancellationToken cancellationToken = default)
|
|
{
|
|
if (endpoint == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(endpoint));
|
|
}
|
|
|
|
var sessionFactory = new DefaultSessionFactory(telemetry);
|
|
return await sessionFactory.CreateAsync(
|
|
ClientConfig,
|
|
endpoint,
|
|
updateBeforeConnect: false,
|
|
checkDomain: false,
|
|
sessionName: "CertSession",
|
|
sessionTimeout: 60000,
|
|
identity: null,
|
|
preferredLocales: default,
|
|
ct: cancellationToken).ConfigureAwait(false);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Disposes the client application before releasing its certificate and temporary PKI storage.
|
|
/// </summary>
|
|
public async ValueTask DisposeAsync()
|
|
{
|
|
if (m_disposed)
|
|
{
|
|
return;
|
|
}
|
|
m_disposed = true;
|
|
await m_application.DisposeAsync().ConfigureAwait(false);
|
|
ClientCertificate?.Dispose();
|
|
TryDeleteDirectory(m_pkiRoot);
|
|
}
|
|
|
|
private static void TryDeleteDirectory(string path)
|
|
{
|
|
try
|
|
{
|
|
if (!string.IsNullOrEmpty(path) && Directory.Exists(path))
|
|
{
|
|
Directory.Delete(path, true);
|
|
}
|
|
}
|
|
catch
|
|
{
|
|
// best-effort cleanup
|
|
}
|
|
}
|
|
}
|
|
}
|