alado 3.0.1 → 3.1.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -10,6 +10,24 @@ function isXmlContentType(contentType) {
|
|
|
10
10
|
const mime = (contentType || '').split(';')[0].trim().toLowerCase();
|
|
11
11
|
return mime === _const_1.ContentType.XML || mime === _const_1.ContentType.TEXT_XML || /^application\/[\w.+-]+\+xml$/.test(mime);
|
|
12
12
|
}
|
|
13
|
+
function collectChunks(req, limit, received, reject) {
|
|
14
|
+
return (chunk) => {
|
|
15
|
+
received.bytes += chunk.length;
|
|
16
|
+
if (limit && received.bytes > limit) {
|
|
17
|
+
req.removeAllListeners('data');
|
|
18
|
+
req.removeAllListeners('end');
|
|
19
|
+
reject({
|
|
20
|
+
statusCode: 413,
|
|
21
|
+
message: 'Content Too Large',
|
|
22
|
+
});
|
|
23
|
+
return;
|
|
24
|
+
}
|
|
25
|
+
received.chunks.push(chunk);
|
|
26
|
+
};
|
|
27
|
+
}
|
|
28
|
+
function concatChunks(received, encoding) {
|
|
29
|
+
return Buffer.concat(received.chunks, received.bytes).toString(encoding);
|
|
30
|
+
}
|
|
13
31
|
async function bodyParser(req, res, limit) {
|
|
14
32
|
const contentType = req.headers['content-type'];
|
|
15
33
|
const result = {
|
|
@@ -18,24 +36,15 @@ async function bodyParser(req, res, limit) {
|
|
|
18
36
|
rawBody: '',
|
|
19
37
|
};
|
|
20
38
|
let body = '';
|
|
39
|
+
const received = { chunks: [], bytes: 0 };
|
|
21
40
|
if (contentType?.startsWith(_const_1.ContentType.FORM_DATA)) {
|
|
22
|
-
req.setEncoding('binary');
|
|
23
41
|
const matchingArray = /boundary=(.+)$/.exec(req.headers['content-type']);
|
|
24
42
|
const boundary = matchingArray && matchingArray[1];
|
|
25
43
|
await new Promise((resolve, reject) => {
|
|
26
|
-
req.on('data', (
|
|
27
|
-
body += chunk.toString();
|
|
28
|
-
// binary encoding: one char per byte, so length is the byte count
|
|
29
|
-
if (limit && body.length > limit) {
|
|
30
|
-
req.removeAllListeners('data');
|
|
31
|
-
req.removeAllListeners('end');
|
|
32
|
-
reject({
|
|
33
|
-
statusCode: 413,
|
|
34
|
-
message: 'Content Too Large',
|
|
35
|
-
});
|
|
36
|
-
}
|
|
37
|
-
});
|
|
44
|
+
req.on('data', collectChunks(req, limit, received, reject));
|
|
38
45
|
req.on('end', () => {
|
|
46
|
+
// multipart is parsed as a binary string: one char per byte, file bytes kept intact
|
|
47
|
+
body = concatChunks(received, 'binary');
|
|
39
48
|
result.rawBody = body;
|
|
40
49
|
const formData = {
|
|
41
50
|
files: [],
|
|
@@ -49,7 +58,10 @@ async function bodyParser(req, res, limit) {
|
|
|
49
58
|
const regExpMatchArray = item.match(regEx);
|
|
50
59
|
element[key] = regExpMatchArray && regExpMatchArray[1] && regExpMatchArray[1];
|
|
51
60
|
});
|
|
52
|
-
const {
|
|
61
|
+
const { value, filename, mimetype } = element;
|
|
62
|
+
// the body is parsed as a binary string (one char per byte) to keep file bytes intact;
|
|
63
|
+
// text (field names and values) is UTF-8 and has to be decoded back
|
|
64
|
+
const name = element.name && Buffer.from(element.name, 'binary').toString('utf8');
|
|
53
65
|
if (!name || !value) {
|
|
54
66
|
continue;
|
|
55
67
|
}
|
|
@@ -64,7 +76,7 @@ async function bodyParser(req, res, limit) {
|
|
|
64
76
|
formData.files.push(file);
|
|
65
77
|
}
|
|
66
78
|
else {
|
|
67
|
-
formData.fields[name] = value;
|
|
79
|
+
formData.fields[name] = Buffer.from(value, 'binary').toString('utf8');
|
|
68
80
|
}
|
|
69
81
|
}
|
|
70
82
|
for (const key in formData.fields) {
|
|
@@ -85,18 +97,9 @@ async function bodyParser(req, res, limit) {
|
|
|
85
97
|
}
|
|
86
98
|
else {
|
|
87
99
|
await new Promise((resolve, reject) => {
|
|
88
|
-
req.on('data', (
|
|
89
|
-
body += chunk.toString();
|
|
90
|
-
if (limit && Buffer.byteLength(body, 'utf8') > limit) {
|
|
91
|
-
req.removeAllListeners('data');
|
|
92
|
-
req.removeAllListeners('end');
|
|
93
|
-
reject({
|
|
94
|
-
statusCode: 413,
|
|
95
|
-
message: 'Content Too Large',
|
|
96
|
-
});
|
|
97
|
-
}
|
|
98
|
-
});
|
|
100
|
+
req.on('data', collectChunks(req, limit, received, reject));
|
|
99
101
|
req.on('end', () => {
|
|
102
|
+
body = concatChunks(received, 'utf8');
|
|
100
103
|
result.rawBody = body;
|
|
101
104
|
if (contentType?.startsWith(_const_1.ContentType.JSON)) {
|
|
102
105
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"body-parser.js","sourceRoot":"","sources":["../../../src/helpers/parser/body-parser.ts"],"names":[],"mappings":";;AAOA,4CAGC;
|
|
1
|
+
{"version":3,"file":"body-parser.js","sourceRoot":"","sources":["../../../src/helpers/parser/body-parser.ts"],"names":[],"mappings":"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"}
|