warn when importing incomptible sites

(v1 multibyte site names)

Author: ttyridal

ext/data/config.js

@@ -110,8 +110,8 @@ function read_mpsites(d){
             lastused: s[1],
             timesused: s[2],
             passtype: s[3],
-            passalgo: s[4],
-            passcnt: s[5],
+            passalgo: parseInt(s[4],10),
+            passcnt: parseInt(s[5],10),
             loginname: s[6],
             sitename: s[7],
             sitepass: s[8]
@@ -192,6 +192,7 @@ $(document).on('drop', function(e){
     }
     var fr = new FileReader();
     fr.onload=function(x){
+        var has_ver1_mb_sites = false;
         try {
             x = read_mpsites(x.target.result);
             if (!x) return;
@@ -217,6 +218,9 @@ $(document).on('drop', function(e){
                 this.passcnt,
                 this.passalgo);
 
+            if (this.passalgo < 2 && !string_is_plain_ascii(this.sitename))
+                has_ver1_mb_sites = true;
+
             if (! (this.sitesearch in stored_sites)) stored_sites[this.sitesearch] = {};
             stored_sites[this.sitesearch][this.sitename] = {
                 'generation': this.passcnt,
@@ -225,6 +229,12 @@ $(document).on('drop', function(e){
             };
         });
 
+        if (has_ver1_mb_sites)
+            alert("Version mismatch\n\nYour file contains site names with non ascii characters from "+
+                  "an old masterpassword version. This addon can not reproduce these passwords");
+        else
+            console.debug('Import successful');
+
         save_sites_to_backend();
     };
     fr.readAsText(e.originalEvent.dataTransfer.files[0]);

ext/test/test-main.js

@@ -9,6 +9,96 @@ exports["test main"] = function(assert) {
 // if (require("sdk/system/runtime").OS == 'Linux') {
 // }
 
+
+function mpsites_upload_jquery() {
+    return {
+        on: function(x, cb){
+            if (x === 'drop') {
+                cb({
+                    originalEvent: {
+                        dataTransfer: {files:[{name:'test.mpsites'}]}
+                    },
+                    preventDefault: function(){},
+                    stopPropagation: function(){}
+                });
+            }
+        },
+        append: function(){}
+    };
+}
+mpsites_upload_jquery.each = function(ar, cb) {
+    for (var x in ar) {
+        if (!ar.hasOwnProperty(x)) continue;
+        cb.apply(ar[x], [x, ar[x]]);
+    }
+};
+
+exports["test mpsites upload invalid"] = function(assert) {
+    var self = require("sdk/self");
+    const { sandbox, evaluate, load } = require("sdk/loader/sandbox");
+    var got_alert_not_mpsites = false;
+    var scope = sandbox();
+    scope.window = {
+        'addEventListener': function(){}
+    };
+    scope.document = {};
+    scope.console = console;
+    scope.confirm = function(m){return true;};
+    scope.alert = function(m){if (/Not a mpsites.file/.test(m)) got_alert_not_mpsites = true;};
+    scope.$ = mpsites_upload_jquery;
+    scope.FileReader = function() { this.onload = function(){ console.error('test failed, onload should be set!');}; };
+    scope.FileReader.prototype.readAsText = function(){
+        this.onload({target:{result:"invalid..not.a.mpsites.file"}});
+    };
+    load(scope, self.data.url('config.js'));
+
+    assert.ok(got_alert_not_mpsites);
+};
+
+exports["test mpsites upload valid"] = function(assert) {
+    var self = require("sdk/self");
+    const { sandbox, evaluate, load } = require("sdk/loader/sandbox");
+
+    var file = [ '# Master Password site export',
+'#     Export of site names and stored passwords (unless device-private) encrypted with the master key.',
+'# ', '##', '# Format: 1', '# Date: 2015-09-30T10:15:25Z', '# User Name: test', '# Full Name: test',
+'# Avatar: 0',
+'# Version: 2.2', '# Algorithm: 3', '# Default Type: 17', '# Passwords: PROTECTED',
+'##', '#',
+'#               Last     Times  Password                      Login\t                     Site\tSite',
+'#               used      used      type                       name\t                     name\tpassword',
+'2015-09-30T10:14:31Z         0    16:1:6                           \t                    asite\t',
+'2015-09-30T10:14:39Z         0    18:1:4                           \t                    åsite\t'
+        ].join('\n');
+
+    var version_mismatch_received = false;
+    var event_received;
+    var scope = sandbox();
+    scope.window = {
+        'addEventListener': function(){}
+    };
+    scope.document = {
+        createEvent:function(){return{initCustomEvent:function(){ this.sites = arguments[3];}};},
+        documentElement:{dispatchEvent: function(e){event_received=e;}}
+    };
+    scope.console = console;
+    scope.confirm = function(m){return true;};
+    scope.alert = function(m){ if (/Version mismatch/.test(m)) version_mismatch_received=true; } ;
+    scope.$ = mpsites_upload_jquery;
+    scope.FileReader = function() { this.onload = function(){ console.error('test failed, onload should be set!');}; };
+    scope.FileReader.prototype.readAsText = function(){
+        this.onload({target:{result:file}});
+    };
+    load(scope, self.data.url('config.js'));
+    assert.ok(version_mismatch_received);
+    assert.ok('asite' in event_received.sites);
+    assert.ok('åsite' in event_received.sites);
+    assert.equal(event_received.sites.asite.asite.generation, 6);
+    assert.equal(event_received.sites.asite.asite.type, 'x');
+    assert.equal(event_received.sites['åsite']['åsite'].generation, 4);
+    assert.equal(event_received.sites['åsite']['åsite'].type, 'm');
+};
+
 exports["test main handlers"] = function(assert, async_test_done) {
     var self = require("sdk/self");
     const { sandbox, evaluate, load } = require("sdk/loader/sandbox");