logstash-output-elasticsearch 7.3.3-java → 7.3.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc9b9269ae5cb7c813b4285f847b8ccd8f05ac36
-  data.tar.gz: 7d35c24ff12143617a196b8ac58533b792bfea84
+  metadata.gz: dc1a672b60b3243dd69f875a60dc888fe4cbf341
+  data.tar.gz: 79e351f418538c857cca719ecbacb650c8e00c00
 SHA512:
-  metadata.gz: e47d9eb0b7b17c372374f0b326f3e22c5969c496364b0a735c7909a7afb4f085723bb356bbc5f5866b85992d3fe7c2f90dcb28082ba1414621a213dce87597c6
-  data.tar.gz: 154d3cee1472d12d47fe39b21eb17403618b19d2a5f515805b7625e3198879f06738fd751b449ebc4e3c3e0bf141d5069db867c3265226c4b1375b27042b554b
+  metadata.gz: a5beaf4ed4b27fdd2724a0d53dd615f926cee4a08ab1289a11bd4db96a8fa4b8e815fd441e64fbdd2885fcd0aeb57eabd18324f8b08a4cd271747bba46ba910c
+  data.tar.gz: 49f4e418557d0b1af16fc23026d8fcc15b97efab6ed08dd1d7bfe9e880eb78adc1ee99382d9ed84a4c314b9841b071c137176924a84e3125faad1053755c9aae

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 7.3.4
+ - Fix incorrect handling of bulk_path containing ?s
+
 ## 7.3.3
  - Fix JRuby 9k incompatibilities and use new URI class that is JRuby 9k compatible
 

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

@@ -66,7 +66,7 @@ module LogStash; module Outputs; class ElasticSearch; class HttpClient;
 
       request_uri = format_url(url, path)
 
-      resp = @manticore.send(method.downcase, request_uri.to_s, params)
+      resp = @manticore.send(method.downcase, request_uri, params)
 
       # Manticore returns lazy responses by default
       # We want to block for our usage, this will wait for the repsonse
@@ -83,30 +83,30 @@ module LogStash; module Outputs; class ElasticSearch; class HttpClient;
       resp
     end
 
-    def format_url(url, path=nil)
+    def format_url(url, path_and_query=nil)
       request_uri = url.clone
-
-      if path
-        # Combine the paths using the minimal # of /s
-        # First, we make sure the path is relative so URI.join does
-        # the right thing
-        relative_path = path && path.start_with?("/") ? path[1..-1] : path
-
-        if !request_uri.path
-          request_uri.path = path
-        else
-          request_uri.path = "#{request_uri.path}/#{relative_path}"
-        end
-      else
-        request_uri = request_uri.clone
-      end
-
+      
       # We excise auth info from the URL in case manticore itself tries to stick
       # sensitive data in a thrown exception or log data
       request_uri.user = nil
       request_uri.password = nil
 
-      request_uri
+      return request_uri.to_s if path_and_query.nil?
+      
+      parsed_path_and_query = java.net.URI.new(path_and_query)
+      
+      query = request_uri.query
+      parsed_query = parsed_path_and_query.query
+      
+      new_query_parts = [request_uri.query, parsed_path_and_query.query].select do |part|
+        part && !part.empty? # Skip empty nil and ""
+      end
+      
+      request_uri.query = new_query_parts.join("&") unless new_query_parts.empty?
+      
+      request_uri.path = "#{request_uri.path}/#{parsed_path_and_query.path}".gsub(/\/{2,}/, "/")
+        
+      request_uri.to_s
     end
 
     def close

data/logstash-output-elasticsearch.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-output-elasticsearch'
-  s.version         = '7.3.3'
+  s.version         = '7.3.4'
   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/unit/outputs/elasticsearch/http_client/manticore_adapter_spec.rb

@@ -50,24 +50,46 @@ describe LogStash::Outputs::ElasticSearch::HttpClient::ManticoreAdapter do
     subject { described_class.new(double("logger"), {}) }
 
     it "should add the path argument to the uri's path" do
-      expect(subject.format_url(url, path).path).to eq("/path//_bulk")
+      expect(java.net.URI.new(subject.format_url(url, path)).path).to eq("/path/_bulk")
     end
 
     context "when uri contains query parameters" do
       let(:query_params) { "query=value&key=value2" }
       let(:url) { ::LogStash::Util::SafeURI.new("http://localhost:9200/path/?#{query_params}") }
+      let(:formatted) { java.net.URI.new(subject.format_url(url, path))}
 
       it "should retain query_params after format" do
-        expect(subject.format_url(url, path).query).to eq(query_params)
+        expect(formatted.query).to eq(query_params)
+      end
+      
+      context "and the path contains query parameters" do
+        let(:path) { "/special_path?specialParam=123" }
+        
+        it "should join the query correctly" do
+          expect(formatted.query).to eq(query_params + "&specialParam=123")
+        end
+      end
+    end
+    
+    context "when the path contains query parameters" do
+      let(:path) { "/special_bulk?pathParam=1"}
+      let(:formatted) { java.net.URI.new(subject.format_url(url, path)) }
+      
+      it "should add the path correctly" do
+        expect(formatted.path).to eq("#{url.path}special_bulk")
+      end 
+      
+      it "should add the query parameters correctly" do
+        expect(formatted.query).to eq("pathParam=1")
       end
     end
 
     context "when uri contains credentials" do
       let(:url) { ::LogStash::Util::SafeURI.new("http://myuser:mypass@localhost:9200") }
+      let(:formatted) { java.net.URI.new(subject.format_url(url, path)) }
 
       it "should remove credentials after format" do
-        expect(subject.format_url(url, path).user).to be_nil
-        expect(subject.format_url(url, path).password).to be_nil
+        expect(formatted.user_info).to be_nil
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 7.3.3
+  version: 7.3.4
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-06-05 00:00:00.000000000 Z
+date: 2017-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement