Skip to content

Commit 031fe7e

Browse files
Merge pull request #7355 from magento-cia/cia-2.4.4-bugfixes-12202021
AC-1173: Change HTTPS setting to secure defaults
2 parents 59dfc49 + e86f2a6 commit 031fe7e

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@
4444
<seo>
4545
<use_rewrites>0</use_rewrites>
4646
</seo>
47+
<secure>
48+
<use_in_frontend>1</use_in_frontend>
49+
<use_in_adminhtml>1</use_in_adminhtml>
50+
</secure>
4751
</web>
4852
</default>
4953
<stores>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class Application
2727
/**
2828
* Default application area.
2929
*/
30-
const DEFAULT_APP_AREA = 'global';
30+
public const DEFAULT_APP_AREA = 'global';
3131

3232
/**
3333
* DB vendor adapter instance.
@@ -276,6 +276,8 @@ protected function getInstallConfig()
276276
if (null === $this->installConfig) {
277277
// phpcs:ignore Magento2.Security.IncludeFile
278278
$this->installConfig = include $this->installConfigFile;
279+
$this->installConfig['use-secure'] = '0';
280+
$this->installConfig['use-secure-admin'] = '0';
279281
}
280282
return $this->installConfig;
281283
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,14 +183,16 @@ public function installDataProvider()
183183
$installShellCommandExpectation = [
184184
PHP_BINARY . ' -f %s setup:install -vvv ' .
185185
'--db-host=%s --db-user=%s --db-password=%s --db-name=%s --db-prefix=%s ' .
186-
'--magento-init-params=%s',
186+
'--use-secure=%s --use-secure-admin=%s --magento-init-params=%s',
187187
[
188188
BP . '/bin/magento',
189189
'/tmp/mysql.sock',
190190
'root',
191191
'',
192192
'magento_integration_tests',
193193
'',
194+
'0',
195+
'0',
194196
$this->getInitParamsQuery(sys_get_temp_dir()),
195197
]
196198
];

0 commit comments

Comments
 (0)