cloudkeeper 1.4.2 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1358dc8f5002e70611207126243b106695182838
-  data.tar.gz: 3665cac985a187a948f973ab8ea30f1295c660c0
+  metadata.gz: adda5085537bff99cf6928e41f903c6ac1ebca8d
+  data.tar.gz: b10b49306646a737bd09956dedb04031087ef97e
 SHA512:
-  metadata.gz: 0bf08fabfc72f259b5a962bff5a4d0d98092e8dac9679f1a2da8b2057317f0c2a65a5e73e833bba04a9e0bed2efa554b2415aa1433e2a2aa111699cd20383686
-  data.tar.gz: 4009178fe581c3c416ad48d048bf54b290cf450f4d96f87a917fb7106223799be594daed75f3ff9d48773a21e7144eda9ffe840a438812154506a71f89b95a85
+  metadata.gz: fd66199e62985e93a4fd09a252903d975e5c109a15909984df73edd599a43e2878204341a0536b371134d4477f4c319519ca05d92aa45e439301f098cdb23d27
+  data.tar.gz: b781937419f1194da141c0a41fd5d5c074f4e01d4ae9114d7691927fe06b68c6cc89895273e31a3e24bdd80aff91ad149d956c13e0912678edbca970ddb8ec7f

data/lib/cloudkeeper/managers/image_list_manager.rb

@@ -33,7 +33,7 @@ module Cloudkeeper
             image_lists[image_list.identifier] = image_list
           rescue Cloudkeeper::Errors::ImageList::DownloadError, Cloudkeeper::Errors::ImageList::VerificationError,
                  Cloudkeeper::Errors::Parsing::ParsingError => ex
-            logger.warn "Image list #{url} couldn't be donwloaded\n#{ex.message}"
+            logger.warn "Image list #{url} couldn't be downloaded\n#{ex.message}"
             next
           end
         end
@@ -55,12 +55,14 @@ module Cloudkeeper
         raise Cloudkeeper::Errors::ImageList::RetrievalError,
               "couldn't download image list from url #{url.inspect}\n#{response.to_hash.inspect}"
       rescue Cloudkeeper::Errors::ImageList::RetrievalError, Cloudkeeper::Errors::InvalidURLError, ::IOError,
-             ::Faraday::ConnectionFailed => ex
+             ::Faraday::ConnectionFailed, ::Faraday::SSLError => ex
         raise Cloudkeeper::Errors::ImageList::DownloadError, ex
       end
 
       def make_request(uri)
-        conn = Faraday.new url: uri
+        ssl = {}
+        ssl = { ca_path: Cloudkeeper::Settings[:'ca-dir'], cert_store: OpenSSL::X509::Store.new } if Cloudkeeper::Settings[:'ca-dir']
+        conn = Faraday.new url: uri, ssl: ssl
         conn.get
       end
 

data/lib/cloudkeeper/managers/image_manager.rb

@@ -62,8 +62,7 @@ module Cloudkeeper
         end
 
         def retrieve_image(uri, filename)
-          use_ssl = uri.scheme == 'https'
-          Net::HTTP.start(uri.host, uri.port, use_ssl: use_ssl) do |http|
+          Net::HTTP.start(uri.host, uri.port, connection_options(uri)) do |http|
             request = Net::HTTP::Get.new(uri)
 
             http.request(request) do |response|
@@ -77,10 +76,17 @@ module Cloudkeeper
             end
           end
         rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, Errno::ECONNREFUSED, Net::HTTPBadResponse,
-               Net::HTTPHeaderSyntaxError, EOFError, Net::HTTPServerException, Net::HTTPRetriableError => ex
+               Net::HTTPHeaderSyntaxError, EOFError, Net::HTTPServerException, Net::HTTPRetriableError,
+               OpenSSL::SSL::SSLError => ex
           raise Cloudkeeper::Errors::NetworkConnectionError, ex
         end
 
+        def connection_options(uri)
+          use_ssl = uri.scheme == 'https'
+          ca_path = Cloudkeeper::Settings[:'ca-dir'] if Cloudkeeper::Settings[:'ca-dir']
+          { use_ssl: use_ssl, ca_path: ca_path }
+        end
+
         def generate_filename(uri)
           File.join(Cloudkeeper::Settings[:'image-dir'], Zaru.sanitize!(File.basename(uri.path)))
         end

data/lib/cloudkeeper/version.rb

@@ -1,3 +1,3 @@
 module Cloudkeeper
-  VERSION = '1.4.2'.freeze
+  VERSION = '1.5.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudkeeper
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.5.0
 platform: ruby
 authors:
 - Michal Kimle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-09 00:00:00.000000000 Z
+date: 2017-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler