mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-23 10:23:13 +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>
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.Collections.Generic;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
using Microsoft.Extensions.Configuration;
|
|
using Microsoft.Extensions.Configuration.Memory;
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.Identity;
|
|
using Opc.Ua.Security.Certificates;
|
|
using Opc.Ua.Tests;
|
|
|
|
namespace Opc.Ua.Client.Tests.ClientBuilder
|
|
{
|
|
[TestFixture]
|
|
[Category("ClientBuilder")]
|
|
[Category("Identity")]
|
|
[Parallelizable]
|
|
[SetCulture("en-us")]
|
|
[SetUICulture("en-us")]
|
|
public sealed class IdentityProviderConfigurationTests
|
|
{
|
|
[Test]
|
|
public void AnonymousOnlyBuildsAnonymousProvider()
|
|
{
|
|
IConfiguration configuration = BuildConfiguration(new Dictionary<string, string>
|
|
{
|
|
["OpcUa:Client:Identity:EnableAnonymous"] = "true"
|
|
});
|
|
var services = new ServiceCollection();
|
|
services.AddOpcUa()
|
|
.AddClient(_ => { })
|
|
.AddIdentityProvider(configuration.GetSection("OpcUa:Client:Identity"));
|
|
|
|
using ServiceProvider sp = services.BuildServiceProvider();
|
|
IClientIdentityProvider provider = sp.GetRequiredService<IClientIdentityProvider>();
|
|
|
|
Assert.That(provider.SupportedTokenTypes, Is.EqualTo([UserTokenType.Anonymous]));
|
|
Assert.That(provider.CanSatisfy(CreatePolicy(UserTokenType.Anonymous), CreateContext()), Is.True);
|
|
Assert.That(provider.CanSatisfy(CreatePolicy(UserTokenType.UserName), CreateContext()), Is.False);
|
|
Assert.That(provider.CanSatisfy(CreatePolicy(UserTokenType.Certificate), CreateContext()), Is.False);
|
|
Assert.That(provider.CanSatisfy(CreateIssuedTokenPolicy(), CreateContext()), Is.False);
|
|
}
|
|
|
|
[Test]
|
|
public void ConfiguredOrderControlsCompositePreference()
|
|
{
|
|
IConfiguration configuration = BuildConfiguration(CreateFullIdentityConfiguration(order: true));
|
|
var services = new ServiceCollection();
|
|
AddIdentityDependencies(services);
|
|
services.AddOpcUa()
|
|
.AddClient(_ => { })
|
|
.AddIdentityProvider(configuration.GetSection("OpcUa:Client:Identity"));
|
|
|
|
using ServiceProvider sp = services.BuildServiceProvider();
|
|
IClientIdentityProvider provider = sp.GetRequiredService<IClientIdentityProvider>();
|
|
|
|
Assert.That(provider.SupportedTokenTypes, Is.EqualTo(
|
|
[
|
|
UserTokenType.IssuedToken,
|
|
UserTokenType.Certificate,
|
|
UserTokenType.UserName
|
|
]));
|
|
}
|
|
|
|
[Test]
|
|
public void EmptyOrderPreservesRegistrationOrder()
|
|
{
|
|
IConfiguration configuration = BuildConfiguration(CreateFullIdentityConfiguration(order: false));
|
|
var services = new ServiceCollection();
|
|
AddIdentityDependencies(services);
|
|
services.AddOpcUa()
|
|
.AddClient(_ => { })
|
|
.AddIdentityProvider(configuration.GetSection("OpcUa:Client:Identity"));
|
|
|
|
using ServiceProvider sp = services.BuildServiceProvider();
|
|
IClientIdentityProvider provider = sp.GetRequiredService<IClientIdentityProvider>();
|
|
|
|
Assert.That(provider.SupportedTokenTypes, Is.EqualTo(
|
|
[
|
|
UserTokenType.UserName,
|
|
UserTokenType.Certificate,
|
|
UserTokenType.IssuedToken
|
|
]));
|
|
}
|
|
|
|
[Test]
|
|
public void MissingIssuedTokenAuthorityThrowsDuringProviderConstruction()
|
|
{
|
|
IConfiguration configuration = BuildConfiguration(new Dictionary<string, string>
|
|
{
|
|
["OpcUa:Client:Identity:EnableAnonymous"] = "false",
|
|
["OpcUa:Client:Identity:IssuedToken:AuthorityUri"] = "https://missing.example",
|
|
["OpcUa:Client:Identity:IssuedToken:ProfileUri"] = Profiles.JwtUserToken
|
|
});
|
|
var services = new ServiceCollection();
|
|
services.AddOpcUa()
|
|
.AddClient(_ => { })
|
|
.AddAccessTokenProvider(new StubAccessTokenProvider("https://issuer.example"))
|
|
.AddIdentityProvider(configuration.GetSection("OpcUa:Client:Identity"));
|
|
|
|
InvalidOperationException ex = Assert.Throws<InvalidOperationException>(() =>
|
|
{
|
|
using ServiceProvider sp = services.BuildServiceProvider();
|
|
_ = sp.GetRequiredService<IClientIdentityProvider>();
|
|
});
|
|
|
|
Assert.That(ex.Message, Does.Contain("https://missing.example"));
|
|
Assert.That(ex.Message, Does.Contain("IAccessTokenProvider"));
|
|
}
|
|
|
|
private static Dictionary<string, string> CreateFullIdentityConfiguration(bool order)
|
|
{
|
|
var data = new Dictionary<string, string>
|
|
{
|
|
["OpcUa:Client:Identity:EnableAnonymous"] = "false",
|
|
["OpcUa:Client:Identity:UserName:UserName"] = "operator",
|
|
["OpcUa:Client:Identity:UserName:SecretName"] = "operator-password",
|
|
["OpcUa:Client:Identity:UserName:SecretStoreType"] = "Fake",
|
|
["OpcUa:Client:Identity:X509:StoreType"] = CertificateStoreType.Directory,
|
|
["OpcUa:Client:Identity:X509:StorePath"] = "pki/user",
|
|
["OpcUa:Client:Identity:X509:SubjectName"] = "CN=Operator",
|
|
["OpcUa:Client:Identity:IssuedToken:AuthorityUri"] = "https://issuer.example",
|
|
["OpcUa:Client:Identity:IssuedToken:ProfileUri"] = Profiles.JwtUserToken
|
|
};
|
|
if (order)
|
|
{
|
|
data["OpcUa:Client:Identity:Order:0"] = "IssuedToken";
|
|
data["OpcUa:Client:Identity:Order:1"] = "X509";
|
|
data["OpcUa:Client:Identity:Order:2"] = "UserName";
|
|
}
|
|
return data;
|
|
}
|
|
|
|
private static IConfiguration BuildConfiguration(Dictionary<string, string> data)
|
|
{
|
|
var source = new MemoryConfigurationSource
|
|
{
|
|
InitialData = data
|
|
};
|
|
return new ConfigurationBuilder()
|
|
.Add(source)
|
|
.Build();
|
|
}
|
|
|
|
private static void AddIdentityDependencies(IServiceCollection services)
|
|
{
|
|
services.AddSingleton<ISecretRegistry>(new FakeSecretRegistry());
|
|
services.AddSingleton<ICertificateProvider>(new FakeCertificateProvider());
|
|
services.AddSingleton<ICertificatePasswordProvider>(new FakeCertificatePasswordProvider());
|
|
services.AddSingleton<IAccessTokenProvider>(
|
|
new StubAccessTokenProvider("https://issuer.example"));
|
|
}
|
|
|
|
private static UserTokenPolicy CreatePolicy(UserTokenType tokenType)
|
|
{
|
|
return new UserTokenPolicy
|
|
{
|
|
PolicyId = tokenType.ToString(),
|
|
TokenType = tokenType,
|
|
SecurityPolicyUri = SecurityPolicies.None
|
|
};
|
|
}
|
|
|
|
private static UserTokenPolicy CreateIssuedTokenPolicy()
|
|
{
|
|
UserTokenPolicy policy = CreatePolicy(UserTokenType.IssuedToken);
|
|
policy.IssuedTokenType = Profiles.JwtUserToken;
|
|
return policy;
|
|
}
|
|
|
|
private static IdentitySelectionContext CreateContext()
|
|
{
|
|
var endpoint = new EndpointDescription
|
|
{
|
|
SecurityPolicyUri = SecurityPolicies.None,
|
|
UserIdentityTokens = []
|
|
};
|
|
return new IdentitySelectionContext(
|
|
endpoint,
|
|
[],
|
|
ServiceMessageContext.CreateEmpty(NUnitTelemetryContext.Create()));
|
|
}
|
|
|
|
private sealed class FakeSecretRegistry : ISecretRegistry
|
|
{
|
|
public void RegisterStore(ISecretStore store)
|
|
{
|
|
}
|
|
|
|
public ISecret TryGet(SecretIdentifier id)
|
|
{
|
|
return null;
|
|
}
|
|
|
|
public ValueTask<ISecret> GetAsync(
|
|
SecretIdentifier id,
|
|
CancellationToken ct = default)
|
|
{
|
|
return new ValueTask<ISecret>((ISecret)null);
|
|
}
|
|
}
|
|
|
|
private sealed class FakeCertificateProvider : ICertificateProvider
|
|
{
|
|
public Certificate TryGetPrivateKeyCertificate(string thumbprint)
|
|
{
|
|
return null;
|
|
}
|
|
|
|
public ValueTask<Certificate> GetPrivateKeyCertificateAsync(
|
|
CertificateIdentifier identifier,
|
|
ICertificatePasswordProvider passwordProvider = null,
|
|
string applicationUri = null,
|
|
CancellationToken ct = default)
|
|
{
|
|
return new ValueTask<Certificate>((Certificate)null);
|
|
}
|
|
}
|
|
|
|
private sealed class FakeCertificatePasswordProvider : ICertificatePasswordProvider
|
|
{
|
|
public char[] GetPassword(CertificateIdentifier certificateIdentifier)
|
|
{
|
|
return [];
|
|
}
|
|
}
|
|
|
|
private sealed class StubAccessTokenProvider : IAccessTokenProvider
|
|
{
|
|
public StubAccessTokenProvider(string authorityUri)
|
|
{
|
|
AuthorityUri = authorityUri;
|
|
}
|
|
|
|
public string AuthorityUri { get; }
|
|
|
|
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,
|
|
[1],
|
|
DateTime.MaxValue,
|
|
AuthorityUri));
|
|
#pragma warning restore CA2000
|
|
}
|
|
}
|
|
}
|
|
}
|