From a06fe4f71cb5803d572badb178df068692a85ecf Mon Sep 17 00:00:00 2001 From: Joao Silva Date: Wed, 12 Jun 2024 11:21:38 +0200 Subject: [PATCH 1/3] DQA-9566: DRUPAL_REVERSE_PROXY not properly set --- tests/fixtures/commands/drupal-settings-setup.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/fixtures/commands/drupal-settings-setup.yml b/tests/fixtures/commands/drupal-settings-setup.yml index 04dd76e26..11a2c17a5 100644 --- a/tests/fixtures/commands/drupal-settings-setup.yml +++ b/tests/fixtures/commands/drupal-settings-setup.yml @@ -40,8 +40,8 @@ $settings['file_temp_path'] = getenv('DRUPAL_FILE_TEMP_PATH') !== FALSE ? getenv('DRUPAL_FILE_TEMP_PATH') : '/tmp'; // Reverse proxy. - if (intval(getenv('DRUPAL_REVERSE_PROXY_ENABLE')) === 1) { - $settings['reverse_proxy'] = (bool) getenv('DRUPAL_REVERSE_PROXY_ENABLE'); + if (filter_var(getenv('DRUPAL_REVERSE_PROXY_ENABLE'), FILTER_VALIDATE_BOOLEAN)) { + $settings['reverse_proxy'] = getenv('DRUPAL_REVERSE_PROXY_ENABLE'); $settings['reverse_proxy_addresses'] = explode(',', getenv('DRUPAL_REVERSE_PROXY_ADDRESSES')); } @@ -103,8 +103,8 @@ $settings['file_temp_path'] = getenv('DRUPAL_FILE_TEMP_PATH') !== FALSE ? getenv('DRUPAL_FILE_TEMP_PATH') : '/tmp'; // Reverse proxy. - if (intval(getenv('DRUPAL_REVERSE_PROXY_ENABLE')) === 1) { - $settings['reverse_proxy'] = (bool) getenv('DRUPAL_REVERSE_PROXY_ENABLE'); + if (filter_var(getenv('DRUPAL_REVERSE_PROXY_ENABLE'), FILTER_VALIDATE_BOOLEAN)) { + $settings['reverse_proxy'] = getenv('DRUPAL_REVERSE_PROXY_ENABLE'); $settings['reverse_proxy_addresses'] = explode(',', getenv('DRUPAL_REVERSE_PROXY_ADDRESSES')); } @@ -167,8 +167,8 @@ $settings['file_temp_path'] = getenv('DRUPAL_FILE_TEMP_PATH') !== FALSE ? getenv('DRUPAL_FILE_TEMP_PATH') : '/tmp'; // Reverse proxy. - if (intval(getenv('DRUPAL_REVERSE_PROXY_ENABLE')) === 1) { - $settings['reverse_proxy'] = (bool) getenv('DRUPAL_REVERSE_PROXY_ENABLE'); + if (filter_var(getenv('DRUPAL_REVERSE_PROXY_ENABLE'), FILTER_VALIDATE_BOOLEAN)) { + $settings['reverse_proxy'] = getenv('DRUPAL_REVERSE_PROXY_ENABLE'); $settings['reverse_proxy_addresses'] = explode(',', getenv('DRUPAL_REVERSE_PROXY_ADDRESSES')); } From 2a4ef4f09c210fb5c79b7b0e262b6096061f74a4 Mon Sep 17 00:00:00 2001 From: Joao Silva Date: Wed, 12 Jun 2024 11:22:32 +0200 Subject: [PATCH 2/3] DQA-9566: Add missing change --- src/TaskRunner/Commands/DrupalCommands.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/TaskRunner/Commands/DrupalCommands.php b/src/TaskRunner/Commands/DrupalCommands.php index 3d3b98e1e..fa1bcfecb 100644 --- a/src/TaskRunner/Commands/DrupalCommands.php +++ b/src/TaskRunner/Commands/DrupalCommands.php @@ -620,8 +620,8 @@ protected function getToolkitSettingsBlock() \$settings['file_temp_path'] = getenv('DRUPAL_FILE_TEMP_PATH') !== FALSE ? getenv('DRUPAL_FILE_TEMP_PATH') : '/tmp'; // Reverse proxy. -if (intval(getenv('DRUPAL_REVERSE_PROXY_ENABLE')) === 1) { - \$settings['reverse_proxy'] = (bool) getenv('DRUPAL_REVERSE_PROXY_ENABLE'); +if (filter_var(getenv('DRUPAL_REVERSE_PROXY_ENABLE'), FILTER_VALIDATE_BOOLEAN)) { + \$settings['reverse_proxy'] = filter_var(getenv('DRUPAL_REVERSE_PROXY_ENABLE'), FILTER_VALIDATE_BOOLEAN); \$settings['reverse_proxy_addresses'] = explode(',', getenv('DRUPAL_REVERSE_PROXY_ADDRESSES')); } From b1f05a9a134328ddf20aa1db839663f1c648631f Mon Sep 17 00:00:00 2001 From: Joao Silva Date: Wed, 12 Jun 2024 11:23:44 +0200 Subject: [PATCH 3/3] DQA-9566: Set correct value --- src/TaskRunner/Commands/DrupalCommands.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TaskRunner/Commands/DrupalCommands.php b/src/TaskRunner/Commands/DrupalCommands.php index fa1bcfecb..e3ef8588c 100644 --- a/src/TaskRunner/Commands/DrupalCommands.php +++ b/src/TaskRunner/Commands/DrupalCommands.php @@ -621,7 +621,7 @@ protected function getToolkitSettingsBlock() // Reverse proxy. if (filter_var(getenv('DRUPAL_REVERSE_PROXY_ENABLE'), FILTER_VALIDATE_BOOLEAN)) { - \$settings['reverse_proxy'] = filter_var(getenv('DRUPAL_REVERSE_PROXY_ENABLE'), FILTER_VALIDATE_BOOLEAN); + \$settings['reverse_proxy'] = getenv('DRUPAL_REVERSE_PROXY_ENABLE'); \$settings['reverse_proxy_addresses'] = explode(',', getenv('DRUPAL_REVERSE_PROXY_ADDRESSES')); }