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>
457 lines
17 KiB
C#
457 lines
17 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.Globalization;
|
|
using System.Security.Cryptography;
|
|
using System.Text;
|
|
using System.Text.Json;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
using System.Xml;
|
|
#if NET8_0_OR_GREATER
|
|
using System.Diagnostics.CodeAnalysis;
|
|
#endif
|
|
using Opc.Ua.Identity;
|
|
|
|
namespace Opc.Ua.Server
|
|
{
|
|
/// <summary>
|
|
/// Experimental vendor authenticator that accepts a KeyCredential proof as an issued user token.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// EXPERIMENTAL — see Docs/KeyCredentialService.md. This authenticator handles the vendor profile URI
|
|
/// <c>urn:opcfoundation:netstandard:profile:authentication:keycredential</c>. It is not an OPC UA
|
|
/// Part 6 §6.5.3 conformance claim and should be enabled only in closed deployments.
|
|
/// </remarks>
|
|
#if NET8_0_OR_GREATER
|
|
[Experimental(
|
|
"OPCUA_EXPERIMENTAL_KC_BRIDGE",
|
|
UrlFormat = "https://github.com/OPCFoundation/UA-.NETStandard/blob/master/Docs/KeyCredentialService.md")]
|
|
#endif
|
|
public sealed class KeyCredentialBridgeAuthenticator : IUserTokenAuthenticator
|
|
{
|
|
/// <summary>
|
|
/// Vendor profile URI handled by the default authenticator configuration.
|
|
/// </summary>
|
|
public const string VendorKeyCredentialProfileUri = KeyCredentialBridgeOptions.DefaultProfileUri;
|
|
|
|
private readonly IKeyCredentialStore m_store;
|
|
private readonly KeyCredentialBridgeOptions m_options;
|
|
|
|
/// <summary>
|
|
/// Creates the bridge authenticator.
|
|
/// </summary>
|
|
public KeyCredentialBridgeAuthenticator(
|
|
IKeyCredentialStore store,
|
|
KeyCredentialBridgeOptions? options = null)
|
|
{
|
|
m_store = store ?? throw new ArgumentNullException(nameof(store));
|
|
m_options = options ?? new KeyCredentialBridgeOptions();
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
public UserTokenType TokenType => UserTokenType.IssuedToken;
|
|
|
|
/// <inheritdoc/>
|
|
public string? IssuedTokenProfileUri => m_options.ProfileUri;
|
|
|
|
/// <inheritdoc/>
|
|
public async ValueTask<AuthenticationResult> AuthenticateAsync(
|
|
AuthenticationContext context,
|
|
CancellationToken ct = default)
|
|
{
|
|
if (context.TokenHandler is not IssuedIdentityTokenHandler issuedTokenHandler ||
|
|
!HandlesProfile(context, issuedTokenHandler))
|
|
{
|
|
return AuthenticationResult.NotHandled;
|
|
}
|
|
|
|
byte[]? tokenBytes = issuedTokenHandler.DecryptedTokenData;
|
|
if (tokenBytes == null || tokenBytes.Length == 0)
|
|
{
|
|
return Reject(StatusCodes.BadIdentityTokenInvalid, "KeyCredential token data is empty.");
|
|
}
|
|
|
|
BridgeToken token;
|
|
try
|
|
{
|
|
token = DecodeToken(tokenBytes);
|
|
}
|
|
catch (JsonException)
|
|
{
|
|
return Reject(StatusCodes.BadIdentityTokenInvalid, "KeyCredential token data is not valid JSON.");
|
|
}
|
|
catch (FormatException)
|
|
{
|
|
return Reject(StatusCodes.BadIdentityTokenInvalid, "KeyCredential proof is not valid base64url.");
|
|
}
|
|
|
|
if (string.IsNullOrWhiteSpace(token.CredentialId) ||
|
|
string.IsNullOrWhiteSpace(token.Nonce) ||
|
|
string.IsNullOrWhiteSpace(token.Proof))
|
|
{
|
|
return Reject(StatusCodes.BadIdentityTokenInvalid, "KeyCredential token is missing required fields.");
|
|
}
|
|
|
|
if (!IsFresh(token.IssuedAt))
|
|
{
|
|
return Reject(StatusCodes.BadIdentityTokenRejected, "KeyCredential proof nonce is expired.");
|
|
}
|
|
|
|
KeyCredential? credential = await m_store
|
|
.GetAsync(token.CredentialId, ct)
|
|
.ConfigureAwait(false);
|
|
if (credential == null)
|
|
{
|
|
return Reject(StatusCodes.BadIdentityTokenRejected, "KeyCredential is not known to this server.");
|
|
}
|
|
|
|
if (credential.Expiration <= DateTime.UtcNow)
|
|
{
|
|
return Reject(StatusCodes.BadIdentityTokenRejected, "KeyCredential has expired.");
|
|
}
|
|
|
|
byte[] suppliedProof;
|
|
try
|
|
{
|
|
suppliedProof = Base64UrlDecode(token.Proof);
|
|
}
|
|
catch (FormatException)
|
|
{
|
|
return Reject(StatusCodes.BadIdentityTokenInvalid, "KeyCredential proof is not valid base64url.");
|
|
}
|
|
|
|
byte[] expectedProof = ComputeProof(
|
|
credential.Secret,
|
|
token.CredentialId,
|
|
token.Nonce,
|
|
token.IssuedAt);
|
|
|
|
if (!FixedTimeEquals(suppliedProof, expectedProof))
|
|
{
|
|
return Reject(StatusCodes.BadIdentityTokenRejected, "KeyCredential proof validation failed.");
|
|
}
|
|
|
|
IReadOnlyDictionary<string, object?> claims = BuildClaims(token.CredentialId, credential);
|
|
return AuthenticationResult.Accept(new KeyCredentialUserIdentity(
|
|
issuedTokenHandler,
|
|
claims,
|
|
ExtractStringList(claims, "groups"),
|
|
ExtractStringList(claims, "roles"),
|
|
GetOptionalString(claims, "iss"),
|
|
GetOptionalString(claims, "sub") ?? token.CredentialId));
|
|
}
|
|
|
|
/// <summary>
|
|
/// Creates a bridge-token JSON payload for a credential secret.
|
|
/// </summary>
|
|
/// <exception cref="ArgumentNullException">Thrown when <paramref name="secret"/> is <c>null</c>.</exception>
|
|
/// <exception cref="ArgumentException">
|
|
/// Thrown when <paramref name="credentialId"/> or <paramref name="nonce"/> is <c>null</c>, empty, or whitespace.
|
|
/// </exception>
|
|
public static byte[] CreateTokenData(
|
|
string credentialId,
|
|
byte[] secret,
|
|
string nonce,
|
|
DateTime issuedAt)
|
|
{
|
|
if (string.IsNullOrWhiteSpace(credentialId))
|
|
{
|
|
throw new ArgumentException("CredentialId must be supplied.", nameof(credentialId));
|
|
}
|
|
if (secret == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(secret));
|
|
}
|
|
if (string.IsNullOrWhiteSpace(nonce))
|
|
{
|
|
throw new ArgumentException("Nonce must be supplied.", nameof(nonce));
|
|
}
|
|
|
|
long issuedAtSeconds = new DateTimeOffset(DateTime.SpecifyKind(issuedAt, DateTimeKind.Utc))
|
|
.ToUnixTimeSeconds();
|
|
string proof = Base64UrlEncode(ComputeProof(secret, credentialId, nonce, issuedAtSeconds));
|
|
string json = "{\"credentialId\":\"" +
|
|
EscapeJson(credentialId) +
|
|
"\",\"nonce\":\"" +
|
|
EscapeJson(nonce) +
|
|
"\",\"issuedAt\":" +
|
|
issuedAtSeconds.ToString(CultureInfo.InvariantCulture) +
|
|
",\"proof\":\"" +
|
|
proof +
|
|
"\"}";
|
|
return Encoding.UTF8.GetBytes(json);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Creates the base64url HMAC proof for a bridge token.
|
|
/// </summary>
|
|
/// <exception cref="ArgumentNullException">Thrown when <paramref name="secret"/> is <c>null</c>.</exception>
|
|
public static string CreateProof(
|
|
byte[] secret,
|
|
string credentialId,
|
|
string nonce,
|
|
long issuedAt)
|
|
{
|
|
if (secret == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(secret));
|
|
}
|
|
return Base64UrlEncode(ComputeProof(secret, credentialId, nonce, issuedAt));
|
|
}
|
|
|
|
private bool HandlesProfile(
|
|
AuthenticationContext context,
|
|
IssuedIdentityTokenHandler issuedTokenHandler)
|
|
{
|
|
return string.Equals(context.UserTokenPolicy.IssuedTokenType, m_options.ProfileUri, StringComparison.Ordinal) ||
|
|
string.Equals(issuedTokenHandler.IssuedTokenTypeProfileUri, m_options.ProfileUri, StringComparison.Ordinal);
|
|
}
|
|
|
|
private bool IsFresh(long issuedAt)
|
|
{
|
|
if (issuedAt <= 0)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
DateTime issuedAtUtc = DateTimeOffset.FromUnixTimeSeconds(issuedAt).UtcDateTime;
|
|
TimeSpan age = DateTime.UtcNow - issuedAtUtc;
|
|
return age >= TimeSpan.Zero && age <= m_options.NonceLifetime;
|
|
}
|
|
|
|
private static BridgeToken DecodeToken(byte[] tokenBytes)
|
|
{
|
|
using var document = JsonDocument.Parse(tokenBytes);
|
|
if (document.RootElement.ValueKind != JsonValueKind.Object)
|
|
{
|
|
throw new JsonException("KeyCredential token must be a JSON object.");
|
|
}
|
|
|
|
JsonElement root = document.RootElement;
|
|
return new BridgeToken(
|
|
GetString(root, "credentialId"),
|
|
GetString(root, "nonce"),
|
|
GetInt64(root, "issuedAt"),
|
|
GetString(root, "proof"));
|
|
}
|
|
|
|
private static Dictionary<string, object?> BuildClaims(
|
|
string credentialId,
|
|
KeyCredential credential)
|
|
{
|
|
var claims = new Dictionary<string, object?>(StringComparer.Ordinal);
|
|
foreach (KeyValuePair<string, object?> item in credential.Subject)
|
|
{
|
|
claims[item.Key] = item.Value;
|
|
}
|
|
if (!claims.ContainsKey("sub"))
|
|
{
|
|
claims["sub"] = credentialId;
|
|
}
|
|
if (credential.Scopes.Count > 0 && !claims.ContainsKey("scope"))
|
|
{
|
|
claims["scope"] = string.Join(" ", credential.Scopes);
|
|
}
|
|
return claims;
|
|
}
|
|
|
|
private static byte[] ComputeProof(
|
|
byte[] secret,
|
|
string credentialId,
|
|
string nonce,
|
|
long issuedAt)
|
|
{
|
|
string input = credentialId +
|
|
"\n" +
|
|
nonce +
|
|
"\n" +
|
|
issuedAt.ToString(CultureInfo.InvariantCulture);
|
|
using var hmac = new HMACSHA256(secret);
|
|
return hmac.ComputeHash(Encoding.UTF8.GetBytes(input));
|
|
}
|
|
|
|
private static bool FixedTimeEquals(byte[] left, byte[] right)
|
|
{
|
|
if (left.Length != right.Length)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
int difference = 0;
|
|
for (int i = 0; i < left.Length; i++)
|
|
{
|
|
difference |= left[i] ^ right[i];
|
|
}
|
|
return difference == 0;
|
|
}
|
|
|
|
private static string GetString(JsonElement root, string propertyName)
|
|
{
|
|
if (!root.TryGetProperty(propertyName, out JsonElement value) ||
|
|
value.ValueKind != JsonValueKind.String)
|
|
{
|
|
return string.Empty;
|
|
}
|
|
return value.GetString() ?? string.Empty;
|
|
}
|
|
|
|
private static long GetInt64(JsonElement root, string propertyName)
|
|
{
|
|
if (!root.TryGetProperty(propertyName, out JsonElement value))
|
|
{
|
|
return 0;
|
|
}
|
|
return value.ValueKind == JsonValueKind.Number && value.TryGetInt64(out long result)
|
|
? result
|
|
: 0;
|
|
}
|
|
|
|
private static IReadOnlyList<string> ExtractStringList(
|
|
IReadOnlyDictionary<string, object?> claims,
|
|
string claimName)
|
|
{
|
|
if (!claims.TryGetValue(claimName, out object? value) || value == null)
|
|
{
|
|
return [];
|
|
}
|
|
|
|
if (value is string single)
|
|
{
|
|
return string.IsNullOrWhiteSpace(single)
|
|
? Array.Empty<string>()
|
|
: [single];
|
|
}
|
|
|
|
if (value is IEnumerable<string> strings)
|
|
{
|
|
return new List<string>(strings).AsReadOnly();
|
|
}
|
|
|
|
return [];
|
|
}
|
|
|
|
private static string? GetOptionalString(
|
|
IReadOnlyDictionary<string, object?> claims,
|
|
string claimName)
|
|
{
|
|
return claims.TryGetValue(claimName, out object? value) ? value as string : null;
|
|
}
|
|
|
|
private static AuthenticationResult Reject(StatusCode statusCode, string message)
|
|
{
|
|
return AuthenticationResult.Reject(
|
|
new ServiceResult(statusCode, new LocalizedText(message)));
|
|
}
|
|
|
|
private static byte[] Base64UrlDecode(string value)
|
|
{
|
|
string base64 = value.Replace('-', '+').Replace('_', '/');
|
|
switch (base64.Length % 4)
|
|
{
|
|
case 2:
|
|
base64 += "==";
|
|
break;
|
|
case 3:
|
|
base64 += "=";
|
|
break;
|
|
}
|
|
return Convert.FromBase64String(base64);
|
|
}
|
|
|
|
private static string Base64UrlEncode(byte[] bytes)
|
|
{
|
|
return Convert.ToBase64String(bytes)
|
|
.TrimEnd('=')
|
|
.Replace('+', '-')
|
|
.Replace('/', '_');
|
|
}
|
|
|
|
private static string EscapeJson(string value)
|
|
{
|
|
#pragma warning disable CA1307 // StringComparison overload is not available on every supported TFM.
|
|
return value.Replace("\\", "\\\\").Replace("\"", "\\\"");
|
|
#pragma warning restore CA1307
|
|
}
|
|
|
|
private sealed record BridgeToken(
|
|
string CredentialId,
|
|
string Nonce,
|
|
long IssuedAt,
|
|
string Proof);
|
|
|
|
private sealed class KeyCredentialUserIdentity : IUserIdentity, IIdentityClaims
|
|
{
|
|
public KeyCredentialUserIdentity(
|
|
IssuedIdentityTokenHandler tokenHandler,
|
|
IReadOnlyDictionary<string, object?> claims,
|
|
IReadOnlyList<string> groups,
|
|
IReadOnlyList<string> roles,
|
|
string? issuer,
|
|
string? subject)
|
|
{
|
|
TokenHandler = tokenHandler ?? throw new ArgumentNullException(nameof(tokenHandler));
|
|
Claims = claims ?? throw new ArgumentNullException(nameof(claims));
|
|
Groups = groups ?? throw new ArgumentNullException(nameof(groups));
|
|
Roles = roles ?? throw new ArgumentNullException(nameof(roles));
|
|
Issuer = issuer;
|
|
Subject = subject;
|
|
}
|
|
|
|
public IReadOnlyDictionary<string, object?> Claims { get; }
|
|
|
|
public IReadOnlyList<string> Groups { get; }
|
|
|
|
public IReadOnlyList<string> Roles { get; }
|
|
|
|
public string? Issuer { get; }
|
|
|
|
public string? Subject { get; }
|
|
|
|
public string DisplayName => Subject ?? TokenHandler.DisplayName;
|
|
|
|
public string PolicyId => TokenHandler.Token.PolicyId ?? string.Empty;
|
|
|
|
public UserTokenType TokenType => UserTokenType.IssuedToken;
|
|
|
|
public XmlQualifiedName IssuedTokenType => new(string.Empty, TokenHandler.IssuedTokenTypeProfileUri ?? string.Empty);
|
|
|
|
public bool SupportsSignatures => false;
|
|
|
|
public ArrayOf<NodeId> GrantedRoleIds => [];
|
|
|
|
public IssuedIdentityTokenHandler TokenHandler { get; }
|
|
|
|
IUserIdentityTokenHandler IUserIdentity.TokenHandler => TokenHandler;
|
|
}
|
|
}
|
|
}
|