From ea0c79c7e3c44a62827e6c82104462e3ca94c724 Mon Sep 17 00:00:00 2001 From: Jillian Vogel Date: Tue, 20 Feb 2018 15:37:20 +1030 Subject: [PATCH 1/2] Adds redirect middleware to Studio --- cms/envs/common.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cms/envs/common.py b/cms/envs/common.py index 85307f775d..d8db4b89af 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -461,6 +461,9 @@ MIDDLEWARE_CLASSES = [ _csrf_middleware, 'django.contrib.sites.middleware.CurrentSiteMiddleware', + # Allows us to define redirects via Django admin + 'django_sites_extensions.middleware.RedirectMiddleware', + # Instead of SessionMiddleware, we use a more secure version # 'django.contrib.sessions.middleware.SessionMiddleware', 'openedx.core.djangoapps.safe_sessions.middleware.SafeSessionMiddleware', From d10eb500b78d7c68e27214df26013f0fa11d1345 Mon Sep 17 00:00:00 2001 From: Jillian Vogel Date: Wed, 21 Feb 2018 11:44:39 +1030 Subject: [PATCH 2/2] Updates tests: adding middleware increased the number of CMS database queries by 1 --- .../contentstore/views/tests/test_course_index.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cms/djangoapps/contentstore/views/tests/test_course_index.py b/cms/djangoapps/contentstore/views/tests/test_course_index.py index a0c40a2445..dababa230e 100644 --- a/cms/djangoapps/contentstore/views/tests/test_course_index.py +++ b/cms/djangoapps/contentstore/views/tests/test_course_index.py @@ -392,13 +392,13 @@ class TestCourseIndexArchived(CourseTestCase): @ddt.data( # Staff user has course staff access - (True, 'staff', None, 3, 17), - (False, 'staff', None, 3, 17), + (True, 'staff', None, 3, 18), + (False, 'staff', None, 3, 18), # Base user has global staff access - (True, 'user', ORG, 3, 17), - (False, 'user', ORG, 3, 17), - (True, 'user', None, 3, 17), - (False, 'user', None, 3, 17), + (True, 'user', ORG, 3, 18), + (False, 'user', ORG, 3, 18), + (True, 'user', None, 3, 18), + (False, 'user', None, 3, 18), ) @ddt.unpack def test_separate_archived_courses(self, separate_archived_courses, username, org, mongo_queries, sql_queries):