http-2 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96271a021aa473e7c555c6ceca6509f30e4ad457051e3971304c5a841afe4ca6
-  data.tar.gz: 5f2284ff6211f414291337d4efe260fc52bb9e18ccdb8bf19408ae781469994c
+  metadata.gz: c96822381e28e32127984c2dbb7b25b3ad5dd87d69283a752378a9f8778c72ae
+  data.tar.gz: beb68a1eb2670d1d0b742224b5ad65bd2bc299656433b120ff31299a481297ce
 SHA512:
-  metadata.gz: 6a3f9b4f1a98f232405b85559c91d976c0712defe2cfe1e1ef4468bc81b7e278abd162f3e0de8828dddcdfaff11808a0cab7c794353f5224303eb8b00a4b44ec
-  data.tar.gz: e14c1ec4652af944dfa791dacae8af519982c04b652b9ef352a1aa2377a15c80f829a2654da7c6e556680d522c7405137e4e5ab24dcb68e196eeb41e5ad54a18
+  metadata.gz: 173e0163e2b05ff3eefdfcc420f8c3913c97702873964ef6c653f0329726443c4c10d73d7ffff31583b06567ef12c8f6545eae0f3d32c52d9b13d98322c09e32
+  data.tar.gz: 43b38b2bdd3ed6ac90382b98c96b03fd76edefbbf4a385c67c3c8db67e6f755382f09c8a3af848a1d8ed55335ad2925d05793ad71c16c5bb831b07f86e0228be

data/lib/http/2/connection.rb

@@ -52,8 +52,7 @@ module HTTP2
     include FlowBuffer
     include Emitter
     include Error
-
-    using StringExtensions
+    include BufferUtils
 
     # Connection state (:new, :closed).
     attr_reader :state
@@ -202,7 +201,7 @@ module HTTP2
           raise HandshakeError unless CONNECTION_PREFACE_MAGIC.start_with? @recv_buffer
 
           return # maybe next time
-        elsif @recv_buffer.read(24) == CONNECTION_PREFACE_MAGIC
+        elsif read_str(@recv_buffer, 24) == CONNECTION_PREFACE_MAGIC
           # MAGIC is OK.  Send our settings
           @state = :waiting_connection_preface
           payload = @local_settings.reject { |k, v| v == SPEC_DEFAULT_CONNECTION_SETTINGS[k] }

data/lib/http/2/extensions.rb

@@ -1,24 +1,22 @@
 # frozen_string_literal: true
 
 module HTTP2
-  module StringExtensions
-    refine String do
-      def read(n)
-        return "".b if n == 0
+  module BufferUtils
+    def read_str(str, n)
+      return "".b if n == 0
 
-        chunk = byteslice(0..n - 1)
-        remaining = byteslice(n..-1)
-        remaining ? replace(remaining) : clear
-        chunk
-      end
+      chunk = str.byteslice(0..n - 1)
+      remaining = str.byteslice(n..-1)
+      remaining ? str.replace(remaining) : str.clear
+      chunk
+    end
 
-      def read_uint32
-        read(4).unpack1("N")
-      end
+    def read_uint32(str)
+      read_str(str, 4).unpack1("N")
+    end
 
-      def shift_byte
-        read(1).ord
-      end
+    def shift_byte(str)
+      read_str(str, 1).ord
     end
   end
 

data/lib/http/2/framer.rb

@@ -4,10 +4,9 @@ module HTTP2
   # Performs encoding, decoding, and validation of binary HTTP/2 frames.
   #
   class Framer
-    using StringExtensions
-
     include Error
     include PackingExtensions
+    include BufferUtils
 
     # Default value of max frame size (16384 bytes)
     DEFAULT_MAX_FRAME_SIZE = 2 << 13
@@ -165,7 +164,7 @@ module HTTP2
       frame[:type], = FRAME_TYPES.find { |_t, pos| type == pos }
       if frame[:type]
         frame[:flags] = FRAME_FLAGS[frame[:type]].each_with_object([]) do |(name, pos), acc|
-          acc << name if (flags & (1 << pos)) > 0
+          acc << name if flags.anybits?((1 << pos))
         end
       end
 
@@ -344,8 +343,8 @@ module HTTP2
 
       raise ProtocolError, "payload too large" if frame[:length] > @local_max_frame_size
 
-      buf.read(9)
-      payload = buf.read(frame[:length])
+      read_str(buf, 9)
+      payload = read_str(buf, frame[:length])
 
       # Implementations MUST discard frames
       # that have unknown or unsupported types.
@@ -357,7 +356,7 @@ module HTTP2
       if FRAME_TYPES_WITH_PADDING.include?(frame[:type])
         padded = frame[:flags].include?(:padded)
         if padded
-          padlen = payload.read(1).unpack1(UINT8)
+          padlen = read_str(payload, 1).unpack1(UINT8)
           frame[:padding] = padlen + 1
           raise ProtocolError, "padding too long" if padlen > payload.bytesize
 
