8000 [StringUtil] Fixed singularification of the word 'movies' by gwijnja · Pull Request #14190 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[StringUtil] Fixed singularification of the word 'movies' #14190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 15 commits into from
Closed

[StringUtil] Fixed singularification of the word 'movies' #14190

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
52885f0
[DoctrineBridge] Add missing variable declaration in testcase
stloyd Mar 31, 2015
195c57e
Safe escaping of fragments for eval()
nicolas-grekas Mar 16, 2015
6c73f0c
isFromTrustedProxy to confirm request came from a trusted proxy.
neclimdul Feb 17, 2015
ad73d3d
security #14166 n/a (neclimdul)
fabpot Apr 1, 2015
3594ea4
security #14167 n/a (nicolas-grekas)
fabpot Apr 1, 2015
dcd7971
updated CHANGELOG for 2.3.27
fabpot Apr 1, 2015
a7dcf0c
update CONTRIBUTORS for 2.3.27
fabpot Apr 1, 2015
ce4aab1
updated VERSION for 2.3.27
fabpot Apr 1, 2015
feb48c2
bumped Symfony version to 2.3.28
fabpot Apr 1, 2015
dbd02b0
Use specialized config methods instead of the generic ifTrue() method
javiereguiluz Apr 2, 2015
25f719e
minor #14173 Use specialized config methods instead of the generic if…
fabpot Apr 2, 2015
d9d43a8
minor #14128 [DoctrineBridge] Add missing variable declaration in tes…
fabpot Apr 2, 2015
a95f7f3
Fix some phpdocs for Twig extensions & templating helpers
stloyd Mar 31, 2015
36d62ee
minor #14134 [CS] Fix some phpdocs for Twig extensions & templating h…
fabpot Apr 2, 2015
6f5e95b
[StringUtil] Fixed singularification of 'movies'
gwijnja Apr 2, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
isFromTrustedProxy to confirm request came from a trusted proxy.
  • Loading branch information
