Skip to content

Refactor OC\Server::getIntegrityCodeChecker #40139

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

Closed
summersab wants to merge 1 commit into from
Closed

Refactor OC\Server::getIntegrityCodeChecker #40139

Show file tree
Hide file tree
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
Refactor OC\Server::getIntegrityCodeChecker 
Signed-off-by: Andrew Summers <[email protected]>
  • Loading branch information
@summersab
summersab committed Aug 30, 2023
commit b21d1445e67f07ce014ddb64a792df30e6fbdda4
2 changes: 1 addition & 1 deletion core/Command/Upgrade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
$self = $this;
$updater = new Updater(
$this->config,
\OC::$server->getIntegrityCodeChecker(),
\OC::$server->get('IntegrityCodeChecker'),
$this->logger,
$this->installer
);
Expand Down
2 changes: 1 addition & 1 deletion core/Controller/SetupController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ private function finishSetup() {
if (file_exists($this->autoConfigFile)) {
unlink($this->autoConfigFile);
}
\OC::$server->getIntegrityCodeChecker()->runInstanceVerification();
\OC::$server->get('IntegrityCodeChecker')->runInstanceVerification();

if ($this->setupHelper->shouldRemoveCanInstallFile()) {
\OC_Template::printGuestPage('', 'installation_incomplete');
Expand Down
2 changes: 1 addition & 1 deletion core/ajax/update.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public function handleRepairFeedback(Event $event): void {
$config = \OC::$server->getConfig();
$updater = new \OC\Updater(
$config,
\OC::$server->getIntegrityCodeChecker(),
\OC::$server->get('IntegrityCodeChecker'),
$logger,
\OC::$server->query(\OC\Installer::class)
);
Expand Down
8 changes: 4 additions & 4 deletions core/register_command.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,19 +55,19 @@
$application->add(new OC\Core\Command\Check(\OC::$server->getSystemConfig()));
$application->add(new OC\Core\Command\L10n\CreateJs());
$application->add(new \OC\Core\Command\Integrity\SignApp(
\OC::$server->getIntegrityCodeChecker(),
\OC::$server->get('IntegrityCodeChecker'),
new \OC\IntegrityCheck\Helpers\FileAccessHelper(),
\OC::$server->getURLGenerator()
));
$application->add(new \OC\Core\Command\Integrity\SignCore(
\OC::$server->getIntegrityCodeChecker(),
\OC::$server->get('IntegrityCodeChecker'),
new \OC\IntegrityCheck\Helpers\FileAccessHelper()
));
$application->add(new \OC\Core\Command\Integrity\CheckApp(
\OC::$server->getIntegrityCodeChecker()
\OC::$server->get('IntegrityCodeChecker')
));
$application->add(new \OC\Core\Command\Integrity\CheckCore(
\OC::$server->getIntegrityCodeChecker()
\OC::$server->get('IntegrityCodeChecker')
));


Expand Down
2 changes: 1 addition & 1 deletion lib/private/Updater.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ private function doUpgrade(string $currentVersion, string $installedVersion): vo
$this->config->setAppValue('core', 'lastupdatedat', '0');

// Check for code integrity if not disabled
if (\OC::$server->getIntegrityCodeChecker()->isCodeCheckEnforced()) {
if (\OC::$server->get('IntegrityCodeChecker')->isCodeCheckEnforced()) {
$this->emit('\OC\Updater', 'startCheckCodeIntegrity');
$this->checker->runInstanceVerification();
$this->emit('\OC\Updater', 'finishedCheckCodeIntegrity');
Expand Down