@@ -369,30 +368,30 @@ module HTTP2
 
       case frame[:type]
       when :data, :ping, :continuation
-        frame[:payload] = payload.read(frame[:length])
+        frame[:payload] = read_str(payload, frame[:length])
       when :headers
         if frame[:flags].include? :priority
-          e_sd = payload.read_uint32
+          e_sd = read_uint32(payload)
           frame[:dependency] = e_sd & RBIT
-          frame[:exclusive] = (e_sd & EBIT) != 0
+          frame[:exclusive] = e_sd.anybits?(EBIT)
           weight = payload.byteslice(0, 1).ord + 1
           frame[:weight] = weight
           payload = payload.byteslice(1..-1)
         end
-        frame[:payload] = payload.read(frame[:length])
+        frame[:payload] = read_str(payload, frame[:length])
       when :priority
         raise FrameSizeError, "Invalid length for PRIORITY_STREAM (#{frame[:length]} != 5)" if frame[:length] != 5
 
-        e_sd = payload.read_uint32
+        e_sd = read_uint32(payload)
         frame[:dependency] = e_sd & RBIT
-        frame[:exclusive] = (e_sd & EBIT) != 0
+        frame[:exclusive] = e_sd.anybits?(EBIT)
         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
 
-        frame[:error] = unpack_error payload.read_uint32
+        frame[:error] = unpack_error read_uint32(payload)
 
       when :settings
         # NOTE: frame[:length] might not match the number of frame[:payload]
@@ -403,8 +402,8 @@ module HTTP2
         raise ProtocolError, "Invalid stream ID (#{frame[:stream]})" if (frame[:stream]).nonzero?
 
         (frame[:length] / 6).times do
-          id  = payload.read(2).unpack1(UINT16)
-          val = payload.read_uint32
+          id  = read_str(payload, 2).unpack1(UINT16)
+          val = read_uint32(payload)
 
           # Unsupported or unrecognized settings MUST be ignored.
           # Here we send it along.
@@ -412,39 +411,39 @@ module HTTP2
           frame[:payload] << [name, val] if name
         end
       when :push_promise
-        frame[:promise_stream] = payload.read_uint32 & RBIT
-        frame[:payload] = payload.read(frame[:length])
+        frame[:promise_stream] = read_uint32(payload) & RBIT
+        frame[:payload] = read_str(payload, frame[:length])
       when :goaway
-        frame[:last_stream] = payload.read_uint32 & RBIT
-        frame[:error] = unpack_error payload.read_uint32
+        frame[:last_stream] = read_uint32(payload) & RBIT
+        frame[:error] = unpack_error read_uint32(payload)
 
         size = frame[:length] - 8 # for last_stream and error
-        frame[:payload] = payload.read(size) if size > 0
+        frame[:payload] = read_str(payload, size) if size > 0
       when :window_update
         if frame[:length] % 4 != 0
           raise FrameSizeError, "Invalid length for WINDOW_UPDATE (#{frame[:length]} not multiple of 4)"
         end
 
-        frame[:increment] = payload.read_uint32 & RBIT
+        frame[:increment] = read_uint32(payload) & RBIT
       when :altsvc
-        frame[:max_age], frame[:port] = payload.read(6).unpack(UINT32 + UINT16)
+        frame[:max_age], frame[:port] = read_str(payload, 6).unpack(UINT32 + UINT16)
 
         len = payload.byteslice(0, 1).ord
         payload = payload.byteslice(1..-1)
-        frame[:proto] = payload.read(len) if len > 0
+        frame[:proto] = read_str(payload, len) if len > 0
 
         len = payload.byteslice(0, 1).ord
         payload = payload.byteslice(1..-1)
-        frame[:host] = payload.read(len) if len > 0
+        frame[:host] = read_str(payload, len) if len > 0
 
-        frame[:origin] = payload.read(payload.size) unless payload.empty?
+        frame[:origin] = read_str(payload, payload.size) unless payload.empty?
 
       when :origin
         origins = []
 
         until payload.empty?
-          len = payload.read(2).unpack1(UINT16)
-          origins << payload.read(len)
+          len = read_str(payload, 2).unpack1(UINT16)
+          origins << read_str(payload, len)
         end
 
         frame[:payload] = origins

data/lib/http/2/header/decompressor.rb

@@ -2,7 +2,6 @@
 
 module HTTP2
   module Header
-    using StringExtensions
     # Responsible for decoding received headers and maintaining compression
     # context of the opposing peer. Decompressor must be initialized with
     # appropriate starting context based on local role: client or server.
@@ -12,6 +11,7 @@ module HTTP2
     #   client_role = Decompressor.new(:response)
     class Decompressor
       include Error
+      include BufferUtils
 
       # @param options [Hash] decoding options.  Only :table_size is effective.
       def initialize(options = {})
