From 2991248c4766ad2c6cb1478ce19a4c47e20d7338 Mon Sep 17 00:00:00 2001 From: Jansen Price Date: Mon, 28 Sep 2020 09:35:13 -0500 Subject: [PATCH] Correctly ingest key passphrase for server key --- bin/orbit | 1 + src/Orbit/Config.php | 2 +- src/Orbit/Console.php | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/bin/orbit b/bin/orbit index e8bb951..9f0e46e 100755 --- a/bin/orbit +++ b/bin/orbit @@ -37,6 +37,7 @@ $args = new \Qi_Console_ArgV( 'hostname:' => 'Set hostname of server (default localhost)', 'tls-cert:' => 'Set cert PEM file to use (default null)', 'tls-key:' => 'Set private key PEM file to use (default null)', + 'tls-passphrase:' => 'Set passphrase for private key', 'root-dir:' => 'Set the file root directory', 'log:' => 'Set log filename (default orbit.log)', 'dev' => 'Allow developer server functions (default false)', diff --git a/src/Orbit/Config.php b/src/Orbit/Config.php index f107a0e..9b03e4a 100644 --- a/src/Orbit/Config.php +++ b/src/Orbit/Config.php @@ -73,7 +73,7 @@ class Config { $valid_keys = [ 'host', 'port', 'hostname', 'tls_certfile', - 'tls_keyfile', 'keypassphrase', 'log_file', 'log_level', + 'tls_keyfile', 'key_passphrase', 'log_file', 'log_level', 'root_dir', 'index_file', 'enable_directory_index', ]; diff --git a/src/Orbit/Console.php b/src/Orbit/Console.php index 1bf677a..48e72d9 100644 --- a/src/Orbit/Console.php +++ b/src/Orbit/Console.php @@ -102,6 +102,10 @@ class Console extends \Qi_Console_Client $config->tls_keyfile = $this->_args->get("tls-key"); } + if ($this->_args->get("tls-passphrase")) { + $config->key_passphrase = $this->_args->get("tls-passphrase"); + } + return $config; }