ae91e6b7f7
#816 finding: the SDK checks that the server certificate names the host only when a session is created with checkDomain:true. The driver, the AdminUI browser and Client.Shared all called the 8-argument DefaultSessionFactory.CreateAsync, which forwards checkDomain:false — so no host-name check ever ran (why a trusted NAT cert for *.invalid browsed fine over an IP in #813). When enabled the SDK (Session.OpenAsync -> ValidateDomains -> FindDomain) compares ConfiguredEndpoint.EndpointUrl.IdnHost — the CONFIGURED host, because OpcUaEndpointSelection/EndpointSelector rewrote the advertised one — against the cert's DNS/IP SANs; secured sessions only, and the auto-accept handler accepts a mismatch. Policy: certificateValidation.validateServerHostName, tri-state. Unset = OpcUaCertificateValidationOptions.DefaultValidateServerHostName = false, the pre-#816 behaviour, so nothing changes on upgrade; true = validate the configured host; false = explicit NAT/port-publish opt-out. Threaded into the driver, the AdminUI browser (same JSON) and the AdminUI form (a select that keeps "unset" unset), Client.Shared ConnectionSettings.ValidateServerHostName and the CLI --validate-host-name. A driver refusal names the opt-out. #818: the NAT fixture's /app/pki is on the opc-plc-nat-pki volume (verified: same thumbprint across --force-recreate), its PUBLIC cert is committed as Docker/nat/opc-plc-nat-server.der, and NatPublishedEndpointBrowseTests run every secure browse on a throwaway PKI (internal browser seam): refusal with nothing trusted, positive with the cert trusted (unset/false host check), and a BadCertificateHostNameInvalid refusal with the check on. The trusted cert is OPCUA_NAT_SERVER_CERT or the committed one (skip on thumbprint mismatch); OPCUA_NAT_SERVER_CERT_TRUSTED is retired. CI exports its throwaway NAT container's public cert. ServerHostNameValidationTests pin the driver against the plain opc-plc. MIN_EXECUTED not raised (needs a hosted run): +6 in v2-integration (440 -> 446), documented in scripts/ci/README.md.
46 lines
1.8 KiB
C#
46 lines
1.8 KiB
C#
using Opc.Ua;
|
|
using Opc.Ua.Client;
|
|
using Serilog;
|
|
|
|
namespace ZB.MOM.WW.OtOpcUa.Client.Shared.Adapters;
|
|
|
|
/// <summary>
|
|
/// Production session factory that creates real OPC UA sessions.
|
|
/// </summary>
|
|
internal sealed class DefaultSessionFactory : ISessionFactory
|
|
{
|
|
private static readonly ILogger Logger = Log.ForContext<DefaultSessionFactory>();
|
|
|
|
/// <inheritdoc />
|
|
public async Task<ISessionAdapter> CreateSessionAsync(
|
|
ApplicationConfiguration config,
|
|
EndpointDescription endpoint,
|
|
string sessionName,
|
|
uint sessionTimeoutMs,
|
|
UserIdentity identity,
|
|
bool validateServerHostName,
|
|
CancellationToken ct)
|
|
{
|
|
var endpointConfig = EndpointConfiguration.Create(config);
|
|
var configuredEndpoint = new ConfiguredEndpoint(null, endpoint, endpointConfig);
|
|
|
|
var created = await new Opc.Ua.Client.DefaultSessionFactory(ClientTelemetry.Context).CreateAsync(
|
|
config,
|
|
configuredEndpoint,
|
|
false, // updateBeforeConnect
|
|
// #816: the overload without checkDomain hard-codes false. The endpoint URL here is the operator's host
|
|
// (EndpointSelector rewrote the advertised one), so that is the host the certificate is checked against.
|
|
validateServerHostName, // checkDomain
|
|
sessionName,
|
|
sessionTimeoutMs,
|
|
identity,
|
|
default,
|
|
ct);
|
|
var session = created as Session
|
|
?? throw new InvalidOperationException(
|
|
$"Session factory returned {created.GetType().Name}, expected {nameof(Session)}.");
|
|
|
|
Logger.Information("Session created: {SessionName} -> {EndpointUrl}", sessionName, endpoint.EndpointUrl);
|
|
return new DefaultSessionAdapter(session, config.CertificateManager as IDisposable);
|
|
}
|
|
} |