src: whitelist v8 options with '_' or '-'

V8 options allow either '_' or '-' to be used in options as a seperator, such as "--abort-on_uncaught-exception". Allow these case variations when used with NODE_OPTIONS. PR-URL: #14093 Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: James M Snell <[email protected]>

Author: sam-github

doc/api/cli.md

@@ -466,7 +466,7 @@ Node options that are allowed are:
 
 V8 options that are allowed are:
 -`--abort-on-uncaught-exception`
--`--max_old_space_size`
+-`--max-old-space-size`
 
 ### `NODE_PENDING_DEPRECATION=1`
 <!-- YAML

src/node.cc

@@ -3729,15 +3729,34 @@ static void PrintHelp(){
 }
 
 
+staticboolArgIsAllowed(constchar* arg, constchar* allowed){
+for (; *arg && *allowed; arg++, allowed++){
+// Like normal strcmp(), except that a '_' in `allowed` matches either a '-'
+// or '_' in `arg`.
+if (*allowed == '_'){
+if (!(*arg == '_' || *arg == '-'))
+returnfalse;
+ } else{
+if (*arg != *allowed)
+returnfalse;
+ }
+ }
+
+// "--some-arg=val" is allowed for "--some-arg"
+if (*arg == '=')
+returntrue;
+
+// Both must be null, or one string is just a prefix of the other, not a
+// match.
+return !*arg && !*allowed;
+}
+
+
 staticvoidCheckIfAllowedInEnv(constchar* exe, bool is_env,
 constchar* arg){
 if (!is_env)
 return;
 
-// Find the arg prefix when its --some_arg=val
-constchar* eq = strchr(arg, '=');
-size_t arglen = eq ? eq - arg : strlen(arg);
-
 staticconstchar* whitelist[] ={
 // Node options, sorted in `node --help` order for ease of comparison.
 "--require", "-r",
@@ -3765,14 +3784,14 @@ static void CheckIfAllowedInEnv(const char* exe, bool is_env,
 "--openssl-config",
 "--icu-data-dir",
 
-// V8 options
-"--abort-on-uncaught-exception",
+// V8 options (define with '_', which allows '-' or '_')
+"--abort_on_uncaught_exception",
 "--max_old_space_size",
  };
 
 for (unsigned i = 0; i < arraysize(whitelist); i++){
 constchar* allowed = whitelist[i];
-if (strlen(allowed) == arglen && strncmp(allowed, arg, arglen) == 0)
+if (ArgIsAllowed(arg, allowed))
 return;
  }
 

test/parallel/test-cli-node-options.js

@@ -26,6 +26,7 @@ disallow('--interactive');
 disallow('-i');
 disallow('--v8-options');
 disallow('--');
+disallow('--no_warnings');// Node options don't allow '_' instead of '-'.
 
 functiondisallow(opt){
 constoptions={env: {NODE_OPTIONS: opt}};
@@ -40,7 +41,6 @@ function disallow(opt){
 
 constprintA=require.resolve('../fixtures/printA.js');
 
-expect('--abort-on-uncaught-exception','B\n');
 expect(`-r ${printA}`,'A\nB\n');
 expect('--no-deprecation','B\n');
 expect('--no-warnings','B\n');
@@ -59,8 +59,13 @@ if (common.hasCrypto){
 expect('--openssl-config=_ossl_cfg','B\n');
 }
 
-// V8 options
+// V8 options
+expect('--abort-on-uncaught-exception','B\n');
+expect('--abort_on_uncaught_exception','B\n');
+expect('--abort_on-uncaught_exception','B\n');
 expect('--max_old_space_size=0','B\n');
+expect('--max-old_space-size=0','B\n');
+expect('--max-old-space-size=0','B\n');
 
 functionexpect(opt,want){
 constprintB=require.resolve('../fixtures/printB.js');