fluentd 1.17.0-x86-mingw32 → 1.18.0-x86-mingw32

Sign up to get free protection for your applications and to get access to all the features.
Files changed (278) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +100 -0
  3. data/README.md +1 -0
  4. data/SECURITY.md +2 -2
  5. data/fluent.conf +14 -14
  6. data/lib/fluent/command/cap_ctl.rb +4 -4
  7. data/lib/fluent/command/fluentd.rb +7 -1
  8. data/lib/fluent/compat/call_super_mixin.rb +3 -3
  9. data/lib/fluent/compat/propagate_default.rb +4 -4
  10. data/lib/fluent/config/literal_parser.rb +9 -2
  11. data/lib/fluent/config/yaml_parser/parser.rb +4 -0
  12. data/lib/fluent/engine.rb +49 -33
  13. data/lib/fluent/env.rb +3 -0
  14. data/lib/fluent/event_router.rb +2 -2
  15. data/lib/fluent/log/console_adapter.rb +4 -2
  16. data/lib/fluent/plugin/filter_parser.rb +27 -51
  17. data/lib/fluent/plugin/in_exec.rb +14 -2
  18. data/lib/fluent/plugin/in_http.rb +6 -1
  19. data/lib/fluent/plugin/in_sample.rb +13 -7
  20. data/lib/fluent/plugin/in_syslog.rb +4 -0
  21. data/lib/fluent/plugin/in_tail.rb +65 -23
  22. data/lib/fluent/plugin/in_tcp.rb +4 -0
  23. data/lib/fluent/plugin/in_udp.rb +10 -1
  24. data/lib/fluent/plugin/input.rb +4 -0
  25. data/lib/fluent/plugin/out_buffer.rb +40 -0
  26. data/lib/fluent/plugin/out_copy.rb +1 -1
  27. data/lib/fluent/plugin/out_file.rb +8 -0
  28. data/lib/fluent/plugin/out_http.rb +12 -0
  29. data/lib/fluent/plugin/output.rb +2 -0
  30. data/lib/fluent/plugin/parser_json.rb +4 -12
  31. data/lib/fluent/plugin_helper/cert_option.rb +8 -0
  32. data/lib/fluent/plugin_helper/event_emitter.rb +12 -0
  33. data/lib/fluent/plugin_helper/http_server/server.rb +24 -8
  34. data/lib/fluent/plugin_helper/server.rb +9 -0
  35. data/lib/fluent/root_agent.rb +114 -19
  36. data/lib/fluent/source_only_buffer_agent.rb +102 -0
  37. data/lib/fluent/supervisor.rb +207 -34
  38. data/lib/fluent/system_config.rb +15 -3
  39. data/lib/fluent/version.rb +1 -1
  40. data/templates/new_gem/fluent-plugin.gemspec.erb +6 -5
  41. metadata +24 -483
  42. data/.github/DISCUSSION_TEMPLATE/q-a-japanese.yml +0 -50
  43. data/.github/DISCUSSION_TEMPLATE/q-a.yml +0 -47
  44. data/.github/ISSUE_TEMPLATE/bug_report.yml +0 -71
  45. data/.github/ISSUE_TEMPLATE/config.yml +0 -5
  46. data/.github/ISSUE_TEMPLATE/feature_request.yml +0 -39
  47. data/.github/ISSUE_TEMPLATE.md +0 -17
  48. data/.github/PULL_REQUEST_TEMPLATE.md +0 -14
  49. data/.github/workflows/stale-actions.yml +0 -24
  50. data/.github/workflows/test-ruby-head.yml +0 -31
  51. data/.github/workflows/test.yml +0 -32
  52. data/.gitignore +0 -30
  53. data/Gemfile +0 -9
  54. data/fluentd.gemspec +0 -62
  55. data/test/command/test_binlog_reader.rb +0 -362
  56. data/test/command/test_ca_generate.rb +0 -70
  57. data/test/command/test_cap_ctl.rb +0 -100
  58. data/test/command/test_cat.rb +0 -128
  59. data/test/command/test_ctl.rb +0 -56
  60. data/test/command/test_fluentd.rb +0 -1291
  61. data/test/command/test_plugin_config_formatter.rb +0 -397
  62. data/test/command/test_plugin_generator.rb +0 -109
  63. data/test/compat/test_calls_super.rb +0 -166
  64. data/test/compat/test_parser.rb +0 -92
  65. data/test/config/assertions.rb +0 -42
  66. data/test/config/test_config_parser.rb +0 -551
  67. data/test/config/test_configurable.rb +0 -1784
  68. data/test/config/test_configure_proxy.rb +0 -604
  69. data/test/config/test_dsl.rb +0 -415
  70. data/test/config/test_element.rb +0 -518
  71. data/test/config/test_literal_parser.rb +0 -309
  72. data/test/config/test_plugin_configuration.rb +0 -56
  73. data/test/config/test_section.rb +0 -191
  74. data/test/config/test_system_config.rb +0 -195
  75. data/test/config/test_types.rb +0 -408
  76. data/test/counter/test_client.rb +0 -563
  77. data/test/counter/test_error.rb +0 -44
  78. data/test/counter/test_mutex_hash.rb +0 -179
  79. data/test/counter/test_server.rb +0 -589
  80. data/test/counter/test_store.rb +0 -258
  81. data/test/counter/test_validator.rb +0 -137
  82. data/test/helper.rb +0 -155
  83. data/test/helpers/fuzzy_assert.rb +0 -89
  84. data/test/helpers/process_extenstion.rb +0 -33
  85. data/test/log/test_console_adapter.rb +0 -117
  86. data/test/plugin/data/2010/01/20100102-030405.log +0 -0
  87. data/test/plugin/data/2010/01/20100102-030406.log +0 -0
  88. data/test/plugin/data/2010/01/20100102.log +0 -0
  89. data/test/plugin/data/log/bar +0 -0
  90. data/test/plugin/data/log/foo/bar.log +0 -0
  91. data/test/plugin/data/log/foo/bar2 +0 -0
  92. data/test/plugin/data/log/test.log +0 -0
  93. data/test/plugin/data/log_numeric/01.log +0 -0
  94. data/test/plugin/data/log_numeric/02.log +0 -0
  95. data/test/plugin/data/log_numeric/12.log +0 -0
  96. data/test/plugin/data/log_numeric/14.log +0 -0
  97. data/test/plugin/data/sd_file/config +0 -11
  98. data/test/plugin/data/sd_file/config.json +0 -17
  99. data/test/plugin/data/sd_file/config.yaml +0 -11
  100. data/test/plugin/data/sd_file/config.yml +0 -11
  101. data/test/plugin/data/sd_file/invalid_config.yml +0 -7
  102. data/test/plugin/in_tail/test_fifo.rb +0 -121
  103. data/test/plugin/in_tail/test_io_handler.rb +0 -150
  104. data/test/plugin/in_tail/test_position_file.rb +0 -346
  105. data/test/plugin/out_forward/test_ack_handler.rb +0 -140
  106. data/test/plugin/out_forward/test_connection_manager.rb +0 -145
  107. data/test/plugin/out_forward/test_handshake_protocol.rb +0 -112
  108. data/test/plugin/out_forward/test_load_balancer.rb +0 -106
  109. data/test/plugin/out_forward/test_socket_cache.rb +0 -174
  110. data/test/plugin/test_bare_output.rb +0 -131
  111. data/test/plugin/test_base.rb +0 -247
  112. data/test/plugin/test_buf_file.rb +0 -1314
  113. data/test/plugin/test_buf_file_single.rb +0 -898
  114. data/test/plugin/test_buf_memory.rb +0 -42
  115. data/test/plugin/test_buffer.rb +0 -1493
  116. data/test/plugin/test_buffer_chunk.rb +0 -209
  117. data/test/plugin/test_buffer_file_chunk.rb +0 -871
  118. data/test/plugin/test_buffer_file_single_chunk.rb +0 -611
  119. data/test/plugin/test_buffer_memory_chunk.rb +0 -339
  120. data/test/plugin/test_compressable.rb +0 -87
  121. data/test/plugin/test_file_util.rb +0 -96
  122. data/test/plugin/test_filter.rb +0 -368
  123. data/test/plugin/test_filter_grep.rb +0 -697
  124. data/test/plugin/test_filter_parser.rb +0 -731
  125. data/test/plugin/test_filter_record_transformer.rb +0 -577
  126. data/test/plugin/test_filter_stdout.rb +0 -207
  127. data/test/plugin/test_formatter_csv.rb +0 -136
  128. data/test/plugin/test_formatter_hash.rb +0 -38
  129. data/test/plugin/test_formatter_json.rb +0 -61
  130. data/test/plugin/test_formatter_ltsv.rb +0 -70
  131. data/test/plugin/test_formatter_msgpack.rb +0 -28
  132. data/test/plugin/test_formatter_out_file.rb +0 -116
  133. data/test/plugin/test_formatter_single_value.rb +0 -44
  134. data/test/plugin/test_formatter_tsv.rb +0 -76
  135. data/test/plugin/test_in_debug_agent.rb +0 -49
  136. data/test/plugin/test_in_exec.rb +0 -261
  137. data/test/plugin/test_in_forward.rb +0 -1178
  138. data/test/plugin/test_in_gc_stat.rb +0 -62
  139. data/test/plugin/test_in_http.rb +0 -1124
  140. data/test/plugin/test_in_monitor_agent.rb +0 -922
  141. data/test/plugin/test_in_object_space.rb +0 -66
  142. data/test/plugin/test_in_sample.rb +0 -190
  143. data/test/plugin/test_in_syslog.rb +0 -505
  144. data/test/plugin/test_in_tail.rb +0 -3429
  145. data/test/plugin/test_in_tcp.rb +0 -328
  146. data/test/plugin/test_in_udp.rb +0 -296
  147. data/test/plugin/test_in_unix.rb +0 -181
  148. data/test/plugin/test_input.rb +0 -137
  149. data/test/plugin/test_metadata.rb +0 -89
  150. data/test/plugin/test_metrics.rb +0 -294
  151. data/test/plugin/test_metrics_local.rb +0 -96
  152. data/test/plugin/test_multi_output.rb +0 -204
  153. data/test/plugin/test_out_copy.rb +0 -308
  154. data/test/plugin/test_out_exec.rb +0 -312
  155. data/test/plugin/test_out_exec_filter.rb +0 -606
  156. data/test/plugin/test_out_file.rb +0 -1038
  157. data/test/plugin/test_out_forward.rb +0 -1349
  158. data/test/plugin/test_out_http.rb +0 -557
  159. data/test/plugin/test_out_null.rb +0 -105
  160. data/test/plugin/test_out_relabel.rb +0 -28
  161. data/test/plugin/test_out_roundrobin.rb +0 -146
  162. data/test/plugin/test_out_secondary_file.rb +0 -458
  163. data/test/plugin/test_out_stdout.rb +0 -205
  164. data/test/plugin/test_out_stream.rb +0 -103
  165. data/test/plugin/test_output.rb +0 -1334
  166. data/test/plugin/test_output_as_buffered.rb +0 -2024
  167. data/test/plugin/test_output_as_buffered_backup.rb +0 -363
  168. data/test/plugin/test_output_as_buffered_compress.rb +0 -179
  169. data/test/plugin/test_output_as_buffered_overflow.rb +0 -250
  170. data/test/plugin/test_output_as_buffered_retries.rb +0 -966
  171. data/test/plugin/test_output_as_buffered_secondary.rb +0 -882
  172. data/test/plugin/test_output_as_standard.rb +0 -374
  173. data/test/plugin/test_owned_by.rb +0 -34
  174. data/test/plugin/test_parser.rb +0 -399
  175. data/test/plugin/test_parser_apache.rb +0 -42
  176. data/test/plugin/test_parser_apache2.rb +0 -47
  177. data/test/plugin/test_parser_apache_error.rb +0 -45
  178. data/test/plugin/test_parser_csv.rb +0 -200
  179. data/test/plugin/test_parser_json.rb +0 -244
  180. data/test/plugin/test_parser_labeled_tsv.rb +0 -160
  181. data/test/plugin/test_parser_msgpack.rb +0 -127
  182. data/test/plugin/test_parser_multiline.rb +0 -111
  183. data/test/plugin/test_parser_nginx.rb +0 -88
  184. data/test/plugin/test_parser_none.rb +0 -52
  185. data/test/plugin/test_parser_regexp.rb +0 -284
  186. data/test/plugin/test_parser_syslog.rb +0 -650
  187. data/test/plugin/test_parser_tsv.rb +0 -122
  188. data/test/plugin/test_sd_file.rb +0 -228
  189. data/test/plugin/test_sd_srv.rb +0 -230
  190. data/test/plugin/test_storage.rb +0 -166
  191. data/test/plugin/test_storage_local.rb +0 -335
  192. data/test/plugin/test_string_util.rb +0 -26
  193. data/test/plugin_helper/data/cert/cert-key.pem +0 -27
  194. data/test/plugin_helper/data/cert/cert-with-CRLF.pem +0 -19
  195. data/test/plugin_helper/data/cert/cert-with-no-newline.pem +0 -19
  196. data/test/plugin_helper/data/cert/cert.pem +0 -19
  197. data/test/plugin_helper/data/cert/cert_chains/ca-cert-key.pem +0 -27
  198. data/test/plugin_helper/data/cert/cert_chains/ca-cert.pem +0 -20
  199. data/test/plugin_helper/data/cert/cert_chains/cert-key.pem +0 -27
  200. data/test/plugin_helper/data/cert/cert_chains/cert.pem +0 -40
  201. data/test/plugin_helper/data/cert/empty.pem +0 -0
  202. data/test/plugin_helper/data/cert/generate_cert.rb +0 -125
  203. data/test/plugin_helper/data/cert/with_ca/ca-cert-key-pass.pem +0 -30
  204. data/test/plugin_helper/data/cert/with_ca/ca-cert-key.pem +0 -27
  205. data/test/plugin_helper/data/cert/with_ca/ca-cert-pass.pem +0 -20
  206. data/test/plugin_helper/data/cert/with_ca/ca-cert.pem +0 -20
  207. data/test/plugin_helper/data/cert/with_ca/cert-key-pass.pem +0 -30
  208. data/test/plugin_helper/data/cert/with_ca/cert-key.pem +0 -27
  209. data/test/plugin_helper/data/cert/with_ca/cert-pass.pem +0 -21
  210. data/test/plugin_helper/data/cert/with_ca/cert.pem +0 -21
  211. data/test/plugin_helper/data/cert/without_ca/cert-key-pass.pem +0 -30
  212. data/test/plugin_helper/data/cert/without_ca/cert-key.pem +0 -27
  213. data/test/plugin_helper/data/cert/without_ca/cert-pass.pem +0 -20
  214. data/test/plugin_helper/data/cert/without_ca/cert.pem +0 -20
  215. data/test/plugin_helper/http_server/test_app.rb +0 -65
  216. data/test/plugin_helper/http_server/test_route.rb +0 -32
  217. data/test/plugin_helper/service_discovery/test_manager.rb +0 -93
  218. data/test/plugin_helper/service_discovery/test_round_robin_balancer.rb +0 -21
  219. data/test/plugin_helper/test_cert_option.rb +0 -25
  220. data/test/plugin_helper/test_child_process.rb +0 -862
  221. data/test/plugin_helper/test_compat_parameters.rb +0 -358
  222. data/test/plugin_helper/test_event_emitter.rb +0 -80
  223. data/test/plugin_helper/test_event_loop.rb +0 -52
  224. data/test/plugin_helper/test_extract.rb +0 -194
  225. data/test/plugin_helper/test_formatter.rb +0 -255
  226. data/test/plugin_helper/test_http_server_helper.rb +0 -372
  227. data/test/plugin_helper/test_inject.rb +0 -561
  228. data/test/plugin_helper/test_metrics.rb +0 -137
  229. data/test/plugin_helper/test_parser.rb +0 -264
  230. data/test/plugin_helper/test_record_accessor.rb +0 -238
  231. data/test/plugin_helper/test_retry_state.rb +0 -1006
  232. data/test/plugin_helper/test_server.rb +0 -1895
  233. data/test/plugin_helper/test_service_discovery.rb +0 -165
  234. data/test/plugin_helper/test_socket.rb +0 -146
  235. data/test/plugin_helper/test_storage.rb +0 -542
  236. data/test/plugin_helper/test_thread.rb +0 -164
  237. data/test/plugin_helper/test_timer.rb +0 -130
  238. data/test/scripts/exec_script.rb +0 -32
  239. data/test/scripts/fluent/plugin/formatter1/formatter_test1.rb +0 -7
  240. data/test/scripts/fluent/plugin/formatter2/formatter_test2.rb +0 -7
  241. data/test/scripts/fluent/plugin/formatter_known.rb +0 -8
  242. data/test/scripts/fluent/plugin/out_test.rb +0 -81
  243. data/test/scripts/fluent/plugin/out_test2.rb +0 -80
  244. data/test/scripts/fluent/plugin/parser_known.rb +0 -4
  245. data/test/test_capability.rb +0 -74
  246. data/test/test_clock.rb +0 -164
  247. data/test/test_config.rb +0 -369
  248. data/test/test_configdsl.rb +0 -148
  249. data/test/test_daemonizer.rb +0 -91
  250. data/test/test_engine.rb +0 -203
  251. data/test/test_event.rb +0 -531
  252. data/test/test_event_router.rb +0 -348
  253. data/test/test_event_time.rb +0 -199
  254. data/test/test_file_wrapper.rb +0 -53
  255. data/test/test_filter.rb +0 -121
  256. data/test/test_fluent_log_event_router.rb +0 -99
  257. data/test/test_formatter.rb +0 -369
  258. data/test/test_input.rb +0 -31
  259. data/test/test_log.rb +0 -1076
  260. data/test/test_match.rb +0 -148
  261. data/test/test_mixin.rb +0 -351
  262. data/test/test_msgpack_factory.rb +0 -50
  263. data/test/test_oj_options.rb +0 -55
  264. data/test/test_output.rb +0 -278
  265. data/test/test_plugin.rb +0 -251
  266. data/test/test_plugin_classes.rb +0 -370
  267. data/test/test_plugin_helper.rb +0 -81
  268. data/test/test_plugin_id.rb +0 -119
  269. data/test/test_process.rb +0 -14
  270. data/test/test_root_agent.rb +0 -951
  271. data/test/test_static_config_analysis.rb +0 -177
  272. data/test/test_supervisor.rb +0 -821
  273. data/test/test_test_drivers.rb +0 -136
  274. data/test/test_time_formatter.rb +0 -301
  275. data/test/test_time_parser.rb +0 -362
  276. data/test/test_tls.rb +0 -65
  277. data/test/test_unique_id.rb +0 -47
  278. data/test/test_variable_store.rb +0 -65
