rubygems_plugin.rb in rubygems_ssl-client-certs-0.0.2.pre.alpha.pre.53

- old
+ new
@@ -1,120 +1,111 @@
 require 'rubygems/remote_fetcher'
 
-$stderr.puts "rubygems ssl client certs plugin loading"
+class Gem::ConfigFile
 
-if Gem::Version.new(Gem::VERSION) < Gem::Version.new('2.1.0') then
+  attr_reader :ssl_client_cert
 
-  class Gem::ConfigFile
+  attr_reader :ssl_verify_mode
 
-    attr_reader :ssl_client_cert
+  attr_reader :ssl_ca_cert
 
-    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
-      def new(*args)
-        $stderr.puts "instantiating new Gem::ConfigFile with patch"
-        config = __new__(*args)
-        config.set_ssl_vars
-        return config
-      end
+  class << self
+    unless self.method_defined? :__new__
+      alias_method :__new__, :new
     end
-
-    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
+    if Gem.instance_variable_get(:@configuration) then
+      Gem.configuration = Gem::ConfigFile.new []
     end
+    def new(*args)
+      config = __new__(*args)
+      config.set_ssl_vars
+      return config
+    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
 
-  class Gem::RemoteFetcher
+end
 
-    def connection_for(uri)
-      net_http_args = [uri.host, uri.port]
+class Gem::RemoteFetcher
 
-      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
+  def connection_for(uri)
+    net_http_args = [uri.host, uri.port]
 
-      connection_id = [Thread.current.object_id, *net_http_args].join ':'
-      @connections[connection_id] ||= Net::HTTP.new(*net_http_args)
-      connection = @connections[connection_id]
+    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 https?(uri) and not connection.started? then
-        configure_connection_for_https(connection)
-      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.start unless connection.started?
-
-      connection
-    rescue defined?(OpenSSL::SSL) ? OpenSSL::SSL::SSLError : Errno::EHOSTDOWN,
-           Errno::EHOSTDOWN => e
-      raise FetchError.new(e.message, uri)
+    if https?(uri) and not connection.started? then
+      configure_connection_for_https(connection)
     end
 
-    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
+    connection.start unless connection.started?
 
-      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
 
-      raise Gem::Exception.new(
-              'Unable to require openssl, install OpenSSL and rebuild ruby (preferred) or use non-HTTPS sources')
+    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!"
     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
+    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 https?(uri)
-      uri.scheme.downcase == 'https'
+    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
     end
+  end
 
+  def https?(uri)
+    uri.scheme.downcase == 'https'
   end
+
 end