Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

out_forward: Rename parameter tls_cert_path to tls_ca_cert_path #2181

Merged
merged 3 commits into from
Nov 21, 2018
+34 −3
Merged

out_forward: Rename parameter tls_cert_path to tls_ca_cert_path #2181

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
537173a
out_forward: Rename parameter tls_cert_path to tls_ca_cert_path
okkez Nov 16, 2018
71d202f
out_forward: Keep backward compatibility
okkez Nov 21, 2018
9d05f55
out_forward: Update test for checking backward compatibility
okkez Nov 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions lib/fluent/plugin/out_forward.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@ class ConnectionClosedError < Error; end
desc 'Verify hostname of servers and certificates or not in TLS transport.'
config_param :tls_verify_hostname, :bool, default: true
desc 'The additional CA certificate path for TLS.'
config_param :tls_cert_path, :array, value_type: :string, default: nil
config_param :tls_ca_cert_path, :array, value_type: :string, default: nil
config_param :tls_cert_path, :array, value_type: :string, default: nil, deprecated: "Use tls_ca_cert_path instead"

config_section :security, required: false, multi: false do
desc 'The hostname'
Expand Down Expand Up @@ -166,8 +167,8 @@ def configure(conf)
end

if @transport == :tls
if @tls_cert_path && !@tls_cert_path.empty?
okkez marked this conversation as resolved.
Show resolved Hide resolved
@tls_cert_path.each do |path|
if @tls_ca_cert_path && !@tls_ca_cert_path.empty?
@tls_ca_cert_path.each do |path|
raise Fluent::ConfigError, "specified cert path does not exist:#{path}" unless File.exist?(path)
raise Fluent::ConfigError, "specified cert path is not readable:#{path}" unless File.readable?(path)
end
Expand Down Expand Up @@ -324,7 +325,7 @@ def create_transfer_socket(host, port, hostname, &block)
verify_fqdn: @tls_verify_hostname,
fqdn: hostname,
allow_self_signed_cert: @tls_allow_self_signed_cert,
cert_paths: @tls_cert_path,
cert_paths: @tls_ca_cert_path,
linger_timeout: @send_timeout,
send_timeout: @send_timeout,
recv_timeout: @ack_response_timeout,
Expand Down
18 changes: 18 additions & 0 deletions test/plugin/test_out_forward.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,24 @@ def read_ack_from_sock(sock, unpacker)
assert{ logs.any?{|log| log.include?(expected_log) && log.include?(expected_detail) } }
end

test 'configure tls_cert_path is deprecated' do
conf = %[
send_timeout 5
transport tls
tls_insecure_mode true
tls_cert_path /tmp/dummy/cert.pem
<server>
host #{TARGET_HOST}
port #{TARGET_PORT}
</server>
]

d = create_driver(conf)
expected_log = "'tls_cert_path' parameter is deprecated: Use tls_ca_cert_path instead"
logs = d.logs
assert{ logs.any?{|log| log.include?(expected_log) } }
end

test 'compress_default_value' do
@d = d = create_driver
assert_equal :text, d.instance.compress
Expand Down