ncore 2.2.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07c75405575122b5d5f7fa72b1c18529154fd5bec8ac5d7498018524ddee61cd
-  data.tar.gz: a1dc08e6302d6476572ee2aad22ab00cb08659539693a2447b2e45bc4755f67a
+  metadata.gz: 7794c341283c6e1ff3f7014e9f706d882c168b4eca9b8573caae51d88ce6fcf3
+  data.tar.gz: d12dcc65c24b2774ec2f23d769b1f1b0e6caecf477f88d059f671b4ef4f4c8bc
 SHA512:
-  metadata.gz: 6f77bd18f1c6d8fe05d5d396d1af31c002a0348d3813383e95e745fb5f78db58553b297319330047a2b14fd668b588e929dbd37875cdc88a4a5c3c9b6431b7c8
-  data.tar.gz: b82e397145c197f5b8655f63d24f7912ee3b41099d00342dcbdd3368e86106eeb72ebdf9c69b26c4a0aede02c15f34b4c82c1a65ffefff4e8617147ac234aedf
+  metadata.gz: 179fafbde6fd33667de8935e14594b950d8183e597d7612eead1cc6582407070f22529aa66c1df47fd8dd2427ec6a229021dcb739f9bd111a24038875b6aa935
+  data.tar.gz: d8d1c0f29e207a057eaa6ff93bdd3b532c6888ed5c19c7057f8fb3c27ee0548f6e411cea0d1dfa728456a0aa562ffadc278466443dc5ab05da2d76bb2ea0147a

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+#### 2.3.2
+
+- Allow ActiveSupport 7.0
+
+#### 2.3.1
+
+- Allow ActiveSupport 6.1
+
+#### 2.3.0
+
+- Use system's CA certificate store by default (backport from v3.2.0)
+  To use bundled CAs instead:
+    SomeAppName::Api.ssl_cert_bundle = :bundled
+  On failure reading specified bundle, raises exception instead of warning
+
+#### 2.2.2
+
+- Update certs
+
 #### 2.2.1
 
 - Fix decimal attributes on Ruby <= 2.5.x

data/lib/ncore/client.rb

@@ -200,7 +200,7 @@ module NCore
         rescue Excon::Errors::SocketError => e
           case e.message
           when /Unable to verify certificate/
-            raise parent::ConnectionError, "Unable to verify certificate for #{host_for_error rest_opts[:url]} : verify URL or disable SSL certificate verification (insecure)."
+            raise parent::ConnectionError, "Unable to verify certificate for #{host_for_error rest_opts[:url]} : verify URL, set ssl_cert_bundle=, or disable SSL certificate verification (insecure)."
           when /Name or service not known/, /No address associated with hostname/
             raise parent::ConnectionError, "DNS error for #{host_for_error rest_opts[:url]} : check network and DNS or visit #{status_page}."
           when /Errno::ECONNREFUSED/
@@ -295,17 +295,16 @@ module NCore
 
       def verify_ssl_cert?
         return @verify_ssl_cert unless @verify_ssl_cert.nil?
-        bundle_readable = File.readable?(ssl_cert_bundle)
-        if verify_ssl && bundle_readable
+        if verify_ssl
+          if ssl_cert_bundle
+            bundle_readable = File.readable?(ssl_cert_bundle) rescue false
+            unless bundle_readable
+              raise parent::CertificateError, "Unable to read SSL cert bundle #{ssl_cert_bundle}."
+            end
+          end
           @verify_ssl_cert = true
         else
-          m = 'WARNNG: SSL cert verification is disabled.'
-          unless verify_ssl
-            m += " Enable verification with: #{parent}::Api.verify_ssl = true."
-          end
-          unless bundle_readable
-            m += " Unable to read CA bundle #{ssl_cert_bundle}."
-          end
+          m = "WARNNG: SSL cert verification is disabled. Enable verification with: #{parent}::Api.verify_ssl = true."
           $stderr.puts m
           @verify_ssl_cert = false
         end

data/lib/ncore/configuration.rb

@@ -45,13 +45,34 @@ module NCore
         mattr_accessor :verify_ssl
         self.verify_ssl = true
 
-        mattr_accessor :ssl_cert_bundle
-        self.ssl_cert_bundle = File.dirname(__FILE__)+'/ssl/ca-certificates.crt'
+        mattr_reader :ssl_cert_bundle
+        class_eval <<-MTH
+          def self.ssl_cert_bundle=(v)
+            v = find_excon_bundle if v==:bundled
+            @@ssl_cert_bundle = v
+          end
+          def ssl_cert_bundle=(v)
+            v = find_excon_bundle if v==:bundled
+            @@ssl_cert_bundle = v
+          end
+        MTH
 
         mattr_accessor :logger
         self.logger = Logger.new(STDOUT)
       end
 
+
+      private
+
+      def find_excon_bundle
+        b = Gem.find_files_from_load_path('../data/cacert.pem').select{|p| p=~/excon/}.first
+        if b
+          b.freeze
+        else
+          raise parent::CertificateError, 'Failed to locate CA cert bundle from excon. Specify a full path instead.'
+        end
+      end
+
     end
 
   end

data/lib/ncore/exceptions.rb

@@ -9,6 +9,7 @@ module NCore
         class AccessDenied < Error ; end
         class AccountInactive < Error ; end
         class AuthenticationFailed < Error ; end
+        class CertificateError < Error ; end
         class ConnectionError < Error ; end
         class RateLimited < Error ; end
         class RecordNotFound < Error ; end

data/lib/ncore/version.rb

@@ -1,3 +1,3 @@
 module NCore
-  VERSION = '2.2.1'
+  VERSION = '2.3.2'
 end

data/ncore.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'activesupport', '>= 3.2', '< 6.1'
+  spec.add_dependency 'activesupport', '>= 3.2', '< 7.1'
   spec.add_dependency 'excon', '~> 0.32'
 
   spec.add_development_dependency "bundler", "~> 1.3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ncore
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Notioneer Team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-06-11 00:00:00.000000000 Z
+date: 2021-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -19,7 +19,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
@@ -117,7 +117,6 @@ files:
 - lib/ncore/rails/log_subscriber.rb
 - lib/ncore/rails/module_fix.rb
 - lib/ncore/singleton_base.rb
-- lib/ncore/ssl/ca-certificates.crt
 - lib/ncore/util.rb
 - lib/ncore/version.rb
 - ncore.gemspec
@@ -125,7 +124,7 @@ homepage: https://notioneer.com/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -140,8 +139,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: NCore - Gem for building REST API clients
 test_files: []