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

added some docstrings and error messages

Browse source
This commit is contained in:
Michael Pöhn 2017-09-20 00:58:19 +02:00
parent 6fc968f7cd
commit 75c5fa6355
2 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
fdroidserver/common.py
View file

@ -517,6 +517,18 @@ apk_release_filename_with_sigfp = re.compile('(?P<appid>[a-zA-Z0-9_\.]+)_(?P<ver
def apk_parse_release_filename(apkname): def apk_parse_release_filename(apkname):
"""Parses the name of an APK file according the F-Droids APK naming
scheme and returns the tokens.
WARNING: Returned values don't necessarily represent the APKs actual
properties, the are just paresed from the file name.
:returns: A triplet containing (appid, versionCode, signer), where appid
should be the package name, versionCode should be the integer
represion of the APKs version and signer should be the first 7 hex
digists of the sha256 signing key fingerprint which was used to sign
this APK.
"""
m = apk_release_filename_with_sigfp.match(apkname) m = apk_release_filename_with_sigfp.match(apkname)
if m: if m:
return m.group('appid'), m.group('vercode'), m.group('sigfp') return m.group('appid'), m.group('vercode'), m.group('sigfp')
@ -2037,7 +2049,7 @@ def signer_fingerprint_short(sig):
Extracts the first 7 hexadecimal digits of sha256 signing-key fingerprint Extracts the first 7 hexadecimal digits of sha256 signing-key fingerprint
for a given pkcs7 signature. for a given pkcs7 signature.
:param sig: Contents of an APK signature. :param sig: Contents of an APK signing certificate.
:returns: shortened signing-key fingerprint. :returns: shortened signing-key fingerprint.
""" """
return signer_fingerprint(sig)[:7] return signer_fingerprint(sig)[:7]
@ -2194,7 +2206,7 @@ def apk_strip_signatures(signed_apk, strip_manifest=False):
def apk_implant_signatures(apkpath, signaturefile, signedfile, manifest): def apk_implant_signatures(apkpath, signaturefile, signedfile, manifest):
"""Implats a signature from out metadata into an APK. """Implats a signature from metadata into an APK.
Note: this changes there supplied APK in place. So copy it if you Note: this changes there supplied APK in place. So copy it if you
need the original to be preserved. need the original to be preserved.

13
fdroidserver/index.py
View file

@ -242,6 +242,13 @@ def make_v1(apps, packages, repodir, repodict, requestsdict, fdroid_signing_key_
def v1_sort_packages(packages, repodir, fdroid_signing_key_fingerprints): def v1_sort_packages(packages, repodir, fdroid_signing_key_fingerprints):
"""Sorts the supplied list to ensure a deterministic sort order for
package entries in the index file. This sort-order also expresses
installation preference to the clients.
(First in this list = first to install)
:param packages: list of packages which need to be sorted before but into index file.
"""
GROUP_DEV_SIGNED = 1 GROUP_DEV_SIGNED = 1
GROUP_FDROID_SIGNED = 2 GROUP_FDROID_SIGNED = 2
@ -270,7 +277,7 @@ def v1_sort_packages(packages, repodir, fdroid_signing_key_fingerprints):
packages.sort(key=v1_sort_keys) packages.sort(key=v1_sort_keys)
def make_v0(apps, apks, repodir, repodict, requestsdict): def make_v0(apps, apks, repodir, repodict, requestsdict, fdroid_signing_key_fingerprints):
""" """
aka index.jar aka index.xml aka index.jar aka index.xml
""" """
@ -354,8 +361,6 @@ def make_v0(apps, apks, repodir, repodict, requestsdict):
root.appendChild(element) root.appendChild(element)
element.setAttribute('packageName', packageName) element.setAttribute('packageName', packageName)
fdroid_signed = load_sigkeys(repodir)
for appid, appdict in apps.items(): for appid, appdict in apps.items():
app = metadata.App(appdict) app = metadata.App(appdict)
@ -369,7 +374,7 @@ def make_v0(apps, apks, repodir, repodict, requestsdict):
if apk.get('versionCode') and apk.get('packageName') == appid: if apk.get('versionCode') and apk.get('packageName') == appid:
apksbyversion[apk['versionCode']].append(apk) apksbyversion[apk['versionCode']].append(apk)
for versionCode, apksforver in apksbyversion.items(): for versionCode, apksforver in apksbyversion.items():
fdroidsig = fdroid_signed.get(appid, {}).get('signer') fdroidsig = fdroid_signing_key_fingerprints.get(appid, {}).get('signer')
fdroid_signed_apk = None fdroid_signed_apk = None
name_match_apk = None name_match_apk = None
for x in apksforver: for x in apksforver: