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

handle error in team outer

Browse Source
This commit is contained in:
yflory 2019-12-18 17:45:57 +01:00
parent 97f322753a
commit 6945628cf1
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1491,13 +1491,16 @@ define([
// Accept the roster invitation: relplace our ephemeral keys with our user keys // Accept the roster invitation: relplace our ephemeral keys with our user keys
var rosterData = Util.find(inviteContent, ['teamData', 'keys', 'roster']); var rosterData = Util.find(inviteContent, ['teamData', 'keys', 'roster']);
var myKeys = inviteContent.ephemeral; var myKeys = inviteContent.ephemeral;
if (!rosterData || !myKeys) {
waitFor.abort();
return void cb({error: 'INVALID_INVITE_CONTENT'});
}
var rosterKeys = Crypto.Team.deriveMemberKeys(rosterData.edit, myKeys); var rosterKeys = Crypto.Team.deriveMemberKeys(rosterData.edit, myKeys);
Roster.create({ Roster.create({
network: ctx.store.network, network: ctx.store.network,
channel: rosterData.channel, channel: rosterData.channel,
keys: rosterKeys, keys: rosterKeys,
anon_rpc: ctx.store.anon_rpc, anon_rpc: ctx.store.anon_rpc,
lastKnownHash: rosterData.lastKnownHash, // XXX Can we trust this user?
}, waitFor(function (err, roster) { }, waitFor(function (err, roster) {
if (err) { if (err) {
waitFor.abort(); waitFor.abort();