logstash-filter-http 1.0.1 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afae45a2a7c10f0b80e4d9eb045c244689c59e0ad205fae9affd450d5e54b045
-  data.tar.gz: 53531aa753498082cf4b1cd8145f89f908a6d044bd3278070a7735da549475f6
+  metadata.gz: 4d5469fab82031f6b39e205f18142291d9896c97cd4b650c5124ff0f661ca945
+  data.tar.gz: 878169ea102e2c342fabed654cc8d265df31a7a935fbe8dd4260f79c2b393fce
 SHA512:
-  metadata.gz: 67d91bdf0c67744aee921a35af663f75d7e19d8bef82cfa76ae6ed69ffa24b74976829db210b50942777cea31b23d1daa75e6682d7566ff86690a956f0a9b5d6
-  data.tar.gz: 76d1e76071bd5ac96b8ba2408c311e619c3deef5aeab8eb08e225b5faf5e7b8efca80c39b5d541c28225771a4aab912c8362d1b83b2ef2fe4f58ddbbfc7d70e6
+  metadata.gz: 6f0f5d51f50ec667de851cf7223d004062d3946c1bc0ee4b849edb3de26bc3da5246a168502c3a169023d646772835f79ebf990daf615085e4ce57a8ed5cc2db
+  data.tar.gz: 25d1125226d4c5adbc0bb74bac0ba1d0e7aa02eba55d765e0a15c084638efea664bab10e618eeb80d85e36cc4e94140708c93b26fab6843e3c9a15d13947732a

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 1.2.1
+  - Fix: do not set content-type if provided by user [#36](https://github.com/logstash-plugins/logstash-filter-http/pull/36)
+
+## 1.2.0
+  - Feat: improve ECS compatibility [#35](https://github.com/logstash-plugins/logstash-filter-http/pull/35)
+
+## 1.1.0
+  - Add support for PUT requests [#34](https://github.com/logstash-plugins/logstash-filter-http/pull/34)
+
+## 1.0.2
+  - Fixed exception when using debug logging [#14](https://github.com/logstash-plugins/logstash-filter-http/pull/14)
+
 ## 1.0.1
   - Fixed minor documentation issues [#9](https://github.com/logstash-plugins/logstash-filter-http/pull/9)
 

data/LICENSE

@@ -1,13 +1,202 @@
-Copyright (c) 2012–2015 Elasticsearch <http://www.elastic.co>
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-    http://www.apache.org/licenses/LICENSE-2.0
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2020 Elastic and contributors
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

data/README.md

@@ -1,4 +1,4 @@
-# Logstash REST Filter [![Build Status](https://travis-ci.org/logstash-plugins/logstash-filter-http.svg?branch=master)](https://travis-ci.org/logstash-plugins/logstash-filter-http)
+# Logstash REST Filter [![Build Status](https://travis-ci.com/logstash-plugins/logstash-filter-http.svg?branch=master)](https://travis-ci.com/logstash-plugins/logstash-filter-http)
 
 This is a filter plugin for [Logstash](https://github.com/elastic/logstash).
 

data/lib/logstash/filters/http.rb

@@ -1,18 +1,26 @@
 # encoding: utf-8
 require 'logstash/filters/base'
+require 'logstash/json'
 require 'logstash/namespace'
 require 'logstash/plugin_mixins/http_client'
-require 'logstash/json'
+require 'logstash/plugin_mixins/ecs_compatibility_support'
+require 'logstash/plugin_mixins/ecs_compatibility_support/target_check'
+require 'logstash/plugin_mixins/validator_support/field_reference_validation_adapter'
 
 # Logstash HTTP Filter
 # This filter calls a defined URL and saves the answer into a specified field.
 #
 class LogStash::Filters::Http < LogStash::Filters::Base
+
+  include LogStash::PluginMixins::ECSCompatibilitySupport(:disabled, :v1, :v8 => :v1)
+
+  extend LogStash::PluginMixins::ValidatorSupport::FieldReferenceValidationAdapter
+
   include LogStash::PluginMixins::HttpClient
 
   config_name 'http'
 
-  VALID_VERBS = ['GET', 'HEAD', 'PATCH', 'DELETE', 'POST']
+  VALID_VERBS = ['GET', 'HEAD', 'PATCH', 'DELETE', 'POST', 'PUT']
 
   config :url, :validate => :string, :required => true
   config :verb, :validate => VALID_VERBS, :required => false, :default => 'GET'
@@ -21,14 +29,28 @@ class LogStash::Filters::Http < LogStash::Filters::Base
   config :body, :required => false
   config :body_format, :validate => ['text', 'json'], :default => "text"
 
-  config :target_body, :validate => :string, :default => "body"
-  config :target_headers, :validate => :string, :default => "headers"
+  # default [body] (legacy) required to be specified in ECS mode
+  config :target_body, :validate => :field_reference
+  # default [headers] (legacy) or [@metadata][filter][http][response][headers] in ECS mode
+  config :target_headers, :validate => :field_reference
 
   # Append values to the `tags` field when there has been no
   # successful match or json parsing error
   config :tag_on_request_failure, :validate => :array, :default => ['_httprequestfailure']
   config :tag_on_json_failure, :validate => :array, :default => ['_jsonparsefailure']
 
+  def initialize(*params)
+    super
+
+    @target_body ||= ecs_select[disabled: '[body]', v1: false]
+    if @target_body.eql? false # user needs to specify target in ECS mode
+      @logger.error missing_config_message(:target_body)
+      raise LogStash::ConfigurationError.new "Wrong configuration (in ecs_compatibility mode #{ecs_compatibility.inspect})"
+    end
+
+    @target_headers ||= ecs_select[disabled: '[headers]', v1: '[@metadata][filter][http][response][headers]']
+  end
+
   def register
     # nothing to see here
     @verb = verb.downcase
@@ -37,10 +59,8 @@ class LogStash::Filters::Http < LogStash::Filters::Base
   def filter(event)
     url_for_event = event.sprintf(@url)
     headers_sprintfed = sprintf_object(event, @headers)
-    if body_format == "json"
-      headers_sprintfed["content-type"] = "application/json"
-    else
-      headers_sprintfed["content-type"] = "text/plain"
+    if !headers_sprintfed.key?('content-type') && !headers_sprintfed.key?('Content-Type')
+      headers_sprintfed['content-type'] = @body_format == "json" ? "application/json" : "text/plain"
     end
     query_sprintfed = sprintf_object(event, @query)
     body_sprintfed = sprintf_object(event, @body)
@@ -51,7 +71,7 @@ class LogStash::Filters::Http < LogStash::Filters::Base
 
     options = { :headers => headers_sprintfed, :query => query_sprintfed, :body => body_sprintfed }
 
-    @logger.debug? && @logger.debug('processing request', :url => url_for_event, :headers => headers_sprintfed, :parameters => parameters_sprintfed)
+    @logger.debug? && @logger.debug('processing request', :url => url_for_event, :headers => headers_sprintfed, :query => query_sprintfed)
     client_error = nil
 
     begin
@@ -62,7 +82,7 @@ class LogStash::Filters::Http < LogStash::Filters::Base
 
     if client_error
       @logger.error('error during HTTP request',
-                    :url => url_for_event, :body => @body,
+                    :url => url_for_event, :body => body_sprintfed,
                     :client_error => client_error.message)
       @tag_on_request_failure.each { |tag| event.tag(tag) }
     elsif !code.between?(200, 299)
@@ -79,6 +99,20 @@ class LogStash::Filters::Http < LogStash::Filters::Base
   end # def filter
 
   private
+
+  def missing_config_message(name)
+    <<-EOF
+Missing a required setting for the http filter plugin:
+
+  filter {
+    http {
+      #{name} => # SETTING MISSING
+      ...
+    }
+  }
+EOF
+  end
+
   def request_http(verb, url, options = {})
     response = client.http(verb, url, options)
     [response.code, response.headers, response.body]

data/logstash-filter-http.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-filter-http'
-  s.version = '1.0.1'
+  s.version = '1.2.1'
   s.licenses = ['Apache License (2.0)']
   s.summary = 'This filter requests data from a RESTful Web Service.'
   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 logstash-filter-http. This gem is not a stand-alone program'
@@ -27,7 +27,9 @@ Gem::Specification.new do |s|
 
   # Gem dependencies
   s.add_runtime_dependency 'logstash-core-plugin-api', '>= 1.60', '<= 2.99'
+  s.add_runtime_dependency 'logstash-mixin-ecs_compatibility_support', '~>1.2'
   s.add_runtime_dependency 'logstash-mixin-http_client', '>= 5.0.0', '< 9.0.0'
+  s.add_runtime_dependency 'logstash-mixin-validator_support', '~> 1.0'
 
-  s.add_development_dependency 'logstash-devutils', '>= 0', '< 2.0.0'
+  s.add_development_dependency 'logstash-devutils'
 end

data/spec/filters/http_spec.rb

@@ -1,4 +1,5 @@
 require 'logstash/devutils/rspec/spec_helper'
+require 'logstash/plugin_mixins/ecs_compatibility_support/spec_helper'
 require 'logstash/filters/http'
 
 describe LogStash::Filters::Http do
@@ -6,34 +7,74 @@ describe LogStash::Filters::Http do
   let(:event) { LogStash::Event.new(data) }
   let(:data) { { "message" => "test" } }
 
-  describe 'response body handling' do
-    before(:each) { subject.register }
-    let(:url) { 'http://laceholder.typicode.com/users/10' }
-    let(:config) do
-      { "url" => url, "target_body" => 'rest' }
+  let(:url) { 'https://a-non-existent.url1' }
+  let(:config) { { "url" => url, 'target_body' => '[the][body]' } }
+
+  let(:response) { [200, {}, "Bom dia"] }
+
+  describe 'target_body default', :ecs_compatibility_support do
+
+    let(:config) { { "url" => url, "ecs_compatibility" => ecs_compatibility } }
+
+    ecs_compatibility_matrix(:disabled, :v1, :v8) do |ecs_select|
+
+      it "has a default body_target (in legacy mode)" do
+        subject.register
+        allow(subject).to receive(:request_http).and_return(response)
+        subject.filter(event)
+
+        expect(event.get('body')).to eq("Bom dia")
+      end if ecs_select.active_mode == :disabled
+
+      it "fails due missing body_target (in ECS mode)" do
+        expect { subject }.to raise_error(LogStash::ConfigurationError)
+      end if ecs_select.active_mode != :disabled
+
     end
+
+  end
+
+  describe 'response body handling', :ecs_compatibility_support do
+
+    let(:url) { 'http://laceholder.typicode.com/users/10' }
+
     before(:each) do
+      subject.register
+
       allow(subject).to receive(:request_http).and_return(response)
       subject.filter(event)
     end
 
-    context "when body is text" do
-      let(:response) { [200, {}, "Bom dia"] }
+    ecs_compatibility_matrix(:disabled, :v1, :v8) do
+
+      let(:config) { super().merge "ecs_compatibility" => ecs_compatibility, 'target_body' => 'gw-response' }
+
+      context "when body is JSON" do
+        context "and headers are set correctly" do
+
+          let(:response) { [200, {"content-type" => "application/json"}, "{\"id\": 10}"] }
+
+          it "fetches and writes body to target" do
+            expect(event.get('[gw-response][id]')).to eq(10)
+          end
 
-      it "fetches and writes body to target" do
-        expect(event.get('rest')).to eq("Bom dia")
+        end
       end
-    end
-    context "when body is JSON" do
-      context "and headers are set correctly" do
-        let(:response) { [200, {"content-type" => "application/json"}, "{\"id\": 10}"] }
+
+      context 'with body target' do
+
+        let(:config) { super().merge "target_body" => '[rest]' }
 
         it "fetches and writes body to target" do
-          expect(event.get('[rest][id]')).to eq(10)
+          expect(event.get('rest')).to eq("Bom dia")
+          expect(event.include?('body')).to be false
         end
+
       end
+
     end
   end
+
   describe 'URL parameter' do
     before(:each) { subject.register }
     context "when url contains field references" do
@@ -45,6 +86,7 @@ describe LogStash::Filters::Http do
       it "interpolates request url using event data" do
         expect(subject).to receive(:request_http).with(anything, "http://stringsize.com/test", anything).and_return(response)
         subject.filter(event)
+        expect(event.get('size')).to eql '4'
       end
     end
   end
@@ -68,38 +110,77 @@ describe LogStash::Filters::Http do
       expect(event.get('tags')).to include('_httprequestfailure')
     end
   end
-  describe "headers" do
+
+  describe "headers", :ecs_compatibility_support do
     before(:each) { subject.register }
-    let(:response) { [200, {}, "Bom dia"] }
-    context "when set" do
-      let(:headers) { { "Cache-Control" => "nocache" } }
-      let(:config) do
-        {
-          "url" => "http://stringsize.com",
-          "target_body" => "size",
-          "headers" => headers
-        }
+    let(:response) do
+      response_headers = {
+          'Server' => 'Apache',
+          'Last-Modified' => 'Mon, 18 Jul 2016 02:36:04 GMT',
+          'X-Backend-Server' => 'logstash.elastic.co',
+      }
+      [200, response_headers, "Bom dia"]
+    end
+
+    let(:url) { "http://stringsize.com" }
+
+    ecs_compatibility_matrix(:disabled, :v1) do |ecs_select|
+
+      let(:config) { super().merge "ecs_compatibility" => ecs_compatibility }
+
+      it "sets response headers in the event" do
+        expect(subject).to receive(:request_http).with(anything, config['url'], anything).and_return(response)
+
+        subject.filter(event)
+
+        if ecs_select.active_mode == :disabled
+          expect(event.get('headers')).to include "Server" => "Apache"
+          expect(event.get('headers')).to include "X-Backend-Server" => "logstash.elastic.co"
+        else
+          expect(event.include?('headers')).to be false
+          expect(event.get('[@metadata][filter][http][response][headers]')).to include "Server" => "Apache"
+          expect(event.get('[@metadata][filter][http][response][headers]')).to include "X-Backend-Server" => "logstash.elastic.co"
+        end
+      end
+
+      context 'with a headers target' do
+
+        let(:config) { super().merge "target_headers" => '[res][headers]' }
+
+        it "sets response headers in the event" do
+          expect(subject).to receive(:request_http).with(anything, config['url'], anything).and_return(response)
+
+          subject.filter(event)
+
+          expect(event.get('[res][headers]')).to include "Server" => "Apache"
+          expect(event.get('[res][headers]').keys).to include "Last-Modified"
+        end
+
       end
+
+    end
+
+    context "(extra) request headers" do
+      let(:headers) { { "Cache-Control" => "nocache" } }
+      let(:config) { super().merge "headers" => headers }
+
       it "are included in the request" do
         expect(subject).to receive(:request_http) do |verb, url, options|
-          expect(options.fetch(:headers, {})).to include(headers)
+          expect( options.fetch(:headers, {}) ).to include(headers)
         end.and_return(response)
+
         subject.filter(event)
       end
     end
   end
+
   describe "query string parameters" do
     before(:each) { subject.register }
     let(:response) { [200, {}, "Bom dia"] }
     context "when set" do
       let(:query) { { "color" => "green" } }
-      let(:config) do
-        {
-          "url" => "http://stringsize.com/%{message}",
-          "target_body" => "size",
-          "query" => query
-        }
-      end
+      let(:config) { super().merge "query" => query }
+
       it "are included in the request" do
         expect(subject).to receive(:request_http).with(anything, anything, include(:query => query)).and_return(response)
         subject.filter(event)
@@ -109,21 +190,11 @@ describe LogStash::Filters::Http do
   describe "request body" do
     before(:each) { subject.register }
     let(:response) { [200, {}, "Bom dia"] }
-    let(:config) do
-      {
-        "url" => "http://stringsize.com",
-        "body" => body
-      }
-    end
+    let(:url) { "http://stringsize.com" }
+    let(:config) { super().merge "body" => body }
 
     describe "format" do
-      let(:config) do
-        {
-          "url" => "http://stringsize.com",
-          "body_format" => body_format,
-          "body" => body
-        }
-      end
+      let(:config) { super().merge "body_format" => body_format, "body" => body }
 
       context "when is json" do
         let(:body_format) { "json" }
@@ -138,12 +209,14 @@ describe LogStash::Filters::Http do
           end.and_return(response)
           subject.filter(event)
         end
+
         it "sets content-type to application/json" do
           expect(subject).to receive(:request_http) do |verb, url, options|
             expect(options).to include(:headers => { "content-type" => "application/json"})
           end.and_return(response)
           subject.filter(event)
         end
+
       end
       context "when is text" do
         let(:body_format) { "text" }
@@ -155,12 +228,29 @@ describe LogStash::Filters::Http do
           end.and_return(response)
           subject.filter(event)
         end
+
         it "sets content-type to text/plain" do
           expect(subject).to receive(:request_http) do |verb, url, options|
             expect(options).to include(:headers => { "content-type" => "text/plain"})
           end.and_return(response)
           subject.filter(event)
         end
+
+        context 'content-type header present' do
+
+          let(:config) { super().merge 'headers' => { 'X-UA' => 'FOO', 'Content-Type' => 'application/x-www-form-urlencoded' } }
+
+          it "respects set header and does not add another" do
+            expect(subject).to receive(:request_http) do |verb, url, options|
+              headers = options[:headers]
+              expect(headers).to include("Content-Type" => "application/x-www-form-urlencoded")
+              expect(headers).to_not include("content-type")
+            end.and_return(response)
+            subject.filter(event)
+          end
+
+        end
+
       end
     end
     context "when using field references" do
@@ -190,14 +280,9 @@ describe LogStash::Filters::Http do
   end
   describe "verb" do
     let(:response) { [200, {}, "Bom dia"] }
-    let(:config) do
-      {
-        "verb" => verb,
-        "url" => "http://stringsize.com",
-        "target_body" => "size"
-      }
-    end
-    ["GET", "HEAD", "POST", "DELETE"].each do |verb_string|
+    let(:config) { super().merge "verb" => verb }
+
+    ["GET", "HEAD", "POST", "DELETE", "PATCH", "PUT"].each do |verb_string|
       let(:verb) { verb_string }
       context "when verb #{verb_string} is set" do
         before(:each) { subject.register }
@@ -217,7 +302,7 @@ describe LogStash::Filters::Http do
 end
 
 =begin
-  # TODO refactor remaning tests to avoid insist + whole pipeline instantiation
+  # TODO refactor remaning tests to avoid whole pipeline instantiation
   describe 'empty response' do
     let(:config) do <<-CONFIG
       filter {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-http
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.2.1
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-02-06 00:00:00.000000000 Z
+date: 2021-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -30,6 +30,20 @@ dependencies:
     - - "<="
       - !ruby/object:Gem::Version
         version: '2.99'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  name: logstash-mixin-ecs_compatibility_support
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -50,15 +64,26 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 9.0.0
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  name: logstash-mixin-validator_support
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.0.0
   name: logstash-devutils
   prerelease: false
   type: :development
@@ -67,9 +92,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.0.0
 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 logstash-filter-http.
   This gem is not a stand-alone program
@@ -107,8 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.6.13
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: This filter requests data from a RESTful Web Service.