From d88dee9a834483036a3d4664e2851dabca281fbc Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 10 Dec 2018 17:47:47 +0100
Subject: [PATCH 1/4] Restrict sending messages in a pad chat to editors only

---
 www/common/common-hash.js       |  1 +
 www/common/common-messenger.js  | 58 +++++++++++++++++++++++++--------
 www/common/outer/async-store.js |  3 ++
 www/common/outer/cursor.js      |  3 +-
 www/common/sframe-common.js     |  7 ++--
 www/common/toolbar3.js          |  2 +-
 www/contacts/messenger-ui.js    |  7 ++--
 7 files changed, 59 insertions(+), 22 deletions(-)

diff --git a/www/common/common-hash.js b/www/common/common-hash.js
index d5066b757..e089852cc 100644
--- a/www/common/common-hash.js
+++ b/www/common/common-hash.js
@@ -12,6 +12,7 @@ define([
     var hexToBase64 = Util.hexToBase64;
     var base64ToHex = Util.base64ToHex;
     Hash.encodeBase64 = Nacl.util.encodeBase64;
+    Hash.decodeBase64 = Nacl.util.decodeBase64;
 
     // This implementation must match that on the server
     // it's used for a checksum
diff --git a/www/common/common-messenger.js b/www/common/common-messenger.js
index 081cd311f..b400d1dae 100644
--- a/www/common/common-messenger.js
+++ b/www/common/common-messenger.js
@@ -26,6 +26,15 @@ define([
         return JSON.parse(JSON.stringify(o));
     };
 
+    var convertToUint8 = function (obj) {
+        var l = Object.keys(obj).length;
+        var u = new Uint8Array(l);
+        for (var i = 0; i<l; i++) {
+            u[i] = obj[i];
+        }
+        return u;
+    };
+
     // TODO
     // - mute a channel (hide notifications or don't open it?)
     var createData = Msg.createData = function (proxy, hash) {
@@ -234,7 +243,7 @@ define([
                 return;
             }
 
-            var decryptedMsg = channel.encryptor.decrypt(parsed0.msg);
+            var decryptedMsg = channel.decrypt(parsed0.msg);
 
             if (decryptedMsg === null) {
                 return void console.error("Failed to decrypt message");
@@ -264,13 +273,14 @@ define([
                 id: channel.id
             });
 
+            if (channel.readOnly) { return; }
             if (parsed[0] !== Types.mapId) { return; } // Don't send your key if it's already an ACK
             // Answer with your own key
             var myData = createData(proxy);
             delete myData.channel;
             var rMsg = [Types.mapIdAck, myData, channel.wc.myID];
             var rMsgStr = JSON.stringify(rMsg);
-            var cryptMsg = channel.encryptor.encrypt(rMsgStr);
+            var cryptMsg = channel.encrypt(rMsgStr);
             var data = {
                 channel: channel.id,
                 msg: cryptMsg
@@ -297,7 +307,7 @@ define([
         var pushMsg = function (channel, cryptMsg) {
             var sig = cryptMsg.slice(0, 64);
             if (msgAlreadyKnown(channel, sig)) { return; }
-            var msg = channel.encryptor.decrypt(cryptMsg);
+            var msg = channel.decrypt(cryptMsg);
 
             var parsedMsg = JSON.parse(msg);
             var curvePublic;
@@ -364,11 +374,11 @@ define([
                     if (!channel) {
                         return void console.error('NO_SUCH_CHANNEL');
                     }
-
+                    if (channel.readOnly) { return; }
 
                     var msg = [Types.update, myData.curvePublic, +new Date(), myData];
                     var msgStr = JSON.stringify(msg);
-                    var cryptMsg = channel.encryptor.encrypt(msgStr);
+                    var cryptMsg = channel.encrypt(msgStr);
                     channel.wc.bcast(cryptMsg).then(function () {
                         // TODO send event
                         //channel.refresh();
@@ -465,7 +475,7 @@ define([
                         if (msg[2] !== 'MSG') { return; }
                         try {
                             return {
-                                d: JSON.parse(channel.encryptor.decrypt(msg[4])),
+                                d: JSON.parse(channel.decrypt(msg[4])),
                                 sig: msg[4].slice(0, 64),
                             };
                         } catch (e) {
@@ -573,7 +583,7 @@ define([
 
             var msg = [Types.unfriend, proxy.curvePublic, +new Date()];
             var msgStr = JSON.stringify(msg);
-            var cryptMsg = channel.encryptor.encrypt(msgStr);
+            var cryptMsg = channel.encrypt(msgStr);
 
             try {
                 channel.wc.bcast(cryptMsg).then(function () {
@@ -602,24 +612,33 @@ define([
                 isFriendChat: data.isFriendChat,
                 isPadChat: data.isPadChat,
                 padChan: data.padChan,
+                readOnly: data.readOnly,
                 sending: false,
-                encryptor: encryptor,
                 messages: [],
                 userList: [],
                 mapId: {},
             };
 
+            channel.encrypt = function (msg) {
+                if (channel.readOnly) { return; }
+                return encryptor.encrypt(msg);
+            };
+            channel.decrypt = data.decrypt || function (msg) {
+                return encryptor.decrypt(msg);
+            };
+
             var onJoining = function (peer) {
                 if (peer === Msg.hk) { return; }
                 if (channel.userList.indexOf(peer) !== -1) { return; }
                 channel.userList.push(peer);
+                if (channel.readOnly) { return; }
 
                 // Join event will be sent once we are able to ID this peer
                 var myData = createData(proxy);
                 delete myData.channel;
                 var msg = [Types.mapId, myData, channel.wc.myID];
                 var msgStr = JSON.stringify(msg);
-                var cryptMsg = channel.encryptor.encrypt(msgStr);
+                var cryptMsg = channel.encrypt(msgStr);
                 var data = {
                     channel: channel.id,
                     msg: cryptMsg
@@ -693,6 +712,7 @@ define([
         var sendMessage = function (id, payload, cb) {
             var channel = getChannel(id);
             if (!channel) { return void cb({error: 'NO_CHANNEL'}); }
+            if (channel.readOnly) { return void cb({error: 'FORBIDDEN'}); }
             if (!network.webChannels.some(function (wc) {
                 if (wc.id === channel.wc.id) { return true; }
             })) {
@@ -706,7 +726,7 @@ define([
                 msg.push(name);
             }
             var msgStr = JSON.stringify(msg);
-            var cryptMsg = channel.encryptor.encrypt(msgStr);
+            var cryptMsg = channel.encrypt(msgStr);
 
             channel.wc.bcast(cryptMsg).then(function () {
                 pushMsg(channel, cryptMsg);
@@ -893,20 +913,32 @@ define([
             }
         };
 
+        var validateKeys = {};
+        messenger.storeValidateKey = function (chan, key) {
+            validateKeys[chan] = key;
+        };
+
         var openPadChat = function (data, cb) {
             var channel = data.channel;
             if (getChannel(channel)) {
                 emit('PADCHAT_READY', channel);
                 return void cb();
             }
-            var keys = data.secret && data.secret.keys;
-            var cryptKey = keys.viewKeyStr ? Crypto.b64AddSlashes(keys.viewKeyStr) : data.secret.key;
-            var encryptor = Crypto.createEncryptor(cryptKey);
+            var secret = data.secret;
+            if (secret.keys.cryptKey) {
+                secret.keys.cryptKey = convertToUint8(secret.keys.cryptKey);
+            }
+            var encryptor = Crypto.createEncryptor(secret.keys);
+            var vKey = (secret.keys && secret.keys.validateKey) || validateKeys[secret.channel];
             var chanData = {
                 padChan: data.secret && data.secret.channel,
+                readOnly: typeof(secret.keys) === "object" && !secret.keys.validateKey,
                 encryptor: encryptor,
                 channel: data.channel,
                 isPadChat: true,
+                decrypt: function (msg) {
+                    return encryptor.decrypt(msg, vKey);
+                },
                 //lastKnownHash: friend.lastKnownHash,
                 //owners: [proxy.edPublic, friend.edPublic],
                 //isFriendChat: true
diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js
index e2b56488e..32b02eb23 100644
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@@ -995,6 +995,9 @@ define([
             var conf = {
                 onReady: function (padData) {
                     channel.data = padData || {};
+                    if (padData && padData.validateKey && store.messenger) {
+                        store.messenger.storeValidateKey(data.channel, padData.validateKey);
+                    }
                     postMessage(clientId, "PAD_READY");
                 },
                 onMessage: function (user, m, validateKey, isCp) {
diff --git a/www/common/outer/cursor.js b/www/common/outer/cursor.js
index 41615c175..709b53a91 100644
--- a/www/common/outer/cursor.js
+++ b/www/common/outer/cursor.js
@@ -107,7 +107,6 @@ define([
             }
 
 
-            chan.encryptor = Crypto.createEncryptor(secret.keys);
             if (!chan.encryptor) { chan.encryptor = Crypto.createEncryptor(secret.keys); }
 
             wc.on('join', function () {
@@ -117,7 +116,7 @@ define([
                 ctx.emit('MESSAGE', {leave: true, id: peer}, chan.clients);
             });
             wc.on('message', function (cryptMsg) {
-                var msg = chan.encryptor.decrypt(cryptMsg, secret.keys.validateKey);
+                var msg = chan.encryptor.decrypt(cryptMsg, secret.keys && secret.keys.validateKey);
                 var parsed;
                 try {
                     parsed = JSON.parse(msg);
diff --git a/www/common/sframe-common.js b/www/common/sframe-common.js
index c64ce8a21..0d631edb7 100644
--- a/www/common/sframe-common.js
+++ b/www/common/sframe-common.js
@@ -173,9 +173,10 @@ define([
     };
     funcs.openPadChat = function (saveChanges) {
         var md = JSON.parse(JSON.stringify(ctx.metadataMgr.getMetadata()));
-        var channel = md.chat || Hash.createChannelId();
-        if (!md.chat) {
-            md.chat = channel;
+        if (md.chat) { delete md.chat; } // Old channel without signing key
+        var channel = md.chat2 || Hash.createChannelId();
+        if (!md.chat2) {
+            md.chat2 = channel;
             ctx.metadataMgr.updateMetadata(md);
             setTimeout(saveChanges);
         }
diff --git a/www/common/toolbar3.js b/www/common/toolbar3.js
index cfc51e7f0..f49f94c0a 100644
--- a/www/common/toolbar3.js
+++ b/www/common/toolbar3.js
@@ -488,7 +488,7 @@ MessengerUI, Messages) {
             show();
         });
 
-        initChat(toolbar, config);
+        initChat(toolbar);
         return $container;
     };
 
diff --git a/www/contacts/messenger-ui.js b/www/contacts/messenger-ui.js
index acf4df66d..e0e4d5c62 100644
--- a/www/contacts/messenger-ui.js
+++ b/www/contacts/messenger-ui.js
@@ -43,6 +43,7 @@ define([
         var sframeChan = common.getSframeChannel();
         var metadataMgr = common.getMetadataMgr();
         var origin = metadataMgr.getPrivateData().origin;
+        var readOnly = metadataMgr.getPrivateData().readOnly;
 
         var isApp = typeof(toolbar) !== "undefined";
 
@@ -358,7 +359,7 @@ define([
                 }, function (e) {
                     if (e) {
                         // failed to send
-                        return void console.error('failed to send');
+                        return void console.error('failed to send', e);
                     }
                     input.value = '';
                     sending = false;
@@ -406,9 +407,9 @@ define([
                 'data-user': data.isFriendChat && curvePublic
             }, [
                 header,
-                tips,
+                readOnly ? undefined : tips,
                 messages,
-                h('div.cp-app-contacts-input', [
+                readOnly ? undefined : h('div.cp-app-contacts-input', [
                     input,
                     sendButton,
                 ]),

From a121df2600f24ba4b98cfb965f1a3994419eb618 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 11 Dec 2018 10:52:11 +0100
Subject: [PATCH 2/4] Delete validateKey in the messenger memory when we leave
 the channel

---
 www/common/common-messenger.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/www/common/common-messenger.js b/www/common/common-messenger.js
index b400d1dae..f6c69f677 100644
--- a/www/common/common-messenger.js
+++ b/www/common/common-messenger.js
@@ -959,6 +959,7 @@ define([
 
         messenger.leavePad = function (padChan) {
             // Leave chat and prevent reconnect when we leave a pad
+            delete validateKeys[padchan];
             Object.keys(channels).some(function (chatChan) {
                 var channel = channels[chatChan];
                 if (channel.padChan !== padChan) { return; }

From fb5ad34299b3260346c52fdf98435698ea980ad8 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 11 Dec 2018 10:57:43 +0100
Subject: [PATCH 3/4] Fix typo...

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

diff --git a/www/common/common-messenger.js b/www/common/common-messenger.js
index f6c69f677..b8ea783a5 100644
--- a/www/common/common-messenger.js
+++ b/www/common/common-messenger.js
@@ -959,7 +959,7 @@ define([
 
         messenger.leavePad = function (padChan) {
             // Leave chat and prevent reconnect when we leave a pad
-            delete validateKeys[padchan];
+            delete validateKeys[padChan];
             Object.keys(channels).some(function (chatChan) {
                 var channel = channels[chatChan];
                 if (channel.padChan !== padChan) { return; }

From 489a99c5c46ae83f9fb9a75e514c3176d332e8fc Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 11 Dec 2018 13:35:00 +0100
Subject: [PATCH 4/4] Don't delete the old chat for now

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

diff --git a/www/common/sframe-common.js b/www/common/sframe-common.js
index 0d631edb7..3c5d47c52 100644
--- a/www/common/sframe-common.js
+++ b/www/common/sframe-common.js
@@ -173,7 +173,7 @@ define([
     };
     funcs.openPadChat = function (saveChanges) {
         var md = JSON.parse(JSON.stringify(ctx.metadataMgr.getMetadata()));
-        if (md.chat) { delete md.chat; } // Old channel without signing key
+        //if (md.chat) { delete md.chat; } // Old channel without signing key
         var channel = md.chat2 || Hash.createChannelId();
         if (!md.chat2) {
             md.chat2 = channel;