mirror of https://github.com/xwiki-labs/cryptpad
Make sure users can't block themselves with SF allow list
This commit is contained in:
parent
835f531c9e
commit
d73b32a05e
|
@ -78,6 +78,7 @@ define([
|
||||||
Realtime.whenRealtimeSyncs(s.realtime, waitFor());
|
Realtime.whenRealtimeSyncs(s.realtime, waitFor());
|
||||||
if (s.sharedFolders && typeof (s.sharedFolders) === "object") {
|
if (s.sharedFolders && typeof (s.sharedFolders) === "object") {
|
||||||
for (var k in s.sharedFolders) {
|
for (var k in s.sharedFolders) {
|
||||||
|
if (!s.sharedFolders[k].realtime) { continue; } // Deprecated
|
||||||
Realtime.whenRealtimeSyncs(s.sharedFolders[k].realtime, waitFor());
|
Realtime.whenRealtimeSyncs(s.sharedFolders[k].realtime, waitFor());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -214,6 +214,18 @@ define([
|
||||||
});
|
});
|
||||||
} catch (e) {}
|
} catch (e) {}
|
||||||
delete allSharedFolders[secret.channel];
|
delete allSharedFolders[secret.channel];
|
||||||
|
// This shouldn't be called on init because we're calling "isNewChannel" first,
|
||||||
|
// but we can still call "cb" just in case. This wait we make sure we won't block
|
||||||
|
// the initial "waitFor"
|
||||||
|
return void cb();
|
||||||
|
}
|
||||||
|
if (info.error === "ERESTRICTED" ) {
|
||||||
|
// This shouldn't happen: allow list are disabled for shared folders
|
||||||
|
// but call "cb" to make sure we won't block the initial "waitFor"
|
||||||
|
sf.teams.forEach(function (obj) {
|
||||||
|
obj.store.manager.restrictedProxy(obj.id, secret.channel);
|
||||||
|
});
|
||||||
|
return void cb();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
@ -67,6 +67,13 @@ define([
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
var restrictedProxy = function (Env, id, channel) {
|
||||||
|
var lm = { proxy: { deprecated: true } };
|
||||||
|
removeProxy(Env, id);
|
||||||
|
addProxy(Env, id, lm, function () {});
|
||||||
|
return void Env.Store.refreshDriveUI();
|
||||||
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Tools
|
Tools
|
||||||
*/
|
*/
|
||||||
|
@ -1118,6 +1125,7 @@ define([
|
||||||
addProxy: callWithEnv(addProxy),
|
addProxy: callWithEnv(addProxy),
|
||||||
removeProxy: callWithEnv(removeProxy),
|
removeProxy: callWithEnv(removeProxy),
|
||||||
deprecateProxy: callWithEnv(deprecateProxy),
|
deprecateProxy: callWithEnv(deprecateProxy),
|
||||||
|
restrictedProxy: callWithEnv(restrictedProxy),
|
||||||
addSharedFolder: callWithEnv(_addSharedFolder),
|
addSharedFolder: callWithEnv(_addSharedFolder),
|
||||||
// Drive
|
// Drive
|
||||||
command: callWithEnv(onCommand),
|
command: callWithEnv(onCommand),
|
||||||
|
|
Loading…
Reference in New Issue