From da26838a16c41a1923ff2cc8d9beaf35deb44d6e Mon Sep 17 00:00:00 2001
From: Joe Corall <jjc223@lehigh.edu>
Date: Thu, 21 Sep 2023 19:10:04 -0400
Subject: [PATCH] Drupal 10 support (#289)

* Remove pipe flag from drush

* Also fix reverse_proxy_trusted_headers
---
 drupal/rootfs/etc/islandora/utilities.sh               | 10 +++++-----
 .../share/drush/Commands/UpdateSettingsCommands.php    |  4 +++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/drupal/rootfs/etc/islandora/utilities.sh b/drupal/rootfs/etc/islandora/utilities.sh
index 250f49bb..cfc938a3 100755
--- a/drupal/rootfs/etc/islandora/utilities.sh
+++ b/drupal/rootfs/etc/islandora/utilities.sh
@@ -481,7 +481,7 @@ function configure_islandora_module {
 # Configure Solr port and host.
 function configure_islandora_default_module {
     local site site_url host port
-    if ! drush pm-list --pipe --type=module --status=enabled --no-core | grep -q search_api; then
+    if ! drush pm-list --format=string --type=module --status=enabled --no-core | grep -q search_api; then
         echo "Search API is not installed.  Skipping configuration"
         return 0
     fi
@@ -514,7 +514,7 @@ function configure_search_api_solr_module {
 # Enables and sets carapace as the default theme.
 function set_carapace_default_theme {
     local site site_url
-    if ! drush pm-list --pipe --type=theme --status=enabled --no-core | grep -q carapace; then
+    if ! drush pm-list --format=string --type=theme --status=enabled --no-core | grep -q carapace; then
         echo "carapace is not available. Skipping configuration."
         return 0
     fi
@@ -569,7 +569,7 @@ function create_solr_core {
 # Generate solr config and create a core for it.
 function create_solr_core_with_default_config {
     local site
-    if ! drush pm-list --pipe --type=module --status=enabled --no-core | grep -q search_api_solr; then
+    if ! drush pm-list --format=string --type=module --status=enabled --no-core | grep -q search_api_solr; then
         echo "search_api_solr is not installed.  Skipping core setup."
         return 0
     fi
@@ -584,7 +584,7 @@ function create_solr_core_with_default_config {
 function configure_matomo_module {
     local site site_url site_id matomo_url matomo_http_url
 
-    if ! drush pm-list --pipe --type=module --status=enabled --no-core | grep -q matomo; then
+    if ! drush pm-list --format=string --type=module --status=enabled --no-core | grep -q matomo; then
         echo "matomo is not installed.  Skipping configuration"
         return 0
     fi
@@ -605,7 +605,7 @@ function configure_matomo_module {
 function configure_openseadragon {
     local site site_url cantaloupe_url
 
-    if ! drush pm-list --pipe --type=module --status=enabled --no-core | grep -q openseadragon; then
+    if ! drush pm-list --format=string --type=module --status=enabled --no-core | grep -q openseadragon; then
         echo "openseadragon is not installed.  Skipping configuration"
         return 0
     fi
diff --git a/drupal/rootfs/usr/share/drush/Commands/UpdateSettingsCommands.php b/drupal/rootfs/usr/share/drush/Commands/UpdateSettingsCommands.php
index 4e14020c..403133c6 100644
--- a/drupal/rootfs/usr/share/drush/Commands/UpdateSettingsCommands.php
+++ b/drupal/rootfs/usr/share/drush/Commands/UpdateSettingsCommands.php
@@ -201,7 +201,9 @@ public function setReverseProxySettings($reverse_proxy_ips) {
       'required' => TRUE,
     ];
     $settings['settings']['reverse_proxy_trusted_headers'] = (object) [
-      'value' => \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_ALL | \Symfony\Component\HttpFoundation\Request::HEADER_FORWARDED,
+      'value' => \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_FOR |
+        \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_PROTO |
+        \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_PORT,
       'required' => TRUE,
     ];
     $this->writeSettings($settings);