puma 8.0.3-java → 8.1.0-java

data/docs/testing_test_rackup_ci_files.md

@@ -7,7 +7,7 @@ and by the type of object used for the body.
 
 Five rackup files are located in 'test/rackup' that can be used.  All have their
 request body size (in kB) set via `Body-Conf` header or with `ENV['CI_BODY_CONF']`.
-Additionally, the ci_select.ru file can have it's body type set via a starting
+Additionally, the ci_select.ru file can have its body type set via a starting
 character.
 
 * **ci_array.ru** - body is an `Array` of 1kB strings.  `Content-Length` is not set.
@@ -21,7 +21,7 @@ contain 1kB items.
 
 All can be delayed by a float value (seconds) specified by the `Dly` header
 
-Note that rhe `Body-Conf` header takes precedence, and `ENV['CI_BODY_CONF']` is
+Note that the `Body-Conf` header takes precedence, and `ENV['CI_BODY_CONF']` is
 only read on load.
 
 ## ci_select.ru

data/ext/puma_http11/extconf.rb

@@ -8,6 +8,8 @@ if $mingw
   have_library 'ssp'
 end
 
+have_func "prctl(PR_SET_CHILD_SUBREAPER, 1)", "sys/prctl.h"
+
 unless ENV["PUMA_DISABLE_SSL"]
   # don't use pkg_config('openssl') if '--with-openssl-dir' is used
   has_openssl_dir = dir_config('openssl').any? ||

data/ext/puma_http11/http11_parser.c

@@ -592,6 +592,10 @@ case 24:
 		case 60: goto st0;
 		case 62: goto st0;
 		case 63: goto tr39;
+		case 92: goto st0;
+		case 96: goto st0;
+		case 123: goto st0;
+		case 125: goto st0;
 		case 127: goto st0;
 	}
 	if ( 0 <= (*p) && (*p) <= 31 )
@@ -607,7 +611,7 @@ st25:
 	if ( ++p == pe )
 		goto _test_eof25;
 case 25:
