http 6.0.2 → 6.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93055a5ab4132e9943b15cacd421d7994bf3fb7f1ffdb5eb37865d59c9d353cf
-  data.tar.gz: 7cb55397feb3a9479d52cf4f4d4de2762ef584daa5d4887f363ae8e0c10f32d6
+  metadata.gz: 0ada1c2436fc0b5a9f5eba76d63d7f7846ad7ff2635717693f67ad48c3d9c22b
+  data.tar.gz: 016a84342ef4655e6359564b7b2833eb2563f57b4876043e901800187cd2a2e6
 SHA512:
-  metadata.gz: 626a25da807e2bc32aa1cb077a7dba2eb20fc0ea0e969e3e9d9c185997baa02072832772d7b6325e7fe00e8a669221032fbad844294d16ae2d62dac1f8b5693b
-  data.tar.gz: dcc2dc39b1a536d737656654accb528fc613a80862174c9bbb0b709572a7277cf221b1fc38c5f821842fdaf2f129ec37caa3f1754852f9822e2d4408472a3018
+  metadata.gz: 03222f88025ec225419f422dc3a2c6823c388354795ebb124630519e79d8ba96955d8e3d956aaba995e4a2c84e3b4932c5773976132967a3128dd6d85d109c87
+  data.tar.gz: c9f80325fd4257df0a0dc8e801f9ed5e006562ec8d84dcca009d5359a8c49e5912d6566bc715f65be8c10a3682831a44e3aad7d626640b472b80eccbaedb8211

data/http.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.metadata["rubygems_mfa_required"] = "true"
 
   spec.files = IO.popen(%w[git ls-files -z], chdir: __dir__, err: IO::NULL) do |ls|
-    extras = %w[LICENSE.txt README.md sig/http.rbs] << File.basename(__FILE__)
+    extras = %w[LICENSE.txt README.md sig/http.rbs sig/llhttp.rbs sig/manifest.yaml] << File.basename(__FILE__)
 
     ls.readlines("\x0", chomp: true).select do |f|
       f.start_with?("lib/") || extras.include?(f)

data/lib/http/connection.rb

@@ -254,7 +254,7 @@ module HTTP
     # @return [void]
     # @api private
     def connect_socket(req, options)
-      @socket = options.timeout_class.new(**options.timeout_options) # steep:ignore
+      @socket = options.timeout_class.new(**options.timeout_options)
       @socket.connect(options.socket_class, req.socket_host, req.socket_port, nodelay: options.nodelay)
 
       send_proxy_connect_request(req)

data/lib/http/features/instrumentation.rb

@@ -14,8 +14,8 @@ module HTTP
     #
     # Emits two events on every request:
     #
-    #  * `start_request.http` before the request is made, so you can log the reqest being started
-    #  * `request.http` after the response is recieved, and contains `start`
+    #  * `start_request.http` before the request is made, so you can log the request being started
+    #  * `request.http` after the response is received, and contains `start`
     #    and `finish` so the duration of the request can be calculated.
     #
     class Instrumentation < Feature

data/lib/http/features/logging.rb

@@ -158,7 +158,7 @@ module HTTP
       # @return [HTTP::Response::Body]
       # @api private
       def logged_body(body)
-        formatter = (method(:format_binary) unless body.loggable?) # steep:ignore
+        formatter = (method(:format_binary) unless body.loggable?)
         stream = BodyLogger.new(body.instance_variable_get(:@stream), logger, formatter: formatter) # steep:ignore
         Response::Body.new(stream, encoding: body.encoding)
       end

data/lib/http/request/builder.rb

@@ -81,7 +81,7 @@ module HTTP
       # @return [HTTP::URI] the constructed URI
       # @api private
       def make_request_uri(uri)
-        uri = uri.to_s
+        uri = neutralize_protocol_relative(uri.to_s)
 
         if @options.base_uri? && uri !~ HTTP_OR_HTTPS_RE
           uri = resolve_against_base(uri)
@@ -101,6 +101,26 @@ module HTTP
         uri
       end
 
+      # Neutralize a leading "//" so it resolves as a relative path under base
+      #
+      # A "//"-prefixed input is a protocol-relative (network-path) reference
+      # per RFC 3986 §4.2 / §5.2. On the base_uri branch it would replace the
+      # base authority via URI#join; on the persistent branch naive
+      # concatenation produces "scheme://persistent//evil/path" which
+      # HTTP::URI.parse normalises into scheme://evil/path. Prepending "./"
+      # forces the input to resolve as an ordinary relative path under the
+      # configured base.
+      #
+      # @param uri [String] the input URI
+      # @return [String] uri unchanged, or "./" + uri when neutralization applies
+      # @api private
+      def neutralize_protocol_relative(uri)
+        return uri unless @options.base_uri? || @options.persistent?
+        return uri unless uri.start_with?("//")
+
+        "./#{uri}"
+      end
+
       # Resolve a relative URI against the configured base URI
       #
       # Ensures the base URI path has a trailing slash so that relative

