mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-27 04:59:55 +08:00
# Description Adopt [`System.TimeProvider`](https://learn.microsoft.com/dotnet/api/system.timeprovider) across the stack so that every place that creates timers, runs duration math, or schedules periodic work is mockable, deterministic in tests, and immune to wall-clock changes. The migration touches Core, Core.Types, Server, Client, PubSub, Configuration, Gds (server + client), Lds, and the Quickstarts/Console reference apps. Per-component changes follow the same pattern: 1. Add a `private readonly TimeProvider m_timeProvider;` field. 2. Accept a nullable `TimeProvider? timeProvider = null` as the **last** constructor parameter (new overload; legacy constructor stays for binary compatibility and delegates with `timeProvider: null`). 3. Initialise the field with `m_timeProvider = timeProvider ??= TimeProvider.System;`. 4. Replace `new Timer(...)`, `Stopwatch`, `HiResClock.*`, `DateTime.UtcNow`-based duration math, and `Task.Delay(delay, ct)` in timing loops with the matching `m_timeProvider` API (`CreateTimer`, `GetTimestamp` / `GetElapsedTime`, `GetUtcNow().UtcDateTime`, `Task.Delay(delay, m_timeProvider, ct)`). 5. Wire the provider through DI: `AddOpcUaServerBuilder` / `AddOpcUaClientBuilder` register `TimeProvider.System` via `TryAddSingleton<TimeProvider>()` so tests can swap in `Microsoft.Extensions.Time.Testing.FakeTimeProvider`. `HiResClock` itself is kept (so the `ApplicationConfiguration.DisableHiResClock` schema flag still round-trips), but **every public member** is now `[Obsolete]` with a single shared message pointing to the new migration-guide section. The few internal call sites that still need to set/read `HiResClock` are wrapped with `#pragma warning disable CS0618`. ### Highlights per component - **Core / Stack** — `Opc.Ua.Core`, `Opc.Ua.Core.Types`, channel pipeline (`UaSCBinaryClientChannel`, `ChannelToken`, `UaSCBinaryChannel`), `ApplicationConfiguration`, certificate validators, `JwksIssuerKeyResolver`, `TimeProviderExtensions` polyfills (`GetTimestampMilliseconds`, `GetTickCount`, `CancellationTokenSource(timeout, timeProvider)`, `Task.Delay(delay, provider, ct)` polyfill for older TFMs). - **Server** — session lockout, subscription pipeline (publish/sample/keep-alive/lifetime), `MonitoredItemQueue`, alarm sampling rate, `IntervalRunner`, server diagnostics, configuration state machines, hosted services. - **Client** — `Session`, managed/V2 subscription engines, reconnect handlers, channel keep-alive, periodic publishing, complex-type discovery polling. - **PubSub** — `IntervalRunner` pipeline, message-receive timers, MQTT/UDP keep-alive, publishers/readers. - **Gds / Lds** — `LdsServer`, `LinqApplicationsDatabase` expiry housekeeping, GDS clients (push, pull), `DirectoryCertificateStore`, `ConnectionStateMachine`, classic subscription engine. - **Quickstarts / Console samples** — `SampleNodeManager`, `ReferenceNodeManager`, `AlarmNodeManager`, `BoilerState`, `MemoryBufferState`, `PublishedValuesWrites`. Samples resolve via `(Server as ITimeProviderProvider)?.TimeProvider ?? TimeProvider.System` so existing ctor signatures stay binary-compatible. - **Tests** — `Opc.Ua.PubSub.Tests` adds `IntervalRunnerTests`; existing `SubscriptionTests`, `UaPublisherTests`, and `TestDataSystem` move off `HiResClock`. Added `Microsoft.Extensions.TimeProvider.Testing` package for `FakeTimeProvider` (project-load warning surfaces on net48/net472 only — runtime is .NET 8+). ### Migration guide New section [**Time and Timer abstraction (`TimeProvider`)**](Docs/MigrationGuide.md#time-and-timer-abstraction-timeprovider) documents: - The canonical replacement table (`HiResClock.UtcNow` → `timeProvider.GetUtcNow().UtcDateTime`, `HiResClock.TickCount64` → `timeProvider.GetTimestamp()`, `new Timer` → `timeProvider.CreateTimer`, `Task.Delay(delay, ct)` → `Task.Delay(delay, timeProvider, ct)`, …). - The `TimeProvider? timeProvider = null` + `??=` constructor pattern. - DI wiring and how to swap in `FakeTimeProvider` in tests. - Before/after snippets for `HiResClock.TickCount64`, `HiResClock.UtcNow`, and `new Timer(...)`. ## Related Issues - Fixes #2458 ## Checklist - [x] 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. - [x] I have added all necessary documentation. - [x] I have verified that my changes do not introduce (new) build or analyzer warnings. - [ ] I ran **all** tests locally using the **UA.slnx** solution against at least .net **framework** and .net **10**, and all passed. - [ ] I fixed **all** failing and flaky tests in the CI pipelines and **all** CodeQL warnings. - [ ] I have addressed **all** PR feedback received.
151 lines
5.4 KiB
C#
151 lines
5.4 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.Text;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
|
|
namespace Opc.Ua.Identity
|
|
{
|
|
/// <summary>
|
|
/// Static JWT bearer <see cref="IAccessTokenProvider"/> for tests,
|
|
/// smoke flows, and callers that obtain the token out-of-band.
|
|
/// </summary>
|
|
public sealed class JwtBearerAccessTokenProvider : IAccessTokenProvider
|
|
{
|
|
/// <summary>
|
|
/// Creates a provider for a pre-supplied JWT payload.
|
|
/// </summary>
|
|
public JwtBearerAccessTokenProvider(
|
|
string authorityUri,
|
|
byte[] tokenBytes,
|
|
DateTime expiresAt,
|
|
string displayName = "")
|
|
: this(authorityUri, tokenBytes, expiresAt, displayName, null)
|
|
{
|
|
}
|
|
|
|
/// <summary>
|
|
/// Creates a provider for a pre-supplied JWT payload with a
|
|
/// caller-supplied <see cref="TimeProvider"/> for expiry checks.
|
|
/// </summary>
|
|
public JwtBearerAccessTokenProvider(
|
|
string authorityUri,
|
|
byte[] tokenBytes,
|
|
DateTime expiresAt,
|
|
string displayName,
|
|
TimeProvider? timeProvider)
|
|
{
|
|
if (tokenBytes == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(tokenBytes));
|
|
}
|
|
|
|
AuthorityUri = authorityUri ?? throw new ArgumentNullException(nameof(authorityUri));
|
|
m_tokenBytes = (byte[])tokenBytes.Clone();
|
|
m_expiresAt = expiresAt;
|
|
m_displayName = displayName ?? string.Empty;
|
|
m_timeProvider = timeProvider ?? TimeProvider.System;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Creates a provider by UTF-8 encoding a compact JWT string.
|
|
/// </summary>
|
|
public static JwtBearerAccessTokenProvider FromJwtString(
|
|
string authorityUri,
|
|
string jwt,
|
|
DateTime expiresAt,
|
|
string displayName = "")
|
|
{
|
|
return FromJwtString(authorityUri, jwt, expiresAt, displayName, null);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Creates a provider by UTF-8 encoding a compact JWT string,
|
|
/// using the supplied <see cref="TimeProvider"/> for expiry checks.
|
|
/// </summary>
|
|
public static JwtBearerAccessTokenProvider FromJwtString(
|
|
string authorityUri,
|
|
string jwt,
|
|
DateTime expiresAt,
|
|
string displayName,
|
|
TimeProvider? timeProvider)
|
|
{
|
|
if (jwt == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(jwt));
|
|
}
|
|
|
|
return new JwtBearerAccessTokenProvider(
|
|
authorityUri,
|
|
Encoding.UTF8.GetBytes(jwt),
|
|
expiresAt,
|
|
displayName,
|
|
timeProvider);
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
public string AuthorityUri { get; }
|
|
|
|
/// <inheritdoc/>
|
|
public ValueTask<AccessToken> AcquireAsync(
|
|
AuthorizationServerMetadata metadata,
|
|
CancellationToken ct = default)
|
|
{
|
|
ct.ThrowIfCancellationRequested();
|
|
if (m_expiresAt <= m_timeProvider.GetUtcNow().UtcDateTime)
|
|
{
|
|
throw ServiceResultException.Create(
|
|
StatusCodes.BadIdentityTokenRejected,
|
|
"Token has expired.");
|
|
}
|
|
|
|
#pragma warning disable CA2000 // Ownership transfers to caller; TODO: remove when analyzer models ValueTask ownership.
|
|
return new ValueTask<AccessToken>(CreateAccessToken());
|
|
#pragma warning restore CA2000
|
|
}
|
|
|
|
private AccessToken CreateAccessToken()
|
|
{
|
|
return new AccessToken(
|
|
Profiles.JwtUserToken,
|
|
(byte[])m_tokenBytes.Clone(),
|
|
m_expiresAt,
|
|
m_displayName);
|
|
}
|
|
|
|
private readonly byte[] m_tokenBytes;
|
|
private readonly DateTime m_expiresAt;
|
|
private readonly string m_displayName;
|
|
private readonly TimeProvider m_timeProvider;
|
|
}
|
|
}
|