mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-27 21:55:54 +08:00
# 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>
282 lines
11 KiB
C#
282 lines
11 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.Threading;
|
|
using System.Threading.Tasks;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.Identity;
|
|
using Opc.Ua.Security.Certificates;
|
|
using Opc.Ua.Tests;
|
|
|
|
namespace Opc.Ua.Client.Tests.Identity
|
|
{
|
|
[TestFixture]
|
|
[Category("Identity")]
|
|
public sealed class DefaultClientIdentityProviderTests
|
|
{
|
|
[Test]
|
|
public async Task AnonymousProviderReturnsAnonymousIdentity()
|
|
{
|
|
var provider = new AnonymousIdentityProvider();
|
|
UserTokenPolicy policy = CreatePolicy(UserTokenType.Anonymous);
|
|
|
|
IUserIdentity identity = await provider.GetIdentityAsync(policy, CreateContext(policy)).ConfigureAwait(false);
|
|
|
|
Assert.That(identity.TokenType, Is.EqualTo(UserTokenType.Anonymous));
|
|
Assert.That(identity.PolicyId, Is.EqualTo(policy.PolicyId));
|
|
Assert.That(provider.ExpiresAt, Is.EqualTo(DateTime.MaxValue));
|
|
}
|
|
|
|
[Test]
|
|
public async Task UserNameProviderResolvesAndDisposesPasswordSecret()
|
|
{
|
|
var registry = new FakeSecretRegistry("password"u8.ToArray());
|
|
var id = new SecretIdentifier("password", "fake");
|
|
var provider = new UserNamePasswordIdentityProvider("user1", registry, id);
|
|
UserTokenPolicy policy = CreatePolicy(UserTokenType.UserName);
|
|
|
|
IUserIdentity identity = await provider.GetIdentityAsync(policy, CreateContext(policy)).ConfigureAwait(false);
|
|
|
|
Assert.That(identity.TokenType, Is.EqualTo(UserTokenType.UserName));
|
|
Assert.That(identity.DisplayName, Is.EqualTo("user1"));
|
|
Assert.That(identity.PolicyId, Is.EqualTo(policy.PolicyId));
|
|
Assert.That(registry.LastSecret.Disposed, Is.True);
|
|
var handler = (UserNameIdentityTokenHandler)identity.TokenHandler;
|
|
Assert.That(handler.DecryptedPassword, Is.EqualTo("password"u8.ToArray()));
|
|
}
|
|
|
|
[Test]
|
|
public async Task X509ProviderCreatesCertificateIdentity()
|
|
{
|
|
using Certificate certificate = CertificateBuilder.Create("CN=User")
|
|
.SetNotBefore(DateTime.UtcNow.AddMinutes(-5))
|
|
.SetLifeTime(TimeSpan.FromDays(1))
|
|
.CreateForRSA();
|
|
var certificateId = new CertificateIdentifier
|
|
{
|
|
Thumbprint = certificate.Thumbprint,
|
|
SubjectName = certificate.Subject
|
|
};
|
|
var provider = new X509ClientIdentityProvider(
|
|
certificateId,
|
|
new FakeCertificatePasswordProvider(),
|
|
new InMemoryCertificateProvider(certificate));
|
|
UserTokenPolicy policy = CreatePolicy(UserTokenType.Certificate);
|
|
|
|
IUserIdentity identity = await provider.GetIdentityAsync(policy, CreateContext(policy)).ConfigureAwait(false);
|
|
|
|
Assert.That(identity.TokenType, Is.EqualTo(UserTokenType.Certificate));
|
|
Assert.That(identity.PolicyId, Is.EqualTo(policy.PolicyId));
|
|
Assert.That(provider.ExpiresAt, Is.EqualTo(DateTime.MaxValue));
|
|
}
|
|
|
|
[Test]
|
|
public async Task IssuedTokenProviderCopiesTokenAndUpdatesExpiry()
|
|
{
|
|
byte[] tokenBytes = "jwt-token"u8.ToArray();
|
|
DateTime expiresAt = DateTime.UtcNow.AddMinutes(10);
|
|
var accessTokens = new FakeAccessTokenProvider(tokenBytes, expiresAt);
|
|
var provider = new IssuedTokenIdentityProvider(accessTokens);
|
|
UserTokenPolicy policy = CreatePolicy(UserTokenType.IssuedToken);
|
|
policy.IssuedTokenType = Profiles.JwtUserToken;
|
|
policy.IssuerEndpointUrl = /*lang=json,strict*/ "{\"authorityUri\":\"https://issuer.example\"}";
|
|
|
|
IUserIdentity identity = await provider.GetIdentityAsync(policy, CreateContext(policy)).ConfigureAwait(false);
|
|
|
|
Assert.That(identity.TokenType, Is.EqualTo(UserTokenType.IssuedToken));
|
|
Assert.That(identity.PolicyId, Is.EqualTo(policy.PolicyId));
|
|
Assert.That(provider.ExpiresAt, Is.EqualTo(expiresAt));
|
|
var handler = (IssuedIdentityTokenHandler)identity.TokenHandler;
|
|
Assert.That(handler.DecryptedTokenData, Is.EqualTo("jwt-token"u8.ToArray()));
|
|
Assert.That(tokenBytes, Is.All.EqualTo(0));
|
|
}
|
|
|
|
private static UserTokenPolicy CreatePolicy(UserTokenType tokenType)
|
|
{
|
|
return new UserTokenPolicy
|
|
{
|
|
PolicyId = tokenType.ToString(),
|
|
TokenType = tokenType,
|
|
SecurityPolicyUri = SecurityPolicies.None
|
|
};
|
|
}
|
|
|
|
private static IdentitySelectionContext CreateContext(UserTokenPolicy policy)
|
|
{
|
|
var endpoint = new EndpointDescription
|
|
{
|
|
SecurityPolicyUri = SecurityPolicies.None,
|
|
UserIdentityTokens = [policy]
|
|
};
|
|
return new IdentitySelectionContext(
|
|
endpoint,
|
|
[policy],
|
|
ServiceMessageContext.CreateEmpty(NUnitTelemetryContext.Create()));
|
|
}
|
|
|
|
private sealed class FakeSecretRegistry : ISecretRegistry
|
|
{
|
|
private readonly byte[] m_secretBytes;
|
|
|
|
public FakeSecretRegistry(byte[] secretBytes)
|
|
{
|
|
m_secretBytes = secretBytes;
|
|
LastSecret = new FakeSecret([]);
|
|
}
|
|
|
|
public FakeSecret LastSecret { get; private set; }
|
|
|
|
public void RegisterStore(ISecretStore store)
|
|
{
|
|
}
|
|
|
|
public ISecret? TryGet(SecretIdentifier id)
|
|
{
|
|
LastSecret = new FakeSecret(m_secretBytes);
|
|
return LastSecret;
|
|
}
|
|
|
|
public ValueTask<ISecret?> GetAsync(
|
|
SecretIdentifier id,
|
|
CancellationToken ct = default)
|
|
{
|
|
LastSecret = new FakeSecret(m_secretBytes);
|
|
return new ValueTask<ISecret?>(LastSecret);
|
|
}
|
|
}
|
|
|
|
private sealed class FakeSecret : ISecret
|
|
{
|
|
private readonly byte[] m_bytes;
|
|
|
|
public FakeSecret(byte[] bytes)
|
|
{
|
|
m_bytes = bytes;
|
|
}
|
|
|
|
public bool Disposed { get; private set; }
|
|
|
|
public ReadOnlySpan<byte> Bytes => m_bytes;
|
|
|
|
public void Dispose()
|
|
{
|
|
Disposed = true;
|
|
}
|
|
}
|
|
|
|
private sealed class FakeCertificatePasswordProvider : ICertificatePasswordProvider
|
|
{
|
|
public char[] GetPassword(CertificateIdentifier certificateIdentifier)
|
|
{
|
|
return [];
|
|
}
|
|
}
|
|
|
|
private sealed class InMemoryCertificateProvider : ICertificateProvider
|
|
{
|
|
private readonly Certificate m_certificate;
|
|
|
|
public InMemoryCertificateProvider(Certificate certificate)
|
|
{
|
|
m_certificate = certificate ?? throw new ArgumentNullException(nameof(certificate));
|
|
}
|
|
|
|
public Certificate? TryGetPrivateKeyCertificate(string thumbprint)
|
|
{
|
|
if (string.IsNullOrEmpty(thumbprint) ||
|
|
!StringComparer.OrdinalIgnoreCase.Equals(thumbprint, m_certificate.Thumbprint))
|
|
{
|
|
return null;
|
|
}
|
|
|
|
return m_certificate.AddRef();
|
|
}
|
|
|
|
public ValueTask<Certificate?> GetPrivateKeyCertificateAsync(
|
|
CertificateIdentifier identifier,
|
|
ICertificatePasswordProvider? passwordProvider = null,
|
|
string? applicationUri = null,
|
|
CancellationToken ct = default)
|
|
{
|
|
if (identifier == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(identifier));
|
|
}
|
|
|
|
return Matches(identifier)
|
|
? new ValueTask<Certificate?>(m_certificate.AddRef())
|
|
: new ValueTask<Certificate?>((Certificate?)null);
|
|
}
|
|
|
|
private bool Matches(CertificateIdentifier identifier)
|
|
{
|
|
if (!string.IsNullOrEmpty(identifier.Thumbprint))
|
|
{
|
|
return StringComparer.OrdinalIgnoreCase.Equals(
|
|
identifier.Thumbprint,
|
|
m_certificate.Thumbprint);
|
|
}
|
|
|
|
return string.Equals(
|
|
identifier.SubjectName,
|
|
m_certificate.Subject,
|
|
StringComparison.Ordinal);
|
|
}
|
|
}
|
|
|
|
private sealed class FakeAccessTokenProvider : IAccessTokenProvider
|
|
{
|
|
private readonly byte[] m_tokenBytes;
|
|
private readonly DateTime m_expiresAt;
|
|
|
|
public FakeAccessTokenProvider(byte[] tokenBytes, DateTime expiresAt)
|
|
{
|
|
m_tokenBytes = tokenBytes;
|
|
m_expiresAt = expiresAt;
|
|
}
|
|
|
|
public string AuthorityUri => "https://issuer.example";
|
|
|
|
public ValueTask<AccessToken> AcquireAsync(
|
|
AuthorizationServerMetadata metadata,
|
|
CancellationToken ct = default)
|
|
{
|
|
#pragma warning disable CA2000 // ownership of the AccessToken transfers to the caller via the returned ValueTask
|
|
return new ValueTask<AccessToken>(new AccessToken(
|
|
Profiles.JwtUserToken,
|
|
m_tokenBytes,
|
|
m_expiresAt,
|
|
"jwt"));
|
|
#pragma warning restore CA2000
|
|
}
|
|
}
|
|
}
|
|
}
|