diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Include untrusted host in the exception message

Browse Source
This commit is contained in:
Jordi Boggiano 2013-08-21 12:06:02 +02:00
parent 4cfbdf11c3
commit fd2f63382a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Component/HttpFoundation/Request.php
View File

@ -1101,7 +1101,7 @@ class Request
// as the host can come from the user (HTTP_HOST and depending on the configuration, SERVER_NAME too can come from the user)
// check that it does not contain forbidden characters (see RFC 952 and RFC 2181)
if ($host && !preg_match('/^\[?(?:[a-zA-Z0-9-:\]_]+\.?)+$/', $host)) {
throw new \UnexpectedValueException('Invalid Host');
throw new \UnexpectedValueException('Invalid Host "'.$host.'"');
}
if (count(self::$trustedHostPatterns) > 0) {
@ -1119,7 +1119,7 @@ class Request
}
}
throw new \UnexpectedValueException('Untrusted Host');
throw new \UnexpectedValueException('Untrusted Host "'.$host.'"');
}
return $host;

2
src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
View File

@ -1520,7 +1520,7 @@ class RequestTest extends \PHPUnit_Framework_TestCase
$request->getHost();
$this->fail('Request::getHost() should throw an exception when host is not trusted.');
} catch (\UnexpectedValueException $e) {
$this->assertEquals('Untrusted Host', $e->getMessage());
$this->assertEquals('Untrusted Host "evil.com"', $e->getMessage());
}
// trusted hosts