test api

.gitignore

@@ -144,4 +144,4 @@ dist
 # Visual Studio Code
 .vscode
 newrelic.ini
-
+themes/elitemba-theme

.tx/config

@@ -1,84 +1,104 @@
 [main]
 host = https://www.transifex.com
 
-[elitemba.django-partial]
+[edx-i.django-partial]
 file_filter = conf/locale/<lang>/LC_MESSAGES/django-partial.po
 source_file = conf/locale/en/LC_MESSAGES/django-partial.po
 source_lang = en
 type = PO
 
-[elitemba.django-studio]
+[edx-i.django-studio]
 file_filter = conf/locale/<lang>/LC_MESSAGES/django-studio.po
 source_file = conf/locale/en/LC_MESSAGES/django-studio.po
 source_lang = en
 type = PO
 
-[elitemba.djangojs-partial]
+[edx-i.djangojs-partial]
 file_filter = conf/locale/<lang>/LC_MESSAGES/djangojs-partial.po
 source_file = conf/locale/en/LC_MESSAGES/djangojs-partial.po
 source_lang = en
 type = PO
 
-[elitemba.djangojs-studio]
+[edx-i.djangojs-studio]
 file_filter = conf/locale/<lang>/LC_MESSAGES/djangojs-studio.po
 source_file = conf/locale/en/LC_MESSAGES/djangojs-studio.po
 source_lang = en
 type = PO
 
-[elitemba.mako]
+[edx-i.mako]
 file_filter = conf/locale/<lang>/LC_MESSAGES/mako.po
 source_file = conf/locale/en/LC_MESSAGES/mako.po
 source_lang = en
 type = PO
 
-[elitemba.mako-studio]
+[edx-i.mako-studio]
 file_filter = conf/locale/<lang>/LC_MESSAGES/mako-studio.po
 source_file = conf/locale/en/LC_MESSAGES/mako-studio.po
 source_lang = en
 type = PO
 
-[elitemba.underscore]
+[edx-i.underscore]
 file_filter = conf/locale/<lang>/LC_MESSAGES/underscore.po
 source_file = conf/locale/en/LC_MESSAGES/underscore.po
 source_lang = en
 type = PO
 
-[elitemba.underscore-studio]
+[edx-i.underscore-studio]
 file_filter = conf/locale/<lang>/LC_MESSAGES/underscore-studio.po
 source_file = conf/locale/en/LC_MESSAGES/underscore-studio.po
 source_lang = en
 type = PO
 
-[elitemba.wiki]
+[edx-i.wiki]
 file_filter = conf/locale/<lang>/LC_MESSAGES/wiki.po
 source_file = conf/locale/en/LC_MESSAGES/wiki.po
 source_lang = en
 type = PO
 
-[open-edx-releases.release-ironwood]
-file_filter = conf/locale/<lang>/LC_MESSAGES/django.po
-source_file = conf/locale/en/LC_MESSAGES/django.po
-source_lang = en
-type = PO
-
-[open-edx-releases.release-ironwood-js]
-file_filter = conf/locale/<lang>/LC_MESSAGES/djangojs.po
-source_file = conf/locale/en/LC_MESSAGES/djangojs.po
-
-[elitemba.membership]
+[edx-i.membership]
 file_filter = conf/locale/<lang>/LC_MESSAGES/membership.po
 source_file = conf/locale/en/LC_MESSAGES/membership.po
 source_lang = en
 type = PO
 
-[elitemba.membership-js]
+[edx-i.membership-js]
 file_filter = conf/locale/<lang>/LC_MESSAGES/membership-js.po
 source_file = conf/locale/en/LC_MESSAGES/membership-js.po
 source_lang = en
 type = PO
 
-[elitemba.eliteu]
+[edx-i.eliteu]
 file_filter = conf/locale/<lang>/LC_MESSAGES/eliteu.po
 source_file = conf/locale/en/LC_MESSAGES/eliteu.po
 source_lang = en
 type = PO
+
+[edx-i.edx_proctoring_proctortrack]
+file_filter = conf/locale/<lang>/LC_MESSAGES/eliteu.po
+source_file = conf/locale/en/LC_MESSAGES/eliteu.po
+source_lang = en
+type = PO
+
+[edx-i.django-theme]
+file_filter = conf/locale/<lang>/LC_MESSAGES/django-theme.po
+source_file = conf/locale/en/LC_MESSAGES/django-theme.po
+source_lang = en
+type = PO
+
+[edx-i.djangojs-theme]
+file_filter = conf/locale/<lang>/LC_MESSAGES/djangojs-theme.po
+source_file = conf/locale/en/LC_MESSAGES/djangojs-theme.po
+source_lang = en
+type = PO
+
+[edx-i.mako-theme]
+file_filter = conf/locale/<lang>/LC_MESSAGES/mako-theme.po
+source_file = conf/locale/en/LC_MESSAGES/mako-theme.po
+source_lang = en
+type = PO
+
+[edx-i.underscore-theme]
+file_filter = conf/locale/<lang>/LC_MESSAGES/underscore-theme.po
+source_file = conf/locale/en/LC_MESSAGES/underscore-theme.po
+source_lang = en
+type = PO

