embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(@embark/blockchain_process): ignore socket disconnect bytes 

Ignore the sequence of bytes `03:ef:bf:bd` that are sent between
Chrome/Firefox (others?) and the node process when a browser connected via
websocket to the blockchain proxy is closed/reloaded. The theory is that
sequence is part of a socket control frame that is leaking to `parseJsonMaybe`
from `http-proxy-middleware`.
This commit is contained in:
Michael Bradley, Jr 2018-12-02 16:14:15 -06:00
parent 647f0ea478
commit 1fac39197f
1 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/lib/modules/blockchain_process/proxy.js
View File

@ -1,4 +1,4 @@
/* global __ exports require */
/* global Buffer __ exports require */
const Asm = require('stream-json/Assembler');
const {canonicalHost, defaultHost} = require('../../utils/host');
@ -13,16 +13,30 @@ const utils = require('../../utils/utils');
const WebSocket = require('ws');
const WsParser = require('simples/lib/parsers/ws');
const hex = (n) => {
let _n = n.toString(16);
return _n.length === 1 ? '0' + _n : _n;
};
const parseJsonMaybe = (string) => {
let object;
try {
if (string && typeof string === 'string') object = JSON.parse(string);
} catch (e) {
console.error('Error parsing string as JSON', string);
} finally {
// eslint-disable-next-line no-unsafe-finally
return object;
if (typeof string === 'string') {
if (string) {
try {
object = JSON.parse(string);
} catch(e) {
if (Array.from(Buffer.from(string)).map(hex).join(':') !==
'03:ef:bf:bd') {
console.error(`Proxy: Error parsing string as JSON '${string}'`);
}
}
} else {
console.error('Proxy: Expected a non-empty string');
}
} else {
console.error(`Proxy: Expected a string but got type '${typeof string}'`);
}
return object;
};
exports.serve = async (ipc, host, port, ws, origin) => {
@ -46,7 +60,9 @@ exports.serve = async (ipc, host, port, ws, origin) => {
}
}
} catch (e) {
console.error('Error tracking request message', JSON.stringify(req));
console.error(
`Proxy: Error tracking request message '${JSON.stringify(req)}'`,
);
}
};
@ -80,7 +96,9 @@ exports.serve = async (ipc, host, port, ws, origin) => {
delete receipts[res.id];
}
} catch (e) {
console.error('Error tracking response message', JSON.stringify(res));
console.error(
`Proxy: Error tracking response message '${JSON.stringify(res)}'`
);
}
};
@ -111,7 +129,7 @@ exports.serve = async (ipc, host, port, ws, origin) => {
onError(err, _req, _res) {
console.error(
__('Error forwarding requests to blockchain/simulator'),
__('Proxy: Error forwarding requests to blockchain/simulator'),
err.message
);
},