[v8.x] cli: add --max-http-header-size flag #25171

MylesBorins · 2018-12-21T19:33:21Z

backport of #24811

Did not backport 436f4de (not applicable to legacy option parser)
632f263 needed to be recreated from scratch PTAL... comments inline about major differences

This commit adds http_parser_set_max_header_size() to the http-parser for overriding the compile time maximum HTTP header size. PR-URL: nodejs#24811 Fixes: nodejs#24692 Refs: nodejs/http-parser#453 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Myles Borins <myles.borins@gmail.com> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>

nodejs-github-bot · 2018-12-21T19:33:23Z

@MylesBorins build started: https://ci.nodejs.org/blue/organizations/jenkins/node-test-pull-request-lite-pipeline/detail/node-test-pull-request-lite-pipeline/2030/pipeline

MylesBorins · 2018-12-21T19:34:46Z

doc/node.1

@@ -110,6 +110,10 @@ Activate inspector on host:port and break at start of user script.
 .BR \-\-inspect-port \fI=[host:]port\fR
 Set the host:port to be used when the inspector is activated.

+.TP


this needed to be rewritten to match style in 8.x PTAL and lmk if it looks right

MylesBorins · 2018-12-21T19:35:02Z

src/node.cc

@@ -201,6 +201,8 @@ unsigned int reverted = 0;
 std::string icu_data_dir;  // NOLINT(runtime/string)
 #endif

+uint64_t max_http_header_size = 8 * 1024;


this is now exposed the way options were exposed in the past, PTAL

src/node.h

MylesBorins · 2018-12-21T19:35:58Z

src/node_config.cc

