Merge pull request #185 from zarqman/allow-multiple-goaway

Allow multiple GOAWAY frames

Author: HoneyryderChuck

lib/http/2/connection.rb

@@ -525,7 +525,8 @@ def connection_management(frame)
       when :closed
         case frame_type
         when :goaway
-          connection_error
+          #  6.8. GOAWAY
+          # An endpoint MAY send multiple GOAWAY frames if circumstances change.
         when :ping
           ping_management(frame)
         else

lib/http/2/extensions.rb

@@ -25,7 +25,7 @@ def append_str(str, data)
     def read_str(str, n)
       return "".b if n == 0
 
-      chunk = str.byteslice(0..n - 1)
+      chunk = str.byteslice(0..(n - 1))
       remaining = str.byteslice(n..-1)
       remaining ? str.replace(remaining) : str.clear
       chunk

lib/http/2/framer.rb

@@ -185,7 +185,7 @@ def read_common_header(buf)
       {
         type: type,
         flags: FRAME_FLAGS[type].filter_map do |name, pos|
-          name if flags.anybits?((1 << pos))
+          name if flags.anybits?(1 << pos)
         end,
         length: length,
         stream: stream & RBIT
@@ -359,7 +359,7 @@ def generate(frame)
         # Padding:  Padding octets that contain no application semantic value.
         # Padding octets MUST be set to zero when sending and ignored when
         # receiving.
-        append_str(bytes, ("\0" * padlen))
+        append_str(bytes, "\0" * padlen)
       end
 
       frame[:length] = length

lib/http/2/header/encoding_context.rb

@@ -211,7 +211,7 @@ def process(cmd)
           emit = [name, value]
 
           # add to table
-          if type == :incremental && size_check(name.bytesize + value.bytesize + 32)
+          if type == :incremental && size_check?(name.bytesize + value.bytesize + 32)
             @table.unshift(emit)
             @current_table_size += name.bytesize + value.bytesize + 32
             @_table_updated = true
@@ -302,7 +302,7 @@ def addcmd(field, value)
       #  When the size is reduced, some headers might be evicted.
       def table_size=(size)
         @limit = size
-        size_check(0)
+        resize_table(0)
       end
 
       def listen_on_table
@@ -313,22 +313,25 @@ def listen_on_table
 
       private
 
+      def resize_table(cmdsize)
+        return if @table.empty?
+
+        while @current_table_size + cmdsize > @limit
+
+          name, value = @table.pop
+          @current_table_size -= name.bytesize + value.bytesize + 32
+          break if @table.empty?
+
+        end
+      end
+
       # To keep the dynamic table size lower than or equal to @limit,
       # remove one or more entries at the end of the dynamic table.
       #
       # @param cmdsize [Integer]
       # @return [Boolean] whether +cmd+ fits in the dynamic table.
-      def size_check(cmdsize)
-        unless @table.empty?
-          while @current_table_size + cmdsize > @limit
-
-            name, value = @table.pop
-            @current_table_size -= name.bytesize + value.bytesize + 32
-            break if @table.empty?
-
-          end
-        end
-
+      def size_check?(cmdsize)
+        resize_table(cmdsize)
         cmdsize <= @limit
       end
     end

lib/http/2/header/huffman.rb

@@ -29,7 +29,7 @@ module Huffman
       def encode(str, buffer = "".b)
         bitstring = String.new("", encoding: Encoding::BINARY, capacity: (str.bytesize * 30) + ((8 - str.size) % 8))
         str.each_byte { |chr| append_str(bitstring, ENCODE_TABLE[chr]) }
-        append_str(bitstring, ("1" * ((8 - bitstring.size) % 8)))
+        append_str(bitstring, "1" * ((8 - bitstring.size) % 8))
         pack([bitstring], "B*", buffer: buffer)
       end
 

sig/header/encoding_context.rbs

@@ -46,7 +46,9 @@ module HTTP2
 
       def add_to_table: (string name, string value) -> void
 
-      def size_check: (Integer cmdsize) -> bool
+      def resize_table: (Integer cmdsize) -> void
+
+      def size_check?: (Integer cmdsize) -> bool
     end
   end
 end

spec/connection_spec.rb

@@ -4,6 +4,7 @@
 
 RSpec.describe HTTP2::Connection do
   include FrameHelpers
+
   let(:conn) { Client.new }
   let(:f) { Framer.new }
 

spec/emitter_spec.rb

@@ -5,6 +5,7 @@
 RSpec.describe HTTP2::Emitter do
   class Worker
     include Emitter
+
     def initialize
       @listeners = Hash.new { |hash, key| hash[key] = [] }
     end

spec/shared_examples/connection.rb

@@ -173,11 +173,13 @@
       expect { conn << f.generate(ping_frame) }.not_to raise_error(ProtocolError)
     end
 
-    it "should respond with protocol error when receiving goaway" do
+    it "should ignore additional goaway" do
+      expect { conn << f.generate(settings_frame) }.not_to raise_error(ProtocolError)
+
       conn.goaway
       expect(conn).to be_closed
 
-      expect { conn << f.generate(goaway_frame) }.to raise_error(ProtocolError)
+      expect { conn << f.generate(goaway_frame) }.not_to raise_error(ProtocolError)
     end
 
     it "should raise error on frame for invalid stream ID" do

spec/stream_spec.rb

@@ -4,6 +4,7 @@
 
 RSpec.describe HTTP2::Stream do
   include FrameHelpers
+
   let(:f) { Framer.new }
   let(:client) { Client.new }
   let(:stream) { client.new_stream }