crypto: fix globalThis.crypto this check

panva · RafaelGSS · commit f7dba5bef7ac · 2023-01-05T13:11:34.000-03:00
PR-URL: #45857 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git a/lib/internal/process/pre_execution.js b/lib/internal/process/pre_execution.js
@@ -23,6 +23,7 @@ const {
 } = require('internal/util');
 
 const {
+  ERR_INVALID_THIS,
   ERR_MANIFEST_ASSERT_INTEGRITY,
   ERR_NO_CRYPTO,
 } = require('internal/errors').codes;
@@ -278,7 +279,15 @@ function setupWebCrypto() {
 
   if (internalBinding('config').hasOpenSSL) {
     defineReplaceableLazyAttribute(
-      globalThis, 'internal/crypto/webcrypto', ['crypto'], false
+      globalThis,
+      'internal/crypto/webcrypto',
+      ['crypto'],
+      false,
+      function cryptoThisCheck() {
+        if (this !== globalThis && this != null)
+          throw new ERR_INVALID_THIS(
+            'nullish or must be the global object');
+      }
     );
     exposeLazyInterfaces(
       globalThis, 'internal/crypto/webcrypto',
diff --git a/lib/internal/util.js b/lib/internal/util.js
@@ -552,14 +552,17 @@ function defineLazyProperties(target, id, keys, enumerable = true) {
   ObjectDefineProperties(target, descriptors);
 }
 
-function defineReplaceableLazyAttribute(target, id, keys, writable = true) {
+function defineReplaceableLazyAttribute(target, id, keys, writable = true, check) {
   let mod;
   for (let i = 0; i < keys.length; i++) {
     const key = keys[i];
     let value;
     let setterCalled = false;
 
     function get() {
+      if (check !== undefined) {
+        FunctionPrototypeCall(check, this);
+      }
       if (setterCalled) {
         return value;
       }
diff --git a/test/wpt/status/WebCryptoAPI.json b/test/wpt/status/WebCryptoAPI.json
@@ -17,13 +17,5 @@
   },
   "historical.any.js": {
     "skip": "Not relevant in Node.js context"
-  },
-  "idlharness.https.any.js": {
-    "fail": {
-      "expected": [
-        "CryptoKey interface: existence and properties of interface object",
-        "Window interface: attribute crypto"
-      ]
-    }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -17,13 +17,5 @@`
`17`	`17`	`},`
`18`	`18`	`"historical.any.js": {`
`19`	`19`	`"skip": "Not relevant in Node.js context"`
`20`		`- },`
`21`		`- "idlharness.https.any.js": {`
`22`		`- "fail": {`
`23`		`- "expected": [`
`24`		`- "CryptoKey interface: existence and properties of interface object",`
`25`		`- "Window interface: attribute crypto"`
`26`		`- ]`
`27`		`- }`
`28`	`20`	`}`
`29`	`21`	`}`