From cb4901431d912dc94fd1f71dd3e50ffb6f35074f Mon Sep 17 00:00:00 2001
From: Chris Dodge <cdodge@edx.org>
Date: Fri, 30 Oct 2015 15:46:13 -0400
Subject: [PATCH 1/8] mark test_can_reset_attempts as flakey as it sporadically
 fails

---
 .../test/acceptance/tests/lms/test_lms_instructor_dashboard.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/common/test/acceptance/tests/lms/test_lms_instructor_dashboard.py b/common/test/acceptance/tests/lms/test_lms_instructor_dashboard.py
index d4c5285674..ee687c5d2e 100644
--- a/common/test/acceptance/tests/lms/test_lms_instructor_dashboard.py
+++ b/common/test/acceptance/tests/lms/test_lms_instructor_dashboard.py
@@ -244,7 +244,7 @@ class ProctoredExamsTest(BaseInstructorDashboardTest):
         # Stop the timed exam.
         self.courseware_page.stop_timed_exam()
 
-    @flaky  # TODO fix this SOL-1183
+    @flaky  # TODO fix this SOL-1182
     def test_can_add_remove_allowance(self):
         """
         Make sure that allowances can be added and removed.
@@ -262,6 +262,7 @@ class ProctoredExamsTest(BaseInstructorDashboardTest):
         # Then I can add Allowance to that exam for a student
         self.assertTrue(allowance_section.is_add_allowance_button_visible)
 
+    @flaky  # TODO fix this SOL-1182
     def test_can_reset_attempts(self):
         """
         Make sure that Exam attempts are visible and can be reset.

From c68af9d21ef0c3e2c0dabeb9dba4a0ce3b9e8537 Mon Sep 17 00:00:00 2001
From: jsa <jsa@edx.org>
Date: Sun, 1 Nov 2015 12:39:23 -0500
Subject: [PATCH 2/8] Show xseries upsell even if the course is not yet in
 session

ECOM-2780
---
 common/djangoapps/student/tests/tests.py | 26 ++++++++++++++++++++++++
 common/djangoapps/student/views.py       |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/common/djangoapps/student/tests/tests.py b/common/djangoapps/student/tests/tests.py
index cc03c370c3..9b03546e05 100644
--- a/common/djangoapps/student/tests/tests.py
+++ b/common/djangoapps/student/tests/tests.py
@@ -1033,6 +1033,32 @@ class DashboardTestXSeriesPrograms(ModuleStoreTestCase, ProgramsApiConfigMixin):
             else:
                 self.assertIn('xseries-border-btn', response.content)
 
+    @patch.dict('django.conf.settings.FEATURES', {'DISABLE_START_DATES': False})
+    @ddt.data((-2, -1), (-1, 1), (1, 2))
+    @ddt.unpack
+    def test_start_end_offsets(self, start_days_offset, end_days_offset):
+        """Test that the xseries upsell messaging displays whether the course
+        has not yet started, is in session, or has already ended.
+        """
+        self.course_1.start = datetime.now(pytz.UTC) + timedelta(days=start_days_offset)
+        self.course_1.end = datetime.now(pytz.UTC) + timedelta(days=end_days_offset)
+        self.update_course(self.course_1, self.user.id)
+        CourseEnrollment.enroll(self.user, self.course_1.id, mode='verified')
+
+        self.client.login(username="jack", password="test")
+        self.create_config(enabled=True, enable_student_dashboard=True)
+
+        with patch(
+            'student.views.get_course_programs_for_dashboard',
+            return_value=self._create_program_data([(self.course_1.id, 'active')])
+        ) as mock_get_programs:
+            response = self.client.get(reverse('dashboard'))
+            # ensure that our course id was included in the API call regardless of start/end dates
+            __, course_ids = mock_get_programs.call_args[0]
+            self.assertEqual(list(course_ids), [self.course_1.id])
+            # count total courses appearing on student dashboard
+            self._assert_responses(response, 1)
+
     @ddt.data(
         ('unpublished', 'unpublished', 'unpublished', 0),
         ('active', 'unpublished', 'unpublished', 1),
diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index 97df4883e9..1e02fe1514 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -581,7 +581,7 @@ def dashboard(request):
     # program-related information on the dashboard view.
     course_programs = {}
     if is_student_dashboard_programs_enabled():
-        course_programs = _get_course_programs(user, show_courseware_links_for)
+        course_programs = _get_course_programs(user, [enrollment.course_id for enrollment in course_enrollments])
 
     # Construct a dictionary of course mode information
     # used to render the course list.  We re-use the course modes dict

From 62f3cf9c46f488470ee68a6dee9fa5f28831208e Mon Sep 17 00:00:00 2001
From: Bill DeRusha <bill@edx.org>
Date: Fri, 30 Oct 2015 19:52:53 -0400
Subject: [PATCH 3/8] Fix cert_status None bug

---
 common/djangoapps/student/tests/test_views.py | 20 ++++++++++++++++++-
 common/djangoapps/student/tests/tests.py      | 19 ++++++++++++------
 common/djangoapps/student/views.py            |  5 ++++-
 lms/templates/dashboard.html                  |  3 ++-
 .../dashboard/_dashboard_course_listing.html  |  4 ++--
 5 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/common/djangoapps/student/tests/test_views.py b/common/djangoapps/student/tests/test_views.py
index 2c42339913..3438770856 100644
--- a/common/djangoapps/student/tests/test_views.py
+++ b/common/djangoapps/student/tests/test_views.py
@@ -11,6 +11,7 @@ from django.conf import settings
 
 from student.tests.factories import UserFactory, CourseEnrollmentFactory
 from student.models import CourseEnrollment
+from student.helpers import DISABLE_UNENROLL_CERT_STATES
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory
 
@@ -38,7 +39,10 @@ class TestStudentDashboardUnenrollments(ModuleStoreTestCase):
     def mock_cert(self, _user, _course_overview, _course_mode):  # pylint: disable=unused-argument
         """ Return a preset certificate status. """
         if self.cert_status is not None:
-            return {'status': self.cert_status}
+            return {
+                'status': self.cert_status,
+                'can_unenroll': self.cert_status not in DISABLE_UNENROLL_CERT_STATES
+            }
         else:
             return {}
 
@@ -85,3 +89,17 @@ class TestStudentDashboardUnenrollments(ModuleStoreTestCase):
                 course_enrollment.assert_called_with(self.user, self.course.id)
             else:
                 course_enrollment.assert_not_called()
+
+    def test_no_cert_status(self):
+        """ Assert that the dashboard loads when cert_status is None."""
+        with patch('student.views.cert_info', return_value=None):
+            response = self.client.get(reverse('dashboard'))
+
+            self.assertEqual(response.status_code, 200)
+
+    def test_cant_unenroll_status(self):
+        """ Assert that the dashboard loads when cert_status does not allow for unenrollment"""
+        with patch('certificates.models.certificate_status_for_student', return_value={'status': 'ready'}):
+            response = self.client.get(reverse('dashboard'))
+
+            self.assertEqual(response.status_code, 200)
diff --git a/common/djangoapps/student/tests/tests.py b/common/djangoapps/student/tests/tests.py
index cc03c370c3..0f6de3b4ac 100644
--- a/common/djangoapps/student/tests/tests.py
+++ b/common/djangoapps/student/tests/tests.py
@@ -79,6 +79,7 @@ class CourseEndingTest(TestCase):
                 'show_disabled_download_button': False,
                 'show_download_url': False,
                 'show_survey_button': False,
+                'can_unenroll': True,
             }
         )
 
