excon 0.97.1 → 0.98.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee0b45af4f7467933687432b2eca89846435cf7fe55b76e17e437b81754fa5cb
-  data.tar.gz: fb52600cfbdaa2ef778ce9131e1905135f80bf74b39db16ca04b67ba379966e3
+  metadata.gz: b980a243ce1d748881c7d985f42db2e6fc20b382597220d2c5d5541e8b3359f9
+  data.tar.gz: 2dacdc182c779be0cf4c978092baca5fef6e4fa0971369be2764b7e090830f68
 SHA512:
-  metadata.gz: 010da7bd227bce02def5a8041d20df6d5f7a4f02a19a04cf4cec60d095f3123bec397476bb7f8c1c55ba56c0ddd969d39d1bde9c2b88749fa3dde17a94f67448
-  data.tar.gz: '0419fa670f965885905f35f8bf95c5a8f8db8c76b172a77ae6c53ff344345c2957a0703454e3080fb2e0e24a8224cf865437334ae956ede7945d7e99e55853d7'
+  metadata.gz: 9495b2cf646c81eb2ab6691cbafe44ddc4842cba32abd2c849b348ad13ad0d067f8ef14babeed0cee3116bf7d7939ec68fdc5c7632455104183ea7d1dcefb938
+  data.tar.gz: bdc12e6fc203c223bad18faaa42311ed416befffe2475c74e2d164fca3a44389b55627b3178022a38b6440a54fadba1ec63b8eb42af843f28fdb731713035725

data/README.md

@@ -446,7 +446,16 @@ connection = Excon.new('https://example.com',
 
 `client_key_pass` is optional.
 
-If you already have loaded the certificate and key into memory, then pass it through like:
+Optionally, you can also pass the whole chain by passing the extra certificates through `client_chain`:
+
+```ruby
+connection = Excon.new('https://example.com',
+                       client_cert: 'mycert.pem',
+                       client_chain: 'mychain.pem',
+                       client_key: 'mycert.key')
+```
+
+If you already have loaded the certificate, key and chain into memory, then pass it through like:
 
 ```ruby
 client_cert_data = File.load 'mycert.pem'
@@ -454,6 +463,7 @@ client_key_data = File.load 'mycert.key'
 
 connection = Excon.new('https://example.com',
                        client_cert_data: client_cert_data,
+                       client_chain_data: client_chain_data,
                        client_key_data: client_key_data)
 ```
 

data/lib/excon/constants.rb

@@ -72,6 +72,8 @@ module Excon
     :client_key_pass,
     :client_cert,
     :client_cert_data,
+    :client_chain,
+    :client_chain_data,
     :certificate,
     :certificate_path,
     :disable_proxy,

data/lib/excon/response.rb

@@ -81,12 +81,13 @@ module Excon
         :body          => String.new,
         :cookies       => [],
         :host          => datum[:host],
-        :scheme          => datum[:scheme],
-        :method          => datum[:method],
+        :scheme        => datum[:scheme],
+        :method        => datum[:method],
         :headers       => Excon::Headers.new,
         :path          => datum[:path],
-        :query          => datum[:query],
+        :query         => datum[:query],
         :port          => datum[:port],
+        :omit_default_port => datum[:omit_default_port],
         :status        => status,
         :status_line   => line,
         :reason_phrase => reason_phrase

data/lib/excon/ssl_socket.rb

@@ -90,6 +90,14 @@ module Excon
         else
           ssl_context.key = OpenSSL::PKey::RSA.new(client_key_data, client_key_pass)
         end
+        if client_chain_data && OpenSSL::X509::Certificate.respond_to?(:load)
+          ssl_context.extra_chain_cert = OpenSSL::X509::Certificate.load(client_chain_data)
+        elsif client_chain_data
+          certs = client_chain_data.scan(/-----BEGIN CERTIFICATE-----(?:.|\n)+?-----END CERTIFICATE-----/)
+          ssl_context.extra_chain_cert = certs.map do |cert|
+            OpenSSL::X509::Certificate.new(cert)
+          end
+        end
       elsif @data.key?(:certificate) && @data.key?(:private_key)
         ssl_context.cert = OpenSSL::X509::Certificate.new(@data[:certificate])
         if OpenSSL::PKey.respond_to? :read
@@ -171,6 +179,14 @@ module Excon
                             end
     end
 
+    def client_chain_data
+      @client_chain_data ||= if (ccd = @data[:client_chain_data])
+                               ccd
+                             elsif (path = @data[:client_chain])
+                               File.read path
+                             end
+    end
+
     def connect
       # backwards compatability for things lacking nonblock
       @nonblock = HAVE_NONBLOCK && @nonblock

data/lib/excon/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Excon
-  VERSION = '0.97.1'
+  VERSION = '0.98.0'
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: excon
 version: !ruby/object:Gem::Version
-  version: 0.97.1
+  version: 0.98.0
 platform: ruby
 authors:
 - dpiddy (Dan Peterson)
 - geemus (Wesley Beary)
 - nextmat (Matt Sanders)
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-11 00:00:00.000000000 Z
+date: 2023-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -235,7 +235,7 @@ metadata:
   documentation_uri: https://github.com/excon/excon/blob/master/README.md
   source_code_uri: https://github.com/excon/excon
   wiki_uri: https://github.com/excon/excon/wiki
-post_install_message:
+post_install_message: 
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -251,8 +251,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
-signing_key:
+rubygems_version: 3.4.1
+signing_key: 
 specification_version: 4
 summary: speed, persistence, http(s)
 test_files: []