mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-17 05:11:13 +08:00
0374e19121
# Description _Describe the changes here to communicate to the maintainers why they should accept this pull request. By default - this will become the Commit message after merging and thus define history._ Add provider-backed MachineTool, bundled WMTP, GMS and CranesHoists companions using the existing Machinery/MachineVision fluent, DI and typed-client approach. **The PR is open/non-draft by user choice. Current head `ecc4a7d6ca3e8004cf28ab54da605da302d026bf` is mergeable and has 108 successful checks, six intentionally skipped checks, zero failures and zero pending checks. All five primary workflows completed successfully at that exact head.** | Family | Released specification/model | Packaging | | --- | --- | --- | | MachineTool | OPC 40501-1, 1.02.0 | Model, Server, Client and MCP; normal root versions | | WMTP | OPC 40505, 1.0.0 | Bundled in MachineTool; distinct CLR/wire namespace and independent WMTP-only hosting | | GMS | OPC 40210 reference 1.0.1, normative model 1.0.0 | Model, Server, Client and MCP; normal root versions | | CranesHoists | OPC 40020-1, 1.00 | Model, Server, Client and MCP; all four plus Debug variants forced preview | There are **12 new packable projects**. No separate WMTP package/profile/guide, root version bump, tag, release or package publication is included. Mandatory instance structure is the default; selected optional features require explicit providers. The implementation reuses Machinery results/jobs/files/ProcessValues and Robotics topology, including retained MachineTool Production, defined GMS jobs/parts, modern ISA95/Machinery jobs, shared-owner hosting and isolated instances alongside MachineVision. Runtime and integration fixes preserve raw quality/timestamps, coherent acquisition, namespace ownership, accepted-configuration state, borrowed-resource lifetime, session/node/file cleanup, terminal-value publication, event propagation and endpoint-aware capability publication. Firmware/licence transfer means provider acceptance, not installation/activation. Cancellation does not silently abort another caller's operation. The later upstream MCP expansion is integrated without losing either family set or its default-off privileged/live execution policy. ### Conformance and scope Canonical model inputs are pinned to UA-Nodeset revision `96a08945425d0295edb3607d2a38f6841ef44046`. **GMS upstream exception:** [Annex A.1](https://reference.opcfoundation.org/specs/OPC-40210/annex-a) makes the released NodeSet normative, but §12.3.2.7 requires undefined `GMS_ProductionStatisticsType`. Inherited statistics and defined jobs/parts are implemented without inventing a standard type/NodeId; the complete GMS Production facet is withheld. The requirement ledger records **102 positively evidenced CU rows, 96 directly negative-tested rows and six explicit negative-evidence limitations**. All 648 test-class/name/TRX links were independently resolved to passing cases. The six limitations concern Stacklight, retained legacy PowerOnDuration, Machinery PowerOnDuration, WorkingUnit, Obligation and MaintenanceMode. They are not claims that every invalid-input or hardware-control behavior was tested. The undefined GMS requirement is outside the 102 defined CUs. No external certification claim is made. Retained baseline complete-assembly line coverage, with generated code retained and no source exclusions: | Family | Model | Server | Client | | --- | ---: | ---: | ---: | | MachineTool/WMTP | 83.80% | 91.98% | 84.74% | | GMS | 95.51% | 90.63% | 88.38% | | CranesHoists | 92.76% | 94.45% | 92.24% | These nine measurements predate the later focused review fixes and merges; they are not relabelled as new `ecc4a7d6c` percentages. The current head's separate CI code-coverage check succeeded. No new exclusions or threshold relaxations were introduced. ## Related Issues - Fixes [#4764](https://github.com/OPCFoundation/UA-.NETStandard/issues/4764), the implementation/design and acceptance tracker. ## Checklist _Put an `x` in the boxes that apply. You can complete these step by step after opening the PR._ - [ ] 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. - [ ] 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. - [x] I have addressed **all** PR feedback received.
159 lines
7.6 KiB
C#
159 lines
7.6 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.Globalization;
|
|
using System.Net;
|
|
using System.Net.NetworkInformation;
|
|
using Opc.Ua;
|
|
|
|
namespace CompanionSuite
|
|
{
|
|
/// <summary>
|
|
/// Bounded checks of the actual listener-selection path; no application host or listener is started.
|
|
/// </summary>
|
|
internal static class EndpointConfigurationChecks
|
|
{
|
|
/// <summary>
|
|
/// Verifies hostname normalization, explicit address families, automatic ports and strict-trust intent.
|
|
/// </summary>
|
|
internal static void Verify()
|
|
{
|
|
Check("DefaultDemoUsesNumericLoopback",
|
|
["--server", "--demo-trust"], "127.0.0.1", 48485, numericLoopback: true);
|
|
Check("LocalhostSelfcheckUsesNumericLoopback",
|
|
["--selfcheck", "--demo-trust", "--endpoint", "opc.tcp://LOCALHOST:48486/Workcell"],
|
|
"127.0.0.1", 48486, numericLoopback: true);
|
|
Check("LocalhostAutomaticPortUsesNumericLoopback",
|
|
["--selfcheck", "--demo-trust", "--endpoint", "opc.tcp://localhost:0/Workcell"],
|
|
"127.0.0.1", 0, numericLoopback: true);
|
|
Check("ExplicitIpv4LoopbackIsPreserved",
|
|
["--server", "--demo-trust", "--endpoint", "opc.tcp://127.0.0.2:48486/Workcell"],
|
|
"127.0.0.2", 48486, numericLoopback: true);
|
|
Check("ExplicitIpv6LoopbackIsPreserved",
|
|
["--server", "--demo-trust", "--endpoint", "opc.tcp://[::1]:48486/Workcell"],
|
|
"::1", 48486, numericLoopback: true);
|
|
Check("Ipv6AutomaticPortIsPreserved",
|
|
["--selfcheck", "--demo-trust", "--endpoint", "opc.tcp://[::1]:0/Workcell"],
|
|
"::1", 0, numericLoopback: true);
|
|
Check("StrictTrustDnsIntentIsPreserved",
|
|
["--server", "--endpoint", "opc.tcp://workcell.example:48486/Workcell"],
|
|
"workcell.example", 48486, numericLoopback: false);
|
|
Check("StrictTrustIpv4IntentIsPreserved",
|
|
["--server", "--endpoint", "opc.tcp://192.0.2.10:48486/Workcell"],
|
|
"192.0.2.10", 48486, numericLoopback: false);
|
|
Check("StrictTrustIpv6IntentIsPreserved",
|
|
["--server", "--endpoint", "opc.tcp://[2001:db8::10]:48486/Workcell"],
|
|
"2001:db8::10", 48486, numericLoopback: false);
|
|
Reject("DemoWildcardIpv4IsRejected", "opc.tcp://0.0.0.0:48486/Workcell");
|
|
Reject("DemoWildcardIpv6IsRejected", "opc.tcp://[::]:48486/Workcell");
|
|
Reject("DemoNonloopbackDnsIsRejected", "opc.tcp://workcell.example:48486/Workcell");
|
|
Console.WriteLine("ENDPOINT_CONFIGURATION_VERIFIED passed=12 listeners_started=0");
|
|
}
|
|
|
|
/// <summary>
|
|
/// Checks the operating system's actual bound sockets before the encrypted self-check uses this endpoint.
|
|
/// </summary>
|
|
internal static void VerifyLoopbackListener(string url)
|
|
{
|
|
var endpoint = new Uri(url);
|
|
if (!IPAddress.TryParse(endpoint.DnsSafeHost, out IPAddress? expected) || !IPAddress.IsLoopback(expected))
|
|
{
|
|
throw new InvalidOperationException("The demo listener URL does not name a numeric loopback address.");
|
|
}
|
|
bool found = false;
|
|
int matches = 0;
|
|
foreach (IPEndPoint listener in IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpListeners())
|
|
{
|
|
if (listener.Port != endpoint.Port)
|
|
{
|
|
continue;
|
|
}
|
|
if (!IPAddress.IsLoopback(listener.Address))
|
|
{
|
|
throw new InvalidOperationException(
|
|
"A wildcard or nonloopback listener exists on the selected demo port.");
|
|
}
|
|
matches++;
|
|
found |= listener.Address.Equals(expected);
|
|
}
|
|
if (!found)
|
|
{
|
|
throw new InvalidOperationException("The selected loopback socket is not listening.");
|
|
}
|
|
Console.WriteLine(
|
|
$"LISTENER_BINDING_VERIFIED address={expected} family={expected.AddressFamily} " +
|
|
$"port={endpoint.Port} loopbackListeners={matches} wildcard=False");
|
|
}
|
|
|
|
/// <summary>
|
|
/// Evaluates the same URL-producing method that feeds AddServer and the self-check client.
|
|
/// </summary>
|
|
private static void Check(
|
|
string name, ArrayOf<string> arguments, string host, int port, bool numericLoopback)
|
|
{
|
|
SuiteOptions options = SuiteOptions.Parse(arguments);
|
|
var endpoint = new Uri(options.CreateListenerEndpoint());
|
|
if (endpoint.Scheme != "opc.tcp" ||
|
|
!string.Equals(endpoint.DnsSafeHost, host, StringComparison.OrdinalIgnoreCase) ||
|
|
(port == 0 ? endpoint.Port <= 0 : endpoint.Port != port) ||
|
|
(numericLoopback && (!IPAddress.TryParse(endpoint.DnsSafeHost, out IPAddress? address) ||
|
|
!IPAddress.IsLoopback(address))))
|
|
{
|
|
string expectedPort = port == 0 ? "automatic" : port.ToString(CultureInfo.InvariantCulture);
|
|
throw new InvalidOperationException(
|
|
$"{name}: expected host={host} port={expectedPort}; " +
|
|
$"actual={endpoint.AbsoluteUri}");
|
|
}
|
|
if (endpoint.AbsolutePath != new Uri(options.Endpoint).AbsolutePath)
|
|
{
|
|
throw new InvalidOperationException(name + ": the selected application path changed.");
|
|
}
|
|
Console.WriteLine($"PASS {name} {endpoint.AbsoluteUri}");
|
|
}
|
|
|
|
/// <summary>
|
|
/// Requires refusal before a wildcard or remote trust-exception configuration can reach a listener.
|
|
/// </summary>
|
|
private static void Reject(string name, string endpoint)
|
|
{
|
|
try
|
|
{
|
|
_ = SuiteOptions.Parse(["--server", "--demo-trust", "--endpoint", endpoint]);
|
|
}
|
|
catch (ArgumentException)
|
|
{
|
|
Console.WriteLine("PASS " + name);
|
|
return;
|
|
}
|
|
throw new InvalidOperationException(name + ": a nonloopback demo endpoint was accepted.");
|
|
}
|
|
}
|
|
}
|