logstash-input-http_bold 3.6.0-java → 5.0.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed590ff2f7fa87bdb02eef98271a84e65c8edb1d8edc67abfd44e3f2f4272925
-  data.tar.gz: e17538afdbaf9650fca472f259e2fe6f9742c396ed3ae3a7636eff0437287c3b
+  metadata.gz: ed86320d99ebc9ae5bdb1f113f5f6f8f821c920bf37c904b3f419742f40c5fe5
+  data.tar.gz: c3d71bc12a9a84d1bdc07801c01214e5e732415246283597f699ffa12da18545
 SHA512:
-  metadata.gz: 15eef8831ef140212121c4c1560dcde8e89cebbe1b0641e3b2695bf1a8262f497a3eaa24951a09898628584c4ae3e1fc5c36474feca140f3749ced73cca22155
-  data.tar.gz: 45d975d48961127f96b46c76c5f18b4e4cfc680fa317b7c00aa840225bf70fccba348be9da8d5ed1980d3a0c04a2b25e1f349f83a93fd664bc0dd7fde1d419dc
+  metadata.gz: 7b1305fe8210836682cceba653e54cb5769e5d21ef2418640c3f30403842d9baedbff0552f6338ec8c75031cee2ac96c821a0d621284bec386cbf6eaa29be642
+  data.tar.gz: d537394a4a0804d43b84f6321ea713893e542d5dde7f544e2f5ff32e23a3d82b261214dc1e443a16ccb2ebc5d3c25dfdadafbeba9d44b2a6b1a26e99fbbaf5f2

data/DEVELOPER.md

@@ -1 +1,33 @@
 # logstash-input-http
+
+
+## Bold customization
+
+### Compilation
+
+1. git clone https://github.com/elastic/logstash.git
+2. cd logstash && git clone ssh://git@gitlab.boldmss.com:9022/proxies_api/logstash-input-http_bold.git
+3. echo "nueva_version" > VERSION
+4. ./gradlew build
+5. ./graldew vendor
+6. jruby -S gem build logstash-input-http_bold.gemspec
+7. gem push logstash-input-http_bold-X.X.X-java.gem (publica la gema en rubygem.org)
+
+### Usage
+
+#### Local
+
+```
+bin/logstash-plugin install --no-verify logstash-input-http_bold/logstash-input-http_bold-3.5.4-java.gem
+```
+
+#### From https://rubygems.org
+
+For a while, isn't possible, because the plugin name is the same than the oficial one.
+
+To change the name it's necesary a code refactor.
+
+
+```
+bin/logstash-plugin install logstash-input-http_bold
+```

data/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gemspec
 
-logstash_path = ENV["LOGSTASH_PATH"] || "../logstash"
+logstash_path = ENV["LOGSTASH_PATH"] || "../../logstash"
 use_logstash_source = ENV["LOGSTASH_SOURCE"] && ENV["LOGSTASH_SOURCE"].to_s == "1"
 
 if Dir.exist?(logstash_path) && use_logstash_source

data/VERSION

@@ -1 +1 @@
-3.6.0
+5.0.0

data/lib/logstash/inputs/{http → http_bold}/message_handler.rb

@@ -3,7 +3,7 @@ require "logstash-input-http_bold_jars"
 
 module LogStash module Inputs class Http
   class MessageHandler
-    include org.logstash.plugins.inputs.http.IMessageHandler
+    include org.logstash.plugins.inputs.http_bold.IMessageHandler
 
     attr_reader :input
 

data/lib/logstash/inputs/http_bold.rb

@@ -2,7 +2,7 @@
 require "logstash/inputs/base"
 require "logstash/namespace"
 require "stud/interval"
-require "logstash-input-http_jars"
+require "logstash-input-http_bold_jars"
 require "logstash/plugin_mixins/ecs_compatibility_support"
 
 # Using this input you can receive single or multiline events over http(s).
