kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-20 13:50:12 +01:00
Code Activity

nightly: stop stripping APKs before signing, apksigner does it

Browse Source 
* https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1033#note_742563869
* https://github.com/wardvl/f-droid-nightly-action/issues/3
This commit is contained in:
Hans-Christoph Steiner 2022-02-21 22:40:22 +01:00
parent 01d1869d59
commit d1fd58681e
No known key found for this signature in database
GPG Key ID: 3E177817BA1B9BFA
2 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fdroidserver/nightly.py
View File

@ -349,7 +349,6 @@ Last updated: {date}'''.format(repo_git_base=repo_git_base,
'Resigning {apkfilename} with provided debug.keystore'
).format(apkfilename=os.path.basename(apkfilename))
)
common.apk_strip_v1_signatures(apkfilename, strip_manifest=True)
common.sign_apk(apkfilename, destapk, KEY_ALIAS)
if options.verbose:

40
tests/common.TestCase
View File

@ -870,6 +870,46 @@ class CommonTest(unittest.TestCase):
self.assertFalse(os.path.isfile(unsigned))
self.assertTrue(fdroidserver.common.verify_apk_signature(signed))
def test_resign_apk(self):
"""When using apksigner, it should resign signed APKs"""
config = fdroidserver.common.read_config(fdroidserver.common.options)
if 'apksigner' not in config:
self.skipTest('SKIPPING test_resign_apk, apksigner not installed!')
config['keyalias'] = 'sova'
config['keystorepass'] = 'r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI='
config['keypass'] = 'r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI='
config['keystore'] = os.path.join(self.basedir, 'keystore.jks')
fdroidserver.common.config = config
fdroidserver.signindex.config = config
testdir = tempfile.mkdtemp(
prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir
)
os.chdir(testdir)
os.mkdir('unsigned')
os.mkdir('repo')
for apk in (
'org.bitbucket.tickytacky.mirrormirror_4.apk',
'v2.only.sig_2.apk',
'SystemWebView-repack.apk',
):
original = os.path.join(self.basedir, apk)
unsigned = os.path.join('unsigned', apk)
resign = os.path.join('repo', apk)
shutil.copy(original, unsigned)
fdroidserver.common.sign_apk(unsigned, resign, config['keyalias'])
self.assertTrue(
fdroidserver.common.verify_apk_signature(resign), apk + " verifies"
)
self.assertTrue(os.path.isfile(resign))
self.assertFalse(os.path.isfile(unsigned))
self.assertNotEqual(
fdroidserver.common.get_first_signer_certificate(original),
fdroidserver.common.get_first_signer_certificate(resign)
)
def test_get_apk_id(self):
config = dict()
fdroidserver.common.fill_config_defaults(config)