summaryrefslogtreecommitdiff
path: root/backend
authorMichael Krelin <hacker@klever.net>2013-11-27 17:11:26 (UTC)
committer Michael Krelin <hacker@klever.net>2013-11-27 17:11:26 (UTC)
commit0f1cc2ac41835ee8fa5dded1593fa95092b54bbe (patch) (side-by-side diff)
tree8563cd1578aad126c803be452dedd3b9dd9e0921 /backend
parentb59defff1efe85e43850243910007dd1fe3a4ef2 (diff)
downloadclipperz-0f1cc2ac41835ee8fa5dded1593fa95092b54bbe.zip
clipperz-0f1cc2ac41835ee8fa5dded1593fa95092b54bbe.tar.gz
clipperz-0f1cc2ac41835ee8fa5dded1593fa95092b54bbe.tar.bz2
switched postgresql schema from json type to plaintext
Diffstat (limited to 'backend') (more/less context) (show whitespace changes)
-rw-r--r--backend/node/src/clipperz.js18
-rw-r--r--backend/node/src/clipperz.schema.sql4
2 files changed, 12 insertions, 10 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
@@ -15,22 +15,24 @@ 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); }
+ 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(
+ 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",[data,sid], function(e,r) {
+ +" 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);
@@ -223,13 +225,13 @@ var CLIPPERZ = module.exports = function(CONFIG) {
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]);
});
},
@@ -499,13 +501,13 @@ var CLIPPERZ = module.exports = function(CONFIG) {
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,
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
@@ -2,13 +2,13 @@ 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
);
@@ -58,10 +58,10 @@ CREATE TABLE clipperz.theotp (
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
);