Merge branch 'master' into multiple-postcards-same-address-#168

web-dapp/app.js

@@ -4,6 +4,7 @@ const express = require('express');
 const path = require('path');
 const bodyParser = require('body-parser');
 const helmet = require('helmet');
+const config = require('./server-config');
 
 const app = express();
 
@@ -17,11 +18,11 @@ app.use('/help', express.static(path.join(__dirname, 'build')));
 app.use('/my-addresses', express.static(path.join(__dirname, 'build')));
 
 // api
-app.use(bodyParser.urlencoded({ extended: true }));
-app.use(bodyParser.json());
+app.use(bodyParser.urlencoded({ extended: true, limit: config.bodySizeLimit }));
+app.use(bodyParser.json({ limit: config.bodySizeLimit }));
 
 const routes = require('./routes')({});
 app.use('/api', routes);
 app.use('/confirm/api', routes);
 
-module.exports = app;
+module.exports = app;

web-dapp/controllers/notifyRegTx.js

@@ -161,6 +161,11 @@ const validateTx = (txId, sha3cc) => {
         });
 };
 
+const unlockSession = (sessionKey, prelog) => {
+    logger.log(`${prelog} unlocking session: ${sessionKey}`);
+    return db.unlock(sessionKey);
+};
+
 module.exports = {
     validateData,
     normalizeData,
@@ -170,4 +175,5 @@ module.exports = {
     createPostCard,
     removeUsedSessionKey,
     validateTx,
+    unlockSession,
 };

web-dapp/routes/notify_reg_tx.js

@@ -48,7 +48,15 @@ module.exports = () => {
             })
             .catch(error => {
                 logger.error(`${prelog} ${error.msg}`);
-                return sendResponse(res, { ok: false, err: error.msg });
+                return notifyRegTxController
+                    .unlockSession(sessionKey, prelog)
+                    .then(
+                        () => {},
+                        () => logger.error(`${prelog} Could not unlock key ${sessionKey}`)
+                    )
+                    .then(() => {
+                        return sendResponse(res, { ok: false, err: error.msg });
+                    });
             });
     });
 

web-dapp/server-config.js

@@ -14,6 +14,7 @@ var cfg = {
         type: 'memory',
         params: {},
     },
+    bodySizeLimit: '3kb',
 
     rpc: 'http://localhost:8545',
 

web-dapp/server-lib/req_id.js

@@ -16,9 +16,6 @@ function req_id(req, res, next) {
     req.x_id = rnd_alphanum(config.reqIdLength);
     var ip = req.headers && req.headers['x-forwarded-for'];
     if (ip) {
-        if ( ip && (ip.indexOf(':') >= 0) && (ip.split(':').length - 1 === 1) ) {
-            ip = (ip.split(':'))[0];
-        }
         if ( ip && (ip.indexOf(',') >= 0) ) {
             var IPa = ip.split(',');
             if ( IPa[0].startsWith('192.168.') || IPa[0].startsWith('10.') || IPa[0].startsWith('192.0.0.') || IPa[0] === 'unknown' ) {
@@ -28,6 +25,9 @@ function req_id(req, res, next) {
                 ip = IPa[0];
             }
         }
+        if ( ip && (ip.indexOf(':') >= 0) && (ip.split(':').length - 1 === 1) ) {
+            ip = (ip.split(':'))[0];
+        }
         if (ip) {
             req.x_ip = ip;
         }

web-dapp/server-lib/session-stores/memory.js

@@ -25,6 +25,11 @@ module.exports = function () {
                 return resolve(db[k1(k)]);
             });
         },
+        unlock: (k) => {
+            db[k] = db[k1(k)];
+            delete db[k1(k)];
+            return Promise.resolve();
+        },
         unset: (k) => {
             delete db[k1(k)];
             return new Promise((resolve) => {

web-dapp/server-lib/session-stores/redis.js

@@ -4,9 +4,20 @@ const logger = require('../logger');
 const redis = require('redis'); // https://github.com/NodeRedis/node_redis
 
 const prelog = '[redis]';
+const lockedPrefix = 'locked';
 
 function k1(k) {
-    return `locked:${k}`;
+    return `${lockedPrefix}:${k}`;
+}
+
+function unlock(client, k) {
+    return new Promise((resolve, reject) => {
+        client.rename(k1(k), k, (err, res) => {
+            if (err) return reject(err);
+
+            resolve(res);
+        });
+    });
 }
 
 module.exports = function () {
@@ -30,6 +41,20 @@ module.exports = function () {
         logger.error(`${prelog} connection closed`);
     });
 
+    client.keys(`${lockedPrefix}:*`, (err, keys) => {
+        if (err) {
+            logger.error('Could not get keys to unlock');
+            return;
+        }
+
+        keys.forEach((key) => {
+            unlock(client, key.replace(`${lockedPrefix}:`, ''))
+                .catch((e) => {
+                    logger.error(`Could not unlock key ${key}`, e);
+                });
+        });
+    });
+
     return {
         set: function (k, v) {
             return new Promise((resolve) => {
@@ -55,6 +80,9 @@ module.exports = function () {
                 });
             });
         },
+        unlock: (k) => {
+            return unlock(client, k);
+        },
         get: (k) => {
             return new Promise((resolve, reject) => {
                 client.get(k, (err, v) => {

web-dapp/test/server/notify_reg_tx.spec.js

@@ -34,6 +34,7 @@ jest.mock('../../controllers/notifyRegTx', () => ({
     createPostCard: jest.fn(() => Promise.resolve({ postcard: 'PostCard' })),
     removeUsedSessionKey: jest.fn(() => Promise.resolve({ ok: true, result: { postcard: 'PostCard' } })),
     validateTx: jest.fn(() => Promise.resolve()),
+    unlockSession: jest.fn(() => Promise.resolve()),
 }));
 
 describe('notify_reg_tx', () => {