logstash-output-elasticsearch 7.3.6-java → 7.3.7-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e57f85845e636e23d965c548b6321f777197b25
-  data.tar.gz: a0c313624973520ac4822cafdd784076990d50bd
+  metadata.gz: 9f7192d92b49c809e5e75e71954febf19fe49d8e
+  data.tar.gz: d0bfa079c1a5658b1e5bd56ce99fd7d77177782c
 SHA512:
-  metadata.gz: ee040ed09865c63d10e596c9210b6cfcf3eb450c806e9e48a89ca7267eb5cce3325dbc5ae6f1a84bc1623aea1b3eac0a9fa6ea60e6132ac89bbcf32dca8a1c53
-  data.tar.gz: 47e59eed527d22f054f08635d2e2e0fee2f1af93377cb9003a642add878f205c31280d0d1359c74f5c21cd6a69dca71e2725a60035627cac98bcda9c2fb5f94f
+  metadata.gz: 8277f8569152e3e874c40631d03b95dbe141368f42faf71a67d4e0b5f35fdf94b58d12b1b6c2fc9cb2a197c00c567820f26539c3b4bbefe2c8a9b3e58b490ddf
+  data.tar.gz: 34c6ae1d82f9284d90c0daf906500f215b3707d65c85e1a6fdb1398e6929f536ccfc000c94aa0772f4f1055236fcd77e12f204168d015e7e8cb335fb642bc24b

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 7.3.7
+ - Properly support characters needing escaping in users / passwords across multiple SafeURI implementions (pre/post LS 5.5.1)
+ - Logstash 5.5.0 does NOT work with this release as it has a broken SafeURI implementation
+
 ## 7.3.5
  - Fix incorrect variable reference when DLQing events
 

data/docs/index.asciidoc

@@ -12,7 +12,7 @@ START - GENERATED VARIABLES, DO NOT EDIT!
 END - GENERATED VARIABLES, DO NOT EDIT!
 ///////////////////////////////////////////
 
-[id="plugins-{type}-{plugin}"]
+[id="plugins-{type}s-{plugin}"]
 
 === Elasticsearch output plugin
 

data/lib/logstash/outputs/elasticsearch/http_client.rb

@@ -286,32 +286,37 @@ module LogStash; module Outputs; class ElasticSearch;
     end
 
     def host_to_url(h)
-      # Build a naked URI class to be wrapped in a SafeURI before returning
-      # do NOT log this! It could leak passwords
-      uri_klass = @url_template[:scheme] == 'https' ? URI::HTTPS : URI::HTTP
-      uri = uri_klass.build(@url_template)
-
-      uri.user = h.user || user
-      uri.password = h.password || password
-      uri.host = h.host if h.host
-      uri.port = h.port if h.port
-      uri.path = h.path if !h.path.nil? && !h.path.empty? &&  h.path != "/"
-      uri.query = h.query
-      
+      # Never override the calculated scheme
+      raw_scheme = @url_template[:scheme] || 'http'
+
+      raw_user = h.user || @url_template[:user]
+      raw_password = h.password || @url_template[:password]
+      postfixed_userinfo = raw_user && raw_password ? "#{raw_user}:#{raw_password}@" : nil
+
+      raw_host = h.host # Always replace this!
+      raw_port =  h.port || @url_template[:port]
+
+      raw_path = !h.path.nil? && !h.path.empty? &&  h.path != "/" ? h.path : @url_template[:path]
+      prefixed_raw_path = raw_path && !raw_path.empty? ? raw_path : "/"
+
       parameters = client_settings[:parameters]
