ensure wire always contains a full frame

socketry · Nov 6, 2023 · de36239 · de36239
1 parent d2f6815
commit de36239
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/lib/protocol/http2/frame.rb b/lib/protocol/http2/frame.rb
@@ -146,7 +146,7 @@ def self.parse_header(buffer)
 			end
 
 			def read_header(stream)
-				if buffer = stream.read(9) and buffer.bytesize == 9
+				if buffer = stream.peek(9) and buffer.bytesize == 9
 					@length, @type, @flags, @stream_id = Frame.parse_header(buffer)
 					# puts "read_header: #{@length} #{@type} #{@flags} #{@stream_id}"
 				else
@@ -155,8 +155,9 @@ def read_header(stream)
 			end
 
 			def read_payload(stream)
-				if payload = stream.read(@length) and payload.bytesize == @length
-					@payload = payload
+				length_with_header = 9 + @length
+				if full_frame = stream.read(length_with_header) and full_frame.bytesize == length_with_header
+					@payload = full_frame[9..]
 				else
 					raise EOFError, "Could not read frame payload!"
 				end

diff --git a/lib/protocol/http2/framer.rb b/lib/protocol/http2/framer.rb
@@ -95,7 +95,7 @@ def write_frame(frame)
 			end
 
 			def read_header
-				if buffer = @stream.read(9)
+				if buffer = @stream.peek(9)
 					if buffer.bytesize == 9
 						return Frame.parse_header(buffer)
 					end