| -rw-r--r-- | backend/node/src/clipperz.js | 20 | ||||
| -rw-r--r-- | backend/node/src/clipperz.schema.sql | 4 |
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 @@ -9,34 +9,36 @@ 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; @@ -217,25 +219,25 @@ var CLIPPERZ = module.exports = function(CONFIG) { 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},{})); }); @@ -493,25 +495,25 @@ var CLIPPERZ = module.exports = function(CONFIG) { 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( 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,20 +1,20 @@ 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, @@ -52,16 +52,16 @@ CREATE TABLE clipperz.theotp ( 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 ); |