Skip to content
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.

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

Add configuration flag to allow to opt-out from skipping CORS when same as origin #178

Merged
merged 3 commits into from Feb 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 10 additions & 0 deletions DependencyInjection/Configuration.php
Expand Up @@ -49,6 +49,7 @@ public function getConfigTreeBuilder(): TreeBuilder
->append($this->getHosts())
->append($this->getOriginRegex())
->append($this->getForcedAllowOriginValue())
->append($this->getSkipSameAsOrigin())
->end()

->arrayNode('paths')
Expand All @@ -64,13 +65,22 @@ public function getConfigTreeBuilder(): TreeBuilder
->append($this->getHosts())
->append($this->getOriginRegex())
->append($this->getForcedAllowOriginValue())
->append($this->getSkipSameAsOrigin())
->end()
->end()
;

return $treeBuilder;
}

private function getSkipSameAsOrigin(): BooleanNodeDefinition
{
$node = new BooleanNodeDefinition('skip_same_as_origin');
$node->defaultTrue();

return $node;
}

private function getAllowCredentials(): BooleanNodeDefinition
{
$node = new BooleanNodeDefinition('allow_credentials');
Expand Down
6 changes: 5 additions & 1 deletion EventListener/CorsListener.php
Expand Up @@ -64,7 +64,11 @@ public function onKernelRequest(RequestEvent $event): void
}

// skip if not a CORS request
if (!$request->headers->has('Origin') || $request->headers->get('Origin') === $request->getSchemeAndHttpHost()) {
if (!$request->headers->has('Origin')) {
return;
}

if ($options['skip_same_as_origin'] && $request->headers->get('Origin') === $request->getSchemeAndHttpHost()) {
return;
}

Expand Down
1 change: 1 addition & 0 deletions README.md
Expand Up @@ -70,6 +70,7 @@ seconds.
hosts: []
origin_regex: false
forced_allow_origin_value: ~
skip_same_as_origin: true
nocive marked this conversation as resolved.
Show resolved Hide resolved
paths:
'^/api/':
allow_origin: ['*']
Expand Down