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/app.js20
-rw-r--r--backend/node/src/clipperz.js37
-rw-r--r--backend/node/src/clipperz.schema.sql7
3 files changed, 54 insertions, 10 deletions
diff --git a/backend/node/src/app.js b/backend/node/src/app.js
index d4d60c2..61c2c72 100644
--- a/backend/node/src/app.js
+++ b/backend/node/src/app.js
@@ -1,49 +1,51 @@
var BUNYAN = require('bunyan');
var LOGGER = BUNYAN.createLogger({
name: 'clipperz',
streams: [
{ name: "console", stream:process.stderr,level:'trace'}
],
serializers: {
req: BUNYAN.stdSerializers.req,
res: BUNYAN.stdSerializers.res,
err: BUNYAN.stdSerializers.err
},
src: true
});
var EXPRESS = require('express');
var HTTP = require('http');
var PATH = require('path');
+
+var CLIPPERZ = require('./clipperz');
+var CONF = require('./conf');
+var clipperz = CLIPPERZ({
+ psql: CONF.psql||'postgresql:///clipperz',
+ logger: LOGGER,
+ dump_template: PATH.join(__dirname,'htdocs/beta/index.html')
+});
+
+
var app = EXPRESS();
app.set('port', process.env.PORT || 3000);
app.use(EXPRESS.logger('dev'));
app.use(EXPRESS.urlencoded());
app.use(EXPRESS.methodOverride());
app.use(EXPRESS.cookieParser('your secret here'));
-app.use(EXPRESS.session());
+app.use(EXPRESS.session({secret:'99 little bugs in the code', key:'sid', store: clipperz.session_store() }));
app.use(app.router);
app.use(EXPRESS.static(PATH.join(__dirname, 'htdocs/')));
if ('development' == app.get('env')) {
app.use(EXPRESS.errorHandler());
}
-var CLIPPERZ = require('./clipperz');
-var CONF = require('./conf');
-var clipperz = CLIPPERZ({
- psql: CONF.psql||'postgresql:///clipperz',
- logger: LOGGER,
- dump_template: PATH.join(__dirname,'htdocs/beta/index.html')
-});
-
app.post('/json',clipperz.json);
app.get('/beta/dump',clipperz.dump);
HTTP.createServer(app).listen(app.get('port'), function(){
LOGGER.info({port:app.get('port')},"Listener established");
});
diff --git a/backend/node/src/clipperz.js b/backend/node/src/clipperz.js
index eebd5bf..73af0a0 100644
--- a/backend/node/src/clipperz.js
+++ b/backend/node/src/clipperz.js
@@ -1,127 +1,158 @@
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); }
+ ) };
+ 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) {
+ 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);
+ }
+ ) };
+ 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},"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) {
LOGGER.trace({query:q,args:a},'SQL: %s',q);
if(this.over) return cb(new Error('game over'));
if('function'===typeof a) cb=a,a=[];
var t0=new Date();
C.query(q,a,function(e,r) {
var t1=new Date(), dt=t1-t0;
LOGGER.trace({query:q,args:a,ms:dt,rows:r&&r.rowCount},"SQL query '%s' took %dms",q,dt);
cb(e,r);
});
},
commit: function(cb) {
LOGGER.trace('SQL: commit');
if(this.over) return cb(new Error('game over'));
return (this.over=true),C.query('COMMIT',function(e){D();cb&&cb(e)});
},
rollback: function(cb) {
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 {
+ var rv = {
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"
@@ -487,51 +518,55 @@ var CLIPPERZ = module.exports = function(CONFIG) {
"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*/',
"_clipperz_dump_data_="+JSON.stringify(ojs)
+";"
+"Clipperz.PM.Proxy.defaultProxy = new Clipperz.PM.Proxy.Offline();"
+"Clipperz.Crypto.PRNG.defaultRandomGenerator().fastEntropyAccumulationForTestingPurpose();"));
});
}
+
};
+ rv.__defineGetter__('session_store',function(){ return function(o) { return new (clipperz_store(PG))(o) } });
+
+ return rv;
};
diff --git a/backend/node/src/clipperz.schema.sql b/backend/node/src/clipperz.schema.sql
index ba6f482..1c2305c 100644
--- a/backend/node/src/clipperz.schema.sql
+++ b/backend/node/src/clipperz.schema.sql
@@ -13,48 +13,55 @@ CREATE TABLE clipperz.theuser (
);
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_ctime timestamp DEFAULT current_timestamp,
+ s_mtime timestamp DEFAULT current_timestamp
+);