ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-24 11:21:25 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Use to_bytes on filenames in filesystem calls.

Browse source
This commit is contained in:
Matt Clay 2016-03-04 02:11:35 -08:00
parent 27a33a6f18
commit 5b79ed77e7
6 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/ansible/utils/hashing.py
View file

@ -21,6 +21,7 @@ __metaclass__ = type
import os
from ansible.errors import AnsibleError
from ansible.utils.unicode import to_bytes
# Note, sha1 is the only hash algorithm compatible with python2.4 and with
# FIPS-140 mode (as of 11-2014)
@ -54,12 +55,12 @@ def secure_hash_s(data, hash_func=sha1):
def secure_hash(filename, hash_func=sha1):
''' Return a secure hash hex digest of local file, None if file is not present or a directory. '''
if not os.path.exists(filename) or os.path.isdir(filename):
if not os.path.exists(to_bytes(filename, errors='strict')) or os.path.isdir(to_bytes(filename, errors='strict')):
return None
digest = hash_func()
blocksize = 64 * 1024
try:
infile = open(filename, 'rb')
infile = open(to_bytes(filename, errors='strict'), 'rb')
block = infile.read(blocksize)
while block:
digest.update(block)