logstash-output-redis 5.0.0 → 5.2.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +14 -0
- data/LICENSE +199 -10
- data/README.md +1 -1
- data/docs/index.asciidoc +99 -4
- data/lib/logstash/outputs/redis.rb +96 -1
- data/logstash-output-redis.gemspec +2 -1
- data/spec/fixtures/certificates/ca.crt +31 -0
- data/spec/fixtures/certificates/ca.key +52 -0
- data/spec/fixtures/certificates/ca.txt +1 -0
- data/spec/fixtures/certificates/client.crt +26 -0
- data/spec/fixtures/certificates/client.key +28 -0
- data/spec/fixtures/certificates/gen-test-certs.sh +60 -0
- data/spec/fixtures/certificates/openssl.cnf +6 -0
- data/spec/fixtures/certificates/redis.crt +25 -0
- data/spec/fixtures/certificates/redis.dh +8 -0
- data/spec/fixtures/certificates/redis.key +28 -0
- data/spec/fixtures/certificates/server.crt +26 -0
- data/spec/fixtures/certificates/server.key +28 -0
- data/spec/integration/outputs/redis_spec.rb +61 -10
- data/spec/unit/outputs/redis_spec.rb +103 -1
- metadata +41 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 22c5b60ca0ba0c727372b570fe5c4946065f7a6cf632154c97cd2b18552d035c
|
4
|
+
data.tar.gz: d82ef3b0de7f16d4db374a13b81b50adb6ffaba2c6a12063349d5381a2070aa3
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 4cedf0b7eea307f77ef27706f9dfdf3d482928e097fdd1f5d59cccca31fc1206eb93daedf87b84127f262390a8b35d26a3492264cb29a2592dab4bbc9db8eb13
|
7
|
+
data.tar.gz: 113541d3dbb624a6c58340bd1d775c4d9d45e5975f644ace941d8f4e33e4966f05800b950eb1f246ae42f895a00d1e825dfa024f411866be25e8555aa80dbc98
|
data/CHANGELOG.md
CHANGED
@@ -1,3 +1,17 @@
|
|
1
|
+
## 5.2.0
|
2
|
+
- Added support to SSL/TLS configurations [#69](https://github.com/logstash-plugins/logstash-output-redis/pull/69)
|
3
|
+
- `ssl_enabled`
|
4
|
+
- `ssl_certificate_authorities`
|
5
|
+
- `ssl_certificate`
|
6
|
+
- `ssl_key`
|
7
|
+
- `ssl_verification_mode`
|
8
|
+
- `ssl_supported_protocols`
|
9
|
+
- `ssl_cipher_suites`
|
10
|
+
|
11
|
+
## 5.1.0
|
12
|
+
- Added basic support for SSL [#59](https://github.com/logstash-plugins/logstash-output-redis/pull/59)
|
13
|
+
- Fixed documentation of required settings [#61](https://github.com/logstash-plugins/logstash-output-redis/pull/61)
|
14
|
+
|
1
15
|
## 5.0.0
|
2
16
|
- Removed obsolete fields `queue` and `name`
|
3
17
|
- Changed major version of redis library dependency to 4.x
|
data/LICENSE
CHANGED
@@ -1,13 +1,202 @@
|
|
1
|
-
Copyright (c) 2012-2018 Elasticsearch <http://www.elastic.co>
|
2
1
|
|
3
|
-
|
4
|
-
|
5
|
-
|
2
|
+
Apache License
|
3
|
+
Version 2.0, January 2004
|
4
|
+
http://www.apache.org/licenses/
|
6
5
|
|
7
|
-
|
6
|
+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
8
7
|
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
8
|
+
1. Definitions.
|
9
|
+
|
10
|
+
"License" shall mean the terms and conditions for use, reproduction,
|
11
|
+
and distribution as defined by Sections 1 through 9 of this document.
|
12
|
+
|
13
|
+
"Licensor" shall mean the copyright owner or entity authorized by
|
14
|
+
the copyright owner that is granting the License.
|
15
|
+
|
16
|
+
"Legal Entity" shall mean the union of the acting entity and all
|
17
|
+
other entities that control, are controlled by, or are under common
|
18
|
+
control with that entity. For the purposes of this definition,
|
19
|
+
"control" means (i) the power, direct or indirect, to cause the
|
20
|
+
direction or management of such entity, whether by contract or
|
21
|
+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
22
|
+
outstanding shares, or (iii) beneficial ownership of such entity.
|
23
|
+
|
24
|
+
"You" (or "Your") shall mean an individual or Legal Entity
|
25
|
+
exercising permissions granted by this License.
|
26
|
+
|
27
|
+
"Source" form shall mean the preferred form for making modifications,
|
28
|
+
including but not limited to software source code, documentation
|
29
|
+
source, and configuration files.
|
30
|
+
|
31
|
+
"Object" form shall mean any form resulting from mechanical
|
32
|
+
transformation or translation of a Source form, including but
|
33
|
+
not limited to compiled object code, generated documentation,
|
34
|
+
and conversions to other media types.
|
35
|
+
|
36
|
+
"Work" shall mean the work of authorship, whether in Source or
|
37
|
+
Object form, made available under the License, as indicated by a
|
38
|
+
copyright notice that is included in or attached to the work
|
39
|
+
(an example is provided in the Appendix below).
|
40
|
+
|
41
|
+
"Derivative Works" shall mean any work, whether in Source or Object
|
42
|
+
form, that is based on (or derived from) the Work and for which the
|
43
|
+
editorial revisions, annotations, elaborations, or other modifications
|
44
|
+
represent, as a whole, an original work of authorship. For the purposes
|
45
|
+
of this License, Derivative Works shall not include works that remain
|
46
|
+
separable from, or merely link (or bind by name) to the interfaces of,
|
47
|
+
the Work and Derivative Works thereof.
|
48
|
+
|
49
|
+
"Contribution" shall mean any work of authorship, including
|
50
|
+
the original version of the Work and any modifications or additions
|
51
|
+
to that Work or Derivative Works thereof, that is intentionally
|
52
|
+
submitted to Licensor for inclusion in the Work by the copyright owner
|
53
|
+
or by an individual or Legal Entity authorized to submit on behalf of
|
54
|
+
the copyright owner. For the purposes of this definition, "submitted"
|
55
|
+
means any form of electronic, verbal, or written communication sent
|
56
|
+
to the Licensor or its representatives, including but not limited to
|
57
|
+
communication on electronic mailing lists, source code control systems,
|
58
|
+
and issue tracking systems that are managed by, or on behalf of, the
|
59
|
+
Licensor for the purpose of discussing and improving the Work, but
|
60
|
+
excluding communication that is conspicuously marked or otherwise
|
61
|
+
designated in writing by the copyright owner as "Not a Contribution."
|
62
|
+
|
63
|
+
"Contributor" shall mean Licensor and any individual or Legal Entity
|
64
|
+
on behalf of whom a Contribution has been received by Licensor and
|
65
|
+
subsequently incorporated within the Work.
|
66
|
+
|
67
|
+
2. Grant of Copyright License. Subject to the terms and conditions of
|
68
|
+
this License, each Contributor hereby grants to You a perpetual,
|
69
|
+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
70
|
+
copyright license to reproduce, prepare Derivative Works of,
|
71
|
+
publicly display, publicly perform, sublicense, and distribute the
|
72
|
+
Work and such Derivative Works in Source or Object form.
|
73
|
+
|
74
|
+
3. Grant of Patent License. Subject to the terms and conditions of
|
75
|
+
this License, each Contributor hereby grants to You a perpetual,
|
76
|
+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
77
|
+
(except as stated in this section) patent license to make, have made,
|
78
|
+
use, offer to sell, sell, import, and otherwise transfer the Work,
|
79
|
+
where such license applies only to those patent claims licensable
|
80
|
+
by such Contributor that are necessarily infringed by their
|
81
|
+
Contribution(s) alone or by combination of their Contribution(s)
|
82
|
+
with the Work to which such Contribution(s) was submitted. If You
|
83
|
+
institute patent litigation against any entity (including a
|
84
|
+
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
85
|
+
or a Contribution incorporated within the Work constitutes direct
|
86
|
+
or contributory patent infringement, then any patent licenses
|
87
|
+
granted to You under this License for that Work shall terminate
|
88
|
+
as of the date such litigation is filed.
|
89
|
+
|
90
|
+
4. Redistribution. You may reproduce and distribute copies of the
|
91
|
+
Work or Derivative Works thereof in any medium, with or without
|
92
|
+
modifications, and in Source or Object form, provided that You
|
93
|
+
meet the following conditions:
|
94
|
+
|
95
|
+
(a) You must give any other recipients of the Work or
|
96
|
+
Derivative Works a copy of this License; and
|
97
|
+
|
98
|
+
(b) You must cause any modified files to carry prominent notices
|
99
|
+
stating that You changed the files; and
|
100
|
+
|
101
|
+
(c) You must retain, in the Source form of any Derivative Works
|
102
|
+
that You distribute, all copyright, patent, trademark, and
|
103
|
+
attribution notices from the Source form of the Work,
|
104
|
+
excluding those notices that do not pertain to any part of
|
105
|
+
the Derivative Works; and
|
106
|
+
|
107
|
+
(d) If the Work includes a "NOTICE" text file as part of its
|
108
|
+
distribution, then any Derivative Works that You distribute must
|
109
|
+
include a readable copy of the attribution notices contained
|
110
|
+
within such NOTICE file, excluding those notices that do not
|
111
|
+
pertain to any part of the Derivative Works, in at least one
|
112
|
+
of the following places: within a NOTICE text file distributed
|
113
|
+
as part of the Derivative Works; within the Source form or
|
114
|
+
documentation, if provided along with the Derivative Works; or,
|
115
|
+
within a display generated by the Derivative Works, if and
|
116
|
+
wherever such third-party notices normally appear. The contents
|
117
|
+
of the NOTICE file are for informational purposes only and
|
118
|
+
do not modify the License. You may add Your own attribution
|
119
|
+
notices within Derivative Works that You distribute, alongside
|
120
|
+
or as an addendum to the NOTICE text from the Work, provided
|
121
|
+
that such additional attribution notices cannot be construed
|
122
|
+
as modifying the License.
|
123
|
+
|
124
|
+
You may add Your own copyright statement to Your modifications and
|
125
|
+
may provide additional or different license terms and conditions
|
126
|
+
for use, reproduction, or distribution of Your modifications, or
|
127
|
+
for any such Derivative Works as a whole, provided Your use,
|
128
|
+
reproduction, and distribution of the Work otherwise complies with
|
129
|
+
the conditions stated in this License.
|
130
|
+
|
131
|
+
5. Submission of Contributions. Unless You explicitly state otherwise,
|
132
|
+
any Contribution intentionally submitted for inclusion in the Work
|
133
|
+
by You to the Licensor shall be under the terms and conditions of
|
134
|
+
this License, without any additional terms or conditions.
|
135
|
+
Notwithstanding the above, nothing herein shall supersede or modify
|
136
|
+
the terms of any separate license agreement you may have executed
|
137
|
+
with Licensor regarding such Contributions.
|
138
|
+
|
139
|
+
6. Trademarks. This License does not grant permission to use the trade
|
140
|
+
names, trademarks, service marks, or product names of the Licensor,
|
141
|
+
except as required for reasonable and customary use in describing the
|
142
|
+
origin of the Work and reproducing the content of the NOTICE file.
|
143
|
+
|
144
|
+
7. Disclaimer of Warranty. Unless required by applicable law or
|
145
|
+
agreed to in writing, Licensor provides the Work (and each
|
146
|
+
Contributor provides its Contributions) on an "AS IS" BASIS,
|
147
|
+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
148
|
+
implied, including, without limitation, any warranties or conditions
|
149
|
+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
150
|
+
PARTICULAR PURPOSE. You are solely responsible for determining the
|
151
|
+
appropriateness of using or redistributing the Work and assume any
|
152
|
+
risks associated with Your exercise of permissions under this License.
|
153
|
+
|
154
|
+
8. Limitation of Liability. In no event and under no legal theory,
|
155
|
+
whether in tort (including negligence), contract, or otherwise,
|
156
|
+
unless required by applicable law (such as deliberate and grossly
|
157
|
+
negligent acts) or agreed to in writing, shall any Contributor be
|
158
|
+
liable to You for damages, including any direct, indirect, special,
|
159
|
+
incidental, or consequential damages of any character arising as a
|
160
|
+
result of this License or out of the use or inability to use the
|
161
|
+
Work (including but not limited to damages for loss of goodwill,
|
162
|
+
work stoppage, computer failure or malfunction, or any and all
|
163
|
+
other commercial damages or losses), even if such Contributor
|
164
|
+
has been advised of the possibility of such damages.
|
165
|
+
|
166
|
+
9. Accepting Warranty or Additional Liability. While redistributing
|
167
|
+
the Work or Derivative Works thereof, You may choose to offer,
|
168
|
+
and charge a fee for, acceptance of support, warranty, indemnity,
|
169
|
+
or other liability obligations and/or rights consistent with this
|
170
|
+
License. However, in accepting such obligations, You may act only
|
171
|
+
on Your own behalf and on Your sole responsibility, not on behalf
|
172
|
+
of any other Contributor, and only if You agree to indemnify,
|
173
|
+
defend, and hold each Contributor harmless for any liability
|
174
|
+
incurred by, or claims asserted against, such Contributor by reason
|
175
|
+
of your accepting any such warranty or additional liability.
|
176
|
+
|
177
|
+
END OF TERMS AND CONDITIONS
|
178
|
+
|
179
|
+
APPENDIX: How to apply the Apache License to your work.
|
180
|
+
|
181
|
+
To apply the Apache License to your work, attach the following
|
182
|
+
boilerplate notice, with the fields enclosed by brackets "[]"
|
183
|
+
replaced with your own identifying information. (Don't include
|
184
|
+
the brackets!) The text should be enclosed in the appropriate
|
185
|
+
comment syntax for the file format. We also recommend that a
|
186
|
+
file or class name and description of purpose be included on the
|
187
|
+
same "printed page" as the copyright notice for easier
|
188
|
+
identification within third-party archives.
|
189
|
+
|
190
|
+
Copyright 2020 Elastic and contributors
|
191
|
+
|
192
|
+
Licensed under the Apache License, Version 2.0 (the "License");
|
193
|
+
you may not use this file except in compliance with the License.
|
194
|
+
You may obtain a copy of the License at
|
195
|
+
|
196
|
+
http://www.apache.org/licenses/LICENSE-2.0
|
197
|
+
|
198
|
+
Unless required by applicable law or agreed to in writing, software
|
199
|
+
distributed under the License is distributed on an "AS IS" BASIS,
|
200
|
+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
201
|
+
See the License for the specific language governing permissions and
|
202
|
+
limitations under the License.
|
data/README.md
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
# Logstash Plugin
|
2
2
|
|
3
|
-
[![Travis Build Status](https://travis-ci.
|
3
|
+
[![Travis Build Status](https://travis-ci.com/logstash-plugins/logstash-output-redis.svg)](https://travis-ci.com/logstash-plugins/logstash-output-redis)
|
4
4
|
|
5
5
|
This is a plugin for [Logstash](https://github.com/elastic/logstash).
|
6
6
|
|
data/docs/index.asciidoc
CHANGED
@@ -44,14 +44,21 @@ This plugin supports the following configuration options plus the <<plugins-{typ
|
|
44
44
|
| <<plugins-{type}s-{plugin}-batch_timeout>> |<<number,number>>|No
|
45
45
|
| <<plugins-{type}s-{plugin}-congestion_interval>> |<<number,number>>|No
|
46
46
|
| <<plugins-{type}s-{plugin}-congestion_threshold>> |<<number,number>>|No
|
47
|
-
| <<plugins-{type}s-{plugin}-data_type>> |<<string,string>>, one of `["list", "channel"]`|
|
47
|
+
| <<plugins-{type}s-{plugin}-data_type>> |<<string,string>>, one of `["list", "channel"]`|Yes
|
48
48
|
| <<plugins-{type}s-{plugin}-db>> |<<number,number>>|No
|
49
49
|
| <<plugins-{type}s-{plugin}-host>> |<<array,array>>|No
|
50
|
-
| <<plugins-{type}s-{plugin}-key>> |<<string,string>>|
|
50
|
+
| <<plugins-{type}s-{plugin}-key>> |<<string,string>>|Yes
|
51
51
|
| <<plugins-{type}s-{plugin}-password>> |<<password,password>>|No
|
52
52
|
| <<plugins-{type}s-{plugin}-port>> |<<number,number>>|No
|
53
53
|
| <<plugins-{type}s-{plugin}-reconnect_interval>> |<<number,number>>|No
|
54
54
|
| <<plugins-{type}s-{plugin}-shuffle_hosts>> |<<boolean,boolean>>|No
|
55
|
+
| <<plugins-{type}s-{plugin}-ssl_certificate>> |<<path,path>>|No
|
56
|
+
| <<plugins-{type}s-{plugin}-ssl_certificate_authorities>> |list of <<path,path>>|No
|
57
|
+
| <<plugins-{type}s-{plugin}-ssl_cipher_suites>> |list of <<string,string>>|No
|
58
|
+
| <<plugins-{type}s-{plugin}-ssl_enabled>> |<<boolean,boolean>>|No
|
59
|
+
| <<plugins-{type}s-{plugin}-ssl_key>> |<<path,path>>|No
|
60
|
+
| <<plugins-{type}s-{plugin}-ssl_supported_protocols>> |<<string,string>>|No
|
61
|
+
| <<plugins-{type}s-{plugin}-ssl_verification_mode>> |<<string,string>>, one of `["full", "none"]`|No
|
55
62
|
| <<plugins-{type}s-{plugin}-timeout>> |<<number,number>>|No
|
56
63
|
|=======================================================================
|
57
64
|
|
@@ -173,8 +180,16 @@ Password to authenticate with. There is no authentication by default.
|
|
173
180
|
|
174
181
|
The default port to connect on. Can be overridden on any hostname.
|
175
182
|
|
183
|
+
[id="plugins-{type}s-{plugin}-ssl"]
|
184
|
+
===== `ssl`
|
185
|
+
|
186
|
+
* Value type is <<boolean,boolean>>
|
187
|
+
* Default value is `false`
|
188
|
+
|
189
|
+
Enable SSL support.
|
190
|
+
|
176
191
|
[id="plugins-{type}s-{plugin}-reconnect_interval"]
|
177
|
-
===== `reconnect_interval`
|
192
|
+
===== `reconnect_interval`
|
178
193
|
|
179
194
|
* Value type is <<number,number>>
|
180
195
|
* Default value is `1`
|
@@ -189,6 +204,86 @@ Interval for reconnecting to failed Redis connections
|
|
189
204
|
|
190
205
|
Shuffle the host list during Logstash startup.
|
191
206
|
|
207
|
+
[id="plugins-{type}s-{plugin}-ssl_certificate"]
|
208
|
+
===== `ssl_certificate`
|
209
|
+
|
210
|
+
* Value type is <<path,path>>
|
211
|
+
* There is no default value for this setting.
|
212
|
+
|
213
|
+
Path to certificate in PEM format. This certificate will be presented
|
214
|
+
to the other part of the TLS connection.
|
215
|
+
|
216
|
+
[id="plugins-{type}s-{plugin}-ssl_certificate_authorities"]
|
217
|
+
===== `ssl_certificate_authorities`
|
218
|
+
|
219
|
+
* Value type is <<array,array>>
|
220
|
+
* Default value is `[]`
|
221
|
+
|
222
|
+
Validate the certificate chain against these authorities.
|
223
|
+
You can define multiple files. All the certificates will be read and added to the trust store.
|
224
|
+
The system CA path is automatically included.
|
225
|
+
|
226
|
+
[id="plugins-{type}s-{plugin}-ssl_cipher_suites"]
|
227
|
+
===== `ssl_cipher_suites`
|
228
|
+
|
229
|
+
* Value type is a list of <<string,string>>
|
230
|
+
* There is no default value for this setting
|
231
|
+
|
232
|
+
The list of cipher suites to use, listed by priorities.
|
233
|
+
Supported cipher suites vary depending on the Java and protocol versions.
|
234
|
+
|
235
|
+
[id="plugins-{type}s-{plugin}-ssl_enabled"]
|
236
|
+
===== `ssl_enabled`
|
237
|
+
|
238
|
+
* Value type is <<boolean,boolean>>
|
239
|
+
* Default value is `false`
|
240
|
+
|
241
|
+
Enable SSL (must be set for other `ssl_` options to take effect).
|
242
|
+
|
243
|
+
[id="plugins-{type}s-{plugin}-ssl_key"]
|
244
|
+
===== `ssl_key`
|
245
|
+
|
246
|
+
* Value type is <<path,path>>
|
247
|
+
* There is no default value for this setting.
|
248
|
+
|
249
|
+
SSL key path
|
250
|
+
|
251
|
+
[id="plugins-{type}s-{plugin}-ssl_key_passphrase"]
|
252
|
+
===== `ssl_key_passphrase`
|
253
|
+
|
254
|
+
* Value type is <<password,password>>
|
255
|
+
* Default value is `nil`
|
256
|
+
|
257
|
+
SSL key passphrase
|
258
|
+
|
259
|
+
[id="plugins-{type}s-{plugin}-ssl_supported_protocols"]
|
260
|
+
===== `ssl_supported_protocols`
|
261
|
+
|
262
|
+
* Value type is <<string,string>>
|
263
|
+
* Allowed values are: `'TLSv1.1'`, `'TLSv1.2'`, `'TLSv1.3'`
|
264
|
+
* Default depends on the JDK being used. With up-to-date Logstash, the default is `['TLSv1.2', 'TLSv1.3']`.
|
265
|
+
`'TLSv1.1'` is not considered secure and is only provided for legacy applications.
|
266
|
+
|
267
|
+
List of allowed SSL/TLS versions to use when establishing a secure connection.
|
268
|
+
|
269
|
+
NOTE: If you configure the plugin to use `'TLSv1.1'` on any recent JVM, such as the one packaged with Logstash,
|
270
|
+
the protocol is disabled by default and needs to be enabled manually by changing `jdk.tls.disabledAlgorithms` in
|
271
|
+
the *$JDK_HOME/conf/security/java.security* configuration file. That is, `TLSv1.1` needs to be removed from the list.
|
272
|
+
|
273
|
+
[id="plugins-{type}s-{plugin}-ssl_verification_mode"]
|
274
|
+
===== `ssl_verification_mode`
|
275
|
+
|
276
|
+
* Value can be any of: `full`, `none`
|
277
|
+
* Default value is `full`
|
278
|
+
|
279
|
+
Defines how to verify the certificates presented by another part in the TLS connection:
|
280
|
+
|
281
|
+
`full` validates that the server certificate has an issue date that's within
|
282
|
+
the not_before and not_after dates; chains to a trusted Certificate Authority (CA), and
|
283
|
+
has a hostname or IP address that matches the names within the certificate.
|
284
|
+
|
285
|
+
`none` performs no certificate validation.
|
286
|
+
|
192
287
|
[id="plugins-{type}s-{plugin}-timeout"]
|
193
288
|
===== `timeout`
|
194
289
|
|
@@ -202,4 +297,4 @@ Redis initial connection timeout in seconds.
|
|
202
297
|
[id="plugins-{type}s-{plugin}-common-options"]
|
203
298
|
include::{include_path}/{type}.asciidoc[]
|
204
299
|
|
205
|
-
:default_codec!:
|
300
|
+
:default_codec!:
|
@@ -38,6 +38,34 @@ class LogStash::Outputs::Redis < LogStash::Outputs::Base
|
|
38
38
|
# The default port to connect on. Can be overridden on any hostname.
|
39
39
|
config :port, :validate => :number, :default => 6379
|
40
40
|
|
41
|
+
# SSL
|
42
|
+
config :ssl_enabled, :validate => :boolean, :default => false
|
43
|
+
|
44
|
+
# Validate the certificate chain against these authorities. You can define multiple files.
|
45
|
+
# All the certificates will be read and added to the trust store.
|
46
|
+
config :ssl_certificate_authorities, :validate => :path, :list => true
|
47
|
+
|
48
|
+
# Options to verify the server's certificate.
|
49
|
+
# "full": validates that the provided certificate has an issue date that’s within the not_before and not_after dates;
|
50
|
+
# chains to a trusted Certificate Authority (CA); has a hostname or IP address that matches the names within the certificate.
|
51
|
+
# "none": performs no certificate validation. Disabling this severely compromises security (https://www.cs.utexas.edu/~shmat/shmat_ccs12.pdf)
|
52
|
+
config :ssl_verification_mode, :validate => %w[full none], :default => 'full'
|
53
|
+
|
54
|
+
# SSL certificate path
|
55
|
+
config :ssl_certificate, :validate => :path
|
56
|
+
|
57
|
+
# SSL key path
|
58
|
+
config :ssl_key, :validate => :path
|
59
|
+
|
60
|
+
# SSL key passphrase
|
61
|
+
config :ssl_key_passphrase, :validate => :password, :default => nil
|
62
|
+
|
63
|
+
# NOTE: the default setting [] uses SSL engine defaults
|
64
|
+
config :ssl_supported_protocols, :validate => %w[TLSv1.1 TLSv1.2 TLSv1.3], :default => [], :list => true
|
65
|
+
|
66
|
+
# The list of ciphers suite to use
|
67
|
+
config :ssl_cipher_suites, :validate => :string, :list => true
|
68
|
+
|
41
69
|
# The Redis database number.
|
42
70
|
config :db, :validate => :number, :default => 0
|
43
71
|
|
@@ -90,6 +118,8 @@ class LogStash::Outputs::Redis < LogStash::Outputs::Base
|
|
90
118
|
def register
|
91
119
|
require 'redis'
|
92
120
|
|
121
|
+
validate_ssl_config!
|
122
|
+
|
93
123
|
if @batch
|
94
124
|
if @data_type != "list"
|
95
125
|
raise RuntimeError.new(
|
@@ -184,8 +214,12 @@ class LogStash::Outputs::Redis < LogStash::Outputs::Base
|
|
184
214
|
:host => @current_host,
|
185
215
|
:port => @current_port,
|
186
216
|
:timeout => @timeout,
|
187
|
-
:db => @db
|
217
|
+
:db => @db,
|
218
|
+
:ssl => @ssl_enabled,
|
188
219
|
}
|
220
|
+
|
221
|
+
params[:ssl_params] = setup_ssl_params if @ssl_enabled
|
222
|
+
|
189
223
|
@logger.debug("connection params", params)
|
190
224
|
|
191
225
|
if @password
|
@@ -195,6 +229,67 @@ class LogStash::Outputs::Redis < LogStash::Outputs::Base
|
|
195
229
|
Redis.new(params)
|
196
230
|
end # def connect
|
197
231
|
|
232
|
+
def setup_ssl_params
|
233
|
+
require "openssl"
|
234
|
+
|
235
|
+
params = {}
|
236
|
+
params[:cert_store] = ssl_certificate_store
|
237
|
+
|
238
|
+
if @ssl_verification_mode == 'none'
|
239
|
+
params[:verify_mode] = OpenSSL::SSL::VERIFY_NONE
|
240
|
+
else
|
241
|
+
params[:verify_mode] = OpenSSL::SSL::VERIFY_PEER|OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT
|
242
|
+
end
|
243
|
+
|
244
|
+
if @ssl_certificate
|
245
|
+
params[:cert] = OpenSSL::X509::Certificate.new(File.read(@ssl_certificate))
|
246
|
+
if @ssl_key
|
247
|
+
# if we have an encrypted key and a password is not provided (nil) than OpenSSL::PKey::RSA
|
248
|
+
# prompts the user to enter a password interactively - we do not want to do that,
|
249
|
+
# for plain-text keys the default '' password argument gets simply ignored
|
250
|
+
params[:key] = OpenSSL::PKey::RSA.new(File.read(@ssl_key), @ssl_key_passphrase.value || '')
|
251
|
+
end
|
252
|
+
end
|
253
|
+
|
254
|
+
params[:min_version] = :TLS1_1
|
255
|
+
if @ssl_supported_protocols.any?
|
256
|
+
protocols = @ssl_supported_protocols.map { |v| v.delete('v').tr(".", "_").to_sym }.sort
|
257
|
+
params[:min_version] = protocols.first
|
258
|
+
params[:max_version] = protocols.last
|
259
|
+
end
|
260
|
+
|
261
|
+
params[:ciphers] = @ssl_cipher_suites if @ssl_cipher_suites&.any?
|
262
|
+
params
|
263
|
+
end
|
264
|
+
|
265
|
+
def ssl_certificate_store
|
266
|
+
cert_store = new_ssl_certificate_store
|
267
|
+
cert_store.set_default_paths
|
268
|
+
@ssl_certificate_authorities&.each do |cert|
|
269
|
+
cert_store.add_file(cert)
|
270
|
+
end
|
271
|
+
|
272
|
+
cert_store
|
273
|
+
end
|
274
|
+
|
275
|
+
def new_ssl_certificate_store
|
276
|
+
OpenSSL::X509::Store.new
|
277
|
+
end
|
278
|
+
|
279
|
+
def validate_ssl_config!
|
280
|
+
unless @ssl_enabled
|
281
|
+
ignored_ssl_settings = original_params.select { |k| k != 'ssl_enabled' && k.start_with?('ssl_') }
|
282
|
+
@logger.warn("Configured SSL settings are not used when `ssl_enabled` is set to `false`: #{ignored_ssl_settings.keys}") if ignored_ssl_settings.any?
|
283
|
+
return
|
284
|
+
end
|
285
|
+
|
286
|
+
if @ssl_certificate && !@ssl_key
|
287
|
+
raise LogStash::ConfigurationError, "Using an `ssl_certificate` requires an `ssl_key`"
|
288
|
+
elsif @ssl_key && !@ssl_certificate
|
289
|
+
raise LogStash::ConfigurationError, 'An `ssl_certificate` is required when using an `ssl_key`'
|
290
|
+
end
|
291
|
+
end
|
292
|
+
|
198
293
|
# A string used to identify a Redis instance in log messages
|
199
294
|
def identity
|
200
295
|
"redis://#{@password}@#{@current_host}:#{@current_port}/#{@db} #{@data_type}:#{@key}"
|
@@ -1,7 +1,7 @@
|
|
1
1
|
Gem::Specification.new do |s|
|
2
2
|
|
3
3
|
s.name = 'logstash-output-redis'
|
4
|
-
s.version = '5.
|
4
|
+
s.version = '5.2.0'
|
5
5
|
s.licenses = ['Apache License (2.0)']
|
6
6
|
s.summary = "Sends events to a Redis queue using the `RPUSH` command"
|
7
7
|
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"
|
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
|
|
21
21
|
|
22
22
|
# Gem dependencies
|
23
23
|
s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
|
24
|
+
s.add_runtime_dependency 'logstash-core', '>= 6.0'
|
24
25
|
|
25
26
|
s.add_runtime_dependency 'redis', '~> 4'
|
26
27
|
s.add_runtime_dependency 'stud'
|
@@ -0,0 +1,31 @@
|
|
1
|
+
-----BEGIN CERTIFICATE-----
|
2
|
+
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
|
30
|
+
ktuOrK6AOmNndv9KJ4b4
|
31
|
+
-----END CERTIFICATE-----
|
@@ -0,0 +1,52 @@
|
|
1
|
+
-----BEGIN PRIVATE KEY-----
|
2
|
+
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
|
51
|
+
oDGPtZqf+lH6or1EtANdnw3K5AyN
|
52
|
+
-----END PRIVATE KEY-----
|
@@ -0,0 +1 @@
|
|
1
|
+
47A3D82860FAB19E7F26B8FF7043280173FB5832
|
@@ -0,0 +1,26 @@
|
|
1
|
+
-----BEGIN CERTIFICATE-----
|
2
|
+
MIIEUjCCAjqgAwIBAgIUR6PYKGD6sZ5/Jrj/cEMoAXP7WDEwDQYJKoZIhvcNAQEL
|
3
|
+
BQAwNTETMBEGA1UECgwKUmVkaXMgVGVzdDEeMBwGA1UEAwwVQ2VydGlmaWNhdGUg
|
4
|
+
QXV0aG9yaXR5MCAXDTI0MDUxNjE4NDUzOVoYDzQ3NjIwNDEyMTg0NTM5WjArMRMw
|
5
|
+
EQYDVQQKDApSZWRpcyBUZXN0MRQwEgYDVQQDDAtDbGllbnQtb25seTCCASIwDQYJ
|
6
|
+
KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMP1ceXuKItfVwCUvBdMgFh8mZP7ak/T
|
7
|
+
Abeo/Fh6uv5LnBt6eJ6uAlaXSmJReFiLOYH5c565bh/KeKMmCI1CzsiFhBZZuFDk
|
8
|
+
Rj8KkX9ux4aGj/O251YeuNy8HYw3spurrhc6EVNIhJvyaN2HprdPiIqYakbMf/HC
|
9
|
+
FSqeJzRbsF4NnXmTajGVowCKAnFsjSP8ARg4bDlbe3A02grgMqgyi3b5LXaNhjV8
|
10
|
+
CRDbJL0qLfZCt2pQuot+UOQQUhjX4vAr7swd42OSAY7lPeIGmD3Le4/M9IBCSxjI
|
11
|
+
ZXuHCZTY7Gwu0JSmfM4hSl5WgaAAlHLj5Kw1WYOzgix3wnU9rMu5rC0CAwEAAaNi
|
12
|
+
MGAwCwYDVR0PBAQDAgWgMBEGCWCGSAGG+EIBAQQEAwIHgDAdBgNVHQ4EFgQUq4dH
|
13
|
+
nr2Dp8kXSlV4QUTp46T7tpgwHwYDVR0jBBgwFoAU5PKoEi5aOx4QjDSdONlcD30X
|
14
|
+
DPcwDQYJKoZIhvcNAQELBQADggIBAHqXEBwU+IzDrS5W0sANa2JMIFu3B4OigBQ5
|
15
|
+
e+cFFQDfA8ZQL/PSLnUOWp4v2hsnw+Qh/OkUCq1Hv29IBhMml8s12FTRaAQo1x5X
|
16
|
+
28iJVsnzj/JsfsShbH7CE0qxlcbYmOsI0GJqAApoQ85/fXq1+BQOImBu9Q1iJhBK
|
17
|
+
rk8Vdh/noKJpqpZmA47Zb+JKrQMbqCYHd2qQxnbiKzTDznEQMMBNxELnXWWS5UQn
|
18
|
+
zevTeyYrP4eihWIOqGnUF/O0PoaMQuJk2x6vwDYyxQaAKuSoOnSRp9VmvcdirKJZ
|
19
|
+
Jj6w6XzeAennxwTFZK49nAX+KnglRqUOHIZAiKrVQTcgMnQOWf9D9hKF5pzJEhoj
|
20
|
+
QtFV490uqw1B08U5KoX2gHtcelhEw7V0gHv26NHuKJR5F7L0ZPDBchIr6yVIL4JU
|
21
|
+
pDALSKZEZMAyC0QYBwXL4tVHgY4MmlD5ep76yNKMSHFHImGmd/7zgIZz6NS10DE2
|
22
|
+
KCemXnHWGO46kNP3Ebv5mpK4JpOH0zI1YAXhmib+U0rjfSUpA5hmOtWXk1bMgS+k
|
23
|
+
PljU730hsgaIR3/7xmDrLG1TPQTY51EO9R36egCOXwTzRerslgCygA+Rf1gFA0NO
|
24
|
+
xfS8fOFEmO1z/HHlESB7gsvusjfm2bhxPxf8v+djIuRwIwvXEVJqjMnC5OBTWOwP
|
25
|
+
3dgnw1I6
|
26
|
+
-----END CERTIFICATE-----
|
@@ -0,0 +1,28 @@
|
|
1
|
+
-----BEGIN PRIVATE KEY-----
|
2
|
+
MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDD9XHl7iiLX1cA
|
3
|
+
lLwXTIBYfJmT+2pP0wG3qPxYerr+S5wbeniergJWl0piUXhYizmB+XOeuW4fynij
|
4
|
+
JgiNQs7IhYQWWbhQ5EY/CpF/bseGho/ztudWHrjcvB2MN7Kbq64XOhFTSISb8mjd
|
5
|
+
h6a3T4iKmGpGzH/xwhUqnic0W7BeDZ15k2oxlaMAigJxbI0j/AEYOGw5W3twNNoK
|
6
|
+
4DKoMot2+S12jYY1fAkQ2yS9Ki32QrdqULqLflDkEFIY1+LwK+7MHeNjkgGO5T3i
|
7
|
+
Bpg9y3uPzPSAQksYyGV7hwmU2OxsLtCUpnzOIUpeVoGgAJRy4+SsNVmDs4Isd8J1
|
8
|
+
PazLuawtAgMBAAECggEARelsDNnmmi7WFe16m59eDPPLQRoKKFeCPdmqyhBjZXVp
|
9
|
+
SP5tSUOQrv8D+UbStlhZmI78Wo0ShoIQfziDBY7nwm+sG+M/mJCQpU4qcbn+snaQ
|
10
|
+
piVDrJyCXLI6ont+m/5oun2rj7iIIzEdi6epaa4U60mMZRzxqrmRHqbVGt95cVwv
|
11
|
+
OjTlNANbrTc7lHXpySwasKxNe9hNOxpHC/GsnSnNUBjnNcmfBzlmd4tfbCl4SlpA
|
12
|
+
IrjrFzcD02LuIZe6mLG4f6F9gG4MIc5ck0jEPzfiucZT6VQgPR+5Qe/92nYZccLm
|
13
|
+
R1lnxsFSMrQjdkOYjAb/QTTcl4Fr6Bu1oeYoziFVuwKBgQDoztIRAAWHsvc2Lhkd
|
14
|
+
xsNT9xWD4kRZsj3RUia+d5ZuSiYZV1I5ITvhJqpfLv6zdmwOG1UTRfwqjtDU3tBX
|
15
|
+
JF7COfSWYnMcuIBeh4eee6zuXoQbaeGRgbK9Pe61Q9+4JX0LnZUXaVjelGrY6vFC
|
16
|
+
VpcwiC2GEmI+9sjYRaHnJzbrfwKBgQDXeuFTUKmSUOLt23taC7xnM6PUC4CDcIHl
|
17
|
+
evh663JumkWpAe3QEpODQYlagh8wYLSAS2WNcRgyjvZB+3mSEK1Ty/c9xoLViFnS
|
18
|
+
KJfNPvkMBDldQ/JJ9ATGgFu2pfKkM7ou4Z9mpqqY0i2A4ckBBEcEpS6BQFI/t3mQ
|
19
|
+
YeuuCKWuUwKBgQDRu2kR+aQBwR/nBpaH9cWIgkM2wgPzjpkUV18iHhg+mbxC/iDL
|
20
|
+
6P3J84xvHaZFxPzJpKP7LgRjzq+h5m1o5BIeBhor1NuBV1IGVzC9fQuo3ytCixu0
|
21
|
+
e1SsGfxP/qqwec1yRm/HXJe8RZcQfnAE5H9mMHhanXs24BrGg8y8st5OPwKBgQDA
|
22
|
+
fNSsSHIycm9Fa7tVRQaYalj/Iwc6Y1amWKN/qrQeeVGhGEgIh4+ewPyiDXsvDDQy
|
23
|
+
Jyggodar02nIp4yCHsO3B41lcd+OQK98PSbeAlMXmO5lkjzuMz3Q1PkYwEVwyYSY
|
24
|
+
PJTYbioXOinL5+ZXMir+y1AvxfWzVYMSp2aRoMfgYQKBgQCC1oUswYrR39ObvfXD
|
25
|
+
ZPOdlv3Xp2jz7L0LOIiYggNXniiBq0IT7Xtu8FYNZ2vnMPi1PsQENqO89vlFeJ92
|
26
|
+
5l2ZMfKceGjc3zxyWQzqPhXXbukBbQC1TYUP+ZxxghRmy5PCTn+siNW4UO1dtUh2
|
27
|
+
s3QtMleyQEr8SusIpJEnG+/ErQ==
|
28
|
+
-----END PRIVATE KEY-----
|
@@ -0,0 +1,60 @@
|
|
1
|
+
|
2
|
+
#!/bin/bash
|
3
|
+
|
4
|
+
# COPIED/MODIFIED from the redis server gen-certs util
|
5
|
+
# https://github.com/redis/redis/blob/cc0091f0f9fe321948c544911b3ea71837cf86e3/utils/gen-test-certs.sh
|
6
|
+
|
7
|
+
# Generate some test certificates which are used by the regression test suite:
|
8
|
+
#
|
9
|
+
# ca.{crt,key} Self signed CA certificate.
|
10
|
+
# redis.{crt,key} A certificate with no key usage/policy restrictions.
|
11
|
+
# client.{crt,key} A certificate restricted for SSL client usage.
|
12
|
+
# server.{crt,key} A certificate restricted for SSL server usage.
|
13
|
+
# redis.dh DH Params file.
|
14
|
+
|
15
|
+
generate_cert() {
|
16
|
+
local name=$1
|
17
|
+
local cn="$2"
|
18
|
+
local opts="$3"
|
19
|
+
|
20
|
+
local keyfile=${name}.key
|
21
|
+
local certfile=${name}.crt
|
22
|
+
|
23
|
+
[ -f $keyfile ] || openssl genrsa -out $keyfile 2048
|
24
|
+
openssl req \
|
25
|
+
-new -sha256 \
|
26
|
+
-subj "/O=Redis Test/CN=$cn" \
|
27
|
+
-key $keyfile | \
|
28
|
+
openssl x509 \
|
29
|
+
-req -sha256 \
|
30
|
+
-CA ca.crt \
|
31
|
+
-CAkey ca.key \
|
32
|
+
-CAserial ca.txt \
|
33
|
+
-CAcreateserial \
|
34
|
+
-days 999999 \
|
35
|
+
$opts \
|
36
|
+
-out $certfile
|
37
|
+
}
|
38
|
+
|
39
|
+
[ -f ca.key ] || openssl genrsa -out ca.key 4096
|
40
|
+
openssl req \
|
41
|
+
-x509 -new -nodes -sha256 \
|
42
|
+
-key ca.key \
|
43
|
+
-days 3650 \
|
44
|
+
-subj '/O=Redis Test/CN=Certificate Authority' \
|
45
|
+
-out ca.crt
|
46
|
+
|
47
|
+
cat > openssl.cnf <<_END_
|
48
|
+
[ server_cert ]
|
49
|
+
keyUsage = digitalSignature, keyEncipherment
|
50
|
+
nsCertType = server
|
51
|
+
[ client_cert ]
|
52
|
+
keyUsage = digitalSignature, keyEncipherment
|
53
|
+
nsCertType = client
|
54
|
+
_END_
|
55
|
+
|
56
|
+
generate_cert server "Server-only" "-extfile openssl.cnf -extensions server_cert"
|
57
|
+
generate_cert client "Client-only" "-extfile openssl.cnf -extensions client_cert"
|
58
|
+
generate_cert redis "Generic-cert"
|
59
|
+
|
60
|
+
[ -f redis.dh ] || openssl dhparam -out redis.dh 2048
|
@@ -0,0 +1,25 @@
|
|
1
|
+
-----BEGIN CERTIFICATE-----
|
2
|
+
MIIEMzCCAhugAwIBAgIUR6PYKGD6sZ5/Jrj/cEMoAXP7WDIwDQYJKoZIhvcNAQEL
|
3
|
+
BQAwNTETMBEGA1UECgwKUmVkaXMgVGVzdDEeMBwGA1UEAwwVQ2VydGlmaWNhdGUg
|
4
|
+
QXV0aG9yaXR5MCAXDTI0MDUxNjE4NDUzOVoYDzQ3NjIwNDEyMTg0NTM5WjAsMRMw
|
5
|
+
EQYDVQQKDApSZWRpcyBUZXN0MRUwEwYDVQQDDAxHZW5lcmljLWNlcnQwggEiMA0G
|
6
|
+
CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3kvR6caLws6+HAFpxx3nrA0pK4AKa
|
7
|
+
tALoFRjWe+7eKqAuXquSJRXHoVPhVXATcMZ1oePPjfDw3LYcDOT6l2BC+ixqyvlC
|
8
|
+
7zngVNgFjpX9oOO6pkeLFre38R+u1U516L4H/MpiqB9S4/YtGV7HXZCCPctVQjGJ
|
9
|
+
6VuxSHBqxJBXPtBw3U11JfKMOHE8MNXXP9mc9tBAZDg4tWuP5fRZ3P4urnen2iTq
|
10
|
+
q/xpuoj7bXAfNNzhbKYEWCFJvbPqIGvDz8JXdywrUaOa4hRctNjqKz5feTwd6A8f
|
11
|
+
9DW87blj6i2/HwF3AZchOPs52O3vvHrw5zQS9qJlgAEq1nR/TZo6sQt1AgMBAAGj
|
12
|
+
QjBAMB0GA1UdDgQWBBT+stkMkr87nvQ7R2a9Ww1bkXnr/zAfBgNVHSMEGDAWgBTk
|
13
|
+
8qgSLlo7HhCMNJ042VwPfRcM9zANBgkqhkiG9w0BAQsFAAOCAgEAL5O9GgjXn4BU
|
14
|
+
8lUB137DNLXbpjt8qB4mSuKJ5sJAnkMW9g7IV7uXdolCH2wSSU4Akk+42w8ghf+T
|
15
|
+
ZHxInv5EWARd1hiT4mM/d1nf0V1HGYcUQKXCJTu9lxTq5rBCLF932jp3dd/P9g3N
|
16
|
+
JfASc3NNSk+VlTB4xlLCQ5b+X+13/TgHGOAqJn1VIYHAD37dyiJkr8S8w7RZuQYT
|
17
|
+
jhEt0S05zcnudM1Kl4RizQ+HlouTz1gNoEkaaC1sNmQHcBSP79xjvTrt2g/YFOsc
|
18
|
+
CY7TwCOmGNhKKC7Gm3Q/yiFj1/lbNq++XYwZrTNS5pknTaUK6LVNuJkYe3HMy4iq
|
19
|
+
LKLbG3sg426071SGbm2vXGrs/p4C02OLqCnL8mwXDxPQ8Px75deBlrXxvOvg1GTl
|
20
|
+
T+pqK4Hx888IavQVrXy7RsdtFAoRGhBWneU+qwF1Nlfvpy+zGOxs+X3+GRF/eclx
|
21
|
+
HWfdRD3huHD6PLyswgG+jBxdbuSaHGbHHBNFVAkK6W8sS9bp7D55cN0gizJglIxA
|
22
|
+
Z/S8EJwyVHkHVszZvzV4rOVGBiO5KnQrUcLVaXDL4lEKa/LuJR0Upec5MrLyZwfI
|
23
|
+
bURTlpO9zacz/e8hWN89lezJ0dCGLp30aQFmWPdjNh1VbMjJ9SeCEjPErTrbInpP
|
24
|
+
ciIyR/xHvB7P+Z7wQKDVd5F+dryq/aA=
|
25
|
+
-----END CERTIFICATE-----
|
@@ -0,0 +1,8 @@
|
|
1
|
+
-----BEGIN DH PARAMETERS-----
|
2
|
+
MIIBDAKCAQEA221GevwdIvhYntSBvnUWI6GeMcQlUADx1WEMn1mjv4HcvIU1wYor
|
3
|
+
bPLj86jdS0lU5u3zdRZ/wuxmnM58hgetaXX8VNPUzfvYhyKInzwzBvfSQSDvFbY/
|
4
|
+
aVdtIhUQ6ij1rSYqzcjVv3gxd2dZNSTT+dYzw/jKLJ9UI7J9PL3dkee/us6hLyDI
|
5
|
+
sfgM/arHcDxMRZvMHPHv4vwzIHt8/MqEgeN1BIm9941r8JTs4NRUk4zfSr7Bl5ff
|
6
|
+
QNiDWzN8RK5bSMcGn+XANWrQKoQyktNYaT9yAjIHNxvCPV4nM6UtyTSRMtcz1+Am
|
7
|
+
mPVONVR9RyPV+FxG6E0AjmukPfu2Z7JVnwIBAgICAOE=
|
8
|
+
-----END DH PARAMETERS-----
|
@@ -0,0 +1,28 @@
|
|
1
|
+
-----BEGIN PRIVATE KEY-----
|
2
|
+
MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC3kvR6caLws6+H
|
3
|
+
AFpxx3nrA0pK4AKatALoFRjWe+7eKqAuXquSJRXHoVPhVXATcMZ1oePPjfDw3LYc
|
4
|
+
DOT6l2BC+ixqyvlC7zngVNgFjpX9oOO6pkeLFre38R+u1U516L4H/MpiqB9S4/Yt
|
5
|
+
GV7HXZCCPctVQjGJ6VuxSHBqxJBXPtBw3U11JfKMOHE8MNXXP9mc9tBAZDg4tWuP
|
6
|
+
5fRZ3P4urnen2iTqq/xpuoj7bXAfNNzhbKYEWCFJvbPqIGvDz8JXdywrUaOa4hRc
|
7
|
+
tNjqKz5feTwd6A8f9DW87blj6i2/HwF3AZchOPs52O3vvHrw5zQS9qJlgAEq1nR/
|
8
|
+
TZo6sQt1AgMBAAECggEAIjfKSmiULrnPpiJyuXKtTxk15+8JjTywrgIAtzoytEbN
|
9
|
+
xNbwtDUlciioMgBy+6yx0Ytzo2SZ3MvHRkNBC1TcJJ/tV5quC8P7zc0C10ZUvwoW
|
10
|
+
aNxFya9aX3caqMQp8+CGS4bbUrhz3kePw6hO+mp+XUiXdjT4dvSAmvMdwUkSfrBt
|
11
|
+
xtcnwiX4g355WwZKp4sqOSnhEQY0KT64hnx1RGAL3IGl6Kj2/V4uwkgbVVR/r2wH
|
12
|
+
ivSW6UA7Umnky2Liccg/QWDkY4OdHWJ2DP4sAZ+HjOBR1eKf+tVJBA40giM9uQ0a
|
13
|
+
pfGuOvOBaUz9voS70uYLy8aGZauoPzfhvzuRby6JAQKBgQDlk7qofud2+uGDohk8
|
14
|
+
QPEz6Zb+h5UxItRI+5ZjylRzcafD03f3euNPCftUQFblQaiRlRN7NH5ozlpmbI5v
|
15
|
+
13YVUNH9toTawpiSRh5RVMtk6dTNUk80J1zhdXZi4nfw3VXVoJW7SQPB8hLSZ7OO
|
16
|
+
YTlKcH9PFg6eVeEZbyEddbS56QKBgQDMs8pSnnGPUdJiQRP11uXUYlBZSgINTM7T
|
17
|
+
AS2e9gXwPP6azTK9e2ky0Bhx+fW+7A4+aRjrJor/V5HCEEUUInHLq/GtG0Z8CmxO
|
18
|
+
oaXusSFKsqtVWauCVogo/2S3kTXjGY2++DIZnCc3q7njoXcwIamUxB1riBCyPLr+
|
19
|
+
XzFV0TmBrQKBgQDjsimnhHY944ZX8CXnROH2Au/ncsHeAhVabW0zfDFWbptd9hc+
|
20
|
+
NXvNoLDNVyLYLs7p1VmFEQNvH3s5quF6u9A6Q/aCFMyfy/FW4oSfVeKFLAYLvl8f
|
21
|
+
8wqD8uSAHu2mz1+aibL4FerMKTPRy1ijFnqkAf/CiLXnBHZFq5rEhUHCQQKBgFJo
|
22
|
+
zzsTroQUXK5RpMeEDGLEcbSApvLTyTAJeWRVh26AH8ASfCrsVB2wySaZiuWiAtn9
|
23
|
+
VZrVmX/SsUt/YVAJzeZBArq+EFI/n/rH+RVvGggIhhGGWBXQ4GAg8Vs1iowy7W3E
|
24
|
+
XecRhnhTGjMZ/fHSm4LYsT9pN8+Jw35EtIfoA07BAoGACJWmulCP582Pdrn0Xrzx
|
25
|
+
mdCVtq1HZd5rUW/KA9fb2ht8A4i0ykZozADYu+eLZ5wu1hxEx/+IyNAhzp8OP1eC
|
26
|
+
DybKS0px957pesTR97hYOgV/xbQp3PhiBaQrgaVHd4AgeXxL39uMzj7tSZKQknfR
|
27
|
+
0rJRsJkplqO24hty/aQ5qO8=
|
28
|
+
-----END PRIVATE KEY-----
|
@@ -0,0 +1,26 @@
|
|
1
|
+
-----BEGIN CERTIFICATE-----
|
2
|
+
MIIEUjCCAjqgAwIBAgIUR6PYKGD6sZ5/Jrj/cEMoAXP7WDAwDQYJKoZIhvcNAQEL
|
3
|
+
BQAwNTETMBEGA1UECgwKUmVkaXMgVGVzdDEeMBwGA1UEAwwVQ2VydGlmaWNhdGUg
|
4
|
+
QXV0aG9yaXR5MCAXDTI0MDUxNjE4NDUzOVoYDzQ3NjIwNDEyMTg0NTM5WjArMRMw
|
5
|
+
EQYDVQQKDApSZWRpcyBUZXN0MRQwEgYDVQQDDAtTZXJ2ZXItb25seTCCASIwDQYJ
|
6
|
+
KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMvxotag0WUqRJZ008eEBIQnqNBdCFm3
|
7
|
+
18Px5rusxwGZ3Kchpi2VYxmKLTUwq5XQo29zHefvlnEFytG4SmvwK1tvW+zYfrgT
|
8
|
+
JWC+j40VcfqgTS2zesqu/zzHcEyWHqJBcMANkSBXNy6byp6zx0JbFqB4RUETqoXZ
|
9
|
+
5v4K3BWohMvAX+Ww78VIQtvc7hNbJZipCvoxShz9Q0B8lOJiDR2gXAVaZltOu+Hk
|
10
|
+
dRolHle+qkYslY27L70cheiQZvweRtC6NquTOSpg+ZDlezn4pHtPKlnxUa82ciZj
|
11
|
+
rqfpysaPLEzeuZ/MDuiyOZ4+h7b8/vyilKRupcV0bU+NfVFsWdvOnaECAwEAAaNi
|
12
|
+
MGAwCwYDVR0PBAQDAgWgMBEGCWCGSAGG+EIBAQQEAwIGQDAdBgNVHQ4EFgQUw851
|
13
|
+
jwi3qF89kUF/SS30OWlCX3swHwYDVR0jBBgwFoAU5PKoEi5aOx4QjDSdONlcD30X
|
14
|
+
DPcwDQYJKoZIhvcNAQELBQADggIBAD0tyTntrFQbvF8bt1o3KhahY0SaHD1SdHWf
|
15
|
+
W81SujJkk3gqpOB/kP/JJUapQOyZ80seYUXtYNMXLWX2zXFoCMquZ7tjG352ybNV
|
16
|
+
Rko1/n9C0fyby+4rEFF281hkqaY1oiBNzwjXp1g6PAHO1zN5ZQAPcB9RLkOXxOnl
|
17
|
+
wPtHX5k6w433B2Xc6k0j5l1q6wK/H4mdD0nlNV05qf2o/Gl8GIAQEo/ZdqO5+aeb
|
18
|
+
8VqDcnQGe1MYhIJRTNYTYeBQ5Qe+caCm0vOm3dLqkdzfKUCwY+q6OGez7JnUJphK
|
19
|
+
VmDYfWAKLjZP7XTsck7oU5tCFWw/eKNr+wr8KwiLaAqmCUO68Pe2q0YTRu2k9fGj
|
20
|
+
cQ+YbZbl2MFoUAo37xdKsE1xMtsTBBezGsoq1/D9yJi1Yfp1KXyRFujbpEVtMTFG
|
21
|
+
X9YtxF4mfPxaguXrrthsMg04eLgG/D+kz7aYh3WydsWZnlCuJ+o6q5c+V0OGwmU+
|
22
|
+
u7GrgyhNXGftQksf9BrNTwcngVFcJSe2xXLG1dDtQJTz8/KcNSIcdb4PPe6bP+st
|
23
|
+
035x2Z7e3JkqiDMNQew80JqeCeYIII9MeUknPHAX3FK9JWK27LhUosnstEFy5FHT
|
24
|
+
xR9BXUupIMJtaDdAICtSujMEm7NkKl38LMQ3UjGZl/jyLd+Y9UnmD3pDouMSW4Js
|
25
|
+
9YD5FxH9
|
26
|
+
-----END CERTIFICATE-----
|
@@ -0,0 +1,28 @@
|
|
1
|
+
-----BEGIN PRIVATE KEY-----
|
2
|
+
MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDL8aLWoNFlKkSW
|
3
|
+
dNPHhASEJ6jQXQhZt9fD8ea7rMcBmdynIaYtlWMZii01MKuV0KNvcx3n75ZxBcrR
|
4
|
+
uEpr8Ctbb1vs2H64EyVgvo+NFXH6oE0ts3rKrv88x3BMlh6iQXDADZEgVzcum8qe
|
5
|
+
s8dCWxageEVBE6qF2eb+CtwVqITLwF/lsO/FSELb3O4TWyWYqQr6MUoc/UNAfJTi
|
6
|
+
Yg0doFwFWmZbTrvh5HUaJR5XvqpGLJWNuy+9HIXokGb8HkbQujarkzkqYPmQ5Xs5
|
7
|
+
+KR7TypZ8VGvNnImY66n6crGjyxM3rmfzA7osjmePoe2/P78opSkbqXFdG1PjX1R
|
8
|
+
bFnbzp2hAgMBAAECggEACiMEV2+KfuE0I+gSRW/Ad3be7T3dihORJPkxYS1KHjBR
|
9
|
+
C0nY8Bm1cXXYr8TPt4Blejb2IuLJxwv9F/HVeaJYLlkVcCsV19WESWfpW89nwRe+
|
10
|
+
BE4wJZI/h5xoXpck1kbjSTl3Z9yL5qw5zMv15MyBHjhiJVUaWAEz2fdNV4J++L9M
|
11
|
+
Ex4H/WvbmNLumam8bnsw3EUc5AEbsEIMBiKfIlNSo6aAco0iVh/wpdv/k78f5F3M
|
12
|
+
XQRtJLaVxn2i5W1BoXzUPTQGDFjd8+kuHHZBAEMjUuH9j+v4RlszEeSM0Eq213C+
|
13
|
+
Aux89yl763tLFrL66a3866SUoKfdp0tkyOVVh3Sw8QKBgQD9TqdxwPqkFTEHyHsG
|
14
|
+
6Xrw+YzoWTv0ZaczwnRE+gXw8rZnkKm4zGbjk0EZMJW/l8mdvbsnhOlasaOBfc4a
|
15
|
+
jpqgvEZpU00V8p/lYqAec0X/qDhLm930T1nMVcatYVSZTPaNuvo6FePV7ches2zC
|
16
|
+
KVJgmKxwnYPHTubWo99KRDsIkQKBgQDOHKU7tfOkzadhuXBkiH6iPYL+S7H3yxAQ
|
17
|
+
QbS27V//6JHIyWP7tei0IwHAZcFR8sdeF2fApyZu7Za6J/7MgyjEimevNg4BeF8Y
|
18
|
+
fWLj9EoEEiHTtipl7tpsAI/RM2Gc4oSJ5LElmLzO9OkwnPWnP1oeClqPtjJ447Oq
|
19
|
+
h9ai49hMEQKBgQCAJ7wVlEH6o/ITcv2zaIrXwhnlL8hihM+MI1R51VkOJ23bhdgo
|
20
|
+
c9mWR9kGqosIzP2nPeejPd5mETuc9w5AZ2eZ7Mde4FM+yGrXPgeugDmo9+3Lawdn
|
21
|
+
ZIIVHEyRSY3opYST/kY8/vgvMsdOCk77CLbxwix0KW0TeDrX2z7MLysC0QKBgBnv
|
22
|
+
wt8zs1g+xNxoUHtmLcFOykgj0F5lQD07d3k5f8YdRxMkPJ+1MXZRnWvPojckvO/b
|
23
|
+
NCQrJIv6++erFsY3jw7Ed+21eKe4tQbI6IPU/udqPLV+i/FN0FCc9XwW4iay3ojX
|
24
|
+
rW8UvFWyvhFu/v6v2zBCj0jcXZeW18oS0/CliVdxAoGBANBIaB8pdLE+bp9YZGKU
|
25
|
+
glrlo11jdqJBYvidlPngZDVvIBSw3b4woK3m+r1+bDpQseDATmTDaaItdHSktmTw
|
26
|
+
fNGAZFyfZmXtmmuPJu16j62ML0YlRWUSAvbD3ntCIKs0zRjyywSOJs/gnaJKNIhB
|
27
|
+
Pj3xop1kUBPxx2Y9Kcu2bg2C
|
28
|
+
-----END PRIVATE KEY-----
|
@@ -6,8 +6,13 @@ require "flores/random"
|
|
6
6
|
|
7
7
|
describe LogStash::Outputs::Redis do
|
8
8
|
|
9
|
+
FIXTURES_PATH = File.expand_path('../../fixtures', File.dirname(__FILE__))
|
10
|
+
PORT = 16379
|
11
|
+
SSL_PORT = 26379
|
12
|
+
|
9
13
|
context "integration tests", :integration => true do
|
10
14
|
shared_examples_for "writing to redis list" do |extra_config|
|
15
|
+
let(:timeout) { 5 }
|
11
16
|
let(:key) { 10.times.collect { rand(10).to_s }.join("") }
|
12
17
|
let(:event_count) { Flores::Random.integer(0..10000) }
|
13
18
|
let(:message) { Flores::Random.text(0..100) }
|
@@ -15,7 +20,9 @@ describe LogStash::Outputs::Redis do
|
|
15
20
|
{
|
16
21
|
"key" => key,
|
17
22
|
"data_type" => "list",
|
18
|
-
"host" => "
|
23
|
+
"host" => "redis",
|
24
|
+
"port" => PORT,
|
25
|
+
"timeout" => timeout
|
19
26
|
}
|
20
27
|
}
|
21
28
|
let(:redis_config) {
|
@@ -23,6 +30,19 @@ describe LogStash::Outputs::Redis do
|
|
23
30
|
}
|
24
31
|
let(:redis_output) { described_class.new(redis_config) }
|
25
32
|
|
33
|
+
let(:redis) do
|
34
|
+
ssl_enabled = redis_config['ssl_enabled'] == true
|
35
|
+
cli_config = {
|
36
|
+
:host => redis_config["host"],
|
37
|
+
:port => redis_config["port"] || PORT,
|
38
|
+
:timeout => timeout,
|
39
|
+
:ssl => ssl_enabled
|
40
|
+
}
|
41
|
+
|
42
|
+
cli_config[:ssl_params] = redis_output.send(:setup_ssl_params) if ssl_enabled
|
43
|
+
Redis.new(cli_config)
|
44
|
+
end
|
45
|
+
|
26
46
|
before do
|
27
47
|
redis_output.register
|
28
48
|
event_count.times do |i|
|
@@ -32,22 +52,24 @@ describe LogStash::Outputs::Redis do
|
|
32
52
|
redis_output.close
|
33
53
|
end
|
34
54
|
|
35
|
-
|
36
|
-
redis
|
55
|
+
after do
|
56
|
+
redis.del(key)
|
57
|
+
end
|
37
58
|
|
59
|
+
it "should successfully send all events to redis" do
|
38
60
|
# The list should contain the number of elements our agent pushed up.
|
39
|
-
|
61
|
+
expect(redis.llen(key)).to eql event_count
|
40
62
|
|
41
63
|
# Now check all events for order and correctness.
|
42
64
|
event_count.times do |value|
|
43
|
-
id, element = redis.blpop(key,
|
65
|
+
id, element = redis.blpop(key, :timeout => timeout)
|
44
66
|
event = LogStash::Event.new(LogStash::Json.load(element))
|
45
|
-
|
46
|
-
|
67
|
+
expect(event.get("sequence")).to eql value
|
68
|
+
expect(event.get("message")).to eql message
|
47
69
|
end
|
48
70
|
|
49
71
|
# The list should now be empty
|
50
|
-
|
72
|
+
expect(redis.llen(key)).to eql 0
|
51
73
|
end
|
52
74
|
end
|
53
75
|
|
@@ -55,11 +77,41 @@ describe LogStash::Outputs::Redis do
|
|
55
77
|
include_examples "writing to redis list"
|
56
78
|
end
|
57
79
|
|
80
|
+
context "when SSL is enabled" do
|
81
|
+
context "with client certificate and key" do
|
82
|
+
ssl_config = {
|
83
|
+
"host" => "redis_ssl",
|
84
|
+
"port" => SSL_PORT,
|
85
|
+
"ssl_enabled" => true,
|
86
|
+
"ssl_certificate_authorities" => File.join(FIXTURES_PATH, 'certificates/ca.crt'),
|
87
|
+
"ssl_certificate" => File.join(FIXTURES_PATH, 'certificates/client.crt'),
|
88
|
+
"ssl_key" => File.join(FIXTURES_PATH, 'certificates/client.key')
|
89
|
+
}
|
90
|
+
|
91
|
+
include_examples "writing to redis list", ssl_config
|
92
|
+
end
|
93
|
+
|
94
|
+
context "with ssl_verification_mode => none" do
|
95
|
+
ssl_config = {
|
96
|
+
"host" => "redis_ssl",
|
97
|
+
"port" => SSL_PORT,
|
98
|
+
"ssl_enabled" => true,
|
99
|
+
"ssl_verification_mode" => "none",
|
100
|
+
"ssl_certificate" => File.join(FIXTURES_PATH, 'certificates/client.crt'),
|
101
|
+
"ssl_key" => File.join(FIXTURES_PATH, 'certificates/client.key')
|
102
|
+
}
|
103
|
+
|
104
|
+
include_examples "writing to redis list", ssl_config
|
105
|
+
end
|
106
|
+
|
107
|
+
end
|
108
|
+
|
58
109
|
context "when batch_mode is true" do
|
59
110
|
batch_events = Flores::Random.integer(1..1000)
|
60
111
|
batch_settings = {
|
61
112
|
"batch" => true,
|
62
|
-
"batch_events" => batch_events
|
113
|
+
"batch_events" => batch_events,
|
114
|
+
"port" => PORT
|
63
115
|
}
|
64
116
|
|
65
117
|
include_examples "writing to redis list", batch_settings do
|
@@ -74,4 +126,3 @@ describe LogStash::Outputs::Redis do
|
|
74
126
|
end
|
75
127
|
end
|
76
128
|
end
|
77
|
-
|
@@ -3,6 +3,7 @@ require "logstash/outputs/redis"
|
|
3
3
|
require "logstash/json"
|
4
4
|
require "redis"
|
5
5
|
require "flores/random"
|
6
|
+
require "flores/pki"
|
6
7
|
|
7
8
|
describe LogStash::Outputs::Redis do
|
8
9
|
|
@@ -38,5 +39,106 @@ describe LogStash::Outputs::Redis do
|
|
38
39
|
end
|
39
40
|
end
|
40
41
|
end
|
41
|
-
end
|
42
42
|
|
43
|
+
context "with SSL enabled" do
|
44
|
+
let(:config) {{ "ssl_enabled" => true, "key" => "key", "data_type" => "list" }}
|
45
|
+
subject(:plugin) { described_class.new(config) }
|
46
|
+
|
47
|
+
context "and not providing a certificate/key pair" do
|
48
|
+
it "registers without error" do
|
49
|
+
expect { plugin.register }.to_not raise_error
|
50
|
+
end
|
51
|
+
end
|
52
|
+
|
53
|
+
context "and providing a certificate/key pair" do
|
54
|
+
let(:cert_key_pair) { Flores::PKI.generate }
|
55
|
+
let(:certificate) do
|
56
|
+
path = Tempfile.new('certificate').path
|
57
|
+
IO.write(path, cert_key_pair.first.to_s)
|
58
|
+
path
|
59
|
+
end
|
60
|
+
let(:key) do
|
61
|
+
path = Tempfile.new('key').path
|
62
|
+
IO.write(path, cert_key_pair[1].to_s)
|
63
|
+
path
|
64
|
+
end
|
65
|
+
let(:config) { super().merge("ssl_certificate" => certificate, "ssl_key" => key) }
|
66
|
+
|
67
|
+
it "registers without error" do
|
68
|
+
expect { plugin.register }.to_not raise_error
|
69
|
+
end
|
70
|
+
end
|
71
|
+
|
72
|
+
FIXTURES_PATH = File.expand_path('../../fixtures', File.dirname(__FILE__))
|
73
|
+
|
74
|
+
context "and plain-text certificate/key" do
|
75
|
+
let(:key_file) { File.join(FIXTURES_PATH, 'certificates/redis.key') }
|
76
|
+
let(:crt_file) { File.join(FIXTURES_PATH, 'certificates/redis.crt') }
|
77
|
+
let(:config) { super().merge("ssl_certificate" => crt_file, "ssl_key" => key_file) }
|
78
|
+
|
79
|
+
it "registers without error" do
|
80
|
+
expect { plugin.register }.to_not raise_error
|
81
|
+
end
|
82
|
+
|
83
|
+
context 'with password set' do
|
84
|
+
let(:config) { super().merge("ssl_key_passphrase" => 'ignored') }
|
85
|
+
|
86
|
+
it "registers without error" do # password simply ignored
|
87
|
+
expect { plugin.register }.to_not raise_error
|
88
|
+
end
|
89
|
+
end
|
90
|
+
|
91
|
+
context 'with supported protocol' do
|
92
|
+
let(:config) { super().merge("ssl_supported_protocols" => %w[TLSv1.2 TLSv1.3]) }
|
93
|
+
|
94
|
+
it 'configures minimum TLS version' do
|
95
|
+
plugin.register
|
96
|
+
ssl_params = plugin.send(:setup_ssl_params)
|
97
|
+
expect(ssl_params).to match(a_hash_including(:min_version => :TLS1_2, :max_version => :TLS1_3))
|
98
|
+
end
|
99
|
+
end
|
100
|
+
end
|
101
|
+
|
102
|
+
context "with only ssl_certificate set" do
|
103
|
+
let(:config) { super().merge("ssl_certificate" => File.join(FIXTURES_PATH, 'certificates/redis.crt')) }
|
104
|
+
|
105
|
+
it "should raise a configuration error to request also `ssl_key`" do
|
106
|
+
expect { plugin.register }.to raise_error(LogStash::ConfigurationError, /Using an `ssl_certificate` requires an `ssl_key`/)
|
107
|
+
end
|
108
|
+
end
|
109
|
+
|
110
|
+
context "with only ssl_key set" do
|
111
|
+
let(:config) { super().merge("ssl_key" => File.join(FIXTURES_PATH, 'certificates/redis.key')) }
|
112
|
+
|
113
|
+
it "should raise a configuration error to request also `ssl_key`" do
|
114
|
+
expect { plugin.register }.to raise_error(LogStash::ConfigurationError, /An `ssl_certificate` is required when using an `ssl_key`/)
|
115
|
+
end
|
116
|
+
end
|
117
|
+
|
118
|
+
context "with ssl_certificate_authorities" do
|
119
|
+
let(:certificate_path) { File.join(FIXTURES_PATH, 'certificates/redis.crt') }
|
120
|
+
let(:config) do
|
121
|
+
super().merge('ssl_certificate_authorities' => [certificate_path])
|
122
|
+
end
|
123
|
+
|
124
|
+
it "sets cert_store values" do
|
125
|
+
ssl_store = double(OpenSSL::X509::Store.new)
|
126
|
+
allow(ssl_store).to receive(:set_default_paths)
|
127
|
+
allow(ssl_store).to receive(:add_file)
|
128
|
+
allow(subject).to receive(:new_ssl_certificate_store).and_return(ssl_store)
|
129
|
+
subject.send :setup_ssl_params
|
130
|
+
expect(ssl_store).to have_received(:add_file).with(certificate_path)
|
131
|
+
end
|
132
|
+
end
|
133
|
+
|
134
|
+
context "CAs certificates" do
|
135
|
+
it "includes openssl default paths" do
|
136
|
+
ssl_store = double(OpenSSL::X509::Store.new)
|
137
|
+
allow(ssl_store).to receive(:set_default_paths)
|
138
|
+
allow(plugin).to receive(:new_ssl_certificate_store).and_return(ssl_store)
|
139
|
+
subject.send :setup_ssl_params
|
140
|
+
expect(ssl_store).to have_received(:set_default_paths)
|
141
|
+
end
|
142
|
+
end
|
143
|
+
end
|
144
|
+
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: logstash-output-redis
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 5.
|
4
|
+
version: 5.2.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Elastic
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2024-06-04 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
requirement: !ruby/object:Gem::Requirement
|
@@ -30,6 +30,20 @@ dependencies:
|
|
30
30
|
- - "<="
|
31
31
|
- !ruby/object:Gem::Version
|
32
32
|
version: '2.99'
|
33
|
+
- !ruby/object:Gem::Dependency
|
34
|
+
requirement: !ruby/object:Gem::Requirement
|
35
|
+
requirements:
|
36
|
+
- - ">="
|
37
|
+
- !ruby/object:Gem::Version
|
38
|
+
version: '6.0'
|
39
|
+
name: logstash-core
|
40
|
+
prerelease: false
|
41
|
+
type: :runtime
|
42
|
+
version_requirements: !ruby/object:Gem::Requirement
|
43
|
+
requirements:
|
44
|
+
- - ">="
|
45
|
+
- !ruby/object:Gem::Version
|
46
|
+
version: '6.0'
|
33
47
|
- !ruby/object:Gem::Dependency
|
34
48
|
requirement: !ruby/object:Gem::Requirement
|
35
49
|
requirements:
|
@@ -131,6 +145,18 @@ files:
|
|
131
145
|
- docs/index.asciidoc
|
132
146
|
- lib/logstash/outputs/redis.rb
|
133
147
|
- logstash-output-redis.gemspec
|
148
|
+
- spec/fixtures/certificates/ca.crt
|
149
|
+
- spec/fixtures/certificates/ca.key
|
150
|
+
- spec/fixtures/certificates/ca.txt
|
151
|
+
- spec/fixtures/certificates/client.crt
|
152
|
+
- spec/fixtures/certificates/client.key
|
153
|
+
- spec/fixtures/certificates/gen-test-certs.sh
|
154
|
+
- spec/fixtures/certificates/openssl.cnf
|
155
|
+
- spec/fixtures/certificates/redis.crt
|
156
|
+
- spec/fixtures/certificates/redis.dh
|
157
|
+
- spec/fixtures/certificates/redis.key
|
158
|
+
- spec/fixtures/certificates/server.crt
|
159
|
+
- spec/fixtures/certificates/server.key
|
134
160
|
- spec/integration/outputs/redis_spec.rb
|
135
161
|
- spec/unit/outputs/redis_spec.rb
|
136
162
|
homepage: http://www.elastic.co/guide/en/logstash/current/index.html
|
@@ -154,11 +180,22 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
154
180
|
- !ruby/object:Gem::Version
|
155
181
|
version: '0'
|
156
182
|
requirements: []
|
157
|
-
|
158
|
-
rubygems_version: 2.6.13
|
183
|
+
rubygems_version: 3.2.33
|
159
184
|
signing_key:
|
160
185
|
specification_version: 4
|
161
186
|
summary: Sends events to a Redis queue using the `RPUSH` command
|
162
187
|
test_files:
|
188
|
+
- spec/fixtures/certificates/ca.crt
|
189
|
+
- spec/fixtures/certificates/ca.key
|
190
|
+
- spec/fixtures/certificates/ca.txt
|
191
|
+
- spec/fixtures/certificates/client.crt
|
192
|
+
- spec/fixtures/certificates/client.key
|
193
|
+
- spec/fixtures/certificates/gen-test-certs.sh
|
194
|
+
- spec/fixtures/certificates/openssl.cnf
|
195
|
+
- spec/fixtures/certificates/redis.crt
|
196
|
+
- spec/fixtures/certificates/redis.dh
|
197
|
+
- spec/fixtures/certificates/redis.key
|
198
|
+
- spec/fixtures/certificates/server.crt
|
199
|
+
- spec/fixtures/certificates/server.key
|
163
200
|
- spec/integration/outputs/redis_spec.rb
|
164
201
|
- spec/unit/outputs/redis_spec.rb
|