8000 [HttpFoundation] Fix BinaryFileResponse incorrect behavior with if-range header by bburnichon · Pull Request #17602 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[HttpFoundation] Fix BinaryFileResponse incorrect behavior with if-range header #17602

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

Merged
merged 1 commit into from
Feb 26, 2016
Merged

[HttpFoundation] Fix BinaryFileResponse incorrect behavior with if-range header #17602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Add check on If-Range header 
Also verify edge case where no last-modified header is available
  • Loading branch information
Benoît Burnichon committed Feb 22, 2016
commit aaad5bd3d193a94b8ac02b54357bee1042ae0a5f
15 changes: 14 additions & 1 deletion src/Symfony/Component/HttpFoundation/BinaryFileResponse.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ public function prepare(Request $request)
$this->maxlen = 0;
} elseif ($request->headers->has('Range')) {
// Process the range headers.
if (!$request->headers->has('If-Range') || $this->getEtag() === $request->headers->get('If-Range')) {
if (!$request->headers->has('If-Range') || $this->hasValidIfRangeHeader($request->headers->get('If-Range'))) {
$range = $request->headers->get('Range');
$fileSize = $this->file->getSize();

Expand Down Expand Up @@ -253,6 +253,19 @@ public function prepare(Request $request)
return $this;
}

private function hasValidIfRangeHeader($header)
{
if ($this->getEtag() === $header) {
return true;
}

if (null === $lastModified = $this->getLastModified()) {
return false;
}

return $lastModified->format('D, d M Y H:i:s').' GMT' === $header;
}

/**
* Sends the file.
*
Expand Down
50 changes: 50 additions & 0 deletions src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php
View file
Open in desktop
8000
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,37 @@ public function testRequests($requestRange, $offset, $length, $responseRange)
$this->assertEquals($responseRange, $response->headers->get('Content-Range'));
}

/**
* @dataProvider provideRanges
*/
public function testRequestsWithoutEtag($requestRange, $offset, $length, $responseRange)
{
$response = BinaryFileResponse::create(__DIR__.'/File/Fixtures/test.gif', 200, array('Content-Type' => 'application/octet-stream'));

// do a request to get the LastModified
$request = Request::create('/');
$response->prepare($request);
$lastModified = $response->headers->get('Last-Modified');

// prepare a request for a range of the testing file
$request = Request::create('/');
$request->headers->set('If-Range', $lastModified);
$request->headers->set('Range', $requestRange);

$file = fopen(__DIR__.'/File/Fixtures/test.gif', 'r');
fseek($file, $offset);
$data = fread($file, $length);
fclose($file);

$this->expectOutputString($data);
$response = clone $response;
$response->prepare($request);
$response->sendContent();

$this->assertEquals(206, $response->getStatusCode());
$this->assertEquals($responseRange, $response->headers->get('Content-Range'));
}

public function provideRanges()
{
return array(
Expand All @@ -91,6 +122,25 @@ public function provideRanges()
);
}

public function testRangeRequestsWithoutLastModifiedDate()
{
// prevent auto last modified
$response = BinaryFileResponse::create(__DIR__.'/File/Fixtures/test.gif', 200, array('Content-Type' => 'application/octet-stream'), true, null, false, false);

// prepare a request for a range of the testing file
$request = Request::create('/');
$request->headers->set('If-Range', date('D, d M Y H:i:s').' GMT');
$request->headers->set('Range', 'bytes=1-4');

$this->expectOutputString(file_get_contents(__DIR__.'/File/Fixtures/test.gif'));
$response = clone $response;
$response->prepare($request);
$response->sendContent();

$this->assertEquals(200, $response->getStatusCode());
$this->assertNull($response->headers->get('Content-Range'));
}

/**
* @dataProvider provideFullFileRanges
*/
Expand Down
0