mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-19 07:02:16 +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>
339 lines
12 KiB
C#
339 lines
12 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 NUnit.Framework;
|
|
using Opc.Ua.Client.TestFramework;
|
|
using Opc.Ua.Identity;
|
|
|
|
using ManagedSessionClass = Opc.Ua.Client.ManagedSession;
|
|
|
|
namespace Opc.Ua.Client.Tests.Identity
|
|
{
|
|
[TestFixture]
|
|
[Category("Session")]
|
|
[Category("Identity")]
|
|
[SetCulture("en-us")]
|
|
[SetUICulture("en-us")]
|
|
public sealed class ProactiveRefreshTests : ClientTestFramework
|
|
{
|
|
public ProactiveRefreshTests()
|
|
: base(Utils.UriSchemeOpcTcp)
|
|
{
|
|
SingleSession = false;
|
|
}
|
|
|
|
[OneTimeSetUp]
|
|
public override Task OneTimeSetUpAsync()
|
|
{
|
|
SingleSession = false;
|
|
return base.OneTimeSetUpAsync();
|
|
}
|
|
|
|
[OneTimeTearDown]
|
|
public override Task OneTimeTearDownAsync()
|
|
{
|
|
return base.OneTimeTearDownAsync();
|
|
}
|
|
|
|
[Test]
|
|
public async Task ProactiveRefreshCallsProviderBeforeExpiry()
|
|
{
|
|
var timeProvider = new FakeTimeProvider();
|
|
var provider = new RefreshingUserNameProvider(timeProvider);
|
|
ManagedSessionClass session = await CreateManagedSessionAsync(provider, timeProvider)
|
|
.ConfigureAwait(false);
|
|
await using (session.ConfigureAwait(false))
|
|
{
|
|
Assert.That(provider.CallCount, Is.EqualTo(1));
|
|
|
|
timeProvider.Advance(TimeSpan.FromSeconds(60));
|
|
await WaitUntilAsync(() => provider.CallCount >= 2).ConfigureAwait(false);
|
|
|
|
Assert.That(session.Connected, Is.True);
|
|
ServerStatusDataType status = await session
|
|
.ReadValueAsync<ServerStatusDataType>(VariableIds.Server_ServerStatus)
|
|
.ConfigureAwait(false);
|
|
Assert.That(status, Is.Not.Null);
|
|
}
|
|
}
|
|
|
|
[Test]
|
|
public async Task RefreshFailureKeepsSessionAliveAndRetries()
|
|
{
|
|
var timeProvider = new FakeTimeProvider();
|
|
var provider = new RefreshingUserNameProvider(timeProvider)
|
|
{
|
|
ThrowOnCall = 2
|
|
};
|
|
ManagedSessionClass session = await CreateManagedSessionAsync(provider, timeProvider)
|
|
.ConfigureAwait(false);
|
|
await using (session.ConfigureAwait(false))
|
|
{
|
|
using var timeout = new CancellationTokenSource(TimeSpan.FromSeconds(10));
|
|
|
|
timeProvider.Advance(TimeSpan.FromSeconds(60));
|
|
await session.EnsureRefreshAsync(timeout.Token).ConfigureAwait(false);
|
|
|
|
Assert.That(provider.CallCount, Is.EqualTo(2));
|
|
Assert.That(session.Connected, Is.True);
|
|
|
|
timeProvider.Advance(TimeSpan.FromSeconds(6));
|
|
await session.EnsureRefreshAsync(timeout.Token).ConfigureAwait(false);
|
|
|
|
Assert.That(provider.CallCount, Is.EqualTo(3));
|
|
Assert.That(session.Connected, Is.True);
|
|
}
|
|
}
|
|
|
|
private async Task<ManagedSessionClass> CreateManagedSessionAsync(
|
|
IClientIdentityProvider provider,
|
|
TimeProvider timeProvider)
|
|
{
|
|
Endpoints = await ClientFixture.GetEndpointsAsync(ServerUrl).ConfigureAwait(false);
|
|
ConfiguredEndpoint endpoint = await ClientFixture
|
|
.GetEndpointAsync(ServerUrl, SecurityPolicies.Basic256Sha256, Endpoints)
|
|
.ConfigureAwait(false);
|
|
var userIdentity = new UserIdentity("user1", "password"u8);
|
|
UserTokenPolicy identityPolicy = endpoint.Description.FindUserTokenPolicy(
|
|
userIdentity.TokenType,
|
|
userIdentity.IssuedTokenType,
|
|
endpoint.Description.SecurityPolicyUri);
|
|
if (identityPolicy == null)
|
|
{
|
|
Assert.Ignore("The test server endpoint does not advertise UserName tokens.");
|
|
}
|
|
|
|
return await ManagedSessionClass.CreateAsync(
|
|
ClientFixture.Config,
|
|
endpoint,
|
|
new DefaultSessionFactory(Telemetry),
|
|
identity: null,
|
|
telemetry: Telemetry,
|
|
sessionName: "ProactiveRefreshTests",
|
|
sessionTimeout: ClientFixture.SessionTimeout,
|
|
checkDomain: false,
|
|
identityProvider: provider,
|
|
timeProvider: timeProvider,
|
|
ct: CancellationToken.None).ConfigureAwait(false);
|
|
}
|
|
|
|
private static async Task WaitUntilAsync(Func<bool> predicate)
|
|
{
|
|
for (int ii = 0; ii < 100; ii++)
|
|
{
|
|
if (predicate())
|
|
{
|
|
return;
|
|
}
|
|
await Task.Delay(20).ConfigureAwait(false);
|
|
}
|
|
Assert.That(predicate(), Is.True);
|
|
}
|
|
|
|
private sealed class RefreshingUserNameProvider : IClientIdentityProvider
|
|
{
|
|
private readonly TimeProvider m_timeProvider;
|
|
|
|
public RefreshingUserNameProvider(TimeProvider timeProvider)
|
|
{
|
|
m_timeProvider = timeProvider;
|
|
ExpiresAt = m_timeProvider.GetUtcNow().UtcDateTime.AddMinutes(2);
|
|
}
|
|
|
|
public int CallCount { get; private set; }
|
|
|
|
public int ThrowOnCall { get; set; }
|
|
|
|
public IReadOnlyList<UserTokenType> SupportedTokenTypes => [UserTokenType.UserName];
|
|
|
|
public IReadOnlyList<string> SupportedIssuedTokenProfileUris => [];
|
|
|
|
public DateTime ExpiresAt { get; private set; }
|
|
|
|
public bool CanSatisfy(UserTokenPolicy policy, IdentitySelectionContext context)
|
|
{
|
|
return policy.TokenType == UserTokenType.UserName;
|
|
}
|
|
|
|
public ValueTask<IUserIdentity> GetIdentityAsync(
|
|
UserTokenPolicy policy,
|
|
IdentitySelectionContext context,
|
|
CancellationToken ct = default)
|
|
{
|
|
CallCount++;
|
|
if (ThrowOnCall == CallCount)
|
|
{
|
|
throw ServiceResultException.Create(
|
|
StatusCodes.BadIdentityTokenRejected,
|
|
"Synthetic refresh failure.");
|
|
}
|
|
|
|
ExpiresAt = m_timeProvider.GetUtcNow().UtcDateTime.AddMinutes(2);
|
|
var identity = new UserIdentity("user1", "password"u8)
|
|
{
|
|
PolicyId = policy.PolicyId
|
|
};
|
|
return new ValueTask<IUserIdentity>(identity);
|
|
}
|
|
}
|
|
|
|
private sealed class FakeTimeProvider : TimeProvider
|
|
{
|
|
private readonly List<FakeTimer> m_timers = [];
|
|
private DateTimeOffset m_utcNow = new(2026, 1, 1, 0, 0, 0, TimeSpan.Zero);
|
|
|
|
public override DateTimeOffset GetUtcNow()
|
|
{
|
|
return m_utcNow;
|
|
}
|
|
|
|
public void Advance(TimeSpan delta)
|
|
{
|
|
List<FakeTimer> dueTimers;
|
|
lock (m_timers)
|
|
{
|
|
m_utcNow += delta;
|
|
dueTimers = [];
|
|
foreach (FakeTimer timer in m_timers)
|
|
{
|
|
if (timer.IsDue(m_utcNow))
|
|
{
|
|
dueTimers.Add(timer);
|
|
}
|
|
}
|
|
}
|
|
|
|
foreach (FakeTimer timer in dueTimers)
|
|
{
|
|
timer.Fire(m_utcNow);
|
|
}
|
|
}
|
|
|
|
public override ITimer CreateTimer(
|
|
TimerCallback callback,
|
|
object state,
|
|
TimeSpan dueTime,
|
|
TimeSpan period)
|
|
{
|
|
var timer = new FakeTimer(this, callback, state, dueTime, period);
|
|
lock (m_timers)
|
|
{
|
|
m_timers.Add(timer);
|
|
}
|
|
return timer;
|
|
}
|
|
|
|
private void Remove(FakeTimer timer)
|
|
{
|
|
lock (m_timers)
|
|
{
|
|
m_timers.Remove(timer);
|
|
}
|
|
}
|
|
|
|
private sealed class FakeTimer : ITimer
|
|
{
|
|
private readonly FakeTimeProvider m_owner;
|
|
private readonly TimerCallback m_callback;
|
|
private readonly object m_state;
|
|
private TimeSpan m_period;
|
|
private DateTimeOffset? m_dueAt;
|
|
private bool m_disposed;
|
|
|
|
public FakeTimer(
|
|
FakeTimeProvider owner,
|
|
TimerCallback callback,
|
|
object state,
|
|
TimeSpan dueTime,
|
|
TimeSpan period)
|
|
{
|
|
m_owner = owner;
|
|
m_callback = callback;
|
|
m_state = state;
|
|
Change(dueTime, period);
|
|
}
|
|
|
|
public bool Change(TimeSpan dueTime, TimeSpan period)
|
|
{
|
|
m_period = period;
|
|
if (dueTime == Timeout.InfiniteTimeSpan)
|
|
{
|
|
m_dueAt = null;
|
|
}
|
|
else
|
|
{
|
|
m_dueAt = m_owner.GetUtcNow() + dueTime;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
public bool IsDue(DateTimeOffset utcNow)
|
|
{
|
|
return !m_disposed && m_dueAt.HasValue && m_dueAt.Value <= utcNow;
|
|
}
|
|
|
|
public void Fire(DateTimeOffset utcNow)
|
|
{
|
|
if (!IsDue(utcNow))
|
|
{
|
|
return;
|
|
}
|
|
|
|
if (m_period == Timeout.InfiniteTimeSpan)
|
|
{
|
|
m_dueAt = null;
|
|
}
|
|
else
|
|
{
|
|
m_dueAt = utcNow + m_period;
|
|
}
|
|
|
|
m_callback(m_state);
|
|
}
|
|
|
|
public void Dispose()
|
|
{
|
|
m_disposed = true;
|
|
m_owner.Remove(this);
|
|
}
|
|
|
|
public ValueTask DisposeAsync()
|
|
{
|
|
Dispose();
|
|
return default;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|