-#line 611 "ext/puma_http11/http11_parser.c"
+#line 615 "ext/puma_http11/http11_parser.c"
 	switch( (*p) ) {
 		case 32: goto tr41;
 		case 34: goto st0;
@@ -627,7 +631,7 @@ st26:
 	if ( ++p == pe )
 		goto _test_eof26;
 case 26:
-#line 631 "ext/puma_http11/http11_parser.c"
+#line 635 "ext/puma_http11/http11_parser.c"
 	switch( (*p) ) {
 		case 32: goto tr44;
 		case 34: goto st0;

data/ext/puma_http11/http11_parser_common.rl

@@ -17,6 +17,9 @@
   escape = ("%" xdigit xdigit);
   uchar = (unreserved | escape | "%");
   pchar = (uchar | ":" | "@" | "&" | "=" | "+" | ";");
+  # RFC 3986 disallows these in paths; browsers never send them unescaped there.
+  path_unwise = ("{" | "}" | "`" | "\\");
+  path_char = pchar -- path_unwise;
   tspecials = ("(" | ")" | "<" | ">" | "@" | "," | ";" | ":" | "\\" | "\"" | "/" | "[" | "]" | "?" | "=" | "{" | "}" | " " | "\t");
 
 # elements
@@ -26,7 +29,7 @@
   scheme = ( alpha | digit | "+" | "-" | "." )* ;
   absolute_uri = (scheme ":" (uchar | reserved )*);
 
-  path = ( pchar+ ( "/" pchar* )* ) ;
+  path = ( path_char+ ( "/" path_char* )* ) ;
   query = ( uchar | reserved )* %query_string ;
   param = ( pchar | "/" )* ;
   params = ( param ( ";" param )* ) ;

data/ext/puma_http11/mini_ssl.c

@@ -228,7 +228,7 @@ sslctx_alloc(VALUE klass) {
 VALUE
 sslctx_initialize(VALUE self, VALUE mini_ssl_ctx) {
   SSL_CTX* ctx;
-  int ssl_options;
+  int ssl_options, private_key_result;
   VALUE key, cert, ca, verify_mode, ssl_cipher_filter, ssl_ciphersuites, no_tlsv1, no_tlsv1_1,
     verification_flags, session_id_bytes, cert_pem, key_pem, key_password_command, key_password;
   BIO *bio;
@@ -292,15 +292,19 @@ sslctx_initialize(VALUE self, VALUE mini_ssl_ctx) {
           StringValue(key_password);
           password_cb = password_callback;
           password = RSTRING_PTR(key_password);
-          SSL_CTX_set_default_passwd_cb(ctx, password_cb);
-          SSL_CTX_set_default_passwd_cb_userdata(ctx, (void *) password);
       }
   }
 
   if (!NIL_P(key)) {
     StringValue(key);
 
-    if (SSL_CTX_use_PrivateKey_file(ctx, RSTRING_PTR(key), SSL_FILETYPE_PEM) != 1) {
+    SSL_CTX_set_default_passwd_cb(ctx, password_cb);
+    SSL_CTX_set_default_passwd_cb_userdata(ctx, (void *) password);
+    private_key_result = SSL_CTX_use_PrivateKey_file(ctx, RSTRING_PTR(key), SSL_FILETYPE_PEM);
+    SSL_CTX_set_default_passwd_cb(ctx, NULL);
+    SSL_CTX_set_default_passwd_cb_userdata(ctx, NULL);
+
+    if (private_key_result != 1) {
       raise_file_error("SSL_CTX_use_PrivateKey_file", RSTRING_PTR(key));
     }
   }

data/ext/puma_http11/org/jruby/puma/Http11Parser.java

@@ -36,8 +36,8 @@ private static short[] init__puma_parser_key_offsets_0()
 	return new short [] {
 	    0,    0,    8,   17,   27,   29,   30,   31,   32,   33,   34,   36,
 	   39,   41,   44,   45,   61,   62,   78,   85,   91,   99,  107,  117,
-	  125,  134,  142,  150,  159,  168,  177,  186,  195,  204,  213,  222,
-	  231,  240,  249,  258,  267,  276,  285,  294,  303,  312,  313
+	  125,  138,  146,  154,  163,  172,  181,  190,  199,  208,  217,  226,
+	  235,  244,  253,  262,  271,  280,  289,  298,  307,  316,  317
 	};
 }
 
@@ -57,23 +57,23 @@ private static char[] init__puma_parser_trans_keys_0()
 	   31,   13,  127,    0,    8,   10,   31,   32,   60,   62,  127,    0,
 	   31,   34,   35,   32,   60,   62,  127,    0,   31,   34,   35,   43,
 	   58,   45,   46,   48,   57,   65,   90,   97,  122,   32,   34,   35,
-	   60,   62,  127,    0,   31,   32,   34,   35,   60,   62,   63,  127,
-	    0,   31,   32,   34,   35,   60,   62,  127,    0,   31,   32,   34,
-	   35,   60,   62,  127,    0,   31,   32,   36,   95,   45,   46,   48,
-	   57,   65,   90,   32,   36,   95,   45,   46,   48,   57,   65,   90,
-	   32,   36,   95,   45,   46,   48,   57,   65,   90,   32,   36,   95,
-	   45,   46,   48,   57,   65,   90,   32,   36,   95,   45,   46,   48,
-	   57,   65,   90,   32,   36,   95,   45,   46,   48,   57,   65,   90,
-	   32,   36,   95,   45,   46,   48,   57,   65,   90,   32,   36,   95,
-	   45,   46,   48,   57,   65,   90,   32,   36,   95,   45,   46,   48,
-	   57,   65,   90,   32,   36,   95,   45,   46,   48,   57,   65,   90,
-	   32,   36,   95,   45,   46,   48,   57,   65,   90,   32,   36,   95,
-	   45,   46,   48,   57,   65,   90,   32,   36,   95,   45,   46,   48,
-	   57,   65,   90,   32,   36,   95,   45,   46,   48,   57,   65,   90,
-	   32,   36,   95,   45,   46,   48,   57,   65,   90,   32,   36,   95,
-	   45,   46,   48,   57,   65,   90,   32,   36,   95,   45,   46,   48,
-	   57,   65,   90,   32,   36,   95,   45,   46,   48,   57,   65,   90,
-	   32,    0
+	   60,   62,  127,    0,   31,   32,   34,   35,   60,   62,   63,   92,
+	   96,  123,  125,  127,    0,   31,   32,   34,   35,   60,   62,  127,
+	    0,   31,   32,   34,   35,   60,   62,  127,    0,   31,   32,   36,
+	   95,   45,   46,   48,   57,   65,   90,   32,   36,   95,   45,   46,
+	   48,   57,   65,   90,   32,   36,   95,   45,   46,   48,   57,   65,
+	   90,   32,   36,   95,   45,   46,   48,   57,   65,   90,   32,   36,
+	   95,   45,   46,   48,   57,   65,   90,   32,   36,   95,   45,   46,
+	   48,   57,   65,   90,   32,   36,   95,   45,   46,   48,   57,   65,
+	   90,   32,   36,   95,   45,   46,   48,   57,   65,   90,   32,   36,
+	   95,   45,   46,   48,   57,   65,   90,   32,   36,   95,   45,   46,
+	   48,   57,   65,   90,   32,   36,   95,   45,   46,   48,   57,   65,
+	   90,   32,   36,   95,   45,   46,   48,   57,   65,   90,   32,   36,
+	   95,   45,   46,   48,   57,   65,   90,   32,   36,   95,   45,   46,
+	   48,   57,   65,   90,   32,   36,   95,   45,   46,   48,   57,   65,
+	   90,   32,   36,   95,   45,   46,   48,   57,   65,   90,   32,   36,
+	   95,   45,   46,   48,   57,   65,   90,   32,   36,   95,   45,   46,
+	   48,   57,   65,   90,   32,    0
 	};
 }
 
@@ -85,7 +85,7 @@ private static byte[] init__puma_parser_single_lengths_0()
 	return new byte [] {
 	    0,    2,    3,    4,    2,    1,    1,    1,    1,    1,    0,    1,
 	    0,    1,    1,    4,    1,    4,    3,    2,    4,    4,    2,    6,
-	    7,    6,    6,    3,    3,    3,    3,    3,    3,    3,    3,    3,
+	   11,    6,    6,    3,    3,    3,    3,    3,    3,    3,    3,    3,
 	    3,    3,    3,    3,    3,    3,    3,    3,    3,    1,    0
 	};
 }
