summaryrefslogtreecommitdiff
authorMichael Krelin <hacker@klever.net>2013-11-25 20:52:38 (UTC)
committer Michael Krelin <hacker@klever.net>2013-11-25 20:52:38 (UTC)
commit352f2216eec032efce4bdeddd2ffe5a9e326a99d (patch) (side-by-side diff)
tree902272eaff4d42c0e732cc446baa3b5958cfae73
parentc79ee694f71f787e896fe3f954316723ef0f5544 (diff)
downloadclipperz-352f2216eec032efce4bdeddd2ffe5a9e326a99d.zip
clipperz-352f2216eec032efce4bdeddd2ffe5a9e326a99d.tar.gz
clipperz-352f2216eec032efce4bdeddd2ffe5a9e326a99d.tar.bz2
postgresql-based clipperz own session store
the use thereof is not mandatory, but may come in handy for the standalone deployment
Diffstat (more/less context) (show 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
@@ -18,4 +18,14 @@ 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();
@@ -25,5 +35,5 @@ 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/')));
@@ -33,12 +43,4 @@ if ('development' == app.get('env')) {
-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);
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
@@ -4,4 +4,6 @@ var BIGNUM = require('bignum');
var ASYNC = require('async');
+var express_store = require('express').session.Store;
+
function clipperz_hash(v) {
return CRYPTO.createHash('sha256').update(
@@ -13,4 +15,33 @@ function clipperz_random() {
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);
@@ -77,5 +108,5 @@ var CLIPPERZ = module.exports = function(CONFIG) {
- return {
+ var rv = {
json: function clipperz_json(req,res,cb) {
@@ -533,5 +564,9 @@ var CLIPPERZ = module.exports = function(CONFIG) {
});
}
+
};
+ 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
@@ -59,2 +59,9 @@ CREATE TABLE clipperz.theotp (
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
+);