Skip to content

fix: do not crash on invalid gzip request bodies #2014

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

Open
00200200 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: do not crash on invalid gzip request bodies #2014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 9 additions & 1 deletion lib/plugins/bodyReader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ function createBodyWriter(req) {
*
* @public
* @function bodyReader
* @throws {BadDigestError | PayloadTooLargeError}
* @throws {BadDigestError | PayloadTooLargeError | InvalidContentError}
* @param {Object} options - an options object
* @returns {Function} Handler
*/
Expand Down Expand Up @@ -155,6 +155,14 @@ function bodyReader(options) {
gz = zlib.createGunzip();
gz.on('data', bodyWriter.write);
gz.once('end', done);
gz.once('error', function onGunzipError(err) {
next(
new errors.InvalidContentError(
'%s',
'Invalid gzip: ' + err.message
)
);
});
req.once('end', gz.end.bind(gz));
} else {
unsupportedContentEncoding = req.headers['content-encoding'];
Expand Down
91 changes: 91 additions & 0 deletions test/plugins/bodyReader.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,97 @@ describe('body reader', function() {
);
});

it('should not crash on an empty gzip body', function(done) {
SERVER.use(restify.plugins.bodyParser());

CLIENT = restifyClients.createJsonClient({
url: 'http://127.0.0.1:' + PORT,
retry: false
});

SERVER.get('/hello', function(req, res, next) {
res.send(200, { hello: 'world' });
next();
});

var req = http.request(
{
hostname: '127.0.0.1',
port: PORT,
path: '/hello',
method: 'GET',
headers: {
'Content-Encoding': 'gzip',
'Content-Type': 'application/json'
}
},
function(res) {
var body = '';
res.on('data', function(chunk) {
body += chunk;
});
res.on('end', function() {
assert.equal(res.statusCode, 400);
var rsp = JSON.parse(body);
assert.equal(rsp.code, 'InvalidContent');
CLIENT.get('/hello', function(err, _, okRes) {
assert.ifError(err);
assert.equal(okRes.statusCode, 200);
done();
});
});
}
);

req.on('error', done);
req.end();
});

it('should not crash on invalid gzip content', function(done) {
SERVER.use(restify.plugins.bodyParser());

CLIENT = restifyClients.createJsonClient({
url: 'http://127.0.0.1:' + PORT,
retry: false
});

SERVER.post('/hello', function(req, res, next) {
res.send(200, { hello: 'world' });
next();
});

var payload = Buffer.from('not-gzip');
var req = http.request(
{
hostname: '127.0.0.1',
port: PORT,
path: '/hello',
method: 'POST',
headers: {
'Content-Encoding': 'gzip',
'Content-Type': 'application/json',
'Content-Length': payload.length
}
},
function(res) {
var body = '';
res.on('data', function(chunk) {
body += chunk;
});
res.on('end', function() {
assert.equal(res.statusCode, 400);
var rsp = JSON.parse(body);
assert.equal(rsp.code, 'InvalidContent');
done();
});
}
);

req.on('error', done);
req.write(payload);
req.end();
});

it('should parse unencoded content', function(done) {
SERVER.use(restify.plugins.bodyParser());

Expand Down