openstack/puppet-oslo
Code Issues Proposed changes

Secure transport_url option in log

Browse Source 
As transport_url option contains rabbit_password,
it should not keep plaintext in logs.

Closes-Bug: #1640809
Change-Id: I958c51050ee48db1ee359ff75dc20ad13e14a672
This commit is contained in:
Xingchao Yu
2016-11-10 22:27:47 +08:00
parent f8c4eee0da
commit 782e94e82e
5 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/messaging/default.pp
View File

@@ -34,7 +34,7 @@ define oslo::messaging::default(
$default_options = { $default_options = {
'DEFAULT/rpc_response_timeout' => { value => $rpc_response_timeout }, 'DEFAULT/rpc_response_timeout' => { value => $rpc_response_timeout },
'DEFAULT/transport_url' => { value => $transport_url }, 'DEFAULT/transport_url' => { value => $transport_url, secret => true },
'DEFAULT/control_exchange' => { value => $control_exchange }, 'DEFAULT/control_exchange' => { value => $control_exchange },
} }

2
manifests/messaging/notifications.pp
View File

@@ -46,7 +46,7 @@ define oslo::messaging::notifications(
$notification_options = { $notification_options = {
'oslo_messaging_notifications/driver' => { value => $driver_orig }, 'oslo_messaging_notifications/driver' => { value => $driver_orig },
'oslo_messaging_notifications/transport_url' => { value => $transport_url }, 'oslo_messaging_notifications/transport_url' => { value => $transport_url, secret => true },
'oslo_messaging_notifications/topics' => { value => $topics_orig }, 'oslo_messaging_notifications/topics' => { value => $topics_orig },
} }

3
releasenotes/notes/secure-transport-url-d67d307cf85a16b1.yaml Normal file
View File

@@ -0,0 +1,3 @@
---
security:
- Secure transport_url option in logs

2
spec/defines/oslo_messaging_default_spec.rb
View File

@@ -26,7 +26,7 @@ describe 'oslo::messaging::default' do
it 'configure DEFAULT with overriden values' do it 'configure DEFAULT with overriden values' do
is_expected.to contain_keystone_config('DEFAULT/rpc_response_timeout').with_value('42') is_expected.to contain_keystone_config('DEFAULT/rpc_response_timeout').with_value('42')
is_expected.to contain_keystone_config('DEFAULT/transport_url').with_value('proto://url') is_expected.to contain_keystone_config('DEFAULT/transport_url').with_value('proto://url').with_secret(true)
is_expected.to contain_keystone_config('DEFAULT/control_exchange').with_value('openstack') is_expected.to contain_keystone_config('DEFAULT/control_exchange').with_value('openstack')
end end
end end

2
spec/defines/oslo_messaging_notifications_spec.rb
View File

@@ -25,7 +25,7 @@ describe 'oslo::messaging::notifications' do
it 'configure oslo_messaging_notifications with overriden values' do it 'configure oslo_messaging_notifications with overriden values' do
is_expected.to contain_keystone_config('oslo_messaging_notifications/driver').with_value('messaging') is_expected.to contain_keystone_config('oslo_messaging_notifications/driver').with_value('messaging')
is_expected.to contain_keystone_config('oslo_messaging_notifications/transport_url').with_value('some_protocol://some_url') is_expected.to contain_keystone_config('oslo_messaging_notifications/transport_url').with_value('some_protocol://some_url').with_secret(true)
is_expected.to contain_keystone_config('oslo_messaging_notifications/topics').with_value('notifications') is_expected.to contain_keystone_config('oslo_messaging_notifications/topics').with_value('notifications')
end end
end end