@@ -111,8 +111,8 @@ private static short[] init__puma_parser_index_offsets_0()
 	return new short [] {
 	    0,    0,    6,   13,   21,   24,   26,   28,   30,   32,   34,   36,
 	   39,   41,   44,   46,   57,   59,   70,   76,   81,   88,   95,  102,
-	  110,  119,  127,  135,  142,  149,  156,  163,  170,  177,  184,  191,
-	  198,  205,  212,  219,  226,  233,  240,  247,  254,  261,  263
+	  110,  123,  131,  139,  146,  153,  160,  167,  174,  181,  188,  195,
+	  202,  209,  216,  223,  230,  237,  244,  251,  258,  265,  267
 	};
 }
 
@@ -131,20 +131,20 @@ private static byte[] init__puma_parser_indicies_0()
 	    1,    1,    1,   25,   29,    1,    1,    1,   28,   30,    1,    1,
 	    1,    1,    1,   31,   32,    1,    1,    1,    1,    1,   33,   34,
 	   35,   34,   34,   34,   34,    1,    8,    1,    9,    1,    1,    1,
-	    1,   35,   36,    1,   38,    1,    1,   39,    1,    1,   37,   40,
-	    1,   42,    1,    1,    1,    1,   41,   43,    1,   45,    1,    1,
-	    1,    1,   44,    2,   46,   46,   46,   46,   46,    1,    2,   47,
-	   47,   47,   47,   47,    1,    2,   48,   48,   48,   48,   48,    1,
-	    2,   49,   49,   49,   49,   49,    1,    2,   50,   50,   50,   50,
-	   50,    1,    2,   51,   51,   51,   51,   51,    1,    2,   52,   52,
-	   52,   52,   52,    1,    2,   53,   53,   53,   53,   53,    1,    2,
-	   54,   54,   54,   54,   54,    1,    2,   55,   55,   55,   55,   55,
-	    1,    2,   56,   56,   56,   56,   56,    1,    2,   57,   57,   57,
-	   57,   57,    1,    2,   58,   58,   58,   58,   58,    1,    2,   59,
-	   59,   59,   59,   59,    1,    2,   60,   60,   60,   60,   60,    1,
-	    2,   61,   61,   61,   61,   61,    1,    2,   62,   62,   62,   62,
-	   62,    1,    2,   63,   63,   63,   63,   63,    1,    2,    1,    1,
-	    0
+	    1,   35,   36,    1,   38,    1,    1,   39,    1,    1,    1,    1,
+	    1,    1,   37,   40,    1,   42,    1,    1,    1,    1,   41,   43,
+	    1,   45,    1,    1,    1,    1,   44,    2,   46,   46,   46,   46,
+	   46,    1,    2,   47,   47,   47,   47,   47,    1,    2,   48,   48,
+	   48,   48,   48,    1,    2,   49,   49,   49,   49,   49,    1,    2,
+	   50,   50,   50,   50,   50,    1,    2,   51,   51,   51,   51,   51,
+	    1,    2,   52,   52,   52,   52,   52,    1,    2,   53,   53,   53,
+	   53,   53,    1,    2,   54,   54,   54,   54,   54,    1,    2,   55,
+	   55,   55,   55,   55,    1,    2,   56,   56,   56,   56,   56,    1,
+	    2,   57,   57,   57,   57,   57,    1,    2,   58,   58,   58,   58,
+	   58,    1,    2,   59,   59,   59,   59,   59,    1,    2,   60,   60,
+	   60,   60,   60,    1,    2,   61,   61,   61,   61,   61,    1,    2,
+	   62,   62,   62,   62,   62,    1,    2,   63,   63,   63,   63,   63,
+	    1,    2,    1,    1,    0
 	};
 }
 

