99 lines
3.4 KiB
Diff
99 lines
3.4 KiB
Diff
From 00da0b65c4c6bd75be2b91fba196be520e8ccf00 Mon Sep 17 00:00:00 2001
|
|
From: Jordan Harband <ljharb@gmail.com>
|
|
Date: Mon, 27 Dec 2021 19:15:57 -0800
|
|
Subject: [PATCH] deps(qs/parse): ignore `__proto__` keys (CVE-2022-24999)
|
|
|
|
Signed-off-by: rpm-build <rpm-build>
|
|
---
|
|
deps/npm/node_modules/qs/lib/parse.js | 2 +-
|
|
deps/npm/node_modules/qs/test/parse.js | 60 ++++++++++++++++++++++++++
|
|
2 files changed, 61 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/deps/npm/node_modules/qs/lib/parse.js b/deps/npm/node_modules/qs/lib/parse.js
|
|
index 8c9872e..08e623a 100644
|
|
--- a/deps/npm/node_modules/qs/lib/parse.js
|
|
+++ b/deps/npm/node_modules/qs/lib/parse.js
|
|
@@ -69,7 +69,7 @@ var parseObject = function (chain, val, options) {
|
|
) {
|
|
obj = [];
|
|
obj[index] = leaf;
|
|
- } else {
|
|
+ } else if (cleanRoot !== '__proto__') {
|
|
obj[cleanRoot] = leaf;
|
|
}
|
|
}
|
|
diff --git a/deps/npm/node_modules/qs/test/parse.js b/deps/npm/node_modules/qs/test/parse.js
|
|
index 0f8fe45..3e93784 100644
|
|
--- a/deps/npm/node_modules/qs/test/parse.js
|
|
+++ b/deps/npm/node_modules/qs/test/parse.js
|
|
@@ -515,6 +515,66 @@ test('parse()', function (t) {
|
|
st.end();
|
|
});
|
|
|
|
+ t.test('dunder proto is ignored', function (st) {
|
|
+ var payload = 'categories[__proto__]=login&categories[__proto__]&categories[length]=42';
|
|
+ var result = qs.parse(payload, { allowPrototypes: true });
|
|
+
|
|
+ st.deepEqual(
|
|
+ result,
|
|
+ {
|
|
+ categories: {
|
|
+ length: '42'
|
|
+ }
|
|
+ },
|
|
+ 'silent [[Prototype]] payload'
|
|
+ );
|
|
+
|
|
+ var plainResult = qs.parse(payload, { allowPrototypes: true, plainObjects: true });
|
|
+
|
|
+ st.deepEqual(
|
|
+ plainResult,
|
|
+ {
|
|
+ __proto__: null,
|
|
+ categories: {
|
|
+ __proto__: null,
|
|
+ length: '42'
|
|
+ }
|
|
+ },
|
|
+ 'silent [[Prototype]] payload: plain objects'
|
|
+ );
|
|
+
|
|
+ var query = qs.parse('categories[__proto__]=cats&categories[__proto__]=dogs&categories[some][json]=toInject', { allowPrototypes: true });
|
|
+
|
|
+ st.notOk(Array.isArray(query.categories), 'is not an array');
|
|
+ st.notOk(query.categories instanceof Array, 'is not instanceof an array');
|
|
+ st.deepEqual(query.categories, { some: { json: 'toInject' } });
|
|
+ st.equal(JSON.stringify(query.categories), '{"some":{"json":"toInject"}}', 'stringifies as a non-array');
|
|
+
|
|
+ st.deepEqual(
|
|
+ qs.parse('foo[__proto__][hidden]=value&foo[bar]=stuffs', { allowPrototypes: true }),
|
|
+ {
|
|
+ foo: {
|
|
+ bar: 'stuffs'
|
|
+ }
|
|
+ },
|
|
+ 'hidden values'
|
|
+ );
|
|
+
|
|
+ st.deepEqual(
|
|
+ qs.parse('foo[__proto__][hidden]=value&foo[bar]=stuffs', { allowPrototypes: true, plainObjects: true }),
|
|
+ {
|
|
+ __proto__: null,
|
|
+ foo: {
|
|
+ __proto__: null,
|
|
+ bar: 'stuffs'
|
|
+ }
|
|
+ },
|
|
+ 'hidden values: plain objects'
|
|
+ );
|
|
+
|
|
+ st.end();
|
|
+ });
|
|
+
|
|
t.test('can return null objects', { skip: !Object.create }, function (st) {
|
|
var expected = Object.create(null);
|
|
expected.a = Object.create(null);
|
|
--
|
|
2.38.1
|
|
|