Merge remote-tracking branch 'origin/master' into ecc_support

mrsuciu · Aug 6, 2024 · c6b0cc3 · c6b0cc3
2 parents 88e1ac6 + 02761c7
commit c6b0cc3
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/Fuzzing/Encoders/Fuzz.Tests/Opc.Ua.Encoders.Fuzz.Tests.csproj b/Fuzzing/Encoders/Fuzz.Tests/Opc.Ua.Encoders.Fuzz.Tests.csproj
@@ -18,10 +18,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="NUnit" Version="4.1.0" />
-    <PackageReference Include="NUnit.Console" Version="3.17.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0">
+    <PackageReference Include="NUnit.Console" Version="3.18.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

diff --git a/Libraries/Opc.Ua.Server/Diagnostics/AuditEvents.cs b/Libraries/Opc.Ua.Server/Diagnostics/AuditEvents.cs
@@ -1095,8 +1095,8 @@ public static void ReportCertificateUpdateRequestedAuditEvent(
                        "CertificateUpdateRequestedAuditEvent",
                        "en-US",
                        "CertificateUpdateRequestedAuditEvent.");
-                
-                
+
+
 
                 e.Initialize(
                    systemContext,
@@ -1374,7 +1374,7 @@ public static void ReportAuditCloseSecureChannelEvent(
                 }
                 if (exception is ServiceResultException sre)
                 {
-                    statusCode = sre.InnerResult.StatusCode;
+                    statusCode = sre.InnerResult?.StatusCode ?? StatusCodes.Uncertain;
                 }
 
                 ISystemContext systemContext = server.DefaultAuditContext;

diff --git a/Libraries/Opc.Ua.Server/Diagnostics/DiagnosticsNodeManager.cs b/Libraries/Opc.Ua.Server/Diagnostics/DiagnosticsNodeManager.cs
@@ -783,6 +783,8 @@ public void CreateServerDiagnostics(
                 if (array1 != null)
                 {
                     array1.OnSimpleReadValue = OnReadDiagnosticsArray;
+                    // Hook the OnReadUserRolePermissions callback to control which user roles can access the services on this node
+                    array1.OnReadUserRolePermissions = OnReadUserRolePermissions;
                 }
 
                 // set up handler for session security diagnostics array.
@@ -793,6 +795,8 @@ public void CreateServerDiagnostics(
                 if (array2 != null)
                 {
                     array2.OnSimpleReadValue = OnReadDiagnosticsArray;
+                    // Hook the OnReadUserRolePermissions callback to control which user roles can access the services on this node
+                    array2.OnReadUserRolePermissions = OnReadUserRolePermissions;
                 }
 
                 // set up handler for subscription security diagnostics array.
@@ -1406,20 +1410,20 @@ private ServiceResult OnReadUserRolePermissions(
             NodeState node,
             ref RolePermissionTypeCollection value)
         {
-            bool admitUser;
+            bool adminUser;
 
             if ((node.NodeId == VariableIds.Server_ServerDiagnostics_ServerDiagnosticsSummary) ||
                  (node.NodeId == VariableIds.Server_ServerDiagnostics_SubscriptionDiagnosticsArray))
             {
-                admitUser = HasApplicationSecureAdminAccess(context);
+                adminUser = HasApplicationSecureAdminAccess(context);
             }
             else
             {
-                admitUser = (node.NodeId == context.SessionId) ||
+                adminUser = (node.NodeId == context.SessionId) ||
                             HasApplicationSecureAdminAccess(context);
             }
 
-            if (admitUser)
+            if (adminUser)
             {
                 var rolePermissionTypes = from roleId in m_kWellKnownRoles
                                           select new RolePermissionType() {

diff --git a/Tests/Opc.Ua.PubSub.Tests/Opc.Ua.PubSub.Tests.csproj b/Tests/Opc.Ua.PubSub.Tests/Opc.Ua.PubSub.Tests.csproj
@@ -27,7 +27,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="NunitXml.TestLogger" Version="4.0.254" />
+    <PackageReference Include="NunitXml.TestLogger" Version="3.1.20" />
     <PackageReference Include="Moq" Version="4.20.70" />
     <PackageReference Include="coverlet.collector" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>