protocol-http1 0.41.0 → 0.41.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa2e943387ba60e2d581cbdebf2dbd4ae864fb848965f30dff7e383a684a731f
-  data.tar.gz: 1824ea1d12202dd3d5dc65192229492a4ad45900dabdbe2b311677878d91866c
+  metadata.gz: 0df45b5ae5b698e1b6ecb3d1e37e88315f0f8e3511dbf0052149ddcc00de2e93
+  data.tar.gz: 8b75994439528fc421eab75b6642166de4f5248a3b51548face0ca24e199f451
 SHA512:
-  metadata.gz: 5fac180bc79a47ad08969214bf46c6fef9c431608e643f6a707cf479fc3f4617f08e87b0057be350d768ad1151107f9147a6a35cd403a70e227d6dde2cbb14be
-  data.tar.gz: 76e0fd036db9afcddccc25f49a8dac62019f3f43e8710d8aa66ca73d2179a2da0d8efb6d3d7ddbd12032b6368fa0de2949e21613149e4f38fd7b8f53cb2a6734
+  metadata.gz: 33ece8b67fa985ea00095b7cc2d990db997e7bec63b95f8e488abd29f8a232b6308c2c976acaa9759a26181652b019b5f4bbe1205f3e8b69e25574b47a1bc3ea
+  data.tar.gz: cda5a75e61108eccc561267225588669c4049beca9d2b90fbfd0afda9787d48cae8f56afb4bcecbb8e7e79a16d266eb946faba156aef006b00c1c894c6373b3e

data/lib/protocol/http1/connection.rb

