Skip to content

Protect against broken JSON packets #167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tshemsedinov wants to merge 2 commits into from
Closed

Protect against broken JSON packets #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ab2bd1
Protect against broken JSON packets
tshemsedinov Jul 22, 2020
f937ba4
Improve test: handle broken JSON packets
tshemsedinov Jul 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions lib/client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,15 @@ class Client {
}

message(data) {
const packet = JSON.parse(data);
const [callType, methodName] = Object.keys(packet);
const callId = packet[callType];
const args = packet[methodName];
this.rpc(callId, methodName, args);
try {
const packet = JSON.parse(data);
const [callType, methodName] = Object.keys(packet);
const callId = packet[callType];
const args = packet[methodName];
this.rpc(callId, methodName, args);
} catch (err) {
application.logger.error(err.message);
}
}

async rpc(callId, method, args) {
Expand Down
9 changes: 5 additions & 4 deletions test/system.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ setTimeout(async () => {
worker.postMessage({ name: 'stop' });
}, TEST_TIMEOUT);

worker.on('exit', () => {
console.log('System test finished');
worker.on('exit', code => {
console.log(`System test finished with code ${code}`);
});

const tasks = [
Expand Down Expand Up @@ -64,11 +64,12 @@ setTimeout(() => {
const req = http.request(request);
req.on('response', res => {
const expectedStatus = task.status || 200;
assert.equal(res.statusCode, expectedStatus);
setTimeout(() => {
assert.equal(res.statusCode, expectedStatus);
}, TEST_TIMEOUT);
});
req.on('error', err => {
console.log(err.stack);
process.exit(1);
});
if (task.data) req.write(task.data);
req.end();
Expand Down