mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Get the real protocol behind several proxies 

X-Forwarded-Proto contains a list of protocols if ownCloud is behind multiple reverse proxies.

This is a revival of https://github.com/owncloud/core/pull/11157 using the new IRequest public API.
This commit is contained in:
Lukas Reschke 2015-02-24 12:24:55 +01:00
parent e08ebe87dc
commit 1c6eae9017
2 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/private/appframework/http/request.php
View File

@ -480,8 +480,8 @@ class Request implements \ArrayAccess, \Countable, IRequest {
} }
/** /**
* Returns the server protocol. It respects reverse proxy servers and load * Returns the server protocol. It respects one or more reverse proxies servers
* balancers. * and load balancers
* @return string Server protocol (http or https) * @return string Server protocol (http or https)
*/ */
public function getServerProtocol() { public function getServerProtocol() {
@ -491,7 +491,13 @@ class Request implements \ArrayAccess, \Countable, IRequest {
} }
if (isset($this->server['HTTP_X_FORWARDED_PROTO'])) { if (isset($this->server['HTTP_X_FORWARDED_PROTO'])) {
$proto = strtolower($this->server['HTTP_X_FORWARDED_PROTO']); if (strpos($this->server['HTTP_X_FORWARDED_PROTO'], ',') !== false) {
$parts = explode(',', $this->server['HTTP_X_FORWARDED_PROTO']);
$proto = strtolower(trim(current($parts)));
} else {
$proto = strtolower($this->server['HTTP_X_FORWARDED_PROTO']);
}
// Verify that the protocol is always HTTP or HTTPS // Verify that the protocol is always HTTP or HTTPS
// default to http if an invalid value is provided // default to http if an invalid value is provided
return $proto === 'https' ? 'https' : 'http'; return $proto === 'https' ? 'https' : 'http';

21
tests/lib/appframework/http/RequestTest.php
View File

@ -593,6 +593,27 @@ class RequestTest extends \Test\TestCase {
$this->assertSame('http', $request->getServerProtocol()); $this->assertSame('http', $request->getServerProtocol());
} }
public function testGetServerProtocolBehindLoadBalancers() {
$this->config
->expects($this->once())
->method('getSystemValue')
->with('overwriteprotocol')
->will($this->returnValue(''));
$request = new Request(
[
'server' => [
'HTTP_X_FORWARDED_PROTO' => 'https,http,http'
],
],
$this->secureRandom,
$this->config,
$this->stream
);
$this->assertSame('https', $request->getServerProtocol());
}
/** /**
* @dataProvider userAgentProvider * @dataProvider userAgentProvider
* @param string $testAgent * @param string $testAgent