summaryrefslogtreecommitdiff
authorMichael Krelin <hacker@klever.net>2014-06-29 19:56:49 (UTC)
committer Michael Krelin <hacker@klever.net>2014-06-29 20:48:23 (UTC)
commitd21898d430781387bc128f83e6f8aead1149a4e5 (patch) (unidiff)
tree15809c4544128bd8a5723cdf96f2b066928edcba
parenta90f522c1e06149420a14100f34b252d7b1119c4 (diff)
downloadclipperz-d21898d430781387bc128f83e6f8aead1149a4e5.zip
clipperz-d21898d430781387bc128f83e6f8aead1149a4e5.tar.gz
clipperz-d21898d430781387bc128f83e6f8aead1149a4e5.tar.bz2
fix a typo in session store implementation
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--backend/node/src/clipperz.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/backend/node/src/clipperz.js b/backend/node/src/clipperz.js
index c51b0bc..5b4df0a 100644
--- a/backend/node/src/clipperz.js
+++ b/backend/node/src/clipperz.js
@@ -1,89 +1,89 @@
1var FS = require('fs'); 1var FS = require('fs');
2var CRYPTO = require('crypto'); 2var CRYPTO = require('crypto');
3var BIGNUM = require('bignum'); 3var BIGNUM = require('bignum');
4var ASYNC = require('async'); 4var ASYNC = require('async');
5 5
6var express_store = require('express-session').Store; 6var express_store = require('express-session').Store;
7 7
8function clipperz_hash(v) { 8function clipperz_hash(v) {
9 return CRYPTO.createHash('sha256').update( 9 return CRYPTO.createHash('sha256').update(
10 CRYPTO.createHash('sha256').update(v).digest('binary') 10 CRYPTO.createHash('sha256').update(v).digest('binary')
11 ).digest('hex'); 11 ).digest('hex');
12}; 12};
13function clipperz_random() { 13function clipperz_random() {
14 for(var r = '';r.length<64;r+=''+BIGNUM(Math.floor(Math.random()*1e18)).toString(16)); 14 for(var r = '';r.length<64;r+=''+BIGNUM(Math.floor(Math.random()*1e18)).toString(16));
15 return r.substr(0,64); 15 return r.substr(0,64);
16}; 16};
17function clipperz_store(PG) { 17function clipperz_store(PG) {
18 var rv = function(o) { express_store.call(this,o); } 18 var rv = function(o) { express_store.call(this,o); }
19 rv.prototype.get = function(sid,cb) { PG.Q( 19 rv.prototype.get = function(sid,cb) { PG.Q(
20 "SELECT s_data FROM clipperz.thesession WHERE s_id=$1",[sid], 20 "SELECT s_data FROM clipperz.thesession WHERE s_id=$1",[sid],
21 function(e,r) { cb(e,(e||!r.rowCount)?null:JSON.parse(r.rows[0].s_data)); } 21 function(e,r) { cb(e,(e||!r.rowCount)?null:JSON.parse(r.rows[0].s_data)); }
22 ) }; 22 ) };
23 rv.prototype.set = function(sid,data,cb) { 23 rv.prototype.set = function(sid,data,cb) {
24 var d = JSON.stringify(data); 24 var d = JSON.stringify(data);
25 PG.Q( 25 PG.Q(
26 "UPDATE clipperz.thesession SET s_data=$1, s_mtime=current_timestamp" 26 "UPDATE clipperz.thesession SET s_data=$1, s_mtime=current_timestamp"
27 +" WHERE s_id=$2",[d,sid], function(e,r) { 27 +" WHERE s_id=$2",[d,sid], function(e,r) {
28 if(e) return cb(e); 28 if(e) return cb(e);
29 if(r.rowCount) return cb(); 29 if(r.rowCount) return cb();
30 PG.Q("INSERT INTO clipperz.thesession (s_id,s_data) VALUES ($1,$2)",[sid,d],cb); 30 PG.Q("INSERT INTO clipperz.thesession (s_id,s_data) VALUES ($1,$2)",[sid,d],cb);
31 }); 31 });
32 }; 32 };
33 rv.prototype.destroy = function(sid,cb) { PG.Q( 33 rv.prototype.destroy = function(sid,cb) { PG.Q(
34 "DELETE FROM clipperz.thesession WHERE s_id=$1",[sid],cb 34 "DELETE FROM clipperz.thesession WHERE s_id=$1",[sid],cb
35 ) }; 35 ) };
36 rv.prototype.length = function(cb) { PG.Q( 36 rv.prototype.length = function(cb) { PG.Q(
37 "SELECT count(*) AS c FROM clipperz.thesession", function(e,r) { 37 "SELECT count(*) AS c FROM clipperz.thesession", function(e,r) {
38 cb(e,e?null:r.rows[0].c); 38 cb(e,e?null:r.rows[0].c);
39 } 39 }
40 ) }; 40 ) };
41 rv.prototype.length = function(cb) { PQ.Q( 41 rv.prototype.clear = function(cb) { PQ.Q(
42 "DELETE FROM clipperz.thesession", cb 42 "DELETE FROM clipperz.thesession", cb
43 ) }; 43 ) };
44 rv.prototype.__proto__ = express_store.prototype; 44 rv.prototype.__proto__ = express_store.prototype;
45 return rv; 45 return rv;
46} 46}
47 47
48var srp_g = BIGNUM(2); 48var srp_g = BIGNUM(2);
49var srp_n = BIGNUM("115b8b692e0e045692cf280b436735c77a5a9e8a9e7ed56c965f87db5b2a2ece3",16); 49var srp_n = BIGNUM("115b8b692e0e045692cf280b436735c77a5a9e8a9e7ed56c965f87db5b2a2ece3",16);
50var n123 = '112233445566778899aabbccddeeff00112233445566778899aabbccddeeff00'; 50var n123 = '112233445566778899aabbccddeeff00112233445566778899aabbccddeeff00';
51 51
52 52
53var CLIPPERZ = module.exports = function(CONFIG) { 53var CLIPPERZ = module.exports = function(CONFIG) {
54 54
55 var LOGGER = CONFIG.logger||{trace:function(){}}; 55 var LOGGER = CONFIG.logger||{trace:function(){}};
56 56
57 var PG = { 57 var PG = {
58 url: CONFIG.psql, 58 url: CONFIG.psql,
59 PG: require('pg').native, 59 PG: require('pg').native,
60 Q: function(q,a,cb) { 60 Q: function(q,a,cb) {
61 if('function'===typeof a) cb=a,a=[]; 61 if('function'===typeof a) cb=a,a=[];
62 LOGGER.trace({query:q,args:a},'SQL: %s',q); 62 LOGGER.trace({query:q,args:a},'SQL: %s',q);
63 PG.PG.connect(PG.url,function(e,C,D) { 63 PG.PG.connect(PG.url,function(e,C,D) {
64 if(e) return cb(e); 64 if(e) return cb(e);
65 var t0=new Date(); 65 var t0=new Date();
66 C.query(q,a,function(e,r) { 66 C.query(q,a,function(e,r) {
67 var t1=new Date(), dt=t1-t0; 67 var t1=new Date(), dt=t1-t0;
68 D(); 68 D();
69 LOGGER.trace({query:q,args:a,ms:dt,rows:r&&r.rowCount,err:e},"SQL query '%s' took %dms",q,dt); 69 LOGGER.trace({query:q,args:a,ms:dt,rows:r&&r.rowCount,err:e},"SQL query '%s' took %dms",q,dt);
70 cb(e,r); 70 cb(e,r);
71 }); 71 });
72 }); 72 });
73 }, 73 },
74 T: function(cb) { 74 T: function(cb) {
75 PG.PG.connect(PG.url,function(e,C,D) { 75 PG.PG.connect(PG.url,function(e,C,D) {
76 if(e) return cb(e); 76 if(e) return cb(e);
77 C.query('BEGIN',function(e){ 77 C.query('BEGIN',function(e){
78 if(e) return D(),cb(e); 78 if(e) return D(),cb(e);
79 LOGGER.trace('SQL: transaction begun'); 79 LOGGER.trace('SQL: transaction begun');
80 cb(null,{ 80 cb(null,{
81 Q: function(q,a,cb) { 81 Q: function(q,a,cb) {
82 LOGGER.trace({query:q,args:a},'SQL: %s',q); 82 LOGGER.trace({query:q,args:a},'SQL: %s',q);
83 if(this.over) return cb(new Error('game over')); 83 if(this.over) return cb(new Error('game over'));
84 if('function'===typeof a) cb=a,a=[]; 84 if('function'===typeof a) cb=a,a=[];
85 var t0=new Date(); 85 var t0=new Date();
86 C.query(q,a,function(e,r) { 86 C.query(q,a,function(e,r) {
87 var t1=new Date(), dt=t1-t0; 87 var t1=new Date(), dt=t1-t0;
88 LOGGER.trace({query:q,args:a,ms:dt,rows:r&&r.rowCount,err:e},"SQL query '%s' took %dms",q,dt); 88 LOGGER.trace({query:q,args:a,ms:dt,rows:r&&r.rowCount,err:e},"SQL query '%s' took %dms",q,dt);
89 cb(e,r); 89 cb(e,r);