Commit 7ae15f9c authored by larowlan's avatar larowlan

SA-CORE-2019-009 by mcdruid, larowlan, Heine, alexpott, xjm, DamienMcKenna,...

SA-CORE-2019-009 by mcdruid, larowlan, Heine, alexpott, xjm, DamienMcKenna, dsnopek, catch, greggles
parent f2b59e3a
......@@ -425,10 +425,9 @@ function install_begin_request($class_loader, &$install_state) {
}
$GLOBALS['conf']['container_service_providers']['InstallerConfigOverride'] = 'Drupal\Core\Installer\ConfigOverride';
// Only allow dumping the container once the hash salt has been created. Note,
// InstallerKernel::createFromRequest() is not used because Settings is
// Note, InstallerKernel::createFromRequest() is not used because Settings is
// already initialized.
$kernel = new InstallerKernel($environment, $class_loader, (bool) Settings::get('hash_salt', FALSE));
$kernel = new InstallerKernel($environment, $class_loader, FALSE);
$kernel::bootEnvironment();
$kernel->setSitePath($site_path);
$kernel->boot();
......
......@@ -15,6 +15,8 @@ class InstallerKernel extends DrupalKernel {
protected function initializeContainer() {
// Always force a container rebuild.
$this->containerNeedsRebuild = TRUE;
// Ensure the InstallerKernel's container is not dumped.
$this->allowDumping = FALSE;
$container = parent::initializeContainer();
return $container;
}
......
......@@ -406,4 +406,12 @@ public static function trustedCallbacks() {
return ['preRenderCacheTags'];
}
/**
* Use a plain Symfony response object to output the current install_profile.
*/
public function getInstallProfile() {
$install_profile = \Drupal::installProfile() ?: 'NONE';
return new Response('install_profile: ' . $install_profile);
}
}
......@@ -204,3 +204,10 @@ system_test.custom_cache_control:
_controller: '\Drupal\system_test\Controller\SystemTestController::getCacheableResponseWithCustomCacheControl'
requirements:
_access: 'TRUE'
system_test.install_profile:
path: '/system-test/get-install-profile'
defaults:
_controller: '\Drupal\system_test\Controller\SystemTestController::getInstallProfile'
requirements:
_access: 'TRUE'
<?php
namespace Drupal\FunctionalTests\Installer;
/**
* Tests re-visiting the installer after a successful installation.
*
* @group Installer
*/
class InstallerPostInstallTest extends InstallerTestBase {
/**
* {@inheritdoc}
*/
protected $profile = 'minimal';
/**
* {@inheritdoc}
*/
protected $defaultTheme = 'stark';
/**
* Confirms that visiting the installer does not break things post-install.
*/
public function testVisitInstallerPostInstall() {
\Drupal::service('module_installer')->install(['system_test']);
// Clear caches to ensure that system_test's routes are available.
$this->resetAll();
// Confirm that the install_profile is correct.
$this->drupalGet('/system-test/get-install-profile');
$this->assertText('minimal');
// Make an anonymous visit to the installer
$this->drupalLogout();
$this->visitInstaller();
// Ensure that the install profile is still correct.
$this->drupalGet('/system-test/get-install-profile');
$this->assertText('minimal');
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment