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.

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

chore: enable csrf token to be read from request headers #2586

Merged
merged 7 commits into from
Jan 22, 2024
Merged

chore: enable csrf token to be read from request headers #2586

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d1ba3ba
chore: enable csrfSubscriber to handle csrf token in header
Jan 17, 2024
4742118
chore: bind csrf token to window.dplan
Jan 17, 2024
eb067f0
chore: set csrf token based on received as input or request header
Jan 17, 2024
ca40830
chore: use lower case header verb for new headers
Jan 17, 2024
69712db
chore: simplify fetch token from header
mussbach Jan 22, 2024
bfa960b
style: Apply php-cs-fixer
demosci Jan 22, 2024
50cdd8d
Merge branch 'main' into chore_enable_csrf_token_to_be_read_from_requ…
muellerdemos Jan 22, 2024
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
5 changes: 5 additions & 0 deletions demosplan/DemosPlanCoreBundle/EventSubscriber/CsrfSubscriber.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ public function onKernelRequest(RequestEvent $event): void
}

$tokenId = $request->request->get('_token');
if ($request->headers->has('x-csrf-token')) {
$tokenId = $request->headers->get('x-csrf-token');
}

if (null === $tokenId) {
$this->messageBag->add('dev', 'error.csrf.missing', ['uri' => $request->getRequestUri()]);
$this->logger->info('CSRF token missing', ['uri' => $request->getRequestUri()]);
Expand All @@ -44,6 +48,7 @@ public function onKernelRequest(RequestEvent $event): void
}

$token = $this->csrfTokenManager->getToken($tokenId);

if ($token instanceof CsrfToken && $this->csrfTokenManager->isTokenValid($token)) {
// all clear, token is set and valid
return;
Expand Down
1 change: 1 addition & 0 deletions templates/bundles/DemosPlanCoreBundle/DemosPlanCore/js/dplan.settings.js.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ window.dplan = {
roles: "{{ currentUser.roles|default([])|json_encode }}"
},
sentryDsn : "{{ sentry_dsn|default }}",
csrfToken : "{{ csrf_token('csrf')|json_encode }}",
jwtToken : "{{ jwtToken|default }}",

defaultProjectionLabel : "{{ defaultProjectionLabel() }}",
Expand Down