From 2df65ed446e5cc3dbd7f65d2d0ef1966ae92aef1 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Thu, 13 Feb 2020 17:51:02 -0500
Subject: [PATCH 01/37] implement 'mkTimeout' method in common-util

---
 www/common/common-util.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/www/common/common-util.js b/www/common/common-util.js
index 1af32103f..da373f1ad 100644
--- a/www/common/common-util.js
+++ b/www/common/common-util.js
@@ -68,6 +68,19 @@
         };
     };
 
+    Util.mkTimeout = function (_f, ms) {
+        ms = ms || 0;
+        var f = Util.once(_f);
+
+        var timeout = setTimeout(function () {
+            f('TIMEOUT');
+        }, ms);
+
+        return Util.both(f, function () {
+            clearTimeout(timeout);
+        });
+    };
+
     Util.response = function () {
         var pending = {};
         var timeouts = {};

From ff895bbc82537f9f316e3b589174d8c4bcddbfdd Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 17 Feb 2020 10:53:04 +0100
Subject: [PATCH 02/37] Move inner files

---
 www/common/common-ui-elements.js     | 58 ++++++++++++++--------------
 www/common/{ => inner}/invitation.js |  0
 www/teams/inner.js                   |  2 +-
 3 files changed, 31 insertions(+), 29 deletions(-)
 rename www/common/{ => inner}/invitation.js (100%)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index fca273e4f..8aba07c18 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -14,7 +14,7 @@ define([
     '/customize/application_config.js',
     '/customize/pages.js',
     '/bower_components/nthen/index.js',
-    '/common/invitation.js',
+    '/common/inner/invitation.js',
 
     'css!/customize/fonts/cptools/style.css',
     '/bower_components/croppie/croppie.min.js',
@@ -100,33 +100,6 @@ define([
         };
     };
 
-    var getPropertiesData = function (common, cb) {
-        var data = {};
-        NThen(function (waitFor) {
-            var base = common.getMetadataMgr().getPrivateData().origin;
-            common.getPadAttribute('', waitFor(function (err, val) {
-                if (err || !val) {
-                    waitFor.abort();
-                    return void cb(err || 'EEMPTY');
-                }
-                if (!val.fileType) {
-                    delete val.owners;
-                    delete val.expire;
-                }
-                Util.extend(data, val);
-                if (data.href) { data.href = base + data.href; }
-                if (data.roHref) { data.roHref = base + data.roHref; }
-            }));
-            common.getPadMetadata(null, waitFor(function (obj) {
-                if (obj && obj.error) { return; }
-                data.owners = obj.owners;
-                data.expire = obj.expire;
-                data.pending_owners = obj.pending_owners;
-            }));
-        }).nThen(function () {
-            cb(void 0, data);
-        });
-    };
     var createOwnerModal = function (common, data) {
         var friends = common.getFriends(true);
         var sframeChan = common.getSframeChannel();
@@ -436,6 +409,7 @@ define([
         }];
         return UI.dialog.customModal(link, {buttons: linkButtons});
     };
+
     var getRightsProperties = function (common, data, cb) {
         var $div = $('<div>');
         if (!data) { return void cb(void 0, $div); }
@@ -864,6 +838,34 @@ define([
 
 
     };
+
+    var getPropertiesData = function (common, cb) {
+        var data = {};
+        NThen(function (waitFor) {
+            var base = common.getMetadataMgr().getPrivateData().origin;
+            common.getPadAttribute('', waitFor(function (err, val) {
+                if (err || !val) {
+                    waitFor.abort();
+                    return void cb(err || 'EEMPTY');
+                }
+                if (!val.fileType) {
+                    delete val.owners;
+                    delete val.expire;
+                }
+                Util.extend(data, val);
+                if (data.href) { data.href = base + data.href; }
+                if (data.roHref) { data.roHref = base + data.roHref; }
+            }));
+            common.getPadMetadata(null, waitFor(function (obj) {
+                if (obj && obj.error) { return; }
+                data.owners = obj.owners;
+                data.expire = obj.expire;
+                data.pending_owners = obj.pending_owners;
+            }));
+        }).nThen(function () {
+            cb(void 0, data);
+        });
+    };
     UIElements.getProperties = function (common, data, cb) {
         var c1;
         var c2;
diff --git a/www/common/invitation.js b/www/common/inner/invitation.js
similarity index 100%
rename from www/common/invitation.js
rename to www/common/inner/invitation.js
diff --git a/www/teams/inner.js b/www/teams/inner.js
index 4dea3e80d..c42e05489 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -15,7 +15,7 @@ define([
     '/common/hyperscript.js',
     '/customize/application_config.js',
     '/common/messenger-ui.js',
-    '/common/invitation.js',
+    '/common/inner/invitation.js',
     '/customize/messages.js',
 
     'css!/bower_components/bootstrap/dist/css/bootstrap.min.css',

From de820dc0d19c7179d59a14ed8d253f9aa03fbbc8 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 17 Feb 2020 14:07:29 +0100
Subject: [PATCH 03/37] Split properties modal into 2 modals

---
 www/common/common-ui-elements.js | 646 ++----------------------------
 www/common/drive-ui.js           |  93 +++--
 www/common/inner/access.js       | 658 +++++++++++++++++++++++++++++++
 3 files changed, 738 insertions(+), 659 deletions(-)
 create mode 100644 www/common/inner/access.js

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 8aba07c18..67c4518fa 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -100,588 +100,8 @@ define([
         };
     };
 
-    var createOwnerModal = function (common, data) {
-        var friends = common.getFriends(true);
-        var sframeChan = common.getSframeChannel();
-        var priv = common.getMetadataMgr().getPrivateData();
-        var user = common.getMetadataMgr().getUserData();
-        var edPublic = priv.edPublic;
-        var channel = data.channel;
-        var owners = data.owners || [];
-        var pending_owners = data.pending_owners || [];
-        var teams = priv.teams;
-        var teamOwner = data.teamId;
-
-        var redrawAll = function () {};
-
-        var div1 = h('div.cp-usergrid-user.cp-share-column.cp-ownership');
-        var div2 = h('div.cp-usergrid-user.cp-share-column.cp-ownership');
-        var $div1 = $(div1);
-        var $div2 = $(div2);
-
-        // Remove owner column
-        var drawRemove = function (pending) {
-            var _owners = {};
-            var o = (pending ? pending_owners : owners) || [];
-            o.forEach(function (ed) {
-                var f;
-                Object.keys(friends).some(function (c) {
-                    if (friends[c].edPublic === ed) {
-                        f = friends[c];
-                        return true;
-                    }
-                });
-                Object.keys(teams).some(function (id) {
-                    if (teams[id].edPublic === ed) {
-                        f = teams[id];
-                        f.teamId = id;
-                    }
-                });
-                if (ed === edPublic) {
-                    f = f || user;
-                    if (f.name) { f.edPublic = edPublic; }
-                }
-                _owners[ed] = f || {
-                    displayName: Messages._getKey('owner_unknownUser', [ed]),
-                    edPublic: ed,
-                };
-            });
-            var msg = pending ? Messages.owner_removePendingText
-                        : Messages.owner_removeText;
-            var removeCol = UIElements.getUserGrid(msg, {
-                common: common,
-                large: true,
-                data: _owners,
-                noFilter: true
-            }, function () {
-            });
-            var $div = $(removeCol.div);
-            // When clicking on the remove button, we check the selected users.
-            // If you try to remove yourself, we'll display an additional warning message
-            var btnMsg = pending ? Messages.owner_removePendingButton : Messages.owner_removeButton;
-            var removeButton = h('button.no-margin', btnMsg);
-            $(removeButton).click(function () {
-                // Check selection
-                var $sel = $div.find('.cp-usergrid-user.cp-selected');
-                var sel = $sel.toArray();
-                if (!sel.length) { return; }
-                var me = false;
-                var toRemove = sel.map(function (el) {
-                    var ed = $(el).attr('data-ed');
-                    if (!ed) { return; }
-                    if (teamOwner && teams[teamOwner] && teams[teamOwner].edPublic === ed) { me = true; }
-                    if (ed === edPublic && !teamOwner) { me = true; }
-                    return ed;
-                }).filter(function (x) { return x; });
-                NThen(function (waitFor) {
-                    var msg = me ? Messages.owner_removeMeConfirm : Messages.owner_removeConfirm;
-                    UI.confirm(msg, waitFor(function (yes) {
-                        if (!yes) {
-                            waitFor.abort();
-                            return;
-                        }
-                    }));
-                }).nThen(function (waitFor) {
-                    // Send the command
-                    sframeChan.query('Q_SET_PAD_METADATA', {
-                        channel: channel,
-                        command: pending ? 'RM_PENDING_OWNERS' : 'RM_OWNERS',
-                        value: toRemove,
-                        teamId: teamOwner
-                    }, waitFor(function (err, res) {
-                        err = err || (res && res.error);
-                        if (err) {
-                            waitFor.abort();
-                            redrawAll();
-                            var text = err === "INSUFFICIENT_PERMISSIONS" ? Messages.fm_forbidden
-                                                                          : Messages.error;
-                            return void UI.warn(text);
-                        }
-                        UI.log(Messages.saved);
-                    }));
-                }).nThen(function (waitFor) {
-                    sel.forEach(function (el) {
-                        var curve = $(el).attr('data-curve');
-                        var friend = curve === user.curvePublic ? user : friends[curve];
-                        if (!friend) { return; }
-                        common.mailbox.sendTo("RM_OWNER", {
-                            channel: channel,
-                            title: data.title,
-                            pending: pending
-                        }, {
-                            channel: friend.notifications,
-                            curvePublic: friend.curvePublic
-                        }, waitFor());
-                    });
-                }).nThen(function () {
-                    redrawAll();
-                });
-            });
-            $div.append(h('p', removeButton));
-            return $div;
-        };
-
-        // Add owners column
-        var drawAdd = function () {
-            var $div = $(h('div.cp-share-column'));
-            var _friends = JSON.parse(JSON.stringify(friends));
-            Object.keys(_friends).forEach(function (curve) {
-                if (owners.indexOf(_friends[curve].edPublic) !== -1 ||
-                    pending_owners.indexOf(_friends[curve].edPublic) !== -1 ||
-                    !_friends[curve].notifications) {
-                    delete _friends[curve];
-                }
-            });
-            var addCol = UIElements.getUserGrid(Messages.owner_addText, {
-                common: common,
-                large: true,
-                data: _friends
-            }, function () {
-                //console.log(arguments);
-            });
-            $div.append(addCol.div);
-
-            var teamsData = Util.tryParse(JSON.stringify(priv.teams)) || {};
-            Object.keys(teamsData).forEach(function (id) {
-                var t = teamsData[id];
-                t.teamId = id;
-                if (owners.indexOf(t.edPublic) !== -1 || pending_owners.indexOf(t.edPublic) !== -1) {
-                    delete teamsData[id];
-                }
-            });
-            var teamsList = UIElements.getUserGrid(Messages.owner_addTeamText, {
-                common: common,
-                large: true,
-                noFilter: true,
-                data: teamsData
-            }, function () {});
-            $div.append(teamsList.div);
-
-            // When clicking on the add button, we get the selected users.
-            var addButton = h('button.no-margin', Messages.owner_addButton);
-            $(addButton).click(function () {
-                // Check selection
-                var $sel = $div.find('.cp-usergrid-user.cp-selected');
-                var sel = $sel.toArray();
-                if (!sel.length) { return; }
-                var toAdd = sel.map(function (el) {
-                    var curve = $(el).attr('data-curve');
-                    // If the pad is woned by a team, we can transfer ownership to ourselves
-                    if (curve === user.curvePublic && teamOwner) { return priv.edPublic; }
-                    var friend = friends[curve];
-                    if (!friend) { return; }
-                    return friend.edPublic;
-                }).filter(function (x) { return x; });
-                var toAddTeams = sel.map(function (el) {
-                    var team = teamsData[$(el).attr('data-teamid')];
-                    if (!team || !team.edPublic) { return; }
-                    return {
-                        edPublic: team.edPublic,
-                        id: $(el).attr('data-teamid')
-                    };
-                }).filter(function (x) { return x; });
-
-                NThen(function (waitFor) {
-                    var msg = Messages.owner_addConfirm;
-                    UI.confirm(msg, waitFor(function (yes) {
-                        if (!yes) {
-                            waitFor.abort();
-                            return;
-                        }
-                    }));
-                }).nThen(function (waitFor) {
-                    // Add one of our teams as an owner
-                    if (toAddTeams.length) {
-                        // Send the command
-                        sframeChan.query('Q_SET_PAD_METADATA', {
-                            channel: channel,
-                            command: 'ADD_OWNERS',
-                            value: toAddTeams.map(function (obj) { return obj.edPublic; }),
-                            teamId: teamOwner
-                        }, waitFor(function (err, res) {
-                            err = err || (res && res.error);
-                            if (err) {
-                                waitFor.abort();
-                                redrawAll();
-                                var text = err === "INSUFFICIENT_PERMISSIONS" ?
-                                        Messages.fm_forbidden : Messages.error;
-                                return void UI.warn(text);
-                            }
-                            var isTemplate = priv.isTemplate || data.isTemplate;
-                            toAddTeams.forEach(function (obj) {
-                                sframeChan.query('Q_STORE_IN_TEAM', {
-                                    href: data.href || data.rohref,
-                                    password: data.password,
-                                    path: isTemplate ? ['template'] : undefined,
-                                    title: data.title || '',
-                                    teamId: obj.id
-                                }, waitFor(function (err) {
-                                    if (err) { return void console.error(err); }
-                                }));
-                            });
-                        }));
-                    }
-                }).nThen(function (waitFor) {
-                    // Offer ownership to a friend
-                    if (toAdd.length) {
-                        // Send the command
-                        sframeChan.query('Q_SET_PAD_METADATA', {
-                            channel: channel,
-                            command: 'ADD_PENDING_OWNERS',
-                            value: toAdd,
-                            teamId: teamOwner
-                        }, waitFor(function (err, res) {
-                            err = err || (res && res.error);
-                            if (err) {
-                                waitFor.abort();
-                                redrawAll();
-                                var text = err === "INSUFFICIENT_PERMISSIONS" ? Messages.fm_forbidden
-                                                                              : Messages.error;
-                                return void UI.warn(text);
-                            }
-                        }));
-                    }
-                }).nThen(function (waitFor) {
-                    sel.forEach(function (el) {
-                        var curve = $(el).attr('data-curve');
-                        var friend = curve === user.curvePublic ? user : friends[curve];
-                        if (!friend) { return; }
-                        common.mailbox.sendTo("ADD_OWNER", {
-                            channel: channel,
-                            href: data.href,
-                            password: data.password,
-                            title: data.title
-                        }, {
-                            channel: friend.notifications,
-                            curvePublic: friend.curvePublic
-                        }, waitFor());
-                    });
-                }).nThen(function () {
-                    redrawAll();
-                    UI.log(Messages.saved);
-                });
-            });
-            $div.append(h('p', addButton));
-            return $div;
-        };
-
-        redrawAll = function (md) {
-            var todo = function (obj) {
-                if (obj && obj.error) { return; }
-                owners = obj.owners || [];
-                pending_owners = obj.pending_owners || [];
-                $div1.empty();
-                $div2.empty();
-                $div1.append(drawRemove(false)).append(drawRemove(true));
-                $div2.append(drawAdd());
-            };
-
-            if (md) { return void todo(md); }
-            common.getPadMetadata({
-                channel: data.channel
-            }, todo);
-        };
-
-        $div1.append(drawRemove(false)).append(drawRemove(true));
-        $div2.append(drawAdd());
-
-        var handler = sframeChan.on('EV_RT_METADATA', function (md) {
-            if (!$div1.length) {
-                return void handler.stop();
-            }
-            owners = md.owners || [];
-            pending_owners = md.pending_owners || [];
-            redrawAll(md);
-        });
-
-        // Create modal
-        var link = h('div.cp-share-columns', [
-            div1,
-            div2
-            /*drawRemove()[0],
-            drawAdd()[0]*/
-        ]);
-        var linkButtons = [{
-            className: 'cancel',
-            name: Messages.filePicker_close,
-            onClick: function () {},
-            keys: [27]
-        }];
-        return UI.dialog.customModal(link, {buttons: linkButtons});
-    };
-
-    var getRightsProperties = function (common, data, cb) {
-        var $div = $('<div>');
-        if (!data) { return void cb(void 0, $div); }
-
-        var draw = function () {
-            var $d = $('<div>');
-            var priv = common.getMetadataMgr().getPrivateData();
-            var user = common.getMetadataMgr().getUserData();
-            var edPublic = priv.edPublic;
-            var owned = false;
-            var _owners = {};
-            if (data.owners && data.owners.length) {
-                if (data.owners.indexOf(edPublic) !== -1) {
-                    owned = true;
-                } else {
-                    Object.keys(priv.teams || {}).some(function (id) {
-                        var team = priv.teams[id] || {};
-                        if (team.viewer) { return; }
-                        if (data.owners.indexOf(team.edPublic) === -1) { return; }
-                        owned = id;
-                        return true;
-                    });
-                }
-                var strangers = 0;
-                data.owners.forEach(function (ed) {
-                    // If a friend is an owner, add their name to the list
-                    // otherwise, increment the list of strangers
-
-                    // Our edPublic? print "Yourself"
-                    if (ed === edPublic) {
-                        _owners[ed] = {
-                            selected: true,
-                            name: user.name,
-                            avatar: user.avatar
-                        };
-                        return;
-                    }
-                    // One of our teams? print the team name
-                    if (Object.keys(priv.teams || {}).some(function (id) {
-                        var team = priv.teams[id] || {};
-                        if (team.edPublic !== ed) { return; }
-                        _owners[ed] = {
-                            name: team.name,
-                            avatar: team.avatar
-                        };
-                        return true;
-                    })) {
-                        return;
-                    }
-                    // One of our friends? print the friend name
-                    if (Object.keys(priv.friends || {}).some(function (c) {
-                        var friend = priv.friends[c] || {};
-                        if (friend.edPublic !== ed || c === 'me') { return; }
-                        _owners[friend.edPublic] = {
-                            name: friend.displayName,
-                            avatar: friend.avatar
-                        };
-                        return true;
-                    })) {
-                        return;
-                    }
-                    // Otherwise it's a stranger
-                    strangers++;
-                });
-                if (strangers) {
-                    _owners['stangers'] = {
-                        name: Messages._getKey('properties_unknownUser', [strangers]),
-                    };
-                }
-            }
-            var _ownersGrid = UIElements.getUserGrid(Messages.creation_owners, {
-                common: common,
-                noSelect: true,
-                data: _owners,
-                large: true
-            }, function () {});
-            if (_ownersGrid && Object.keys(_owners).length) {
-                $d.append(_ownersGrid.div);
-            } else {
-                $d.append([
-                    h('label', Messages.creation_owners),
-                ]);
-                $d.append(UI.dialog.selectable(Messages.creation_noOwner, {
-                    id: 'cp-app-prop-owners',
-                }));
-
-            }
-
-            var parsed;
-            if (data.href || data.roHref) {
-                parsed = Hash.parsePadUrl(data.href || data.roHref);
-            }
-            if (owned && parsed.hashData.type === 'pad') {
-                var manageOwners = h('button.no-margin', Messages.owner_openModalButton);
-                $(manageOwners).click(function () {
-                    data.teamId = typeof(owned) !== "boolean" ? owned : undefined;
-                    var modal = createOwnerModal(common, data);
-                    UI.openCustomModal(modal, {
-                        wide: true,
-                    });
-                });
-                $d.append(h('p', manageOwners));
-            }
-
-            if (!data.noExpiration) {
-                var expire = Messages.creation_expireFalse;
-                if (data.expire && typeof (data.expire) === "number") {
-                    expire = new Date(data.expire).toLocaleString();
-                }
-                $('<label>', {'for': 'cp-app-prop-expire'}).text(Messages.creation_expiration)
-                    .appendTo($d);
-                $d.append(UI.dialog.selectable(expire, {
-                    id: 'cp-app-prop-expire',
-                }));
-            }
-
-            if (!data.noPassword) {
-                var hasPassword = data.password;
-                var $pwLabel = $('<label>', {'for': 'cp-app-prop-password'}).text(Messages.creation_passwordValue)
-                                .hide().appendTo($d);
-                var password = UI.passwordInput({
-                    id: 'cp-app-prop-password',
-                    readonly: 'readonly'
-                });
-                var $password = $(password).hide();
-                var $pwInput = $password.find('.cp-password-input');
-                $pwInput.val(data.password).click(function () {
-                    $pwInput[0].select();
-                });
-                $d.append(password);
-
-                if (hasPassword) {
-                    $pwLabel.show();
-                    $password.css('display', 'flex');
-                }
-
-                // In the properties, we should have the edit href if we know it.
-                // We should know it because the pad is stored, but it's better to check...
-                if (!data.noEditPassword && owned && data.href) { // FIXME SHEET fix password change for sheets
-                    var sframeChan = common.getSframeChannel();
-
-                    var isOO = parsed.type === 'sheet';
-                    var isFile = parsed.hashData.type === 'file';
-                    var isSharedFolder = parsed.type === 'drive';
-
-                    var changePwTitle = Messages.properties_changePassword;
-                    var changePwConfirm = isFile ? Messages.properties_confirmChangeFile : Messages.properties_confirmChange;
-                    if (!hasPassword) {
-                        changePwTitle = Messages.properties_addPassword;
-                        changePwConfirm = isFile ? Messages.properties_confirmNewFile : Messages.properties_confirmNew;
-                    }
-                    $('<label>', {'for': 'cp-app-prop-change-password'})
-                        .text(changePwTitle).appendTo($d);
-                    var newPassword = UI.passwordInput({
-                        id: 'cp-app-prop-change-password',
-                        style: 'flex: 1;'
-                    });
-                    var passwordOk = h('button', Messages.properties_changePasswordButton);
-                    var changePass = h('span.cp-password-change-container', [
-                        newPassword,
-                        passwordOk
-                    ]);
-                    var pLocked = false;
-                    $(passwordOk).click(function () {
-                        var newPass = $(newPassword).find('input').val();
-                        if (data.password === newPass ||
-                            (!data.password && !newPass)) {
-                            return void UI.alert(Messages.properties_passwordSame);
-                        }
-                        if (pLocked) { return; }
-                        pLocked = true;
-                        UI.confirm(changePwConfirm, function (yes) {
-                            if (!yes) { pLocked = false; return; }
-                            $(passwordOk).html('').append(h('span.fa.fa-spinner.fa-spin', {style: 'margin-left: 0'}));
-                            var q = isFile ? 'Q_BLOB_PASSWORD_CHANGE' :
-                                        (isOO ? 'Q_OO_PASSWORD_CHANGE' : 'Q_PAD_PASSWORD_CHANGE');
-
-                            // If this is a file password change, register to the upload events:
-                            // * if there is a pending upload, ask if we shoudl interrupt
-                            // * display upload progress
-                            var onPending;
-                            var onProgress;
-                            if (isFile) {
-                                onPending = sframeChan.on('Q_BLOB_PASSWORD_CHANGE_PENDING', function (data, cb) {
-                                    onPending.stop();
-                                    UI.confirm(Messages.upload_uploadPending, function (yes) {
-                                        cb({cancel: yes});
-                                    });
-                                });
-                                onProgress = sframeChan.on('EV_BLOB_PASSWORD_CHANGE_PROGRESS', function (data) {
-                                    if (typeof (data) !== "number") { return; }
-                                    var p = Math.round(data);
-                                    $(passwordOk).text(p + '%');
-                                });
-                            }
-
-                            sframeChan.query(q, {
-                                teamId: typeof(owned) !== "boolean" ? owned : undefined,
-                                href: data.href,
-                                password: newPass
-                            }, function (err, data) {
-                                $(passwordOk).text(Messages.properties_changePasswordButton);
-                                pLocked = false;
-                                if (err || data.error) {
-                                    console.error(err || data.error);
-                                    return void UI.alert(Messages.properties_passwordError);
-                                }
-                                UI.findOKButton().click();
-
-                                $pwLabel.show();
-                                $password.css('display', 'flex');
-                                $pwInput.val(newPass);
-
-                                // If the current document is a file or if we're changing the password from a drive,
-                                // we don't have to reload the page at the end.
-                                // Tell the user the password change was successful and abort
-                                if (isFile || priv.app !== parsed.type) {
-                                    if (onProgress && onProgress.stop) { onProgress.stop(); }
-                                    $(passwordOk).text(Messages.properties_changePasswordButton);
-                                    var alertMsg = data.warning ? Messages.properties_passwordWarningFile
-                                                                : Messages.properties_passwordSuccessFile;
-                                    return void UI.alert(alertMsg, undefined, {force: true});
-                                }
-
-                                // Pad password changed: update the href
-                                // Use hidden hash if needed (we're an owner of this pad so we know it is stored)
-                                var useUnsafe = Util.find(priv, ['settings', 'security', 'unsafeLinks']);
-                                var href = (priv.readOnly && data.roHref) ? data.roHref : data.href;
-                                if (useUnsafe === false) {
-                                    var newParsed = Hash.parsePadUrl(href);
-                                    var newSecret = Hash.getSecrets(newParsed.type, newParsed.hash, newPass);
-                                    var newHash = Hash.getHiddenHashFromKeys(parsed.type, newSecret, {});
-                                    href = Hash.hashToHref(newHash, parsed.type);
-                                }
-
-                                if (data.warning) {
-                                    return void UI.alert(Messages.properties_passwordWarning, function () {
-                                        common.gotoURL(href);
-                                    }, {force: true});
-                                }
-                                return void UI.alert(Messages.properties_passwordSuccess, function () {
-                                    if (!isSharedFolder) {
-                                        common.gotoURL(href);
-                                    }
-                                }, {force: true});
-                            });
-                        });
-                    });
-                    $d.append(changePass);
-                }
-            }
-            return $d;
-        };
-
-        var sframeChan = common.getSframeChannel();
-        var handler = sframeChan.on('EV_RT_METADATA', function (md) {
-            if (!$div.length) {
-                handler.stop();
-                return;
-            }
-            md = JSON.parse(JSON.stringify(md));
-            data.owners = md.owners;
-            data.expire = md.expire;
-            data.pending_owners = md.pending_owners;
-            $div.empty();
-            $div.append(draw());
-        });
-        $div.append(draw());
-
-        cb(void 0, $div);
-    };
-    var getPadProperties = function (common, data, cb) {
+    var getPadProperties = function (common, data, opts, cb) {
+        opts = opts || {};
         var $d = $('<div>');
         if (!data) { return void cb(void 0, $d); }
 
@@ -695,7 +115,7 @@ define([
             }));
         }
 
-        if (data.roHref) {
+        if (data.roHref && !opts.noReadOnly) {
             $('<label>', {'for': 'cp-app-prop-rolink'}).text(Messages.viewShare).appendTo($d);
             $d.append(UI.dialog.selectable(data.roHref, {
                 id: 'cp-app-prop-rolink',
@@ -839,7 +259,8 @@ define([
 
     };
 
-    var getPropertiesData = function (common, cb) {
+    var getPropertiesData = function (common, opts, cb) {
+        opts = opts || {};
         var data = {};
         NThen(function (waitFor) {
             var base = common.getMetadataMgr().getPrivateData().origin;
@@ -855,46 +276,33 @@ define([
                 Util.extend(data, val);
                 if (data.href) { data.href = base + data.href; }
                 if (data.roHref) { data.roHref = base + data.roHref; }
-            }));
-            common.getPadMetadata(null, waitFor(function (obj) {
-                if (obj && obj.error) { return; }
-                data.owners = obj.owners;
-                data.expire = obj.expire;
-                data.pending_owners = obj.pending_owners;
-            }));
+            }), opts.href);
         }).nThen(function () {
             cb(void 0, data);
         });
     };
-    UIElements.getProperties = function (common, data, cb) {
-        var c1;
-        var c2;
-        var button = [{
-            className: 'primary',
-            name: Messages.okButton,
-            onClick: function () {},
-            keys: [13]
-        }];
+    UIElements.getProperties = function (common, opts, cb) {
+        var data;
+        var content;
         NThen(function (waitFor) {
-            getPadProperties(common, data, waitFor(function (e, c) {
-                c1 = UI.dialog.customModal(c[0], {
-                    buttons: button
-                });
+            getPropertiesData(common, opts, waitFor(function (e, _data) {
+                if (e) {
+                    waitFor.abort();
+                    return void cb(e);
+                }
+                data = _data;
             }));
-            getRightsProperties(common, data, waitFor(function (e, c) {
-                c2 = UI.dialog.customModal(c[0], {
-                    buttons: button
-                });
+        }).nThen(function (waitFor) {
+            getPadProperties(common, data, opts, waitFor(function (e, c) {
+                if (e) {
+                    waitFor.abort();
+                    return void cb(e);
+                }
+                content = c[0];
             }));
         }).nThen(function () {
-            var tabs = UI.dialog.tabs([{
-                title: Messages.fc_prop,
-                content: c1
-            }, {
-                title: Messages.creation_propertiesTitle,
-                content: c2
-            }]);
-            cb (void 0, $(tabs));
+            var modal = UI.alert(content);
+            cb (void 0, modal);
         });
     };
 
@@ -2382,12 +1790,8 @@ define([
                         if (!data) {
                             return void UI.alert(Messages.autostore_notAvailable);
                         }
-                        getPropertiesData(common, function (e, data) {
+                        UIElements.getProperties(common, {}, function (e) {
                             if (e) { return void console.error(e); }
-                            UIElements.getProperties(common, data, function (e, $prop) {
-                                if (e) { return void console.error(e); }
-                                UI.openCustomModal($prop[0]);
-                            });
                         });
                     });
                 });
diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 37a1ad7e6..ce3299af5 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -8,6 +8,9 @@ define([
     '/common/common-interface.js',
     '/common/common-constants.js',
     '/common/common-feedback.js',
+
+    '/common/inner/access.js',
+
     '/bower_components/nthen/index.js',
     '/common/hyperscript.js',
     '/common/proxy-manager.js',
@@ -23,6 +26,7 @@ define([
     UI,
     Constants,
     Feedback,
+    Access,
     nThen,
     h,
     ProxyManager,
@@ -79,6 +83,7 @@ define([
     var faColor = 'cptools-palette';
     var faTrash = 'fa-trash';
     var faDelete = 'fa-eraser';
+    var faAccess = 'fa-unlock-alt';
     var faProperties = 'fa-info-circle';
     var faTags = 'fa-hashtag';
     var faUploadFiles = 'cptools-file-upload';
@@ -448,6 +453,10 @@ define([
                     'data-icon': faDelete,
                 }, Messages.fc_remove_sharedfolder)),
                 $separator.clone()[0],
+                h('li', h('a.cp-app-drive-context-access.dropdown-item', {
+                    'tabindex': '-1',
+                    'data-icon': faAccess,
+                }, "ACCESS")), // XXX
                 h('li', h('a.cp-app-drive-context-properties.dropdown-item', {
                     'tabindex': '-1',
                     'data-icon': faProperties,
@@ -1203,7 +1212,7 @@ define([
                         hide.push('savelocal');
                         hide.push('openro');
                         hide.push('openincode');
-                        hide.push('properties');
+                        hide.push('properties', 'access');
                         hide.push('hashtag');
                     }
                     // If we're in the trash, hide restore and properties for non-root elements
@@ -1233,7 +1242,7 @@ define([
                 });
                 if (paths.length > 1) {
                     hide.push('restore');
-                    hide.push('properties');
+                    hide.push('properties', 'access');
                     hide.push('rename');
                     hide.push('openparent');
                     hide.push('hashtag');
@@ -1259,10 +1268,10 @@ define([
                 case 'tree':
                     show = ['open', 'openro', 'openincode', 'expandall', 'collapseall',
                             'color', 'download', 'share', 'savelocal', 'rename', 'delete',
-                            'deleteowned', 'removesf', 'properties', 'hashtag'];
+                            'deleteowned', 'removesf', 'properties', 'access', 'hashtag'];
                     break;
                 case 'default':
-                    show = ['open', 'openro', 'share', 'openparent', 'delete', 'deleteowned', 'properties', 'hashtag'];
+                    show = ['open', 'openro', 'share', 'openparent', 'delete', 'deleteowned', 'properties', 'access', 'hashtag'];
                     break;
                 case 'trashtree': {
                     show = ['empty'];
@@ -3074,9 +3083,8 @@ define([
                             }).appendTo($openDir);
                         }
                         $('<a>').text(Messages.fc_prop).click(function () {
-                            APP.getProperties(r.id, function (e, $prop) {
+                            APP.getProperties(r.id, function (e) {
                                 if (e) { return void logError(e); }
-                                UI.alert($prop[0], undefined, true);
                             });
                         }).appendTo($openDir);
                     }
@@ -3824,12 +3832,11 @@ define([
             }
         };
 
-        var getProperties = APP.getProperties = function (el, cb) {
+        APP.getProperties = function (el, cb) {
             if (!manager.isFile(el) && !manager.isSharedFolder(el)) {
                 return void cb('NOT_FILE');
             }
             //var ro = manager.isReadOnlyFile(el);
-            var base = APP.origin;
             var data;
             if (manager.isSharedFolder(el)) {
                 data = JSON.parse(JSON.stringify(manager.getSharedFolderData(el)));
@@ -3838,42 +3845,42 @@ define([
             }
             if (!data || !(data.href || data.roHref)) { return void cb('INVALID_FILE'); }
 
-            if (data.href) {
-                data.href = base + data.href;
+            var opts = {};
+            opts.href = Hash.getRelativeHref(data.href || data.roHref);
+
+            if (manager.isSharedFolder(el)) {
+                var ro = folders[el] && folders[el].version >= 2;
+                if (!ro) { opts.noReadOnly = true; }
             }
-            if (data.roHref) {
-                data.roHref = base + data.roHref;
+            UIElements.getProperties(common, opts, cb);
+        };
+        APP.getAccess = function (el, cb) {
+            if (!manager.isFile(el) && !manager.isSharedFolder(el)) {
+                return void cb('NOT_FILE');
+            }
+            var data;
+            if (manager.isSharedFolder(el)) {
+                data = JSON.parse(JSON.stringify(manager.getSharedFolderData(el)));
+            } else {
+                data = JSON.parse(JSON.stringify(manager.getFileData(el)));
             }
+            if (!data || !(data.href || data.roHref)) { return void cb('INVALID_FILE'); }
+
+            var opts = {};
+            opts.href = Hash.getRelativeHref(data.href || data.roHref);
+            opts.channel = data.channel;
 
+            // Transfer ownership: templates are stored as templates for other users/teams
             if (currentPath[0] === TEMPLATE) {
-                data.isTemplate = true;
+                opts.isTemplate = true;
             }
 
+            // Shared folders: no expiration date
             if (manager.isSharedFolder(el)) {
-                var ro = folders[el] && folders[el].version >= 2;
-                if (!ro) { delete data.roHref; }
-                //data.noPassword = true;
-                //data.noEditPassword = true;
-                data.noExpiration = true;
-                // this is here to allow users to check the channel id of a shared folder
-                // we should remove it at some point
-                data.sharedFolder = true;
-            }
-
-            if ((manager.isFile(el) && data.roHref) || manager.isSharedFolder(el)) { // Only for pads!
-                sframeChan.query('Q_GET_PAD_METADATA', {
-                    channel: data.channel
-                }, function (err, val) {
-                    if (!err && !(val && val.error)) {
-                        data.owners = val.owners;
-                        data.expire = val.expire;
-                        data.pending_owners = val.pending_owners;
-                    }
-                    UIElements.getProperties(common, data, cb);
-                });
-                return;
+                opts.noExpiration = true;
             }
-            UIElements.getProperties(common, data, cb);
+
+            Access.getAccessModal(common, opts, cb);
         };
 
         if (!APP.loggedIn) {
@@ -4218,9 +4225,19 @@ define([
                     // ANON_SHARED_FOLDER
                     el = manager.find(paths[0].path.slice(1), APP.newSharedFolder);
                 }
-                getProperties(el, function (e, $prop) {
+                APP.getProperties(el, function (e) {
+                    if (e) { return void logError(e); }
+                });
+            }
+            else if ($this.hasClass("cp-app-drive-context-access")) {
+                if (paths.length !== 1) { return; }
+                el = manager.find(paths[0].path);
+                if (paths[0].path[0] === SHARED_FOLDER && APP.newSharedFolder) {
+                    // ANON_SHARED_FOLDER
+                    el = manager.find(paths[0].path.slice(1), APP.newSharedFolder);
+                }
+                APP.getAccess(el, function (e) {
                     if (e) { return void logError(e); }
-                    UI.openCustomModal($prop[0]);
                 });
             }
             else if ($this.hasClass("cp-app-drive-context-hashtag")) {
diff --git a/www/common/inner/access.js b/www/common/inner/access.js
new file mode 100644
index 000000000..139a52d64
--- /dev/null
+++ b/www/common/inner/access.js
@@ -0,0 +1,658 @@
+define([
+    'jquery',
+    '/common/common-util.js',
+    '/common/common-hash.js',
+    '/common/common-interface.js',
+    '/common/common-ui-elements.js',
+    '/common/hyperscript.js',
+    '/customize/messages.js',
+    '/bower_components/nthen/index.js',
+], function ($, Util, Hash, UI, UIElements, h,
+             Messages, nThen) {
+console.log(UI, UIElements, h);
+
+    var Access = {};
+
+    var createOwnerModal = function (common, data) {
+        var friends = common.getFriends(true);
+        var sframeChan = common.getSframeChannel();
+        var priv = common.getMetadataMgr().getPrivateData();
+        var user = common.getMetadataMgr().getUserData();
+        var edPublic = priv.edPublic;
+        var channel = data.channel;
+        var owners = data.owners || [];
+        var pending_owners = data.pending_owners || [];
+        var teams = priv.teams;
+        var teamOwner = data.teamId;
+
+        var redrawAll = function () {};
+
+        var div1 = h('div.cp-usergrid-user.cp-share-column.cp-ownership');
+        var div2 = h('div.cp-usergrid-user.cp-share-column.cp-ownership');
+        var $div1 = $(div1);
+        var $div2 = $(div2);
+
+        // Remove owner column
+        var drawRemove = function (pending) {
+            var _owners = {};
+            var o = (pending ? pending_owners : owners) || [];
+            o.forEach(function (ed) {
+                var f;
+                Object.keys(friends).some(function (c) {
+                    if (friends[c].edPublic === ed) {
+                        f = friends[c];
+                        return true;
+                    }
+                });
+                Object.keys(teams).some(function (id) {
+                    if (teams[id].edPublic === ed) {
+                        f = teams[id];
+                        f.teamId = id;
+                    }
+                });
+                if (ed === edPublic) {
+                    f = f || user;
+                    if (f.name) { f.edPublic = edPublic; }
+                }
+                _owners[ed] = f || {
+                    displayName: Messages._getKey('owner_unknownUser', [ed]),
+                    edPublic: ed,
+                };
+            });
+            var msg = pending ? Messages.owner_removePendingText
+                        : Messages.owner_removeText;
+            var removeCol = UIElements.getUserGrid(msg, {
+                common: common,
+                large: true,
+                data: _owners,
+                noFilter: true
+            }, function () {
+            });
+            var $div = $(removeCol.div);
+            // When clicking on the remove button, we check the selected users.
+            // If you try to remove yourself, we'll display an additional warning message
+            var btnMsg = pending ? Messages.owner_removePendingButton : Messages.owner_removeButton;
+            var removeButton = h('button.no-margin', btnMsg);
+            $(removeButton).click(function () {
+                // Check selection
+                var $sel = $div.find('.cp-usergrid-user.cp-selected');
+                var sel = $sel.toArray();
+                if (!sel.length) { return; }
+                var me = false;
+                var toRemove = sel.map(function (el) {
+                    var ed = $(el).attr('data-ed');
+                    if (!ed) { return; }
+                    if (teamOwner && teams[teamOwner] && teams[teamOwner].edPublic === ed) { me = true; }
+                    if (ed === edPublic && !teamOwner) { me = true; }
+                    return ed;
+                }).filter(function (x) { return x; });
+                nThen(function (waitFor) {
+                    var msg = me ? Messages.owner_removeMeConfirm : Messages.owner_removeConfirm;
+                    UI.confirm(msg, waitFor(function (yes) {
+                        if (!yes) {
+                            waitFor.abort();
+                            return;
+                        }
+                    }));
+                }).nThen(function (waitFor) {
+                    // Send the command
+                    sframeChan.query('Q_SET_PAD_METADATA', {
+                        channel: channel,
+                        command: pending ? 'RM_PENDING_OWNERS' : 'RM_OWNERS',
+                        value: toRemove,
+                        teamId: teamOwner
+                    }, waitFor(function (err, res) {
+                        err = err || (res && res.error);
+                        if (err) {
+                            waitFor.abort();
+                            redrawAll();
+                            var text = err === "INSUFFICIENT_PERMISSIONS" ? Messages.fm_forbidden
+                                                                          : Messages.error;
+                            return void UI.warn(text);
+                        }
+                        UI.log(Messages.saved);
+                    }));
+                }).nThen(function (waitFor) {
+                    sel.forEach(function (el) {
+                        var curve = $(el).attr('data-curve');
+                        var friend = curve === user.curvePublic ? user : friends[curve];
+                        if (!friend) { return; }
+                        common.mailbox.sendTo("RM_OWNER", {
+                            channel: channel,
+                            title: data.title,
+                            pending: pending
+                        }, {
+                            channel: friend.notifications,
+                            curvePublic: friend.curvePublic
+                        }, waitFor());
+                    });
+                }).nThen(function () {
+                    redrawAll();
+                });
+            });
+            $div.append(h('p', removeButton));
+            return $div;
+        };
+
+        // Add owners column
+        var drawAdd = function () {
+            var $div = $(h('div.cp-share-column'));
+            var _friends = JSON.parse(JSON.stringify(friends));
+            Object.keys(_friends).forEach(function (curve) {
+                if (owners.indexOf(_friends[curve].edPublic) !== -1 ||
+                    pending_owners.indexOf(_friends[curve].edPublic) !== -1 ||
+                    !_friends[curve].notifications) {
+                    delete _friends[curve];
+                }
+            });
+            var addCol = UIElements.getUserGrid(Messages.owner_addText, {
+                common: common,
+                large: true,
+                data: _friends
+            }, function () {
+                //console.log(arguments);
+            });
+            $div.append(addCol.div);
+
+            var teamsData = Util.tryParse(JSON.stringify(priv.teams)) || {};
+            Object.keys(teamsData).forEach(function (id) {
+                var t = teamsData[id];
+                t.teamId = id;
+                if (owners.indexOf(t.edPublic) !== -1 || pending_owners.indexOf(t.edPublic) !== -1) {
+                    delete teamsData[id];
+                }
+            });
+            var teamsList = UIElements.getUserGrid(Messages.owner_addTeamText, {
+                common: common,
+                large: true,
+                noFilter: true,
+                data: teamsData
+            }, function () {});
+            $div.append(teamsList.div);
+
+            // When clicking on the add button, we get the selected users.
+            var addButton = h('button.no-margin', Messages.owner_addButton);
+            $(addButton).click(function () {
+                // Check selection
+                var $sel = $div.find('.cp-usergrid-user.cp-selected');
+                var sel = $sel.toArray();
+                if (!sel.length) { return; }
+                var toAdd = sel.map(function (el) {
+                    var curve = $(el).attr('data-curve');
+                    // If the pad is woned by a team, we can transfer ownership to ourselves
+                    if (curve === user.curvePublic && teamOwner) { return priv.edPublic; }
+                    var friend = friends[curve];
+                    if (!friend) { return; }
+                    return friend.edPublic;
+                }).filter(function (x) { return x; });
+                var toAddTeams = sel.map(function (el) {
+                    var team = teamsData[$(el).attr('data-teamid')];
+                    if (!team || !team.edPublic) { return; }
+                    return {
+                        edPublic: team.edPublic,
+                        id: $(el).attr('data-teamid')
+                    };
+                }).filter(function (x) { return x; });
+
+                nThen(function (waitFor) {
+                    var msg = Messages.owner_addConfirm;
+                    UI.confirm(msg, waitFor(function (yes) {
+                        if (!yes) {
+                            waitFor.abort();
+                            return;
+                        }
+                    }));
+                }).nThen(function (waitFor) {
+                    // Add one of our teams as an owner
+                    if (toAddTeams.length) {
+                        // Send the command
+                        sframeChan.query('Q_SET_PAD_METADATA', {
+                            channel: channel,
+                            command: 'ADD_OWNERS',
+                            value: toAddTeams.map(function (obj) { return obj.edPublic; }),
+                            teamId: teamOwner
+                        }, waitFor(function (err, res) {
+                            err = err || (res && res.error);
+                            if (err) {
+                                waitFor.abort();
+                                redrawAll();
+                                var text = err === "INSUFFICIENT_PERMISSIONS" ?
+                                        Messages.fm_forbidden : Messages.error;
+                                return void UI.warn(text);
+                            }
+                            var isTemplate = priv.isTemplate || data.isTemplate;
+                            toAddTeams.forEach(function (obj) {
+                                sframeChan.query('Q_STORE_IN_TEAM', {
+                                    href: data.href || data.rohref,
+                                    password: data.password,
+                                    path: isTemplate ? ['template'] : undefined,
+                                    title: data.title || '',
+                                    teamId: obj.id
+                                }, waitFor(function (err) {
+                                    if (err) { return void console.error(err); }
+                                }));
+                            });
+                        }));
+                    }
+                }).nThen(function (waitFor) {
+                    // Offer ownership to a friend
+                    if (toAdd.length) {
+                        // Send the command
+                        sframeChan.query('Q_SET_PAD_METADATA', {
+                            channel: channel,
+                            command: 'ADD_PENDING_OWNERS',
+                            value: toAdd,
+                            teamId: teamOwner
+                        }, waitFor(function (err, res) {
+                            err = err || (res && res.error);
+                            if (err) {
+                                waitFor.abort();
+                                redrawAll();
+                                var text = err === "INSUFFICIENT_PERMISSIONS" ? Messages.fm_forbidden
+                                                                              : Messages.error;
+                                return void UI.warn(text);
+                            }
+                        }));
+                    }
+                }).nThen(function (waitFor) {
+                    sel.forEach(function (el) {
+                        var curve = $(el).attr('data-curve');
+                        var friend = curve === user.curvePublic ? user : friends[curve];
+                        if (!friend) { return; }
+                        common.mailbox.sendTo("ADD_OWNER", {
+                            channel: channel,
+                            href: data.href,
+                            password: data.password,
+                            title: data.title
+                        }, {
+                            channel: friend.notifications,
+                            curvePublic: friend.curvePublic
+                        }, waitFor());
+                    });
+                }).nThen(function () {
+                    redrawAll();
+                    UI.log(Messages.saved);
+                });
+            });
+            $div.append(h('p', addButton));
+            return $div;
+        };
+
+        redrawAll = function (md) {
+            var todo = function (obj) {
+                if (obj && obj.error) { return; }
+                owners = obj.owners || [];
+                pending_owners = obj.pending_owners || [];
+                $div1.empty();
+                $div2.empty();
+                $div1.append(drawRemove(false)).append(drawRemove(true));
+                $div2.append(drawAdd());
+            };
+
+            if (md) { return void todo(md); }
+            common.getPadMetadata({
+                channel: data.channel
+            }, todo);
+        };
+
+        $div1.append(drawRemove(false)).append(drawRemove(true));
+        $div2.append(drawAdd());
+
+        var handler = sframeChan.on('EV_RT_METADATA', function (md) {
+            if (!$div1.length) {
+                return void handler.stop();
+            }
+            owners = md.owners || [];
+            pending_owners = md.pending_owners || [];
+            redrawAll(md);
+        });
+
+        // Create modal
+        var link = h('div.cp-share-columns', [
+            div1,
+            div2
+            /*drawRemove()[0],
+            drawAdd()[0]*/
+        ]);
+        var linkButtons = [{
+            className: 'cancel',
+            name: Messages.filePicker_close,
+            onClick: function () {},
+            keys: [27]
+        }];
+        return UI.dialog.customModal(link, {buttons: linkButtons});
+    };
+
+    var getRightsProperties = function (common, data, cb) {
+        var $div = $('<div>');
+        if (!data) { return void cb(void 0, $div); }
+
+        var draw = function () {
+            var $d = $('<div>');
+            var priv = common.getMetadataMgr().getPrivateData();
+            var user = common.getMetadataMgr().getUserData();
+            var edPublic = priv.edPublic;
+            var owned = false;
+            var _owners = {};
+            if (data.owners && data.owners.length) {
+                if (data.owners.indexOf(edPublic) !== -1) {
+                    owned = true;
+                } else {
+                    Object.keys(priv.teams || {}).some(function (id) {
+                        var team = priv.teams[id] || {};
+                        if (team.viewer) { return; }
+                        if (data.owners.indexOf(team.edPublic) === -1) { return; }
+                        owned = id;
+                        return true;
+                    });
+                }
+                var strangers = 0;
+                data.owners.forEach(function (ed) {
+                    // If a friend is an owner, add their name to the list
+                    // otherwise, increment the list of strangers
+
+                    // Our edPublic? print "Yourself"
+                    if (ed === edPublic) {
+                        _owners[ed] = {
+                            selected: true,
+                            name: user.name,
+                            avatar: user.avatar
+                        };
+                        return;
+                    }
+                    // One of our teams? print the team name
+                    if (Object.keys(priv.teams || {}).some(function (id) {
+                        var team = priv.teams[id] || {};
+                        if (team.edPublic !== ed) { return; }
+                        _owners[ed] = {
+                            name: team.name,
+                            avatar: team.avatar
+                        };
+                        return true;
+                    })) {
+                        return;
+                    }
+                    // One of our friends? print the friend name
+                    if (Object.keys(priv.friends || {}).some(function (c) {
+                        var friend = priv.friends[c] || {};
+                        if (friend.edPublic !== ed || c === 'me') { return; }
+                        _owners[friend.edPublic] = {
+                            name: friend.displayName,
+                            avatar: friend.avatar
+                        };
+                        return true;
+                    })) {
+                        return;
+                    }
+                    // Otherwise it's a stranger
+                    strangers++;
+                });
+                if (strangers) {
+                    _owners['stangers'] = {
+                        name: Messages._getKey('properties_unknownUser', [strangers]),
+                    };
+                }
+            }
+            var _ownersGrid = UIElements.getUserGrid(Messages.creation_owners, {
+                common: common,
+                noSelect: true,
+                data: _owners,
+                large: true
+            }, function () {});
+            if (_ownersGrid && Object.keys(_owners).length) {
+                $d.append(_ownersGrid.div);
+            } else {
+                $d.append([
+                    h('label', Messages.creation_owners),
+                ]);
+                $d.append(UI.dialog.selectable(Messages.creation_noOwner, {
+                    id: 'cp-app-prop-owners',
+                }));
+
+            }
+
+            var parsed;
+            if (data.href || data.roHref) {
+                parsed = Hash.parsePadUrl(data.href || data.roHref);
+            }
+            if (owned && parsed.hashData.type === 'pad') {
+                var manageOwners = h('button.no-margin', Messages.owner_openModalButton);
+                $(manageOwners).click(function () {
+                    data.teamId = typeof(owned) !== "boolean" ? owned : undefined;
+                    var modal = createOwnerModal(common, data);
+                    UI.openCustomModal(modal, {
+                        wide: true,
+                    });
+                });
+                $d.append(h('p', manageOwners));
+            }
+
+            if (!data.noExpiration) {
+                var expire = Messages.creation_expireFalse;
+                if (data.expire && typeof (data.expire) === "number") {
+                    expire = new Date(data.expire).toLocaleString();
+                }
+                $('<label>', {'for': 'cp-app-prop-expire'}).text(Messages.creation_expiration)
+                    .appendTo($d);
+                $d.append(UI.dialog.selectable(expire, {
+                    id: 'cp-app-prop-expire',
+                }));
+            }
+
+            if (!data.noPassword) {
+                var hasPassword = data.password;
+                var $pwLabel = $('<label>', {'for': 'cp-app-prop-password'}).text(Messages.creation_passwordValue)
+                                .hide().appendTo($d);
+                var password = UI.passwordInput({
+                    id: 'cp-app-prop-password',
+                    readonly: 'readonly'
+                });
+                var $password = $(password).hide();
+                var $pwInput = $password.find('.cp-password-input');
+                $pwInput.val(data.password).click(function () {
+                    $pwInput[0].select();
+                });
+                $d.append(password);
+
+                if (hasPassword) {
+                    $pwLabel.show();
+                    $password.css('display', 'flex');
+                }
+
+                // In the properties, we should have the edit href if we know it.
+                // We should know it because the pad is stored, but it's better to check...
+                if (!data.noEditPassword && owned && data.href) { // FIXME SHEET fix password change for sheets
+                    var sframeChan = common.getSframeChannel();
+
+                    var isOO = parsed.type === 'sheet';
+                    var isFile = parsed.hashData.type === 'file';
+                    var isSharedFolder = parsed.type === 'drive';
+
+                    var changePwTitle = Messages.properties_changePassword;
+                    var changePwConfirm = isFile ? Messages.properties_confirmChangeFile : Messages.properties_confirmChange;
+                    if (!hasPassword) {
+                        changePwTitle = Messages.properties_addPassword;
+                        changePwConfirm = isFile ? Messages.properties_confirmNewFile : Messages.properties_confirmNew;
+                    }
+                    $('<label>', {'for': 'cp-app-prop-change-password'})
+                        .text(changePwTitle).appendTo($d);
+                    var newPassword = UI.passwordInput({
+                        id: 'cp-app-prop-change-password',
+                        style: 'flex: 1;'
+                    });
+                    var passwordOk = h('button', Messages.properties_changePasswordButton);
+                    var changePass = h('span.cp-password-change-container', [
+                        newPassword,
+                        passwordOk
+                    ]);
+                    var pLocked = false;
+                    $(passwordOk).click(function () {
+                        var newPass = $(newPassword).find('input').val();
+                        if (data.password === newPass ||
+                            (!data.password && !newPass)) {
+                            return void UI.alert(Messages.properties_passwordSame);
+                        }
+                        if (pLocked) { return; }
+                        pLocked = true;
+                        UI.confirm(changePwConfirm, function (yes) {
+                            if (!yes) { pLocked = false; return; }
+                            $(passwordOk).html('').append(h('span.fa.fa-spinner.fa-spin', {style: 'margin-left: 0'}));
+                            var q = isFile ? 'Q_BLOB_PASSWORD_CHANGE' :
+                                        (isOO ? 'Q_OO_PASSWORD_CHANGE' : 'Q_PAD_PASSWORD_CHANGE');
+
+                            // If this is a file password change, register to the upload events:
+                            // * if there is a pending upload, ask if we shoudl interrupt
+                            // * display upload progress
+                            var onPending;
+                            var onProgress;
+                            if (isFile) {
+                                onPending = sframeChan.on('Q_BLOB_PASSWORD_CHANGE_PENDING', function (data, cb) {
+                                    onPending.stop();
+                                    UI.confirm(Messages.upload_uploadPending, function (yes) {
+                                        cb({cancel: yes});
+                                    });
+                                });
+                                onProgress = sframeChan.on('EV_BLOB_PASSWORD_CHANGE_PROGRESS', function (data) {
+                                    if (typeof (data) !== "number") { return; }
+                                    var p = Math.round(data);
+                                    $(passwordOk).text(p + '%');
+                                });
+                            }
+
+                            sframeChan.query(q, {
+                                teamId: typeof(owned) !== "boolean" ? owned : undefined,
+                                href: data.href,
+                                password: newPass
+                            }, function (err, data) {
+                                $(passwordOk).text(Messages.properties_changePasswordButton);
+                                pLocked = false;
+                                if (err || data.error) {
+                                    console.error(err || data.error);
+                                    return void UI.alert(Messages.properties_passwordError);
+                                }
+                                UI.findOKButton().click();
+
+                                $pwLabel.show();
+                                $password.css('display', 'flex');
+                                $pwInput.val(newPass);
+
+                                // If the current document is a file or if we're changing the password from a drive,
+                                // we don't have to reload the page at the end.
+                                // Tell the user the password change was successful and abort
+                                if (isFile || priv.app !== parsed.type) {
+                                    if (onProgress && onProgress.stop) { onProgress.stop(); }
+                                    $(passwordOk).text(Messages.properties_changePasswordButton);
+                                    var alertMsg = data.warning ? Messages.properties_passwordWarningFile
+                                                                : Messages.properties_passwordSuccessFile;
+                                    return void UI.alert(alertMsg, undefined, {force: true});
+                                }
+
+                                // Pad password changed: update the href
+                                // Use hidden hash if needed (we're an owner of this pad so we know it is stored)
+                                var useUnsafe = Util.find(priv, ['settings', 'security', 'unsafeLinks']);
+                                var href = (priv.readOnly && data.roHref) ? data.roHref : data.href;
+                                if (useUnsafe === false) {
+                                    var newParsed = Hash.parsePadUrl(href);
+                                    var newSecret = Hash.getSecrets(newParsed.type, newParsed.hash, newPass);
+                                    var newHash = Hash.getHiddenHashFromKeys(parsed.type, newSecret, {});
+                                    href = Hash.hashToHref(newHash, parsed.type);
+                                }
+
+                                if (data.warning) {
+                                    return void UI.alert(Messages.properties_passwordWarning, function () {
+                                        common.gotoURL(href);
+                                    }, {force: true});
+                                }
+                                return void UI.alert(Messages.properties_passwordSuccess, function () {
+                                    if (!isSharedFolder) {
+                                        common.gotoURL(href);
+                                    }
+                                }, {force: true});
+                            });
+                        });
+                    });
+                    $d.append(changePass);
+                }
+            }
+            return $d;
+        };
+
+        var sframeChan = common.getSframeChannel();
+        var handler = sframeChan.on('EV_RT_METADATA', function (md) {
+            if (!$div.length) {
+                handler.stop();
+                return;
+            }
+            md = JSON.parse(JSON.stringify(md));
+            data.owners = md.owners;
+            data.expire = md.expire;
+            data.pending_owners = md.pending_owners;
+            $div.empty();
+            $div.append(draw());
+        });
+        $div.append(draw());
+
+        cb(void 0, $div);
+    };
+
+    var getAccessData = function (common, opts, _cb) {
+        var cb = Util.once(Util.mkAsync(_cb));
+        opts = opts || {};
+        var data = {};
+        nThen(function (waitFor) {
+            var base = common.getMetadataMgr().getPrivateData().origin;
+            common.getPadAttribute('', waitFor(function (err, val) {
+                if (err || !val) {
+                    waitFor.abort();
+                    return void cb(err || 'EEMPTY');
+                }
+                if (!val.fileType) {
+                    delete val.owners;
+                    delete val.expire;
+                }
+                Util.extend(data, val);
+                if (data.href) { data.href = base + data.href; }
+                if (data.roHref) { data.roHref = base + data.roHref; }
+            }), opts.href);
+
+            // If this is a file, don't try to look for metadata
+            if (opts.channel && opts.channel.length > 34) { return; }
+            common.getPadMetadata({
+                channel: opts.channel // optional, fallback to current pad
+            }, waitFor(function (obj) {
+                if (obj && obj.error) { console.error(obj.error); return; }
+                data.owners = obj.owners;
+                data.expire = obj.expire;
+                data.pending_owners = obj.pending_owners;
+            }));
+        }).nThen(function () {
+            cb(void 0, data);
+        });
+    };
+    Access.getAccessModal = function (common, opts, cb) {
+        var data;
+        var content;
+        nThen(function (waitFor) {
+            getAccessData(common, opts, waitFor(function (e, _data) {
+                if (e) {
+                    waitFor.abort();
+                    return void cb(e);
+                }
+                data = _data;
+            }));
+        }).nThen(function (waitFor) {
+            getRightsProperties(common, data, waitFor(function (e, c) {
+                if (e) {
+                    waitFor.abort();
+                    return void cb(e);
+                }
+                content = c[0];
+            }));
+        }).nThen(function () {
+            var modal = UI.alert(content);
+            cb (void 0, modal);
+        });
+    };
+
+    return Access;
+});

From 8694c1702369f1710541d19726251257a541b84c Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 17 Feb 2020 09:26:36 -0500
Subject: [PATCH 04/37] sketch out metadata commands for allow lists

---
 lib/metadata.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/lib/metadata.js b/lib/metadata.js
index 220327456..92a5d7541 100644
--- a/lib/metadata.js
+++ b/lib/metadata.js
@@ -19,6 +19,19 @@ var isValidOwner = function (owner) {
     return typeof(owner) === 'string' && owner.length === 44;
 };
 
+// ["RESTRICT_ACCESS", [true], 1561623438989]
+// ["RESTRICT_ACCESS", [false], 1561623438989]
+// commands.RESTRICT_ACCESS = function (meta, args) {};
+
+// ["ADD_ALLOWED", ["7eEqelGso3EBr5jHlei6av4r9w2B9XZiGGwA1EgZ-5I=", ...], 1561623438989]
+// commands.ADD_ALLOWED = function (meta, args) {};
+
+// ["RM_ALLOWED", ["7eEqelGso3EBr5jHlei6av4r9w2B9XZiGGwA1EgZ-5I=", ...], 1561623438989]
+// commands.RM_ALLOWED = function (meta, args) {};
+
+// ["RESET_ALLOWED", ["7eEqelGso3EBr5jHlei6av4r9w2B9XZiGGwA1EgZ-5I=", ...], 1561623438989]
+// commands.RESET_ALLOWED = function (meta, args) {};
+
 // ["ADD_OWNERS", ["7eEqelGso3EBr5jHlei6av4r9w2B9XZiGGwA1EgZ-5I="], 1561623438989]
 commands.ADD_OWNERS = function (meta, args) {
     // bail out if args isn't an array

From a4be6185de7eb80980176541fbd28cb50ad786d9 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 17 Feb 2020 11:54:27 -0500
Subject: [PATCH 05/37] merge staging and do a little lint compliance

---
 lib/historyKeeper.js |  9 +++++++++
 lib/hk-util.js       |  6 +++---
 lib/metadata.js      | 41 +++++++++++++++++++++++++++++++++++++----
 lib/rpc.js           |  4 ++--
 4 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/lib/historyKeeper.js b/lib/historyKeeper.js
index bccfef38f..a77a95740 100644
--- a/lib/historyKeeper.js
+++ b/lib/historyKeeper.js
@@ -112,6 +112,15 @@ module.exports.create = function (config, cb) {
         },
         channelOpen: function (Server, channelName, userId) {
             Env.channel_cache[channelName] = Env.channel_cache[channelName] || {};
+
+
+            // XXX RESTRICT
+            // this event is emitted whenever a user joins a channel.
+            // if that channel is restricted then we should forcefully disconnect them.
+            // we won't know that it's restricted until we load its metadata.
+            // as long as metadata is in memory as long as anyone is sending messages to a channel
+            // then we won't broadcast messages to unauthorized users
+
             Server.send(userId, [
                 0,
                 Env.id,
diff --git a/lib/hk-util.js b/lib/hk-util.js
index 3221d50a2..3c5fe887c 100644
--- a/lib/hk-util.js
+++ b/lib/hk-util.js
@@ -789,9 +789,9 @@ const handleGetFullHistory = function (Env, Server, seq, userId, parsed) {
 };
 
 const directMessageCommands = {
-    GET_HISTORY: handleGetHistory,
-    GET_HISTORY_RANGE: handleGetHistoryRange,
-    GET_FULL_HISTORY: handleGetFullHistory,
+    GET_HISTORY: handleGetHistory, // XXX RESTRICT
+    GET_HISTORY_RANGE: handleGetHistoryRange, // XXX RESTRICT
+    GET_FULL_HISTORY: handleGetFullHistory, // XXX RESTRICT
 };
 
 /*  onDirectMessage
diff --git a/lib/metadata.js b/lib/metadata.js
index 92a5d7541..aa5b49517 100644
--- a/lib/metadata.js
+++ b/lib/metadata.js
@@ -21,16 +21,49 @@ var isValidOwner = function (owner) {
 
 // ["RESTRICT_ACCESS", [true], 1561623438989]
 // ["RESTRICT_ACCESS", [false], 1561623438989]
-// commands.RESTRICT_ACCESS = function (meta, args) {};
+commands.RESTRICT_ACCESS = function (meta, args) {
+    if (!Array.isArray(args) || typeof(args[0]) !== 'boolean') {
+        throw new Error('INVALID_STATE');
+    }
+
+    var bool = args[0];
+
+    // reject the proposed command if there is no change in state
+    if (meta.restricted === bool) { return false; }
+
+    // apply the new state
+    meta.restricted = args[0];
+
+    // if you're disabling access restrictions then you can assume
+    // then there is nothing more to do. Leave the existing list as-is
+    if (!bool) { return true; }
+
+    // you're all set if an allow list already exists
+    if (Array.isArray(meta.allowed)) { return true; }
+
+    // otherwise define it
+    meta.allowed = [];
+
+    return true;
+};
 
 // ["ADD_ALLOWED", ["7eEqelGso3EBr5jHlei6av4r9w2B9XZiGGwA1EgZ-5I=", ...], 1561623438989]
-// commands.ADD_ALLOWED = function (meta, args) {};
+commands.ADD_ALLOWED = function (meta, args) {
+    args = args;
+    throw new Error('NOT_IMPLEMENTED');
+};
 
 // ["RM_ALLOWED", ["7eEqelGso3EBr5jHlei6av4r9w2B9XZiGGwA1EgZ-5I=", ...], 1561623438989]
-// commands.RM_ALLOWED = function (meta, args) {};
+commands.RM_ALLOWED = function (meta, args) {
+    args = args;
+    throw new Error('NOT_IMPLEMENTED');
+};
 
 // ["RESET_ALLOWED", ["7eEqelGso3EBr5jHlei6av4r9w2B9XZiGGwA1EgZ-5I=", ...], 1561623438989]
-// commands.RESET_ALLOWED = function (meta, args) {};
+commands.RESET_ALLOWED = function (meta, args) {
+    args = args;
+    throw new Error('NOT_IMPLEMENTED');
+};
 
 // ["ADD_OWNERS", ["7eEqelGso3EBr5jHlei6av4r9w2B9XZiGGwA1EgZ-5I="], 1561623438989]
 commands.ADD_OWNERS = function (meta, args) {
diff --git a/lib/rpc.js b/lib/rpc.js
index 875032b74..0d9c605f7 100644
--- a/lib/rpc.js
+++ b/lib/rpc.js
@@ -18,8 +18,8 @@ const UNAUTHENTICATED_CALLS = {
     GET_DELETED_PADS: Pinning.getDeletedPads,
     IS_CHANNEL_PINNED: Pinning.isChannelPinned,
     IS_NEW_CHANNEL: Channel.isNewChannel,
-    WRITE_PRIVATE_MESSAGE: Channel.writePrivateMessage,
-    GET_METADATA: Metadata.getMetadata,
+    WRITE_PRIVATE_MESSAGE: Channel.writePrivateMessage, // XXX RESTRICT
+    GET_METADATA: Metadata.getMetadata, // XXX RESTRICT
 };
 
 var isUnauthenticateMessage = function (msg) {

From 81a0bbb0efd8b176bc5ce269c9f9613b2fde92a5 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 18 Feb 2020 10:28:36 +0100
Subject: [PATCH 06/37] Add owners tab

---
 .../src/less2/include/alertify.less           |  31 +-
 www/common/common-interface.js                |   7 +-
 www/common/common-ui-elements.js              |  17 +-
 www/common/inner/access.js                    | 595 ++++++++++--------
 4 files changed, 376 insertions(+), 274 deletions(-)

diff --git a/customize.dist/src/less2/include/alertify.less b/customize.dist/src/less2/include/alertify.less
index 557f391c1..52019a912 100644
--- a/customize.dist/src/less2/include/alertify.less
+++ b/customize.dist/src/less2/include/alertify.less
@@ -182,6 +182,7 @@
                     margin-bottom: 10px;
                     box-sizing: content-box;
                     span {
+                        .tools_unselectable();
                         font-size: 20px;
                         height: 40px;
                         line-height: 40px;
@@ -190,12 +191,16 @@
                         border-left: 1px solid lighten(@alertify-base, 10%);
                         border-right: 1px solid lighten(@alertify-base, 10%);
                         cursor: pointer;
-                        &:hover {
+                        &:not(.disabled):hover {
                             background-color: @alertify-light-bg;
                         }
+                        &.disabled {
+                            color: #949494;
+                            cursor: not-allowed;
+                        }
                     }
                     span.alertify-tabs-active {
-                        background-color: @alertify-fore;
+                        background-color: @alertify-fore !important;
                         border-left: 1px solid @alertify-fore;
                         border-right: 1px solid @alertify-fore;
                         color: @alertify-base;
@@ -386,18 +391,13 @@
         }
     }
     div.wide {
-        div.alertify-tabs {
-            p.msg:not(:last-child) {
-                border-bottom: 1px solid @alertify-fore;
-            }
-        }
         .cp-share-columns {
             display: flex;
             flex-flow: row;
 
             & > .cp-share-column {
                 width: 50%;
-                padding: 0 10px;
+                //padding: 0 10px;
                 position: relative;
                 &.contains-nav {
                     nav {
@@ -414,7 +414,20 @@
                     }
                 }
                 &:first-child {
-                    border-right: 1px solid @alertify-fore;
+                    margin-right: @alertify_padding-base;
+                }
+                &:last-child {
+                    margin-left: @alertify_padding-base;
+                }
+            }
+            & > .cp-share-column-mid {
+                display: flex;
+                align-items: center;
+                button {
+                    width: 50px;
+                    margin: 0;
+                    min-width: 0;
+                    font-size: 18px;
                 }
             }
         }
diff --git a/www/common/common-interface.js b/www/common/common-interface.js
index fca655360..5795520ae 100644
--- a/www/common/common-interface.js
+++ b/www/common/common-interface.js
@@ -218,14 +218,15 @@ define([
         var titles = [];
         var active = 0;
         tabs.forEach(function (tab, i) {
-            if (!tab.content || !tab.title) { return; }
+            if (!(tab.content || tab.disabled) || !tab.title) { return; }
             var content = h('div.alertify-tabs-content', tab.content);
-            var title = h('span.alertify-tabs-title', tab.title);
+            var title = h('span.alertify-tabs-title'+ (tab.disabled ? '.disabled' : ''), tab.title);
             if (tab.icon) {
                 var icon = h('i', {class: tab.icon});
                 $(title).prepend(' ').prepend(icon);
             }
             $(title).click(function () {
+                if (tab.disabled) { return; }
                 var old = tabs[active];
                 if (old.onHide) { old.onHide(); }
                 titles.forEach(function (t) { $(t).removeClass('alertify-tabs-active'); });
@@ -239,7 +240,7 @@ define([
             });
             titles.push(title);
             contents.push(content);
-            if (tab.active) { active = i; }
+            if (tab.active && !tab.disabled) { active = i; }
         });
         if (contents.length) {
             $(contents[active]).addClass('alertify-tabs-content-active');
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 67c4518fa..cebf5047e 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -284,6 +284,12 @@ define([
     UIElements.getProperties = function (common, opts, cb) {
         var data;
         var content;
+        var button = [{
+            className: 'cancel',
+            name: Messages.filePicker_close,
+            onClick: function () {},
+            keys: [13,27]
+        }];
         NThen(function (waitFor) {
             getPropertiesData(common, opts, waitFor(function (e, _data) {
                 if (e) {
@@ -298,10 +304,17 @@ define([
                     waitFor.abort();
                     return void cb(e);
                 }
-                content = c[0];
+                content = UI.dialog.customModal(c[0], {
+                    buttons: button
+                });
             }));
         }).nThen(function () {
-            var modal = UI.alert(content);
+            var tabs = UI.dialog.tabs([{
+                title: Messages.fc_prop,
+                icon: "fa fa-info-circle",
+                content: content
+            }]);
+            var modal = UI.openCustomModal(tabs);
             cb (void 0, modal);
         });
     };
diff --git a/www/common/inner/access.js b/www/common/inner/access.js
index 139a52d64..cccae9477 100644
--- a/www/common/inner/access.js
+++ b/www/common/inner/access.js
@@ -9,11 +9,11 @@ define([
     '/bower_components/nthen/index.js',
 ], function ($, Util, Hash, UI, UIElements, h,
              Messages, nThen) {
-console.log(UI, UIElements, h);
-
     var Access = {};
 
-    var createOwnerModal = function (common, data) {
+    var getOwnersTab = function (common, data, opts, _cb) {
+        var cb = Util.once(Util.mkAsync(_cb));
+
         var friends = common.getFriends(true);
         var sframeChan = common.getSframeChannel();
         var priv = common.getMetadataMgr().getPrivateData();
@@ -23,13 +23,19 @@ console.log(UI, UIElements, h);
         var owners = data.owners || [];
         var pending_owners = data.pending_owners || [];
         var teams = priv.teams;
+        var teamsData = Util.tryParse(JSON.stringify(priv.teams)) || {};
         var teamOwner = data.teamId;
 
+        opts = opts || {};
         var redrawAll = function () {};
 
-        var div1 = h('div.cp-usergrid-user.cp-share-column.cp-ownership');
-        var div2 = h('div.cp-usergrid-user.cp-share-column.cp-ownership');
+        var addBtn = h('button.btn.btn-primary.fa.fa-arrow-left');
+
+        var div1 = h('div.cp-share-column.cp-ownership');
+        var divMid = h('div.cp-share-column-mid', addBtn);
+        var div2 = h('div.cp-share-column.cp-ownership');
         var $div1 = $(div1);
+        $divMid = $(divMid);
         var $div2 = $(div2);
 
         // Remove owner column
@@ -105,7 +111,7 @@ console.log(UI, UIElements, h);
                         err = err || (res && res.error);
                         if (err) {
                             waitFor.abort();
-                            redrawAll();
+                            redrawAll(true);
                             var text = err === "INSUFFICIENT_PERMISSIONS" ? Messages.fm_forbidden
                                                                           : Messages.error;
                             return void UI.warn(text);
@@ -127,7 +133,7 @@ console.log(UI, UIElements, h);
                         }, waitFor());
                     });
                 }).nThen(function () {
-                    redrawAll();
+                    redrawAll(true);
                 });
             });
             $div.append(h('p', removeButton));
@@ -154,7 +160,6 @@ console.log(UI, UIElements, h);
             });
             $div.append(addCol.div);
 
-            var teamsData = Util.tryParse(JSON.stringify(priv.teams)) || {};
             Object.keys(teamsData).forEach(function (id) {
                 var t = teamsData[id];
                 t.teamId = id;
@@ -171,293 +176,289 @@ console.log(UI, UIElements, h);
             $div.append(teamsList.div);
 
             // When clicking on the add button, we get the selected users.
-            var addButton = h('button.no-margin', Messages.owner_addButton);
-            $(addButton).click(function () {
-                // Check selection
-                var $sel = $div.find('.cp-usergrid-user.cp-selected');
-                var sel = $sel.toArray();
-                if (!sel.length) { return; }
-                var toAdd = sel.map(function (el) {
-                    var curve = $(el).attr('data-curve');
-                    // If the pad is woned by a team, we can transfer ownership to ourselves
-                    if (curve === user.curvePublic && teamOwner) { return priv.edPublic; }
-                    var friend = friends[curve];
-                    if (!friend) { return; }
-                    return friend.edPublic;
-                }).filter(function (x) { return x; });
-                var toAddTeams = sel.map(function (el) {
-                    var team = teamsData[$(el).attr('data-teamid')];
-                    if (!team || !team.edPublic) { return; }
-                    return {
-                        edPublic: team.edPublic,
-                        id: $(el).attr('data-teamid')
-                    };
-                }).filter(function (x) { return x; });
+            //var addButton = h('button.no-margin', Messages.owner_addButton); // XXX
+            //$div.append(h('p', addButton));
+            return $div;
+        };
 
-                nThen(function (waitFor) {
-                    var msg = Messages.owner_addConfirm;
-                    UI.confirm(msg, waitFor(function (yes) {
-                        if (!yes) {
+        $(addBtn).click(function () {
+            var $div = $div2.find('.cp-share-column');
+            // Check selection
+            var $sel = $div.find('.cp-usergrid-user.cp-selected');
+            var sel = $sel.toArray();
+            if (!sel.length) { return; }
+            var toAdd = sel.map(function (el) {
+                var curve = $(el).attr('data-curve');
+                // If the pad is woned by a team, we can transfer ownership to ourselves
+                if (curve === user.curvePublic && teamOwner) { return priv.edPublic; }
+                var friend = friends[curve];
+                if (!friend) { return; }
+                return friend.edPublic;
+            }).filter(function (x) { return x; });
+            var toAddTeams = sel.map(function (el) {
+                var team = teamsData[$(el).attr('data-teamid')];
+                if (!team || !team.edPublic) { return; }
+                return {
+                    edPublic: team.edPublic,
+                    id: $(el).attr('data-teamid')
+                };
+            }).filter(function (x) { return x; });
+
+            nThen(function (waitFor) {
+                var msg = Messages.owner_addConfirm;
+                UI.confirm(msg, waitFor(function (yes) {
+                    if (!yes) {
+                        waitFor.abort();
+                        return;
+                    }
+                }));
+            }).nThen(function (waitFor) {
+                // Add one of our teams as an owner
+                if (toAddTeams.length) {
+                    // Send the command
+                    sframeChan.query('Q_SET_PAD_METADATA', {
+                        channel: channel,
+                        command: 'ADD_OWNERS',
+                        value: toAddTeams.map(function (obj) { return obj.edPublic; }),
+                        teamId: teamOwner
+                    }, waitFor(function (err, res) {
+                        err = err || (res && res.error);
+                        if (err) {
                             waitFor.abort();
-                            return;
+                            redrawAll(true);
+                            var text = err === "INSUFFICIENT_PERMISSIONS" ?
+                                    Messages.fm_forbidden : Messages.error;
+                            return void UI.warn(text);
                         }
+                        var isTemplate = priv.isTemplate || opts.isTemplate;
+                        toAddTeams.forEach(function (obj) {
+                            sframeChan.query('Q_STORE_IN_TEAM', {
+                                href: data.href || data.rohref,
+                                password: data.password,
+                                path: isTemplate ? ['template'] : undefined,
+                                title: data.title || '',
+                                teamId: obj.id
+                            }, waitFor(function (err) {
+                                if (err) { return void console.error(err); }
+                            }));
+                        });
                     }));
-                }).nThen(function (waitFor) {
-                    // Add one of our teams as an owner
-                    if (toAddTeams.length) {
-                        // Send the command
-                        sframeChan.query('Q_SET_PAD_METADATA', {
-                            channel: channel,
-                            command: 'ADD_OWNERS',
-                            value: toAddTeams.map(function (obj) { return obj.edPublic; }),
-                            teamId: teamOwner
-                        }, waitFor(function (err, res) {
-                            err = err || (res && res.error);
-                            if (err) {
-                                waitFor.abort();
-                                redrawAll();
-                                var text = err === "INSUFFICIENT_PERMISSIONS" ?
-                                        Messages.fm_forbidden : Messages.error;
-                                return void UI.warn(text);
-                            }
-                            var isTemplate = priv.isTemplate || data.isTemplate;
-                            toAddTeams.forEach(function (obj) {
-                                sframeChan.query('Q_STORE_IN_TEAM', {
-                                    href: data.href || data.rohref,
-                                    password: data.password,
-                                    path: isTemplate ? ['template'] : undefined,
-                                    title: data.title || '',
-                                    teamId: obj.id
-                                }, waitFor(function (err) {
-                                    if (err) { return void console.error(err); }
-                                }));
-                            });
-                        }));
-                    }
-                }).nThen(function (waitFor) {
-                    // Offer ownership to a friend
-                    if (toAdd.length) {
-                        // Send the command
-                        sframeChan.query('Q_SET_PAD_METADATA', {
-                            channel: channel,
-                            command: 'ADD_PENDING_OWNERS',
-                            value: toAdd,
-                            teamId: teamOwner
-                        }, waitFor(function (err, res) {
-                            err = err || (res && res.error);
-                            if (err) {
-                                waitFor.abort();
-                                redrawAll();
-                                var text = err === "INSUFFICIENT_PERMISSIONS" ? Messages.fm_forbidden
-                                                                              : Messages.error;
-                                return void UI.warn(text);
-                            }
-                        }));
-                    }
-                }).nThen(function (waitFor) {
-                    sel.forEach(function (el) {
-                        var curve = $(el).attr('data-curve');
-                        var friend = curve === user.curvePublic ? user : friends[curve];
-                        if (!friend) { return; }
-                        common.mailbox.sendTo("ADD_OWNER", {
-                            channel: channel,
-                            href: data.href,
-                            password: data.password,
-                            title: data.title
-                        }, {
-                            channel: friend.notifications,
-                            curvePublic: friend.curvePublic
-                        }, waitFor());
-                    });
-                }).nThen(function () {
-                    redrawAll();
-                    UI.log(Messages.saved);
+                }
+            }).nThen(function (waitFor) {
+                // Offer ownership to a friend
+                if (toAdd.length) {
+                    // Send the command
+                    sframeChan.query('Q_SET_PAD_METADATA', {
+                        channel: channel,
+                        command: 'ADD_PENDING_OWNERS',
+                        value: toAdd,
+                        teamId: teamOwner
+                    }, waitFor(function (err, res) {
+                        err = err || (res && res.error);
+                        if (err) {
+                            waitFor.abort();
+                            redrawAll(true);
+                            var text = err === "INSUFFICIENT_PERMISSIONS" ? Messages.fm_forbidden
+                                                                          : Messages.error;
+                            return void UI.warn(text);
+                        }
+                    }));
+                }
+            }).nThen(function (waitFor) {
+                sel.forEach(function (el) {
+                    var curve = $(el).attr('data-curve');
+                    var friend = curve === user.curvePublic ? user : friends[curve];
+                    if (!friend) { return; }
+                    common.mailbox.sendTo("ADD_OWNER", {
+                        channel: channel,
+                        href: data.href,
+                        password: data.password,
+                        title: data.title
+                    }, {
+                        channel: friend.notifications,
+                        curvePublic: friend.curvePublic
+                    }, waitFor());
                 });
+            }).nThen(function () {
+                redrawAll(true);
+                UI.log(Messages.saved);
             });
-            $div.append(h('p', addButton));
-            return $div;
-        };
+        });
 
-        redrawAll = function (md) {
-            var todo = function (obj) {
-                if (obj && obj.error) { return; }
-                owners = obj.owners || [];
-                pending_owners = obj.pending_owners || [];
+        redrawAll = function (reload) {
+            nThen(function (waitFor) {
+                if (!reload) { return; }
+                common.getPadMetadata({
+                    channel: data.channel
+                }, waitFor(function (md) {
+                    data.owners = md.owners || [];
+                    data.pending_owners = md.pending_owners || [];
+                }));
+            }).nThen(function () {
+                owners = data.owners || [];
+                pending_owners = data.pending_owners || [];
                 $div1.empty();
                 $div2.empty();
                 $div1.append(drawRemove(false)).append(drawRemove(true));
                 $div2.append(drawAdd());
-            };
-
-            if (md) { return void todo(md); }
-            common.getPadMetadata({
-                channel: data.channel
-            }, todo);
+            });
         };
-
-        $div1.append(drawRemove(false)).append(drawRemove(true));
-        $div2.append(drawAdd());
+        redrawAll();
 
         var handler = sframeChan.on('EV_RT_METADATA', function (md) {
             if (!$div1.length) {
                 return void handler.stop();
             }
-            owners = md.owners || [];
-            pending_owners = md.pending_owners || [];
-            redrawAll(md);
+            data.owners = md.owners || [];
+            data.pending_owners = md.pending_owners || [];
+            redrawAll();
         });
 
         // Create modal
         var link = h('div.cp-share-columns', [
             div1,
+            divMid,
             div2
-            /*drawRemove()[0],
-            drawAdd()[0]*/
         ]);
-        var linkButtons = [{
-            className: 'cancel',
-            name: Messages.filePicker_close,
-            onClick: function () {},
-            keys: [27]
-        }];
-        return UI.dialog.customModal(link, {buttons: linkButtons});
+        cb(void 0, link);
     };
 
-    var getRightsProperties = function (common, data, cb) {
-        var $div = $('<div>');
-        if (!data) { return void cb(void 0, $div); }
-
-        var draw = function () {
-            var $d = $('<div>');
-            var priv = common.getMetadataMgr().getPrivateData();
-            var user = common.getMetadataMgr().getUserData();
-            var edPublic = priv.edPublic;
-            var owned = false;
-            var _owners = {};
-            if (data.owners && data.owners.length) {
-                if (data.owners.indexOf(edPublic) !== -1) {
-                    owned = true;
-                } else {
-                    Object.keys(priv.teams || {}).some(function (id) {
-                        var team = priv.teams[id] || {};
-                        if (team.viewer) { return; }
-                        if (data.owners.indexOf(team.edPublic) === -1) { return; }
-                        owned = id;
-                        return true;
-                    });
-                }
-                var strangers = 0;
-                data.owners.forEach(function (ed) {
-                    // If a friend is an owner, add their name to the list
-                    // otherwise, increment the list of strangers
-
-                    // Our edPublic? print "Yourself"
-                    if (ed === edPublic) {
-                        _owners[ed] = {
-                            selected: true,
-                            name: user.name,
-                            avatar: user.avatar
-                        };
-                        return;
-                    }
-                    // One of our teams? print the team name
-                    if (Object.keys(priv.teams || {}).some(function (id) {
-                        var team = priv.teams[id] || {};
-                        if (team.edPublic !== ed) { return; }
-                        _owners[ed] = {
-                            name: team.name,
-                            avatar: team.avatar
-                        };
-                        return true;
-                    })) {
-                        return;
-                    }
-                    // One of our friends? print the friend name
-                    if (Object.keys(priv.friends || {}).some(function (c) {
-                        var friend = priv.friends[c] || {};
-                        if (friend.edPublic !== ed || c === 'me') { return; }
-                        _owners[friend.edPublic] = {
-                            name: friend.displayName,
-                            avatar: friend.avatar
-                        };
-                        return true;
-                    })) {
-                        return;
-                    }
-                    // Otherwise it's a stranger
-                    strangers++;
+    var isOwned = function (common, data) {
+        data = data || {};
+        var priv = common.getMetadataMgr().getPrivateData();
+        var edPublic = priv.edPublic;
+        var owned = false;
+        if (data.owners && data.owners.length) {
+            if (data.owners.indexOf(edPublic) !== -1) {
+                owned = true;
+            } else {
+                Object.keys(priv.teams || {}).some(function (id) {
+                    var team = priv.teams[id] || {};
+                    if (team.viewer) { return; }
+                    if (data.owners.indexOf(team.edPublic) === -1) { return; }
+                    owned = id;
+                    return true;
                 });
-                if (strangers) {
-                    _owners['stangers'] = {
-                        name: Messages._getKey('properties_unknownUser', [strangers]),
-                    };
-                }
             }
-            var _ownersGrid = UIElements.getUserGrid(Messages.creation_owners, {
-                common: common,
-                noSelect: true,
-                data: _owners,
-                large: true
-            }, function () {});
-            if (_ownersGrid && Object.keys(_owners).length) {
-                $d.append(_ownersGrid.div);
-            } else {
-                $d.append([
-                    h('label', Messages.creation_owners),
-                ]);
-                $d.append(UI.dialog.selectable(Messages.creation_noOwner, {
-                    id: 'cp-app-prop-owners',
-                }));
+        }
+        return owned;
+    };
 
+    var getUserList = function (common, list) {
+        if (!Array.isArray(list)) { return; }
+        var priv = common.getMetadataMgr().getPrivateData();
+        var user = common.getMetadataMgr().getUserData();
+        var edPublic = priv.edPublic;
+        var strangers = 0;
+        var _owners = {};
+        list.forEach(function (ed) {
+            // If a friend is an owner, add their name to the list
+            // otherwise, increment the list of strangers
+
+            // Our edPublic? print "Yourself"
+            if (ed === edPublic) {
+                _owners[ed] = {
+                    //selected: true,
+                    name: user.name,
+                    avatar: user.avatar
+                };
+                return;
             }
-
-            var parsed;
-            if (data.href || data.roHref) {
-                parsed = Hash.parsePadUrl(data.href || data.roHref);
+            // One of our teams? print the team name
+            if (Object.keys(priv.teams || {}).some(function (id) {
+                var team = priv.teams[id] || {};
+                if (team.edPublic !== ed) { return; }
+                _owners[ed] = {
+                    name: team.name,
+                    avatar: team.avatar
+                };
+                return true;
+            })) {
+                return;
             }
-            if (owned && parsed.hashData.type === 'pad') {
-                var manageOwners = h('button.no-margin', Messages.owner_openModalButton);
-                $(manageOwners).click(function () {
-                    data.teamId = typeof(owned) !== "boolean" ? owned : undefined;
-                    var modal = createOwnerModal(common, data);
-                    UI.openCustomModal(modal, {
-                        wide: true,
-                    });
-                });
-                $d.append(h('p', manageOwners));
+            // One of our friends? print the friend name
+            if (Object.keys(priv.friends || {}).some(function (c) {
+                var friend = priv.friends[c] || {};
+                if (friend.edPublic !== ed || c === 'me') { return; }
+                _owners[friend.edPublic] = {
+                    name: friend.displayName,
+                    avatar: friend.avatar
+                };
+                return true;
+            })) {
+                return;
             }
+            // Otherwise it's a stranger
+            _owners[ed] = {
+                name: '???', // XXX unkwown?
+            };
+            strangers++;
+        });
+        if (!Object.keys(_owners).length) { return; }
+        /*
+        if (strangers) {
+            _owners['stangers'] = {
+                name: Messages._getKey('properties_unknownUser', [strangers]),
+            };
+        }
+        */
+        return UIElements.getUserGrid(null, {
+            common: common,
+            noSelect: true,
+            data: _owners,
+            large: true
+        }, function () {});
+    };
 
-            if (!data.noExpiration) {
+    var getAccessTab = function (common, data, opts, _cb) {
+        var cb = Util.once(Util.mkAsync(_cb));
+        opts = opts || {};
+
+        var priv = common.getMetadataMgr().getPrivateData();
+        var edPublic = priv.edPublic;
+
+        var $div = $(h('div.cp-share-columns'));
+        if (!data) { return void cb(void 0, $div); }
+
+        var div1 = h('div.cp-usergrid-user.cp-share-column.cp-access');
+        var div2 = h('div.cp-usergrid-user.cp-share-column.cp-access');
+        var $div1 = $(div1).appendTo($div);
+        var $div2 = $(div2).appendTo($div);
+
+        var parsed = Hash.parsePadUrl(data.href || data.roHref);
+        if (!parsed || !parsed.hashData) { return void console.error("Invalid href"); }
+
+        var drawLeft = function () {
+            var $d = $('<div>');
+
+            var owned = isOwned(common, data);
+
+            if (!opts.noExpiration) {
                 var expire = Messages.creation_expireFalse;
                 if (data.expire && typeof (data.expire) === "number") {
                     expire = new Date(data.expire).toLocaleString();
                 }
-                $('<label>', {'for': 'cp-app-prop-expire'}).text(Messages.creation_expiration)
-                    .appendTo($d);
-                $d.append(UI.dialog.selectable(expire, {
-                    id: 'cp-app-prop-expire',
-                }));
+                $d.append(h('div.cp-app-prop', [
+                    Messages.creation_expiration,
+                    h('br'),
+                    h('span.cp-app-prop-content', expire)
+                ]));
             }
 
+            var $pwLabel = $('<label>', {'for': 'cp-app-prop-password'})
+                            .text(Messages.creation_passwordValue).appendTo($d);
+            var password = UI.passwordInput({
+                id: 'cp-app-prop-password',
+                readonly: 'readonly'
+            });
+            $d.append(password);
             if (!data.noPassword) {
                 var hasPassword = data.password;
-                var $pwLabel = $('<label>', {'for': 'cp-app-prop-password'}).text(Messages.creation_passwordValue)
-                                .hide().appendTo($d);
-                var password = UI.passwordInput({
-                    id: 'cp-app-prop-password',
-                    readonly: 'readonly'
-                });
-                var $password = $(password).hide();
+                var $password = $(password);
                 var $pwInput = $password.find('.cp-password-input');
-                $pwInput.val(data.password).click(function () {
+                $pwInput.val(data.password || '').click(function () {
                     $pwInput[0].select();
                 });
-                $d.append(password);
-
-                if (hasPassword) {
-                    $pwLabel.show();
-                    $password.css('display', 'flex');
-                }
 
                 // In the properties, we should have the edit href if we know it.
                 // We should know it because the pad is stored, but it's better to check...
@@ -532,8 +533,6 @@ console.log(UI, UIElements, h);
                                 }
                                 UI.findOKButton().click();
 
-                                $pwLabel.show();
-                                $password.css('display', 'flex');
                                 $pwInput.val(newPass);
 
                                 // If the current document is a file or if we're changing the password from a drive,
@@ -576,8 +575,45 @@ console.log(UI, UIElements, h);
             }
             return $d;
         };
+        var drawRight = function () {
+            var content = [
+                h('label', Messages.creation_owners),
+            ];
+            var _ownersGrid = getUserList(common, data.owners);
+            if (_ownersGrid && _ownersGrid.div) {
+                content.push(_ownersGrid.div);
+            } else {
+                content.push(UI.dialog.selectable(Messages.creation_noOwner, {
+                    id: 'cp-app-prop-owners',
+                }));
+            }
+
+            /*
+            var owned = isOwned(common, data);
+            var parsed = Hash.parsePadUrl(data.href || data.roHref);
+            if (!parsed || !parsed.hashData) { return; }
+            if (owned && parsed.hashData.type === 'pad') {
+                var manageOwners = h('button.no-margin', Messages.owner_openModalButton);
+                $(manageOwners).click(function () {
+                    data.teamId = typeof(owned) !== "boolean" ? owned : undefined;
+                    var modal = createOwnerModal(common, data);
+                    UI.openCustomModal(modal, {
+                        wide: true,
+                    });
+                });
+                $d.append(h('p', manageOwners));
+            }
+            */
+            return h('div', content);
+        };
 
         var sframeChan = common.getSframeChannel();
+        var redraw = function () {
+            $div1.empty();
+            $div1.append(drawLeft());
+            $div2.empty();
+            $div2.append(drawRight());
+        };
         var handler = sframeChan.on('EV_RT_METADATA', function (md) {
             if (!$div.length) {
                 handler.stop();
@@ -587,10 +623,9 @@ console.log(UI, UIElements, h);
             data.owners = md.owners;
             data.expire = md.expire;
             data.pending_owners = md.pending_owners;
-            $div.empty();
-            $div.append(draw());
+            redraw();
         });
-        $div.append(draw());
+        redraw();
 
         cb(void 0, $div);
     };
@@ -631,7 +666,14 @@ console.log(UI, UIElements, h);
     };
     Access.getAccessModal = function (common, opts, cb) {
         var data;
-        var content;
+        var tab1, tab2, tab3;
+        var owned = false;
+        var button = [{
+            className: 'cancel',
+            name: Messages.filePicker_close,
+            onClick: function () {},
+            keys: [13,27]
+        }];
         nThen(function (waitFor) {
             getAccessData(common, opts, waitFor(function (e, _data) {
                 if (e) {
@@ -641,15 +683,48 @@ console.log(UI, UIElements, h);
                 data = _data;
             }));
         }).nThen(function (waitFor) {
-            getRightsProperties(common, data, waitFor(function (e, c) {
+            owned = isOwned(common, data);
+
+            getAccessTab(common, data, opts, waitFor(function (e, c) {
                 if (e) {
                     waitFor.abort();
                     return void cb(e);
                 }
-                content = c[0];
+                tab1 = UI.dialog.customModal(c[0], {
+                    buttons: button
+                });
+            }));
+
+            if (!owned) { return; }
+
+            getOwnersTab(common, data, opts, waitFor(function (e, c) {
+                if (e) {
+                    waitFor.abort();
+                    return void cb(e);
+                }
+                tab3 = UI.dialog.customModal(c, {
+                    buttons: button
+                });
             }));
         }).nThen(function () {
-            var modal = UI.alert(content);
+            var tabs = UI.dialog.tabs([{
+                title: "ACCESS", // XXX
+                icon: "fa fa-unlock-alt",
+                content: tab1
+            }, {
+                title: "ALLOW LIST", // XXX
+                disabled: !owned,
+                icon: "fa fa-list",
+                content: h('div')
+            }, {
+                title: Messages.creation_owners,
+                disabled: !owned,
+                icon: "fa fa-id-badge",
+                content: tab3
+            }]);
+            var modal = UI.openCustomModal(tabs, {
+                wide: true
+            });
             cb (void 0, modal);
         });
     };

From 0a45d48710c4c92cfc8d68d00336a6eac340abb4 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 18 Feb 2020 11:12:50 +0100
Subject: [PATCH 07/37] Improve ownership UI

---
 .../src/less2/include/usergrid.less           | 23 ++++++
 www/common/common-ui-elements.js              | 17 +++-
 www/common/inner/access.js                    | 79 ++++++++-----------
 3 files changed, 71 insertions(+), 48 deletions(-)

diff --git a/customize.dist/src/less2/include/usergrid.less b/customize.dist/src/less2/include/usergrid.less
index 6ba8c2d07..adddd5644 100644
--- a/customize.dist/src/less2/include/usergrid.less
+++ b/customize.dist/src/less2/include/usergrid.less
@@ -109,6 +109,29 @@
                     color: @colortheme_alertify-primary-text;
                 }
             }
+            .fa-times {
+                padding-left: 5px;
+                cursor: pointer;
+                height: 100%;
+                line-height: 25px;
+                color: @cryptpad_text_col;
+                &:hover {
+                    color: lighten(@cryptpad_text_col, 10%);
+                }
+            }
+        }
+        &.list {
+            .cp-usergrid-grid {
+                display: block;
+            }
+            .cp-usergrid-user {
+                width: auto;
+                max-width: calc(100% - 6px);
+                overflow: hidden;
+                white-space: nowrap;
+                text-overflow: ellipsis;
+                display: inline-flex;
+            }
         }
     }
 }
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index cebf5047e..5d0955102 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -329,7 +329,15 @@ define([
             var name = data.displayName || data.name || Messages.anonymous;
             var avatar = h('span.cp-usergrid-avatar.cp-avatar');
             UIElements.displayAvatar(common, $(avatar), data.avatar, name);
-            return h('div.cp-usergrid-user'+(data.selected?'.cp-selected':'')+(config.large?'.large':''), {
+            var removeBtn, el;
+            if (config.remove) {
+                removeBtn = h('span.fa.fa-times');
+                $(removeBtn).click(function () {
+                    config.remove(el);
+                });
+            }
+
+            el = h('div.cp-usergrid-user'+(data.selected?'.cp-selected':'')+(config.large?'.large':''), {
                 'data-ed': data.edPublic,
                 'data-teamid': data.teamId,
                 'data-curve': data.curvePublic || '',
@@ -339,17 +347,20 @@ define([
                 style: 'order:'+i+';'
             },[
                 avatar,
-                h('span.cp-usergrid-user-name', name)
+                h('span.cp-usergrid-user-name', name),
+                removeBtn
             ]);
+            return el;
         }).filter(function (x) { return x; });
 
         var noOthers = icons.length === 0 ? '.cp-usergrid-empty' : '';
+        var classes = noOthers + (config.large?'.large':'') + (config.list?'.list':'');
 
         var inputFilter = h('input', {
             placeholder: Messages.share_filterFriend
         });
 
-        var div = h('div.cp-usergrid-container' + noOthers + (config.large?'.large':''), [
+        var div = h('div.cp-usergrid-container' + classes, [
             label ? h('label', label) : undefined,
             h('div.cp-usergrid-filter', (config.noFilter || config.noSelect) ? undefined : [
                 inputFilter
diff --git a/www/common/inner/access.js b/www/common/inner/access.js
index cccae9477..413798314 100644
--- a/www/common/inner/access.js
+++ b/www/common/inner/access.js
@@ -35,7 +35,6 @@ define([
         var divMid = h('div.cp-share-column-mid', addBtn);
         var div2 = h('div.cp-share-column.cp-ownership');
         var $div1 = $(div1);
-        $divMid = $(divMid);
         var $div2 = $(div2);
 
         // Remove owner column
@@ -65,35 +64,17 @@ define([
                     edPublic: ed,
                 };
             });
-            var msg = pending ? Messages.owner_removePendingText
-                        : Messages.owner_removeText;
-            var removeCol = UIElements.getUserGrid(msg, {
-                common: common,
-                large: true,
-                data: _owners,
-                noFilter: true
-            }, function () {
-            });
-            var $div = $(removeCol.div);
-            // When clicking on the remove button, we check the selected users.
-            // If you try to remove yourself, we'll display an additional warning message
-            var btnMsg = pending ? Messages.owner_removePendingButton : Messages.owner_removeButton;
-            var removeButton = h('button.no-margin', btnMsg);
-            $(removeButton).click(function () {
+
+            var remove = function (el) {
                 // Check selection
-                var $sel = $div.find('.cp-usergrid-user.cp-selected');
-                var sel = $sel.toArray();
-                if (!sel.length) { return; }
                 var me = false;
-                var toRemove = sel.map(function (el) {
-                    var ed = $(el).attr('data-ed');
-                    if (!ed) { return; }
-                    if (teamOwner && teams[teamOwner] && teams[teamOwner].edPublic === ed) { me = true; }
-                    if (ed === edPublic && !teamOwner) { me = true; }
-                    return ed;
-                }).filter(function (x) { return x; });
+                var $el = $(el);
+                var ed = $el.attr('data-ed');
+                if (!ed) { return; }
+                if (teamOwner && teams[teamOwner] && teams[teamOwner].edPublic === ed) { me = true; }
+                if (ed === edPublic && !teamOwner) { me = true; }
                 nThen(function (waitFor) {
-                    var msg = me ? Messages.owner_removeMeConfirm : Messages.owner_removeConfirm;
+                    var msg = me ? Messages.owner_removeMeConfirm : Messages.owner_removeConfirm; // XXX check existing keys
                     UI.confirm(msg, waitFor(function (yes) {
                         if (!yes) {
                             waitFor.abort();
@@ -105,7 +86,7 @@ define([
                     sframeChan.query('Q_SET_PAD_METADATA', {
                         channel: channel,
                         command: pending ? 'RM_PENDING_OWNERS' : 'RM_OWNERS',
-                        value: toRemove,
+                        value: [ed],
                         teamId: teamOwner
                     }, waitFor(function (err, res) {
                         err = err || (res && res.error);
@@ -119,24 +100,34 @@ define([
                         UI.log(Messages.saved);
                     }));
                 }).nThen(function (waitFor) {
-                    sel.forEach(function (el) {
-                        var curve = $(el).attr('data-curve');
-                        var friend = curve === user.curvePublic ? user : friends[curve];
-                        if (!friend) { return; }
-                        common.mailbox.sendTo("RM_OWNER", {
-                            channel: channel,
-                            title: data.title,
-                            pending: pending
-                        }, {
-                            channel: friend.notifications,
-                            curvePublic: friend.curvePublic
-                        }, waitFor());
-                    });
+                    var curve = $el.attr('data-curve');
+                    var friend = curve === user.curvePublic ? user : friends[curve];
+                    if (!friend) { return; }
+                    common.mailbox.sendTo("RM_OWNER", {
+                        channel: channel,
+                        title: data.title,
+                        pending: pending
+                    }, {
+                        channel: friend.notifications,
+                        curvePublic: friend.curvePublic
+                    }, waitFor());
                 }).nThen(function () {
                     redrawAll(true);
                 });
+            };
+
+            var msg = pending ? Messages.owner_removePendingText
+                        : Messages.owner_removeText;
+            var removeCol = UIElements.getUserGrid(msg, {
+                common: common,
+                large: true,
+                data: _owners,
+                noSelect: true,
+                list: true,
+                remove: remove
+            }, function () {
             });
-            $div.append(h('p', removeButton));
+            var $div = $(removeCol.div);
             return $div;
         };
 
@@ -415,7 +406,6 @@ define([
         opts = opts || {};
 
         var priv = common.getMetadataMgr().getPrivateData();
-        var edPublic = priv.edPublic;
 
         var $div = $(h('div.cp-share-columns'));
         if (!data) { return void cb(void 0, $div); }
@@ -445,8 +435,7 @@ define([
                 ]));
             }
 
-            var $pwLabel = $('<label>', {'for': 'cp-app-prop-password'})
-                            .text(Messages.creation_passwordValue).appendTo($d);
+            $('<label>', {'for': 'cp-app-prop-password'}).text(Messages.creation_passwordValue).appendTo($d);
             var password = UI.passwordInput({
                 id: 'cp-app-prop-password',
                 readonly: 'readonly'

From 3647d583f88121e6d098cf036b70dbe8f6b4cf51 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 18 Feb 2020 16:10:39 +0100
Subject: [PATCH 08/37] Add allowList tab

---
 .../src/less2/include/modals-ui-elements.less |  14 +
 .../src/less2/include/usergrid.less           |   4 +-
 www/common/common-interface.js                |   6 +
 www/common/common-ui-elements.js              |   2 +-
 www/common/inner/access.js                    | 309 +++++++++++++++++-
 5 files changed, 325 insertions(+), 10 deletions(-)

diff --git a/customize.dist/src/less2/include/modals-ui-elements.less b/customize.dist/src/less2/include/modals-ui-elements.less
index e13263d36..62f815b21 100644
--- a/customize.dist/src/less2/include/modals-ui-elements.less
+++ b/customize.dist/src/less2/include/modals-ui-elements.less
@@ -68,6 +68,20 @@
         color: @cryptpad_text_col;
     }
 
+    // Access modal
+    .cp-overlay-container {
+        position: relative;
+        .cp-overlay {
+            position: absolute;
+            background-color: rgba(255,255,255,0.5);
+            top: 0;
+            bottom: 0;
+            left: 0;
+            right: 0;
+        }
+    }
+
+
     // teams invite modal
     .cp-teams-invite-block {
         display: flex;
diff --git a/customize.dist/src/less2/include/usergrid.less b/customize.dist/src/less2/include/usergrid.less
index adddd5644..77b4b1c4a 100644
--- a/customize.dist/src/less2/include/usergrid.less
+++ b/customize.dist/src/less2/include/usergrid.less
@@ -121,9 +121,6 @@
             }
         }
         &.list {
-            .cp-usergrid-grid {
-                display: block;
-            }
             .cp-usergrid-user {
                 width: auto;
                 max-width: calc(100% - 6px);
@@ -131,6 +128,7 @@
                 white-space: nowrap;
                 text-overflow: ellipsis;
                 display: inline-flex;
+                flex: unset;
             }
         }
     }
diff --git a/www/common/common-interface.js b/www/common/common-interface.js
index 5795520ae..8b3f8835c 100644
--- a/www/common/common-interface.js
+++ b/www/common/common-interface.js
@@ -1184,15 +1184,20 @@ define([
         var $ok = $('<span>', {'class': 'fa fa-check', title: Messages.saved}).hide();
         var $spinner = $('<span>', {'class': 'fa fa-spinner fa-pulse'}).hide();
 
+        var state = false;
+
         var spin = function () {
+            state = true;
             $ok.hide();
             $spinner.show();
         };
         var hide = function () {
+            state = false;
             $ok.hide();
             $spinner.hide();
         };
         var done = function () {
+            state = false;
             $ok.show();
             $spinner.hide();
         };
@@ -1203,6 +1208,7 @@ define([
         }
 
         return {
+            getState: function () { return state; },
             ok: $ok[0],
             spinner: $spinner[0],
             spin: spin,
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 5d0955102..4fc8ba347 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -348,7 +348,7 @@ define([
             },[
                 avatar,
                 h('span.cp-usergrid-user-name', name),
-                removeBtn
+                data.notRemovable ? undefined : removeBtn
             ]);
             return el;
         }).filter(function (x) { return x; });
diff --git a/www/common/inner/access.js b/www/common/inner/access.js
index 413798314..c13fb0c1d 100644
--- a/www/common/inner/access.js
+++ b/www/common/inner/access.js
@@ -134,7 +134,7 @@ define([
         // Add owners column
         var drawAdd = function () {
             var $div = $(h('div.cp-share-column'));
-            var _friends = JSON.parse(JSON.stringify(friends));
+            var _friends = Util.clone(friends);
             Object.keys(_friends).forEach(function (curve) {
                 if (owners.indexOf(_friends[curve].edPublic) !== -1 ||
                     pending_owners.indexOf(_friends[curve].edPublic) !== -1 ||
@@ -142,7 +142,8 @@ define([
                     delete _friends[curve];
                 }
             });
-            var addCol = UIElements.getUserGrid(Messages.owner_addText, {
+            // XXX if no more friends, display message...
+            var addCol = UIElements.getUserGrid("CONTACTS", { // XXX
                 common: common,
                 large: true,
                 data: _friends
@@ -151,18 +152,20 @@ define([
             });
             $div.append(addCol.div);
 
+            var _teamsData = Util.clone(teamsData);
             Object.keys(teamsData).forEach(function (id) {
                 var t = teamsData[id];
                 t.teamId = id;
                 if (owners.indexOf(t.edPublic) !== -1 || pending_owners.indexOf(t.edPublic) !== -1) {
-                    delete teamsData[id];
+                    delete _teamsData[id];
                 }
             });
-            var teamsList = UIElements.getUserGrid(Messages.owner_addTeamText, {
+            if (!Object.keys(_teamsData).length) { return $div; }
+            var teamsList = UIElements.getUserGrid("TEAMS", { // XXX
                 common: common,
                 large: true,
                 noFilter: true,
-                data: teamsData
+                data: _teamsData
             }, function () {});
             $div.append(teamsList.div);
 
@@ -314,6 +317,291 @@ define([
         cb(void 0, link);
     };
 
+    var getAllowTab = function (common, data, opts, _cb) {
+        var cb = Util.once(Util.mkAsync(_cb));
+        opts = opts || {};
+
+        // XXX reload all this data in the "draw" functions
+
+        var friends = common.getFriends(true);
+        var sframeChan = common.getSframeChannel();
+        var priv = common.getMetadataMgr().getPrivateData();
+        var user = common.getMetadataMgr().getUserData();
+        var edPublic = priv.edPublic;
+        var channel = data.channel;
+
+        var owners = data.owners || [];
+        var restricted = data.restricted || false;
+        var allowed = data.allowed || [];
+
+        var teams = priv.teams;
+        var teamsData = Util.tryParse(JSON.stringify(priv.teams)) || {};
+        var teamOwner = data.teamId;
+
+        var redrawAll = function () {};
+
+        var addBtn = h('button.btn.btn-primary.fa.fa-arrow-left');
+
+        var div1 = h('div.cp-share-column.cp-allowlist');
+        var divMid = h('div.cp-share-column-mid.cp-overlay-container', [
+            addBtn,
+            h('div.cp-overlay')
+        ]);
+        var div2 = h('div.cp-share-column.cp-allowlist');
+        var $div1 = $(div1);
+        var $div2 = $(div2);
+
+        // Create modal
+        var link = h('div.cp-share-columns', [
+            div1,
+            divMid,
+            div2
+        ]);
+
+        var setLock = function (locked) {
+            $(link).find('.cp-overlay').toggle(locked);
+        };
+
+        // Remove owner column
+        var drawRemove = function () {
+            // XXX filter with allow list
+            var _allowed = {};
+            var all = Util.deduplicateString(owners.concat(allowed));
+            all.forEach(function (ed) {
+                var f;
+                Object.keys(friends).some(function (c) {
+                    if (friends[c].edPublic === ed) {
+                        f = friends[c];
+                        return true;
+                    }
+                });
+                Object.keys(teams).some(function (id) {
+                    if (teams[id].edPublic === ed) {
+                        f = teams[id];
+                        f.teamId = id;
+                    }
+                });
+                if (ed === edPublic) {
+                    f = f || user;
+                    if (f.name) { f.edPublic = edPublic; }
+                }
+                _allowed[ed] = f || {
+                    displayName: Messages._getKey('owner_unknownUser', [ed]),
+                    edPublic: ed,
+                };
+
+                if (owners.indexOf(ed) !== -1) {
+                    _allowed[ed].notRemovable = true;
+                }
+            });
+
+            var remove = function (el) {
+                // Check selection
+                var $el = $(el);
+                var ed = $el.attr('data-ed');
+                if (!ed) { return; }
+                nThen(function (waitFor) {
+                    var msg = "Are your sure?"; // XXX check existing keys
+                    UI.confirm(msg, waitFor(function (yes) {
+                        if (!yes) {
+                            waitFor.abort();
+                            return;
+                        }
+                    }));
+                }).nThen(function (waitFor) {
+                    // Send the command
+                    sframeChan.query('Q_SET_PAD_METADATA', {
+                        channel: channel,
+                        command: 'RM_ALLOWED',
+                        value: [ed],
+                        teamId: teamOwner
+                    }, waitFor(function (err, res) {
+                        err = err || (res && res.error);
+                        redrawAll(true);
+                        if (err) {
+                            waitFor.abort();
+                            var text = err === "INSUFFICIENT_PERMISSIONS" ? Messages.fm_forbidden
+                                                                          : Messages.error;
+                            return void UI.warn(text);
+                        }
+                        UI.log(Messages.saved);
+                    }));
+                });
+            };
+
+            var cbox = UI.createCheckbox('cp-allowlist', "ENABLE?", restricted); // XXX
+            var $cbox = $(cbox);
+            var spinner = UI.makeSpinner($cbox)
+            var $checkbox = $cbox.find('input').on('change', function () {
+                if (spinner.getState()) {
+                    $checkbox.prop('checked', !$checkbox.prop('checked'));
+                    return;
+                }
+                spinner.spin();
+                var val = $checkbox.is(':checked');
+                sframeChan.query('Q_SET_PAD_METADATA', {
+                    channel: channel,
+                    command: 'RESTRICT_ACCESS',
+                    value: [Boolean(val)],
+                    teamId: teamOwner
+                }, function (err, res) {
+                    err = err || (res && res.error);
+                    redrawAll(true);
+                    if (err) {
+                        spinner.hide();
+                        var text = err === "INSUFFICIENT_PERMISSIONS" ? Messages.fm_forbidden
+                                                                      : Messages.error;
+                        return void UI.warn(text);
+                    }
+                    spinner.done();
+                    UI.log(Messages.saved);
+                });
+            });
+
+
+            var msg = "ALLOW LIST"; // XXX
+            var removeCol = UIElements.getUserGrid(msg, {
+                common: common,
+                large: true,
+                data: _allowed,
+                noSelect: true,
+                list: true,
+                remove: remove
+            }, function () { });
+            $(removeCol.div).addClass('cp-overlay-container').append(h('div.cp-overlay'));
+            return h('div', [
+                h('p', 'Allow list text...'), // XXX
+                cbox,
+                removeCol.div
+            ]);
+        };
+
+        // Add owners column
+        var drawAdd = function () {
+            var $div = $(h('div.cp-share-column'));
+
+            $div.addClass('cp-overlay-container').append(h('div.cp-overlay'));
+
+            var _friends = Util.clone(friends);
+            Object.keys(_friends).forEach(function (curve) {
+                if (owners.indexOf(_friends[curve].edPublic) !== -1 ||
+                    allowed.indexOf(_friends[curve].edPublic) !== -1) {
+                    delete _friends[curve];
+                }
+            });
+            var addCol = UIElements.getUserGrid("CONTACTS", { // XXX
+                common: common,
+                large: true,
+                data: _friends
+            }, function () {
+                //console.log(arguments);
+            });
+            $div.append(addCol.div);
+
+            var _teamsData = Util.clone(teamsData);
+            Object.keys(teamsData).forEach(function (id) {
+                var t = teamsData[id];
+                t.teamId = id;
+                if (owners.indexOf(t.edPublic) !== -1 || allowed.indexOf(t.edPublic) !== -1) {
+                    delete _teamsData[id];
+                }
+            });
+            if (!Object.keys(_teamsData).length) { return $div; }
+            var teamsList = UIElements.getUserGrid("TEAMS", { // XXX
+                common: common,
+                large: true,
+                noFilter: true,
+                data: _teamsData
+            }, function () {});
+            $div.append(teamsList.div);
+
+            return $div;
+        };
+
+        $(addBtn).click(function () {
+            var $div = $div2.find('.cp-share-column');
+            // Check selection
+            var $sel = $div.find('.cp-usergrid-user.cp-selected');
+            var sel = $sel.toArray();
+            if (!sel.length) { return; }
+            var toAdd = sel.map(function (el) {
+                var curve = $(el).attr('data-curve');
+                var teamId = $(el).attr('data-teamid');
+                // If the pad is woned by a team, we can transfer ownership to ourselves
+                if (curve === user.curvePublic && teamOwner) { return priv.edPublic; }
+                var data = friends[curve] || teamsData[teamId];
+                if (!data) { return; }
+                return data.edPublic;
+            }).filter(function (x) { return x; });
+
+            nThen(function (waitFor) {
+                var msg = Messages.owner_addConfirm;
+                UI.confirm(msg, waitFor(function (yes) {
+                    if (!yes) {
+                        waitFor.abort();
+                        return;
+                    }
+                }));
+            }).nThen(function (waitFor) {
+                // Offer ownership to a friend
+                if (toAdd.length) {
+                    // Send the command
+                    sframeChan.query('Q_SET_PAD_METADATA', {
+                        channel: channel,
+                        command: 'ADD_ALLOWED',
+                        value: toAdd,
+                        teamId: teamOwner
+                    }, waitFor(function (err, res) {
+                        err = err || (res && res.error);
+                        redrawAll(true);
+                        if (err) {
+                            waitFor.abort();
+                            var text = err === "INSUFFICIENT_PERMISSIONS" ? Messages.fm_forbidden
+                                                                          : Messages.error;
+                            return void UI.warn(text);
+                        }
+                    }));
+                }
+            }).nThen(function () {
+                UI.log(Messages.saved);
+            });
+        });
+
+        redrawAll = function (reload) {
+            nThen(function (waitFor) {
+                if (!reload) { return; }
+                common.getPadMetadata({
+                    channel: data.channel
+                }, waitFor(function (md) {
+                    data.owners = md.owners;
+                    data.restricted = md.restricted;
+                    data.allowed = md.allowed;
+                }));
+            }).nThen(function () {
+                owners = data.owners || [];
+                restricted = data.restricted || false;
+                allowed = data.allowed || [];
+                $div1.empty();
+                $div2.empty();
+                $div1.append(drawRemove());
+                $div2.append(drawAdd());
+                setLock(!restricted);
+            });
+        };
+        redrawAll();
+
+        var handler = sframeChan.on('EV_RT_METADATA', function (md) {
+            if (!$div1.length) {
+                return void handler.stop();
+            }
+            data.owners = md.owners || [];
+            data.pending_owners = md.pending_owners || [];
+            redrawAll();
+        });
+
+        cb(void 0, link);
+    };
+
     var isOwned = function (common, data) {
         data = data || {};
         var priv = common.getMetadataMgr().getPrivateData();
@@ -686,6 +974,15 @@ define([
 
             if (!owned) { return; }
 
+            getAllowTab(common, data, opts, waitFor(function (e, c) {
+                if (e) {
+                    waitFor.abort();
+                    return void cb(e);
+                }
+                tab2 = UI.dialog.customModal(c, {
+                    buttons: button
+                });
+            }));
             getOwnersTab(common, data, opts, waitFor(function (e, c) {
                 if (e) {
                     waitFor.abort();
@@ -704,7 +1001,7 @@ define([
                 title: "ALLOW LIST", // XXX
                 disabled: !owned,
                 icon: "fa fa-list",
-                content: h('div')
+                content: tab2
             }, {
                 title: Messages.creation_owners,
                 disabled: !owned,

From 156c37942dec7fbca62690f76df5259faf79425e Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 18 Feb 2020 14:16:07 -0500
Subject: [PATCH 09/37] implement new metadata commands related to allow lists
 and mailboxes

---
 lib/metadata.js | 150 +++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 142 insertions(+), 8 deletions(-)

diff --git a/lib/metadata.js b/lib/metadata.js
index aa5b49517..a8ed86fd3 100644
--- a/lib/metadata.js
+++ b/lib/metadata.js
@@ -2,23 +2,48 @@ var Meta = module.exports;
 
 var deduplicate = require("./common-util").deduplicateString;
 
-/*  Metadata fields:
+/*  Metadata fields and the commands that can modify them
+
+we assume that these commands can only be performed
+by owners or in some cases pending owners. Thus
+the owners field is guaranteed to exist.
 
     * channel <STRING>
     * validateKey <STRING>
     * owners <ARRAY>
       * ADD_OWNERS
       * RM_OWNERS
+      * RESET_OWNERS
+    * pending_owners <ARRAY>
+      * ADD_PENDING_OWNERS
+      * RM_PENDING_OWNERS
     * expire <NUMBER>
+      * UPDATE_EXPIRATION (NOT_IMPLEMENTED)
+    * restricted <BOOLEAN>
+      * RESTRICT_ACCESS
+    * allowed <ARRAY>
+      * ADD_ALLOWED
+      * RM_ALLOWED
+      * RESET_ALLOWED
+      * ADD_OWNERS
+      * RESET_OWNERS
+    * mailbox <STRING|MAP>
+      * ADD_MAILBOX
+      * RM_MAILBOX
 
 */
 
 var commands = {};
 
-var isValidOwner = function (owner) {
+var isValidPublicKey = function (owner) {
     return typeof(owner) === 'string' && owner.length === 44;
 };
 
+// isValidPublicKey is a better indication of what the above function does
+// I'm preserving this function name in case we ever want to expand its
+// criteria at a later time...
+var isValidOwner = isValidPublicKey;
+
 // ["RESTRICT_ACCESS", [true], 1561623438989]
 // ["RESTRICT_ACCESS", [false], 1561623438989]
 commands.RESTRICT_ACCESS = function (meta, args) {
@@ -49,20 +74,95 @@ commands.RESTRICT_ACCESS = function (meta, args) {
 
 // ["ADD_ALLOWED", ["7eEqelGso3EBr5jHlei6av4r9w2B9XZiGGwA1EgZ-5I=", ...], 1561623438989]
 commands.ADD_ALLOWED = function (meta, args) {
-    args = args;
-    throw new Error('NOT_IMPLEMENTED');
+    if (!Array.isArray(args)) {
+        throw new Error("INVALID_ARGS");
+    }
+
+    var allowed = meta.allowed || [];
+
+    var changed = false;
+    args.forEach(function (arg) {
+        // don't add invalid public keys
+        if (!isValidPublicKey(arg)) { return; }
+        // don't add owners to the allow list
+        if (meta.owners.indexOf(arg) >= 0) { return; }
+        // don't duplicate entries in the allow list
+        if (allowed.indexOf(arg) >= 0) { return; }
+        allowed.push(arg);
+        changed = true;
+    });
+
+    if (changed) {
+        meta.allowed = meta.allowed || allowed;
+    }
+
+    return changed;
 };
 
 // ["RM_ALLOWED", ["7eEqelGso3EBr5jHlei6av4r9w2B9XZiGGwA1EgZ-5I=", ...], 1561623438989]
 commands.RM_ALLOWED = function (meta, args) {
-    args = args;
-    throw new Error('NOT_IMPLEMENTED');
+    if (!Array.isArray(args)) {
+        throw new Error("INVALID_ARGS");
+    }
+
+    // there may not be anything to remove
+    if (!meta.allowed) { return false; }
+
+    var changed = false;
+    args.forEach(function (arg) {
+        var index = meta.allowed.indexOf(arg);
+        if (index < 0) { return; }
+        meta.allowed.splice(index, 1);
+        changed = true;
+    });
+
+    return changed;
+};
+
+var arrayHasChanged = function (A, B) {
+    var changed;
+    A.some(function (a) {
+        if (B.indexOf(a) < 0) { return (changed = true); }
+    });
+    if (changed) { return true; }
+    B.some(function (b) {
+        if (A.indexOf(b) < 0) { return (changed = true); }
+    });
+    return changed;
+};
+
+var filterInPlace = function (A, f) {
+    for (var i = A.length - 1; i >= 0; i--) {
+        if (f(A[i], i, A)) { A.splice(i, 1); }
+    }
 };
 
 // ["RESET_ALLOWED", ["7eEqelGso3EBr5jHlei6av4r9w2B9XZiGGwA1EgZ-5I=", ...], 1561623438989]
 commands.RESET_ALLOWED = function (meta, args) {
-    args = args;
-    throw new Error('NOT_IMPLEMENTED');
+    if (!Array.isArray(args)) { throw new Error("INVALID_ARGS"); }
+
+    var updated = args.filter(function (arg) {
+        // don't allow invalid public keys
+        if (!isValidPublicKey(arg)) { return false; }
+        // don't ever add owners to the allow list
+        if (meta.owners.indexOf(arg)) { return false; }
+        return true;
+    });
+
+    // this is strictly an optimization...
+    // a change in length is a clear indicator of a functional change
+    if (meta.allowed && meta.allowed.length !== updated.length) {
+        meta.allowed = updated;
+        return true;
+    }
+
+    // otherwise we must check that the arrays contain distinct elements
+    // if there is no functional change, then return false
+    if (!arrayHasChanged(meta.allowed, updated)) { return false; }
+
+    // otherwise overwrite the in-memory data and indicate that there was a change
+    meta.allowed = updated;
+    return true;
 };
 
 // ["ADD_OWNERS", ["7eEqelGso3EBr5jHlei6av4r9w2B9XZiGGwA1EgZ-5I="], 1561623438989]
@@ -86,6 +186,13 @@ commands.ADD_OWNERS = function (meta, args) {
         changed = true;
     });
 
+    if (changed && Array.isArray(meta.allowed)) {
+        // make sure owners are not included in the allow list
+        filterInPlace(meta.allowed, function (member) {
+            return meta.owners.indexOf(member) !== -1;
+        });
+    }
+
     return changed;
 };
 
@@ -187,6 +294,14 @@ commands.RESET_OWNERS = function (meta, args) {
 
     // overwrite the existing owners with the new one
     meta.owners = deduplicate(args.filter(isValidOwner));
+
+    if (Array.isArray(meta.allowed)) {
+        // make sure owners are not included in the allow list
+        filterInPlace(meta.allowed, function (member) {
+            return meta.owners.indexOf(member) !== -1;
+        });
+    }
+
     return true;
 };
 
@@ -224,6 +339,25 @@ commands.ADD_MAILBOX = function (meta, args) {
     return changed;
 };
 
+commands.RM_MAILBOX = function (meta, args) {
+    if (!Array.isArray(args)) { throw new Error("INVALID_ARGS"); }
+    if (!meta.mailbox || typeof(meta.mailbox) === 'undefined') {
+        return false;
+    }
+    if (typeof(meta.mailbox) === 'string' && args.length === 0) {
+        delete meta.mailbox;
+        return true;
+    }
+
+    var changed = false;
+    args.forEach(function (arg) {
+        if (meta.mailbox[arg] === 'undefined') { return; }
+        delete meta.mailbox[arg];
+        changed = true;
+    });
+    return changed;
+};
+
 commands.UPDATE_EXPIRATION = function () {
     throw new Error("E_NOT_IMPLEMENTED");
 };

From eac3e4cbcdf935a3450b77c3b34fc7dcb6dd0339 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 18 Feb 2020 16:05:12 -0500
Subject: [PATCH 10/37] sketch out some historyKeeper functionality related to
 access lists

---
 lib/historyKeeper.js |  4 ++++
 lib/hk-util.js       | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/lib/historyKeeper.js b/lib/historyKeeper.js
index a77a95740..1b306681e 100644
--- a/lib/historyKeeper.js
+++ b/lib/historyKeeper.js
@@ -113,6 +113,10 @@ module.exports.create = function (config, cb) {
         channelOpen: function (Server, channelName, userId) {
             Env.channel_cache[channelName] = Env.channel_cache[channelName] || {};
 
+            //const metadata = Env.metadata_cache[channelName];
+            // chainpad-server@4.0.3 supports a removeFromChannel method
+            // Server.removeFromChannel(channelName, userId);
+            // this lets us kick users from restricted channels
 
             // XXX RESTRICT
             // this event is emitted whenever a user joins a channel.
diff --git a/lib/hk-util.js b/lib/hk-util.js
index 3c5fe887c..c94a67bd5 100644
--- a/lib/hk-util.js
+++ b/lib/hk-util.js
@@ -75,6 +75,29 @@ const isMetadataMessage = function (parsed) {
     return Boolean(parsed && parsed.channel);
 };
 
+const isChannelRestricted = function (metadata) { // XXX RESTRICT
+    metadata = metadata;
+    return false;
+};
+
+const isUserAllowed = function (metadata, userId) { // XXX RESTRICT
+/*
+
+    at this point all we have is the user's netflux id.
+    the allow-list is encoded for 'unsafeKeys' (URL-unsafe base64 encoded public signing keys).
+
+    we need a lookup table: netfluxId => public keys with which this netflux session has authenticated.
+    from there we can check whether the user has authenticated for any of the allowed keys this session.
+
+    owners are implicitly allowed to view any file they own.
+    pending_owners too.
+    otherwise check metadata.allowed.
+
+*/
+    userId = userId;
+    return false;
+};
+
 // validateKeyStrings supplied by clients must decode to 32-byte Uint8Arrays
 const isValidValidateKeyString = function (key) {
     try {
@@ -646,6 +669,16 @@ const handleGetHistory = function (Env, Server, seq, userId, parsed) {
             // And then check if the channel is expired. If it is, send the error and abort
             // FIXME this is hard to read because 'checkExpired' has side effects
             if (checkExpired(Env, Server, channelName)) { return void waitFor.abort(); }
+
+            // XXX RESTRICT
+            // once we've loaded the metadata we can check whether the channel is restricted
+            // and notify the user if they're not included in the list
+            if (isChannelRestricted(index.metadata) && isUserAllowed(index.metadata, userId)) {
+                // XXX RESTRICT send a message indicating that they need to authenticate
+                // for a list of private keys...
+                return void waitFor.abort();
+            }
+
             // always send metadata with GET_HISTORY requests
             Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, JSON.stringify(index.metadata)], w);
         }));
@@ -817,6 +850,10 @@ HK.onDirectMessage = function (Env, Server, seq, userId, json) {
     // have to abort later (once we know the expiration time)
     if (checkExpired(Env, Server, parsed[1])) { return; }
 
+    // XXX RESTRICT
+    // metadata might already be in memory.
+    // rejecting unauthorized users here is an optimization
+
     // look up the appropriate command in the map of commands or fall back to RPC
     var command = directMessageCommands[parsed[0]] || handleRPC;
 

From 505e383f9f44133e55cad2344ee731f28ccf0f47 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 18 Feb 2020 16:06:06 -0500
Subject: [PATCH 11/37] test restricted access from the command line

---
 scripts/tests/test-rpc.js | 135 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 134 insertions(+), 1 deletion(-)

diff --git a/scripts/tests/test-rpc.js b/scripts/tests/test-rpc.js
index 07f30bc46..e944a498b 100644
--- a/scripts/tests/test-rpc.js
+++ b/scripts/tests/test-rpc.js
@@ -357,9 +357,142 @@ nThen(function  (w) {
         bob.name = 'bob';
         //console.log("Initialized Bob");
     }));
+}).nThen(function (w) {
+    // restrict access to oscar's mailbox channel
+    oscar.rpc.send('SET_METADATA', {
+        command: 'RESTRICT_ACCESS',
+        channel: oscar.mailboxChannel,
+        value: [ true ]
+    }, w(function (err, response) {
+        if (err) {
+            return void console.log(err);
+        }
+        var metadata = response[0];
+        if (!(metadata && metadata.restricted)) {
+            throw new Error("EXPECTED MAILBOX TO BE RESTRICTED");
+        }
+    }));
+}).nThen(function (w) {
+    // XXX RESTRICT GET_METADATA should fail because alice is not on the allow list
+    // expect INSUFFICIENT_PERMISSIONS
+    alice.anonRpc.send('GET_METADATA', oscar.mailboxChannel, w(function (err) {
+        if (!err) {
+            // XXX RESTRICT alice should not be permitted to read oscar's mailbox's metadata
+        }
+    }));
+}).nThen(function (w) {
+    // add alice to oscar's mailbox's allow list for some reason
+    oscar.rpc.send('SET_METADATA', {
+        command: 'ADD_ALLOWED',
+        channel: oscar.mailboxChannel,
+        value: [
+            alice.edKeys.edPublic
+        ]
+    }, w(function (err /*, metadata */) {
+        if (err) {
+            return void console.error(err);
+        }
+        //console.log('XXX', metadata);
+    }));
+}).nThen(function (w) {
+    oscar.anonRpc.send('GET_METADATA', oscar.mailboxChannel, w(function (err, response) {
+        if (err) {
+            throw new Error("OSCAR SHOULD BE ABLE TO READ HIS OWN METADATA");
+        }
+        var metadata = response && response[0];
+
+        if (!metadata) {
+            throw new Error("EXPECTED METADATA");
+        }
+
+        if (metadata.allowed[0] !== alice.edKeys.edPublic) {
+            throw new Error("EXPECTED ALICE TO BE ON ALLOW LIST");
+        }
+    }));
 }).nThen(function () {
-    //setTimeout(w(), 500);
+    // XXX RESTRICT alice should now be able to read oscar's mailbox metadata
+/*
+    alice.anonRpc.send('GET_METADATA', oscar.mailboxChannel, function (err, response) {
+        if (err) {
+            PROBLEM
+        }
+    });
+*/
+}).nThen(function (w) {
+    //throw new Error("boop");
+    // add alice as an owner of oscar's mailbox for some reason
+    oscar.rpc.send('SET_METADATA', {
+        command: 'ADD_OWNERS',
+        channel: oscar.mailboxChannel,
+        value: [
+            alice.edKeys.edPublic
+        ]
+    }, Util.mkTimeout(w(function (err) {
+        if (err === 'TIMEOUT') {
+            throw new Error(err);
+        }
+        if (err) {
+            throw new Error("ADD_OWNERS_FAILURE");
+        }
+    }), 2000));
+}).nThen(function (w)  {
+    // alice should now be able to read oscar's mailbox metadata
+    alice.anonRpc.send('GET_METADATA', oscar.mailboxChannel, w(function (err, response) {
+        if (err) {
+            throw new Error("EXPECTED ALICE TO BE ALLOWED TO READ OSCAR'S METADATA");
+        }
 
+        var metadata = response && response[0];
+        if (!metadata) { throw new Error("EXPECTED METADATA"); }
+        if (metadata.allowed.length !== 0) {
+            throw new Error("EXPECTED AN EMPTY ALLOW LIST");
+        }
+    }));
+}).nThen(function (w) {
+    // disable the access restrictionallow list
+    oscar.rpc.send('SET_METADATA', {
+        command: 'RESTRICT_ACCESS',
+        channel: oscar.mailboxChannel,
+        value: [
+            false
+        ]
+    }, w(function (err) {
+        if (err) {
+            throw new Error("COULD_NOT_DISABLE_RESTRICTED_ACCESS");
+        }
+    }));
+    // add alice to oscar's mailbox's allow list for some reason
+    oscar.rpc.send('SET_METADATA', {
+        command: 'ADD_ALLOWED',
+        channel: oscar.mailboxChannel,
+        value: [
+            bob.edKeys.edPublic
+        ]
+    }, w(function (err) {
+        if (err) {
+            return void console.error(err);
+        }
+    }));
+}).nThen(function (w) {
+    oscar.anonRpc.send('GET_METADATA', oscar.mailboxChannel, w(function (err, response) {
+        if (err) {
+            throw new Error("OSCAR SHOULD BE ABLE TO READ HIS OWN METADATA");
+        }
+        var metadata = response && response[0];
+
+        if (!metadata) {
+            throw new Error("EXPECTED METADATA");
+        }
+
+        if (metadata.allowed[0] !== bob.edKeys.edPublic) {
+            throw new Error("EXPECTED ALICE TO BE ON ALLOW LIST");
+        }
+        if (metadata.restricted) {
+            throw new Error("RESTRICTED_ACCESS_NOT_DISABLED");
+        }
+    }));
+}).nThen(function () {
+    //setTimeout(w(), 500);
 }).nThen(function (w) {
     // Alice loads the roster...
     var rosterKeys = Crypto.Team.deriveMemberKeys(sharedConfig.rosterSeed, alice.curveKeys);

From 27e57e7af06bb6888ee52551ebd83ab2510ef038 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 18 Feb 2020 16:07:14 -0500
Subject: [PATCH 12/37] oups! fix a missing callback that's been here for a
 while...

---
 lib/commands/metadata.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/commands/metadata.js b/lib/commands/metadata.js
index 511f963bf..5b5e28f7e 100644
--- a/lib/commands/metadata.js
+++ b/lib/commands/metadata.js
@@ -42,8 +42,8 @@ Data.setMetadata = function (Env, safeKey, data, cb, Server) {
     var channel = data.channel;
     var command = data.command;
     if (!channel || !Core.isValidId(channel)) { return void cb ('INVALID_CHAN'); }
-    if (!command || typeof (command) !== 'string') { return void cb ('INVALID_COMMAND'); }
-    if (Meta.commands.indexOf(command) === -1) { return void('UNSUPPORTED_COMMAND'); }
+    if (!command || typeof (command) !== 'string') { return void cb('INVALID_COMMAND'); }
+    if (Meta.commands.indexOf(command) === -1) { return void cb('UNSUPPORTED_COMMAND'); }
 
     queueMetadata(channel, function (next) {
         Data.getMetadata(Env, channel, function (err, metadata) {

From 17113f298cbc20dcbe01357a83520a1597f8501b Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 19 Feb 2020 13:03:49 +0100
Subject: [PATCH 13/37] Display allow list state in access modal

---
 www/common/inner/access.js | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/www/common/inner/access.js b/www/common/inner/access.js
index c13fb0c1d..5a6e1d1d9 100644
--- a/www/common/inner/access.js
+++ b/www/common/inner/access.js
@@ -853,34 +853,35 @@ define([
             return $d;
         };
         var drawRight = function () {
-            var content = [
-                h('label', Messages.creation_owners),
-            ];
+            // XXX allow_enabled, allow_disabled, allow_label
+            Messages.allow_enabled = 'ENABLED'; // XXX
+            Messages.allow_disabled = 'DISABLED'; // XXX
+            Messages.allow_label = 'Allow list: {0}'; // XXX
+
+
+            var content = [];
             var _ownersGrid = getUserList(common, data.owners);
             if (_ownersGrid && _ownersGrid.div) {
+                content.push(h('label', Messages.creation_owners));
                 content.push(_ownersGrid.div);
             } else {
                 content.push(UI.dialog.selectable(Messages.creation_noOwner, {
                     id: 'cp-app-prop-owners',
                 }));
+                content.push(h('div.cp-app-prop', [
+                    Messages.creation_expiration,
+                    h('br'),
+                    h('span.cp-app-prop-content', expire)
+                ]));
             }
 
-            /*
-            var owned = isOwned(common, data);
-            var parsed = Hash.parsePadUrl(data.href || data.roHref);
-            if (!parsed || !parsed.hashData) { return; }
-            if (owned && parsed.hashData.type === 'pad') {
-                var manageOwners = h('button.no-margin', Messages.owner_openModalButton);
-                $(manageOwners).click(function () {
-                    data.teamId = typeof(owned) !== "boolean" ? owned : undefined;
-                    var modal = createOwnerModal(common, data);
-                    UI.openCustomModal(modal, {
-                        wide: true,
-                    });
-                });
-                $d.append(h('p', manageOwners));
+            var state = data.restricted ? Messages.allow_enabled : Messages.allow_disabled;
+            content.push(h('label', Messages._getKey('allow_label', [state])));
+            if (data.restricted) {
+                var _allowed = Util.deduplicateString(data.owners.concat(data.allowed));
+                var _allowedGrid = getUserList(common, _allowed);
+                content.push(_allowedGrid.div);
             }
-            */
             return h('div', content);
         };
 

From 175423fee4bff420985c6bd9b96a6be17ed2d506 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 19 Feb 2020 13:14:50 +0100
Subject: [PATCH 14/37] Add translation keys

---
 www/common/inner/access.js | 37 +++++++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/www/common/inner/access.js b/www/common/inner/access.js
index 5a6e1d1d9..746234b43 100644
--- a/www/common/inner/access.js
+++ b/www/common/inner/access.js
@@ -131,6 +131,10 @@ define([
             return $div;
         };
 
+        // XXX contacts, teams
+        Messages.contacts = "Contacts";
+        Messages.teams = "Teams";
+
         // Add owners column
         var drawAdd = function () {
             var $div = $(h('div.cp-share-column'));
@@ -143,7 +147,7 @@ define([
                 }
             });
             // XXX if no more friends, display message...
-            var addCol = UIElements.getUserGrid("CONTACTS", { // XXX
+            var addCol = UIElements.getUserGrid(Messages.contacts, {
                 common: common,
                 large: true,
                 data: _friends
@@ -161,7 +165,7 @@ define([
                 }
             });
             if (!Object.keys(_teamsData).length) { return $div; }
-            var teamsList = UIElements.getUserGrid("TEAMS", { // XXX
+            var teamsList = UIElements.getUserGrid(Messages.teams, {
                 common: common,
                 large: true,
                 noFilter: true,
@@ -169,9 +173,6 @@ define([
             }, function () {});
             $div.append(teamsList.div);
 
-            // When clicking on the add button, we get the selected users.
-            //var addButton = h('button.no-margin', Messages.owner_addButton); // XXX
-            //$div.append(h('p', addButton));
             return $div;
         };
 
@@ -364,7 +365,6 @@ define([
 
         // Remove owner column
         var drawRemove = function () {
-            // XXX filter with allow list
             var _allowed = {};
             var all = Util.deduplicateString(owners.concat(allowed));
             all.forEach(function (ed) {
@@ -395,13 +395,18 @@ define([
                 }
             });
 
+            // XXX allow_removeConfirm, allow_checkbox, allow_text
+            Messages.allow_removeConfirm = "Are you sure?"; // XXX
+            Messages.allow_checkbox = "Enable allow list"; // XXX
+            Messages.allow_text = 'Pewpewpew'; // XXX
+
             var remove = function (el) {
                 // Check selection
                 var $el = $(el);
                 var ed = $el.attr('data-ed');
                 if (!ed) { return; }
                 nThen(function (waitFor) {
-                    var msg = "Are your sure?"; // XXX check existing keys
+                    var msg = Messages.allow_removeConfirm;
                     UI.confirm(msg, waitFor(function (yes) {
                         if (!yes) {
                             waitFor.abort();
@@ -429,7 +434,7 @@ define([
                 });
             };
 
-            var cbox = UI.createCheckbox('cp-allowlist', "ENABLE?", restricted); // XXX
+            var cbox = UI.createCheckbox('cp-allowlist', Messages.allow_checkbox, restricted);
             var $cbox = $(cbox);
             var spinner = UI.makeSpinner($cbox)
             var $checkbox = $cbox.find('input').on('change', function () {
@@ -459,7 +464,7 @@ define([
             });
 
 
-            var msg = "ALLOW LIST"; // XXX
+            var msg = Messages._getKey('allow_label', ['']);
             var removeCol = UIElements.getUserGrid(msg, {
                 common: common,
                 large: true,
@@ -470,7 +475,7 @@ define([
             }, function () { });
             $(removeCol.div).addClass('cp-overlay-container').append(h('div.cp-overlay'));
             return h('div', [
-                h('p', 'Allow list text...'), // XXX
+                h('p', Messages.allow_text),
                 cbox,
                 removeCol.div
             ]);
@@ -489,7 +494,7 @@ define([
                     delete _friends[curve];
                 }
             });
-            var addCol = UIElements.getUserGrid("CONTACTS", { // XXX
+            var addCol = UIElements.getUserGrid(Messages.contacts, {
                 common: common,
                 large: true,
                 data: _friends
@@ -507,7 +512,7 @@ define([
                 }
             });
             if (!Object.keys(_teamsData).length) { return $div; }
-            var teamsList = UIElements.getUserGrid("TEAMS", { // XXX
+            var teamsList = UIElements.getUserGrid(Messages.teams, {
                 common: common,
                 large: true,
                 noFilter: true,
@@ -994,12 +999,16 @@ define([
                 });
             }));
         }).nThen(function () {
+            // XXX access_main, access_allow
+            Messages.access_main = 'ACCESS'; // XXX
+            Messages.access_allow = 'ALLOW'; // XXX
+
             var tabs = UI.dialog.tabs([{
-                title: "ACCESS", // XXX
+                title: Messages.access_main,
                 icon: "fa fa-unlock-alt",
                 content: tab1
             }, {
-                title: "ALLOW LIST", // XXX
+                title: Messages.access_allow,
                 disabled: !owned,
                 icon: "fa fa-list",
                 content: tab2

From ef4188db5b99e15691fc6e56bd5e17532c079732 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 19 Feb 2020 14:31:59 +0100
Subject: [PATCH 15/37] Fix translation keys and fix UI

---
 .../src/less2/include/alertify.less           |  4 ++
 www/common/inner/access.js                    | 64 ++++++++++++-------
 2 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/customize.dist/src/less2/include/alertify.less b/customize.dist/src/less2/include/alertify.less
index 52019a912..aba088c2e 100644
--- a/customize.dist/src/less2/include/alertify.less
+++ b/customize.dist/src/less2/include/alertify.less
@@ -72,6 +72,10 @@
         z-index: 100000; // alertify container
         font: @colortheme_app-font;
 
+        .cp-checkmark {
+            color: #000000;
+        }
+
         .cp-inline-alert-text {
             flex: 1;
         }
diff --git a/www/common/inner/access.js b/www/common/inner/access.js
index 746234b43..216e7f94f 100644
--- a/www/common/inner/access.js
+++ b/www/common/inner/access.js
@@ -11,6 +11,12 @@ define([
              Messages, nThen) {
     var Access = {};
 
+        // XXX contacts, teams, access_noContact
+        Messages.contacts = "Contacts"; // XXX
+        Messages.teams = "Teams"; // XXX
+        Messages.access_noContact = "No other contact to add"; // XXX
+
+
     var getOwnersTab = function (common, data, opts, _cb) {
         var cb = Util.once(Util.mkAsync(_cb));
 
@@ -59,7 +65,7 @@ define([
                     f = f || user;
                     if (f.name) { f.edPublic = edPublic; }
                 }
-                _owners[ed] = f || {
+                _owners[ed] = Util.clone(f) || {
                     displayName: Messages._getKey('owner_unknownUser', [ed]),
                     edPublic: ed,
                 };
@@ -131,10 +137,6 @@ define([
             return $div;
         };
 
-        // XXX contacts, teams
-        Messages.contacts = "Contacts";
-        Messages.teams = "Teams";
-
         // Add owners column
         var drawAdd = function () {
             var $div = $(h('div.cp-share-column'));
@@ -147,14 +149,22 @@ define([
                 }
             });
             // XXX if no more friends, display message...
-            var addCol = UIElements.getUserGrid(Messages.contacts, {
-                common: common,
-                large: true,
-                data: _friends
-            }, function () {
-                //console.log(arguments);
-            });
-            $div.append(addCol.div);
+            if (!Object.keys(_friends).length) {
+                $div.append(h('div.cp-app-prop', [
+                    Messages.contacts,
+                    h('br'),
+                    h('span.cp-app-prop-content', Messages.access_noContact)
+                ]));
+            } else {
+                var addCol = UIElements.getUserGrid(Messages.contacts, {
+                    common: common,
+                    large: true,
+                    data: _friends
+                }, function () {
+                    //console.log(arguments);
+                });
+                $div.append(addCol.div);
+            }
 
             var _teamsData = Util.clone(teamsData);
             Object.keys(teamsData).forEach(function (id) {
@@ -385,7 +395,7 @@ define([
                     f = f || user;
                     if (f.name) { f.edPublic = edPublic; }
                 }
-                _allowed[ed] = f || {
+                _allowed[ed] = Util.clone(f) || {
                     displayName: Messages._getKey('owner_unknownUser', [ed]),
                     edPublic: ed,
                 };
@@ -476,7 +486,7 @@ define([
             $(removeCol.div).addClass('cp-overlay-container').append(h('div.cp-overlay'));
             return h('div', [
                 h('p', Messages.allow_text),
-                cbox,
+                h('p', cbox),
                 removeCol.div
             ]);
         };
@@ -494,14 +504,22 @@ define([
                     delete _friends[curve];
                 }
             });
-            var addCol = UIElements.getUserGrid(Messages.contacts, {
-                common: common,
-                large: true,
-                data: _friends
-            }, function () {
-                //console.log(arguments);
-            });
-            $div.append(addCol.div);
+            if (!Object.keys(_friends).length) {
+                $div.append(h('div.cp-app-prop', [
+                    Messages.contacts,
+                    h('br'),
+                    h('span.cp-app-prop-content', Messages.access_noContact)
+                ]));
+            } else {
+                var addCol = UIElements.getUserGrid(Messages.contacts, {
+                    common: common,
+                    large: true,
+                    data: _friends
+                }, function () {
+                    //console.log(arguments);
+                });
+                $div.append(addCol.div);
+            }
 
             var _teamsData = Util.clone(teamsData);
             Object.keys(teamsData).forEach(function (id) {

From 5f8ae61bd4ab52ef5f17fc3fcb8fff3deec0088a Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 19 Feb 2020 15:56:25 +0100
Subject: [PATCH 16/37] Add request access button to the access modal

---
 www/common/inner/access.js        | 49 +++++++++++++++++++++++++++----
 www/common/sframe-common-outer.js | 29 +++++++++++++-----
 www/common/toolbar3.js            |  8 +++--
 3 files changed, 70 insertions(+), 16 deletions(-)

diff --git a/www/common/inner/access.js b/www/common/inner/access.js
index 216e7f94f..b0232f0b7 100644
--- a/www/common/inner/access.js
+++ b/www/common/inner/access.js
@@ -65,7 +65,7 @@ define([
                     f = f || user;
                     if (f.name) { f.edPublic = edPublic; }
                 }
-                _owners[ed] = Util.clone(f) || {
+                _owners[ed] = f ? Util.clone(f) : {
                     displayName: Messages._getKey('owner_unknownUser', [ed]),
                     edPublic: ed,
                 };
@@ -395,7 +395,7 @@ define([
                     f = f || user;
                     if (f.name) { f.edPublic = edPublic; }
                 }
-                _allowed[ed] = Util.clone(f) || {
+                _allowed[ed] = f ? Util.clone(f) : {
                     displayName: Messages._getKey('owner_unknownUser', [ed]),
                     edPublic: ed,
                 };
@@ -717,6 +717,7 @@ define([
         opts = opts || {};
 
         var priv = common.getMetadataMgr().getPrivateData();
+        var sframeChan = common.getSframeChannel();
 
         var $div = $(h('div.cp-share-columns'));
         if (!data) { return void cb(void 0, $div); }
@@ -763,8 +764,6 @@ define([
                 // In the properties, we should have the edit href if we know it.
                 // We should know it because the pad is stored, but it's better to check...
                 if (!data.noEditPassword && owned && data.href) { // FIXME SHEET fix password change for sheets
-                    var sframeChan = common.getSframeChannel();
-
                     var isOO = parsed.type === 'sheet';
                     var isFile = parsed.hashData.type === 'file';
                     var isSharedFolder = parsed.type === 'drive';
@@ -881,7 +880,11 @@ define([
             Messages.allow_disabled = 'DISABLED'; // XXX
             Messages.allow_label = 'Allow list: {0}'; // XXX
 
+            var owned = isOwned(common, data);
+            var priv = common.getMetadataMgr().getPrivateData();
+            var edPublic = priv.edPublic;
 
+            // Owners
             var content = [];
             var _ownersGrid = getUserList(common, data.owners);
             if (_ownersGrid && _ownersGrid.div) {
@@ -898,6 +901,41 @@ define([
                 ]));
             }
 
+            // Request edit access
+            if (data.roHref && !data.href) {
+                var requestButton = h('button.btn.btn-secondary.no-margin',
+                                        Messages.requestEdit_button);
+                var requestBlock = h('p', requestButton);
+                var $requestBlock = $(requestBlock).hide();
+                content.push(requestBlock);
+                sframeChan.query('Q_REQUEST_ACCESS', {
+                    send: false,
+                    metadata: data
+                }, function (err, obj) {
+                    // Abort if no mailbox available
+                    if (!(obj && obj.state)) { return; }
+
+                    var spinner = UI.makeSpinner($requestBlock);
+                    $requestBlock.show().find('button').click(function () {
+                        if (spinner.getState()) { return; }
+                        spinner.spin();
+                        sframeChan.query('Q_REQUEST_ACCESS', {
+                            send: true,
+                            metadata: data
+                        }, function (err, obj) {
+                            if (obj && obj.state) {
+                                UI.log(Messages.requestEdit_sent);
+                                $requestBlock.find('button').prop('disabled', true);
+                                spinner.done();
+                            } else {
+                                spinner.hide();
+                            }
+                        });
+                    });
+                });
+            }
+
+            // Allow list
             var state = data.restricted ? Messages.allow_enabled : Messages.allow_disabled;
             content.push(h('label', Messages._getKey('allow_label', [state])));
             if (data.restricted) {
@@ -908,7 +946,6 @@ define([
             return h('div', content);
         };
 
-        var sframeChan = common.getSframeChannel();
         var redraw = function () {
             $div1.empty();
             $div1.append(drawLeft());
@@ -924,6 +961,7 @@ define([
             data.owners = md.owners;
             data.expire = md.expire;
             data.pending_owners = md.pending_owners;
+            data.mailbox = md.mailbox;
             redraw();
         });
         redraw();
@@ -960,6 +998,7 @@ define([
                 data.owners = obj.owners;
                 data.expire = obj.expire;
                 data.pending_owners = obj.pending_owners;
+                data.mailbox = obj.mailbox;
             }));
         }).nThen(function () {
             cb(void 0, data);
diff --git a/www/common/sframe-common-outer.js b/www/common/sframe-common-outer.js
index b831436b3..9fce81594 100644
--- a/www/common/sframe-common-outer.js
+++ b/www/common/sframe-common-outer.js
@@ -1236,22 +1236,24 @@ define([
             });
             // REQUEST_ACCESS is used both to check IF we can contact an owner (send === false)
             // AND also to send the request if we want (send === true)
-            sframeChan.on('Q_REQUEST_ACCESS', function (send, cb) {
+            sframeChan.on('Q_REQUEST_ACCESS', function (data, cb) {
                 if (readOnly && hashes.editHash) {
                     return void cb({error: 'ALREADYKNOWN'});
                 }
+                var send = data.send;
+                var metadata = data.metadata;
                 var owner, owners;
-                var crypto = Crypto.createEncryptor(secret.keys);
+                var _secret = secret;
+                if (metadata && metadata.roHref) {
+                    var _parsed = Utils.Hash.parsePadUrl(metadata.roHref);
+                    _secret = Utils.Hash.getSecrets(_parsed.type, _parsed.hash, metadata.password);
+                }
+                var crypto = Crypto.createEncryptor(_secret.keys);
                 nThen(function (waitFor) {
                     // Try to get the owner's mailbox from the pad metadata first.
                     // If it's is an older owned pad, check if the owner is a friend
                     // or an acquaintance (from async-store directly in requestAccess)
-                    Cryptpad.getPadMetadata({
-                        channel: secret.channel
-                    }, waitFor(function (obj) {
-                        obj = obj || {};
-                        if (obj.error) { return; }
-
+                    var todo = function (obj) {
                         owners = obj.owners;
 
                         var mailbox;
@@ -1270,6 +1272,17 @@ define([
                                 owner = data;
                             } catch (e) { console.error(e); }
                         }
+                    };
+
+                    // If we already have metadata, use it, otherwise, try to get it
+                    if (metadata) { return void todo(metadata); }
+
+                    Cryptpad.getPadMetadata({
+                        channel: secret.channel
+                    }, waitFor(function (obj) {
+                        obj = obj || {};
+                        if (obj.error) { return; }
+                        todo(obj);
                     }));
                 }).nThen(function () {
                     // If we are just checking (send === false) and there is a mailbox field, cb state true
diff --git a/www/common/toolbar3.js b/www/common/toolbar3.js
index b6cb3c125..a46e573ef 100644
--- a/www/common/toolbar3.js
+++ b/www/common/toolbar3.js
@@ -574,6 +574,7 @@ MessengerUI, Messages) {
         return $shareBlock;
     };
 
+    /*
     var createRequest = function (toolbar, config) {
         if (!config.metadataMgr) {
             throw new Error("You must provide a `metadataMgr` to display the request access button");
@@ -590,13 +591,13 @@ MessengerUI, Messages) {
         // If we have access to the owner's mailbox, display the button and enable it
         // false => check if we can contact the owner
         // true ==> send the request
-        Common.getSframeChannel().query('Q_REQUEST_ACCESS', false, function (err, obj) {
+        Common.getSframeChannel().query('Q_REQUEST_ACCESS', {send:false}, function (err, obj) {
             if (obj && obj.state) {
                 var locked = false;
                 $requestBlock.show().click(function () {
                     if (locked) { return; }
                     locked = true;
-                    Common.getSframeChannel().query('Q_REQUEST_ACCESS', true, function (err, obj) {
+                    Common.getSframeChannel().query('Q_REQUEST_ACCESS', {send:true}, function (err, obj) {
                         if (obj && obj.state) {
                             UI.log(Messages.requestEdit_sent);
                             $requestBlock.hide();
@@ -614,6 +615,7 @@ MessengerUI, Messages) {
 
         return $requestBlock;
     };
+    */
 
     var createTitle = function (toolbar, config) {
         var $titleContainer = $('<span>', {
@@ -1226,7 +1228,7 @@ MessengerUI, Messages) {
         tb['fileshare'] = createFileShare;
         tb['title'] = createTitle;
         tb['pageTitle'] = createPageTitle;
-        tb['request'] = createRequest;
+        //tb['request'] = createRequest;
         tb['lag'] = $.noop;
         tb['spinner'] = createSpinner;
         tb['state'] = $.noop;

From e861cd3ab7360803987bb52768583e396cbea26d Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 19 Feb 2020 15:58:30 +0100
Subject: [PATCH 17/37] lint compliance

---
 www/common/inner/access.js | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/www/common/inner/access.js b/www/common/inner/access.js
index b0232f0b7..aad7ae6e5 100644
--- a/www/common/inner/access.js
+++ b/www/common/inner/access.js
@@ -446,7 +446,7 @@ define([
 
             var cbox = UI.createCheckbox('cp-allowlist', Messages.allow_checkbox, restricted);
             var $cbox = $(cbox);
-            var spinner = UI.makeSpinner($cbox)
+            var spinner = UI.makeSpinner($cbox);
             var $checkbox = $cbox.find('input').on('change', function () {
                 if (spinner.getState()) {
                     $checkbox.prop('checked', !$checkbox.prop('checked'));
@@ -880,10 +880,6 @@ define([
             Messages.allow_disabled = 'DISABLED'; // XXX
             Messages.allow_label = 'Allow list: {0}'; // XXX
 
-            var owned = isOwned(common, data);
-            var priv = common.getMetadataMgr().getPrivateData();
-            var edPublic = priv.edPublic;
-
             // Owners
             var content = [];
             var _ownersGrid = getUserList(common, data.owners);
@@ -894,11 +890,6 @@ define([
                 content.push(UI.dialog.selectable(Messages.creation_noOwner, {
                     id: 'cp-app-prop-owners',
                 }));
-                content.push(h('div.cp-app-prop', [
-                    Messages.creation_expiration,
-                    h('br'),
-                    h('span.cp-app-prop-content', expire)
-                ]));
             }
 
             // Request edit access

From bd0e4e66bb4fab4762b67b6216032ffd032acba6 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 19 Feb 2020 16:35:12 +0100
Subject: [PATCH 18/37] Fix allow list issues

---
 www/common/inner/access.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/www/common/inner/access.js b/www/common/inner/access.js
index aad7ae6e5..26d945bcc 100644
--- a/www/common/inner/access.js
+++ b/www/common/inner/access.js
@@ -618,7 +618,8 @@ define([
                 return void handler.stop();
             }
             data.owners = md.owners || [];
-            data.pending_owners = md.pending_owners || [];
+            data.restricted = md.restricted;
+            data.allowed = md.allowed;
             redrawAll();
         });
 
@@ -953,6 +954,8 @@ define([
             data.expire = md.expire;
             data.pending_owners = md.pending_owners;
             data.mailbox = md.mailbox;
+            data.restricted = md.restricted;
+            data.allowed = md.allowed;
             redraw();
         });
         redraw();
@@ -990,6 +993,8 @@ define([
                 data.expire = obj.expire;
                 data.pending_owners = obj.pending_owners;
                 data.mailbox = obj.mailbox;
+                data.restricted = obj.restricted;
+                data.allowed = obj.allowed;
             }));
         }).nThen(function () {
             cb(void 0, data);

From 57c360ebf6665ae6da2217c4c58d8875349a88be Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 19 Feb 2020 17:20:37 +0100
Subject: [PATCH 19/37] Refresh access modal when other tabs make changes

---
 www/common/inner/access.js | 103 +++++++++++++++++++------------------
 1 file changed, 52 insertions(+), 51 deletions(-)

diff --git a/www/common/inner/access.js b/www/common/inner/access.js
index 26d945bcc..d1129ca9d 100644
--- a/www/common/inner/access.js
+++ b/www/common/inner/access.js
@@ -16,6 +16,25 @@ define([
         Messages.teams = "Teams"; // XXX
         Messages.access_noContact = "No other contact to add"; // XXX
 
+    var evRedrawAll = Util.mkEvent();
+
+    // Override metadata values from data
+    var override = function (data, obj) {
+        data.owners = obj.owners;
+        data.expire = obj.expire;
+        data.pending_owners = obj.pending_owners;
+        data.mailbox = obj.mailbox;
+        data.restricted = obj.restricted;
+        data.allowed = obj.allowed;
+    };
+    var loadMetadata = function (common, data, waitFor, redraw) {
+        common.getPadMetadata({
+            channel: data.channel
+        }, waitFor(function (md) {
+            override(data, md);
+            if (redraw) { evRedrawAll.fire(redraw); }
+        }));
+    };
 
     var getOwnersTab = function (common, data, opts, _cb) {
         var cb = Util.once(Util.mkAsync(_cb));
@@ -293,12 +312,7 @@ define([
         redrawAll = function (reload) {
             nThen(function (waitFor) {
                 if (!reload) { return; }
-                common.getPadMetadata({
-                    channel: data.channel
-                }, waitFor(function (md) {
-                    data.owners = md.owners || [];
-                    data.pending_owners = md.pending_owners || [];
-                }));
+                loadMetadata(common, data, waitFor, "owner");
             }).nThen(function () {
                 owners = data.owners || [];
                 pending_owners = data.pending_owners || [];
@@ -310,13 +324,11 @@ define([
         };
         redrawAll();
 
-        var handler = sframeChan.on('EV_RT_METADATA', function (md) {
-            if (!$div1.length) {
-                return void handler.stop();
-            }
-            data.owners = md.owners || [];
-            data.pending_owners = md.pending_owners || [];
-            redrawAll();
+        evRedrawAll.reg(function (type) {
+            if (type === "owner") { return; }
+            setTimeout(function () {
+                redrawAll();
+            });
         });
 
         // Create modal
@@ -593,13 +605,7 @@ define([
         redrawAll = function (reload) {
             nThen(function (waitFor) {
                 if (!reload) { return; }
-                common.getPadMetadata({
-                    channel: data.channel
-                }, waitFor(function (md) {
-                    data.owners = md.owners;
-                    data.restricted = md.restricted;
-                    data.allowed = md.allowed;
-                }));
+                loadMetadata(common, data, waitFor, "allow");
             }).nThen(function () {
                 owners = data.owners || [];
                 restricted = data.restricted || false;
@@ -613,14 +619,11 @@ define([
         };
         redrawAll();
 
-        var handler = sframeChan.on('EV_RT_METADATA', function (md) {
-            if (!$div1.length) {
-                return void handler.stop();
-            }
-            data.owners = md.owners || [];
-            data.restricted = md.restricted;
-            data.allowed = md.allowed;
-            redrawAll();
+        evRedrawAll.reg(function (type) {
+            if (type === "allow") { return; }
+            setTimeout(function () {
+                redrawAll();
+            });
         });
 
         cb(void 0, link);
@@ -938,28 +941,22 @@ define([
             return h('div', content);
         };
 
-        var redraw = function () {
-            $div1.empty();
-            $div1.append(drawLeft());
+        var redraw = function (right) {
+            if (!right) {
+                $div1.empty();
+                $div1.append(drawLeft());
+            }
             $div2.empty();
             $div2.append(drawRight());
         };
-        var handler = sframeChan.on('EV_RT_METADATA', function (md) {
-            if (!$div.length) {
-                handler.stop();
-                return;
-            }
-            md = JSON.parse(JSON.stringify(md));
-            data.owners = md.owners;
-            data.expire = md.expire;
-            data.pending_owners = md.pending_owners;
-            data.mailbox = md.mailbox;
-            data.restricted = md.restricted;
-            data.allowed = md.allowed;
-            redraw();
-        });
         redraw();
 
+        evRedrawAll.reg(function (ownersOrAllow) {
+            setTimeout(function () {
+                redraw(ownersOrAllow);
+            });
+        });
+
         cb(void 0, $div);
     };
 
@@ -989,12 +986,7 @@ define([
                 channel: opts.channel // optional, fallback to current pad
             }, waitFor(function (obj) {
                 if (obj && obj.error) { console.error(obj.error); return; }
-                data.owners = obj.owners;
-                data.expire = obj.expire;
-                data.pending_owners = obj.pending_owners;
-                data.mailbox = obj.mailbox;
-                data.restricted = obj.restricted;
-                data.allowed = obj.allowed;
+                loadMetadata(common, data, waitFor);
             }));
         }).nThen(function () {
             cb(void 0, data);
@@ -1075,6 +1067,15 @@ define([
                 wide: true
             });
             cb (void 0, modal);
+
+            var sframeChan = common.getSframeChannel();
+            var handler = sframeChan.on('EV_RT_METADATA', function (md) {
+                if (!$(modal).length) {
+                    return void handler.stop();
+                }
+                override(data, Util.clone(md));
+                evRedrawAll.fire();
+            });
         });
     };
 

From b4ca18d7c2cfa3ca2bfc904c93d18cdc87d63893 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 19 Feb 2020 17:26:31 +0100
Subject: [PATCH 20/37] Fix access modal bug

---
 www/common/inner/access.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/www/common/inner/access.js b/www/common/inner/access.js
index d1129ca9d..0b55b8476 100644
--- a/www/common/inner/access.js
+++ b/www/common/inner/access.js
@@ -186,8 +186,8 @@ define([
             }
 
             var _teamsData = Util.clone(teamsData);
-            Object.keys(teamsData).forEach(function (id) {
-                var t = teamsData[id];
+            Object.keys(_teamsData).forEach(function (id) {
+                var t = _teamsData[id];
                 t.teamId = id;
                 if (owners.indexOf(t.edPublic) !== -1 || pending_owners.indexOf(t.edPublic) !== -1) {
                     delete _teamsData[id];
@@ -534,8 +534,8 @@ define([
             }
 
             var _teamsData = Util.clone(teamsData);
-            Object.keys(teamsData).forEach(function (id) {
-                var t = teamsData[id];
+            Object.keys(_teamsData).forEach(function (id) {
+                var t = _teamsData[id];
                 t.teamId = id;
                 if (owners.indexOf(t.edPublic) !== -1 || allowed.indexOf(t.edPublic) !== -1) {
                     delete _teamsData[id];

From 43492b6df58a0d4c060e289c05e87fb2888e878f Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 19 Feb 2020 18:51:04 +0100
Subject: [PATCH 21/37] Add mute pad option

---
 .../src/less2/include/modals-ui-elements.less |  3 +
 www/common/inner/access.js                    | 47 ++++++++++-
 www/common/outer/async-store.js               |  2 +
 www/common/sframe-common-outer.js             | 79 ++++++++++++++++++-
 4 files changed, 127 insertions(+), 4 deletions(-)

diff --git a/customize.dist/src/less2/include/modals-ui-elements.less b/customize.dist/src/less2/include/modals-ui-elements.less
index 62f815b21..855142a28 100644
--- a/customize.dist/src/less2/include/modals-ui-elements.less
+++ b/customize.dist/src/less2/include/modals-ui-elements.less
@@ -81,6 +81,9 @@
         }
     }
 
+    .cp-access-margin-right {
+        margin-right: 5px !important;
+    }
 
     // teams invite modal
     .cp-teams-invite-block {
diff --git a/www/common/inner/access.js b/www/common/inner/access.js
index 0b55b8476..4473b8f30 100644
--- a/www/common/inner/access.js
+++ b/www/common/inner/access.js
@@ -634,7 +634,7 @@ define([
         var priv = common.getMetadataMgr().getPrivateData();
         var edPublic = priv.edPublic;
         var owned = false;
-        if (data.owners && data.owners.length) {
+        if (Array.isArray(data.owners) && data.owners.length) {
             if (data.owners.indexOf(edPublic) !== -1) {
                 owned = true;
             } else {
@@ -898,7 +898,7 @@ define([
 
             // Request edit access
             if (data.roHref && !data.href) {
-                var requestButton = h('button.btn.btn-secondary.no-margin',
+                var requestButton = h('button.btn.btn-secondary.no-margin.cp-access-margin-right',
                                         Messages.requestEdit_button);
                 var requestBlock = h('p', requestButton);
                 var $requestBlock = $(requestBlock).hide();
@@ -930,6 +930,49 @@ define([
                 });
             }
 
+            // XXX access_muteRequests
+            Messages.access_muteRequests = "Mute access requests for this pad"; // XXX
+
+            // Mute access requests
+            var priv = common.getMetadataMgr().getPrivateData();
+            var edPublic = priv.edPublic;
+            var owned = isOwned(common, data);
+            var canMute = data.mailbox && owned === true && (
+                    (typeof (data.mailbox) === "string" && data.owners[0] === edPublic) ||
+                    data.mailbox[edPublic]);
+            if (owned === true) {
+                var cbox = UI.createCheckbox('cp-access-mute', Messages.access_muteRequests, !canMute);
+                var $cbox = $(cbox);
+                var spinner = UI.makeSpinner($cbox);
+                var $checkbox = $cbox.find('input').on('change', function () {
+                    if (spinner.getState()) {
+                        $checkbox.prop('checked', !$checkbox.prop('checked'));
+                        return;
+                    }
+                    spinner.spin();
+                    var val = $checkbox.is(':checked');
+                    sframeChan.query('Q_UPDATE_MAILBOX', {
+                        metadata: data,
+                        add: !val
+                    }, function (err, res) {
+                        err = err || (res && res.error);
+                        if (err) {
+                            spinner.hide();
+                            var text = err === "INSUFFICIENT_PERMISSIONS" ? Messages.fm_forbidden
+                                                                          : Messages.error;
+                            return void UI.warn(text);
+                        }
+                        spinner.done();
+                        UI.log(Messages.saved);
+                    });
+                });
+                $cbox.find('.cp-checkmark-label').addClass('cp-access-margin-right');
+                $cbox.find('.cp-checkmark-mark')
+                    .after(h('span.fa.fa-bell-slash.cp-access-margin-right'));
+                content.push(h('p', cbox));
+            }
+
+
             // Allow list
             var state = data.restricted ? Messages.allow_enabled : Messages.allow_disabled;
             content.push(h('label', Messages._getKey('allow_label', [state])));
diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js
index 56415dab6..10e915520 100644
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@@ -1632,6 +1632,7 @@ define([
 
             // If the owner was not is the pad metadata, check if it is a friend.
             // We'll contact the first owner for whom we know the mailbox
+            /* // XXX check mailbox in our contacts is not compatible with the new "mute pad" feature
             if (!owner && Array.isArray(owners)) {
                 var friends = store.proxy.friends || {};
                 // If we have friends, check if an owner is one of them (with a mailbox)
@@ -1648,6 +1649,7 @@ define([
                     });
                 }
             }
+            */
 
             // If send is true, send the request to the owner.
             if (owner) {
diff --git a/www/common/sframe-common-outer.js b/www/common/sframe-common-outer.js
index 9fce81594..4d2cd08f1 100644
--- a/www/common/sframe-common-outer.js
+++ b/www/common/sframe-common-outer.js
@@ -1278,7 +1278,7 @@ define([
                     if (metadata) { return void todo(metadata); }
 
                     Cryptpad.getPadMetadata({
-                        channel: secret.channel
+                        channel: _secret.channel
                     }, waitFor(function (obj) {
                         obj = obj || {};
                         if (obj.error) { return; }
@@ -1287,18 +1287,93 @@ define([
                 }).nThen(function () {
                     // If we are just checking (send === false) and there is a mailbox field, cb state true
                     // If there is no mailbox, we'll have to check if an owner is a friend in the worker
+                    /* // XXX
                     if (owner && !send) {
                         return void cb({state: true});
                     }
+                    */
+                    if (!send) { return void cb({state: Boolean(owner)}); }
+
                     Cryptpad.padRpc.requestAccess({
                         send: send,
-                        channel: secret.channel,
+                        channel: _secret.channel,
                         owner: owner,
                         owners: owners
                     }, cb);
                 });
             });
 
+            // Add or remove our mailbox from the list if we're an owner
+            sframeChan.on('Q_UPDATE_MAILBOX', function (data, cb) {
+                var metadata = data.metadata;
+                var add = data.add;
+                var _secret = secret;
+                if (metadata && (metadata.href || metadata.roHref)) {
+                    var _parsed = Utils.Hash.parsePadUrl(metadata.href || metadata.roHref);
+                    _secret = Utils.Hash.getSecrets(_parsed.type, _parsed.hash, metadata.password);
+                }
+                var crypto = Crypto.createEncryptor(_secret.keys);
+                nThen(function (waitFor) {
+                    // If we already have metadata, use it, otherwise, try to get it
+                    if (metadata) { return; }
+
+                    Cryptpad.getPadMetadata({
+                        channel: secret.channel
+                    }, waitFor(function (obj) {
+                        obj = obj || {};
+                        if (obj.error) {
+                            waitFor.abort();
+                            return void cb(obj);
+                        }
+                        metadata = obj;
+                    }));
+                }).nThen(function () {
+                    // Get and maybe migrate the existing mailbox object
+                    var owners = metadata.owners;
+                    if (!Array.isArray(owners) || owners.indexOf(edPublic) === -1) {
+                        waitFor.abort();
+                        return void cb({ error: 'INSUFFICIENT_PERMISSIONS' });
+                    }
+
+                    // Remove a mailbox
+                    if (!add) {
+                        // Old format: this is the mailbox of the first owner
+                        if (typeof (metadata.mailbox) === "string" && metadata.mailbox) {
+                            // Not our mailbox? abort
+                            if (owners[0] !== edPublic) {
+                                return void cb({ error: 'INSUFFICIENT_PERMISSIONS' });
+                            }
+                            // Remove it
+                            return void Cryptpad.setPadMetadata({
+                                channel: _secret.channel,
+                                command: 'RM_MAILBOX',
+                                value: []
+                            }, cb);
+                        } else if (metadata.mailbox) { // New format
+                            return void Cryptpad.setPadMetadata({
+                                channel: _secret.channel,
+                                command: 'RM_MAILBOX',
+                                value: [edPublic]
+                            }, cb);
+                        }
+                        return void cb({
+                            error: 'NO_MAILBOX'
+                        });
+                    }
+                    // Add a mailbox
+                    var toAdd = {};
+                    toAdd[edPublic] = crypto.encrypt(JSON.stringify({
+                        notifications: notifications,
+                        curvePublic: curvePublic
+                    }));
+                    Cryptpad.setPadMetadata({
+                        channel: _secret.channel,
+                        command: 'ADD_MAILBOX',
+                        value: toAdd
+                    }, cb);
+                });
+            });
+
             sframeChan.on('EV_BURN_PAD', function (channel) {
                 if (!burnAfterReading) { return; }
                 Cryptpad.burnPad({

From 620995506eff61bd25fdc53d6802564f1c10da9a Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 19 Feb 2020 18:52:17 +0100
Subject: [PATCH 22/37] lint compliance

---
 www/common/outer/async-store.js   | 2 +-
 www/common/sframe-common-outer.js | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js
index 10e915520..d82b52d3f 100644
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@@ -1628,11 +1628,11 @@ define([
         // data.send === true  ==> send the request
         Store.requestPadAccess = function (clientId, data, cb) {
             var owner = data.owner;
-            var owners = data.owners;
 
             // If the owner was not is the pad metadata, check if it is a friend.
             // We'll contact the first owner for whom we know the mailbox
             /* // XXX check mailbox in our contacts is not compatible with the new "mute pad" feature
+            var owners = data.owners;
             if (!owner && Array.isArray(owners)) {
                 var friends = store.proxy.friends || {};
                 // If we have friends, check if an owner is one of them (with a mailbox)
diff --git a/www/common/sframe-common-outer.js b/www/common/sframe-common-outer.js
index 4d2cd08f1..f5b0baeb4 100644
--- a/www/common/sframe-common-outer.js
+++ b/www/common/sframe-common-outer.js
@@ -1331,7 +1331,6 @@ define([
                     // Get and maybe migrate the existing mailbox object
                     var owners = metadata.owners;
                     if (!Array.isArray(owners) || owners.indexOf(edPublic) === -1) {
-                        waitFor.abort();
                         return void cb({ error: 'INSUFFICIENT_PERMISSIONS' });
                     }
 

From 521db379a0d774d87ca9339dd47792859b029347 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 19 Feb 2020 19:05:29 +0100
Subject: [PATCH 23/37] Add access button in all the apps

---
 www/common/common-ui-elements.js   | 20 ++++++++++++++++++++
 www/common/inner/access.js         |  3 ++-
 www/common/onlyoffice/inner.js     |  2 ++
 www/common/sframe-app-framework.js |  2 ++
 www/file/inner.js                  |  1 +
 www/poll/inner.js                  |  2 ++
 6 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 4fc8ba347..fe38c06ed 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1802,6 +1802,26 @@ define([
                 });
                 updateIcon(data.element.is(':visible'));
                 break;
+            case 'access':
+                button = $('<button>', {
+                    'class': 'fa fa-unlock-alt cp-toolbar-icon-access',
+                    title: "ACCESS", // XXX
+                }).append($('<span>', {'class': 'cp-toolbar-drawer-element'})
+                .text("ACCESS")) // XXX
+                .click(common.prepareFeedback(type))
+                .click(function () {
+                    common.isPadStored(function (err, data) {
+                        if (!data) {
+                            return void UI.alert(Messages.autostore_notAvailable);
+                        }
+                        require(['/common/inner/access.js'], function (Access) {
+                            Access.getAccessModal(common, {}, function (e) {
+                                if (e) { console.error(e); }
+                            });
+                        });
+                    });
+                });
+                break;
             case 'properties':
                 button = $('<button>', {
                     'class': 'fa fa-info-circle cp-toolbar-icon-properties',
diff --git a/www/common/inner/access.js b/www/common/inner/access.js
index 4473b8f30..f717ad2ef 100644
--- a/www/common/inner/access.js
+++ b/www/common/inner/access.js
@@ -940,7 +940,7 @@ define([
             var canMute = data.mailbox && owned === true && (
                     (typeof (data.mailbox) === "string" && data.owners[0] === edPublic) ||
                     data.mailbox[edPublic]);
-            if (owned === true) {
+            if (owned === true) { // XXX not for files
                 var cbox = UI.createCheckbox('cp-access-mute', Messages.access_muteRequests, !canMute);
                 var $cbox = $(cbox);
                 var spinner = UI.makeSpinner($cbox);
@@ -1067,6 +1067,7 @@ define([
             }));
 
             if (!owned) { return; }
+            // XXX if "file" ==> don't show "allow" and "owners"
 
             getAllowTab(common, data, opts, waitFor(function (e, c) {
                 if (e) {
diff --git a/www/common/onlyoffice/inner.js b/www/common/onlyoffice/inner.js
index 4270b0f4c..d18001dc9 100644
--- a/www/common/onlyoffice/inner.js
+++ b/www/common/onlyoffice/inner.js
@@ -1479,6 +1479,8 @@ define([
 
             var $properties = common.createButton('properties', true);
             toolbar.$drawer.append($properties);
+            var $access = common.createButton('access', true);
+            toolbar.$drawer.append($access);
         };
 
         config.onReady = function (info) {
diff --git a/www/common/sframe-app-framework.js b/www/common/sframe-app-framework.js
index ea22aaf5f..dfd9faef6 100644
--- a/www/common/sframe-app-framework.js
+++ b/www/common/sframe-app-framework.js
@@ -699,6 +699,8 @@ define([
 
             var $properties = common.createButton('properties', true);
             toolbar.$drawer.append($properties);
+            var $access = common.createButton('access', true);
+            toolbar.$drawer.append($access);
 
             createFilePicker();
 
diff --git a/www/file/inner.js b/www/file/inner.js
index 361c59356..f0753005f 100644
--- a/www/file/inner.js
+++ b/www/file/inner.js
@@ -132,6 +132,7 @@ define([
                     title: Title.getTitleConfig(),
                 });
                 toolbar.$rightside.append(common.createButton('forget', true));
+                toolbar.$rightside.append(common.createButton('access', true));
                 toolbar.$rightside.append(common.createButton('properties', true));
                 if (common.isLoggedIn()) {
                     toolbar.$rightside.append(common.createButton('hashtag', true));
diff --git a/www/poll/inner.js b/www/poll/inner.js
index d1d583757..80132cb19 100644
--- a/www/poll/inner.js
+++ b/www/poll/inner.js
@@ -1171,6 +1171,8 @@ define([
         var $forgetPad = common.createButton('forget', true, {}, forgetCb);
         $rightside.append($forgetPad);
 
+        var $access = common.createButton('access', true);
+        $drawer.append($access);
         var $properties = common.createButton('properties', true);
         $drawer.append($properties);
 

From f579c9b059c4dd0c8de9fdb5ec92e2662ff8e2dc Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Wed, 19 Feb 2020 14:22:12 -0500
Subject: [PATCH 24/37] semi-functional allow-list implementation in
 historyKeeper

---
 lib/api.js               | 16 +------
 lib/commands/metadata.js | 12 ++++-
 lib/historyKeeper.js     | 94 ++++++++++++++++++++++++++++++++--------
 lib/hk-util.js           | 78 ++++++++++++++++++++-------------
 lib/metadata.js          |  6 +++
 lib/rpc.js               | 11 +++--
 6 files changed, 149 insertions(+), 68 deletions(-)

diff --git a/lib/api.js b/lib/api.js
index bd5c99629..8e6725039 100644
--- a/lib/api.js
+++ b/lib/api.js
@@ -14,21 +14,7 @@ module.exports.create = function (config) {
             .on('channelClose', historyKeeper.channelClose)
             .on('channelMessage', historyKeeper.channelMessage)
             .on('channelOpen', historyKeeper.channelOpen)
-            .on('sessionClose', function (userId, reason) {
-                if (['BAD_MESSAGE', 'SOCKET_ERROR', 'SEND_MESSAGE_FAIL_2'].indexOf(reason) !== -1) {
-                    if (reason && reason.code === 'ECONNRESET') { return; }
-                    return void log.error('SESSION_CLOSE_WITH_ERROR', {
-                        userId: userId,
-                        reason: reason,
-                    });
-                }
-
-                if (reason && reason === 'SOCKET_CLOSED') { return; }
-                log.verbose('SESSION_CLOSE_ROUTINE', {
-                    userId: userId,
-                    reason: reason,
-                });
-            })
+            .on('sessionClose', historyKeeper.sessionClose)
             .on('error', function (error, label, info) {
                 if (!error) { return; }
                 /* labels:
diff --git a/lib/commands/metadata.js b/lib/commands/metadata.js
index 5b5e28f7e..78584d3ae 100644
--- a/lib/commands/metadata.js
+++ b/lib/commands/metadata.js
@@ -12,7 +12,7 @@ Data.getMetadata = function (Env, channel, cb/* , Server */) {
     if (!Core.isValidId(channel)) { return void cb('INVALID_CHAN'); }
     if (channel.length !== 32) { return cb("INVALID_CHAN_LENGTH"); }
 
-    // FIXME get metadata from the server cache if it is available
+    // XXX get metadata from the server cache if it is available
     batchMetadata(channel, cb, function (done) {
         var ref = {};
         var lineHandler = Meta.createLineHandler(ref, Env.Log.error);
@@ -108,6 +108,16 @@ Data.setMetadata = function (Env, safeKey, data, cb, Server) {
                     return void next();
                 }
 
+
+            // chainpad-server@4.0.3 supports a removeFromChannel method
+            // Server.removeFromChannel(channelName, userId);
+            // this lets us kick users from restricted channels
+
+            // XXX RESTRICT
+            // if the metadata changes and includes an allowed list
+            // kick any current users from the channel
+            // if they aren't on it.
+
                 cb(void 0, metadata);
                 next();
 
diff --git a/lib/historyKeeper.js b/lib/historyKeeper.js
index 1b306681e..53de34e6b 100644
--- a/lib/historyKeeper.js
+++ b/lib/historyKeeper.js
@@ -46,6 +46,8 @@ module.exports.create = function (config, cb) {
         paths: {},
         //msgStore: config.store,
 
+        netfluxUsers: {},
+
         pinStore: undefined,
         pinnedPads: {},
         pinsLoaded: false,
@@ -110,27 +112,81 @@ module.exports.create = function (config, cb) {
             // we drop cached metadata and indexes at the same time
             HK.dropChannel(Env, channelName);
         },
-        channelOpen: function (Server, channelName, userId) {
+        channelOpen: function (Server, channelName, userId, wait) {
             Env.channel_cache[channelName] = Env.channel_cache[channelName] || {};
 
-            //const metadata = Env.metadata_cache[channelName];
-            // chainpad-server@4.0.3 supports a removeFromChannel method
-            // Server.removeFromChannel(channelName, userId);
-            // this lets us kick users from restricted channels
-
-            // XXX RESTRICT
-            // this event is emitted whenever a user joins a channel.
-            // if that channel is restricted then we should forcefully disconnect them.
-            // we won't know that it's restricted until we load its metadata.
-            // as long as metadata is in memory as long as anyone is sending messages to a channel
-            // then we won't broadcast messages to unauthorized users
-
-            Server.send(userId, [
-                0,
-                Env.id,
-                'JOIN',
-                channelName
-            ]);
+            var proceed = function () {
+                Server.send(userId, [
+                    0,
+                    Env.id,
+                    'JOIN',
+                    channelName
+                ]);
+            };
+
+            // only conventional channels can be restricted
+            if ((channelName || "").length !== 32) { // XXX use contants
+                return proceed();
+            }
+
+            var next = wait();
+
+            // gets and caches the metadata...
+            // XXX make sure it doesn't get stuck in cache...
+            HK.getMetadata(Env, channelName, function (err, metadata) {
+                if (err) {
+                    console.log("> METADATA ERR", err);
+                    throw new Error(err); // XXX
+                }
+
+                if (!metadata || (metadata && !metadata.restricted)) {
+                    // the channel doesn't have metadata, or it does and it's not restricted
+                    // either way, let them join.
+                    proceed();
+                    return void next();
+                }
+
+                // this channel is restricted. verify that the user in question is in the allow list
+
+                // construct a definitive list (owners + allowed)
+                var allowed = HK.listAllowedUsers(metadata);
+                // and get the list of keys for which this user has already authenticated
+                var session = HK.getNetfluxSession(Env, userId);
+
+                // iterate over their keys. If any of them are in the allow list, let them join
+                if (session) {
+                    for (var unsafeKey in session) {
+                        if (allowed.indexOf(unsafeKey) !== -1) {
+                            proceed();
+                            return void next();
+                        }
+                    }
+                }
+
+                // otherwise they're not allowed.
+                // respond with a special error that includes the list of keys
+                // which would be allowed...
+                // XXX bonus points if you hash the keys to limit data exposure
+                next(["ERESTRICTED"].concat(allowed));
+            });
+        },
+        sessionClose: function (userId, reason) {
+            HK.closeNetfluxSession(Env, userId);
+
+            // XXX RESTRICT drop user session data
+            if (['BAD_MESSAGE', 'SOCKET_ERROR', 'SEND_MESSAGE_FAIL_2'].indexOf(reason) !== -1) {
+                if (reason && reason.code === 'ECONNRESET') { return; }
+                return void Log.error('SESSION_CLOSE_WITH_ERROR', {
+                    userId: userId,
+                    reason: reason,
+                });
+            }
+
+            if (reason && reason === 'SOCKET_CLOSED') { return; }
+            Log.verbose('SESSION_CLOSE_ROUTINE', {
+                userId: userId,
+                reason: reason,
+            });
         },
         directMessage: function (Server, seq, userId, json) {
             // netflux-server allows you to register an id with a handler
diff --git a/lib/hk-util.js b/lib/hk-util.js
index c94a67bd5..eac886c79 100644
--- a/lib/hk-util.js
+++ b/lib/hk-util.js
@@ -4,7 +4,7 @@ var HK = module.exports;
 
 const nThen = require('nthen');
 const Util = require("./common-util");
-const Meta = require("./metadata");
+const MetaRPC = require("./commands/metadata");
 const Nacl = require('tweetnacl/nacl-fast');
 
 const now = function () { return (new Date()).getTime(); };
@@ -80,6 +80,23 @@ const isChannelRestricted = function (metadata) { // XXX RESTRICT
     return false;
 };
 
+HK.listAllowedUsers = function (metadata) {
+    return (metadata.owners || []).concat((metadata.allowed || []));
+};
+
+HK.getNetfluxSession = function (Env, netfluxId) {
+    return Env.netfluxUsers[netfluxId];
+};
+
+HK.authenticateNetfluxSession = function (Env, netfluxId, unsafeKey) {
+    var user = Env.netfluxUsers[netfluxId] = Env.netfluxUsers[netfluxId] || {};
+    user[unsafeKey] = +new Date();
+};
+
+HK.closeNetfluxSession = function (Env, netfluxId) {
+    delete Env.netfluxUsers[netfluxId];
+};
+
 const isUserAllowed = function (metadata, userId) { // XXX RESTRICT
 /*
 
@@ -174,6 +191,23 @@ const checkExpired = function (Env, Server, channel) {
     return true;
 };
 
+const getMetadata = HK.getMetadata = function (Env, channelName, cb) {
+    var metadata = Env.metadata_cache[channelName];
+    if (metadata && typeof(metadata) === 'object') {
+        return void Util.mkAsync(cb)(undefined, metadata);
+    }
+
+    MetaRPC.getMetadata(Env, channelName, function (err, metadata) {
+        if (err) {
+            console.error(err);
+            return void cb(err);
+        }
+        // cache it
+        Env.metadata_cache[channelName] = metadata;
+        cb(undefined, metadata);
+    });
+};
+
 /*  computeIndex
     can call back with an error or a computed index which includes:
         * cpIndex:
@@ -203,13 +237,18 @@ const computeIndex = function (Env, channelName, cb) {
     let metadata;
     let i = 0;
 
-    const ref = {};
-
     const CB = Util.once(cb);
 
     const offsetByHash = {};
     let size = 0;
     nThen(function (w) {
+        getMetadata(Env, channelName, w(function (err, _metadata) {
+            if (err) {
+                throw new Error(err);
+            }
+            metadata = _metadata;
+        }));
+    }).nThen(function (w) {
         // iterate over all messages in the channel log
         // old channels can contain metadata as the first message of the log
         // remember metadata the first time you encounter it
@@ -218,14 +257,15 @@ const computeIndex = function (Env, channelName, cb) {
             let msg;
             // keep an eye out for the metadata line if you haven't already seen it
             // but only check for metadata on the first line
-            if (!i && !metadata && msgObj.buff.indexOf('{') === 0) {
+            if (!i && msgObj.buff.indexOf('{') === 0) { // XXX RESTRICT metadata...
                 i++; // always increment the message counter
                 msg = tryParse(Env, msgObj.buff.toString('utf8'));
                 if (typeof msg === "undefined") { return readMore(); }
 
                 // validate that the current line really is metadata before storing it as such
-                if (isMetadataMessage(msg)) {
-                    metadata = msg;
+                if (isMetadataMessage(msg)) { // XXX RESTRICT
+                    //metadata = msg; // XXX RESTRICT
+                    // skip this, as you already have metadata...
                     return readMore();
                 }
             }
@@ -268,26 +308,8 @@ const computeIndex = function (Env, channelName, cb) {
                 size = msgObj.offset + msgObj.buff.length + 1;
             });
         }));
-    }).nThen(function (w) {
-        // create a function which will iterate over amendments to the metadata
-        const handler = Meta.createLineHandler(ref, Log.error);
-
-        // initialize the accumulator in case there was a foundational metadata line in the log content
-        if (metadata) { handler(void 0, metadata); }
-
-        // iterate over the dedicated metadata log (if it exists)
-        // proceed even in the event of a stream error on the metadata log
-        store.readDedicatedMetadata(channelName, handler, w(function (err) {
-            if (err) {
-                return void Log.error("DEDICATED_METADATA_ERROR", err);
-            }
-        }));
     }).nThen(function () {
-        // when all is done, cache the metadata in memory
-        if (ref.index) { // but don't bother if no metadata was found...
-            metadata = Env.metadata_cache[channelName] = ref.meta;
-        }
-        // and return the computed index
+        // return the computed index
         CB(null, {
             // Only keep the checkpoints included in the last 100 messages
             cpIndex: sliceCpIndex(cpIndex, i),
@@ -316,9 +338,7 @@ const getIndex = (Env, channelName, cb) => {
     // if there is a channel in memory and it has an index cached, return it
     if (chan && chan.index) {
         // enforce async behaviour
-        return void setTimeout(function () {
-            cb(undefined, chan.index);
-        });
+        return void Util.mkAsync(cb)(undefined, chan.index);
     }
 
     Env.batchIndexReads(channelName, cb, function (done) {
@@ -592,7 +612,7 @@ const handleRPC = function (Env, Server, seq, userId, parsed) {
     Server.send(userId, [seq, 'ACK']);
     try {
         // slice off the sequence number and pass in the rest of the message
-        Env.rpc(Server, rpc_call, function (err, output) {
+        Env.rpc(Server, userId, rpc_call, function (err, output) {
             if (err) {
                 Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, JSON.stringify([parsed[0], 'ERROR', err])]); 
                 return;
diff --git a/lib/metadata.js b/lib/metadata.js
index a8ed86fd3..46d261e3d 100644
--- a/lib/metadata.js
+++ b/lib/metadata.js
@@ -224,6 +224,9 @@ commands.RM_OWNERS = function (meta, args) {
         changed = true;
     });
 
+    // XXX RESTRICT only owned channels can be restricted
+    // drop the restricted flag if there are no owners
+
     return changed;
 };
 
@@ -302,6 +305,9 @@ commands.RESET_OWNERS = function (meta, args) {
         });
     }
 
+    // XXX RESTRICT only owned channels can be restricted
+    // drop the restricted flag if there are no owners
+
     return true;
 };
 
diff --git a/lib/rpc.js b/lib/rpc.js
index 0d9c605f7..ad6ccde5c 100644
--- a/lib/rpc.js
+++ b/lib/rpc.js
@@ -9,6 +9,7 @@ const Block = require("./commands/block");
 const Metadata = require("./commands/metadata");
 const Channel = require("./commands/channel");
 const Upload = require("./commands/upload");
+const HK = require("./hk-util");
 
 var RPC = module.exports;
 
@@ -117,7 +118,7 @@ var handleAuthenticatedMessage = function (Env, unsafeKey, msg, respond, Server)
     return void Respond('UNSUPPORTED_RPC_CALL', msg);
 };
 
-var rpc = function (Env, Server, data, respond) {
+var rpc = function (Env, Server, userId, data, respond) {
     if (!Array.isArray(data)) {
         Env.Log.debug('INVALID_ARG_FORMET', data);
         return void respond('INVALID_ARG_FORMAT');
@@ -143,8 +144,9 @@ var rpc = function (Env, Server, data, respond) {
     var publicKey = msg.shift();
 
     // make sure a user object is initialized in the cookie jar
+    var session;
     if (publicKey) {
-        Core.getSession(Env.Sessions, publicKey);
+        session = Core.getSession(Env.Sessions, publicKey);
     } else {
         Env.Log.debug("NO_PUBLIC_KEY_PROVIDED", publicKey);
     }
@@ -174,6 +176,7 @@ var rpc = function (Env, Server, data, respond) {
         // check the signature on the message
         // refuse the command if it doesn't validate
         if (Core.checkSignature(Env, serialized, signature, publicKey) === true) {
+            HK.authenticateNetfluxSession(Env, userId, publicKey);
             return void handleAuthenticatedMessage(Env, publicKey, msg, respond, Server);
         }
         return void respond("INVALID_SIGNATURE_OR_PUBLIC_KEY");
@@ -202,9 +205,9 @@ RPC.create = function (Env, cb) {
         Core.expireSessions(Sessions);
     }, Core.SESSION_EXPIRATION_TIME);
 
-    cb(void 0, function (Server, data, respond) {
+    cb(void 0, function (Server, userId, data, respond) {
         try {
-            return rpc(Env, Server, data, respond);
+            return rpc(Env, Server, userId, data, respond);
         } catch (e) {
             console.log("Error from RPC with data " + JSON.stringify(data));
             console.log(e.stack);

From 79bc8830efffe5d7b027b68b12ae0633112e405c Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Wed, 19 Feb 2020 14:39:28 -0500
Subject: [PATCH 25/37] disable access restriction if all owners are removed

---
 lib/metadata.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/metadata.js b/lib/metadata.js
index 46d261e3d..2cc11e072 100644
--- a/lib/metadata.js
+++ b/lib/metadata.js
@@ -224,8 +224,9 @@ commands.RM_OWNERS = function (meta, args) {
         changed = true;
     });
 
-    // XXX RESTRICT only owned channels can be restricted
-    // drop the restricted flag if there are no owners
+    if (meta.owners.length === 0 && meta.restricted) {
+        meta.restricted = false;
+    }
 
     return changed;
 };
@@ -305,8 +306,9 @@ commands.RESET_OWNERS = function (meta, args) {
         });
     }
 
-    // XXX RESTRICT only owned channels can be restricted
-    // drop the restricted flag if there are no owners
+    if (meta.owners.length === 0 && meta.restricted) {
+        meta.restricted = false;
+    }
 
     return true;
 };

From 597f417ad607117ef54af372718f948cdff03801 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Wed, 19 Feb 2020 15:32:15 -0500
Subject: [PATCH 26/37] WIP block history requests that bypass JOIN restriction
 (where appropriate)

---
 lib/historyKeeper.js |  11 ++---
 lib/hk-util.js       | 103 +++++++++++++++++++++++++------------------
 2 files changed, 63 insertions(+), 51 deletions(-)

diff --git a/lib/historyKeeper.js b/lib/historyKeeper.js
index 53de34e6b..93644f571 100644
--- a/lib/historyKeeper.js
+++ b/lib/historyKeeper.js
@@ -153,14 +153,9 @@ module.exports.create = function (config, cb) {
                 // and get the list of keys for which this user has already authenticated
                 var session = HK.getNetfluxSession(Env, userId);
 
-                // iterate over their keys. If any of them are in the allow list, let them join
-                if (session) {
-                    for (var unsafeKey in session) {
-                        if (allowed.indexOf(unsafeKey) !== -1) {
-                            proceed();
-                            return void next();
-                        }
-                    }
+                if (HK.isUserSessionAllowed(allowed, session)) {
+                    proceed();
+                    return void next();
                 }
 
                 // otherwise they're not allowed.
diff --git a/lib/hk-util.js b/lib/hk-util.js
index eac886c79..049529a74 100644
--- a/lib/hk-util.js
+++ b/lib/hk-util.js
@@ -75,11 +75,6 @@ const isMetadataMessage = function (parsed) {
     return Boolean(parsed && parsed.channel);
 };
 
-const isChannelRestricted = function (metadata) { // XXX RESTRICT
-    metadata = metadata;
-    return false;
-};
-
 HK.listAllowedUsers = function (metadata) {
     return (metadata.owners || []).concat((metadata.allowed || []));
 };
@@ -88,6 +83,16 @@ HK.getNetfluxSession = function (Env, netfluxId) {
     return Env.netfluxUsers[netfluxId];
 };
 
+HK.isUserSessionAllowed = function (allowed, session) {
+    if (!session) { return false; }
+    for (var unsafeKey in session) {
+        if (allowed.indexOf(unsafeKey) !== -1) {
+            return true;
+        }
+    }
+    return false;
+};
+
 HK.authenticateNetfluxSession = function (Env, netfluxId, unsafeKey) {
     var user = Env.netfluxUsers[netfluxId] = Env.netfluxUsers[netfluxId] || {};
     user[unsafeKey] = +new Date();
@@ -97,24 +102,6 @@ HK.closeNetfluxSession = function (Env, netfluxId) {
     delete Env.netfluxUsers[netfluxId];
 };
 
-const isUserAllowed = function (metadata, userId) { // XXX RESTRICT
-/*
-
-    at this point all we have is the user's netflux id.
-    the allow-list is encoded for 'unsafeKeys' (URL-unsafe base64 encoded public signing keys).
-
-    we need a lookup table: netfluxId => public keys with which this netflux session has authenticated.
-    from there we can check whether the user has authenticated for any of the allowed keys this session.
-
-    owners are implicitly allowed to view any file they own.
-    pending_owners too.
-    otherwise check metadata.allowed.
-
-*/
-    userId = userId;
-    return false;
-};
-
 // validateKeyStrings supplied by clients must decode to 32-byte Uint8Arrays
 const isValidValidateKeyString = function (key) {
     try {
@@ -690,15 +677,6 @@ const handleGetHistory = function (Env, Server, seq, userId, parsed) {
             // FIXME this is hard to read because 'checkExpired' has side effects
             if (checkExpired(Env, Server, channelName)) { return void waitFor.abort(); }
 
-            // XXX RESTRICT
-            // once we've loaded the metadata we can check whether the channel is restricted
-            // and notify the user if they're not included in the list
-            if (isChannelRestricted(index.metadata) && isUserAllowed(index.metadata, userId)) {
-                // XXX RESTRICT send a message indicating that they need to authenticate
-                // for a list of private keys...
-                return void waitFor.abort();
-            }
-
             // always send metadata with GET_HISTORY requests
             Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, JSON.stringify(index.metadata)], w);
         }));
@@ -865,20 +843,59 @@ HK.onDirectMessage = function (Env, Server, seq, userId, json) {
         return;
     }
 
-    // If the requested history is for an expired channel, abort
-    // Note the if we don't have the keys for that channel in metadata_cache, we'll
-    // have to abort later (once we know the expiration time)
-    if (checkExpired(Env, Server, parsed[1])) { return; }
+    var first = parsed[0];
+
+    if (typeof(directMessageCommands[first]) !== 'function') {
+        // it's either an unsupported command or an RPC call
+        // either way, RPC has it covered
+        return void handleRPC(Env, Server, seq, userId, parsed);
+    }
+
+    // otherwise it's some kind of history retrieval command...
+    // go grab its metadata, because unfortunately people can ask for history
+    // whether or not they have joined the channel, so we can't rely on JOIN restriction
+    // to stop people from loading history they shouldn't see.
+    var channelName = parsed[1];
+    nThen(function (w) {
+        HK.getMetadata(Env, channelName, w(function (err, metadata) {
+            if (err) {
+                // stream errors?
+                // we should log these, but if we can't load metadata
+                // then it's probably not restricted or expired
+                // it's not like anything else will recover from this anyway
+                return;
+            }
 
-    // XXX RESTRICT
-    // metadata might already be in memory.
-    // rejecting unauthorized users here is an optimization
 
-    // look up the appropriate command in the map of commands or fall back to RPC
-    var command = directMessageCommands[parsed[0]] || handleRPC;
+            // likewise, we can't do anything more here if there's no metadata
+            // jump to the next block
+            if (!metadata) { return; }
 
-    // run the command with the standard function signature
-    command(Env, Server, seq, userId, parsed);
+            // If the requested history is for an expired channel, abort
+            // checkExpired has side effects and will disconnect users for you...
+            if (checkExpired(Env, Server, parsed[1])) {
+                // if the channel is expired just abort.
+                w.abort();
+                return;
+            }
+
+            // jump to handling the command if there's no restriction...
+            if (!metadata.restricted) { return; }
+
+            // check if the user is in the allow list...
+            const allowed = HK.listAllowedUsers(metadata);
+            const session = HK.getNetfluxSession(Env, userId);
+
+            if (HK.isUserSessionAllowed(allowed, session)) {
+                return;
+            }
+
+            // XXX NOT ALLOWED
+        }));
+    }).nThen(function () {
+        // run the appropriate command from the map
+        directMessageCommands[first](Env, Server, seq, userId, parsed);
+    });
 };
 
 /*  onChannelMessage

From 9d5bf7e1bb813499bf2f4b13187e4293d82e1ccd Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 20 Feb 2020 11:30:38 +0100
Subject: [PATCH 27/37] Disable allow list for files and shared folders

---
 www/common/inner/access.js  | 44 ++++++++++++++++++++++---------------
 www/common/proxy-manager.js |  5 +++--
 2 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/www/common/inner/access.js b/www/common/inner/access.js
index f717ad2ef..9acab44ab 100644
--- a/www/common/inner/access.js
+++ b/www/common/inner/access.js
@@ -167,7 +167,6 @@ define([
                     delete _friends[curve];
                 }
             });
-            // XXX if no more friends, display message...
             if (!Object.keys(_friends).length) {
                 $div.append(h('div.cp-app-prop', [
                     Messages.contacts,
@@ -570,7 +569,7 @@ define([
             }).filter(function (x) { return x; });
 
             nThen(function (waitFor) {
-                var msg = Messages.owner_addConfirm;
+                var msg = Messages.owner_addConfirm; // XXX change to use allow list here
                 UI.confirm(msg, waitFor(function (yes) {
                     if (!yes) {
                         waitFor.abort();
@@ -896,6 +895,10 @@ define([
                 }));
             }
 
+            // Stop here for files: no allow list, no access request
+            // Also stop for shared folders
+            if (parsed.hashData.type !== 'pad' || parsed.type === 'drive') { return h('div', content); }
+
             // Request edit access
             if (data.roHref && !data.href) {
                 var requestButton = h('button.btn.btn-secondary.no-margin.cp-access-margin-right',
@@ -940,7 +943,7 @@ define([
             var canMute = data.mailbox && owned === true && (
                     (typeof (data.mailbox) === "string" && data.owners[0] === edPublic) ||
                     data.mailbox[edPublic]);
-            if (owned === true) { // XXX not for files
+            if (owned === true) {
                 var cbox = UI.createCheckbox('cp-access-mute', Messages.access_muteRequests, !canMute);
                 var $cbox = $(cbox);
                 var spinner = UI.makeSpinner($cbox);
@@ -1038,7 +1041,8 @@ define([
     Access.getAccessModal = function (common, opts, cb) {
         var data;
         var tab1, tab2, tab3;
-        var owned = false;
+        var disabled = false;
+        var allowDisabled = false;
         var button = [{
             className: 'cancel',
             name: Messages.filePicker_close,
@@ -1054,7 +1058,10 @@ define([
                 data = _data;
             }));
         }).nThen(function (waitFor) {
-            owned = isOwned(common, data);
+            var owned = isOwned(common, data);
+            var parsed = Hash.parsePadUrl(data.href || data.roHref);
+            disabled = !owned || !parsed.hashData || parsed.hashData.type !== 'pad';
+            allowDisabled = parsed.type === 'drive';
 
             getAccessTab(common, data, opts, waitFor(function (e, c) {
                 if (e) {
@@ -1066,18 +1073,19 @@ define([
                 });
             }));
 
-            if (!owned) { return; }
-            // XXX if "file" ==> don't show "allow" and "owners"
+            if (disabled) { return; }
 
-            getAllowTab(common, data, opts, waitFor(function (e, c) {
-                if (e) {
-                    waitFor.abort();
-                    return void cb(e);
-                }
-                tab2 = UI.dialog.customModal(c, {
-                    buttons: button
-                });
-            }));
+            if (!allowDisabled) {
+                getAllowTab(common, data, opts, waitFor(function (e, c) {
+                    if (e) {
+                        waitFor.abort();
+                        return void cb(e);
+                    }
+                    tab2 = UI.dialog.customModal(c, {
+                        buttons: button
+                    });
+                }));
+            }
             getOwnersTab(common, data, opts, waitFor(function (e, c) {
                 if (e) {
                     waitFor.abort();
@@ -1098,12 +1106,12 @@ define([
                 content: tab1
             }, {
                 title: Messages.access_allow,
-                disabled: !owned,
+                disabled: disabled || allowDisabled,
                 icon: "fa fa-list",
                 content: tab2
             }, {
                 title: Messages.creation_owners,
-                disabled: !owned,
+                disabled: disabled,
                 icon: "fa fa-id-badge",
                 content: tab3
             }]);
diff --git a/www/common/proxy-manager.js b/www/common/proxy-manager.js
index 83e10c50c..29f762956 100644
--- a/www/common/proxy-manager.js
+++ b/www/common/proxy-manager.js
@@ -900,10 +900,11 @@ define([
         cb = cb || function () {};
         var sfId = Env.user.userObject.getSFIdFromHref(data.href);
         if (sfId) {
-            var sfData = Env.user.proxy[UserObject.SHARED_FOLDERS][sfId];
+            var sfData = getSharedFolderData(Env, sfId);
+            var sfValue = data.attr ? sfData[data.attr] : JSON.parse(JSON.stringify(sfData));
             setTimeout(function () {
                 cb(null, {
-                    value: sfData[data.attr],
+                    value: sfValue,
                     atime: 1
                 });
             });

From 5a189862eb79d034126131557f5662c23f999b9e Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 20 Feb 2020 11:31:54 +0100
Subject: [PATCH 28/37] Fix color

---
 customize.dist/src/less2/include/alertify.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/customize.dist/src/less2/include/alertify.less b/customize.dist/src/less2/include/alertify.less
index aba088c2e..2960c1c3b 100644
--- a/customize.dist/src/less2/include/alertify.less
+++ b/customize.dist/src/less2/include/alertify.less
@@ -73,7 +73,7 @@
         font: @colortheme_app-font;
 
         .cp-checkmark {
-            color: #000000;
+            color: @cryptpad_text_col;
         }
 
         .cp-inline-alert-text {

From 866ce6fb7d74d781dbaf5729041d328c820c4c11 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 20 Feb 2020 11:43:35 +0100
Subject: [PATCH 29/37] Add translation key

---
 www/common/inner/access.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/www/common/inner/access.js b/www/common/inner/access.js
index 9acab44ab..102fb67dc 100644
--- a/www/common/inner/access.js
+++ b/www/common/inner/access.js
@@ -416,7 +416,8 @@ define([
                 }
             });
 
-            // XXX allow_removeConfirm, allow_checkbox, allow_text
+            // XXX allow_removeConfirm, allow_checkbox, allow_text, allow_addConfirm
+            Messages.allow_addConfirm = "Are you sure?"; // XXX
             Messages.allow_removeConfirm = "Are you sure?"; // XXX
             Messages.allow_checkbox = "Enable allow list"; // XXX
             Messages.allow_text = 'Pewpewpew'; // XXX
@@ -569,7 +570,7 @@ define([
             }).filter(function (x) { return x; });
 
             nThen(function (waitFor) {
-                var msg = Messages.owner_addConfirm; // XXX change to use allow list here
+                var msg = Messages.allow_addConfirm;
                 UI.confirm(msg, waitFor(function (yes) {
                     if (!yes) {
                         waitFor.abort();

From e6c948febb8a911dbc9b9fc422ac9be9d11dfbcc Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 20 Feb 2020 12:12:22 +0100
Subject: [PATCH 30/37] Display ERESTRICTED error in the UI

---
 www/common/common-ui-elements.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index fe38c06ed..882f7d027 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -3588,7 +3588,7 @@ define([
     };
 
     UIElements.onServerError = function (common, err, toolbar, cb) {
-        if (["EDELETED", "EEXPIRED"].indexOf(err.type) === -1) { return; }
+        if (["EDELETED", "EEXPIRED", "ERESTRICTED"].indexOf(err.type) === -1) { return; }
         var priv = common.getMetadataMgr().getPrivateData();
         var msg = err.type;
         if (err.type === 'EEXPIRED') {
@@ -3602,11 +3602,13 @@ define([
             if (err.loaded) {
                 msg += Messages.errorCopy;
             }
+        } else if (err.type === 'ERESTRICTED') {
+            msg = Messages.restrictedError || "RESTRICTED"; // XXX
         }
         var sframeChan = common.getSframeChannel();
         sframeChan.event('EV_SHARE_OPEN', {hidden: true});
         if (toolbar && typeof toolbar.deleted === "function") { toolbar.deleted(); }
-        UI.errorLoadingScreen(msg, true, true);
+        UI.errorLoadingScreen(msg, Boolean(err.loaded), Boolean(err.loaded));
         (cb || function () {})();
     };
 

From 791aad53f2116eae4859d0e5ee697af32bdd65ab Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Fri, 21 Feb 2020 08:18:05 -0500
Subject: [PATCH 31/37] WIP allow list changes

---
 lib/commands/metadata.js | 11 ++++++-----
 lib/historyKeeper.js     | 32 ++++++++++++++++----------------
 lib/hk-util.js           | 21 ++++++++++++++++-----
 3 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/lib/commands/metadata.js b/lib/commands/metadata.js
index 78584d3ae..5b6d17493 100644
--- a/lib/commands/metadata.js
+++ b/lib/commands/metadata.js
@@ -6,17 +6,15 @@ const BatchRead = require("../batch-read");
 const WriteQueue = require("../write-queue");
 const Core = require("./core");
 const Util = require("../common-util");
+const HK = require("../hk-util");
 
-const batchMetadata = BatchRead("GET_METADATA");
 Data.getMetadata = function (Env, channel, cb/* , Server */) {
     if (!Core.isValidId(channel)) { return void cb('INVALID_CHAN'); }
-    if (channel.length !== 32) { return cb("INVALID_CHAN_LENGTH"); }
+    if (channel.length !== HK.STANDARD_CHANNEL_LENGTH) { return cb("INVALID_CHAN_LENGTH"); }
 
-    // XXX get metadata from the server cache if it is available
-    batchMetadata(channel, cb, function (done) {
+    Env.batchMetadata(channel, cb, function (done) {
         var ref = {};
         var lineHandler = Meta.createLineHandler(ref, Env.Log.error);
-
         return void Env.msgStore.readChannelMetadata(channel, lineHandler, function (err) {
             if (err) {
                 // stream errors?
@@ -118,6 +116,9 @@ Data.setMetadata = function (Env, safeKey, data, cb, Server) {
             // kick any current users from the channel
             // if they aren't on it.
 
+            // review Server.channelBroadcast as used for EEXPIRED
+            // send them to the user in question, from historyKeeper
+
                 cb(void 0, metadata);
                 next();
 
diff --git a/lib/historyKeeper.js b/lib/historyKeeper.js
index 93644f571..12c9762e5 100644
--- a/lib/historyKeeper.js
+++ b/lib/historyKeeper.js
@@ -38,6 +38,7 @@ module.exports.create = function (config, cb) {
         channel_cache: {},
         queueStorage: WriteQueue(),
         batchIndexReads: BatchRead("HK_GET_INDEX"),
+        batchMetadata: BatchRead('GET_METADATA'),
 
         //historyKeeper: config.historyKeeper,
         intervals: config.intervals || {},
@@ -115,22 +116,23 @@ module.exports.create = function (config, cb) {
         channelOpen: function (Server, channelName, userId, wait) {
             Env.channel_cache[channelName] = Env.channel_cache[channelName] || {};
 
-            var proceed = function () {
-                Server.send(userId, [
-                    0,
-                    Env.id,
-                    'JOIN',
-                    channelName
-                ]);
+            var next = wait();
+            var cb = function (err, info) {
+                next(err, info, function () {
+                    Server.send(userId, [
+                        0,
+                        Env.id,
+                        'JOIN',
+                        channelName
+                    ]);
+                });
             };
 
             // only conventional channels can be restricted
-            if ((channelName || "").length !== 32) { // XXX use contants
-                return proceed();
+            if ((channelName || "").length !== HK.STANDARD_CHANNEL_LENGTH) {
+                return void cb();
             }
 
-            var next = wait();
-
             // gets and caches the metadata...
             // XXX make sure it doesn't get stuck in cache...
             HK.getMetadata(Env, channelName, function (err, metadata) {
@@ -142,8 +144,7 @@ module.exports.create = function (config, cb) {
                 if (!metadata || (metadata && !metadata.restricted)) {
                     // the channel doesn't have metadata, or it does and it's not restricted
                     // either way, let them join.
-                    proceed();
-                    return void next();
+                    return void cb();
                 }
 
                 // this channel is restricted. verify that the user in question is in the allow list
@@ -154,15 +155,14 @@ module.exports.create = function (config, cb) {
                 var session = HK.getNetfluxSession(Env, userId);
 
                 if (HK.isUserSessionAllowed(allowed, session)) {
-                    proceed();
-                    return void next();
+                    return void cb();
                 }
 
                 // otherwise they're not allowed.
                 // respond with a special error that includes the list of keys
                 // which would be allowed...
                 // XXX bonus points if you hash the keys to limit data exposure
-                next(["ERESTRICTED"].concat(allowed));
+                cb("ERESTRICTED", allowed);
             });
         },
         sessionClose: function (userId, reason) {
diff --git a/lib/hk-util.js b/lib/hk-util.js
index 049529a74..e14975a1a 100644
--- a/lib/hk-util.js
+++ b/lib/hk-util.js
@@ -171,17 +171,19 @@ const checkExpired = function (Env, Server, channel) {
             error: 'EEXPIRED',
             channel: channel
         }, Env.id);
-        dropChannel(channel);
+        dropChannel(Env, channel);
     });
 
     // return true to indicate that it has expired
     return true;
 };
 
-const getMetadata = HK.getMetadata = function (Env, channelName, cb) {
+const getMetadata = HK.getMetadata = function (Env, channelName, _cb) {
+    var cb = Util.once(Util.mkAsync(_cb));
+
     var metadata = Env.metadata_cache[channelName];
     if (metadata && typeof(metadata) === 'object') {
-        return void Util.mkAsync(cb)(undefined, metadata);
+        return void cb(undefined, metadata);
     }
 
     MetaRPC.getMetadata(Env, channelName, function (err, metadata) {
@@ -189,6 +191,10 @@ const getMetadata = HK.getMetadata = function (Env, channelName, cb) {
             console.error(err);
             return void cb(err);
         }
+        if (!(metadata && typeof(metadata.channel) === 'string' && metadata.channel.length === STANDARD_CHANNEL_LENGTH)) {
+            return cb();
+        }
+
         // cache it
         Env.metadata_cache[channelName] = metadata;
         cb(undefined, metadata);
@@ -231,7 +237,8 @@ const computeIndex = function (Env, channelName, cb) {
     nThen(function (w) {
         getMetadata(Env, channelName, w(function (err, _metadata) {
             if (err) {
-                throw new Error(err);
+                console.log(err);
+                throw new Error(err); // XXX
             }
             metadata = _metadata;
         }));
@@ -693,7 +700,7 @@ const handleGetHistory = function (Env, Server, seq, userId, parsed) {
         }, (err) => {
             if (err && err.code !== 'ENOENT') {
                 if (err.message !== 'EINVAL') { Log.error("HK_GET_HISTORY", err); }
-                const parsedMsg = {error:err.message, channel: channelName, txid: txid};
+                const parsedMsg = {error:err.message, channel: channelName, txid: txid}; // XXX history retrieval error format
                 Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, JSON.stringify(parsedMsg)]);
                 return;
             }
@@ -876,6 +883,7 @@ HK.onDirectMessage = function (Env, Server, seq, userId, json) {
             if (checkExpired(Env, Server, parsed[1])) {
                 // if the channel is expired just abort.
                 w.abort();
+                // XXX what do we tell the person who asked?
                 return;
             }
 
@@ -891,6 +899,9 @@ HK.onDirectMessage = function (Env, Server, seq, userId, json) {
             }
 
             // XXX NOT ALLOWED
+            // respond to txid with error as in handleGetHistory
+            // send the allow list anyway, it might not get used currently
+            // but will in the future
         }));
     }).nThen(function () {
         // run the appropriate command from the map

From 09901488108fbe1d68a06913287d0821d66cf2ac Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Fri, 21 Feb 2020 16:25:43 +0100
Subject: [PATCH 32/37] Fix team ownership in the access modal

---
 www/common/inner/access.js | 50 ++++++++++++++++++++++----------------
 1 file changed, 29 insertions(+), 21 deletions(-)

diff --git a/www/common/inner/access.js b/www/common/inner/access.js
index 102fb67dc..63a5519ea 100644
--- a/www/common/inner/access.js
+++ b/www/common/inner/access.js
@@ -36,6 +36,27 @@ define([
         }));
     };
 
+    var isOwned = function (common, data) {
+        data = data || {};
+        var priv = common.getMetadataMgr().getPrivateData();
+        var edPublic = priv.edPublic;
+        var owned = false;
+        if (Array.isArray(data.owners) && data.owners.length) {
+            if (data.owners.indexOf(edPublic) !== -1) {
+                owned = true;
+            } else {
+                Object.keys(priv.teams || {}).some(function (id) {
+                    var team = priv.teams[id] || {};
+                    if (team.viewer) { return; }
+                    if (data.owners.indexOf(team.edPublic) === -1) { return; }
+                    owned = id;
+                    return true;
+                });
+            }
+        }
+        return owned;
+    };
+
     var getOwnersTab = function (common, data, opts, _cb) {
         var cb = Util.once(Util.mkAsync(_cb));
 
@@ -350,6 +371,7 @@ define([
         var priv = common.getMetadataMgr().getPrivateData();
         var user = common.getMetadataMgr().getUserData();
         var edPublic = priv.edPublic;
+
         var channel = data.channel;
 
         var owners = data.owners || [];
@@ -428,6 +450,7 @@ define([
                 var ed = $el.attr('data-ed');
                 if (!ed) { return; }
                 nThen(function (waitFor) {
+                    /*
                     var msg = Messages.allow_removeConfirm;
                     UI.confirm(msg, waitFor(function (yes) {
                         if (!yes) {
@@ -436,6 +459,7 @@ define([
                         }
                     }));
                 }).nThen(function (waitFor) {
+                    */
                     // Send the command
                     sframeChan.query('Q_SET_PAD_METADATA', {
                         channel: channel,
@@ -570,6 +594,7 @@ define([
             }).filter(function (x) { return x; });
 
             nThen(function (waitFor) {
+                /*
                 var msg = Messages.allow_addConfirm;
                 UI.confirm(msg, waitFor(function (yes) {
                     if (!yes) {
@@ -578,6 +603,7 @@ define([
                     }
                 }));
             }).nThen(function (waitFor) {
+                */
                 // Offer ownership to a friend
                 if (toAdd.length) {
                     // Send the command
@@ -629,27 +655,6 @@ define([
         cb(void 0, link);
     };
 
-    var isOwned = function (common, data) {
-        data = data || {};
-        var priv = common.getMetadataMgr().getPrivateData();
-        var edPublic = priv.edPublic;
-        var owned = false;
-        if (Array.isArray(data.owners) && data.owners.length) {
-            if (data.owners.indexOf(edPublic) !== -1) {
-                owned = true;
-            } else {
-                Object.keys(priv.teams || {}).some(function (id) {
-                    var team = priv.teams[id] || {};
-                    if (team.viewer) { return; }
-                    if (data.owners.indexOf(team.edPublic) === -1) { return; }
-                    owned = id;
-                    return true;
-                });
-            }
-        }
-        return owned;
-    };
-
     var getUserList = function (common, list) {
         if (!Array.isArray(list)) { return; }
         var priv = common.getMetadataMgr().getPrivateData();
@@ -1060,6 +1065,9 @@ define([
             }));
         }).nThen(function (waitFor) {
             var owned = isOwned(common, data);
+            if (typeof(owned) !== "boolean") {
+                data.teamId = Number(owned);
+            }
             var parsed = Hash.parsePadUrl(data.href || data.roHref);
             disabled = !owned || !parsed.hashData || parsed.hashData.type !== 'pad';
             allowDisabled = parsed.type === 'drive';

From fe0e02a4214b74808c811638e5a0937f34714d1d Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Fri, 21 Feb 2020 10:31:10 -0500
Subject: [PATCH 33/37] restrict access to metadata

---
 lib/commands/channel.js  |  2 ++
 lib/commands/metadata.js | 31 +++++++++++++++++++++++++++++--
 lib/hk-util.js           |  4 ++--
 lib/rpc.js               | 10 +++++-----
 4 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/lib/commands/channel.js b/lib/commands/channel.js
index 6296aee0e..da4fb6685 100644
--- a/lib/commands/channel.js
+++ b/lib/commands/channel.js
@@ -261,6 +261,8 @@ Channel.writePrivateMessage = function (Env, args, cb, Server) {
         msg // the actual message content. Generally a string
     ];
 
+    // XXX RESTRICT respect allow lists
+
     // historyKeeper already knows how to handle metadata and message validation, so we just pass it off here
     // if the message isn't valid it won't be stored.
     Env.historyKeeper.channelMessage(Server, channelStruct, fullMessage);
diff --git a/lib/commands/metadata.js b/lib/commands/metadata.js
index 5b6d17493..21132dd23 100644
--- a/lib/commands/metadata.js
+++ b/lib/commands/metadata.js
@@ -2,16 +2,21 @@
 const Data = module.exports;
 
 const Meta = require("../metadata");
-const BatchRead = require("../batch-read");
 const WriteQueue = require("../write-queue");
 const Core = require("./core");
 const Util = require("../common-util");
 const HK = require("../hk-util");
 
-Data.getMetadata = function (Env, channel, cb/* , Server */) {
+Data.getMetadataRaw = function (Env, channel /* channelName */, _cb) {
+    const cb = Util.once(Util.mkAsync(_cb));
     if (!Core.isValidId(channel)) { return void cb('INVALID_CHAN'); }
     if (channel.length !== HK.STANDARD_CHANNEL_LENGTH) { return cb("INVALID_CHAN_LENGTH"); }
 
+    var cached = Env.metadata_cache[channel];
+    if (HK.isMetadataMessage(cached)) {
+        return void cb(void 0, cached);
+    }
+
     Env.batchMetadata(channel, cb, function (done) {
         var ref = {};
         var lineHandler = Meta.createLineHandler(ref, Env.Log.error);
@@ -25,6 +30,28 @@ Data.getMetadata = function (Env, channel, cb/* , Server */) {
     });
 };
 
+Data.getMetadata = function (Env, channel, cb, Server, netfluxId) {
+    Data.getMetadataRaw(Env, channel, function (err, metadata) {
+        if (err) { return void cb(err); }
+
+        if (!(metadata && metadata.restricted)) {
+            // if it's not restricted then just call back
+            return void cb(void 0, metadata);
+        }
+
+        const session = HK.getNetfluxSession(Env, netfluxId);
+        const allowed = HK.listAllowedUsers(metadata);
+
+        if (!HK.isUserSessionAllowed(allowed, session)) {
+            return void cb(void 0, {
+                restricted: metadata.restricted,
+                allowed: allowed,
+            });
+        }
+        cb(void 0, metadata);
+    });
+};
+
 /* setMetadata
     - write a new line to the metadata log if a valid command is provided
     - data is an object: {
diff --git a/lib/hk-util.js b/lib/hk-util.js
index e14975a1a..fe14c47dc 100644
--- a/lib/hk-util.js
+++ b/lib/hk-util.js
@@ -71,7 +71,7 @@ const sliceCpIndex = function (cpIndex, line) {
     return start.concat(end);
 };
 
-const isMetadataMessage = function (parsed) {
+const isMetadataMessage = HK.isMetadataMessage = function (parsed) {
     return Boolean(parsed && parsed.channel);
 };
 
@@ -186,7 +186,7 @@ const getMetadata = HK.getMetadata = function (Env, channelName, _cb) {
         return void cb(undefined, metadata);
     }
 
-    MetaRPC.getMetadata(Env, channelName, function (err, metadata) {
+    MetaRPC.getMetadataRaw(Env, channelName, function (err, metadata) {
         if (err) {
             console.error(err);
             return void cb(err);
diff --git a/lib/rpc.js b/lib/rpc.js
index ad6ccde5c..c54edf31d 100644
--- a/lib/rpc.js
+++ b/lib/rpc.js
@@ -19,15 +19,15 @@ const UNAUTHENTICATED_CALLS = {
     GET_DELETED_PADS: Pinning.getDeletedPads,
     IS_CHANNEL_PINNED: Pinning.isChannelPinned,
     IS_NEW_CHANNEL: Channel.isNewChannel,
-    WRITE_PRIVATE_MESSAGE: Channel.writePrivateMessage, // XXX RESTRICT
-    GET_METADATA: Metadata.getMetadata, // XXX RESTRICT
+    WRITE_PRIVATE_MESSAGE: Channel.writePrivateMessage,
+    GET_METADATA: Metadata.getMetadata,
 };
 
 var isUnauthenticateMessage = function (msg) {
     return msg && msg.length === 2 && typeof(UNAUTHENTICATED_CALLS[msg[0]]) === 'function';
 };
 
-var handleUnauthenticatedMessage = function (Env, msg, respond, Server) {
+var handleUnauthenticatedMessage = function (Env, msg, respond, Server, netfluxId) {
     Env.Log.silly('LOG_RPC', msg[0]);
 
     var method = UNAUTHENTICATED_CALLS[msg[0]];
@@ -37,7 +37,7 @@ var handleUnauthenticatedMessage = function (Env, msg, respond, Server) {
             return void respond(err);
         }
         respond(err, [null, value, null]);
-    }, Server);
+    }, Server, netfluxId);
 };
 
 const AUTHENTICATED_USER_TARGETED = {
@@ -137,7 +137,7 @@ var rpc = function (Env, Server, userId, data, respond) {
     }
 
     if (isUnauthenticateMessage(msg)) {
-        return handleUnauthenticatedMessage(Env, msg, respond, Server);
+        return handleUnauthenticatedMessage(Env, msg, respond, Server, userId);
     }
 
     var signature = msg.shift();

From 075eddb1db87757e9bf75853bed529d0ebe3a670 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Fri, 21 Feb 2020 10:50:59 -0500
Subject: [PATCH 34/37] guard against a typeError if there are no owners

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

diff --git a/www/common/inner/access.js b/www/common/inner/access.js
index 102fb67dc..6137635e5 100644
--- a/www/common/inner/access.js
+++ b/www/common/inner/access.js
@@ -981,7 +981,7 @@ define([
             var state = data.restricted ? Messages.allow_enabled : Messages.allow_disabled;
             content.push(h('label', Messages._getKey('allow_label', [state])));
             if (data.restricted) {
-                var _allowed = Util.deduplicateString(data.owners.concat(data.allowed));
+                var _allowed = Util.deduplicateString((data.owners || []).concat(data.allowed));
                 var _allowedGrid = getUserList(common, _allowed);
                 content.push(_allowedGrid.div);
             }

From 7ee877821069fdedcbb225e533988187fe614526 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Fri, 21 Feb 2020 13:05:07 -0500
Subject: [PATCH 35/37] kick unauthorized users from restricted channels

and update dependencies
---
 lib/commands/metadata.js | 70 ++++++++++++++++++++++++++++++----------
 package-lock.json        |  4 +--
 package.json             |  2 +-
 3 files changed, 55 insertions(+), 21 deletions(-)

diff --git a/lib/commands/metadata.js b/lib/commands/metadata.js
index 21132dd23..a5bca0dca 100644
--- a/lib/commands/metadata.js
+++ b/lib/commands/metadata.js
@@ -71,7 +71,7 @@ Data.setMetadata = function (Env, safeKey, data, cb, Server) {
     if (Meta.commands.indexOf(command) === -1) { return void cb('UNSUPPORTED_COMMAND'); }
 
     queueMetadata(channel, function (next) {
-        Data.getMetadata(Env, channel, function (err, metadata) {
+        Data.getMetadataRaw(Env, channel, function (err, metadata) {
             if (err) {
                 cb(err);
                 return void next();
@@ -133,34 +133,70 @@ Data.setMetadata = function (Env, safeKey, data, cb, Server) {
                     return void next();
                 }
 
-
-            // chainpad-server@4.0.3 supports a removeFromChannel method
-            // Server.removeFromChannel(channelName, userId);
-            // this lets us kick users from restricted channels
-
-            // XXX RESTRICT
-            // if the metadata changes and includes an allowed list
-            // kick any current users from the channel
-            // if they aren't on it.
-
-            // review Server.channelBroadcast as used for EEXPIRED
-            // send them to the user in question, from historyKeeper
-
+                // send the message back to the person who changed it
+                // since we know they're allowed to see it
                 cb(void 0, metadata);
                 next();
 
                 const metadata_cache = Env.metadata_cache;
                 const channel_cache = Env.channel_cache;
 
+                // update the cached metadata
                 metadata_cache[channel] = metadata;
 
+                // as well as the metadata that's attached to the index...
+                // XXX determine if we actually need this...
                 var index = Util.find(channel_cache, [channel, 'index']);
                 if (index && typeof(index) === 'object') { index.metadata = metadata; }
 
-                Server.channelBroadcast(channel, JSON.stringify(metadata), Env.historyKeeper.id);
+                // it's easy to check if the channel is restricted
+                const isRestricted = metadata.restricted;
+                // and these values will be used in any case
+                const s_metadata = JSON.stringify(metadata);
+                const hk_id = Env.historyKeeper.id;
+
+                if (!isRestricted) {
+                    // pre-allow-list behaviour
+                    // if it's not restricted, broadcast the new metadata to everyone
+                    return void Server.channelBroadcast(channel, s_metadata, hk_id);
+                }
+
+                // otherwise derive the list of users (unsafeKeys) that are allowed to stay
+                const allowed = HK.listAllowedUsers(metadata);
+                // anyone who is not allowed will get the same error message
+                const s_error = JSON.stringify({
+                    error: 'ERESTRICTED',
+                    channel: channel,
+                });
+
+                // iterate over the channel's userlist
+                const toRemove = [];
+                Server.getChannelUserList(channel).forEach(function (userId) {
+                    const session = HK.getNetfluxSession(Env, userId);
+
+                    // if the user is allowed to remain, send them the metadata
+                    if (HK.isUserSessionAllowed(allowed, session)) {
+                        return void Server.send(userId, [
+                            0,
+                            hk_id,
+                            'MSG',
+                            userId,
+                            s_metadata
+                        ], function () {});
+                    }
+                    // otherwise they are not in the list.
+                    // send them an error and kick them out!
+                    Server.send(userId, [
+                        0,
+                        hk_id,
+                        'MSG',
+                        userId,
+                        s_error
+                    ], function () {});
+                });
+
+                Server.removeFromChannel(channel, toRemove);
             });
         });
     });
 };
-
-
diff --git a/package-lock.json b/package-lock.json
index d4a119d75..c3e9c6905 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -113,9 +113,7 @@
       }
     },
     "chainpad-server": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/chainpad-server/-/chainpad-server-4.0.2.tgz",
-      "integrity": "sha512-9NrFsATd70uAdksxsCZBIJ/SiREmJ6QLYTNaeFLH/nJpeZ2b7wblVGABCj3JYWvngdEZ7Umc+afbWH8sUmtgeQ==",
+      "version": "4.0.3",
       "requires": {
         "nthen": "0.1.8",
         "pull-stream": "^3.6.9",
diff --git a/package.json b/package.json
index 81be1c7f8..43a28fdb2 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "chainpad-crypto": "^0.2.2",
-    "chainpad-server": "^4.0.0",
+    "chainpad-server": "^4.0.3",
     "express": "~4.16.0",
     "fs-extra": "^7.0.0",
     "get-folder-size": "^2.0.1",

From 033bd361f942965edac1f5b449d403d5a5a4ed38 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Fri, 21 Feb 2020 13:58:21 -0500
Subject: [PATCH 36/37] add backwards compatibility with older servers

---
 lib/historyKeeper.js | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/lib/historyKeeper.js b/lib/historyKeeper.js
index 12c9762e5..7cf6dad00 100644
--- a/lib/historyKeeper.js
+++ b/lib/historyKeeper.js
@@ -116,16 +116,22 @@ module.exports.create = function (config, cb) {
         channelOpen: function (Server, channelName, userId, wait) {
             Env.channel_cache[channelName] = Env.channel_cache[channelName] || {};
 
+            var sendHKJoinMessage = function () {
+                Server.send(userId, [
+                    0,
+                    Env.id,
+                    'JOIN',
+                    channelName
+                ]);
+            };
+
+            // a little backwards compatibility in case you don't have the latest server
+            // allow lists won't work unless you update, though
+            if (typeof(wait) !== 'function') { return void sendHKJoinMessage(); }
+
             var next = wait();
             var cb = function (err, info) {
-                next(err, info, function () {
-                    Server.send(userId, [
-                        0,
-                        Env.id,
-                        'JOIN',
-                        channelName
-                    ]);
-                });
+                next(err, info, sendHKJoinMessage);
             };
 
             // only conventional channels can be restricted

From e328ae97fd7c339ad7b91ae10f9ccd3605627857 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Mon, 24 Feb 2020 16:42:28 +0000
Subject: [PATCH 37/37] change owner icon

- badge icon for owned pads
- no icons for pads owned by someone else or without an owner
---
 www/common/drive-ui.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index afcfe2d6a..0689c528f 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -122,9 +122,9 @@ define([
     var $addIcon = $('<span>', {"class": "fa fa-plus"});
     var $renamedIcon = $('<span>', {"class": "fa fa-flag"});
     var $readonlyIcon = $('<span>', {"class": "fa " + faReadOnly});
-    var $ownedIcon = $('<span>', {"class": "fa fa-id-card-o"});
+    var $ownedIcon = $('<span>', {"class": "fa fa-id-badge"});
     var $sharedIcon = $('<span>', {"class": "fa " + faShared});
-    var $ownerIcon = $('<span>', {"class": "fa fa-id-card"});
+    //var $ownerIcon = $('<span>', {"class": "fa fa-id-card"});
     var $tagsIcon = $('<span>', {"class": "fa " + faTags});
     var $passwordIcon = $('<span>', {"class": "fa fa-lock"});
     var $expirableIcon = $('<span>', {"class": "fa fa-clock-o"});
@@ -1819,10 +1819,10 @@ define([
                 var $owned = $ownedIcon.clone().appendTo($state);
                 $owned.attr('title', Messages.fm_padIsOwned);
                 $span.addClass('cp-app-drive-element-owned');
-            } else if (data.owners && data.owners.length) {
+            } /* else if (data.owners && data.owners.length) {
                 var $owner = $ownerIcon.clone().appendTo($state);
                 $owner.attr('title', Messages.fm_padIsOwnedOther);
-            }
+            } */
         };
         var thumbsUrls = {};
         var addFileData = function (element, $element) {