rubygems_ssl-client-certs 0.0.2.pre.alpha.pre.53 → 0.0.2.pre.alpha.pre.54

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzI1Y2E2MDRhNTNjMzY2MGNiOGFhZjA1ZmU5Y2Q0ZGY4Y2M5YTY3YQ==
+    ZTJmYzc4N2Y3OWIxMmEyM2E3MGRkOWU2MGJjYjFiOGZhNzU0NzY4ZQ==
   data.tar.gz: !binary |-
-    ZTJmNjY5NDlmYWVhMjU0M2VlMWM0ZmM5NTE4N2Y1OGI5NTA4MjY1Yw==
+    MGIxMDIwNjMzYTEyZjU5M2I5NTgyMGQ0MmNiNTM3ZDVjOGM1NzU0OA==
 SHA512:
   metadata.gz: !binary |-
-    YTI5ZWE2MTI4ZTc0NjNlZDcxYTMxNzEyOGI3YTg3YmM1ZmQ0Y2NjODgzZmMw
-    YjMzNzM3NmVmNjU2MmJjN2I0Y2YxZTc4ZDgyZTQ2YjExMDVjMGJmNDMxYWJj
-    ZjM5ZDg2YzhkZTMwZTI4OWVmZmExOGJkYWRkN2Y4NjlhNDk1NmQ=
+    Zjk3OTM0ZDg2ZjNjYTk5NWRiMjlmYjJmZDY5NzMwOTBiNmRjNGRiY2FkNDc1
+    NTZlZThjODJlZTE2ODkzYmNmNmJmZTQxZGVjZWJjOGJkZDE4NjY4YmY2NWZj
+    MjNjNzExYjBlZDg1NGQ2Y2UwNWVlMTg3MWE3Y2VlNzk2ZTA4MzU=
   data.tar.gz: !binary |-
-    YTJlMTZlNjk1OGVjNzhmZWM4YTVhZmVlYmJkZGRlMGZhOWExMzhiODNmMWI1
-    MGZiYjA3YjNlYThkM2FlZGI4Y2Q4ODg2ODNkN2U2OGQ2YmNhYmJhOWRhNjIw
-    MmQ2MTk2ODY1ZTI2OWNiMDFhMjcyNzI4OWY0MmQ0MmU4NDZhZTI=
+    ODUzY2Q5OWY5OGRjZDVkMWM3OTk4MzUyYmUyN2UwOWJjNDk0NDU5MmQyNTU2
+    NmU1Nzk1MjRkM2UzYmIxMGMxNTUyZTkyMjQ1YjVhMDAxMjM4NjdmNjRmOWQ4
+    NjFmNTcxYWEwZmE0MDc1Y2FiYzg0YTM1NmNkOWRjOTViYzdlMzE=

data/lib/rubygems_plugin.rb

@@ -1,111 +1,124 @@
 require 'rubygems/remote_fetcher'
 
-class Gem::ConfigFile
+$stderr.puts "rubygems ssl client certs plugin loading"
 
-  attr_reader :ssl_client_cert
+if Gem::Version.new(Gem::VERSION) < Gem::Version.new('2.1.0') then
 
-  attr_reader :ssl_verify_mode
+  class Gem::ConfigFile
 
-  attr_reader :ssl_ca_cert
+    attr_reader :ssl_client_cert
 
-  class << self
-    unless self.method_defined? :__new__
-      alias_method :__new__, :new
-    end
-    if Gem.instance_variable_get(:@configuration) then
-      Gem.configuration = Gem::ConfigFile.new []
+    attr_reader :ssl_verify_mode
+
+    attr_reader :ssl_ca_cert
+    $stderr.puts "loading Gem::ConfigFile monkey patch"
+
+    class << self
+      unless self.method_defined? :__new__
+        $stderr.puts "aliasing new to __new__"
+        alias_method :__new__, :new
+      end
+      if Gem.instance_variable_get(:@configuration) then
+        $stderr.puts "forcing a reload of the Gem configuration"
+        Gem.configuration = Gem::ConfigFile.new []  
+      end
+      def new(*args)
+        $stderr.puts "instantiating new Gem::ConfigFile with patch"
+        config = __new__(*args)
+        config.set_ssl_vars
+        return config
+      end
     end
-    def new(*args)
-      config = __new__(*args)
-      config.set_ssl_vars
-      return config
+
+    def set_ssl_vars
+      $stderr.puts "Configuring SSL variables for Gem::ConfigFile"
+      @ssl_verify_mode = @hash[:ssl_verify_mode] if @hash.key? :ssl_verify_mode
+      @ssl_ca_cert = @hash[:ssl_ca_cert] if @hash.key? :ssl_ca_cert
+      @ssl_ca_cert = ENV['BUNDLE_SSL_CA_CERT'] unless @ssl_ca_cert
+      @ssl_client_cert = @hash[:ssl_client_cert] if @hash.key? :ssl_client_cert
+      @ssl_client_cert = ENV['BUNDLE_SSL_CLIENT_CERT'] unless @ssl_client_cert
     end
-  end
 
-  def set_ssl_vars
-    @ssl_verify_mode = @hash[:ssl_verify_mode] if @hash.key? :ssl_verify_mode
-    @ssl_ca_cert = @hash[:ssl_ca_cert] if @hash.key? :ssl_ca_cert
-    @ssl_ca_cert = ENV['BUNDLE_SSL_CA_CERT'] unless @ssl_ca_cert
-    @ssl_client_cert = @hash[:ssl_client_cert] if @hash.key? :ssl_client_cert
-    @ssl_client_cert = ENV['BUNDLE_SSL_CLIENT_CERT'] unless @ssl_client_cert
   end
 
