From 119d31f8c469a5191092d9d8c64b41d2b4af2669 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Thu, 19 Sep 2019 22:16:04 -0700
Subject: [PATCH 1/2] src: add buildflag to force context-aware addons

---
 doc/api/cli.md      | 8 ++++++++
 doc/api/errors.md   | 5 +++++
 src/node_binding.cc | 8 ++++++++
 src/node_errors.h   | 3 +++
 src/node_options.cc | 4 ++++
 src/node_options.h  | 1 +
 6 files changed, 29 insertions(+)

diff --git a/doc/api/cli.md b/doc/api/cli.md
index af54fbe7c030ca..92a6a48e27d2b1 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -427,6 +427,13 @@ added: v6.0.0
 
 Silence all process warnings (including deprecations).
 
+### `--force-context-aware`
+<!-- YAML
+added: REPLACEME
+-->
+
+Disable loading non-context-aware native addons.
+
 ### `--openssl-config=file`
 <!-- YAML
 added: v6.9.0
@@ -996,6 +1003,7 @@ Node.js options that are allowed are:
 * `--experimental-report`
 * `--experimental-vm-modules`
 * `--experimental-wasm-modules`
+* `--force-context-aware`
 * `--force-fips`
 * `--frozen-intrinsics`
 * `--heapsnapshot-signal`
diff --git a/doc/api/errors.md b/doc/api/errors.md
index 989811fea90188..34412648b327b6 100644
--- a/doc/api/errors.md
+++ b/doc/api/errors.md
@@ -1611,6 +1611,11 @@ OpenSSL crypto support.
 An attempt was made to use features that require [ICU][], but Node.js was not
 compiled with ICU support.
 
+<a id="ERR_NON_CONTEXT_AWARE_DISABLED"></a>
+### ERR_NON_CONTEXT_AWARE_DISABLED
+
+A non-context-aware native addon was loaded in a process that disallows them.
+
 <a id="ERR_OUT_OF_RANGE"></a>
 ### ERR_OUT_OF_RANGE
 
diff --git a/src/node_binding.cc b/src/node_binding.cc
index c51a892e1bcd3d..fe077e1d92eebd 100644
--- a/src/node_binding.cc
+++ b/src/node_binding.cc
@@ -1,4 +1,5 @@
 #include "node_binding.h"
+#include "node_errors.h"
 #include <atomic>
 #include "env-inl.h"
 #include "node_native_module_env.h"
