Skip to content

Check multiple Vary headers when existing #32

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 2 commits into from
Mar 13, 2025
Merged

Check multiple Vary headers when existing #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95bebd9
Check multiple Vary headers when existing
barryvdh Mar 13, 2025
69714b5
Use setVary
barryvdh Mar 13, 2025
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
11 changes: 9 additions & 2 deletions src/CorsService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,8 +276,15 @@ public function varyHeader(Response $response, string $header): Response
{
if (!$response->headers->has('Vary')) {
$response->headers->set('Vary', $header);
} elseif (!in_array($header, explode(', ', (string) $response->headers->get('Vary')))) {
$response->headers->set('Vary', ((string) $response->headers->get('Vary')) . ', ' . $header);
} else {
$varyHeaders = $response->getVary();
if (!in_array($header, $varyHeaders, true)) {
if (count($response->headers->all('Vary')) === 1) {
$response->setVary(((string)$response->headers->get('Vary')) . ', ' . $header);
} else {
$response->setVary($header, false);
}
}
}

return $response;
Expand Down
28 changes: 27 additions & 1 deletion tests/CorsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,32 @@ public function itAppendsAnExistingVaryHeader(): void
$this->assertEquals('Content-Type, Origin', $response->headers->get('Vary'));
}

/**
* @test
* @see http://www.w3.org/TR/cors/index.html#resource-implementation
*/
public function itAppendsMultipleExistingVaryHeaders(): void
{
$app = $this->createStackedApp(
array(
'allowedOrigins' => ['*'],
'supportsCredentials' => true,
),
array(
'Vary' => [
'Content-Type',
'Referer',
],
)
);
$request = $this->createValidActualRequest();

$response = $app->handle($request);

$this->assertCount(3, $response->headers->all('Vary'));
$this->assertEquals(['Content-Type', 'Referer', 'Origin'], $response->headers->all('Vary'));
}

/**
* @test
*/
Expand Down Expand Up @@ -555,7 +581,7 @@ private function createValidPreflightRequest(): Request

/**
* @param CorsInputOptions $options
* @param string[] $responseHeaders
* @param array<array<string>|string> $responseHeaders
* @return MockApp
*/
private function createStackedApp(array $options = array(), array $responseHeaders = array()): MockApp
Expand Down
4 changes: 2 additions & 2 deletions tests/MockApp.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*/
class MockApp
{
/** @var string[] */
/** @var array<array<string>|string> */
private $responseHeaders;

/**
Expand All @@ -30,7 +30,7 @@ class MockApp
private $cors;

/**
* @param string[] $responseHeaders
* @param array<array<string>|string> $responseHeaders
* @param CorsInputOptions $options
*/
public function __construct(array $responseHeaders, array $options = [])
Expand Down