central-develop into 0.17.x

kalite/control_panel/static/js/control_panel/data_export/views.js

@@ -104,7 +104,7 @@ var ZoneSelectView = Backbone.View.extend({
 
     template: require('./hbtemplates/zone-select.handlebars'),
 
-    initialize: function() {
+    initialize: function(options) {
         // Create collections
         this.zone_list = new Models.ZoneCollection();
 
@@ -117,7 +117,7 @@ var ZoneSelectView = Backbone.View.extend({
             // Fetch collection by org_id
             this.zone_list.fetch({
                 data: $.param({
-                    "org_id": this.options.org_id,
+                    "org_id": options.org_id,
                     "limit": 0
                 })
             });

kalite/distributed/static/js/distributed/bundle_modules/base.js

@@ -14,6 +14,9 @@ require("browsernizr/test/canvas");
 require("browsernizr/test/touchevents");
 var Modernizr = require("browsernizr");
 
+// Expose this as a global object for use in central server inline JS.
+global.getCookie = require("utils/get_cookie");
+
 global.$ = $;
 global._ = _;
 global.sessionModel = new SessionModel();

kalite/packages/bundled/fle_utils/django_utils/command.py

@@ -118,6 +118,73 @@ def call_command_async(cmd, *args, **kwargs):
         return call_command_subprocess(cmd, *args, **kwargs)
 
 
+def call_outside_command_with_output(command, *args, **kwargs):
+    """
+    Runs call_command for a KA Lite installation at the given location,
+    and returns the output.
+    """
+
+    if settings.IS_SOURCE:
+        assert "kalite_dir" in kwargs, "don't forget to specify the kalite_dir"
+        kalite_dir = kwargs.pop('kalite_dir')
+    else:
+        kalite_dir = None
+
+    # some custom variables that have to be put inside kwargs
+    # or else will mess up the way the command is called
+    output_to_stdout = kwargs.pop('output_to_stdout', False)
+    output_to_stderr = kwargs.pop('output_to_stderr', False)
+    wait = kwargs.pop('wait', True)
+
+    # build the command
+    if kalite_dir:
+        kalite_bin = os.path.join(kalite_dir, "bin", "kalite")
+    else:
+        kalite_bin = 'kalite'
+
+    cmd = (kalite_bin, "manage", command) if os.name != "nt" else (sys.executable, kalite_bin, "manage", command)
+    for arg in args:
+        cmd += (arg,)
+
+    kwargs_keys = kwargs.keys()
+
+    # Ensure --settings occurs first, as otherwise docopt parsing barfs
+    kwargs_keys = sorted(kwargs_keys, cmp=lambda x,y: -1 if x=="settings" else 0)
+
+    for key in kwargs_keys:
+        val = kwargs[key]
+        key = key.replace(u"_",u"-")
+        prefix = u"--" if command != "runcherrypyserver" else u""  # hack, but ... whatever!
+        if isinstance(val, bool):
+            cmd += (u"%s%s" % (prefix, key),)
+        else:
+            # TODO(jamalex): remove this replacement, after #4066 is fixed:
+            # https://github.com/learningequality/ka-lite/issues/4066
+            cleaned_val = unicode(val).replace(" ", "")
+            cmd += (u"%s%s=%s" % (prefix, key, cleaned_val),)
+
+    # we also need to change the environment to point to the the local
+    # kalite settings. This is especially important for when the
+    # central server calls this function, as if we don't change this,
+    # kalitectl.py wil look for centralserver.settings instead of
+    # kalite.settings.
+    new_env = os.environ.copy()
+    new_env["DJANGO_SETTINGS_MODULE"] = kwargs.get("settings") or "kalite.settings"
+
+    p = subprocess.Popen(
+        cmd,
+        shell=False,
+        # cwd=os.path.split(cmd[0])[0],
+        stdout=None if output_to_stdout else subprocess.PIPE,
+        stderr=None if output_to_stderr else subprocess.PIPE,
+        env=new_env,
+    )
+    out = p.communicate() if wait else (None, None)
+
+    # tuple output of stdout, stderr, exit code and process object
+    return out + (1 if out[1] else 0, p)
+
+
 class LocaleAwareCommand(BaseCommand):
     option_list = BaseCommand.option_list + (
         make_option('--locale',

kalite/packages/bundled/securesync/api_client.py

@@ -13,9 +13,9 @@
 
 class BaseClient(object):
 
-    def __init__(self, host="%s://%s/" % (settings.SECURESYNC_PROTOCOL, settings.CENTRAL_SERVER_HOST), require_trusted=True, verbose=True):
-        self.parsed_url = urllib2.urlparse.urlparse(host)
-        self.url = "%s://%s" % (self.parsed_url.scheme, self.parsed_url.netloc)
+    def __init__(self, host=None, require_trusted=True, verbose=True):
+        self.url = host or settings.CENTRAL_SERVER_URL
+        self.parsed_url = urllib2.urlparse.urlparse(self.url)
         self.require_trusted = require_trusted
         self.verbose = verbose
 

kalite/packages/bundled/securesync/devices/api_views.py

@@ -49,15 +49,17 @@ def register_device(request):
     try:
         if not client_device.verify():
             # We've been getting this verification error a lot, even when we shouldn't. Send more details to us by email so we can diagnose.
-            msg = "\n\n".join([request.body, client_device._hashable_representation(), str(client_device.validate()), client_device.signed_by_id, client_device.id, str(request)])
+            import inspect
+            d = client_device
+            msg = "\n\n".join([str(msg) for msg in [request.body, d._hashable_representation(), d.__dict__, d.__class__, inspect.getfile(d.__class__), local_version, d.description, d.signed_by_id, d.id, request]])
             send_mail("Client device did not verify", msg, "[email protected]", ["[email protected]"])
             return JsonResponseMessageError("Client device must be self-signed with a signature matching its own public key!", code=EC.CLIENT_DEVICE_INVALID_SIGNATURE)
     except Exception as e:
         # Can't properly namespace to a particular Exception here, since the only reason we would be getting here is
         # that what should be proper exception namespacing in code being called isn't correctly catching this exception
         msg = "\n\n".join([request.body, client_device._hashable_representation(), "Exception: %s" % e, str(type(e)), client_device.signed_by_id, client_device.id, str(request)])
         send_mail("Exception while verifying client device", msg, "[email protected]", ["[email protected]"])
-        return JsonResponseMessageError("Client device must be self-signed with a signature matching its own public key!", code=EC.CLIENT_DEVICE_INVALID_SIGNATURE)
+        return JsonResponseMessageError("Client device must be self-signed with a signature matching its own public key.", code=EC.CLIENT_DEVICE_INVALID_SIGNATURE)
 
     try:
         zone = register_self_registered_device(client_device, models, data)

kalite/packages/bundled/securesync/management/commands/register.py

@@ -61,7 +61,7 @@ def handle(self, *args, **options):
         csrftoken = s.cookies['csrftoken_central']
         login_data = dict(username=options["username"], password=options["password"], csrfmiddlewaretoken=csrftoken, next='/')
         r = s.post(login_url, data=login_data, headers={"Referer": login_url})
-        assert r.status_code == 200, "Error logging into central server: " + r.content
+        assert r.status_code == 200 and "Incorrect user" not in r.content, "Error logging into central server: " + r.content
 
         # register on the central server
         reg_url = client.get_registration_url()
@@ -80,5 +80,3 @@ def handle(self, *args, **options):
         own_device = Device.get_own_device()
         assert own_device.is_registered(), "Device was not registered successfully..."
         sys.stdout.write("Device '%s' has been successfully registered to zone '%s'!\n" % (own_device.id, own_device.get_zone().id))
-
-

kalite/version.py

@@ -3,7 +3,7 @@
 # Must also be of the form N.N.N for internal use, where N is a non-negative integer
 MAJOR_VERSION = "0"
 MINOR_VERSION = "17"
-PATCH_VERSION = "5"
+PATCH_VERSION = "6.dev"
 VERSION = "%s.%s.%s" % (MAJOR_VERSION, MINOR_VERSION, PATCH_VERSION)
 SHORTVERSION = "%s.%s" % (MAJOR_VERSION, MINOR_VERSION)
 

static-libraries/js/jquery.cookie.js

@@ -0,0 +1,97 @@
+/**
+ * Cookie plugin
+ *
+ * Copyright (c) 2006 Klaus Hartl (stilbuero.de)
+ * Dual licensed under the MIT and GPL licenses:
+ * http://www.opensource.org/licenses/mit-license.php
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ */
+
+/**
+ * Create a cookie with the given name and value and other optional parameters.
+ *
+ * @example $.cookie('the_cookie', 'the_value');
+ * @desc Set the value of a cookie.
+ * @example $.cookie('the_cookie', 'the_value', { expires: 7, path: '/', domain: 'jquery.com', secure: true });
+ * @desc Create a cookie with all available options.
+ * @example $.cookie('the_cookie', 'the_value');
+ * @desc Create a session cookie.
+ * @example $.cookie('the_cookie', null);
+ * @desc Delete a cookie by passing null as value. Keep in mind that you have to use the same path and domain
+ *       used when the cookie was set.
+ *
+ * @param String name The name of the cookie.
+ * @param String value The value of the cookie.
+ * @param Object options An object literal containing key/value pairs to provide optional cookie attributes.
+ * @option Number|Date expires Either an integer specifying the expiration date from now on in days or a Date object.
+ *                             If a negative value is specified (e.g. a date in the past), the cookie will be deleted.
+ *                             If set to null or omitted, the cookie will be a session cookie and will not be retained
+ *                             when the the browser exits.
+ * @option String path The value of the path atribute of the cookie (default: path of page that created the cookie).
+ * @option String domain The value of the domain attribute of the cookie (default: domain of page that created the cookie).
+ * @option Boolean secure If true, the secure attribute of the cookie will be set and the cookie transmission will
+ *                        require a secure protocol (like HTTPS).
+ * @type undefined
+ *
+ * @name $.cookie
+ * @cat Plugins/Cookie
+ * @author Klaus Hartl/[email protected]
+ */
+
+/**
+ * Get the value of a cookie with the given name.
+ *
+ * @example $.cookie('the_cookie');
+ * @desc Get the value of a cookie.
+ *
+ * @param String name The name of the cookie.
+ * @return The value of the cookie.
+ * @type String
+ *
+ * @name $.cookie
+ * @cat Plugins/Cookie
+ * @author Klaus Hartl/[email protected]
+ */
+jQuery.cookie = function(name, value, options) {
+    if (typeof value != 'undefined') { // name and value given, set cookie
+        options = options || {};
+        if (value === null) {
+            value = '';
+            options = $.extend({}, options); // clone object since it's unexpected behavior if the expired property were changed
+            options.expires = -1;
+        }
+        var expires = '';
+        if (options.expires && (typeof options.expires == 'number' || options.expires.toUTCString)) {
+            var date;
+            if (typeof options.expires == 'number') {
+                date = new Date();
+                date.setTime(date.getTime() + (options.expires * 24 * 60 * 60 * 1000));
+            } else {
+                date = options.expires;
+            }
+            expires = '; expires=' + date.toUTCString(); // use expires attribute, max-age is not supported by IE
+        }
+        // NOTE Needed to parenthesize options.path and options.domain
+        // in the following expressions, otherwise they evaluate to undefined
+        // in the packed version for some reason...
+        var path = options.path ? '; path=' + (options.path) : '';
+        var domain = options.domain ? '; domain=' + (options.domain) : '';
+        var secure = options.secure ? '; secure' : '';
+        document.cookie = [name, '=', encodeURIComponent(value), expires, path, domain, secure].join('');
+    } else { // only name given, get cookie
+        var cookieValue = null;
+        if (document.cookie && document.cookie != '') {
+            var cookies = document.cookie.split(';');
+            for (var i = 0; i < cookies.length; i++) {
+                var cookie = jQuery.trim(cookies[i]);
+                // Does this cookie string begin with the name we want?
+                if (cookie.substring(0, name.length + 1) == (name + '=')) {
+                    cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
+                    break;
+                }
+            }
+        }
+        return cookieValue;
+    }
+};