Feanil/reset all passwords

AUTHORS

@@ -141,3 +141,4 @@ William Desloge <william.desloge@ionis-group.com>
 Marco Re <mrc.re@tiscali.it>
 Jonas Jelten <jelten@in.tum.de>
 Christine Lytwynec <clytwynec@edx.org>
+John Cox <johncox@google.com>

CHANGELOG.rst

@@ -5,6 +5,11 @@ These are notable changes in edx-platform.  This is a rolling list of changes,
 in roughly chronological order, most recent first.  Add your entries at or near
 the top.  Include a label indicating the component affected.
 
+Common: Add extensible third-party auth module.
+
+Blades: Handle situation if no response were sent from XQueue to LMS in Matlab
+problem after Run Code button press. BLD-994.
+
 Blades: Set initial video quality to large instead of default to avoid automatic switch to HD when iframe resizes. BLD-981.
 
 Blades: Add an upload button for authors to provide students with an option to

CONTRIBUTING.rst

@@ -4,9 +4,11 @@ Contributing to edx-platform
 
 Contributions to edx-platform are very welcome, and strongly encouraged! The
 easiest way is to fork the repo and then make a pull request from your fork.
-Read on for details on how to become a contributor, edx-platform code quality,
-testing, making a pull request, and more.
+Check out our `process documentation`_, or read on for details on how to
+become a contributor, edx-platform code quality, testing, making a pull
+request, and more.
 
+.. _process documentation: https://github.com/edx/edx-platform/blob/master/docs/en_us/developers/source/process/index.rst
 
 Becoming a Contributor
 ======================

cms/djangoapps/contentstore/features/textbooks.feature

@@ -19,9 +19,9 @@ Feature: CMS.Textbooks
     And I upload the textbook "textbook.pdf"
     And I wait for "2" seconds
     And I save the textbook
-    Then I should see a textbook named "Economics" with a chapter path containing "/c4x/MITx/999/asset/textbook.pdf"
+    Then I should see a textbook named "Economics" with a chapter path containing "/static/textbook.pdf"
     And I reload the page
-    Then I should see a textbook named "Economics" with a chapter path containing "/c4x/MITx/999/asset/textbook.pdf"
+    Then I should see a textbook named "Economics" with a chapter path containing "/static/textbook.pdf"
 
   Scenario: Create a textbook with multiple chapters
     Given I have opened a new course in Studio

cms/djangoapps/contentstore/features/video.py

@@ -37,8 +37,6 @@ def configure_youtube_api(_step, action):
 @step('I have created a Video component$')
 def i_created_a_video_component(_step):
 
