protocol-http1 0.14.6 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a46985e11bfc9d2130f9abceacbd769c4aa83881a1a607afe9d0b4d07ad37e81
-  data.tar.gz: cb08e884e92c03ab5a05b2d83e75478d458335502222dc89eabf961a43d08ba1
+  metadata.gz: c1c040780ba6a7bae3e921d5a7ff40ba5e656ce66d8a138d2c5382ce42efc317
+  data.tar.gz: 551dbe0ecbc187b7b3c0c86507d737eace6b41c4f3b62f0d8a7c6f6d8b0bd0a2
 SHA512:
-  metadata.gz: 0e78ae57c521f71a09aafec920e852dae0a66068bcc35271029567e053211967e56797e123a6046eb5323a703c6617ca9310d500ead439574c45d6c49c615000
-  data.tar.gz: aae580287000a506cfd34cfee5ccd00c0ee26194cacf73725462885c37acff442a04ac69ca1ba0a4f4d996fcad2317741773d4a81d2a9cbc1045ecf3270f3053
+  metadata.gz: a57fcfd40cf929f6e6a096d07513378b6631d5dbdab25431c9c8763fea9e4a1967e77adc8bddc55a2ca8eb5b3232088bbaf9d0af1fed8dad05af20e3702e4ef2
+  data.tar.gz: f736986596addfec4908e05d9bf632f79f906cf1508076ec7e5dd5de1e08efee33c9c1edd512aef50c4f483db92b92481ba68929edbefe454db57b445b969f8c

data/lib/protocol/http1/body/fixed.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2019-2022, by Samuel Williams.
+# Copyright, 2019-2023, by Samuel Williams.
 
 require 'protocol/http/body/readable'
 
@@ -23,6 +23,7 @@ module Protocol
 				end
 				
 				def close(error = nil)
+					# If we are closing the body without fully reading it, the underlying connection is now in an undefined state.
 					if @remaining != 0
 						@stream.close
 					end
@@ -30,14 +31,16 @@ module Protocol
 					super
 				end
 				
+				# @raises EOFError if the stream is closed before the expected length is read.
 				def read
 					if @remaining > 0
+						# `readpartial` will raise `EOFError` if the stream is closed/finished:
 						if chunk = @stream.readpartial(@remaining)
 							@remaining -= chunk.bytesize
 							
 							return chunk
-						else
-							raise EOFError, "Stream closed with #{@remaining} bytes remaining!"
+						# else
+						# 	raise EOFError, "Stream closed with #{@remaining} bytes remaining!"
 						end
 					end
 				end

data/lib/protocol/http1/connection.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2019-2022, by Samuel Williams.
+# Copyright, 2019-2023, by Samuel Williams.
+# Copyright, 2019, by Brian Morearty.
 # Copyright, 2020, by Bruno Sutic.
 
 require 'protocol/http/headers'
@@ -31,7 +32,7 @@ module Protocol
 		UPGRADE = 'upgrade'
 		
 		# HTTP/1.x request line parser:
