Skip to content
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.

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

Fix no zlib headers #5497

Merged
merged 4 commits into from
Jan 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 9 additions & 0 deletions lib/adapters/http.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import stream from 'stream';
import AxiosHeaders from '../core/AxiosHeaders.js';
import AxiosTransformStream from '../helpers/AxiosTransformStream.js';
import EventEmitter from 'events';
import ZlibHeaderTransformStream from '../helpers/ZlibHeaderTransformStream.js';

const zlibOptions = {
flush: zlib.constants.Z_SYNC_FLUSH,
Expand Down Expand Up @@ -425,7 +426,15 @@ export default isHttpAdapterSupported && function httpAdapter(config) {
case 'x-gzip':
case 'compress':
case 'x-compress':
// add the unzipper to the body stream processing pipeline
streams.push(zlib.createUnzip(zlibOptions));

// remove the content-encoding in order to not confuse downstream operations
delete res.headers['content-encoding'];
break;
case 'deflate':
streams.push(new ZlibHeaderTransformStream());

// add the unzipper to the body stream processing pipeline
streams.push(zlib.createUnzip(zlibOptions));

Expand Down
28 changes: 28 additions & 0 deletions lib/helpers/ZlibHeaderTransformStream.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
"use strict";

import stream from "stream";

class ZlibHeaderTransformStream extends stream.Transform {
__transform(chunk, encoding, callback) {
this.push(chunk);
callback();
}

_transform(chunk, encoding, callback) {
if (chunk.length !== 0) {
this._transform = this.__transform;

// Add Default Compression headers if no zlib headers are present
if (chunk[0] !== 120) { // Hex: 78
const header = Buffer.alloc(2);
header[0] = 120; // Hex: 78
header[1] = 156; // Hex: 9C
this.push(header, encoding);
}
}

this.__transform(chunk, encoding, callback);
}
}

export default ZlibHeaderTransformStream;
8 changes: 6 additions & 2 deletions test/unit/adapters/http.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ const pipelineAsync = util.promisify(stream.pipeline);
const finishedAsync = util.promisify(stream.finished);
const gzip = util.promisify(zlib.gzip);
const deflate = util.promisify(zlib.deflate);
const deflateRaw = util.promisify(zlib.deflateRaw);
const brotliCompress = util.promisify(zlib.brotliCompress);

function toleranceRange(positive, negative) {
Expand Down Expand Up @@ -493,13 +494,16 @@ describe('supports http with nodejs', function () {
describe('algorithms', ()=> {
const responseBody ='str';

for (const [type, zipped] of Object.entries({
for (const [typeName, zipped] of Object.entries({
gzip: gzip(responseBody),
compress: gzip(responseBody),
deflate: deflate(responseBody),
'deflate-raw': deflateRaw(responseBody),
br: brotliCompress(responseBody)
})) {
describe(`${type} decompression`, async () => {
const type = typeName.split('-')[0];

describe(`${typeName} decompression`, async () => {
it(`should support decompression`, async () => {
server = await startHTTPServer(async (req, res) => {
res.setHeader('Content-Encoding', type);
Expand Down