mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-04 22:40:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Log zip recursion limit

Browse source
This commit is contained in:
Jochen Sprickerhof 2022-04-28 12:49:25 +02:00 • committed by Hans-Christoph Steiner
parent 5fc88431f8
commit 7ec3905734
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
fdroidserver/scanner.py
View file

@ -110,22 +110,29 @@ def get_embedded_classes(apkfile, depth=0):
""" """
apk_regex = re.compile(r'.*\.apk') apk_regex = re.compile(r'.*\.apk')
class_regex = re.compile(r'classes.*\.dex') class_regex = re.compile(r'classes.*\.dex')
with TemporaryDirectory() as tmp_dir: with TemporaryDirectory() as tmp_dir:
apk_classes = set() apk_classes = set()
with zipfile.ZipFile(apkfile, 'r') as apk_zip: with zipfile.ZipFile(apkfile, 'r') as apk_zip:
# apk files can contain apk files, again # apk files can contain apk files, again
if depth < 10: # zipbomb protection if depth > 10: # zipbomb protection
logging.error(_('max recursion depth in zip file reached: %s') % apk_zip)
else:
for apk in [name for name in apk_zip.namelist() if apk_regex.search(name)]: for apk in [name for name in apk_zip.namelist() if apk_regex.search(name)]:
with apk_zip.open(apk) as apk_fp: with apk_zip.open(apk) as apk_fp:
apk_classes = apk_classes.union(get_embedded_classes(apk_fp, depth + 1)) apk_classes = apk_classes.union(get_embedded_classes(apk_fp, depth + 1))
dexes = [name for name in apk_zip.namelist() if class_regex.search(name)] dexes = [name for name in apk_zip.namelist() if class_regex.search(name)]
for name in dexes: for name in dexes:
apk_zip.extract(name, tmp_dir) apk_zip.extract(name, tmp_dir)
if not dexes: if not dexes:
return apk_classes return apk_classes
tmp_dexes = ['{}/{}'.format(tmp_dir, dex) for dex in dexes] tmp_dexes = ['{}/{}'.format(tmp_dir, dex) for dex in dexes]
run = common.SdkToolsPopen(["dexdump"] + tmp_dexes) run = common.SdkToolsPopen(["dexdump"] + tmp_dexes)
classes = set(re.findall(r'[A-Z]+((?:\w+\/)+\w+)', run.output)) classes = set(re.findall(r'[A-Z]+((?:\w+\/)+\w+)', run.output))
return classes.union(apk_classes) return classes.union(apk_classes)