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
@@ -14,35 +14,37 @@ var LOGGER = BUNYAN.createLogger({
 
 
 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,20 +1,51 @@
 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) {
@@ -73,13 +104,13 @@ var CLIPPERZ = module.exports = function(CONFIG) {
         });
    });
   }
  };
 
 
- 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}) };
@@ -529,9 +560,13 @@ var CLIPPERZ = module.exports = function(CONFIG) {
       "_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
@@ -55,6 +55,13 @@ CREATE TABLE clipperz.theotp (
  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
+);