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

A few more sanity checks for detecting unzip output that's not a file entry (#3982)

Browse source 
* A few more sanity checks for detecting unzip output that's not a file entry

Also note that there's a rounding error somewhere in the mtime
comparison code.

* Fix reference to sub-array
This commit is contained in:
Toshio Kuratomi 2016-06-27 13:18:12 -07:00 committed by Matt Clay
parent c59510aaf4
commit 30399d94f6
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/ansible/modules/files/unarchive.py
View file

@ -314,13 +314,19 @@ class ZipArchive(object):
change = False change = False
pcs = line.split(None, 7) pcs = line.split(None, 7)
if len(pcs) != 8:
# Too few fields... probably a piece of the header or footer
continue
# Check first and seventh field in order to skip header/footer # Check first and seventh field in order to skip header/footer
if len(pcs[0]) != 7 and len(pcs[0]) != 10: continue if len(pcs[0]) != 7 and len(pcs[0]) != 10: continue
if len(pcs[6]) != 15: continue if len(pcs[6]) != 15: continue
if pcs[0][0] not in 'dl-?' or not frozenset(pcs[0][1:]).issubset('rwxst-'):
continue
ztype = pcs[0][0] ztype = pcs[0][0]
permstr = pcs[0][1:10] permstr = pcs[0][1:]
version = pcs[1] version = pcs[1]
ostype = pcs[2] ostype = pcs[2]
size = int(pcs[3]) size = int(pcs[3])
@ -394,6 +400,9 @@ class ZipArchive(object):
itemized = list('.%s.......??' % ftype) itemized = list('.%s.......??' % ftype)
# Note: this timestamp calculation has a rounding error
# somewhere... unzip and this timestamp can be one second off
# When that happens, we report a change and re-unzip the file
dt_object = datetime.datetime(*(time.strptime(pcs[6], '%Y%m%d.%H%M%S')[0:6])) dt_object = datetime.datetime(*(time.strptime(pcs[6], '%Y%m%d.%H%M%S')[0:6]))
timestamp = time.mktime(dt_object.timetuple()) timestamp = time.mktime(dt_object.timetuple())