Skip to content

Commit

Permalink
Merge branch '5.4' into 6.4
Browse files Browse the repository at this point in the history
* 5.4:
  Do not read from argv on non-CLI SAPIs
  [Process] Use %PATH% before %CD% to load the shell on Windows
  [HttpFoundation] Reject URIs that contain invalid characters
  [HttpClient] Filter private IPs before connecting when Host == IP
  • Loading branch information
nicolas-grekas committed Nov 5, 2024
2 parents 4875486 + 168b77c commit ba020a3
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 2 deletions.
17 changes: 17 additions & 0 deletions Request.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

namespace Symfony\Component\HttpFoundation;

use Symfony\Component\HttpFoundation\Exception\BadRequestException;
use Symfony\Component\HttpFoundation\Exception\ConflictingHeadersException;
use Symfony\Component\HttpFoundation\Exception\JsonException;
use Symfony\Component\HttpFoundation\Exception\SessionNotFoundException;
Expand Down Expand Up @@ -326,6 +327,8 @@ public static function createFromGlobals(): static
* @param array $files The request files ($_FILES)
* @param array $server The server parameters ($_SERVER)
* @param string|resource|null $content The raw body data
*
* @throws BadRequestException When the URI is invalid
*/
public static function create(string $uri, string $method = 'GET', array $parameters = [], array $cookies = [], array $files = [], array $server = [], $content = null): static
{
Expand Down Expand Up @@ -354,6 +357,20 @@ public static function create(string $uri, string $method = 'GET', array $parame
unset($components['fragment']);
}

if (false === $components) {
throw new BadRequestException('Invalid URI.');
}

if (false !== ($i = strpos($uri, '\\')) && $i < strcspn($uri, '?#')) {
throw new BadRequestException('Invalid URI: A URI cannot contain a backslash.');
}
if (\strlen($uri) !== strcspn($uri, "\r\n\t")) {
throw new BadRequestException('Invalid URI: A URI cannot contain CR/LF/TAB characters.');
}
if ('' !== $uri && (\ord($uri[0]) <= 32 || \ord($uri[-1]) <= 32)) {
throw new BadRequestException('Invalid URI: A URI must not start nor end with ASCII control characters or spaces.');
}

if (isset($components['host'])) {
$server['SERVER_NAME'] = $components['host'];
$server['HTTP_HOST'] = $components['host'];
Expand Down
30 changes: 28 additions & 2 deletions Tests/RequestTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

use PHPUnit\Framework\TestCase;
use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
use Symfony\Component\HttpFoundation\Exception\BadRequestException;
use Symfony\Component\HttpFoundation\Exception\ConflictingHeadersException;
use Symfony\Component\HttpFoundation\Exception\JsonException;
use Symfony\Component\HttpFoundation\Exception\SuspiciousOperationException;
Expand Down Expand Up @@ -305,9 +306,34 @@ public function testCreateWithRequestUri()
$this->assertTrue($request->isSecure());

// Fragment should not be included in the URI
$request = Request::create('http://test.com/foo#bar');
$request->server->set('REQUEST_URI', 'http://test.com/foo#bar');
$request = Request::create('http://test.com/foo#bar\\baz');
$request->server->set('REQUEST_URI', 'http://test.com/foo#bar\\baz');
$this->assertEquals('http://test.com/foo', $request->getUri());

$request = Request::create('http://test.com/foo?bar=f\\o');
$this->assertEquals('http://test.com/foo?bar=f%5Co', $request->getUri());
$this->assertEquals('/foo', $request->getPathInfo());
$this->assertEquals('bar=f%5Co', $request->getQueryString());
}

/**
* @testWith ["http://foo.com\\bar"]
* ["\\\\foo.com/bar"]
* ["a\rb"]
* ["a\nb"]
* ["a\tb"]
* ["\u0000foo"]
* ["foo\u0000"]
* [" foo"]
* ["foo "]
* [":"]
*/
public function testCreateWithBadRequestUri(string $uri)
{
$this->expectException(BadRequestException::class);
$this->expectExceptionMessage('Invalid URI');

Request::create($uri);
}

/**
Expand Down

0 comments on commit ba020a3

Please sign in to comment.