php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-03 13:58:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #14488: Added support for X-Forwarded-Host to yii\web\Request, fixed getServerPort() usage

Browse Source
This commit is contained in:
Alexander Makarov
2018-02-07 00:01:50 +03:00
committed by GitHub
parent 40b038379f
commit 7bafb7bf09
3 changed files with 94 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/CHANGELOG.md
View File

@ -4,6 +4,7 @@ Yii Framework 2 Change Log
2.0.14 under development
------------------------
- Enh #14488: Added support for X-Forwarded-Host to `yii\web\Request`, fixed `getServerPort()` usage (si294r, samdark)
- Enh #13019: Support JSON in SchemaBuilderTrait (zhukovra, undefinedor)
- Enh #15047: `yii\db\Query::select()` and `yii\db\Query::addSelect()` now check for duplicate column names (wapmorgan)
- Enh #14643: Added `yii\web\ErrorAction::$layout` property to conveniently set layout from error action config (swods, cebe, samdark)

20
framework/web/Request.php
View File

@ -218,9 +218,12 @@ class Request extends \yii\base\Request
* @since 2.0.13
*/
public $secureHeaders = [
// Common:
'X-Forwarded-For',
'X-Forwarded-Host',
'X-Forwarded-Proto',
// Microsoft:
'Front-End-Https',
'X-Rewrite-Url',
];
@ -233,7 +236,7 @@ class Request extends \yii\base\Request
* @since 2.0.13
*/
public $ipHeaders = [
'X-Forwarded-For',
'X-Forwarded-For', // Common
];
/**
* @var array list of headers to check for determining whether the connection is made via HTTPS.
@ -245,8 +248,8 @@ class Request extends \yii\base\Request
* @since 2.0.13
*/
public $secureProtocolHeaders = [
'X-Forwarded-Proto' => ['https'],
'Front-End-Https' => ['on'],
'X-Forwarded-Proto' => ['https'], // Common
'Front-End-Https' => ['on'], // Microsoft
];
/**
@ -705,7 +708,10 @@ class Request extends \yii\base\Request
if ($this->_hostInfo === null) {
$secure = $this->getIsSecureConnection();
$http = $secure ? 'https' : 'http';
if ($this->headers->has('Host')) {
if ($this->headers->has('X-Forwarded-Host')) {
$this->_hostInfo = $http . '://' . $this->headers->get('X-Forwarded-Host');
} elseif ($this->headers->has('Host')) {
$this->_hostInfo = $http . '://' . $this->headers->get('Host');
} elseif (isset($_SERVER['SERVER_NAME'])) {
$this->_hostInfo = $http . '://' . $_SERVER['SERVER_NAME'];
@ -1217,7 +1223,8 @@ class Request extends \yii\base\Request
public function getPort()
{
if ($this->_port === null) {
$this->_port = !$this->getIsSecureConnection() && isset($_SERVER['SERVER_PORT']) ? (int) $_SERVER['SERVER_PORT'] : 80;
$serverPort = $this->getServerPort();
$this->_port = !$this->getIsSecureConnection() && $serverPort !== null ? $serverPort : 80;
}
return $this->_port;
@ -1249,7 +1256,8 @@ class Request extends \yii\base\Request
public function getSecurePort()
{
if ($this->_securePort === null) {
$this->_securePort = $this->getIsSecureConnection() && isset($_SERVER['SERVER_PORT']) ? (int) $_SERVER['SERVER_PORT'] : 443;
$serverPort = $this->getServerPort();
$this->_securePort = $this->getIsSecureConnection() && $serverPort !== null ? $serverPort : 443;
}
return $this->_securePort;