-    assert_less(world.youtube.config['youtube_api_response'].status_code, 400,  "Real Youtube server is unavailable")
-
     world.create_course_with_unit()
     world.create_component_instance(
         step=_step,

cms/djangoapps/contentstore/management/commands/import.py

@@ -53,5 +53,5 @@ def handle(self, *args, **options):
         for module in course_items:
             course_id = module.location.course_id
             if not are_permissions_roles_seeded(course_id):
-                self.stdout.write('Seeding forum roles for course {0}'.format(course_id))
+                self.stdout.write('Seeding forum roles for course {0}\n'.format(course_id))
                 seed_permissions_roles(course_id)

cms/djangoapps/contentstore/management/commands/tests/test_import.py

@@ -12,6 +12,7 @@
 
 from contentstore.tests.modulestore_config import TEST_MODULESTORE
 from django_comment_common.utils import are_permissions_roles_seeded
+from xmodule.modulestore.django import modulestore
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 
 
@@ -22,6 +23,7 @@ class TestImport(ModuleStoreTestCase):
     """
 
     COURSE_ID = ['EDx', '0.00x', '2013_Spring', ]
+    DIFF_RUN = ['EDx', '0.00x', '2014_Spring', ]
 
     def setUp(self):
         """
@@ -41,10 +43,35 @@ def setUp(self):
         with open(os.path.join(self.good_dir, "course", "{0[2]}.xml".format(self.COURSE_ID)), "w+") as f:
             f.write('<course></course>')
 
+        # Create run changed course xml
+        self.dupe_dir = tempfile.mkdtemp(dir=self.content_dir)
+        os.makedirs(os.path.join(self.dupe_dir, "course"))
+        with open(os.path.join(self.dupe_dir, "course.xml"), "w+") as f:
+            f.write('<course url_name="{0[2]}" org="{0[0]}" '
+                    'course="{0[1]}"/>'.format(self.DIFF_RUN))
+
+        with open(os.path.join(self.dupe_dir, "course", "{0[2]}.xml".format(self.DIFF_RUN)), "w+") as f:
+            f.write('<course></course>')
+
     def test_forum_seed(self):
         """
         Tests that forum roles were created with import.
         """
         self.assertFalse(are_permissions_roles_seeded('/'.join(self.COURSE_ID)))
         call_command('import', self.content_dir, self.good_dir)
         self.assertTrue(are_permissions_roles_seeded('/'.join(self.COURSE_ID)))
+
+    def test_duplicate_with_url(self):
+        """
+        Check to make sure an import doesn't import courses that have the
+        same org and course, but they have different runs in order to
+        prevent modulestore "findone" exceptions on deletion
+        """
+        # Load up base course and verify it is available
+        call_command('import', self.content_dir, self.good_dir)
+        store = modulestore()
+        self.assertIsNotNone(store.get_course('/'.join(self.COURSE_ID)))
+
+        # Now load up duped course and verify it doesn't load
+        call_command('import', self.content_dir, self.dupe_dir)
+        self.assertIsNone(store.get_course('/'.join(self.DIFF_RUN)))

cms/djangoapps/contentstore/tests/test_contentstore.py

@@ -1809,10 +1809,10 @@ def test_import_into_new_course_id(self):
         # first check PDF textbooks, to make sure the url paths got updated
         course_module = module_store.get_instance(target_course_id, target_location)
 
-        self.assertEquals(len(course_module.pdf_textbooks), 1)
-        self.assertEquals(len(course_module.pdf_textbooks[0]["chapters"]), 2)
-        self.assertEquals(course_module.pdf_textbooks[0]["chapters"][0]["url"], '/c4x/MITx/999/asset/Chapter1.pdf')
-        self.assertEquals(course_module.pdf_textbooks[0]["chapters"][1]["url"], '/c4x/MITx/999/asset/Chapter2.pdf')
+        self.assertEqual(len(course_module.pdf_textbooks), 1)
+        self.assertEqual(len(course_module.pdf_textbooks[0]["chapters"]), 2)
+        self.assertEqual(course_module.pdf_textbooks[0]["chapters"][0]["url"], '/static/Chapter1.pdf')
+        self.assertEqual(course_module.pdf_textbooks[0]["chapters"][1]["url"], '/static/Chapter2.pdf')
 
     def test_import_into_new_course_id_wiki_slug_renamespacing(self):
         module_store = modulestore('direct')

cms/envs/bok_choy.py

@@ -49,3 +49,9 @@
 
 # Unfortunately, we need to use debug mode to serve staticfiles
 DEBUG = True
+
+# Point the URL used to test YouTube availability to our stub YouTube server
+YOUTUBE_PORT = 9080
+YOUTUBE['API'] = "127.0.0.1:{0}/get_youtube_api/".format(YOUTUBE_PORT)
+YOUTUBE['TEST_URL'] = "127.0.0.1:{0}/test_youtube/".format(YOUTUBE_PORT)
+YOUTUBE['TEXT_API']['url'] = "127.0.0.1:{0}/test_transcripts_youtube/".format(YOUTUBE_PORT)

cms/static/js/views/edit_chapter.js

@@ -65,7 +65,7 @@ define(["js/views/baseview", "underscore", "underscore.string", "jquery", "gette
                     if(!that.model.get('name')) {
                         options.name = response.asset.displayname;
                     }
-                    options.asset_path = response.asset.url;
+                    options.asset_path = response.asset.portable_url;
                     that.model.set(options);
                 }
             });

