opuppet/module-puppetlabs-mysql
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Escape $root_password during execs.

Browse source 
Some characters used in a password can cause the shell in an exec to do
unexpected things unless the password is enclosed in single quotes.
Updated the rspec tests to deal with the password quoting.
This commit is contained in:
Michael Arnold 2012-05-10 21:46:54 -07:00
parent 583e60fe84
commit 605fa718e1
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
manifests/config.pp
View file

@ -81,13 +81,13 @@ class mysql::config(
if $root_password != 'UNSET' { if $root_password != 'UNSET' {
case $old_root_password { case $old_root_password {
'': { $old_pw='' } '': { $old_pw='' }
default: { $old_pw="-p${old_root_password}" } default: { $old_pw="-p'${old_root_password}'" }
} }
exec { 'set_mysql_rootpw': exec { 'set_mysql_rootpw':
command => "mysqladmin -u root ${old_pw} password ${root_password}", command => "mysqladmin -u root ${old_pw} password '${root_password}'",
logoutput => true, logoutput => true,
unless => "mysqladmin -u root -p${root_password} status > /dev/null", unless => "mysqladmin -u root -p'${root_password}' status > /dev/null",
path => '/usr/local/sbin:/usr/bin:/usr/local/bin', path => '/usr/local/sbin:/usr/bin:/usr/local/bin',
notify => Exec['mysqld-restart'], notify => Exec['mysqld-restart'],
require => File['/etc/mysql/conf.d'], require => File['/etc/mysql/conf.d'],

12
spec/classes/mysql_config_spec.rb
View file

@ -59,9 +59,9 @@ describe 'mysql::config' do
end end
it { should contain_exec('set_mysql_rootpw').with( it { should contain_exec('set_mysql_rootpw').with(
'command' => 'mysqladmin -u root password foo', 'command' => 'mysqladmin -u root password \'foo\'',
'logoutput' => true, 'logoutput' => true,
'unless' => "mysqladmin -u root -pfoo status > /dev/null", 'unless' => "mysqladmin -u root -p\'foo\' status > /dev/null",
'path' => '/usr/local/sbin:/usr/bin:/usr/local/bin' 'path' => '/usr/local/sbin:/usr/bin:/usr/local/bin'
)} )}
@ -78,9 +78,9 @@ describe 'mysql::config' do
end end
it { should contain_exec('set_mysql_rootpw').with( it { should contain_exec('set_mysql_rootpw').with(
'command' => 'mysqladmin -u root -pbar password foo', 'command' => 'mysqladmin -u root -p\'bar\' password \'foo\'',
'logoutput' => true, 'logoutput' => true,
'unless' => "mysqladmin -u root -pfoo status > /dev/null", 'unless' => "mysqladmin -u root -p\'foo\' status > /dev/null",
'path' => '/usr/local/sbin:/usr/bin:/usr/local/bin' 'path' => '/usr/local/sbin:/usr/bin:/usr/local/bin'
)} )}
@ -186,9 +186,9 @@ describe 'mysql::config' do
end end
it { should contain_exec('set_mysql_rootpw').with( it { should contain_exec('set_mysql_rootpw').with(
'command' => 'mysqladmin -u root -pbar password foo', 'command' => 'mysqladmin -u root -p\'bar\' password \'foo\'',
'logoutput' => true, 'logoutput' => true,
'unless' => "mysqladmin -u root -pfoo status > /dev/null", 'unless' => "mysqladmin -u root -p\'foo\' status > /dev/null",
'path' => '/usr/local/sbin:/usr/bin:/usr/local/bin' 'path' => '/usr/local/sbin:/usr/bin:/usr/local/bin'
)} )}