-end
+  class Gem::RemoteFetcher
 
-class Gem::RemoteFetcher
+    def connection_for(uri)
+      net_http_args = [uri.host, uri.port]
 
-  def connection_for(uri)
-    net_http_args = [uri.host, uri.port]
+      if @proxy_uri and not no_proxy?(uri.host) then
+        net_http_args += [
+          @proxy_uri.host,
+          @proxy_uri.port,
+          @proxy_uri.user,
+          @proxy_uri.password
+        ]
+      end
 
-    if @proxy_uri and not no_proxy?(uri.host) then
-      net_http_args += [
-        @proxy_uri.host,
-        @proxy_uri.port,
-        @proxy_uri.user,
-        @proxy_uri.password
-      ]
-    end
+      connection_id = [Thread.current.object_id, *net_http_args].join ':'
+      @connections[connection_id] ||= Net::HTTP.new(*net_http_args)
+      connection = @connections[connection_id]
 
-    connection_id = [Thread.current.object_id, *net_http_args].join ':'
-    @connections[connection_id] ||= Net::HTTP.new(*net_http_args)
-    connection = @connections[connection_id]
+      if https?(uri) and not connection.started? then
+        configure_connection_for_https(connection)
+      end
 
-    if https?(uri) and not connection.started? then
-      configure_connection_for_https(connection)
+      connection.start unless connection.started?
+
+      connection
+    rescue defined?(OpenSSL::SSL) ? OpenSSL::SSL::SSLError : Errno::EHOSTDOWN,
+           Errno::EHOSTDOWN => e
+      raise FetchError.new(e.message, uri)
     end
 
-    connection.start unless connection.started?
+    def configure_connection_for_https(connection)
+      require 'net/https'
+      connection.use_ssl = true
+      connection.verify_mode =
+        Gem.configuration.ssl_verify_mode || OpenSSL::SSL::VERIFY_PEER
+      store = OpenSSL::X509::Store.new
+
+      if Gem.configuration.ssl_client_cert
+        pem = File.read(Gem.configuration.ssl_client_cert)
+        connection.cert = OpenSSL::X509::Certificate.new(pem)
+        connection.key = OpenSSL::PKey::RSA.new(pem)
+      else
+        puts "no Client Cert configured!"
+        if !Gem.configuration.respond_to?(:ssl_client_cert)
+          puts "Loaded Gem::ConfigFile does not support ssl_client_cert"
+        end
+      end
 
-    connection
-  rescue defined?(OpenSSL::SSL) ? OpenSSL::SSL::SSLError : Errno::EHOSTDOWN,
-         Errno::EHOSTDOWN => e
-    raise FetchError.new(e.message, uri)
-  end
+      if Gem.configuration.ssl_ca_cert
+        if File.directory? Gem.configuration.ssl_ca_cert
+          store.add_path Gem.configuration.ssl_ca_cert
+        else
+          store.add_file Gem.configuration.ssl_ca_cert
+        end
+      else
+        puts "no CA Cert configured!"
+        store.set_default_paths
+        add_rubygems_trusted_certs(store)
+      end
+      connection.cert_store = store
+    rescue LoadError => e
+      raise unless (e.respond_to?(:path) && e.path == 'openssl') ||
+                   e.message =~ / -- openssl$/
 
-  def configure_connection_for_https(connection)
-    require 'net/https'
-    connection.use_ssl = true
-    connection.verify_mode =
-      Gem.configuration.ssl_verify_mode || OpenSSL::SSL::VERIFY_PEER
-    store = OpenSSL::X509::Store.new
-
-    if Gem.configuration.ssl_client_cert
-      pem = File.read(Gem.configuration.ssl_client_cert)
-      connection.cert = OpenSSL::X509::Certificate.new(pem)
-      connection.key = OpenSSL::PKey::RSA.new(pem)
-    else
-      puts "no Client Cert configured!"
+      raise Gem::Exception.new(
+              'Unable to require openssl, install OpenSSL and rebuild ruby (preferred) or use non-HTTPS sources')
     end
 
-    if Gem.configuration.ssl_ca_cert
-      if File.directory? Gem.configuration.ssl_ca_cert
-        store.add_path Gem.configuration.ssl_ca_cert
-      else
-        store.add_file Gem.configuration.ssl_ca_cert
+    def add_rubygems_trusted_certs(store)
+      pattern = File.expand_path("./ssl_certs/*.pem", File.dirname(__FILE__))
+      Dir.glob(pattern).each do |ssl_cert_file|
+        store.add_file ssl_cert_file
       end
-    else
-      puts "no CA Cert configured!"
-      store.set_default_paths
-      add_rubygems_trusted_certs(store)
     end
-    connection.cert_store = store
-  rescue LoadError => e
-    raise unless (e.respond_to?(:path) && e.path == 'openssl') ||
-                 e.message =~ / -- openssl$/
-
-    raise Gem::Exception.new(
-            'Unable to require openssl, install OpenSSL and rebuild ruby (preferred) or use non-HTTPS sources')
-  end
 
-  def add_rubygems_trusted_certs(store)
-    pattern = File.expand_path("./ssl_certs/*.pem", File.dirname(__FILE__))
-    Dir.glob(pattern).each do |ssl_cert_file|
-      store.add_file ssl_cert_file
+    def https?(uri)
+      uri.scheme.downcase == 'https'
     end
-  end
 
-  def https?(uri)
-    uri.scheme.downcase == 'https'
   end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubygems_ssl-client-certs
 version: !ruby/object:Gem::Version
-  version: 0.0.2.pre.alpha.pre.53
+  version: 0.0.2.pre.alpha.pre.54
 platform: ruby
 authors:
 - Aaron Moses