@@ -20,14 +20,14 @@ require "logstash/plugin_mixins/ecs_compatibility_support"
 # This plugin supports standard HTTP basic authentication headers to identify the requester.
 # You can pass in an username, password combination while sending data to this input
 #
-# You can also setup SSL and send data securely over https, with an option of validating 
-# the client's certificate. Currently, the certificate setup is through 
-# https://docs.oracle.com/cd/E19509-01/820-3503/ggfen/index.html[Java Keystore 
+# You can also setup SSL and send data securely over https, with an option of validating
+# the client's certificate. Currently, the certificate setup is through
+# https://docs.oracle.com/cd/E19509-01/820-3503/ggfen/index.html[Java Keystore
 # format]
 #
 class LogStash::Inputs::Http < LogStash::Inputs::Base
   include LogStash::PluginMixins::ECSCompatibilitySupport(:disabled, :v1, :v8 => :v1)
-  require "logstash/inputs/http/tls"
+  require "logstash/inputs/http_bold/tls"
 
   java_import "io.netty.handler.codec.http.HttpUtil"
 
@@ -95,7 +95,7 @@ class LogStash::Inputs::Http < LogStash::Inputs::Base
   config :tls_max_version, :validate => :number, :default => TLS.max.version
 
   # The list of ciphers suite to use, listed by priorities.
-  config :cipher_suites, :validate => :array, :default => org.logstash.plugins.inputs.http.util.SslSimpleBuilder.getDefaultCiphers
+  config :cipher_suites, :validate => :array, :default => org.logstash.plugins.inputs.http_bold.util.SslSimpleBuilder.getDefaultCiphers
 
   # Apply specific codecs for specific content types.
   # The default codec will be applied only after this list is checked
@@ -143,7 +143,7 @@ class LogStash::Inputs::Http < LogStash::Inputs::Base
       @codecs[content_type] = LogStash::Plugin.lookup("codec", codec).new
     end
 
-    require "logstash/inputs/http/message_handler"
+    require "logstash/inputs/http_bold/message_handler"
     message_handler = MessageHandler.new(self, @codec, @codecs, @auth_token)
     @http_server = create_http_server(message_handler)
 
@@ -253,7 +253,7 @@ class LogStash::Inputs::Http < LogStash::Inputs::Base
   end
 
   def create_http_server(message_handler)
