logstash-input-tcp 6.4.7-java → 7.0.0-java
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +7 -8
- data/docs/index.asciidoc +19 -31
- data/lib/logstash/inputs/tcp.rb +8 -41
- data/lib/logstash-input-tcp_jars.rb +7 -7
- data/logstash-input-tcp.gemspec +1 -2
- data/spec/inputs/tcp_spec.rb +20 -76
- data/vendor/jar-dependencies/io/netty/netty-buffer/{4.1.126.Final/netty-buffer-4.1.126.Final.jar → 4.1.115.Final/netty-buffer-4.1.115.Final.jar} +0 -0
- data/vendor/jar-dependencies/io/netty/netty-codec/{4.1.126.Final/netty-codec-4.1.126.Final.jar → 4.1.115.Final/netty-codec-4.1.115.Final.jar} +0 -0
- data/vendor/jar-dependencies/io/netty/netty-common/{4.1.126.Final/netty-common-4.1.126.Final.jar → 4.1.115.Final/netty-common-4.1.115.Final.jar} +0 -0
- data/vendor/jar-dependencies/io/netty/netty-handler/{4.1.126.Final/netty-handler-4.1.126.Final.jar → 4.1.115.Final/netty-handler-4.1.115.Final.jar} +0 -0
- data/vendor/jar-dependencies/io/netty/netty-transport/{4.1.126.Final/netty-transport-4.1.126.Final.jar → 4.1.115.Final/netty-transport-4.1.115.Final.jar} +0 -0
- data/vendor/jar-dependencies/io/netty/netty-transport-native-unix-common/{4.1.126.Final/netty-transport-native-unix-common-4.1.126.Final.jar → 4.1.115.Final/netty-transport-native-unix-common-4.1.115.Final.jar} +0 -0
- data/vendor/jar-dependencies/org/logstash/inputs/logstash-input-tcp/7.0.0/logstash-input-tcp-7.0.0.jar +0 -0
- data/version +1 -1
- metadata +10 -24
- data/vendor/jar-dependencies/org/logstash/inputs/logstash-input-tcp/6.4.7/logstash-input-tcp-6.4.7.jar +0 -0
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: c8bc68458ba90d33f5f007625f68bbe9a1807a18c2c7d197aa75ed5092e1cc55
|
4
|
+
data.tar.gz: 0aa68f080ab88ad648bd9a19455bc495cdcbb1dbcab3b34e27d14e496ec5b3f9
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 0ab15b83290d8dd586523d0a83a5a49741f2f9050851e8f86d04a2441ecf1b767467fecbd8372e8d7a67454b3f6cbcbcd2890790ba875914790d10e00bea5f92
|
7
|
+
data.tar.gz: e87be82c1979de3b29a4ad66d7c022a6cad29327d6ec660b835908d69d7abf5284af027a7194d2103e3c180d836f9f9039cc9b17f3e96046101012dac2a5a86a
|
data/CHANGELOG.md
CHANGED
@@ -1,11 +1,10 @@
|
|
1
|
-
##
|
2
|
-
-
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
- Name netty threads with plugin id and their purpose [229](https://github.com/logstash-plugins/logstash-input-tcp/pull/229)
|
1
|
+
## 7.0.0
|
2
|
+
- SSL settings that were marked deprecated in version `6.4.0` are now marked obsolete, and will prevent the plugin from starting.
|
3
|
+
- These settings are:
|
4
|
+
- `ssl_cert`, which should be replaced by `ssl_certificate`
|
5
|
+
- `ssl_enable`, which should be replaced by `ssl_enabled`
|
6
|
+
- `ssl_verify`, which should be replaced by `ssl_client_authentication` when `mode` is `server` or `ssl_verification_mode`when mode is `client`
|
7
|
+
- [228](https://github.com/logstash-plugins/logstash-input-tcp/pull/228)
|
9
8
|
|
10
9
|
## 6.4.4
|
11
10
|
- update netty to 4.1.115 [#227](https://github.com/logstash-plugins/logstash-input-tcp/pull/227)
|
data/docs/index.asciidoc
CHANGED
@@ -121,6 +121,10 @@ filter {
|
|
121
121
|
|
122
122
|
This plugin supports the following configuration options plus the <<plugins-{type}s-{plugin}-common-options>> described later.
|
123
123
|
|
124
|
+
NOTE: As of version `7.0.0` of this plugin, a number of previously deprecated settings related to SSL have been removed. Please see the
|
125
|
+
<<plugins-{type}s-{plugin}-obsolete-options>> for more details.
|
126
|
+
|
127
|
+
|
124
128
|
[cols="<,<,<",options="header",]
|
125
129
|
|=======================================================================
|
126
130
|
|Setting |Input type|Required
|
@@ -130,19 +134,16 @@ This plugin supports the following configuration options plus the <<plugins-{typ
|
|
130
134
|
| <<plugins-{type}s-{plugin}-mode>> |<<string,string>>, one of `["server", "client"]`|No
|
131
135
|
| <<plugins-{type}s-{plugin}-port>> |<<number,number>>|Yes
|
132
136
|
| <<plugins-{type}s-{plugin}-proxy_protocol>> |<<boolean,boolean>>|No
|
133
|
-
| <<plugins-{type}s-{plugin}-ssl_cert>> |a valid filesystem path|__Deprecated__
|
134
137
|
| <<plugins-{type}s-{plugin}-ssl_certificate>> |a valid filesystem path|No
|
135
138
|
| <<plugins-{type}s-{plugin}-ssl_certificate_authorities>> |<<array,array>>|No
|
136
139
|
| <<plugins-{type}s-{plugin}-ssl_cipher_suites>> |<<string,string>>|No
|
137
140
|
| <<plugins-{type}s-{plugin}-ssl_client_authentication>> |<<string,string>>, one of `["none", "optional", "required"]`|No
|
138
|
-
| <<plugins-{type}s-{plugin}-ssl_enable>> |<<boolean,boolean>>|__Deprecated__
|
139
141
|
| <<plugins-{type}s-{plugin}-ssl_enabled>> |<<boolean,boolean>>|No
|
140
142
|
| <<plugins-{type}s-{plugin}-ssl_extra_chain_certs>> |<<array,array>>|No
|
141
143
|
| <<plugins-{type}s-{plugin}-ssl_key>> |a valid filesystem path|No
|
142
144
|
| <<plugins-{type}s-{plugin}-ssl_key_passphrase>> |<<password,password>>|No
|
143
145
|
| <<plugins-{type}s-{plugin}-ssl_supported_protocols>> |<<string,string>>|No
|
144
146
|
| <<plugins-{type}s-{plugin}-ssl_verification_mode>> |<<string,string>>, one of `["full", "none"]`|No
|
145
|
-
| <<plugins-{type}s-{plugin}-ssl_verify>> |<<boolean,boolean>>|__Deprecated__
|
146
147
|
| <<plugins-{type}s-{plugin}-tcp_keep_alive>> |<<boolean,boolean>>|No
|
147
148
|
|=======================================================================
|
148
149
|
|
@@ -212,16 +213,6 @@ When mode is `client`, the port to connect to.
|
|
212
213
|
Proxy protocol support, only v1 is supported at this time
|
213
214
|
http://www.haproxy.org/download/1.5/doc/proxy-protocol.txt
|
214
215
|
|
215
|
-
[id="plugins-{type}s-{plugin}-ssl_cert"]
|
216
|
-
===== `ssl_cert`
|
217
|
-
deprecated[6.4.0, Replaced by <<plugins-{type}s-{plugin}-ssl_certificate>>]
|
218
|
-
|
219
|
-
* Value type is <<path,path>>
|
220
|
-
* There is no default value for this setting.
|
221
|
-
|
222
|
-
Path to certificate in PEM format. This certificate will be presented
|
223
|
-
to the connecting clients.
|
224
|
-
|
225
216
|
[id="plugins-{type}s-{plugin}-ssl_certificate"]
|
226
217
|
===== `ssl_certificate`
|
227
218
|
|
@@ -268,14 +259,6 @@ Please note that the server does not validate the client certificate CN (Common
|
|
268
259
|
|
269
260
|
NOTE: This setting can be used only if <<plugins-{type}s-{plugin}-mode>> is `server` and <<plugins-{type}s-{plugin}-ssl_certificate_authorities>> is set.
|
270
261
|
|
271
|
-
[id="plugins-{type}s-{plugin}-ssl_enable"]
|
272
|
-
===== `ssl_enable`
|
273
|
-
deprecated[6.4.0, Replaced by <<plugins-{type}s-{plugin}-ssl_enabled>>]
|
274
|
-
|
275
|
-
* Value type is <<boolean,boolean>>
|
276
|
-
* Default value is `false`
|
277
|
-
|
278
|
-
Enable SSL (must be set for other `ssl_` options to take effect).
|
279
262
|
|
280
263
|
[id="plugins-{type}s-{plugin}-ssl_enabled"]
|
281
264
|
===== `ssl_enabled`
|
@@ -343,16 +326,6 @@ This setting can be used only if <<plugins-{type}s-{plugin}-mode>> is `client`.
|
|
343
326
|
|
344
327
|
WARNING: Setting certificate verification to `none` disables many security benefits of SSL/TLS, which is very dangerous. For more information on disabling certificate verification please read https://www.cs.utexas.edu/~shmat/shmat_ccs12.pdf
|
345
328
|
|
346
|
-
[id="plugins-{type}s-{plugin}-ssl_verify"]
|
347
|
-
===== `ssl_verify`
|
348
|
-
deprecated[6.4.0, Replaced by <<plugins-{type}s-{plugin}-ssl_client_authentication>> and <<plugins-{type}s-{plugin}-ssl_verification_mode>>]
|
349
|
-
|
350
|
-
* Value type is <<boolean,boolean>>
|
351
|
-
* Default value is `true`
|
352
|
-
|
353
|
-
Verify the identity of the other end of the SSL connection against the CA.
|
354
|
-
For input, sets the field `sslsubject` to that of the client certificate.
|
355
|
-
|
356
329
|
[id="plugins-{type}s-{plugin}-tcp_keep_alive"]
|
357
330
|
===== `tcp_keep_alive`
|
358
331
|
|
@@ -363,6 +336,21 @@ Instruct the socket to use TCP keep alive. If it's `true` then the underlying so
|
|
363
336
|
will use the OS defaults settings for keep alive. If it's `false` it doesn't configure any
|
364
337
|
keep alive setting for the underlying socket.
|
365
338
|
|
339
|
+
[id="plugins-{type}s-{plugin}-obsolete-options"]
|
340
|
+
==== TCP Input Obsolete Configuration Options
|
341
|
+
|
342
|
+
WARNING: As of version `7.0.0` of this plugin, some configuration options have been replaced.
|
343
|
+
The plugin will fail to start if it contains any of these obsolete options.
|
344
|
+
|
345
|
+
|
346
|
+
[cols="<,<",options="header",]
|
347
|
+
|=======================================================================
|
348
|
+
|Setting|Replaced by
|
349
|
+
| ssl_cert |<<plugins-{type}s-{plugin}-ssl_certificate>>
|
350
|
+
| ssl_enable |<<plugins-{type}s-{plugin}-ssl_enabled>>
|
351
|
+
| ssl_verify |<<plugins-{type}s-{plugin}-ssl_client_authentication>> in `server` mode and <<plugins-{type}s-{plugin}-ssl_verification_mode>> in `client` mode
|
352
|
+
|=======================================================================
|
353
|
+
|
366
354
|
|
367
355
|
[id="plugins-{type}s-{plugin}-common-options"]
|
368
356
|
include::{include_path}/{type}.asciidoc[]
|
data/lib/logstash/inputs/tcp.rb
CHANGED
@@ -6,7 +6,6 @@ require "logstash/inputs/base"
|
|
6
6
|
require "logstash/util/socket_peer"
|
7
7
|
require "logstash-input-tcp_jars"
|
8
8
|
require 'logstash/plugin_mixins/ecs_compatibility_support'
|
9
|
-
require "logstash/plugin_mixins/normalize_config_support"
|
10
9
|
|
11
10
|
require "socket"
|
12
11
|
require "openssl"
|
@@ -69,8 +68,6 @@ class LogStash::Inputs::Tcp < LogStash::Inputs::Base
|
|
69
68
|
# ecs_compatibility option, provided by Logstash core or the support adapter.
|
70
69
|
include LogStash::PluginMixins::ECSCompatibilitySupport(:disabled, :v1, :v8 => :v1)
|
71
70
|
|
72
|
-
include LogStash::PluginMixins::NormalizeConfigSupport
|
73
|
-
|
74
71
|
config_name "tcp"
|
75
72
|
|
76
73
|
default :codec, "line"
|
@@ -91,8 +88,6 @@ class LogStash::Inputs::Tcp < LogStash::Inputs::Base
|
|
91
88
|
# http://www.haproxy.org/download/1.5/doc/proxy-protocol.txt
|
92
89
|
config :proxy_protocol, :validate => :boolean, :default => false
|
93
90
|
|
94
|
-
# Enable SSL (must be set for other `ssl_` options to take effect).
|
95
|
-
config :ssl_enable, :validate => :boolean, :default => false, :deprecated => "Use 'ssl_enabled' instead."
|
96
91
|
|
97
92
|
# Enable SSL (must be set for other `ssl_` options to take effect).
|
98
93
|
config :ssl_enabled, :validate => :boolean, :default => false
|
@@ -104,9 +99,6 @@ class LogStash::Inputs::Tcp < LogStash::Inputs::Base
|
|
104
99
|
# This option needs to be used with `ssl_certificate_authorities` and a defined list of CAs.
|
105
100
|
config :ssl_client_authentication, :validate => %w[none optional required], :default => 'required'
|
106
101
|
|
107
|
-
# Verify the identity of the other end of the SSL connection against the CA.
|
108
|
-
# For input, sets the field `sslsubject` to that of the client certificate.
|
109
|
-
config :ssl_verify, :validate => :boolean, :default => true, :deprecated => "Use 'ssl_client_authentication' when mode is 'server' or 'ssl_verification_mode' when mode is 'client'"
|
110
102
|
|
111
103
|
# Options to verify the server's certificate.
|
112
104
|
# "full": validates that the provided certificate has an issue date that’s within the not_before and not_after dates;
|
@@ -116,8 +108,6 @@ class LogStash::Inputs::Tcp < LogStash::Inputs::Base
|
|
116
108
|
config :ssl_verification_mode, :validate => %w[full none], :default => 'full'
|
117
109
|
|
118
110
|
# SSL certificate path
|
119
|
-
config :ssl_cert, :validate => :path, :deprecated => "Use 'ssl_certificate' instead."
|
120
|
-
|
121
111
|
# SSL certificate path
|
122
112
|
config :ssl_certificate, :validate => :path
|
123
113
|
|
@@ -148,6 +138,13 @@ class LogStash::Inputs::Tcp < LogStash::Inputs::Base
|
|
148
138
|
# Option to allow users to avoid DNS Reverse Lookup.
|
149
139
|
config :dns_reverse_lookup_enabled, :validate => :boolean, :default => true
|
150
140
|
|
141
|
+
# Obsolete SSL Settings
|
142
|
+
config :ssl_enable, :obsolete => "Use 'ssl_enabled' instead."
|
143
|
+
config :ssl_verify, :obsolete => "Use 'ssl_client_authentication' when mode is 'server' or 'ssl_verification_mode' when mode is 'client'"
|
144
|
+
config :ssl_cert, :obsolete => "Use 'ssl_certificate' instead."
|
145
|
+
|
146
|
+
|
147
|
+
|
151
148
|
# Monkey patch TCPSocket and SSLSocket to include socket peer
|
152
149
|
# @private
|
153
150
|
def self.patch_socket_peer!
|
@@ -163,7 +160,6 @@ class LogStash::Inputs::Tcp < LogStash::Inputs::Base
|
|
163
160
|
super(*args)
|
164
161
|
|
165
162
|
setup_fields!
|
166
|
-
setup_ssl_params!
|
167
163
|
|
168
164
|
self.class.patch_socket_peer!
|
169
165
|
|
@@ -181,7 +177,7 @@ class LogStash::Inputs::Tcp < LogStash::Inputs::Base
|
|
181
177
|
validate_ssl_config!
|
182
178
|
|
183
179
|
if server?
|
184
|
-
@loop = InputLoop.new(@
|
180
|
+
@loop = InputLoop.new(@host, @port, DecoderImpl.new(@codec, self), @tcp_keep_alive, java_ssl_context)
|
185
181
|
end
|
186
182
|
end
|
187
183
|
|
@@ -368,35 +364,6 @@ class LogStash::Inputs::Tcp < LogStash::Inputs::Base
|
|
368
364
|
original_params.include?('ssl_enable') ? 'ssl_enable' : 'ssl_enabled'
|
369
365
|
end
|
370
366
|
|
371
|
-
def setup_ssl_params!
|
372
|
-
@ssl_enabled = normalize_config(:ssl_enabled) do |normalizer|
|
373
|
-
normalizer.with_deprecated_alias(:ssl_enable)
|
374
|
-
end
|
375
|
-
|
376
|
-
@ssl_certificate = normalize_config(:ssl_certificate) do |normalizer|
|
377
|
-
normalizer.with_deprecated_alias(:ssl_cert)
|
378
|
-
end
|
379
|
-
|
380
|
-
if server?
|
381
|
-
@ssl_client_authentication = normalize_config(:ssl_client_authentication) do |normalizer|
|
382
|
-
normalizer.with_deprecated_mapping(:ssl_verify) do |ssl_verify|
|
383
|
-
ssl_verify == true ? "required" : "none"
|
384
|
-
end
|
385
|
-
end
|
386
|
-
else
|
387
|
-
@ssl_verification_mode = normalize_config(:ssl_verification_mode) do |normalize|
|
388
|
-
normalize.with_deprecated_mapping(:ssl_verify) do |ssl_verify|
|
389
|
-
ssl_verify == true ? "full" : "none"
|
390
|
-
end
|
391
|
-
end
|
392
|
-
end
|
393
|
-
|
394
|
-
params['ssl_enabled'] = @ssl_enabled unless @ssl_enabled.nil?
|
395
|
-
params['ssl_certificate'] = @ssl_certificate unless @ssl_certificate.nil?
|
396
|
-
params['ssl_verification_mode'] = @ssl_verification_mode unless @ssl_verification_mode.nil?
|
397
|
-
params['ssl_client_authentication'] = @ssl_client_authentication unless @ssl_client_authentication.nil?
|
398
|
-
end
|
399
|
-
|
400
367
|
def server?
|
401
368
|
@mode == "server"
|
402
369
|
end
|
@@ -1,12 +1,12 @@
|
|
1
1
|
# AUTOGENERATED BY THE GRADLE SCRIPT. DO NOT EDIT.
|
2
2
|
|
3
3
|
require 'jar_dependencies'
|
4
|
-
require_jar('io.netty', 'netty-buffer', '4.1.
|
5
|
-
require_jar('io.netty', 'netty-codec', '4.1.
|
6
|
-
require_jar('io.netty', 'netty-common', '4.1.
|
7
|
-
require_jar('io.netty', 'netty-transport', '4.1.
|
8
|
-
require_jar('io.netty', 'netty-handler', '4.1.
|
9
|
-
require_jar('io.netty', 'netty-transport-native-unix-common', '4.1.
|
4
|
+
require_jar('io.netty', 'netty-buffer', '4.1.115.Final')
|
5
|
+
require_jar('io.netty', 'netty-codec', '4.1.115.Final')
|
6
|
+
require_jar('io.netty', 'netty-common', '4.1.115.Final')
|
7
|
+
require_jar('io.netty', 'netty-transport', '4.1.115.Final')
|
8
|
+
require_jar('io.netty', 'netty-handler', '4.1.115.Final')
|
9
|
+
require_jar('io.netty', 'netty-transport-native-unix-common', '4.1.115.Final')
|
10
10
|
require_jar('commons-io', 'commons-io', '2.17.0')
|
11
11
|
|
12
|
-
require_jar('org.logstash.inputs', 'logstash-input-tcp', '
|
12
|
+
require_jar('org.logstash.inputs', 'logstash-input-tcp', '7.0.0')
|
data/logstash-input-tcp.gemspec
CHANGED
@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
|
|
6
6
|
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"
|
7
7
|
s.authors = ["Elastic"]
|
8
8
|
s.email = 'info@elastic.co'
|
9
|
-
s.homepage = "
|
9
|
+
s.homepage = "http://www.elastic.co/guide/en/logstash/current/index.html"
|
10
10
|
s.platform = "java"
|
11
11
|
s.require_paths = ["lib", "vendor/jar-dependencies"]
|
12
12
|
|
@@ -22,7 +22,6 @@ Gem::Specification.new do |s|
|
|
22
22
|
# Gem dependencies
|
23
23
|
s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
|
24
24
|
s.add_runtime_dependency 'logstash-mixin-ecs_compatibility_support', '~>1.2'
|
25
|
-
s.add_runtime_dependency 'logstash-mixin-normalize_config_support', '~>1.0'
|
26
25
|
|
27
26
|
s.add_runtime_dependency 'logstash-core', '>= 8.1.0'
|
28
27
|
|
data/spec/inputs/tcp_spec.rb
CHANGED
@@ -54,6 +54,25 @@ describe LogStash::Inputs::Tcp, :ecs_compatibility_support do
|
|
54
54
|
end
|
55
55
|
end
|
56
56
|
|
57
|
+
['client', 'server'].each do | mode|
|
58
|
+
describe "handling obsolete settings for #{mode} mode" do
|
59
|
+
[{:name => 'ssl_cert', :replacement => 'ssl_certificate', :sample_value => "certificate_path"},
|
60
|
+
{:name => 'ssl_enable', :replacement => 'ssl_enabled', :sample_value => true},
|
61
|
+
{:name => 'ssl_verify', :replacement => 'ssl_client_authentication', :sample_value => 'peer'}].each do | obsolete_setting |
|
62
|
+
context "with obsolete #{obsolete_setting[:name]}" do
|
63
|
+
let(:config) { { "mode" => mode, "port" => port } }
|
64
|
+
let (:deprecated_config) do
|
65
|
+
config.merge({obsolete_setting[:name] => obsolete_setting[:sample_value]})
|
66
|
+
end
|
67
|
+
|
68
|
+
it "should raise a config error with the appropriate message" do
|
69
|
+
expect { LogStash::Inputs::Tcp.new(deprecated_config).register }.to raise_error LogStash::ConfigurationError, /The setting `#{obsolete_setting[:name]}` in plugin `tcp` is obsolete and is no longer available. Use '#{obsolete_setting[:replacement]}'/i
|
70
|
+
end
|
71
|
+
end
|
72
|
+
end
|
73
|
+
end
|
74
|
+
end
|
75
|
+
|
57
76
|
ecs_compatibility_matrix(:disabled,:v1, :v8 => :v1) do |ecs_select|
|
58
77
|
before(:each) do
|
59
78
|
allow_any_instance_of(described_class).to receive(:ecs_compatibility).and_return(ecs_compatibility)
|
@@ -602,17 +621,6 @@ describe LogStash::Inputs::Tcp, :ecs_compatibility_support do
|
|
602
621
|
end
|
603
622
|
end
|
604
623
|
|
605
|
-
context "with deprecated ssl_verify = true and no ssl_certificate_authorities" do
|
606
|
-
let(:config) { super().merge(
|
607
|
-
'ssl_verify' => true,
|
608
|
-
'ssl_certificate_authorities' => []
|
609
|
-
) }
|
610
|
-
|
611
|
-
it "should register without errors" do
|
612
|
-
expect { subject.register }.to_not raise_error
|
613
|
-
end
|
614
|
-
end
|
615
|
-
|
616
624
|
%w[required optional].each do |ssl_client_authentication|
|
617
625
|
context "with ssl_client_authentication = `#{ssl_client_authentication}` and no ssl_certificate_authorities" do
|
618
626
|
let(:config) { super().merge(
|
@@ -636,70 +644,6 @@ describe LogStash::Inputs::Tcp, :ecs_compatibility_support do
|
|
636
644
|
end
|
637
645
|
end
|
638
646
|
end
|
639
|
-
|
640
|
-
context "with deprecated settings" do
|
641
|
-
let(:ssl_verify) { true }
|
642
|
-
let(:certificate_path) { File.expand_path('../fixtures/small.crt', File.dirname(__FILE__)) }
|
643
|
-
let(:config) do
|
644
|
-
{
|
645
|
-
"host" => "127.0.0.1",
|
646
|
-
"port" => port,
|
647
|
-
"ssl_enable" => true,
|
648
|
-
"ssl_cert" => certificate_path,
|
649
|
-
"ssl_key" => File.expand_path('../fixtures/small.key', File.dirname(__FILE__)),
|
650
|
-
"ssl_verify" => ssl_verify
|
651
|
-
}
|
652
|
-
end
|
653
|
-
|
654
|
-
context "and mode is server" do
|
655
|
-
let(:config) { super().merge("mode" => 'server') }
|
656
|
-
[true, false].each do |verify|
|
657
|
-
context "and ssl_verify is #{verify}" do
|
658
|
-
let(:ssl_verify) { verify }
|
659
|
-
|
660
|
-
it "should set new configs params" do
|
661
|
-
subject.register
|
662
|
-
expect(subject.params).to match hash_including(
|
663
|
-
"ssl_enabled" => true,
|
664
|
-
"ssl_certificate" => certificate_path,
|
665
|
-
"ssl_client_authentication" => verify ? 'required' : 'none')
|
666
|
-
end
|
667
|
-
|
668
|
-
it "should set new configs variables" do
|
669
|
-
subject.register
|
670
|
-
expect(subject.instance_variable_get(:@ssl_enabled)).to eql(true)
|
671
|
-
expect(subject.instance_variable_get(:@ssl_client_authentication)).to eql(verify ? 'required' : 'none')
|
672
|
-
expect(subject.instance_variable_get(:@ssl_certificate)).to eql(certificate_path)
|
673
|
-
end
|
674
|
-
end
|
675
|
-
end
|
676
|
-
end
|
677
|
-
|
678
|
-
context "and mode is client" do
|
679
|
-
let(:config) { super().merge("mode" => 'client') }
|
680
|
-
[true, false].each do |verify|
|
681
|
-
context "and ssl_verify is #{verify}" do
|
682
|
-
let(:ssl_verify) { verify }
|
683
|
-
|
684
|
-
it "should set new configs params" do
|
685
|
-
subject.register
|
686
|
-
expect(subject.params).to match hash_including(
|
687
|
-
"ssl_enabled" => true,
|
688
|
-
"ssl_certificate" => certificate_path,
|
689
|
-
"ssl_verification_mode" => verify ? 'full' : 'none'
|
690
|
-
)
|
691
|
-
end
|
692
|
-
|
693
|
-
it "should set new configs variables" do
|
694
|
-
subject.register
|
695
|
-
expect(subject.instance_variable_get(:@ssl_enabled)).to eql(true)
|
696
|
-
expect(subject.instance_variable_get(:@ssl_verification_mode)).to eql(verify ? 'full' : 'none')
|
697
|
-
expect(subject.instance_variable_get(:@ssl_certificate)).to eql(certificate_path)
|
698
|
-
end
|
699
|
-
end
|
700
|
-
end
|
701
|
-
end
|
702
|
-
end
|
703
647
|
end
|
704
648
|
end
|
705
649
|
|
@@ -747,7 +691,7 @@ describe LogStash::Inputs::Tcp, :ecs_compatibility_support do
|
|
747
691
|
|
748
692
|
context "with a non encrypted private key" do
|
749
693
|
let(:config) do
|
750
|
-
base_config.merge "
|
694
|
+
base_config.merge "ssl_client_authentication" => "required"
|
751
695
|
end
|
752
696
|
it "should be able to connect and write data" do
|
753
697
|
result = TcpHelpers.pipelineless_input(subject, 1) do
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
data/version
CHANGED
@@ -1 +1 @@
|
|
1
|
-
|
1
|
+
7.0.0
|
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:
|
4
|
+
version: 7.0.0
|
5
5
|
platform: java
|
6
6
|
authors:
|
7
7
|
- Elastic
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2025-
|
11
|
+
date: 2025-01-10 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
requirement: !ruby/object:Gem::Requirement
|
@@ -44,20 +44,6 @@ dependencies:
|
|
44
44
|
- - "~>"
|
45
45
|
- !ruby/object:Gem::Version
|
46
46
|
version: '1.2'
|
47
|
-
- !ruby/object:Gem::Dependency
|
48
|
-
requirement: !ruby/object:Gem::Requirement
|
49
|
-
requirements:
|
50
|
-
- - "~>"
|
51
|
-
- !ruby/object:Gem::Version
|
52
|
-
version: '1.0'
|
53
|
-
name: logstash-mixin-normalize_config_support
|
54
|
-
type: :runtime
|
55
|
-
prerelease: false
|
56
|
-
version_requirements: !ruby/object:Gem::Requirement
|
57
|
-
requirements:
|
58
|
-
- - "~>"
|
59
|
-
- !ruby/object:Gem::Version
|
60
|
-
version: '1.0'
|
61
47
|
- !ruby/object:Gem::Dependency
|
62
48
|
requirement: !ruby/object:Gem::Requirement
|
63
49
|
requirements:
|
@@ -246,15 +232,15 @@ files:
|
|
246
232
|
- spec/inputs/tcp_spec.rb
|
247
233
|
- spec/spec_helper.rb
|
248
234
|
- vendor/jar-dependencies/commons-io/commons-io/2.17.0/commons-io-2.17.0.jar
|
249
|
-
- vendor/jar-dependencies/io/netty/netty-buffer/4.1.
|
250
|
-
- vendor/jar-dependencies/io/netty/netty-codec/4.1.
|
251
|
-
- vendor/jar-dependencies/io/netty/netty-common/4.1.
|
252
|
-
- vendor/jar-dependencies/io/netty/netty-handler/4.1.
|
253
|
-
- vendor/jar-dependencies/io/netty/netty-transport-native-unix-common/4.1.
|
254
|
-
- vendor/jar-dependencies/io/netty/netty-transport/4.1.
|
255
|
-
- vendor/jar-dependencies/org/logstash/inputs/logstash-input-tcp/
|
235
|
+
- vendor/jar-dependencies/io/netty/netty-buffer/4.1.115.Final/netty-buffer-4.1.115.Final.jar
|
236
|
+
- vendor/jar-dependencies/io/netty/netty-codec/4.1.115.Final/netty-codec-4.1.115.Final.jar
|
237
|
+
- vendor/jar-dependencies/io/netty/netty-common/4.1.115.Final/netty-common-4.1.115.Final.jar
|
238
|
+
- vendor/jar-dependencies/io/netty/netty-handler/4.1.115.Final/netty-handler-4.1.115.Final.jar
|
239
|
+
- vendor/jar-dependencies/io/netty/netty-transport-native-unix-common/4.1.115.Final/netty-transport-native-unix-common-4.1.115.Final.jar
|
240
|
+
- vendor/jar-dependencies/io/netty/netty-transport/4.1.115.Final/netty-transport-4.1.115.Final.jar
|
241
|
+
- vendor/jar-dependencies/org/logstash/inputs/logstash-input-tcp/7.0.0/logstash-input-tcp-7.0.0.jar
|
256
242
|
- version
|
257
|
-
homepage:
|
243
|
+
homepage: http://www.elastic.co/guide/en/logstash/current/index.html
|
258
244
|
licenses:
|
259
245
|
- Apache License (2.0)
|
260
246
|
metadata:
|