http-2 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a5b4286258966b81acdfc845ae3dda4380c4f64
-  data.tar.gz: 7f61a80280bc7b85f220a6e6661d594d588f0969
+  metadata.gz: f52820ad290d538c293b8d008baa622bc788c07c
+  data.tar.gz: 93aa6df1ade7720059e84c8ffd69d1fb2385028d
 SHA512:
-  metadata.gz: 90e4326062ff7d6ee5161ffe0509a99ac46f36c5aebe906b8ec6e044018d36fab1a8e17cf549a30272a5c6a1d7603362eb2fac42edbcc5a666f9b336cdf4bdc4
-  data.tar.gz: fc4ed18e276fbd8d27dbf090999f989d91450bd8a2dd59d9a1e77bdaa482e74217a4f7ecb0bf9033af99c40df29858d88c849a7cba36e19363c43718cc026aa4
+  metadata.gz: d8fb28dd5124a1dc9995f250ca82a0a257d5a1c2a4b802fadcf0d7fe30a054c1e1e312fa81f6bb69888103783d23916c3bdb464c5eb5819e2ef68609ddeae303
+  data.tar.gz: 82f8859ce4752d46be361deb76e1b37b076472b0b07262ca5aa9d7b2daa2c50d6d28b44aa8811031b58a294424c1e8fc056f22ffd9c92301a48b2369503784ae

data/lib/http/2/client.rb

@@ -38,6 +38,11 @@ module HTTP2
       super(frame)
     end
 
+    def receive(frame)
+      send_connection_preface
+      super(frame)
+    end
+
     # sends the preface and initializes the first stream in half-closed state
     def upgrade
       fail ProtocolError unless @stream_id == 1

data/lib/http/2/compressor.rb

@@ -139,7 +139,8 @@ module HTTP2
       # - http://tools.ietf.org/html/draft-ietf-httpbis-header-compression-10#section-4.1
       #
       # @param cmd [Hash] { type:, name:, value:, index: }
-      # @return [Array] +[name, value]+ header field that is added to the decoded header list
+      # @return [Array, nil] +[name, value]+ header field that is added to the decoded header list,
+      #                                      or nil if +cmd[:type]+ is +:changetablesize+
       def process(cmd)
         emit = nil
 
@@ -553,6 +554,7 @@ module HTTP2
         decoding_pseudo_headers = true
         until buf.empty?
           next_header = @cc.process(header(buf))
+          next if next_header.nil?
           is_pseudo_header = next_header.first.start_with? ':'
           if !decoding_pseudo_headers && is_pseudo_header
             fail ProtocolError, 'one or more pseudo headers encountered after regular headers'
@@ -560,7 +562,7 @@ module HTTP2
           decoding_pseudo_headers = is_pseudo_header
           list << next_header
         end
-        list.compact
+        list
       end
     end
   end

data/lib/http/2/connection.rb

@@ -94,6 +94,7 @@ module HTTP2
       @error = nil
 
       @h2c_upgrade = nil
+      @closed_since = nil
     end
 
     def closed?
@@ -144,6 +145,7 @@ module HTTP2
       send(type: :goaway, last_stream: last_stream,
            error: error, payload: payload)
       @state = :closed
+      @closed_since = Time.now
     end
 
     # Sends a WINDOW_UPDATE frame to the peer.
@@ -358,7 +360,10 @@ module HTTP2
       raise if e.is_a?(Error::Error)
       connection_error(e: e)
     end
-    alias << receive
+
+    def <<(*args)
+      receive(*args)
+    end
 
     private
 
@@ -446,12 +451,22 @@ module HTTP2
           # the connection, although a new connection can be established
           # for new streams.
           @state = :closed
+          @closed_since = Time.now
           emit(:goaway, frame[:last_stream], frame[:error], frame[:payload])
-        when :altsvc, :blocked
+        when :altsvc
+          # 4.  The ALTSVC HTTP/2 Frame
+          # An ALTSVC frame on stream 0 with empty (length 0) "Origin"
+          # information is invalid and MUST be ignored.
+          if frame[:origin] && !frame[:origin].empty?
+            emit(frame[:type], frame)
+          end
+        when :blocked
           emit(frame[:type], frame)
         else
           connection_error
         end
+      when :closed
+        connection_error if (Time.now - @closed_since) > 15
       else
         connection_error
       end

data/lib/http/2/stream.rb

@@ -115,7 +115,15 @@ module HTTP2
         process_priority(frame)
       when :window_update
         process_window_update(frame)
-      when :altsvc, :blocked
+      when :altsvc
+        # 4.  The ALTSVC HTTP/2 Frame
+        # An ALTSVC frame on a
+        # stream other than stream 0 containing non-empty "Origin" information
+        # is invalid and MUST be ignored.
+        if !frame[:origin] || frame[:origin].empty?
+          emit(frame[:type], frame)
+        end
+      when :blocked
         emit(frame[:type], frame)
       end
 

