update

romanett · romanett · commit b088bcaa4c5e · 2025-11-20T08:15:39.000+01:00
diff --git a/Samples/GDS/Client/Controls/ApplicationCertificateControl.cs b/Samples/GDS/Client/Controls/ApplicationCertificateControl.cs
@@ -31,6 +31,7 @@
 using System;
 using System.Drawing;
 using System.IO;
+using System.Linq;
 using System.Security.Cryptography.X509Certificates;
 using System.Threading;
 using System.Threading.Tasks;
@@ -254,7 +255,7 @@ private async Task RequestNewCertificatePullModeAsync(object sender, EventArgs e
                         {
                             //create temporary cert to generate csr from
                             m_certificate = CertificateFactory.CreateCertificate(
-                                X509Utils.GetApplicationUriFromCertificate(m_certificate),
+                                X509Utils.GetApplicationUrisFromCertificate(m_certificate)[0],
                                 m_application.ApplicationName,
                                 Utils.ReplaceDCLocalhost(m_application.CertificateSubjectName),
                                 m_application.GetDomainNames(m_certificate))
diff --git a/Samples/Opc.Ua.Sample/SampleServer.UserAuthentication.cs b/Samples/Opc.Ua.Sample/SampleServer.UserAuthentication.cs
@@ -30,6 +30,7 @@
 using System;
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
+using Microsoft.Extensions.Logging;
 using Opc.Ua.Server;
 
 namespace Opc.Ua.Sample
@@ -81,7 +82,7 @@ private void SessionManager_ImpersonateUser(ISession session, ImpersonateEventAr
             {
                 VerifyPassword(userNameToken.UserName, Encoding.UTF8.GetString(userNameToken.DecryptedPassword));
                 args.Identity = new UserIdentity(userNameToken);
-                Utils.Trace("UserName Token Accepted: {0}", args.Identity.DisplayName);
+                m_logger.LogInformation("UserName Token Accepted: {0}", args.Identity.DisplayName);
                 return;
             }
 
@@ -92,7 +93,7 @@ private void SessionManager_ImpersonateUser(ISession session, ImpersonateEventAr
             {
                 VerifyCertificate(x509Token.Certificate);
                 args.Identity = new UserIdentity(x509Token);
-                Utils.Trace("X509 Token Accepted: {0}", args.Identity.DisplayName);
+                m_logger.LogInformation("X509 Token Accepted: {0}", args.Identity.DisplayName);
                 return;
             }
         }
@@ -129,11 +130,11 @@ private void VerifyCertificate(X509Certificate2 certificate)
             {
                 if (m_certificateValidator != null)
                 {
-                    m_certificateValidator.Validate(certificate);
+                    m_certificateValidator.ValidateAsync(certificate, System.Threading.CancellationToken.None).GetAwaiter().GetResult();
                 }
                 else
                 {
-                    CertificateValidator.Validate(certificate);
+                    CertificateValidator.ValidateAsync(certificate, System.Threading.CancellationToken.None).GetAwaiter().GetResult();
                 }
             }
             catch (Exception e)
diff --git a/Workshop/Aggregation/Server/AggregationNodeManager.cs b/Workshop/Aggregation/Server/AggregationNodeManager.cs
@@ -872,7 +872,7 @@ protected override void OnDeleteMonitoredItemsComplete(ServerSystemContext conte
                 }
                 catch (Exception e)
                 {
-                    Utils.Trace(e, "Could not access external system.");
+                    m_logger.LogError(e, "Could not access external system.");
                 }
             }
         }
@@ -1093,13 +1093,13 @@ public override ServiceResult SubscribeToEvents(
 
                     if (ServiceResult.IsBad(request.Status.Error))
                     {
-                        Utils.Trace((int)Utils.TraceMasks.Error, "Could not create event item. {0}", request.Status.Error.ToLongString());
+                        m_logger.LogError("Could not create event item. {0}", request.Status.Error.ToLongString());
                     }
                 }
             }
             catch (Exception e)
             {
-                Utils.Trace(e, "Could not access external system.");
+                m_logger.LogError(e, "Could not access external system.");
             }
 
             return ServiceResult.Good;