@@ -91,7 +92,8 @@ class CourseEndingTest(TestCase):
                 'show_download_url': False,
                 'show_survey_button': False,
                 'mode': None,
-                'linked_in_url': None
+                'linked_in_url': None,
+                'can_unenroll': True,
             }
         )
 
@@ -106,7 +108,8 @@ class CourseEndingTest(TestCase):
                 'survey_url': survey_url,
                 'grade': '67',
                 'mode': 'honor',
-                'linked_in_url': None
+                'linked_in_url': None,
+                'can_unenroll': False,
             }
         )
 
@@ -121,7 +124,8 @@ class CourseEndingTest(TestCase):
                 'survey_url': survey_url,
                 'grade': '67',
                 'mode': 'verified',
-                'linked_in_url': None
+                'linked_in_url': None,
+                'can_unenroll': False,
             }
         )
 
@@ -143,7 +147,8 @@ class CourseEndingTest(TestCase):
                 'survey_url': survey_url,
                 'grade': '67',
                 'mode': 'honor',
-                'linked_in_url': None
+                'linked_in_url': None,
+                'can_unenroll': False,
             }
         )
 
@@ -162,7 +167,8 @@ class CourseEndingTest(TestCase):
                 'survey_url': survey_url,
                 'grade': '67',
                 'mode': 'honor',
-                'linked_in_url': None
+                'linked_in_url': None,
+                'can_unenroll': True,
             }
         )
 
@@ -181,7 +187,8 @@ class CourseEndingTest(TestCase):
                 'show_survey_button': False,
                 'grade': '67',
                 'mode': 'honor',
-                'linked_in_url': None
+                'linked_in_url': None,
+                'can_unenroll': True,
             }
         )
 
diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index 97df4883e9..6d5bc9b7d5 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -202,6 +202,7 @@ def cert_info(user, course_overview, course_mode):
             'show_survey_button': bool
             'survey_url': url, only if show_survey_button is True
             'grade': if status is not 'processing'
