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

Merge pull request #14197 from bcoca/safer_data_load

Browse source 
load now does not modify the incomming data
This commit is contained in:
Brian Coca 2016-02-02 00:02:23 -05:00
commit eafc31f3f8
1 changed files with 16 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
lib/ansible/parsing/dataloader.py
View file

@ -20,7 +20,6 @@ from __future__ import (absolute_import, division, print_function)
__metaclass__ = type __metaclass__ = type
import copy import copy
import json
import os import os
import stat import stat
import subprocess import subprocess
@ -74,30 +73,24 @@ class DataLoader():
a JSON or YAML string. a JSON or YAML string.
''' '''
# YAML parser will take JSON as it is a subset.
if isinstance(data, AnsibleUnicode):
# The PyYAML's libyaml bindings use PyUnicode_CheckExact so
# they are unable to cope with our subclass.
# Unwrap and re-wrap the unicode so we can keep track of line
# numbers
in_data = text_type(data)
else:
in_data = data
try: try:
# we first try to load this data as JSON new_data = self._safe_load(in_data, file_name=file_name)
return json.loads(data) except YAMLError as yaml_exc:
except: self._handle_error(yaml_exc, file_name, show_content)
# if loading JSON failed for any reason, we go ahead
# and try to parse it as YAML instead
if isinstance(data, AnsibleUnicode): if isinstance(data, AnsibleUnicode):
# The PyYAML's libyaml bindings use PyUnicode_CheckExact so new_data = AnsibleUnicode(new_data)
# they are unable to cope with our subclass. new_data.ansible_pos = data.ansible_pos
# Unwrap and re-wrap the unicode so we can keep track of line return new_data
# numbers
new_data = text_type(data)
else:
new_data = data
try:
new_data = self._safe_load(new_data, file_name=file_name)
except YAMLError as yaml_exc:
self._handle_error(yaml_exc, file_name, show_content)
if isinstance(data, AnsibleUnicode):
new_data = AnsibleUnicode(new_data)
new_data.ansible_pos = data.ansible_pos
return new_data
def load_from_file(self, file_name): def load_from_file(self, file_name):
''' Loads data from a file, which can contain either JSON or YAML. ''' ''' Loads data from a file, which can contain either JSON or YAML. '''