From 2d4775afef9ebe130889e7275d3521926ba42677 Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Tue, 28 Mar 2017 08:56:39 +0200 Subject: [PATCH 1/2] src: add --use-bundled-ca --use-openssl-ca check The --use-bundled-ca and --use-openssl-ca command line arguments are mutually exclusive but can both be used on the same command line. This commit adds a check if both options are used. Fixes: https://github.com/nodejs/node/issues/12083 PR-URL: https://github.com/nodejs/node/pull/12087 Reviewed-By: Ben Noordhuis Reviewed-By: Gibson Fahnestock Reviewed-By: Colin Ihrig Reviewed-By: Richard Lau Reviewed-By: Sam Roberts --- src/node.cc | 13 ++++++++++ test/parallel/test-openssl-ca-options.js | 31 ++++++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 test/parallel/test-openssl-ca-options.js diff --git a/src/node.cc b/src/node.cc index 8928b676cb2e34..29a0321880dd53 100644 --- a/src/node.cc +++ b/src/node.cc @@ -3632,6 +3632,7 @@ static void ParseArgs(int* argc, const char** new_exec_argv = new const char*[nargs]; const char** new_v8_argv = new const char*[nargs]; const char** new_argv = new const char*[nargs]; + const char** local_preload_modules = new const char*[nargs]; bool use_bundled_ca = false; bool use_openssl_ca = false; @@ -3747,7 +3748,9 @@ static void ParseArgs(int* argc, default_cipher_list = arg + 18; } else if (strncmp(arg, "--use-openssl-ca", 16) == 0) { ssl_openssl_cert_store = true; + use_openssl_ca = true; } else if (strncmp(arg, "--use-bundled-ca", 16) == 0) { + use_bundled_ca = true; ssl_openssl_cert_store = false; #if NODE_FIPS_MODE } else if (strcmp(arg, "--enable-fips") == 0) { @@ -3782,6 +3785,16 @@ static void ParseArgs(int* argc, index += args_consumed; } +#if HAVE_OPENSSL + if (use_openssl_ca && use_bundled_ca) { + fprintf(stderr, + "%s: either --use-openssl-ca or --use-bundled-ca can be used, " + "not both\n", + argv[0]); + exit(9); + } +#endif + // Copy remaining arguments. const unsigned int args_left = nargs - index; diff --git a/test/parallel/test-openssl-ca-options.js b/test/parallel/test-openssl-ca-options.js new file mode 100644 index 00000000000000..f27976fab7c16c --- /dev/null +++ b/test/parallel/test-openssl-ca-options.js @@ -0,0 +1,31 @@ +'use strict'; +// This test checks the usage of --use-bundled-ca and --use-openssl-ca arguments +// to verify that both are not used at the same time. +const common = require('../common'); +if (!common.hasCrypto) { + common.skip('missing crypto'); + return; +} +const assert = require('assert'); +const os = require('os'); +const childProcess = require('child_process'); +const result = childProcess.spawnSync(process.execPath, [ + '--use-bundled-ca', + '--use-openssl-ca', + '-p', 'process.version'], + {encoding: 'utf8'}); + +assert.strictEqual(result.stderr, + process.execPath + ': either --use-openssl-ca or ' + + '--use-bundled-ca can be used, not both' + os.EOL); +assert.strictEqual(result.status, 9); + +const useBundledCA = childProcess.spawnSync(process.execPath, [ + '--use-bundled-ca', + '-p', 'process.version']); +assert.strictEqual(useBundledCA.status, 0); + +const useOpenSSLCA = childProcess.spawnSync(process.execPath, [ + '--use-openssl-ca', + '-p', 'process.version']); +assert.strictEqual(useOpenSSLCA.status, 0); From 063fd1819f30759a1f096a013dd84952738dcbd9 Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Mon, 10 Apr 2017 15:13:24 +0200 Subject: [PATCH 2/2] src: guard bundled_ca/openssl_ca with HAVE_OPENSSL Currently, the following warning will be reported when configuring without-ssl: ../src/node.cc:3653:8: warning: unused variable 'use_bundled_ca' [-Wunused-variable] bool use_bundled_ca = false; ^ ../src/node.cc:3654:8: warning: unused variable 'use_openssl_ca' [-Wunused-variable] bool use_openssl_ca = false; ^ I missed this when working on commit 8a7db9d4b5798679045d7a4f6f62243ba4be5b8c ("src: add --use-bundled-ca --use-openssl-ca check"). Refs: https://github.com/nodejs/node/pull/12087 PR-URL: https://github.com/nodejs/node/pull/12302 Reviewed-By: Colin Ihrig Reviewed-By: Richard Lau Reviewed-By: Anna Henningsen --- src/node.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/node.cc b/src/node.cc index 29a0321880dd53..fa824728aaaa03 100644 --- a/src/node.cc +++ b/src/node.cc @@ -3633,8 +3633,10 @@ static void ParseArgs(int* argc, const char** new_v8_argv = new const char*[nargs]; const char** new_argv = new const char*[nargs]; const char** local_preload_modules = new const char*[nargs]; +#if HAVE_OPENSSL bool use_bundled_ca = false; bool use_openssl_ca = false; +#endif // HAVE_OPENSSL for (unsigned int i = 0; i < nargs; ++i) { new_exec_argv[i] = nullptr;