@@ -31,15 +31,15 @@ module HTTP2
       # @return [Integer]
       def integer(buf, n)
         limit = (2**n) - 1
-        i = n.zero? ? 0 : (buf.shift_byte & limit)
+        i = n.zero? ? 0 : (shift_byte(buf) & limit)
 
         m = 0
         if i == limit
-          while (byte = buf.shift_byte)
+          while (byte = shift_byte(buf))
             i += ((byte & 127) << m)
             m += 7
 
-            break if (byte & 128).zero?
+            break if byte.nobits?(128)
           end
         end
 
@@ -54,9 +54,9 @@ module HTTP2
       def string(buf)
         raise CompressionError, "invalid header block fragment" if buf.empty?
 
-        huffman = (buf.getbyte(0) & 0x80) == 0x80
+        huffman = buf.getbyte(0).allbits?(0x80)
         len = integer(buf, 7)
-        str = buf.read(len)
+        str = read_str(buf, len)
         raise CompressionError, "string too short" unless str.bytesize == len
 
         str = Huffman.new.decode(str) if huffman

data/lib/http/2/header/encoding_context.rb

@@ -75,12 +75,14 @@ module HTTP2
         ["vary",                        ""],
         ["via",                         ""],
         ["www-authenticate",            ""]
-      ].each { |pair| pair.each(&:freeze).freeze }.freeze
-
-      STATIC_TABLE_BY_FIELD = STATIC_TABLE
-                              .each_with_object({})
-                              .with_index { |((field, value), hs), idx| (hs[field] ||= []) << [idx, value] }
-                              .each { |pair| pair.each(&:freeze).freeze }.freeze
+      ].each(&:freeze).freeze
+
+      STATIC_TABLE_BY_FIELD =
+        STATIC_TABLE
+        .each_with_object({})
+        .with_index { |((field, value), hs), idx| (hs[field] ||= []) << [idx, value].freeze }
+        .each_value(&:freeze)
+        .freeze
 
       STATIC_TABLE_SIZE = STATIC_TABLE.size
 

data/lib/http/2/header/huffman.rb

@@ -10,8 +10,6 @@ module HTTP2
   module Header
     # Huffman encoder/decoder
     class Huffman
-      using StringExtensions
-
       include Error
       include PackingExtensions
 

data/lib/http/2/header/huffman_statemachine.rb

@@ -268,7 +268,7 @@ module HTTP2
         [[28, 29], [28, 5], [29, 29], [29, 5], [30, 29], [30, 5], [31, 29], [31, 5], [127, 29], [127, 5], [220, 29], [220, 5], [249, 29], [249, 5], [nil, 254], [nil, 255]],
         [[10, 17], [10, 18], [10, 19], [10, 20], [10, 21], [10, 22], [10, 23], [10, 7], [13, 17], [13, 18], [13, 19], [13, 20], [13, 21], [13, 22], [13, 23], [13, 7]],
         [[22, 17], [22, 18], [22, 19], [22, 20], [22, 21], [22, 22], [22, 23], [22, 7], [256, 17], [256, 18], [256, 19], [256, 20], [256, 21], [256, 22], [256, 23], [256, 7]],
-      ].each { |arr| arr.each { |subarr| subarr.each(&:freeze) }.freeze }.freeze
+      ].each { |arr| arr.each { |subarr| subarr.freeze }.freeze }.freeze
     end
   end
 end

data/lib/http/2/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HTTP2
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/sig/connection.rbs

@@ -2,6 +2,7 @@ module HTTP2
   class Connection
     include FlowBuffer
     include Emitter
+    include BufferUtils
 
     REQUEST_MANDATORY_HEADERS: Array[String]
     RESPONSE_MANDATORY_HEADERS: Array[String]

data/sig/extensions.rbs

@@ -1,4 +1,12 @@
 module HTTP2
+  module BufferUtils
+    def read_str: (String str, Integer n) -> String
+
+    def read_uint32: (String str) -> Integer
+
+    def shift_byte: (String str) -> Integer
+  end
+
   module PackingExtensions
     def pack: (Array[Integer] array_to_pack, String template, buffer: String, ?offset: Integer) -> String
   end

data/sig/framer.rbs

@@ -1,6 +1,7 @@
 module HTTP2
   class Framer
     include PackingExtensions
+    include BufferUtils
 
     DEFAULT_MAX_FRAME_SIZE: Integer
 

data/sig/header/decompressor.rbs

@@ -1,6 +1,8 @@
 module HTTP2
   module Header
     class Decompressor
+      include BufferUtils
+
       @cc: EncodingContext
 
       def table_size=: (Integer) -> void

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http-2
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Tiago Cardoso
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-26 00:00:00.000000000 Z
+date: 2024-11-05 00:00:00.000000000 Z
 dependencies: []
 description: Pure-ruby HTTP 2.0 protocol implementation
 email: