yao 0.13.2 → 0.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 051a375b0fda12cf9a9a3553d13905638adb2af8e661606d2407c0a1b832c032
-  data.tar.gz: a0592f5d24e3d258b2b2bba0c6b7d16dc48a26a365a27c4b98354a349da04144
+  metadata.gz: 919bc587d14da66211d65e2b3a9b73b41f458947f9417bdc64d09fc818aafde6
+  data.tar.gz: b88b52c34a06ba337b3fc84944eb7cb83e496588df76a3b659dedf0e195ffd1a
 SHA512:
-  metadata.gz: 9c3859bf07d45e3f257ab3b7c8e45da5304cb0046b823916617fcd896d3ea2e7811dd4b3fce463a9fb1916dba336df00c6f817a246feeea6227036b7206a49b0
-  data.tar.gz: 5fc9b2a499232273a76bde3134102d1913baa41c233cd42a5aa4d84704a19817a39285fcba8ab05bfbe0dc2d060705d7e0d580a30b4b53e49f2928b518ff7a44
+  metadata.gz: 594a7f34ebd9d3f879377125d8383eb42a50295f668111757e63cdbecc7c40b7f4d43a93e94477a8874f24996d30e813b7f9268d49ba0604aca8f3b980b95687
+  data.tar.gz: 689b7970f7ac73e37bbb174ac1871e7b56a1c6778da40f3d1e7c5042097b72d6d1fba4059debaff0914b6e95ce953581021fea103d48c967a176c30c2e9e8d2e

data/README.md

@@ -34,7 +34,8 @@ Yao.configure do
   # timeout is optional
   timeout     300
 
-  # If your endpoint requires cert & key
+  # If your endpoint requires cacert,cert and key
+  ca_cert "/path/to/my.ca"
   client_cert "/path/to/my.pem"
   client_key "/path/to/my.key"
 

data/lib/yao/auth.rb

@@ -5,7 +5,7 @@ require 'yao/token'
 require 'yao/tokenv3'
 
 module Yao
-  %i(tenant_name username password timeout client_cert client_key region_name
+  %i(tenant_name username password timeout ca_cert client_cert client_key region_name
      identity_api_version user_domain_id user_domain_name project_domain_id project_domain_name).each do |name|
     Yao.config.param name, nil
   end

data/lib/yao/client.rb

@@ -127,10 +127,13 @@ module Yao
         if Yao.config.client_cert && Yao.config.client_key
           cert = OpenSSL::X509::Certificate.new(File.read(Yao.config.client_cert))
           key  = OpenSSL::PKey.read(File.read(Yao.config.client_key))
-          opt.merge!(ssl: {
+          h = {
             client_cert: cert,
             client_key:  key,
-          })
+          }
+
+          h[:ca_file] = Yao.config.ca_cert if Yao.config.ca_cert
+          opt.merge!(ssl: h)
         end
         opt
       end

data/lib/yao/version.rb

@@ -1,3 +1,3 @@
 module Yao
-  VERSION = "0.13.2"
+  VERSION = "0.13.3"
 end

data/test/yao/test_client.rb

@@ -64,6 +64,7 @@ class TestClient < Test::Unit::TestCase
   end
 
   def test_cert_key
+    stub(Yao.config).ca_cert { File.expand_path("../../fixtures/dummy.pem", __FILE__) }
     stub(Yao.config).client_cert { File.expand_path("../../fixtures/dummy.pem", __FILE__) }
     stub(Yao.config).client_key  { File.expand_path("../../fixtures/dummy.key", __FILE__) }
     stub(OpenSSL::X509::Certificate).new { "DummyCert" }
@@ -71,6 +72,7 @@ class TestClient < Test::Unit::TestCase
 
     cli = Yao::Client.gen_client("http://cool-api.example.com:12345/v3.0")
     ssl = cli.ssl
+    assert { ssl[:ca_file] == File.expand_path("../../fixtures/dummy.pem", __FILE__) }
     assert { ssl[:client_cert] == "DummyCert" }
     assert { ssl[:client_key] == "DummyKey" }
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yao
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.13.3
 platform: ruby
 authors:
 - Uchio, KONDO
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-16 00:00:00.000000000 Z
+date: 2020-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json