Skip to content

Commit c854c29

Browse files
authored
Fix broken cookie paths when BASE_PATH is set (introduced in #10706) (#10856)
Fixes #10837
1 parent 33d8f8e commit c854c29

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

netbox/netbox/settings.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,11 @@
8181
BASE_PATH = getattr(configuration, 'BASE_PATH', '')
8282
if BASE_PATH:
8383
BASE_PATH = BASE_PATH.strip('/') + '/' # Enforce trailing slash only
84+
CSRF_COOKIE_PATH = LANGUAGE_COOKIE_PATH = SESSION_COOKIE_PATH = f'/{BASE_PATH.rstrip("/")}'
8485
CORS_ORIGIN_ALLOW_ALL = getattr(configuration, 'CORS_ORIGIN_ALLOW_ALL', False)
8586
CORS_ORIGIN_REGEX_WHITELIST = getattr(configuration, 'CORS_ORIGIN_REGEX_WHITELIST', [])
8687
CORS_ORIGIN_WHITELIST = getattr(configuration, 'CORS_ORIGIN_WHITELIST', [])
8788
CSRF_COOKIE_NAME = getattr(configuration, 'CSRF_COOKIE_NAME', 'csrftoken')
88-
CSRF_COOKIE_PATH = BASE_PATH or '/'
8989
CSRF_TRUSTED_ORIGINS = getattr(configuration, 'CSRF_TRUSTED_ORIGINS', [])
9090
DATE_FORMAT = getattr(configuration, 'DATE_FORMAT', 'N j, Y')
9191
DATETIME_FORMAT = getattr(configuration, 'DATETIME_FORMAT', 'N j, Y g:i a')
@@ -130,8 +130,6 @@
130130
SENTRY_TAGS = getattr(configuration, 'SENTRY_TAGS', {})
131131
SESSION_FILE_PATH = getattr(configuration, 'SESSION_FILE_PATH', None)
132132
SESSION_COOKIE_NAME = getattr(configuration, 'SESSION_COOKIE_NAME', 'sessionid')
133-
SESSION_COOKIE_PATH = BASE_PATH or '/'
134-
LANGUAGE_COOKIE_PATH = BASE_PATH or '/'
135133
SHORT_DATE_FORMAT = getattr(configuration, 'SHORT_DATE_FORMAT', 'Y-m-d')
136134
SHORT_DATETIME_FORMAT = getattr(configuration, 'SHORT_DATETIME_FORMAT', 'Y-m-d H:i')
137135
SHORT_TIME_FORMAT = getattr(configuration, 'SHORT_TIME_FORMAT', 'H:i:s')

0 commit comments

Comments
 (0)