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

fixed memoryerror when coping huge file (#16392)

Browse source 
* fixed

* support both python 2 and 3
This commit is contained in:
nyasukun 2016-07-22 22:06:06 +09:00 committed by Brian Coca
parent 84c1697271
commit adea1f2b80
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -380,11 +380,11 @@ class DataLoader():
try: try:
with open(to_bytes(real_path), 'rb') as f: with open(to_bytes(real_path), 'rb') as f:
data = f.read() if self._vault.is_encrypted(f):
if self._vault.is_encrypted(data):
# if the file is encrypted and no password was specified, # if the file is encrypted and no password was specified,
# the decrypt call would throw an error, but we check first # the decrypt call would throw an error, but we check first
# since the decrypt function doesn't know the file name # since the decrypt function doesn't know the file name
data = f.read()
if not self._vault_password: if not self._vault_password:
raise AnsibleParserError("A vault password must be specified to decrypt %s" % file_path) raise AnsibleParserError("A vault password must be specified to decrypt %s" % file_path)

6
lib/ansible/parsing/vault/__init__.py
View file

@ -115,6 +115,12 @@ class VaultLib:
:returns: True if it is recognized. Otherwise, False. :returns: True if it is recognized. Otherwise, False.
""" """
if hasattr(data, 'read'):
current_position = data.tell()
header_part = data.read(len(b_HEADER))
data.seek(current_position)
return self.is_encrypted(header_part)
if to_bytes(data, errors='strict', encoding='utf-8').startswith(b_HEADER): if to_bytes(data, errors='strict', encoding='utf-8').startswith(b_HEADER):
return True return True
return False return False