composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-18 16:18:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°3671 - fix typo in HTTP header name

Browse Source
This commit is contained in:
bruno-ds
2021-03-05 16:57:03 +01:00
parent a06bf6ea7c
commit ae6a264d6d
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/utils.inc.php
View File

@@ -916,7 +916,7 @@ class utils
$sServerName = isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : '';
if ($bTrustProxy) {
$sServerName = isset($_SERVER['X_FORWARDED_HOST']) ? $_SERVER['X_FORWARDED_HOST'] : $sServerName;
$sServerName = isset($_SERVER['HTTP_X_FORWARDED_HOST']) ? $_SERVER['HTTP_X_FORWARDED_HOST'] : $sServerName;
}
return $sServerName;
@@ -935,7 +935,7 @@ class utils
$sServerPort = isset($_SERVER['SERVER_PORT']) ? $_SERVER['SERVER_PORT'] : 80;
if ($bTrustProxy) {
$sServerPort = isset($_SERVER['X_FORWARDED_PORT']) ? $_SERVER['X_FORWARDED_PORT'] : $sServerPort;
$sServerPort = isset($_SERVER['HTTP_X_FORWARDED_PORT']) ? $_SERVER['HTTP_X_FORWARDED_PORT'] : $sServerPort;
}
return $sServerPort;

32
test/application/UtilsTest.php
View File

@@ -186,9 +186,9 @@ class UtilsTest extends \Combodo\iTop\Test\UnitTest\ItopTestCase
$baseServerVar = [
'REMOTE_ADDR' => '127.0.0.1', //is not set, disable IsProxyTrusted
'SERVER_NAME' => 'example.com',
'X_FORWARDED_HOST' => null,
'HTTP_X_FORWARDED_HOST' => null,
'SERVER_PORT' => '80',
'X_FORWARDED_PORT' => null,
'HTTP_X_FORWARDED_PORT' => null,
'REQUEST_URI' => '/index.php?baz=1',
'SCRIPT_NAME' => '/index.php',
'SCRIPT_FILENAME' => APPROOT.'index.php',
@@ -244,8 +244,8 @@ class UtilsTest extends \Combodo\iTop\Test\UnitTest\ItopTestCase
'bForceTrustProxy' => false,
'bConfTrustProxy' => false,
'aServerVars' => array_merge($baseServerVar, [
'X_FORWARDED_HOST' => 'proxy.com',
'X_FORWARDED_PORT' => '4443',
'HTTP_X_FORWARDED_HOST' => 'proxy.com',
'HTTP_X_FORWARDED_PORT' => '4443',
'HTTP_X_FORWARDED_PROTO' => 'https',
]),
'sExpectedAppRootUrl' => 'http://example.com/',
@@ -254,8 +254,8 @@ class UtilsTest extends \Combodo\iTop\Test\UnitTest\ItopTestCase
'bForceTrustProxy' => false,
'bConfTrustProxy' => true,
'aServerVars' => array_merge($baseServerVar, [
'X_FORWARDED_HOST' => 'proxy.com',
'X_FORWARDED_PORT' => '4443',
'HTTP_X_FORWARDED_HOST' => 'proxy.com',
'HTTP_X_FORWARDED_PORT' => '4443',
'HTTP_X_FORWARDED_PROTO' => 'https',
]),
'sExpectedAppRootUrl' => 'https://proxy.com:4443/',
@@ -264,8 +264,8 @@ class UtilsTest extends \Combodo\iTop\Test\UnitTest\ItopTestCase
'bForceTrustProxy' => false,
'bConfTrustProxy' => true,
'aServerVars' => array_merge($baseServerVar, [
'X_FORWARDED_HOST' => 'proxy.com',
'X_FORWARDED_PORT' => '4443',
'HTTP_X_FORWARDED_HOST' => 'proxy.com',
'HTTP_X_FORWARDED_PORT' => '4443',
'HTTP_X_FORWARDED_PROTOCOL' => 'https',
]),
'sExpectedAppRootUrl' => 'https://proxy.com:4443/',
@@ -274,8 +274,8 @@ class UtilsTest extends \Combodo\iTop\Test\UnitTest\ItopTestCase
'bForceTrustProxy' => true,
'bConfTrustProxy' => false,
'aServerVars' => array_merge($baseServerVar, [
'X_FORWARDED_HOST' => 'proxy.com',
'X_FORWARDED_PORT' => '4443',
'HTTP_X_FORWARDED_HOST' => 'proxy.com',
'HTTP_X_FORWARDED_PORT' => '4443',
'HTTP_X_FORWARDED_PROTO' => 'https',
]),
'sExpectedAppRootUrl' => 'https://proxy.com:4443/',
@@ -284,8 +284,8 @@ class UtilsTest extends \Combodo\iTop\Test\UnitTest\ItopTestCase
'bForceTrustProxy' => true,
'bConfTrustProxy' => true,
'aServerVars' => array_merge($baseServerVar, [
'X_FORWARDED_HOST' => 'proxy.com',
'X_FORWARDED_PORT' => '4443',
'HTTP_X_FORWARDED_HOST' => 'proxy.com',
'HTTP_X_FORWARDED_PORT' => '4443',
'HTTP_X_FORWARDED_PROTO' => 'https',
]),
'sExpectedAppRootUrl' => 'https://proxy.com:4443/',
@@ -296,8 +296,8 @@ class UtilsTest extends \Combodo\iTop\Test\UnitTest\ItopTestCase
'bConfTrustProxy' => false,
'aServerVars' => array_merge($baseServerVar, [
'REMOTE_ADDR' => null,
'X_FORWARDED_HOST' => 'proxy.com',
'X_FORWARDED_PORT' => '4443',
'HTTP_X_FORWARDED_HOST' => 'proxy.com',
'HTTP_X_FORWARDED_PORT' => '4443',
'HTTP_X_FORWARDED_PROTO' => 'https',
]),
'sExpectedAppRootUrl' => 'https://proxy.com:4443/',
@@ -307,8 +307,8 @@ class UtilsTest extends \Combodo\iTop\Test\UnitTest\ItopTestCase
'bConfTrustProxy' => true,
'aServerVars' => array_merge($baseServerVar, [
'REMOTE_ADDR' => null,
'X_FORWARDED_HOST' => 'proxy.com',
'X_FORWARDED_PORT' => '4443',
'HTTP_X_FORWARDED_HOST' => 'proxy.com',
'HTTP_X_FORWARDED_PORT' => '4443',
'HTTP_X_FORWARDED_PROTO' => 'https',
]),
'sExpectedAppRootUrl' => 'http://example.com/',