From c802b761c78d285f6f1ef0f3e7a1b22719ba847e Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 19 Jun 2018 11:04:39 +0200
Subject: [PATCH 1/5] Fix pads not stored in the correct folder the first time

---
 www/common/cryptpad-common.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index 001358651..5015ffa8f 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -460,7 +460,7 @@ define([
                     if (typeof(meta) === "object") {
                         meta.defaultTitle = meta.title || meta.defaultTitle;
                         delete meta.users;
-                        delete meta.title;
+                        meta.title = "";
                     }
                     val = JSON.stringify(parsed);
                 } catch (e) {
@@ -489,6 +489,13 @@ define([
         if (typeof (data.title) !== "string") { return cb('Missing title'); }
         if (data.title.trim() === "") { data.title = Hash.getDefaultName(parsed); }
 
+        if (common.initialPath) {
+            if (!data.path) {
+                data.path = common.initialPath;
+                delete common.initialPath;
+            }
+        }
+
         postMessage("SET_PAD_TITLE", data, function (obj) {
             if (obj && obj.error) {
                 console.log("unable to set pad title");
@@ -837,7 +844,7 @@ define([
                 driveEvents: rdyCfg.driveEvents
             };
             if (sessionStorage[Constants.newPadPathKey]) {
-                cfg.initialPath = sessionStorage[Constants.newPadPathKey];
+                common.initialPath = sessionStorage[Constants.newPadPathKey];
                 delete sessionStorage[Constants.newPadPathKey];
             }
             AStore.query("CONNECT", cfg, waitFor(function (data) {

From 29f577dfc68bb4186eb548825eb9026d7e8bbb8b Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 19 Jun 2018 16:59:59 +0200
Subject: [PATCH 2/5] Improve history to load it chunk by chunk

---
 .../src/less2/include/toolbar-history.less    |  72 +++--
 customize.dist/translations/messages.fr.js    |   7 +-
 customize.dist/translations/messages.js       |   8 +-
 www/common/cryptpad-common.js                 |   3 +
 www/common/outer/async-store.js               |  60 +++++
 www/common/outer/store-rpc.js                 |   1 +
 www/common/sframe-common-history.js           | 249 ++++++++++++------
 www/common/sframe-common-outer.js             |  18 ++
 www/common/sframe-protocol.js                 |   1 +
 9 files changed, 313 insertions(+), 106 deletions(-)

diff --git a/customize.dist/src/less2/include/toolbar-history.less b/customize.dist/src/less2/include/toolbar-history.less
index abf14f3ac..31da75ad1 100644
--- a/customize.dist/src/less2/include/toolbar-history.less
+++ b/customize.dist/src/less2/include/toolbar-history.less
@@ -5,23 +5,47 @@
         display: none;
         text-align: center;
         width: 100%;
+        padding: 10px 0;
+        align-items: center;
+        justify-content: center;
         * {
             font: @colortheme_app-font;
         }
-        .cp-toolbar-history-next {
-            display: inline-block;
-            vertical-align: middle;
-            margin: 20px;
+        .cp-history-filler {
+            flex: 1;
         }
-        .cp-toolbar-history-previous {
-            display: inline-block;
-            vertical-align: middle;
-            margin: 20px;
+        .cp-toolbar-history-close,
+        .cp-toolbar-history-revert {
+            background: white;
+            color: black;
+            //margin-top: 5px;
+            &:hover {
+                background-color: #e6e6e6;
+            }
+        }
+        .cp-toolbar-history-loadmore {
+            height: 100%;
+            color: black;
+            width: 25px;
+            position: absolute;
+            left: 0;
+            padding: 0;
+        }
+        .cp-toolbar-history-version {
+            position: absolute;
+            height: 25px;
+            line-height: 25px;
+            width: 100%;
+            text-align: center;
         }
         .cp-toolbar-history-goto {
             display: inline-block;
             vertical-align: middle;
             text-align: center;
+            flex: 1;
+            flex-basis: 80%;
+            min-width: 0;
+            max-width: 600px;
             input { width: 75px; }
         }
         .cp-toolbar-history-goto-input {
@@ -29,6 +53,30 @@
             margin-left: 5px;
             vertical-align: middle;
         }
+        .cp-toolbar-history-bar {
+            width: 100%;
+            background: white;
+            height: 25px;
+            margin: auto;
+            position: relative;
+        }
+        .cp-toolbar-history-pos-container {
+            width: ~"calc(100% - 2px)";
+            height: 25px;
+            position: relative;
+        }
+        @pos-color: #55FF55;
+        .cp-toolbar-history-pos {
+            width: 2px;
+            height: 25px;
+            background: @pos-color;
+            &:after {
+                content: '';
+                border: 6px solid transparent;
+                border-top-color: @pos-color;
+                margin-left: -5px;
+            }
+        }
         button {
             color: inherit;
             background-color: rgba(0,0,0,0.2);
@@ -36,14 +84,6 @@
                 background-color: rgba(0,0,0,0.4);
             }
         }
-        .cp-toolbar-history-close {
-            background: white;
-            color: black;
-            margin-top: 5px;
-            &:hover {
-                background-color: #e6e6e6;
-            }
-        }
         .fa-spinner {
             font-size: 66px;
         }
diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js
index 838dfcd2b..a936f592c 100644
--- a/customize.dist/translations/messages.fr.js
+++ b/customize.dist/translations/messages.fr.js
@@ -232,12 +232,11 @@ define(function () {
 
     out.historyText = "Historique";
     out.historyButton = "Afficher l'historique du document";
-    out.history_next = "Voir la version suivante";
-    out.history_prev = "Voir la version précédente";
-    out.history_goTo = "Voir la version sélectionnée";
+    out.history_next = "Version plus récente";
+    out.history_prev = "Version plus ancienne";
+    out.history_loadMore = "Charger davantage d'historique";
     out.history_close = "Retour";
     out.history_closeTitle = "Fermer l'historique";
-    out.history_restore = "Restaurer";
     out.history_restoreTitle = "Restaurer la version du document sélectionnée";
     out.history_restorePrompt = "Êtes-vous sûr de vouloir remplacer la version actuelle du document par la version affichée ?";
     out.history_restoreDone = "Document restauré";
diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index 16e837a35..65ade7f7f 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -234,12 +234,10 @@ define(function () {
 
     out.historyText = "History";
     out.historyButton = "Display the document history";
-    out.history_next = "Go to the next version";
-    out.history_prev = "Go to the previous version";
-    out.history_goTo = "Go to the selected version";
-    out.history_close = "Back";
+    out.history_next = "Newer version";
+    out.history_prev = "Older version";
+    out.history_loadMore = "Load more history";
     out.history_closeTitle = "Close the history";
-    out.history_restore = "Restore";
     out.history_restoreTitle = "Restore the selected version of the document";
     out.history_restorePrompt = "Are you sure you want to replace the current version of the document by the displayed one?";
     out.history_restoreDone = "Document restored";
diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index b3f3edb63..89b46e03f 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -692,6 +692,9 @@ define([
     common.getFullHistory = function (data, cb) {
         postMessage("GET_FULL_HISTORY", data, cb);
     };
+    common.getHistoryRange = function (data, cb) {
+        postMessage("GET_HISTORY_RANGE", data, cb);
+    };
 
     common.getShareHashes = function (secret, cb) {
         var hashes;
diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js
index e703b6a5b..53b84f395 100644
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@@ -1101,10 +1101,13 @@ define([
                 }
             };
             var msgs = [];
+            var completed = false;
             var onMsg = function (msg) {
+                if (completed) { return; }
                 var parsed = parse(msg);
                 if (parsed[0] === 'FULL_HISTORY_END') {
                     cb(msgs);
+                    completed = true;
                     return;
                 }
                 if (parsed[0] !== 'FULL_HISTORY') { return; }
@@ -1123,6 +1126,63 @@ define([
             network.sendto(hkn, JSON.stringify(['GET_FULL_HISTORY', data.channel, data.validateKey]));
         };
 
+        Store.getHistoryRange = function (clientId, data, cb) {
+            var network = store.network;
+            var hkn = network.historyKeeper;
+            var parse = function (msg) {
+                try {
+                    return JSON.parse(msg);
+                } catch (e) {
+                    return null;
+                }
+            };
+            var msgs = [];
+            var first = true;
+            var fullHistory = false;
+            var completed = false;
+            var lastKnownHash;
+            var txid = Util.uid();
+
+            var onMsg = function (msg) {
+                if (completed) { return; }
+                var parsed = parse(msg);
+                if (parsed[1] !== txid) { console.log('bad txid'); return; }
+                if (parsed[0] === 'HISTORY_RANGE_END') {
+                    cb({
+                        messages: msgs,
+                        isFull: fullHistory,
+                        lastKnownHash: lastKnownHash
+                    });
+                    completed = true;
+                    return;
+                }
+                if (parsed[0] !== 'HISTORY_RANGE') { return; }
+                if (parsed[2] && parsed[1].validateKey) { // Metadata
+                    return;
+                }
+                if (parsed[2][3] !== data.channel) { return; }
+                msg = parsed[2][4];
+                if (msg) {
+                    if (first) {
+                        // If the first message if not a checkpoint, it means it is the first
+                        // message of the pad, so we have the full history!
+                        if (!/^cp\|/.test(msg)) { fullHistory = true; }
+                        lastKnownHash = msg.slice(0,64);
+                        first = false;
+                    }
+                    msg = msg.replace(/cp\|(([A-Za-z0-9+\/=]+)\|)?/, '');
+                    msgs.push(msg);
+                }
+            };
+
+            network.on('message', onMsg);
+            network.sendto(hkn, JSON.stringify(['GET_HISTORY_RANGE', data.channel, {
+                from: data.lastKnownHash,
+                cpCount: 2,
+                txid: txid
+            }]));
+        };
+
         // Drive
         Store.userObjectCommand = function (clientId, cmdData, cb) {
             if (!cmdData || !cmdData.cmd) { return; }
diff --git a/www/common/outer/store-rpc.js b/www/common/outer/store-rpc.js
index a2b7d2404..972776abe 100644
--- a/www/common/outer/store-rpc.js
+++ b/www/common/outer/store-rpc.js
@@ -70,6 +70,7 @@ define([
             JOIN_PAD: Store.joinPad,
             LEAVE_PAD: Store.leavePad,
             GET_FULL_HISTORY: Store.getFullHistory,
+            GET_HISTORY_RANGE: Store.getHistoryRange,
             IS_NEW_CHANNEL: Store.isNewChannel,
             // Drive
             DRIVE_USEROBJECT: Store.userObjectCommand,
diff --git a/www/common/sframe-common-history.js b/www/common/sframe-common-history.js
index 27503d07a..efaa01cc1 100644
--- a/www/common/sframe-common-history.js
+++ b/www/common/sframe-common-history.js
@@ -1,26 +1,36 @@
 define([
     'jquery',
     '/common/common-interface.js',
+    '/bower_components/nthen/index.js',
     //'/bower_components/chainpad-json-validator/json-ot.js',
 
     '/bower_components/chainpad/chainpad.dist.js',
-], function ($, UI, ChainPad /* JsonOT */) {
+], function ($, UI, nThen, ChainPad /* JsonOT */) {
     //var ChainPad = window.ChainPad;
     var History = {};
 
-    var getStates = function (rt) {
-        var states = [];
-        var b = rt.getAuthBlock();
-        if (b) { states.unshift(b); }
-        while (b.getParent()) {
-            b = b.getParent();
-            states.unshift(b);
+    History.create = function (common, config) {
+        if (!config.$toolbar) { return void console.error("config.$toolbar is undefined");}
+        if (History.loading) { return void console.error("History is already being loaded..."); }
+        History.loading = true;
+        var $toolbar = config.$toolbar;
+
+        if (!config.applyVal || !config.setHistory || !config.onLocal || !config.onRemote) {
+            throw new Error("Missing config element: applyVal, onLocal, onRemote, setHistory");
         }
-        return states;
-    };
 
-    var loadHistory = function (config, common, cb) {
-        var createRealtime = function () {
+        var getStates = function (rt) {
+            var states = [];
+            var b = rt.getAuthBlock();
+            if (b) { states.unshift(b); }
+            while (b.getParent()) {
+                b = b.getParent();
+                states.unshift(b);
+            }
+            return states;
+        };
+
+        var createRealtime = function (config) {
             return ChainPad.create({
                 userName: 'history',
                 validateContent: function (content) {
@@ -33,36 +43,45 @@ define([
                     }
                 },
                 initialState: '',
-                //patchTransformer: ChainPad.NaiveJSONTransformer,
-                //logLevel: 0,
-                //transformFunction: JsonOT.validate,
                 logLevel: config.debug ? 2 : 0,
                 noPrune: true
             });
         };
-        var realtime = createRealtime();
-
-        History.readOnly = common.getMetadataMgr().getPrivateData().readOnly;
-
-        /*var to = window.setTimeout(function () {
-            cb('[GET_FULL_HISTORY_TIMEOUT]');
-        }, 30000);*/
 
-        common.getFullHistory(realtime, function () {
-            //window.clearTimeout(to);
-            cb(null, realtime);
-        });
-    };
+        var loadFullHistory = function (config, common, cb) {
+            var realtime = createRealtime(config);
+            common.getFullHistory(realtime, function () {
+                cb(null, realtime);
+            });
+        };
+        loadFullHistory = loadFullHistory;
 
-    History.create = function (common, config) {
-        if (!config.$toolbar) { return void console.error("config.$toolbar is undefined");}
-        if (History.loading) { return void console.error("History is already being loaded..."); }
-        History.loading = true;
-        var $toolbar = config.$toolbar;
+        var fillChainPad = function (realtime, messages) {
+            messages.forEach(function (m) {
+                realtime.message(m);
+            });
+        };
 
-        if (!config.applyVal || !config.setHistory || !config.onLocal || !config.onRemote) {
-            throw new Error("Missing config element: applyVal, onLocal, onRemote, setHistory");
-        }
+        var allMessages = [];
+        var lastKnownHash;
+        var isComplete = false;
+        var loadMoreHistory = function (config, common, cb) {
+            if (isComplete) { return void cb ('EFULL'); }
+            var realtime = createRealtime(config);
+            var sframeChan = common.getSframeChannel();
+
+            sframeChan.query('Q_GET_HISTORY_RANGE', {
+                lastKnownHash: lastKnownHash
+            }, function (err, data) {
+                if (err) { return void console.error(err); }
+                if (!Array.isArray(data.messages)) { return void console.error('Not an array!'); }
+                lastKnownHash = data.lastKnownHash;
+                isComplete = data.isFull;
+                Array.prototype.unshift.apply(allMessages, data.messages); // Destructive concat
+                fillChainPad(realtime, allMessages);
+                cb (null, realtime);
+            });
+        };
 
         // config.setHistory(bool, bool)
         // - bool1: history value
@@ -84,21 +103,20 @@ define([
         };
 
         config.setHistory(true);
-        var onReady = function () { };
 
         var Messages = common.Messages;
 
         var realtime;
 
         var states = [];
-        var c = states.length - 1;
+        var c = 0;//states.length - 1;
 
         var $hist = $toolbar.find('.cp-toolbar-history');
         var $left = $toolbar.find('.cp-toolbar-leftside');
         var $right = $toolbar.find('.cp-toolbar-rightside');
         var $cke = $toolbar.find('.cke_toolbox_main');
 
-        $hist.html('').show();
+        $hist.html('').css('display', 'flex');
         $left.hide();
         $right.hide();
         $cke.hide();
@@ -107,29 +125,73 @@ define([
 
         var onUpdate;
 
-        var update = function () {
+        var update = function (newRt) {
+            realtime = newRt;
             if (!realtime) { return []; }
             states = getStates(realtime);
             if (typeof onUpdate === "function") { onUpdate(); }
             return states;
         };
 
+        var $loadMore, $version, get;
+
         // Get the content of the selected version, and change the version number
-        var get = function (i) {
+        var loading = false;
+        var loadMore = function (cb) {
+            if (loading) { return; }
+            loading = true;
+            $loadMore.removeClass('fa fa-ellipsis-h')
+                .append($('<span>', {'class': 'fa fa-refresh fa-spin fa-3x fa-fw'}));
+            loadMoreHistory(config, common, function (err, newRt) {
+                if (err === 'EFULL') {
+                    $loadMore.off('click').hide();
+                    get(c);
+                    $version.show();
+                    return;
+                }
+                loading = false;
+                if (err) { return void console.error(err); }
+                update(newRt);
+                $loadMore.addClass('fa fa-ellipsis-h').html('');
+                get(c);
+                if (cb) { cb(); }
+            });
+        };
+        get = function (i) {
             i = parseInt(i);
             if (isNaN(i)) { return; }
-            if (i < 0) { i = 0; }
-            if (i > states.length - 1) { i = states.length - 1; }
-            var val = states[i].getContent().doc;
+            if (i > 0) { i = 0; }
+            if (i < -(states.length - 2)) { i = -(states.length - 2); }
+            if (i <= -(states.length - 11)) {
+                loadMore();
+            }
+            var idx = states.length - 1 + i;
+            var val = states[idx].getContent().doc;
             c = i;
             if (typeof onUpdate === "function") { onUpdate(); }
-            $hist.find('.cp-toolbar-history-next, .cp-toolbar-history-previous').css('visibility', '');
-            if (c === states.length - 1) { $hist.find('.cp-toolbar-history-next').css('visibility', 'hidden'); }
-            if (c === 0) { $hist.find('.cp-toolbar-history-previous').css('visibility', 'hidden'); }
+            $hist.find('.cp-toolbar-history-next, .cp-toolbar-history-previous, ' +
+                       '.cp-toolbar-history-fast-next, .cp-toolbar-history-fast-previous')
+                .css('visibility', '');
+            if (c === -(states.length-1)) {
+                $hist.find('.cp-toolbar-history-previous').css('visibility', 'hidden');
+                $hist.find('.cp-toolbar-history-fast-previous').css('visibility', 'hidden');
+            }
+            if (c === 0) {
+                $hist.find('.cp-toolbar-history-next').css('visibility', 'hidden');
+                $hist.find('.cp-toolbar-history-fast-next').css('visibility', 'hidden');
+            }
+            var $pos = $hist.find('.cp-toolbar-history-pos');
+            var p = 100 * (1 - (-c / (states.length-1)));
+            $pos.css('margin-left', p+'%');
+
+            // Display the version when the full history is loaded
+            // Note: the first version is always empty and probably can't be displayed, so
+            // we can consider we have only states.length - 1 versions
+            $version.text(idx + ' / ' + (states.length-1));
 
             if (config.debug) {
-                console.log(states[i]);
-                var ops = states[i] && states[i].getPatch() && states[i].getPatch().operations;
+                console.log(states[idx]);
+                var ops = states[idx] && states[idx].getPatch() && states[idx].getPatch().operations;
                 if (Array.isArray(ops)) {
                     ops.forEach(function (op) { console.log(op); });
                 }
@@ -148,6 +210,17 @@ define([
         // Create the history toolbar
         var display = function () {
             $hist.html('');
+
+            var $rev = $('<button>', {
+                'class':'cp-toolbar-history-revert buttonSuccess fa fa-check-circle-o',
+                title: Messages.history_restoreTitle
+            }).appendTo($hist);//.text(Messages.history_restore);
+            if (History.readOnly) { $rev.css('visibility', 'hidden'); }
+            $('<span>', {'class': 'cp-history-filler'}).appendTo($hist);
+            var $fastPrev = $('<button>', {
+                'class': 'cp-toolbar-history-fast-previous fa fa-fast-backward buttonPrimary',
+                title: Messages.history_prev
+            }).appendTo($hist);
             var $prev =$('<button>', {
                 'class': 'cp-toolbar-history-previous fa fa-step-backward buttonPrimary',
                 title: Messages.history_prev
@@ -157,58 +230,73 @@ define([
                 'class': 'cp-toolbar-history-next fa fa-step-forward buttonPrimary',
                 title: Messages.history_next
             }).appendTo($hist);
+            var $fastNext = $('<button>', {
+                'class': 'cp-toolbar-history-fast-next fa fa-fast-forward buttonPrimary',
+                title: Messages.history_next
+            }).appendTo($hist);
+            $('<span>', {'class': 'cp-history-filler'}).appendTo($hist);
+            var $close = $('<button>', {
+                'class':'cp-toolbar-history-close fa fa-window-close',
+                title: Messages.history_closeTitle
+            }).appendTo($hist);
+
+            var $bar = $('<div>', {'class': 'cp-toolbar-history-bar'}).appendTo($nav);
+            var $container = $('<div>', {'class':'cp-toolbar-history-pos-container'}).appendTo($bar);
+            $('<div>', {'class': 'cp-toolbar-history-pos'}).appendTo($container);
+
+            $version = $('<span>', {
+                'class': 'cp-toolbar-history-version'
+            }).prependTo($bar).hide();
+            $loadMore = $('<button>', {
+                'class':'cp-toolbar-history-loadmore fa fa-ellipsis-h',
+                title: Messages.history_loadMore
+            }).click(function () {
+                loadMore(function () {
+                    get(c);
+                });
+            }).prependTo($container);
 
-            $('<label>').text(Messages.history_version).appendTo($nav);
-            var $cur = $('<input>', {
-                'class' : 'cp-toolbar-history-goto-input',
-                'type' : 'number',
-                'min' : '1',
-                'max' : states.length
-            }).val(c + 1).appendTo($nav).mousedown(function (e) {
-                // stopPropagation because the event would be cancelled by the dropdown menus
+            // Load a version when clicking on the bar
+            $container.click(function (e) {
                 e.stopPropagation();
+                if (!$(e.target).is('.cp-toolbar-history-pos-container')) { return; }
+                var p = e.offsetX / $container.width();
+                var v = -Math.round((states.length - 1) * (1 - p));
+                render(get(v));
             });
-            var $label2 = $('<label>').text(' / '+ states.length).appendTo($nav);
-            $('<br>').appendTo($nav);
-            var $close = $('<button>', {
-                'class':'cp-toolbar-history-close',
-                title: Messages.history_closeTitle
-            }).text(Messages.history_closeTitle).appendTo($nav);
-            var $rev = $('<button>', {
-                'class':'cp-toolbar-history-revert buttonSuccess',
-                title: Messages.history_restoreTitle
-            }).text(Messages.history_restore).appendTo($nav);
-            if (History.readOnly) { $rev.hide(); }
 
             onUpdate = function () {
-                $cur.attr('max', states.length);
-                $cur.val(c+1);
-                $label2.text(' / ' + states.length);
+                // Called when a new version is loaded
             };
 
+            var onKeyDown, onKeyUp;
             var close = function () {
                 $hist.hide();
                 $left.show();
                 $right.show();
                 $cke.show();
                 $(window).trigger('resize');
+                $(window).off('keydown', onKeyDown);
+                $(window).off('keyup', onKeyUp);
             };
 
-            // Buttons actions
+            // Version buttons
             $prev.click(function () { render(getPrevious()); });
             $next.click(function () { render(getNext()); });
-            $cur.keydown(function (e) {
+            $fastPrev.click(function () { render(getPrevious(10)); });
+            $fastNext.click(function () { render(getNext(10)); });
+            onKeyDown = function (e) {
                 var p = function () { e.preventDefault(); };
-                if (e.which === 13) { p(); return render( get($cur.val() - 1) ); } // Enter
                 if ([37, 40].indexOf(e.which) >= 0) { p(); return render(getPrevious()); } // Left
                 if ([38, 39].indexOf(e.which) >= 0) { p(); return render(getNext()); } // Right
                 if (e.which === 33) { p(); return render(getNext(10)); } // PageUp
                 if (e.which === 34) { p(); return render(getPrevious(10)); } // PageUp
                 if (e.which === 27) { p(); $close.click(); }
-            }).keyup(function (e) { e.stopPropagation(); }).focus();
-            $cur.on('change', function () {
-                render( get($cur.val() - 1) );
-            });
+            };
+            onKeyUp = function (e) { e.stopPropagation(); };
+            $(window).on('keydown', onKeyDown).on('keyup', onKeyUp).focus();
+
+            // Close & restore buttons
             $close.click(function () {
                 states = [];
                 close();
@@ -229,14 +317,13 @@ define([
         };
 
         // Load all the history messages into a new chainpad object
-        loadHistory(config, common, function (err, newRt) {
+        loadMoreHistory(config, common, function (err, newRt) {
+            History.readOnly = common.getMetadataMgr().getPrivateData().readOnly;
             History.loading = false;
             if (err) { throw new Error(err); }
-            realtime = newRt;
-            update();
+            update(newRt);
             c = states.length - 1;
             display();
-            onReady();
         });
     };
 
diff --git a/www/common/sframe-common-outer.js b/www/common/sframe-common-outer.js
index 79f9c45a7..8b30aa2e2 100644
--- a/www/common/sframe-common-outer.js
+++ b/www/common/sframe-common-outer.js
@@ -420,6 +420,24 @@ define([
                     }));
                 });
             });
+            sframeChan.on('Q_GET_HISTORY_RANGE', function (data, cb) {
+                var crypto = Crypto.createEncryptor(secret.keys);
+                Cryptpad.getHistoryRange({
+                    channel: secret.channel,
+                    validateKey: secret.keys.validateKey,
+                    lastKnownHash: data.lastKnownHash
+                }, function (data) {
+                    cb({
+                        isFull: data.isFull,
+                        messages: data.messages.map(function (msg) {
+                            // The 3rd parameter "true" means we're going to skip signature validation.
+                            // We don't need it since the message is already validated serverside by hk
+                            return crypto.decrypt(msg, true, true);
+                        }),
+                        lastKnownHash: data.lastKnownHash
+                    });
+                });
+            });
 
             sframeChan.on('Q_GET_PAD_ATTRIBUTE', function (data, cb) {
                 var href;
diff --git a/www/common/sframe-protocol.js b/www/common/sframe-protocol.js
index a75936af5..a23124a65 100644
--- a/www/common/sframe-protocol.js
+++ b/www/common/sframe-protocol.js
@@ -87,6 +87,7 @@ define({
     // Request the full history from the server when the users clicks on the history button.
     // Callback is called when the FULL_HISTORY_END message is received in the outside.
     'Q_GET_FULL_HISTORY': true,
+    'Q_GET_HISTORY_RANGE': true,
     // When a (full) history message is received from the server.
     'EV_RT_HIST_MESSAGE': true,
 

From 3ba0ad3cf1c42f7714d008e419f7a7fd2bf9b79c Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 19 Jun 2018 18:08:14 +0200
Subject: [PATCH 3/5] get, set, and clear blocks from localStorage

---
 www/common/common-constants.js  | 1 +
 www/common/outer/local-store.js | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/www/common/common-constants.js b/www/common/common-constants.js
index 494267ed3..ce96bb66b 100644
--- a/www/common/common-constants.js
+++ b/www/common/common-constants.js
@@ -3,6 +3,7 @@ define(function () {
         // localStorage
         userHashKey: 'User_hash',
         userNameKey: 'User_name',
+        blockHashKey: 'Block_hash',
         fileHashKey: 'FS_hash',
         // sessionStorage
         newPadPathKey: "newPadPath",
diff --git a/www/common/outer/local-store.js b/www/common/outer/local-store.js
index a40a3e6f5..28f94b62b 100644
--- a/www/common/outer/local-store.js
+++ b/www/common/outer/local-store.js
@@ -58,6 +58,14 @@ define([
         localStorage[Constants.userHashKey] = sHash;
     };
 
+    LocalStore.getBlockHash = function () {
+        return localStorage[Constants.blockHashKey];
+    };
+
+    LocalStore.setBlockHash = function (hash) {
+        LocalStorage[Constants.blockHashKey] = hash;
+    };
+
     LocalStore.getAccountName = function () {
         return localStorage[Constants.userNameKey];
     };
@@ -96,6 +104,7 @@ define([
         [
             Constants.userNameKey,
             Constants.userHashKey,
+            Constants.blockHashKey,
             'loginToken',
             'plan',
         ].forEach(function (k) {

From a5b207d57b19141e1eafd16b45254f4a7fb0ca0f Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 20 Jun 2018 10:02:56 +0200
Subject: [PATCH 4/5] Password change UI

---
 .../src/less2/include/sidebar-layout.less     |  4 +-
 customize.dist/translations/messages.js       |  9 +++
 www/settings/app-settings.less                |  9 +++
 www/settings/inner.js                         | 73 ++++++++++++++++++-
 4 files changed, 90 insertions(+), 5 deletions(-)

diff --git a/customize.dist/src/less2/include/sidebar-layout.less b/customize.dist/src/less2/include/sidebar-layout.less
index 5640e014b..ef6e1189a 100644
--- a/customize.dist/src/less2/include/sidebar-layout.less
+++ b/customize.dist/src/less2/include/sidebar-layout.less
@@ -10,7 +10,7 @@
 
 
 .sidebar-layout_main() {
-    input[type="text"] {
+    input[type="text"], input[type="password"] {
         padding-left: 10px;
     }
     #cp-sidebarlayout-container {
@@ -60,7 +60,7 @@
                 }
                 margin-bottom: 20px;
             }
-            [type="text"], button {
+            [type="text"], [type="password"], button {
                 vertical-align: middle;
                 height: 40px;
                 box-sizing: border-box;
diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index 65ade7f7f..008d53217 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -600,6 +600,15 @@ define(function () {
     out.settings_templateSkip = "Skip the template selection modal";
     out.settings_templateSkipHint = "When you create a new empty pad, if you have stored templates for this type of pad, a modal appears to ask if you want to use a template. Here you can choose to never show this modal and so to never use a template.";
 
+    out.settings_changePasswordTitle = "Change your password"; // XXX
+    out.settings_changePasswordHint = "Change your account's password without losing its data. You have to enter your existing password once, and the new password you want twice.<br>" +
+                                      "<b>We can't reset your password if you forget it so be very careful!</b>"; // XXX
+    out.settings_changePasswordButton = "Change password"; // XXX
+    out.settings_changePasswordCurrent = "Existing password"; // XXX
+    out.settings_changePasswordNew = "New password"; // XXX
+    out.settings_changePasswordNewConfirm = "Confirm new password"; // XXX
+    out.settings_changePasswordConfirm = "Are you sure?"; // XXX
+
     out.upload_title = "File upload";
     out.upload_modal_title = "File upload options";
     out.upload_modal_filename = "File name (extension <em>{0}</em> added automatically)";
diff --git a/www/settings/app-settings.less b/www/settings/app-settings.less
index a47dd88f6..2cfd48a65 100644
--- a/www/settings/app-settings.less
+++ b/www/settings/app-settings.less
@@ -55,6 +55,15 @@
                     width: @sidebar_button-width;
                 }
             }
+            .cp-settings-change-password {
+                [type="password"], [type="text"] {
+                    width: @sidebar_button-width;
+                    flex: unset;
+                }
+                button {
+                    margin-top: 5px;
+                }
+            }
             .cp-settings-drive-backup {
                 button {
                     span.fa {
diff --git a/www/settings/inner.js b/www/settings/inner.js
index acfa8bafd..07bb4f390 100644
--- a/www/settings/inner.js
+++ b/www/settings/inner.js
@@ -9,6 +9,7 @@ define([
     '/common/common-hash.js',
     '/customize/messages.js',
     '/common/hyperscript.js',
+    '/customize/credential.js',
     '/customize/application_config.js',
     '/api/config',
 
@@ -27,6 +28,7 @@ define([
     Hash,
     Messages,
     h,
+    Cred,
     AppConfig,
     ApiConfig
     )
@@ -375,22 +377,87 @@ define([
 
         var $div = $('<div>', { 'class': 'cp-settings-change-password cp-sidebarlayout-element'});
 
-        $('<span>', {'class': 'label'}).text("TODO Change your password").appendTo($div); // XXX
+        $('<span>', {'class': 'label'}).text(Messages.settings_changePasswordTitle).appendTo($div);
 
         $('<span>', {'class': 'cp-sidebarlayout-description'})
-            .append("TODO").appendTo($div); // XXX
+            .append(Messages.settings_changePasswordHint).appendTo($div);
 
         // var publicKey = privateData.edPublic;
 
+        var form = h('div', [
+            UI.passwordInput({
+                id: 'cp-settings-change-password-current',
+                placeholder: Messages.settings_changePasswordCurrent
+            }, true),
+            h('br'),
+            UI.passwordInput({
+                id: 'cp-settings-change-password-new',
+                placeholder: Messages.settings_changePasswordNew
+            }, true),
+            UI.passwordInput({
+                id: 'cp-settings-change-password-new2',
+                placeholder: Messages.settings_changePasswordNewConfirm
+            }, true),
+            h('button.btn.btn-primary', Messages.settings_changePasswordButton)
+        ]);
+
+        $(form).appendTo($div);
+
         var updateBlock = function (data, cb) {
             sframeChan.query('Q_WRITE_LOGIN_BLOCK', data, function (err, obj) {
                 if (err || obj.error) { return void cb ({error: err || obj.error}); }
                 cb (obj);
             });
         };
-
         updateBlock = updateBlock; // jshint..
 
+        var todo = function () {
+            var oldPassword = $(form).find('#cp-settings-change-password-current').val();
+            var newPassword = $(form).find('#cp-settings-change-password-new').val();
+            var newPasswordConfirm = $(form).find('#cp-settings-change-password-new2').val();
+
+            /* basic validation */
+            if (!Cred.isLongEnoughPassword(newPassword)) {
+                var warning = Messages._getKey('register_passwordTooShort', [
+                    Cred.MINIMUM_PASSWORD_LENGTH
+                ]);
+                return void UI.alert(warning);
+            }
+
+            if (newPassword !== newPasswordConfirm) {
+                UI.alert(Messages.register_passwordsDontMatch);
+                return;
+            }
+
+            UI.confirm(Messages.settings_changePasswordConfirm,
+            function (yes) {
+                if (!yes) { return; }
+                // TODO
+                console.log(oldPassword, newPassword, newPasswordConfirm);
+            }, {
+                ok: Messages.register_writtenPassword,
+                cancel: Messages.register_cancel,
+                cancelClass: 'safe',
+                okClass: 'danger',
+                reverseOrder: true,
+                done: function ($dialog) {
+                    $dialog.find('> div').addClass('half');
+                },
+            }, true);
+        };
+
+        $(form).find('button').click(function () {
+            todo();
+        });
+        $(form).find('input').keydown(function (e) {
+            // Save on Enter
+            if (e.which === 13) {
+                e.preventDefault();
+                e.stopPropagation();
+                todo();
+            }
+        });
+
         return $div;
     };
 

From d03339f20bb651c682047e29e3f8eaaba279b4f1 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Wed, 20 Jun 2018 14:27:44 +0200
Subject: [PATCH 5/5] check for the presence of a blockHash in localStorage
 when logging in

---
 rpc.js                          |  3 +--
 www/assert/main.js              | 15 ++++++++++++
 www/common/common-hash.js       | 37 +++++++++++++++++++++++++++++
 www/common/common-util.js       |  8 +++----
 www/common/cryptpad-common.js   | 42 ++++++++++++++++++++++++++++++++-
 www/common/outer/login-block.js | 31 ++++++++++++++++++++----
 www/settings/inner.js           | 35 +++++++++++++++++++++++++--
 7 files changed, 157 insertions(+), 14 deletions(-)

diff --git a/rpc.js b/rpc.js
index d10fe6149..5f6288805 100644
--- a/rpc.js
+++ b/rpc.js
@@ -1380,8 +1380,7 @@ var createLoginBlockPath = function (Env, publicKey) {
 };
 
 var writeLoginBlock = function (Env, msg, cb) {
-    console.log(msg); // XXX
-
+    //console.log(msg);
     var publicKey = msg[0];
     var signature = msg[1];
     var block = msg[2];
diff --git a/www/assert/main.js b/www/assert/main.js
index 4ff862511..a6a82e421 100644
--- a/www/assert/main.js
+++ b/www/assert/main.js
@@ -10,9 +10,12 @@ define([
     '/common/wire.js',
     '/common/flat-dom.js',
     '/common/media-tag.js',
+
+    '/bower_components/tweetnacl/nacl-fast.min.js',
 ], function ($, Hyperjson, Sortify, Drive, Test, Hash, Util, Thumb, Wire, Flat, MediaTag) {
     window.Hyperjson = Hyperjson;
     window.Sortify = Sortify;
+    var Nacl = window.nacl;
 
     var assertions = 0;
     var failed = false;
@@ -296,6 +299,18 @@ define([
             !secret.hashData.present);
     }, "test support for ugly tracking query paramaters in url");
 
+    assert(function (cb) {
+        var href = 'https://cryptpad.fr/block/pe/pewpewpewpewpew';
+        var key = Nacl.randomBytes(32);
+
+        var hash = Hash.createBlockHash(href, key);
+
+        var parsed = Hash.parseBlockHash(hash);
+
+        cb(parsed && href === parsed.href &&
+            parsed.keys.symmetric.length === key.length);
+    }, 'parse a block hash');
+
     assert(function (cb) {
         try {
             MediaTag(void 0).on('progress').on('decryption');
diff --git a/www/common/common-hash.js b/www/common/common-hash.js
index 4b0c2c607..e283d2525 100644
--- a/www/common/common-hash.js
+++ b/www/common/common-hash.js
@@ -474,6 +474,43 @@ Version 1
             '/' + curvePublic.replace(/\//g, '-') + '/';
     };
 
+    // XXX consider putting Block functions in /common/outer/login-block.js
+    Hash.createBlockHash = function (href, key) {
+        if (typeof(href) !== 'string') { return; }
+        if (!key instanceof Uint8Array) { return; }
+
+        // TODO verify inputs
+        try { return href + '#' + Nacl.util.encodeBase64(key); }
+        catch (e) { return; }
+    };
+
+    var decodeSafeB64 = function (b64) {
+        try {
+            return Nacl.util.decodeBase64(b64.replace(/\-/g, '/'));
+        } catch (e) {
+            console.error(e);
+            return;
+        }
+    };
+
+    Hash.parseBlockHash = function (hash) {
+        if (typeof(hash) !== 'string') { return; }
+        var parts = hash.split('#');
+        if (parts.length !== 2) { return; }
+
+        try {
+            return {
+                href: parts[0],
+                keys: {
+                    symmetric: decodeSafeB64(parts[1]),
+                }
+            };
+        } catch (e) {
+            console.error(e);
+            return;
+        }
+    };
+
     // Create untitled documents when no name is given
     var getLocaleDate = function () {
         if (window.Intl && window.Intl.DateTimeFormat) {
diff --git a/www/common/common-util.js b/www/common/common-util.js
index 2a30133e9..cc56cd0d5 100644
--- a/www/common/common-util.js
+++ b/www/common/common-util.js
@@ -137,17 +137,15 @@ define([], function () {
         else if (bytes >= oneMegabyte) { return 'MB'; }
     };
 
+    // given a path, asynchronously return an arraybuffer
     Util.fetch = function (src, cb) {
         var done = false;
-        var CB = function (err, res) {
-            if (done) { return; }
-            done = true;
-            cb(err, res);
-        };
+        var CB = Util.once(cb);
 
         var xhr = new XMLHttpRequest();
         xhr.open("GET", src, true);
         xhr.responseType = "arraybuffer";
+        xhr.onerror = function (err) { CB(err); };
         xhr.onload = function () {
             if (/^4/.test(''+this.status)) {
                 return CB('XHR_ERROR');
diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index d095d2b3c..dd7a46d25 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -8,11 +8,12 @@ define([
     '/common/common-feedback.js',
     '/common/outer/local-store.js',
     '/common/outer/worker-channel.js',
+    '/common/outer/login-block.js',
 
     '/customize/application_config.js',
     '/bower_components/nthen/index.js',
 ], function (Config, Messages, Util, Hash,
-            Messaging, Constants, Feedback, LocalStore, Channel,
+            Messaging, Constants, Feedback, LocalStore, Channel, Block,
             AppConfig, Nthen) {
 
 /*  This file exposes functionality which is specific to Cryptpad, but not to
@@ -883,7 +884,46 @@ define([
             if (AppConfig.beforeLogin) {
                 AppConfig.beforeLogin(LocalStore.isLoggedIn(), waitFor());
             }
+
         }).nThen(function (waitFor) {
+            var blockHash = LocalStore.getBlockHash();
+
+            if (blockHash) {
+                console.log(blockHash);
+                var parsed = Hash.parseBlockHash(blockHash);
+
+                if (typeof(parsed) !== 'object') {
+                    console.error("Failed to parse blockHash");
+                    console.log(parsed);
+                    return;
+                } else {
+                    console.log(parsed);
+                }
+                Util.fetch(parsed.href, waitFor(function (err, arraybuffer) {
+                    if (err) { return void console.log(err); }
+
+                    // use the results to load your user hash and
+                    // put your userhash into localStorage
+                    try {
+                        var block_info = Block.decrypt(arraybuffer, parsed.keys);
+                        if (block_info[Constants.userHashKey]) { LocalStore.setUserHash(block_info[Constants.userHashKey]); }
+                    } catch (e) {
+                        console.error(e);
+                        return void console.error("failed to decrypt or decode block content");
+                    }
+                }));
+            } else {
+                // XXX debugging
+                console.error("NO BLOCK HASH");
+            }
+        }).nThen(function (waitFor) {
+            // XXX debugging
+            if (LocalStore.getUserHash()) {
+                console.log('User_hash detected');
+            } else {
+                console.log("User_hash not detected");
+            }
+
             var cfg = {
                 init: true,
                 //query: onMessage, // TODO temporary, will be replaced by a webworker channel
diff --git a/www/common/outer/login-block.js b/www/common/outer/login-block.js
index 026fa289f..3e931488b 100644
--- a/www/common/outer/login-block.js
+++ b/www/common/outer/login-block.js
@@ -1,7 +1,8 @@
 define([
     '/common/common-util.js',
+    '/api/config',
     '/bower_components/tweetnacl/nacl-fast.min.js',
-], function (Util) {
+], function (Util, ApiConfig) {
     var Nacl = window.nacl;
 
     var Block = {};
@@ -30,9 +31,11 @@ define([
         var symmetric = seed.subarray(Nacl.sign.seedLength,
             Nacl.sign.seedLength + Nacl.secretbox.keyLength);
 
+        console.log("symmetric key: ", Nacl.util.encodeBase64(symmetric));
+
         return {
             sign: Nacl.sign.keyPair.fromSeed(signSeed), // 32 bytes
-            symmetric: symmetric,
+            symmetric: symmetric, // 32 bytes ...
         };
     };
 
@@ -51,8 +54,15 @@ define([
     Block.decrypt = function (u8_content, keys) {
         // version is currently ignored since there is only one
         var nonce = u8_content.subarray(1, 1 + Nacl.secretbox.nonceLength);
-        var box = content.subarray(1 + Nacl.secretbox.nonceLength);
-        return Nacl.secretbox.open(box, nonce, keys.symmetric);
+        var box = u8_content.subarray(1 + Nacl.secretbox.nonceLength);
+
+        var plaintext = Nacl.secretbox.open(box, nonce, keys.symmetric);
+        try {
+            return JSON.parse(Nacl.util.encodeUTF8(plaintext));
+        } catch (e) {
+            console.error(e);
+            return;
+        }
     };
 
     // (Uint8Array block) => signature
@@ -86,5 +96,18 @@ define([
         };
     };
 
+    // FIXME don't spread the functions below across this file and common-hash
+    // find a permanent home for these hacks
+    var urlSafeB64 = function (u8) {
+        return Nacl.util.encodeBase64(u8).replace(/\//g, '-');
+    };
+
+    Block.getBlockHash = function (keys) {
+        var publicKey = urlSafeB64(keys.sign.publicKey);
+        var relative = 'block/' + publicKey.slice(0, 2) + '/' +  publicKey; // XXX FIXME use configurable path from /api/config
+        var symmetric = urlSafeB64(keys.symmetric);
+        return ApiConfig.httpUnsafeOrigin + relative + '#' + symmetric;
+    };
+
     return Block;
 });
diff --git a/www/settings/inner.js b/www/settings/inner.js
index acfa8bafd..3d59acb9c 100644
--- a/www/settings/inner.js
+++ b/www/settings/inner.js
@@ -11,6 +11,7 @@ define([
     '/common/hyperscript.js',
     '/customize/application_config.js',
     '/api/config',
+    '/common/outer/login-block.js', // XXX HACK
 
     '/bower_components/file-saver/FileSaver.min.js',
     'css!/bower_components/bootstrap/dist/css/bootstrap.min.css',
@@ -28,7 +29,8 @@ define([
     Messages,
     h,
     AppConfig,
-    ApiConfig
+    ApiConfig,
+    Block // XXX HACK
     )
 {
     var saveAs = window.saveAs;
@@ -389,7 +391,36 @@ define([
             });
         };
 
-        updateBlock = updateBlock; // jshint..
+        var removeBlock = function (data, cb) {
+            sframeChan.query('Q_REMOVE_LOGIN_BLOCK', data, function (err, obj) {
+                if (err || obj.error) { return void cb ({error: err || obj.error}); }
+                cb (obj);
+            });
+        };
+
+
+        // XXX
+        if (false) { // STUBBED, just for development purposes
+            console.error("TRYING TO WRITE A BLOCK");
+
+            var keys = Block.genkeys(Block.seed());
+            var data = Block.serialize(JSON.stringify({
+                a: 5,
+                b: 6,
+                User_hash: "XXX", /// TODO encode newly derived User_hash here
+            }), keys);
+
+            updateBlock(data, function (err, thing) {
+                console.log(err, thing);
+
+                console.log(Block.getBlockHash(keys));
+
+                return;
+                removeBlock(Block.remove(keys), function (err, obj) {
+                    console.log(err, obj);
+                });
+            });
+        }
 
         return $div;
     };