Merge branch 'staging' into new-messaging

2017-08-18 15:31:06 +02:00
commit 253ab68d8d
@@ -6,6 +6,23 @@ define([
    var Nacl = window.nacl;
    var module = {};

+    var blobToArrayBuffer = function (blob, cb) {
+        var reader = new FileReader();
+        reader.onloadend = function () {
+            cb(void 0, this.result);
+        };
+        reader.readAsArrayBuffer(blob);
+    };
+
+    var arrayBufferToString = function (AB) {
+        try {
+            return Nacl.util.encodeBase64(new Uint8Array(AB));
+        } catch (e) {
+            console.error(e);
+            return null;
+        }
+    };
+
    module.create = function (common, config) {
        var File = {};

@@ -227,19 +244,33 @@ define([
            queue.next();
        };

-        var handleFile = File.handleFile = function (file, e) {
-            var reader = new FileReader();
-            reader.onloadend = function () {
+        var handleFile = File.handleFile = function (file, e, thumbnail) {
+            var thumb;
+            var finish = function (arrayBuffer) {
+                var metadata = {
+                    name: file.name,
+                    type: file.type,
+                };
+                if (thumb) { metadata.thumbnail = thumb; }
                queue.push({
-                    blob: this.result,
-                    metadata: {
-                        name: file.name,
-                        type: file.type,
-                    },
+                    blob: arrayBuffer,
+                    metadata: metadata,
                    dropEvent: e
                });
            };
-            reader.readAsArrayBuffer(file);
+
+            var processFile = function () {
+                blobToArrayBuffer(file, function (e, buffer) {
+                    finish(buffer);
+                });
+            };
+
+            if (!thumbnail) { return void processFile(); }
+            blobToArrayBuffer(thumbnail, function (e, buffer) {
+                if (e) { console.error(e); }
+                thumb = arrayBufferToString(buffer);
+                processFile();
+            });
        };

        var onFileDrop = File.onFileDrop = function (file, e) {
@@ -256,7 +256,7 @@ define([
            var $friend = ui.getFriend(curvePublic);
            var $chat = ui.getChannel(curvePublic);
            $friend.remove();
-            $chat.remove();
+            if ($chat) { $chat.remove(); }
            ui.showInfo();
        };

@@ -892,7 +892,7 @@ define([
    var addToFriendList = Msg.addToFriendList = function (common, data, cb) {
        var proxy = common.getProxy();
        var friends = getFriendList(proxy);
-        var pubKey = data.curvePublic;
+        var pubKey = data.curvePublic; // todo validata data

        if (pubKey === proxy.curvePublic) { return void cb("E_MYKEY"); }

@@ -938,7 +938,7 @@ define([
                    var todo = function (yes) {
                        if (yes) {
                            pending[sender] = msgData;
-                            msg = ["FRIEND_REQ_OK", chan, createData(common, msgData.channel)];
+                            msg = ["FRIEND_REQ_OK", chan, createData(proxy, msgData.channel)];
                        }
                        msgStr = Crypto.encrypt(JSON.stringify(msg), key);
                        network.sendto(sender, msgStr);
@@ -1005,7 +1005,7 @@ define([
        if (!parsed.hashData) { return; }
        // Message
        var chan = parsed.hashData.channel;
-        var myData = createData(common);
+        var myData = createData(common.getProxy());
        var msg = ["FRIEND_REQ", chan, myData];
        // Encryption
        var keyStr = parsed.hashData.key;
@@ -8,6 +8,8 @@ define([
    var BAD_STATE_TIMEOUT = typeof(AppConfig.badStateTimeout) === 'number'?
        AppConfig.badStateTimeout: 30000;

+    var connected = false;
+
    /*
        TODO make this not blow up when disconnected or lagging...
    */
@@ -20,6 +22,7 @@ define([
            }

            var to = setTimeout(function () {
+                if (!connected) { return; }
                realtime.abort();
                // don't launch more than one popup
                if (common.infiniteSpinnerDetected) { return; }
@@ -38,5 +41,10 @@ define([
        }, 0);
    };

+    common.setConnectionState = function (bool) {
+        if (typeof(bool) !== 'boolean') { return; }
+        connected = bool;
+    };
+
    return common;
 });
@@ -0,0 +1,51 @@
+define([
+    '/bower_components/tweetnacl/nacl-fast.min.js',
+], function () {
+    var Nacl = window.nacl;
+    var Thumb = {
+        dimension: 150, // thumbnails are all 150px
+    };
+
+    // create thumbnail image from metadata
+    // return an img tag, or undefined if anything goes wrong
+    Thumb.fromMetadata = function (metadata) {
+        if (!metadata || typeof(metadata) !== 'object' || !metadata.thumbnail) { return; }
+        try {
+            var u8 = Nacl.util.decodeBase64(metadata.thumbnail);
+            var blob = new Blob([u8], {
+                type: 'image/png'
+            });
+            var url = URL.createObjectURL(blob);
+            var img = new Image();
+            img.src = url;
+            img.width = Thumb.dimension;
+            img.height = Thumb.dimension;
+            return img;
+        } catch (e) {
+            console.error(e);
+            return;
+        }
+    };
+
+    // assumes that your canvas is square
+    // nodeback returning blob
+    Thumb.fromCanvas = function (canvas, cb) {
+        canvas = canvas;
+        var c2 = document.createElement('canvas');
+        var d = Thumb.dimension;
+        c2.width = d;
+        c2.height = 2;
+
+        var ctx = c2.getContext('2d');
+        ctx.drawImage(canvas, 0, 0, d, d);
+        c2.toBlob(function (blob) {
+            cb(void 0, blob);
+        });
+    };
+
+    Thumb.fromVideo = function (video, cb) {
+        cb = cb; // WIP
+    };
+
+    return Thumb;
+});
@@ -571,6 +571,7 @@ define([
        _onDisplayNameChanged.forEach(function (h) {
            h(newName, isLocal);
        });
+        common.clearTooltips();
    };

    // STORAGE
@@ -1848,12 +1849,18 @@ define([

        Store.ready(function (err, storeObj) {
            store = common.store = env.store = storeObj;
-
            common.addDirectMessageHandler(common);

            var proxy = getProxy();
            var network = getNetwork();

+            network.on('disconnect', function () {
+                Realtime.setConnectionState(false);
+            });
+            network.on('reconnect', function () {
+                Realtime.setConnectionState(true);
+            });
+
            if (Object.keys(proxy).length === 1) {
                feedback("FIRST_APP_USE", true);
            }
@@ -50,25 +50,35 @@ define([
    };

    Curve.deriveKeys = function (theirs, mine) {
-        var pub = decodeBase64(theirs);
-        var secret = decodeBase64(mine);
+        try {
+            var pub = decodeBase64(theirs);
+            var secret = decodeBase64(mine);

-        var sharedSecret = Nacl.box.before(pub, secret);
-        var salt = decodeUTF8('CryptPad.signingKeyGenerationSalt');
+            var sharedSecret = Nacl.box.before(pub, secret);
+            var salt = decodeUTF8('CryptPad.signingKeyGenerationSalt');

-        // 64 uint8s
-        var hash = Nacl.hash(concatenateUint8s([salt, sharedSecret]));
-        var signKp = Nacl.sign.keyPair.fromSeed(hash.subarray(0, 32));
-        var cryptKey = hash.subarray(32, 64);
+            // 64 uint8s
+            var hash = Nacl.hash(concatenateUint8s([salt, sharedSecret]));
+            var signKp = Nacl.sign.keyPair.fromSeed(hash.subarray(0, 32));
+            var cryptKey = hash.subarray(32, 64);

-        return {
-            cryptKey: encodeBase64(cryptKey),
-            signKey: encodeBase64(signKp.secretKey),
-            validateKey: encodeBase64(signKp.publicKey)
-        };
+            return {
+                cryptKey: encodeBase64(cryptKey),
+                signKey: encodeBase64(signKp.secretKey),
+                validateKey: encodeBase64(signKp.publicKey)
+            };
+        } catch (e) {
+            console.error('invalid keys or other problem deriving keys');
+            console.error(e);
+            return null;
+        }
    };

    Curve.createEncryptor = function (keys) {
+        if (!keys || typeof(keys) !== 'object') {
+            return void console.error("invalid input for createEncryptor");
+        }
+
        var cryptKey = decodeBase64(keys.cryptKey);
        var signKey = decodeBase64(keys.signKey);
        var validateKey = decodeBase64(keys.validateKey);
@@ -1 +1 @@
-(function webpackUniversalModuleDefinition(root,factory){if(typeof exports==="object"&&typeof module==="object")module.exports=factory();else if(typeof define==="function"&&define.amd)define([],factory);else if(typeof exports==="object")exports["MediaTag"]=factory();else root["MediaTag"]=factory()})(this,function(){return function(modules){var installedModules={};function __webpack_require__(moduleId){if(installedModules[moduleId])return installedModules[moduleId].exports;var module=installedModules[moduleId]={i:moduleId,l:false,exports:{}};modules[moduleId].call(module.exports,module,module.exports,__webpack_require__);module.l=true;return module.exports}__webpack_require__.m=modules;__webpack_require__.c=installedModules;__webpack_require__.i=function(value){return value};__webpack_require__.d=function(exports,name,getter){if(!__webpack_require__.o(exports,name)){Object.defineProperty(exports,name,{configurable:false,enumerable:true,get:getter})}};__webpack_require__.n=function(module){var getter=module&&module.__esModule?function getDefault(){return module["default"]}:function getModuleExports(){return module};__webpack_require__.d(getter,"a",getter);return getter};__webpack_require__.o=function(object,property){return Object.prototype.hasOwnProperty.call(object,property)};__webpack_require__.p="";return __webpack_require__(__webpack_require__.s=95)}([function(module,exports,__webpack_require__){"use strict";var Identifier={IMAGE:"image",AUDIO:"audio",VIDEO:"video",PDF:"pdf",DASH:"dash",DOWNLOAD:"download",CRYPTO:"crypto",CLEAR_KEY:"clear-key",MEDIA_OBJECT:"media-object"};module.exports=Identifier},function(module,exports,__webpack_require__){"use strict";var Type={MATCHER:"matcher",RENDERER:"renderer",FILTER:"filter",SANITIZER:"sanitizer"};module.exports=Type},function(module,exports,__webpack_require__){"use strict";var ProcessingEngine=__webpack_require__(34);var MatchingEngine=__webpack_require__(33);var PluginStore=__webpack_require__(53);var UriStore=__webpack_require__(54);var MediaTag=__webpack_require__(31);function MediaTagAPI(elements){if(elements instanceof Array){var mediaObjects=[];elements.forEach(function(element){if(element.mediaObject){mediaObjects.push(element.mediaObject)}else{var _mediaTag=new MediaTag(element,MediaTagAPI.processingEngine);_mediaTag.mediaObjects.forEach(function(mediaObject){mediaObjects.push(MediaTagAPI.processingEngine.start(mediaObject))})}});return mediaObjects}var element=elements;var mediaTag=new MediaTag(element,MediaTagAPI.processingEngine);mediaTag.mediaObjects.forEach(function(mediaObject){MediaTagAPI.processingEngine.start(mediaObject)})}MediaTagAPI.pluginStore=MediaTagAPI.pluginStore||new PluginStore;MediaTagAPI.uriStore=MediaTagAPI.uriStore||new UriStore("../plugins");MediaTagAPI.processingEngine=MediaTagAPI.processingEngine||new ProcessingEngine(MediaTagAPI.pluginStore);MediaTagAPI.matchingEngine=MediaTagAPI.matchingEngine||new MatchingEngine(MediaTagAPI.pluginStore,MediaTagAPI.uriStore);MediaTagAPI.loadingEngine=null;module.exports=MediaTagAPI},function(module,exports,__webpack_require__){"use strict";var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor}}();function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function")}}function _possibleConstructorReturn(self,call){if(!self){throw new ReferenceError("this hasn't been initialised - super() hasn't been called")}return call&&(typeof call==="object"||typeof call==="function")?call:self}function _inherits(subClass,superClass){if(typeof superClass!=="function"&&superClass!==null){throw new TypeError("Super expression must either be null or a function, not "+typeof superClass)}subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:false,writable:true,configurable:true}});if(superClass)Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass}var Type=__webpack_require__(1);var Occurrence=__webpack_require__(5);var Plugin=__webpack_require__(6);var Matcher=function(_Plugin){_inherits(Matcher,_Plugin);function Matcher(identifier,targetType){_classCallCheck(this,Matcher);var _this=_possibleConstructorReturn(this,(Matcher.__proto__||Object.getPrototypeOf(Matcher)).call(this,identifier,Type.MATCHER,Occurrence.ANY));_this.targetType=targetType;return _this}_createClass(Matcher,[{key:"getTargetType",value:function getTargetType(){return this.targetType}}]);return Matcher}(Plugin);module.exports=Matcher},funcLine truncated
+(function webpackUniversalModuleDefinition(root,factory){if(typeof exports==="object"&&typeof module==="object")module.exports=factory();else if(typeof define==="function"&&define.amd)define([],factory);else if(typeof exports==="object")exports["MediaTag"]=factory();else root["MediaTag"]=factory()})(this,function(){return function(modules){var installedModules={};function __webpack_require__(moduleId){if(installedModules[moduleId]){return installedModules[moduleId].exports}var module=installedModules[moduleId]={i:moduleId,l:false,exports:{}};modules[moduleId].call(module.exports,module,module.exports,__webpack_require__);module.l=true;return module.exports}__webpack_require__.m=modules;__webpack_require__.c=installedModules;__webpack_require__.d=function(exports,name,getter){if(!__webpack_require__.o(exports,name)){Object.defineProperty(exports,name,{configurable:false,enumerable:true,get:getter})}};__webpack_require__.n=function(module){var getter=module&&module.__esModule?function getDefault(){return module["default"]}:function getModuleExports(){return module};__webpack_require__.d(getter,"a",getter);return getter};__webpack_require__.o=function(object,property){return Object.prototype.hasOwnProperty.call(object,property)};__webpack_require__.p="";return __webpack_require__(__webpack_require__.s=63)}([function(module,exports,__webpack_require__){"use strict";var Identifier={IMAGE:"image",AUDIO:"audio",VIDEO:"video",PDF:"pdf",DASH:"dash",DOWNLOAD:"download",CRYPTO:"crypto",CLEAR_KEY:"clear-key",MEDIA_OBJECT:"media-object"};module.exports=Identifier},function(module,exports,__webpack_require__){"use strict";var Type={MATCHER:"matcher",RENDERER:"renderer",FILTER:"filter",SANITIZER:"sanitizer"};module.exports=Type},function(module,exports,__webpack_require__){"use strict";var ProcessingEngine=__webpack_require__(31);var MatchingEngine=__webpack_require__(33);var PluginStore=__webpack_require__(34);var UriStore=__webpack_require__(35);var MediaTag=__webpack_require__(36);function MediaTagAPI(elements){if(elements instanceof Array){var mediaObjects=[];elements.forEach(function(element){if(element.mediaObject){mediaObjects.push(element.mediaObject)}else{var _mediaTag=new MediaTag(element,MediaTagAPI.processingEngine);_mediaTag.mediaObjects.forEach(function(mediaObject){mediaObjects.push(MediaTagAPI.processingEngine.start(mediaObject))})}});return mediaObjects}var element=elements;var mediaTag=new MediaTag(element,MediaTagAPI.processingEngine);mediaTag.mediaObjects.forEach(function(mediaObject){MediaTagAPI.processingEngine.start(mediaObject)})}MediaTagAPI.pluginStore=MediaTagAPI.pluginStore||new PluginStore;MediaTagAPI.uriStore=MediaTagAPI.uriStore||new UriStore("../plugins");MediaTagAPI.processingEngine=MediaTagAPI.processingEngine||new ProcessingEngine(MediaTagAPI.pluginStore);MediaTagAPI.matchingEngine=MediaTagAPI.matchingEngine||new MatchingEngine(MediaTagAPI.pluginStore,MediaTagAPI.uriStore);MediaTagAPI.loadingEngine=null;module.exports=MediaTagAPI},function(module,exports,__webpack_require__){"use strict";var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor}}();function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function")}}function _possibleConstructorReturn(self,call){if(!self){throw new ReferenceError("this hasn't been initialised - super() hasn't been called")}return call&&(typeof call==="object"||typeof call==="function")?call:self}function _inherits(subClass,superClass){if(typeof superClass!=="function"&&superClass!==null){throw new TypeError("Super expression must either be null or a function, not "+typeof superClass)}subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:false,writable:true,configurable:true}});if(superClass)Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass}var Type=__webpack_require__(1);var Occurrence=__webpack_require__(5);var Plugin=__webpack_require__(6);var Matcher=function(_Plugin){_inherits(Matcher,_Plugin);function Matcher(identifier,targetType){_classCallCheck(this,Matcher);var _this=_possibleConstructorReturn(this,(Matcher.__proto__||Object.getPrototypeOf(Matcher)).call(this,identifier,Type.MATCHER,Occurrence.ANY));_this.targetType=targetType;return _this}_createClass(Matcher,[{key:"getTargetType",value:function getTargetType(){return this.targetType}}]);return Matcher}(Plugin);module.exports=Matcher},function(module,exports,__webpack_require__){"use stricLine truncated
@@ -1,4 +1,11 @@
 (function () {
+    var Mod = function (ApiConfig) {
+        var requireConf;
+        if (ApiConfig && ApiConfig.requireConf) {
+            requireConf = ApiConfig.requireConf;
+        }
+        var urlArgs = typeof(requireConf.urlArgs) === 'string'? '?' + urlArgs: '';
+
    var Module = {};

    var isSupported = Module.isSupported = function () {
@@ -41,8 +48,8 @@
        }
    };

-    var DEFAULT_MAIN = '/customize/main-favicon.png';
-    var DEFAULT_ALT = '/customize/alt-favicon.png';
+    var DEFAULT_MAIN = '/customize/main-favicon.png' + urlArgs;
+    var DEFAULT_ALT = '/customize/alt-favicon.png' + urlArgs;

    var createFavicon = function () {
        console.log("creating favicon");
@@ -110,14 +117,14 @@
            cancel: cancel,
        };
    };
+        return Module;
+    };

    if (typeof(module) !== 'undefined' && module.exports) {
-        module.exports = Module;
+        module.exports = Mod();
    } else if ((typeof(define) !== 'undefined' && define !== null) && (define.amd !== null)) {
-        define(function () {
-            return Module;
-        });
+        define(['/api/config'], Mod);
    } else {
-        window.Visible = Module;
+        window.Visible = Mod();
    }
 }());
@@ -341,25 +341,14 @@ function isDataSchema(url) {
  return url.substr(i, 5).toLowerCase() === 'data:';
 }
 function getPDFFileNameFromURL(url) {
-  var defaultFilename = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'document.pdf';
-
-  if (isDataSchema(url)) {
-    console.warn('getPDFFileNameFromURL: ' + 'ignoring "data:" URL for performance reasons.');
-    return defaultFilename;
+  var query;
+  var title;
+  if (/\#/.test(url)) {
+    url.replace(/\#(.*)$/, function (all, t) {
+      title = t;
+    });
  }
-  var reURI = /^(?:(?:[^:]+:)?\/\/[^\/]+)?([^?#]*)(\?[^#]*)?(#.*)?$/;
-  var reFilename = /[^\/?#=]+\.pdf\b(?!.*\.pdf\b)/i;
-  var splitURI = reURI.exec(url);
-  var suggestedFilename = reFilename.exec(splitURI[1]) || reFilename.exec(splitURI[2]) || reFilename.exec(splitURI[3]);
-  if (suggestedFilename) {
-    suggestedFilename = suggestedFilename[0];
-    if (suggestedFilename.indexOf('%') !== -1) {
-      try {
-        suggestedFilename = reFilename.exec(decodeURIComponent(suggestedFilename))[0];
-      } catch (e) {}
-    }
-  }
-  return suggestedFilename || defaultFilename;
+  return title || 'document.pdf';
 }
 function normalizeWheelEventDelta(evt) {
  var delta = Math.sqrt(evt.deltaX * evt.deltaX + evt.deltaY * evt.deltaY);
@@ -1192,11 +1181,13 @@ var PDFViewerApplication = {
  setTitleUsingUrl: function pdfViewSetTitleUsingUrl(url) {
    this.url = url;
    this.baseUrl = url.split('#')[0];
-    var title = (0, _ui_utils.getPDFFileNameFromURL)(url, '');
+
+    var title = _ui_utils.getPDFFileNameFromURL(url);
    if (!title) {
      try {
        title = decodeURIComponent((0, _pdfjsLib.getFilenameFromUrl)(url)) || url;
      } catch (e) {
+          console.error(e)
        title = url;
      }
    }