mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-20 08:41:51 +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>
301 lines
13 KiB
C#
301 lines
13 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.Threading;
|
|
using System.Threading.Tasks;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.Server.TestFramework;
|
|
|
|
namespace Opc.Ua.Server.Tests
|
|
{
|
|
/// <summary>
|
|
/// Verifies how <see cref="StandardServer.ActivateSessionAsync"/> reports
|
|
/// failures before and after the activation committed.
|
|
/// </summary>
|
|
[TestFixture]
|
|
[Category("Session")]
|
|
public sealed class StandardServerActivateSessionRegressionTests
|
|
{
|
|
/// <summary>
|
|
/// AS-2: a failing ephemeral-key step after the activation committed must not
|
|
/// fault the response; the client needs the serverNonce the session now
|
|
/// expects (Part 4 5.7.3.1).
|
|
/// </summary>
|
|
[Test]
|
|
public async Task PostCommitFailureStillReturnsTheServerNonceAsync()
|
|
{
|
|
var fixture = new ServerFixture<ActivateTestServer>(
|
|
telemetry => new ActivateTestServer(telemetry))
|
|
{
|
|
SecurityNone = true
|
|
};
|
|
try
|
|
{
|
|
ActivateTestServer server = await fixture.StartAsync().ConfigureAwait(false);
|
|
SecureChannelContext channel = CreateChannel(server, "post-commit");
|
|
NodeId token = await CreateSessionAsync(server, channel).ConfigureAwait(false);
|
|
server.ThrowFromAdditionalParameters = true;
|
|
|
|
using var lifetime = new RequestLifetime();
|
|
ActivateSessionResponse response = await server.ActivateSessionAsync(
|
|
channel, new RequestHeader { AuthenticationToken = token }, null, default, default,
|
|
default, null, lifetime).ConfigureAwait(false);
|
|
|
|
Assert.That(StatusCode.IsGood(response.ResponseHeader.ServiceResult), Is.True);
|
|
Assert.That(response.ServerNonce.IsEmpty, Is.False);
|
|
Assert.That(server.CurrentInstance.SessionManager.GetSession(token)!.Activated, Is.True);
|
|
}
|
|
finally
|
|
{
|
|
await fixture.StopAsync().ConfigureAwait(false);
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// AS-2: a failure that is not a ServiceResultException (here a cancelled
|
|
/// authentication) is still audited and counted as a rejected session.
|
|
/// </summary>
|
|
[Test]
|
|
public async Task CancelledActivationIsCountedAsRejectedAsync()
|
|
{
|
|
var fixture = new ServerFixture<ActivateTestServer>(
|
|
telemetry => new ActivateTestServer(telemetry))
|
|
{
|
|
SecurityNone = true
|
|
};
|
|
try
|
|
{
|
|
ActivateTestServer server = await fixture.StartAsync().ConfigureAwait(false);
|
|
SecureChannelContext channel = CreateChannel(server, "cancelled-activate");
|
|
NodeId token = await CreateSessionAsync(server, channel).ConfigureAwait(false);
|
|
uint rejectedBefore = 0;
|
|
server.CurrentInstance.UpdateServerDiagnostics(
|
|
diagnostics => rejectedBefore = diagnostics.RejectedSessionCount);
|
|
server.CancelAuthentication = true;
|
|
|
|
using var lifetime = new RequestLifetime();
|
|
Assert.CatchAsync<OperationCanceledException>(async () =>
|
|
await server.ActivateSessionAsync(
|
|
channel, new RequestHeader { AuthenticationToken = token }, null, default, default,
|
|
default, null, lifetime).ConfigureAwait(false));
|
|
|
|
server.CurrentInstance.UpdateServerDiagnostics(diagnostics =>
|
|
Assert.That(diagnostics.RejectedSessionCount, Is.EqualTo(rejectedBefore + 1)));
|
|
}
|
|
finally
|
|
{
|
|
await fixture.StopAsync().ConfigureAwait(false);
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// K15: the post-commit activation callback (e.g. the distributed session
|
|
/// mirror write) cannot fail the activation, so the request's cancellation
|
|
/// (TimeoutHint, Cancel) must not silently abort it while the client gets Good.
|
|
/// </summary>
|
|
[Test]
|
|
public async Task PostCommitCallbackIsNotBoundToTheRequestCancellationAsync()
|
|
{
|
|
var fixture = new ServerFixture<ActivateTestServer>(
|
|
telemetry => new ActivateTestServer(telemetry))
|
|
{
|
|
SecurityNone = true
|
|
};
|
|
try
|
|
{
|
|
ActivateTestServer server = await fixture.StartAsync().ConfigureAwait(false);
|
|
SecureChannelContext channel = CreateChannel(server, "post-commit-token");
|
|
NodeId token = await CreateSessionAsync(server, channel).ConfigureAwait(false);
|
|
|
|
using var lifetime = new RequestLifetime();
|
|
Assert.That(lifetime.CancellationToken.CanBeCanceled, Is.True);
|
|
ActivateSessionResponse response = await server.ActivateSessionAsync(
|
|
channel, new RequestHeader { AuthenticationToken = token }, null, default, default,
|
|
default, null, lifetime).ConfigureAwait(false);
|
|
|
|
Assert.That(StatusCode.IsGood(response.ResponseHeader.ServiceResult), Is.True);
|
|
Assert.That(server.ActivatedCallbackToken, Is.Not.Null);
|
|
Assert.That(server.ActivatedCallbackToken.Value.CanBeCanceled, Is.False);
|
|
}
|
|
finally
|
|
{
|
|
await fixture.StopAsync().ConfigureAwait(false);
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// PR review 4166517507: the activation gate is released before the post-commit
|
|
/// steps, so a close can start while they run. The activation must then fail
|
|
/// with Bad_SessionClosed instead of reporting Good for a closed session.
|
|
/// </summary>
|
|
[Test]
|
|
public async Task CloseDuringPostCommitStepsFailsWithSessionClosedAsync()
|
|
{
|
|
var fixture = new ServerFixture<ActivateTestServer>(
|
|
telemetry => new ActivateTestServer(telemetry))
|
|
{
|
|
SecurityNone = true
|
|
};
|
|
try
|
|
{
|
|
ActivateTestServer server = await fixture.StartAsync().ConfigureAwait(false);
|
|
SecureChannelContext channel = CreateChannel(server, "post-commit-close");
|
|
NodeId token = await CreateSessionAsync(server, channel).ConfigureAwait(false);
|
|
NodeId sessionId = server.CurrentInstance.SessionManager.GetSession(token)!.Id;
|
|
server.CloseDuringPostCommit = () => server.CurrentInstance.SessionManager
|
|
.CloseSessionAsync(sessionId).AsTask().GetAwaiter().GetResult();
|
|
|
|
using var lifetime = new RequestLifetime();
|
|
ServiceResultException ex = Assert.ThrowsAsync<ServiceResultException>(async () =>
|
|
await server.ActivateSessionAsync(
|
|
channel, new RequestHeader { AuthenticationToken = token }, null, default, default,
|
|
default, null, lifetime).ConfigureAwait(false));
|
|
|
|
Assert.That(ex.StatusCode, Is.EqualTo(StatusCodes.BadSessionClosed));
|
|
Assert.That(server.CurrentInstance.SessionManager.GetSession(token), Is.Null);
|
|
}
|
|
finally
|
|
{
|
|
await fixture.StopAsync().ConfigureAwait(false);
|
|
}
|
|
}
|
|
|
|
private static SecureChannelContext CreateChannel(StandardServer server, string channelId)
|
|
{
|
|
EndpointDescription endpoint = server.GetEndpoints().Find(
|
|
candidate => candidate.SecurityPolicyUri == SecurityPolicies.None);
|
|
Assert.That(endpoint, Is.Not.Null);
|
|
return new SecureChannelContext(channelId, endpoint, RequestEncoding.Binary, null, null);
|
|
}
|
|
|
|
private static async Task<NodeId> CreateSessionAsync(StandardServer server, SecureChannelContext channel)
|
|
{
|
|
using var lifetime = new RequestLifetime();
|
|
CreateSessionResponse response = await server.CreateSessionAsync(
|
|
channel, new RequestHeader(), null, null, null, "activate-regression",
|
|
default, default, 60000, 0, lifetime).ConfigureAwait(false);
|
|
return response.AuthenticationToken;
|
|
}
|
|
|
|
private sealed class ActivateTestServer : StandardServer
|
|
{
|
|
public ActivateTestServer(ITelemetryContext telemetry)
|
|
: base(telemetry)
|
|
{
|
|
}
|
|
|
|
public bool ThrowFromAdditionalParameters { get; set; }
|
|
|
|
public bool CancelAuthentication { get; set; }
|
|
|
|
public CancellationToken? ActivatedCallbackToken { get; set; }
|
|
|
|
public Action CloseDuringPostCommit { get; set; } = null!;
|
|
|
|
protected override ISessionManager CreateSessionManager(
|
|
IServerInternal server,
|
|
ApplicationConfiguration configuration)
|
|
{
|
|
return new CancellingSessionManager(server, configuration, this);
|
|
}
|
|
|
|
protected override AdditionalParametersType ActivateSessionProcessAdditionalParameters(
|
|
ISession session,
|
|
ExtensionObject additionalHeader)
|
|
{
|
|
if (ThrowFromAdditionalParameters)
|
|
{
|
|
throw new ObjectDisposedException(nameof(Session));
|
|
}
|
|
Action close = CloseDuringPostCommit;
|
|
CloseDuringPostCommit = null!;
|
|
close?.Invoke();
|
|
return base.ActivateSessionProcessAdditionalParameters(session, additionalHeader)!;
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Fails authentication with a cancellation, which SessionManager propagates
|
|
/// as an OperationCanceledException rather than a ServiceResultException.
|
|
/// </summary>
|
|
private sealed class CancellingSessionManager : SessionManager
|
|
{
|
|
public CancellingSessionManager(
|
|
IServerInternal server,
|
|
ApplicationConfiguration configuration,
|
|
ActivateTestServer owner)
|
|
: base(server, configuration)
|
|
{
|
|
m_owner = owner;
|
|
}
|
|
|
|
protected override ValueTask<(
|
|
IUserIdentity? Identity,
|
|
IUserIdentity? EffectiveIdentity,
|
|
ServiceResult? Error)> AuthenticateUserIdentityAsync(
|
|
ISession session,
|
|
IUserIdentityTokenHandler newIdentity,
|
|
UserTokenPolicy? userTokenPolicy,
|
|
EndpointDescription endpointDescription,
|
|
CancellationToken cancellationToken)
|
|
{
|
|
if (m_owner.CancelAuthentication)
|
|
{
|
|
throw new OperationCanceledException("Injected authentication cancellation.");
|
|
}
|
|
return base.AuthenticateUserIdentityAsync(
|
|
session, newIdentity, userTokenPolicy, endpointDescription, cancellationToken);
|
|
}
|
|
|
|
protected override ValueTask OnSessionActivatedAsync(
|
|
NodeId authenticationToken,
|
|
ISession session,
|
|
ByteString serverNonce,
|
|
UserTokenType clientUserTokenType,
|
|
string? clientUserId,
|
|
long activationSequence,
|
|
CancellationToken cancellationToken)
|
|
{
|
|
m_owner.ActivatedCallbackToken = cancellationToken;
|
|
return base.OnSessionActivatedAsync(
|
|
authenticationToken,
|
|
session,
|
|
serverNonce,
|
|
clientUserTokenType,
|
|
clientUserId,
|
|
activationSequence,
|
|
cancellationToken);
|
|
}
|
|
|
|
private readonly ActivateTestServer m_owner;
|
|
}
|
|
}
|
|
}
|