web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow pending_owners to claim ownership

Browse Source
This commit is contained in:
yflory 2019-08-30 11:49:15 +02:00
parent 2d5b6a53ff
commit e12e5e1f25
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/metadata.js
View File

@ -73,7 +73,7 @@ commands.UPDATE_EXPIRATION = function () {
throw new Error("E_NOT_IMPLEMENTED"); throw new Error("E_NOT_IMPLEMENTED");
}; };
var handleCommand = function (meta, line) { var handleCommand = Meta.handleCommand = function (meta, line) {
var command = line[0]; var command = line[0];
var args = line[1]; var args = line[1];
//var time = line[2]; //var time = line[2];
@ -84,6 +84,7 @@ var handleCommand = function (meta, line) {
commands[command](meta, args); commands[command](meta, args);
}; };
Meta.commands = Object.keys(commands);
Meta.createLineHandler = function (ref, errorHandler) { Meta.createLineHandler = function (ref, errorHandler) {
ref.meta = {}; ref.meta = {};
@ -125,4 +126,3 @@ Meta.createLineHandler = function (ref, errorHandler) {
}; };
}; };
Meta.commands = Object.keys(commands);

32
rpc.js
View File

@ -347,27 +347,39 @@ var setMetadata = function (Env, data, unsafeKey, cb) {
if (!command || typeof (command) !== 'string') { return void cb ('INVALID_COMMAND'); } if (!command || typeof (command) !== 'string') { return void cb ('INVALID_COMMAND'); }
if (Meta.commands.indexOf(command) === -1) { return void('UNSUPPORTED_COMMAND'); } if (Meta.commands.indexOf(command) === -1) { return void('UNSUPPORTED_COMMAND'); }
// XXX should we add checks to "metadata.js" to make sure data.value is
// valid for the selected command?
getMetadata(Env, channel, function (err, metadata) { getMetadata(Env, channel, function (err, metadata) {
if (err) { return void cb(err); } if (err) { return void cb(err); }
if (!(metadata && Array.isArray(metadata.owners))) { return void cb('E_NO_OWNERS'); } if (!(metadata && Array.isArray(metadata.owners))) { return void cb('E_NO_OWNERS'); }
// Confirm that the channel is owned by the user in question // Confirm that the channel is owned by the user in question
if (metadata.owners.indexOf(unsafeKey) === -1) { // or the user is accepting a pending ownerhsip offer
if (metadata.pending_owners && Array.isArray(metadata.pending_owners) &&
metadata.pending_owners.indexOf(unsafeKey) !== -1 &&
metadata.owners.indexOf(unsafeKey) === -1) {
// If you are a pending owner, make sure you can only add yourelf as an owner
if (command !== 'ADD_OWNERS' || !Array.isArray(data.value) || data.value.length !== 1
|| data.value[0] !== unsafeKey) {
return void cb('INSUFFICIENT_PERMISSIONS');
}
} else if (metadata.owners.indexOf(unsafeKey) === -1) {
return void cb('INSUFFICIENT_PERMISSIONS'); return void cb('INSUFFICIENT_PERMISSIONS');
} }
// Add the new metadata line // Add the new metadata line
var line = JSON.stringify([command, data.value]); var line = [command, data.value, +new Date()];
return void Env.msgStore.writeMetadata(channel, line, function (e) { try {
Meta.handleCommand(metadata, line);
} catch (e) {
return void cb(e);
}
return void Env.msgStore.writeMetadata(channel, JSON.stringify(line), function (e) {
if (e) { if (e) {
return void cb(e); return void cb(e);
} }
getMetadata(Env, channel, function (err, metadata) { cb(void 0, metadata);
// XXX handle error here?
cb(void 0, metadata);
});
}); });
}); });
}; };