Fix handling of stream reset frames.

Author: ioquatix

lib/protocol/http2/client.rb

@@ -27,6 +27,14 @@ def initialize(framer)
 				super(framer, 1)
 			end
 
+			def local_stream_id?(id)
+				id.odd?
+			end
+			
+			def remote_stream_id?(id)
+				id.even?
+			end
+			
 			def valid_remote_stream_id?(stream_id)
 				stream_id.even?
 			end

lib/protocol/http2/connection.rb

@@ -41,6 +41,7 @@ def initialize(framer, local_stream_id)
 				@dependencies = {0 => @dependency}
 
 				@framer = framer
+				# The next stream id to use:
 				@local_stream_id = local_stream_id
 				@remote_stream_id = 0
 
@@ -420,9 +421,42 @@ def receive_push_promise(frame)
 				raise ProtocolError, "Unable to receive push promise!"
 			end
 
+			def client_stream_id?(id)
+				id.odd?
+			end
+			
+			def server_stream_id?(id)
+				id.even?
+			end
+			
+			def closed_stream_id?(id)
+				if id.zero?
+					# The connection "stream id" can never be closed:
+					false
+				elsif id.even?
+					# Server-initiated streams are even.
+					if @local_stream_id.even?
+						id < @local_stream_id
+					else
+						id < @remote_stream_id
+					end
+				elsif id.odd?
+					# Client-initiated streams are odd.
+					if @local_stream_id.odd?
+						id < @local_stream_id
+					else
+						id < @remote_stream_id
+					end
+				end
+			end
+			
 			def receive_reset_stream(frame)
-				if stream = @streams[frame.stream_id]
+				if frame.connection?
+					raise ProtocolError, "Cannot reset connection!"
+				elsif stream = @streams[frame.stream_id]
 					stream.receive_reset_stream(frame)
+				elsif closed_stream_id?(frame.stream_id)
+					# Ignore.
 				else
 					raise StreamClosed, "Cannot reset stream #{frame.stream_id}"
 				end
@@ -439,8 +473,10 @@ def receive_window_update(frame)
 					rescue ProtocolError => error
 						stream.send_reset_stream(error.code)
 					end
-				elsif frame.stream_id > @remote_stream_id
-					# Receiving any frame other than HEADERS or PRIORITY on a stream in this state MUST be treated as a connection error of type PROTOCOL_ERROR.
+				elsif closed_stream_id?(frame.stream_id)
+					# Ignore.
+				else
+					# Receiving any frame other than HEADERS or PRIORITY on a stream in this state (idle) MUST be treated as a connection error of type PROTOCOL_ERROR.
 					raise ProtocolError, "Cannot update window of idle stream #{frame.stream_id}"
 				end
 			end

lib/protocol/http2/server.rb

@@ -27,6 +27,14 @@ def initialize(framer)
 				super(framer, 2)
 			end
 
+			def local_stream_id?(id)
+				id.even?
+			end
+			
+			def remote_stream_id?(id)
+				id.odd?
+			end
+			
 			def valid_remote_stream_id?(stream_id)
 				stream_id.odd?
 			end

lib/protocol/http2/stream.rb

@@ -130,7 +130,6 @@ def children
 
 			# The stream is being closed because the connection is being closed.
 			def close(error = nil)
-				@connection.delete(@id)
 			end
 
 			def maximum_frame_size
@@ -247,6 +246,7 @@ def open!
 			# @param error_code [Integer] the error code if the stream was closed due to a stream reset.
 			def close!(error_code = nil)
 				@state = :closed
+				@connection.delete(@id)
 
 				if error_code
 					error = StreamError.new("Stream closed!", error_code)
@@ -352,16 +352,10 @@ def receive_data(frame)
 				end
 			end
 
-			def ignore_reset_stream(frame)
-				# Async.logger.warn(self) {"Received reset stream (#{error_code}) in state: #{@state}!"}
-			end
-			
 			def receive_reset_stream(frame)
 				if @state == :idle
 					# If a RST_STREAM frame identifying an idle stream is received, the recipient MUST treat this as a connection error (Section 5.4.1) of type PROTOCOL_ERROR.
 					raise ProtocolError, "Cannot receive reset stream in state: #{@state}!"
-				elsif self.closed?
-					ignore_reset_stream(frame)
 				else
 					error_code = frame.unpack
 

spec/protocol/http2/stream_spec.rb

@@ -118,9 +118,11 @@
 		end
 
 		it "ignores reset stream" do
-			expect(stream).to receive(:ignore_reset_stream)
+			server_stream = server.create_stream(stream.id)
+			server_stream.open!
+			server_stream.send_reset_stream
 
-			stream.receive_reset_stream(double)
+			client.read_frame
 		end
 	end
 end