Skip to content

Commit 27b26ec

Browse files
Fixes #19195: Language cookie should respect SESSION_COOKIE_SECURE value (#19197)
1 parent 7c2776d commit 27b26ec

File tree

2 files changed

+18
-3
lines changed

2 files changed

+18
-3
lines changed

netbox/account/views.py

+12-2
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,12 @@ def post(self, request):
123123

124124
# Set the user's preferred language (if any)
125125
if language := request.user.config.get('locale.language'):
126-
response.set_cookie(settings.LANGUAGE_COOKIE_NAME, language, max_age=request.session.get_expiry_age())
126+
response.set_cookie(
127+
key=settings.LANGUAGE_COOKIE_NAME,
128+
value=language,
129+
max_age=request.session.get_expiry_age(),
130+
secure=settings.SESSION_COOKIE_SECURE,
131+
)
127132

128133
return response
129134

@@ -218,7 +223,12 @@ def post(self, request):
218223

219224
# Set/clear language cookie
220225
if language := form.cleaned_data['locale.language']:
221-
response.set_cookie(settings.LANGUAGE_COOKIE_NAME, language, max_age=request.session.get_expiry_age())
226+
response.set_cookie(
227+
key=settings.LANGUAGE_COOKIE_NAME,
228+
value=language,
229+
max_age=request.session.get_expiry_age(),
230+
secure=settings.SESSION_COOKIE_SECURE,
231+
)
222232
else:
223233
response.delete_cookie(settings.LANGUAGE_COOKIE_NAME)
224234

netbox/netbox/middleware.py

+6-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,12 @@ def __call__(self, request):
4343
# Check if language cookie should be renewed
4444
if request.user.is_authenticated and settings.SESSION_SAVE_EVERY_REQUEST:
4545
if language := request.user.config.get('locale.language'):
46-
response.set_cookie(settings.LANGUAGE_COOKIE_NAME, language, max_age=request.session.get_expiry_age())
46+
response.set_cookie(
47+
key=settings.LANGUAGE_COOKIE_NAME,
48+
value=language,
49+
max_age=request.session.get_expiry_age(),
50+
secure=settings.SESSION_COOKIE_SECURE,
51+
)
4752

4853
# Attach the unique request ID as an HTTP header.
4954
response['X-Request-ID'] = request.id

0 commit comments

Comments
 (0)