node-opcua-address-space 2.187.11 → 2.187.16

package/impl/address_space.ts

@@ -942,7 +942,7 @@ export class AddressSpaceImpl implements AddressSpacePrivate {
      *
      *
      */
-    public browsePath(browsePath: BrowsePath): BrowsePathResult {
+    public browsePath(browsePath: BrowsePath, context?: ISessionContext): BrowsePathResult {
         assert(browsePath instanceof BrowsePath);
 
         const startingNode = this.findNode(browsePath.startingNode);
@@ -989,10 +989,21 @@ export class AddressSpaceImpl implements AddressSpacePrivate {
 
         const res: BrowsePathTargetOptions[] = [];
 
+        // a node the context cannot browse is invisible: neither followed nor returned
+        const isBrowseDenied = (nodeId: NodeId): boolean => {
+            if (!context) {
+                return false;
+            }
+            const node = this.findNode(nodeId);
+            return !!node && context.isBrowseAccessRestricted(node);
+        };
+
         const explore_element = (curNodeObject: BaseNode, elements: RelativePathElement[], index: number) => {
             const element = elements[index];
             const is_last = index + 1 === elements.length;
-            const nodeIds = curNodeObject.browseNodeByTargetName(element, is_last);
+            const nodeIds = curNodeObject
+                .browseNodeByTargetName(element, is_last)
+                .filter((nodeId: NodeId) => !isBrowseDenied(nodeId));
             const targets = nodeIds.map((nodeId: NodeId) => {
                 return {
                     remainingPathIndex: elements.length - index,

package/impl/base_node_private.ts

@@ -811,7 +811,7 @@ function _clone_collection_new(
 
             // also clone or instantiate interface members that may be required in the optionals
             extraInfo.level++;
-            _cloneInterface(nodeToClone, clonedNode, node, optionalFilter, extraInfo, browseNameMap);
+            _cloneInterface(nodeToClone, clonedNode, node, copyAlsoModellingRules, optionalFilter, extraInfo, browseNameMap);
             extraInfo.level--;
             // === clone);
             // extraInfo.registerClonedObject(clone, node);
@@ -900,6 +900,7 @@ function _cloneInterface(
     nodeToClone: UAObject | UAVariable | UAMethod | UAObjectType | UAVariableType,
     clonedNode: BaseNode,
     node: UAObject | UAVariable | UAMethod,
+    copyAlsoModellingRules: boolean,
     optionalFilter: CloneFilter,
     extraInfo: CloneExtraInfo,
     browseNameMap: Set<string>
@@ -949,7 +950,7 @@ function _cloneInterface(
                 `\n${extraInfo?.pad()}`,
                 aggregates.map((r) => r.toString({ addressSpace })).join(`\n${extraInfo?.pad()}`)
             );
-        _clone_collection_new(nodeToClone, clonedNode, aggregates, false, localFilter, extraInfo, browseNameMap);
+        _clone_collection_new(nodeToClone, clonedNode, aggregates, copyAlsoModellingRules, localFilter, extraInfo, browseNameMap);
     }
 }