-      if parameters && !parameters.empty?
-        combined = uri.query ?
-          Hash[URI::decode_www_form(uri.query)].merge(parameters) :
-          parameters
-        query_str = combined.flat_map {|k,v|
-          values = Array(v)
-          values.map {|av| "#{k}=#{av}"}
-        }.join("&")
-        
-        uri.query = query_str
-      end
+      raw_query = if parameters && !parameters.empty?
+                    combined = h.query ?
+                      Hash[URI::decode_www_form(h.query)].merge(parameters) :
+                      parameters
+                    query_str = combined.flat_map {|k,v|
+                      values = Array(v)
+                      values.map {|av| "#{k}=#{av}"}
+                    }.join("&")
+                    query_str
+                  else
+                    h.query
+                  end
+      prefixed_raw_query = raw_query && !raw_query.empty? ? "?#{raw_query}" : nil
+      
+      raw_url = "#{raw_scheme}://#{postfixed_userinfo}#{raw_host}:#{raw_port}#{prefixed_raw_path}#{prefixed_raw_query}"
 
-      ::LogStash::Util::SafeURI.new(uri.normalize)
+      ::LogStash::Util::SafeURI.new(raw_url)
     end
 
     def template_exists?(name)

data/lib/logstash/outputs/elasticsearch/http_client/manticore_adapter.rb

