valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make onlyif and unless run with the same settings as the cmd itself.

Browse Source 
The unless and onlyif checks should be executed with the same working
directory, user, group, shell, and environment as the command itself.
Take this example for instance:

createuser --no-superuser --no-createdb --no-createrole joe:
  cmd.run:
    - unless: psql --tuples-only -c 'SELECT rolname FROM
              pg_catalog.pg_roles;' | grep '^joe$'
    - user: postgres

Before this fix this state will fail during the unless check since its
beeing executed by root in a normal PostgreSQL setup.

In addition a bug where the effective gid was not reset when the
state returned early was fixed.
This commit is contained in:
Eivind Uggedal 2012-05-08 16:57:19 +02:00
parent 11a896b14d
commit 188545b7f4
1 changed files with 45 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
salt/states/cmd.py
View File

@ -118,33 +118,10 @@ def run(name,
'result': False,
'comment': ''}
if onlyif:
if __salt__['cmd.retcode'](onlyif) != 0:
ret['comment'] = 'onlyif exec failed'
ret['result'] = True
return ret
if unless:
if __salt__['cmd.retcode'](unless) == 0:
ret['comment'] = 'unless executed successfully'
ret['result'] = True
return ret
if not os.path.isdir(cwd):
ret['comment'] = 'Desired working directory is not available'
return ret
pgid = os.getegid()
if group:
try:
egid = grp.getgrnam(group).gr_gid
if not __opts__['test']:
os.setegid(egid)
except KeyError:
ret['comment'] = 'The group {0} is not available'.format(group)
return ret
if env:
_env = {}
for var in env.split():
@ -156,22 +133,52 @@ def run(name,
return ret
env = _env
# Wow, we passed the test, run this sucker!
if not __opts__['test']:
try:
cmd_all = __salt__['cmd.run_all'](name, cwd, runas=user,
shell=shell, env=env)
except CommandExecutionError as e:
ret['comment'] = e
return ret
pgid = os.getegid()
ret['changes'] = cmd_all
ret['result'] = not bool(cmd_all['retcode'])
ret['comment'] = 'Command "{0}" run'.format(name)
os.setegid(pgid)
try:
if group:
try:
egid = grp.getgrnam(group).gr_gid
if not __opts__['test']:
os.setegid(egid)
except KeyError:
ret['comment'] = 'The group {0} is not available'.format(group)
return ret
cmd_kwargs = {'cwd': cwd,
'runas': user,
'shell': shell,
'env': env}
if onlyif:
if __salt__['cmd.retcode'](onlyif, **cmd_kwargs) != 0:
ret['comment'] = 'onlyif exec failed'
ret['result'] = True
return ret
if unless:
if __salt__['cmd.retcode'](unless, **cmd_kwargs) == 0:
ret['comment'] = 'unless executed successfully'
ret['result'] = True
return ret
# Wow, we passed the test, run this sucker!
if not __opts__['test']:
try:
cmd_all = __salt__['cmd.run_all'](name, **cmd_kwargs)
except CommandExecutionError as e:
ret['comment'] = e
return ret
ret['changes'] = cmd_all
ret['result'] = not bool(cmd_all['retcode'])
ret['comment'] = 'Command "{0}" run'.format(name)
return ret
ret['result'] = None
ret['comment'] = 'Command "{0}" would have been executed'.format(name)
return ret
ret['result'] = None
ret['comment'] = 'Command "{0}" would have been executed'.format(name)
return ret
finally:
os.setegid(pgid)
mod_watch = run