Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
CVE-2020-5248 Deprecate GLPIKEY usage, and replace it with key file per instance. Add a command to generate new key, and update database. Add plugins hooks to register fields or configuration entries to be handled when updating db.
- Loading branch information
Showing
15 changed files
with
406 additions
and
31 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| /config/config_db* | ||
| /config/glpi.key | ||
| /config/config_path.php | ||
| /config/local_define.php | ||
| /tests/config_db* | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,110 @@ | ||
| <?php | ||
| /** | ||
| * --------------------------------------------------------------------- | ||
| * GLPI - Gestionnaire Libre de Parc Informatique | ||
| * Copyright (C) 2015-2018 Teclib' and contributors. | ||
| * | ||
| * http://glpi-project.org | ||
| * | ||
| * based on GLPI - Gestionnaire Libre de Parc Informatique | ||
| * Copyright (C) 2003-2014 by the INDEPNET Development Team. | ||
| * | ||
| * --------------------------------------------------------------------- | ||
| * | ||
| * LICENSE | ||
| * | ||
| * This file is part of GLPI. | ||
| * | ||
| * GLPI is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation; either version 2 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * GLPI is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with GLPI. If not, see <http://www.gnu.org/licenses/>. | ||
| * --------------------------------------------------------------------- | ||
| */ | ||
|
|
||
| namespace Glpi\Console\Security; | ||
|
|
||
| if (!defined('GLPI_ROOT')) { | ||
| die("Sorry. You can't access this file directly"); | ||
| } | ||
|
|
||
| use Glpi\Console\AbstractCommand; | ||
| use Symfony\Component\Console\Input\InputInterface; | ||
| use Symfony\Component\Console\Output\OutputInterface; | ||
| use Symfony\Component\Console\Question\ConfirmationQuestion; | ||
| use GLPIKey; | ||
|
|
||
| class ChangekeyCommand extends AbstractCommand { | ||
| /** | ||
| * Error code returned when unable to renew key. | ||
| * | ||
| * @var integer | ||
| */ | ||
| const ERROR_UNABLE_TO_RENEW_KEY = 1; | ||
|
|
||
| protected function configure() { | ||
| parent::configure(); | ||
|
|
||
| $this->setName('glpi:security:change_key'); | ||
| $this->setDescription(__('Change password storage key and update values in database.')); | ||
| } | ||
|
|
||
| protected function execute(InputInterface $input, OutputInterface $output) { | ||
| $glpikey = new GLPIKey(); | ||
|
|
||
| $fields = $glpikey->getFields(); | ||
| $configs = $glpikey->getConfigs(); | ||
| $conf_count = 0; | ||
| foreach ($configs as $config) { | ||
| $conf_count += count($config); | ||
| } | ||
|
|
||
| $output->writeln( | ||
| sprintf( | ||
| '<info>' . __('Found %1$s field(s) and %2$s configuration entries requiring migration.') . '</info>', | ||
| count($fields), | ||
| $conf_count | ||
| ) | ||
| ); | ||
|
|
||
| if (!$input->getOption('no-interaction')) { | ||
| // Ask for confirmation (unless --no-interaction) | ||
| $question_helper = $this->getHelper('question'); | ||
| $run = $question_helper->ask( | ||
| $input, | ||
| $output, | ||
| new ConfirmationQuestion(__('Do you want to continue ?') . ' [Yes/no]', true) | ||
| ); | ||
| if (!$run) { | ||
| $output->writeln( | ||
| '<comment>' . __('Aborted.') . '</comment>', | ||
| OutputInterface::VERBOSITY_VERBOSE | ||
| ); | ||
| return 0; | ||
| } | ||
| } | ||
|
|
||
| $created = $glpikey->generate(); | ||
| if (!$created) { | ||
| $output->writeln( | ||
| '<error>' . __('Unable to change security key!') . '</error>', | ||
| OutputInterface::VERBOSITY_QUIET | ||
| ); | ||
| return self::ERROR_UNABLE_TO_RENEW_KEY; | ||
| } | ||
|
|
||
| $this->output->write(PHP_EOL); | ||
|
|
||
| $output->writeln('<info>' . __('New security key generated; database updated.') . '</info>'); | ||
|
|
||
| return 0; // Success | ||
| } | ||
| } |
Oops, something went wrong.