@@ -56,7 +56,7 @@ module LogStash; module Outputs; class ElasticSearch; class HttpClient;
 
       if url.user
         params[:auth] = { 
-          :user => url.user,
+          :user => CGI.unescape(url.user),
           # We have to unescape the password here since manticore won't do it
           # for us unless its part of the URL
           :password => CGI.unescape(url.password), 

data/lib/logstash/outputs/elasticsearch/http_client_builder.rb

@@ -140,14 +140,12 @@ module LogStash; module Outputs; class ElasticSearch;
 
     def self.setup_basic_auth(logger, params)
       user, password = params["user"], params["password"]
-      unsafe_password = password && password.value
-      unsafe_escaped_password = unsafe_password ? CGI.escape(unsafe_password) : nil
       
-      return {} unless user && unsafe_escaped_password
+      return {} unless user && password && password.value
 
       {
-        :user => user,
-        :password => unsafe_escaped_password
+        :user => CGI.escape(user),
+        :password => CGI.escape(password.value)
       }
     end
 

data/logstash-output-elasticsearch.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-output-elasticsearch'
-  s.version         = '7.3.6'
+  s.version         = '7.3.7'
   s.licenses        = ['apache-2.0']
   s.summary         = "Logstash Output to Elasticsearch"
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"

data/spec/fixtures/test_certs/ca/ca.crt

@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDmzCCAoOgAwIBAgIUJ3zg8MPyVvlLtNfv27YwTmy8sKAwDQYJKoZIhvcNAQEL
+BQAwNDEyMDAGA1UEAxMpRWxhc3RpYyBDZXJ0aWZpY2F0ZSBUb29sIEF1dG9nZW5l
+cmF0ZWQgQ0EwHhcNMTcwNzExMjA0ODM3WhcNMjAwNzEwMjA0ODM3WjA0MTIwMAYD
+VQQDEylFbGFzdGljIENlcnRpZmljYXRlIFRvb2wgQXV0b2dlbmVyYXRlZCBDQTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIH11HENfB27hsxlPIIZJvBV
+gyDRo8T29HEm/mm9hlg4c76xsdXlPoKZ0ENzcEMg+AyKjQxD5cZIACvsd3lbJnca
++8CUcfqKDu1rDq6T5YMX75Gw21ZeJoGy3voCXGvTIoH1aNdRt/8EcWq9P81Mew7A
+jh1qhv8WR8Ajxt29OSyWH8VC2WHrihkD/s+3eHCNNpW3CCFtA3uc3sbENVB04A7d
+0HzZRD5EfZcZVlcfd5o4ZPuH5PnR4LkZAR2TEgQ8qpruF3m3YMmPvnHaRx5/Bivv
+0IuBOAQhkL1w5MzSZVOg3N0u91Krss2tUGLf8c5qnxveqdSKShgVxwI/6P0CaccC
+AwEAAaOBpDCBoTAdBgNVHQ4EFgQUba74O4k4WAzgVH9WqCLvypyTj1swbwYDVR0j
+BGgwZoAUba74O4k4WAzgVH9WqCLvypyTj1uhOKQ2MDQxMjAwBgNVBAMTKUVsYXN0
+aWMgQ2VydGlmaWNhdGUgVG9vbCBBdXRvZ2VuZXJhdGVkIENBghQnfODww/JW+Uu0
+1+/btjBObLywoDAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQAf
+jVC71jdUu649ZWketKEqlmAL5K4RmBghKS49Coso1eACngbzVfnh0vfKxF1giIvw
+154ZmcAD0bmArO538j+uEvr9kj3ZX8qmvNLRNQ2IcUQaR7N+8Iu8WIqtTIfI07hp
+cXHv0jIcq7sFp4BpWDnWGlipFN+ldFRBvaUarrK1QcDAeWyPaUqryY7egecV9PpV
+Ebh28RblD5QlA9+sLc5u+zg1vlWg7fLsiGQqNR29dXWmavcamKfo5TOAuzXFlU78
+it8DhTCvTnmCIi0NIxJY9rHLHgz/3aDRsBDzCZMQFJ2KfssI6YHZ9LpZ+3iVObr6
+jGjKiXeVb9DcAnYR+Ihy
+-----END CERTIFICATE-----

data/spec/fixtures/test_certs/ca/ca.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAgfXUcQ18HbuGzGU8ghkm8FWDINGjxPb0cSb+ab2GWDhzvrGx
+1eU+gpnQQ3NwQyD4DIqNDEPlxkgAK+x3eVsmdxr7wJRx+ooO7WsOrpPlgxfvkbDb
+Vl4mgbLe+gJca9MigfVo11G3/wRxar0/zUx7DsCOHWqG/xZHwCPG3b05LJYfxULZ
+YeuKGQP+z7d4cI02lbcIIW0De5zexsQ1UHTgDt3QfNlEPkR9lxlWVx93mjhk+4fk
++dHguRkBHZMSBDyqmu4XebdgyY++cdpHHn8GK+/Qi4E4BCGQvXDkzNJlU6Dc3S73
+Uquyza1QYt/xzmqfG96p1IpKGBXHAj/o/QJpxwIDAQABAoIBADvKJGWqpYpsRvTs
+Mm1MMwzo2n4T1Lt+PjF8lhmBtzgJKL73s3BLmnmtWBJgHqrTlSr35zJYXnLdly6e
+CM1NMSIkyOPtp45zS7DQyx1oL3QjY/VsH0zZ3e9Xopv00B5PMZYGmKhPEU6C9cb8
+sEi8QfUkg31nEBp1Xqc4DnrfXllzQiZIVrhHleRcBVtpYVkR3dN5wg+YTwF5n8ru
+2Z/N8yuBMrKWqozlUY+x7iDCVXIbp+t3zePfOOhzSdIt4qx372PX6L0HmrI4ZAzw
+HkpCQbnlWL55G2CPcnvJF3evbDWoiX8vCYDAQmzFA6X8lAMF9jjKfWlo2Qa1AciN
+yqwePKECgYEA0wR9CT51h5PuvGUmKPAfImTNyqQIksibe+AOkU01ldHmBVRfX16f
+SKMDKMry4tzXGinVjITonxTdT7jXO5z3754CBoEItdASruikay63DF90hVvP18Zl
+OcH/UIBkyvtSjJLEm2/jdfwI+qIOSfhwi5mymXUGVRyEb5i8FORWidcCgYEAnanv
+9dk3cx034vG/p36RmI57I1gh6UsEBk53uPZAcecBigDJut2o3vO7/gc/+vROCzk3
+Y+EY7tgRDQUh0b9ex+Dq6BkjkZkAKWVCf+u8KDCpW7Xlgm1YDpS2B0EwASgql6Xl
+qXu1VgTNc44g0D74yJbs853GWYg5AnV/sRCfgZECgYAklw6nX7E5hSlMea2YQ6ri
+Z+BXVwI1kZuEa2GbSGwWQoNEQVEYVGwCSGHv3OEo/Wo/GynwZ8t+ajvF6yNHLvy/
+DAMF5bIA9MeIlMaN31fWSWcHCNiNbdV3onAHIXxYxiOWRIza9xfWCZH1A8y+ftnl
+Gw2hFm22rG86ep2CceWfmQKBgQCXe8fK90GHoPMpYg066SkK4xr9ApjShfj/9jSh
+yjhxN/sKlWc92+t9C8H8eQrIHCNANWE63fQOyBrZ36x20uBGO5x4FG9QXSkCnQAf
+2GeYVeji7QnvHxAUMl4S6lctRWJnAkZ/aRT56PNdq5lrfJWcZSaVi2oga/oamrpt
+bgNTgQKBgQCGUheUb+51c6hoi7kjuv1uJNyGzirkYA+pNUest2EXVMwMpsLP9hSl
+fN11QvMVqRsBnwl2pRnwGilJHl5OO9Z3GBTHsG15EPXhjgUX8r49+GB/HNPP57Ev
+lA775+tliHVv6Pl0E3RjhUlSuJIwZZ2ImV+RDryElBKCet4kI/KrIw==
+-----END RSA PRIVATE KEY-----

data/spec/fixtures/test_certs/test.crt

@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDjDCCAnSgAwIBAgIULhSohxna+aUn+a7UIQmNPLb11p8wDQYJKoZIhvcNAQEL
+BQAwNDEyMDAGA1UEAxMpRWxhc3RpYyBDZXJ0aWZpY2F0ZSBUb29sIEF1dG9nZW5l
+cmF0ZWQgQ0EwHhcNMTcwNzExMjA0OTEwWhcNMjAwNzEwMjA0OTEwWjAPMQ0wCwYD
+VQQDEwR0ZXN0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnNOuaiad
+YCotO/bSTVJwlR4f1Kdt3gMZeD1i3QKX8QSXACpVeNaTn/6Vflbf/jlWk8i6Mbsv
+HeZgdxMe3/CMs8U9fRx2tt4hF5tVivnkRfXbvC5lhYsjg4k2DorkigP/4D4XDonv
+pFwB7qKeChnYbe9ADh8DMymKj2Z0LXxSEjuP5VH1O+5jLyddL4gRpCRa5G79vq9m
+7rdnq7HTfZ6m3t15AIY4XWZ0VW2epMsflQcbNChcYNMMDhBZzPkhRs7KEEHUV9ye
+sGTxGRUBLWNd7rNLY0T0biiUlaWfgbGfUmDKZKofowoo+M9w5rREEnXqrGkc3QmT
+zx9XRHqfeEC/ZQIDAQABo4G6MIG3MB0GA1UdDgQWBBS++BZR6DYwjv7jlkS2mVdJ
+NtpILDBvBgNVHSMEaDBmgBRtrvg7iThYDOBUf1aoIu/KnJOPW6E4pDYwNDEyMDAG
+A1UEAxMpRWxhc3RpYyBDZXJ0aWZpY2F0ZSBUb29sIEF1dG9nZW5lcmF0ZWQgQ0GC
+FCd84PDD8lb5S7TX79u2ME5svLCgMBoGA1UdEQQTMBGCCWxvY2FsaG9zdIcEfwAA
+ATAJBgNVHRMEAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQBugjYG5LK91A1awDYTsrrT
+Bmi8TiOeHa69Qia4SrFpwua648TpC5esaIC4uAJlTVP5MwcMB/5+lZOcUjVgFIss
+Z4mdRgExXMAoDiI5OOqXcCiGYWv/jGJzKj4EZ65UZADVrGDFmZPW99g4XDInc27W
+lmZETkjriueku7gH4eEOdfSX9jv6M+mYhRJlllWlzk77zzENtFn4uCQmd9bzFDQM
+hOxi+tif9SrGEAoJoSP204vunLIDNve2KycVXuQkhZO+Q5JYmN38DqFrjC/U5JbC
+IIdTES3+iydEHevB3biI251NrQkg1eOOTG376viFZVmZB9e75waf8JLKKswNmubU
+-----END CERTIFICATE-----

data/spec/fixtures/test_certs/test.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAnNOuaiadYCotO/bSTVJwlR4f1Kdt3gMZeD1i3QKX8QSXACpV
+eNaTn/6Vflbf/jlWk8i6MbsvHeZgdxMe3/CMs8U9fRx2tt4hF5tVivnkRfXbvC5l
+hYsjg4k2DorkigP/4D4XDonvpFwB7qKeChnYbe9ADh8DMymKj2Z0LXxSEjuP5VH1
+O+5jLyddL4gRpCRa5G79vq9m7rdnq7HTfZ6m3t15AIY4XWZ0VW2epMsflQcbNChc
+YNMMDhBZzPkhRs7KEEHUV9yesGTxGRUBLWNd7rNLY0T0biiUlaWfgbGfUmDKZKof
+owoo+M9w5rREEnXqrGkc3QmTzx9XRHqfeEC/ZQIDAQABAoIBAAm4XREbP5ncQ116
+GOLN/0hey55EmlyuWH/JXj1QkdZQcIOEHDQXKKM8BkwEWnHJYAJc6J14ep0h0EzR
+FJLQuAfUa9E7WGhRMD/kUtMAVhO3/1yUi5pRW2wlrwILvcqIIO3nK0qtZfsL8Nq3
+nZAGthFqSNAXP/2Fz56/vOes0vFqQpHC9y+xzQVm9Kr/bZeB0gWH1Eq32Dz2Q8pW
+E1BNgy48az20AcH8KiJCy5JjByDkcBjBPm8S074Hab9VPvLEnKrpApNZT3V/cLVd
+t0UmGT937g1DuqwYBl6eLB+FgOZhNjONtF7llHDYWtx0r9XaKplGtmMeW1rDRLp4
+XkDeKqkCgYEA54xm+Uc1SLGgnzPQb88Sk+H6ffFy4fkzS2FTeEm7NlKpFLtPVNx+
+wZys0GobYn7XFq0lGODWhuFJbN8vm8aGZ2xgKv3213yKWOjn/UBP8D8JyC3HQs5f
+atf6a15z7bp+Vrab+tn0dOi4Jz6FhNxmhwFVS3n+e7fZo7gUxAAOxTcCgYEArWNI
+c2f+Qf44lskqrN2NNNY44/lYEDB5WWKT8q+9Z/4MuFXmYQvQHrdvI1yuYfXSLUqN
+VeH4j7V25nQXBbB1zCvHmjP2/t00EwhRh1Z9iNA74eukRJrzvMvgugSioVc3PpDx
+yb3+7kT68iE3LHWWW0If0ENb3CX6/OyAiJRG7kMCgYEA0//0+B9+ZcRcb+cc3IIX
+XFb25gD/Um67zDScG/JF+oLMVDL7e5M2a0Zr45aC5DeF7zkwUgrp4Cy88XWXPWUT
+AfZ0RmiobLuWX7k/TtxnVGwjJKjlXAFf049TtKKSOgMaUYJ4ZcDQ1YmNskDINtEk
+/k72LVjQ6611EzUjriDvZRkCgYAmtAPHJw59Yqb1GaB6B9ZuVedLFCyRKJDd4ABQ
+auQno3DpcNtFDGL/iEi5pwWR/lJVI9AavJ9ETOhmlsFQ1svksF0U0cavq2blXLT+
+NdM9x+WmD3iSi9gea5AVVdWLmDFPuQEP3GZcf29YvwtW1ESkyETbsz19DclRzeT/
+F8IhiwKBgCrTlgDzZrvMKzD2VHNPLkr2ixJwEolTQFwhklAFeFvlUkI0XwBHkfwS
+hQ+EQosZaPIQ5pupn8UFmpfGpv7f4vyTSVtbkay7eBIgFY8jPZFkM1zqtgwRerN1
+5HNArAuzAH9LiauuZrAhFolwPfEdSWxvJhvfPE/aM5OpbQRUyQb4
+-----END RSA PRIVATE KEY-----

data/spec/integration/outputs/index_spec.rb

@@ -44,11 +44,11 @@ describe "TARGET_BULK_BYTES", :integration => true do
   end
 end
 
-describe "indexing", :integration => true do
+describe "indexing" do
   let(:event) { LogStash::Event.new("message" => "Hello World!", "type" => type) }
   let(:index) { 10.times.collect { rand(10).to_s }.join("") }
   let(:type) { 10.times.collect { rand(10).to_s }.join("") }
-  let(:event_count) { 10000 + rand(500) }
+  let(:event_count) { 1 + rand(2) }
   let(:config) { "not implemented" }
   let(:events) { event_count.times.map { event }.to_a }
   subject { LogStash::Outputs::ElasticSearch.new(config) }
@@ -64,7 +64,7 @@ describe "indexing", :integration => true do
     subject.register
   end
   
-  shared_examples "an indexer" do
+  shared_examples "an indexer" do |secure|
     it "ships events" do
       subject.multi_receive(events)
 
@@ -84,8 +84,20 @@ describe "indexing", :integration => true do
     end
     
     it "sets the correct content-type header" do
+      expected_manticore_opts = {:headers => {"Content-Type" => "application/json"}, :body => anything}
+      if secure
+        expected_manticore_opts = {
+          :headers => {"Content-Type" => "application/json"}, 
+          :body => anything, 
+          :auth => {
+            :user => user,
+            :password => password,
+            :eager => true
+          }}
+      end
+
       expect(subject.client.pool.adapter.client).to receive(:send).
-        with(anything, anything, {:headers => {"Content-Type" => "application/json"}, :body => anything}).
+        with(anything, anything, expected_manticore_opts).
         and_call_original
       subject.multi_receive(events)
     end
@@ -115,15 +127,15 @@ describe "indexing", :integration => true do
   describe "a secured indexer", :secure_integration => true do
     let(:user) { "simpleuser" }
     let(:password) { "abc123" }
-    let(:cacert) { "spec/fixtures/server.crt" }
-    let(:es_url) {"https://localhost:9900"}
+    let(:cacert) { "spec/fixtures/test_certs/test.crt" }
+    let(:es_url) {"https://localhost:9200"}
     let(:config) do
       {
-        "hosts" => ["localhost:9900"],
+        "hosts" => ["localhost:9200"],
         "user" => user,
         "password" => password,
         "ssl" => true,
-        "cacert" => "spec/fixtures/server.crt",
+        "cacert" => "spec/fixtures/test_certs/test.crt",
         "index" => index
       }
     end
@@ -139,30 +151,26 @@ describe "indexing", :integration => true do
         }
       }
     end
