GithubStar/UA-.NETStandard
1
0
Fork 0
mirror of https://github.com/OPCFoundation/UA-.NETStandard.git synced 2026-10-28 22:55:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #280 .Fix in logic for AutoAcceptUntrustedCertificates config flag

Browse Source
This commit is contained in:
AlinMoldovean
2017-11-10 17:21:10 +02:00
parent c5e8c35e8d
commit 7a0c536674
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SampleApplications/SDK/Opc.Ua.Configuration/ApplicationInstance.cs
+8 -6
View File
@@ -267,7 +267,7 @@ namespace Opc.Ua.Configuration
await LoadApplicationConfiguration(false);
}
if (m_applicationConfiguration.SecurityConfiguration != null && m_applicationConfiguration.SecurityConfiguration.AutoAcceptUntrustedCertificates)
if (m_applicationConfiguration.CertificateValidator != null)
{
m_applicationConfiguration.CertificateValidator.CertificateValidation += CertificateValidator_CertificateValidation;
}
@@ -328,9 +328,10 @@ namespace Opc.Ua.Configuration
try
{
if (configuration.SecurityConfiguration != null && configuration.SecurityConfiguration.AutoAcceptUntrustedCertificates)
if (configuration.CertificateValidator != null)
{
configuration.CertificateValidator.CertificateValidation += CertificateValidator_CertificateValidation;
ApplicationInstance applicationInstance = new ApplicationInstance(configuration);
configuration.CertificateValidator.CertificateValidation += applicationInstance.CertificateValidator_CertificateValidation;
}
m_server.Start(configuration);
@@ -341,7 +342,6 @@ namespace Opc.Ua.Configuration
Utils.Trace((int)Utils.TraceMasks.Error, error.ToLongString());
}
}
#endregion
#region Private Fields
@@ -1007,11 +1007,13 @@ namespace Opc.Ua.Configuration
/// <summary>
/// Handles a certificate validation error.
/// </summary>
private static void CertificateValidator_CertificateValidation(CertificateValidator validator, CertificateValidationEventArgs e)
private void CertificateValidator_CertificateValidation(CertificateValidator validator, CertificateValidationEventArgs e)
{
try
{
if (e.Error != null && e.Error.Code == StatusCodes.BadCertificateUntrusted)
if (m_applicationConfiguration.SecurityConfiguration != null
&& m_applicationConfiguration.SecurityConfiguration.AutoAcceptUntrustedCertificates
&& e.Error != null && e.Error.Code == StatusCodes.BadCertificateUntrusted)
{
e.Accept = true;
Utils.Trace((int)Utils.TraceMasks.Security, "Automatically accepted certificate: {0}", e.Certificate.Subject);