http-2-next 0.2.5 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4bc850ae42e15d3e2bebfa09e18223b29c0165ac5a6d4fcf5f3249c200319ba
-  data.tar.gz: 802fefcc76aa95b7bbf3893b750d018953466780d1efc22f25e10d644214c2ef
+  metadata.gz: 2d8116cb645b3a24de8f06bd6e1d6e14ba75c57e28f6a4daf9e999bab456ac5f
+  data.tar.gz: 9f97d8e2748411a121e1ca5e7b1de77298371638579829a5d2a5881d353c8ff3
 SHA512:
-  metadata.gz: bc1ce68818a4f93e93744834e76ec701c99adabce55f5045f7c1caa3969e8586e681c4f77355138cb05c3e4f6c5eb036ce26d3582b0ca3ce80a14ab99cd1d0dd
-  data.tar.gz: 855c24d7a79eb56808ae0993b23a5115ff3f19889da8be5ebb1db8354ed138c5728047d9416cc48ff3b8a27577b551a357b1a4aa1e7cbda107e5c977a868b351
+  metadata.gz: 61248cc2f85d2b60d0edf3a8a4b0643836a44c66a7ded2382c86010a08da519290dba36973599ed65fea11a5727e3b8a6576c5a82782c38188e5f83adf098c82
+  data.tar.gz: 8a61192c8c2f8c1dfbf830254eab786ebb0e59304da1e23f791911201cf08e8c93f1546831f06159e334888a05e72a0c42d3a003a998be357c05ee9f3f00e74a

data/README.md