-    it_behaves_like("an indexer") 
+    it_behaves_like("an indexer", true)
     
     describe "with a password requiring escaping" do
-      let(:user) { "fancyuser" }
+      let(:user) { "f@ncyuser" }
       let(:password) { "ab%12#" }
       
-      include_examples("an indexer")
+      include_examples("an indexer", true)
     end
     
-    describe "with a password requiring escaping in the URL" do
+    describe "with a user/password requiring escaping in the URL" do
       let(:config) do
         {
-          "hosts" => ["https://#{user}:#{CGI.escape(password)}@localhost:9900"],
+          "hosts" => ["https://#{CGI.escape(user)}:#{CGI.escape(password)}@localhost:9200"],
           "ssl" => true,
-          "cacert" => "spec/fixtures/server.crt",
+          "cacert" => "spec/fixtures/test_certs/test.crt",
           "index" => index
         }
       end
       
-      begin
-        include_examples("an indexer")
-      rescue => e
-        require 'pry'; binding.pry
-      end
+      include_examples("an indexer", true)
     end
   end
 end

data/spec/unit/http_client_builder_spec.rb

@@ -7,7 +7,7 @@ describe LogStash::Outputs::ElasticSearch::HttpClientBuilder do
   describe "auth setup with url encodable passwords" do
     let(:klass) { LogStash::Outputs::ElasticSearch::HttpClientBuilder }
     let(:user) { "foo@bar"}
