logstash-input-tcp 6.0.3-java → 6.0.4-java
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +6 -3
- data/lib/logstash/inputs/tcp.rb +5 -4
- data/lib/logstash/inputs/tcp/compat_ssl_options.rb +16 -19
- data/lib/logstash/inputs/tcp/decoder_impl.rb +1 -3
- data/logstash-input-tcp.gemspec +1 -0
- data/spec/inputs/tcp_spec.rb +2 -0
- data/spec/spec_helper.rb +7 -4
- data/vendor/jar-dependencies/org/logstash/inputs/logstash-input-tcp/{6.0.3/logstash-input-tcp-6.0.3.jar → 6.0.4/logstash-input-tcp-6.0.4.jar} +0 -0
- data/version +1 -1
- metadata +17 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 111b9d45b87f5cd47ca57f08c6888c6707e497a3ac684cd979e753c7bca0a36f
|
4
|
+
data.tar.gz: eb7fbb4e8f20b1ecebe0a0e6b0c6faa02a6658c2e84ff5499ebb874e696deaee
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: b1a9c7eb8a2cdfe98282aea08a466b4909f766ffb983a36ef7c614725e230ff627d8eff56f35e5bcbfdbc7379e58e2424a7faf10d0a444c79d2579c6a59cda90
|
7
|
+
data.tar.gz: ad6dda462743631fbbc51121bce2cf7c7fd1897553e2fb804af52b8c1cdd52625616c7802c19e2052b7c804c5c41cb7d2dfcc86c9a9894981fd241afa0d7cc7b
|
data/CHANGELOG.md
CHANGED
@@ -1,3 +1,6 @@
|
|
1
|
+
## 6.0.4
|
2
|
+
- Refactor: scope java_import to avoid polluting [#152](https://github.com/logstash-plugins/logstash-input-tcp/pull/152)
|
3
|
+
|
1
4
|
## 6.0.3
|
2
5
|
- Skip empty lines while reading certificate files [#144](https://github.com/logstash-plugins/logstash-input-tcp/issues/144)
|
3
6
|
|
@@ -21,7 +24,7 @@
|
|
21
24
|
|
22
25
|
## 5.0.9
|
23
26
|
- New configuration option to set TCP keep-alive [#16](https://github.com/logstash-plugins/logstash-input-tcp/pull/116)
|
24
|
-
|
27
|
+
|
25
28
|
## 5.0.8
|
26
29
|
- Reorder shut down of the two event loops to prevent RejectedExecutionException
|
27
30
|
|
@@ -57,7 +60,7 @@
|
|
57
60
|
## 4.2.2
|
58
61
|
- Fixed regression causing incoming connection host ips being accidentally resolved to hostnames
|
59
62
|
- Implemented plain socket server in a non-blocking way improving performance and fixing issues for use cases with a large number of concurrent connections
|
60
|
-
|
63
|
+
|
61
64
|
## 4.2.1
|
62
65
|
- Version yanked from RubyGems for accidental behaviour change causing unwanted reverse lookups on connections
|
63
66
|
|
@@ -87,7 +90,7 @@
|
|
87
90
|
- New dependency requirements for logstash-core for the 5.0 release
|
88
91
|
## 3.0.2
|
89
92
|
- Fixed a bug where previous connection would accidentally be closed when accepting new socket connection
|
90
|
-
- Fixed an issue with log message which used a closed socket's peer address
|
93
|
+
- Fixed an issue with log message which used a closed socket's peer address
|
91
94
|
|
92
95
|
## 3.0.1
|
93
96
|
- 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
CHANGED
@@ -11,8 +11,6 @@ require "logstash/inputs/tcp/compat_ssl_options"
|
|
11
11
|
require "socket"
|
12
12
|
require "openssl"
|
13
13
|
|
14
|
-
java_import org.logstash.tcp.InputLoop
|
15
|
-
|
16
14
|
# Read events over a TCP socket.
|
17
15
|
#
|
18
16
|
# 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
|
|
23
21
|
# #### Accepting log4j2 logs
|
24
22
|
#
|
25
23
|
# Log4j2 can send JSON over a socket, and we can use that combined with our tcp
|
26
|
-
# input to accept the logs.
|
24
|
+
# input to accept the logs.
|
27
25
|
#
|
28
26
|
# First, we need to configure your application to send logs in JSON over a
|
29
27
|
# socket. The following log4j2.xml accomplishes this task.
|
@@ -62,6 +60,9 @@ java_import org.logstash.tcp.InputLoop
|
|
62
60
|
# }
|
63
61
|
# }
|
64
62
|
class LogStash::Inputs::Tcp < LogStash::Inputs::Base
|
63
|
+
|
64
|
+
java_import org.logstash.tcp.InputLoop
|
65
|
+
|
65
66
|
config_name "tcp"
|
66
67
|
|
67
68
|
default :codec, "line"
|
@@ -261,7 +262,7 @@ class LogStash::Inputs::Tcp < LogStash::Inputs::Base
|
|
261
262
|
decorate(event)
|
262
263
|
@output_queue << event
|
263
264
|
end
|
264
|
-
|
265
|
+
|
265
266
|
def server?
|
266
267
|
@mode == "server"
|
267
268
|
end
|
@@ -1,22 +1,5 @@
|
|
1
1
|
require 'openssl'
|
2
2
|
|
3
|
-
java_import 'io.netty.handler.ssl.ClientAuth'
|
4
|
-
java_import 'io.netty.handler.ssl.SslContextBuilder'
|
5
|
-
java_import 'java.io.FileInputStream'
|
6
|
-
java_import 'java.io.FileReader'
|
7
|
-
java_import 'java.security.cert.CertificateFactory'
|
8
|
-
java_import 'java.security.cert.X509Certificate'
|
9
|
-
java_import 'org.bouncycastle.asn1.pkcs.PrivateKeyInfo'
|
10
|
-
java_import 'org.bouncycastle.jce.provider.BouncyCastleProvider'
|
11
|
-
java_import 'org.bouncycastle.openssl.PEMKeyPair'
|
12
|
-
java_import 'org.bouncycastle.openssl.PEMParser'
|
13
|
-
java_import 'org.bouncycastle.openssl.PEMEncryptedKeyPair'
|
14
|
-
java_import 'org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter'
|
15
|
-
java_import 'org.bouncycastle.openssl.jcajce.JcePEMDecryptorProviderBuilder'
|
16
|
-
java_import 'org.bouncycastle.openssl.jcajce.JceOpenSSLPKCS8DecryptorProviderBuilder'
|
17
|
-
java_import 'org.bouncycastle.pkcs.PKCS8EncryptedPrivateKeyInfo'
|
18
|
-
|
19
|
-
|
20
3
|
# Simulate a normal SslOptions builder:
|
21
4
|
#
|
22
5
|
# ssl_context = SslOptions.builder
|
@@ -29,6 +12,20 @@ java_import 'org.bouncycastle.pkcs.PKCS8EncryptedPrivateKeyInfo'
|
|
29
12
|
# .set_ssl_certificate_authorities(@ssl_certificate_authorities.to_java(:string))
|
30
13
|
# .build.toSslContext()
|
31
14
|
class SslOptions
|
15
|
+
|
16
|
+
java_import 'io.netty.handler.ssl.ClientAuth'
|
17
|
+
java_import 'io.netty.handler.ssl.SslContextBuilder'
|
18
|
+
java_import 'java.security.cert.X509Certificate'
|
19
|
+
java_import 'org.bouncycastle.asn1.pkcs.PrivateKeyInfo'
|
20
|
+
java_import 'org.bouncycastle.jce.provider.BouncyCastleProvider'
|
21
|
+
java_import 'org.bouncycastle.openssl.PEMKeyPair'
|
22
|
+
java_import 'org.bouncycastle.openssl.PEMParser'
|
23
|
+
java_import 'org.bouncycastle.openssl.PEMEncryptedKeyPair'
|
24
|
+
java_import 'org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter'
|
25
|
+
java_import 'org.bouncycastle.openssl.jcajce.JcePEMDecryptorProviderBuilder'
|
26
|
+
java_import 'org.bouncycastle.openssl.jcajce.JceOpenSSLPKCS8DecryptorProviderBuilder'
|
27
|
+
java_import 'org.bouncycastle.pkcs.PKCS8EncryptedPrivateKeyInfo'
|
28
|
+
|
32
29
|
def self.builder
|
33
30
|
new
|
34
31
|
end
|
@@ -74,14 +71,14 @@ class SslOptions
|
|
74
71
|
return nil unless @ssl_enabled
|
75
72
|
|
76
73
|
# create certificate object
|
77
|
-
cf = CertificateFactory.getInstance("X.509")
|
74
|
+
cf = java.security.cert.CertificateFactory.getInstance("X.509")
|
78
75
|
cert_chain = []
|
79
76
|
fetch_certificates_from_file(@ssl_cert_path, cf) do |cert|
|
80
77
|
cert_chain << cert
|
81
78
|
end
|
82
79
|
|
83
80
|
# convert key from pkcs1 to pkcs8 and get PrivateKey object
|
84
|
-
pem_parser = PEMParser.new(FileReader.new(@ssl_key_path))
|
81
|
+
pem_parser = PEMParser.new(java.io.FileReader.new(@ssl_key_path))
|
85
82
|
java.security.Security.addProvider(BouncyCastleProvider.new)
|
86
83
|
converter = JcaPEMKeyConverter.new
|
87
84
|
case obj = pem_parser.readObject
|
data/logstash-input-tcp.gemspec
CHANGED
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
|
|
32
32
|
s.add_runtime_dependency 'logstash-codec-multiline'
|
33
33
|
|
34
34
|
s.add_development_dependency 'logstash-devutils'
|
35
|
+
s.add_development_dependency 'insist'
|
35
36
|
s.add_development_dependency 'flores', '~> 0.0.6'
|
36
37
|
s.add_development_dependency 'stud', '~> 0.0.22'
|
37
38
|
end
|
data/spec/inputs/tcp_spec.rb
CHANGED
data/spec/spec_helper.rb
CHANGED
@@ -3,14 +3,17 @@ require "logstash/devutils/rspec/spec_helper"
|
|
3
3
|
require "tempfile"
|
4
4
|
require "stud/temporary"
|
5
5
|
|
6
|
-
java_import 'org.bouncycastle.openssl.jcajce.JceOpenSSLPKCS8EncryptorBuilder'
|
7
|
-
java_import 'org.bouncycastle.openssl.jcajce.JcaPEMWriter'
|
8
|
-
java_import 'org.bouncycastle.openssl.jcajce.JcaPKCS8Generator'
|
9
|
-
java_import 'org.bouncycastle.jce.provider.BouncyCastleProvider'
|
10
6
|
# this has been taken from the udp input, it should be DRYed
|
11
7
|
|
12
8
|
class TcpHelpers
|
13
9
|
|
10
|
+
java_import 'org.bouncycastle.openssl.PEMParser'
|
11
|
+
java_import 'org.bouncycastle.openssl.jcajce.JceOpenSSLPKCS8EncryptorBuilder'
|
12
|
+
java_import 'org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter'
|
13
|
+
java_import 'org.bouncycastle.openssl.jcajce.JcaPEMWriter'
|
14
|
+
java_import 'org.bouncycastle.openssl.jcajce.JcaPKCS8Generator'
|
15
|
+
java_import 'org.bouncycastle.jce.provider.BouncyCastleProvider'
|
16
|
+
|
14
17
|
def self.pipelineless_input(plugin, size, &block)
|
15
18
|
queue = Queue.new
|
16
19
|
input_thread = Thread.new do
|
Binary file
|
data/version
CHANGED
@@ -1 +1 @@
|
|
1
|
-
6.0.
|
1
|
+
6.0.4
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: logstash-input-tcp
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 6.0.
|
4
|
+
version: 6.0.4
|
5
5
|
platform: java
|
6
6
|
authors:
|
7
7
|
- Elastic
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2020-03-16 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
requirement: !ruby/object:Gem::Requirement
|
@@ -114,6 +114,20 @@ dependencies:
|
|
114
114
|
- - ">="
|
115
115
|
- !ruby/object:Gem::Version
|
116
116
|
version: '0'
|
117
|
+
- !ruby/object:Gem::Dependency
|
118
|
+
requirement: !ruby/object:Gem::Requirement
|
119
|
+
requirements:
|
120
|
+
- - ">="
|
121
|
+
- !ruby/object:Gem::Version
|
122
|
+
version: '0'
|
123
|
+
name: insist
|
124
|
+
prerelease: false
|
125
|
+
type: :development
|
126
|
+
version_requirements: !ruby/object:Gem::Requirement
|
127
|
+
requirements:
|
128
|
+
- - ">="
|
129
|
+
- !ruby/object:Gem::Version
|
130
|
+
version: '0'
|
117
131
|
- !ruby/object:Gem::Dependency
|
118
132
|
requirement: !ruby/object:Gem::Requirement
|
119
133
|
requirements:
|
@@ -164,7 +178,7 @@ files:
|
|
164
178
|
- logstash-input-tcp.gemspec
|
165
179
|
- spec/inputs/tcp_spec.rb
|
166
180
|
- spec/spec_helper.rb
|
167
|
-
- vendor/jar-dependencies/org/logstash/inputs/logstash-input-tcp/6.0.
|
181
|
+
- vendor/jar-dependencies/org/logstash/inputs/logstash-input-tcp/6.0.4/logstash-input-tcp-6.0.4.jar
|
168
182
|
- version
|
169
183
|
homepage: http://www.elastic.co/guide/en/logstash/current/index.html
|
170
184
|
licenses:
|