data/ext/puma_http11/puma_http11.c

@@ -13,6 +13,10 @@
 #include <ctype.h>
 #include "http11_parser.h"
 
+#ifdef HAVE_PRCTL
+#include <sys/prctl.h>
+#endif
+
 #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
 
 static VALUE eHttpParserError;
@@ -460,6 +464,24 @@ static VALUE HttpParser_body(VALUE self) {
   return http->body;
 }
 
+/**
+ * call-seq:
+ *    Puma.enable_child_subreaper -> true or false
+ *
+ * Marks the calling process as a child subreaper so that orphaned descendants
+ * are reparented to it. Returns false where this is unsupported.
+ */
+static VALUE Puma_enable_child_subreaper(VALUE self) {
+#ifdef HAVE_PRCTL
+  if (prctl(PR_SET_CHILD_SUBREAPER, 1) < 0) {
+    rb_sys_fail("prctl(PR_SET_CHILD_SUBREAPER)");
+  }
+  return Qtrue;
+#else
+  return Qfalse;
+#endif
+}
+
 #ifdef HAVE_OPENSSL_BIO_H
 void Init_mini_ssl(VALUE mod);
 #endif
@@ -483,6 +505,8 @@ RUBY_FUNC_EXPORTED void Init_puma_http11(void)
   rb_global_variable(&eHttpParserError);
   eHttpParserError = rb_define_class_under(mPuma, "HttpParserError", rb_eStandardError);
 
+  rb_define_singleton_method(mPuma, "enable_child_subreaper", Puma_enable_child_subreaper, 0);
+
   rb_define_alloc_func(cHttpParser, HttpParser_alloc);
   rb_define_method(cHttpParser, "initialize", HttpParser_init, 0);
   rb_define_method(cHttpParser, "reset", HttpParser_reset, 0);

data/lib/puma/binder.rb

@@ -309,6 +309,13 @@ module Puma
       end
     end
 
