Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SetupController#run(): prevent admin auto-login after autoconfig-only setup #29423

Closed
wants to merge 1 commit into from
Closed

SetupController#run(): prevent admin auto-login after autoconfig-only setup #29423

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 14 additions & 0 deletions core/Controller/SetupController.php
View file
Open in desktop
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
Loading