cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

use safe load instead

Browse source 
fixes #21724
This commit is contained in:
Brian Coca 2017-02-21 16:46:59 -05:00 committed by Brian Coca
parent 8ec28a2ba4
commit 5258e6d52a
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
contrib/inventory/stacki.py
View file

@ -170,7 +170,7 @@ def main():
for cfg_file in config_files:
if os.path.isfile(cfg_file):
stream = open(cfg_file, 'r')
config = yaml.load(stream)
config = yaml.safe_load(stream)
break
if not config:
sys.stderr.write("No config file found at {}\n".format(config_files))

2
lib/ansible/module_utils/aos.py
View file

@ -132,7 +132,7 @@ def content_to_dict(module, content):
# elif format in ['yaml', 'var']:
try:
content_dict = yaml.load(content)
content_dict = yaml.safe_load(content)
if not isinstance(content_dict, dict):
raise

2
lib/ansible/modules/cloud/cloudstack/cs_facts.py
View file

@ -146,7 +146,7 @@ class CloudStackFacts(object):
def _get_user_data_json(self):
try:
# this data come form users, we try what we can to parse it...
return yaml.load(self._fetch(CS_USERDATA_BASE_URL))
return yaml.safe_load(self._fetch(CS_USERDATA_BASE_URL))
except:
return None

4
lib/ansible/modules/clustering/kubernetes.py
View file

@ -347,13 +347,13 @@ def main():
if inline_data:
if not isinstance(inline_data, dict) and not isinstance(inline_data, list):
data = yaml.load(inline_data)
data = yaml.safe_load(inline_data)
else:
data = inline_data
else:
try:
f = open(file_reference, "r")
data = [x for x in yaml.load_all(f)]
data = [x for x in yaml.safe_load_all(f)]
f.close()
if not data:
module.fail_json(msg="No valid data could be found.")