Fixes #1302. Use value from OnReadUserAccessLevel at Read/WriteNonVal…

…ueAttribute if handler exists. (#1413)
OPCFoundation · May 31, 2021 · 8406716 · 8406716
1 parent afe352c
commit 8406716
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/Stack/Opc.Ua.Core/Stack/State/BaseVariableState.cs b/Stack/Opc.Ua.Core/Stack/State/BaseVariableState.cs
@@ -1486,7 +1486,11 @@ public override void SetStatusCode(ISystemContext context, StatusCode statusCode
                 return StatusCodes.BadNotReadable;
             }
 
-            if ((m_userAccessLevel & AccessLevels.CurrentRead) == 0)
+            // check the user access level for the variable.
+            byte userAccessLevel = m_userAccessLevel;
+            OnReadUserAccessLevel?.Invoke(context, this, ref userAccessLevel);
+
+            if ((userAccessLevel & AccessLevels.CurrentRead) == 0)
             {
                 return StatusCodes.BadUserAccessDenied;
             }
@@ -1867,7 +1871,11 @@ public override void SetStatusCode(ISystemContext context, StatusCode statusCode
                 return StatusCodes.BadNotWritable;
             }
 
-            if ((m_userAccessLevel & AccessLevels.CurrentWrite) == 0)
+            // check the user access level for the variable.
+            byte userAccessLevel = m_userAccessLevel;
+            OnReadUserAccessLevel?.Invoke(context, this, ref userAccessLevel);
+
+            if ((userAccessLevel & AccessLevels.CurrentWrite) == 0)
             {
                 return StatusCodes.BadUserAccessDenied;
             }