cms/static/js/views/modals/edit_xblock.js

@@ -135,6 +135,12 @@ define(["jquery", "underscore", "gettext", "js/views/modals/base_modal",
                 var parent = $(event.target.parentElement),
                     mode = parent.data('mode');
                 event.preventDefault();
+                var $cheatsheet = $('.simple-editor-cheatsheet');
+                if ($cheatsheet.hasClass("shown")) {
+                    $(".CodeMirror").removeAttr("style");
+                    $(".modal-content").removeAttr("style");
+                    $cheatsheet.removeClass('shown');
+                }
                 this.selectMode(mode);
             },
 

cms/static/js/views/xblock.js

@@ -25,18 +25,23 @@ define(["jquery", "underscore", "js/views/baseview", "xblock/runtime.v1"],
             },
 
             handleXBlockFragment: function(fragment, options) {
-                var wrapper = this.$el,
+                var self = this,
+                    wrapper = this.$el,
                     xblockElement,
                     success = options ? options.success : null,
-                    xblock;
-                this.renderXBlockFragment(fragment, wrapper);
-                xblockElement = this.$('.xblock').first();
-                xblock = XBlock.initializeBlock(xblockElement);
-                this.xblock = xblock;
-                this.xblockReady(xblock);
-                if (success) {
-                    success(xblock);
-                }
+                    xblock,
+                    fragmentsRendered;
+
+                fragmentsRendered = this.renderXBlockFragment(fragment, wrapper);
+                fragmentsRendered.done(function() {
+                    xblockElement = self.$('.xblock').first();
+                    xblock = XBlock.initializeBlock(xblockElement);
+                    self.xblock = xblock;
+                    self.xblockReady(xblock);
+                    if (success) {
+                        success(xblock);
+                    }
+                });
             },
 
             /**

common/djangoapps/student/models.py

@@ -22,6 +22,7 @@
 
 from django.conf import settings
 from django.utils import timezone
+from django.utils.dateparse import parse_datetime
 from django.contrib.auth.models import User
 from django.contrib.auth.hashers import make_password
 from django.contrib.auth.signals import user_logged_in, user_logged_out
@@ -392,6 +393,16 @@ def is_student_forced_password_reset_enabled(cls):
                 'MIN_DAYS_FOR_STUDENT_ACCOUNTS_PASSWORD_RESETS', None
             )
 
+    @classmethod
+    def is_password_reset_time_defined(cls):
+        """
+        Returns whether on not a time is defined for how old a password can be.
+        """
+        return settings.FEATURES['ADVANCED_SECURITY'] and \
+            settings.ADVANCED_SECURITY_CONFIG.get(
+                'OLDEST_VALID_PASSWORD_TIME', None
+            )
+
     @classmethod
     def should_user_reset_password_now(cls, user):
         """
@@ -410,7 +421,7 @@ def should_user_reset_password_now(cls, user):
             days_before_password_reset = \
                 settings.ADVANCED_SECURITY_CONFIG['MIN_DAYS_FOR_STUDENT_ACCOUNTS_PASSWORD_RESETS']
 
-        if days_before_password_reset:
+        if days_before_password_reset or cls.is_password_reset_time_defined():
             history = PasswordHistory.objects.filter(user=user).order_by('-time_set')
             time_last_reset = None
 
@@ -423,6 +434,12 @@ def should_user_reset_password_now(cls, user):
 
             now = timezone.now()
 
+            if cls.is_password_reset_time_defined():
+                naive_time = parse_datetime(settings.ADVANCED_SECURITY_CONFIG['OLDEST_VALID_PASSWORD_TIME'])
+                oldest_valid = timezone.get_current_timezone().localize(naive_time)
+                delta = time_last_reset - oldest_valid
+                return delta.days < 0
+
             delta = now - time_last_reset
 
             return delta.days >= days_before_password_reset