mirror of
https://github.com/zebrajr/node.git
synced 2025-12-06 00:20:08 +01:00
zlib: gracefully set windowBits from 8 to 9
On 4 April 2017, Node.js versions v4.8.2 and v6.10.2 were
released. These versions bumped the vendored zlib library from
v1.2.8 to v1.2.11 in response to what it describes as low-severity
CVEs. In zlib v1.2.9, a change was made that causes an error to be
raised when a raw deflate stream is initialised with windowBits set
to 8.
In zlib v1.2.9, 8 become an invalid value for this parameter, and Node's zlib
module will crash if you call this:
```
zlib.createDeflateRaw({windowBits: 8})
```
On some versions this crashes Node and you cannot recover from it, while on some
versions it throws an exception. The permessage-deflate library up to
version v0.1.5 does make such a call with no try/catch
This commit reverts to the original behavior of zlib by gracefully changed
windowBits: 8 to windowBits: 9 for raw deflate streams.
PR-URL: https://github.com/nodejs-private/node-private/pull/95
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
This commit is contained in:
parent
452cd40a02
commit
dd764d9cb6
|
|
@ -415,9 +415,13 @@ added: v0.5.8
|
|||
|
||||
Returns a new [DeflateRaw][] object with an [options][].
|
||||
|
||||
*Note*: The zlib library rejects requests for 256-byte windows (i.e.,
|
||||
`{ windowBits: 8 }` in `options`). An `Error` will be thrown when creating a
|
||||
[DeflateRaw][] object with this specific value of the `windowBits` option.
|
||||
*Note*: An upgrade of zlib from 1.2.8 to 1.2.11 changed behavior when windowBits
|
||||
is set to 8 for raw deflate streams. zlib does not have a working implementation
|
||||
of an 8-bit Window for raw deflate streams and would automatically set windowBit
|
||||
to 9 if initially set to 8. Newer versions of zlib will throw an exception.
|
||||
This creates a potential DOS vector, and as such the behavior ahs been reverted
|
||||
in Node.js 8, 6, and 4. Node.js version 9 and higher will throw when windowBits
|
||||
is set to 8.
|
||||
|
||||
## zlib.createGunzip([options])
|
||||
<!-- YAML
|
||||
|
|
|
|||
|
|
@ -266,6 +266,7 @@ function Gunzip(opts) {
|
|||
|
||||
// raw - no header
|
||||
function DeflateRaw(opts) {
|
||||
if (opts && opts.windowBits === 8) opts.windowBits = 9;
|
||||
if (!(this instanceof DeflateRaw)) return new DeflateRaw(opts);
|
||||
Zlib.call(this, opts, binding.DEFLATERAW);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,18 +0,0 @@
|
|||
'use strict';
|
||||
|
||||
const common = require('../common');
|
||||
|
||||
const assert = require('assert');
|
||||
const zlib = require('zlib');
|
||||
|
||||
if (process.config.variables.node_shared_zlib &&
|
||||
/^1\.2\.[0-8]$/.test(process.versions.zlib)) {
|
||||
common.skip("older versions of shared zlib don't throw on create");
|
||||
}
|
||||
|
||||
// For raw deflate encoding, requests for 256-byte windows are rejected as
|
||||
// invalid by zlib.
|
||||
// (http://zlib.net/manual.html#Advanced)
|
||||
assert.throws(() => {
|
||||
zlib.createDeflateRaw({ windowBits: 8 });
|
||||
}, /^Error: Init error$/);
|
||||
|
|
@ -130,6 +130,28 @@ class SlowStream extends stream.Stream {
|
|||
}
|
||||
}
|
||||
|
||||
// windowBits: 8 shouldn't throw
|
||||
assert.doesNotThrow(() => {
|
||||
zlib.createDeflateRaw({ windowBits: 8 });
|
||||
}, 'windowsBits set to 8 should follow legacy zlib behavior');
|
||||
|
||||
{
|
||||
const node = fs.createReadStream(process.execPath);
|
||||
const raw = [];
|
||||
const reinflated = [];
|
||||
node.on('data', (chunk) => raw.push(chunk));
|
||||
|
||||
// Usually, the inflate windowBits parameter needs to be at least the
|
||||
// value of the matching deflate’s windowBits. However, inflate raw with
|
||||
// windowBits = 8 should be able to handle compressed data from a source
|
||||
// that does not know about the silent 8-to-9 upgrade of windowBits
|
||||
// that older versions of zlib/Node perform.
|
||||
node.pipe(zlib.createDeflateRaw({ windowBits: 9 }))
|
||||
.pipe(zlib.createInflateRaw({ windowBits: 8 }))
|
||||
.on('data', (chunk) => reinflated.push(chunk))
|
||||
.on('end', common.mustCall(
|
||||
() => assert(Buffer.concat(raw).equals(Buffer.concat(reinflated)))));
|
||||
}
|
||||
|
||||
// for each of the files, make sure that compressing and
|
||||
// decompressing results in the same data, for every combination
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user