@@ -88,6 +88,10 @@ static void InitConfig(Local<Object> target,
  if (env->abort_on_uncaught_exception())
    READONLY_BOOLEAN_PROPERTY("shouldAbortOnUncaughtException");

+  READONLY_PROPERTY(target,


as there is no longer getOptions I have appended the property of max_http_header_size to the process.bindings('config')... is this the best way to do it?

If we need to expose this, then yes, this is probably the best way (do we need to, though?)

the option is exposed in 10.x and higher via getOptions... so was trying to keep the behavior equivalent.

Don't need to though, open to reverting this

MylesBorins · 2018-12-21T19:36:10Z

src/node_http_parser.cc

@@ -755,6 +755,9 @@ const struct http_parser_settings Parser::settings = {
  nullptr   // on_chunk_complete
 };

+void InitMaxHttpHeaderSizeOnce() {


this is the exact same as the 10.x PR aside from the options parsing

MylesBorins · 2018-12-21T19:36:39Z

test/sequential/test-http-max-http-headers.js

-const MAX = 8 * 1024; // 8KB
+const MAX = +(process.argv[2] || 8 * 1024); // Command line option, or 8KB.
+
+assert(process.binding('config').maxHTTPHeaderSize,


extra assert here to confirm that the value is on the process.binding('config')

MylesBorins · 2018-12-21T19:58:31Z

This broke some stuff... digging in

edit: it was a missing comma 🤦🏽‍♀️

MylesBorins · 2018-12-21T20:26:26Z

~~CI: https://ci.nodejs.org/job/node-test-pull-request/19726/~~

New CI after fix in bc2d3db

https://ci.nodejs.org/job/node-test-pull-request/19727/

edit: arm failure rebuilding

https://ci.nodejs.org/job/node-test-commit-arm-fanned/5329/

Allow the maximum size of HTTP headers to be overridden from the command line. co-authored-by: Matteo Collina <hello@matteocollina.com> PR-URL: nodejs#24811 Fixes: nodejs#24692 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Myles Borins <myles.borins@gmail.com> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>

This commit adds http_parser_set_max_header_size() to the http-parser for overriding the compile time maximum HTTP header size. Backport-PR-URL: #25171 PR-URL: #24811 Fixes: #24692 Refs: nodejs/http-parser#453 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Myles Borins <myles.borins@gmail.com> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>

Allow the maximum size of HTTP headers to be overridden from the command line. Backport-PR-URL: #25171 co-authored-by: Matteo Collina <hello@matteocollina.com> PR-URL: #24811 Fixes: #24692 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Myles Borins <myles.borins@gmail.com> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>

MylesBorins · 2018-12-21T23:06:33Z

landed in 3812a99...d6c029d

mcollina · 2018-12-21T23:07:00Z

src/node.cc

@@ -3468,6 +3473,8 @@ static void ParseArgs(int* argc,
      new_v8_argc += 1;
    } else if (strncmp(arg, "--v8-pool-size=", 15) == 0) {
      v8_thread_pool_size = atoi(arg + 15);
+    } else if (strncmp(arg, "--max-http-header-size=", 23) == 0) {
+      max_http_header_size = atoi(arg + 23);


this might be strtoul() instead?

This commit adds http_parser_set_max_header_size() to the http-parser for overriding the compile time maximum HTTP header size. Backport-PR-URL: #25171 PR-URL: #24811 Fixes: #24692 Refs: nodejs/http-parser#453 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Myles Borins <myles.borins@gmail.com> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>

Allow the maximum size of HTTP headers to be overridden from the command line. Backport-PR-URL: #25171 co-authored-by: Matteo Collina <hello@matteocollina.com> PR-URL: #24811 Fixes: #24692 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Myles Borins <myles.borins@gmail.com> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>

This commit adds http_parser_set_max_header_size() to the http-parser for overriding the compile time maximum HTTP header size. Backport-PR-URL: #25171 PR-URL: #24811 Fixes: #24692 Refs: nodejs/http-parser#453 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Myles Borins <myles.borins@gmail.com> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>

Allow the maximum size of HTTP headers to be overridden from the command line. Backport-PR-URL: #25171 co-authored-by: Matteo Collina <hello@matteocollina.com> PR-URL: #24811 Fixes: #24692 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Myles Borins <myles.borins@gmail.com> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>

nodejs-github-bot added c++ Issues and PRs that require attention from people who are familiar with C++. lib / src Issues and PRs related to general changes in the lib or src directory. v8.x labels Dec 21, 2018

MylesBorins requested review from mcollina and addaleax December 21, 2018 19:33

MylesBorins commented Dec 21, 2018

View reviewed changes

MylesBorins force-pushed the header-option-backport-8.x branch from 174cf77 to 92ab0e0 Compare December 21, 2018 19:39

addaleax approved these changes Dec 21, 2018

View reviewed changes

MylesBorins mentioned this pull request Dec 21, 2018

cli: add --max-http-header-size flag #24811

Merged

4 tasks

MylesBorins force-pushed the header-option-backport-8.x branch from 92ab0e0 to 73b53e1 Compare December 21, 2018 20:25

MylesBorins force-pushed the header-option-backport-8.x branch from 73b53e1 to bc2d3db Compare December 21, 2018 20:39

MylesBorins mentioned this pull request Dec 21, 2018

[v6.x] cli: add --max-http-header-size flag #25173

Closed

MylesBorins closed this Dec 21, 2018

mcollina reviewed Dec 21, 2018

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[v8.x] cli: add --max-http-header-size flag #25171

[v8.x] cli: add --max-http-header-size flag #25171

MylesBorins commented Dec 21, 2018

nodejs-github-bot commented Dec 21, 2018

MylesBorins Dec 21, 2018

MylesBorins Dec 21, 2018

MylesBorins Dec 21, 2018

addaleax Dec 21, 2018 •

edited

MylesBorins Dec 21, 2018

MylesBorins Dec 21, 2018

MylesBorins Dec 21, 2018

MylesBorins commented Dec 21, 2018 •

edited

MylesBorins commented Dec 21, 2018 •

edited

MylesBorins commented Dec 21, 2018

mcollina Dec 21, 2018

[v8.x] cli: add --max-http-header-size flag #25171

[v8.x] cli: add --max-http-header-size flag #25171

Conversation

MylesBorins commented Dec 21, 2018

nodejs-github-bot commented Dec 21, 2018

MylesBorins Dec 21, 2018

Choose a reason for hiding this comment

MylesBorins Dec 21, 2018

Choose a reason for hiding this comment

MylesBorins Dec 21, 2018

Choose a reason for hiding this comment

addaleax Dec 21, 2018 • edited

Choose a reason for hiding this comment

MylesBorins Dec 21, 2018

Choose a reason for hiding this comment

MylesBorins Dec 21, 2018

Choose a reason for hiding this comment

MylesBorins Dec 21, 2018

Choose a reason for hiding this comment

MylesBorins commented Dec 21, 2018 • edited

MylesBorins commented Dec 21, 2018 • edited

MylesBorins commented Dec 21, 2018

mcollina Dec 21, 2018

Choose a reason for hiding this comment

addaleax Dec 21, 2018 •

edited

MylesBorins commented Dec 21, 2018 •

edited

MylesBorins commented Dec 21, 2018 •

edited