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

Add a queue to setMetadata to aovid race conditions

Browse Source
This commit is contained in:
yflory
2019-08-30 11:49:38 +02:00
parent e12e5e1f25
commit 5f37aae990
1 changed files with 41 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
rpc.js
View File

@@ -340,6 +340,7 @@ var getMetadata = function (Env, channel, cb) {
value: value value: value
} }
*/ */
var metadataSem = Saferphore.create(1);
var setMetadata = function (Env, data, unsafeKey, cb) { var setMetadata = function (Env, data, unsafeKey, cb) {
var channel = data.channel; var channel = data.channel;
var command = data.command; var command = data.command;
@@ -347,39 +348,53 @@ 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'); }
getMetadata(Env, channel, function (err, metadata) { metadataSem.take(function (give) {
if (err) { return void cb(err); } var g = give();
if (!(metadata && Array.isArray(metadata.owners))) { return void cb('E_NO_OWNERS'); } getMetadata(Env, channel, function (err, metadata) {
if (err) {
g();
return void cb(err);
}
if (!(metadata && Array.isArray(metadata.owners))) {
g();
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
// or the user is accepting a pending ownerhsip offer // or the user is accepting a pending ownerhsip offer
if (metadata.pending_owners && Array.isArray(metadata.pending_owners) && if (metadata.pending_owners && Array.isArray(metadata.pending_owners) &&
metadata.pending_owners.indexOf(unsafeKey) !== -1 && metadata.pending_owners.indexOf(unsafeKey) !== -1 &&
metadata.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 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 if (command !== 'ADD_OWNERS' || !Array.isArray(data.value)
|| data.value[0] !== unsafeKey) { || data.value.length !== 1
|| data.value[0] !== unsafeKey) {
g();
return void cb('INSUFFICIENT_PERMISSIONS');
}
} else if (metadata.owners.indexOf(unsafeKey) === -1) {
g();
return void cb('INSUFFICIENT_PERMISSIONS'); return void cb('INSUFFICIENT_PERMISSIONS');
} }
} else if (metadata.owners.indexOf(unsafeKey) === -1) { // Add the new metadata line
return void cb('INSUFFICIENT_PERMISSIONS'); var line = [command, data.value, +new Date()];
} try {
Meta.handleCommand(metadata, line);
// Add the new metadata line } catch (e) {
var line = [command, data.value, +new Date()]; g();
try {
Meta.handleCommand(metadata, line);
} catch (e) {
return void cb(e);
}
return void Env.msgStore.writeMetadata(channel, JSON.stringify(line), function (e) {
if (e) {
return void cb(e); return void cb(e);
} }
cb(void 0, metadata);
Env.msgStore.writeMetadata(channel, JSON.stringify(line), function (e) {
g();
if (e) {
return void cb(e);
}
cb(void 0, metadata);
});
}); });
}); });
}; };