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>
448 lines
16 KiB
C#
448 lines
16 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.Text;
|
|
using System.Text.Json;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
using Opc.Ua.Identity;
|
|
|
|
namespace Opc.Ua.Server
|
|
{
|
|
/// <summary>
|
|
/// Validates JWT issued identity tokens without a JWT library dependency.
|
|
/// </summary>
|
|
public sealed class JwtAuthenticator : IUserTokenAuthenticator
|
|
{
|
|
private readonly IIssuerKeyResolver? m_keyResolver;
|
|
private readonly string? m_expectedAudience;
|
|
private readonly TimeSpan m_clockSkewTolerance;
|
|
private readonly Func<IssuedIdentityTokenHandler, CancellationToken, ValueTask<IUserIdentity?>>? m_verify;
|
|
|
|
/// <summary>
|
|
/// Creates a JWT authenticator.
|
|
/// </summary>
|
|
public JwtAuthenticator(
|
|
IIssuerKeyResolver keyResolver,
|
|
string expectedAudience,
|
|
TimeSpan? clockSkewTolerance = null)
|
|
{
|
|
m_keyResolver = keyResolver ?? throw new ArgumentNullException(nameof(keyResolver));
|
|
if (string.IsNullOrEmpty(expectedAudience))
|
|
{
|
|
throw new ArgumentException(
|
|
"Expected audience must be supplied.",
|
|
nameof(expectedAudience));
|
|
}
|
|
m_expectedAudience = expectedAudience;
|
|
m_clockSkewTolerance = clockSkewTolerance ?? TimeSpan.FromSeconds(60);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Creates a delegate-backed JWT authenticator.
|
|
/// </summary>
|
|
public JwtAuthenticator(
|
|
Func<IssuedIdentityTokenHandler, CancellationToken, ValueTask<IUserIdentity?>> verify)
|
|
{
|
|
m_verify = verify ?? throw new ArgumentNullException(nameof(verify));
|
|
m_clockSkewTolerance = TimeSpan.FromSeconds(60);
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
public UserTokenType TokenType => UserTokenType.IssuedToken;
|
|
|
|
/// <inheritdoc/>
|
|
public string? IssuedTokenProfileUri => Profiles.JwtUserToken;
|
|
|
|
/// <inheritdoc/>
|
|
public async ValueTask<AuthenticationResult> AuthenticateAsync(
|
|
AuthenticationContext context,
|
|
CancellationToken ct = default)
|
|
{
|
|
if (context.TokenHandler is not IssuedIdentityTokenHandler issuedTokenHandler ||
|
|
issuedTokenHandler.IssuedTokenType != IssuedTokenType.JWT)
|
|
{
|
|
return AuthenticationResult.NotHandled;
|
|
}
|
|
|
|
if (m_verify != null)
|
|
{
|
|
return await AuthenticateWithVerifierAsync(issuedTokenHandler, ct).ConfigureAwait(false);
|
|
}
|
|
|
|
byte[]? tokenBytes = issuedTokenHandler.DecryptedTokenData;
|
|
if (tokenBytes == null || tokenBytes.Length == 0)
|
|
{
|
|
return Reject(StatusCodes.BadIdentityTokenInvalid, "JWT token data is empty.");
|
|
}
|
|
|
|
string jwt = Encoding.UTF8.GetString(tokenBytes, 0, tokenBytes.Length);
|
|
string[] segments = jwt.Split('.');
|
|
if (segments.Length != 3 ||
|
|
string.IsNullOrEmpty(segments[0]) ||
|
|
string.IsNullOrEmpty(segments[1]) ||
|
|
string.IsNullOrEmpty(segments[2]))
|
|
{
|
|
return Reject(StatusCodes.BadIdentityTokenInvalid, "JWT must contain header, payload and signature.");
|
|
}
|
|
|
|
byte[] headerBytes;
|
|
byte[] payloadBytes;
|
|
byte[] signatureBytes;
|
|
try
|
|
{
|
|
headerBytes = Base64UrlDecode(segments[0]);
|
|
payloadBytes = Base64UrlDecode(segments[1]);
|
|
signatureBytes = Base64UrlDecode(segments[2]);
|
|
}
|
|
catch (FormatException)
|
|
{
|
|
return Reject(StatusCodes.BadIdentityTokenInvalid, "JWT contains invalid base64url data.");
|
|
}
|
|
|
|
string? keyId;
|
|
string? algorithm;
|
|
try
|
|
{
|
|
using var headerDocument = JsonDocument.Parse(headerBytes);
|
|
JsonElement header = headerDocument.RootElement;
|
|
keyId = GetOptionalString(header, "kid");
|
|
algorithm = GetOptionalString(header, "alg");
|
|
}
|
|
catch (JsonException)
|
|
{
|
|
return Reject(StatusCodes.BadIdentityTokenInvalid, "JWT header is not valid JSON.");
|
|
}
|
|
|
|
if (string.IsNullOrEmpty(algorithm))
|
|
{
|
|
return Reject(StatusCodes.BadIdentityTokenInvalid, "JWT header does not specify an algorithm.");
|
|
}
|
|
|
|
byte[] signingInputBytes = Encoding.ASCII.GetBytes(segments[0] + "." + segments[1]);
|
|
IReadOnlyList<IssuerVerificationKey> keys = await m_keyResolver!
|
|
.GetKeysAsync(keyId, ct)
|
|
.ConfigureAwait(false);
|
|
|
|
bool signatureValid = false;
|
|
foreach (IssuerVerificationKey key in keys)
|
|
{
|
|
if (!string.Equals(key.Algorithm, algorithm, StringComparison.Ordinal))
|
|
{
|
|
continue;
|
|
}
|
|
if (key.KeyId != null &&
|
|
keyId != null &&
|
|
!string.Equals(key.KeyId, keyId, StringComparison.Ordinal))
|
|
{
|
|
continue;
|
|
}
|
|
|
|
try
|
|
{
|
|
if (key.VerifySignature(signingInputBytes, signatureBytes))
|
|
{
|
|
signatureValid = true;
|
|
break;
|
|
}
|
|
}
|
|
catch (NotSupportedException)
|
|
{
|
|
return Reject(StatusCodes.BadIdentityTokenRejected, "JWT signing algorithm is not supported.");
|
|
}
|
|
}
|
|
|
|
if (!signatureValid)
|
|
{
|
|
return Reject(StatusCodes.BadIdentityTokenRejected, "JWT signature validation failed.");
|
|
}
|
|
|
|
try
|
|
{
|
|
using var payloadDocument = JsonDocument.Parse(payloadBytes);
|
|
JsonElement payload = payloadDocument.RootElement;
|
|
ServiceResult? validationError = ValidatePayload(payload);
|
|
if (ServiceResult.IsBad(validationError))
|
|
{
|
|
return AuthenticationResult.Reject(validationError!);
|
|
}
|
|
|
|
IReadOnlyDictionary<string, object?> claims = ExtractClaims(payload);
|
|
IReadOnlyList<string> groups = ExtractStringList(claims, "groups");
|
|
IReadOnlyList<string> roles = ExtractStringList(claims, "roles");
|
|
string? issuer = GetOptionalString(payload, "iss");
|
|
string? subject = GetOptionalString(payload, "sub");
|
|
|
|
return AuthenticationResult.Accept(
|
|
new JwtUserIdentity(
|
|
issuedTokenHandler,
|
|
claims,
|
|
groups,
|
|
roles,
|
|
issuer,
|
|
subject));
|
|
}
|
|
catch (JsonException)
|
|
{
|
|
return Reject(StatusCodes.BadIdentityTokenInvalid, "JWT payload is not valid JSON.");
|
|
}
|
|
}
|
|
|
|
private async ValueTask<AuthenticationResult> AuthenticateWithVerifierAsync(
|
|
IssuedIdentityTokenHandler issuedTokenHandler,
|
|
CancellationToken ct)
|
|
{
|
|
ct.ThrowIfCancellationRequested();
|
|
try
|
|
{
|
|
IUserIdentity? identity = await m_verify!(issuedTokenHandler, ct).ConfigureAwait(false);
|
|
return identity == null
|
|
? Reject(
|
|
StatusCodes.BadIdentityTokenRejected,
|
|
"No token validator is configured.")
|
|
: AuthenticationResult.Accept(identity);
|
|
}
|
|
catch (ServiceResultException ex)
|
|
{
|
|
return AuthenticationResult.Reject(ex.Result);
|
|
}
|
|
}
|
|
|
|
private ServiceResult? ValidatePayload(JsonElement payload)
|
|
{
|
|
string? issuer = GetOptionalString(payload, "iss");
|
|
if (!string.Equals(issuer, m_keyResolver!.IssuerUri, StringComparison.Ordinal))
|
|
{
|
|
return CreateError(StatusCodes.BadIdentityTokenRejected, "JWT issuer is not trusted.");
|
|
}
|
|
|
|
if (!AudienceContainsExpected(payload))
|
|
{
|
|
return CreateError(StatusCodes.BadIdentityTokenRejected, "JWT audience does not match this server.");
|
|
}
|
|
|
|
if (!TryGetInt64(payload, "exp", out long expiresAt))
|
|
{
|
|
return CreateError(StatusCodes.BadIdentityTokenInvalid, "JWT expiration is missing or invalid.");
|
|
}
|
|
|
|
long now = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
|
|
long skewSeconds = (long)m_clockSkewTolerance.TotalSeconds;
|
|
if (now > expiresAt + skewSeconds)
|
|
{
|
|
return CreateError(StatusCodes.BadIdentityTokenRejected, "JWT has expired.");
|
|
}
|
|
|
|
if (TryGetInt64(payload, "nbf", out long notBefore) && now + skewSeconds < notBefore)
|
|
{
|
|
return CreateError(StatusCodes.BadIdentityTokenRejected, "JWT is not valid yet.");
|
|
}
|
|
|
|
if (TryGetInt64(payload, "iat", out long issuedAt) && now + skewSeconds < issuedAt)
|
|
{
|
|
return CreateError(StatusCodes.BadIdentityTokenRejected, "JWT was issued in the future.");
|
|
}
|
|
|
|
return null;
|
|
}
|
|
|
|
private bool AudienceContainsExpected(JsonElement payload)
|
|
{
|
|
if (!payload.TryGetProperty("aud", out JsonElement audience))
|
|
{
|
|
return false;
|
|
}
|
|
|
|
if (audience.ValueKind == JsonValueKind.String)
|
|
{
|
|
return string.Equals(audience.GetString(), m_expectedAudience, StringComparison.Ordinal);
|
|
}
|
|
|
|
if (audience.ValueKind != JsonValueKind.Array)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
foreach (JsonElement value in audience.EnumerateArray())
|
|
{
|
|
if (value.ValueKind == JsonValueKind.String &&
|
|
string.Equals(value.GetString(), m_expectedAudience, StringComparison.Ordinal))
|
|
{
|
|
return true;
|
|
}
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
private static Dictionary<string, object?> ExtractClaims(JsonElement payload)
|
|
{
|
|
var claims = new Dictionary<string, object?>(StringComparer.Ordinal);
|
|
foreach (JsonProperty property in payload.EnumerateObject())
|
|
{
|
|
AddClaim(claims, property.Name, property.Value);
|
|
}
|
|
return claims;
|
|
}
|
|
|
|
private static void AddClaim(
|
|
IDictionary<string, object?> claims,
|
|
string name,
|
|
JsonElement value)
|
|
{
|
|
switch (value.ValueKind)
|
|
{
|
|
case JsonValueKind.Object:
|
|
foreach (JsonProperty property in value.EnumerateObject())
|
|
{
|
|
AddClaim(claims, name + "." + property.Name, property.Value);
|
|
}
|
|
break;
|
|
case JsonValueKind.Array:
|
|
var values = new List<string>();
|
|
foreach (JsonElement element in value.EnumerateArray())
|
|
{
|
|
values.Add(GetClaimArrayValue(element));
|
|
}
|
|
claims[name] = values.AsReadOnly();
|
|
break;
|
|
case JsonValueKind.String:
|
|
claims[name] = value.GetString();
|
|
break;
|
|
case JsonValueKind.Number:
|
|
if (value.TryGetInt64(out long longValue))
|
|
{
|
|
claims[name] = longValue;
|
|
}
|
|
else
|
|
{
|
|
claims[name] = value.GetDouble();
|
|
}
|
|
break;
|
|
case JsonValueKind.True:
|
|
claims[name] = true;
|
|
break;
|
|
case JsonValueKind.False:
|
|
claims[name] = false;
|
|
break;
|
|
case JsonValueKind.Null:
|
|
case JsonValueKind.Undefined:
|
|
claims[name] = null;
|
|
break;
|
|
}
|
|
}
|
|
|
|
private static string GetClaimArrayValue(JsonElement element)
|
|
{
|
|
return element.ValueKind switch
|
|
{
|
|
JsonValueKind.String => element.GetString() ?? string.Empty,
|
|
JsonValueKind.Number => element.TryGetInt64(out long longValue)
|
|
? longValue.ToString(CultureInfo.InvariantCulture)
|
|
: element.GetDouble().ToString(CultureInfo.InvariantCulture),
|
|
JsonValueKind.True => bool.TrueString,
|
|
JsonValueKind.False => bool.FalseString,
|
|
JsonValueKind.Null or JsonValueKind.Undefined => string.Empty,
|
|
_ => element.GetRawText()
|
|
};
|
|
}
|
|
|
|
private static IReadOnlyList<string> ExtractStringList(
|
|
IReadOnlyDictionary<string, object?> claims,
|
|
string name)
|
|
{
|
|
if (!claims.TryGetValue(name, out object? value) || value == null)
|
|
{
|
|
return [];
|
|
}
|
|
|
|
if (value is IReadOnlyList<string> list)
|
|
{
|
|
return list;
|
|
}
|
|
|
|
if (value is string singleValue && singleValue.Length > 0)
|
|
{
|
|
return [singleValue];
|
|
}
|
|
|
|
return [];
|
|
}
|
|
|
|
private static bool TryGetInt64(JsonElement payload, string propertyName, out long value)
|
|
{
|
|
value = 0;
|
|
return payload.TryGetProperty(propertyName, out JsonElement property) &&
|
|
property.ValueKind == JsonValueKind.Number &&
|
|
property.TryGetInt64(out value);
|
|
}
|
|
|
|
private static string? GetOptionalString(JsonElement element, string propertyName)
|
|
{
|
|
if (!element.TryGetProperty(propertyName, out JsonElement property) ||
|
|
property.ValueKind != JsonValueKind.String)
|
|
{
|
|
return null;
|
|
}
|
|
|
|
return property.GetString();
|
|
}
|
|
|
|
private static byte[] Base64UrlDecode(string value)
|
|
{
|
|
string padded = value.Replace('-', '+').Replace('_', '/');
|
|
switch (padded.Length % 4)
|
|
{
|
|
case 2:
|
|
padded += "==";
|
|
break;
|
|
case 3:
|
|
padded += "=";
|
|
break;
|
|
}
|
|
|
|
return Convert.FromBase64String(padded);
|
|
}
|
|
|
|
private static AuthenticationResult Reject(StatusCode statusCode, string message)
|
|
{
|
|
return AuthenticationResult.Reject(CreateError(statusCode, message));
|
|
}
|
|
|
|
private static ServiceResult CreateError(StatusCode statusCode, string message)
|
|
{
|
|
return new ServiceResult(statusCode, new LocalizedText(message));
|
|
}
|
|
}
|
|
}
|