158 lines
6.2 KiB
Diff
158 lines
6.2 KiB
Diff
|
Backport from upstream commits.
|
||
|
|
https://github.com/nghttp2/nghttp2/commit/00201ecd8f982da3b67d4f6868af72a1b03b14e0
|
||
|
|
https://github.com/nghttp2/nghttp2/commit/d71a4668c6bead55805d18810d633fbb98315af9
|
||
|
|
|
||
|
|
|
||
|
|
diff -ur node-v18.19.1_orig/deps/nghttp2/lib/includes/nghttp2/nghttp2.h node-v18.19.1/deps/nghttp2/lib/includes/nghttp2/nghttp2.h
|
||
|
|
--- node-v18.19.1_orig/deps/nghttp2/lib/includes/nghttp2/nghttp2.h 2024-04-15 14:38:00.000000000 +0200
|
||
|
|
+++ node-v18.19.1/deps/nghttp2/lib/includes/nghttp2/nghttp2.h 2024-04-15 14:43:36.000000000 +0200
|
||
|
|
@@ -440,7 +440,12 @@
|
||
|
|
* 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;
|
||
|
|
|
||
|
|
/**
|
||
|
|
@@ -2775,6 +2780,17 @@
|
||
|
|
|
||
|
|
/**
|
||
|
|
* @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
|
||
|
|
*
|
||
|
|
* Initializes |*session_ptr| for client use. The all members of
|
||
|
|
* |callbacks| are copied to |*session_ptr|. Therefore |*session_ptr|
|
||
|
|
Only in node-v18.19.1/deps/nghttp2/lib/includes/nghttp2: nghttp2.h.orig
|
||
|
|
diff -ur node-v18.19.1_orig/deps/nghttp2/lib/nghttp2_helper.c node-v18.19.1/deps/nghttp2/lib/nghttp2_helper.c
|
||
|
|
--- node-v18.19.1_orig/deps/nghttp2/lib/nghttp2_helper.c 2024-04-15 14:38:00.000000000 +0200
|
||
|
|
+++ node-v18.19.1/deps/nghttp2/lib/nghttp2_helper.c 2024-04-15 14:41:10.000000000 +0200
|
||
|
|
@@ -336,6 +336,8 @@
|
||
|
|
"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 -ur node-v18.19.1_orig/deps/nghttp2/lib/nghttp2_option.c node-v18.19.1/deps/nghttp2/lib/nghttp2_option.c
|
||
|
|
--- node-v18.19.1_orig/deps/nghttp2/lib/nghttp2_option.c 2024-04-15 14:38:00.000000000 +0200
|
||
|
|
+++ node-v18.19.1/deps/nghttp2/lib/nghttp2_option.c 2024-04-15 14:43:36.000000000 +0200
|
||
|
|
@@ -150,3 +150,8 @@
|
||
|
|
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 -ur node-v18.19.1_orig/deps/nghttp2/lib/nghttp2_option.h node-v18.19.1/deps/nghttp2/lib/nghttp2_option.h
|
||
|
|
--- node-v18.19.1_orig/deps/nghttp2/lib/nghttp2_option.h 2024-04-15 14:38:00.000000000 +0200
|
||
|
|
+++ node-v18.19.1/deps/nghttp2/lib/nghttp2_option.h 2024-04-15 14:43:36.000000000 +0200
|
||
|
|
@@ -71,6 +71,7 @@
|
||
|
|
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;
|
||
|
|
|
||
|
|
/**
|
||
|
|
@@ -99,6 +100,10 @@
|
||
|
|
*/
|
||
|
|
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 -ur node-v18.19.1_orig/deps/nghttp2/lib/nghttp2_session.c node-v18.19.1/deps/nghttp2/lib/nghttp2_session.c
|
||
|
|
--- node-v18.19.1_orig/deps/nghttp2/lib/nghttp2_session.c 2024-04-15 14:38:00.000000000 +0200
|
||
|
|
+++ node-v18.19.1/deps/nghttp2/lib/nghttp2_session.c 2024-04-15 14:43:36.000000000 +0200
|
||
|
|
@@ -496,6 +496,7 @@
|
||
|
|
(*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) &&
|
||
|
|
@@ -584,6 +585,10 @@
|
||
|
|
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,
|
||
|
|
@@ -6778,6 +6783,8 @@
|
||
|
|
}
|
||
|
|
}
|
||
|
|
session_inbound_frame_reset(session);
|
||
|
|
+
|
||
|
|
+ session->num_continuations = 0;
|
||
|
|
}
|
||
|
|
break;
|
||
|
|
}
|
||
|
|
@@ -6899,6 +6906,10 @@
|
||
|
|
}
|
||
|
|
#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;
|
||
|
|
|
||
|
|
Only in node-v18.19.1/deps/nghttp2/lib: nghttp2_session.c.orig
|
||
|
|
diff -ur node-v18.19.1_orig/deps/nghttp2/lib/nghttp2_session.h node-v18.19.1/deps/nghttp2/lib/nghttp2_session.h
|
||
|
|
--- node-v18.19.1_orig/deps/nghttp2/lib/nghttp2_session.h 2024-04-15 14:38:00.000000000 +0200
|
||
|
|
+++ node-v18.19.1/deps/nghttp2/lib/nghttp2_session.h 2024-04-15 14:41:10.000000000 +0200
|
||
|
|
@@ -110,6 +110,10 @@
|
||
|
|
#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 @@
|
||
|
|
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,
|