GithubStar/UA-.NETStandard
1
0
Fork 0
mirror of https://github.com/OPCFoundation/UA-.NETStandard.git synced 2026-10-26 04:19:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add Discovery Url null check in PatchEndpointUrl, fix AddUnsecurePolicyNone and MaxConnectionsPerServer warning (#2019)

Browse Source 
- Fix a null reference exception if an invalid discovery Url is returned by the server which cannot be parsed as Uri.
- Fix AddUnsecurePolicyNone to only add that policy.
- Fix a warning due to HttpHandler MaxConnectionsPerServer property
This commit is contained in:
Martin Regen
2022-12-12 06:55:30 +01:00
committed by GitHub
parent dd51122bde
commit fffa8bf4cb
3 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libraries/Opc.Ua.Configuration/ApplicationConfigurationBuilder.cs
+2 -1
View File
@@ -247,7 +247,8 @@ namespace Opc.Ua.Configuration
{
if (addPolicy)
{
AddSecurityPolicies(false, false, true);
var policies = ApplicationConfiguration.ServerConfiguration.SecurityPolicies;
InternalAddPolicy(policies, MessageSecurityMode.None, SecurityPolicies.None);
}
return this;
}
Stack/Opc.Ua.Bindings.Https/Stack/Https/HttpsTransportChannel.cs
+12 -11
View File
@@ -116,14 +116,19 @@ namespace Opc.Ua.Bindings
// auto validate server cert, if supported
// if unsupported, the TLS server cert must be trusted by a root CA
var handler = new HttpClientHandler
{
var handler = new HttpClientHandler {
ClientCertificateOptions = ClientCertificateOption.Manual,
MaxConnectionsPerServer = kMaxConnectionsPerServer,
AllowAutoRedirect = false,
MaxRequestContentBufferSize = m_quotas.MaxMessageSize,
};
// set property only if supported
var maxConnectionsPerServerProperty = handler.GetType().GetProperty("MaxConnectionsPerServer");
if (maxConnectionsPerServerProperty != null)
{
maxConnectionsPerServerProperty.SetValue(handler, kMaxConnectionsPerServer);
}
// send client certificate for servers that require TLS client authentication
if (m_settings.ClientCertificate != null)
{
@@ -148,8 +153,7 @@ namespace Opc.Ua.Bindings
try
{
serverCertificateCustomValidationCallback =
(httpRequestMessage, cert, chain, policyErrors) =>
{
(httpRequestMessage, cert, chain, policyErrors) => {
try
{
var validationChain = new X509Certificate2Collection();
@@ -246,8 +250,7 @@ namespace Opc.Ua.Bindings
}
var result = new HttpsAsyncResult(callback, callbackData, m_operationTimeout, request, null);
Task.Run(async () =>
{
Task.Run(async () => {
try
{
var ct = new CancellationTokenSource(m_operationTimeout).Token;
@@ -416,15 +419,13 @@ namespace Opc.Ua.Bindings
m_operationTimeout = settings.Configuration.OperationTimeout;
// initialize the quotas.
m_quotas = new ChannelQuotas
{
m_quotas = new ChannelQuotas {
MaxBufferSize = m_settings.Configuration.MaxBufferSize,
MaxMessageSize = m_settings.Configuration.MaxMessageSize,
ChannelLifetime = m_settings.Configuration.ChannelLifetime,
SecurityTokenLifetime = m_settings.Configuration.SecurityTokenLifetime,
MessageContext = new ServiceMessageContext
{
MessageContext = new ServiceMessageContext {
MaxArrayLength = m_settings.Configuration.MaxArrayLength,
MaxByteStringLength = m_settings.Configuration.MaxByteStringLength,
MaxMessageSize = m_settings.Configuration.MaxMessageSize,
Stack/Opc.Ua.Core/Stack/Client/DiscoveryClient.cs
+6
View File
@@ -273,6 +273,12 @@ namespace Opc.Ua
foreach (EndpointDescription discoveryEndPoint in endpoints)
{
Uri discoveryEndPointUri = Utils.ParseUri(discoveryEndPoint.EndpointUrl);
if (discoveryEndPointUri == null)
{
Utils.LogWarning("Discovery endpoint contains invalid Url: {0}", discoveryEndPoint.EndpointUrl);
continue;
}
if ((endpointUrl.Scheme == discoveryEndPointUri.Scheme) &&
(endpointUrl.Port == discoveryEndPointUri.Port))
{