260a084d27
Remove all ports from the trusted domains Conflicts: lib/private/repair.php lib/repair/repairconfig.php
66 lines
1.5 KiB
PHP
66 lines
1.5 KiB
PHP
<?php
|
|
/**
|
|
* Copyright (c) 2014 Lukas Reschke <lukas@owncloud.com>
|
|
* This file is licensed under the Affero General Public License version 3 or
|
|
* later.
|
|
* See the COPYING-README file.
|
|
*/
|
|
|
|
namespace OC\Repair;
|
|
|
|
use OC\Hooks\BasicEmitter;
|
|
use OC\RepairStep;
|
|
use Sabre\DAV\Exception;
|
|
|
|
/**
|
|
* Class RepairConfig
|
|
*
|
|
* @package OC\Repair
|
|
*/
|
|
class RepairConfig extends BasicEmitter implements RepairStep {
|
|
|
|
/**
|
|
* @return string
|
|
*/
|
|
public function getName() {
|
|
return 'Repair config';
|
|
}
|
|
|
|
/**
|
|
* Updates the configuration after running an update
|
|
*/
|
|
public function run() {
|
|
$this->addSecret();
|
|
$this->removePortsFromTrustedDomains();
|
|
}
|
|
|
|
/**
|
|
* Adds a secret to config.php
|
|
*/
|
|
private function addSecret() {
|
|
if(\OC::$server->getConfig()->getSystemValue('secret', null) === null) {
|
|
$secret = \OC::$server->getSecureRandom()->getMediumStrengthGenerator()->generate(48);
|
|
\OC::$server->getConfig()->setSystemValue('secret', $secret);
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
* Remove ports from existing trusted domains in config.php
|
|
*/
|
|
private function removePortsFromTrustedDomains() {
|
|
$trustedDomains = \OC::$server->getConfig()->getSystemValue('trusted_domains', array());
|
|
$newTrustedDomains = array();
|
|
foreach($trustedDomains as $domain) {
|
|
$pos = strrpos($domain, ':');
|
|
if ($pos !== false) {
|
|
$port = substr($domain, $pos + 1);
|
|
if (is_numeric($port)) {
|
|
$domain = substr($domain, 0, $pos);
|
|
}
|
|
}
|
|
$newTrustedDomains[] = $domain;
|
|
}
|
|
\OC::$server->getConfig()->setSystemValue('trusted_domains', $newTrustedDomains);
|
|
}
|
|
}
|