mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-14 23:12:46 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

use subclass hack for better ZIP cloning

Browse source 
See https://bugs.python.org/issue43547 for more info on the details.

thanks to @obfusk for the technique
This commit is contained in:
Felix C. Stegerman 2021-04-12 19:30:45 +02:00
parent 3d6345a595
commit 67a0f3ae5b
No known key found for this signature in database
GPG key ID: B218FF2C27FC6CC6
2 changed files with 31 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

26
fdroidserver/common.py
View file

@ -3,6 +3,7 @@
# common.py - part of the FDroid server tools # common.py - part of the FDroid server tools
# Copyright (C) 2010-13, Ciaran Gultnieks, ciaran@ciarang.com # Copyright (C) 2010-13, Ciaran Gultnieks, ciaran@ciarang.com
# Copyright (C) 2013-2014 Daniel Martí <mvdan@mvdan.cc> # Copyright (C) 2013-2014 Daniel Martí <mvdan@mvdan.cc>
# Copyright (C) 2021 Felix C. Stegerman <flx@obfusk.net>
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by # it under the terms of the GNU Affero General Public License as published by
@ -3007,6 +3008,27 @@ def metadata_find_developer_signing_files(appid, vercode):
return None return None
class ClonedZipInfo(zipfile.ZipInfo):
"""Hack to allow fully cloning ZipInfo instances
The zipfile library has some bugs that prevent it from fully
cloning ZipInfo entries. https://bugs.python.org/issue43547
"""
def __init__(self, zinfo):
self.original = zinfo
for k in self.__slots__:
try:
setattr(self, k, getattr(zinfo, k))
except AttributeError:
pass
def __getattribute__(self, name):
if name in ("date_time", "external_attr", "flag_bits"):
return getattr(self.original, name)
return object.__getattribute__(self, name)
def apk_strip_v1_signatures(signed_apk, strip_manifest=False): def apk_strip_v1_signatures(signed_apk, strip_manifest=False):
"""Removes signatures from APK. """Removes signatures from APK.
@ -3024,10 +3046,10 @@ def apk_strip_v1_signatures(signed_apk, strip_manifest=False):
if strip_manifest: if strip_manifest:
if info.filename != 'META-INF/MANIFEST.MF': if info.filename != 'META-INF/MANIFEST.MF':
buf = in_apk.read(info.filename) buf = in_apk.read(info.filename)
out_apk.writestr(info, buf) out_apk.writestr(ClonedZipInfo(info), buf)
else: else:
buf = in_apk.read(info.filename) buf = in_apk.read(info.filename)
out_apk.writestr(info, buf) out_apk.writestr(ClonedZipInfo(info), buf)
def _zipalign(unsigned_apk, aligned_apk): def _zipalign(unsigned_apk, aligned_apk):

7
tests/common.TestCase
View file

@ -1754,6 +1754,13 @@ class CommonTest(unittest.TestCase):
fdroidserver.common.read_pkg_args(appid_versionCode_pairs, allow_vercodes) fdroidserver.common.read_pkg_args(appid_versionCode_pairs, allow_vercodes)
) )
def test_apk_strip_v1_signatures(self):
testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
before = os.path.join(self.basedir, 'no_targetsdk_minsdk1_unsigned.apk')
after = os.path.join(testdir, 'after.apk')
shutil.copy(before, after)
fdroidserver.common.apk_strip_v1_signatures(after, strip_manifest=False)
if __name__ == "__main__": if __name__ == "__main__":
os.chdir(os.path.dirname(__file__)) os.chdir(os.path.dirname(__file__))