github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-23 22:27:21 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix password support for Modules

Browse source 
Module settings should use value field for setting password in
Elasticsearch output config, not the implicit, obfuscated to_s value.

Fixes #8226
This commit is contained in:
Rob Bavey 2017-09-12 17:21:15 -04:00
parent 5ad11dacc7
commit 1ceda5a27f
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
logstash-core/lib/logstash/modules/logstash_config.rb
View file

@ -69,7 +69,7 @@ module LogStash module Modules class LogStashConfig
password = @settings["var.elasticsearch.password"]
lines = ["hosts => #{hosts}", "index => \"#{index}\""]
lines.push(user ? "user => \"#{user}\"" : nil)
lines.push(password ? "password => \"#{password}\"" : nil)
lines.push(password ? "password => \"#{password_value(password)}\"" : nil)
lines.push(type_string ? "document_type => #{type_string}" : nil)
lines.push("ssl => #{@settings.fetch('var.elasticsearch.ssl.enabled', false)}")
if cacert = @settings["var.elasticsearch.ssl.certificate_authority"]
@ -84,6 +84,10 @@ elasticsearch {
CONF
end
def password_value(password)
password.is_a?(LogStash::Util::Password) ? password.value : password
end
def config_string
# process the template and settings
# send back as a string

8
logstash-core/spec/logstash/modules/logstash_config_spec.rb
View file

@ -3,7 +3,7 @@ require "logstash/modules/logstash_config"
describe LogStash::Modules::LogStashConfig do
let(:mod) { instance_double("module", :directory => Stud::Temporary.directory, :module_name => "testing") }
let(:settings) { {"var.logstash.testing.pants" => "fancy" }}
let(:settings) { {"var.logstash.testing.pants" => "fancy", "var.elasticsearch.password" => LogStash::Util::Password.new('correct_horse_battery_staple') }}
subject { described_class.new(mod, settings) }
describe "configured inputs" do
@ -36,6 +36,12 @@ describe LogStash::Modules::LogStashConfig do
end
end
describe 'elastic_search_config' do
it 'should put the password in correctly' do
expect(subject.elasticsearch_output_config()).to include("password => \"correct_horse_battery_staple\"")
end
end
describe "alias modules options" do
let(:alias_table) do
{ "var.logstash.testing" => "var.logstash.better" }