@neclimdul @fabpot
neclimdul authored and fabpot committed Apr 1, 2015
commit 6c73f0ce9302a0091bbfbb96f317e400ce16ef84
13 changes: 9 additions & 4 deletions src/Symfony/Component/HttpFoundation/Request.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -791,7 +791,7 @@ public function getClientIps()
{
$ip = $this->server->get('REMOTE_ADDR');

if (!self::$trustedProxies) {
if (!$this->isFromTrustedProxy()) {
return array($ip);
}

Expand Down Expand Up @@ -957,7 +957,7 @@ public function getScheme()
*/
public function getPort()
{
if (self::$trustedProxies) {
if ($this->isFromTrustedProxy()) {
if (self::$trustedHeaders[self::HEADER_CLIENT_PORT] && $port = $this->headers->get(self::$trustedHeaders[self::HEADER_CLIENT_PORT])) {
return $port;
}
Expand Down Expand Up @@ -1138,7 +1138,7 @@ public function getQueryString()
*/
public function isSecure()
{
if (self::$trustedProxies && self::$trustedHeaders[self::HEADER_CLIENT_PROTO] && $proto = $this->headers->get(self::$trustedHeaders[self::HEADER_CLIENT_PROTO])) {
if ($this->isFromTrustedProxy() && self::$trustedHeaders[self::HEADER_CLIENT_PROTO] && $proto = $this->headers->get(self::$trustedHeaders[self::HEADER_CLIENT_PROTO])) {
return in_array(strtolower(current(explode(',', $proto))), array('https', 'on', 'ssl', '1'));
}

Expand Down Expand Up @@ -1166,7 +1166,7 @@ public function isSecure()
*/
public function getHost()
{
if (self::$trustedProxies && self::$trustedHeaders[self::HEADER_CLIENT_HOST] && $host = $this->headers->get(self::$trustedHeaders[self::HEADER_CLIENT_HOST])) {
if ($this->isFromTrustedProxy() && self::$trustedHeaders[self::HEADER_CLIENT_HOST] && $host = $this->headers->get(self::$trustedHeaders[self::HEADER_CLIENT_HOST])) {
$elements = explode(',', $host);

$host = $elements[count($elements) - 1];
Expand Down Expand Up @@ -1853,4 +1853,9 @@ private function getUrlencodedPrefix($string, $prefix)

return false;
}

private function isFromTrustedProxy()
{
return self::$trustedProxies && IpUtils::checkIp($this->server->get('REMOTE_ADDR'), self::$trustedProxies);
}
}
38 changes: 25 additions & 13 deletions src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -722,35 +722,37 @@ public function testGetPort()
'HTTP_X_FORWARDED_PROTO' => 'https',
'HTTP_X_FORWARDED_PORT' => '8443',
));
$port = $request->getPort();

$this->assertEquals(8443, $port, 'With PROTO and PORT set PORT takes precedence.');
$this->assertEquals(80, $request->getPort(), 'With PROTO and PORT on untrusted connection server value takes precedence.');
$request->server->set('REMOTE_ADDR', '1.1.1.1');
$this->assertEquals(8443, $request->getPort(), 'With PROTO and PORT set PORT takes precedence.');

$request = Request::create('http://example.com', 'GET', array(), array(), array(), array(
'HTTP_X_FORWARDED_PROTO' => 'https',
));
$port = $request->getPort();

$this->assertEquals(443, $port, 'With only PROTO set getPort() defaults to 443.');
$this->assertEquals(80, $request->getPort(), 'With only PROTO set getPort() ignores trusted headers on untrusted connection.');
$request->server->set('REMOTE_ADDR', '1.1.1.1');
$this->assertEquals(443, $request->getPort(), 'With only PROTO set getPort() defaults to 443.');

$request = Request::create('http://example.com', 'GET', array(), array(), array(), array(
'HTTP_X_FORWARDED_PROTO' => 'http',
));
$port = $request->getPort();

$this->assertEquals(80, $port, 'If X_FORWARDED_PROTO is set to HTTP return 80.');
$this->assertEquals(80, $request->getPort(), 'If X_FORWARDED_PROTO is set to HTTP getPort() ignores trusted headers on untrusted connection.');
$request->server->set('REMOTE_ADDR', '1.1.1.1');
$this->assertEquals(80, $request->getPort(), 'If X_FORWARDED_PROTO is set to HTTP getPort() returns port of the original request.');

$request = Request::create('http://example.com', 'GET', array(), array(), array(), array(
'HTTP_X_FORWARDED_PROTO' => 'On',
));
$port = $request->getPort();
$this->assertEquals(443, $port, 'With only PROTO set and value is On, getPort() defaults to 443.');
$this->assertEquals(80, $request->getPort(), 'With only PROTO set and value is On, getPort() ignores trusted headers on untrusted connection.');
$request->server->set('REMOTE_ADDR', '1.1.1.1');
$this->assertEquals(443, $request->getPort(), 'With only PROTO set and value is On, getPort() defaults to 443.');

$request = Request::create('http://example.com', 'GET', array(), array(), array(), array(
'HTTP_X_FORWARDED_PROTO' => '1',
));
$port = $request->getPort();
$this->assertEquals(443, $port, 'With only PROTO set and value is 1, getPort() defaults to 443.');
$this->assertEquals(80, $request->getPort(), 'With only PROTO set and value is 1, getPort() ignores trusted headers on untrusted connection.');
$request->server->set('REMOTE_ADDR', '1.1.1.1');
$this->assertEquals(443, $request->getPort(), 'With only PROTO set and value is 1, getPort() defaults to 443.');

$request = Request::create('http://example.com', 'GET', array(), array(), array(), array(
'HTTP_X_FORWARDED_PROTO' => 'something-else',
Expand Down Expand Up @@ -1020,6 +1022,8 @@ public function testOverrideGlobals()
$request->headers->set('X_FORWARDED_PROTO', 'https');

Request::setTrustedProxies(array('1.1.1.1'));
$this->assertFalse($request->isSecure());
$request->server->set('REMOTE_ADDR', '1.1.1.1');
$this->assertTrue($request->isSecure());
Request::setTrustedProxies(array());

Expand Down Expand Up @@ -1455,7 +1459,15 @@ public function testTrustedProxies()
$this->assertEquals(443, $request->getPort());
$this->assertTrue($request->isSecure());

// trusted proxy via setTrustedProxies()
Request::setTrustedProxies(array('3.3.3.4', '2.2.2.2'));
$this->assertEquals('3.3.3.3', $request->getClientIp());
$this->assertEquals('example.com', $request->getHost());
$this->assertEquals(80, $request->getPort());
$this->assertFalse($request->isSecure());

// check various X_FORWARDED_PROTO header values
Request::setTrustedProxies(array('3.3.3.3', '2.2.2.2'));
$request->headers->set('X_FORWARDED_PROTO', 'ssl');
$this->assertTrue($request->isSecure());

Expand Down
0