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

Merge branch 'start-integrating' into 'master'

Browse source 
start integrating

See merge request fdroid/fdroidserver!1631
This commit is contained in:
Hans-Christoph Steiner 2025-03-31 15:34:14 +00:00
commit bb7394ab3c
2 changed files with 6 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

26
fdroidserver/common.py
View file

@ -3410,22 +3410,6 @@ def apk_signer_fingerprint(apk_path):
return signer_fingerprint(cert_encoded) return signer_fingerprint(cert_encoded)
def apk_signer_fingerprint_short(apk_path):
"""Get 7 hex digit SHA-256 fingerprint string for the first signer from given APK.
Parameters
----------
apk_path
path to APK
Returns
-------
first 7 chars of the standard SHA-256 signer fingerprint
"""
return apk_signer_fingerprint(apk_path)[:7]
def metadata_get_sigdir(appid, vercode=None): def metadata_get_sigdir(appid, vercode=None):
"""Get signature directory for app.""" """Get signature directory for app."""
if vercode: if vercode:
@ -3958,11 +3942,13 @@ def compare_apks(apk1, apk2, tmp_dir, log_dir=None):
f.extractall(path=os.path.join(apk2dir, 'content')) f.extractall(path=os.path.join(apk2dir, 'content'))
if set_command_in_config('apktool'): if set_command_in_config('apktool'):
if subprocess.call([config['apktool'], 'd', absapk1, '--output', 'apktool'], if subprocess.call(
cwd=apk1dir) != 0: [config['apktool'], 'd', absapk1, '--output', 'apktool'], cwd=apk1dir
):
return "Failed to run apktool " + apk1 return "Failed to run apktool " + apk1
if subprocess.call([config['apktool'], 'd', absapk2, '--output', 'apktool'], if subprocess.call(
cwd=apk2dir) != 0: [config['apktool'], 'd', absapk2, '--output', 'apktool'], cwd=apk2dir
):
return "Failed to run apktool " + apk2 return "Failed to run apktool " + apk2
p = FDroidPopen(['diff', '-r', apk1dir, apk2dir], output=False) p = FDroidPopen(['diff', '-r', apk1dir, apk2dir], output=False)

12
tests/test_common.py
View file

@ -794,18 +794,6 @@ class CommonTest(SetUpTearDownMixin, unittest.TestCase):
self.assertEqual(keytoolcertfingerprint, self.assertEqual(keytoolcertfingerprint,
fdroidserver.common.apk_signer_fingerprint(apkfile)) fdroidserver.common.apk_signer_fingerprint(apkfile))
@unittest.skipIf(sys.byteorder == 'big', 'androguard is not ported to big-endian')
def test_apk_signer_fingerprint_short(self):
# fingerprints fetched with: keytool -printcert -file ____.RSA
testapks = (('repo/obb.main.oldversion_1444412523.apk', '818e469'),
('repo/obb.main.twoversions_1101613.apk', '32a2362'),
('repo/obb.main.twoversions_1101617.apk', '32a2362'))
for apkfile, keytoolcertfingerprint in testapks:
self.assertEqual(keytoolcertfingerprint,
fdroidserver.common.apk_signer_fingerprint_short(apkfile))
def test_find_apksigner_system_package_default_path(self): def test_find_apksigner_system_package_default_path(self):
"""apksigner should be automatically used from the PATH""" """apksigner should be automatically used from the PATH"""
usr_bin_apksigner = '/usr/bin/apksigner' usr_bin_apksigner = '/usr/bin/apksigner'