mirror of
https://github.com/n8n-io/n8n.git
synced 2024-11-09 22:24:05 -08:00
fix(core): Handle gzip and deflate compressed request payloads (#7461)
NODE-870
This commit is contained in:
parent
ef58a23d21
commit
83762e051d
|
@ -1,4 +1,6 @@
|
|||
import getRawBody from 'raw-body';
|
||||
import { type Readable } from 'stream';
|
||||
import { createGunzip, createInflate } from 'zlib';
|
||||
import type { Request, RequestHandler } from 'express';
|
||||
import { parse as parseQueryString } from 'querystring';
|
||||
import { Parser as XmlParser } from 'xml2js';
|
||||
|
@ -20,8 +22,21 @@ export const rawBodyReader: RequestHandler = async (req, res, next) => {
|
|||
|
||||
req.readRawBody = async () => {
|
||||
if (!req.rawBody) {
|
||||
req.rawBody = await getRawBody(req, {
|
||||
length: req.headers['content-length'],
|
||||
let stream: Readable = req;
|
||||
let contentLength: string | undefined;
|
||||
const contentEncoding = req.headers['content-encoding'];
|
||||
switch (contentEncoding) {
|
||||
case 'gzip':
|
||||
stream = req.pipe(createGunzip());
|
||||
break;
|
||||
case 'deflate':
|
||||
stream = req.pipe(createInflate());
|
||||
break;
|
||||
default:
|
||||
contentLength = req.headers['content-length'];
|
||||
}
|
||||
req.rawBody = await getRawBody(stream, {
|
||||
length: contentLength,
|
||||
limit: `${String(payloadSizeMax)}mb`,
|
||||
});
|
||||
req._body = true;
|
||||
|
|
40
packages/cli/test/integration/middlewares/bodyParser.test.ts
Normal file
40
packages/cli/test/integration/middlewares/bodyParser.test.ts
Normal file
|
@ -0,0 +1,40 @@
|
|||
import { createServer } from 'http';
|
||||
import { gzipSync, deflateSync } from 'zlib';
|
||||
import type { Request, Response } from 'express';
|
||||
import request from 'supertest';
|
||||
import { rawBodyReader, bodyParser } from '@/middlewares/bodyParser';
|
||||
|
||||
describe('bodyParser', () => {
|
||||
const server = createServer((req: Request, res: Response) => {
|
||||
rawBodyReader(req, res, async () => {
|
||||
bodyParser(req, res, () => res.end(JSON.stringify(req.body)));
|
||||
});
|
||||
});
|
||||
|
||||
it('should handle uncompressed data', async () => {
|
||||
const response = await request(server).post('/').send({ hello: 'world' }).expect(200);
|
||||
expect(response.text).toEqual('{"hello":"world"}');
|
||||
});
|
||||
|
||||
it('should handle gzip data', async () => {
|
||||
const response = await request(server)
|
||||
.post('/')
|
||||
.set('content-encoding', 'gzip')
|
||||
// @ts-ignore
|
||||
.serialize((d) => gzipSync(JSON.stringify(d)))
|
||||
.send({ hello: 'world' })
|
||||
.expect(200);
|
||||
expect(response.text).toEqual('{"hello":"world"}');
|
||||
});
|
||||
|
||||
it('should handle deflate data', async () => {
|
||||
const response = await request(server)
|
||||
.post('/')
|
||||
.set('content-encoding', 'deflate')
|
||||
// @ts-ignore
|
||||
.serialize((d) => deflateSync(JSON.stringify(d)))
|
||||
.send({ hello: 'world' })
|
||||
.expect(200);
|
||||
expect(response.text).toEqual('{"hello":"world"}');
|
||||
});
|
||||
});
|
Loading…
Reference in a new issue