RanchiMall/SuperNodeStorage
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Keys module

Browse Source 
- Improved security for node-privkey storage
- Private is stored as encrypted in file (loaded once on startup)
- node private key is stored in encrypted format in memory
- moved myPrivKey, myFloID to keys module
This commit is contained in:
sairajzero 2022-11-29 04:39:33 +05:30
parent b303219d1b
commit 2dc338f90d
4 changed files with 108 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/client.js
View File

@ -1,6 +1,6 @@
var DB, _list; //container for database and _list (stored n serving) var DB, _list; //container for database and _list (stored n serving)
global.INVALID = function(message) { global.INVALID = function (message) {
if (!(this instanceof INVALID)) if (!(this instanceof INVALID))
return new INVALID(message); return new INVALID(message);
this.message = message; this.message = message;
@ -39,7 +39,7 @@ function processIncomingData(data) {
console.debug(result); console.debug(result);
resolve(result); resolve(result);
}).catch(error => { }).catch(error => {
console.debug(error); (error instanceof INVALID ? console.debug : console.error)(error);
reject(error); reject(error);
}); });
}; };

91
src/intra.js
View File

@ -1,5 +1,6 @@
'use strict'; 'use strict';
const WebSocket = require('ws'); const WebSocket = require('ws');
const keys = require('./keys');
//CONSTANTS //CONSTANTS
const SUPERNODE_INDICATOR = '$', const SUPERNODE_INDICATOR = '$',
@ -26,12 +27,12 @@ var DB, refresher; //container for database and refresher
//List of node backups stored //List of node backups stored
const _list = {}; const _list = {};
Object.defineProperty(_list, 'delete', { Object.defineProperty(_list, 'delete', {
value: function(id) { value: function (id) {
delete this[id]; delete this[id];
} }
}); });
Object.defineProperty(_list, 'get', { Object.defineProperty(_list, 'get', {
value: function(keys = null) { value: function (keys = null) {
if (keys === null) keys = Object.keys(this); if (keys === null) keys = Object.keys(this);
if (Array.isArray(keys)) if (Array.isArray(keys))
return Object.fromEntries(keys.map(k => [k, this[k]])); return Object.fromEntries(keys.map(k => [k, this[k]]));
@ -40,12 +41,12 @@ Object.defineProperty(_list, 'get', {
} }
}); });
Object.defineProperty(_list, 'stored', { Object.defineProperty(_list, 'stored', {
get: function() { get: function () {
return Object.keys(this); return Object.keys(this);
} }
}); });
Object.defineProperty(_list, 'serving', { Object.defineProperty(_list, 'serving', {
get: function() { get: function () {
let serveList = []; let serveList = [];
for (let id in this) for (let id in this)
if (this[id] === 0) if (this[id] === 0)
@ -58,7 +59,7 @@ Object.defineProperty(_list, 'serving', {
function NodeContainer() { function NodeContainer() {
var _ws, _id, _onmessage, _onclose; var _ws, _id, _onmessage, _onclose;
Object.defineProperty(this, 'set', { Object.defineProperty(this, 'set', {
value: function(id, ws) { value: function (id, ws) {
if (_ws !== undefined) if (_ws !== undefined)
this.close(); this.close();
_id = id; _id = id;
@ -70,12 +71,12 @@ function NodeContainer() {
} }
}); });
Object.defineProperty(this, 'id', { Object.defineProperty(this, 'id', {
get: function() { get: function () {
return _id; return _id;
} }
}); });
Object.defineProperty(this, 'readyState', { Object.defineProperty(this, 'readyState', {
get: function() { get: function () {
if (_ws instanceof WebSocket) if (_ws instanceof WebSocket)
return _ws.readyState; return _ws.readyState;
else else
@ -83,29 +84,29 @@ function NodeContainer() {
} }
}); });
Object.defineProperty(this, 'send', { Object.defineProperty(this, 'send', {
value: function(packet) { value: function (packet) {
_ws.send(packet); _ws.send(packet);
} }
}); });
Object.defineProperty(this, 'onmessage', { Object.defineProperty(this, 'onmessage', {
set: function(fn) { set: function (fn) {
if (fn instanceof Function) if (fn instanceof Function)
_onmessage = fn; _onmessage = fn;
} }
}); });
Object.defineProperty(this, 'onclose', { Object.defineProperty(this, 'onclose', {
set: function(fn) { set: function (fn) {
if (fn instanceof Function) if (fn instanceof Function)
_onclose = fn; _onclose = fn;
} }
}); });
Object.defineProperty(this, 'is', { Object.defineProperty(this, 'is', {
value: function(ws) { value: function (ws) {
return ws === _ws; return ws === _ws;
} }
}); });
Object.defineProperty(this, 'close', { Object.defineProperty(this, 'close', {
value: function() { value: function () {
if (_ws.readyState === 1) { if (_ws.readyState === 1) {
_ws.onclose = () => console.warn('Closing: ' + _id); _ws.onclose = () => console.warn('Closing: ' + _id);
_ws.close(); _ws.close();
@ -126,17 +127,17 @@ _prevNode.onclose = evt => _prevNode.close();
//Packet processing //Packet processing
const packet_ = {}; const packet_ = {};
packet_.construct = function(message) { packet_.construct = function (message) {
const packet = { const packet = {
from: myFloID, from: keys.node_id,
message: message, message: message,
time: Date.now() time: Date.now()
}; };
packet.sign = floCrypto.signData(this.s(packet), myPrivKey); packet.sign = floCrypto.signData(this.s(packet), keys.node_priv);
return SUPERNODE_INDICATOR + JSON.stringify(packet); return SUPERNODE_INDICATOR + JSON.stringify(packet);
}; };
packet_.s = d => [JSON.stringify(d.message), d.time].join("|"); packet_.s = d => [JSON.stringify(d.message), d.time].join("|");
packet_.parse = function(str) { packet_.parse = function (str) {
try { try {
let packet = JSON.parse(str.substring(SUPERNODE_INDICATOR.length)); let packet = JSON.parse(str.substring(SUPERNODE_INDICATOR.length));
let curTime = Date.now(); let curTime = Date.now();
@ -172,7 +173,7 @@ function connectToActiveNode(snID, reverse = false) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
if (!(snID in floGlobals.supernodes)) if (!(snID in floGlobals.supernodes))
return reject(`${snID} is not a supernode`); return reject(`${snID} is not a supernode`);
if (snID === myFloID) if (snID === keys.node_id)
return reject(`Reached end of circle. Next node avaiable is self`); return reject(`Reached end of circle. Next node avaiable is self`);
connectToNode(snID) connectToNode(snID)
.then(ws => resolve(ws)) .then(ws => resolve(ws))
@ -186,12 +187,12 @@ function connectToActiveNode(snID, reverse = false) {
}; };
//Connect to next available node //Connect to next available node
function connectToNextNode(curNode = myFloID) { function connectToNextNode(curNode = keys.node_id) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
if (curNode === myFloID && !(myFloID in floGlobals.supernodes)) if (curNode === keys.node_id && !(keys.node_id in floGlobals.supernodes))
return reject(`This (${myFloID}) is not a supernode`); return reject(`This (${keys.node_id}) is not a supernode`);
let nextNodeID = cloud.nextNode(curNode); let nextNodeID = cloud.nextNode(curNode);
if (nextNodeID === myFloID) if (nextNodeID === keys.node_id)
return reject("No other node online"); return reject("No other node online");
connectToNode(nextNodeID).then(ws => { connectToNode(nextNodeID).then(ws => {
_nextNode.set(nextNodeID, ws); _nextNode.set(nextNodeID, ws);
@ -209,7 +210,7 @@ function connectToNextNode(curNode = myFloID) {
function connectToAliveNodes(nodes = null) { function connectToAliveNodes(nodes = null) {
if (!Array.isArray(nodes)) nodes = Object.keys(floGlobals.supernodes); if (!Array.isArray(nodes)) nodes = Object.keys(floGlobals.supernodes);
nodes = nodes.filter(n => n !== myFloID); nodes = nodes.filter(n => n !== keys.node_id);
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
Promise.allSettled(nodes.map(n => connectToNode(n))).then(results => { Promise.allSettled(nodes.map(n => connectToNode(n))).then(results => {
let ws_connections = {}; let ws_connections = {};
@ -261,7 +262,7 @@ function processTaskFromNextNode(packet) {
storeBackupData(task.data, from, packet); storeBackupData(task.data, from, packet);
break; break;
default: default:
console.log("Invalid task type:" + task.type + "from next-node"); console.warn("Invalid task type:" + task.type + "from next-node");
}; };
}); });
}; };
@ -299,7 +300,7 @@ function processTaskFromPrevNode(packet) {
deleteMigratedData(task.data, from, packet); deleteMigratedData(task.data, from, packet);
break; break;
default: default:
console.log("Invalid task type:" + task.type + "from prev-node"); console.warn("Invalid task type:" + task.type + "from prev-node");
}; };
}); });
}; };
@ -325,7 +326,7 @@ function processTaskFromSupernode(packet, ws) {
initiateRefresh(); initiateRefresh();
break; break;
default: default:
console.log("Invalid task type:" + task.type + "from super-node"); console.warn("Invalid task type:" + task.type + "from super-node");
}; };
}); });
}; };
@ -336,7 +337,7 @@ function processTaskFromSupernode(packet, ws) {
//Acknowledge handshake //Acknowledge handshake
function handshakeMid(id, ws) { function handshakeMid(id, ws) {
if (_prevNode.id && _prevNode.id in floGlobals.supernodes) { if (_prevNode.id && _prevNode.id in floGlobals.supernodes) {
if (cloud.innerNodes(_prevNode.id, myFloID).includes(id)) { if (cloud.innerNodes(_prevNode.id, keys.node_id).includes(id)) {
//close existing prev-node connection //close existing prev-node connection
_prevNode.send(packet_.construct({ _prevNode.send(packet_.construct({
type: RECONNECT_NEXT_NODE type: RECONNECT_NEXT_NODE
@ -364,7 +365,7 @@ function handshakeMid(id, ws) {
if (!_nextNode.id) if (!_nextNode.id)
reconnectNextNode(); reconnectNextNode();
//Reorder storelist //Reorder storelist
let nodes = cloud.innerNodes(_prevNode.id, myFloID).concat(myFloID), let nodes = cloud.innerNodes(_prevNode.id, keys.node_id).concat(keys.node_id),
req_sync = [], req_sync = [],
new_order = []; new_order = [];
nodes.forEach(n => { nodes.forEach(n => {
@ -384,7 +385,7 @@ function handshakeMid(id, ws) {
handshakeMid.requestData(req_sync, new_order); handshakeMid.requestData(req_sync, new_order);
}; };
handshakeMid.requestData = function(req_sync, new_order) { handshakeMid.requestData = function (req_sync, new_order) {
if (handshakeMid.timeout) { if (handshakeMid.timeout) {
clearTimeout(handshakeMid.timeout); clearTimeout(handshakeMid.timeout);
delete handshakeMid.timeout; delete handshakeMid.timeout;
@ -438,15 +439,15 @@ function reconnectNextNode() {
if (_nextNode.id) if (_nextNode.id)
_nextNode.close(); _nextNode.close();
connectToNextNode() connectToNextNode()
.then(result => console.log(result)) .then(result => console.debug(result))
.catch(error => { .catch(error => {
//Case: No other node is online //Case: No other node is online
console.info(error); console.info(error);
//Serve all nodes //Serve all nodes
for (let sn in floGlobals.supernodes) for (let sn in floGlobals.supernodes)
DB.createTable(sn) DB.createTable(sn)
.then(result => _list[sn] = 0) .then(result => _list[sn] = 0)
.catch(error => console.error(error)); .catch(error => console.error(error));
}); });
}; };
@ -456,13 +457,13 @@ function reconnectNextNode() {
function orderBackup(order) { function orderBackup(order) {
let new_order = [], let new_order = [],
req_sync = []; req_sync = [];
let cur_serve = cloud.innerNodes(_prevNode.id, myFloID).concat(myFloID); let cur_serve = cloud.innerNodes(_prevNode.id, keys.node_id).concat(keys.node_id);
for (let n in order) { for (let n in order) {
if (!cur_serve.includes(n) && order[n] + 1 !== _list[n] && n in floGlobals.supernodes) { if (!cur_serve.includes(n) && order[n] + 1 !== _list[n] && n in floGlobals.supernodes) {
if (order[n] >= floGlobals.sn_config.backupDepth) if (order[n] >= floGlobals.sn_config.backupDepth)
DB.dropTable(n).then(_ => null) DB.dropTable(n).then(_ => null)
.catch(error => console.error(error)) .catch(error => console.error(error))
.finally(_ => _list.delete(n)); .finally(_ => _list.delete(n));
else if (order[n] >= 0) { else if (order[n] >= 0) {
if (_list[n] === undefined) if (_list[n] === undefined)
req_sync.push(n); req_sync.push(n);
@ -477,7 +478,7 @@ function orderBackup(order) {
orderBackup.requestData(req_sync, new_order); orderBackup.requestData(req_sync, new_order);
}; };
orderBackup.requestData = function(req_sync, new_order) { orderBackup.requestData = function (req_sync, new_order) {
Promise.allSettled(req_sync.map(n => DB.createGetLastLog(n))).then(result => { Promise.allSettled(req_sync.map(n => DB.createGetLastLog(n))).then(result => {
let let
lastlogs = {}, lastlogs = {},
@ -522,13 +523,13 @@ function sendStoredData(lastlogs, node) {
id: n, id: n,
status: true status: true
})); }));
console.log(`START: ${n} data sync(send) to ${node.id}`); console.info(`START: ${n} data sync(send) to ${node.id}`);
//TODO: efficiently handle large number of data instead of loading all into memory //TODO: efficiently handle large number of data instead of loading all into memory
result.forEach(d => node.send(packet_.construct({ result.forEach(d => node.send(packet_.construct({
type: STORE_BACKUP_DATA, type: STORE_BACKUP_DATA,
data: d data: d
}))); })));
console.log(`END: ${n} data sync(send) to ${node.id}`); console.info(`END: ${n} data sync(send) to ${node.id}`);
node.send(packet_.construct({ node.send(packet_.construct({
type: DATA_SYNC, type: DATA_SYNC,
id: n, id: n,
@ -541,7 +542,7 @@ function sendStoredData(lastlogs, node) {
//Indicate sync of data //Indicate sync of data
function dataSyncIndication(snID, status, from) { function dataSyncIndication(snID, status, from) {
console.log(`${status ? 'START':'END'}: ${snID} data sync(receive) form ${from}`); console.info(`${status ? 'START' : 'END'}: ${snID} data sync(receive) form ${from}`);
}; };
//Store (backup) data //Store (backup) data
@ -633,7 +634,7 @@ function dataMigration(node_change, flag) {
if (del_nodes.includes(_nextNode.id)) if (del_nodes.includes(_nextNode.id))
reconnectNextNode(); reconnectNextNode();
else { //reconnect next node if there are newly added nodes in between self and current next node else { //reconnect next node if there are newly added nodes in between self and current next node
let innerNodes = cloud.innerNodes(myFloID, _nextNode.id); let innerNodes = cloud.innerNodes(keys.node_id, _nextNode.id);
if (new_nodes.filter(n => innerNodes.includes(n)).length) if (new_nodes.filter(n => innerNodes.includes(n)).length)
reconnectNextNode(); reconnectNextNode();
}; };
@ -654,17 +655,17 @@ function dataMigration(node_change, flag) {
}; };
//data migration sub-process: Deleted nodes //data migration sub-process: Deleted nodes
dataMigration.process_del = async function(del_nodes, old_kb) { dataMigration.process_del = async function (del_nodes, old_kb) {
if (!del_nodes.length) if (!del_nodes.length)
return; return;
let serve = _prevNode.id ? old_kb.innerNodes(_prevNode.id, myFloID) : _list.serving; let serve = _prevNode.id ? old_kb.innerNodes(_prevNode.id, keys.node_id) : _list.serving;
let process_nodes = del_nodes.filter(n => serve.includes(n)); let process_nodes = del_nodes.filter(n => serve.includes(n));
if (process_nodes.length) { if (process_nodes.length) {
connectToAllActiveNodes().then(ws_connections => { connectToAllActiveNodes().then(ws_connections => {
let remaining = process_nodes.length; let remaining = process_nodes.length;
process_nodes.forEach(n => { process_nodes.forEach(n => {
DB.readAllData(n, 0).then(result => { DB.readAllData(n, 0).then(result => {
console.log(`START: Data migration for ${n}`); console.info(`START: Data migration for ${n}`);
//TODO: efficiently handle large number of data instead of loading all into memory //TODO: efficiently handle large number of data instead of loading all into memory
result.forEach(d => { result.forEach(d => {
let closest = cloud.closestNode(d.receiverID); let closest = cloud.closestNode(d.receiverID);
@ -681,7 +682,7 @@ dataMigration.process_del = async function(del_nodes, old_kb) {
data: d data: d
})); }));
}); });
console.log(`END: Data migration for ${n}`); console.info(`END: Data migration for ${n}`);
_list.delete(n); _list.delete(n);
DB.dropTable(n).then(_ => null).catch(e => console.error(e)); DB.dropTable(n).then(_ => null).catch(e => console.error(e));
remaining--; remaining--;
@ -706,7 +707,7 @@ dataMigration.process_del = async function(del_nodes, old_kb) {
}; };
//data migration sub-process: Added nodes //data migration sub-process: Added nodes
dataMigration.process_new = async function(new_nodes) { dataMigration.process_new = async function (new_nodes) {
if (!new_nodes.length) if (!new_nodes.length)
return; return;
connectToAllActiveNodes(new_nodes).then(ws_connections => { connectToAllActiveNodes(new_nodes).then(ws_connections => {
@ -756,7 +757,7 @@ dataMigration.process_new = async function(new_nodes) {
}); });
}; };
dataMigration.intimateAllNodes = function() { dataMigration.intimateAllNodes = function () {
connectToAliveNodes().then(ws_connections => { connectToAliveNodes().then(ws_connections => {
let packet = packet_.construct({ let packet = packet_.construct({
type: INITIATE_REFRESH type: INITIATE_REFRESH

37
src/keys.js Normal file
View File

@ -0,0 +1,37 @@
'use strict';
const PRIV_EKEY_MIN = 32,
PRIV_EKEY_MAX = 48;
var node_priv, e_key, node_id, node_pub; //containers for node-key wrapper
const _ = {
get node_priv() {
if (!node_priv || !e_key)
throw Error("keys not set");
return Crypto.AES.decrypt(node_priv, e_key);
},
set node_priv(key) {
node_pub = floCrypto.getPubKeyHex(key);
node_id = floCrypto.getFloID(node_pub);
if (!key || !node_pub || !node_id)
throw Error("Invalid Keys");
let n = floCrypto.randInt(PRIV_EKEY_MIN, PRIV_EKEY_MAX)
e_key = floCrypto.randString(n);
node_priv = Crypto.AES.encrypt(key, e_key);
}
}
module.exports = {
set node_priv(key) {
_.node_priv = key;
},
get node_priv() {
return _.node_priv;
},
get node_id() {
return node_id;
},
get node_pub() {
return node_pub;
}
}

30
src/main.js
View File

@ -1,4 +1,3 @@
const config = require('../args/config.json');
global.floGlobals = require("./floGlobals"); global.floGlobals = require("./floGlobals");
require('./set_globals'); require('./set_globals');
require('./lib'); require('./lib');
@ -9,16 +8,33 @@ const Database = require("./database");
const intra = require('./intra'); const intra = require('./intra');
const client = require('./client'); const client = require('./client');
const Server = require('./server'); const Server = require('./server');
const keys = require("./keys");
var DB; //Container for Database object var DB; //Container for Database object
const INTERVAL_REFRESH_TIME = 1 * 60 * 60 * 1000; //1 hr const INTERVAL_REFRESH_TIME = 1 * 60 * 60 * 1000; //1 hr
function startNode() { function startNode() {
//Set myPrivKey, myPubKey, myFloID
global.myPrivKey = config["privateKey"]; const config = require(`../args/config.json`);
global.myPubKey = floCrypto.getPubKeyHex(config["privateKey"]); let _pass;
global.myFloID = floCrypto.getFloID(config["privateKey"]); for (let arg of process.argv)
console.info("Logged In as " + myFloID); if (/^-password=/i.test(arg))
_pass = arg.split(/=(.*)/s)[1];
try {
let _tmp = require(`../args/keys.json`);
_tmp = floCrypto.retrieveShamirSecret(_tmp);
if (!_pass) {
console.error('Password not entered!');
process.exit(1);
}
keys.node_priv = Crypto.AES.decrypt(_tmp, _pass);
} catch (error) {
console.error('Unable to load private key!');
process.exit(1);
}
console.info("Logged in as", keys.node_id);
//DB connect //DB connect
Database(config["sql_user"], config["sql_pwd"], config["sql_db"], config["sql_host"]).then(db => { Database(config["sql_user"], config["sql_pwd"], config["sql_db"], config["sql_host"]).then(db => {
console.info("Connected to Database"); console.info("Connected to Database");
@ -233,7 +249,7 @@ function diskCleanUp(base) {
if (failed.length) { if (failed.length) {
console.error(JSON.stringify(failed)); console.error(JSON.stringify(failed));
let success = results.length - failed.length; let success = results.length - failed.length;
reject(`Disk clean-up process has failed at ${100 * success/results.length}%. (Success:${success}|Failed:${failed.count})`); reject(`Disk clean-up process has failed at ${100 * success / results.length}%. (Success:${success}|Failed:${failed.count})`);
} else } else
resolve("Disk clean-up process finished successfully (100%)"); resolve("Disk clean-up process finished successfully (100%)");
}).catch(error => reject(error)); }).catch(error => reject(error));