-    org.logstash.plugins.inputs.http.NettyHttpServer.new(
+    org.logstash.plugins.inputs.http_bold.NettyHttpServer.new(
       @host, @port, message_handler, build_ssl_params(), @threads, @max_pending_requests, @max_content_length, @response_code)
   end
 
@@ -261,10 +261,10 @@ class LogStash::Inputs::Http < LogStash::Inputs::Base
     return nil unless @ssl
 
     if @keystore && @keystore_password
-      ssl_builder = org.logstash.plugins.inputs.http.util.JksSslBuilder.new(@keystore, @keystore_password.value)
+      ssl_builder = org.logstash.plugins.inputs.http_bold.util.JksSslBuilder.new(@keystore, @keystore_password.value)
     else
       begin
-        ssl_builder = org.logstash.plugins.inputs.http.util.SslSimpleBuilder
+        ssl_builder = org.logstash.plugins.inputs.http_bold.util.SslSimpleBuilder
                           .new(@ssl_certificate, @ssl_key, @ssl_key_passphrase.nil? ? nil : @ssl_key_passphrase.value)
                           .setCipherSuites(normalized_ciphers)
       rescue java.lang.IllegalArgumentException => e
@@ -308,7 +308,7 @@ class LogStash::Inputs::Http < LogStash::Inputs::Base
 
   def new_ssl_handshake_provider(ssl_builder)
     begin
-      ssl_handler_provider = org.logstash.plugins.inputs.http.util.SslHandlerProvider.new(ssl_builder.build())
+      ssl_handler_provider = org.logstash.plugins.inputs.http_bold.util.SslHandlerProvider.new(ssl_builder.build())
       ssl_handler_provider.setVerifyMode(@ssl_verify_mode_final.upcase)
       ssl_handler_provider.setProtocols(convert_protocols)
       ssl_handler_provider.setHandshakeTimeoutMilliseconds(@ssl_handshake_timeout)

data/lib/logstash-input-http_bold_jars.rb

@@ -4,4 +4,4 @@ require 'jar_dependencies'
 require_jar('io.netty', 'netty-all', '4.1.65.Final')
 require_jar('org.apache.logging.log4j', 'log4j-api', '2.11.1')
 require_jar('org.json', 'json', '20210307')
-require_jar('org.logstash.plugins.input.http_bold', 'logstash-input-http_bold', '3.6.0')
+require_jar('org.logstash.plugins.input.http_bold', 'logstash-input-http_bold', '5.0.0')

data/lib/logstash-input-http_jars.rb

@@ -3,4 +3,5 @@
 require 'jar_dependencies'
 require_jar('io.netty', 'netty-all', '4.1.65.Final')
 require_jar('org.apache.logging.log4j', 'log4j-api', '2.11.1')
-require_jar('org.logstash.plugins.input.http', 'logstash-input-http', '3.4.1')
+require_jar('org.json', 'json', '20210307')
+require_jar('org.logstash.plugins.input.http_bold', 'logstash-input-http_bold', '4.0.3')

data/lib/logstash-input-httpbold_jars.rb

@@ -0,0 +1,7 @@
+# AUTOGENERATED BY THE GRADLE SCRIPT. DO NOT EDIT.
+
+require 'jar_dependencies'
+require_jar('io.netty', 'netty-all', '4.1.65.Final')
+require_jar('org.apache.logging.log4j', 'log4j-api', '2.11.1')
+require_jar('org.json', 'json', '20210307')
+require_jar('org.logstash.plugins.input.http_bold', 'logstash-input-http_bold', '1.0.0')

data/spec/inputs/{http_bolspec.rb → http_bold_spec.rb}

@@ -1,6 +1,6 @@
 require "logstash/devutils/rspec/spec_helper"
 require "logstash/devutils/rspec/shared_examples"
-require "logstash/inputs/http"
+require "logstash/inputs/http_bold"
 require "json"
 require "manticore"
 require "stud/temporary"
@@ -10,7 +10,7 @@ require 'logstash/plugin_mixins/ecs_compatibility_support/spec_helper'
 
 java_import "io.netty.handler.ssl.util.SelfSignedCertificate"
 
-describe LogStash::Inputs::Http do
+describe LogStash::Inputs::Http_bold do
 
   before do
     srand(RSpec.configuration.seed)
@@ -32,7 +32,7 @@ describe LogStash::Inputs::Http do
   end
 
   describe "request handling" do
-    subject { LogStash::Inputs::Http.new("port" => port) }
+    subject { LogStash::Inputs::Http_bold.new("port" => port) }
 
     before :each do
       setup_server_client
@@ -74,7 +74,7 @@ describe LogStash::Inputs::Http do
     end
 
     context "with default codec" do
-      subject { LogStash::Inputs::Http.new("port" => port) }
+      subject { LogStash::Inputs::Http_bold.new("port" => port) }
       context "when receiving a text/plain request" do
         it "should process the request normally" do
           client.post("http://127.0.0.1:#{port}/meh.json",
@@ -140,7 +140,7 @@ describe LogStash::Inputs::Http do
     end
 
     context "with json codec" do
-      subject { LogStash::Inputs::Http.new("port" => port, "codec" => "json") }
+      subject { LogStash::Inputs::Http_bold.new("port" => port, "codec" => "json") }
       it "should parse the json body" do
         response = client.post("http://127.0.0.1:#{port}/meh.json", :body => { "message" => "Hello" }.to_json).call
         event = logstash_queue.pop
@@ -149,7 +149,7 @@ describe LogStash::Inputs::Http do
     end
 
     context "with json_lines codec without final delimiter" do
-      subject { LogStash::Inputs::Http.new("port" => port, "codec" => "json_lines") }
+      subject { LogStash::Inputs::Http_bold.new("port" => port, "codec" => "json_lines") }
       let(:line1) { '{"foo": 1}' }
       let(:line2) { '{"foo": 2}' }
       it "should parse all json_lines in body including last one" do
@@ -163,7 +163,7 @@ describe LogStash::Inputs::Http do
     end
 
     context "when using a custom codec mapping" do
-      subject { LogStash::Inputs::Http.new("port" => port,
+      subject { LogStash::Inputs::Http_bold.new("port" => port,
                                            "additional_codecs" => { "application/json" => "plain" }) }
       it "should decode the message accordingly" do
         body = { "message" => "Hello" }.to_json
@@ -174,9 +174,9 @@ describe LogStash::Inputs::Http do
         expect(event.get("message")).to eq(body)
       end
     end
-    
+
     context "when receiving a content-type with a charset" do
-      subject { LogStash::Inputs::Http.new("port" => port,
+      subject { LogStash::Inputs::Http_bold.new("port" => port,
                                            "additional_codecs" => { "application/json" => "plain" }) }
       it "should decode the message accordingly" do
         body = { "message" => "Hello" }.to_json
@@ -190,7 +190,7 @@ describe LogStash::Inputs::Http do
 
     context "when using custom headers" do
       let(:custom_headers) { { 'access-control-allow-origin' => '*' } }
-      subject { LogStash::Inputs::Http.new("port" => port, "response_headers" => custom_headers) }
+      subject { LogStash::Inputs::Http_bold.new("port" => port, "response_headers" => custom_headers) }
 
       describe "the response" do
         it "should include the custom headers" do
@@ -201,7 +201,7 @@ describe LogStash::Inputs::Http do
     end
     describe "basic auth" do
       user = "test"; password = "pwd"
-      subject { LogStash::Inputs::Http.new("port" => port, "user" => user, "password" => password) }
+      subject { LogStash::Inputs::Http_bold.new("port" => port, "user" => user, "password" => password) }
       let(:auth_token) { Base64.strict_encode64("#{user}:#{password}") }
       context "when client doesn't present auth token" do
         let!(:response) { client.post("http://127.0.0.1:#{port}/meh", :body => "hi").call }
@@ -256,7 +256,7 @@ describe LogStash::Inputs::Http do
     describe "HTTP Protocol Handling" do
       context "when an HTTP1.1 request is made" do
         let(:protocol_version) do
-          Java::OrgApacheHttp::HttpVersion::HTTP_1_1
+          Java::OrgApacheHttp_bold::Http_boldVersion::HTTP_1_1
         end
         it "responds with a HTTP1.1 response" do
           response = client.post("http://127.0.0.1:#{port}", :body => "hello")
@@ -268,7 +268,7 @@ describe LogStash::Inputs::Http do
       end
       context "when an HTTP1.0 request is made" do
         let(:protocol_version) do
-          Java::OrgApacheHttp::HttpVersion::HTTP_1_0
+          Java::OrgApacheHttp_bold::Http_boldVersion::HTTP_1_0
         end
         it "responds with a HTTP1.0 response" do
           response = client.post("http://127.0.0.1:#{port}", :body => "hello")
@@ -287,7 +287,7 @@ describe LogStash::Inputs::Http do
       end
       context "when response_code is configured" do
         let(:code) { 202 }
-        subject { LogStash::Inputs::Http.new("port" => port, "response_code" => code) }
+        subject { LogStash::Inputs::Http_bold.new("port" => port, "response_code" => code) }
         it "responds with the configured code" do
           response = client.post("http://127.0.0.1:#{port}", :body => "hello")
           response.call
@@ -317,7 +317,7 @@ describe LogStash::Inputs::Http do
       end
 
       describe "remote host" do
-        subject { LogStash::Inputs::Http.new(config.merge("port" => port)) }
+        subject { LogStash::Inputs::Http_bold.new(config.merge("port" => port)) }
         context "by default" do
           let(:config) { {} }
           it "is written to the \"host\" field" do
@@ -342,7 +342,7 @@ describe LogStash::Inputs::Http do
       end
 
       describe "request headers" do
-        subject { LogStash::Inputs::Http.new(config.merge("port" => port)) }
+        subject { LogStash::Inputs::Http_bold.new(config.merge("port" => port)) }
         context "by default" do
           let(:config) { {} }
           it "are written to the \"headers\" field" do
@@ -410,39 +410,39 @@ describe LogStash::Inputs::Http do
     let(:ipv6) { "2001:db8::8a2e:370:7334" }
 
     it "should parse in IPV4 format with port" do
-      domain, port = LogStash::Inputs::Http.get_domain_port("#{localhost}:8080")
+      domain, port = LogStash::Inputs::Http_bold.get_domain_port("#{localhost}:8080")
       expect(domain).to eq(localhost)
       expect(port).to eq(8080)
     end
 
     it "should parse in IPV4 format without port" do
-      domain, port = LogStash::Inputs::Http.get_domain_port(localhost)
+      domain, port = LogStash::Inputs::Http_bold.get_domain_port(localhost)
       expect(domain).to eq(localhost)
       expect(port).to be_nil
     end
 
     it "should parse in IPV6 format with port" do
-      domain, port = LogStash::Inputs::Http.get_domain_port("[#{ipv6}]:8080")
+      domain, port = LogStash::Inputs::Http_bold.get_domain_port("[#{ipv6}]:8080")
       expect(domain).to eq(ipv6)
       expect(port).to eq(8080)
     end
 
     it "should parse in IPV6 format without port" do
-      domain, port = LogStash::Inputs::Http.get_domain_port("#{ipv6}")
+      domain, port = LogStash::Inputs::Http_bold.get_domain_port("#{ipv6}")
       expect(domain).to eq(ipv6)
       expect(port).to be_nil
     end
   end
 
   context "with :ssl => false" do
-    subject { LogStash::Inputs::Http.new("port" => port, "ssl" => false) }
+    subject { LogStash::Inputs::Http_bold.new("port" => port, "ssl" => false) }
     it "should not raise exception" do
       expect { subject.register }.to_not raise_exception
     end
   end
   context "with :ssl => true" do
     context "without :ssl_certificate" do
-      subject { LogStash::Inputs::Http.new("port" => port, "ssl" => true) }
+      subject { LogStash::Inputs::Http_bold.new("port" => port, "ssl" => true) }
       it "should raise exception" do
         expect { subject.register }.to raise_exception(LogStash::ConfigurationError)
       end
@@ -458,14 +458,14 @@ describe LogStash::Inputs::Http do
 
       after(:each) { ssc.delete }
 
-      subject { LogStash::Inputs::Http.new(config) }
+      subject { LogStash::Inputs::Http_bold.new(config) }
 
       it "should not raise exception" do
         expect { subject.register }.to_not raise_exception
       end
 
       context "with ssl_verify_mode = none" do
-        subject { LogStash::Inputs::Http.new(config.merge("ssl_verify_mode" => "none")) }
+        subject { LogStash::Inputs::Http_bold.new(config.merge("ssl_verify_mode" => "none")) }
 
         it "should not raise exception" do
           expect { subject.register }.to_not raise_exception
@@ -473,7 +473,7 @@ describe LogStash::Inputs::Http do
       end
       ["peer", "force_peer"].each do |verify_mode|
         context "with ssl_verify_mode = #{verify_mode}" do
-          subject { LogStash::Inputs::Http.new("port" => port, "ssl" => true,
+          subject { LogStash::Inputs::Http_bold.new("port" => port, "ssl" => true,
                                                "ssl_certificate" => ssl_certificate.path,
                                                "ssl_certificate_authorities" => ssl_certificate.path,
                                                "ssl_key" => ssl_key.path,
@@ -485,7 +485,7 @@ describe LogStash::Inputs::Http do
         end
       end
       context "with verify_mode = none" do
-        subject { LogStash::Inputs::Http.new(config.merge("verify_mode" => "none")) }
+        subject { LogStash::Inputs::Http_bold.new(config.merge("verify_mode" => "none")) }
 
         it "should not raise exception" do
           expect { subject.register }.to_not raise_exception
@@ -493,7 +493,7 @@ describe LogStash::Inputs::Http do
       end
       ["peer", "force_peer"].each do |verify_mode|
         context "with verify_mode = #{verify_mode}" do
-          subject { LogStash::Inputs::Http.new("port" => port, "ssl" => true,
+          subject { LogStash::Inputs::Http_bold.new("port" => port, "ssl" => true,
                                                "ssl_certificate" => ssl_certificate.path,
                                                "ssl_certificate_authorities" => ssl_certificate.path,
                                                "ssl_key" => ssl_key.path,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-http_bold
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 5.0.0
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-17 00:00:00.000000000 Z
+date: 2021-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -152,18 +152,24 @@ files:
 - docs/index.asciidoc
 - lib/logstash-input-http_bold_jars.rb
 - lib/logstash-input-http_jars.rb
-- lib/logstash/inputs/http/message_handler.rb
-- lib/logstash/inputs/http/tls.rb
+- lib/logstash-input-httpbold_jars.rb
 - lib/logstash/inputs/http_bold.rb
+- lib/logstash/inputs/http_bold/message_handler.rb
+- lib/logstash/inputs/http_bold/tls.rb
 - lib/logstash/util/http_compressed_requests.rb
 - lib/tasks/build.rake
 - logstash-input-http_bold.gemspec
-- spec/inputs/http_bolspec.rb
+- spec/inputs/http_bold_spec.rb
 - vendor/jar-dependencies/io/netty/netty-all/4.1.65.Final/netty-all-4.1.65.Final.jar
 - vendor/jar-dependencies/org/apache/logging/log4j/log4j-api/2.11.1/log4j-api-2.11.1.jar
 - vendor/jar-dependencies/org/json/json/20210307/json-20210307.jar
-- vendor/jar-dependencies/org/logstash/plugins/input/http_bold/logstash-input-http_bold/3.5.0/logstash-input-http_bold-3.5.0.jar
-- vendor/jar-dependencies/org/logstash/plugins/input/http_bold/logstash-input-http_bold/3.6.0/logstash-input-http_bold-3.6.0.jar
+- vendor/jar-dependencies/org/logstash/plugins/input/http/logstash-input-http/3.4.1/logstash-input-http-3.4.1.jar
+- vendor/jar-dependencies/org/logstash/plugins/input/http/logstash-input-http/4.0.0/logstash-input-http-4.0.0.jar
+- vendor/jar-dependencies/org/logstash/plugins/input/http/logstash-input-http/4.0.1/logstash-input-http-4.0.1.jar
+- vendor/jar-dependencies/org/logstash/plugins/input/http/logstash-input-http/4.0.2/logstash-input-http-4.0.2.jar
+- vendor/jar-dependencies/org/logstash/plugins/input/http/logstash-input-http/4.0.3/logstash-input-http-4.0.3.jar
+- vendor/jar-dependencies/org/logstash/plugins/input/http_bold/logstash-input-http_bold/5.0.0/logstash-input-http_bold-5.0.0.jar
+- vendor/jar-dependencies/org/logstash/plugins/input/httpbold/logstash-input-httpbold/1.0.0/logstash-input-httpbold-1.0.0.jar
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)
@@ -191,4 +197,4 @@ signing_key:
 specification_version: 4
 summary: Receives events over HTTP or HTTPS
 test_files:
-- spec/inputs/http_bolspec.rb
+- spec/inputs/http_bold_spec.rb