faraday-net_http 3.0.2 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9cad2197cf7df07a668741fb5ae27309b6f7aee396b207268ba63076569ae59f
-  data.tar.gz: 47fbe72a4c70f85b5659376f0a758088d26c8a6f2901a8320a22bfba872e2c1f
+  metadata.gz: 737599a223dbac248cbbbbd9135fb6435b9fe3b340549b87c9e5176ce066e3fd
+  data.tar.gz: 5d7e885ac59d063f49a7fb999f1cf86ebd66aa1c0c76a5d0273bdd4992b72eb6
 SHA512:
-  metadata.gz: 7b6cb45789018beedcef079c136c213e6532aba87d2503bd6f1544cf30f3ab3cdda9c08e4164d0f93a056595622cdf9c8f125e19798f8147e3e52f1387c5c800
-  data.tar.gz: 66131665eb559ad8b1bbba18c12916c3ace677b93a6055269c7def945dced9021f2864df22d9326880a8379602e0ac78fd44f49c137217e05978fa7377cedb3d
+  metadata.gz: 413aabd776695183fa818a0c022e8e2b450724bcfb6b0255e1a9240ef321d3d7f58e3988c68110a669234c830a2ac2f2a1ce04ad5d1fb2afde9b23998a183e82
+  data.tar.gz: 5931da595d755e6c86b71387335231201706391cf6faed61d46c2ddeb2667090d6fc397d9918d82079d5db8dd125c55e760a8ae393cc9771f2408435065df8fb

data/lib/faraday/adapter/net_http.rb

@@ -42,8 +42,7 @@ module Faraday
 
       def build_connection(env)
         net_http_connection(env).tap do |http|
-          http.use_ssl = env[:url].scheme == 'https' if http.respond_to?(:use_ssl=)
-          configure_ssl(http, env[:ssl])
+          configure_ssl(http, env[:ssl]) if env[:url].scheme == 'https' && env[:ssl]
           configure_request(http, env[:request])
         end
       end
@@ -54,7 +53,8 @@ module Faraday
         if proxy
           Net::HTTP.new(env[:url].hostname, port,
                         proxy[:uri].hostname, proxy[:uri].port,
-                        proxy[:user], proxy[:password])
+                        proxy[:user], proxy[:password],
+                        nil, proxy[:uri].scheme == 'https')
         else
           Net::HTTP.new(env[:url].hostname, port, nil)
         end
@@ -106,18 +106,14 @@ module Faraday
         http_response
       end
 
-      def request_with_wrapped_block(http, env)
+      def request_with_wrapped_block(http, env, &block)
         # Must use Net::HTTP#start and pass it a block otherwise the server's
         # TCP socket does not close correctly.
         http.start do |opened_http|
           opened_http.request create_request(env) do |response|
             save_http_response(env, response)
 
-            if block_given?
-              response.read_body do |chunk|
-                yield(chunk)
-              end
-            end
+            response.read_body(&block) if block_given?
           end
         end
       end
@@ -133,12 +129,15 @@ module Faraday
       end
 
       def configure_ssl(http, ssl)
-        return unless ssl
+        http.use_ssl = true if http.respond_to?(:use_ssl=)
 
         http.verify_mode = ssl_verify_mode(ssl)
         http.cert_store = ssl_cert_store(ssl)
 
-        http.cert = ssl[:client_cert] if ssl[:client_cert]
+        cert, *extra_chain_cert = ssl[:client_cert]
+        http.cert = cert if cert
+        http.extra_chain_cert = extra_chain_cert if extra_chain_cert.any?
+
         http.key = ssl[:client_key] if ssl[:client_key]
         http.ca_file = ssl[:ca_file] if ssl[:ca_file]
         http.ca_path = ssl[:ca_path] if ssl[:ca_path]
@@ -147,6 +146,7 @@ module Faraday
         http.min_version = ssl[:min_version] if ssl[:min_version]
         http.max_version = ssl[:max_version] if ssl[:max_version]
         http.verify_hostname = ssl[:verify_hostname] if verify_hostname_enabled?(http, ssl)
+        http.ciphers = ssl[:ciphers] if ssl[:ciphers]
       end
 
       def configure_request(http, req)
@@ -172,20 +172,18 @@ module Faraday
       def ssl_cert_store(ssl)
         return ssl[:cert_store] if ssl[:cert_store]
 
-        @ssl_cert_store ||= begin
-                              # Use the default cert store by default, i.e. system ca certs
-                              OpenSSL::X509::Store.new.tap(&:set_default_paths)
-                            end
+        # Use the default cert store by default, i.e. system ca certs
+        @ssl_cert_store ||= OpenSSL::X509::Store.new.tap(&:set_default_paths)
       end
 
       def ssl_verify_mode(ssl)
         ssl[:verify_mode] || begin
-                               if ssl.fetch(:verify, true)
-                                 OpenSSL::SSL::VERIFY_PEER
-                               else
-                                 OpenSSL::SSL::VERIFY_NONE
-                               end
-                             end
+          if ssl.fetch(:verify, true)
+            OpenSSL::SSL::VERIFY_PEER
+          else
+            OpenSSL::SSL::VERIFY_NONE
+          end
+        end
       end
 
       def encoded_body(http_response)

data/lib/faraday/net_http/version.rb

@@ -2,6 +2,6 @@
 
 module Faraday
   module NetHttp
-    VERSION = '3.0.2'
+    VERSION = '3.4.0'
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: faraday-net_http
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.4.0
 platform: ruby
 authors:
 - Jan van der Pas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-11 00:00:00.000000000 Z
+date: 2024-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: net-http
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.5'
-  type: :development
+        version: 0.5.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: 0.5.0
 description: Faraday adapter for Net::HTTP
 email:
 - janvanderpas@gmail.com
@@ -42,7 +42,8 @@ licenses:
 metadata:
   homepage_uri: https://github.com/lostisland/faraday-net_http
   source_code_uri: https://github.com/lostisland/faraday-net_http
-  changelog_uri: https://github.com/lostisland/faraday-net_http/releases/tag/v3.0.2
+  changelog_uri: https://github.com/lostisland/faraday-net_http/releases/tag/v3.4.0
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -51,14 +52,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.5.11
 signing_key: 
 specification_version: 4
 summary: Faraday adapter for Net::HTTP