@@ -33,6 +33,7 @@ module Protocol
 		
 		# HTTP/1.x request line parser:
 		TOKEN = /[!#$%&'*+\-\.\^_`|~0-9a-zA-Z]+/.freeze
+		VALID_METHOD = /\A#{TOKEN}\z/.freeze
 		REQUEST_LINE = /\A(#{TOKEN}) ([^\s]+) (HTTP\/\d.\d)\z/.freeze
 		
 		# HTTP/1.x header parser:
@@ -185,7 +186,8 @@ module Protocol
 			
 			# Write the appropriate header for connection upgrade.
 			def write_upgrade_header(upgrade)
-				write_stream("connection: upgrade\r\nupgrade: #{upgrade}\r\n")
+				write_header(CONNECTION, "upgrade")
+				write_header(UPGRADE, upgrade)
 			end
 			
 			# Indicates whether the connection has been hijacked meaning its IO has been handed over and is not usable anymore.
@@ -253,6 +255,8 @@ module Protocol
 			#
 			# Transitions to the open state.
 			#
+			# Requires the method to be an HTTP token and rejects CR, LF, and NUL bytes in the authority and target before writing any request bytes.
+			#
 			# @parameter authority [String] the authority of the request.
 			# @parameter method [String] the HTTP method.
 			# @parameter target [String] the request target.
@@ -260,6 +264,23 @@ module Protocol
 			# @parameter headers [Hash] the HTTP headers.
 			# @raises [RefusedError] if the request was not processed.
 			def write_request(authority, method, target, version, headers)
+				method = method.to_s
+				unless method.b.match?(VALID_METHOD)
+					raise InvalidRequest, "Invalid request method: #{method.inspect}"
+				end
+				
+				target = target.to_s
+				unless target.b.match?(VALID_FIELD_VALUE)
+					raise InvalidRequest, "Invalid request target: #{target.inspect}"
+				end
+				
+				if authority
+					authority = authority.to_s
+					unless authority.b.match?(VALID_FIELD_VALUE)
+						raise InvalidRequest, "Invalid request authority: #{authority.inspect}"
+					end
+				end
+				
 				open!
 				
 				write_stream("#{method} #{target} #{version}\r\n")
@@ -311,27 +332,36 @@ module Protocol
 				flush_stream
 			end
 			
+			# Write a header to the connection, rejecting CR, LF, and NUL in its value.
+			#
+			# @parameter name [String] the header name.
+			# @parameter value [String] the header value.
+			# @raises [BadHeader] if the header name or value is invalid.
+			def write_header(name, value)
+				# Convert it to a string:
+				name = name.to_s
+				value = value.to_s
+				
+				# Validate it:
+				unless name.match?(VALID_FIELD_NAME)
+					raise BadHeader, "Invalid header name: #{name.inspect}"
+				end
+				
+				unless value.match?(VALID_FIELD_VALUE)
+					raise BadHeader, "Invalid header value for #{name}: #{value.inspect}"
+				end
+				
+				# Write it:
+				write_stream("#{name}: #{value}\r\n")
+			end
+			
 			# Write headers to the connection.
 			#
 			# @parameter headers [Hash] the headers to write.
 			# @raises [BadHeader] if the header name or value is invalid.
 			def write_headers(headers)
 				headers.each do |name, value|
-					# Convert it to a string:
-					name = name.to_s
-					value = value.to_s
-					
-					# Validate it:
-					unless name.match?(VALID_FIELD_NAME)
-						raise BadHeader, "Invalid header name: #{name.inspect}"
-					end
-					
-					unless value.match?(VALID_FIELD_VALUE)
-						raise BadHeader, "Invalid header value for #{name}: #{value.inspect}"
-					end
-					
-					# Write it:
-					write_stream("#{name}: #{value}\r\n")
+					write_header(name, value)
 				end
 			end
 			

data/lib/protocol/http1/version.rb

@@ -5,6 +5,6 @@
 
 module Protocol
 	module HTTP1
-		VERSION = "0.41.0"
+		VERSION = "0.41.1"
 	end
 end

data/readme.md

@@ -91,12 +91,14 @@ bundle exec sus
 
 ### Making Releases
 
-To make a new release:
+To prepare a release branch and open a pull request from an up-to-date `main`:
 
 ``` shell
-bundle exec bake gem:release:patch # or minor or major
+bundle exec bake gem:github:release:patch # or minor or major
 ```
 
+See [bake-gem-github](https://github.com/socketry/bake-gem-github) for setup, remote releases, and recovery.
+
 ### Developer Certificate of Origin
 
 In order to protect users of this project, we require all contributors to comply with the [Developer Certificate of Origin](https://developercertificate.org/). This ensures that all contributions are properly licensed and attributed.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protocol-http1
 version: !ruby/object:Gem::Version
-  version: 0.41.0
+  version: 0.41.1
 platform: ruby
 authors:
 - Samuel Williams
@@ -14,32 +14,28 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIE2DCCA0CgAwIBAgIBATANBgkqhkiG9w0BAQsFADBhMRgwFgYDVQQDDA9zYW11
-  ZWwud2lsbGlhbXMxHTAbBgoJkiaJk/IsZAEZFg1vcmlvbnRyYW5zZmVyMRIwEAYK
-  CZImiZPyLGQBGRYCY28xEjAQBgoJkiaJk/IsZAEZFgJuejAeFw0yMjA4MDYwNDUz
-  MjRaFw0zMjA4MDMwNDUzMjRaMGExGDAWBgNVBAMMD3NhbXVlbC53aWxsaWFtczEd
-  MBsGCgmSJomT8ixkARkWDW9yaW9udHJhbnNmZXIxEjAQBgoJkiaJk/IsZAEZFgJj
-  bzESMBAGCgmSJomT8ixkARkWAm56MIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIB
-  igKCAYEAomvSopQXQ24+9DBB6I6jxRI2auu3VVb4nOjmmHq7XWM4u3HL+pni63X2
-  9qZdoq9xt7H+RPbwL28LDpDNflYQXoOhoVhQ37Pjn9YDjl8/4/9xa9+NUpl9XDIW
-  sGkaOY0eqsQm1pEWkHJr3zn/fxoKPZPfaJOglovdxf7dgsHz67Xgd/ka+Wo1YqoE
-  e5AUKRwUuvaUaumAKgPH+4E4oiLXI4T1Ff5Q7xxv6yXvHuYtlMHhYfgNn8iiW8WN
-  XibYXPNP7NtieSQqwR/xM6IRSoyXKuS+ZNGDPUUGk8RoiV/xvVN4LrVm9upSc0ss
-  RZ6qwOQmXCo/lLcDUxJAgG95cPw//sI00tZan75VgsGzSWAOdjQpFM0l4dxvKwHn
-  tUeT3ZsAgt0JnGqNm2Bkz81kG4A2hSyFZTFA8vZGhp+hz+8Q573tAR89y9YJBdYM
-  zp0FM4zwMNEUwgfRzv1tEVVUEXmoFCyhzonUUw4nE4CFu/sE3ffhjKcXcY//qiSW
-  xm4erY3XAgMBAAGjgZowgZcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0O
-  BBYEFO9t7XWuFf2SKLmuijgqR4sGDlRsMC4GA1UdEQQnMCWBI3NhbXVlbC53aWxs
-  aWFtc0BvcmlvbnRyYW5zZmVyLmNvLm56MC4GA1UdEgQnMCWBI3NhbXVlbC53aWxs
-  aWFtc0BvcmlvbnRyYW5zZmVyLmNvLm56MA0GCSqGSIb3DQEBCwUAA4IBgQB5sxkE
-  cBsSYwK6fYpM+hA5B5yZY2+L0Z+27jF1pWGgbhPH8/FjjBLVn+VFok3CDpRqwXCl
-  xCO40JEkKdznNy2avOMra6PFiQyOE74kCtv7P+Fdc+FhgqI5lMon6tt9rNeXmnW/
-  c1NaMRdxy999hmRGzUSFjozcCwxpy/LwabxtdXwXgSay4mQ32EDjqR1TixS1+smp
-  8C/NCWgpIfzpHGJsjvmH2wAfKtTTqB9CVKLCWEnCHyCaRVuKkrKjqhYCdmMBqCws
-  JkxfQWC+jBVeG9ZtPhQgZpfhvh+6hMhraUYRQ6XGyvBqEUe+yo6DKIT3MtGE2+CP
-  eX9i9ZWBydWb8/rvmwmX2kkcBbX0hZS1rcR593hGc61JR6lvkGYQ2MYskBveyaxt
-  Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
-  voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
+  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
   -----END CERTIFICATE-----
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
@@ -96,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.21
 specification_version: 4
 summary: A low level implementation of the HTTP/1 protocol.
 test_files: []