-		TOKEN = /[!#$%&'*+-\.^_`|~0-9a-zA-Z]+/.freeze
+		TOKEN = /[!#$%&'*+\-\.\^_`|~0-9a-zA-Z]+/.freeze
 		REQUEST_LINE = /\A(#{TOKEN}) ([^\s]+) (HTTP\/\d.\d)\z/.freeze
 		
 		# HTTP/1.x header parser:
@@ -63,12 +64,6 @@ module Protocol
 			# The number of requests processed.
 			attr :count
 			
-			def upgrade?(headers)
-				if upgrade = headers[UPGRADE]
-					return upgrade
-				end
-			end
-			
 			def persistent?(version, method, headers)
 				if method == HTTP::Methods::CONNECT
 					return false
@@ -281,7 +276,7 @@ module Protocol
 					chunk_length += chunk.bytesize
 					
 					if chunk_length > length
-						raise Error, "Trying to write #{chunk_length} bytes, but content length was #{length} bytes!"
+						raise ContentLengthError, "Trying to write #{chunk_length} bytes, but content length was #{length} bytes!"
 					end
 					
 					@stream.write(chunk)
@@ -291,7 +286,7 @@ module Protocol
 				@stream.flush
 				
 				if chunk_length != length
-					raise Error, "Wrote #{chunk_length} bytes, but content length was #{length} bytes!"
+					raise ContentLengthError, "Wrote #{chunk_length} bytes, but content length was #{length} bytes!"
 				end
 			end
 			
@@ -400,13 +395,19 @@ module Protocol
 				read_remainder_body
 			end
 			
-			def read_upgrade_body(protocol)
-				read_remainder_body
-			end
-			
 			HEAD = "HEAD"
 			CONNECT = "CONNECT"
 			
+			def extract_content_length(headers)
+				if content_length = headers.delete(CONTENT_LENGTH)
+					if length = Integer(content_length, exception: false) and length >= 0
+						yield length
+					else
+						raise BadRequest, "Invalid content length: #{content_length}"
+					end
+				end
+			end
+			
 			def read_response_body(method, status, headers)
 				# RFC 7230 3.3.3
 				# 1.  Any response to a HEAD request and any response with a 1xx
@@ -415,19 +416,16 @@ module Protocol
 				# header fields, regardless of the header fields present in the
 				# message, and thus cannot contain a message body.
 				if method == HTTP::Methods::HEAD
-					if content_length = headers.delete(CONTENT_LENGTH)
-						length = Integer(content_length)
-						
+					extract_content_length(headers) do |length|
 						if length > 0
 							return read_head_body(length)
-						elsif length == 0
-							return nil
 						else
-							raise BadRequest, "Invalid content length: #{content_length}"
+							return nil
 						end
-					else
-						return nil
 					end
+					
+					# There is no body for a HEAD request if there is no content length:
+					return nil
 				end
 				
 				if (status >= 100 and status < 200) or status == 204 or status == 304
@@ -499,14 +497,11 @@ module Protocol
 				# the recipient times out before the indicated number of octets are
 				# received, the recipient MUST consider the message to be
 				# incomplete and close the connection.
-				if content_length = headers.delete(CONTENT_LENGTH)
-					length = Integer(content_length)
+				extract_content_length(headers) do |length|
 					if length > 0
 						return read_fixed_body(length)
-					elsif length == 0
-						return nil
 					else
-						raise BadRequest, "Invalid content length: #{content_length}"
+						return nil
 					end
 				end
 				

data/lib/protocol/http1/error.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2019-2022, by Samuel Williams.
+# Copyright, 2019-2023, by Samuel Williams.
 
 require 'protocol/http/error'
 
@@ -13,6 +13,10 @@ module Protocol
 		class InvalidRequest < Error
 		end
 		
+		# The specified content length and the given content's length do not match.
+		class ContentLengthError < Error
+		end
+		
 		# The request was parsed correctly, but was invalid for some other reason.
 		class BadRequest < Error
 		end

data/lib/protocol/http1/version.rb

@@ -5,6 +5,6 @@
 
 module Protocol
 	module HTTP1
-		VERSION = "0.14.6"
+		VERSION = "0.15.0"
 	end
 end

data/license.md

@@ -1,6 +1,8 @@
 # MIT License
 
-Copyright, 2019-2022, by Samuel Williams.  
+Copyright, 2019-2023, by Samuel Williams.  
+Copyright, 2019, by Brian Morearty.  
+Copyright, 2020, by Olle Jonsson.  
 Copyright, 2020, by Bruno Sutic.  
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protocol-http1
 version: !ruby/object:Gem::Version
-  version: 0.14.6
+  version: 0.15.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -40,7 +40,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2022-08-29 00:00:00.000000000 Z
+date: 2023-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: protocol-http
@@ -85,47 +85,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: sus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rspec-files
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: rspec-memory
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 description:
 email:
 executables: []
@@ -161,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: A low level implementation of the HTTP/1 protocol.