+            'can_unenroll': if status allows for unenrollment
     """
     if not course_overview.may_certify():
         return {}
@@ -302,6 +303,7 @@ def _cert_info(user, course_overview, cert_status, course_mode):  # pylint: disa
                     'show_disabled_download_button': False,
                     'show_download_url': False,
                     'show_survey_button': False,
+                    'can_unenroll': True
                     }
 
     if cert_status is None:
@@ -319,7 +321,8 @@ def _cert_info(user, course_overview, cert_status, course_mode):  # pylint: disa
         'show_download_url': status == 'ready',
         'show_disabled_download_button': status == 'generating',
         'mode': cert_status.get('mode', None),
-        'linked_in_url': None
+        'linked_in_url': None,
+        'can_unenroll': status not in DISABLE_UNENROLL_CERT_STATES,
     }
 
     if (status in ('generating', 'ready', 'notpassing', 'restricted') and
diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html
index 8755a7f8d2..a54bb972dd 100644
--- a/lms/templates/dashboard.html
+++ b/lms/templates/dashboard.html
@@ -87,6 +87,7 @@ import json
       % for dashboard_index, enrollment in enumerate(course_enrollments):
         <% show_courseware_link = (enrollment.course_id in show_courseware_links_for) %>
         <% cert_status = cert_statuses.get(enrollment.course_id) %>
+        <% can_unenroll = (not cert_status) or cert_status.get('can_unenroll') %>
         <% credit_status = credit_statuses.get(enrollment.course_id) %>
         <% show_email_settings = (enrollment.course_id in show_email_settings_for) %>
         <% course_mode_info = all_course_modes.get(enrollment.course_id) %>
@@ -96,7 +97,7 @@ import json
         <% course_verification_status = verification_status_by_course.get(enrollment.course_id, {}) %>
         <% course_requirements = courses_requirements_not_met.get(enrollment.course_id) %>
         <% course_program_info = course_programs.get(unicode(enrollment.course_id)) %>
-        <%include file = 'dashboard/_dashboard_course_listing.html' args="course_overview=enrollment.course_overview, enrollment=enrollment, show_courseware_link=show_courseware_link, cert_status=cert_status, credit_status=credit_status, show_email_settings=show_email_settings, course_mode_info=course_mode_info, show_refund_option=show_refund_option, is_paid_course=is_paid_course, is_course_blocked=is_course_blocked, verification_status=course_verification_status, course_requirements=course_requirements, dashboard_index=dashboard_index, share_settings=share_settings, user=user, course_program_info=course_program_info" />
+        <%include file = 'dashboard/_dashboard_course_listing.html' args="course_overview=enrollment.course_overview, enrollment=enrollment, show_courseware_link=show_courseware_link, cert_status=cert_status, can_unenroll=can_unenroll, credit_status=credit_status, show_email_settings=show_email_settings, course_mode_info=course_mode_info, show_refund_option=show_refund_option, is_paid_course=is_paid_course, is_course_blocked=is_course_blocked, verification_status=course_verification_status, course_requirements=course_requirements, dashboard_index=dashboard_index, share_settings=share_settings, user=user, course_program_info=course_program_info" />
       % endfor
 
       </ul>
diff --git a/lms/templates/dashboard/_dashboard_course_listing.html b/lms/templates/dashboard/_dashboard_course_listing.html
index e73780761c..6bca726e22 100644
--- a/lms/templates/dashboard/_dashboard_course_listing.html
+++ b/lms/templates/dashboard/_dashboard_course_listing.html
@@ -1,4 +1,4 @@
-<%page args="course_overview, enrollment, show_courseware_link, cert_status, credit_status, show_email_settings, course_mode_info, show_refund_option, is_paid_course, is_course_blocked, verification_status, course_requirements, dashboard_index, share_settings, course_program_info" />
+<%page args="course_overview, enrollment, show_courseware_link, cert_status, can_unenroll, credit_status, show_email_settings, course_mode_info, show_refund_option, is_paid_course, is_course_blocked, verification_status, course_requirements, dashboard_index, share_settings, course_program_info" />
 
 <%!
 import urllib
@@ -178,7 +178,7 @@ from student.helpers import (
               </a>
               <div class="actions-dropdown" id="actions-dropdown-${dashboard_index}" aria-label="${_('Additional Actions Menu')}">
                 <ul class="actions-dropdown-list" id="actions-dropdown-list-${dashboard_index}" aria-label="${_('Available Actions')}" role="menu">
-                  % if cert_status.get('status') not in DISABLE_UNENROLL_CERT_STATES:
+                  % if can_unenroll:
                     <li class="actions-item" id="actions-item-unenroll-${dashboard_index}">
                     % if is_paid_course and show_refund_option:
                       ## Translators: The course name will be added to the end of this sentence.

From 36f05c860c10446d26460ea47481b641e0fe3fd7 Mon Sep 17 00:00:00 2001
From: Eric Fischer <efischer@edx.org>
Date: Mon, 2 Nov 2015 09:37:22 -0500
Subject: [PATCH 4/8] Applying security patch

Applying a security patch from last week that has made its way through
the disclosure period already. FYI @robrap
---
 cms/djangoapps/contentstore/views/course.py |  2 +-
 cms/templates/settings_advanced.html        |  4 +-
 openedx/core/lib/json_utils.py              | 48 ++++++++++++++++
 openedx/core/lib/tests/test_json_utils.py   | 64 +++++++++++++++++++--
 4 files changed, 110 insertions(+), 8 deletions(-)

diff --git a/cms/djangoapps/contentstore/views/course.py b/cms/djangoapps/contentstore/views/course.py
index 4ff5151e16..a447d77f49 100644
--- a/cms/djangoapps/contentstore/views/course.py
+++ b/cms/djangoapps/contentstore/views/course.py
@@ -1140,7 +1140,7 @@ def advanced_settings_handler(request, course_key_string):
 
             return render_to_response('settings_advanced.html', {
                 'context_course': course_module,
-                'advanced_dict': json.dumps(CourseMetadata.fetch(course_module)),
+                'advanced_dict': CourseMetadata.fetch(course_module),
                 'advanced_settings_url': reverse_course_url('advanced_settings_handler', course_key)
             })
         elif 'application/json' in request.META.get('HTTP_ACCEPT', ''):
diff --git a/cms/templates/settings_advanced.html b/cms/templates/settings_advanced.html
index eb108866a3..40f347ca30 100644
--- a/cms/templates/settings_advanced.html
+++ b/cms/templates/settings_advanced.html
@@ -4,7 +4,7 @@
 <%!
   from django.utils.translation import ugettext as _
   from contentstore import utils
-  from django.utils.html import escapejs
+  from openedx.core.lib.json_utils import escape_json_dumps
 %>
 <%block name="title">${_("Advanced Settings")}</%block>
 <%block name="bodyclass">is-signedin course advanced view-settings</%block>
@@ -19,7 +19,7 @@
 
 <%block name="requirejs">
     require(["js/factories/settings_advanced"], function(SettingsAdvancedFactory) {
-        SettingsAdvancedFactory(${advanced_dict | n}, "${advanced_settings_url}");
+        SettingsAdvancedFactory(${escape_json_dumps(advanced_dict) | n}, "${advanced_settings_url}");
     });
 </%block>
 
diff --git a/openedx/core/lib/json_utils.py b/openedx/core/lib/json_utils.py
index 3c89321e99..076d0c1288 100644
--- a/openedx/core/lib/json_utils.py
+++ b/openedx/core/lib/json_utils.py
@@ -1,6 +1,7 @@
 """
 Utilities for dealing with JSON.
 """
+import json
 import simplejson
 
 
@@ -20,3 +21,50 @@ class EscapedEdxJSONEncoder(EdxJSONEncoder):
             simplejson.loads(super(EscapedEdxJSONEncoder, self).encode(obj)),
             cls=simplejson.JSONEncoderForHTML
         )
+
+
+def _escape_json_for_html(json_str):
+    """
+    Escape JSON that is safe to be embedded in HTML.
+
+    This implementation is based on escaping performed in simplejson.JSONEncoderForHTML.
+
+    Arguments:
+        json_str (str): The JSON string to be escaped
+
+    Returns:
+        (str) Escaped JSON that is safe to be embedded in HTML.
+
+    """
+    json_str = json_str.replace("&", "\\u0026")
+    json_str = json_str.replace(">", "\\u003e")
+    json_str = json_str.replace("<", "\\u003c")
+    return json_str
+
+
+def escape_json_dumps(obj, cls=EdxJSONEncoder):
+    """
+    JSON dumps encoded JSON that is safe to be embedded in HTML.
+
+    Usage:
+        Can be used inside a Mako template inside a <SCRIPT> as follows:
+            var my_json = ${escape_json_dumps(my_object) | n}
+
+        Use the "n" Mako filter above.  It is possible that the
+            default filter may include html encoding in the future, and
+            we must make sure to get the proper escaping.
+
+        Ensure ascii in json.dumps (ensure_ascii=True) allows safe skipping of Mako's
+            default filter decode.utf8.
+
+    Arguments:
+        obj: The json object to be encoded and dumped to a string
+        cls (class): The JSON encoder class (defaults to EdxJSONEncoder)
+
+    Returns:
+        str: Escaped encoded JSON
+
+    """
+    encoded_json = json.dumps(obj, ensure_ascii=True, cls=cls)
+    encoded_json = _escape_json_for_html(encoded_json)
+    return encoded_json
diff --git a/openedx/core/lib/tests/test_json_utils.py b/openedx/core/lib/tests/test_json_utils.py
index 9521f58826..855aafc8a0 100644
--- a/openedx/core/lib/tests/test_json_utils.py
+++ b/openedx/core/lib/tests/test_json_utils.py
@@ -3,16 +3,70 @@ Tests for json_utils.py
 """
 import json
 from unittest import TestCase
