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

progress for implicit pinning

Browse Source
This commit is contained in:
ansuz 2017-04-10 17:42:35 +02:00
parent f82278a25c
commit a14bb1480a
2 changed files with 202 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

210
rpc.js
View File

@ -38,20 +38,42 @@ var parseCookie = function (cookie) {
return c; return c;
}; };
var addTokenForKey = function (Cookies, publicKey, token) { var beginSession = function (Sessions, key) {
if (!Cookies[publicKey]) { throw new Error('undefined user'); } if (Sessions[key]) {
Sessions[key].atime = +new Date();
var user = Cookies[publicKey]; return Sessions[key];
user.tokens.push(token); }
var user = Sessions[key] = {};
user.atime = +new Date(); user.atime = +new Date();
if (user.tokens.length > 2) { user.tokens.shift(); } user.tokens = [
makeToken()
];
return user;
}; };
var isTooOld = function (time, now) { var isTooOld = function (time, now) {
return (now - time) > 300000; return (now - time) > 300000;
}; };
var isValidCookie = function (Cookies, publicKey, cookie) { var expireSessions = function (Sessions) {
var now = +new Date();
Object.keys(Sessions).forEach(function (key) {
if (isTooOld(Sessions[key].atime, now)) {
delete Sessions[key];
}
});
};
var addTokenForKey = function (Sessions, publicKey, token) {
if (!Sessions[publicKey]) { throw new Error('undefined user'); }
var user = Sessions[publicKey];
user.tokens.push(token);
user.atime = +new Date();
if (user.tokens.length > 2) { user.tokens.shift(); }
};
var isValidCookie = function (Sessions, publicKey, cookie) {
var parsed = parseCookie(cookie); var parsed = parseCookie(cookie);
if (!parsed) { return false; } if (!parsed) { return false; }
@ -67,7 +89,7 @@ var isValidCookie = function (Cookies, publicKey, cookie) {
return false; return false;
} }
var user = Cookies[publicKey]; var user = Sessions[publicKey];
if (!user) { return false; } if (!user) { return false; }
var idx = user.tokens.indexOf(parsed.seq); var idx = user.tokens.indexOf(parsed.seq);
@ -76,7 +98,7 @@ var isValidCookie = function (Cookies, publicKey, cookie) {
var next; var next;
if (idx > 0) { if (idx > 0) {
// make a new token // make a new token
addTokenForKey(Cookies, publicKey, makeToken()); addTokenForKey(Sessions, publicKey, makeToken());
} }
return true; return true;
@ -122,10 +144,24 @@ var checkSignature = function (signedMsg, signature, publicKey) {
return Nacl.sign.detached.verify(signedBuffer, signatureBuffer, pubBuffer); return Nacl.sign.detached.verify(signedBuffer, signatureBuffer, pubBuffer);
}; };
var getChannelList = function (store, publicKey, cb) { var loadUserPins = function (store, Sessions, publicKey, cb) {
// to accumulate pinned channels var session = beginSession(Sessions, publicKey);
if (session.channels) {
return cb(session.channels);
}
// if channels aren't in memory. load them from disk
var pins = {}; var pins = {};
var pin = function (channel) {
pins[channel] = true;
};
var unpin = function (channel) {
pins[channel] = false;
};
store.getMessages(publicKey, function (msg) { store.getMessages(publicKey, function (msg) {
// handle messages... // handle messages...
var parsed; var parsed;
@ -134,20 +170,16 @@ var getChannelList = function (store, publicKey, cb) {
switch (parsed[0]) { switch (parsed[0]) {
case 'PIN': case 'PIN':
pins[parsed[1]] = true; parsed[1].forEach(pin);
break; break;
case 'UNPIN': case 'UNPIN':
pins[parsed[1]] = false; parsed[1].forEach(unpin);
break; break;
case 'RESET': case 'RESET':
Object.keys(pins).forEach(function (pin) { Object.keys(pins).forEach(unpin);
pins[pin] = false;
});
if (parsed[1] && parsed[1].length) { if (parsed[1] && parsed[1].length) {
parsed[1].forEach(function (channel) { parsed[1].forEach(pin);
pins[channel] = true;
});
} }
break; break;
default: default:
@ -159,27 +191,39 @@ var getChannelList = function (store, publicKey, cb) {
} }
}, function () { }, function () {
// no more messages // no more messages
var pinned = Object.keys(pins).filter(function (pin) {
return pins[pin];
});
cb(pinned); // only put this into the cache if it completes
session.channels = pins;
cb(pins);
});
};
var truthyKeys = function (O) {
return Object.keys(O).filter(function (k) {
return O[k];
});
};
var getChannelList = function (store, Sessions, publicKey, cb) {
loadUserPins(store, Sessions, publicKey, function (pins) {
cb(truthyKeys(pins));
}); });
}; };
var getFileSize = function (store, channel, cb) { var getFileSize = function (store, channel, cb) {
if (!isValidChannel(channel)) { return void cb('INVALID_CHAN'); } if (!isValidChannel(channel)) { return void cb('INVALID_CHAN'); }
// TODO don't blow up if their store doesn't have this API
return void store.getChannelSize(channel, function (e, size) { return void store.getChannelSize(channel, function (e, size) {
if (e) { return void cb(e.code); } if (e) { return void cb(e.code); }
cb(void 0, size); cb(void 0, size);
}); });
}; };
var getTotalSize = function (pinStore, messageStore, publicKey, cb) { var getTotalSize = function (pinStore, messageStore, Sessions, publicKey, cb) {
var bytes = 0; var bytes = 0;
return void getChannelList(pinStore, publicKey, function (channels) { return void getChannelList(pinStore, Sessions, publicKey, function (channels) {
if (!channels) { cb('NO_ARRAY'); } // unexpected if (!channels) { cb('NO_ARRAY'); } // unexpected
var count = channels.length; var count = channels.length;
@ -209,8 +253,8 @@ var hashChannelList = function (A) {
return hash; return hash;
}; };
var getHash = function (store, publicKey, cb) { var getHash = function (store, Sessions, publicKey, cb) {
getChannelList(store, publicKey, function (channels) { getChannelList(store, Sessions, publicKey, function (channels) {
cb(void 0, hashChannelList(channels)); cb(void 0, hashChannelList(channels));
}); });
}; };
@ -219,66 +263,93 @@ var storeMessage = function (store, publicKey, msg, cb) {
store.message(publicKey, JSON.stringify(msg), cb); store.message(publicKey, JSON.stringify(msg), cb);
}; };
var pinChannel = function (store, publicKey, channel, cb) { var pinChannel = function (store, Sessions, publicKey, channels, cb) {
store.message(publicKey, JSON.stringify(['PIN', channel]), if (!channels && channels.filter) {
function (e) { // expected array
if (e) { return void cb(e); } return void cb('[TYPE_ERROR] pin expects channel list argument');
}
getHash(store, publicKey, function (e, hash) { getChannelList(store, Sessions, publicKey, function (pinned) {
cb(e, hash); var session = beginSession(Sessions, publicKey);
// only pin channels which are not already pinned
var toStore = channels.filter(function (channel) {
return pinned.indexOf(channel) === -1;
});
if (toStore.length === 0) {
return void getHash(store, Sessions, publicKey, cb);
}
store.message(publicKey, JSON.stringify(['PIN', toStore]),
function (e) {
if (e) { return void cb(e); }
toStore.forEach(function (channel) {
session.channels[channel] = true;
});
getHash(store, Sessions, publicKey, cb);
}); });
}); });
}; };
var unpinChannel = function (store, publicKey, channel, cb) { var unpinChannel = function (store, Sessions, publicKey, channels, cb) {
store.message(publicKey, JSON.stringify(['UNPIN', channel]), if (!channels && channels.filter) {
function (e) { // expected array
if (e) { return void cb(e); } return void cb('[TYPE_ERROR] unpin expects channel list argument');
}
getHash(store, publicKey, function (e, hash) { getChannelList(store, Sessions, publicKey, function (pinned) {
cb(e, hash); var session = beginSession(Sessions, publicKey);
// only unpin channels which are pinned
var toStore = channels.filter(function (channel) {
return pinned.indexOf(channel) !== -1;
});
if (toStore.length === 0) {
return void getHash(store, Sessions, publicKey, cb);
}
store.message(publicKey, JSON.stringify(['UNPIN', toStore]),
function (e) {
if (e) { return void cb(e); }
toStore.forEach(function (channel) {
// TODO actually delete
session.channels[channel] = false;
});
getHash(store, Sessions, publicKey, cb);
}); });
}); });
}; };
var resetUserPins = function (store, publicKey, channelList, cb) { var resetUserPins = function (store, Sessions, publicKey, channelList, cb) {
var session = beginSession(Sessions, publicKey);
var pins = session.channels = {};
store.message(publicKey, JSON.stringify(['RESET', channelList]), store.message(publicKey, JSON.stringify(['RESET', channelList]),
function (e) { function (e) {
if (e) { return void cb(e); } if (e) { return void cb(e); }
channelList.forEach(function (channel) {
pins[channel] = true;
});
getHash(store, publicKey, function (e, hash) { getHash(store, Sessions, publicKey, function (e, hash) {
cb(e, hash); cb(e, hash);
}); });
}); });
}; };
var expireSessions = function (Cookies) {
var now = +new Date();
Object.keys(Cookies).forEach(function (key) {
if (isTooOld(Cookies[key].atime, now)) {
delete Cookies[key];
}
});
};
RPC.create = function (config, cb) { RPC.create = function (config, cb) {
// load pin-store... // load pin-store...
console.log('loading rpc module...'); console.log('loading rpc module...');
var Cookies = {}; var Sessions = {};
var store; var store;
var addUser = function (key) {
if (Cookies[key]) { return; }
var user = Cookies[key] = {};
user.atime = +new Date();
user.tokens = [
makeToken()
];
};
var rpc = function (ctx, data, respond) { var rpc = function (ctx, data, respond) {
if (!data.length) { if (!data.length) {
return void respond("INSUFFICIENT_ARGS"); return void respond("INSUFFICIENT_ARGS");
@ -291,13 +362,12 @@ RPC.create = function (config, cb) {
var signature = msg.shift(); var signature = msg.shift();
var publicKey = msg.shift(); var publicKey = msg.shift();
// make sure a user object is initialized in the cookie jar // make sure a user object is initialized in the cookie jar
addUser(publicKey); beginSession(Sessions, publicKey);
var cookie = msg[0]; var cookie = msg[0];
if (!isValidCookie(Cookies, publicKey, cookie)) { if (!isValidCookie(Sessions, publicKey, cookie)) {
// no cookie is fine if the RPC is to get a cookie // no cookie is fine if the RPC is to get a cookie
if (msg[1] !== 'COOKIE') { if (msg[1] !== 'COOKIE') {
return void respond('NO_COOKIE'); return void respond('NO_COOKIE');
@ -326,7 +396,7 @@ RPC.create = function (config, cb) {
msg.shift(); msg.shift();
var Respond = function (e, msg) { var Respond = function (e, msg) {
var token = Cookies[publicKey].tokens.slice(-1)[0]; var token = Sessions[publicKey].tokens.slice(-1)[0];
var cookie = makeCookie(token).join('|'); var cookie = makeCookie(token).join('|');
respond(e, [cookie].concat(msg||[])); respond(e, [cookie].concat(msg||[]));
}; };
@ -338,23 +408,23 @@ RPC.create = function (config, cb) {
switch (msg[0]) { switch (msg[0]) {
case 'COOKIE': return void Respond(void 0); case 'COOKIE': return void Respond(void 0);
case 'RESET': case 'RESET':
return resetUserPins(store, safeKey, msg[1], function (e, hash) { return resetUserPins(store, Sessions, safeKey, msg[1], function (e, hash) {
return void Respond(e, hash); return void Respond(e, hash);
}); });
case 'PIN': case 'PIN':
return pinChannel(store, safeKey, msg[1], function (e, hash) { return pinChannel(store, Sessions, safeKey, msg[1], function (e, hash) {
Respond(e, hash); Respond(e, hash);
}); });
case 'UNPIN': case 'UNPIN':
return unpinChannel(store, safeKey, msg[1], function (e, hash) { return unpinChannel(store, Sessions, safeKey, msg[1], function (e, hash) {
Respond(e, hash); Respond(e, hash);
}); });
case 'GET_HASH': case 'GET_HASH':
return void getHash(store, safeKey, function (e, hash) { return void getHash(store, Sessions, safeKey, function (e, hash) {
Respond(e, hash); Respond(e, hash);
}); });
case 'GET_TOTAL_SIZE': case 'GET_TOTAL_SIZE':
return getTotalSize(store, ctx.store, safeKey, function (e, size) { return getTotalSize(store, ctx.store, Sessions, safeKey, function (e, size) {
if (e) { return void Respond(e); } if (e) { return void Respond(e); }
Respond(e, size); Respond(e, size);
}); });
@ -373,7 +443,7 @@ RPC.create = function (config, cb) {
// expire old sessions once per minute // expire old sessions once per minute
setInterval(function () { setInterval(function () {
expireSessions(Cookies); expireSessions(Sessions);
}, 60000); }, 60000);
}); });
}; };

86
www/common/cryptpad-common.js
View File

@ -5,9 +5,9 @@ define([
'/bower_components/chainpad-crypto/crypto.js?v=0.1.5', '/bower_components/chainpad-crypto/crypto.js?v=0.1.5',
'/bower_components/alertifyjs/dist/js/alertify.js', '/bower_components/alertifyjs/dist/js/alertify.js',
'/common/clipboard.js', '/common/clipboard.js',
'/customize/application_config.js',
'/common/pinpad.js', /* TODO '/common/pinpad.js', /* TODO
load pinpad dynamically only after you know that it will be needed */ load pinpad dynamically only after you know that it will be needed */
'/customize/application_config.js',
'/bower_components/jquery/dist/jquery.min.js', '/bower_components/jquery/dist/jquery.min.js',
], function (Config, Messages, Store, Crypto, Alertify, Clipboard, Pinpad, AppConfig) { ], function (Config, Messages, Store, Crypto, Alertify, Clipboard, Pinpad, AppConfig) {
@ -575,6 +575,9 @@ load pinpad dynamically only after you know that it will be needed */
// TODO integrate pinning if enabled // TODO integrate pinning if enabled
var setRecentPads = common.setRecentPads = function (pads, cb) { var setRecentPads = common.setRecentPads = function (pads, cb) {
getStore().setDrive(storageKey, pads, function (err, data) { getStore().setDrive(storageKey, pads, function (err, data) {
if (PINNING_ENABLED && isLoggedIn()) {
console.log("TODO check pin hash");
}
cb(err, data); cb(err, data);
}); });
}; };
@ -597,7 +600,6 @@ load pinpad dynamically only after you know that it will be needed */
}); });
}; };
// STORAGE // STORAGE
// TODO integrate pinning if enabled // TODO integrate pinning if enabled
var forgetPad = common.forgetPad = function (href, cb) { var forgetPad = common.forgetPad = function (href, cb) {
@ -879,7 +881,7 @@ load pinpad dynamically only after you know that it will be needed */
} }
console.log('RPC handshake complete'); console.log('RPC handshake complete');
rpc = env.rpc = call; rpc = common.rpc = env.rpc = call;
// TODO check if pin list is up to date // TODO check if pin list is up to date
// if not, reset // if not, reset
@ -996,7 +998,6 @@ load pinpad dynamically only after you know that it will be needed */
/* /*
* Buttons * Buttons
*/ */
// TODO integrate pinning if enabled
var renamePad = common.renamePad = function (title, callback) { var renamePad = common.renamePad = function (title, callback) {
if (title === null) { return; } if (title === null) { return; }
@ -1015,6 +1016,27 @@ load pinpad dynamically only after you know that it will be needed */
}); });
}; };
var hrefToHexChannelId = common.hrefToHexChannelId = function (href) {
var parsed = common.parsePadUrl(href);
if (!parsed || !parsed.hash) { return; }
parsed = common.parseHash(parsed.hash);
if (parsed.version === 0) {
return parsed.channel;
} else if (parsed.version !== 1) {
console.error("parsed href had no version");
console.error(parsed);
return;
}
var channel = parsed.channel;
if (!channel) { return; }
var hex = common.base64ToHex(channel);
return hex;
};
var getUserChannelList = common.getUserChannelList = function () { var getUserChannelList = common.getUserChannelList = function () {
var store = common.getStore(); var store = common.getStore();
var proxy = store.getProxy(); var proxy = store.getProxy();
@ -1027,26 +1049,8 @@ load pinpad dynamically only after you know that it will be needed */
var userChannel = common.parseHash(userHash).channel; var userChannel = common.parseHash(userHash).channel;
if (!userChannel) { return null; } if (!userChannel) { return null; }
var list = fo.getFilesDataFiles().map(function (href) { var list = fo.getFilesDataFiles().map(hrefToHexChannelId)
var parsed = common.parsePadUrl(href); .filter(function (x) { return x; });
if (!parsed || !parsed.hash) { return; }
parsed = common.parseHash(parsed.hash);
if (parsed.version === 0) {
return parsed.channel;
} else if (parsed.version !== 1) {
console.error("parsed href had no version");
console.error(parsed);
return;
}
var channel = parsed.channel;
if (!channel) { return; }
var hex = common.base64ToHex(channel);
return hex;
}).filter(function (x) { return x; });
list.push(common.base64ToHex(userChannel)); list.push(common.base64ToHex(userChannel));
list.sort(); list.sort();
@ -1058,6 +1062,40 @@ load pinpad dynamically only after you know that it will be needed */
return deduplicateString(getUserChannelList()).sort(); return deduplicateString(getUserChannelList()).sort();
}; };
var pinsReady = common.pinsReady = function () {
if (!PINNING_ENABLED) {
console.error('[PINNING_DISABLED]');
return false;
}
if (!rpc) {
console.error('[RPC_NOT_READY]');
return false;
}
return true;
};
var arePinsSynced = common.arePinsSynced = function (cb) {
if (!pinsReady()) { return void cb ('[RPC_NOT_READY]'); }
var list = getCanonicalChannelList();
var local = rpc.hashChannelList(list);
rpc.getServerHash(function (e, hash) {
if (e) { return void cb(e); }
cb(void 0, hash === local);
});
};
var resetPins = common.resetPins = function (cb) {
if (!PINNING_ENABLED) { return void console.error('[PINNING_DISABLED]'); }
if (!rpc) { return void console.error('[RPC_NOT_READY]'); }
var list = getCanonicalChannelList();
rpc.reset(list, function (e, hash) {
if (e) { return void cb(e); }
cb(void 0, hash);
});
};
var createButton = common.createButton = function (type, rightside, data, callback) { var createButton = common.createButton = function (type, rightside, data, callback) {
var button; var button;
var size = "17px"; var size = "17px";