summaryrefslogtreecommitdiff
path: root/backend
Side-by-side diff
Diffstat (limited to 'backend') (more/less context) (ignore whitespace changes)
-rw-r--r--backend/node/src/clipperz.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/backend/node/src/clipperz.js b/backend/node/src/clipperz.js
index c6d776a..eebd5bf 100644
--- a/backend/node/src/clipperz.js
+++ b/backend/node/src/clipperz.js
@@ -150,113 +150,113 @@ var CLIPPERZ = module.exports = function(CONFIG) {
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:{}},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",
+ PG.Q("SELECT u_header::varchar,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});
+ res.res({header: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]);
});
}],
updatev: ['updater','insertr',function(cb,rr) {
var crv=r.currentRecordVersion;
T.Q(
"UPDATE clipperz.therecordversion"
+" SET rv_ref=$1, rv_data=$2, rv_version=$3,"
+" rv_previous_id=COALESCE($4,rv_previous_id),"
@@ -426,103 +426,103 @@ var CLIPPERZ = module.exports = function(CONFIG) {
cb(e,r.rows[0]);
});
},
otp: function(cb) {
var otps=ppp.oneTimePasswords;
if(!otps) return cb();
ASYNC.each(Object.keys(otps),function(r,cb) {
T.Q(
"UPDATE clipperz.theotp"
+" SET otp_data=$1, otp_utime=current_timestamp WHERE otp_ref=$2 AND u_id=$3",
[ otps[r], r, req.session.u ], function(e,r) {
if(e) return cb(e);
if(!r.rowCount) return cb(new Error("OTP's gone AWOL"));
cb();
});
},cb);
}
},function(e,r) {
T.end(e, function(e) {
if(e) return cb(e);
res.res({result:'done',lock:r.user.u_lock});
});
});
});
case 'deleteUser': return PG.Q(
"DELETE FROM clipperz.theuser WHERE u_id=$1",
[req.session.u],function(e,r) {
if(e) return cb(e);
res.res({result:'ok'});
});
case 'echo': return res.res({result:ppp});
case 'getOneTimePasswordsDetails': return res.res({});
case 'getLoginHistory': return res.res({result:[]});
}
break;
case 'logout': return req.session.destroy(function(e){res.res({})});
}
cb();
},
dump: function(req,res,cb) {
if(!req.session.u) return cb(new Error('logging in helps'));
return ASYNC.parallel({
u: function(cb) {
PG.Q(
"SELECT"
- +" u_name, u_srp_s, u_srp_v, u_authversion, u_header, u_statistics, u_version"
+ +" u_name, u_srp_s, u_srp_v, u_authversion, u_header::varchar, 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"));
r = r.rows[0];
return cb(null,{u:r.u_name,d:{s:r.u_srp_s,v:r.u_srp_v, version:r.u_authversion,
- maxNumberOfRecords: '100', userDetails: JSON.stringify(r.u_header),
+ maxNumberOfRecords: '100', userDetails: r.u_header,
statistics: r.u_statistics, userDetailsVersion: r.u_version
}});
});
},
records: function(cb) {
PG.Q(
"SELECT"
+" r.r_id, r.r_ref, r_data, r_version, r_ctime, r_mtime, r_atime,"
+" rv.rv_id, rv.rv_ref AS rv_ref, rv_header, rv_data, rv_version, rv_ctime, rv_mtime, rv_atime"
+" FROM"
+" clipperz.therecord AS r"
+" LEFT JOIN clipperz.therecordversion AS rv USING (r_id)"
+" WHERE r.u_id=$1"
+" ORDER BY r.r_id ASC, rv.rv_id ASC", [req.session.u],function(e,r) {
if(e) return cb(e);
var rv = {};
r.rows.forEach(function(r) {
if(!rv[r.r_ref]) rv[r.r_ref] = {
data: r.r_data, version: r.r_version,
creationDate: r.r_ctime.toString(),
updateDate: r.r_mtime.toString(),
accessDate: r.r_atime.toString(),
versions: {}
};
if(!r.rv_id) return;
rv[r.r_ref].versions[rv[r.r_ref].currentVersion=r.rv_ref] = {
header: r.rv_header, data: r.rv_data, version: r.rv_version,
creationDate: r.rv_ctime.toString(),
updateDate: r.rv_mtime.toString(),
accessDate: r.rv_atime.toString()
};
});
cb(null,rv);
});
},
html: function(cb) {
FS.readFile(CONFIG.dump_template,{encoding:'utf-8'},cb);
}
},function(e,r) {
if(e) return cb(e);
var d = new Date();
res.attachment('Clipperz_'+d.getFullYear()+'_'+(d.getMonth()+1)+'_'+d.getDate()+'.html');
var ojs = { users: {
catchAllUser: { __masterkey_test_value__: 'masterkey', s: n123, v: n123 }
} };
r.u.d.records = r.records;
ojs.users[r.u.u] = r.u.d;
res.send(r.html.replace('/*offline_data_placeholder*/',