http-2-next 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b8760a4af91eae4da3ae631c99b68cef2130cc0758ac7c91420bffe53582e55
-  data.tar.gz: ced41c1e91b125dd4ea957d026b27ccec5cd2aa79ca6376883f829c52199e758
+  metadata.gz: e1a2260b9fc7284c07a10b356a5008632319f6511848b8bfe923d908df84b92e
+  data.tar.gz: c733242b644fcb16685df75cbac2934ad43fe2d284ea90ad28fb9af89210588e
 SHA512:
-  metadata.gz: a3f421c1e495cb9bed15a3635dfdae9996074a77e221f1a3e5ebd75be0df0e154ab395ffc3caf3e333749b2fd4350ec226941f84c55c9c99ef023f18fe1da002
-  data.tar.gz: 4f0af698fbd7ac5a94b03fba9b93f47c6d8c34d0e44469a63dcec27609932a45e2b59f6ed08a8e55441d14756a238a8f0bea08ae795e3494e061f82d0a4668cf
+  metadata.gz: 616823541f91bcd9b13ab0b040c837fafd69f3dc8e0be7fc9a1a04e461f6cd129a5a64be09e6412fdacadcf04d3433039cbf5da56cb6604d9baea28abd7ee5d3
+  data.tar.gz: fe807a6f0318f6ed00fb2a7922d5e78202dd9165345df312f668baaa08af926d3e4d641da48899f7d6b830f9b7375096ad61f0bbd70bf2c00cbf8f12ce5bbb50

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

@@ -68,5 +68,11 @@ module HTTP2Next
       frame = Framer.new.generate(type: :settings, stream: 0, payload: settings)
       Base64.urlsafe_encode64(frame[9..-1])
     end
+
+    private
+
+    def verify_pseudo_headers(frame, mandatory_headers = RESPONSE_MANDATORY_HEADERS)
+      super(frame, mandatory_headers)
+    end
   end
 end

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

@@ -35,6 +35,9 @@ module HTTP2Next
   # Default connection "fast-fail" preamble string as defined by the spec.
   CONNECTION_PREFACE_MAGIC = "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n"
 
+  REQUEST_MANDATORY_HEADERS = %w[:scheme :method :authority :path].freeze
+  RESPONSE_MANDATORY_HEADERS = %w[:status].freeze
+
   # Connection encapsulates all of the connection, stream, flow-control,
   # error management, and other processing logic required for a well-behaved
   # HTTP 2.0 endpoint.
@@ -270,6 +273,8 @@ module HTTP2Next
 
             stream = @streams[frame[:stream]]
             if stream.nil?
+              verify_pseudo_headers(frame)
+
               stream = activate_stream(
                 id: frame[:stream],
                 weight: frame[:weight] || DEFAULT_WEIGHT,
@@ -329,6 +334,7 @@ module HTTP2Next
               end
             end
 
+            verify_pseudo_headers(frame, REQUEST_MANDATORY_HEADERS)
             stream = activate_stream(id: pid, parent: parent)
             verify_stream_order(stream.id)
             emit(:promise, stream)
@@ -727,6 +733,21 @@ module HTTP2Next
       @last_stream_id = id
     end
 
+    def verify_pseudo_headers(frame, mandatory_headers)
+      headers = frame[:payload]
+      return if headers.is_a?(Buffer)
+
+      pseudo_headers = headers.take_while do |field, value|
+        # use this loop to validate pseudo-headers
+        connection_error(:protocol_error, msg: "path is empty") if field == ":path" && value.empty?
+        field.start_with?(":")
+      end.map(&:first)
+      return if mandatory_headers.size == pseudo_headers.size &&
+                (mandatory_headers - pseudo_headers).empty?
+
+      connection_error(:protocol_error, msg: "invalid pseudo-headers")
+    end
+
     # Emit GOAWAY error indicating to peer that the connection is being
     # aborted, and once sent, raise a local exception.
     #

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

@@ -114,6 +114,10 @@ module HTTP2Next
 
     private
 
+    def verify_pseudo_headers(frame, mandatory_headers = REQUEST_MANDATORY_HEADERS)
+      super(frame, mandatory_headers)
+    end
+
     # Handle locally initiated server-push event emitted by the stream.
     #
     # @param args [Array]

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

@@ -116,7 +116,8 @@ module HTTP2Next
         # stream error (Section 5.4.2) of type STREAM_CLOSED.
         stream_error(:stream_closed) unless @state == :open ||
                                             @state == :half_closed_local ||
-                                            @state == :half_closing || @state == :closing
+                                            @state == :half_closing || @state == :closing ||
+                                            (@state == :closed && @closed == :local_rst)
         @received_data = true
         calculate_content_length(frame[:length])
         update_local_window(frame)
@@ -124,21 +125,22 @@ module HTTP2Next
         emit(:data, frame[:payload]) unless frame[:ignore]
         calculate_window_update(@local_window_max_size)
       when :headers
-        stream_error(:stream_closed) if @state == :closed || @state == :remote_closed
+        stream_error(:stream_closed) if (@state == :closed && @closed != :local_rst) ||
+                                        @state == :remote_closed
         @_method ||= frame[:method]
         @_content_length ||= frame[:content_length]
         @_trailers ||= frame[:trailer]
         if @_waiting_on_trailers
           verify_trailers(frame)
-        else
-          verify_pseudo_headers(frame)
+        elsif @received_data
+          stream_error(:protocol_error, msg: "already received data")
         end
         emit(:headers, frame[:payload]) unless frame[:ignore]
         @_waiting_on_trailers = !@_trailers.nil?
       when :push_promise
         emit(:promise_headers, frame[:payload]) unless frame[:ignore]
       when :continuation
-        stream_error(:stream_closed) if @state == :closed || @state == :remote_closed
+        stream_error(:stream_closed) if (@state == :closed && @closed != :local_rst) || @state == :remote_closed
         stream_error(:protocol_error) if @received_data
       when :priority
         process_priority(frame)
@@ -158,25 +160,6 @@ module HTTP2Next
     end
     alias << receive
 
-    REQUEST_MANDATORY_HEADERS = %w[:scheme :method :authority :path].freeze
-    RESPONSE_MANDATORY_HEADERS = %w[:status].freeze
-
-    def verify_pseudo_headers(frame)
-      headers = frame[:payload]
-      return if headers.is_a?(Buffer)
-
-      mandatory_headers = @id.odd? ? REQUEST_MANDATORY_HEADERS : RESPONSE_MANDATORY_HEADERS
-      pseudo_headers = headers.take_while do |field, value|
-        # use this loop to validate pseudo-headers
-        stream_error(:protocol_error, msg: "path is empty") if field == ":path" && value.empty?
-        field.start_with?(":")
-      end.map(&:first)
-      return if mandatory_headers.size == pseudo_headers.size &&
-                (mandatory_headers - pseudo_headers).empty?
-
-      stream_error(:protocol_error, msg: "invalid pseudo-headers")
-    end
-
     def verify_trailers(frame)
       stream_error(:protocol_error, msg: "trailer headers frame must close the stream") unless end_stream?(frame)
       return unless @_trailers
@@ -675,6 +658,8 @@ module HTTP2Next
     end
 
     def stream_error(error = :internal_error, msg: nil)
+      # if the stream already broke with an error, ignore subsequent
+
       @error = error
       close(error) if @state != :closed
 

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HTTP2Next
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http-2-next
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Tiago Cardoso
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-13 00:00:00.000000000 Z
+date: 2019-11-17 00:00:00.000000000 Z
 dependencies: []
 description: Pure-ruby HTTP 2.0 protocol implementation
 email: