bayserver-docker-http 3.0.5 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3f7151a765dc5d7e998d7ada10ae2ecc046085647e28ce01c8376c07c34499c
-  data.tar.gz: '01791184ee8ceff8fafbeacfab0159f7c8ec0e9079a3bcfcf09e63030350cb61'
+  metadata.gz: 77533775218a5eeece533642ac1268d650988959191835225d32c64169b0a22b
+  data.tar.gz: 1f84273c4d5308ed6f0a9f35304d87a3ac81f39bc82ca1e2f76b51cb9e42fc72
 SHA512:
-  metadata.gz: 33972f70152484741d656ad3ff12c7de391aad24bcce455c64eb9c37b169ad7c9c50b7f9bd92e130df634ad91b290b4bb62a10d39f5c32aae62a344df1676238
-  data.tar.gz: 3efd07af360f198d91289441dac24e3da3094e3207c3f1f429e45a3b71fbcd47d4f06f31d12d99696fbbd2364fb4d6ebf4552741a2e8dc771647af1acb75b7d9
+  metadata.gz: 8843bca3e9b0468c6c2b3f3a92803c2f8246a670ac8f94258c3e4b73bc5a2cf959b0d6d8e86067bd3f8ef7fe58a69b910bd37a9156fe55de7df26db937603693
+  data.tar.gz: 589f8e2c5db82799fe851e78c1a42c35a51dd963f849aad53f3dad6d246293cd0baa5e7e6cdbd7f9b271e84a18a0cba531ef5b661ca289472dcf0d804c13651b

data/lib/baykit/bayserver/docker/http/h1/command/cmd_header.rb

@@ -118,42 +118,48 @@ module Baykit
               end
 
               def unpack(pkt)
-                acc = pkt.new_data_accessor
                 data_len = pkt.data_len()
                 state = STATE_READ_FIRST_LINE
 
                 line_start_pos = 0
                 line_len = 0
 
-                data_len.times do |pos|
-                  b = acc.get_byte
-                  case b
-                  when CharUtil::CR_BYTE
-                    next
+                pos = 0
+                while pos < data_len
+                  next_nl = pkt.buf.index("\n", pos)
+                  if !next_nl
+                    # No more new lines
+                    break
+                  end
 
-                  when CharUtil::LF_BYTE
-                    if line_len == 0
-                      break
-                    end
-                    if state == STATE_READ_FIRST_LINE
-                      if @is_req_header
-                        unpack_request_line(pkt.buf, line_start_pos, line_len)
-                      else
-                        unpack_status_line(pkt.buf, line_start_pos, line_len)
-                      end
-
-                      state = STATE_READ_MESSAGE_HEADERS
+                  line_start_pos = pos
+
+                  # Calculate line length excluding \n
+                  # Also handle \r if it exists just before \n
+                  line_end = (next_nl > pos && pkt.buf[next_nl - 1] == "\r") ? next_nl - 1 : next_nl
+                  line_len = line_end - pos
+
+                  if line_len == 0
+                    # Empty line found (End of headers)
+                    # Move pos past the newline and exit
+                    pos = next_nl + 1
+                    break
+                  end
+
+                  if state == STATE_READ_FIRST_LINE
+                    if @is_req_header
+                      unpack_request_line(pkt.buf, pos, line_len)
                     else
-                      unpack_message_header(pkt.buf, line_start_pos, line_len)
+                      unpack_status_line(pkt.buf, pos, line_len)
                     end
 
-                    line_len = 0
-                    line_start_pos = pos + 1
-
+                    state = STATE_READ_MESSAGE_HEADERS
                   else
-                    line_len += 1
+                    unpack_message_header(pkt.buf, pos, line_len)
                   end
 
+                  # Move to the start of the next line
+                  pos = next_nl + 1
                 end
 
                 if state == STATE_READ_FIRST_LINE
@@ -257,11 +263,11 @@ module Baykit
               end
 
               def pack_request_line(acc)
-                acc.put_string(@method)
+                acc.put_bytes(@method)
                 acc.put_bytes(" ")
-                acc.put_string(@uri)
+                acc.put_bytes(@uri)
                 acc.put_bytes(" ")
-                acc.put_string(@version);
+                acc.put_bytes(@version)
                 acc.put_bytes(CharUtil::CRLF)
               end
 
@@ -276,9 +282,9 @@ module Baykit
 
                 # status
                 acc.put_bytes(" ")
-                acc.put_string(@status.to_s)
+                acc.put_bytes(@status.to_s)
                 acc.put_bytes(" ")
-                acc.put_string(desc)
+                acc.put_bytes(desc)
                 acc.put_bytes(CharUtil::CRLF)
               end
 
@@ -289,9 +295,9 @@ module Baykit
                 if !value.kind_of?(String)
                   raise RuntimeError.new("IllegalArgument: #{value}")
                 end
-                acc.put_string(name)
+                acc.put_bytes(name)
                 acc.put_bytes(":")
-                acc.put_string(value)
+                acc.put_bytes(value)
                 acc.put_bytes(CharUtil::CRLF)
               end
 

data/lib/baykit/bayserver/docker/http/h1/h1_inbound_handler.rb

@@ -99,13 +99,13 @@ module Baykit
             def send_res_headers(tur)
 
               # determine Connection header value
-              if tur.req.headers.get_connection() != Headers::CONNECTION_KEEP_ALIVE
+              if tur.req.headers.get_connection() != Headers::CONNECTION_KEEP_ALIVE && tur.req.headers.get_connection() != Headers::CONNECTION_UNKNOWN
                 # If client doesn't support "Keep-Alive", set "Close"
                 res_con = "Close"
               else
                 res_con = "Keep-Alive"
                 # Client supports "Keep-Alive"
-                if tur.res.headers.get_connection() != Headers::CONNECTION_KEEP_ALIVE
+                if tur.res.headers.get_connection() != Headers::CONNECTION_KEEP_ALIVE && tur.res.headers.get_connection() != Headers::CONNECTION_UNKNOWN
                   # If tours doesn't need "Keep-Alive"
                   if tur.res.headers.content_length() == -1
                     # If content-length not specified
@@ -139,7 +139,8 @@ module Baykit
               @protocol_handler.post(cmd, &callback)
             end
 
-            def send_end_tour(tur, keep_alive, &callback)
+            def send_end_tour(tur, &callback)
+              keep_alive = tur.res.headers.get_connection() == Headers::CONNECTION_KEEP_ALIVE
               BayLog.trace("%s sendEndTour: tur=%s keep=%s", ship, tur, keep_alive)
 
               # Send dummy end request command
@@ -175,7 +176,7 @@ module Baykit
               end
 
               tur.res.send_error(Tour::TOUR_ID_NOCHECK, HttpStatus::BAD_REQUEST, err.message, err)
-              true
+              false
             end
 
             ######################################################

data/lib/baykit/bayserver/docker/http/h1/h1_packet_unpacker.rb

@@ -68,50 +68,45 @@ module Baykit
               suspend = false
 
               if @state == STATE_READ_HEADERS
