Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

customize.dist/about.html

@@ -106,7 +106,7 @@
                     <div class="col">
                         <ul class="list-unstyled">
                             <li class="title" data-localization="footer_contact"><li>
-                            <li><a href="https://riot.im/app/#/room/!cryptpad:matrix.org" target="_blank" rel="noopener noreferrer">Chat</a></li>
+                            <li><a href="https://riot.im/app/#/room/#cryptpad:matrix.org" target="_blank" rel="noopener noreferrer">Chat</a></li>
                             <li><a href="https://twitter.com/cryptpad" target="_blank" rel="noopener noreferrer">Twitter</a></li>
                             <li><a href="https://github.com/xwiki-labs/cryptpad" target="_blank" rel="noopener noreferrer">GitHub</a></li>
                             <li><a href="/contact.html">Email</a></li>
@@ -114,7 +114,7 @@
                     </div>
             </div>
         </div>
-            <div class="version-footer">CryptPad v1.6.0 (Grootslang)</div>
+            <div class="version-footer">CryptPad v1.6.0 (Hodag)</div>
     </footer>
 
 </body>

customize.dist/contact.html

@@ -103,7 +103,7 @@
                     <div class="col">
                         <ul class="list-unstyled">
                             <li class="title" data-localization="footer_contact"><li>
-                            <li><a href="https://riot.im/app/#/room/!cryptpad:matrix.org" target="_blank" rel="noopener noreferrer">Chat</a></li>
+                            <li><a href="https://riot.im/app/#/room/#cryptpad:matrix.org" target="_blank" rel="noopener noreferrer">Chat</a></li>
                             <li><a href="https://twitter.com/cryptpad" target="_blank" rel="noopener noreferrer">Twitter</a></li>
                             <li><a href="https://github.com/xwiki-labs/cryptpad" target="_blank" rel="noopener noreferrer">GitHub</a></li>
                             <li><a href="/contact.html">Email</a></li>
@@ -111,7 +111,7 @@
                     </div>
             </div>
         </div>
-            <div class="version-footer">CryptPad v1.6.0 (Grootslang)</div>
+            <div class="version-footer">CryptPad v1.6.0 (Hodag)</div>
     </footer>
 
 </body>

customize.dist/index.html

@@ -225,7 +225,7 @@
                     <div class="col">
                         <ul class="list-unstyled">
                             <li class="title" data-localization="footer_contact"><li>
-                            <li><a href="https://riot.im/app/#/room/!cryptpad:matrix.org" target="_blank" rel="noopener noreferrer">Chat</a></li>
+                            <li><a href="https://riot.im/app/#/room/#cryptpad:matrix.org" target="_blank" rel="noopener noreferrer">Chat</a></li>
                             <li><a href="https://twitter.com/cryptpad" target="_blank" rel="noopener noreferrer">Twitter</a></li>
                             <li><a href="https://github.com/xwiki-labs/cryptpad" target="_blank" rel="noopener noreferrer">GitHub</a></li>
                             <li><a href="/contact.html">Email</a></li>
@@ -233,7 +233,7 @@
                     </div>
             </div>
         </div>
-            <div class="version-footer">CryptPad v1.6.0 (Grootslang)</div>
+            <div class="version-footer">CryptPad v1.6.0 (Hodag)</div>
     </footer>
 
 </body>

customize.dist/privacy.html

@@ -124,7 +124,7 @@
                     <div class="col">
                         <ul class="list-unstyled">
                             <li class="title" data-localization="footer_contact"><li>
-                            <li><a href="https://riot.im/app/#/room/!cryptpad:matrix.org" target="_blank" rel="noopener noreferrer">Chat</a></li>
+                            <li><a href="https://riot.im/app/#/room/#cryptpad:matrix.org" target="_blank" rel="noopener noreferrer">Chat</a></li>
                             <li><a href="https://twitter.com/cryptpad" target="_blank" rel="noopener noreferrer">Twitter</a></li>
                             <li><a href="https://github.com/xwiki-labs/cryptpad" target="_blank" rel="noopener noreferrer">GitHub</a></li>
                             <li><a href="/contact.html">Email</a></li>
@@ -132,7 +132,7 @@
                     </div>
             </div>
         </div>
-            <div class="version-footer">CryptPad v1.6.0 (Grootslang)</div>
+            <div class="version-footer">CryptPad v1.6.0 (Hodag)</div>
     </footer>
 
 </body>

customize.dist/src/fragments/footer.html