@@ -1262,7 +1262,7 @@ Opc.Ua.Client.ISession GetClientSession(ServerSystemContext context)
 
             try
             {
-                Utils.Trace($"Create Connect Session: {m_endpoint} for {sessionName}");
+                m_logger.LogInformation($"Create Connect Session: {m_endpoint} for {sessionName}");
                 var session = Opc.Ua.Client.Session.CreateAsync(
                     m_configuration,
                     m_reverseConnectManager,
@@ -1299,7 +1299,7 @@ Opc.Ua.Client.ISession GetClientSession(ServerSystemContext context)
             }
             catch (Exception e)
             {
-                Utils.Trace(e, "Could not connect to server.");
+                m_logger.LogError(e, "Could not connect to server.");
 
                 lock (m_clientsLock)
                 {
@@ -1441,7 +1441,7 @@ private async void DoMetadataUpdateAsync(object state)
             }
             catch (Exception e)
             {
-                Utils.Trace(e, "Unexpected error updating event type cache.");
+                m_logger.LogError(e, "Unexpected error updating event type cache.");
             }
             finally
             {
@@ -1655,7 +1655,7 @@ private void Client_KeepAlive(Opc.Ua.Client.ISession session, Opc.Ua.Client.Keep
         {
             if (e.Status != null && ServiceResult.IsNotGood(e.Status))
             {
-                Utils.Trace("{0} {1}/{2}", e.Status, session.OutstandingRequestCount, session.DefunctRequestCount);
+                m_logger.LogDebug("{ 0} {1}/{2}", e.Status, session.OutstandingRequestCount, session.DefunctRequestCount);
                 var totalBadRequestCount = session.OutstandingRequestCount + session.DefunctRequestCount;
                 Opc.Ua.Client.SessionReconnectHandler reconnectHandler;
                 if (totalBadRequestCount >= 3 &&
@@ -1666,15 +1666,15 @@ private void Client_KeepAlive(Opc.Ua.Client.ISession session, Opc.Ua.Client.Keep
                         AggregationClientSession clientSession = m_clients.Where(c => c.Value?.SessionSessionId == session.SessionId).FirstOrDefault().Value;
                         if (clientSession != null && clientSession.ReconnectHandler == null)
                         {
-                            Utils.Trace($"--- RECONNECTING --- SessionId: {clientSession.ClientSessionId}");
+                            m_logger.LogInformation($"--- RECONNECTING --- SessionId: {clientSession.ClientSessionId}");
                             reconnectHandler = new Opc.Ua.Client.SessionReconnectHandler(true);
                             reconnectHandler.BeginReconnect(session, m_reverseConnectManager, DefaultReconnectPeriod, Client_ReconnectComplete);
                             clientSession.ReconnectHandler = reconnectHandler;
                             e.CancelKeepAlive = true;
                         }
                         else if (clientSession == null)
                         {
-                            Utils.Trace($"--- KEEP ALIVE for stale session --- SessionId: {session.SessionId}");
+                            m_logger.LogWarning($"--- KEEP ALIVE for stale session --- SessionId: {session.SessionId}");
                         }
                     }
                 }
@@ -1696,7 +1696,7 @@ private void Client_ReconnectComplete(object sender, EventArgs e)
                 AggregationClientSession clientSession = m_clients.Where(c => Object.ReferenceEquals(reconnectHandler, c.Value?.ReconnectHandler)).FirstOrDefault().Value;
                 if (clientSession == null)
                 {
-                    Utils.Trace($"--- RECONNECTED --- SessionId: {clientSession.ClientSessionId} but client session was not found.");
+                    m_logger.LogInformation($"--- RECONNECTED --- SessionId: {clientSession.ClientSessionId} but client session was not found.");
                     return;
                 }
 
@@ -1711,7 +1711,7 @@ private void Client_ReconnectComplete(object sender, EventArgs e)
                     Utils.SilentDispose(oldSession);
                 }
                 reconnectHandler.Dispose();
-                Utils.Trace($"--- RECONNECTED --- SessionId: {clientSession.ClientSessionId}");
+                m_logger.LogInformation($"--- RECONNECTED --- SessionId: {clientSession.ClientSessionId}");
             }
         }
 
diff --git a/Workshop/UserAuthentication/Server/UserAuthenticationServer.cs b/Workshop/UserAuthentication/Server/UserAuthenticationServer.cs
@@ -40,6 +40,7 @@
 using System.Runtime.InteropServices;
 using Opc.Ua;
 using Opc.Ua.Server;
+using Microsoft.Extensions.Logging;
 
 namespace Quickstarts.UserAuthenticationServer
 {
@@ -96,7 +97,7 @@ protected override void OnServerStarted(IServerInternal server)
         /// </remarks>
         protected override MasterNodeManager CreateMasterNodeManager(IServerInternal server, ApplicationConfiguration configuration)
         {
-            Utils.Trace("Creating the Node Managers.");
+            m_logger.LogInformation("Creating the Node Managers.");
 
             List<INodeManager> nodeManagers = new List<INodeManager>();
 
@@ -169,8 +170,7 @@ private void CreateUserIdentityValidators(ApplicationConfiguration configuration
 
                     if (trustedIssuers == null)
                     {
-                        Utils.Trace(
-                            (int)Utils.TraceMasks.Error,
+                        m_logger.LogError(
                             "Could not load CertificateTrustList for UserTokenPolicy {0}",
                             policy.PolicyId);
 
@@ -208,7 +208,7 @@ private void SessionManager_ImpersonateUser(ISession session, ImpersonateEventAr
             {
                 VerifyPassword(userNameToken.UserName, Encoding.UTF8.GetString(userNameToken.DecryptedPassword));
                 args.Identity = new UserIdentity(userNameToken);
-                Utils.Trace("UserName Token Accepted: {0}", args.Identity.DisplayName);
+                m_logger.LogInformation("UserName Token Accepted: {0}", args.Identity.DisplayName);
                 return;
             }
 
@@ -219,7 +219,7 @@ private void SessionManager_ImpersonateUser(ISession session, ImpersonateEventAr
             {
                 VerifyCertificate(x509Token.Certificate);
                 args.Identity = new UserIdentity(x509Token);
-                Utils.Trace("X509 Token Accepted: {0}", args.Identity.DisplayName);
+                m_logger.LogInformation("X509 Token Accepted: {0}", args.Identity.DisplayName);
                 return;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@`
`30`	`30`	`using System;`
`31`	`31`	`using System.Security.Cryptography.X509Certificates;`
`32`	`32`	`using System.Text;`
	`33`	`+using Microsoft.Extensions.Logging;`
`33`	`34`	`using Opc.Ua.Server;`
`34`	`35`
`35`	`36`	`namespace Opc.Ua.Sample`
`@@ -81,7 +82,7 @@ private void SessionManager_ImpersonateUser(ISession session, ImpersonateEventAr`
`81`	`82`	`{`
`82`	`83`	`VerifyPassword(userNameToken.UserName, Encoding.UTF8.GetString(userNameToken.DecryptedPassword));`
`83`	`84`	`args.Identity = new UserIdentity(userNameToken);`
`84`		`- Utils.Trace("UserName Token Accepted: {0}", args.Identity.DisplayName);`
	`85`	`+ m_logger.LogInformation("UserName Token Accepted: {0}", args.Identity.DisplayName);`
`85`	`86`	`return;`
`86`	`87`	`}`
`87`	`88`
`@@ -92,7 +93,7 @@ private void SessionManager_ImpersonateUser(ISession session, ImpersonateEventAr`
`92`	`93`	`{`
`93`	`94`	`VerifyCertificate(x509Token.Certificate);`
`94`	`95`	`args.Identity = new UserIdentity(x509Token);`
`95`		`- Utils.Trace("X509 Token Accepted: {0}", args.Identity.DisplayName);`
	`96`	`+ m_logger.LogInformation("X509 Token Accepted: {0}", args.Identity.DisplayName);`
`96`	`97`	`return;`
`97`	`98`	`}`
`98`	`99`	`}`
`@@ -129,11 +130,11 @@ private void VerifyCertificate(X509Certificate2 certificate)`
`129`	`130`	`{`
`130`	`131`	`if (m_certificateValidator != null)`
`131`	`132`	`{`
`132`		`- m_certificateValidator.Validate(certificate);`
	`133`	`+ m_certificateValidator.ValidateAsync(certificate, System.Threading.CancellationToken.None).GetAwaiter().GetResult();`
`133`	`134`	`}`
`134`	`135`	`else`
`135`	`136`	`{`
`136`		`- CertificateValidator.Validate(certificate);`
	`137`	`+ CertificateValidator.ValidateAsync(certificate, System.Threading.CancellationToken.None).GetAwaiter().GetResult();`
`137`	`138`	`}`
`138`	`139`	`}`
`139`	`140`	`catch (Exception e)`
Original file line number	Diff line number	Diff line change
`@@ -872,7 +872,7 @@ protected override void OnDeleteMonitoredItemsComplete(ServerSystemContext conte`
`872`	`872`	`}`
`873`	`873`	`catch (Exception e)`
`874`	`874`	`{`
`875`		`- Utils.Trace(e, "Could not access external system.");`
	`875`	`+ m_logger.LogError(e, "Could not access external system.");`
`876`	`876`	`}`
`877`	`877`	`}`
`878`	`878`	`}`
`@@ -1093,13 +1093,13 @@ public override ServiceResult SubscribeToEvents(`
`1093`	`1093`
`1094`	`1094`	`if (ServiceResult.IsBad(request.Status.Error))`
`1095`	`1095`	`{`
`1096`		`- Utils.Trace((int)Utils.TraceMasks.Error, "Could not create event item. {0}", request.Status.Error.ToLongString());`
	`1096`	`+ m_logger.LogError("Could not create event item. {0}", request.Status.Error.ToLongString());`
`1097`	`1097`	`}`
`1098`	`1098`	`}`
`1099`	`1099`	`}`
`1100`	`1100`	`catch (Exception e)`
`1101`	`1101`	`{`
`1102`		`- Utils.Trace(e, "Could not access external system.");`
	`1102`	`+ m_logger.LogError(e, "Could not access external system.");`
`1103`	`1103`	`}`
`1104`	`1104`
`1105`	`1105`	`return ServiceResult.Good;`
`@@ -1262,7 +1262,7 @@ Opc.Ua.Client.ISession GetClientSession(ServerSystemContext context)`
`1262`	`1262`
`1263`	`1263`	`try`
`1264`	`1264`	`{`
`1265`		`- Utils.Trace($"Create Connect Session: {m_endpoint} for {sessionName}");`
	`1265`	`+ m_logger.LogInformation($"Create Connect Session: {m_endpoint} for {sessionName}");`
`1266`	`1266`	`var session = Opc.Ua.Client.Session.CreateAsync(`
`1267`	`1267`	`m_configuration,`
`1268`	`1268`	`m_reverseConnectManager,`
`@@ -1299,7 +1299,7 @@ Opc.Ua.Client.ISession GetClientSession(ServerSystemContext context)`
`1299`	`1299`	`}`
`1300`	`1300`	`catch (Exception e)`
`1301`	`1301`	`{`
`1302`		`- Utils.Trace(e, "Could not connect to server.");`
	`1302`	`+ m_logger.LogError(e, "Could not connect to server.");`
`1303`	`1303`
`1304`	`1304`	`lock (m_clientsLock)`
`1305`	`1305`	`{`
`@@ -1441,7 +1441,7 @@ private async void DoMetadataUpdateAsync(object state)`
`1441`	`1441`	`}`
`1442`	`1442`	`catch (Exception e)`
`1443`	`1443`	`{`
`1444`		`- Utils.Trace(e, "Unexpected error updating event type cache.");`
	`1444`	`+ m_logger.LogError(e, "Unexpected error updating event type cache.");`
`1445`	`1445`	`}`
`1446`	`1446`	`finally`
`1447`	`1447`	`{`
`@@ -1655,7 +1655,7 @@ private void Client_KeepAlive(Opc.Ua.Client.ISession session, Opc.Ua.Client.Keep`
`1655`	`1655`	`{`
`1656`	`1656`	`if (e.Status != null && ServiceResult.IsNotGood(e.Status))`
`1657`	`1657`	`{`
`1658`		`- Utils.Trace("{0} {1}/{2}", e.Status, session.OutstandingRequestCount, session.DefunctRequestCount);`
	`1658`	`+ m_logger.LogDebug("{ 0} {1}/{2}", e.Status, session.OutstandingRequestCount, session.DefunctRequestCount);`
`1659`	`1659`	`var totalBadRequestCount = session.OutstandingRequestCount + session.DefunctRequestCount;`
`1660`	`1660`	`Opc.Ua.Client.SessionReconnectHandler reconnectHandler;`
`1661`	`1661`	`if (totalBadRequestCount >= 3 &&`
`@@ -1666,15 +1666,15 @@ private void Client_KeepAlive(Opc.Ua.Client.ISession session, Opc.Ua.Client.Keep`
`1666`	`1666`	`AggregationClientSession clientSession = m_clients.Where(c => c.Value?.SessionSessionId == session.SessionId).FirstOrDefault().Value;`
`1667`	`1667`	`if (clientSession != null && clientSession.ReconnectHandler == null)`
`1668`	`1668`	`{`
`1669`		`- Utils.Trace($"--- RECONNECTING --- SessionId: {clientSession.ClientSessionId}");`
	`1669`	`+ m_logger.LogInformation($"--- RECONNECTING --- SessionId: {clientSession.ClientSessionId}");`
`1670`	`1670`	`reconnectHandler = new Opc.Ua.Client.SessionReconnectHandler(true);`
`1671`	`1671`	`reconnectHandler.BeginReconnect(session, m_reverseConnectManager, DefaultReconnectPeriod, Client_ReconnectComplete);`
`1672`	`1672`	`clientSession.ReconnectHandler = reconnectHandler;`
`1673`	`1673`	`e.CancelKeepAlive = true;`
`1674`	`1674`	`}`
`1675`	`1675`	`else if (clientSession == null)`
`1676`	`1676`	`{`
`1677`		`- Utils.Trace($"--- KEEP ALIVE for stale session --- SessionId: {session.SessionId}");`
	`1677`	`+ m_logger.LogWarning($"--- KEEP ALIVE for stale session --- SessionId: {session.SessionId}");`
`1678`	`1678`	`}`
`1679`	`1679`	`}`
`1680`	`1680`	`}`
`@@ -1696,7 +1696,7 @@ private void Client_ReconnectComplete(object sender, EventArgs e)`
`1696`	`1696`	`AggregationClientSession clientSession = m_clients.Where(c => Object.ReferenceEquals(reconnectHandler, c.Value?.ReconnectHandler)).FirstOrDefault().Value;`
`1697`	`1697`	`if (clientSession == null)`
`1698`	`1698`	`{`
`1699`		`- Utils.Trace($"--- RECONNECTED --- SessionId: {clientSession.ClientSessionId} but client session was not found.");`
	`1699`	`+ m_logger.LogInformation($"--- RECONNECTED --- SessionId: {clientSession.ClientSessionId} but client session was not found.");`
`1700`	`1700`	`return;`
`1701`	`1701`	`}`
`1702`	`1702`
`@@ -1711,7 +1711,7 @@ private void Client_ReconnectComplete(object sender, EventArgs e)`
`1711`	`1711`	`Utils.SilentDispose(oldSession);`
`1712`	`1712`	`}`
`1713`	`1713`	`reconnectHandler.Dispose();`
`1714`		`- Utils.Trace($"--- RECONNECTED --- SessionId: {clientSession.ClientSessionId}");`
	`1714`	`+ m_logger.LogInformation($"--- RECONNECTED --- SessionId: {clientSession.ClientSessionId}");`
`1715`	`1715`	`}`
`1716`	`1716`	`}`
`1717`	`1717`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@`
`40`	`40`	`using System.Runtime.InteropServices;`
`41`	`41`	`using Opc.Ua;`
`42`	`42`	`using Opc.Ua.Server;`
	`43`	`+using Microsoft.Extensions.Logging;`
`43`	`44`
`44`	`45`	`namespace Quickstarts.UserAuthenticationServer`
`45`	`46`	`{`
`@@ -96,7 +97,7 @@ protected override void OnServerStarted(IServerInternal server)`
`96`	`97`	`/// </remarks>`
`97`	`98`	`protected override MasterNodeManager CreateMasterNodeManager(IServerInternal server, ApplicationConfiguration configuration)`
`98`	`99`	`{`
`99`		`- Utils.Trace("Creating the Node Managers.");`
	`100`	`+ m_logger.LogInformation("Creating the Node Managers.");`
`100`	`101`
`101`	`102`	`List<INodeManager> nodeManagers = new List<INodeManager>();`
`102`	`103`
`@@ -169,8 +170,7 @@ private void CreateUserIdentityValidators(ApplicationConfiguration configuration`
`169`	`170`
`170`	`171`	`if (trustedIssuers == null)`
`171`	`172`	`{`
`172`		`- Utils.Trace(`
`173`		`- (int)Utils.TraceMasks.Error,`
	`173`	`+ m_logger.LogError(`
`174`	`174`	`"Could not load CertificateTrustList for UserTokenPolicy {0}",`
`175`	`175`	`policy.PolicyId);`
`176`	`176`
`@@ -208,7 +208,7 @@ private void SessionManager_ImpersonateUser(ISession session, ImpersonateEventAr`
`208`	`208`	`{`
`209`	`209`	`VerifyPassword(userNameToken.UserName, Encoding.UTF8.GetString(userNameToken.DecryptedPassword));`
`210`	`210`	`args.Identity = new UserIdentity(userNameToken);`
`211`		`- Utils.Trace("UserName Token Accepted: {0}", args.Identity.DisplayName);`
	`211`	`+ m_logger.LogInformation("UserName Token Accepted: {0}", args.Identity.DisplayName);`
`212`	`212`	`return;`
`213`	`213`	`}`
`214`	`214`
`@@ -219,7 +219,7 @@ private void SessionManager_ImpersonateUser(ISession session, ImpersonateEventAr`
`219`	`219`	`{`
`220`	`220`	`VerifyCertificate(x509Token.Certificate);`
`221`	`221`	`args.Identity = new UserIdentity(x509Token);`
`222`		`- Utils.Trace("X509 Token Accepted: {0}", args.Identity.DisplayName);`
	`222`	`+ m_logger.LogInformation("X509 Token Accepted: {0}", args.Identity.DisplayName);`
`223`	`223`	`return;`
`224`	`224`	`}`
`225`	`225`	`}`