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

fix!: (WIP) Disable Secure cookies by default, enable when using HTTPS #5011

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions api/app/settings/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -1043,8 +1043,8 @@
PREVENT_SIGNUP = env.bool("PREVENT_SIGNUP", default=False)
PREVENT_EMAIL_PASSWORD = env.bool("PREVENT_EMAIL_PASSWORD", default=False)
COOKIE_AUTH_ENABLED = env.bool("COOKIE_AUTH_ENABLED", default=False)
USE_SECURE_COOKIES = env.bool("USE_SECURE_COOKIES", default=True)
COOKIE_SAME_SITE = env.str("COOKIE_SAME_SITE", default="none")
USE_SECURE_COOKIES = env.bool("USE_SECURE_COOKIES", default=False)
COOKIE_SAME_SITE = env.str("COOKIE_SAME_SITE", default=None)

# CORS settings

Expand Down
10 changes: 9 additions & 1 deletion api/app/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,22 @@
"preventEmailPassword": "PREVENT_EMAIL_PASSWORD",
"preventSignup": "PREVENT_SIGNUP",
"sentry": "SENTRY_API_KEY",
"useSecureCookies": "USE_SECURE_COOKIES",
}

override_data = {
key: getattr(settings, value)
for key, value in config_mapping_dict.items()
if getattr(settings, value, None) is not None
}
is_secure_request = request.is_secure()
override_data["useSecureCookies"] = is_secure_request or settings.USE_SECURE_COOKIES
if settings.COOKIE_SAME_SITE is not None:
same_site = settings.COOKIE_SAME_SITE
elif is_secure_request:
same_site = "None"

Check warning on line 71 in api/app/views.py

View check run for this annotation

Codecov / codecov/patch

api/app/views.py#L66-L71

Added lines #L66 - L71 were not covered by tests
else:
same_site = "Lax"
override_data["cookieSameSite"] = same_site

Check warning on line 74 in api/app/views.py

View check run for this annotation

Codecov / codecov/patch

api/app/views.py#L73-L74

Added lines #L73 - L74 were not covered by tests

return HttpResponse(
content="window.projectOverrides = " + json.dumps(override_data),
Expand Down
4 changes: 2 additions & 2 deletions api/custom_auth/jwt_cookie/services.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
from users.models import FFAdminUser


def authorise_response(user: FFAdminUser, response: Response) -> Response:
def authorise_response(user: FFAdminUser, response: Response, secure=False) -> Response:
sliding_token = SlidingToken.for_user(user)
response.set_cookie(
JWT_SLIDING_COOKIE_KEY,
str(sliding_token),
httponly=True,
secure=settings.USE_SECURE_COOKIES,
secure=secure,
samesite=settings.COOKIE_SAME_SITE,
)
return response
12 changes: 10 additions & 2 deletions api/custom_auth/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,11 @@ def post(self, request: Request) -> Response:
)
except MFAMethodDoesNotExistError:
if settings.COOKIE_AUTH_ENABLED:
return authorise_response(user, Response(status=HTTP_204_NO_CONTENT))
return authorise_response(
user,
Response(status=HTTP_204_NO_CONTENT),
secure=request.is_secure(),
)
return self._action(serializer)


Expand All @@ -83,7 +87,11 @@ def post(self, request: Request) -> Response:
)
serializer.user = user
if settings.COOKIE_AUTH_ENABLED:
return authorise_response(user, Response(status=HTTP_204_NO_CONTENT))
return authorise_response(
user,
Response(status=HTTP_204_NO_CONTENT),
secure=request.is_secure(),
)
return self._action(serializer)
except MFAValidationError as cause:
return ErrorResponse(error=cause, status=status.HTTP_401_UNAUTHORIZED)
Expand Down
4 changes: 2 additions & 2 deletions frontend/api/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@ app.get('/config/project-overrides', (req, res) => {
value: envToBool('LINKEDIN_PARTNER_TRACKING', false),
},
{ name: 'albacross', value: process.env.ALBACROSS_CLIENT_ID },
{ name: 'useSecureCookies', value: envToBool('USE_SECURE_COOKIES', true) },
{ name: 'cookieSameSite', value: process.env.USE_SECURE_COOKIES },
{ name: 'useSecureCookies', value: envToBool('USE_SECURE_COOKIES', false) },
{ name: 'cookieSameSite', value: process.env.COOKIE_SAME_SITE },
{ name: 'cookieAuthEnabled', value: process.env.COOKIE_AUTH_ENABLED },
{
name: 'githubAppURL',
Expand Down
2 changes: 1 addition & 1 deletion frontend/web/project/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ global.API = {
require('js-cookie').set(key, v, {
expires: 30,
path: '/',
sameSite: Project.cookieSameSite || 'none',
sameSite: Project.cookieSameSite || 'Lax',
secure: Project.useSecureCookies,
})
}
Expand Down
Loading