elasticsearch-transport 1.0.15 → 1.0.16.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8912230f142b53ab174f9cb27d98c3faa220517
-  data.tar.gz: d561830a59e77b6daf839a4b7fef09394506ea98
+  metadata.gz: 9ed68a35342a6cb66f67c6bd8de44bbb21a4eea6
+  data.tar.gz: 8e7cb53702e1103a44555a3d6364aec3c759b2b4
 SHA512:
-  metadata.gz: 6a41d9e20a098bb9731e7029daf96996c92e898b982fef262ac290cd680dde7a5d99d8d6134aaca5c9a1df31dc525aeee603e0881d80ae972315b7524579e7e6
-  data.tar.gz: 83667f70dc3c27c925f63ec0def5400f292f60bfe4b9b83629c74a243adb8a0dd23ecd45dd247c9530da06bb7429411cddc10355b00c40a1e64e6250c21e9062
+  metadata.gz: 4927b38e7a37068ed3893fd4441e052d6c49cb8f5bbeb346400a5dd5fb58e75a6a31a1b7aae368e580bf63f20624ff4fcb9ede1db950feaeef954eabdd3f0707
+  data.tar.gz: fb1bd274b0d768529d453efa5b27194c61ff00b214c642818c9cb890ea2ca772772ec47e7cc04f8c5fc9a99222f8f25825d38b72bed1d91d8185d7aba5847f1e

data/Gemfile

@@ -3,14 +3,14 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in elasticsearch-transport.gemspec
 gemspec
 
-if File.exists? File.expand_path("../../elasticsearch-api/elasticsearch-api.gemspec", __FILE__)
+if File.exist? File.expand_path("../../elasticsearch-api/elasticsearch-api.gemspec", __FILE__)
   gem 'elasticsearch-api', :path => File.expand_path("../../elasticsearch-api", __FILE__), :require => false
 end
 
-if File.exists? File.expand_path("../../elasticsearch-extensions", __FILE__)
+if File.exist? File.expand_path("../../elasticsearch-extensions", __FILE__)
   gem 'elasticsearch-extensions', :path => File.expand_path("../../elasticsearch-extensions", __FILE__), :require => false
 end
 
-if File.exists? File.expand_path("../../elasticsearch/elasticsearch.gemspec", __FILE__)
+if File.exist? File.expand_path("../../elasticsearch/elasticsearch.gemspec", __FILE__)
   gem 'elasticsearch', :path => File.expand_path("../../elasticsearch", __FILE__), :require => false
 end

data/README.md

@@ -295,7 +295,6 @@ To configure the _Faraday_ instance directly, use a block:
 You can use any standard Faraday middleware and plugins in the configuration block,
 for example sign the requests for the [AWS Elasticsearch service](https://aws.amazon.com/elasticsearch-service/):
 
-    require 'patron'
     require 'faraday_middleware/aws_signers_v4'
 
     client = Elasticsearch::Client.new url: 'https://search-my-cluster-abc123....es.amazonaws.com' do |f|

data/elasticsearch-transport.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   end
 
   s.add_development_dependency "bundler", "> 1"
-  s.add_development_dependency "rake"
+  s.add_development_dependency "rake", "< 11.0"
 
   if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
     s.add_development_dependency "elasticsearch-extensions"
@@ -47,7 +47,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "patron" unless defined? JRUBY_VERSION
   s.add_development_dependency "typhoeus", '~> 0.6'
   s.add_development_dependency "net-http-persistent"
-  s.add_development_dependency "manticore", '~> 0.3.5' if defined? JRUBY_VERSION
+  s.add_development_dependency "manticore", '~> 0.5.2' if defined? JRUBY_VERSION
   s.add_development_dependency "hashie"
 
   # Prevent unit test failures on Ruby 1.8

data/lib/elasticsearch/transport/transport/base.rb

@@ -11,6 +11,7 @@ module Elasticsearch
         DEFAULT_RESURRECT_AFTER  = 60     # Seconds
         DEFAULT_MAX_RETRIES      = 3      # Requests
         DEFAULT_SERIALIZER_CLASS = Serializer::MultiJson
+        SANITIZED_PASSWORD       = '*'*rand(15)
 
         attr_reader   :hosts, :options, :connections, :counter, :last_request_at, :protocol
         attr_accessor :serializer, :sniffer, :logger, :tracer,
@@ -28,6 +29,8 @@ module Elasticsearch
         # @see Client#initialize
         #
         def initialize(arguments={}, &block)
+          @state_mutex = Mutex.new
+
           @hosts       = arguments[:hosts]   || []
           @options     = arguments[:options] || {}
           @block       = block
@@ -94,10 +97,12 @@ module Elasticsearch
         # @api private
         #
         def __rebuild_connections(arguments={})
-          @hosts       = arguments[:hosts]    || []
-          @options     = arguments[:options]  || {}
-          __close_connections
-          @connections = __build_connections
+          @state_mutex.synchronize do
+            @hosts       = arguments[:hosts]    || []
+            @options     = arguments[:options]  || {}
+            __close_connections
+            @connections = __build_connections
+          end
         end
 
         # Closes the connections collection.
@@ -113,7 +118,8 @@ module Elasticsearch
         # @api private
         #
         def __log(method, path, params, body, url, response, json, took, duration)
-          logger.info  "#{method.to_s.upcase} #{url} " +
+          sanitized_url = url.to_s.gsub(/\/\/(.+):(.+)@/, '//' + '\1:' + SANITIZED_PASSWORD +  '@')
+          logger.info  "#{method.to_s.upcase} #{sanitized_url} " +
                        "[status:#{response.status}, request:#{sprintf('%.3fs', duration)}, query:#{took}]"
           logger.debug "> #{__convert_to_json(body)}" if body
           logger.debug "< #{response.body}"
@@ -160,7 +166,7 @@ module Elasticsearch
         # @api private
         def __full_url(host)
           url  = "#{host[:protocol]}://"
-          url += "#{host[:user]}:#{host[:password]}@" if host[:user]
+          url += "#{CGI.escape(host[:user])}:#{CGI.escape(host[:password])}@" if host[:user]
           url += "#{host[:host]}:#{host[:port]}"
           url += "#{host[:path]}" if host[:path]
           url

data/lib/elasticsearch/transport/transport/connections/connection.rb

@@ -29,6 +29,7 @@ module Elasticsearch
             @state_mutex = Mutex.new
 
             @options[:resurrect_timeout] ||= DEFAULT_RESURRECT_TIMEOUT
+            @dead = false
             @failures = 0
           end
 

data/lib/elasticsearch/transport/transport/connections/selector.rb

@@ -50,7 +50,7 @@ module Elasticsearch
             #
             def select(options={})
               # On Ruby 1.9, Array#rotate could be used instead
-              @current = @current.nil? ? 0 : @current+1
+              @current = !defined?(@current) || @current.nil? ? 0 : @current+1
               @current = 0 if @current >= connections.size
               connections[@current]
             end

data/lib/elasticsearch/transport/transport/http/curb.rb

@@ -57,7 +57,7 @@ module Elasticsearch
                   client.password = host[:password]
                 end
 
-                client.instance_eval &@block if @block
+                client.instance_eval(&@block) if @block
 
                 Connections::Connection.new :host => host, :connection => client
               },

