bug fix

LavaMoat · Oct 27, 2024 · 8f7b09f · 8f7b09f
1 parent ef04847
commit 8f7b09f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/src/hook.js b/src/hook.js
@@ -1,7 +1,7 @@
 const workaroundChromiumBug = require('./chromium_bug_workaround');
 const {getLength} = require('./common');
 const {shadows, toArray, getFramesArray, getContentWindowOfFrame, getOwnerWindowOfNode} = require('./utils');
-const {Object, getFrameElement, Function} = require('./natives');
+const {Object, getFrameElement, Function, isConnected} = require('./natives');
 const {forEachOpened} = require('./proxy');
 
 function isCrossOrigin(dst, src) {
@@ -24,6 +24,9 @@ function findWin(win, frameElement) {
     }
     for (let i = 0; i < shadows.length; i++) {
         const shadow = shadows[i];
+        if (!isConnected(shadow)) {
+            continue;
+        }
         const owner = getOwnerWindowOfNode(shadow);
         if (owner !== win) {
             continue;
@@ -32,9 +35,6 @@ function findWin(win, frameElement) {
         for (let j = 0; j < frames.length; j++) {
             const frame = frames[j];
             const win = getContentWindowOfFrame(frame);
-            if (win === null) {
-                continue;
-            }
             if (frame === frameElement) {
                 return win;
             }

diff --git a/src/natives.js b/src/natives.js
@@ -92,6 +92,7 @@ function setup(win) {
         push: Object.getOwnPropertyDescriptor(Array.prototype, 'push').value,
         split: Object.getOwnPropertyDescriptor(String.prototype, 'split').value,
         nodeType: Object.getOwnPropertyDescriptor(Node.prototype, 'nodeType').get,
+        isConnected: Object.getOwnPropertyDescriptor(Node.prototype, 'isConnected').get,
         tagName: Object.getOwnPropertyDescriptor(Element.prototype, 'tagName').get,
         getInnerHTML: Object.getOwnPropertyDescriptor(Element.prototype, 'innerHTML').get,
         setInnerHTML: Object.getOwnPropertyDescriptor(Element.prototype, 'innerHTML').set,
@@ -137,6 +138,7 @@ function setup(win) {
         push,
         split,
         nodeType,
+        isConnected,
         tagName,
         toString,
         getOnload,
@@ -207,6 +209,10 @@ function setup(win) {
         return bag.nodeType.call(node);
     }
 
+    function isConnected(node) {
+        return bag.isConnected.call(node);
+    }
+
     function tagName(element) {
         return bag.tagName.call(element);
     }

diff --git a/src/shadow.js b/src/shadow.js
@@ -1,11 +1,11 @@
 const hook = require('./hook');
 const {getFramesArray, shadows} = require('./utils');
-const {Object, Function} = require('./natives');
+const {Object, Function, isConnected} = require('./natives');
 
 function protectShadows(connectedOnly) {
     for (let i = 0; i < shadows.length; i++) {
         const shadow = shadows[i];
-        if (connectedOnly && !shadow.isConnected) {
+        if (connectedOnly && !isConnected(shadow)) {
             continue;
         }
         const frames = getFramesArray(shadow, false);