lib/rubygems_plugin.rb in rubygems_ssl-client-certs-0.0.1.pre.alpha.pre.35 vs lib/rubygems_plugin.rb in rubygems_ssl-client-certs-0.0.2.pre.alpha.pre.51
- old
+ new
@@ -1,108 +1,127 @@
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::Version
- attr_reader :ssl_ca_cert
+ def self.correct? version
+ version.to_s =~ /\A\s*([0-9]+(?>\.[0-9a-zA-Z]+)*(-[0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*)?)?\s*\z/
+ end
- class << self
- unless self.method_defined? :__new__
- alias_method :__new__, :new
+ end
+
+ class Gem::ConfigFile
+
+ attr_reader :ssl_client_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__
+ 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
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
- connection
- rescue defined?(OpenSSL::SSL) ? OpenSSL::SSL::SSLError : Errno::EHOSTDOWN,
- Errno::EHOSTDOWN => e
- raise FetchError.new(e.message, uri)
- end
+ 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
- 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_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$/
- 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