data/lib/elasticsearch/transport/transport/http/manticore.rb

@@ -45,6 +45,19 @@ module Elasticsearch
         class Manticore
           include Base
 
+          def initialize(arguments={}, &block)
+            @manticore = build_client(arguments[:options] || {})
+            super(arguments, &block)
+          end
+
+          # Should just be run once at startup
+          def build_client(options={})
+            client_options = options[:transport_options] || {}
+            client_options[:ssl] = options[:ssl] || {}
+
+            @manticore = ::Manticore::Client.new(client_options)
+          end
+
           # Performs the request by invoking {Transport::Base#perform_request} with a block.
           #
           # @return [Response]
@@ -84,9 +97,6 @@ module Elasticsearch
               @request_options[:headers] = options[:headers]
             end
 
-            client_options = options[:transport_options] || {}
-            client_options[:ssl] = options[:ssl] || {}
-
             Connections::Collection.new \
               :connections => hosts.map { |host|
                 host[:protocol]   = host[:scheme] || DEFAULT_PROTOCOL
@@ -95,11 +105,9 @@ module Elasticsearch
                 host.delete(:user)     # auth is not supported here.
                 host.delete(:password) # use the headers
 
-                url               = __full_url(host)
-
                 Connections::Connection.new \
                   :host => host,
-                  :connection => ::Manticore::Client.new(client_options)
+                  :connection => @manticore
               },
               :selector_class => options[:selector_class],
               :selector => options[:selector]

data/lib/elasticsearch/transport/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module Transport
-    VERSION = "1.0.15"
+    VERSION = "1.0.16.pre"
   end
 end

data/test/unit/transport_base_test.rb

@@ -75,6 +75,11 @@ class Elasticsearch::Transport::Transport::BaseTest < Test::Unit::TestCase
       should "combine authentication credentials" do
         assert_equal 'http://U:P@myhost:8080', @transport.__full_url(@basic_parts.merge :user => 'U', :password => 'P')
       end
+
+      should "escape the username and password" do
+        assert_equal 'http://user%40domain:foo%2Fbar@myhost:8080',
+                     @transport.__full_url(@basic_parts.merge :user => 'user@domain', :password => 'foo/bar')
+      end
     end
   end
 
@@ -370,6 +375,23 @@ class Elasticsearch::Transport::Transport::BaseTest < Test::Unit::TestCase
                  end
     end
 
+    should "sanitize password in the URL" do
+      fake_connection = stub :full_url => 'http://user:password@localhost:9200/_search?size=1',
+                             :host     => 'localhost',
+                             :connection => stub_everything,
+                             :failures => 0,
+                             :healthy! => true
+      @transport.stubs(:get_connection).returns(fake_connection)
+
+      @transport.logger.expects(:info).with do |message|
+        assert_match /http:\/\/user:\*{1,15}@localhost\:9200/, message
+        true
+      end
+
+
+      @transport.perform_request('GET', '/') {Elasticsearch::Transport::Transport::Response.new 200, '{"foo":"bar"}' }
+    end
+
     should "log a failed Elasticsearch request" do
       @block = Proc.new { |c, u| puts "ERROR" }
       @block.expects(:call).returns(Elasticsearch::Transport::Transport::Response.new 500, 'ERROR')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-transport
 version: !ruby/object:Gem::Version
-  version: 1.0.15
+  version: 1.0.16.pre
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-04 00:00:00.000000000 Z
+date: 2016-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -56,16 +56,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: elasticsearch-extensions
   requirement: !ruby/object:Gem::Requirement
@@ -394,9 +394,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2