@@ -1,165 +0,0 @@
1
- require_relative '../helper'
2
- require 'flexmock/test_unit'
3
- require 'fluent/plugin_helper/service_discovery'
4
- require 'fluent/plugin/output'
5
-
6
- class ServiceDiscoveryHelper < Test::Unit::TestCase
7
- class Dummy < Fluent::Plugin::TestBase
8
- helpers :service_discovery
9
-
10
- # Make these mehtod public
11
- def service_discovery_create_manager(title, configurations:, load_balancer: nil, custom_build_method: nil, interval: 3)
12
- super
13
- end
14
-
15
- def discovery_manager
16
- super
17
- end
18
- end
19
-
20
- class DummyPlugin < Fluent::Plugin::TestBase
21
- helpers :service_discovery
22
-
23
- def configure(conf)
24
- super
25
- service_discovery_configure(:service_discovery_helper_test, static_default_service_directive: 'node')
26
- end
27
-
28
- def select_service(&block)
29
- service_discovery_select_service(&block)
30
- end
31
-
32
- # Make these mehtod public
33
- def discovery_manager
34
- super
35
- end
36
- end
37
-
38
- setup do
39
- @sd_file_dir = File.expand_path('../plugin/data/sd_file', __dir__)
40
-
41
- @d = nil
42
- end
43
-
44
- teardown do
45
- if @d
46
- @d.stop unless @d.stopped?
47
- @d.shutdown unless @d.shutdown?
48
- @d.after_shutdown unless @d.after_shutdown?
49
- @d.close unless @d.closed?
50
- @d.terminate unless @d.terminated?
51
- end
52
- end
53
-
54
- test 'support calling #service_discovery_create_manager and #discovery_manager from plugin' do
55
- d = @d = Dummy.new
56
-
57
- d.service_discovery_create_manager(
58
- :service_discovery_helper_test,
59
- configurations: [{ type: :static, conf: config_element('root', '', {}, [config_element('service', '', { 'host' => '127.0.0.1', 'port' => '1234' })]) }],
60
- )
61
-
62
- assert_true !!d.discovery_manager
63
-
64
- mock.proxy(d.discovery_manager).start.once
65
- mock.proxy(d).timer_execute(:service_discovery_helper_test, anything).never
66
-
67
- d.start
68
- d.event_loop_wait_until_start
69
-
70
- services = d.discovery_manager.services
71
- assert_equal 1, services.size
72
- assert_equal '127.0.0.1', services[0].host
73
- assert_equal 1234, services[0].port
74
- end
75
-
76
- test 'start discovery manager' do
77
- d = @d = DummyPlugin.new
78
-
79
- services = [config_element('service', '', { 'host' => '127.0.0.1', 'port' => '1234' })]
80
- d.configure(config_element('root', '', {}, [config_element('service_discovery', '', {'@type' => 'static'}, services)]))
81
-
82
- assert_true !!d.discovery_manager
83
-
84
- mock.proxy(d.discovery_manager).start.once
85
- mock.proxy(d).timer_execute(:service_discovery_helper_test, anything).never
86
-
87
- d.start
88
- d.event_loop_wait_until_start
89
-
90
- assert_equal 1, d.discovery_manager.services.size
91
- d.select_service do |serv|
92
- assert_equal "127.0.0.1", serv.host
93
- assert_equal 1234, serv.port
94
- end
95
- end
96
-
97
- test 'call timer_execute if dynamic configuration' do
98
- d = @d = DummyPlugin.new
99
- d.configure(config_element('root', '', {}, [config_element('service_discovery', '', { '@type' => 'file', 'path' => File.join(@sd_file_dir, 'config.yml' )})]))
100
-
101
- assert_true !!d.discovery_manager
102
- mock.proxy(d.discovery_manager).start.once
103
- mock(d).timer_execute(:service_discovery_helper_test, anything).once
104
- d.start
105
- d.event_loop_wait_until_start
106
- end
107
-
108
- test 'exits service discovery instances without any errors' do
109
- d = @d = DummyPlugin.new
110
- mockv = flexmock('dns_resolver', getaddress: '127.0.0.1')
111
- .should_receive(:getresources)
112
- .and_return([Resolv::DNS::Resource::IN::SRV.new(1, 10, 8081, 'service1.example.com')])
113
- .mock
114
- mock(Resolv::DNS).new { mockv }
115
-
116
- d.configure(config_element('root', '', {}, [config_element('service_discovery', '', { '@type' => 'srv', 'service' => 'service1', 'hostname' => 'example.com' })]))
117
-
118
- assert_true !!d.discovery_manager
119
- mock.proxy(d.discovery_manager).start.once
120
- mock(d).timer_execute(:service_discovery_helper_test, anything).once
121
-
122
- # To avoid claring `@logs` during `terminate` step
123
- # https://github.com/fluent/fluentd/blob/bc78d889f93dad8c2a4e0ad1ca802546185dacba/lib/fluent/test/log.rb#L33
124
- mock(d.log).reset.times(3)
125
-
126
- d.start
127
- d.event_loop_wait_until_start
128
-
129
- d.stop unless d.stopped?
130
- d.shutdown unless d.shutdown?
131
- d.after_shutdown unless d.after_shutdown?
132
- d.close unless d.closed?
133
- d.terminate unless d.terminated?
134
-
135
- assert_false(d.log.out.logs.any? { |e| e.match?(/thread doesn't exit correctly/) })
136
- end
137
-
138
- test 'static service discovery will be configured automatically when default service directive is specified' do
139
- d = @d = DummyPlugin.new
140
-
141
- nodes = [
142
- config_element('node', '', { 'host' => '192.168.0.1', 'port' => '24224' }),
143
- config_element('node', '', { 'host' => '192.168.0.2', 'port' => '24224' })
144
- ]
145
- d.configure(config_element('root', '', {}, nodes))
146
-
147
- assert_true !!d.discovery_manager
148
-
149
- mock.proxy(d.discovery_manager).start.once
150
- mock.proxy(d).timer_execute(:service_discovery_helper_test, anything).never
151
-
152
- d.start
153
- d.event_loop_wait_until_start
154
-
155
- assert_equal 2, d.discovery_manager.services.size
156
- d.select_service do |serv|
157
- assert_equal "192.168.0.1", serv.host
158
- assert_equal 24224, serv.port
159
- end
160
- d.select_service do |serv|
161
- assert_equal "192.168.0.2", serv.host
162
- assert_equal 24224, serv.port
163
- end
164
- end
165
- end
@@ -1,146 +0,0 @@
1
- require_relative '../helper'
2
- require 'fluent/plugin_helper/socket'
3
- require 'fluent/plugin/base'
4
-
5
- require 'socket'
6
- require 'openssl'
7
-
8
- class SocketHelperTest < Test::Unit::TestCase
9
- CERT_DIR = File.expand_path(File.dirname(__FILE__) + '/data/cert/without_ca')
10
- CA_CERT_DIR = File.expand_path(File.dirname(__FILE__) + '/data/cert/with_ca')
11
- CERT_CHAINS_DIR = File.expand_path(File.dirname(__FILE__) + '/data/cert/cert_chains')
12
-
13
- def setup
14
- @port = unused_port
15
- end
16
-
17
- def teardown
18
- @port = nil
19
- end
20
-
21
- class SocketHelperTestPlugin < Fluent::Plugin::TestBase
22
- helpers :socket
23
- end
24
-
25
- class EchoTLSServer
26
- def initialize(port, host: '127.0.0.1', cert_path: nil, private_key_path: nil, ca_path: nil)
27
- server = TCPServer.open(host, port)
28
- ctx = OpenSSL::SSL::SSLContext.new
29
- ctx.cert = OpenSSL::X509::Certificate.new(File.open(cert_path)) if cert_path
30
-
31
- cert_store = OpenSSL::X509::Store.new
32
- cert_store.set_default_paths
33
- cert_store.add_file(ca_path) if ca_path
34
- ctx.cert_store = cert_store
35
-
36
- ctx.key = OpenSSL::PKey::RSA.new(File.open(private_key_path)) if private_key_path
37
- ctx.verify_mode = OpenSSL::SSL::VERIFY_PEER
38
- ctx.verify_hostname = false
39
-
40
- @server = OpenSSL::SSL::SSLServer.new(server, ctx)
41
- @thread = nil
42
- @r, @w = IO.pipe
43
- end
44
-
45
- def start
46
- do_start
47
-
48
- if block_given?
49
- begin
50
- yield
51
- @thread.join(5)
52
- ensure
53
- stop
54
- end
55
- end
56
- end
57
-
58
- def stop
59
- unless @w.closed?
60
- @w.write('stop')
61
- end
62
-
63
- [@server, @w, @r].each do |s|
64
- next if s.closed?
65
- s.close
66
- end
67
-
68
- @thread.join(5)
69
- end
70
-
71
- private
72
-
73
- def do_start
74
- @thread = Thread.new(@server) do |s|
75
- socks, _, _ = IO.select([s.accept, @r], nil, nil)
76
-
77
- if socks.include?(@r)
78
- break
79
- end
80
-
81
- sock = socks.first
82
- buf = +''
83
- loop do
84
- b = sock.read_nonblock(1024, nil, exception: false)
85
- if b == :wait_readable || b.nil?
86
- break
87
- end
88
- buf << b
89
- end
90
-
91
- sock.write(buf)
92
- sock.close
93
- end
94
- end
95
- end
96
-
97
- test 'with self-signed cert/key pair' do
98
- cert_path = File.join(CERT_DIR, 'cert.pem')
99
- private_key_path = File.join(CERT_DIR, 'cert-key.pem')
100
-
101
- EchoTLSServer.new(@port, cert_path: cert_path, private_key_path: private_key_path).start do
102
- client = SocketHelperTestPlugin.new.socket_create_tls('127.0.0.1', @port, verify_fqdn: false, cert_paths: [cert_path])
103
- client.write('hello')
104
- assert_equal 'hello', client.readpartial(100)
105
- client.close
106
- end
107
- end
108
-
109
- test 'with cert/key signed by self-signed CA' do
110
- cert_path = File.join(CA_CERT_DIR, 'cert.pem')
111
- private_key_path = File.join(CA_CERT_DIR, 'cert-key.pem')
112
-
113
- ca_cert_path = File.join(CA_CERT_DIR, 'ca-cert.pem')
114
-
115
- EchoTLSServer.new(@port, cert_path: cert_path, private_key_path: private_key_path).start do
116
- client = SocketHelperTestPlugin.new.socket_create_tls('127.0.0.1', @port, verify_fqdn: false, cert_paths: [ca_cert_path])
117
- client.write('hello')
118
- assert_equal 'hello', client.readpartial(100)
119
- client.close
120
- end
121
- end
122
-
123
- test 'with cert/key signed by self-signed CA in server and client cert chain' do
124
- cert_path = File.join(CERT_DIR, 'cert.pem')
125
- private_key_path = File.join(CERT_DIR, 'cert-key.pem')
126
-
127
- client_ca_cert_path = File.join(CERT_CHAINS_DIR, 'ca-cert.pem')
128
- client_cert_path = File.join(CERT_CHAINS_DIR, 'cert.pem')
129
- client_private_key_path = File.join(CERT_CHAINS_DIR, 'cert-key.pem')
130
-
131
- EchoTLSServer.new(@port, cert_path: cert_path, private_key_path: private_key_path, ca_path: client_ca_cert_path).start do
132
- client = SocketHelperTestPlugin.new.socket_create_tls('127.0.0.1', @port, verify_fqdn: false, cert_path: client_cert_path, private_key_path: client_private_key_path, cert_paths: [cert_path])
133
- client.write('hello')
134
- assert_equal 'hello', client.readpartial(100)
135
- client.close
136
- end
137
- end
138
-
139
- test 'with empty cert file' do
140
- cert_path = File.expand_path(File.dirname(__FILE__) + '/data/cert/empty.pem')
141
-
142
- assert_raise Fluent::ConfigError do
143
- SocketHelperTestPlugin.new.socket_create_tls('127.0.0.1', @port, cert_path: cert_path)
144
- end
145
- end
146
- end