wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace dangerous shell calls with module.run_command

Browse source
This commit is contained in:
Evgenii Terechkov 2016-08-30 23:50:12 +07:00 committed by Matt Clay
parent 8fd4785062
commit da71acf1bf
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/ansible/modules/packaging/os/apt_rpm.py
View file

@ -75,7 +75,7 @@ RPM_PATH="/usr/bin/rpm"
def query_package(module, name): def query_package(module, name):
# rpm -q returns 0 if the package is installed, # rpm -q returns 0 if the package is installed,
# 1 if it is not installed # 1 if it is not installed
rc = os.system("%s -q %s" % (RPM_PATH,name)) rc, out, err = module.run_command("%s -q %s" % (RPM_PATH,name))
if rc == 0: if rc == 0:
return True return True
else: else:
@ -84,14 +84,14 @@ def query_package(module, name):
def query_package_provides(module, name): def query_package_provides(module, name):
# rpm -q returns 0 if the package is installed, # rpm -q returns 0 if the package is installed,
# 1 if it is not installed # 1 if it is not installed
rc = os.system("%s -q --provides %s >/dev/null" % (RPM_PATH,name)) rc, out, err = module.run_command("%s -q --provides %s" % (RPM_PATH,name))
return rc == 0 return rc == 0
def update_package_db(module): def update_package_db(module):
rc = os.system("%s update" % APT_PATH) rc, out, err = module.run_command("%s update" % APT_PATH)
if rc != 0: if rc != 0:
module.fail_json(msg="could not update package db") module.fail_json(msg="could not update package db: %s" % err)
def remove_packages(module, packages): def remove_packages(module, packages):
@ -102,10 +102,10 @@ def remove_packages(module, packages):
if not query_package(module, package): if not query_package(module, package):
continue continue
rc = os.system("%s -y remove %s > /dev/null" % (APT_PATH,package)) rc, out, err = module.run_command("%s -y remove %s" % (APT_PATH,package))
if rc != 0: if rc != 0:
module.fail_json(msg="failed to remove %s" % (package)) module.fail_json(msg="failed to remove %s: %s" % (package, err))
remove_c += 1 remove_c += 1
@ -124,9 +124,7 @@ def install_packages(module, pkgspec):
if len(packages) != 0: if len(packages) != 0:
cmd = ("%s -y install %s > /dev/null" % (APT_PATH, packages)) rc, out, err = module.run_command("%s -y install %s" % (APT_PATH, packages))
rc, out, err = module.run_command(cmd,use_unsafe_shell=True)
installed = True installed = True
for packages in pkgspec: for packages in pkgspec: