logstash-input-tcp 6.0.3-java → 6.0.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 403704dc430009f35b036df09b638c613f345f33da52fbf750788b4e649760d6
-  data.tar.gz: c2443349ab82648037fcf4748cb4130f45e65bf3efadeec60db8e3124223c4e9
+  metadata.gz: 111b9d45b87f5cd47ca57f08c6888c6707e497a3ac684cd979e753c7bca0a36f
+  data.tar.gz: eb7fbb4e8f20b1ecebe0a0e6b0c6faa02a6658c2e84ff5499ebb874e696deaee
 SHA512:
-  metadata.gz: 1e26da0f4abe68fbbcbb62d148bee467bdc71494462a608929850dbdda2c67f3bc87fd7ea68cab6306e41cca567f752940631a6f2276c467c437412438c99142
-  data.tar.gz: f54efa720d20246c05c84b63b5477707b7d16659c57d5e684138485b0908cd94ea4b14ce553d56d5eefc08ec6796e5f81548c41c025d4ff4a330f5aae59434a5
+  metadata.gz: b1a9c7eb8a2cdfe98282aea08a466b4909f766ffb983a36ef7c614725e230ff627d8eff56f35e5bcbfdbc7379e58e2424a7faf10d0a444c79d2579c6a59cda90
+  data.tar.gz: ad6dda462743631fbbc51121bce2cf7c7fd1897553e2fb804af52b8c1cdd52625616c7802c19e2052b7c804c5c41cb7d2dfcc86c9a9894981fd241afa0d7cc7b

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 6.0.4
+  - Refactor: scope java_import to avoid polluting [#152](https://github.com/logstash-plugins/logstash-input-tcp/pull/152)
+
 ## 6.0.3
   - Skip empty lines while reading certificate files [#144](https://github.com/logstash-plugins/logstash-input-tcp/issues/144)
 
@@ -21,7 +24,7 @@
 
 ## 5.0.9
   - New configuration option to set TCP keep-alive [#16](https://github.com/logstash-plugins/logstash-input-tcp/pull/116)
-  
+
 ## 5.0.8
   - Reorder shut down of the two event loops to prevent RejectedExecutionException
 
@@ -57,7 +60,7 @@
 ## 4.2.2
   - Fixed regression causing incoming connection host ips being accidentally resolved to hostnames
   - Implemented plain socket server in a non-blocking way improving performance and fixing issues for use cases with a large number of concurrent connections
-  
+
 ## 4.2.1
   - Version yanked from RubyGems for accidental behaviour change causing unwanted reverse lookups on connections
 
@@ -87,7 +90,7 @@
  - New dependency requirements for logstash-core for the 5.0 release
 ## 3.0.2
  - Fixed a bug where previous connection would accidentally be closed when accepting new socket connection
- - Fixed an issue with log message which used a closed socket's peer address 
+ - Fixed an issue with log message which used a closed socket's peer address
 
 ## 3.0.1
  - properly convert sslsubject to string before assigning to event field, added specs, see https://github.com/logstash-plugins/logstash-input-tcp/pull/38

data/lib/logstash/inputs/tcp.rb

@@ -11,8 +11,6 @@ require "logstash/inputs/tcp/compat_ssl_options"
 require "socket"
 require "openssl"
 
-java_import org.logstash.tcp.InputLoop
-
 # Read events over a TCP socket.
 #
 # Like stdin and file inputs, each event is assumed to be one line of text.
@@ -23,7 +21,7 @@ java_import org.logstash.tcp.InputLoop
 # #### Accepting log4j2 logs
 #
 # Log4j2 can send JSON over a socket, and we can use that combined with our tcp
-# input to accept the logs. 
+# input to accept the logs.
 #
 # First, we need to configure your application to send logs in JSON over a
 # socket. The following log4j2.xml accomplishes this task.
@@ -62,6 +60,9 @@ java_import org.logstash.tcp.InputLoop
 #       }
 #     }
 class LogStash::Inputs::Tcp < LogStash::Inputs::Base
+
+  java_import org.logstash.tcp.InputLoop
+
   config_name "tcp"
 
   default :codec, "line"
@@ -261,7 +262,7 @@ class LogStash::Inputs::Tcp < LogStash::Inputs::Base
     decorate(event)
     @output_queue << event
   end
-  
+
   def server?
     @mode == "server"
   end

data/lib/logstash/inputs/tcp/compat_ssl_options.rb

@@ -1,22 +1,5 @@
 require 'openssl'
 
-java_import 'io.netty.handler.ssl.ClientAuth'
-java_import 'io.netty.handler.ssl.SslContextBuilder'
-java_import 'java.io.FileInputStream'
-java_import 'java.io.FileReader'
-java_import 'java.security.cert.CertificateFactory'
-java_import 'java.security.cert.X509Certificate'
-java_import 'org.bouncycastle.asn1.pkcs.PrivateKeyInfo'
-java_import 'org.bouncycastle.jce.provider.BouncyCastleProvider'
-java_import 'org.bouncycastle.openssl.PEMKeyPair'
-java_import 'org.bouncycastle.openssl.PEMParser'
-java_import 'org.bouncycastle.openssl.PEMEncryptedKeyPair'
-java_import 'org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter'
-java_import 'org.bouncycastle.openssl.jcajce.JcePEMDecryptorProviderBuilder'
-java_import 'org.bouncycastle.openssl.jcajce.JceOpenSSLPKCS8DecryptorProviderBuilder'
-java_import 'org.bouncycastle.pkcs.PKCS8EncryptedPrivateKeyInfo'
-
-
 # Simulate a normal SslOptions builder:
 #
 #     ssl_context = SslOptions.builder
@@ -29,6 +12,20 @@ java_import 'org.bouncycastle.pkcs.PKCS8EncryptedPrivateKeyInfo'
 #       .set_ssl_certificate_authorities(@ssl_certificate_authorities.to_java(:string))
 #       .build.toSslContext()
 class SslOptions
+
+  java_import 'io.netty.handler.ssl.ClientAuth'
+  java_import 'io.netty.handler.ssl.SslContextBuilder'
+  java_import 'java.security.cert.X509Certificate'
+  java_import 'org.bouncycastle.asn1.pkcs.PrivateKeyInfo'
+  java_import 'org.bouncycastle.jce.provider.BouncyCastleProvider'
+  java_import 'org.bouncycastle.openssl.PEMKeyPair'
+  java_import 'org.bouncycastle.openssl.PEMParser'
+  java_import 'org.bouncycastle.openssl.PEMEncryptedKeyPair'
+  java_import 'org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter'
+  java_import 'org.bouncycastle.openssl.jcajce.JcePEMDecryptorProviderBuilder'
+  java_import 'org.bouncycastle.openssl.jcajce.JceOpenSSLPKCS8DecryptorProviderBuilder'
+  java_import 'org.bouncycastle.pkcs.PKCS8EncryptedPrivateKeyInfo'
+
   def self.builder
     new
   end
@@ -74,14 +71,14 @@ class SslOptions
     return nil unless @ssl_enabled
 
     # create certificate object
-    cf = CertificateFactory.getInstance("X.509")
+    cf = java.security.cert.CertificateFactory.getInstance("X.509")
     cert_chain = []
     fetch_certificates_from_file(@ssl_cert_path, cf) do |cert|
       cert_chain << cert
     end
 
     # convert key from pkcs1 to pkcs8 and get PrivateKey object
-    pem_parser = PEMParser.new(FileReader.new(@ssl_key_path))
+    pem_parser = PEMParser.new(java.io.FileReader.new(@ssl_key_path))
     java.security.Security.addProvider(BouncyCastleProvider.new)
     converter = JcaPEMKeyConverter.new
     case obj = pem_parser.readObject

data/lib/logstash/inputs/tcp/decoder_impl.rb

@@ -1,11 +1,9 @@
 # encoding: utf-8
 require 'java'
 
-java_import org.logstash.tcp.Decoder
-
 class DecoderImpl
 
-  include Decoder
+  include org.logstash.tcp.Decoder
 
   def initialize(codec, tcp)
     @tcp = tcp

data/logstash-input-tcp.gemspec

@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'logstash-codec-multiline'
 
   s.add_development_dependency 'logstash-devutils'
+  s.add_development_dependency 'insist'
   s.add_development_dependency 'flores', '~> 0.0.6'
   s.add_development_dependency 'stud', '~> 0.0.22'
 end

data/spec/inputs/tcp_spec.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 require "logstash/devutils/rspec/spec_helper"
+require "insist"
+require "logstash/devutils/rspec/shared_examples"
 require "socket"
 require "timeout"
 require "logstash/json"

data/spec/spec_helper.rb

@@ -3,14 +3,17 @@ require "logstash/devutils/rspec/spec_helper"
 require "tempfile"
 require "stud/temporary"
 
-java_import 'org.bouncycastle.openssl.jcajce.JceOpenSSLPKCS8EncryptorBuilder'
-java_import 'org.bouncycastle.openssl.jcajce.JcaPEMWriter'
-java_import 'org.bouncycastle.openssl.jcajce.JcaPKCS8Generator'
-java_import 'org.bouncycastle.jce.provider.BouncyCastleProvider'
 # this has been taken from the udp input, it should be DRYed
 
 class TcpHelpers
 
+  java_import 'org.bouncycastle.openssl.PEMParser'
+  java_import 'org.bouncycastle.openssl.jcajce.JceOpenSSLPKCS8EncryptorBuilder'
+  java_import 'org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter'
+  java_import 'org.bouncycastle.openssl.jcajce.JcaPEMWriter'
+  java_import 'org.bouncycastle.openssl.jcajce.JcaPKCS8Generator'
+  java_import 'org.bouncycastle.jce.provider.BouncyCastleProvider'
+
   def self.pipelineless_input(plugin, size, &block)
     queue = Queue.new
     input_thread = Thread.new do

data/version

@@ -1 +1 @@
-6.0.3
+6.0.4

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-tcp
 version: !ruby/object:Gem::Version
-  version: 6.0.3
+  version: 6.0.4
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-06-05 00:00:00.000000000 Z
+date: 2020-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -114,6 +114,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: insist
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -164,7 +178,7 @@ files:
 - logstash-input-tcp.gemspec
 - spec/inputs/tcp_spec.rb
 - spec/spec_helper.rb
-- vendor/jar-dependencies/org/logstash/inputs/logstash-input-tcp/6.0.3/logstash-input-tcp-6.0.3.jar
+- vendor/jar-dependencies/org/logstash/inputs/logstash-input-tcp/6.0.4/logstash-input-tcp-6.0.4.jar
 - version
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses: