mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-18 22:55:08 +08:00
0000513cde
# Description Introduces a pluggable user-identity provider model covering all OPC UA Part 6 §6.5 mechanisms (Anonymous, UserName, X509, IssuedToken/JWT) on both client and server, with full `Microsoft.Extensions.DependencyInjection` integration, plus the Part 12 §9 `AuthorizationService` two-phase token-request flow **including refresh-token rotation**, the Part 12 §8 KeyCredential Push model, and a clean provider model for OPC 10000-12 §7.2 `ApplicationSelfAdmin`. The work is split across phase-by-phase commits so it can be reviewed independently; nothing here changes wire-level behaviour or forces existing applications to migrate. ### Documentation All under `Docs/`: - `IdentityProviders.md` — full developer guide: three-layer model, recipes, configuration reference, "what gets auto-wired" matrix, JWS algorithm table, identity-augmenters section, **"Implementing your own provider"** how-to subsections for Entra / OIDC / Windows / AspNetCore (sibling files merged in per review feedback). - `DependencyInjection.md` — `Identity` sections with `appsettings.json` examples, identity-extension matrix, `WithAuthorizationService` + `WithKeyCredentialPush` + `AddIdentityAugmenter` extensions documented. - `RoleBasedUserManagement.md` — claim-criteria callout describing `IIdentityClaims` probe surface. - `AuthorizationService.md` — Architecture diagram + `IAccessTokenProvider` conceptual narrative restored from master; modern `StartRequestToken` / `FinishRequestToken` flow leads; refresh-token recipe added. - `KeyCredentialService.md` — Push model + Pull vs Push vs Bridge decision matrix + Hybrid (Push + Pull) section; explicit experimental warning for the bridge. - `GDS.md` — KeyCredential Push, `StartRequestToken`, `GdsApplicationSelfAdminProvider`, **shipped Refresh-token support with rotation policy and audit semantics** all documented. - `MigrationGuide.md` — User Identity Providers section listing `[Obsolete]` markers + mechanical recipes; SelfAdmin migration via `IIdentityAugmenter`; `EnableRefreshTokens` default note. - `README.md` index entries. ## 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. - [x] I ran **all** tests locally using the **UA.slnx** solution against at least .net **framework** and .net **10**, and all passed. - [x] I fixed **all** failing and flaky tests in the CI pipelines and **all** CodeQL warnings. - [x] I have addressed **all** PR feedback received.
170 lines
7.4 KiB
C#
170 lines
7.4 KiB
C#
/* ========================================================================
|
|
* Copyright (c) 2005-2025 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.IO;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
|
|
namespace Opc.Ua.WotCon.Client
|
|
{
|
|
/// <summary>
|
|
/// Extension methods on the generated <see cref="WoTAssetFileTypeClient"/>
|
|
/// proxy that implement the OPC 10100-1 §6.3.10 upload-and-update
|
|
/// flow (<c>Open(Write|EraseExisting) → Write* → CloseAndUpdate</c>).
|
|
/// </summary>
|
|
public static class WoTAssetFileTypeClientExtensions
|
|
{
|
|
/// <summary>
|
|
/// Spec §6.3.10 only allows Read (1) and Write|EraseExisting (6).
|
|
/// </summary>
|
|
private const byte WriteEraseMode = 6;
|
|
|
|
/// <summary>
|
|
/// Uploads <paramref name="thingDescriptionJson"/> to the WoT
|
|
/// asset file and then triggers <c>CloseAndUpdate</c> so the
|
|
/// server materialises the new asset shape.
|
|
/// </summary>
|
|
/// <param name="file">The asset file proxy.</param>
|
|
/// <param name="thingDescriptionJson">The TD payload as UTF-8 JSON bytes.</param>
|
|
/// <param name="chunkSize">Maximum per-write chunk size.</param>
|
|
/// <param name="ct">Cancellation token.</param>
|
|
/// <exception cref="ArgumentNullException"><paramref name="file"/> is null.</exception>
|
|
/// <exception cref="ArgumentOutOfRangeException"><paramref name="chunkSize"/> is less than or equal to zero.</exception>
|
|
public static async ValueTask UploadAndUpdateAsync(
|
|
this WoTAssetFileTypeClient file,
|
|
ReadOnlyMemory<byte> thingDescriptionJson,
|
|
int chunkSize = FileTypeClientExtensions.DefaultChunkSize,
|
|
CancellationToken ct = default)
|
|
{
|
|
if (file is null)
|
|
{
|
|
throw new ArgumentNullException(nameof(file));
|
|
}
|
|
if (chunkSize <= 0)
|
|
{
|
|
throw new ArgumentOutOfRangeException(nameof(chunkSize), "Chunk size must be positive.");
|
|
}
|
|
uint handle = await file.OpenAsync(WriteEraseMode, ct).ConfigureAwait(false);
|
|
try
|
|
{
|
|
int offset = 0;
|
|
while (offset < thingDescriptionJson.Length)
|
|
{
|
|
int take = Math.Min(chunkSize, thingDescriptionJson.Length - offset);
|
|
var chunk = ByteString.From(
|
|
thingDescriptionJson.Slice(offset, take).ToArray());
|
|
await file.WriteAsync(handle, chunk, ct).ConfigureAwait(false);
|
|
offset += take;
|
|
}
|
|
await file.CloseAndUpdateAsync(handle, ct).ConfigureAwait(false);
|
|
}
|
|
catch
|
|
{
|
|
try
|
|
{
|
|
await file.CloseAsync(handle, CancellationToken.None).ConfigureAwait(false);
|
|
}
|
|
catch
|
|
{
|
|
// Best-effort cleanup.
|
|
}
|
|
throw;
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Uploads the contents of <paramref name="thingDescriptionJson"/>
|
|
/// to the WoT asset file in chunks and then triggers
|
|
/// <c>CloseAndUpdate</c> so the server materialises the new
|
|
/// asset shape. The stream is read sequentially until
|
|
/// end-of-stream; non-seekable streams (e.g.
|
|
/// <see cref="System.Net.Sockets.NetworkStream"/>) are
|
|
/// supported. The caller retains ownership of
|
|
/// <paramref name="thingDescriptionJson"/> and is responsible
|
|
/// for disposing it.
|
|
/// </summary>
|
|
/// <param name="file">The asset file proxy.</param>
|
|
/// <param name="thingDescriptionJson">A readable stream producing
|
|
/// the TD payload as UTF-8 JSON bytes.</param>
|
|
/// <param name="chunkSize">Maximum per-write chunk size and
|
|
/// size of the rented intermediate buffer.</param>
|
|
/// <param name="ct">Cancellation token.</param>
|
|
/// <exception cref="ArgumentNullException"><paramref name="file"/> is null.</exception>
|
|
/// <exception cref="ArgumentNullException"><paramref name="thingDescriptionJson"/> is null.</exception>
|
|
/// <exception cref="ArgumentException"><paramref name="thingDescriptionJson"/> is not readable.</exception>
|
|
/// <exception cref="ArgumentOutOfRangeException"><paramref name="chunkSize"/> is less than or equal to zero.</exception>
|
|
public static async ValueTask UploadAndUpdateAsync(
|
|
this WoTAssetFileTypeClient file,
|
|
Stream thingDescriptionJson,
|
|
int chunkSize = FileTypeClientExtensions.DefaultChunkSize,
|
|
CancellationToken ct = default)
|
|
{
|
|
if (file is null)
|
|
{
|
|
throw new ArgumentNullException(nameof(file));
|
|
}
|
|
if (thingDescriptionJson is null)
|
|
{
|
|
throw new ArgumentNullException(nameof(thingDescriptionJson));
|
|
}
|
|
if (!thingDescriptionJson.CanRead)
|
|
{
|
|
throw new ArgumentException(
|
|
"Stream must be readable.", nameof(thingDescriptionJson));
|
|
}
|
|
if (chunkSize <= 0)
|
|
{
|
|
throw new ArgumentOutOfRangeException(nameof(chunkSize), "Chunk size must be positive.");
|
|
}
|
|
uint handle = await file.OpenAsync(WriteEraseMode, ct).ConfigureAwait(false);
|
|
try
|
|
{
|
|
await thingDescriptionJson.CopyStreamInChunksAsync(
|
|
chunkSize,
|
|
(chunk, token) => file.WriteAsync(handle, ByteString.From(chunk), token),
|
|
ct).ConfigureAwait(false);
|
|
await file.CloseAndUpdateAsync(handle, ct).ConfigureAwait(false);
|
|
}
|
|
catch
|
|
{
|
|
try
|
|
{
|
|
await file.CloseAsync(handle, CancellationToken.None).ConfigureAwait(false);
|
|
}
|
|
catch
|
|
{
|
|
// Best-effort cleanup.
|
|
}
|
|
throw;
|
|
}
|
|
}
|
|
}
|
|
}
|