Merge pull request #7355 from magento-cia/cia-2.4.4-bugfixes-12202021

AC-1173: Change HTTPS setting to secure defaults

Author: dvoskoboinikov

app/code/Magento/Backend/etc/config.xml

@@ -44,6 +44,10 @@
             <seo>
                 <use_rewrites>0</use_rewrites>
             </seo>
+            <secure>
+                <use_in_frontend>1</use_in_frontend>
+                <use_in_adminhtml>1</use_in_adminhtml>
+            </secure>
         </web>
     </default>
     <stores>

dev/tests/integration/framework/Magento/TestFramework/Application.php

@@ -27,7 +27,7 @@ class Application
     /**
      * Default application area.
      */
-    const DEFAULT_APP_AREA = 'global';
+    public const DEFAULT_APP_AREA = 'global';
 
     /**
      * DB vendor adapter instance.
@@ -276,6 +276,8 @@ protected function getInstallConfig()
         if (null === $this->installConfig) {
             // phpcs:ignore Magento2.Security.IncludeFile
             $this->installConfig = include $this->installConfigFile;
+            $this->installConfig['use-secure'] = '0';
+            $this->installConfig['use-secure-admin'] = '0';
         }
         return $this->installConfig;
     }

dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/ApplicationTest.php

@@ -183,14 +183,16 @@ public function installDataProvider()
         $installShellCommandExpectation = [
             PHP_BINARY . ' -f %s setup:install -vvv ' .
             '--db-host=%s --db-user=%s --db-password=%s --db-name=%s --db-prefix=%s ' .
-            '--magento-init-params=%s',
+            '--use-secure=%s --use-secure-admin=%s --magento-init-params=%s',
             [
                 BP . '/bin/magento',
                 '/tmp/mysql.sock',
                 'root',
                 '',
                 'magento_integration_tests',
                 '',
+                '0',
+                '0',
                 $this->getInitParamsQuery(sys_get_temp_dir()),
             ]
         ];