-                while pos < buf.length
-                  b = buf[pos]
-                  @tmp_buf.put_byte(b)
-                  pos += 1
-                  #@BayServer.info b + " " + b.codepoints[0].to_s + " pos=" + pos.to_s
-                  if b == CharUtil::CR
-                    next
-                  elsif b == CharUtil::LF
-                    if line_len == 0
-                      # empty line (all headers are read)
-                      pkt = @pkt_store.rent(H1Type::HEADER)
-                      pkt.new_data_accessor.put_bytes(@tmp_buf.bytes, 0, @tmp_buf.length)
-
-                      begin
-                        next_act = @cmd_upacker.packet_received(pkt)
-                      ensure
-                        @pkt_store.Return pkt
-                      end
-
-                      case next_act
-                      when NextSocketAction::CONTINUE, NextSocketAction::SUSPEND
-                        if @cmd_upacker.finished()
-                          change_state(STATE_END)
-                        else
-                          change_state(STATE_READ_CONTENT)
-                        end
-                      when NextSocketAction::CLOSE
-                        # Maybe error
-                        reset_state()
-                        return next_act
-                      else
-                        raise RuntimeError.new("Invalid next action: #{next_act}")
-                      end
-
-                      suspend = (next_act == NextSocketAction::SUSPEND)
-                      break
+
+                # Find end of headers (empty line)
+                # Look for \n\n (LF+LF) or \n\r\n (LF+CR+LF)
+                header_end_pos = buf.index("\n\r\n", pos) || buf.index("\n\n", pos)
+
+                if header_end_pos
+                  # Calculate total header length
+                  header_len = (buf[header_end_pos + 1] == "\r") ? header_end_pos + 3 : header_end_pos + 2
+
+                  # Batch copy all header bytes at once
+                  @tmp_buf.put(buf, pos, header_len - pos)
+                  pos = header_len
+
+                  # Move to packet processing
+                  pkt = @pkt_store.rent(H1Type::HEADER)
+                  pkt.new_data_accessor.put_bytes(@tmp_buf.bytes, 0, @tmp_buf.length)
+
+                  begin
+                    next_act = @cmd_upacker.packet_received(pkt)
+                  ensure
+                    @pkt_store.Return pkt
+                  end
+
+                  case next_act
+                  when NextSocketAction::CONTINUE, NextSocketAction::SUSPEND
+                    if @cmd_upacker.finished()
+                      change_state(STATE_END)
+                    else
+                      change_state(STATE_READ_CONTENT)
                     end
-                    line_len = 0
+                  when NextSocketAction::CLOSE
+                    # Maybe error
+                    reset_state()
+                    return next_act
                   else
-                    line_len += 1
-                  end
-                  if line_len >= MAX_LINE_LEN
-                    raise ProtocolException.new("Http/1 Line is too long")
+                    raise RuntimeError.new("Invalid next action: #{next_act}")
                   end
+
+                  suspend = (next_act == NextSocketAction::SUSPEND)
                 end
               end
 

data/lib/baykit/bayserver/docker/http/h2/command/cmd_continuation.rb

@@ -0,0 +1,58 @@
+require 'baykit/bayserver/docker/http/h2/package'
+
+#
+# HTTP/2 Continuation payload format
+#
+# +---------------------------------------------------------------+
+# |                   Header Block Fragment (*)                 ...
+# +---------------------------------------------------------------+
+#
+module Baykit
+  module BayServer
+    module Docker
+      module Http
+        module H2
+          module Command
+
+            class CmdContinuation < Baykit::BayServer::Docker::Http::H2::H2Command
+              include Baykit::BayServer::Docker::Http::H2
+
+              #
+              # This class refers external byte array, so this IS NOT mutable
+              #
+              attr :start
+              attr :length
+              attr :data
+
+              def initialize(stream_id, flags = nil)
+                super(H2Type::CONTINUATION, stream_id, flags)
+              end
+
+              def unpack(pkt)
+                super
+                @data = pkt.buf
+                @start = pkt.header_len
+                @length = pkt.data_len()
+              end
+
+              def pack(pkt)
+                acc = pkt.new_data_accessor()
+                if @flags.padded?
+                  raise RuntimeError.new("Padding not supported")
+                end
+                acc.put_bytes(@data, @start, @length)
+                super
+              end
+
+              def handle(cmd_handler)
+                return cmd_handler.handle_continuation(self)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
+

data/lib/baykit/bayserver/docker/http/h2/command/cmd_headers.rb

@@ -25,6 +25,13 @@ module Baykit
             class CmdHeaders < Baykit::BayServer::Docker::Http::H2::H2Command
               include Baykit::BayServer::Docker::Http::H2
 
