Merge pull request #7727 from owncloud/cli-trusteddomainupgradewarning
Added warning for trusted_domains after CLI upgrade
This commit is contained in:
commit
4112d63a40
|
@ -27,6 +27,12 @@ class Upgrade extends Command {
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Execute the upgrade command
|
||||||
|
*
|
||||||
|
* @param InputInterface $input input interface
|
||||||
|
* @param OutputInterface $output output interface
|
||||||
|
*/
|
||||||
protected function execute(InputInterface $input, OutputInterface $output) {
|
protected function execute(InputInterface $input, OutputInterface $output) {
|
||||||
global $RUNTIME_NOAPPS;
|
global $RUNTIME_NOAPPS;
|
||||||
|
|
||||||
|
@ -69,6 +75,9 @@ class Upgrade extends Command {
|
||||||
});
|
});
|
||||||
|
|
||||||
$updater->upgrade();
|
$updater->upgrade();
|
||||||
|
|
||||||
|
$this->postUpgradeCheck($input, $output);
|
||||||
|
|
||||||
return self::ERROR_SUCCESS;
|
return self::ERROR_SUCCESS;
|
||||||
} else if(\OC_Config::getValue('maintenance', false)) {
|
} else if(\OC_Config::getValue('maintenance', false)) {
|
||||||
//Possible scenario: ownCloud core is updated but an app failed
|
//Possible scenario: ownCloud core is updated but an app failed
|
||||||
|
@ -84,4 +93,21 @@ class Upgrade extends Command {
|
||||||
return self::ERROR_UP_TO_DATE;
|
return self::ERROR_UP_TO_DATE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Perform a post upgrade check (specific to the command line tool)
|
||||||
|
*
|
||||||
|
* @param InputInterface $input input interface
|
||||||
|
* @param OutputInterface $output output interface
|
||||||
|
*/
|
||||||
|
protected function postUpgradeCheck(InputInterface $input, OutputInterface $output) {
|
||||||
|
$trustedDomains = \OC_Config::getValue('trusted_domains', array());
|
||||||
|
if (empty($trustedDomains)) {
|
||||||
|
$output->write(
|
||||||
|
'<warning>The setting "trusted_domains" could not be ' .
|
||||||
|
'set automatically by the upgrade script, ' .
|
||||||
|
'please set it manually</warning>'
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -108,7 +108,7 @@ class Updater extends BasicEmitter {
|
||||||
/*
|
/*
|
||||||
* START CONFIG CHANGES FOR OLDER VERSIONS
|
* START CONFIG CHANGES FOR OLDER VERSIONS
|
||||||
*/
|
*/
|
||||||
if (version_compare($currentVersion, '6.90.1', '<')) {
|
if (!\OC::$CLI && version_compare($currentVersion, '6.90.1', '<')) {
|
||||||
// Add the overwriteHost config if it is not existant
|
// Add the overwriteHost config if it is not existant
|
||||||
// This is added to prevent host header poisoning
|
// This is added to prevent host header poisoning
|
||||||
\OC_Config::setValue('trusted_domains', \OC_Config::getValue('trusted_domains', array(\OC_Request::serverHost())));
|
\OC_Config::setValue('trusted_domains', \OC_Config::getValue('trusted_domains', array(\OC_Request::serverHost())));
|
||||||
|
|
Loading…
Reference in New Issue