@@ -2,7 +2,7 @@
 
 [![Gem Version](https://badge.fury.io/rb/http-2-next.svg)](http://rubygems.org/gems/http-2-next)
 [![Build status](https://gitlab.com/honeyryderchuck/http-2-next/badges/master/pipeline.svg)](https://gitlab.com/honeyryderchuck/http-2-next/commits/master)
-[![coverage report](https://gitlab.com/honeyryderchuck/http-2-next/badges/master/coverage.svg)](https://honeyryderchuck.gitlab.io/http-2-next/coverage/#_AllFiles)
+[![coverage report](https://gitlab.com/honeyryderchuck/http-2-next/badges/master/coverage.svg?job=coverage)](https://honeyryderchuck.gitlab.io/http-2-next/coverage/#_AllFiles)
 
 **Attention!** This is a fork of the [http-2](https://github.com/igrigorik/http-2) gem.
 

data/lib/http/2/next.rb

@@ -4,11 +4,8 @@ require "http/2/next/version"
 require "http/2/next/extensions"
 require "http/2/next/error"
 require "http/2/next/emitter"
-require "http/2/next/buffer"
 require "http/2/next/flow_buffer"
-require "http/2/next/huffman"
-require "http/2/next/huffman_statemachine"
-require "http/2/next/compressor"
+require "http/2/next/header"
 require "http/2/next/framer"
 require "http/2/next/connection"
 require "http/2/next/client"

data/lib/http/2/next/connection.rb

@@ -51,18 +51,19 @@ module HTTP2Next
     include Emitter
     include Error
 
+    using StringExtensions
+
     # Connection state (:new, :closed).
     attr_reader :state
 
     # Size of current connection flow control window (by default, set to
     # infinity, but is automatically updated on receipt of peer settings).
     attr_reader :local_window
-    attr_reader :remote_window
+    attr_reader :remote_window, :remote_settings
     alias window local_window
 
     # Current settings value for local and peer
     attr_reader :local_settings
-    attr_reader :remote_settings
 
     # Pending settings value
     #  Sent but not ack'ed settings
@@ -72,6 +73,9 @@ module HTTP2Next
     # are not counted towards the stream limit).
     attr_reader :active_stream_count
 
+    # Max number of streams that can be in-transit in this connection.
+    attr_writer :max_streams
+
     # Initializes new connection object.
     #
     def initialize(settings = {})
@@ -82,6 +86,7 @@ module HTTP2Next
       @decompressor = Header::Decompressor.new(settings)
 
       @active_stream_count = 0
+      @max_streams = nil
       @last_activated_stream = 0
       @last_stream_id = 0
       @streams = {}
@@ -95,12 +100,13 @@ module HTTP2Next
       @remote_window_limit = @remote_settings[:settings_initial_window_size]
       @remote_window = @remote_window_limit
 
-      @recv_buffer = Buffer.new
+      @recv_buffer = "".b
       @continuation = []
       @error = nil
 
       @h2c_upgrade = nil
       @closed_since = nil
+      @received_frame = false
     end
 
     def closed?
@@ -114,7 +120,7 @@ module HTTP2Next
     # @param parent [Stream]
     def new_stream(**args)
       raise ConnectionClosed if @state == :closed
-      raise StreamLimitExceeded if @active_stream_count >= @remote_settings[:settings_max_concurrent_streams]
+      raise StreamLimitExceeded if @active_stream_count >= (@max_streams || @remote_settings[:settings_max_concurrent_streams])
 
       connection_error(:protocol_error, msg: "id is smaller than previous") if @stream_id < @last_activated_stream
 
@@ -155,7 +161,7 @@ module HTTP2Next
       send(type: :goaway, last_stream: last_stream,
            error: error, payload: payload)
       @state = :closed
-      @closed_since = Time.now
+      @closed_since = Process.clock_gettime(Process::CLOCK_MONOTONIC)
     end
 
     # Sends a WINDOW_UPDATE frame to the peer.
@@ -172,7 +178,7 @@ module HTTP2Next
     # @param settings [Array or Hash]
     def settings(payload)
       payload = payload.to_a
-      connection_error if validate_settings(@local_role, payload)
+      validate_settings(@local_role, payload)
       @pending_settings << payload
       send(type: :settings, stream: 0, payload: payload)
       @pending_settings << payload
@@ -209,6 +215,11 @@ module HTTP2Next
       end
 
       while (frame = @framer.parse(@recv_buffer))
+        if is_a?(Client) && !@received_frame
+          connection_error(:protocol_error, msg: "didn't receive settings") if frame[:type] != :settings
+          @received_frame = true
+        end
+
         # Implementations MUST discard frames
         # that have unknown or unsupported types.
         if frame[:type].nil?
@@ -236,7 +247,7 @@ module HTTP2Next
           @continuation.clear
 
           frame.delete(:length)
-          frame[:payload] = Buffer.new(payload)
+          frame[:payload] = payload
           frame[:flags] << :end_headers
         end
 
@@ -469,7 +480,7 @@ module HTTP2Next
           # the connection, although a new connection can be established
           # for new streams.
           @state = :closed
-          @closed_since = Time.now
+          @closed_since = Process.clock_gettime(Process::CLOCK_MONOTONIC)
           emit(:goaway, frame[:last_stream], frame[:error], frame[:payload])
         when :altsvc
           # 4.  The ALTSVC HTTP/2 Frame
@@ -494,7 +505,7 @@ module HTTP2Next
         when :ping
           ping_management(frame)
         else
-          connection_error if (Time.now - @closed_since) > 15
+          connection_error if (Process.clock_gettime(Process::CLOCK_MONOTONIC) - @closed_since) > 15
         end
       else
         connection_error
@@ -517,8 +528,6 @@ module HTTP2Next
     def validate_settings(role, settings)
       settings.each do |key, v|
         case key
-        when :settings_header_table_size
-          # Any value is valid
         when :settings_enable_push
           case role
           when :server
@@ -526,32 +535,41 @@ module HTTP2Next
             # Clients MUST reject any attempt to change the
             # SETTINGS_ENABLE_PUSH setting to a value other than 0 by treating the
             # message as a connection error (Section 5.4.1) of type PROTOCOL_ERROR.
-            return ProtocolError.new("invalid #{key} value") unless v.zero?
+            next if v.zero?
+
+            connection_error(:protocol_error, msg: "invalid #{key} value")
           when :client
             # Any value other than 0 or 1 MUST be treated as a
             # connection error (Section 5.4.1) of type PROTOCOL_ERROR.
-            return ProtocolError.new("invalid #{key} value") unless v.zero? || v == 1
+            next if v.zero? || v == 1
+
+            connection_error(:protocol_error, msg: "invalid #{key} value")
           end
-        when :settings_max_concurrent_streams
-          # Any value is valid
         when :settings_initial_window_size
           # Values above the maximum flow control window size of 2^31-1 MUST
           # be treated as a connection error (Section 5.4.1) of type
           # FLOW_CONTROL_ERROR.
-          return FlowControlError.new("invalid #{key} value") unless v <= 0x7fffffff
+          next if v <= 0x7fffffff
+
+          connection_error(:flow_control_error, msg: "invalid #{key} value")
         when :settings_max_frame_size
           # The initial value is 2^14 (16,384) octets.  The value advertised
           # by an endpoint MUST be between this initial value and the maximum
           # allowed frame size (2^24-1 or 16,777,215 octets), inclusive.
           # Values outside this range MUST be treated as a connection error
           # (Section 5.4.1) of type PROTOCOL_ERROR.
-          return ProtocolError.new("invalid #{key} value") unless v >= 16_384 && v <= 16_777_215
-        when :settings_max_header_list_size
+          next if v >= 16_384 && v <= 16_777_215
+
+          connection_error(:protocol_error, msg: "invalid #{key} value")
+          # when :settings_max_concurrent_streams
+          # Any value is valid
+          # when :settings_header_table_size
+          # Any value is valid
+          # when :settings_max_header_list_size
           # Any value is valid
           # else # ignore unknown settings
         end
       end
-      nil
     end
 
     # Update connection settings based on parameters set by the peer.
@@ -568,8 +586,7 @@ module HTTP2Next
                          # Process pending settings we have sent.
                          [@pending_settings.shift, :local]
                        else
-                         check = validate_settings(@remote_role, frame[:payload])
-                         connection_error(check) if check
+                         validate_settings(@remote_role, frame[:payload])
                          [frame[:payload], :remote]
                        end
 
@@ -656,7 +673,7 @@ module HTTP2Next
     #
     # @param frame [Hash]
     def decode_headers(frame)
-      frame[:payload] = @decompressor.decode(frame[:payload], frame) if frame[:payload].is_a? Buffer
+      frame[:payload] = @decompressor.decode(frame[:payload], frame) if frame[:payload].is_a?(String)
     rescue CompressionError => e
       connection_error(:compression_error, e: e)
     rescue ProtocolError => e
@@ -671,15 +688,16 @@ module HTTP2Next
     # @return [Array of Frame]
     def encode_headers(frame)
       payload = frame[:payload]
-      payload = @compressor.encode(payload) unless payload.is_a? Buffer
+      payload = @compressor.encode(payload) unless payload.is_a?(String)
 
       frames = []
 
-      while payload.bytesize > 0
+      while payload && payload.bytesize > 0
         cont = frame.dup
         cont[:type] = :continuation
         cont[:flags] = []
-        cont[:payload] = payload.slice!(0, @remote_settings[:settings_max_frame_size])
+        cont[:payload] = payload.byteslice(0, @remote_settings[:settings_max_frame_size])
+        payload = payload.byteslice(@remote_settings[:settings_max_frame_size]..-1)
         frames << cont
       end
       if frames.empty?
@@ -703,10 +721,10 @@ module HTTP2Next
     # @param priority [Integer]
     # @param window [Integer]
     # @param parent [Stream]
-    def activate_stream(id: nil, **args)
+    def activate_stream(id:, **args)
       connection_error(msg: "Stream ID already exists") if @streams.key?(id)
 
-      raise StreamLimitExceeded if @active_stream_count >= @local_settings[:settings_max_concurrent_streams]
+      raise StreamLimitExceeded if @active_stream_count >= (@max_streams || @local_settings[:settings_max_concurrent_streams])
 
       stream = Stream.new(connection: self, id: id, **args)
 
@@ -720,11 +738,11 @@ module HTTP2Next
         # References to such streams will be purged whenever another stream
         # is closed, with a minimum of 15s RTT time window.
         @streams_recently_closed.reject! do |stream_id, v|
-          to_delete = (Time.now - v) > 15
+          to_delete = (Process.clock_gettime(Process::CLOCK_MONOTONIC) - v) > 15
           @streams.delete stream_id if to_delete
           to_delete
         end
-        @streams_recently_closed[id] = Time.now
+        @streams_recently_closed[id] = Process.clock_gettime(Process::CLOCK_MONOTONIC)
       end
 
       stream.on(:promise, &method(:promise)) if is_a? Server
@@ -742,7 +760,7 @@ module HTTP2Next
 
     def verify_pseudo_headers(frame, mandatory_headers)
       headers = frame[:payload]
-      return if headers.is_a?(Buffer)
+      return if headers.is_a?(String)
 
       pseudo_headers = headers.take_while do |field, value|
         # use this loop to validate pseudo-headers

data/lib/http/2/next/emitter.rb

@@ -9,19 +9,18 @@ module HTTP2Next
     #
     # @param event [Symbol]
     # @param block [Proc] callback function
-    def add_listener(event, &block)
+    def on(event, &block)
       raise ArgumentError, "must provide callback" unless block_given?
 
       listeners(event.to_sym).push block
     end
-    alias on add_listener
 
     # Subscribe to next event (at most once) for specified type.
     #
     # @param event [Symbol]
     # @param block [Proc] callback function
     def once(event, &block)
-      add_listener(event) do |*args, &callback|
+      on(event) do |*args, &callback|
         block.call(*args, &callback)
         :delete
       end
@@ -34,7 +33,7 @@ module HTTP2Next
     # @param block [Proc] callback function
     def emit(event, *args, &block)
       listeners(event).delete_if do |cb|
-        cb.call(*args, &block) == :delete
+        :delete == cb.call(*args, &block) # rubocop:disable Style/YodaCondition
       end
     end
 

data/lib/http/2/next/error.rb

@@ -10,6 +10,7 @@ module HTTP2Next
 
     class Error < StandardError
       def self.inherited(klass)
+        super
         type = klass.name.split("::").last
         type = type.gsub(/([^\^])([A-Z])/, '\1_\2').downcase.to_sym
         HTTP2Next::Error.types[type] = klass

data/lib/http/2/next/extensions.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module HTTP2Next
-  module Extensions
+  module RegexpExtensions
     unless Regexp.method_defined?(:match?)
       refine Regexp do
         def match?(*args)
@@ -10,4 +10,29 @@ module HTTP2Next
       end
     end
   end
+
+  module StringExtensions
+    refine String do
+      def read(n)
+        chunk = byteslice(0..n - 1)
+        remaining = byteslice(n..-1)
+        remaining ? replace(remaining) : clear
+        chunk
+      end
+
+      def read_uint32
+        read(4).unpack1("N")
+      end
+
+      def shift_byte
+        read(1).ord
+      end
+
+      unless String.method_defined?(:unpack1)
+        def unpack1(format)
+          unpack(format).first
+        end
+      end
+    end
+  end
 end

data/lib/http/2/next/flow_buffer.rb

@@ -73,6 +73,7 @@ module HTTP2Next
 
       while (frame = send_buffer.retrieve(@remote_window))
 
+        # puts "#{self.class} -> #{@remote_window}"
         sent = frame[:payload].bytesize
 
         manage_state(frame) do
@@ -137,10 +138,13 @@ module HTTP2Next
 
         # Split frame so that it fits in the window
         # TODO: consider padding!
-        frame[:payload] = payload.slice!(0, window_size)
-        frame[:length] = frame[:payload].bytesize
-        chunk[:length]  = payload.bytesize
+        frame_bytes = payload.byteslice(0, window_size)
+        payload = payload.byteslice(window_size..-1)
+
+        frame[:payload] = frame_bytes
+        frame[:length] = frame_bytes.bytesize
         chunk[:payload] = payload
+        chunk[:length]  = payload.bytesize
 
         # if no longer last frame in sequence...
         frame[:flags] -= [:end_stream] if end_stream

data/lib/http/2/next/framer.rb

@@ -4,6 +4,8 @@ module HTTP2Next
   # Performs encoding, decoding, and validation of binary HTTP/2 frames.
   #
   class Framer
+    using StringExtensions
+
     include Error
 
     # Default value of max frame size (16384 bytes)
@@ -154,9 +156,10 @@ module HTTP2Next
     # Decodes common 9-byte header.
     #
     # @param buf [Buffer]
+    # @return [Hash] the corresponding frame
     def read_common_header(buf)
       frame = {}
-      len_hi, len_lo, type, flags, stream = buf.slice(0, 9).unpack(HEADERPACK)
+      len_hi, len_lo, type, flags, stream = buf.byteslice(0, 9).unpack(HEADERPACK)
 
       frame[:length] = (len_hi << FRAME_LENGTH_HISHIFT) | len_lo
       frame[:type], = FRAME_TYPES.find { |_t, pos| type == pos }
@@ -175,7 +178,7 @@ module HTTP2Next
     #
     # @param frame [Hash]
     def generate(frame)
-      bytes  = Buffer.new
+      bytes  = "".b
       length = 0
 
       frame[:flags] ||= []
@@ -184,6 +187,7 @@ module HTTP2Next
       case frame[:type]
       when :data
         bytes << frame[:payload]
+        bytes.force_encoding(Encoding::BINARY)
         length += frame[:payload].bytesize
 
       when :headers
@@ -221,7 +225,7 @@ module HTTP2Next
         raise CompressionError, "Invalid stream ID (#{frame[:stream]})" if (frame[:stream]).nonzero?
 
         frame[:payload].each do |(k, v)|
-          if k.is_a? Integer
+          if k.is_a? Integer # rubocop:disable Style/GuardClause
             DEFINED_SETTINGS.value?(k) || next
           else
             k = DEFINED_SETTINGS[k]
@@ -333,10 +337,10 @@ module HTTP2Next
     #
     # @param buf [Buffer]
     def parse(buf)
-      return nil if buf.size < 9
+      return if buf.size < 9
 
       frame = read_common_header(buf)
-      return nil if buf.size < 9 + frame[:length]
+      return if buf.size < 9 + frame[:length]
 
       raise ProtocolError, "payload too large" if frame[:length] > @local_max_frame_size
 
@@ -353,11 +357,11 @@ module HTTP2Next
       if FRAME_TYPES_WITH_PADDING.include?(frame[:type])
         padded = frame[:flags].include?(:padded)
         if padded
-          padlen = payload.read(1).unpack(UINT8).first
+          padlen = payload.read(1).unpack1(UINT8)
           frame[:padding] = padlen + 1
           raise ProtocolError, "padding too long" if padlen > payload.bytesize
 
-          payload.slice!(-padlen, padlen) if padlen > 0
+          payload = payload.byteslice(0, payload.bytesize - padlen) if padlen > 0
           frame[:length] -= frame[:padding]
           frame[:flags].delete(:padded)
         end
@@ -371,7 +375,9 @@ module HTTP2Next
           e_sd = payload.read_uint32
           frame[:dependency] = e_sd & RBIT
           frame[:exclusive] = (e_sd & EBIT) != 0
-          frame[:weight] = payload.getbyte + 1
+          weight = payload.byteslice(0, 1).ord + 1
+          frame[:weight] = weight
+          payload = payload.byteslice(1..-1)
         end
         frame[:payload] = payload.read(frame[:length])
       when :priority
@@ -380,7 +386,9 @@ module HTTP2Next
         e_sd = payload.read_uint32
         frame[:dependency] = e_sd & RBIT
         frame[:exclusive] = (e_sd & EBIT) != 0
-        frame[:weight] = payload.getbyte + 1
+        weight = payload.byteslice(0, 1).ord + 1
+        frame[:weight] = weight
+        payload = payload.byteslice(1..-1)
       when :rst_stream
         raise FrameSizeError, "Invalid length for RST_STREAM (#{frame[:length]} != 4)" if frame[:length] != 4
 
@@ -395,7 +403,7 @@ module HTTP2Next
         raise ProtocolError, "Invalid stream ID (#{frame[:stream]})" if (frame[:stream]).nonzero?
 
         (frame[:length] / 6).times do
-          id  = payload.read(2).unpack(UINT16).first
+          id  = payload.read(2).unpack1(UINT16)
           val = payload.read_uint32
 
           # Unsupported or unrecognized settings MUST be ignored.
@@ -425,10 +433,12 @@ module HTTP2Next
       when :altsvc
         frame[:max_age], frame[:port] = payload.read(6).unpack(UINT32 + UINT16)
 
-        len = payload.getbyte
+        len = payload.byteslice(0, 1).ord
+        payload = payload.byteslice(1..-1)
         frame[:proto] = payload.read(len) if len > 0
 
-        len = payload.getbyte
+        len = payload.byteslice(0, 1).ord
+        payload = payload.byteslice(1..-1)
         frame[:host] = payload.read(len) if len > 0
 
         frame[:origin] = payload.read(payload.size) unless payload.empty?
@@ -437,7 +447,7 @@ module HTTP2Next
         origins = []
 
         until payload.empty?
-          len = payload.read(2).unpack(UINT16).first
+          len = payload.read(2).unpack1(UINT16)
           origins << payload.read(len)
         end
 
@@ -452,17 +462,16 @@ module HTTP2Next
 
     def pack_error(e)
       unless e.is_a? Integer
-        raise CompressionError, "Unknown error ID for #{e}" if DEFINED_ERRORS[e].nil?
-
         e = DEFINED_ERRORS[e]
+
+        raise CompressionError, "Unknown error ID for #{e}" unless e
       end
 
       [e].pack(UINT32)
     end
 
     def unpack_error(error)
-      name, = DEFINED_ERRORS.find { |_name, v| v == error }
-      name || error
+      DEFINED_ERRORS.key(error) || error
     end
   end
 end