infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Encrypt href for new pads in old shared folders

pull/1/head
yflory 2019-11-08 12:07:08 +01:00
parent 5dcc7643da
commit f42574948e
3 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
www/common/outer/sharedfolder.js
View File

@ -59,7 +59,7 @@ define([
});
};
// XXX only needed if we want a manual migration from the share modal...
// SFMIGRATION: only needed if we want a manual migration from the share modal...
SF.migrate = function (channel) {
var sf = allSharedFolders[channel];
if (!sf) { return; }

7
www/common/proxy-manager.js
View File

@ -39,13 +39,6 @@ define([
userObject: userObject,
leave: leave
};
if (false) { // XXX allow shared folder migration while using it
// NOTE: this is not needed if we always use the editKey in userObject, even with old version
var path = proxy.drive ? ['drive', 'version'] : ['version'];
proxy.on('change', path, function () {
userObject.setReadOnly(false, editKey);
});
}
return userObject;
};

4
www/common/userObject.js
View File

@ -105,10 +105,6 @@ define([
module.init = function (files, config) {
var exp = {};
if (false && !files.version) { // XXX if we remove false, old shared folders won't encrypt new hrefs
config.editKey = undefined;
}
exp.cryptor = createCryptor(config.editKey);
exp.setReadOnly = function (state, key) {