@@ -31,7 +31,7 @@
                     <div class="col">
                         <ul class="list-unstyled">
                             <li class="title" data-localization="footer_contact"><li>
-                            <li><a href="https://riot.im/app/#/room/!cryptpad:matrix.org" target="_blank" rel="noopener noreferrer">Chat</a></li>
+                            <li><a href="https://riot.im/app/#/room/#cryptpad:matrix.org" target="_blank" rel="noopener noreferrer">Chat</a></li>
                             <li><a href="https://twitter.com/cryptpad" target="_blank" rel="noopener noreferrer">Twitter</a></li>
                             <li><a href="https://github.com/xwiki-labs/cryptpad" target="_blank" rel="noopener noreferrer">GitHub</a></li>
                             <li><a href="/contact.html">Email</a></li>
@@ -39,5 +39,5 @@
                     </div>
             </div>
         </div>
-            <div class="version-footer">CryptPad v1.6.0 (Grootslang)</div>
+            <div class="version-footer">CryptPad v1.6.0 (Hodag)</div>
     </footer>

customize.dist/terms.html

@@ -107,7 +107,7 @@
                     <div class="col">
                         <ul class="list-unstyled">
                             <li class="title" data-localization="footer_contact"><li>
-                            <li><a href="https://riot.im/app/#/room/!cryptpad:matrix.org" target="_blank" rel="noopener noreferrer">Chat</a></li>
+                            <li><a href="https://riot.im/app/#/room/#cryptpad:matrix.org" target="_blank" rel="noopener noreferrer">Chat</a></li>
                             <li><a href="https://twitter.com/cryptpad" target="_blank" rel="noopener noreferrer">Twitter</a></li>
                             <li><a href="https://github.com/xwiki-labs/cryptpad" target="_blank" rel="noopener noreferrer">GitHub</a></li>
                             <li><a href="/contact.html">Email</a></li>
@@ -115,7 +115,7 @@
                     </div>
             </div>
         </div>
-            <div class="version-footer">CryptPad v1.6.0 (Grootslang)</div>
+            <div class="version-footer">CryptPad v1.6.0 (Hodag)</div>
     </footer>
 
 </body>

rpc.js

@@ -192,8 +192,9 @@ var checkSignature = function (signedMsg, signature, publicKey) {
     return Nacl.sign.detached.verify(signedBuffer, signatureBuffer, pubBuffer);
 };
 
