logstash-output-elasticsearch 5.2.0-java → 5.2.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d553066aa5a9463be1990f8eb44e9d5803bee747
-  data.tar.gz: 2d277b0d77b2baa69afcc2a842a68a2fe0f07ae6
+  metadata.gz: 3b251154b11adcfa757987794bdad62c0488d349
+  data.tar.gz: f23e6896387edeb0eeacab8e669acae81c432aa7
 SHA512:
-  metadata.gz: 8b69222e253ad2ab4ecdc3805e9c02077344fed9820ef0c116ea2157ff67d8d1f0df4bc701f0df1d7042a1e43a218ff846f3c3fdfa8e47252158722dc9736808
-  data.tar.gz: f314dc238f4704775a4ba5019aa3f4a70561be8bf50001b50e6df6a101bfeef7851fe06bf470b839a393b55dd577f69413bb47c0117ea18f9805bbf29dfb18a0
+  metadata.gz: bb7d268d9129800467d11b13d577fe367b063f6df75317f57e850cb2f0011ed4c7ac49275138c4334d39d8e1776e0002bc2e4cd031e6ec194f34183d85fe9b1a
+  data.tar.gz: 7dcd51f47cafc2cff0dc1633e373f40de486b5be82a9351e693d834e91aeaa63eb91d733950054075ae8cea35bfb340cdf0961a814bfff12ae119187a180aebe

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 5.2.1
+- Hide user/password in connection pool
+- depends on Adressable ~> 2.3.0 to satisfy development dependency of the core ([logstash/#6204](https://github.com/elastic/logstash/issues/6204))
+
 ## 5.2.0
 - Change default lang for scripts to be painless, inline with ES 5.0. Earlier there was no default.
 

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

@@ -261,7 +261,7 @@ module LogStash; module Outputs; class ElasticSearch; class HttpClient;
         new_urls.each do |url|
           # URI objects don't have real hash equality! So, since this isn't perf sensitive we do a linear scan
           unless @url_info.keys.include?(url)
-            state_changes[:added] << url.to_s
+            state_changes[:added] << url
             add_url(url)
           end
         end
@@ -269,14 +269,24 @@ module LogStash; module Outputs; class ElasticSearch; class HttpClient;
         # Delete connections not in the new list
         @url_info.each do |url,_|
           unless new_urls.include?(url)
-            state_changes[:removed] << url.to_s
+            state_changes[:removed] << url
             remove_url(url)
           end
         end
       end
 
       if state_changes[:removed].size > 0 || state_changes[:added].size > 0
-        logger.info("Elasticsearch pool URLs updated", :changes => state_changes)
+        if logger.info?
+          logger.info("Elasticsearch pool URLs updated", :changes => safe_state_changes(state_changes))
+        end
+      end
+    end
+    
+    def safe_state_changes(state_changes)
+      state_changes.reduce({}) do |acc, kv|
+        k,v = kv
+        acc[k] = v.map(&LogStash::Outputs::ElasticSearch::SafeURL.method(:without_credentials)).map(&:to_s)
+        acc
       end
     end
 

data/logstash-output-elasticsearch.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-elasticsearch'
-  s.version         = '5.2.0'
+  s.version         = '5.2.1'
   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"
@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'cabin', ['~> 0.6']
   s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
   s.add_development_dependency 'ftw', '~> 0.0.42'
+  s.add_development_dependency 'addressable', "~> 2.3.0" # used by FTW. V 2.5.0 is ruby 2.0 only. 
   s.add_development_dependency 'logstash-codec-plain'
 
   if RUBY_PLATFORM == 'java'

data/spec/unit/outputs/elasticsearch/http_client/pool_spec.rb

@@ -93,6 +93,21 @@ describe LogStash::Outputs::ElasticSearch::HttpClient::Pool do
       expect(subject).to have_received(:in_use_connections).twice
     end
   end
+  
+  describe "safe_state_changes" do
+    let(:state_changes) do 
+      {
+        :added => [URI.parse("http://sekretu:sekretp@foo1")],
+        :removed => [URI.parse("http://sekretu:sekretp@foo2")]
+      }
+    end
+    let(:processed) { subject.safe_state_changes(state_changes)}
+    
+    it "should hide passwords" do
+      expect(processed[:added].any? {|p| p =~ /sekretp/ }).to be false
+      expect(processed[:removed].any? {|p| p =~ /sekretp/ }).to be false
+    end
+  end
 
   describe "connection management" do
     context "with only one URL in the list" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.2.1
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-10-05 00:00:00.000000000 Z
+date: 2016-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -78,6 +78,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.42
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+  name: addressable
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: