Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
SetupController#run(): prevent admin auto-login after autoconfig-only…
… setup

Signed-off-by: Alexander A. Klimov <[email protected]>
  • Loading branch information
Al2Klimov authored and AndyScherzinger committed Feb 27, 2024
commit 2452aaf4419795635de040389c8e001c978f0ba5
14 changes: 14 additions & 0 deletions core/Controller/SetupController.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,12 @@ public function run(array $post): void {
}

if (isset($post['install']) and $post['install'] == 'true') {
// autoconfig.php by itself...
$autoConfig = $this->loadAutoConfig([]);

// ... already contains all setup parameters.
$autoConfigIsComplete = isset($autoConfig['install']) and $autoConfig['install'] == 'true';

// We have to launch the installation process :
$e = $this->setupHelper->install($post);
$errors = ['errors' => $e];
Expand All @@ -72,6 +78,14 @@ public function run(array $post): void {
$options = array_merge($opts, $post, $errors);
$this->display($options);
} else {
if ($autoConfigIsComplete) {
// Everything was done automatically, POSTed data (if any) had no effect.
// So the owner doesn't expect to have to visit the site first (ASAP).

// For the case the client isn't the owner, prevent auto-login (as admin).
header_remove('Set-Cookie');
}

$this->finishSetup();
}
} else {
Expand Down