+    # Removes and returns the activated socket for +url+ as <tt>[key, socket]</tt>,
+    # or +nil+ if none was activated for it.
+    def take_activated_socket(url)
+      key = activated_keys_for(url).find { |k| @activated_sockets.key?(k) }
+      [key, @activated_sockets.delete(key)] if key
+    end
+
     def localhost_authority
       @localhost_authority ||= Localhost::Authority.fetch if defined?(Localhost::Authority) && !Puma::IS_JRUBY
     end
@@ -486,6 +493,28 @@ module Puma
 
     private
 
+    def activated_keys_for(url)
+      uri = URI.parse url
+      case uri.scheme
+      when "tcp", "ssl"
+        [[:tcp, uri.host, uri.port]]
+      when "unix"
+        path = "#{uri.host}#{uri.path}".gsub("%20", " ")
+        return [] if path.start_with?("@")
+
+        real_path = begin
+          File.realdirpath(path)
+        rescue SystemCallError
+          path
+        end
+        [[:unix, path], [:unix, real_path]].uniq
+      else
+        []
+      end
+    rescue URI::InvalidURIError
+      []
+    end
+
     # @!attribute [r] loopback_addresses
     def loopback_addresses
       t = Socket.ip_address_list.select do |addrinfo|

data/lib/puma/cli.rb

@@ -138,6 +138,12 @@ module Puma
             user_config.fork_worker(*args.compact)
           end
 
+          o.on "--mold-worker=[REQUESTS]", Array,
+            "Fork new workers from a mold promoted from an existing worker. Cluster mode only",
+            "Promote a new mold at each comma-separated REQUESTS threshold (default 1000)" do |thresholds|
+            user_config.mold_worker(*thresholds)
+          end
+
           o.on "-I", "--include PATH", "Specify $LOAD_PATH directories" do |arg|
             $LOAD_PATH.unshift(*arg.split(':'))
           end

data/lib/puma/client.rb

@@ -3,6 +3,7 @@
 require_relative 'detect'
 require_relative 'io_buffer'
 require_relative 'client_env'
+require_relative 'null_io'
 require 'tempfile'
 
 if Puma::IS_JRUBY
@@ -18,6 +19,17 @@ module Puma
 
   class HttpParserError501 < IOError; end
 
+  # Raised when a +continue_callback+ answers an <tt>Expect: 100-continue</tt>
+  # request itself, so the request body is never read.
+  class ContinueRejected < StandardError
+    attr_reader :response
+
+    def initialize(response)
+      super("Expect: 100-continue answered by continue_callback")
+      @response = response
+    end
+  end
+
   #———————————————————————— DO NOT USE — this class is for internal use only ———
 
 
@@ -46,12 +58,12 @@ module Puma
     ALLOWED_TRANSFER_ENCODING = %w[compress deflate gzip].freeze
 
     # chunked body validation
-    CHUNK_SIZE_INVALID = /[^\h]/.freeze
+    CHUNK_SIZE_VALID = /\A\h+\z/.freeze
     CHUNK_VALID_ENDING = Const::LINE_END
     CHUNK_VALID_ENDING_SIZE = CHUNK_VALID_ENDING.bytesize
 
     # The maximum number of bytes we'll buffer looking for a valid
-    # chunk header.
+    # chunk header, and the maximum size of a trailer section.
     MAX_CHUNK_HEADER_SIZE = 4096
 
     SHUTDOWN_READ_GRACE = 1
@@ -78,7 +90,8 @@ module Puma
                 :tempfile, :io_buffer, :http_content_length_limit_exceeded,
                 :requests_served, :error_status_code, :bytes_read
 
-    attr_writer :peerip, :http_content_length_limit, :supported_http_methods
+    attr_writer :peerip, :http_content_length_limit, :supported_http_methods,
+                :allow_underscore_headers, :continue_callback
 
     attr_accessor :remote_addr_header, :listener, :env_set_http_version,
                   :reactor_error
@@ -108,6 +121,8 @@ module Puma
 
       @http_content_length_limit = nil
       @http_content_length_limit_exceeded = nil
+      @allow_underscore_headers = true
+      @continue_callback = nil
       @error_status_code = nil
       @reactor_error = nil
 
