mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-21 09:06:37 +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>
274 lines
12 KiB
C#
274 lines
12 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.Collections.Generic;
|
|
using System.Linq;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
using Moq;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.Tests;
|
|
|
|
namespace Opc.Ua.Server.Tests.KeyCredential
|
|
{
|
|
[TestFixture]
|
|
[Category("KeyCredential")]
|
|
public class KeyCredentialPushTests
|
|
{
|
|
private static readonly ITelemetryContext s_telemetry = NUnitTelemetryContext.Create();
|
|
|
|
/// <summary>
|
|
/// Verifies that updating a credential stores its plaintext secret and deleting the credential removes it.
|
|
/// </summary>
|
|
[Test]
|
|
public async Task UpdateCredentialThenDeleteCredentialUpdatesStore()
|
|
{
|
|
using var store = new InMemoryKeyCredentialStore();
|
|
var subject = new KeyCredentialPushSubject(store);
|
|
KeyCredentialConfigurationFolderState folder = CreateFolder();
|
|
ISystemContext context = CreateAdminContext();
|
|
await subject.BindAsync(folder, context).ConfigureAwait(false);
|
|
|
|
KeyCredentialConfigurationState credentialNode = await CreateCredentialNodeAsync(folder, context)
|
|
.ConfigureAwait(false);
|
|
byte[] secret = [1, 2, 3, 4];
|
|
KeyCredentialUpdateMethodStateResult updateResult = await credentialNode.UpdateCredential!.OnCallAsync!(
|
|
context,
|
|
credentialNode.UpdateCredential,
|
|
credentialNode.NodeId,
|
|
"credential-1",
|
|
ByteString.From(secret),
|
|
string.Empty,
|
|
string.Empty,
|
|
CancellationToken.None)
|
|
.ConfigureAwait(false);
|
|
|
|
Assert.That(ServiceResult.IsGood(updateResult.ServiceResult), Is.True);
|
|
Server.KeyCredential stored = (await store.GetAsync("credential-1", CancellationToken.None)
|
|
.ConfigureAwait(false))!;
|
|
Assert.That(stored, Is.Not.Null);
|
|
Assert.That(stored.Secret, Is.EqualTo(secret));
|
|
|
|
ServiceResult deleteResult = await credentialNode.DeleteCredential!.OnCallMethod2Async!(
|
|
context,
|
|
credentialNode.DeleteCredential,
|
|
credentialNode.NodeId,
|
|
[],
|
|
[],
|
|
CancellationToken.None)
|
|
.ConfigureAwait(false);
|
|
|
|
Assert.That(ServiceResult.IsGood(deleteResult), Is.True);
|
|
Assert.That(await store.GetAsync("credential-1", CancellationToken.None).ConfigureAwait(false), Is.Null);
|
|
}
|
|
|
|
[Test]
|
|
public async Task UpdateCredentialRotationRemovesPreviousSecret()
|
|
{
|
|
using var store = new InMemoryKeyCredentialStore();
|
|
var subject = new KeyCredentialPushSubject(store);
|
|
KeyCredentialConfigurationFolderState folder = CreateFolder();
|
|
ISystemContext context = CreateAdminContext();
|
|
await subject.BindAsync(folder, context).ConfigureAwait(false);
|
|
KeyCredentialConfigurationState credentialNode = await CreateCredentialNodeAsync(folder, context)
|
|
.ConfigureAwait(false);
|
|
|
|
await credentialNode.UpdateCredential!.OnCallAsync!(
|
|
context,
|
|
credentialNode.UpdateCredential,
|
|
credentialNode.NodeId,
|
|
"credential-old",
|
|
ByteString.From([1, 2, 3, 4]),
|
|
string.Empty,
|
|
string.Empty,
|
|
CancellationToken.None).ConfigureAwait(false);
|
|
|
|
KeyCredentialUpdateMethodStateResult result = await credentialNode.UpdateCredential.OnCallAsync(
|
|
context,
|
|
credentialNode.UpdateCredential,
|
|
credentialNode.NodeId,
|
|
"credential-new",
|
|
ByteString.From([5, 6, 7, 8]),
|
|
string.Empty,
|
|
string.Empty,
|
|
CancellationToken.None).ConfigureAwait(false);
|
|
|
|
Assert.That(ServiceResult.IsGood(result.ServiceResult), Is.True);
|
|
Assert.That(await store.GetAsync("credential-old", CancellationToken.None).ConfigureAwait(false), Is.Null);
|
|
Assert.That(await store.GetAsync("credential-new", CancellationToken.None).ConfigureAwait(false), Is.Not.Null);
|
|
}
|
|
|
|
[Test]
|
|
public async Task CreateCredentialRejectsDuplicateBrowseName()
|
|
{
|
|
using var store = new InMemoryKeyCredentialStore();
|
|
var subject = new KeyCredentialPushSubject(store);
|
|
KeyCredentialConfigurationFolderState folder = CreateFolder();
|
|
ISystemContext context = CreateAdminContext();
|
|
await subject.BindAsync(folder, context).ConfigureAwait(false);
|
|
await CreateCredentialNodeAsync(folder, context).ConfigureAwait(false);
|
|
|
|
CreateCredentialMethodStateResult result = await folder.CreateCredential!.OnCallAsync!(
|
|
context,
|
|
folder.CreateCredential,
|
|
folder.NodeId,
|
|
"ServiceA",
|
|
"urn:test:resource-2",
|
|
KeyCredentialBridgeOptions.DefaultProfileUri,
|
|
[],
|
|
CancellationToken.None).ConfigureAwait(false);
|
|
|
|
Assert.That(result.ServiceResult.StatusCode, Is.EqualTo(StatusCodes.BadNodeIdExists));
|
|
}
|
|
|
|
[Test]
|
|
public async Task UpdateCredentialRejectsUnauthorizedCaller()
|
|
{
|
|
using var store = new InMemoryKeyCredentialStore();
|
|
var subject = new KeyCredentialPushSubject(store);
|
|
KeyCredentialConfigurationFolderState folder = CreateFolder();
|
|
ISystemContext adminContext = CreateAdminContext();
|
|
await subject.BindAsync(folder, adminContext).ConfigureAwait(false);
|
|
KeyCredentialConfigurationState credentialNode = await CreateCredentialNodeAsync(folder, adminContext)
|
|
.ConfigureAwait(false);
|
|
|
|
KeyCredentialUpdateMethodStateResult result = await credentialNode.UpdateCredential!.OnCallAsync!(
|
|
CreateAnonymousContext(),
|
|
credentialNode.UpdateCredential,
|
|
credentialNode.NodeId,
|
|
"credential-1",
|
|
ByteString.From([1, 2, 3, 4]),
|
|
string.Empty,
|
|
SecurityPolicies.Basic256Sha256,
|
|
CancellationToken.None)
|
|
.ConfigureAwait(false);
|
|
|
|
Assert.That(result.ServiceResult.StatusCode, Is.EqualTo(StatusCodes.BadUserAccessDenied));
|
|
}
|
|
|
|
[Test]
|
|
public async Task BindAddsBrowseChildrenForStoredCredentials()
|
|
{
|
|
using var store = new InMemoryKeyCredentialStore();
|
|
await store.UpdateAsync(
|
|
"browse-credential",
|
|
new Server.KeyCredential([9, 8, 7], DateTime.UtcNow.AddHours(1)),
|
|
CancellationToken.None)
|
|
.ConfigureAwait(false);
|
|
var subject = new KeyCredentialPushSubject(store);
|
|
KeyCredentialConfigurationFolderState folder = CreateFolder();
|
|
ISystemContext context = CreateAdminContext();
|
|
|
|
await subject.BindAsync(folder, context).ConfigureAwait(false);
|
|
|
|
IList<BaseInstanceState> children = [];
|
|
folder.GetChildren(context, children);
|
|
Assert.That(children.OfType<KeyCredentialConfigurationState>()
|
|
.Any(child => child.CredentialId!.Value == "browse-credential"), Is.True);
|
|
}
|
|
|
|
private static async Task<KeyCredentialConfigurationState> CreateCredentialNodeAsync(
|
|
KeyCredentialConfigurationFolderState folder,
|
|
ISystemContext context)
|
|
{
|
|
CreateCredentialMethodStateResult createResult = await folder.CreateCredential!.OnCallAsync!(
|
|
context,
|
|
folder.CreateCredential,
|
|
folder.NodeId,
|
|
"ServiceA",
|
|
"urn:test:resource",
|
|
KeyCredentialBridgeOptions.DefaultProfileUri,
|
|
[],
|
|
CancellationToken.None)
|
|
.ConfigureAwait(false);
|
|
Assert.That(ServiceResult.IsGood(createResult.ServiceResult), Is.True);
|
|
ushort expectedNamespaceIndex = (ushort)context.NamespaceUris.GetIndex(
|
|
KeyCredentialPushSubject.NamespaceUri);
|
|
Assert.Multiple(() =>
|
|
{
|
|
// The standard folder is in namespace 0, which is reserved for the
|
|
// OPC UA standard address space, so instances get a server-owned namespace.
|
|
Assert.That(folder.NodeId.NamespaceIndex, Is.Zero);
|
|
Assert.That(expectedNamespaceIndex, Is.GreaterThan((ushort)0));
|
|
Assert.That(
|
|
createResult.CredentialNodeId.NamespaceIndex,
|
|
Is.EqualTo(expectedNamespaceIndex));
|
|
});
|
|
|
|
IList<BaseInstanceState> children = [];
|
|
folder.GetChildren(context, children);
|
|
return children.OfType<KeyCredentialConfigurationState>()
|
|
.Single(child => child.NodeId == createResult.CredentialNodeId);
|
|
}
|
|
|
|
private static KeyCredentialConfigurationFolderState CreateFolder()
|
|
{
|
|
return new KeyCredentialConfigurationFolderState(null)
|
|
{
|
|
NodeId = KeyCredentialPushSubject.StandardConfigurationFolderNodeId,
|
|
BrowseName = new QualifiedName("KeyCredentialConfiguration"),
|
|
DisplayName = LocalizedText.From("KeyCredentialConfiguration"),
|
|
TypeDefinitionId = ObjectTypeIds.KeyCredentialConfigurationFolderType
|
|
};
|
|
}
|
|
|
|
private static SessionSystemContext CreateAdminContext()
|
|
{
|
|
return CreateContext(UserTokenType.UserName, ObjectIds.WellKnownRole_SecurityAdmin);
|
|
}
|
|
|
|
private static SessionSystemContext CreateAnonymousContext()
|
|
{
|
|
return CreateContext(UserTokenType.Anonymous);
|
|
}
|
|
|
|
private static SessionSystemContext CreateContext(UserTokenType tokenType, params NodeId[] grantedRoles)
|
|
{
|
|
var identity = new Mock<IUserIdentity>();
|
|
identity.Setup(i => i.TokenType).Returns(tokenType);
|
|
identity.Setup(i => i.DisplayName).Returns(tokenType.ToString());
|
|
identity.Setup(i => i.GrantedRoleIds).Returns(ArrayOf.Wrapped(grantedRoles));
|
|
var endpoint = new EndpointDescription { SecurityMode = MessageSecurityMode.SignAndEncrypt };
|
|
var channelContext = new SecureChannelContext("test", endpoint, RequestEncoding.Binary);
|
|
var operationContext = new OperationContext(
|
|
new RequestHeader(),
|
|
channelContext,
|
|
RequestType.Call,
|
|
RequestLifetime.None,
|
|
identity.Object);
|
|
return new SessionSystemContext(operationContext, s_telemetry)
|
|
{
|
|
NamespaceUris = new NamespaceTable(),
|
|
ServerUris = new StringTable()
|
|
};
|
|
}
|
|
}
|
|
}
|