+              #
+              # This class refers external byte array, so this IS NOT mutable
+              #
+              attr_accessor :start
+              attr_accessor :length
+              attr_accessor :data
+
               attr :pad_length
               attr_accessor :excluded
               attr :stream_dependency
@@ -42,7 +49,7 @@ module Baykit
 
               def unpack(pkt)
                 super
-                acc = pkt.new_h2_data_accessor
+                acc = pkt.new_data_accessor
 
                 if pkt.flags.padded?
                   @pad_length = acc.get_byte
@@ -53,11 +60,13 @@ module Baykit
                   @stream_dependency = H2Packet.extract_int31(val)
                   @weight = acc.get_byte
                 end
-                read_header_block(acc, pkt.data_len())
+                @data = pkt.buf
+                @start = pkt.header_len + acc.pos
+                @length = pkt.data_len - acc.pos
               end
 
               def pack(pkt)
-                acc = pkt.new_h2_data_accessor
+                acc = pkt.new_data_accessor
 
                 if @flags.padded?
                   acc.put_byte(@pad_length)
@@ -67,7 +76,8 @@ module Baykit
                   acc.put_int(H2Packet.make_stream_dependency32(@excluded, @stream_dependency))
                   acc.put_byte(@weight)
                 end
-                write_header_block(acc)
+
+                acc.put_bytes(@data, @start, @length)
                 super
               end
 
@@ -75,28 +85,6 @@ module Baykit
                 return cmd_handler.handle_headers(self)
               end
 
-              def read_header_block(acc, len)
-                while acc.pos < len
-                  blk = HeaderBlock.unpack(acc)
-                  #if(BayLog.trace_mode?)
-                  #  BayLog.trace "h2: Read header block: #{blk}"
-                  #end
-                  @header_blocks << blk
-                end
-              end
-
-              def write_header_block(acc)
-                @header_blocks.each do |blk|
-                  #if(BayLog.trace_mode?)
-                  #  BayLog.trace "h2: Write header block: #{blk}"
-                  #end
-                  HeaderBlock.pack(blk, acc)
-                end
-              end
-
-              def add_header_block(blk)
-                @header_blocks.append(blk)
-              end
             end
           end
         end

data/lib/baykit/bayserver/docker/http/h2/command/cmd_preface.rb

@@ -33,7 +33,7 @@ module Baykit
               end
 
               def pack(pkt)
-                acc = pkt.new_h2_data_accessor()
+                acc = pkt.new_data_accessor()
                 acc.put_bytes(PREFACE_BYTES)
               end
 

data/lib/baykit/bayserver/docker/http/h2/command/package.rb

@@ -7,3 +7,4 @@ require 'baykit/bayserver/docker/http/h2/command/cmd_priority'
 require 'baykit/bayserver/docker/http/h2/command/cmd_rst_stream'
 require 'baykit/bayserver/docker/http/h2/command/cmd_settings'
 require 'baykit/bayserver/docker/http/h2/command/cmd_window_update'
+require 'baykit/bayserver/docker/http/h2/command/cmd_continuation'

data/lib/baykit/bayserver/docker/http/h2/h2_command_handler.rb

@@ -41,6 +41,10 @@ module Baykit
             def handle_rst_stream(cmd)
               raise NotImplementedError.new
             end
+
+            def handle_continuation(cmd)
+              raise NotImplementedError.new
+            end
           end
         end
       end

data/lib/baykit/bayserver/docker/http/h2/h2_command_unpacker.rb

@@ -54,6 +54,9 @@ module Baykit
               when H2Type::RST_STREAM
                 cmd = CmdRstStream.new(pkt.stream_id, pkt.flags)
 
+              when H2Type::CONTINUATION
+                cmd = CmdContinuation.new(pkt.stream_id, pkt.flags)
+
               else
                 reset()
                 raise RuntimeError.new("Invalid Packet: #{pkt}")