Update to 20.16.0

Resolves: RHEL-43645 RHEL-46706 RHEL-46882 RHEL-50109
Also fixes: CVE-2024-36137 CVE-2024-22018 CVE-2024-22020 CVE-2024-28863

.gitignore

@@ -60,3 +60,7 @@
 /node-v20.12.2-stripped.tar.gz
 /icu4c-74_2-src.tgz
 /undici-5.28.4.tar.gz
+/node-v20.14.0-stripped.tar.gz
+/icu4c-75_1-src.tgz
+/undici-6.13.0.tar.gz
+/node-v20.16.0-stripped.tar.gz

0003-Limit-CONTINUATION-frames-following-an-incoming-HEAD.patch

@@ -1,107 +0,0 @@
-From d9a06fe94439d9f103aeffe597441c0a2c0a4eb3 Mon Sep 17 00:00:00 2001
-From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-Date: Sat, 9 Mar 2024 16:26:42 +0900
-Subject: [PATCH] Limit CONTINUATION frames following an incoming HEADER frame
-
-Signed-off-by: rpm-build <rpm-build>
----
- deps/nghttp2/lib/includes/nghttp2/nghttp2.h |  7 ++++++-
- deps/nghttp2/lib/nghttp2_helper.c           |  2 ++
- deps/nghttp2/lib/nghttp2_session.c          |  7 +++++++
- deps/nghttp2/lib/nghttp2_session.h          | 10 ++++++++++
- 4 files changed, 25 insertions(+), 1 deletion(-)
-
-diff --git a/deps/nghttp2/lib/includes/nghttp2/nghttp2.h b/deps/nghttp2/lib/includes/nghttp2/nghttp2.h
-index 8891760..a9629c7 100644
---- a/deps/nghttp2/lib/includes/nghttp2/nghttp2.h
-+++ b/deps/nghttp2/lib/includes/nghttp2/nghttp2.h
-@@ -466,7 +466,12 @@ typedef enum {
-    * exhaustion on server side to send these frames forever and does
-    * not read network.
-    */
--  NGHTTP2_ERR_FLOODED = -904
-+  NGHTTP2_ERR_FLOODED = -904,
-+  /**
-+   * When a local endpoint receives too many CONTINUATION frames
-+   * following a HEADER frame.
-+   */
-+  NGHTTP2_ERR_TOO_MANY_CONTINUATIONS = -905,
- } nghttp2_error;
- 
- /**
-diff --git a/deps/nghttp2/lib/nghttp2_helper.c b/deps/nghttp2/lib/nghttp2_helper.c
-index 93dd475..b3563d9 100644
---- a/deps/nghttp2/lib/nghttp2_helper.c
-+++ b/deps/nghttp2/lib/nghttp2_helper.c
-@@ -336,6 +336,8 @@ const char *nghttp2_strerror(int error_code) {
-            "closed";
-   case NGHTTP2_ERR_TOO_MANY_SETTINGS:
-     return "SETTINGS frame contained more than the maximum allowed entries";
-+  case NGHTTP2_ERR_TOO_MANY_CONTINUATIONS:
-+    return "Too many CONTINUATION frames following a HEADER frame";
-   default:
-     return "Unknown error code";
-   }
-diff --git a/deps/nghttp2/lib/nghttp2_session.c b/deps/nghttp2/lib/nghttp2_session.c
-index 226cdd5..e343365 100644
---- a/deps/nghttp2/lib/nghttp2_session.c
-+++ b/deps/nghttp2/lib/nghttp2_session.c
-@@ -497,6 +497,7 @@ static int session_new(nghttp2_session **session_ptr,
-   (*session_ptr)->max_send_header_block_length = NGHTTP2_MAX_HEADERSLEN;
-   (*session_ptr)->max_outbound_ack = NGHTTP2_DEFAULT_MAX_OBQ_FLOOD_ITEM;
-   (*session_ptr)->max_settings = NGHTTP2_DEFAULT_MAX_SETTINGS;
-+  (*session_ptr)->max_continuations = NGHTTP2_DEFAULT_MAX_CONTINUATIONS;
- 
-   if (option) {
-     if ((option->opt_set_mask & NGHTTP2_OPT_NO_AUTO_WINDOW_UPDATE) &&
-@@ -6812,6 +6813,8 @@ nghttp2_ssize nghttp2_session_mem_recv2(nghttp2_session *session,
-           }
-         }
-         session_inbound_frame_reset(session);
-+
-+        session->num_continuations = 0;
-       }
-       break;
-     }
-@@ -6933,6 +6936,10 @@ nghttp2_ssize nghttp2_session_mem_recv2(nghttp2_session *session,
-       }
- #endif /* DEBUGBUILD */
- 
-+      if (++session->num_continuations > session->max_continuations) {
-+        return NGHTTP2_ERR_TOO_MANY_CONTINUATIONS;
-+      }
-+
-       readlen = inbound_frame_buf_read(iframe, in, last);
-       in += readlen;
- 
-diff --git a/deps/nghttp2/lib/nghttp2_session.h b/deps/nghttp2/lib/nghttp2_session.h
-index b119329..ef8f7b2 100644
---- a/deps/nghttp2/lib/nghttp2_session.h
-+++ b/deps/nghttp2/lib/nghttp2_session.h
-@@ -110,6 +110,10 @@ typedef struct {
- #define NGHTTP2_DEFAULT_STREAM_RESET_BURST 1000
- #define NGHTTP2_DEFAULT_STREAM_RESET_RATE 33
- 
-+/* The default max number of CONTINUATION frames following an incoming
-+   HEADER frame. */
-+#define NGHTTP2_DEFAULT_MAX_CONTINUATIONS 8
-+
- /* Internal state when receiving incoming frame */
- typedef enum {
-   /* Receiving frame header */
-@@ -290,6 +294,12 @@ struct nghttp2_session {
-   size_t max_send_header_block_length;
-   /* The maximum number of settings accepted per SETTINGS frame. */
-   size_t max_settings;
-+  /* The maximum number of CONTINUATION frames following an incoming
-+     HEADER frame. */
-+  size_t max_continuations;
-+  /* The number of CONTINUATION frames following an incoming HEADER
-+     frame.  This variable is reset when END_HEADERS flag is seen. */
-+  size_t num_continuations;
-   /* Next Stream ID. Made unsigned int to detect >= (1 << 31). */
-   uint32_t next_stream_id;
-   /* The last stream ID this session initiated.  For client session,
--- 
-2.44.0
-

0004-Add-nghttp2_option_set_max_continuations.patch

@@ -1,89 +0,0 @@
-From ca0a0b02da4db1d65eca8169c6e27bb635924dfb Mon Sep 17 00:00:00 2001
-From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-Date: Sat, 9 Mar 2024 16:48:10 +0900
-Subject: [PATCH] Add nghttp2_option_set_max_continuations
-
-Signed-off-by: rpm-build <rpm-build>
----
- deps/nghttp2/lib/includes/nghttp2/nghttp2.h | 11 +++++++++++
- deps/nghttp2/lib/nghttp2_option.c           |  5 +++++
- deps/nghttp2/lib/nghttp2_option.h           |  5 +++++
- deps/nghttp2/lib/nghttp2_session.c          |  4 ++++
- 4 files changed, 25 insertions(+)
-
-diff --git a/deps/nghttp2/lib/includes/nghttp2/nghttp2.h b/deps/nghttp2/lib/includes/nghttp2/nghttp2.h
-index a9629c7..92c3ccc 100644
---- a/deps/nghttp2/lib/includes/nghttp2/nghttp2.h
-+++ b/deps/nghttp2/lib/includes/nghttp2/nghttp2.h
-@@ -3210,6 +3210,17 @@ NGHTTP2_EXTERN void
- nghttp2_option_set_stream_reset_rate_limit(nghttp2_option *option,
-                                            uint64_t burst, uint64_t rate);
- 
-+/**
-+ * @function
-+ *
-+ * This function sets the maximum number of CONTINUATION frames
-+ * following an incoming HEADER frame.  If more than those frames are
-+ * received, the remote endpoint is considered to be misbehaving and
-+ * session will be closed.  The default value is 8.
-+ */
-+NGHTTP2_EXTERN void nghttp2_option_set_max_continuations(nghttp2_option *option,
-+                                                         size_t val);
-+
- /**
-  * @function
-  *
-diff --git a/deps/nghttp2/lib/nghttp2_option.c b/deps/nghttp2/lib/nghttp2_option.c
-index 43d4e95..53144b9 100644
---- a/deps/nghttp2/lib/nghttp2_option.c
-+++ b/deps/nghttp2/lib/nghttp2_option.c
-@@ -150,3 +150,8 @@ void nghttp2_option_set_stream_reset_rate_limit(nghttp2_option *option,
-   option->stream_reset_burst = burst;
-   option->stream_reset_rate = rate;
- }
-+
-+void nghttp2_option_set_max_continuations(nghttp2_option *option, size_t val) {
-+  option->opt_set_mask |= NGHTTP2_OPT_MAX_CONTINUATIONS;
-+  option->max_continuations = val;
-+}
-diff --git a/deps/nghttp2/lib/nghttp2_option.h b/deps/nghttp2/lib/nghttp2_option.h
-index 2259e18..c89cb97 100644
---- a/deps/nghttp2/lib/nghttp2_option.h
-+++ b/deps/nghttp2/lib/nghttp2_option.h
-@@ -71,6 +71,7 @@ typedef enum {
-   NGHTTP2_OPT_SERVER_FALLBACK_RFC7540_PRIORITIES = 1 << 13,
-   NGHTTP2_OPT_NO_RFC9113_LEADING_AND_TRAILING_WS_VALIDATION = 1 << 14,
-   NGHTTP2_OPT_STREAM_RESET_RATE_LIMIT = 1 << 15,
-+  NGHTTP2_OPT_MAX_CONTINUATIONS = 1 << 16,
- } nghttp2_option_flag;
- 
- /**
-@@ -98,6 +99,10 @@ struct nghttp2_option {
-    * NGHTTP2_OPT_MAX_SETTINGS
-    */
-   size_t max_settings;
-+  /**
-+   * NGHTTP2_OPT_MAX_CONTINUATIONS
-+   */
-+  size_t max_continuations;
-   /**
-    * Bitwise OR of nghttp2_option_flag to determine that which fields
-    * are specified.
-diff --git a/deps/nghttp2/lib/nghttp2_session.c b/deps/nghttp2/lib/nghttp2_session.c
-index e343365..555032d 100644
---- a/deps/nghttp2/lib/nghttp2_session.c
-+++ b/deps/nghttp2/lib/nghttp2_session.c
-@@ -586,6 +586,10 @@ static int session_new(nghttp2_session **session_ptr,
-                            option->stream_reset_burst,
-                            option->stream_reset_rate);
-     }
-+
-+    if (option->opt_set_mask & NGHTTP2_OPT_MAX_CONTINUATIONS) {
-+      (*session_ptr)->max_continuations = option->max_continuations;
-+    }
-   }
- 
-   rv = nghttp2_hd_deflate_init2(&(*session_ptr)->hd_deflater,
--- 
-2.44.0
-

nodejs.spec

@@ -33,7 +33,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}/%{name}-%{version}}
 
@@ -44,8 +44,8 @@
 # than a Fedora release lifecycle.
 %global nodejs_epoch 1
 %global nodejs_major 20
-%global nodejs_minor 12
+%global nodejs_minor 16
-%global nodejs_patch 2
+%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 115
@@ -69,7 +69,7 @@
 
 # c-ares - from deps/cares/include/ares_version.h
 # https://github.com/nodejs/node/pull/9332
-%global c_ares_version 1.27.0
+%global c_ares_version 1.31.0
 
 # llhttp - from deps/llhttp/include/llhttp.h
 %global llhttp_version 8.1.2
@@ -78,17 +78,17 @@
 %global libuv_version 1.46.0
 
 # nghttp2 - from deps/nghttp2/lib/includes/nghttp2/nghttp2ver.h
-%global nghttp2_version 1.60.0
+%global nghttp2_version 1.61.0
 
 # nghttp3 - from deps/ngtcp2/nghttp3/lib/includes/nghttp3/version.h
 %global nghttp3_version 0.7.0
 
 # ngtcp2 from deps/ngtcp2/ngtcp2/lib/includes/ngtcp2/version.h
-%global ngtcp2_version 0.8.1
+%global ngtcp2_version 1.1.0
 
 # ICU - from tools/icu/current_ver.dep
-%global icu_major 74
+%global icu_major 75
-%global icu_minor 2
+%global icu_minor 1
 %global icu_version %{icu_major}.%{icu_minor}
 
 %global icudatadir %{nodejs_datadir}/icudata
@@ -106,10 +106,10 @@
 %endif
 
 # simduft from deps/simdutf/simdutf.h
-%global simduft_version 4.0.8
+%global simduft_version 5.2.8
 
 # ada from deps/ada/ada.h
-%global ada_version 2.7.6
+%global ada_version 2.8.0
 
 # OpenSSL minimum version
 %global openssl_minimum 1:1.1.1
@@ -122,7 +122,7 @@
 
 # npm - from deps/npm/package.json
 %global npm_epoch 1
-%global npm_version 10.5.0
+%global npm_version 10.8.1
 
 # In order to avoid needing to keep incrementing the release version for the
 # main package forever, we will just construct one for npm that is guaranteed
@@ -132,10 +132,10 @@
 
 # Node.js 16.9.1 and later comes with an experimental package management tool
 # corepack - from deps/corepack/package.json
-%global corepack_version 0.25.2
+%global corepack_version 0.28.1
 
 # uvwasi - from deps/uvwasi/include/uvwasi.h
-%global uvwasi_version 0.0.20
+%global uvwasi_version 0.0.21
 
 # histogram_c - from deps/histogram/include/hdr/hdr_histogram_version.h
 %global histogram_version 0.11.8
@@ -183,7 +183,7 @@ Source102: https://github.com/WebAssembly/wasi-sdk/archive/wasi-sdk-11/wasi-sdk-
 # Version: jq '.version' deps/undici/src/package.json
 # Original: https://github.com/nodejs/undici/archive/refs/tags/v5.28.3.tar.gz
 # Adjustments: rm -f undici-5.28.4/lib/llhttp/llhttp*.wasm*
-Source111: undici-5.28.4.tar.gz
+Source111: undici-6.13.0.tar.gz
 # The WASM blob was made using wasi-sdk v16; compiler libraries are linked in.
 # Version source: deps/undici/src/lib/llhttp/wasm_build_env.txt
 # Also check (undici tarball): lib/llhttp/wasm_build_env.txt
@@ -192,8 +192,6 @@ Source112: https://github.com/WebAssembly/wasi-sdk/archive/wasi-sdk-16/wasi-sdk-
 # Disable running gyp on bundled deps we don't use
 Patch1: 0001-Disable-running-gyp-on-shared-deps.patch
 Patch2: 0002-Disable-FIPS-options.patch
-Patch3: 0003-Limit-CONTINUATION-frames-following-an-incoming-HEAD.patch
-Patch4: 0004-Add-nghttp2_option_set_max_continuations.patch
 
 BuildRequires: make
 BuildRequires: python3-devel
@@ -724,6 +722,10 @@ end
 
 
 %changelog
+* Mon Aug 05 2024 Honza Horak <hhorak@redhat.com> - 1:20.16.0-1
+- Update to 20.16.0
+  Fixes: CVE-2024-36137 CVE-2024-22018 CVE-2024-22020
+
 * Tue Apr 16 2024 Jan Staněk <jstanek@redhat.com> - 1:20.12.2-2
 - Backport nghttp2 patch for CVE-2024-28182
 

sources

@@ -1,6 +1,6 @@
-SHA512 (node-v20.12.2-stripped.tar.gz) = bff24d8b3e6443aaab139cbea51978b2bcaf763aa31b304456f471187d1ef5eced8fe68737ee075ea802f1ff2a5b686d38e42fb5c5824b24b9f472337589e8a5
+SHA512 (node-v20.16.0-stripped.tar.gz) = 93e4b4350f4560c9c3ffe4c5c41dd93dc3dfad33e3c2b7ef864ae987fc51f30dd6d04f087eca2d9fa6848996697059ba64f291f86b6965a39905220de3bff397
-SHA512 (icu4c-74_2-src.tgz) = e6c7876c0f3d756f3a6969cad9a8909e535eeaac352f3a721338b9cbd56864bf7414469d29ec843462997815d2ca9d0dab06d38c37cdd4d8feb28ad04d8781b0
+SHA512 (icu4c-75_1-src.tgz) = 70ea842f0d5f1f6c6b65696ac71d96848c4873f4d794bebc40fd87af2ad4ef064c61a786bf7bc430ce4713ec6deabb8cc1a8cc0212eab148cee2d498a3683e45
-SHA512 (undici-5.28.4.tar.gz) = a0ebe329141f82c6d1073f089b0fef436abbd0cea5323e24e288aabcb165ac98fc21b8da472d8b52f5c38b47451392072c80d1a1dbfa073612842408934cf966
+SHA512 (undici-6.13.0.tar.gz) = e906e7109865f63947f4732be23caaacdb6df8ab3ff6f302dd7870dde672e852754f06a4ce5b0168e076a4344fd8ad5dfd340b6670a1211cb9c54367eb515430
 SHA512 (cjs-module-lexer-1.2.2.tar.gz) = 0437378a087a43044b64e6b2e66426e429d87ed3f24a225d20ddc8fedda25917ba7db04a9d41207c59d20f0e6764837dad09393e5b8f92e361941a60ac5edd80
 SHA512 (wasi-sdk-wasi-sdk-11.tar.gz) = cb37f357b09431a3efad26141d83dce63232a35b536d9a7bd341d4d9627a0a3d4bd4d57504b6e3dab421942d2c168a96da2a6be889aab3f9a2852fc5a3200d3c
 SHA512 (wasi-sdk-wasi-sdk-16.tar.gz) = 501467cb04ee85ab2ccc3d8ab1beb5dd8957ca71cc51c86fd357991ddccb1a8c2656e24b947ea3a5acfaafd8c762f5ba20458c22b58a5a5c85ef8ecb7a76db65