cms/envs/devstack_docker.py

@@ -9,8 +9,8 @@
 
 LOGGING['loggers']['tracking']['handlers'] = ['console']
 
-LMS_BASE = 'edx.devstack.lms:18000'
-CMS_BASE = 'edx.devstack.lms:18010'
+LMS_BASE = 'localhost:18000'
+CMS_BASE = 'localhost:18010'
 LMS_ROOT_URL = 'http://{}'.format(LMS_BASE)
 
 FEATURES.update({

cms/envs/eliteu_aliyun.py

@@ -0,0 +1,4 @@
+from .production import *
+
+############### Settings for AES Encryption/Decryption  ##################
+AES_KEY = AUTH_TOKENS.get('AES_KEY', '')

cms/templates/base.html

@@ -9,7 +9,6 @@
 <%namespace name='static' file='static_content.html'/>
 <%!
 from django.utils.translation import ugettext as _
-from django.conf import settings
 
 from openedx.core.djangoapps.util.user_messages import PageLevelMessages
 from openedx.core.djangolib.js_utils import (
@@ -42,15 +41,6 @@
       jsi18n_path = "js/i18n/{language}/djangojs.js".format(language=LANGUAGE_CODE)
     %>
 
-    <% sentry_dsn_frontend = getattr(settings, 'SENTRY_DSN_FRONTEND', '') %>
-    % if sentry_dsn_frontend:
-        <script src="https://browser.sentry-cdn.com/4.4.2/bundle.min.js" crossorigin="anonymous"></script>
-        <script type="text/javascript">
-            // Sentry Settings
-            Sentry.init({ dsn: '${sentry_dsn_frontend}' });
-        </script>
-    % endif
-
     % if getattr(settings, 'CAPTURE_CONSOLE_LOG', False):
         <script type="text/javascript">
             var oldOnError = window.onerror;
@@ -85,19 +75,6 @@
     <%include file="widgets/segment-io.html" />
 
     <%block name="header_extras"></%block>
-
-    <% ga_acct = getattr(settings, 'GOOGLE_ANALYTICS_ACCOUNT', None) %>
-    <!-- Google Analytics -->
-    <script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-    ga('create', '${ga_acct}', 'auto');
-    ga('send', 'pageview');
-    </script>
-    <!-- End Google Analytics --> 
   </head>
 
   <body class="${static.dir_rtl()} <%block name='bodyclass'></%block> lang_${LANGUAGE_CODE}">

cms/templates/emails/activation_email.txt

@@ -8,6 +8,4 @@ ${_("Thank you for signing up for {studio_name}! To activate your account, pleas
   http://${ site }/activate/${ key }
 % endif
 
-
-
 ${_("If you didn't request this, you don't need to do anything; you won't receive any more email from us. Please do not reply to this e-mail; if you require assistance, check the help section of the {studio_name} web site.").format(studio_name=settings.STUDIO_NAME)}

cms/templates/register.html

@@ -68,7 +68,7 @@ <h1 class="title title-1">${_("Sign Up for {studio_name}").format(studio_name=se
             <li class="field checkbox required" id="field-tos">
               <input id="tos" name="terms_of_service" type="checkbox" value="true" />
               <label for="tos">
-                ${_("I agree to the {a_start} Terms of Service {a_end}").format(a_start='<a data-rel="edx.org" href="{}">'.format('https://www.elitemba.cn/honor'), a_end="</a>")}
+                ${_("I agree to the {a_start} Terms of Service {a_end}").format(a_start='<a data-rel="edx.org" href="{}">'.format(marketing_link('TOS')), a_end="</a>")}
               </label>
             </li>
           </ol>

cms/templates/settings.html

@@ -279,7 +279,7 @@ <h2 class="title-2">${_('Course Schedule')}</h2>
                 <span class="tip tip-stacked">
                   ${_("Last day students can enroll.")}
                 % if not enrollment_end_editable:
-                  ${_("Contact your EliteMBA partner manager to update these settings.")}
+                  ${_("Contact your edX partner manager to update these settings.")}
                 % endif
                 </span>
               </div>

common/djangoapps/student/fields.py

@@ -0,0 +1,64 @@
+from django.db.models import CharField
+from django.conf import settings
+from hasher import AESCipher
+
+
+class AESCharField(CharField):
+    """
+    AESCharField
+    - Compatible with unencrypted data, the encrypted string will be carried
+    """
+
+    def __init__(self, *args, **kwargs):
+        """
+        init
+        :param prefix: prefix
+        """
+        if 'prefix' in kwargs:
+            self.prefix = kwargs['prefix']
+            del kwargs['prefix']
+        else:
+            self.prefix = "aes_str:::"
+
+        self.cipher = AESCipher(settings.AES_KEY)
+        super(AESCharField, self).__init__(*args, **kwargs)
+
+    def deconstruct(self):
+        name, path, args, kwargs = super(AESCharField, self).deconstruct()
+
+        if self.prefix != "aes_str:::":
+            kwargs['prefix'] = self.prefix
+        return name, path, args, kwargs
+
+    def from_db_value(self, value, expression, connection, context):
+        """
+        decode
+        """
+        if value is None:
+            return value
+        if value.startswith(self.prefix):
+            value = value[len(self.prefix):]
+            value = self.cipher.decrypt(value)
+
+        return value
+
+    def to_python(self, value):
+        if value is None:
+            return value
+        elif value.startswith(self.prefix):
+            value = value[len(self.prefix):]
+            value = self.cipher.decrypt(value)
+
+        return value
+
+    def get_prep_value(self, value):
+        """
+        in
+        """
+        if isinstance(value, str) or isinstance(value, unicode):
+            value = self.cipher.encrypt(value)
+            value = self.prefix + value
+        elif value is not None:
+            raise TypeError(str(value)+" is not a valid value for AESCharField")
+
+        return value

common/djangoapps/student/hasher.py

@@ -0,0 +1,44 @@
+import base64
+import hashlib
+from Crypto import Random
+from Crypto.Cipher import AES
+from django.conf import settings
+
+
+class AESCipher(object):
+
+    def __init__(self, key, iv=b'X\x04\xa76\xe9\x9e\x19Sx\xe3CE*/\xb1.'):
+        """
+        default use [settings.SECRET_KEY]
+        if user want to use custom, just like this.
+        eg. key = hashlib.sha256(settings.AES_KEY).digest()
+
+        # iv = Random.new().read(AES.block_size)
+        # use settings iv instead of random to produce same result
+        """
+        self.key = hashlib.sha256(key).digest()
+        self.iv = iv
+
+    def encrypt(self, raw):
+        if raw is None:
+            return raw
+
+        raw = self._pad(raw)
+        cipher = AES.new(self.key, AES.MODE_CBC, self.iv)
+        return base64.b64encode(self.iv + cipher.encrypt(raw.encode()))
+
+    def decrypt(self, enc):
+        if enc is None:
+            return enc
+
+        enc = base64.b64decode(enc)
+        iv = enc[:AES.block_size]
+        cipher = AES.new(self.key, AES.MODE_CBC, iv)
+        return self._unpad(cipher.decrypt(enc[AES.block_size:])).decode('utf-8')
+
+    def _pad(self, s):
+        bs = AES.block_size
+        return s + (bs - len(s) % bs) * chr(bs - len(s) % bs)
+
+    def _unpad(self, s):
+        return s[:-ord(s[len(s) - 1:])]

common/djangoapps/student/migrations/0021_auto_20191216_0429.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.20 on 2019-12-16 09:29
+from __future__ import unicode_literals
+
+from django.db import migrations
+import student.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('student', '0020_merge_20190510_0217'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='userprofile',
+            name='phone',
+            field=student.fields.AESCharField(max_length=60, null=True, verbose_name=b'Phone'),
+        ),
+    ]

common/djangoapps/student/migrations/0022_hash_userprofile_phone.py

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.20 on 2019-05-10 06:17
+from __future__ import unicode_literals
+
+from django.db import migrations
+from student.models import UserProfile
+from student.hasher import AESCipher
+
+def forwards_func(apps, schema_editor):
+    users = UserProfile.objects.all()
+    hasher = AESCipher
+    for profile in users:
+        profile.save()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('student', '0021_auto_20191216_0429'),
+    ]
+
+    operations = [
+        migrations.RunPython(forwards_func),
+    ]

common/djangoapps/student/migrations/0023_hash_user_email.py

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.20 on 2019-05-10 06:17
+from __future__ import unicode_literals
+
+from django.db import migrations
+from django.contrib.auth.models import User
+
+
+def forwards_func(apps, schema_editor):
+    users = User.objects.all()        
+    for user in users:
+        user.save(update_fields=["email"])
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('student', '0022_hash_userprofile_phone'),
+    ]
+
+    operations = [
+        migrations.RunPython(forwards_func),
+    ]