summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--backend/node/src/clipperz.js20
-rw-r--r--backend/node/src/clipperz.schema.sql4
2 files changed, 13 insertions, 11 deletions
diff --git a/backend/node/src/clipperz.js b/backend/node/src/clipperz.js
index b98c00e..b8b4d3e 100644
--- a/backend/node/src/clipperz.js
+++ b/backend/node/src/clipperz.js
@@ -1,78 +1,80 @@
var FS = require('fs');
var CRYPTO = require('crypto');
var BIGNUM = require('bignum');
var ASYNC = require('async');
var express_store = require('express').session.Store;
function clipperz_hash(v) {
return CRYPTO.createHash('sha256').update(
CRYPTO.createHash('sha256').update(v).digest('binary')
).digest('hex');
};
function clipperz_random() {
for(var r = '';r.length<64;r+=''+BIGNUM(Math.floor(Math.random()*1e18)).toString(16));
return r.substr(0,64);
};
function clipperz_store(PG) {
var rv = function(o) { express_store.call(this,o); }
rv.prototype.get = function(sid,cb) { PG.Q(
"SELECT s_data FROM clipperz.thesession WHERE s_id=$1",[sid],
- function(e,r) { cb(e,(e||!r.rowCount)?null:r.rows[0].s_data); }
+ function(e,r) { cb(e,(e||!r.rowCount)?null:JSON.parse(r.rows[0].s_data)); }
) };
- rv.prototype.set = function(sid,data,cb) { PG.Q(
- "UPDATE clipperz.thesession SET s_data=$1, s_mtime=current_timestamp"
- +" WHERE s_id=$2",[data,sid], function(e,r) {
+ rv.prototype.set = function(sid,data,cb) {
+ var d = JSON.stringify(data);
+ PG.Q(
+ "UPDATE clipperz.thesession SET s_data=$1, s_mtime=current_timestamp"
+ +" WHERE s_id=$2",[d,sid], function(e,r) {
if(e) return cb(e);
if(r.rowCount) return cb();
- PG.Q("INSERT INTO clipperz.thesession (s_id,s_data) VALUES ($1,$2)",[sid,data],cb);
- }
- ) };
+ PG.Q("INSERT INTO clipperz.thesession (s_id,s_data) VALUES ($1,$2)",[sid,d],cb);
+ });
+ };
rv.prototype.destroy = function(sid,cb) { PG.Q(
"DELETE FROM clipperz.thesession WHERE s_id=$1",[sid],cb
) };
rv.prototype.length = function(cb) { PG.Q(
"SELECT count(*) AS c FROM clipperz.thesession", function(e,r) {
cb(e,e?null:r.rows[0].c);
}
) };
rv.prototype.length = function(cb) { PQ.Q(
"DELETE FROM clipperz.thesession", cb
) };
rv.prototype.__proto__ = express_store.prototype;
return rv;
}
var srp_g = BIGNUM(2);
var srp_n = BIGNUM("115b8b692e0e045692cf280b436735c77a5a9e8a9e7ed56c965f87db5b2a2ece3",16);
var n123 = '112233445566778899aabbccddeeff00112233445566778899aabbccddeeff00';
var CLIPPERZ = module.exports = function(CONFIG) {
var LOGGER = CONFIG.logger||{trace:function(){}};
var PG = {
url: CONFIG.psql,
PG: require('pg').native,
Q: function(q,a,cb) {
if('function'===typeof a) cb=a,a=[];
LOGGER.trace({query:q,args:a},'SQL: %s',q);
PG.PG.connect(PG.url,function(e,C,D) {
if(e) return cb(e);
var t0=new Date();
C.query(q,a,function(e,r) {
var t1=new Date(), dt=t1-t0;
D();
LOGGER.trace({query:q,args:a,ms:dt,rows:r&&r.rowCount,err:e},"SQL query '%s' took %dms",q,dt);
cb(e,r);
});
});
},
T: function(cb) {
PG.PG.connect(PG.url,function(e,C,D) {
if(e) return cb(e);
C.query('BEGIN',function(e){
if(e) return D(),cb(e);
cb(null,{
Q: function(q,a,cb) {
@@ -181,97 +183,97 @@ 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::varchar,u_statistics,u_version FROM clipperz.theuser WHERE u_id=$1",
+ 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: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) {
@@ -457,97 +459,97 @@ 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::varchar, u_statistics, u_version"
+ +" u_name, u_srp_s, u_srp_v, u_authversion, 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"));
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: 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');
diff --git a/backend/node/src/clipperz.schema.sql b/backend/node/src/clipperz.schema.sql
index 1c2305c..591828a 100644
--- a/backend/node/src/clipperz.schema.sql
+++ b/backend/node/src/clipperz.schema.sql
@@ -1,67 +1,67 @@
CREATE SCHEMA clipperz;
CREATE TABLE clipperz.theuser (
u_id serial PRIMARY KEY,
u_name varchar NOT NULL UNIQUE,
u_srp_s varchar NOT NULL,
u_srp_v varchar NOT NULL,
- u_header json NOT NULL,
+ u_header varchar NOT NULL,
u_statistics varchar NOT NULL,
u_authversion varchar NOT NULL,
u_version varchar NOT NULL,
u_lock varchar NOT NULL
);
CREATE TABLE clipperz.therecord (
r_id serial PRIMARY KEY,
u_id integer NOT NULL REFERENCES clipperz.theuser(u_id) ON UPDATE CASCADE ON DELETE CASCADE,
r_ref varchar NOT NULL UNIQUE,
r_data varchar NOT NULL,
r_version varchar NOT NULL,
r_ctime timestamp NOT NULL DEFAULT current_timestamp,
r_mtime timestamp NOT NULL DEFAULT current_timestamp,
r_atime timestamp NOT NULL DEFAULT current_timestamp
);
CREATE INDEX therecord_u_id_key ON clipperz.therecord (u_id);
CREATE TABLE clipperz.therecordversion (
rv_id serial PRIMARY KEY,
r_id integer NOT NULL REFERENCES clipperz.therecord (r_id) ON UPDATE CASCADE ON DELETE CASCADE,
rv_ref varchar NOT NULL UNIQUE,
rv_header varchar,
rv_data varchar NOT NULL,
rv_version varchar NOT NULL,
rv_previous_key varchar NOT NULL,
rv_previous_id varchar,
rv_ctime timestamp NOT NULL DEFAULT current_timestamp,
rv_mtime timestamp NOT NULL DEFAULT current_timestamp,
rv_atime timestamp NOT NULL DEFAULT current_timestamp
);
CREATE TABLE clipperz.otpstatus (
otps_id serial PRIMARY KEY,
otps_code varchar NOT NULL,
otps_name varchar NOT NULL,
otps_desc varchar NOT NULL
);
CREATE TABLE clipperz.theotp (
otp_id serial PRIMARY KEY,
u_id integer REFERENCES clipperz.theuser (u_id) ON UPDATE CASCADE ON DELETE CASCADE,
otps_id integer REFERENCES clipperz.otpstatus (otps_id) ON UPDATE CASCADE ON DELETE CASCADE,
otp_ref varchar NOT NULL UNIQUE,
otp_key varchar NOT NULL UNIQUE,
otp_key_checksum varchar NOT NULL,
otp_data varchar NOT NULL,
otp_version varchar NOT NULL,
otp_ctime timestamp NOT NULL DEFAULT current_timestamp,
otp_rtime timestamp NOT NULL DEFAULT current_timestamp,
otp_utime timestamp NOT NULL DEFAULT current_timestamp
);
CREATE TABLE clipperz.thesession (
s_id varchar PRIMARY KEY,
- s_data json,
+ s_data varchar,
s_ctime timestamp DEFAULT current_timestamp,
s_mtime timestamp DEFAULT current_timestamp
);