-    let(:password) {"bazblah" }
+    let(:password) {"baz@blah" }
     let(:password_secured) do
       secured = double("password")
       allow(secured).to receive(:value).and_return(password)
@@ -17,20 +17,12 @@ describe LogStash::Outputs::ElasticSearch::HttpClientBuilder do
     let(:logger) { mock("logger") }
     let(:auth_setup) { klass.setup_basic_auth(double("logger"), {"user" => user, "password" => password_secured}) }
 
-    it "should return the user verbatim" do
-      expect(auth_setup[:user]).to eql(user)
+    it "should return the user escaped" do
+      expect(auth_setup[:user]).to eql(CGI.escape(user))
     end
 
-    it "should return the password verbatim" do
-      expect(auth_setup[:password]).to eql(password)
-    end
-    
-    context "passwords that need escaping" do
-      let(:password) { "foo@bar#" }
-      
-      it "should escape the password" do
-        expect(auth_setup[:password]).to eql("foo%40bar%23")
-      end
+    it "should return the password escaped" do
+      expect(auth_setup[:password]).to eql(CGI.escape(password))
     end
   end
 

data/spec/unit/outputs/elasticsearch_spec.rb

@@ -171,13 +171,15 @@ describe "outputs/elasticsearch" do
     end
 
     describe "without a port specified" do
