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

Handle BadZipFile

Browse source
This commit is contained in:
Jochen Sprickerhof 2022-05-02 13:37:08 +02:00 • committed by Hans-Christoph Steiner
parent 925cdbe542
commit c80fdd5ce8
1 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

23
fdroidserver/scanner.py
View file

@ -115,17 +115,20 @@ def get_embedded_classes(apkfile, depth=0):
class_regex = re.compile(r'classes.*\.dex') class_regex = re.compile(r'classes.*\.dex')
classes = set() classes = set()
with TemporaryDirectory() as tmp_dir, zipfile.ZipFile(apkfile, 'r') as apk_zip: try:
for info in apk_zip.infolist(): with TemporaryDirectory() as tmp_dir, zipfile.ZipFile(apkfile, 'r') as apk_zip:
# apk files can contain apk files, again for info in apk_zip.infolist():
if apk_regex.search(info.filename): # apk files can contain apk files, again
with apk_zip.open(info) as apk_fp: if apk_regex.search(info.filename):
classes = classes.union(get_embedded_classes(apk_fp, depth + 1)) with apk_zip.open(info) as apk_fp:
classes = classes.union(get_embedded_classes(apk_fp, depth + 1))
elif class_regex.search(info.filename): elif class_regex.search(info.filename):
apk_zip.extract(info, tmp_dir) apk_zip.extract(info, tmp_dir)
run = common.SdkToolsPopen(["dexdump", '{}/{}'.format(tmp_dir, info.filename)]) run = common.SdkToolsPopen(["dexdump", '{}/{}'.format(tmp_dir, info.filename)])
classes = classes.union(set(re.findall(r'[A-Z]+((?:\w+\/)+\w+)', run.output))) classes = classes.union(set(re.findall(r'[A-Z]+((?:\w+\/)+\w+)', run.output)))
except zipfile.BadZipFile as ex:
return {_('Problem with ZIP file: %s, error %s') % (apkfile, ex)}
return classes return classes