-
-from openedx.core.lib.json_utils import EscapedEdxJSONEncoder
+from openedx.core.lib.json_utils import (
+    escape_json_dumps, EscapedEdxJSONEncoder
+)
 
 
-class TestEscapedEdxJSONEncoder(TestCase):
-    """Test the EscapedEdxJSONEncoder class."""
+class TestJsonUtils(TestCase):
+    """
+    Test JSON Utils
+    """
+
+    class NoDefaultEncoding(object):
+        """
+        Helper class that has no default JSON encoding
+        """
+        def __init__(self, value):
+            self.value = value
+
+    class SampleJSONEncoder(json.JSONEncoder):
+        """
+        A test encoder that is used to prove that the encoder does its job before the escaping.
+        """
+        # pylint: disable=method-hidden
+        def default(self, noDefaultEncodingObj):
+            return noDefaultEncodingObj.value.replace("<script>", "sample-encoder-was-here")
+
     def test_escapes_forward_slashes(self):
-        """Verify that we escape forward slashes with backslashes."""
+        """
+        Verify that we escape forward slashes with backslashes.
+        """
         malicious_json = {'</script><script>alert("hello, ");</script>': '</script><script>alert("world!");</script>'}
         self.assertNotIn(
             '</script>',
             json.dumps(malicious_json, cls=EscapedEdxJSONEncoder)
         )
+
+    def test_escape_json_dumps_escapes_unsafe_html(self):
+        """
+        Test escape_json_dumps properly escapes &, <, and >.
+        """
+        malicious_json = {"</script><script>alert('hello, ');</script>": "</script><script>alert('&world!');</script>"}
+        expected_encoded_json = (
+            r'''{"\u003c/script\u003e\u003cscript\u003ealert('hello, ');\u003c/script\u003e": '''
+            r'''"\u003c/script\u003e\u003cscript\u003ealert('\u0026world!');\u003c/script\u003e"}'''
+        )
+
+        encoded_json = escape_json_dumps(malicious_json)
+        self.assertEquals(expected_encoded_json, encoded_json)
+
+    def test_escape_json_dumps_with_custom_encoder_escapes_unsafe_html(self):
+        """
+        Test escape_json_dumps first encodes with custom JSNOEncoder before escaping &, <, and >
+
+        The test encoder class should first perform the replacement of "<script>" with
+        "sample-encoder-was-here", and then should escape the remaining &, <, and >.
+
+        """
+        malicious_json = {
+            "</script><script>alert('hello, ');</script>":
+            self.NoDefaultEncoding("</script><script>alert('&world!');</script>")
+        }
+        expected_custom_encoded_json = (
+            r'''{"\u003c/script\u003e\u003cscript\u003ealert('hello, ');\u003c/script\u003e": '''
+            r'''"\u003c/script\u003esample-encoder-was-herealert('\u0026world!');\u003c/script\u003e"}'''
+        )
+
+        encoded_json = escape_json_dumps(malicious_json, cls=self.SampleJSONEncoder)
+        self.assertEquals(expected_custom_encoded_json, encoded_json)

From 6123827ab1055f6a931173e364991dc5b1fa789a Mon Sep 17 00:00:00 2001
From: Bill DeRusha <bill@edx.org>
Date: Mon, 2 Nov 2015 17:15:09 -0500
Subject: [PATCH 5/8] Compare all refund dates in UTC

---
 common/djangoapps/student/models.py             | 4 ++--
 common/djangoapps/student/tests/test_refunds.py | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/djangoapps/student/models.py b/common/djangoapps/student/models.py
index e799bcdf9b..2faf03bba4 100644
--- a/common/djangoapps/student/models.py
+++ b/common/djangoapps/student/models.py
@@ -1377,7 +1377,7 @@ class CourseEnrollment(models.Model):
 
         # If it is after the refundable cutoff date they should not be refunded.
         refund_cutoff_date = self.refund_cutoff_date()
-        if refund_cutoff_date and datetime.now() > refund_cutoff_date:
+        if refund_cutoff_date and datetime.now(UTC) > refund_cutoff_date:
             return False
 
         course_mode = CourseMode.mode_for_course(self.course_id, 'verified')
@@ -1400,7 +1400,7 @@ class CourseEnrollment(models.Model):
             self.course_overview.start.replace(tzinfo=None)
         )
 
-        return refund_window_start_date + EnrollmentRefundConfiguration.current().refund_window
+        return refund_window_start_date.replace(tzinfo=UTC) + EnrollmentRefundConfiguration.current().refund_window
 
     @property
     def username(self):
diff --git a/common/djangoapps/student/tests/test_refunds.py b/common/djangoapps/student/tests/test_refunds.py
index 6c56c9a18a..f495b81bc6 100644
--- a/common/djangoapps/student/tests/test_refunds.py
+++ b/common/djangoapps/student/tests/test_refunds.py
@@ -113,10 +113,10 @@ class RefundableTest(SharedModuleStoreTestCase):
         self.assertTrue(self.enrollment.refundable())
 
         with patch('student.models.CourseEnrollment.refund_cutoff_date') as cutoff_date:
