Permalink
Browse files

src: remove has_experimental_policy option

This would be set when `--experimental-policy` was set,
but since an empty string does not refer to a valid file,
we can just check the value of `--experimental-policy`
directly.

PR-URL: #25628
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
Reviewed-By: Minwoo Jung <minwoo@nodesource.com>
  • Loading branch information...
addaleax committed Jan 21, 2019
1 parent 0640b09 commit 7cc51531a72c2a2f120243bf8265224d8ce839b9
Showing with 3 additions and 8 deletions.
  1. +2 −2 lib/internal/bootstrap/node.js
  2. +1 −1 lib/internal/modules/cjs/loader.js
  3. +0 −4 src/node_options.cc
  4. +0 −1 src/node_options.h
@@ -172,10 +172,10 @@ function startup() {
}

// TODO(joyeecheung): move this down further to get better snapshotting
if (getOptionValue('[has_experimental_policy]')) {
const experimentalPolicy = getOptionValue('--experimental-policy');
if (experimentalPolicy) {
process.emitWarning('Policies are experimental.',
'ExperimentalWarning');
const experimentalPolicy = getOptionValue('--experimental-policy');
const { pathToFileURL, URL } = NativeModule.require('url');
// URL here as it is slightly different parsing
// no bare specifiers for now
@@ -45,7 +45,7 @@ const { getOptionValue } = require('internal/options');
const preserveSymlinks = getOptionValue('--preserve-symlinks');
const preserveSymlinksMain = getOptionValue('--preserve-symlinks-main');
const experimentalModules = getOptionValue('--experimental-modules');
const manifest = getOptionValue('[has_experimental_policy]') ?
const manifest = getOptionValue('--experimental-policy') ?
require('internal/process/policy').manifest :
null;

@@ -143,15 +143,11 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
"experimental ES Module support and caching modules",
&EnvironmentOptions::experimental_modules,
kAllowedInEnvironment);
AddOption("[has_experimental_policy]",
"",
&EnvironmentOptions::has_experimental_policy);
AddOption("--experimental-policy",
"use the specified file as a "
"security policy",
&EnvironmentOptions::experimental_policy,
kAllowedInEnvironment);
Implies("--experimental-policy", "[has_experimental_policy]");
AddOption("--experimental-repl-await",
"experimental await keyword support in REPL",
&EnvironmentOptions::experimental_repl_await,
@@ -95,7 +95,6 @@ class EnvironmentOptions : public Options {
bool abort_on_uncaught_exception = false;
bool experimental_modules = false;
std::string experimental_policy;
bool has_experimental_policy;
bool experimental_repl_await = false;
bool experimental_vm_modules = false;
bool expose_internals = false;

0 comments on commit 7cc5153

Please sign in to comment.