@@ -354,6 +369,8 @@ module Puma
       raise e unless HttpParserError === e && e.message.include?('non-SSL')
 
       req, _ = @buffer.split "\r\n\r\n"
+      raise e if req.nil? || req.empty?
+
       request_line, headers = req.split "\r\n", 2
 
       # below checks for request issues and changes error message accordingly
@@ -384,6 +401,7 @@ module Puma
 
     # processes the `env` and the request body
     def process_env_body
+      validate_env
       temp = setup_body
       normalize_env
       req_env_post_parse
@@ -496,10 +514,21 @@ module Puma
     # @return [Boolean] true if the body can be completely read, false otherwise
     #
     def setup_body
+      # The parsers preserve underscores as commas to distinguish these aliases
+      # from real framing headers. Reject them before 100 Continue or body reads,
+      # regardless of allow_underscore_headers, to avoid proxy disagreements.
+      if @env.key?('HTTP_CONTENT,LENGTH') || @env.key?('HTTP_TRANSFER,ENCODING')
+        @error_status_code = 400
+        @env[HTTP_CONNECTION] = CLOSE
+        raise HttpParserError, 'Underscores are not allowed in HTTP framing headers'
+      end
+
       @body_read_start = Process.clock_gettime(Process::CLOCK_MONOTONIC, :float_millisecond)
 
       if @env[HTTP_EXPECT] == CONTINUE
-        # TODO allow a hook here to check the headers before going forward
+        if @continue_callback && (response = @continue_callback.call(@env))
+          reject_continue response
+        end
         write_interim HTTP_11_100
       end
 
@@ -704,6 +733,8 @@ module Puma
     end
 
     def decode_chunk(chunk)
+      return finish_last_chunk(@prev_chunk + chunk) if @in_last_chunk
+
       if @partial_part_left > 0
         if @partial_part_left <= chunk.size
           if @partial_part_left > 2
@@ -739,31 +770,18 @@ module Puma
           # Puma doesn't process chunk extensions, but should parse if they're
           # present, which is the reason for the semicolon regex
           chunk_hex = line.strip[/\A[^;]+/]
-          if CHUNK_SIZE_INVALID.match? chunk_hex
-            raise HttpParserError, "Invalid chunk size: '#{chunk_hex}'"
+          unless CHUNK_SIZE_VALID.match? chunk_hex
+            err_msg = chunk_hex && !chunk_hex.empty? ?
+              "Invalid chunk size: '#{chunk_hex}'" :
+              "Chunk size cannot be empty or nil"
+            raise HttpParserError, err_msg
           end
+
           len = chunk_hex.to_i(16)
           if len == 0
             @in_last_chunk = true
             @body.rewind
-            rest = io.read
-            if rest.bytesize < CHUNK_VALID_ENDING_SIZE
-              @buffer = nil
-              @partial_part_left = CHUNK_VALID_ENDING_SIZE - rest.bytesize
-              return false
-            else
-              # if the next character is a CRLF, set buffer to everything after that CRLF
-              start_of_rest = if rest.start_with?(CHUNK_VALID_ENDING)
-                CHUNK_VALID_ENDING_SIZE
-              else # we have started a trailer section, which we do not support. skip it!
-                rest.index(CHUNK_VALID_ENDING*2) + CHUNK_VALID_ENDING_SIZE*2
-              end
-
-              @buffer = rest[start_of_rest..-1]
-              @buffer = nil if @buffer.empty?
-              set_ready
-              return true
-            end
+            return finish_last_chunk(io.read)
           end
 
           # Track the excess as a function of the size of the
@@ -816,12 +834,33 @@ module Puma
         end
       end
 
