Incorporate review changes
This commit is contained in:
parent
992164446c
commit
cebf9f6a5a
|
@ -626,7 +626,6 @@ class OC {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$trustedDomainHelper = new \OC\Security\TrustedDomainHelper(\OC::$server->getConfig());
|
|
||||||
$request = \OC::$server->getRequest();
|
$request = \OC::$server->getRequest();
|
||||||
$host = $request->getInsecureServerHost();
|
$host = $request->getInsecureServerHost();
|
||||||
/**
|
/**
|
||||||
|
@ -637,7 +636,7 @@ class OC {
|
||||||
// overwritehost is always trusted, workaround to not have to make
|
// overwritehost is always trusted, workaround to not have to make
|
||||||
// \OC\AppFramework\Http\Request::getOverwriteHost public
|
// \OC\AppFramework\Http\Request::getOverwriteHost public
|
||||||
&& self::$server->getConfig()->getSystemValue('overwritehost') === ''
|
&& self::$server->getConfig()->getSystemValue('overwritehost') === ''
|
||||||
&& !$trustedDomainHelper->isTrustedDomain($host)
|
&& !\OC::$server->getTrustedDomainHelper()->isTrustedDomain($host)
|
||||||
) {
|
) {
|
||||||
header('HTTP/1.1 400 Bad Request');
|
header('HTTP/1.1 400 Bad Request');
|
||||||
header('Status: 400 Bad Request');
|
header('Status: 400 Bad Request');
|
||||||
|
|
|
@ -128,9 +128,9 @@ class Request implements \ArrayAccess, \Countable, IRequest {
|
||||||
|
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* @param $parameters
|
* @param array $parameters
|
||||||
*/
|
*/
|
||||||
public function setUrlParameters($parameters) {
|
public function setUrlParameters(array $parameters) {
|
||||||
$this->items['urlParams'] = $parameters;
|
$this->items['urlParams'] = $parameters;
|
||||||
$this->items['parameters'] = array_merge(
|
$this->items['parameters'] = array_merge(
|
||||||
$this->items['parameters'],
|
$this->items['parameters'],
|
||||||
|
@ -195,8 +195,8 @@ class Request implements \ArrayAccess, \Countable, IRequest {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Magic property accessors
|
* Magic property accessors
|
||||||
* @param $name
|
* @param string $name
|
||||||
* @param $value
|
* @param mixed $value
|
||||||
*/
|
*/
|
||||||
public function __set($name, $value) {
|
public function __set($name, $value) {
|
||||||
throw new \RuntimeException('You cannot change the contents of the request object');
|
throw new \RuntimeException('You cannot change the contents of the request object');
|
||||||
|
@ -253,7 +253,7 @@ class Request implements \ArrayAccess, \Countable, IRequest {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param $name
|
* @param string $name
|
||||||
* @return bool
|
* @return bool
|
||||||
*/
|
*/
|
||||||
public function __isset($name) {
|
public function __isset($name) {
|
||||||
|
@ -261,7 +261,7 @@ class Request implements \ArrayAccess, \Countable, IRequest {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param $id
|
* @param string $id
|
||||||
*/
|
*/
|
||||||
public function __unset($id) {
|
public function __unset($id) {
|
||||||
throw new \RunTimeException('You cannot change the contents of the request object');
|
throw new \RunTimeException('You cannot change the contents of the request object');
|
||||||
|
|
|
@ -17,6 +17,7 @@ use OC\Security\Crypto;
|
||||||
use OC\Security\Hasher;
|
use OC\Security\Hasher;
|
||||||
use OC\Security\SecureRandom;
|
use OC\Security\SecureRandom;
|
||||||
use OC\Diagnostics\NullEventLogger;
|
use OC\Diagnostics\NullEventLogger;
|
||||||
|
use OC\Security\TrustedDomainHelper;
|
||||||
use OCP\IServerContainer;
|
use OCP\IServerContainer;
|
||||||
use OCP\ISession;
|
use OCP\ISession;
|
||||||
use OC\Tagging\TagMapper;
|
use OC\Tagging\TagMapper;
|
||||||
|
@ -260,6 +261,9 @@ class Server extends SimpleContainer implements IServerContainer {
|
||||||
$this->registerService('IniWrapper', function ($c) {
|
$this->registerService('IniWrapper', function ($c) {
|
||||||
return new IniGetWrapper();
|
return new IniGetWrapper();
|
||||||
});
|
});
|
||||||
|
$this->registerService('TrustedDomainHelper', function ($c) {
|
||||||
|
return new TrustedDomainHelper($this->getConfig());
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -324,7 +328,6 @@ class Server extends SimpleContainer implements IServerContainer {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the preview manager which can create preview images for a given file
|
* Returns the preview manager which can create preview images for a given file
|
||||||
*
|
*
|
||||||
|
@ -743,4 +746,13 @@ class Server extends SimpleContainer implements IServerContainer {
|
||||||
public function getIniWrapper() {
|
public function getIniWrapper() {
|
||||||
return $this->query('IniWrapper');
|
return $this->query('IniWrapper');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the trusted domain helper
|
||||||
|
*
|
||||||
|
* @return TrustedDomainHelper
|
||||||
|
*/
|
||||||
|
public function getTrustedDomainHelper() {
|
||||||
|
return $this->query('TrustedDomainHelper');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue