80169b1f0a
Check for unexpected end-of-file error when decompressing. If the output buffer still has space after decompressing and deflate returned Z_OK or Z_BUF_ERROR - that means unexpected end-of-file. Added test-zlib-truncated.js for the case of truncated input. Fixed the zlib dictionary test to not end the inflate stream on a truncated output (no crc) of deflate Fixes: https://github.com/nodejs/node/issues/2043 PR-URL: https://github.com/nodejs/node/pull/2595 Reviewed-By: Trevor Norris <trev.norris@gmail.com>
90 lines
2.5 KiB
JavaScript
90 lines
2.5 KiB
JavaScript
'use strict';
|
|
// test compression/decompression with dictionary
|
|
|
|
const common = require('../common');
|
|
const assert = require('assert');
|
|
const zlib = require('zlib');
|
|
const path = require('path');
|
|
|
|
const spdyDict = new Buffer([
|
|
'optionsgetheadpostputdeletetraceacceptaccept-charsetaccept-encodingaccept-',
|
|
'languageauthorizationexpectfromhostif-modified-sinceif-matchif-none-matchi',
|
|
'f-rangeif-unmodifiedsincemax-forwardsproxy-authorizationrangerefererteuser',
|
|
'-agent10010120020120220320420520630030130230330430530630740040140240340440',
|
|
'5406407408409410411412413414415416417500501502503504505accept-rangesageeta',
|
|
'glocationproxy-authenticatepublicretry-afterservervarywarningwww-authentic',
|
|
'ateallowcontent-basecontent-encodingcache-controlconnectiondatetrailertran',
|
|
'sfer-encodingupgradeviawarningcontent-languagecontent-lengthcontent-locati',
|
|
'oncontent-md5content-rangecontent-typeetagexpireslast-modifiedset-cookieMo',
|
|
'ndayTuesdayWednesdayThursdayFridaySaturdaySundayJanFebMarAprMayJunJulAugSe',
|
|
'pOctNovDecchunkedtext/htmlimage/pngimage/jpgimage/gifapplication/xmlapplic',
|
|
'ation/xhtmltext/plainpublicmax-agecharset=iso-8859-1utf-8gzipdeflateHTTP/1',
|
|
'.1statusversionurl\0'
|
|
].join(''));
|
|
|
|
const input = [
|
|
'HTTP/1.1 200 Ok',
|
|
'Server: node.js',
|
|
'Content-Length: 0',
|
|
''
|
|
].join('\r\n');
|
|
|
|
function basicDictionaryTest() {
|
|
let output = '';
|
|
const deflate = zlib.createDeflate({ dictionary: spdyDict });
|
|
const inflate = zlib.createInflate({ dictionary: spdyDict });
|
|
|
|
deflate.on('data', function(chunk) {
|
|
inflate.write(chunk);
|
|
});
|
|
|
|
inflate.on('data', function(chunk) {
|
|
output += chunk;
|
|
});
|
|
|
|
deflate.on('end', function() {
|
|
inflate.end();
|
|
});
|
|
|
|
inflate.on('end', function() {
|
|
assert.equal(input, output);
|
|
});
|
|
|
|
deflate.write(input);
|
|
deflate.end();
|
|
}
|
|
|
|
function deflateResetDictionaryTest() {
|
|
let doneReset = false;
|
|
let output = '';
|
|
const deflate = zlib.createDeflate({ dictionary: spdyDict });
|
|
const inflate = zlib.createInflate({ dictionary: spdyDict });
|
|
|
|
deflate.on('data', function(chunk) {
|
|
if (doneReset)
|
|
inflate.write(chunk);
|
|
});
|
|
|
|
inflate.on('data', function(chunk) {
|
|
output += chunk;
|
|
});
|
|
|
|
deflate.on('end', function() {
|
|
inflate.end();
|
|
});
|
|
|
|
inflate.on('end', function() {
|
|
assert.equal(input, output);
|
|
});
|
|
|
|
deflate.write(input);
|
|
deflate.flush(function() {
|
|
deflate.reset();
|
|
doneReset = true;
|
|
deflate.write(input);
|
|
deflate.end();
|
|
});
|
|
}
|
|
|
|
basicDictionaryTest();
|
|
deflateResetDictionaryTest();
|