378962eeb1
The AdminUI OPC UA browse picker connected to the EndpointUrl the server advertised in GetEndpoints verbatim, so behind NAT / a container port publish it dialled the server's private hostname + internal port and failed DNS where the runtime driver (which rewrites per #676) connected. - Move the rewrite to the shared OpcUaEndpointUrlRewriter (.Contracts, pure Uri logic, no SDK dependency) and the policy+mode selection to OpcUaEndpointSelection (.Session leaf). Driver and browser both select through it, so the browse connects exactly where the driver does. - Policy/mode filter, server certificate and strict browse PKI (no auto-accept) are unchanged. - Unit tests: rewrite (host/port differ, same, IPv6 both sides, path kept, port-less, scheme mismatch untouched), browser selection seam. - Live NAT tests (Fixture=opc-plc-nat, OPCUA_NAT_ENDPOINT): browse via a published port with a premise check that the advertised host:port differs and does not resolve, nsu= round-trip, unreachable endpoint fails cleanly, SignAndEncrypt reaches the server and is refused BadCertificateUntrusted. Verified red without the rewrite. Refs #806
44 lines
2.8 KiB
C#
44 lines
2.8 KiB
C#
namespace ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient;
|
|
|
|
/// <summary>
|
|
/// The ONE implementation of "connect where the operator pointed us, not where the server says it lives" for the
|
|
/// OpcUaClient driver family. A server reports its GetEndpoints results with ITS view of its own address; behind
|
|
/// NAT, a port map, a container port publish or a proxy that address is unreachable from here (or bypasses the
|
|
/// proxy). Shared by the runtime driver (Gitea #676) and the AdminUI live-browse picker (Gitea #806, which used
|
|
/// the advertised URL unchanged and failed DNS on a published-port fixture the driver handled).
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// Pure string/<see cref="Uri"/> logic, deliberately in <c>.Contracts</c>: it is not session-typed, so it must not
|
|
/// pull the OPC UA SDK in (pinned by <c>ContractsIsDependencyLightTests</c>). It only chooses the network
|
|
/// address; the security policy, mode and server certificate of the selected endpoint are untouched, so the
|
|
/// secure-channel certificate check still validates the server actually reached.
|
|
/// </remarks>
|
|
public static class OpcUaEndpointUrlRewriter
|
|
{
|
|
/// <summary>
|
|
/// The address to open the session on. When the advertised URL's scheme matches the configured one, the
|
|
/// configured host AND port (when it names one) replace the advertised ones and the advertised path is kept —
|
|
/// the SDK's own <c>CoreClientUtils.SelectEndpoint</c> rule. A different scheme is a different transport and is
|
|
/// left alone; an unparseable advertised URL falls back to the configured one.
|
|
/// </summary>
|
|
/// <param name="advertisedUrl">The <c>EndpointUrl</c> the server returned from GetEndpoints.</param>
|
|
/// <param name="configuredUrl">The URL the operator configured (the one GetEndpoints was sent to).</param>
|
|
/// <returns>The URL to connect the session to.</returns>
|
|
public static string Rewrite(string? advertisedUrl, string configuredUrl)
|
|
{
|
|
if (!Uri.TryCreate(configuredUrl, UriKind.Absolute, out var configured)) return advertisedUrl ?? configuredUrl;
|
|
if (string.IsNullOrWhiteSpace(advertisedUrl)
|
|
|| !Uri.TryCreate(advertisedUrl, UriKind.Absolute, out var advertised))
|
|
return configuredUrl;
|
|
if (!string.Equals(advertised.Scheme, configured.Scheme, StringComparison.OrdinalIgnoreCase)) return advertisedUrl;
|
|
// A port-less configured URL (Uri.Port == -1 for opc.tcp) keeps the advertised port — copying -1 would drop it
|
|
// and the SDK would fall back to 4840 (review of 3b88056f; same fix as the client's EndpointSelector).
|
|
var builder = new UriBuilder(advertised)
|
|
{
|
|
Host = configured.DnsSafeHost,
|
|
Port = configured.Port > 0 ? configured.Port : advertised.Port,
|
|
};
|
|
return builder.Uri.ToString();
|
|
}
|
|
}
|