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: support different JWT CSRF cookie names #25891

Merged
merged 6 commits into from
Nov 14, 2023
Merged

chore: support different JWT CSRF cookie names #25891

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
455c2eb
chore: support different JWT CSRF cookie names
dpgaspar Nov 7, 2023
b86618d
abs import
dpgaspar Nov 7, 2023
8bcd810
fix
dpgaspar Nov 7, 2023
b3a2a72
fix name
dpgaspar Nov 7, 2023
da90256
debug
dpgaspar Nov 10, 2023
fd6d73c
remove debug
dpgaspar Nov 10, 2023
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
7 changes: 6 additions & 1 deletion superset-frontend/src/setup/setupClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,18 @@
*/
import { SupersetClient, logging, ClientConfig } from '@superset-ui/core';
import parseCookie from 'src/utils/parseCookie';
import getBootstrapData from 'src/utils/getBootstrapData';

const bootstrapData = getBootstrapData();

function getDefaultConfiguration(): ClientConfig {
const csrfNode = document.querySelector<HTMLInputElement>('#csrf_token');
const csrfToken = csrfNode?.value;

// when using flask-jwt-extended csrf is set in cookies
const cookieCSRFToken = parseCookie().csrf_access_token || '';
const JWTAccessCSRFCookieName =
dpgaspar marked this conversation as resolved.
Show resolved Hide resolved
bootstrapData.common.conf.JWT_ACCESS_CSRF_COOKIE_NAME;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't we have a fallback here to 'csrf_access_token'?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

by default JWT_ACCESS_CSRF_COOKIE_NAME is csrf_access_token and that default is set by flask-jwt-extended

const cookieCSRFToken = parseCookie()[JWTAccessCSRFCookieName] || '';

return {
protocol: ['http:', 'https:'].includes(window?.location?.protocol)
Expand Down
1 change: 1 addition & 0 deletions superset/views/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@
"ALERT_REPORTS_DEFAULT_WORKING_TIMEOUT",
"NATIVE_FILTER_DEFAULT_ROW_LIMIT",
"PREVENT_UNSAFE_DEFAULT_URLS_ON_DATASET",
"JWT_ACCESS_CSRF_COOKIE_NAME",
)

logger = logging.getLogger(__name__)
Expand Down