protocol-http1 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f22aa54b84d5e367d855540a30f40103e384c2bed44d023cb14fa0be4024455b
-  data.tar.gz: ea92287d17970faf97174324907815798664be67316cd790af6fe7522263d586
+  metadata.gz: 28184b21d65b6cde9ee2985a6680ecbd01ce6e63a6d812cc440a13a6785de072
+  data.tar.gz: de2c9f93370098fe72637140523e428ce5dc170b06af494b4d0cd424c4ecd3d9
 SHA512:
-  metadata.gz: f44d2e720314924e6b57c2f6e3e5f288ae8e4a5487d5730b9a343b959c0b28397594e8283e0180b70ebb5b75ccfab644b2bb609b0143bb2886c5d33d0b9dbdd5
-  data.tar.gz: c6afa65e6541ba2c0d8186c495c29f2fd3549b4a8e17cd91c379c409c8251e4146e10d82fc9835c761c040c4c48ea47934736f94ed9ee90b23716e2ee98b6c5c
+  metadata.gz: d42abab0bbb5c5b95efdbba9caf23b64ab4cad2d63b7ecf37abb5269ba726d42592f9a2eac673a987e5a72c116cee8a07c7ce8a929bd1fc7bc6ab7bab25b5be8
+  data.tar.gz: fdadc58aa32cbcd37672eda928fdc207f0180483266ae6813e726692b2c32858566439d1a4a7d1e48a7eebf7779539d39f973e1ff92cda0a87ba07fa884c2c26

data/fuzz/request/bake.rb

@@ -0,0 +1,5 @@
+
+# Run the fuzz test.
+def run
+	system("AFL_SKIP_BIN_CHECK=1 afl-fuzz -i input/ -o output/ -t 1000  -m 1000 -- ruby script.rb")
+end

data/fuzz/request/input/body.txt

@@ -0,0 +1,6 @@
+POST /upload HTTP/1.1
+Host: example.com
+Accept: */*
+Content-Length: 10
+
+0123456789

data/fuzz/request/input/simple.txt

@@ -0,0 +1,2 @@
+GET / HTTP/1.1
+

data/fuzz/request/script.rb

@@ -0,0 +1,32 @@
+#!/usr/bin/env ruby
+
+require 'socket'
+require_relative '../../lib/protocol/http1'
+
+def test
+	# input, output = Socket.pair(Socket::PF_UNIX, Socket::SOCK_STREAM)
+	
+	server = Protocol::HTTP1::Connection.new($stdin)
+	
+	# input.write($stdin.read)
+	# input.close
+
+	begin
+		host, method, path, version, headers, body = server.read_request
+		
+		body = server.read_request_body(method, headers)
+	rescue Protocol::HTTP1::InvalidRequest
+		# Ignore.
+	end
+end
+
+if ENV["_"] =~ /afl/
+	require 'kisaten'
+	Kisaten.crash_at [], [], Signal.list['USR1']
+	
+	while Kisaten.loop 10000
+		test
+	end
+else
+	test
+end

data/lib/protocol/http1/connection.rb

@@ -281,14 +281,17 @@ module Protocol
 			
 			def write_fixed_length_body(body, length, head)
 				@stream.write("content-length: #{length}\r\n\r\n")
-				@stream.flush
 				
 				if head
+					@stream.flush
+					
 					body.close
 					
 					return
 				end
 				
+				@stream.flush unless body.ready?
+				
 				chunk_length = 0
 				body.each do |chunk|
 					chunk_length += chunk.bytesize
@@ -309,21 +312,25 @@ module Protocol
 			
 			def write_chunked_body(body, head, trailers = nil)
 				@stream.write("transfer-encoding: chunked\r\n\r\n")
-				@stream.flush
 				
 				if head
+					@stream.flush
+					
 					body.close
 					
 					return
 				end
 				
+				@stream.flush unless body.ready?
+				
 				body.each do |chunk|
 					next if chunk.size == 0
 					
 					@stream.write("#{chunk.bytesize.to_s(16).upcase}\r\n")
 					@stream.write(chunk)
 					@stream.write(CRLF)
-					@stream.flush
+					
+					@stream.flush unless body.ready?
 				end
 				
 				if trailers
@@ -342,14 +349,15 @@ module Protocol
 				@persistent = false
 				
 				@stream.write("\r\n")
-				@stream.flush
+				@stream.flush unless body.ready?
 				
 				if head
 					body.close
 				else
 					body.each do |chunk|
 						@stream.write(chunk)
-						@stream.flush
+						
+						@stream.flush unless body.ready?
 					end
 				end
 				

data/lib/protocol/http1/version.rb

@@ -22,6 +22,6 @@
 
 module Protocol
 	module HTTP1
-		VERSION = "0.12.0"
+		VERSION = "0.13.0"
 	end
 end

data/protocol-http1.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 	spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
 	spec.require_paths = ["lib"]
 	
-	spec.add_dependency "protocol-http", "~> 0.18"
+	spec.add_dependency "protocol-http", "~> 0.19"
 	
 	spec.add_development_dependency "covered"
 	spec.add_development_dependency "bundler"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protocol-http1
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-08 00:00:00.000000000 Z
+date: 2020-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: protocol-http
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: covered
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,10 @@ files:
 - Gemfile
 - README.md
 - examples/http1/request.rb
+- fuzz/request/bake.rb
+- fuzz/request/input/body.txt
+- fuzz/request/input/simple.txt
+- fuzz/request/script.rb
 - lib/protocol/http1.rb
 - lib/protocol/http1/body/chunked.rb
 - lib/protocol/http1/body/fixed.rb