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

export more, use finer granularity for methods

Browse Source
This commit is contained in:
ansuz 2016-09-01 12:15:09 +02:00
parent 2f2aeef0e5
commit f74236d729
1 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
customize.dist/user.js
View File

@ -3,34 +3,38 @@ define([
'/customize/messages.js', '/customize/messages.js',
'/bower_components/chainpad-listmap/chainpad-listmap.js', '/bower_components/chainpad-listmap/chainpad-listmap.js',
'/bower_components/chainpad-crypto/crypto.js', '/bower_components/chainpad-crypto/crypto.js',
'/customize/store.js',
'/bower_components/scrypt-async/scrypt-async.min.js', '/bower_components/scrypt-async/scrypt-async.min.js',
'/bower_components/tweetnacl/nacl-fast.min.js', '/bower_components/tweetnacl/nacl-fast.min.js',
], function (Config, Messages, Listmap, Crypto) { ], function (Config, Messages, Listmap, Crypto, Store) {
var Scrypt = window.scrypt; var Scrypt = window.scrypt;
var Nacl = window.nacl; var Nacl = window.nacl;
var localKey = 'cryptpad_user_session';
var User = {}; var User = {};
var localKey = User.localKey = 'cryptpad_user_session';
var store;
Store.ready(function (err, s) {
if (err) {
console.error(err);
return;
}
store = s;
});
var isArray = function (o) { return Object.prototype.toString.call(o) === '[object Array]'; }; var isArray = function (o) { return Object.prototype.toString.call(o) === '[object Array]'; };
var session = User.session = function (secret) { var session = User.session = function (secret, cb) {
// TODO use store.js, not localStorage?
if (secret) { if (secret) {
localStorage.setItem(localKey, JSON.stringify(secret)); store.set(localKey, secret, cb);
return; return;
} }
if (secret === null) { if (secret === null) {
localStorage.removeItem(localKey); store.remove(localKey, cb);
return;
}
var temp = localStorage.getItem(localKey);
try {
return JSON.parse(temp);
} catch (err) {
return null;
} }
store.get(localKey, cb);
}; };
/* 64 uint8s symmetric keys /* 64 uint8s symmetric keys
@ -91,11 +95,12 @@ define([
initialize(rt.proxy, secret, cb); initialize(rt.proxy, secret, cb);
}; };
/* Asynchronously derive 128 random uint8s given a uname and password var disconnect = User.disconnect = function (cb) {
var err = "User.disconnect is not implemented yet";
cb(err);
};
cb(proxy, secret) var genSecret = User.genSecret = function (uname, pw, cb) {
*/
var login = User.login = function (uname, pw, cb) {
Scrypt(pw, Scrypt(pw,
uname, uname,
15, // memory cost parameter 15, // memory cost parameter
@ -105,8 +110,19 @@ define([
function (bytes) { function (bytes) {
var secret = parse128(bytes); var secret = parse128(bytes);
secret.username = uname; secret.username = uname;
session(secret); cb(void 0, secret);
});
};
/* Asynchronously derive 128 random uint8s given a uname and password
cb(proxy, secret)
*/
var login = User.login = function (uname, pw, cb) {
genSecret(uname, pw, function (err, secret) {
session(secret, function (err) {
connect(secret, cb); connect(secret, cb);
});
}); });
}; };