summaryrefslogtreecommitdiff
path: root/backend/node/src
Side-by-side diff
Diffstat (limited to 'backend/node/src') (more/less context) (ignore whitespace changes)
-rw-r--r--backend/node/src/clipperz.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/backend/node/src/clipperz.js b/backend/node/src/clipperz.js
index 6bf56bb..c6d776a 100644
--- a/backend/node/src/clipperz.js
+++ b/backend/node/src/clipperz.js
@@ -64,193 +64,193 @@ var CLIPPERZ = module.exports = function(CONFIG) {
LOGGER.trace('SQL: rollback');
if(this.over) return cb(new Error('game over'));
return (this.over=true),C.query('ROLLBACK',function(e){D();cb&&cb(e)});
},
end: function(e,cb) {
if(e) return LOGGER.trace(e,"rolling back transaction due to an error"),this.rollback(cb);
this.commit(cb);
}
});
});
});
}
};
return {
json: function clipperz_json(req,res,cb) {
var method = req.body.method, pp = JSON.parse(req.body.parameters).parameters;
var message = pp.message;
var ppp = pp.parameters;
res.res = function(o) { return res.json({result:o}) };
LOGGER.trace({method:method,parameters:pp},"JSON request");
switch(method) {
case 'registration':
switch(message) {
case 'completeRegistration': return PG.Q(
"INSERT INTO clipperz.theuser"
+" (u_name, u_srp_s,u_srp_v, u_authversion,u_header,u_statistics,u_version,u_lock)"
+" VALUES ($1, $2,$3, $4,$5,$6,$7,$8)",
[pp.credentials.C, pp.credentials.s, pp.credentials.v,
pp.credentials.version,pp.user.header, pp.user.statistics,
pp.user.version, pp.user.lock], function(e,r) {
if(e) return cb(e);
res.res({lock:pp.user.lock,result:'done'});
});
}
break;
case 'handshake':
switch(message) {
case 'connect': return ASYNC.auto({
u: function(cb) { PG.Q(
"SELECT u_id, u_srp_s, u_srp_v FROM clipperz.theuser WHERE u_name=$1",
[ppp.C], function(e,r) {
if(e) return cb(e);
if(!r.rowCount) return cb(null,{u_id:null,u_srp_s:n123,u_srp_v:n123});
cb(null,r.rows[0]);
}) },
otp: ['u',function(cb,r) {
if(!req.session.otp) return cb();
if(req.session.u!=r.u.u_id) return cb(new Error('user/OTP mismatch'));
PG.Q(
"UPDATE clipperz.theotp AS otp"
+" SET"
+" otps_id=CASE WHEN s.otps_code='REQUESTED' THEN ("
+" SELECT ss.otps_id FROM clipperz.otpstatus AS ss WHERE ss.otps_code='USED'"
+" ) ELSE otp.otps_id END,"
+" otp_utime=current_timestamp"
+" FROM clipperz.otpstatus AS s, clipperz.theotp AS o"
+" WHERE"
+" o.otp_id=otp.otp_id AND otp.otps_id=s.otps_id"
+" AND otp.otp_id=$1 AND otp.u_id=$2"
+" RETURNING o.otps_id!=otp.otps_id AS yes, o.otp_ref",
[ req.session.otp, req.session.u ],
function(e,r) {
if(e) return cb(e);
if(!r.rowCount) return cb(new Error('no OTP found'));
r=r.rows[0];
if(!r.yes) return cb(new Error('OTP is in a sorry state'));
cb(null,{ref:r.otp_ref});
});
}]
},function(e,r) {
if(e) return cb(e);
req.session.C = ppp.C; req.session.A = ppp.A;
req.session.s = r.u.u_srp_s; req.session.v = r.u.u_srp_v;
req.session.u = r.u.u_id;
req.session.b = clipperz_random();
req.session.B = BIGNUM(req.session.v,16).add(srp_g.powm(BIGNUM(req.session.b,16),srp_n)).toString(16);
var rv = {s:req.session.s,B:req.session.B}
if(r.otp && r.otp.otp_ref) rv.oneTimePassword=r.otp.otp_ref;
res.res(rv);
});
case 'credentialCheck':
var u = clipperz_hash(BIGNUM(req.session.B,16).toString(10));
var A = BIGNUM(req.session.A,16);
var S = A.mul(BIGNUM(req.session.v,16).powm(BIGNUM(u,16),srp_n)).powm(
BIGNUM(req.session.b,16), srp_n);
var K = clipperz_hash(S.toString(10));
var M1 = clipperz_hash(A.toString(10)+BIGNUM(req.session.B,16).toString(10)+K.toString(16));
if(M1!=ppp.M1) return res.res({error:'?'});
req.session.K = K;
var M2 = clipperz_hash(A.toString(10)+M1+K.toString(16));
- return res.res({M2:M2,connectionId:'',loginInfo:{latest:{},current:{}},offlineCopyNeededd:false,lock:'----'});
+ return res.res({M2:M2,connectionId:'',loginInfo:{latest:{},current:{}},offlineCopyNeeded:false,lock:'----'});
case 'oneTimePassword': return PG.Q(
"UPDATE clipperz.theotp AS otp"
+" SET"
+" otps_id = CASE WHEN s.otps_code!='ACTIVE' THEN s.otps_id ELSE ("
+" SELECT ss.otps_id FROM clipperz.otpstatus AS ss WHERE ss.otps_code=CASE"
+" WHEN otp.otp_key_checksum=$2 THEN 'REQUESTED'"
+" ELSE 'DISABLED' END"
+" ) END,"
+" otp_data = CASE WHEN s.otps_code='ACTIVE' THEN '' ELSE otp.otp_data END,"
+" otp_utime = current_timestamp,"
+" otp_rtime = CASE WHEN otp.otp_key_checksum=$2 THEN current_timestamp ELSE otp.otp_rtime END"
+" FROM clipperz.otpstatus AS s, clipperz.theotp AS o"
+" WHERE"
+" o.otp_id=otp.otp_id AND otp.otps_id=s.otps_id AND otp.otp_key=$1"
+" RETURNING otp.u_id, s.otps_code, otp.otp_id, otp.otp_key_checksum, o.otp_data, otp.otp_version",
[ ppp.oneTimePasswordKey, ppp.oneTimePasswordKeyChecksum ],
function(e,r) {
if(e) return cb(e);
if(!r.rowCount) return cb(new Error('OTP not found'));
r=r.rows[0];
if(r.otp_key_checksum!=ppp.oneTimePasswordKeyChecksum)
return cb(new Error('OTP was disabled because of checksum mismatch'));
if(r.otps_code!='ACTIVE')
return cb(new Error("OTP wasn't active, sorry"));
req.session.u=r.u_id; req.session.otp=r.otp_id;
res.res({data:r.otp_data,version:r.otp_version});
});
}
break;
case 'message':
if(!req.session.K) return res.res({result:'EXCEPTION',message:"effectively, we're missing a aconnection"});
if(req.session.K!=pp.srpSharedSecret) return res.res({error:'Wrong shared secret!'});
switch(message) {
case 'getUserDetails': return ASYNC.parallel({
u: function(cb) {
PG.Q("SELECT u_header,u_statistics,u_version FROM clipperz.theuser WHERE u_id=$1",
[req.session.u],function(e,r) {
if(e) return cb(e);
if(!r.rowCount) return cb(new Error("user's gone AWOL"));
cb(null,r.rows[0]);
});
},
stats: function(cb) {
PG.Q("SELECT r_ref,r_mtime FROM clipperz.therecord WHERE u_id=$1",
[req.session.u],function(e,r) {
if(e) return cb(e);
cb(null,r.rows.reduce(function(p,r){p[r.r_ref]={updateDate:r.r_mtime};return p},{}));
});
}
},function(e,r) {
if(e) return cb(e);
res.res({header:JSON.stringify(r.u.u_header),statistics:r.u.u_statistics,version:r.u.u_version,recordsStats:r.stats});
});
case 'saveChanges': return PG.T(function(e,T) {
if(e) return cb(e);
ASYNC.auto({
user: function(cb) {
T.Q(
"UPDATE clipperz.theuser"
+" SET u_header=$1, u_statistics=$2, u_version=$3, u_lock=COALESCE($4,u_lock)"
+" WHERE u_id=$5"
+" RETURNING u_lock",[ppp.user.header,ppp.user.statistics,ppp.user.version,ppp.user.lock||null,req.session.u],
function(e,r) {
if(e) return cb(e);
if(!r.rowCount) return cb(new Error("user's gone AWOL"));
cb(null,r.rows[0]);
});
},
updaterecords: function(cb) {
if(!(ppp.records && ppp.records.updated && ppp.records.updated.length)) return cb();
ASYNC.each(ppp.records.updated,function(r,cb) {
ASYNC.auto({
updater: function(cb) {
T.Q(
"UPDATE clipperz.therecord"
+" SET r_data=$2, r_version=$3, r_mtime=current_timestamp"
+" WHERE r_ref=$1 AND u_id=$4 RETURNING r_id",
[r.record.reference,r.record.data,r.record.version,req.session.u], function(e,r) {
if(e) return cb(e);
return cb(null,r.rows.length?r.rows[0]:null);
});
},
insertr: ['updater',function(cb,rr) {
if(rr.updater) return cb();
T.Q(
"INSERT INTO clipperz.therecord"
+" (u_id,r_ref,r_data,r_version)"
+" VALUES ($1,$2,$3,$4) RETURNING r_id",[req.session.u,r.record.reference,r.record.data,r.record.version],
function(e,r) {
if(e) return cb(e);
return cb(null,r.rows[0]);
});
}],