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

Team deletion

Browse Source
This commit is contained in:
yflory 2019-09-30 15:49:02 +02:00
parent 7b4a72b3a2
commit 1288f28931
1 changed files with 45 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
www/common/outer/team.js
View File

@ -278,7 +278,9 @@ define([
}; };
var openChannel = function (ctx, teamData, id, cb) { var openChannel = function (ctx, teamData, id, _cb) {
var cb = Util.once(_cb);
var secret = Hash.getSecrets('team', teamData.hash, teamData.password); var secret = Hash.getSecrets('team', teamData.hash, teamData.password);
var crypto = Crypto.createEncryptor(secret.keys); var crypto = Crypto.createEncryptor(secret.keys);
@ -286,7 +288,34 @@ define([
var roster; var roster;
var lm; var lm;
// Roster keys
var myKeys = {
curvePublic: ctx.store.proxy.curvePublic,
curvePrivate: ctx.store.proxy.curvePrivate
};
var rosterData = keys.roster || {};
var rosterKeys = rosterData.edit ? Crypto.Team.deriveMemberKeys(rosterData.edit, myKeys)
: Crypto.Team.deriveGuestKeys(rosterData.view || '');
nThen(function (waitFor) { nThen(function (waitFor) {
ctx.store.anon_rpc.send("IS_NEW_CHANNEL", secret.channel, waitFor(function (e, response) {
if (response && response.length && typeof(response[0]) === 'boolean' && response[0]) {
// Channel is empty: remove this team
delete ctx.store.proxy.teams[id];
waitFor.abort();
cb({error: 'ENOENT'});
}
}));
ctx.store.anon_rpc.send("IS_NEW_CHANNEL", rosterKeys.channel, waitFor(function (e, response) {
if (response && response.length && typeof(response[0]) === 'boolean' && response[0]) {
// Channel is empty: remove this team
delete ctx.store.proxy.teams[id];
waitFor.abort();
cb({error: 'ENOENT'});
}
}));
}).nThen(function (waitFor) {
// Load the proxy // Load the proxy
var cfg = { var cfg = {
data: {}, data: {},
@ -308,15 +337,18 @@ define([
}; };
lm = Listmap.create(cfg); lm = Listmap.create(cfg);
lm.proxy.on('ready', waitFor()); lm.proxy.on('ready', waitFor());
lm.proxy.on('error', function (info) {
if (info && typeof (info.loaded) !== "undefined" && !info.loaded) {
cb({error:'ECONNECT'});
}
if (info && info.error) {
if (info.error === "EDELETED" ) {
closeTeam(ctx, id);
}
}
});
// Load the roster // Load the roster
var myKeys = {
curvePublic: ctx.store.proxy.curvePublic,
curvePrivate: ctx.store.proxy.curvePrivate
};
var rosterData = keys.roster || {};
var rosterKeys = rosterData.edit ? Crypto.Team.deriveMemberKeys(rosterData.edit, myKeys)
: Crypto.Team.deriveGuestKeys(rosterData.view || '');
Roster.create({ Roster.create({
network: ctx.store.network, network: ctx.store.network,
channel: rosterKeys.channel, channel: rosterKeys.channel,
@ -503,6 +535,11 @@ define([
if (info && typeof (info.loaded) !== "undefined" && !info.loaded) { if (info && typeof (info.loaded) !== "undefined" && !info.loaded) {
cb({error:'ECONNECT'}); cb({error:'ECONNECT'});
} }
if (info && info.error) {
if (info.error === "EDELETED") {
closeTeam(ctx, id);
}
}
}); });
}); });
}; };