fox-it/log4j-finder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #33 from yunzheng/main

Browse Source 
Fallback to BytesIO only when needed regarding ZipFile nested zips
This commit is contained in:
yunzheng
2021-12-17 17:20:42 +01:00
committed by GitHub
parent abece018d3 f179c081d8
commit 16283db339
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
log4j-finder.py
View File

@@ -149,9 +149,15 @@ def iter_jarfile(fobj, parents=None, stats=None):
if zpath.name.lower() in FILENAMES:
yield (zinfo, zfile, zpath, parents)
elif zpath.name.lower().endswith(JAR_EXTENSIONS):
yield from iter_jarfile(
io.BytesIO(zfile.open(zinfo.filename).read()), parents=parents + [zpath]
)
zfobj = zfile.open(zinfo.filename)
try:
# Test if we can open the zfobj without errors, fallback to BytesIO otherwise
# see https://github.com/fox-it/log4j-finder/pull/22
zipfile.ZipFile(zfobj)
except zipfile.BadZipFile as e:
log.debug(f"Got {zinfo}: {e}, falling back to BytesIO")
zfobj = io.BytesIO(zfile.open(zinfo.filename).read())
yield from iter_jarfile(zfobj, parents=parents + [zpath])
except IOError as e:
log.debug(f"{fobj}: {e}")
except zipfile.BadZipFile as e: