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 double password wrap

Browse source 
Password settings for Modules supplied via a yml file were being wrapped inside a
LogStash::Utils::Password object twice during startup - once in from_yaml, and once
in validate. Disallow this from happening by skipping the wrap if the password is
already wrapped

This should complete the fix for #8224

Fixes #8258
This commit is contained in:
Rob Bavey 2017-09-14 12:41:59 -04:00
parent 7c6450cd59
commit 38bd1d4c1b
2 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
logstash-core/lib/logstash/util/modules_setting_array.rb
View file

@ -16,7 +16,7 @@ module LogStash module Util class ModulesSettingArray
@original = value
# wrap passwords
@original.each do |hash|
hash.keys.select{|key| key.to_s.end_with?('password')}.each do |key|
hash.keys.select{|key| key.to_s.end_with?('password') && !hash[key].is_a?(LogStash::Util::Password)}.each do |key|
hash[key] = LogStash::Util::Password.new(hash[key])
end
end

13
logstash-core/spec/logstash/settings/modules_spec.rb
View file

@ -9,12 +9,23 @@ describe LogStash::Setting::Modules do
describe "Modules.Cli" do
subject { described_class.new("mycloudid", LogStash::Util::ModulesSettingArray, []) }
context "when given an array of hashes that contains a password key" do
let(:secret) { 'some_secret'}
it "should convert password Strings to Password" do
source = [{"var.kibana.password" => "some_secret"}]
source = [{"var.kibana.password" => secret}]
setting = subject.set(source)
expect(setting).to be_a(Array)
expect(setting.__class__).to eq(LogStash::Util::ModulesSettingArray)
expect(setting.first.fetch("var.kibana.password")).to be_a(LogStash::Util::Password)
expect(setting.first.fetch("var.kibana.password").value).to eq(secret)
end
it 'should not wrap values that are already passwords' do
source = [{"var.kibana.password" => LogStash::Util::Password.new(secret)}]
setting = subject.set(source)
expect(setting).to be_a(Array)
expect(setting.__class__).to eq(LogStash::Util::ModulesSettingArray)
expect(setting.first.fetch("var.kibana.password")).to be_a(LogStash::Util::Password)
expect(setting.first.fetch("var.kibana.password").value).to eq(secret)
end
end
end