-var loadUserPins = function (store, Sessions, publicKey, cb) {
+var loadUserPins = function (Env, publicKey, cb) {
-    var session = beginSession(Sessions, publicKey);
+    var pinStore = Env.pinStore;
+    var session = beginSession(Env.Sessions, publicKey);
 
     if (session.channels) {
         return cb(session.channels);
@@ -210,7 +211,7 @@ var loadUserPins = function (store, Sessions, publicKey, cb) {
         pins[channel] = false;
     };
 
-    store.getMessages(publicKey, function (msg) {
+    pinStore.getMessages(publicKey, function (msg) {
         // handle messages...
         var parsed;
         try {
@@ -252,8 +253,8 @@ var truthyKeys = function (O) {
     });
 };
 
-var getChannelList = function (store, Sessions, publicKey, cb) {
+var getChannelList = function (Env, publicKey, cb) {
-    loadUserPins(store, Sessions, publicKey, function (pins) {
+    loadUserPins(Env, publicKey, function (pins) {
         cb(truthyKeys(pins));
     });
 };
@@ -263,7 +264,8 @@ var makeFilePath = function (root, id) {
     return Path.join(root, id.slice(0, 2), id);
 };
 
-var getUploadSize = function (paths, channel, cb) {
+var getUploadSize = function (Env, channel, cb) {
+    var paths = Env.paths;
     var path = makeFilePath(paths.blob, channel);
     if (!path) {
         return cb('INVALID_UPLOAD_ID');
@@ -275,28 +277,29 @@ var getUploadSize = function (paths, channel, cb) {
     });
 };
 
-var getFileSize = function (paths, msgStore, channel, cb) {
+var getFileSize = function (Env, channel, cb) {
     if (!isValidId(channel)) { return void cb('INVALID_CHAN'); }
 
     if (channel.length === 32) {
-        if (typeof(msgStore.getChannelSize) !== 'function') {
+        if (typeof(Env.msgStore.getChannelSize) !== 'function') {
             return cb('GET_CHANNEL_SIZE_UNSUPPORTED');
         }
 
-        return void msgStore.getChannelSize(channel, function (e, size) {
+        return void Env.msgStore.getChannelSize(channel, function (e, size) {
             if (e) { return void cb(e.code); }
             cb(void 0, size);
         });
     }
 
     // 'channel' refers to a file, so you need anoter API
-    getUploadSize(paths, channel, function (e, size) {
+    getUploadSize(Env, channel, function (e, size) {
         if (e) { return void cb(e); }
         cb(void 0, size);
     });
 };
 
-var getMultipleFileSize = function (paths, msgStore, channels, cb) {
+var getMultipleFileSize = function (Env, channels, cb) {
+    var msgStore = Env.msgStore;
     if (!Array.isArray(channels)) { return cb('INVALID_LIST'); }
     if (typeof(msgStore.getChannelSize) !== 'function') {
         return cb('GET_CHANNEL_SIZE_UNSUPPORTED');
@@ -311,7 +314,7 @@ var getMultipleFileSize = function (paths, msgStore, channels, cb) {
     };
 
     channels.forEach(function (channel) {
-        getFileSize(paths, msgStore, channel, function (e, size) {
+        getFileSize(Env, channel, function (e, size) {
             if (e) {
                 console.error(e);
                 counts[channel] = -1;
@@ -323,17 +326,18 @@ var getMultipleFileSize = function (paths, msgStore, channels, cb) {
     });
 };
 
-var getTotalSize = function (paths, pinStore, msgStore, Sessions, publicKey, cb) {
+var getTotalSize = function (Env, publicKey, cb) {
     var bytes = 0;
+    //var msgStore = Env.msgStore;
 
-    return void getChannelList(pinStore, Sessions, publicKey, function (channels) {
+    return void getChannelList(Env, publicKey, function (channels) {
         if (!channels) { cb('NO_ARRAY'); } // unexpected
 
         var count = channels.length;
         if (!count) { cb(void 0, 0); }
 
         channels.forEach(function (channel) {
-            getFileSize(paths, msgStore, channel, function (e, size) {
+            getFileSize(Env, channel, function (e, size) {
                 count--;
                 if (!e) { bytes += size; }
                 if (count === 0) { return cb(void 0, bytes); }
@@ -356,21 +360,113 @@ var hashChannelList = function (A) {
     return hash;
 };
 
-var getHash = function (store, Sessions, publicKey, cb) {
+var getHash = function (Env, publicKey, cb) {
-    getChannelList(store, Sessions, publicKey, function (channels) {
+    getChannelList(Env, publicKey, function (channels) {
         cb(void 0, hashChannelList(channels));
     });
 };
 
-// TODO check if new pinned size exceeds user quota
+// The limits object contains storage limits for all the publicKey that have paid
-var pinChannel = function (pinStore, Sessions, publicKey, channels, cb) {
+// To each key is associated an object containing the 'limit' value and a 'note' explaining that limit
+var limits = {};
+var updateLimits = function (config, publicKey, cb) {
+    if (typeof cb !== "function") { cb = function () {}; }
+
+    var defaultLimit = typeof(config.defaultStorageLimit) === 'number'?
+        config.defaultStorageLimit: DEFAULT_LIMIT;
+
+    var body = JSON.stringify({
+        domain: config.domain,
+        subdomain: config.subdomain
+    });
+    var options = {
+        host: 'accounts.cryptpad.fr',
+        path: '/api/getauthorized',
+        method: 'POST',
+        headers: {
+            "Content-Type": "application/json",
+            "Content-Length": Buffer.byteLength(body)
+        }
+    };
+    var req = Https.request(options, function (response) {
+        if (!('' + response.statusCode).match(/^2\d\d$/)) {
+            return void cb('SERVER ERROR ' + response.statusCode);
+        }
+        var str = '';
+
+        response.on('data', function (chunk) {
+            str += chunk;
+        });
+
+        response.on('end', function () {
+            try {
+                var json = JSON.parse(str);
+                limits = json;
+                var l;
+                if (publicKey) {
+                    var limit = limits[publicKey];
+                    l = limit && typeof limit.limit === "number" ?
+                            [limit.limit, limit.plan] : [defaultLimit, ''];
+                }
+                cb(void 0, l);
+            } catch (e) {
+                cb(e);
+            }
+        });
+    });
+
+    req.on('error', function (e) {
+        if (!config.domain) { return cb(); }
+        cb(e);
+    });
+
+    req.end(body);
+};
+
+var getLimit = function (Env, publicKey, cb) {
+    var unescapedKey = unescapeKeyCharacters(publicKey);
+    var limit = limits[unescapedKey];
+    var defaultLimit = typeof(Env.defaultStorageLimit) === 'number'?
+        Env.defaultStorageLimit: DEFAULT_LIMIT;
+
+    var toSend = limit && typeof(limit.limit) === "number"?
+        [limit.limit, limit.plan] : [defaultLimit, ''];
+
+    cb(void 0, toSend);
+};
+
+var getFreeSpace = function (Env, publicKey, cb) {
+    getLimit(Env, publicKey, function (e, limit) {
+        if (e) { return void cb(e); }
+        getTotalSize(Env, publicKey, function (e, size) {
+            if (e) { return void cb(e); }
+
+            var rem = limit[0] - size;
+            if (typeof(rem) !== 'number') {
+                return void cb('invalid_response');
+            }
+            cb(void 0, rem);
+        });
+    });
+};
+
+var sumChannelSizes = function (sizes) {
+    return Object.keys(sizes).map(function (id) { return sizes[id]; })
+        .filter(function (x) {
+            // only allow positive numbers
+            return !(typeof(x) !== 'number' || x <= 0);
+        })
+        .reduce(function (a, b) { return a + b; });
+};
+
+var pinChannel = function (Env, publicKey, channels, cb) {
     if (!channels && channels.filter) {
-        // expected array
         return void cb('[TYPE_ERROR] pin expects channel list argument');
     }
 
-    getChannelList(pinStore, Sessions, publicKey, function (pinned) {
+    // get channel list ensures your session has a cached channel list
-        var session = beginSession(Sessions, publicKey);
+    getChannelList(Env, publicKey, function (pinned) {
+        var session = beginSession(Env.Sessions, publicKey);
 
         // only pin channels which are not already pinned
         var toStore = channels.filter(function (channel) {
@@ -378,28 +474,42 @@ var pinChannel = function (pinStore, Sessions, publicKey, channels, cb) {
         });
 
         if (toStore.length === 0) {
-            return void getHash(pinStore, Sessions, publicKey, cb);
+            return void getHash(Env, publicKey, cb);
+        }
+
+        getMultipleFileSize(Env, toStore, function (e, sizes) {
+            if (e) { return void cb(e); }
+            var pinSize = sumChannelSizes(sizes);
+
+            getFreeSpace(Env, publicKey, function (e, free) {
+                if (e) {
+                    console.error(e);
+                    return void cb(e);
                 }
+                if (pinSize > free) { return void cb('E_OVER_LIMIT'); }
 
-        pinStore.message(publicKey, JSON.stringify(['PIN', toStore]),
+                Env.pinStore.message(publicKey, JSON.stringify(['PIN', toStore]),
                     function (e) {
                     if (e) { return void cb(e); }
                     toStore.forEach(function (channel) {
                         session.channels[channel] = true;
                     });
-            getHash(pinStore, Sessions, publicKey, cb);
+                    getHash(Env, publicKey, cb);
+                });
+            });
         });
     });
 };
 
-var unpinChannel = function (pinStore, Sessions, publicKey, channels, cb) {
+var unpinChannel = function (Env, publicKey, channels, cb) {
+    var pinStore = Env.pinStore;
     if (!channels && channels.filter) {
         // expected array
         return void cb('[TYPE_ERROR] unpin expects channel list argument');
     }
 
-    getChannelList(pinStore, Sessions, publicKey, function (pinned) {
+    getChannelList(Env, publicKey, function (pinned) {
-        var session = beginSession(Sessions, publicKey);
+        var session = beginSession(Env.Sessions, publicKey);
 
         // only unpin channels which are pinned
         var toStore = channels.filter(function (channel) {
@@ -407,7 +517,7 @@ var unpinChannel = function (pinStore, Sessions, publicKey, channels, cb) {
         });
 
         if (toStore.length === 0) {
-            return void getHash(pinStore, Sessions, publicKey, cb);
+            return void getHash(Env, publicKey, cb);
         }
 
         pinStore.message(publicKey, JSON.stringify(['UNPIN', toStore]),
@@ -417,17 +527,35 @@ var unpinChannel = function (pinStore, Sessions, publicKey, channels, cb) {
                 delete session.channels[channel];
             });
 
-            getHash(pinStore, Sessions, publicKey, cb);
+            getHash(Env, publicKey, cb);
         });
     });
 };
 
-// TODO check if new pinned size exceeds user quota
+var resetUserPins = function (Env, publicKey, channelList, cb) {
-var resetUserPins = function (pinStore, Sessions, publicKey, channelList, cb) {
+    if (!Array.isArray(channelList)) { return void cb('INVALID_PIN_LIST'); }
-    var session = beginSession(Sessions, publicKey);
+    var pinStore = Env.pinStore;
+    var session = beginSession(Env.Sessions, publicKey);
+
+    if (!channelList.length) {
+        return void getHash(Env, publicKey, function (e, hash) {
+            if (e) { return cb(e); }
+            cb(void 0, hash);
+        });
+    }
 
     var pins = session.channels = {};
 
+    getMultipleFileSize(Env, channelList, function (e, sizes) {
+        if (e) { return void cb(e); }
+        var pinSize = sumChannelSizes(sizes);
+
+        getFreeSpace(Env, publicKey, function (e, free) {
+            if (e) {
+                console.error(e);
+                return void cb(e);
+            }
+            if (pinSize > free) { return void(cb('E_OVER_LIMIT')); }
             pinStore.message(publicKey, JSON.stringify(['RESET', channelList]),
                 function (e) {
                 if (e) { return void cb(e); }
@@ -435,10 +563,12 @@ var resetUserPins = function (pinStore, Sessions, publicKey, channelList, cb) {
                     pins[channel] = true;
                 });
 
-        getHash(pinStore, Sessions, publicKey, function (e, hash) {
+                getHash(Env, publicKey, function (e, hash) {
                     cb(e, hash);
                 });
             });
+        });
+    });
 };
 
 var getPrivilegedUserList = function (cb) {
@@ -464,71 +594,6 @@ var isPrivilegedUser = function (publicKey, cb) {
         cb(list.indexOf(publicKey) !== -1);
     });
 };
-
-// The limits object contains storage limits for all the publicKey that have paid
-// To each key is associated an object containing the 'limit' value and a 'note' explaining that limit
-var limits = {};
-var updateLimits = function (config, publicKey, cb) {
-    if (typeof cb !== "function") { cb = function () {}; }
-
-    var body = JSON.stringify({
-        domain: config.domain,
-        subdomain: config.subdomain
-    });
-    var options = {
-        host: 'accounts.cryptpad.fr',
-        path: '/api/getauthorized',
-        method: 'POST',
-        headers: {
-            "Content-Type": "application/json",
-            "Content-Length": Buffer.byteLength(body)
-        }
-    };
-    var req = Https.request(options, function (response) {
-        if (!('' + response.statusCode).match(/^2\d\d$/)) {
-            return void cb('SERVER ERROR ' + response.statusCode);
-        }
-        var str = '';
-
-        response.on('data', function (chunk) {
-            str += chunk;
-        });
-
-        response.on('end', function () {
-            try {
-                var json = JSON.parse(str);
-                limits = json;
-                var l;
-                if (publicKey) {
-                    var limit = limits[publicKey];
-                    l = limit && typeof limit.limit === "number" ?
-                            [limit.limit, limit.plan] : [DEFAULT_LIMIT, ''];
-                }
-                cb(void 0, l);
-            } catch (e) {
-                cb(e);
-            }
-        });
-    });
-
-    req.on('error', function (e) {
-        if (!config.domain) { return cb(); }
-        cb(e);
-    });
-
-    req.end(body);
-};
-
-var getLimit = function (publicKey, cb) {
-    var unescapedKey = unescapeKeyCharacters(publicKey);
-    var limit = limits[unescapedKey];
-
-    var toSend = limit && typeof(limit.limit) === "number"?
-        [limit.limit, limit.plan] : [DEFAULT_LIMIT, ''];
-
-    cb(void 0, toSend);
-};
-
 var safeMkdir = function (path, cb) {
     Fs.mkdir(path, function (e) {
         if (!e || e.code === 'EEXIST') { return void cb(); }
@@ -556,11 +621,12 @@ var makeFileStream = function (root, id, cb) {
     });
 };
 
-var upload = function (paths, Sessions, publicKey, content, cb) {
+var upload = function (Env, publicKey, content, cb) {
+    var paths = Env.paths;
     var dec = new Buffer(Nacl.util.decodeBase64(content)); // jshint ignore:line
     var len = dec.length;
 
-    var session = beginSession(Sessions, publicKey);
+    var session = beginSession(Env.Sessions, publicKey);
 
     if (typeof(session.currentUploadSize) !== 'number') {
         // improperly initialized... maybe they didn't check before uploading?
@@ -588,7 +654,8 @@ var upload = function (paths, Sessions, publicKey, content, cb) {
     }
 };
 
-var upload_cancel = function (paths, Sessions, publicKey, cb) {
+var upload_cancel = function (Env, publicKey, cb) {
+    var paths = Env.paths;
     var path = makeFilePath(paths.staging, publicKey);
     if (!path) {
         console.log(paths.staging, publicKey);
@@ -612,8 +679,9 @@ var isFile = function (filePath, cb) {
     });
 };
 
-var upload_complete = function (paths, Sessions, publicKey, cb) {
+var upload_complete = function (Env, publicKey, cb) {
-    var session = beginSession(Sessions, publicKey);
+    var paths = Env.paths;
+    var session = beginSession(Env.Sessions, publicKey);
 
     if (session.blobstage && session.blobstage.close) {
         session.blobstage.close();
@@ -657,7 +725,10 @@ var upload_complete = function (paths, Sessions, publicKey, cb) {
     });
 };
 
-var upload_status = function (paths, pinStore, msgStore, Sessions, publicKey, filesize, cb) {
+var upload_status = function (Env, publicKey, filesize, cb) {
+    var paths = Env.paths;
+    //var msgStore = Env.msgStore;
+
     // validate that the provided size is actually a positive number
     if (typeof(filesize) !== 'number' &&
         filesize >= 0) { return void cb('E_INVALID_SIZE'); }
@@ -666,10 +737,9 @@ var upload_status = function (paths, pinStore, msgStore, Sessions, publicKey, fi
     var filePath = makeFilePath(paths.staging, publicKey);
     if (!filePath) { return void cb('E_INVALID_PATH'); }
 
-    getLimit(publicKey, function (e, limit) {
+    getFreeSpace(Env, publicKey, function (e, free) {
         if (e) { return void cb(e); }
-        getTotalSize(paths, pinStore, msgStore, Sessions, publicKey, function (e, size) {
+        if (filesize >= free) { return cb('TOO_LARGE'); }
-            if ((filesize + size) >= limit) { return cb('TOO_LARGE'); }
         isFile(filePath, function (e, yes) {
             if (e) {
                 console.error("uploadError: [%s]", e);
@@ -678,7 +748,6 @@ var upload_status = function (paths, pinStore, msgStore, Sessions, publicKey, fi
             cb(e, yes);
         });
     });
-    });
 };
 
 /*::const ConfigType = require('./config.example.js');*/
@@ -686,19 +755,22 @@ RPC.create = function (config /*:typeof(ConfigType)*/, cb /*:(?Error, ?Function)
     // load pin-store...
     console.log('loading rpc module...');
 
-    var Sessions = {};
-
     var keyOrDefaultString = function (key, def) {
         return typeof(config[key]) === 'string'? config[key]: def;
     };
 
-    var paths = {};
+    var Env = {};
+    Env.defaultStorageLimit = config.defaultStorageLimit;
+
+    Env.maxUploadSize = config.maxUploadSize || (20 * 1024 * 1024);
+
+    var Sessions = Env.Sessions = {};
+
+    var paths = Env.paths = {};
     var pinPath = paths.pin = keyOrDefaultString('pinPath', './pins');
     var blobPath = paths.blob = keyOrDefaultString('blobPath', './blob');
     var blobStagingPath = paths.staging = keyOrDefaultString('blobStagingPath', './blobstage');
 
-    var pinStore;
-
     var rpc = function (
         ctx /*:{ store: Object }*/,
         data /*:Array<Array<any>>*/,
@@ -769,47 +841,46 @@ RPC.create = function (config /*:typeof(ConfigType)*/, cb /*:(?Error, ?Function)
             Respond('E_ACCESS_DENIED');
         };
 
-        var msgStore = ctx.store;
+        if (!Env.msgStore) { Env.msgStore = ctx.store; }
 
         var handleMessage = function (privileged) {
         switch (msg[0]) {
             case 'COOKIE': return void Respond(void 0);
             case 'RESET':
-                return resetUserPins(pinStore, Sessions, safeKey, msg[1], function (e, hash) {
+                return resetUserPins(Env, safeKey, msg[1], function (e, hash) {
                     return void Respond(e, hash);
                 });
-            case 'PIN': // TODO don't pin if over the limit
+            case 'PIN':
-                // if over, send error E_OVER_LIMIT
+                return pinChannel(Env, safeKey, msg[1], function (e, hash) {
-                return pinChannel(pinStore, Sessions, safeKey, msg[1], function (e, hash) {
                     Respond(e, hash);
                 });
             case 'UNPIN':
-                return unpinChannel(pinStore, Sessions, safeKey, msg[1], function (e, hash) {
+                return unpinChannel(Env, safeKey, msg[1], function (e, hash) {
                     Respond(e, hash);
                 });
             case 'GET_HASH':
-                return void getHash(pinStore, Sessions, safeKey, function (e, hash) {
+                return void getHash(Env, safeKey, function (e, hash) {
                     Respond(e, hash);
                 });
             case 'GET_TOTAL_SIZE': // TODO cache this, since it will get called quite a bit
-                return getTotalSize(paths, pinStore, msgStore, Sessions, safeKey, function (e, size) {
+                return getTotalSize(Env, safeKey, function (e, size) {
                     if (e) { return void Respond(e); }
                     Respond(e, size);
                 });
             case 'GET_FILE_SIZE':
-                return void getFileSize(paths, msgStore, msg[1], Respond);
+                return void getFileSize(Env, msg[1], Respond);
             case 'UPDATE_LIMITS':
                 return void updateLimits(config, safeKey, function (e, limit) {
                     if (e) { return void Respond(e); }
                     Respond(void 0, limit);
                 });
             case 'GET_LIMIT':
-                return void getLimit(safeKey, function (e, limit) {
+                return void getLimit(Env, safeKey, function (e, limit) {
                     if (e) { return void Respond(e); }
                     Respond(void 0, limit);
                 });
             case 'GET_MULTIPLE_FILE_SIZE':
-                return void getMultipleFileSize(paths, msgStore, msg[1], function (e, dict) {
+                return void getMultipleFileSize(Env, msg[1], function (e, dict) {
                     if (e) { return void Respond(e); }
                     Respond(void 0, dict);
                 });
@@ -817,13 +888,13 @@ RPC.create = function (config /*:typeof(ConfigType)*/, cb /*:(?Error, ?Function)
             // restricted to privileged users...
             case 'UPLOAD':
                 if (!privileged) { return deny(); }
-                return void upload(paths, Sessions, safeKey, msg[1], function (e, len) {
+                return void upload(Env, safeKey, msg[1], function (e, len) {
                     Respond(e, len);
                 });
             case 'UPLOAD_STATUS':
                 if (!privileged) { return deny(); }
                 var filesize = msg[1];
-                return void upload_status(paths, pinStore, msgStore, Sessions, safeKey, msg[1], function (e, yes) {
+                return void upload_status(Env, safeKey, msg[1], function (e, yes) {
                     if (!e && !yes) {
                         // no pending uploads, set the new size
                         var user = beginSession(Sessions, safeKey);
@@ -834,12 +905,12 @@ RPC.create = function (config /*:typeof(ConfigType)*/, cb /*:(?Error, ?Function)
                 });
             case 'UPLOAD_COMPLETE':
                 if (!privileged) { return deny(); }
-                return void upload_complete(paths, Sessions, safeKey, function (e, hash) {
+                return void upload_complete(Env, safeKey, function (e, hash) {
                     Respond(e, hash);
                 });
             case 'UPLOAD_CANCEL':
                 if (!privileged) { return deny(); }
-                return void upload_cancel(paths, Sessions, safeKey, function (e) {
+                return void upload_cancel(Env, safeKey, function (e) {
                     Respond(e);
                 });
             default:
@@ -881,7 +952,7 @@ RPC.create = function (config /*:typeof(ConfigType)*/, cb /*:(?Error, ?Function)
     Store.create({
         filePath: pinPath,
     }, function (s) {
-        pinStore = s;
+        Env.pinStore = s;
 
         safeMkdir(blobPath, function (e) {
             if (e) { throw e; }

www/common/cryptpad-common.js

@@ -779,6 +779,21 @@ define([
         common.getPinnedUsage(todo);
     };
 
+    common.uploadComplete = function (cb) {
+        if (!pinsReady()) { return void cb('[RPC_NOT_READY]'); }
+        rpc.uploadComplete(cb);
+    };
+
+    common.uploadStatus = function (size, cb) {
+        if (!pinsReady()) { return void cb('[RPC_NOT_READY]'); }
+        rpc.uploadStatus(size, cb);
+    };
+
+    common.uploadCancel = function (cb) {
+        if (!pinsReady()) { return void cb('[RPC_NOT_READY]'); }
+        rpc.uploadCancel(cb);
+    };
+
     var LIMIT_REFRESH_RATE = 30000; // milliseconds
     common.createUsageBar = function (cb, alwaysDisplayUpgrade) {
         var todo = function (err, state, data) {

www/common/pinpad.js

@@ -144,6 +144,40 @@ define([
                 });
             };
 
+            exp.uploadComplete = function (cb) {
+                rpc.send('UPLOAD_COMPLETE', null, function (e, res) {
+                    if (e) { return void cb(e); }
+                    var id = res[0];
+                    if (typeof(id) !== 'string') {
+                        return void cb('INVALID_ID');
+                    }
+                    cb(void 0, id);
+                });
+            };
+
+            exp.uploadStatus = function (size, cb) {
+                if (typeof(size) !== 'number') {
+                    return void window.setTimeout(function () {
+                        cb('INVALID_SIZE');
+                    });
+                }
+                rpc.send('UPLOAD_STATUS', size, function (e, res) {
+                    if (e) { return void cb(e); }
+                    var pending = res[0];
+                    if (typeof(pending) !== 'boolean') {
+                        return void cb('INVALID_RESPONSE');
+                    }
+                    cb(void 0, pending);
+                });
+            };
+
+            exp.uploadCancel = function (cb) {
+                rpc.send('UPLOAD_CANCEL', void 0, function (e, res) {
+                    if (e) { return void cb(e); }
+                    cb();
+                });
+            };
+
             cb(e, exp);
         });
     };

www/file/main.js

@@ -65,9 +65,8 @@ define([
             }
 
             // if not box then done
-            Cryptpad.rpc.send('UPLOAD_COMPLETE', '', function (e, res) {
+            Cryptpad.uploadComplete(function (e, id) {
                 if (e) { return void console.error(e); }
-                var id = res[0];
                 var uri = ['', 'blob', id.slice(0,2), id].join('/');
                 console.log("encrypted blob is now available as %s", uri);
 
@@ -78,32 +77,28 @@ define([
 
                 APP.toolbar.addElement(['fileshare'], {});
 
-                // check if the uploaded file can be decrypted
+                var title = document.title = metadata.name;
-                var newU8 = FileCrypto.joinChunks(chunks);
+                myFile = blob;
-                FileCrypto.decrypt(newU8, key, function (e, res) {
+                myDataType = metadata.type;
-                    if (e) { return console.error(e); }
-                    var title = document.title = res.metadata.name;
-                    myFile = res.content;
-                    myDataType = res.metadata.type;
-
                 var defaultName = Cryptpad.getDefaultName(Cryptpad.parsePadUrl(window.location.href));
                 Title.updateTitle(title || defaultName);
                 APP.toolbar.title.show();
+                console.log(title);
                 Cryptpad.alert(Messages._getKey('upload_success', [title]));
             });
-            });
         };
 
-        Cryptpad.rpc.send('UPLOAD_STATUS', estimate, function (e, pending) {
+        Cryptpad.uploadStatus(estimate, function (e, pending) {
             if (e) {
                 console.error(e);
                 return void Cryptpad.alert(Messages.upload_serverError);
             }
 
-            if (pending[0]) {
+            if (pending) {
+                // TODO queue uploads... ?
                 return void Cryptpad.confirm(Messages.upload_uploadPending, function (yes) {
                     if (!yes) { return; }
-                    Cryptpad.rpc.send('UPLOAD_CANCEL', '', function (e, res) {
+                    Cryptpad.uploadCancel(function (e, res) {
                         if (e) { return void console.error(e); }
                         console.log(res);
                         next(again);

www/settings/index.html

@@ -97,7 +97,7 @@
                     <div class="col">
                         <ul class="list-unstyled">
                             <li class="title" data-localization="footer_contact"><li>
-                            <li><a href="https://riot.im/app/#/room/!cryptpad:matrix.org" target="_blank" rel="noopener noreferrer">Chat</a></li>
+                            <li><a href="https://riot.im/app/#/room/#cryptpad:matrix.org" target="_blank" rel="noopener noreferrer">Chat</a></li>
                             <li><a href="https://twitter.com/cryptpad" target="_blank" rel="noopener noreferrer">Twitter</a></li>
                             <li><a href="https://github.com/xwiki-labs/cryptpad" target="_blank" rel="noopener noreferrer">GitHub</a></li>
                             <li><a href="/contact.html">Email</a></li>
@@ -105,7 +105,7 @@
                     </div>
             </div>
         </div>
-            <div class="version-footer">CryptPad v1.6.0 (Grootslang)</div>
+            <div class="version-footer">CryptPad v1.6.0 (Hodag)</div>
     </footer>
 
 </body>