mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-18 22:55:08 +08:00
a81d981755
# Description
Pure code-style sweep across the repo — no behavioral changes. Drives
`dotnet format` info-level diagnostics down on a large slice of the
codebase (Stack, Libraries, Tests, Tools).
Six commits, applied bottom-up in safety order so each batch leaves the
build green:
1. **`style: fix whitespace and final-newline formatting (WHITESPACE,
FINALNEWLINE)`**
197 hits across ~30 files; pure mechanical cleanup.
2. **`style: apply dotnet format style fixes (IDE rules)`**
IDE-rule batch via `dotnet format style --severity info` —
`var`/explicit type, simplify names, collection expressions, expression
bodies, unused usings, etc.
3. **`style: apply dotnet format analyzers fixes (RCS blank-line
formatting)`**
Roslynator formatting (RCS0xxx) blank-line and punctuation rules.
4. **`style: convert comments to doc comments and inline local vars
(RCS1181, RCS1124)`**
24 files. RCS1181 promotes `// summary`-style comments above
public/internal members to `/// <summary>` doc comments; RCS1124 inlines
locals used exactly once. Generated `Tools/` files were reverted to keep
the source-generator outputs deterministic.
5. **`docs(agent): correct --diagnostics flag form and verify Roslynator
4.x code fixers`**
Updates `.github/agents/opc-ua-codestyle-enforcer.agent.md` with two
corrections discovered while running this sweep:
- `dotnet format --diagnostics "RULE1 RULE2"` (single quoted,
space-separated) silently fixes nothing on `dotnet format` 10.x — it
parses as one unknown ID and exits 0. The correct form is `--diagnostics
RULE1 --diagnostics RULE2 …`, repeated per rule.
- Roslynator 4.15.0 **does** ship code fixers for
RCS1078/1118/1124/1140/1142/1181/1221/1260 (the previous "no auto-fixer"
list was outdated). RCS1140/1142 default to `Hidden` so need `--severity
info` to surface and fire; RCS1078 requires
`roslynator_empty_string_style = field` (already set in
`.editorconfig`). Only NUnit4002/2046/2010 genuinely lack auto-fixers in
this stack.
6. **`style: format new code from master merge (dotnet format sweep)`**
After merging master into the branch (commit `e3ebc8742`), re-ran the
same three-phase format sweep on the 151 .cs files brought in by the
merge, scoped per project via repeated `--include`. 81 files changed;
same rule families as commits 1–4.
- Hand-fixed `Tests/Opc.Ua.MigrationAnalyzer.Tests/AnalyzerHarness.cs`
for `RCS1174` (redundant `async`/`await` removal) because the auto-fixer
didn't apply for that specific case.
- Reverted files that the formatter would break:
- `Libraries/Opc.Ua.Server/Server/ServerInternalData.cs` — multi-TFM
analysis disagreement injected `<<<<<<<` / `=======` / `>>>>>>>`
markers.
-
`Tools/Opc.Ua.MigrationAnalyzer.Core/{Core/Stack/Client/ChannelBase.cs,
Core/Stack/Types/IUserIdentityTokenHandler.cs,
Client/Session/Session.cs}` — IDE0005 removed `using
Opc.Ua.Security.Certificates` that IS used (the files are 1.5.378
reference fixtures for the analyzer).
- `Tests/Opc.Ua.Gds.Tests/PushTest.cs` — IDE0002 over-simplified
`OpcUa.ObjectTypeIds` to `ObjectTypeIds`, which then resolves to a
conflicting type.
### What this PR does **not** touch
- No behavioral or semantic logic changes.
- No `.editorconfig` rule promotions (rules stay at their current
severities; this is a backlog-burndown pass, not a rule tightening).
- Generated source under `Tools/` is intentionally excluded.
- Higher-risk rule families (`RCS1090`/`CA2007` `ConfigureAwait`,
`RCS1249` null-forgiving cleanup, `IDE0270`/`IDE0059`) are left for
follow-up sweeps because they need per-TFM build verification or
semantic review.
## Related Issues
_No tracking issue — this is a non-functional style sweep and the
agent-doc correction is a follow-up to the same work. Happy to open one
if the maintainers prefer._
## 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.
- [x] I have added tests that prove my fix is effective or that my
feature works and increased code coverage. _(N/A — style-only, no
behavioral change)_
- [x] I have added all necessary documentation. _(agent doc updated with
the two corrections)_
- [x] I have verified that my changes do not introduce (new) build or
analyzer warnings. _(verified clean on `net10.0` and `net48`; only
pre-existing `NETSDK1005`/`NETSDK1207` failures on Tools/AOT projects)_
- [ ] I ran **all** tests locally using the **UA.slnx** solution against
at least .net **framework** and .net **10**, and all passed. _(build
verified on net10 and net48 per batch; full test suite not yet run
locally — relying on CI)_
- [ ] I fixed **all** failing and flaky tests in the CI pipelines and
**all** CodeQL warnings.
- [ ] I have addressed **all** PR feedback received.
---------
Co-authored-by: agent <agent@local>
377 lines
15 KiB
C#
377 lines
15 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.Threading;
|
|
using System.Threading.Tasks;
|
|
using Opc.Ua.Server.Hosting;
|
|
|
|
namespace Opc.Ua.Server
|
|
{
|
|
/// <summary>
|
|
/// Binds OPC 10000-12 §8 KeyCredentialConfiguration nodes to an <see cref="IKeyCredentialStore"/>.
|
|
/// </summary>
|
|
public sealed class KeyCredentialPushSubject
|
|
{
|
|
/// <summary>
|
|
/// Namespace URI used for dynamic credential configuration instances.
|
|
/// </summary>
|
|
public const string NamespaceUri = "urn:opcfoundation:netstandard:keycredential-push";
|
|
|
|
/// <summary>
|
|
/// Standard NodeId of ServerConfiguration/KeyCredentialConfiguration.
|
|
/// </summary>
|
|
public static readonly NodeId StandardConfigurationFolderNodeId = new(18155u);
|
|
|
|
private readonly IKeyCredentialStore m_store;
|
|
private readonly KeyCredentialPushOptions m_options;
|
|
private Func<BaseInstanceState, CancellationToken, ValueTask>? m_addNodeAsync;
|
|
private Func<BaseInstanceState, CancellationToken, ValueTask>? m_removeNodeAsync;
|
|
|
|
/// <summary>
|
|
/// Creates a KeyCredential push subject.
|
|
/// </summary>
|
|
public KeyCredentialPushSubject(
|
|
IKeyCredentialStore store,
|
|
KeyCredentialPushOptions? options = null)
|
|
{
|
|
m_store = store ?? throw new ArgumentNullException(nameof(store));
|
|
m_options = options ?? new KeyCredentialPushOptions();
|
|
}
|
|
|
|
/// <summary>
|
|
/// Configures a source-generated KeyCredentialConfigurationFolderState.
|
|
/// </summary>
|
|
/// <exception cref="ArgumentNullException">
|
|
/// Thrown when <paramref name="folder"/> or <paramref name="context"/> is <c>null</c>.
|
|
/// </exception>
|
|
/// <exception cref="NotSupportedException">
|
|
/// Thrown when <c>ConfigurationFolderPath</c> is set to a path other than
|
|
/// <c>ServerConfiguration/KeyCredentialConfiguration</c>.
|
|
/// </exception>
|
|
public async ValueTask BindAsync(
|
|
KeyCredentialConfigurationFolderState folder,
|
|
ISystemContext context,
|
|
Func<BaseInstanceState, CancellationToken, ValueTask>? addNodeAsync = null,
|
|
Func<BaseInstanceState, CancellationToken, ValueTask>? removeNodeAsync = null,
|
|
CancellationToken ct = default)
|
|
{
|
|
if (folder == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(folder));
|
|
}
|
|
if (context == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(context));
|
|
}
|
|
|
|
if (!string.IsNullOrEmpty(m_options.ConfigurationFolderPath) &&
|
|
!string.Equals(
|
|
m_options.ConfigurationFolderPath,
|
|
"ServerConfiguration/KeyCredentialConfiguration",
|
|
StringComparison.Ordinal))
|
|
{
|
|
throw new NotSupportedException(
|
|
"Only the standard ServerConfiguration/KeyCredentialConfiguration folder is currently supported.");
|
|
}
|
|
|
|
m_addNodeAsync = addNodeAsync;
|
|
m_removeNodeAsync = removeNodeAsync;
|
|
|
|
folder.CreateCredential ??= folder.AddCreateCredential(context);
|
|
folder.CreateCredential.OnCall = null;
|
|
folder.CreateCredential.OnCallAsync = OnCreateCredentialAsync;
|
|
|
|
IList<BaseInstanceState> children = [];
|
|
folder.GetChildren(context, children);
|
|
foreach (BaseInstanceState child in children)
|
|
{
|
|
if (child is KeyCredentialConfigurationState credentialState)
|
|
{
|
|
WireCredentialState(credentialState, context);
|
|
}
|
|
}
|
|
|
|
IReadOnlyList<string> credentialIds = await m_store.ListAsync(ct).ConfigureAwait(false);
|
|
foreach (string credentialId in credentialIds)
|
|
{
|
|
if (FindCredentialState(folder, context, credentialId) == null)
|
|
{
|
|
KeyCredentialConfigurationState state = CreateCredentialState(
|
|
folder,
|
|
context,
|
|
credentialId,
|
|
credentialId,
|
|
KeyCredentialBridgeOptions.DefaultProfileUri,
|
|
[]);
|
|
state.CredentialId!.Value = credentialId;
|
|
await AddNodeAsync(state, ct).ConfigureAwait(false);
|
|
}
|
|
}
|
|
|
|
folder.ClearChangeMasks(context, includeChildren: true);
|
|
}
|
|
|
|
private async ValueTask<CreateCredentialMethodStateResult> OnCreateCredentialAsync(
|
|
ISystemContext context,
|
|
MethodState method,
|
|
NodeId objectId,
|
|
string name,
|
|
string resourceUri,
|
|
string profileUri,
|
|
ArrayOf<string> endpointUrls,
|
|
CancellationToken ct = default)
|
|
{
|
|
ServiceResult authorization = RoleAuthorizationGate.CheckAdmin(context);
|
|
if (ServiceResult.IsBad(authorization))
|
|
{
|
|
return new CreateCredentialMethodStateResult { ServiceResult = authorization };
|
|
}
|
|
|
|
if (method.Parent is not KeyCredentialConfigurationFolderState folder)
|
|
{
|
|
return new CreateCredentialMethodStateResult
|
|
{
|
|
ServiceResult = new ServiceResult(StatusCodes.BadInvalidState)
|
|
};
|
|
}
|
|
|
|
string browseName = string.IsNullOrWhiteSpace(name) ? resourceUri : name;
|
|
if (string.IsNullOrWhiteSpace(browseName))
|
|
{
|
|
return new CreateCredentialMethodStateResult
|
|
{
|
|
ServiceResult = new ServiceResult(StatusCodes.BadInvalidArgument)
|
|
};
|
|
}
|
|
|
|
KeyCredentialConfigurationState state = CreateCredentialState(
|
|
folder,
|
|
context,
|
|
browseName,
|
|
resourceUri,
|
|
profileUri,
|
|
endpointUrls.ToArray() ?? []);
|
|
await AddNodeAsync(state, ct).ConfigureAwait(false);
|
|
return new CreateCredentialMethodStateResult
|
|
{
|
|
ServiceResult = ServiceResult.Good,
|
|
CredentialNodeId = state.NodeId
|
|
};
|
|
}
|
|
|
|
private async ValueTask<KeyCredentialUpdateMethodStateResult> OnUpdateCredentialAsync(
|
|
ISystemContext context,
|
|
MethodState method,
|
|
NodeId objectId,
|
|
string credentialId,
|
|
ByteString credentialSecret,
|
|
string certificateThumbprint,
|
|
string securityPolicyUri,
|
|
CancellationToken ct = default)
|
|
{
|
|
ServiceResult authorization = RoleAuthorizationGate.CheckAdmin(context);
|
|
if (ServiceResult.IsBad(authorization))
|
|
{
|
|
return new KeyCredentialUpdateMethodStateResult { ServiceResult = authorization };
|
|
}
|
|
|
|
if (string.IsNullOrWhiteSpace(credentialId) || credentialSecret.IsNull)
|
|
{
|
|
return new KeyCredentialUpdateMethodStateResult
|
|
{
|
|
ServiceResult = new ServiceResult(StatusCodes.BadInvalidArgument)
|
|
};
|
|
}
|
|
|
|
var subject = new Dictionary<string, object?>(StringComparer.Ordinal)
|
|
{
|
|
["sub"] = credentialId
|
|
};
|
|
if (!string.IsNullOrWhiteSpace(certificateThumbprint))
|
|
{
|
|
subject["x509.thumbprint"] = certificateThumbprint;
|
|
}
|
|
if (!string.IsNullOrWhiteSpace(securityPolicyUri))
|
|
{
|
|
subject["ua.securityPolicyUri"] = securityPolicyUri;
|
|
}
|
|
|
|
var credential = new KeyCredential(
|
|
credentialSecret.ToArray(),
|
|
DateTime.MaxValue,
|
|
subject,
|
|
[]);
|
|
|
|
await m_store.UpdateAsync(credentialId, credential, ct).ConfigureAwait(false);
|
|
|
|
if (method.Parent is KeyCredentialConfigurationState state)
|
|
{
|
|
state.CredentialId ??= state.CreateOrReplaceCredentialId(context, state.CredentialId!);
|
|
state.CredentialId.Value = credentialId;
|
|
state.ServiceStatus ??= state.CreateOrReplaceServiceStatus(context, state.ServiceStatus!);
|
|
state.ServiceStatus.Value = StatusCodes.Good;
|
|
state.ClearChangeMasks(context, includeChildren: true);
|
|
}
|
|
|
|
return new KeyCredentialUpdateMethodStateResult { ServiceResult = ServiceResult.Good };
|
|
}
|
|
|
|
private async ValueTask<ServiceResult> OnDeleteCredentialAsync(
|
|
ISystemContext context,
|
|
MethodState method,
|
|
NodeId objectId,
|
|
ArrayOf<Variant> inputArguments,
|
|
List<Variant> outputArguments,
|
|
CancellationToken ct = default)
|
|
{
|
|
ServiceResult authorization = RoleAuthorizationGate.CheckAdmin(context);
|
|
if (ServiceResult.IsBad(authorization))
|
|
{
|
|
return authorization;
|
|
}
|
|
|
|
if (method.Parent is not KeyCredentialConfigurationState state)
|
|
{
|
|
return new ServiceResult(StatusCodes.BadInvalidState);
|
|
}
|
|
|
|
string credentialId = state.CredentialId?.Value ?? state.BrowseName.Name ?? string.Empty;
|
|
if (string.IsNullOrWhiteSpace(credentialId))
|
|
{
|
|
return new ServiceResult(StatusCodes.BadInvalidArgument);
|
|
}
|
|
|
|
await m_store.DeleteAsync(credentialId, ct).ConfigureAwait(false);
|
|
state.Parent?.RemoveChild(state);
|
|
await RemoveNodeAsync(state, ct).ConfigureAwait(false);
|
|
return ServiceResult.Good;
|
|
}
|
|
|
|
private KeyCredentialConfigurationState CreateCredentialState(
|
|
KeyCredentialConfigurationFolderState folder,
|
|
ISystemContext context,
|
|
string name,
|
|
string resourceUri,
|
|
string profileUri,
|
|
IEnumerable<string> endpointUrls)
|
|
{
|
|
ushort namespaceIndex = GetNamespaceIndex(context);
|
|
QualifiedName browseName = new(name, namespaceIndex);
|
|
KeyCredentialConfigurationState state = folder.AddServiceName_Placeholder(context, browseName);
|
|
state.NodeId = CreateCredentialNodeId(name, namespaceIndex);
|
|
state.SymbolicName = name;
|
|
state.ReferenceTypeId = ReferenceTypeIds.HasComponent;
|
|
state.TypeDefinitionId = ObjectTypeIds.KeyCredentialConfigurationType;
|
|
state.DisplayName = LocalizedText.From(name);
|
|
state.ResourceUri ??= state.CreateOrReplaceResourceUri(context, state.ResourceUri!);
|
|
state.ResourceUri.Value = resourceUri ?? string.Empty;
|
|
state.ProfileUri ??= state.CreateOrReplaceProfileUri(context, state.ProfileUri!);
|
|
state.ProfileUri.Value = string.IsNullOrWhiteSpace(profileUri)
|
|
? KeyCredentialBridgeOptions.DefaultProfileUri
|
|
: profileUri;
|
|
state.EndpointUrls ??= state.CreateOrReplaceEndpointUrls(context, state.EndpointUrls!);
|
|
state.EndpointUrls.Value = [.. endpointUrls];
|
|
state.CredentialId ??= state.CreateOrReplaceCredentialId(context, state.CredentialId!);
|
|
state.ServiceStatus ??= state.CreateOrReplaceServiceStatus(context, state.ServiceStatus!);
|
|
state.ServiceStatus.Value = StatusCodes.Good;
|
|
WireCredentialState(state, context);
|
|
return state;
|
|
}
|
|
|
|
private void WireCredentialState(KeyCredentialConfigurationState state, ISystemContext context)
|
|
{
|
|
state.UpdateCredential ??= state.AddUpdateCredential(context);
|
|
state.UpdateCredential.OnCall = null;
|
|
state.UpdateCredential.OnCallAsync = OnUpdateCredentialAsync;
|
|
|
|
state.DeleteCredential ??= state.AddDeleteCredential(context);
|
|
state.DeleteCredential.OnCallMethod2 = null;
|
|
state.DeleteCredential.OnCallMethod2Async = OnDeleteCredentialAsync;
|
|
}
|
|
|
|
private async ValueTask AddNodeAsync(BaseInstanceState state, CancellationToken ct)
|
|
{
|
|
if (m_addNodeAsync != null)
|
|
{
|
|
await m_addNodeAsync(state, ct).ConfigureAwait(false);
|
|
}
|
|
}
|
|
|
|
private async ValueTask RemoveNodeAsync(BaseInstanceState state, CancellationToken ct)
|
|
{
|
|
if (m_removeNodeAsync != null)
|
|
{
|
|
await m_removeNodeAsync(state, ct).ConfigureAwait(false);
|
|
}
|
|
}
|
|
|
|
private static KeyCredentialConfigurationState? FindCredentialState(
|
|
KeyCredentialConfigurationFolderState folder,
|
|
ISystemContext context,
|
|
string credentialId)
|
|
{
|
|
IList<BaseInstanceState> children = [];
|
|
folder.GetChildren(context, children);
|
|
foreach (BaseInstanceState child in children)
|
|
{
|
|
if (child is KeyCredentialConfigurationState state &&
|
|
(string.Equals(state.CredentialId?.Value, credentialId, StringComparison.Ordinal) ||
|
|
string.Equals(state.BrowseName.Name, credentialId, StringComparison.Ordinal)))
|
|
{
|
|
return state;
|
|
}
|
|
}
|
|
return null;
|
|
}
|
|
|
|
private static ushort GetNamespaceIndex(ISystemContext context)
|
|
{
|
|
NamespaceTable? namespaces = context.NamespaceUris;
|
|
if (namespaces == null)
|
|
{
|
|
return 1;
|
|
}
|
|
|
|
int index = namespaces.GetIndex(NamespaceUri);
|
|
if (index < 0)
|
|
{
|
|
index = namespaces.Append(NamespaceUri);
|
|
}
|
|
return (ushort)index;
|
|
}
|
|
|
|
private static NodeId CreateCredentialNodeId(string name, ushort namespaceIndex)
|
|
{
|
|
return new NodeId("KeyCredentialConfiguration/" + name, namespaceIndex);
|
|
}
|
|
}
|
|
}
|