data/lib/http/2/version.rb

@@ -1,3 +1,3 @@
 module HTTP2
-  VERSION = '0.10.0'.freeze
+  VERSION = '0.10.1'.freeze
 end

data/spec/client_spec.rb

@@ -32,6 +32,18 @@ RSpec.describe HTTP2::Client do
       expect(frame[:type]).to eq :settings
       expect(frame[:payload]).to include([:settings_max_concurrent_streams, 200])
     end
+
+    it 'should initialize client when receiving server settings before sending ack' do
+      frames = []
+      @client.on(:frame) { |bytes| frames << bytes }
+      @client << f.generate(SETTINGS.dup)
+
+      expect(frames[0]).to eq CONNECTION_PREFACE_MAGIC
+      expect(f.parse(frames[1])[:type]).to eq :settings
+      ack_frame = f.parse(frames[2])
+      expect(ack_frame[:type]).to eq :settings
+      expect(ack_frame[:flags]).to include(:ack)
+    end
   end
 
   context 'upgrade' do
@@ -122,4 +134,54 @@ RSpec.describe HTTP2::Client do
       @client << set_stream_id(f.generate(PUSH_PROMISE.dup), s.id)
     end
   end
+
+  context 'alt-svc' do
+    context 'received in the connection' do
+      it 'should emit :altsvc when receiving one' do
+        @client << f.generate(SETTINGS.dup)
+        frame = nil
+        @client.on(:altsvc) do |f|
+          frame = f
+        end
+        @client << f.generate(ALTSVC.deep_dup)
+        expect(frame).to be_a(Hash)
+      end
+      it 'should not emit :altsvc when the frame when contains no host' do
+        @client << f.generate(SETTINGS.dup)
+        frame = nil
+        @client.on(:altsvc) do |f|
+          frame = f
+        end
+
+        @client << f.generate(ALTSVC.deep_dup.merge(origin: nil))
+        expect(frame).to be_nil
+      end
+    end
+    context 'received in a stream' do
+      it 'should emit :altsvc' do
+        s = @client.new_stream
+        s.send HEADERS.deep_dup
+        s.close
+
+        frame = nil
+        s.on(:altsvc) { |f| frame = f }
+
+        @client << set_stream_id(f.generate(ALTSVC.deep_dup.merge(origin: nil)), s.id)
+
+        expect(frame).to be_a(Hash)
+      end
+      it 'should not emit :alt_svc when the frame when contains a origin' do
+        s = @client.new_stream
+        s.send HEADERS.deep_dup
+        s.close
+
+        frame = nil
+        s.on(:altsvc) { |f| frame = f }
+
+        @client << set_stream_id(f.generate(ALTSVC.deep_dup), s.id)
+
+        expect(frame).to be_nil
+      end
+    end
+  end
 end

data/spec/compressor_spec.rb

@@ -546,6 +546,22 @@ RSpec.describe HTTP2::Header do
         },
       ],
     },
+    { title: 'D.6.a.  Response Examples with Huffman - dynamic table size updates should not trigger exceptions',
+      type: :response,
+      table_size: 4096,
+      huffman: :always,
+      bypass_encoder: true,
+      streams: [
+        { wire: '2088 7689 aa63 55e5 80ae 16d7 17',
+          emitted: [
+            [':status', '200'],
+            ['server', 'nginx/1.15.2'],
+          ],
+          table: [],
+          table_size: 0,
+        },
+      ],
+    },
   ]
 
   context 'decode' do

data/spec/connection_spec.rb

@@ -10,7 +10,6 @@ RSpec.describe HTTP2::Connection do
   context 'initialization and settings' do
     (FRAME_TYPES - [SETTINGS]).each do |frame|
       it "should raise error if first frame is #{frame[:type]}" do
-        frame = set_stream_id(f.generate(frame.deep_dup), 0x0)
         expect { @conn << frame }.to raise_error(ProtocolError)
         expect(@conn).to be_closed
       end
@@ -542,6 +541,15 @@ RSpec.describe HTTP2::Connection do
       expect { @conn.new_stream }.to raise_error(ConnectionClosed)
     end
 
+    it 'should not raise error when receiving connection management frames immediately after emitting goaway' do
+      @conn.goaway
+      expect(@conn).to be_closed
+
+      expect { @conn << f.generate(SETTINGS.dup) }.not_to raise_error(ProtocolError)
+      expect { @conn << f.generate(PING.dup) }.not_to raise_error(ProtocolError)
+      expect { @conn << f.generate(GOAWAY.dup) }.not_to raise_error(ProtocolError)
+    end
+
     it 'should process connection management frames after GOAWAY' do
       @conn << f.generate(SETTINGS.dup)
       @conn << f.generate(HEADERS.dup)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http-2
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Ilya Grigorik
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-25 00:00:00.000000000 Z
+date: 2018-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler