Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #899 from smuth4/master

Browse source 
Respect HTTP_X_FORWARDED_HOST
This commit is contained in:
ArthurHoaro 2017-07-13 14:15:06 +02:00 committed by GitHub
commit 2fee2f425d
2 changed files with 41 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
application/HttpUtils.php
View file

@ -311,7 +311,19 @@ function server_url($server)
}
}
return $scheme.'://'.$server['SERVER_NAME'].$port;
if (isset($server['HTTP_X_FORWARDED_HOST'])) {
// Keep forwarded host
if (strpos($server['HTTP_X_FORWARDED_HOST'], ',') !== false) {
$hosts = explode(',', $server['HTTP_X_FORWARDED_HOST']);
$host = trim($hosts[0]);
} else {
$host = $server['HTTP_X_FORWARDED_HOST'];
}
} else {
$host = $server['SERVER_NAME'];
}
return $scheme.'://'.$host.$port;
}
// SSL detection

28
tests/HttpUtils/ServerUrlTest.php
View file

@ -38,6 +38,34 @@ class ServerUrlTest extends PHPUnit_Framework_TestCase
);
}
/**
* Detect a Proxy that sets Forwarded-Host
*/
public function testHttpsProxyForwardedHost()
{
$this->assertEquals(
'https://host.tld:8080',
server_url(
array(
'HTTP_X_FORWARDED_PROTO' => 'https',
'HTTP_X_FORWARDED_PORT' => '8080',
'HTTP_X_FORWARDED_HOST' => 'host.tld'
)
)
);
$this->assertEquals(
'https://host.tld:4974',
server_url(
array(
'HTTP_X_FORWARDED_PROTO' => 'https, https',
'HTTP_X_FORWARDED_PORT' => '4974, 80',
'HTTP_X_FORWARDED_HOST' => 'host.tld, example.com'
)
)
);
}
/**
* Detect a Proxy with SSL enabled
*/