diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php index 5bd9da0407..eec6d23dce 100644 --- a/lib/composer/composer/autoload_classmap.php +++ b/lib/composer/composer/autoload_classmap.php @@ -703,7 +703,6 @@ return array( 'OC\\Repair\\SearchLuceneTables' => $baseDir . '/lib/private/Repair/SearchLuceneTables.php', 'OC\\Repair\\SharePropagation' => $baseDir . '/lib/private/Repair/SharePropagation.php', 'OC\\Repair\\SqliteAutoincrement' => $baseDir . '/lib/private/Repair/SqliteAutoincrement.php', - 'OC\\Repair\\UpdateCertificateStore' => $baseDir . '/lib/private/Repair/UpdateCertificateStore.php', 'OC\\Repair\\UpdateOutdatedOcsIds' => $baseDir . '/lib/private/Repair/UpdateOutdatedOcsIds.php', 'OC\\RichObjectStrings\\Validator' => $baseDir . '/lib/private/RichObjectStrings/Validator.php', 'OC\\Route\\CachingRouter' => $baseDir . '/lib/private/Route/CachingRouter.php', diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php index 475b4c1554..9967b709c3 100644 --- a/lib/composer/composer/autoload_static.php +++ b/lib/composer/composer/autoload_static.php @@ -733,7 +733,6 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c 'OC\\Repair\\SearchLuceneTables' => __DIR__ . '/../../..' . '/lib/private/Repair/SearchLuceneTables.php', 'OC\\Repair\\SharePropagation' => __DIR__ . '/../../..' . '/lib/private/Repair/SharePropagation.php', 'OC\\Repair\\SqliteAutoincrement' => __DIR__ . '/../../..' . '/lib/private/Repair/SqliteAutoincrement.php', - 'OC\\Repair\\UpdateCertificateStore' => __DIR__ . '/../../..' . '/lib/private/Repair/UpdateCertificateStore.php', 'OC\\Repair\\UpdateOutdatedOcsIds' => __DIR__ . '/../../..' . '/lib/private/Repair/UpdateOutdatedOcsIds.php', 'OC\\RichObjectStrings\\Validator' => __DIR__ . '/../../..' . '/lib/private/RichObjectStrings/Validator.php', 'OC\\Route\\CachingRouter' => __DIR__ . '/../../..' . '/lib/private/Route/CachingRouter.php', diff --git a/lib/private/Repair/UpdateCertificateStore.php b/lib/private/Repair/UpdateCertificateStore.php deleted file mode 100644 index a3313d5c23..0000000000 --- a/lib/private/Repair/UpdateCertificateStore.php +++ /dev/null @@ -1,90 +0,0 @@ - - * @author Thomas Müller - * - * @license AGPL-3.0 - * - * This code is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License, version 3, - * as published by the Free Software Foundation. - * - * This program 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 Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License, version 3, - * along with this program. If not, see - * - */ - -namespace OC\Repair; - -use OC\Files\View; -use OC\Server; -use OCP\IConfig; -use OCP\Migration\IOutput; -use OCP\Migration\IRepairStep; - -/** - * Class UpdateCertificateStore rewrites the user specific certificate store after - * an update has been performed. This is done because a new root certificate file - * might have been added. - * - * @package OC\Repair - */ -class UpdateCertificateStore implements IRepairStep { - /** - * FIXME: The certificate manager does only allow specifying the user - * within the constructor. This makes DI impossible. - * @var Server - */ - protected $server; - /** @var IConfig */ - protected $config; - - /** - * @param Server $server - * @param IConfig $config - */ - public function __construct(Server $server, - IConfig $config) { - $this->server = $server; - $this->config = $config; - } - - /** {@inheritDoc} */ - public function getName() { - return 'Update user certificate stores with new root certificates'; - } - - /** {@inheritDoc} */ - public function run(IOutput $out) { - $rootView = new View(); - $dataDirectory = $this->config->getSystemValue('datadirectory', null); - if(is_null($dataDirectory)) { - throw new \Exception('No data directory specified'); - } - - $pathToRootCerts = '/files_external/rootcerts.crt'; - - foreach($rootView->getDirectoryContent('', 'httpd/unix-directory') as $fileInfo) { - $uid = trim($fileInfo->getPath(), '/'); - if($rootView->file_exists($uid . $pathToRootCerts)) { - // Delete the existing root certificate - $rootView->unlink($uid . $pathToRootCerts); - - /** - * FIXME: The certificate manager does only allow specifying the user - * within the constructor. This makes DI impossible. - */ - // Regenerate the certificates - $certificateManager = $this->server->getCertificateManager($uid); - $certificateManager->createCertificateBundle(); - } - } - } -}