mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-03 17:50:11 +02:00
prefer apksigner if installed, jarsigner sucks
Google has their own utility for verifying APK signatures on a desktop machine since Java's jarsigner is bad for the task. For example, it acts as if an unsigned APK validates. And to check whether an APK is unsigned using jarsigner is difficult. apksigner also does the v2 signatures, so it will have to be used eventually anyway. It is already in Debian/stretch and can be available in jessie-backports if need be. https://android.googlesource.com/platform/tools/apksig https://packages.debian.org/apksigner
This commit is contained in:
parent
ffd490d8da
commit
223c793201
@ -2054,18 +2054,35 @@ def verify_apks(signed_apk, unsigned_apk, tmp_dir):
|
||||
unsigned.close()
|
||||
signed.close()
|
||||
|
||||
if subprocess.call([config['jarsigner'], '-verify', tmp_apk]) != 0:
|
||||
logging.info("...NOT verified - {0}".format(unsigned_apk))
|
||||
return compare_apks(signed_apk, tmp_apk, tmp_dir)
|
||||
verified = verify_apk_signature(tmp_apk)
|
||||
|
||||
if not verified:
|
||||
logging.info("...NOT verified - {0}".format(tmp_apk))
|
||||
return compare_apks(signed_apk, tmp_apk, tmp_dir, os.path.dirname(unsigned_apk))
|
||||
|
||||
logging.info("...successfully verified")
|
||||
return None
|
||||
|
||||
|
||||
def verify_apk_signature(apk):
|
||||
"""verify the signature on an APK
|
||||
|
||||
Try to use apksigner whenever possible since jarsigner is very
|
||||
shitty: unsigned APKs pass as "verified"! So this has to turn on
|
||||
-strict then check for result 4.
|
||||
|
||||
"""
|
||||
if set_command_in_config('apksigner'):
|
||||
return subprocess.call([config['apksigner'], 'verify', apk]) == 0
|
||||
else:
|
||||
logging.warning("Using Java's jarsigner, not recommended for verifying APKs! Use apksigner")
|
||||
return subprocess.call([config['jarsigner'], '-strict', '-verify', apk]) == 4
|
||||
|
||||
|
||||
apk_badchars = re.compile('''[/ :;'"]''')
|
||||
|
||||
|
||||
def compare_apks(apk1, apk2, tmp_dir):
|
||||
def compare_apks(apk1, apk2, tmp_dir, log_dir=None):
|
||||
"""Compare two apks
|
||||
|
||||
Returns None if the apk content is the same (apart from the signing key),
|
||||
@ -2073,12 +2090,16 @@ def compare_apks(apk1, apk2, tmp_dir):
|
||||
trying to do the comparison.
|
||||
"""
|
||||
|
||||
if not log_dir:
|
||||
log_dir = tmp_dir
|
||||
|
||||
absapk1 = os.path.abspath(apk1)
|
||||
absapk2 = os.path.abspath(apk2)
|
||||
|
||||
if set_command_in_config('diffoscope'):
|
||||
htmlfile = absapk1 + '.diffoscope.html'
|
||||
textfile = absapk1 + '.diffoscope.txt'
|
||||
logfilename = os.path.join(log_dir, os.path.basename(absapk1))
|
||||
htmlfile = logfilename + '.diffoscope.html'
|
||||
textfile = logfilename + '.diffoscope.txt'
|
||||
if subprocess.call([config['diffoscope'],
|
||||
'--max-report-size', '12345678', '--max-diff-block-lines', '100',
|
||||
'--html', htmlfile, '--text', textfile,
|
||||
|
@ -178,6 +178,18 @@ class CommonTest(unittest.TestCase):
|
||||
# these should be resigned, and therefore different
|
||||
self.assertNotEqual(open(sourcefile, 'rb').read(), open(testfile, 'rb').read())
|
||||
|
||||
def test_verify_apk_signature(self):
|
||||
fdroidserver.common.config = None
|
||||
config = fdroidserver.common.read_config(fdroidserver.common.options)
|
||||
config['jarsigner'] = fdroidserver.common.find_sdk_tools_cmd('jarsigner')
|
||||
fdroidserver.common.config = config
|
||||
|
||||
self.assertTrue(fdroidserver.common.verify_apk_signature('urzip.apk'))
|
||||
self.assertFalse(fdroidserver.common.verify_apk_signature('urzip-badcert.apk'))
|
||||
self.assertFalse(fdroidserver.common.verify_apk_signature('urzip-badsig.apk'))
|
||||
self.assertTrue(fdroidserver.common.verify_apk_signature('urzip-release.apk'))
|
||||
self.assertFalse(fdroidserver.common.verify_apk_signature('urzip-release-unsigned.apk'))
|
||||
|
||||
def test_verify_apks(self):
|
||||
fdroidserver.common.config = None
|
||||
config = fdroidserver.common.read_config(fdroidserver.common.options)
|
||||
|
Loading…
Reference in New Issue
Block a user