-            cutoff_date.return_value = datetime.now() - timedelta(days=1)
+            cutoff_date.return_value = datetime.now(pytz.UTC) - timedelta(minutes=5)
             self.assertFalse(self.enrollment.refundable())
 
-            cutoff_date.return_value = datetime.now() + timedelta(days=1)
+            cutoff_date.return_value = datetime.now(pytz.UTC) + timedelta(minutes=5)
             self.assertTrue(self.enrollment.refundable())
 
     @ddt.data(
@@ -132,7 +132,7 @@ class RefundableTest(SharedModuleStoreTestCase):
         """
         Assert that the later date is used with the configurable refund period in calculating the returned cutoff date.
         """
-        now = datetime.now().replace(microsecond=0)
+        now = datetime.now(pytz.UTC).replace(microsecond=0)
         order_date = now + order_date_delta
         course_start = now + course_start_delta
         expected_date = now + expected_date_delta

From 0aa58f5033c86a504908fe191f1c924fa1654181 Mon Sep 17 00:00:00 2001
From: David Ormsbee <dave@edx.org>
Date: Mon, 2 Nov 2015 22:17:01 -0500
Subject: [PATCH 6/8] New Relic transaction naming now ignores suffix most of
 the time.

The only time it should include the suffix is when the handler is
explicilty "xmodule_handler", meaning it's an old-style handler
that routes everything. For example, Capa uses one handler for
all its AJAX requests, and only differentiates actions based on
suffix ("get", "problem_check", etc.).

What prompted this change is that LTIDescriptor defines a handler
"lti_2_0_result_rest_handler" which encodes user-specific
information into the suffix. This is a perfectly valid thing to
do, but it blows out the number of named transactions in our
metrics.
---
 lms/djangoapps/courseware/module_render.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lms/djangoapps/courseware/module_render.py b/lms/djangoapps/courseware/module_render.py
index 38d8bac62c..bf0decad3d 100644
--- a/lms/djangoapps/courseware/module_render.py
+++ b/lms/djangoapps/courseware/module_render.py
@@ -1037,7 +1037,7 @@ def _invoke_xblock_handler(request, course_id, usage_id, handler, suffix, course
         # New Relic. The suffix is necessary for XModule handlers because the
         # "handler" in those cases is always just "xmodule_handler".
         nr_tx_name = "{}.{}".format(instance.__class__.__name__, handler)
-        nr_tx_name += "/{}".format(suffix) if suffix else ""
+        nr_tx_name += "/{}".format(suffix) if (suffix and handler == "xmodule_handler") else ""
         newrelic.agent.set_transaction_name(nr_tx_name, group="Python/XBlock/Handler")
 
         tracking_context_name = 'module_callback_handler'

From 3609cc7a995b1ed83fc3b96ba7a382f1acc46068 Mon Sep 17 00:00:00 2001
From: Eric Fischer <efischer@edx.org>
Date: Mon, 2 Nov 2015 16:36:58 -0500
Subject: [PATCH 7/8] Post-migration management command

On devops recommendation, now handling the potential for an 'inconsistency
window' via a management command instead of a hacky "re-run the data migration"
bash script.
---
 .../commands/post_cohort_membership_fix.py    | 81 ++++++++++++++++++
 .../remove_users_from_multiple_cohorts.py     | 56 -------------
 .../tests/test_post_cohort_membership_fix.py  | 84 +++++++++++++++++++
 ...test_remove_users_from_multiple_cohorts.py | 82 ------------------
 .../course_groups/migrations/rerun_0006.sh    |  8 --
 5 files changed, 165 insertions(+), 146 deletions(-)
 create mode 100644 openedx/core/djangoapps/course_groups/management/commands/post_cohort_membership_fix.py
 delete mode 100644 openedx/core/djangoapps/course_groups/management/commands/remove_users_from_multiple_cohorts.py
 create mode 100644 openedx/core/djangoapps/course_groups/management/commands/tests/test_post_cohort_membership_fix.py
 delete mode 100644 openedx/core/djangoapps/course_groups/management/commands/tests/test_remove_users_from_multiple_cohorts.py
 delete mode 100644 openedx/core/djangoapps/course_groups/migrations/rerun_0006.sh

diff --git a/openedx/core/djangoapps/course_groups/management/commands/post_cohort_membership_fix.py b/openedx/core/djangoapps/course_groups/management/commands/post_cohort_membership_fix.py
new file mode 100644
index 0000000000..d613421472
--- /dev/null
+++ b/openedx/core/djangoapps/course_groups/management/commands/post_cohort_membership_fix.py
@@ -0,0 +1,81 @@
+"""
+Intended to fix any inconsistencies that may arise during the rollout of the CohortMembership model.
+Illustration: https://gist.github.com/efischer19/d62f8ee42b7fbfbc6c9a
+"""
+from django.core.management.base import BaseCommand
+from django.db import IntegrityError
+
+from openedx.core.djangoapps.course_groups.models import CourseUserGroup, CohortMembership
+
+
+class Command(BaseCommand):
+    """
+    Repair any inconsistencies between CourseUserGroup and CohortMembership. To be run after migration 0006.
+    """
+    help = '''
+    Repairs any potential inconsistencies made in the window between running migrations 0005 and 0006, and deploying
+    the code changes to enforce use of CohortMembership that go with said migrations.
+    |commit|: optional argument. If not provided, will dry-run and list number of operations that would be made.
+    '''
+
+    def handle(self, *args, **options):
+        """
+        Execute the command. Since this is designed to fix any issues cause by running pre-CohortMembership code
+        with the database already migrated to post-CohortMembership state, we will use the pre-CohortMembership
+        table CourseUserGroup as the canonical source of truth. This way, changes made in the window are persisted.
+        """
+        commit = False
+        if len(args) == 1:
+            commit = args[0] == 'commit'
+
+        memberships_to_delete = 0
+        memberships_to_add = 0
+
+        # Begin by removing any data in CohortMemberships that does not match CourseUserGroups data
+        for membership in CohortMembership.objects.all():
+            try:
+                CourseUserGroup.objects.get(
+                    group_type=CourseUserGroup.COHORT,
+                    users__id=membership.user.id,
+                    course_id=membership.course_id,
+                    id=membership.course_user_group.id
+                )
+            except CourseUserGroup.DoesNotExist:
+                memberships_to_delete += 1
+                if commit:
+                    membership.delete()
+
+        # Now we can add any CourseUserGroup data that is missing a backing CohortMembership
+        for course_group in CourseUserGroup.objects.filter(group_type=CourseUserGroup.COHORT):
+            for user in course_group.users.all():
+                try:
+                    CohortMembership.objects.get(
+                        user=user,
+                        course_id=course_group.course_id,
+                        course_user_group_id=course_group.id
+                    )
+                except CohortMembership.DoesNotExist:
+                    memberships_to_add += 1
+                    if commit:
+                        membership = CohortMembership(
+                            course_user_group=course_group,
+                            user=user,
+                            course_id=course_group.course_id
+                        )
+                        try:
+                            membership.save()
+                        except IntegrityError:  # If the user is in multiple cohorts, we arbitrarily choose between them
+                            # In this case, allow the pre-existing entry to be "correct"
+                            course_group.users.remove(user)
+                            user.course_groups.remove(course_group)
+
+        print '{} CohortMemberships did not match the CourseUserGroup table and will be deleted'.format(
+            memberships_to_delete
+        )
+        print '{} CourseUserGroup users do not have a CohortMembership; one will be added if it is valid'.format(
+            memberships_to_add
+        )
+        if commit:
+            print 'Changes have been made and saved.'
+        else:
+            print 'Dry run, changes have not been saved. Run again with "commit" argument to save changes'
diff --git a/openedx/core/djangoapps/course_groups/management/commands/remove_users_from_multiple_cohorts.py b/openedx/core/djangoapps/course_groups/management/commands/remove_users_from_multiple_cohorts.py
deleted file mode 100644
index 46a753ea41..0000000000
--- a/openedx/core/djangoapps/course_groups/management/commands/remove_users_from_multiple_cohorts.py
+++ /dev/null
@@ -1,56 +0,0 @@
-"""
-Script for removing users with multiple cohorts of a course from cohorts
-to ensure user's uniqueness for a course cohorts
-"""
-from django.contrib.auth.models import User
-from django.core.management.base import BaseCommand
-from django.db.models import Count
-
-from openedx.core.djangoapps.course_groups.models import CourseUserGroup
-
-
-class Command(BaseCommand):
-    """
-    Remove users with multiple cohorts of a course from all cohorts
-    """
-    help = 'Remove all users from multiple cohorts (except one) of each course'
-
-    def handle(self, *args, **options):
-        """
-        Execute the command
-        """
-        # Get entries of cohorts which have same user added multiple times for a single course
-        multiple_objects_cohorts = CourseUserGroup.objects.filter(group_type=CourseUserGroup.COHORT).\
-            values_list('users', 'course_id').annotate(user_count=Count('users')).filter(user_count__gt=1).\
-            order_by('users')
-        multiple_objects_cohorts_count = multiple_objects_cohorts.count()
-        multiple_course_cohorts_users = set(multiple_objects_cohorts.values_list('users', flat=True))
-        users_failed_to_cleanup = []
-
-        for user in User.objects.filter(id__in=multiple_course_cohorts_users):
-            print u"Removing user with id '{0}' from cohort groups".format(user.id)
-            try:
-                # remove user from only cohorts
-                user.course_groups.remove(*user.course_groups.filter(group_type=CourseUserGroup.COHORT))
-            except AttributeError as err:
-                users_failed_to_cleanup.append(user.email)
-                print u"Failed to remove user with id {0} from cohort groups, error: {1}".format(user.id, err)
-
-        print "=" * 80
-        print u"=" * 30 + u"> Cohorts summary"
-        print(
-            u"Total number of CourseUserGroup of type '{0}' with multiple users: {1}".format(
-                CourseUserGroup.COHORT, multiple_objects_cohorts_count
-            )
-        )
-        print(
-            u"Total number of unique users with multiple course cohorts: {0}".format(
-                len(multiple_course_cohorts_users)
-            )
-        )
-        print(
-            u"Users which failed on cohorts cleanup [{0}]: [{1}]".format(
-                len(users_failed_to_cleanup), (', '.join(users_failed_to_cleanup))
-            )
-        )
-        print "=" * 80
diff --git a/openedx/core/djangoapps/course_groups/management/commands/tests/test_post_cohort_membership_fix.py b/openedx/core/djangoapps/course_groups/management/commands/tests/test_post_cohort_membership_fix.py
new file mode 100644
index 0000000000..300901bd00
--- /dev/null
+++ b/openedx/core/djangoapps/course_groups/management/commands/tests/test_post_cohort_membership_fix.py
@@ -0,0 +1,84 @@
+"""
+Test for the post-migration fix commands that are included with this djangoapp
+"""
+from django.core.management import call_command
+from django.test.client import RequestFactory
+
+from openedx.core.djangoapps.course_groups.views import cohort_handler
+from openedx.core.djangoapps.course_groups.cohorts import get_cohort_by_name
+from openedx.core.djangoapps.course_groups.tests.helpers import config_course_cohorts
+from openedx.core.djangoapps.course_groups.models import CohortMembership
+from student.tests.factories import UserFactory
+from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
+from xmodule.modulestore.tests.factories import CourseFactory
+
+
+class TestPostMigrationFix(ModuleStoreTestCase):
+    """
+    Base class for testing post-migration fix commands
+    """
+    def setUp(self):
+        """
+        setup course, user and request for tests
+        """
+        super(TestPostMigrationFix, self).setUp()
+        self.course1 = CourseFactory.create()
+        self.course2 = CourseFactory.create()
+        self.user1 = UserFactory(is_staff=True)
+        self.user2 = UserFactory(is_staff=True)
+        self.request = RequestFactory().get("dummy_url")
+        self.request.user = self.user1
+
+    def test_post_cohortmembership_fix(self):
+        """
+        Test that changes made *after* migration, but *before* turning on new code are handled properly
+        """
+        # First, we're going to simulate some problem states that can arise during this window
+        config_course_cohorts(self.course1, is_cohorted=True, auto_cohorts=["Course1AutoGroup1", "Course1AutoGroup2"])
+
+        # Get the cohorts from the courses, which will cause auto cohorts to be created
+        cohort_handler(self.request, unicode(self.course1.id))
+        course_1_auto_cohort_1 = get_cohort_by_name(self.course1.id, "Course1AutoGroup1")
+        course_1_auto_cohort_2 = get_cohort_by_name(self.course1.id, "Course1AutoGroup2")
+
+        # When migrations were first run, the users were assigned to CohortMemberships correctly
+        membership1 = CohortMembership(
+            course_id=course_1_auto_cohort_1.course_id,
+            user=self.user1,
+            course_user_group=course_1_auto_cohort_1
+        )
+        membership1.save()
+        membership2 = CohortMembership(
+            course_id=course_1_auto_cohort_1.course_id,
+            user=self.user2,
+            course_user_group=course_1_auto_cohort_1
+        )
+        membership2.save()
+
+        # But before CohortMembership code was turned on, some changes were made:
+        course_1_auto_cohort_2.users.add(self.user1)  # user1 is now in 2 cohorts in the same course!
+        course_1_auto_cohort_2.users.add(self.user2)
+        course_1_auto_cohort_1.users.remove(self.user2)  # and user2 was moved, but no one told CohortMembership!
+
+        # run the post-CohortMembership command, dry-run
+        call_command('post_cohort_membership_fix')
+
+        # Verify nothing was changed in dry-run mode.
+        self.assertEqual(self.user1.course_groups.count(), 2)  # CourseUserGroup has 2 entries for user1
+
+        self.assertEqual(CohortMembership.objects.get(user=self.user2).course_user_group.name, 'Course1AutoGroup1')
+        user2_cohorts = list(self.user2.course_groups.values_list('name', flat=True))
+        self.assertEqual(user2_cohorts, ['Course1AutoGroup2'])  # CourseUserGroup and CohortMembership disagree
+
+        # run the post-CohortMembership command, and commit it
+        call_command('post_cohort_membership_fix', 'commit')
+
+        # verify that both databases agree about the (corrected) state of the memberships
+        self.assertEqual(self.user1.course_groups.count(), 1)
+        self.assertEqual(CohortMembership.objects.filter(user=self.user1).count(), 1)
+
+        self.assertEqual(self.user2.course_groups.count(), 1)
+        self.assertEqual(CohortMembership.objects.filter(user=self.user2).count(), 1)
+        self.assertEqual(CohortMembership.objects.get(user=self.user2).course_user_group.name, 'Course1AutoGroup2')
+        user2_cohorts = list(self.user2.course_groups.values_list('name', flat=True))
+        self.assertEqual(user2_cohorts, ['Course1AutoGroup2'])
diff --git a/openedx/core/djangoapps/course_groups/management/commands/tests/test_remove_users_from_multiple_cohorts.py b/openedx/core/djangoapps/course_groups/management/commands/tests/test_remove_users_from_multiple_cohorts.py
deleted file mode 100644
index 1546dee667..0000000000
--- a/openedx/core/djangoapps/course_groups/management/commands/tests/test_remove_users_from_multiple_cohorts.py
+++ /dev/null
@@ -1,82 +0,0 @@
-"""
-Tests for cleanup of users which are added in multiple cohorts of a course
-"""
-from django.core.exceptions import MultipleObjectsReturned
-from django.core.management import call_command
-from django.test.client import RequestFactory
-
-from openedx.core.djangoapps.course_groups.views import cohort_handler
-from openedx.core.djangoapps.course_groups.cohorts import get_cohort, get_cohort_by_name
-from openedx.core.djangoapps.course_groups.tests.helpers import config_course_cohorts
-from student.tests.factories import UserFactory
-from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
-from xmodule.modulestore.tests.factories import CourseFactory
-
-
-class TestMultipleCohortUsers(ModuleStoreTestCase):
-    """
-    Base class for testing users with multiple cohorts
-    """
-    def setUp(self):
-        """
-        setup course, user and request for tests
-        """
-        super(TestMultipleCohortUsers, self).setUp()
-        self.course1 = CourseFactory.create()
-        self.course2 = CourseFactory.create()
-        self.user1 = UserFactory(is_staff=True)
-        self.user2 = UserFactory(is_staff=True)
-        self.request = RequestFactory().get("dummy_url")
-        self.request.user = self.user1
-
-    def test_users_with_multiple_cohorts_cleanup(self):
-        """
-        Test that user which have been added in multiple cohorts of a course,
-        can get cohorts without error after running cohorts cleanup command
-        """
-        # set two auto_cohort_groups for both courses
-        config_course_cohorts(
-            self.course1, is_cohorted=True, auto_cohorts=["Course1AutoGroup1", "Course1AutoGroup2"]
-        )
-        config_course_cohorts(
-            self.course2, is_cohorted=True, auto_cohorts=["Course2AutoGroup1", "Course2AutoGroup2"]
-        )
-
-        # get the cohorts from the courses, which will cause auto cohorts to be created
-        cohort_handler(self.request, unicode(self.course1.id))
-        cohort_handler(self.request, unicode(self.course2.id))
-        course_1_auto_cohort_1 = get_cohort_by_name(self.course1.id, "Course1AutoGroup1")
-        course_1_auto_cohort_2 = get_cohort_by_name(self.course1.id, "Course1AutoGroup2")
-        course_2_auto_cohort_1 = get_cohort_by_name(self.course2.id, "Course2AutoGroup1")
-
-        # forcefully add user1 in two auto cohorts
-        course_1_auto_cohort_1.users.add(self.user1)
-        course_1_auto_cohort_2.users.add(self.user1)
-        # forcefully add user2 in auto cohorts of both courses
-        course_1_auto_cohort_1.users.add(self.user2)
-        course_2_auto_cohort_1.users.add(self.user2)
-
-        # now check that when user1 goes on discussion page and tries to get
-        # cohorts 'MultipleObjectsReturned' exception is returned
-        with self.assertRaises(MultipleObjectsReturned):
-            get_cohort(self.user1, self.course1.id)
-        # also check that user 2 can go on discussion page of both courses
-        # without any exception
-        get_cohort(self.user2, self.course1.id)
-        get_cohort(self.user2, self.course2.id)
-
-        # call command to remove users added in multiple cohorts of a course
-        # are removed from all cohort groups
-        call_command('remove_users_from_multiple_cohorts')
-
-        # check that only user1 (with multiple cohorts) is removed from cohorts
-        # and user2 is still in auto cohorts of both course after running
-        # 'remove_users_from_multiple_cohorts' management command
-        self.assertEqual(self.user1.course_groups.count(), 0)
-        self.assertEqual(self.user2.course_groups.count(), 2)
-        user2_cohorts = list(self.user2.course_groups.values_list('name', flat=True))
-        self.assertEqual(user2_cohorts, ['Course1AutoGroup1', 'Course2AutoGroup1'])
-
-        # now check that user1 can get cohorts in which he is added
-        response = cohort_handler(self.request, unicode(self.course1.id))
-        self.assertEqual(response.status_code, 200)
diff --git a/openedx/core/djangoapps/course_groups/migrations/rerun_0006.sh b/openedx/core/djangoapps/course_groups/migrations/rerun_0006.sh
deleted file mode 100644
index d40e60d2b0..0000000000
--- a/openedx/core/djangoapps/course_groups/migrations/rerun_0006.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-if [ $# -eq 0 ]; then
-    echo "$0: usage: rerun_0006.sh <arguments>. At minimum, '--settings=<environment>' is expected."
-    exit 1
-fi
-
-./manage.py lms migrate course_groups 0005 --fake "$@"
-./manage.py lms migrate course_groups 0006 "$@"

From dc469ea5ecf1b9f415159ae3021b5817d0d7e011 Mon Sep 17 00:00:00 2001
From: Eric Fischer <efischer@edx.org>
Date: Tue, 3 Nov 2015 17:10:19 -0500
Subject: [PATCH 8/8] Fix cert_status None. Add GeneratedCertificate to admin

---
 common/djangoapps/student/tests/tests.py |  4 ++--
 common/djangoapps/student/views.py       |  6 +++---
 lms/djangoapps/certificates/admin.py     | 10 ++++++++++
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/common/djangoapps/student/tests/tests.py b/common/djangoapps/student/tests/tests.py
index afb4877980..a2c1e05ae4 100644
--- a/common/djangoapps/student/tests/tests.py
+++ b/common/djangoapps/student/tests/tests.py
@@ -195,14 +195,14 @@ class CourseEndingTest(TestCase):
         # test when the display is unavailable or notpassing, we get the correct results out
         course2.certificates_display_behavior = 'early_no_info'
         cert_status = {'status': 'unavailable'}
-        self.assertIsNone(_cert_info(user, course2, cert_status, course_mode))
+        self.assertEqual(_cert_info(user, course2, cert_status, course_mode), {})
 
         cert_status = {
             'status': 'notpassing', 'grade': '67',
             'download_url': download_url,
             'mode': 'honor'
         }
-        self.assertIsNone(_cert_info(user, course2, cert_status, course_mode))
+        self.assertEqual(_cert_info(user, course2, cert_status, course_mode), {})
 
 
 @ddt.ddt
diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index 736a333823..f67bf08adf 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -312,7 +312,7 @@ def _cert_info(user, course_overview, cert_status, course_mode):  # pylint: disa
     is_hidden_status = cert_status['status'] in ('unavailable', 'processing', 'generating', 'notpassing')
 
     if course_overview.certificates_display_behavior == 'early_no_info' and is_hidden_status:
-        return None
+        return {}
 
     status = template_state.get(cert_status['status'], default_status)
 
@@ -1033,8 +1033,8 @@ def change_enrollment(request, check_access=True):
         if not enrollment:
             return HttpResponseBadRequest(_("You are not enrolled in this course"))
 
-        certicifate_info = cert_info(user, enrollment.course_overview, enrollment.mode)
-        if certicifate_info.get('status') in DISABLE_UNENROLL_CERT_STATES:
+        certificate_info = cert_info(user, enrollment.course_overview, enrollment.mode)
+        if certificate_info.get('status') in DISABLE_UNENROLL_CERT_STATES:
             return HttpResponseBadRequest(_("Your certificate prevents you from unenrolling from this course"))
 
         CourseEnrollment.unenroll(user, course_id)
diff --git a/lms/djangoapps/certificates/admin.py b/lms/djangoapps/certificates/admin.py
index 38983e2988..f878e083b2 100644
--- a/lms/djangoapps/certificates/admin.py
+++ b/lms/djangoapps/certificates/admin.py
@@ -11,6 +11,7 @@ from certificates.models import (
     BadgeImageConfiguration,
     CertificateTemplate,
     CertificateTemplateAsset,
+    GeneratedCertificate,
 )
 
 
@@ -46,8 +47,17 @@ class CertificateTemplateAssetAdmin(admin.ModelAdmin):
     list_display = ('description', '__unicode__')
 
 
+class GeneratedCertificateAdmin(admin.ModelAdmin):
+    """
+    Django admin customizations for GeneratedCertificate model
+    """
+    search_fields = ('course_id', 'user__username')
+    list_display = ('id', 'course_id', 'mode', 'user')
+
+
 admin.site.register(CertificateGenerationConfiguration)
 admin.site.register(CertificateHtmlViewConfiguration, ConfigurationModelAdmin)
 admin.site.register(BadgeImageConfiguration)
 admin.site.register(CertificateTemplate, CertificateTemplateAdmin)
 admin.site.register(CertificateTemplateAsset, CertificateTemplateAssetAdmin)
+admin.site.register(GeneratedCertificate, GeneratedCertificateAdmin)