diff --git a/admin/base/settings/defaults.py b/admin/base/settings/defaults.py index 1997310f6f0..15983664179 100644 --- a/admin/base/settings/defaults.py +++ b/admin/base/settings/defaults.py @@ -30,14 +30,13 @@ # session: SESSION_COOKIE_NAME = 'admin' -SESSION_COOKIE_SECURE = osf_settings.SECURE_MODE +SESSION_COOKIE_SECURE = osf_settings.SESSION_COOKIE_SECURE SESSION_COOKIE_HTTPONLY = osf_settings.SESSION_COOKIE_HTTPONLY # csrf: CSRF_COOKIE_NAME = 'admin-csrf' -CSRF_COOKIE_SECURE = osf_settings.SECURE_MODE -# set to False for admin draft registration uses a SPA and ajax and grab the token to use it in the requests -CSRF_COOKIE_HTTPONLY = False +CSRF_COOKIE_SECURE = osf_settings.SESSION_COOKIE_SECURE +CSRF_COOKIE_HTTPONLY = True ALLOWED_HOSTS = [ '.osf.io' diff --git a/admin_tests/base/test_csrf.py b/admin_tests/base/test_csrf.py new file mode 100644 index 00000000000..6cef38bf038 --- /dev/null +++ b/admin_tests/base/test_csrf.py @@ -0,0 +1,46 @@ +from copy import deepcopy + +import pytest + +from django.test import Client +from django.urls import reverse + +from admin.base import settings as admin_settings + + +@pytest.mark.django_db +@pytest.mark.urls('admin.base.urls') +class TestAdminCSRF: + + @pytest.fixture + def admin_client(self, settings): + # Admin templates need webpack_loader, which isn't in the API test settings. + templates = deepcopy(admin_settings.TEMPLATES) + templates[0]['OPTIONS']['libraries'] = { + 'webpack_loader': 'webpack_loader.templatetags.webpack_loader', + } + settings.MIDDLEWARE = admin_settings.MIDDLEWARE + settings.TEMPLATES = templates + settings.WEBPACK_LOADER = admin_settings.WEBPACK_LOADER + settings.CSRF_COOKIE_NAME = admin_settings.CSRF_COOKIE_NAME + settings.CSRF_COOKIE_HTTPONLY = admin_settings.CSRF_COOKIE_HTTPONLY + return Client(enforce_csrf_checks=True, HTTP_REFERER='https://testserver/') + + @pytest.mark.parametrize('secure', [False, True]) + def test_login_form_with_httponly_csrf_cookie(self, admin_client, settings, secure): + settings.CSRF_COOKIE_SECURE = secure + url = reverse('auth:login') + response = admin_client.get(url, secure=secure) + + assert response.status_code == 200 + cookie = response.cookies[admin_settings.CSRF_COOKIE_NAME] + assert bool(cookie['secure']) == secure + assert cookie['httponly'] + + assert admin_client.post(url, secure=secure).status_code == 403 + + response = admin_client.post(url, { + 'csrfmiddlewaretoken': str(response.context['csrf_token']), + }, secure=secure) + assert response.status_code == 302 + assert response.url == url diff --git a/api/base/settings/defaults.py b/api/base/settings/defaults.py index 3b8f090ef23..c2aad06f016 100644 --- a/api/base/settings/defaults.py +++ b/api/base/settings/defaults.py @@ -58,7 +58,7 @@ # session: SESSION_COOKIE_NAME = osf_settings.COOKIE_NAME -SESSION_COOKIE_SECURE = osf_settings.SECURE_MODE +SESSION_COOKIE_SECURE = osf_settings.SESSION_COOKIE_SECURE SESSION_COOKIE_HTTPONLY = osf_settings.SESSION_COOKIE_HTTPONLY SESSION_COOKIE_SAMESITE = osf_settings.SESSION_COOKIE_SAMESITE SESSION_COOKIE_AGE = 2592000 # 30 days in seconds @@ -67,8 +67,9 @@ # csrf: CSRF_COOKIE_NAME = 'api-csrf' -CSRF_COOKIE_SECURE = osf_settings.SECURE_MODE -CSRF_COOKIE_HTTPONLY = osf_settings.SECURE_MODE +CSRF_COOKIE_SECURE = osf_settings.SESSION_COOKIE_SECURE +# JavaScript reads this cookie for the X-CSRFToken header. +CSRF_COOKIE_HTTPONLY = False ALLOWED_HOSTS = [ '.osf.io', diff --git a/framework/csrf/handlers.py b/framework/csrf/handlers.py index 4e384d34899..5ed97d61707 100644 --- a/framework/csrf/handlers.py +++ b/framework/csrf/handlers.py @@ -52,6 +52,7 @@ def after_request(resp): max_age=api_settings.CSRF_COOKIE_AGE, domain=api_settings.CSRF_COOKIE_DOMAIN, path=api_settings.CSRF_COOKIE_PATH, + secure=api_settings.CSRF_COOKIE_SECURE, httponly=api_settings.CSRF_COOKIE_HTTPONLY, ) diff --git a/tests/test_csrf.py b/tests/test_csrf.py index e4c5784419a..a6c96582be1 100644 --- a/tests/test_csrf.py +++ b/tests/test_csrf.py @@ -1,9 +1,34 @@ +from http.cookies import SimpleCookie + +import pytest +from flask import Flask, Response + +from framework.csrf import handlers from tests.base import OsfTestCase from osf_tests.factories import UserFactory from django.conf import settings as api_settings from website import settings +class TestCSRFHandlers: + + @pytest.mark.parametrize('secure', [False, True]) + def test_csrf_cookie_flags(self, settings, monkeypatch, secure): + settings.CSRF_COOKIE_SECURE = secure + monkeypatch.setattr(handlers, 'get_current_user_id', lambda: 'user') + app = Flask(__name__) + + with app.test_request_context('/'): + handlers.before_request() + response = handlers.after_request(Response()) + + cookies = SimpleCookie() + cookies.load(response.headers['Set-Cookie']) + cookie = cookies[api_settings.CSRF_COOKIE_NAME] + assert bool(cookie['secure']) == secure + assert not cookie['httponly'] + + class TestCSRF(OsfTestCase): def test_csrf_cookie_gets_set_on_authd_request(self):