mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-18 22:55:08 +08:00
d525bc3f28
# Description This PR fixes bounded ManagedSession reconnect cleanup and reorganizes the sample applications into domain-focused folders. ## Reconnect cleanup - Bounds reconnect integration cleanup with independent 30-second close and dispose limits. - Sends `CloseSession` through the awaited transport request path during `Session.DisposeAsync`. - Preserves explicit `Session.CloseAsync` behavior that waits for or cancels outstanding publish requests. - Covers the disposal request path with a regression test. ## Sample organization - `samples/OpenUsd`: `GeneratorServer`, `SiteCompositionServer` - `samples/Redundancy`: `RedundantClient`, `RedundantServer`, `RedundantPubSub` - `samples/Isa95`: `MinimalIsa95Server` - `samples/MinimalApi`: `MinimalBoilerServer`, `MinimalCalcServer`, `MinimalClient` - `samples/DI`: `PumpDeviceIntegrationServer` - `samples/Lds`: `ConsoleLdsServer` - `samples/Reference`: `ConsoleReferenceClient`, `ConsoleReferenceServer` - `samples/PubSub`: `ConsoleReferencePubSubClient` `UA.slnx` now exposes the same requested domain groups. Project references, tests, runtime sample probes, CI workflows, Dockerfiles, Compose files, helper scripts, and documentation were updated to the new paths. `samples/Robotics/MinimalRobotServer` remains under `Robotics`. ## Validation - `dotnet build UA.slnx` - 3 Redundancy short-haul sample tests - 70 DI sample tests - 914 OpenUSD tests - 1 WotCon model-materialization test - 137 AOT tests - `docker compose config` for all 6 moved Redundancy Compose files ## Related Issues - Fixes #4273 ## 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. - [x] I have added all necessary documentation. - [x] I have verified that my changes do not introduce new build or analyzer warnings. - [x] I built the complete `UA.slnx` solution locally. - [ ] I ran all tests locally against at least .NET Framework and .NET 10. - [ ] I fixed all failing and flaky tests in the CI pipelines and all CodeQL warnings. - [x] I have addressed all PR feedback received. --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: marcschier <11168470+marcschier@users.noreply.github.com> Co-authored-by: Marc Schier <mschier@microsoft.com> Co-authored-by: Marc Schier <marcschier@users.noreply.github.com> Copilot-Session: a2c2838f-74ae-4997-a1d4-50574d9e0636
123 lines
5.0 KiB
C#
123 lines
5.0 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 Opc.Ua;
|
|
using Opc.Ua.PubSub.Security;
|
|
|
|
namespace Quickstarts.ConsoleReferencePubSubClient
|
|
{
|
|
/// <summary>
|
|
/// Demo-only shared symmetric key material wiring the reference
|
|
/// publisher and subscriber for <c>SignAndEncrypt</c> over the
|
|
/// <c>PubSub-Aes256-CTR</c> policy without an external Security Key
|
|
/// Service. The publisher and subscriber both build an identical
|
|
/// <see cref="StaticSecurityKeyProvider"/> from the constants below.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// The fixed keys here are a sample convenience ONLY. Production
|
|
/// deployments must source keys from a real SKS (see
|
|
/// <see href="https://reference.opcfoundation.org/specs/OPC-10000-14/v1.05.06/8.3">
|
|
/// Part 14 §8.3</see>) and never embed key material in source.
|
|
/// </remarks>
|
|
public static class SampleSecurity
|
|
{
|
|
/// <summary>
|
|
/// SecurityGroupId shared by the demo publisher and subscriber.
|
|
/// </summary>
|
|
public const string SecurityGroupId = "DemoSecurityGroup";
|
|
|
|
/// <summary>
|
|
/// Placeholder Security Key Service endpoint URL. The demo sources
|
|
/// keys from a local <see cref="StaticSecurityKeyProvider"/>, but
|
|
/// the configuration validator requires a secured group to declare
|
|
/// at least one SecurityKeyService endpoint per
|
|
/// <see href="https://reference.opcfoundation.org/specs/OPC-10000-14/v1.05.06/6.2.5.4">
|
|
/// Part 14 §6.2.5.4</see>.
|
|
/// </summary>
|
|
public const string SecurityKeyServiceUrl = "opc.tcp://localhost:4840/SecurityKeyService";
|
|
|
|
private const uint TokenId = 1U;
|
|
|
|
/// <summary>
|
|
/// Builds the shared static key provider. Identical on both the
|
|
/// publisher and subscriber so secured frames round-trip.
|
|
/// </summary>
|
|
/// <param name="timeProvider">Clock for the key ring.</param>
|
|
/// <returns>A configured key provider.</returns>
|
|
public static IPubSubSecurityKeyProvider CreateKeyProvider(
|
|
TimeProvider? timeProvider = null)
|
|
{
|
|
byte[] signingKey = BuildKey(0x10, 32);
|
|
byte[] encryptingKey = BuildKey(0x20, 32);
|
|
byte[] keyNonce = BuildKey(0x30, 12);
|
|
|
|
PubSubSecurityKey? key = null;
|
|
PubSubSecurityKeyRing? ring = null;
|
|
try
|
|
{
|
|
key = new PubSubSecurityKey(
|
|
TokenId,
|
|
ByteString.Create(signingKey),
|
|
ByteString.Create(encryptingKey),
|
|
ByteString.Create(keyNonce),
|
|
DateTimeUtc.From(DateTime.UtcNow),
|
|
TimeSpan.FromHours(24));
|
|
|
|
ring = new PubSubSecurityKeyRing(SecurityGroupId, timeProvider);
|
|
ring.SetCurrent(key);
|
|
// Ownership of the key transfers to the ring; null out the
|
|
// local so it is not disposed here on the success path.
|
|
key = null;
|
|
|
|
var provider = new StaticSecurityKeyProvider(SecurityGroupId, ring);
|
|
// Ownership of the ring transfers to the returned provider,
|
|
// which lives for the application lifetime.
|
|
ring = null;
|
|
return provider;
|
|
}
|
|
finally
|
|
{
|
|
ring?.Dispose();
|
|
key?.Dispose();
|
|
}
|
|
}
|
|
|
|
private static byte[] BuildKey(byte seed, int length)
|
|
{
|
|
byte[] bytes = new byte[length];
|
|
for (int i = 0; i < length; i++)
|
|
{
|
|
bytes[i] = (byte)((seed + (i * 7)) & 0xFF);
|
|
}
|
|
return bytes;
|
|
}
|
|
}
|
|
}
|