-      if @in_last_chunk
-        set_ready
-        true
-      else
-        false
+      false
+    end
+
+    # Consume the terminator that ends a chunked body. Per RFC 9112 §7.1.2
+    # this is either a bare CRLF or an optional trailer section ending in
+    # CRLF*2. Puma does not surface trailers, so we skip past them. Bytes
+    # past the terminator belong to the next pipelined request.
+    def finish_last_chunk(rest)
+      if rest.start_with?(CHUNK_VALID_ENDING)
+        trailer_end = CHUNK_VALID_ENDING_SIZE
+      elsif idx = rest.index(CHUNK_VALID_ENDING * 2)
+        trailer_end = idx + CHUNK_VALID_ENDING_SIZE * 2
+      elsif rest.bytesize < MAX_CHUNK_HEADER_SIZE
+        @prev_chunk = rest
+        return false
+      end
+
+      if trailer_end.nil? || trailer_end > MAX_CHUNK_HEADER_SIZE
+        @env[HTTP_CONNECTION] = CLOSE
+        raise HttpParserError, "maximum size of chunk trailer exceeded"
       end
+
+      @prev_chunk = ""
+      @buffer = rest[trailer_end..-1]
+      @buffer = nil if @buffer.empty?
+      set_ready
+      true
     end
 
     def set_ready
@@ -832,6 +871,13 @@ module Puma
       @ready = true
     end
 
+    def reject_continue(response)
+      @buffer = nil
+      @body = EmptyBody
+      @env[HTTP_CONNECTION] = 'close'
+      raise ContinueRejected, response
+    end
+
     def raise_above_http_content_limit
       @http_content_length_limit_exceeded = true
       @buffer = nil

data/lib/puma/client_env.rb

@@ -12,6 +12,22 @@ module Puma
 
     include Puma::Const
 
+    def validate_env
+      return unless @env[SERVER_PROTOCOL] == HTTP_11
+
+      unless @env.key? HTTP_HOST
+        @error_status_code = 400
+        @env[HTTP_CONNECTION] = CLOSE
+        raise HttpParserError, "Missing Host header"
+      end
+
+      if @env[HTTP_HOST].empty?
+        @error_status_code = 400
+        @env[HTTP_CONNECTION] = CLOSE
+        raise HttpParserError, "Invalid Host header"
+      end
+    end
+
     # Given a Hash +env+ for the request read from +client+, add
     # and fixup keys to comply with Rack's env guidelines.
     # @param env [Hash] see Puma::Client#env, from request
@@ -105,9 +121,10 @@ module Puma
     # avoid allocation in the common case (ie there are no headers
     # with `,` in their names), that's why it has the extra conditionals.
     #
-    # @note If a normalized version of a `,` header already exists, we ignore
-    #       the `,` version. This prevents clobbering headers managed by proxies
-    #       but not by clients (Like X-Forwarded-For).
+    # @note If underscore headers are disallowed, `,` headers are discarded.
+    #       Otherwise, if a normalized version of a `,` header already exists, we
+    #       ignore the `,` version. This prevents clobbering headers managed by
+    #       proxies but not by clients (Like X-Forwarded-For).
     #
     # @param env [Hash] see Puma::Client#env, from request, modifies in place
     # @version 5.0.3
@@ -115,28 +132,25 @@ module Puma
     def req_env_post_parse
       to_delete = nil
       to_add = nil
+      underscore_headers = nil
 
       @env.each do |k,v|
-        if k.start_with?("HTTP_") && k.include?(",") && !UNMASKABLE_HEADERS.key?(k)
-          if to_delete
-            to_delete << k
-          else
-            to_delete = [k]
-          end
+        next unless k.start_with?("HTTP_") && k.include?(",")
 
-          new_k = k.tr(",", "_")
-          if @env.key?(new_k)
-            next
-          end
+        (underscore_headers ||= []) << k.delete_prefix("HTTP_").tr("_,", "-_")
+        next if @allow_underscore_headers && UNMASKABLE_HEADERS.key?(k)
 
-          unless to_add
-            to_add = {}
-          end
+        (to_delete ||= []) << k
+        next unless @allow_underscore_headers
 
-          to_add[new_k] = v
-        end
+        new_k = k.tr(",", "_")
+        next if @env.key?(new_k)
+
+        (to_add ||= {})[new_k] = v
       end
 
+      @env[PUMA_UNDERSCORE_HEADERS] = underscore_headers if underscore_headers
+
       if to_delete # rubocop:disable Style/SafeNavigation
         to_delete.each { |k| env.delete(k) }
       end