@@ -463,6 +464,13 @@ void DLOpen(const FunctionCallbackInfo<Value>& args) {
     }
 
     if (mp != nullptr) {
+      if (mp->nm_context_register_func == nullptr) {
+        if (env->options()->force_context_aware) {
+          dlib->Close();
+          THROW_ERR_NON_CONTEXT_AWARE_DISABLED(env);
+          return false;
+        }
+      }
       mp->nm_dso_handle = dlib->handle_;
       dlib->SaveInGlobalHandleMap(mp);
     } else {
diff --git a/src/node_errors.h b/src/node_errors.h
index 261c6077bb8054..f6fca6c690a1d2 100644
--- a/src/node_errors.h
+++ b/src/node_errors.h
@@ -52,6 +52,7 @@ void PrintErrorString(const char* format, ...);
   V(ERR_MISSING_MESSAGE_PORT_IN_TRANSFER_LIST, TypeError)                    \
   V(ERR_MISSING_PASSPHRASE, TypeError)                                       \
   V(ERR_MISSING_PLATFORM_FOR_WORKER, Error)                                  \
+  V(ERR_NON_CONTEXT_AWARE_DISABLED, Error)                                   \
   V(ERR_MODULE_NOT_FOUND, Error)                                             \
   V(ERR_OUT_OF_RANGE, RangeError)                                            \
   V(ERR_SCRIPT_EXECUTION_INTERRUPTED, Error)                                 \
@@ -96,6 +97,8 @@ void PrintErrorString(const char* format, ...);
   V(ERR_MISSING_PLATFORM_FOR_WORKER,                                         \
     "The V8 platform used by this instance of Node does not support "        \
     "creating Workers")                                                      \
+  V(ERR_NON_CONTEXT_AWARE_DISABLED,                                          \
+    "Loading non context-aware native modules has been disabled")            \
   V(ERR_SCRIPT_EXECUTION_INTERRUPTED,                                        \
     "Script execution was interrupted by `SIGINT`")                          \
   V(ERR_TRANSFERRING_EXTERNALIZED_SHAREDARRAYBUFFER,                         \
diff --git a/src/node_options.cc b/src/node_options.cc
index 286218fb19f4f7..c0e5b035f75aef 100644
--- a/src/node_options.cc
+++ b/src/node_options.cc
@@ -393,6 +393,10 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
             "silence all process warnings",
             &EnvironmentOptions::no_warnings,
             kAllowedInEnvironment);
+  AddOption("--force-context-aware",
+            "disable loading non-context-aware addons",
+            &EnvironmentOptions::force_context_aware,
+            kAllowedInEnvironment);
   AddOption("--pending-deprecation",
             "emit pending deprecation warnings",
             &EnvironmentOptions::pending_deprecation,
diff --git a/src/node_options.h b/src/node_options.h
index a15944aed99cfd..cb00a5533952bd 100644
--- a/src/node_options.h
+++ b/src/node_options.h
@@ -117,6 +117,7 @@ class EnvironmentOptions : public Options {
   bool no_deprecation = false;
   bool no_force_async_hooks_checks = false;
   bool no_warnings = false;
+  bool force_context_aware = false;
   bool pending_deprecation = false;
   bool preserve_symlinks = false;
   bool preserve_symlinks_main = false;

From bcef0546d0f43bdd83fff46248c076de2e709ec0 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Fri, 20 Sep 2019 21:01:43 -0700
Subject: [PATCH 2/2] test: --force-context-aware cli flag

---
 doc/api/cli.md                              |  3 ++-
 test/addons/force-context-aware/binding.cc  |  6 ++++++
 test/addons/force-context-aware/binding.gyp |  9 +++++++++
 test/addons/force-context-aware/index.js    |  4 ++++
 test/addons/force-context-aware/test.js     | 13 +++++++++++++
 test/addons/zlib-binding/test.js            |  2 ++
 6 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 test/addons/force-context-aware/binding.cc
 create mode 100644 test/addons/force-context-aware/binding.gyp
 create mode 100644 test/addons/force-context-aware/index.js
 create mode 100644 test/addons/force-context-aware/test.js

diff --git a/doc/api/cli.md b/doc/api/cli.md
index 92a6a48e27d2b1..c705601e5b0620 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -432,7 +432,7 @@ Silence all process warnings (including deprecations).
 added: REPLACEME
 -->
 
-Disable loading non-context-aware native addons.
+Disable loading native addons that are not [context-aware][].
 
 ### `--openssl-config=file`
 <!-- YAML
@@ -1236,3 +1236,4 @@ greater than `4` (its current default value). For more information, see the
 [experimental ECMAScript Module]: esm.html#esm_resolve_hook
 [libuv threadpool documentation]: http://docs.libuv.org/en/latest/threadpool.html
 [remote code execution]: https://www.owasp.org/index.php/Code_Injection
+[context-aware]: addons.html#addons_context_aware_addons
diff --git a/test/addons/force-context-aware/binding.cc b/test/addons/force-context-aware/binding.cc
new file mode 100644
index 00000000000000..4f302fbd558a8a
--- /dev/null
+++ b/test/addons/force-context-aware/binding.cc
@@ -0,0 +1,6 @@
+#include <node.h>
+#include <v8.h>
+
+void init(v8::Local<v8::Object> exports) {}
+
+NODE_MODULE(NODE_GYP_MODULE_NAME, init)
diff --git a/test/addons/force-context-aware/binding.gyp b/test/addons/force-context-aware/binding.gyp
new file mode 100644
index 00000000000000..55fbe7050f18e4
--- /dev/null
+++ b/test/addons/force-context-aware/binding.gyp
@@ -0,0 +1,9 @@
+{
+  'targets': [
+    {
+      'target_name': 'binding',
+      'sources': [ 'binding.cc' ],
+      'includes': ['../common.gypi'],
+    }
+  ]
+}
diff --git a/test/addons/force-context-aware/index.js b/test/addons/force-context-aware/index.js
new file mode 100644
index 00000000000000..17b9a0ad1ef969
--- /dev/null
+++ b/test/addons/force-context-aware/index.js
@@ -0,0 +1,4 @@
+'use strict';
+const common = require('../../common');
+
+require(`./build/${common.buildType}/binding`);
diff --git a/test/addons/force-context-aware/test.js b/test/addons/force-context-aware/test.js
new file mode 100644
index 00000000000000..d5264463a79997
--- /dev/null
+++ b/test/addons/force-context-aware/test.js
@@ -0,0 +1,13 @@
+'use strict';
+const common = require('../../common');
+const childProcess = require('child_process');
+const assert = require('assert');
+const path = require('path');
+
+const mod = path.join('test', 'addons', 'force-context-aware', 'index.js');
+
+const execString = `"${process.execPath}" --force-context-aware ./${mod}`;
+childProcess.exec(execString, common.mustCall((err) => {
+  const errMsg = 'Loading non context-aware native modules has been disabled';
+  assert.strictEqual(err.message.includes(errMsg), true);
+}));
diff --git a/test/addons/zlib-binding/test.js b/test/addons/zlib-binding/test.js
index b50817aa5d4687..7fad9129cd3931 100644
--- a/test/addons/zlib-binding/test.js
+++ b/test/addons/zlib-binding/test.js
@@ -1,3 +1,5 @@
+// Flags: --force-context-aware
+
 'use strict';
 
 const common = require('../../common');