+      let(:options) { super.merge('hosts' => 'localhost') }
       it "should properly set the default port (9200) on the HTTP client" do
         expect(manticore_url.port).to eql(9200)
       end
     end
     describe "with a port other than 9200 specified" do
+      let(:options) { super.merge('hosts' => 'localhost:9202') }
       it "should properly set the specified port on the HTTP client" do
-        expect(manticore_urls.any? {|u| u.port == 9202}).to eql(true)
+        expect(manticore_url.port).to eql(9202)
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 7.3.6
+  version: 7.3.7
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-06-23 00:00:00.000000000 Z
+date: 2017-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -230,6 +230,10 @@ files:
 - spec/fixtures/scripts/painless/scripted_update.painless
 - spec/fixtures/scripts/painless/scripted_update_nested.painless
 - spec/fixtures/scripts/painless/scripted_upsert.painless
+- spec/fixtures/test_certs/ca/ca.crt
+- spec/fixtures/test_certs/ca/ca.key
+- spec/fixtures/test_certs/test.crt
+- spec/fixtures/test_certs/test.key
 - spec/integration/outputs/compressed_indexing_spec.rb
 - spec/integration/outputs/create_spec.rb
 - spec/integration/outputs/delete_spec.rb
@@ -290,6 +294,10 @@ test_files:
 - spec/fixtures/scripts/painless/scripted_update.painless
 - spec/fixtures/scripts/painless/scripted_update_nested.painless
 - spec/fixtures/scripts/painless/scripted_upsert.painless
+- spec/fixtures/test_certs/ca/ca.crt
+- spec/fixtures/test_certs/ca/ca.key
+- spec/fixtures/test_certs/test.crt
+- spec/fixtures/test_certs/test.key
 - spec/integration/outputs/compressed_indexing_spec.rb
 - spec/integration/outputs/create_spec.rb
 - spec/integration/outputs/delete_spec.rb