http-protocol 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6878c2aaace06793d74e1e5d15672c8e6eec05603b270f180aa9c294d55318be
-  data.tar.gz: 9b95862aa4a58d6f536107d46c9f769e5e16b2168cebafe02fd5f6912dc09b10
+  metadata.gz: 84fb025f5c2cc394607d0c28b592c8fda12285a8340c0d3eb2a5ec8328aab371
+  data.tar.gz: 98a7233fe2c8e0f706d9738b0845bd86a9edd7e4fadf4335fc30763a3a468927
 SHA512:
-  metadata.gz: f8781ccf5b026240587e2c57279043d814019bef9736a1779ea55e42da36e4cb5bb751b708d06be27b616342b318be263c69eb4d609d00d853568e361450bd81
-  data.tar.gz: 3c329fabfdfd669110d12ddd7b3a3153ea9625ddc4dfe44db5e0e316e5bca60065a00d68f299f6ea7f4ddf36c3766d012c36e8d819d685940afc3fd51d0827d6
+  metadata.gz: 5a436986f8203efcc943a7353acb3a8c9489f5e5576127b913482b684f4d879de6f4b88b05c9b17bd5c981826177be00b7f1f2876a6239ee0a5b7c17763afc84
+  data.tar.gz: 4453a7d3c4cab53a2ba6fdb1db9eb82988157582cd9c01b8aca9dd437d13cd6adfc4b20e1e03065cfc0150c497f67f8a05de3d1706d0ec932519e291227216a2

data/lib/http/protocol/http2/connection.rb

@@ -81,6 +81,12 @@ module HTTP
 					@state == :closed
 				end
 				
+				def close
+					send_goaway
+					
+					@framer.close
+				end
+				
 				def encode_headers(headers, buffer = String.new.b)
 					HPACK::Compressor.new(buffer, @encoder).encode(headers)
 					
@@ -103,8 +109,8 @@ module HTTP
 				attr :streams
 				
 				def read_frame
-					frame = @framer.read_frame
-					# puts "#{self.class} #{@state} read_frame: #{frame.inspect}"
+					frame = @framer.read_frame(@local_settings.maximum_frame_size)
+					# puts "#{self.class} #{@state} read_frame: class=#{frame.class} flags=#{frame.flags} length=#{frame.length}"
 					
 					yield frame if block_given?
 					
@@ -113,6 +119,15 @@ module HTTP
 					return frame
 				rescue ProtocolError => error
 					send_goaway(error.code || PROTOCOL_ERROR, error.message)
+					
+					raise
+				rescue HTTP::HPACK::CompressionError => error
+					send_goaway(COMPRESSION_ERROR, error.message)
+					
+					raise
+				rescue
+					send_goaway(PROTOCOL_ERROR, $!.message)
+					
 					raise
 				end
 				
@@ -136,11 +151,10 @@ module HTTP
 				
 				def receive_goaway(frame)
 					@state = :closed
-					@framer.close
 				end
 				
 				def write_frame(frame)
-					# puts "#{self.class} #{@state} write_frame: #{frame.inspect}"
+					# puts "#{self.class} #{@state} write_frame: class=#{frame.class} flags=#{frame.flags} length=#{frame.length}"
 					@framer.write_frame(frame)
 				end
 				
@@ -246,6 +260,10 @@ module HTTP
 				end
 				
 				def receive_headers(frame)
+					if frame.stream_id == 0
+						raise ProtocolError, "Cannot receive headers for stream 0!"
+					end
+					
 					if stream = @streams[frame.stream_id]
 						stream.receive_headers(frame)
 						

data/lib/http/protocol/http2/continuation_frame.rb

@@ -34,13 +34,13 @@ module HTTP
 					flag_set?(END_HEADERS)
 				end
 				
-				def read(io)
+				def read(io, maximum_frame_size)
 					super
 					
 					unless end_headers?
 						@continuation = ContinuationFrame.new
 						
-						@continuation.read(io)
+						@continuation.read(io, maximum_frame_size)
 					end
 				end
 				

data/lib/http/protocol/http2/frame.rb

@@ -29,6 +29,9 @@ module HTTP
 			PADDED = 0x8
 			PRIORITY = 0x20
 			
+			MAXIMUM_ALLOWED_WINDOW_SIZE = 0x7FFFFFFF
+			MAXIMUM_ALLOWED_FRAME_SIZE = 0xFFFFFF
+			
 			class Frame
 				include Comparable
 				
@@ -156,8 +159,13 @@ module HTTP
 					@payload = io.read(@length)
 				end
 				
-				def read(io)
+				def read(io, maximum_frame_size = MAXIMUM_ALLOWED_FRAME_SIZE)
 					read_header(io) unless @length
+					
+					if @length > maximum_frame_size
+						raise FrameSizeError, "Frame length #{@length} exceeds maximum frame size #{maximum_frame_size}!"
+					end
+					
 					read_payload(io)
 				end
 				

data/lib/http/protocol/http2/framer.rb

@@ -78,7 +78,7 @@ module HTTP
 					return string
 				end
 				
-				def read_frame
+				def read_frame(maximum_frame_size = MAXIMUM_ALLOWED_FRAME_SIZE)
 					# Read the header:
 					length, type, flags, stream_id = read_header
 					
@@ -89,7 +89,7 @@ module HTTP
 					frame = klass.new(stream_id, flags, type, length)
 					
 					# Read the payload:
-					frame.read(@io)
+					frame.read(@io, maximum_frame_size)
 					
 					return frame
 				end
@@ -97,6 +97,7 @@ module HTTP
 				def write_frame(frame)
 					# puts "framer: write_frame #{frame.inspect}"
 					frame.write(@io)
+					
 					@io.flush
 				end
 				

data/lib/http/protocol/http2/settings_frame.rb

@@ -24,9 +24,6 @@ module HTTP
 	module Protocol
 		module HTTP2
 			class Settings
-				MAXIMUM_ALLOWED_WINDOW_SIZE = 0x7FFFFFFF
-				MAXIMUM_ALLOWED_FRAME_SIZE = 0xFFFFFF
-				
 				HEADER_TABLE_SIZE = 0x1
 				ENABLE_PUSH = 0x2
 				MAXIMUM_CONCURRENT_STREAMS = 0x3

data/lib/http/protocol/version.rb

@@ -20,6 +20,6 @@
 
 module HTTP
 	module Protocol
-		VERSION = "0.3.1"
+		VERSION = "0.3.2"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: http-protocol
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-19 00:00:00.000000000 Z
+date: 2018-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-hpack