diff --git a/.gitignore b/.gitignore index a6f9ceb..baf7d34 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/node-v10.23.1-stripped.tar.gz +SOURCES/node-v10.24.0-stripped.tar.gz diff --git a/.rh-nodejs10-nodejs.metadata b/.rh-nodejs10-nodejs.metadata index f124458..a764f50 100644 --- a/.rh-nodejs10-nodejs.metadata +++ b/.rh-nodejs10-nodejs.metadata @@ -1 +1 @@ -658cfc032ba3e2a252a5f9c910eab516bb0aa16e SOURCES/node-v10.23.1-stripped.tar.gz +e4768a6c0b0573c8094b4062d5a484a78a1dcc4d SOURCES/node-v10.24.0-stripped.tar.gz diff --git a/SOURCES/deps-ini-do-not-allow-invalid-hazardous-string-as-section-nam.patch b/SOURCES/deps-ini-do-not-allow-invalid-hazardous-string-as-section-nam.patch deleted file mode 100644 index d4b55f2..0000000 --- a/SOURCES/deps-ini-do-not-allow-invalid-hazardous-string-as-section-nam.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 3ef951c3e17a56fe7bbb1b9f2c476ad55c52c287 Mon Sep 17 00:00:00 2001 -From: isaacs -Date: Tue, 8 Dec 2020 14:21:50 -0800 -Subject: [PATCH] do not allow invalid hazardous string as section name - -Signed-off-by: rpm-build ---- - deps/npm/node_modules/ini/ini.js | 8 +++++ - deps/npm/node_modules/ini/test/proto.js | 45 +++++++++++++++++++++++++ - 2 files changed, 53 insertions(+) - create mode 100644 deps/npm/node_modules/ini/test/proto.js - -diff --git a/deps/npm/node_modules/ini/ini.js b/deps/npm/node_modules/ini/ini.js -index 590195d..0401258 100644 ---- a/deps/npm/node_modules/ini/ini.js -+++ b/deps/npm/node_modules/ini/ini.js -@@ -80,6 +80,12 @@ function decode (str) { - if (!match) return - if (match[1] !== undefined) { - section = unsafe(match[1]) -+ if (section === '__proto__') { -+ // not allowed -+ // keep parsing the section, but don't attach it. -+ p = {} -+ return -+ } - p = out[section] = out[section] || {} - return - } -@@ -94,6 +100,7 @@ function decode (str) { - // Convert keys with '[]' suffix to an array - if (key.length > 2 && key.slice(-2) === '[]') { - key = key.substring(0, key.length - 2) -+ if (key === '__proto__') return - if (!p[key]) { - p[key] = [] - } else if (!Array.isArray(p[key])) { -@@ -125,6 +132,7 @@ function decode (str) { - var l = parts.pop() - var nl = l.replace(/\\\./g, '.') - parts.forEach(function (part, _, __) { -+ if (part === '__proto__') return - if (!p[part] || typeof p[part] !== 'object') p[part] = {} - p = p[part] - }) -diff --git a/deps/npm/node_modules/ini/test/proto.js b/deps/npm/node_modules/ini/test/proto.js -new file mode 100644 -index 0000000..ab35533 ---- /dev/null -+++ b/deps/npm/node_modules/ini/test/proto.js -@@ -0,0 +1,45 @@ -+var ini = require('../') -+var t = require('tap') -+ -+var data = ` -+__proto__ = quux -+foo = baz -+[__proto__] -+foo = bar -+[other] -+foo = asdf -+[kid.__proto__.foo] -+foo = kid -+[arrproto] -+hello = snyk -+__proto__[] = you did a good job -+__proto__[] = so you deserve arrays -+thanks = true -+` -+var res = ini.parse(data) -+t.deepEqual(res, { -+ foo: 'baz', -+ other: { -+ foo: 'asdf', -+ }, -+ kid: { -+ foo: { -+ foo: 'kid', -+ }, -+ }, -+ arrproto: { -+ hello: 'snyk', -+ thanks: true, -+ }, -+}) -+t.equal(res.__proto__, Object.prototype) -+t.equal(res.kid.__proto__, Object.prototype) -+t.equal(res.kid.foo.__proto__, Object.prototype) -+t.equal(res.arrproto.__proto__, Object.prototype) -+t.equal(Object.prototype.foo, undefined) -+t.equal(Object.prototype[0], undefined) -+t.equal(Object.prototype['0'], undefined) -+t.equal(Object.prototype[1], undefined) -+t.equal(Object.prototype['1'], undefined) -+t.equal(Array.prototype[0], undefined) -+t.equal(Array.prototype[1], undefined) --- -2.29.2 - diff --git a/SPECS/nodejs.spec b/SPECS/nodejs.spec index 3b6f68c..ef7a8c9 100644 --- a/SPECS/nodejs.spec +++ b/SPECS/nodejs.spec @@ -15,7 +15,7 @@ # This is used by both the nodejs package and the npm subpackage that # has a separate version - the name is special so that rpmdev-bumpspec # will bump this rather than adding .1 to the end. -%global baserelease 2 +%global baserelease 1 %{?!_pkgdocdir:%global _pkgdocdir %{_docdir}/%{pkg_name}-%{version}} @@ -25,8 +25,8 @@ # feature releases that are only supported for nine months, which is shorter # than a Fedora release lifecycle. %global nodejs_major 10 -%global nodejs_minor 23 -%global nodejs_patch 1 +%global nodejs_minor 24 +%global nodejs_patch 0 %global nodejs_abi %{nodejs_major}.%{nodejs_minor} # nodejs_soversion - from NODE_MODULE_VERSION in src/node_version.h %global nodejs_soversion 64 @@ -82,7 +82,7 @@ # npm - from deps/npm/package.json %global npm_major 6 %global npm_minor 14 -%global npm_patch 10 +%global npm_patch 11 %global npm_version %{npm_major}.%{npm_minor}.%{npm_patch} # zlib version - from deps/zlib/CMakeLists.txt @@ -131,9 +131,7 @@ Source7: nodejs_native.attr Patch1: 0001-Remove-or-backport-OpenSSL-features.patch -# CVE-2020-7788 -Patch2: deps-ini-do-not-allow-invalid-hazardous-string-as-section-nam.patch -Patch3: deps-y18n-CVE-2020-7774.patch +Patch2: deps-y18n-CVE-2020-7774.patch %{?scl:Requires: %{scl}-runtime} %{?scl:BuildRequires: %{scl}-runtime} @@ -299,7 +297,6 @@ export CFLAGS='%{node_cflags_oneline}' CXXFLAGS='%{node_cflags_oneline}' --shared-http-parser \ --with-dtrace \ --with-intl=small-icu \ - --debug-nghttp2 \ --openssl-use-def-ca-store %else ./configure --prefix=%{_prefix} \ @@ -307,7 +304,6 @@ export CFLAGS='%{node_cflags_oneline}' CXXFLAGS='%{node_cflags_oneline}' %{?!el7:--shared-zlib} \ --with-dtrace \ --with-intl=small-icu \ - --debug-nghttp2 \ --openssl-use-def-ca-store %endif @@ -494,6 +490,10 @@ python2 tools/test.py "${RUN_SUITES[@]}" || : %changelog +* Tue Feb 23 2021 Jan Staněk - 10.24.0-1 +- Rebase to 10.24.0 +- Resolves: CVE-2021-22883 CVE-2021-22884 + * Tue Jan 26 2021 Jan Staněk - 10.23.1-2 - Patch bundled y18n for CVE-2020-7774 - Resolves: CVE-2020-7774