Skip to content

DAAS-245 fix crash when zip has password #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CrimsonGlory wants to merge 1 commit into
base: master
Choose a base branch
from
Open

DAAS-245 fix crash when zip has password #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added daas/daas_app/tests/resources/9a978978b27d437be8fb6c186f71540dab5a559a.zip
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions daas/daas_app/tests/test_utils/resource_directories.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@
ZIP_PROTECTED = '/test_resources/zip_protected_password_is_ASDF1234.zip'
ZIPPED_APK_SAMPLE = '/test_resources/42e4149aef780867bda918c0c61d8ecdb620f691.zip'
APK_ZIPPED_PACK = '/test_resources/apk_pack.zip'
ZIPPED_APK_PASSWORD_PROTECTED_SAMPLE = '/test_resources/9a978978b27d437be8fb6c186f71540dab5a559a.zip'
5 changes: 5 additions & 0 deletions decompilers/apk_decompiler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@ def unzip(self):
except BadZipFile:
logging.error('[APK] File is corrupt (BadZipFile). Marking as failed.')
raise CorruptAPKException("APK file is corrupt and cannot be extracted as ZIP")
except RuntimeError as e:
if 'is encrypted, password required for extraction' in str(e):
logging.error('[APK] File is encrypted and requires a password. Marking as failed.')
raise CorruptAPKException("APK file is encrypted and requires a password for extraction")
raise

def apk_to_java_files(self):
decompiled = False
Expand Down