Pass all globals through "require"

zcbenz · codebytere · commit a010945b8e0e · 2018-07-30T10:56:20.000-07:00
(cherry picked from commit 7d01541)
diff --git a/lib/internal/bootstrap/loaders.js b/lib/internal/bootstrap/loaders.js
@@ -70,6 +70,10 @@
     writable: false
   });
 
+  // Store the global context into a local variable, so we can refrence them in
+  // this scope even after we deleted them from global context.
+  const localGlobal = global;
+
   // Set up process.binding() and process._linkedBinding()
   {
     const bindingObj = ObjectCreate(null);
@@ -217,9 +221,10 @@
   };
 
   NativeModule.wrapper = [
-    '(function (exports, require, module, process) {',
-    '\n});'
-  ];
+    '(function (exports, require, module, process, global, Buffer) { ' +
+    'return function (exports, require, module, process) { ',
+    '\n}.call(this, exports, require, module, process); });'
+  ]
 
   const getOwn = (target, property, receiver) => {
     return ReflectApply(ObjectHasOwnProperty, target, [property]) ?
@@ -262,7 +267,7 @@
       const requireFn = this.id.startsWith('internal/deps/') ?
         NativeModule.requireForDeps :
         NativeModule.require;
-      fn(this.exports, requireFn, this, process);
+      fn(this.exports, requireFn, this, process, localGlobal, localGlobal.Buffer);
 
       if (config.experimentalModules && !NativeModule.isInternal(this.id)) {
         this.exportKeys = ObjectKeys(this.exports);
diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
@@ -80,6 +80,10 @@ const {
   CHAR_9,
 } = require('internal/constants');
 
+// Store the global context into a local variable, so we can refrence them in
+// this scope even after we deleted them from global context.
+const localGlobal = global;
+
 function stat(filename) {
   filename = path.toNamespacedPath(filename);
   const cache = stat.cache;
@@ -126,8 +130,9 @@ Module.wrap = function(script) {
 };
 
 Module.wrapper = [
-  '(function (exports, require, module, __filename, __dirname) { ',
-  '\n});'
+  '(function (exports, require, module, __filename, __dirname, process, global, Buffer) { ' +
+  'return function (exports, require, module, __filename, __dirname) { ',
+  '\n}.call(this, exports, require, module, __filename, __dirname); });'
 ];
 
 const debug = util.debuglog('module');
@@ -684,10 +689,12 @@ Module.prototype._compile = function(content, filename) {
   var result;
   if (inspectorWrapper) {
     result = inspectorWrapper(compiledWrapper, this.exports, this.exports,
-                              require, this, filename, dirname);
+                              require, this, filename, dirname, process,
+                              localGlobal, localGlobal.Buffer);
   } else {
     result = compiledWrapper.call(this.exports, this.exports, require, this,
-                                  filename, dirname);
+                                  filename, dirname, process, localGlobal,
+                                  localGlobal.Buffer);
   }
   if (depth === 0) stat.cache = null;
   return result;
