From 368e253c9fc2ee1524ea29312f108722585eeeba Mon Sep 17 00:00:00 2001
From: Yann Flory <yann.flory@xwiki.com>
Date: Fri, 16 Sep 2016 18:45:40 +0200
Subject: [PATCH 01/18] Ability to send a read-only URL

---
 NetfluxWebsocketSrv.js        | 21 ++++++++++++++++
 package.json                  |  3 ++-
 www/common/cryptpad-common.js | 46 +++++++++++++++++++++++++++++------
 www/pad/main.js               | 13 ++++++----
 4 files changed, 69 insertions(+), 14 deletions(-)

diff --git a/NetfluxWebsocketSrv.js b/NetfluxWebsocketSrv.js
index a5e75c6cf..499a3cde8 100644
--- a/NetfluxWebsocketSrv.js
+++ b/NetfluxWebsocketSrv.js
@@ -1,5 +1,6 @@
 ;(function () { 'use strict';
 const Crypto = require('crypto');
+const Nacl = require('tweetnacl');
 const LogStore = require('./storage/LogStore');
 
 
@@ -27,6 +28,15 @@ const sendMsg = function (ctx, user, msg) {
 
 const sendChannelMessage = function (ctx, channel, msgStruct) {
     msgStruct.unshift(0);
+    if (msgStruct[2] === 'MSG' && channel.validateKey) {
+        let msg = Nacl.util.decodeBase64(msgStruct[4]);
+        let validated = Nacl.sign.open(msg, channel.validateKey);
+        if (!validated) {
+            console.log("Unsigned message rejected");
+            return;
+        }
+        msgStruct[4] = Nacl.util.encodeUTF8(validated);
+    }
     channel.forEach(function (user) {
       if(msgStruct[2] !== 'MSG' || user.id !== msgStruct[1]) { // We don't want to send back a message to its sender, in order to save bandwidth
         sendMsg(ctx, user, msgStruct);
@@ -149,6 +159,17 @@ const handleMessage = function (ctx, user, msg) {
             clearTimeout(ctx.timeouts[chanName]);
         }
 
+        // validation key?
+        if (json[2]) {
+            if (chan.validateKey && Nacl.util.encodeBase64(chan.validateKey) !== json[2]) {
+                sendMsg(ctx, user, [seq, 'ERROR', 'INVALID_KEY', obj]);
+                return;
+            }
+            if (!chan.validateKey) {
+                chan.validateKey = Nacl.util.decodeBase64(json[2]);
+            }
+        }
+
         chan.id = chanName;
         if (USE_HISTORY_KEEPER) {
             sendMsg(ctx, user, [0, HISTORY_KEEPER_ID, 'JOIN', chanName]);
diff --git a/package.json b/package.json
index c61266ee7..ec9dbf734 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,8 @@
   "dependencies": {
     "express": "~4.10.1",
     "ws": "^1.0.1",
-    "nthen": "~0.1.0"
+    "nthen": "~0.1.0",
+    "tweetnacl": "~0.12.2"
   },
   "devDependencies": {
     "jshint": "~2.9.1",
diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index 1e1a67069..6b8415fd6 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -128,7 +128,7 @@ define([
 
     var base64ToHex = common.base64ToHex = function (b64String) {
         var hexArray = [];
-        atob(b64String.replace(/-/g, '/') + "==").split("").forEach(function(e){
+        atob(b64String.replace(/-/g, '/')).split("").forEach(function(e){
             var h = e.charCodeAt(0).toString(16);
             if (h.length === 1) { h = "0"+h; }
             hexArray.push(h);
@@ -136,18 +136,28 @@ define([
         return hexArray.join("");
     };
 
-    var getHashFromKeys = common.getHashFromKeys = function (chanKey, cryptKey) {
-        return '/1/' + hexToBase64(chanKey) + '/' + cryptKey.replace(/\//g, '-');
+
+    var getEditHashFromKeys = common.getEditHashFromKeys = function (chanKey, keys) {
+        if (typeof keys === 'string') {
+            return chanKey + Crypto.b64RemoveSlashes(keys);
+        }
+        return '/1/edit/' + hexToBase64(chanKey) + '/' + Crypto.b64RemoveSlashes(keys.editKeyStr);
+    };
+    var getViewHashFromKeys = common.getViewHashFromKeys = function (chanKey, keys) {
+        return '/1/view/' + hexToBase64(chanKey) + '/' + Crypto.b64RemoveSlashes(keys.viewKeyStr);
     };
+    var getHashFromKeys = common.getHashFromKeys = getEditHashFromKeys;
 
     var getSecrets = common.getSecrets = function () {
         var secret = {};
         if (!/#/.test(window.location.href)) {
-            secret.key = Crypto.genKey();
+            secret.keys = Crypto.createEditCryptor();
+            secret.key = Crypto.createEditCryptor().editKeyStr;
         } else {
             var hash = window.location.hash.slice(1);
             if (hash.length === 0) {
-                secret.key = Crypto.genKey();
+                secret.keys = Crypto.createEditCryptor();
+                secret.key = Crypto.createEditCryptor().editKeyStr;
                 return secret;
             }
             common.redirect(hash);
@@ -166,15 +176,35 @@ define([
                     throw new Error("Unable to parse the key");
                 }
                 var version = hashArray[1];
-                if (version === "1") {
+                /*if (version === "1") {
                     secret.channel = base64ToHex(hashArray[2]);
                     secret.key = hashArray[3].replace(/-/g, '/'); //TODO replace / by -
                     if (secret.channel.length !== 32 || secret.key.length !== 24) {
                         common.alert("The channel key and/or the encryption key is invalid");
-                        console.log("Channel key length : " + secret.channel.length + " != 32");
-                        console.log("Encryption key length : " + secret.key.length + " != 24");
                         throw new Error("The channel key and/or the encryption key is invalid");
                     }
+                }*/
+                if (version === "1") {
+                    var mode = hashArray[2];
+                    if (mode === 'edit') {
+                        secret.channel = base64ToHex(hashArray[3]);
+                        var keys = Crypto.createEditCryptor(hashArray[4].replace(/-/g, '/'));
+                        secret.keys = keys;
+                        secret.key = keys.editKeyStr;
+                        if (secret.channel.length !== 32 || secret.key.length !== 24) {
+                            common.alert("The channel key and/or the encryption key is invalid");
+                            throw new Error("The channel key and/or the encryption key is invalid");
+                        }
+                    }
+                    else if (mode === 'view') {
+                        secret.channel = base64ToHex(hashArray[3]);
+                        var keys = Crypto.createViewCryptor(hashArray[4].replace(/-/g, '/'));
+                        secret.keys = keys;
+                        if (secret.channel.length !== 32) {
+                            common.alert("The channel key is invalid");
+                            throw new Error("The channel key is invalid");
+                        }
+                    }
                 }
             }
         }
diff --git a/www/pad/main.js b/www/pad/main.js
index fac663e51..922cf1f02 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -115,7 +115,6 @@ define([
                 } else {
                     module.spinner.show();
                 }
-
                 inner.setAttribute('contenteditable', bool);
             };
 
@@ -317,14 +316,15 @@ define([
                 // the channel we will communicate over
                 channel: secret.channel,
 
-                // our encryption key
-                cryptKey: secret.key,
+                // our public key. send -1 if view mode
+                validateKey: secret.keys.validateKey || undefined,
+                readOnly: secret.keys.editKeyStr ? undefined : 1,
 
                 // method which allows us to get the id of the user
                 setMyID: setMyID,
 
                 // Pass in encrypt and decrypt methods
-                crypto: Crypto.createEncryptor(secret.key),
+                crypto: Crypto.createEncryptor(secret.keys),
 
                 // really basic operational transform
                 transformFunction : JsonOT.validate,
@@ -545,7 +545,10 @@ define([
                 $rightside.append($forgetPad);
 
                 // set the hash
-                window.location.hash = Cryptpad.getHashFromKeys(info.channel, secret.key);
+                if (secret.keys.editKeyStr) {
+                    window.location.hash = Cryptpad.getEditHashFromKeys(info.channel, secret.keys);
+                }
+                console.log("View Hash : " + Cryptpad.getViewHashFromKeys(info.channel, secret.keys));
 
                 Cryptpad.getPadTitle(function (err, title) {
                     if (err) {

From 391b7690e6887900c472d245740f65e6e4fb15f1 Mon Sep 17 00:00:00 2001
From: Yann Flory <yann.flory@xwiki.com>
Date: Mon, 19 Sep 2016 14:52:36 +0200
Subject: [PATCH 02/18] Set the pad to readonly mode when using a 'view' url

---
 www/common/toolbar.js | 15 +++++++++++++--
 www/pad/main.js       | 37 +++++++++++++++++++++++++++++--------
 2 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index 956defc4d..57e533b74 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -135,12 +135,21 @@ define([
         return $span[0];
     };
 
-    var updateUserList = function (myUserName, listElement, userList, userData) {
+    var arrayIntersect = function(a, b) {
+        return $.grep(a, function(i) {
+            return $.inArray(i, b) > -1;
+        });
+    };
+
+    var updateUserList = function (myUserName, listElement, userList, userData, readOnly) {
         var meIdx = userList.indexOf(myUserName);
         if (meIdx === -1) {
             listElement.textContent = Messages.synchronizing;
             return;
         }
+        console.log(userList);
+        userList = readOnly === -1 ? userList : arrayIntersect(userList, Object.keys(userData));
+        console.log(userList);
         if (userList.length === 1) {
             listElement.innerHTML = Messages.editingAlone;
         } else if (userList.length === 2) {
@@ -187,6 +196,8 @@ define([
         var changeNameID = config.changeNameID;
         var saveContentID = config.saveContentID || config.exportContentID;
         var loadContentID = config.loadContentID || config.importContentID;
+        // readOnly = 1 (readOnly enabled), 0 (disabled), -1 (old pad without readOnly mode)
+        var readOnly = (typeof config.readOnly !== "undefined") ? (readOnly ? 1 : 0) : -1;
         var saveElement;
         var loadElement;
 
@@ -205,7 +216,7 @@ define([
           if(newUserData) { // Someone has changed his name/color
             userData = newUserData;
           }
-          updateUserList(myUserName, userListElement, users, userData);
+          updateUserList(myUserName, userListElement, users, userData, readOnly);
         };
 
         var ks = function () {
diff --git a/www/pad/main.js b/www/pad/main.js
index 922cf1f02..348e507d8 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -65,6 +65,7 @@ define([
 
     var andThen = function (Ckeditor) {
         var secret = Cryptpad.getSecrets();
+        var readOnly = !secret.keys.editKeyStr;
 
         var fixThings = false;
 
@@ -115,7 +116,9 @@ define([
                 } else {
                     module.spinner.show();
                 }
-                inner.setAttribute('contenteditable', bool);
+                if (!readOnly || !bool) {
+                    inner.setAttribute('contenteditable', bool);
+                }
             };
 
             // don't let the user edit until the pad is ready
@@ -191,6 +194,12 @@ define([
                         }
                     }
 
+                    // Do not change the contenteditable value in view mode
+                    if (readOnly && info.node && info.node.tagName === 'BODY' &&
+                        info.diff.action === 'modifyAttribute' && info.diff.name === 'contenteditable') {
+                        return true;
+                    }
+
                     // no use trying to recover the cursor if it doesn't exist
                     if (!cursor.exists()) { return; }
 
@@ -295,7 +304,9 @@ define([
             var applyHjson = function (shjson) {
                 var userDocStateDom = hjsonToDom(JSON.parse(shjson));
 
-                userDocStateDom.setAttribute("contenteditable", "true"); // lol wtf
+                if (!readOnly) {
+                    userDocStateDom.setAttribute("contenteditable", "true"); // lol wtf
+                }
                 var patch = (DD).diff(inner, userDocStateDom);
                 (DD).apply(inner, patch);
             };
@@ -318,7 +329,7 @@ define([
 
                 // our public key. send -1 if view mode
                 validateKey: secret.keys.validateKey || undefined,
-                readOnly: secret.keys.editKeyStr ? undefined : 1,
+                readOnly: readOnly,
 
                 // method which allows us to get the id of the user
                 setMyID: setMyID,
@@ -383,6 +394,8 @@ define([
                 // build a dom from HJSON, diff, and patch the editor
                 applyHjson(shjson);
 
+                if (readOnly) { return; }
+
                 var shjson2 = stringifyDOM(inner);
                 if (shjson2 !== shjson) {
                     console.error("shjson2 !== shjson");
@@ -467,9 +480,11 @@ define([
                 var config = {
                     userData: userList,
                     changeNameID: Toolbar.constants.changeName,
+                    readOnly: readOnly
                 };
+                if (readOnly) {delete config.changeNameID; }
                 toolbar = info.realtime.toolbar = Toolbar.create($bar, info.myID, info.realtime, info.getLag, info.userList, config);
-                createChangeName(Toolbar.constants.changeName, $bar);
+                if (!readOnly) { createChangeName(Toolbar.constants.changeName, $bar); }
 
                 var $rightside = $bar.find('.' + Toolbar.constants.rightside);
 
@@ -545,7 +560,7 @@ define([
                 $rightside.append($forgetPad);
 
                 // set the hash
-                if (secret.keys.editKeyStr) {
+                if (!readOnly) {
                     window.location.hash = Cryptpad.getEditHashFromKeys(info.channel, secret.keys);
                 }
                 console.log("View Hash : " + Cryptpad.getViewHashFromKeys(info.channel, secret.keys));
@@ -585,12 +600,17 @@ define([
                 }
 
                 getLastName(function (err, lastName) {
-                    if (typeof(lastName) === 'string' && lastName.length) {
-                        setName(lastName);
-                    }
                     console.log("Unlocking editor");
                     setEditable(true);
                     initializing = false;
+                    myData[myID] = {
+                        name: ""
+                    };
+                    addToUserList(myData);
+                    if (typeof(lastName) === 'string' && lastName.length) {
+                        setName(lastName);
+                    }
+                    onLocal();
                 });
             };
 
@@ -617,6 +637,7 @@ define([
 
             var onLocal = realtimeOptions.onLocal = function () {
                 if (initializing) { return; }
+                if (readOnly) { return; }
 
                 // stringify the json and send it into chainpad
                 var shjson = stringifyDOM(inner);

From 99b50465c7b56b8d8d5c3a17c1badb10e548ba0e Mon Sep 17 00:00:00 2001
From: Yann Flory <yann.flory@xwiki.com>
Date: Mon, 19 Sep 2016 17:52:37 +0200
Subject: [PATCH 03/18] Add the read-only mode for /pad and /code

---
 customize.dist/toolbar.css                 |  5 +++
 customize.dist/translations/messages.fr.js |  6 +++
 customize.dist/translations/messages.js    |  6 +++
 www/code/main.js                           | 52 +++++++++++++++-------
 www/common/toolbar.js                      | 40 +++++++++++++----
 www/pad/main.js                            |  8 +++-
 6 files changed, 91 insertions(+), 26 deletions(-)

diff --git a/customize.dist/toolbar.css b/customize.dist/toolbar.css
index 61b592eda..b03039473 100644
--- a/customize.dist/toolbar.css
+++ b/customize.dist/toolbar.css
@@ -83,3 +83,8 @@
 .cryptpad-spinner {
   float: left;
 }
+.cryptpad-readonly {
+  margin-right: 20px;
+  font-weight: bold;
+  text-transform: uppercase;
+}
\ No newline at end of file
diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js
index 4ddd2a2f6..813620dfb 100644
--- a/customize.dist/translations/messages.fr.js
+++ b/customize.dist/translations/messages.fr.js
@@ -20,6 +20,12 @@ define(function () {
     out.synchronizing = 'Synchronisation';
     out.reconnecting = 'Reconnexion...';
     out.lag = 'Latence';
+    out.readonly = 'Lecture seule';
+    out.nobodyIsEditing = "Personne n'édite le document";
+    out.onePersonIsEditing = 'Une personne édite le document';
+    out.peopleAreEditing = '{0} personnes éditent le document';
+    out.oneViewer = '1 lecteur';
+    out.viewers = '{0} lecteurs';
 
     out.importButton = 'IMPORTER';
     out.importButtonTitle = 'Importer un document depuis un fichier local';
diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index 3a43d9209..e4dec777e 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -20,6 +20,12 @@ define(function () {
     out.synchronizing = 'Synchronizing';
     out.reconnecting = 'Reconnecting...';
     out.lag = 'Lag';
+    out.readonly = 'Read only';
+    out.nobodyIsEditing = 'Nobody is editing';
+    out.onePersonIsEditing = 'One person is editing';
+    out.peopleAreEditing = '{0} people are editing';
+    out.oneViewer = '1 viewer';
+    out.viewers = '{0} viewers';
 
     out.importButton = 'IMPORT';
     out.importButtonTitle = 'Import a document from a local file';
diff --git a/www/code/main.js b/www/code/main.js
index 764ff6698..db84ec3ec 100644
--- a/www/code/main.js
+++ b/www/code/main.js
@@ -39,6 +39,7 @@ define([
             toolbar;
 
         var secret = Cryptpad.getSecrets();
+        var readOnly = !secret.keys.editKeyStr;
 
         var andThen = function (CMeditor) {
             var CodeMirror = module.CodeMirror = CMeditor;
@@ -106,6 +107,7 @@ define([
             }());
 
             var setEditable = module.setEditable = function (bool) {
+                if (readOnly && bool) { return; }
                 editor.setOption('readOnly', !bool);
             };
 
@@ -132,8 +134,10 @@ define([
                 userName: userName,
                 websocketURL: Config.websocketURL,
                 channel: secret.channel,
-                //cryptKey: key,
-                crypto: Crypto.createEncryptor(secret.key),
+                // our public key
+                validateKey: secret.keys.validateKey || undefined,
+                readOnly: readOnly,
+                crypto: Crypto.createEncryptor(secret.keys),
                 setMyID: setMyID,
                 transformFunction: JsonOT.validate
             };
@@ -274,9 +278,11 @@ define([
                 var config = {
                     userData: userList,
                     changeNameID: Toolbar.constants.changeName,
+                    readOnly: readOnly
                 };
+                if (readOnly) {delete config.changeNameID; }
                 toolbar = module.toolbar = Toolbar.create($bar, info.myID, info.realtime, info.getLag, info.userList, config);
-                createChangeName(Toolbar.constants.changeName, $bar);
+                if (!readOnly) { createChangeName(Toolbar.constants.changeName, $bar); }
 
                 var $rightside = $bar.find('.' + Toolbar.constants.rightside);
 
@@ -443,7 +449,11 @@ define([
                     configureTheme();
                 });
 
-                window.location.hash = Cryptpad.getHashFromKeys(info.channel, secret.key);
+                // set the hash
+                if (!readOnly) {
+                    window.location.hash = Cryptpad.getEditHashFromKeys(info.channel, secret.keys);
+                }
+                console.log("View Hash : " + Cryptpad.getViewHashFromKeys(info.channel, secret.keys));
                 Cryptpad.getPadTitle(function (err, title) {
                     if (err) {
                         console.log("Unable to get pad title");
@@ -510,7 +520,7 @@ define([
                 }
 
                 // Update the user list (metadata) from the hyperjson
-                //updateUserList(shjson);
+                updateUserList(userDoc);
 
                 editor.setValue(newDoc || Messages.codeInitialState);
 
@@ -531,9 +541,17 @@ define([
                         console.error(err);
                         return;
                     }
+                    // Update the toolbar list:
+                    // Add the current user in the metadata if he has edit rights
+                    if (readOnly) { return; }
+                    myData[myID] = {
+                        name: ""
+                    };
+                    addToUserList(myData);
                     if (typeof(lastName) === 'string' && lastName.length) {
                         setName(lastName);
                     }
+                    onLocal();
                 });
             };
 
@@ -604,17 +622,19 @@ define([
 
                 editor.scrollTo(scroll.left, scroll.top);
 
-                var localDoc = canonicalize($textarea.val());
-                var hjson2 = {
-                  content: localDoc,
-                  metadata: userList,
-                  highlightMode: highlightMode,
-                };
-                var shjson2 = stringify(hjson2);
-                if (shjson2 !== shjson) {
-                    console.error("shjson2 !== shjson");
-                    TextPatcher.log(shjson, TextPatcher.diff(shjson, shjson2));
-                    module.patchText(shjson2);
+                if (!readOnly) {
+                    var localDoc = canonicalize($textarea.val());
+                    var hjson2 = {
+                      content: localDoc,
+                      metadata: userList,
+                      highlightMode: highlightMode,
+                    };
+                    var shjson2 = stringify(hjson2);
+                    if (shjson2 !== shjson) {
+                        console.error("shjson2 !== shjson");
+                        TextPatcher.log(shjson, TextPatcher.diff(shjson, shjson2));
+                        module.patchText(shjson2);
+                    }
                 }
 
                 notify();
diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index 2f9ca2ce6..865529d78 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -141,22 +141,44 @@ define([
         });
     };
 
+    var getViewers = function (n) {
+        if (!n || !parseInt(n) || n === 0) { return ''; }
+        if (n === 1) { return '; + ' + Messages.oneViewer; }
+        return '; + ' + Messages._getKey('viewers', [n]);
+    }
     var updateUserList = function (myUserName, listElement, userList, userData, readOnly) {
         var meIdx = userList.indexOf(myUserName);
         if (meIdx === -1) {
             listElement.textContent = Messages.synchronizing;
             return;
         }
-        console.log(userList);
+        var numberOfUsers = userList.length;
         userList = readOnly === -1 ? userList : arrayIntersect(userList, Object.keys(userData));
-        console.log(userList);
-        if (userList.length === 1) {
-            listElement.innerHTML = Messages.editingAlone;
-        } else if (userList.length === 2) {
-            listElement.innerHTML = Messages.editingWithOneOtherPerson + getOtherUsers(myUserName, userList, userData);
-        } else {
-            listElement.innerHTML = Messages.editingWith + ' ' + (userList.length - 1) + ' ' + Messages.otherPeople + getOtherUsers(myUserName, userList, userData);
+        var innerHTML;
+        var numberOfViewUsers = numberOfUsers - userList.length;
+        if (readOnly === 1) {
+            innerHTML = '<span class="cryptpad-readonly">' + Messages.readonly + '</span>';
+            if (userList.length === 0) {
+                innerHTML += Messages.nobodyIsEditing;
+            } else if (userList.length === 1) {
+                innerHTML += Messages.onePersonIsEditing + getOtherUsers(myUserName, userList, userData);
+            } else {
+                innerHTML += Messages._getKey('peopleAreEditing', [userList.length]) + getOtherUsers(myUserName, userList, userData);
+            }
+            // Remove the current user
+            numberOfViewUsers--;
+        }
+        else {
+            if (userList.length === 1) {
+                innerHTML = Messages.editingAlone;
+            } else if (userList.length === 2) {
+                innerHTML = Messages.editingWithOneOtherPerson + getOtherUsers(myUserName, userList, userData);
+            } else {
+                innerHTML = Messages.editingWith + ' ' + (userList.length - 1) + ' ' + Messages.otherPeople + getOtherUsers(myUserName, userList, userData);
+            }
         }
+        innerHTML += getViewers(numberOfViewUsers);
+        listElement.innerHTML = innerHTML;
     };
 
     var createLagElement = function ($container) {
@@ -197,7 +219,7 @@ define([
         var saveContentID = config.saveContentID || config.exportContentID;
         var loadContentID = config.loadContentID || config.importContentID;
         // readOnly = 1 (readOnly enabled), 0 (disabled), -1 (old pad without readOnly mode)
-        var readOnly = (typeof config.readOnly !== "undefined") ? (readOnly ? 1 : 0) : -1;
+        var readOnly = (typeof config.readOnly !== "undefined") ? (config.readOnly ? 1 : 0) : -1;
         var saveElement;
         var loadElement;
 
diff --git a/www/pad/main.js b/www/pad/main.js
index 348e507d8..f94c86981 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -327,7 +327,7 @@ define([
                 // the channel we will communicate over
                 channel: secret.channel,
 
-                // our public key. send -1 if view mode
+                // our public key
                 validateKey: secret.keys.validateKey || undefined,
                 readOnly: readOnly,
 
@@ -593,6 +593,9 @@ define([
                 var shjson = info.realtime.getUserDoc();
                 applyHjson(shjson);
 
+                // Update the user list (metadata) from the hyperjson
+                updateUserList(shjson);
+
                 if (Visible.isSupported()) {
                     Visible.onChange(function (yes) {
                         if (yes) { unnotify(); }
@@ -603,6 +606,9 @@ define([
                     console.log("Unlocking editor");
                     setEditable(true);
                     initializing = false;
+                    // Update the toolbar list:
+                    // Add the current user in the metadata if he has edit rights
+                    if (readOnly) { return; }
                     myData[myID] = {
                         name: ""
                     };

From bf8c9a2c4be480de4dafa8b68573a781ffee0cac Mon Sep 17 00:00:00 2001
From: Yann Flory <yann.flory@xwiki.com>
Date: Tue, 20 Sep 2016 11:35:57 +0200
Subject: [PATCH 04/18] Add a button to get the read only URL

---
 customize.dist/translations/messages.fr.js | 16 ++++++++-----
 customize.dist/translations/messages.js    | 17 ++++++++------
 www/code/main.js                           | 27 ++++++++++++++++++++--
 www/pad/main.js                            | 26 +++++++++++++++++++--
 4 files changed, 69 insertions(+), 17 deletions(-)

diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js
index 813620dfb..9fd72124a 100644
--- a/customize.dist/translations/messages.fr.js
+++ b/customize.dist/translations/messages.fr.js
@@ -3,6 +3,11 @@ define(function () {
 
     out.main_title = "Cryptpad: Editeur collaboratif en temps réel, zero knowledge";
 
+    out.type = {};
+    out.type.pad = 'Pad';
+    out.type.code = 'Code';
+    out.type.poll = 'Sondage';
+    out.type.slide = 'Présentation';
 
     out.errorBox_errorType_disconnected = 'Connexion perdue';
     out.errorBox_errorExplanation_disconnected = [
@@ -60,6 +65,11 @@ define(function () {
 
     out.commitButton = 'VALIDER';
 
+    out.linksButton = 'LIENS';
+    out.linksButtonTitle = 'Obtenir les liens disponibles pour accéder à ce document';
+    out.readonlyUrl = 'Lien de lecture seule';
+    out.editUrl = "Lien d'édition";
+
     out.disconnectAlert = 'Perte de la connexion au réseau !';
 
     out.tryIt = 'Essayez-le !';
@@ -71,12 +81,6 @@ define(function () {
     out.loginText = '<p>Votre nom d\'utilisateur et votre mot de passe sont utilisés pour générer une clé unique qui reste inconnue de notre serveur.</p>\n' +
                     '<p>Faites attention de ne pas oublier vos identifiants puisqu\'ils seront impossible à récupérer.</p>';
 
-    out.type = {};
-    out.type.pad = 'Pad';
-    out.type.code = 'Code';
-    out.type.poll = 'Sondage';
-    out.type.slide = 'Présentation';
-
     out.forget = "Oublier";
 
     // Polls
diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index e4dec777e..eda389589 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -3,6 +3,11 @@ define(function () {
 
     out.main_title = "Cryptpad: Zero Knowledge, Collaborative Real Time Editing";
 
+    out.type = {};
+    out.type.pad = 'Pad';
+    out.type.code = 'Code';
+    out.type.poll = 'Poll';
+    out.type.slide = 'Presentation';
 
     out.errorBox_errorType_disconnected = 'Connection Lost';
     out.errorBox_errorExplanation_disconnected = [
@@ -59,6 +64,11 @@ define(function () {
     out.presentSuccess = 'Hit ESC to exit presentation mode';
 
     out.commitButton = 'COMMIT';
+    
+    out.linksButton = 'LINKS';
+    out.linksButtonTitle = 'Get the available links for this document';
+    out.readonlyUrl = 'Read only URL';
+    out.editUrl = 'Edit URL';
 
     out.disconnectAlert = 'Network connection lost!';
 
@@ -71,13 +81,6 @@ define(function () {
     out.loginText = '<p>Your username and password are used to generate a unique key which is never known by our server.</p>\n' +
                     '<p>Be careful not to forget your credentials, as they are impossible to recover</p>';
 
-    // TODO : move at the beginning
-    out.type = {};
-    out.type.pad = 'Pad';
-    out.type.code = 'Code';
-    out.type.poll = 'Poll';
-    out.type.slide = 'Presentation';
-
     out.forget = "Forget";
 
     // Polls
diff --git a/www/code/main.js b/www/code/main.js
index db84ec3ec..491de8e43 100644
--- a/www/code/main.js
+++ b/www/code/main.js
@@ -286,6 +286,13 @@ define([
 
                 var $rightside = $bar.find('.' + Toolbar.constants.rightside);
 
+                var editHash;
+                var viewHash = Cryptpad.getViewHashFromKeys(info.channel, secret.keys);
+
+                if (!readOnly) {
+                    editHash = Cryptpad.getEditHashFromKeys(info.channel, secret.keys);
+                }
+
                 /* add an export button */
                 var $export = $('<button>', {
                     title: Messages.exportButtonTitle,
@@ -391,6 +398,22 @@ define([
                     });
                 $rightside.append($forgetPad);
 
+                /* add a 'links' button */
+                var $links = $('<button>', {
+                    title: Messages.linksButtonTitle
+                })
+                    .text(Messages.linksButton)
+                    .addClass('rightside-button')
+                    .click(function () {
+                        var baseUrl = window.location.origin + window.location.pathname + '#';
+                        var content = '<b>' + Messages.readonlyUrl + '</b> : <a target="_blank">' + baseUrl + viewHash + '</a>';
+                        if (!readOnly) {
+                            content += '<br><b>' + Messages.editUrl + '</b> : <a target="_blank">' + baseUrl + editHash + '</a>';
+                        }
+                        Cryptpad.alert(content);
+                    });
+                $rightside.append($links);
+
                 var configureLanguage = function (cb) {
                     // FIXME this is async so make it happen as early as possible
 
@@ -451,9 +474,9 @@ define([
 
                 // set the hash
                 if (!readOnly) {
-                    window.location.hash = Cryptpad.getEditHashFromKeys(info.channel, secret.keys);
+                    window.location.hash = editHash;
                 }
-                console.log("View Hash : " + Cryptpad.getViewHashFromKeys(info.channel, secret.keys));
+
                 Cryptpad.getPadTitle(function (err, title) {
                     if (err) {
                         console.log("Unable to get pad title");
diff --git a/www/pad/main.js b/www/pad/main.js
index f94c86981..9aa22a0ec 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -488,6 +488,13 @@ define([
 
                 var $rightside = $bar.find('.' + Toolbar.constants.rightside);
 
+                var editHash;
+                var viewHash = Cryptpad.getViewHashFromKeys(info.channel, secret.keys);
+
+                if (!readOnly) {
+                    editHash = Cryptpad.getEditHashFromKeys(info.channel, secret.keys);
+                }
+
                 /* add an export button */
                 var $export = $('<button>', {
                     title: Messages.exportButtonTitle,
@@ -559,11 +566,26 @@ define([
                     });
                 $rightside.append($forgetPad);
 
+                /* add a 'links' button */
+                var $links = $('<button>', {
+                    title: Messages.linksButtonTitle
+                })
+                    .text(Messages.linksButton)
+                    .addClass('rightside-button')
+                    .click(function () {
+                        var baseUrl = window.location.origin + window.location.pathname + '#';
+                        var content = '<b>' + Messages.readonlyUrl + '</b> : <a target="_blank">' + baseUrl + viewHash + '</a>';
+                        if (!readOnly) {
+                            content += '<br><b>' + Messages.editUrl + '</b> : <a target="_blank">' + baseUrl + editHash + '</a>';
+                        }
+                        Cryptpad.alert(content);
+                    });
+                $rightside.append($links);
+
                 // set the hash
                 if (!readOnly) {
-                    window.location.hash = Cryptpad.getEditHashFromKeys(info.channel, secret.keys);
+                    window.location.hash = editHash;
                 }
-                console.log("View Hash : " + Cryptpad.getViewHashFromKeys(info.channel, secret.keys));
 
                 Cryptpad.getPadTitle(function (err, title) {
                     if (err) {

From 202925302e94ef330d6557b3053536e6dec64ba9 Mon Sep 17 00:00:00 2001
From: Yann Flory <yann.flory@xwiki.com>
Date: Tue, 20 Sep 2016 11:59:13 +0200
Subject: [PATCH 05/18] Display a indicator for read-only pads in the main page

---
 customize.dist/main.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/customize.dist/main.js b/customize.dist/main.js
index 3e9eab3b5..d9220a8d7 100644
--- a/customize.dist/main.js
+++ b/customize.dist/main.js
@@ -106,9 +106,17 @@ define([
                 });
             });
 
+            var readOnly = false;
+            if (pad.href.indexOf('#') !== -1) {
+                var modeArray = pad.href.split('#')[1].split('/');
+                if (modeArray.length >= 3 && modeArray[2] === 'view') {
+                    readOnly =  true;
+                }
+            }
+            var readOnlyText = readOnly ? '(' + Messages.readonly + ') ' : '';
             $row
                 .append($('<td>').text(name))
-                .append($('<td>').append($('<a>', {
+                .append($('<td>').append(readOnlyText).append($('<a>', {
                     href: pad.href,
                     title: pad.title,
                 }).text(shortTitle)))
@@ -134,6 +142,9 @@ define([
 
             if (hasRecent) {
                 $('table').attr('style', '');
+                // Race condition here, this is triggered before the localization in HTML
+                // so we have to remove the data-localization attr
+                $tryit.removeAttr('data-localization');
                 $tryit.text(Messages.recentPads);
             }
         });

From 83705ae058df28ddb07c661bed46c94bc2ee901c Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 20 Sep 2016 18:22:40 +0200
Subject: [PATCH 06/18] Improve the UI in read-only mode

---
 customize.dist/translations/messages.fr.js |  7 ++---
 customize.dist/translations/messages.js    |  7 ++---
 www/code/main.js                           | 34 ++++++++++++----------
 www/common/cryptpad-common.js              |  7 +++--
 www/pad/main.js                            | 34 ++++++++++++----------
 5 files changed, 47 insertions(+), 42 deletions(-)

diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js
index 9fd72124a..d289fbfc3 100644
--- a/customize.dist/translations/messages.fr.js
+++ b/customize.dist/translations/messages.fr.js
@@ -65,10 +65,9 @@ define(function () {
 
     out.commitButton = 'VALIDER';
 
-    out.linksButton = 'LIENS';
-    out.linksButtonTitle = 'Obtenir les liens disponibles pour accéder à ce document';
-    out.readonlyUrl = 'Lien de lecture seule';
-    out.editUrl = "Lien d'édition";
+    out.getViewButton = 'LECTURE SEULE';
+    out.getViewButtonTitle = "Obtenir l'adresse d'accès à ce document en lecture seule";
+    out.readonlyUrl = 'URL de lecture seule';
 
     out.disconnectAlert = 'Perte de la connexion au réseau !';
 
diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index eda389589..06df24f26 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -64,11 +64,10 @@ define(function () {
     out.presentSuccess = 'Hit ESC to exit presentation mode';
 
     out.commitButton = 'COMMIT';
-    
-    out.linksButton = 'LINKS';
-    out.linksButtonTitle = 'Get the available links for this document';
+
+    out.getViewButton = 'READ-ONLY URL';
+    out.getViewButtonTitle = 'Get the read-only URL for this document';
     out.readonlyUrl = 'Read only URL';
-    out.editUrl = 'Edit URL';
 
     out.disconnectAlert = 'Network connection lost!';
 
diff --git a/www/code/main.js b/www/code/main.js
index 491de8e43..e8e7958a6 100644
--- a/www/code/main.js
+++ b/www/code/main.js
@@ -39,7 +39,10 @@ define([
             toolbar;
 
         var secret = Cryptpad.getSecrets();
-        var readOnly = !secret.keys.editKeyStr;
+        var readOnly = secret.keys && !secret.keys.editKeyStr;
+        if (!secret.keys) {
+            secret.keys = secret.key;
+        }
 
         var andThen = function (CMeditor) {
             var CodeMirror = module.CodeMirror = CMeditor;
@@ -398,21 +401,20 @@ define([
                     });
                 $rightside.append($forgetPad);
 
-                /* add a 'links' button */
-                var $links = $('<button>', {
-                    title: Messages.linksButtonTitle
-                })
-                    .text(Messages.linksButton)
-                    .addClass('rightside-button')
-                    .click(function () {
-                        var baseUrl = window.location.origin + window.location.pathname + '#';
-                        var content = '<b>' + Messages.readonlyUrl + '</b> : <a target="_blank">' + baseUrl + viewHash + '</a>';
-                        if (!readOnly) {
-                            content += '<br><b>' + Messages.editUrl + '</b> : <a target="_blank">' + baseUrl + editHash + '</a>';
-                        }
-                        Cryptpad.alert(content);
-                    });
-                $rightside.append($links);
+                if (!readOnly && viewHash) {
+                    /* add a 'links' button */
+                    var $links = $('<button>', {
+                        title: Messages.getViewButtonTitle
+                    })
+                        .text(Messages.getViewButton)
+                        .addClass('rightside-button')
+                        .click(function () {
+                            var baseUrl = window.location.origin + window.location.pathname + '#';
+                            var content = '<b>' + Messages.readonlyUrl + '</b><br><a target="_blank">' + baseUrl + viewHash + '</a><br>';
+                            Cryptpad.alert(content);
+                        });
+                    $rightside.append($links);
+                }
 
                 var configureLanguage = function (cb) {
                     // FIXME this is async so make it happen as early as possible
diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index 76685717d..c28ed33ae 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -139,11 +139,14 @@ define([
 
     var getEditHashFromKeys = common.getEditHashFromKeys = function (chanKey, keys) {
         if (typeof keys === 'string') {
-            return chanKey + Crypto.b64RemoveSlashes(keys);
+            return chanKey + keys;
         }
         return '/1/edit/' + hexToBase64(chanKey) + '/' + Crypto.b64RemoveSlashes(keys.editKeyStr);
     };
     var getViewHashFromKeys = common.getViewHashFromKeys = function (chanKey, keys) {
+        if (typeof keys === 'string') {
+            return;
+        }
         return '/1/view/' + hexToBase64(chanKey) + '/' + Crypto.b64RemoveSlashes(keys.viewKeyStr);
     };
     var getHashFromKeys = common.getHashFromKeys = getEditHashFromKeys;
@@ -178,7 +181,7 @@ define([
                 var version = hashArray[1];
                 /*if (version === "1") {
                     secret.channel = base64ToHex(hashArray[2]);
-                    secret.key = hashArray[3].replace(/-/g, '/'); //TODO replace / by -
+                    secret.key = hashArray[3].replace(/-/g, '/');
                     if (secret.channel.length !== 32 || secret.key.length !== 24) {
                         common.alert("The channel key and/or the encryption key is invalid");
                         throw new Error("The channel key and/or the encryption key is invalid");
diff --git a/www/pad/main.js b/www/pad/main.js
index 9aa22a0ec..91c710f66 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -65,7 +65,10 @@ define([
 
     var andThen = function (Ckeditor) {
         var secret = Cryptpad.getSecrets();
-        var readOnly = !secret.keys.editKeyStr;
+        var readOnly = secret.keys && !secret.keys.editKeyStr;
+        if (!secret.keys) {
+            secret.keys = secret.key;
+        }
 
         var fixThings = false;
 
@@ -566,21 +569,20 @@ define([
                     });
                 $rightside.append($forgetPad);
 
-                /* add a 'links' button */
-                var $links = $('<button>', {
-                    title: Messages.linksButtonTitle
-                })
-                    .text(Messages.linksButton)
-                    .addClass('rightside-button')
-                    .click(function () {
-                        var baseUrl = window.location.origin + window.location.pathname + '#';
-                        var content = '<b>' + Messages.readonlyUrl + '</b> : <a target="_blank">' + baseUrl + viewHash + '</a>';
-                        if (!readOnly) {
-                            content += '<br><b>' + Messages.editUrl + '</b> : <a target="_blank">' + baseUrl + editHash + '</a>';
-                        }
-                        Cryptpad.alert(content);
-                    });
-                $rightside.append($links);
+                if (!readOnly && viewHash) {
+                    /* add a 'links' button */
+                    var $links = $('<button>', {
+                        title: Messages.getViewButtonTitle
+                    })
+                        .text(Messages.getViewButton)
+                        .addClass('rightside-button')
+                        .click(function () {
+                            var baseUrl = window.location.origin + window.location.pathname + '#';
+                            var content = '<b>' + Messages.readonlyUrl + '</b><br><a target="_blank">' + baseUrl + viewHash + '</a><br>';
+                            Cryptpad.alert(content);
+                        });
+                    $rightside.append($links);
+                }
 
                 // set the hash
                 if (!readOnly) {

From 7cc52184229e42556c5732a68a8f66a715820692 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 21 Sep 2016 15:02:50 +0200
Subject: [PATCH 07/18] Messages are now verified by the users instead of the
 server

---
 NetfluxWebsocketSrv.js | 44 +++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/NetfluxWebsocketSrv.js b/NetfluxWebsocketSrv.js
index 499a3cde8..fb826a3f3 100644
--- a/NetfluxWebsocketSrv.js
+++ b/NetfluxWebsocketSrv.js
@@ -13,6 +13,7 @@ const USE_FILE_BACKUP_STORAGE = true;
 
 
 let dropUser;
+let historyKeeperKeys = {};
 
 const now = function () { return (new Date()).getTime(); };
 
@@ -28,21 +29,22 @@ const sendMsg = function (ctx, user, msg) {
 
 const sendChannelMessage = function (ctx, channel, msgStruct) {
     msgStruct.unshift(0);
-    if (msgStruct[2] === 'MSG' && channel.validateKey) {
-        let msg = Nacl.util.decodeBase64(msgStruct[4]);
-        let validated = Nacl.sign.open(msg, channel.validateKey);
-        if (!validated) {
-            console.log("Unsigned message rejected");
-            return;
-        }
-        msgStruct[4] = Nacl.util.encodeUTF8(validated);
-    }
     channel.forEach(function (user) {
       if(msgStruct[2] !== 'MSG' || user.id !== msgStruct[1]) { // We don't want to send back a message to its sender, in order to save bandwidth
         sendMsg(ctx, user, msgStruct);
       }
     });
     if (USE_HISTORY_KEEPER && msgStruct[2] === 'MSG') {
+        if (historyKeeperKeys[channel.id]) {
+            let signedMsg = msgStruct[4].replace(/^cp\|/, '');
+            signedMsg = Nacl.util.decodeBase64(signedMsg);
+            let validateKey = Nacl.util.decodeBase64(historyKeeperKeys[channel.id]);
+            let validated = Nacl.sign.open(signedMsg, validateKey);
+            if (!validated) {
+                console.log("Signed message rejected");
+                return;
+            }
+        }
         ctx.store.message(channel.id, JSON.stringify(msgStruct), function (err) {
             if (err && typeof(err) !== 'function') {
                 // ignore functions because older datastores
@@ -78,6 +80,7 @@ dropUser = function (ctx, user) {
         if (chan.length === 0) {
             console.log("Removing empty channel ["+chanName+"]");
             delete ctx.channels[chanName];
+            delete historyKeeperKeys[chanName];
 
             /*  Call removeChannel if it is a function and channel removal is
                 set to true in the config file */
@@ -130,7 +133,7 @@ const getHistory = function (ctx, channelName, handler, cb) {
             // no checkpoints.
             for (var x = msgBuff2.pop(); x; x = msgBuff2.pop()) { handler(x); }
         }
-        cb();
+        cb(messageBuf);
     });
 };
 
@@ -159,17 +162,6 @@ const handleMessage = function (ctx, user, msg) {
             clearTimeout(ctx.timeouts[chanName]);
         }
 
-        // validation key?
-        if (json[2]) {
-            if (chan.validateKey && Nacl.util.encodeBase64(chan.validateKey) !== json[2]) {
-                sendMsg(ctx, user, [seq, 'ERROR', 'INVALID_KEY', obj]);
-                return;
-            }
-            if (!chan.validateKey) {
-                chan.validateKey = Nacl.util.decodeBase64(json[2]);
-            }
-        }
-
         chan.id = chanName;
         if (USE_HISTORY_KEEPER) {
             sendMsg(ctx, user, [0, HISTORY_KEEPER_ID, 'JOIN', chanName]);
@@ -185,9 +177,17 @@ const handleMessage = function (ctx, user, msg) {
             try { parsed = JSON.parse(json[2]); } catch (err) { console.error(err); return; }
             if (parsed[0] === 'GET_HISTORY') {
                 sendMsg(ctx, user, [seq, 'ACK']);
+                if (historyKeeperKeys[parsed[1]]) {
+                    var key = {channel: parsed[1], validateKey: historyKeeperKeys[parsed[1]]};
+                    sendMsg(ctx, user, [0, HISTORY_KEEPER_ID, 'MSG', user.id, JSON.stringify(key)])
+                }
                 getHistory(ctx, parsed[1], function (msg) {
                     sendMsg(ctx, user, [0, HISTORY_KEEPER_ID, 'MSG', user.id, JSON.stringify(msg)]);
-                }, function () {
+                }, function (messages) {
+                    // parsed[2] is a validation key if it exists
+                    if (messages.length === 0 && parsed[2] && !historyKeeperKeys[parsed[1]]) {
+                        historyKeeperKeys[parsed[1]] = parsed[2];
+                    }
                     sendMsg(ctx, user, [0, HISTORY_KEEPER_ID, 'MSG', user.id, 0]);
                 });
             }

From 47e8be1681fe14611fd06ae32f2b94f6db6ea42c Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 21 Sep 2016 15:03:36 +0200
Subject: [PATCH 08/18] Remove the IMPORT button and editor toolbars in
 read-only mode

---
 www/code/main.js | 71 ++++++++++++++++++++------------------
 www/pad/main.js  | 88 ++++++++++++++++++++++++++----------------------
 2 files changed, 87 insertions(+), 72 deletions(-)

diff --git a/www/code/main.js b/www/code/main.js
index e8e7958a6..9841f4511 100644
--- a/www/code/main.js
+++ b/www/code/main.js
@@ -305,38 +305,40 @@ define([
                     .click(exportText);
                 $rightside.append($export);
 
-                /* add an import button */
-                var $import = $('<button>',{
-                    title: Messages.importButtonTitle
-                })
-                    .text(Messages.importButton)
-                    .addClass('rightside-button')
-                    .click(Cryptpad.importContent('text/plain', function (content, file) {
-                        var mode;
-                        var mime = CodeMirror.findModeByMIME(file.type);
-
-                        if (!mime) {
-                            var ext = /.+\.([^.]+)$/.exec(file.name);
-                            if (ext[1]) {
-                                mode = CodeMirror.findModeByExtension(ext[1]);
+                if (!readOnly) {
+                    /* add an import button */
+                    var $import = $('<button>',{
+                        title: Messages.importButtonTitle
+                    })
+                        .text(Messages.importButton)
+                        .addClass('rightside-button')
+                        .click(Cryptpad.importContent('text/plain', function (content, file) {
+                            var mode;
+                            var mime = CodeMirror.findModeByMIME(file.type);
+
+                            if (!mime) {
+                                var ext = /.+\.([^.]+)$/.exec(file.name);
+                                if (ext[1]) {
+                                    mode = CodeMirror.findModeByExtension(ext[1]);
+                                }
+                            } else {
+                                mode = mime && mime.mode || null;
                             }
-                        } else {
-                            mode = mime && mime.mode || null;
-                        }
 
-                        if (mode && Modes.list.some(function (o) { return o.mode === mode; })) {
-                            setMode(mode);
-                            $bar.find('#language-mode').val(mode);
-                        } else {
-                            console.log("Couldn't find a suitable highlighting mode: %s", mode);
-                            setMode('text');
-                            $bar.find('#language-mode').val('text');
-                        }
+                            if (mode && Modes.list.some(function (o) { return o.mode === mode; })) {
+                                setMode(mode);
+                                $bar.find('#language-mode').val(mode);
+                            } else {
+                                console.log("Couldn't find a suitable highlighting mode: %s", mode);
+                                setMode('text');
+                                $bar.find('#language-mode').val('text');
+                            }
 
-                        editor.setValue(content);
-                        onLocal();
-                    }));
-                $rightside.append($import);
+                            editor.setValue(content);
+                            onLocal();
+                        }));
+                    $rightside.append($import);
+                }
 
                 /* add a rename button */
                 var $setTitle = $('<button>', {
@@ -410,7 +412,7 @@ define([
                         .addClass('rightside-button')
                         .click(function () {
                             var baseUrl = window.location.origin + window.location.pathname + '#';
-                            var content = '<b>' + Messages.readonlyUrl + '</b><br><a target="_blank">' + baseUrl + viewHash + '</a><br>';
+                            var content = '<b>' + Messages.readonlyUrl + '</b><br><a>' + baseUrl + viewHash + '</a><br>';
                             Cryptpad.alert(content);
                         });
                     $rightside.append($links);
@@ -470,9 +472,14 @@ define([
                     });
                 };
 
-                configureLanguage(function () {
+                if (!readOnly) {
+                    configureLanguage(function () {
+                        configureTheme();
+                    });
+                }
+                else {
                     configureTheme();
-                });
+                }
 
                 // set the hash
                 if (!readOnly) {
diff --git a/www/pad/main.js b/www/pad/main.js
index 91c710f66..22b012e1f 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -86,6 +86,11 @@ define([
 
         editor.on('instanceReady', function (Ckeditor) {
 
+            if (readOnly) {
+                $('#pad-iframe')[0].contentWindow.$('#cke_1_toolbox > .cke_toolbar').hide();
+            }
+
+
             /* add a class to the magicline plugin so we can pick it out more easily */
 
             var ml = $('iframe')[0].contentWindow.CKEDITOR.instances.editor1.plugins.magicline
@@ -397,33 +402,33 @@ define([
                 // build a dom from HJSON, diff, and patch the editor
                 applyHjson(shjson);
 
-                if (readOnly) { return; }
-
-                var shjson2 = stringifyDOM(inner);
-                if (shjson2 !== shjson) {
-                    console.error("shjson2 !== shjson");
-                    module.patchText(shjson2);
-
-                    /*  pushing back over the wire is necessary, but it can
-                        result in a feedback loop, which we call a browser
-                        fight */
-                    if (module.logFights) {
-                        // what changed?
-                        var op = TextPatcher.diff(shjson, shjson2);
-                        // log the changes
-                        TextPatcher.log(shjson, op);
-                        var sop = JSON.stringify(TextPatcher.format(shjson, op));
-
-                        var index = module.fights.indexOf(sop);
-                        if (index === -1) {
-                            module.fights.push(sop);
-                            console.log("Found a new type of browser disagreement");
-                            console.log("You can inspect the list in your " +
-                                "console at `REALTIME_MODULE.fights`");
-                            console.log(module.fights);
-                        } else {
-                            console.log("Encountered a known browser disagreement: " +
-                                "available at `REALTIME_MODULE.fights[%s]`", index);
+                if (!readOnly) {
+                    var shjson2 = stringifyDOM(inner);
+                    if (shjson2 !== shjson) {
+                        console.error("shjson2 !== shjson");
+                        module.patchText(shjson2);
+
+                        /*  pushing back over the wire is necessary, but it can
+                            result in a feedback loop, which we call a browser
+                            fight */
+                        if (module.logFights) {
+                            // what changed?
+                            var op = TextPatcher.diff(shjson, shjson2);
+                            // log the changes
+                            TextPatcher.log(shjson, op);
+                            var sop = JSON.stringify(TextPatcher.format(shjson, op));
+
+                            var index = module.fights.indexOf(sop);
+                            if (index === -1) {
+                                module.fights.push(sop);
+                                console.log("Found a new type of browser disagreement");
+                                console.log("You can inspect the list in your " +
+                                    "console at `REALTIME_MODULE.fights`");
+                                console.log(module.fights);
+                            } else {
+                                console.log("Encountered a known browser disagreement: " +
+                                    "available at `REALTIME_MODULE.fights[%s]`", index);
+                            }
                         }
                     }
                 }
@@ -505,19 +510,22 @@ define([
                     .text(Messages.exportButton)
                     .addClass('rightside-button')
                     .click(exportFile);
+                $rightside.append($export);
 
-                /* add an import button */
-                var $import = $('<button>', {
-                    title: Messages.importButtonTitle
-                })
-                    .text(Messages.importButton)
-                    .addClass('rightside-button')
-                    .click(Cryptpad.importContent('text/plain', function (content) {
-                        var shjson = stringify(Hyperjson.fromDOM(domFromHTML(content).body));
-                        applyHjson(shjson);
-                        realtimeOptions.onLocal();
-                    }));
-                $rightside.append($export).append($import);
+                if (!readOnly) {
+                    /* add an import button */
+                    var $import = $('<button>', {
+                        title: Messages.importButtonTitle
+                    })
+                        .text(Messages.importButton)
+                        .addClass('rightside-button')
+                        .click(Cryptpad.importContent('text/plain', function (content) {
+                            var shjson = stringify(Hyperjson.fromDOM(domFromHTML(content).body));
+                            applyHjson(shjson);
+                            realtimeOptions.onLocal();
+                        }));
+                    $rightside.append($import);
+                }
 
                 /* add a rename button */
                 var $rename = $('<button>', {
@@ -578,7 +586,7 @@ define([
                         .addClass('rightside-button')
                         .click(function () {
                             var baseUrl = window.location.origin + window.location.pathname + '#';
-                            var content = '<b>' + Messages.readonlyUrl + '</b><br><a target="_blank">' + baseUrl + viewHash + '</a><br>';
+                            var content = '<b>' + Messages.readonlyUrl + '</b><br><a>' + baseUrl + viewHash + '</a><br>';
                             Cryptpad.alert(content);
                         });
                     $rightside.append($links);

From ad32ea2a82af94ed00a4f31e5bbedaec48632637 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 21 Sep 2016 17:24:00 +0200
Subject: [PATCH 09/18] Store the validate key in the history keeper database

---
 NetfluxWebsocketSrv.js | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/NetfluxWebsocketSrv.js b/NetfluxWebsocketSrv.js
index fb826a3f3..80778864d 100644
--- a/NetfluxWebsocketSrv.js
+++ b/NetfluxWebsocketSrv.js
@@ -27,6 +27,16 @@ const sendMsg = function (ctx, user, msg) {
     }
 };
 
+const storeMessage = function (ctx, channel, msg) {
+    ctx.store.message(channel.id, msg, function (err) {
+        if (err && typeof(err) !== 'function') {
+            // ignore functions because older datastores
+            // might pass waitFors into the callback
+            console.log("Error writing message: " + err);
+        }
+    });
+};
+
 const sendChannelMessage = function (ctx, channel, msgStruct) {
     msgStruct.unshift(0);
     channel.forEach(function (user) {
@@ -45,13 +55,7 @@ const sendChannelMessage = function (ctx, channel, msgStruct) {
                 return;
             }
         }
-        ctx.store.message(channel.id, JSON.stringify(msgStruct), function (err) {
-            if (err && typeof(err) !== 'function') {
-                // ignore functions because older datastores
-                // might pass waitFors into the callback
-                console.log("Error writing message: " + err);
-            }
-        });
+        storeMessage(ctx, channel, JSON.stringify(msgStruct));
     }
 };
 
@@ -107,8 +111,15 @@ dropUser = function (ctx, user) {
 
 const getHistory = function (ctx, channelName, handler, cb) {
     var messageBuf = [];
+    var messageKey;
     ctx.store.getMessages(channelName, function (msgStr) {
-        messageBuf.push(JSON.parse(msgStr));
+        var parsed = JSON.parse(msgStr);
+        if (parsed.validateKey) {
+            historyKeeperKeys[channelName] = parsed.validateKey;
+            handler(parsed);
+            return;
+        }
+        messageBuf.push(parsed);
     }, function (err) {
         if (err) {
             console.log("Error getting messages " + err.stack);
@@ -177,15 +188,13 @@ const handleMessage = function (ctx, user, msg) {
             try { parsed = JSON.parse(json[2]); } catch (err) { console.error(err); return; }
             if (parsed[0] === 'GET_HISTORY') {
                 sendMsg(ctx, user, [seq, 'ACK']);
-                if (historyKeeperKeys[parsed[1]]) {
-                    var key = {channel: parsed[1], validateKey: historyKeeperKeys[parsed[1]]};
-                    sendMsg(ctx, user, [0, HISTORY_KEEPER_ID, 'MSG', user.id, JSON.stringify(key)])
-                }
                 getHistory(ctx, parsed[1], function (msg) {
                     sendMsg(ctx, user, [0, HISTORY_KEEPER_ID, 'MSG', user.id, JSON.stringify(msg)]);
                 }, function (messages) {
                     // parsed[2] is a validation key if it exists
                     if (messages.length === 0 && parsed[2] && !historyKeeperKeys[parsed[1]]) {
+                        var key = {channel: parsed[1], validateKey: parsed[2]};
+                        storeMessage(ctx, ctx.channels[parsed[1]], JSON.stringify(key));
                         historyKeeperKeys[parsed[1]] = parsed[2];
                     }
                     sendMsg(ctx, user, [0, HISTORY_KEEPER_ID, 'MSG', user.id, 0]);

From 99004428d5ce2cdc697b598970b608e33cf8b572 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 22 Sep 2016 16:09:20 +0200
Subject: [PATCH 10/18] Enable the read-only mode in Cryptpoll

---
 www/code/main.js    |  1 +
 www/poll/index.html |  4 +--
 www/poll/main.js    | 78 ++++++++++++++++++++++++++++++++++++++-------
 3 files changed, 69 insertions(+), 14 deletions(-)

diff --git a/www/code/main.js b/www/code/main.js
index 9841f4511..c9727e1ac 100644
--- a/www/code/main.js
+++ b/www/code/main.js
@@ -151,6 +151,7 @@ define([
 
             var onLocal = config.onLocal = function () {
                 if (initializing) { return; }
+                if (readOnly) { return; }
 
                 editor.save();
                 var textValue = canonicalize($textarea.val());
diff --git a/www/poll/index.html b/www/poll/index.html
index 9981f28b8..fd8fe0dab 100644
--- a/www/poll/index.html
+++ b/www/poll/index.html
@@ -40,7 +40,7 @@
 <div id="toolbar" class="buttons">
     <sub><a href="/"></a></sub>
 </div>
-<h1>CryptPoll</h1>
+<h1 id="mainTitle">CryptPoll</h1>
 <h2 data-localization="poll_subtitle"></h2>
 
 <p data-localization="poll_p_save"></p>
@@ -53,7 +53,7 @@
     <input type="text" id="title" placeholder="title"><br />
     <textarea id="description" placeholder="description"></textarea>
 
-    <p data-localization="poll_p_howtouse"></p>
+    <p id="howToUse" data-localization="poll_p_howtouse"></p>
 
     <!-- Table markup-->
     <table id="table">
diff --git a/www/poll/main.js b/www/poll/main.js
index 3ef0292e7..026f25e26 100644
--- a/www/poll/main.js
+++ b/www/poll/main.js
@@ -39,6 +39,14 @@ define([
     */
 
     var secret = Cryptpad.getSecrets();
+    var readOnly = secret.keys && !secret.keys.editKeyStr;
+    if (!secret.keys) {
+        secret.keys = secret.key;
+    }
+    if (readOnly) {
+        $('#mainTitle').html($('#mainTitle').html() + ' - ' + Messages.readonly);
+        $('#adduser, #addoption, #howToUse').remove();
+    }
 
     var module = window.APP = {
         Cryptpad: Cryptpad,
@@ -139,6 +147,7 @@ define([
     var table = module.table = Table($('#table'), xy);
 
     var setEditable = function (bool) {
+        if (readOnly && bool) { return; }
         module.isEditable = bool;
 
         items.forEach(function ($item) {
@@ -163,6 +172,7 @@ define([
     };
 
     var removeRow = function (proxy, uid) {
+        if (readOnly) { return; }
         // remove proxy.table.rows[uid]
 
         proxy.table.rows[uid] = undefined;
@@ -186,6 +196,7 @@ define([
     };
 
     var removeColumn = function (proxy, uid) {
+        if (readOnly) { return; }
         // remove proxy.table.cols[uid]
         proxy.table.cols[uid] = undefined;
         delete proxy.table.rows[uid];
@@ -212,6 +223,7 @@ define([
     };
 
     var makeUserEditable = module.makeUserEditable = function (id, bool) {
+        if (readOnly) { return; }
         var $name = $('input[type="text"][id="' + id + '"]').attr('disabled', !bool);
 
         var $edit = $name.parent().find('.edit');
@@ -289,6 +301,11 @@ define([
                     });
             });
 
+        if (readOnly) {
+            $edit = '';
+            $remove = '';
+        }
+
         var $wrapper = $('<div>', {
             'class': 'text-cell',
         })
@@ -313,6 +330,7 @@ define([
     };
 
     var makeOptionEditable = function (id, bool) {
+        if (readOnly) { return; }
         if (bool) {
             module.rt.proxy.table.rowsOrder.forEach(function (rowuid) {
                 $('#' + rowuid)
@@ -363,6 +381,11 @@ define([
             });
         });
 
+        if (readOnly) {
+            $edit = '';
+            $remove = '';
+        }
+
         var $wrapper = $('<div>', {
             'class': 'text-cell',
         })
@@ -715,16 +738,33 @@ define([
                 });
         }));
 
-        $toolbar.append(Button({
-            id: 'wizard',
-            'class': 'wizard button action',
-            title: Messages.wizardTitle,
-        }).text(Messages.wizardButton).click(function () {
-            Wizard.show();
-            if (Wizard.hasBeenDisplayed) { return; }
-            Cryptpad.log(Messages.wizardLog);
-            Wizard.hasBeenDisplayed = true;
-        }));
+        if (!readOnly) {
+            $toolbar.append(Button({
+                id: 'wizard',
+                'class': 'wizard button action',
+                title: Messages.wizardTitle,
+            }).text(Messages.wizardButton).click(function () {
+                Wizard.show();
+                if (Wizard.hasBeenDisplayed) { return; }
+                Cryptpad.log(Messages.wizardLog);
+                Wizard.hasBeenDisplayed = true;
+            }));
+        }
+
+        if (!readOnly && module.viewHash) {
+            /* add a 'links' button */
+            var $links = $('<button>', {
+                title: Messages.getViewButtonTitle
+            })
+                .text(Messages.getViewButton)
+                .addClass('button action')
+                .click(function () {
+                    var baseUrl = window.location.origin + window.location.pathname + '#';
+                    var content = '<b>' + Messages.readonlyUrl + '</b><br><a>' + baseUrl + module.viewHash + '</a><br>';
+                    Cryptpad.alert(content);
+                });
+            $toolbar.append($links);
+        }
 
         /* Import/Export buttons */
         /*
@@ -784,6 +824,7 @@ define([
         }
 
         Cryptpad.getPadAttribute('column', function (err, column) {
+            if (readOnly) { return; }
             if (err) {
                 console.log("unable to retrieve column");
                 return;
@@ -831,7 +872,10 @@ define([
         websocketURL: Config.websocketURL,
         channel: secret.channel,
         data: {},
-        crypto: Crypto.createEncryptor(secret.key),
+        // our public key
+        validateKey: secret.keys.validateKey || undefined,
+        readOnly: readOnly,
+        crypto: Crypto.createEncryptor(secret.keys),
     };
 
     // don't initialize until the store is ready.
@@ -840,7 +884,17 @@ define([
         var rt = module.rt = Listmap.create(config);
         rt.proxy.on('create', function (info) {
             var realtime = module.realtime = info.realtime;
-            window.location.hash = Cryptpad.getHashFromKeys(info.channel, secret.key);
+
+            var editHash;
+            var viewHash = module.viewHash = Cryptpad.getViewHashFromKeys(info.channel, secret.keys);
+            if (!readOnly) {
+                editHash = Cryptpad.getEditHashFromKeys(info.channel, secret.keys);
+            }
+            // set the hash
+            if (!readOnly) {
+                window.location.hash = editHash;
+            }
+
             module.patchText = TextPatcher.create({
                 realtime: realtime,
                 logging: true,

From 73d5ea967b77b7a709fa88376cb2486b0e580963 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 22 Sep 2016 16:34:06 +0200
Subject: [PATCH 11/18] Fix an error created by the merge

---
 www/code/main.js | 2 +-
 www/pad/main.js  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/code/main.js b/www/code/main.js
index 41e089e70..684a813f1 100644
--- a/www/code/main.js
+++ b/www/code/main.js
@@ -576,7 +576,7 @@ define([
                 }
 
                 // Update the user list (metadata) from the hyperjson
-                updateUserList(userDoc);
+                updateMetadata(userDoc);
 
                 editor.setValue(newDoc || Messages.codeInitialState);
 
diff --git a/www/pad/main.js b/www/pad/main.js
index 6399da196..f104b4fc4 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -651,7 +651,7 @@ define([
                 applyHjson(shjson);
 
                 // Update the user list (metadata) from the hyperjson
-                updateUserList(shjson);
+                updateMetadata(shjson);
 
                 if (Visible.isSupported()) {
                     Visible.onChange(function (yes) {

From 79884e2400561e19ee9fdd8b5ffb8b054fadc419 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 22 Sep 2016 17:12:46 +0200
Subject: [PATCH 12/18] Use the same username for all pads

---
 www/code/main.js              |  4 ++--
 www/common/cryptpad-common.js | 12 ++++++++++++
 www/pad/main.js               |  4 ++--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/www/code/main.js b/www/code/main.js
index 684a813f1..6fffd26ec 100644
--- a/www/code/main.js
+++ b/www/code/main.js
@@ -186,7 +186,7 @@ define([
                    name: myUserName
                 };
                 addToUserList(myData);
-                Cryptpad.setPadAttribute('username', myUserName, function (err, data) {
+                Cryptpad.setAttribute('username', myUserName, function (err, data) {
                     if (err) {
                         console.log("Couldn't set username");
                         console.error(err);
@@ -197,7 +197,7 @@ define([
             };
 
             var getLastName = function (cb) {
-                Cryptpad.getPadAttribute('username', function (err, userName) {
+                Cryptpad.getAttribute('username', function (err, userName) {
                     cb(err, userName || '');
                 });
             };
diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index 125df6a79..3185f462c 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -318,6 +318,12 @@ define([
             cb(err, data);
         });
     };
+    var setAttribute = common.setAttribute = function (attr, value, cb, legacy) {
+        getStore(legacy).set(["cryptpad", attr].join('.'), value, function (err, data) {
+            cb(err, data);
+        });
+    };
+
 
     // STORAGE
     var getPadAttribute = common.getPadAttribute = function (attr, cb, legacy) {
@@ -325,6 +331,12 @@ define([
             cb(err, data);
         });
     };
+    var getAttribute = common.getAttribute = function (attr, cb, legacy) {
+        getStore(legacy).get(["cryptpad", attr].join('.'), function (err, data) {
+            cb(err, data);
+        });
+    };
+
 
     // STORAGE
     /* fetch and migrate your pad history from localStorage */
diff --git a/www/pad/main.js b/www/pad/main.js
index f104b4fc4..02a0e49f4 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -269,7 +269,7 @@ define([
             };
 
             var getLastName = function (cb) {
-                Cryptpad.getPadAttribute('username', function (err, userName) {
+                Cryptpad.getAttribute('username', function (err, userName) {
                     cb(err, userName || '');
                 });
             };
@@ -287,7 +287,7 @@ define([
                 addToUserList(myData);
                 editor.fire('change');
 
-                Cryptpad.setPadAttribute('username', newName, function (err, data) {
+                Cryptpad.setAttribute('username', newName, function (err, data) {
                     if (err) {
                         console.error("Couldn't set username");
                     }

From d46bd1af5c130577a77504d9fc7efe08b204d6cd Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 22 Sep 2016 17:56:47 +0200
Subject: [PATCH 13/18] Improve the toolbar UI with the username displayed

---
 customize.dist/toolbar.css | 13 ++++---------
 www/common/toolbar.js      | 17 ++++++++++++-----
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/customize.dist/toolbar.css b/customize.dist/toolbar.css
index b03039473..587d45eaf 100644
--- a/customize.dist/toolbar.css
+++ b/customize.dist/toolbar.css
@@ -60,14 +60,6 @@
   margin-right: 5px;
   padding-left: 5px;
 }
-.cryptpad-changeName {
-  float: left;
-  cursor: pointer;
-}
-.cryptpad-changeName button {
-  padding: 0;
-  margin-right: 5px;
-}
 .cryptpad-toolbar-leftside {
   float: left;
 }
@@ -87,4 +79,7 @@
   margin-right: 20px;
   font-weight: bold;
   text-transform: uppercase;
-}
\ No newline at end of file
+}
+.cryptpad-toolbar-username {
+  font-style: italic;
+};
diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index 865529d78..b2be2f5ca 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -27,6 +27,9 @@ define([
 
     var SPINNER_CLS = Bar.constants.spinner = 'cryptpad-spinner';
 
+    var USERNAME_CLS = Bar.constants.username = 'cryptpad-toolbar-username';
+
+    var READONLY_CLS = Bar.constants.readonly = 'cryptpad-readonly';
     /** Key in the localStore which indicates realtime activity should be disallowed. */
     // TODO remove? will never be used in cryptpad
     var LOCALSTORAGE_DISALLOW = Bar.constants.localstorageDisallow = 'cryptpad-disallow';
@@ -121,16 +124,16 @@ define([
       return (i > 0) ? list.slice(0, -2) : list;
     };
 
-    var createChangeName = function($container, userList, buttonID) {
+    var createChangeName = function($container, buttonID) {
         var $span = $('<span>', {
             id: uid(),
         });
         var $button = $('<button>', {
             id: buttonID,
-            'class': USERNAME_BUTTON_GROUP,
+            'class': 'rightside-button',
         }).text(Messages.changeNameButton);
 
-        $(userList).append($button);
+        $container.append($button);
         $button.after($span);
         return $span[0];
     };
@@ -157,7 +160,7 @@ define([
         var innerHTML;
         var numberOfViewUsers = numberOfUsers - userList.length;
         if (readOnly === 1) {
-            innerHTML = '<span class="cryptpad-readonly">' + Messages.readonly + '</span>';
+            innerHTML = '<span class="' + READONLY_CLS + '">' + Messages.readonly + '</span>';
             if (userList.length === 0) {
                 innerHTML += Messages.nobodyIsEditing;
             } else if (userList.length === 1) {
@@ -178,6 +181,9 @@ define([
             }
         }
         innerHTML += getViewers(numberOfViewUsers);
+        if (userData[myUserName] && userData[myUserName].name) {
+            innerHTML = '<span class="' + USERNAME_CLS + '">' + userData[myUserName].name + '</span> | ' + innerHTML;
+        }
         listElement.innerHTML = innerHTML;
     };
 
@@ -226,7 +232,8 @@ define([
         // Check if the user is allowed to change his name
         if(changeNameID) {
             // Create the button and update the element containing the user list
-            userListElement = createChangeName($container, userListElement, changeNameID);
+            //userListElement = createChangeName($container, userListElement, changeNameID);
+            createChangeName(toolbar.find('.' + RIGHTSIDE_CLS), changeNameID);
         }
 
         var connected = false;

From eac0cdd6dd0a493721ac5240eb92dbb583fab0f2 Mon Sep 17 00:00:00 2001
From: Yann Flory <yann.flory@xwiki.com>
Date: Fri, 23 Sep 2016 12:26:06 +0200
Subject: [PATCH 14/18] Enable read-only mode in slides

---
 www/slide/main.js  | 61 +++++++++++++++++++++++++++++++++++++++++-----
 www/slide/slide.js |  4 ++-
 2 files changed, 58 insertions(+), 7 deletions(-)

diff --git a/www/slide/main.js b/www/slide/main.js
index 08947687e..75d84ad02 100644
--- a/www/slide/main.js
+++ b/www/slide/main.js
@@ -32,6 +32,11 @@ define([
     Cryptpad.styleAlerts();
 
     var secret = Cryptpad.getSecrets();
+    var readOnly = secret.keys && !secret.keys.editKeyStr;
+    Slide.readOnly = readOnly;
+    if (!secret.keys) {
+        secret.keys = secret.key;
+    }
 
     var APP = window.APP = {
         TextPatcher: TextPatcher,
@@ -72,14 +77,30 @@ define([
     var $content = $('#content');
     Slide.setModal($modal, $content);
 
+    var enterPresentationMode = function (shouldLog) {
+        Slide.show(true, $textarea.val());
+        if (shouldLog) {
+            Cryptpad.log(Messages.presentSuccess);
+        }
+    };
+
+    if (readOnly) {
+        enterPresentationMode(false);
+    }
+
     var config = APP.config = {
         initialState: '{}',
         websocketURL: Config.websocketURL,
         channel: secret.channel,
-        crypto: Crypto.createEncryptor(secret.key),
+        crypto: Crypto.createEncryptor(secret.keys),
+        validateKey: secret.keys.validateKey || undefined,
+        readOnly: readOnly,
     };
 
-    var setEditable = function (bool) { $textarea.attr('disabled', !bool); };
+    var setEditable = function (bool) {
+        if (readOnly && bool) { return; }
+        $textarea.attr('disabled', !bool);
+    };
     var canonicalize = function (text) { return text.replace(/\r\n/g, '\n'); };
 
     setEditable(false);
@@ -101,6 +122,7 @@ define([
 
     var onLocal = config.onLocal = function () {
         if (initializing) { return; }
+        if (readOnly) { return; }
 
         var textContent = canonicalize($textarea.val());
 
@@ -119,7 +141,13 @@ define([
     };
 
     var onInit = config.onInit = function (info) {
-        window.location.hash = Cryptpad.getHashFromKeys(info.channel, secret.key);
+        var editHash;
+        var viewHash = Cryptpad.getViewHashFromKeys(info.channel, secret.keys);
+        if (!readOnly) {
+            editHash = Cryptpad.getEditHashFromKeys(info.channel, secret.keys);
+            window.location.hash = editHash;
+        }
+
         $(window).on('hashchange', function() {
             window.location.reload();
         });
@@ -147,8 +175,7 @@ define([
         })
         .text(Messages.presentButton)
         .click(function () {
-            Slide.show(true, $textarea.val());
-            Cryptpad.log(Messages.presentSuccess);
+            enterPresentationMode(true);
         });
 
         var $forget = Button({
@@ -247,13 +274,35 @@ define([
             Cryptpad.warn(Messages.shareFailed);
         });
 
+        /* add a 'links' button */
+        var $links = Button({
+            title: Messages.getViewButtonTitle,
+            'class': 'links button action',
+        })
+            .text(Messages.getViewButton)
+            .click(function () {
+                var baseUrl = window.location.origin + window.location.pathname + '#';
+                var content = '<b>' + Messages.readonlyUrl + '</b><br><a>' + baseUrl + viewHash + '</a><br>';
+                Cryptpad.alert(content);
+            });
+
+        if (readOnly) {
+            $links = '';
+            $import = '';
+            $present = '';
+        }
+        if (!viewHash) {
+            $links = '';
+        }
+
         $bar
             .append($present)
             .append($forget)
             .append($rename)
             .append($import)
             .append($export)
-            .append($share);
+            .append($share)
+            .append($links);
     };
     var onRemote = config.onRemote = function (info) {
         if (initializing) { return; }
diff --git a/www/slide/slide.js b/www/slide/slide.js
index 1e2391483..5ab436f10 100644
--- a/www/slide/slide.js
+++ b/www/slide/slide.js
@@ -160,7 +160,9 @@ define([
                 Slide.right();
                 break;
             case 27: // esc
-                show(false);
+                if (!Slide.readOnly) {
+                    show(false);
+                }
                 break;
             default:
                 console.log(e.which);

From 2267ec8c43ddaaa60fa8c59cc82c2cf53c9ae8b0 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Fri, 23 Sep 2016 15:12:07 +0200
Subject: [PATCH 15/18] Slides in read-only were not updated with the latest
 content

---
 www/slide/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/slide/main.js b/www/slide/main.js
index 75d84ad02..9a68983cb 100644
--- a/www/slide/main.js
+++ b/www/slide/main.js
@@ -322,7 +322,7 @@ define([
         elem.selectionStart = selects[0];
         elem.selectionEnd = selects[1];
 
-        Slide.update(content);
+        Slide.update(userDoc);
 
         notify();
     };

From 37c3f127902df0134c456c7e8abf405eccc2e357 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Fri, 23 Sep 2016 15:37:12 +0200
Subject: [PATCH 16/18] Use the new end_of_history message

---
 NetfluxWebsocketSrv.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/NetfluxWebsocketSrv.js b/NetfluxWebsocketSrv.js
index 80778864d..bfb8e4753 100644
--- a/NetfluxWebsocketSrv.js
+++ b/NetfluxWebsocketSrv.js
@@ -197,7 +197,8 @@ const handleMessage = function (ctx, user, msg) {
                         storeMessage(ctx, ctx.channels[parsed[1]], JSON.stringify(key));
                         historyKeeperKeys[parsed[1]] = parsed[2];
                     }
-                    sendMsg(ctx, user, [0, HISTORY_KEEPER_ID, 'MSG', user.id, 0]);
+                    let parsedMsg = {state: 1, channel: parsed[1]};
+                    sendMsg(ctx, user, [0, HISTORY_KEEPER_ID, 'MSG', user.id, JSON.stringify(parsedMsg)]);
                 });
             }
             return;

From a82b7aaf8bbdbf4361cf6c686e4440ad9e7cc9c6 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Fri, 23 Sep 2016 16:06:46 +0200
Subject: [PATCH 17/18] allow empty names

---
 www/pad/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/pad/main.js b/www/pad/main.js
index f104b4fc4..6956d3e43 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -275,7 +275,7 @@ define([
             };
 
             var setName = module.setName = function (newName) {
-                if (!(typeof(newName) === 'string' && newName.trim())) { return; }
+                if (!(typeof(newName) === 'string')) { return; }
                 var myUserNameTemp = Cryptpad.fixHTML(newName.trim());
                 if(myUserNameTemp.length > 32) {
                     myUserNameTemp = myUserNameTemp.substr(0, 32);

From d6525087c7dcd8e7b8302a947420deb0247bb92d Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Fri, 23 Sep 2016 17:53:24 +0200
Subject: [PATCH 18/18] jshint compliancy

---
 www/common/cryptpad-common.js | 3 +--
 www/common/toolbar.js         | 2 +-
 www/pad/main.js               | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index 3185f462c..8aa391496 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -201,8 +201,7 @@ define([
                     }
                     else if (mode === 'view') {
                         secret.channel = base64ToHex(hashArray[3]);
-                        var keys = Crypto.createViewCryptor(hashArray[4].replace(/-/g, '/'));
-                        secret.keys = keys;
+                        secret.keys = Crypto.createViewCryptor(hashArray[4].replace(/-/g, '/'));
                         if (secret.channel.length !== 32) {
                             common.alert("The channel key is invalid");
                             throw new Error("The channel key is invalid");
diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index b2be2f5ca..089195950 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -148,7 +148,7 @@ define([
         if (!n || !parseInt(n) || n === 0) { return ''; }
         if (n === 1) { return '; + ' + Messages.oneViewer; }
         return '; + ' + Messages._getKey('viewers', [n]);
-    }
+    };
     var updateUserList = function (myUserName, listElement, userList, userData, readOnly) {
         var meIdx = userList.indexOf(myUserName);
         if (meIdx === -1) {
diff --git a/www/pad/main.js b/www/pad/main.js
index 74c9e722e..b9ebd657a 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -275,7 +275,7 @@ define([
             };
 
             var setName = module.setName = function (newName) {
-                if (!(typeof(newName) === 'string')) { return; }
+                if (typeof(newName) !== 'string') { return; }
                 var myUserNameTemp = Cryptpad.fixHTML(newName.trim());
                 if(myUserNameTemp.length > 32) {
                     myUserNameTemp = myUserNameTemp.substr(0, 32);
@@ -673,7 +673,7 @@ define([
                     if (typeof(lastName) === 'string' && lastName.length) {
                         setName(lastName);
                     }
-                    onLocal();
+                    realtimeOptions.onLocal();
                 });
             };