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

Merge branch 'sfPassword' into ro

Browse Source
This commit is contained in:
yflory
2019-10-22 17:26:32 +02:00
parent e6267a89ff 126f10b782
commit 9477ae0895
14 changed files with 199 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1526,8 +1526,7 @@ define([
Store.leavePad = function (clientId, data, cb) {
var channel = channels[data.channel];
if (!channel || !channel.cpNf) { return void cb ({error: 'EINVAL'}); }
channel.cpNf.stop();
delete channels[data.channel];
Store.dropChannel(data.channel);
cb();
};
Store.sendPadMsg = function (clientId, data, cb) {
@@ -1542,6 +1541,20 @@ define([
channel.sendMessage(msg, clientId, cb);
};
// Unpin and pin the new channel in all team when changing a pad password
Store.changePadPasswordPin = function (clientId, data, cb) {
var oldChannel = data.oldChannel;
var channel = data.channel;
nThen(function (waitFor) {
getAllStores().forEach(function (s) {
var allData = s.manager.findChannel(channel);
if (!allData.length) { return; }
s.rpc.unpin([oldChannel], waitFor());
s.rpc.pin([channel], waitFor());
});
}).nThen(cb);
};
// requestPadAccess is used to check if we have a way to contact the owner
// of the pad AND to send the request if we want
// data.send === false ==> check if we can contact them
@@ -1831,7 +1844,7 @@ define([
// Clients management
var driveEventClients = [];
var dropChannel = function (chanId) {
var dropChannel = Store.dropChannel = function (chanId) {
try {
store.messenger.leavePad(chanId);
} catch (e) { console.error(e); }
@@ -1900,7 +1913,7 @@ define([
store.manager.user.userObject.getHref(data) : data.href;
var parsed = Hash.parsePadUrl(href);
var secret = Hash.getSecrets(parsed.type, parsed.hash, o);
SF.updatePassword({
SF.updatePassword(Store, {
oldChannel: secret.channel,
password: n,
href: href
@@ -2044,6 +2057,15 @@ define([
/////////////////////// Init /////////////////////////////////////
//////////////////////////////////////////////////////////////////
Store.refreshDriveUI = function () {
getAllStores().forEach(function (_s) {
var send = _s.id ? _s.sendEvent : sendDriveEvent;
send('DRIVE_CHANGE', {
path: ['drive', UserObject.FILES_DATA]
});
});
};
var onReady = function (clientId, returned, cb) {
var proxy = store.proxy;
var unpin = function (data, cb) {

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

@@ -103,29 +103,31 @@ define([
cb(sf.rt, sf.metadata);
});
});
sf.teams.push(store);
if (handler) { handler(id, sf.rt); }
return sf.rt;
}
if (sf && sf.queue && sf.rt) {
// The shared folder is loading, add our callbacks to the queue
sf.queue.push({
sf.teams.push({
cb: cb,
store: store,
id: id
});
sf.teams.push(store);
if (handler) { handler(id, sf.rt); }
return sf.rt;
return;
}
if (sf && !sf.ready && sf.rt) {
// The shared folder is loading, add our callbacks to the queue
sf.teams.push({
cb: cb,
store: store,
id: id
});
if (handler) { handler(id, sf.rt); }
return;
}
sf = allSharedFolders[secret.channel] = {
queue: [{
teams: [{
cb: cb,
store: store,
id: id
}],
teams: [store],
readOnly: Boolean(secondaryKey)
};
@@ -151,10 +153,10 @@ define([
// New Shared folder: no migration required
rt.proxy.version = 2;
}
if (!sf.queue) {
if (!sf.teams) {
return;
}
sf.queue.forEach(function (obj) {
sf.teams.forEach(function (obj) {
var leave = function () { SF.leave(secret.channel, teamId); };
var uo = obj.store.manager.addProxy(obj.id, rt, leave, secondaryKey);
SF.checkMigration(secondaryKey, rt.proxy, uo, function () {
@@ -163,15 +165,17 @@ define([
});
sf.metadata = info.metadata;
sf.ready = true;
delete sf.queue;
});
rt.proxy.on('error', function (info) {
if (info && info.error) {
if (info.error === "EDELETED" ) {
try {
// Deprecate the shared folder from each team
sf.teams.forEach(function (store) {
store.manager.deprecateProxy(id, secret.channel);
// XXX We can't deprecate a read-only proxy: the read-only seed will change...
// We can only remove it
sf.teams.forEach(function (obj) {
console.log(obj.store.id, obj.store, obj.id);
obj.store.manager.deprecateProxy(obj.id, secret.channel);
});
} catch (e) {}
delete allSharedFolders[secret.channel];
@@ -200,8 +204,8 @@ define([
var clients = sf.teams;
if (!Array.isArray(clients)) { return; }
var idx;
clients.some(function (store, i) {
if (store.id === teamId) {
clients.some(function (obj, i) {
if (obj.store.id === teamId) {
idx = i;
return true;
}
@@ -217,6 +221,7 @@ define([
}
};
// Update the password locally
SF.updatePassword = function (Store, data, network, cb) {
var oldChannel = data.oldChannel;
var href = data.href;
@@ -229,13 +234,18 @@ define([
sf.rt.stop();
}
var nt = nThen;
sf.teams.forEach(function (s) {
sf.teams.forEach(function (obj) {
// XXX if we're a viewer in this team, we can't update the keys
nt = nt(function (waitFor) {
var sfId = s.manager.user.userObject.getSFIdFromHref(href);
var s = obj.store;
var sfId = obj.id;
var shared = Util.find(s.proxy, ['drive', UserObject.SHARED_FOLDERS]) || {};
if (!sfId || !shared[sfId]) { return; }
var sf = JSON.parse(JSON.stringify(shared[sfId]));
sf.password = password;
sf.channel = secret.channel;
sf.href = '/drive/#'+Hash.getEditHashFromKeys(secret); // XXX encrypt
sf.roHref = '/drive/#'+Hash.getViewHashFromKeys(secret);
SF.load({
network: network,
store: s,

1
www/common/outer/store-rpc.js
View File

@@ -79,6 +79,7 @@ define([
GIVE_PAD_ACCESS: Store.givePadAccess,
GET_PAD_METADATA: Store.getPadMetadata,
SET_PAD_METADATA: Store.setPadMetadata,
CHANGE_PAD_PASSWORD_PIN: Store.changePadPasswordPin,
// Drive
DRIVE_USEROBJECT: Store.userObjectCommand,
// Settings,