data/lib/http/response.rb

@@ -337,9 +337,9 @@ module HTTP
     # @return [HTTP::Request]
     # @api private
     def init_request(request, uri)
-      raise ArgumentError, ":uri is for backwards compatibilty and conflicts with :request" if request && uri
+      raise ArgumentError, ":uri is for backwards compatibility and conflicts with :request" if request && uri
 
-      # For backwards compatibilty
+      # For backwards compatibility
       if uri
         HTTP::Request.new(uri: uri, verb: :get)
       else

data/lib/http/timeout/null.rb

@@ -185,12 +185,14 @@ module HTTP
       # @return [Object] the connected socket
       # @api private
       def open_socket(socket_class, host, port, connect_timeout: nil)
-        if connect_timeout
+        return socket_class.open(host, port) unless connect_timeout
+
+        if native_timeout?(socket_class)
+          open_with_timeout(socket_class, host, port, connect_timeout)
+        else
           ::Timeout.timeout(connect_timeout, ConnectTimeoutError) do
             open_with_timeout(socket_class, host, port, connect_timeout)
           end
-        else
-          socket_class.open(host, port)
         end
       rescue IO::TimeoutError
         raise ConnectTimeoutError, "Connect timed out after #{connect_timeout} seconds"

data/lib/http/uri/parsing.rb

@@ -171,11 +171,11 @@ module HTTP
     # @return [Hash] URI components
     private_class_method def self.parse_with_addressable(uri_string)
       require_addressable
-      parsed = Addressable::URI.parse(uri_string) # steep:ignore
+      parsed = Addressable::URI.parse(uri_string)
       { scheme: parsed.scheme, user: parsed.user, password: parsed.password,
         host: parsed.host, port: parsed.port, path: parsed.path,
         query: parsed.query, fragment: parsed.fragment }
-    rescue Addressable::URI::InvalidURIError # steep:ignore
+    rescue Addressable::URI::InvalidURIError
       raise InvalidError, "invalid URI: #{uri_string.inspect}"
     end
   end

data/lib/http/version.rb

@@ -2,5 +2,5 @@
 
 module HTTP
   # Current library version
-  VERSION = "6.0.2"
+  VERSION = "6.0.4"
 end

data/sig/http.rbs

@@ -818,6 +818,7 @@ module HTTP
       private
 
       def make_request_uri: (String | URI uri) -> URI
+      def neutralize_protocol_relative: (String uri) -> String
       def resolve_against_base: (String uri) -> String
       def merge_query_params!: (URI uri) -> void
       def make_request_headers: () -> Headers

data/sig/llhttp.rbs

@@ -0,0 +1,20 @@
+# Stubs for llhttp / llhttp-ffi, which do not ship their own RBS signatures.
+# Referenced by `HTTP::Response::Parser`, which is part of the public API.
+
+module LLHttp
+  class Error < StandardError
+  end
+
+  class Parser
+    def initialize: (untyped, ?type: Symbol) -> void
+    def reset: () -> void
+    def <<: (String) -> void
+    def status_code: () -> Integer
+    def http_major: () -> Integer
+    def http_minor: () -> Integer
+  end
+
+  class Delegate
+    def initialize: () -> void
+  end
+end

data/sig/manifest.yaml

@@ -0,0 +1,13 @@
+dependencies:
+  - name: base64
+  - name: digest
+  - name: forwardable
+  - name: openssl
+  - name: pathname
+  - name: securerandom
+  - name: singleton
+  - name: tempfile
+  - name: time
+  - name: timeout
+  - name: uri
+  - name: zlib

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http
 version: !ruby/object:Gem::Version
-  version: 6.0.2
+  version: 6.0.4
 platform: ruby
 authors:
 - Tony Arcieri
@@ -113,15 +113,17 @@ files:
 - lib/http/uri/parsing.rb
 - lib/http/version.rb
 - sig/http.rbs
+- sig/llhttp.rbs
+- sig/manifest.yaml
 homepage: https://github.com/httprb/http
 licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/httprb/http
-  source_code_uri: https://github.com/httprb/http/tree/v6.0.2
+  source_code_uri: https://github.com/httprb/http/tree/v6.0.4
   bug_tracker_uri: https://github.com/httprb/http/issues
-  changelog_uri: https://github.com/httprb/http/blob/v6.0.2/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/http/6.0.2
+  changelog_uri: https://github.com/httprb/http/blob/v6.0.4/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/http/6.0.4
   rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
@@ -137,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.8
+rubygems_version: 4.0.16
 specification_version: 4
 summary: HTTP should be easy
 test_files: []