dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix race condition with the allow list

This commit is contained in:
yflory 2021-02-25 11:27:39 +01:00
parent f071e2df25
commit daeae8b74e
2 changed files with 21 additions and 19 deletions

3
www/common/outer/async-store.js
View File

@ -1703,6 +1703,8 @@ define([
// There is an allow list: check if we can authenticate
if (!Array.isArray(allowed)) { return void cb('EINVAL'); }
if (!store.loggedIn || !store.proxy.edPublic) { return void cb('EFORBIDDEN'); }
onReadyEvt.reg(function () {
var rpc;
var teamModule = store.modules['team'];
var teams = (teamModule && teamModule.getTeams()) || [];
@ -1724,6 +1726,7 @@ define([
rpc.send('COOKIE', '', function (err) {
cb(err);
});
});
},
onConnectionChange: function (info) {
if (!info.state) {

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

@ -113,7 +113,6 @@ define([
if (!config.store.id && !config.store.network) {
Cache.getChannelCache(secret.channel, waitFor(function (err, res) {
if (err === "EINVAL") { // Cache not found
console.warn(secret.channel);
waitFor.abort();
store.manager.restrictedProxy(id, secret.channel);
// XXX unrestrict when we connect?