2017-03-29 18:10:04 +02:00
|
|
|
#!/usr/bin/env python3
|
|
|
|
#
|
|
|
|
# update.py - part of the FDroid server tools
|
|
|
|
# Copyright (C) 2017, Torsten Grote <t at grobox dot de>
|
|
|
|
# Copyright (C) 2016, Blue Jay Wireless
|
|
|
|
# Copyright (C) 2014-2016, Hans-Christoph Steiner <hans@eds.org>
|
|
|
|
# Copyright (C) 2010-2015, Ciaran Gultnieks <ciaran@ciarang.com>
|
|
|
|
# Copyright (C) 2013-2014, Daniel Martí <mvdan@mvdan.cc>
|
|
|
|
#
|
|
|
|
# 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
|
|
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
|
|
# (at your option) any later version.
|
|
|
|
#
|
|
|
|
# This program is distributed in the hope that it will be useful,
|
|
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
# GNU Affero General Public License for more details.
|
|
|
|
#
|
|
|
|
# You should have received a copy of the GNU Affero General Public License
|
|
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
import collections
|
|
|
|
import json
|
|
|
|
import logging
|
|
|
|
import os
|
|
|
|
import re
|
|
|
|
import shutil
|
2017-03-29 23:33:09 +02:00
|
|
|
import tempfile
|
2017-03-29 18:10:04 +02:00
|
|
|
import urllib.parse
|
2017-03-29 23:33:09 +02:00
|
|
|
import zipfile
|
2017-09-03 23:07:43 +02:00
|
|
|
import calendar
|
2017-03-29 18:10:04 +02:00
|
|
|
from binascii import hexlify, unhexlify
|
2018-04-25 14:20:19 +02:00
|
|
|
from datetime import datetime, timezone
|
2017-03-29 18:10:04 +02:00
|
|
|
from xml.dom.minidom import Document
|
|
|
|
|
2017-09-13 18:03:57 +02:00
|
|
|
from . import _
|
|
|
|
from . import common
|
|
|
|
from . import metadata
|
|
|
|
from . import net
|
|
|
|
from . import signindex
|
2017-09-20 00:16:13 +02:00
|
|
|
from fdroidserver.common import FDroidPopen, FDroidPopenBytes, load_stats_fdroid_signing_key_fingerprints
|
2020-06-03 22:28:18 +02:00
|
|
|
from fdroidserver.exception import FDroidException, VerificationException
|
2017-03-29 18:10:04 +02:00
|
|
|
|
|
|
|
|
2020-06-03 22:27:09 +02:00
|
|
|
def make(apps, apks, repodir, archive):
|
2017-03-29 18:10:04 +02:00
|
|
|
"""Generate the repo index files.
|
|
|
|
|
|
|
|
This requires properly initialized options and config objects.
|
|
|
|
|
2020-06-03 22:28:18 +02:00
|
|
|
:param apps: OrderedDict of apps to go into the index, each app should have
|
|
|
|
at least one associated apk
|
|
|
|
:param apks: list of apks to go into the index
|
2017-03-29 18:10:04 +02:00
|
|
|
:param repodir: the repo directory
|
|
|
|
:param archive: True if this is the archive repo, False if it's the
|
|
|
|
main one.
|
|
|
|
"""
|
|
|
|
from fdroidserver.update import METADATA_VERSION
|
|
|
|
|
2017-03-31 15:50:15 +02:00
|
|
|
if not common.options.nosign:
|
2017-10-16 18:11:57 +02:00
|
|
|
common.assert_config_keystore(common.config)
|
2017-03-29 18:10:04 +02:00
|
|
|
|
2020-06-03 22:28:18 +02:00
|
|
|
# Historically the index has been sorted by App Name, so we enforce this ordering here
|
2020-11-17 23:49:04 +01:00
|
|
|
sortedids = sorted(apps, key=lambda appid: common.get_app_display_name(apps[appid]).upper())
|
2020-06-03 22:28:18 +02:00
|
|
|
sortedapps = collections.OrderedDict()
|
|
|
|
for appid in sortedids:
|
|
|
|
sortedapps[appid] = apps[appid]
|
|
|
|
|
2017-03-29 18:10:04 +02:00
|
|
|
repodict = collections.OrderedDict()
|
2018-04-25 14:20:19 +02:00
|
|
|
repodict['timestamp'] = datetime.utcnow().replace(tzinfo=timezone.utc)
|
2017-03-29 18:10:04 +02:00
|
|
|
repodict['version'] = METADATA_VERSION
|
|
|
|
|
2017-03-31 15:50:15 +02:00
|
|
|
if common.config['repo_maxage'] != 0:
|
|
|
|
repodict['maxage'] = common.config['repo_maxage']
|
2017-03-29 18:10:04 +02:00
|
|
|
|
|
|
|
if archive:
|
2017-03-31 15:50:15 +02:00
|
|
|
repodict['name'] = common.config['archive_name']
|
|
|
|
repodict['icon'] = os.path.basename(common.config['archive_icon'])
|
|
|
|
repodict['address'] = common.config['archive_url']
|
|
|
|
repodict['description'] = common.config['archive_description']
|
|
|
|
urlbasepath = os.path.basename(urllib.parse.urlparse(common.config['archive_url']).path)
|
2017-03-29 18:10:04 +02:00
|
|
|
else:
|
2017-03-31 15:50:15 +02:00
|
|
|
repodict['name'] = common.config['repo_name']
|
|
|
|
repodict['icon'] = os.path.basename(common.config['repo_icon'])
|
|
|
|
repodict['address'] = common.config['repo_url']
|
|
|
|
repodict['description'] = common.config['repo_description']
|
|
|
|
urlbasepath = os.path.basename(urllib.parse.urlparse(common.config['repo_url']).path)
|
2017-03-29 18:10:04 +02:00
|
|
|
|
|
|
|
mirrorcheckfailed = False
|
|
|
|
mirrors = []
|
2019-02-22 21:38:20 +01:00
|
|
|
for mirror in common.config.get('mirrors', []):
|
2017-03-29 18:10:04 +02:00
|
|
|
base = os.path.basename(urllib.parse.urlparse(mirror).path.rstrip('/'))
|
2017-03-31 15:50:15 +02:00
|
|
|
if common.config.get('nonstandardwebroot') is not True and base != 'fdroid':
|
2017-09-13 18:03:57 +02:00
|
|
|
logging.error(_("mirror '%s' does not end with 'fdroid'!") % mirror)
|
2017-03-29 18:10:04 +02:00
|
|
|
mirrorcheckfailed = True
|
|
|
|
# must end with / or urljoin strips a whole path segment
|
|
|
|
if mirror.endswith('/'):
|
|
|
|
mirrors.append(urllib.parse.urljoin(mirror, urlbasepath))
|
|
|
|
else:
|
|
|
|
mirrors.append(urllib.parse.urljoin(mirror + '/', urlbasepath))
|
2017-03-31 15:50:15 +02:00
|
|
|
for mirror in common.config.get('servergitmirrors', []):
|
2017-07-19 12:59:20 +02:00
|
|
|
for url in get_mirror_service_urls(mirror):
|
|
|
|
mirrors.append(url + '/' + repodir)
|
2017-03-29 18:10:04 +02:00
|
|
|
if mirrorcheckfailed:
|
2017-09-13 18:03:57 +02:00
|
|
|
raise FDroidException(_("Malformed repository mirrors."))
|
2017-03-29 18:10:04 +02:00
|
|
|
if mirrors:
|
|
|
|
repodict['mirrors'] = mirrors
|
|
|
|
|
2017-04-03 11:29:21 +02:00
|
|
|
requestsdict = collections.OrderedDict()
|
2017-03-29 18:10:04 +02:00
|
|
|
for command in ('install', 'uninstall'):
|
|
|
|
packageNames = []
|
|
|
|
key = command + '_list'
|
2017-03-31 15:50:15 +02:00
|
|
|
if key in common.config:
|
|
|
|
if isinstance(common.config[key], str):
|
|
|
|
packageNames = [common.config[key]]
|
|
|
|
elif all(isinstance(item, str) for item in common.config[key]):
|
|
|
|
packageNames = common.config[key]
|
2017-03-29 18:10:04 +02:00
|
|
|
else:
|
2017-09-13 18:03:57 +02:00
|
|
|
raise TypeError(_('only accepts strings, lists, and tuples'))
|
2017-03-29 18:10:04 +02:00
|
|
|
requestsdict[command] = packageNames
|
|
|
|
|
2017-09-20 00:16:13 +02:00
|
|
|
fdroid_signing_key_fingerprints = load_stats_fdroid_signing_key_fingerprints()
|
2017-03-29 18:10:04 +02:00
|
|
|
|
2020-06-03 22:28:18 +02:00
|
|
|
make_v0(sortedapps, apks, repodir, repodict, requestsdict,
|
2017-09-20 00:16:13 +02:00
|
|
|
fdroid_signing_key_fingerprints)
|
2020-06-03 22:28:18 +02:00
|
|
|
make_v1(sortedapps, apks, repodir, repodict, requestsdict,
|
2017-09-20 00:16:13 +02:00
|
|
|
fdroid_signing_key_fingerprints)
|
2017-03-29 18:10:04 +02:00
|
|
|
|
2017-09-20 00:16:13 +02:00
|
|
|
|
|
|
|
def make_v1(apps, packages, repodir, repodict, requestsdict, fdroid_signing_key_fingerprints):
|
2017-03-29 18:10:04 +02:00
|
|
|
|
|
|
|
def _index_encoder_default(obj):
|
|
|
|
if isinstance(obj, set):
|
2017-08-16 05:46:32 +02:00
|
|
|
return sorted(list(obj))
|
2017-03-29 18:10:04 +02:00
|
|
|
if isinstance(obj, datetime):
|
2017-09-03 23:07:43 +02:00
|
|
|
# Java prefers milliseconds
|
2020-06-29 21:45:22 +02:00
|
|
|
# we also need to account for time zone/daylight saving time
|
2017-09-03 23:07:43 +02:00
|
|
|
return int(calendar.timegm(obj.timetuple()) * 1000)
|
2017-09-04 02:23:17 +02:00
|
|
|
if isinstance(obj, dict):
|
|
|
|
d = collections.OrderedDict()
|
|
|
|
for key in sorted(obj.keys()):
|
|
|
|
d[key] = obj[key]
|
|
|
|
return d
|
2017-03-29 18:10:04 +02:00
|
|
|
raise TypeError(repr(obj) + " is not JSON serializable")
|
|
|
|
|
|
|
|
output = collections.OrderedDict()
|
|
|
|
output['repo'] = repodict
|
|
|
|
output['requests'] = requestsdict
|
|
|
|
|
2017-09-20 00:16:13 +02:00
|
|
|
# establish sort order of the index
|
2018-05-14 14:07:40 +02:00
|
|
|
v1_sort_packages(packages, fdroid_signing_key_fingerprints)
|
2017-09-20 00:16:13 +02:00
|
|
|
|
2017-03-29 18:10:04 +02:00
|
|
|
appslist = []
|
|
|
|
output['apps'] = appslist
|
2017-05-15 20:11:41 +02:00
|
|
|
for packageName, appdict in apps.items():
|
2017-03-29 18:10:04 +02:00
|
|
|
d = collections.OrderedDict()
|
|
|
|
appslist.append(d)
|
|
|
|
for k, v in sorted(appdict.items()):
|
|
|
|
if not v:
|
|
|
|
continue
|
eliminate app.builds everywhere, it should be app['Builds']
The .txt format was the last place where the lowercase "builds" was used,
this converts references everywhere to be "Builds". This makes it possible
to load metadata YAML files with any YAML parser, then have it possible to
use fdroidserver methods on that data, like metadata.write_metadata().
The test files in tests/metadata/dump/*.yaml were manually edited by cutting
the builds: block and putting it the sort order for Builds: so the contents
should be unchanged.
```
sed -i \
-e 's/app\.builds/app.get('Builds', \[\])/g' \
-e "s/app\.get(Builds, \[\]) =/app\['Builds'] =/g" \
-e "s/app\.get(Builds, \[\]) =/app\['Builds'] =/g" \
-e "s/app\.get(Builds, \[\])/app.get('Builds', \[\])/g" \
-e "s/app\.get('Builds', \[\])\.append/app\['Builds'\].append/g" \
-e "s/app\['builds'\]/app.get('Builds', [])/g" \
*/*.*
```
2020-12-09 16:01:21 +01:00
|
|
|
if k in ('Builds', 'comments', 'metadatapath',
|
2020-01-13 15:43:42 +01:00
|
|
|
'ArchivePolicy', 'AutoName', 'AutoUpdateMode', 'MaintainerNotes',
|
2017-03-29 18:10:04 +02:00
|
|
|
'Provides', 'Repo', 'RepoType', 'RequiresRoot',
|
|
|
|
'UpdateCheckData', 'UpdateCheckIgnore', 'UpdateCheckMode',
|
|
|
|
'UpdateCheckName', 'NoSourceSince', 'VercodeOperation'):
|
|
|
|
continue
|
|
|
|
|
|
|
|
# name things after the App class fields in fdroidclient
|
|
|
|
if k == 'id':
|
|
|
|
k = 'packageName'
|
|
|
|
elif k == 'CurrentVersionCode': # TODO make SuggestedVersionCode the canonical name
|
|
|
|
k = 'suggestedVersionCode'
|
|
|
|
elif k == 'CurrentVersion': # TODO make SuggestedVersionName the canonical name
|
|
|
|
k = 'suggestedVersionName'
|
|
|
|
else:
|
|
|
|
k = k[:1].lower() + k[1:]
|
|
|
|
d[k] = v
|
|
|
|
|
2017-09-04 02:23:17 +02:00
|
|
|
# establish sort order in localized dicts
|
|
|
|
for app in output['apps']:
|
|
|
|
localized = app.get('localized')
|
|
|
|
if localized:
|
|
|
|
lordered = collections.OrderedDict()
|
|
|
|
for lkey, lvalue in sorted(localized.items()):
|
|
|
|
lordered[lkey] = collections.OrderedDict()
|
|
|
|
for ikey, iname in sorted(lvalue.items()):
|
|
|
|
lordered[lkey][ikey] = iname
|
|
|
|
app['localized'] = lordered
|
|
|
|
|
2017-04-03 11:29:21 +02:00
|
|
|
output_packages = collections.OrderedDict()
|
2017-03-29 18:10:04 +02:00
|
|
|
output['packages'] = output_packages
|
|
|
|
for package in packages:
|
|
|
|
packageName = package['packageName']
|
2017-05-15 20:11:41 +02:00
|
|
|
if packageName not in apps:
|
2017-09-13 18:03:57 +02:00
|
|
|
logging.info(_('Ignoring package without metadata: ') + package['apkName'])
|
2017-05-15 20:11:41 +02:00
|
|
|
continue
|
2018-04-17 12:15:51 +02:00
|
|
|
if not package.get('versionName'):
|
|
|
|
app = apps[packageName]
|
|
|
|
versionCodeStr = str(package['versionCode']) # TODO build.versionCode should be int!
|
eliminate app.builds everywhere, it should be app['Builds']
The .txt format was the last place where the lowercase "builds" was used,
this converts references everywhere to be "Builds". This makes it possible
to load metadata YAML files with any YAML parser, then have it possible to
use fdroidserver methods on that data, like metadata.write_metadata().
The test files in tests/metadata/dump/*.yaml were manually edited by cutting
the builds: block and putting it the sort order for Builds: so the contents
should be unchanged.
```
sed -i \
-e 's/app\.builds/app.get('Builds', \[\])/g' \
-e "s/app\.get(Builds, \[\]) =/app\['Builds'] =/g" \
-e "s/app\.get(Builds, \[\]) =/app\['Builds'] =/g" \
-e "s/app\.get(Builds, \[\])/app.get('Builds', \[\])/g" \
-e "s/app\.get('Builds', \[\])\.append/app\['Builds'\].append/g" \
-e "s/app\['builds'\]/app.get('Builds', [])/g" \
*/*.*
```
2020-12-09 16:01:21 +01:00
|
|
|
for build in app.get('Builds', []):
|
2018-04-17 12:15:51 +02:00
|
|
|
if build['versionCode'] == versionCodeStr:
|
|
|
|
versionName = build.get('versionName')
|
|
|
|
logging.info(_('Overriding blank versionName in {apkfilename} from metadata: {version}')
|
|
|
|
.format(apkfilename=package['apkName'], version=versionName))
|
|
|
|
package['versionName'] = versionName
|
|
|
|
break
|
2017-03-29 18:10:04 +02:00
|
|
|
if packageName in output_packages:
|
|
|
|
packagelist = output_packages[packageName]
|
|
|
|
else:
|
|
|
|
packagelist = []
|
|
|
|
output_packages[packageName] = packagelist
|
|
|
|
d = collections.OrderedDict()
|
|
|
|
packagelist.append(d)
|
|
|
|
for k, v in sorted(package.items()):
|
|
|
|
if not v:
|
|
|
|
continue
|
|
|
|
if k in ('icon', 'icons', 'icons_src', 'name', ):
|
|
|
|
continue
|
|
|
|
d[k] = v
|
|
|
|
|
|
|
|
json_name = 'index-v1.json'
|
|
|
|
index_file = os.path.join(repodir, json_name)
|
|
|
|
with open(index_file, 'w') as fp:
|
2017-04-02 21:58:34 +02:00
|
|
|
if common.options.pretty:
|
|
|
|
json.dump(output, fp, default=_index_encoder_default, indent=2)
|
|
|
|
else:
|
|
|
|
json.dump(output, fp, default=_index_encoder_default)
|
2017-03-29 18:10:04 +02:00
|
|
|
|
2017-03-31 15:50:15 +02:00
|
|
|
if common.options.nosign:
|
2017-09-13 18:03:57 +02:00
|
|
|
logging.debug(_('index-v1 must have a signature, use `fdroid signindex` to create it!'))
|
2017-03-29 18:10:04 +02:00
|
|
|
else:
|
2017-03-31 15:50:15 +02:00
|
|
|
signindex.config = common.config
|
2017-03-29 18:10:04 +02:00
|
|
|
signindex.sign_index_v1(repodir, json_name)
|
|
|
|
|
|
|
|
|
2018-05-14 14:07:40 +02:00
|
|
|
def v1_sort_packages(packages, fdroid_signing_key_fingerprints):
|
2017-09-20 00:58:19 +02:00
|
|
|
"""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.
|
|
|
|
"""
|
2017-09-20 00:16:13 +02:00
|
|
|
|
|
|
|
GROUP_DEV_SIGNED = 1
|
|
|
|
GROUP_FDROID_SIGNED = 2
|
|
|
|
GROUP_OTHER_SIGNED = 3
|
|
|
|
|
|
|
|
def v1_sort_keys(package):
|
|
|
|
packageName = package.get('packageName', None)
|
|
|
|
|
|
|
|
sig = package.get('signer', None)
|
|
|
|
|
|
|
|
dev_sig = common.metadata_find_developer_signature(packageName)
|
|
|
|
group = GROUP_OTHER_SIGNED
|
|
|
|
if dev_sig and dev_sig == sig:
|
|
|
|
group = GROUP_DEV_SIGNED
|
|
|
|
else:
|
|
|
|
fdroidsig = fdroid_signing_key_fingerprints.get(packageName, {}).get('signer')
|
|
|
|
if fdroidsig and fdroidsig == sig:
|
|
|
|
group = GROUP_FDROID_SIGNED
|
|
|
|
|
|
|
|
versionCode = None
|
|
|
|
if package.get('versionCode', None):
|
|
|
|
versionCode = -int(package['versionCode'])
|
|
|
|
|
|
|
|
return(packageName, group, sig, versionCode)
|
|
|
|
|
|
|
|
packages.sort(key=v1_sort_keys)
|
|
|
|
|
|
|
|
|
2017-09-20 00:58:19 +02:00
|
|
|
def make_v0(apps, apks, repodir, repodict, requestsdict, fdroid_signing_key_fingerprints):
|
2017-03-29 18:10:04 +02:00
|
|
|
"""
|
|
|
|
aka index.jar aka index.xml
|
|
|
|
"""
|
|
|
|
|
|
|
|
doc = Document()
|
|
|
|
|
|
|
|
def addElement(name, value, doc, parent):
|
|
|
|
el = doc.createElement(name)
|
|
|
|
el.appendChild(doc.createTextNode(value))
|
|
|
|
parent.appendChild(el)
|
|
|
|
|
|
|
|
def addElementNonEmpty(name, value, doc, parent):
|
|
|
|
if not value:
|
|
|
|
return
|
|
|
|
addElement(name, value, doc, parent)
|
|
|
|
|
|
|
|
def addElementIfInApk(name, apk, key, doc, parent):
|
|
|
|
if key not in apk:
|
|
|
|
return
|
|
|
|
value = str(apk[key])
|
|
|
|
addElement(name, value, doc, parent)
|
|
|
|
|
2017-07-19 10:59:05 +02:00
|
|
|
def addElementCheckLocalized(name, app, key, doc, parent, default=''):
|
index: xml.dom.minidom no longer sorts attribs
It seems now that xml.dom.minidom preserves the order of attributes, rather
than sorting them. We assume alpha-sort, so this manually
This diff in the test suite running on Debian/testing pointed it out:
https://gitlab.com/fdroid/fdroidserver/-/jobs/486970383
```diff
--- /builds/fdroid/fdroidserver/tests/repo/index.xml 2020-04-11 13:36:57.000000000 +0000
+++ repo/index.xml 2020-04-11 13:41:44.000000000 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<fdroid>
- <repo icon="fdroid-icon.png" name="My First F-Droid Repo Demo" pubkey="308204e1308202c9a003020102020434597643300d06092a864886f70d01010b050030213110300e060355040b1307462d44726f6964310d300b06035504031304736f7661301e170d3136303931333230313930395a170d3434303133303230313930395a30213110300e060355040b1307462d44726f6964310d300b06035504031304736f766130820222300d06092a864886f70d01010105000382020f003082020a028202010086ef94b5aacf2ba4f38c875f4194b44f5644392e3715575d7c92828577e692c352b567172823851c8c72347fbc9d99684cd7ca3e1db3e4cca126382c53f2a5869fb4c19bdec989b2930501af3e758ff40588915fe96b10076ce3346a193a0277d79e83e30fd8657c20e35260dd085aa32eac7c4b85786ffefbf1555cafe2bc928443430cdbba48cfbe701e12ae86e676477932730d4fc7c00af820aef85038a5b4df084cf6470d110dc4c49ea1b749b80b34709d199b3db516b223625c5de4501e861f7d261b3838f8f616aa78831d618d41d25872dc810c9b2087b5a9e146ca95be740316dcdbcb77314e23ab87d4487913b800b1113c0603ea2294188b71d3e49875df097b56f9151211fc6832f9790c5c83d17481f14ad37915fd164f4fd713f6732a15f4245714b84cd665bdbd085660ea33ad7d7095dcc414f09e3903604a40facc2314a115c0045bb50e9df38efb57e1b8e7cc105f340a26eeb46aba0fa6672953eee7f1f92dcb408e561909bbd4bdf4a4948c4d57c467d21aa238c34ba43be050398be963191fa2b49828bc1e4eeed224b40dbe9dc3e570890a71a974a2f4527edb1b07105071755105edcb2af2f269facfb89180903a572a99b46456e80d4a01685a80b233278805f2c876678e731f4ec4f52075aeef6b2b023efbb8a3637ef507c4c37c27e428152ec1817fcba640ad601cb09f72f0fbe2d274a2410203010001a321301f301d0603551d0e04160414c28bf33dd5a9a17338e5b1d1a6edd8c7d141ed0b300d06092a864886f70d01010b0500038202010084e20458b2aafd7fc27146b0986f9324f4260f244920417a77c9bf15e2e2d22d2725bdd8093ec261c3779c3ca03312516506f9410075b90595b41345956d8eb2786fb5994f195611382c2b99dba13381b0100a30bc9e6e47248bf4325e2f6eec9d789216dc7536e753bf1f4be603d9fa2e6f5e192b4eb988b8cdb0bb1e8668a9225426f7d4636479f73ed24ad1d2657c31e63c93d9679b9080171b3bd1bf10a3b92b80bd790fbf62d3644900cd08eae8b9bf9c2567be98dc8cdd2ae19a8d57a3e3e2de899f81f1279f578989e6af906f80c8c2b67651730ee7e568c1af5bcb845b6d685dc55332a9984aeceaea3b7e883447edf1c76b155d95253e39b9710eaa22efa6c81468829702b5dce7126538f3ca70c2f0ad9a5795435fdb1f715f20d60359ef9a9926c7050116e802df651727447848827815f70bd82af3cedd08783156102d2d8ce995c4c43b8e47e91a3e6927f3505a5d395e6bebb84542c570903eeab4382a1c2151f1471c7a06a34dc4d268d8fa72e93bdcd2dccc4302ecac47b9e7e3d8bc9b46d21cd097874a24d529548018dc190ff568c6aa428f0a5eedff1a347730931c74f19277538e49647a4ad7254f4c1ec7d4da12cce9e1fad9607534e66ab40a56b473d9d7e3d563fd03cad2052bad365c5a29f8ae54f09b60dbca3ea768d7767cbe1c133ca08ce725c1c1370f4aab8e5b6e286f52dc0be8d0982b5a" timestamp="1480431575" url="https://MyFirstFDroidRepo.org/fdroid/repo" version="21">
+ <repo name="My First F-Droid Repo Demo" icon="fdroid-icon.png" url="https://MyFirstFDroidRepo.org/fdroid/repo" version="21" timestamp="1480431575" pubkey="308204e1308202c9a003020102020434597643300d06092a864886f70d01010b050030213110300e060355040b1307462d44726f6964310d300b06035504031304736f7661301e170d3136303931333230313930395a170d3434303133303230313930395a30213110300e060355040b1307462d44726f6964310d300b06035504031304736f766130820222300d06092a864886f70d01010105000382020f003082020a028202010086ef94b5aacf2ba4f38c875f4194b44f5644392e3715575d7c92828577e692c352b567172823851c8c72347fbc9d99684cd7ca3e1db3e4cca126382c53f2a5869fb4c19bdec989b2930501af3e758ff40588915fe96b10076ce3346a193a0277d79e83e30fd8657c20e35260dd085aa32eac7c4b85786ffefbf1555cafe2bc928443430cdbba48cfbe701e12ae86e676477932730d4fc7c00af820aef85038a5b4df084cf6470d110dc4c49ea1b749b80b34709d199b3db516b223625c5de4501e861f7d261b3838f8f616aa78831d618d41d25872dc810c9b2087b5a9e146ca95be740316dcdbcb77314e23ab87d4487913b800b1113c0603ea2294188b71d3e49875df097b56f9151211fc6832f9790c5c83d17481f14ad37915fd164f4fd713f6732a15f4245714b84cd665bdbd085660ea33ad7d7095dcc414f09e3903604a40facc2314a115c0045bb50e9df38efb57e1b8e7cc105f340a26eeb46aba0fa6672953eee7f1f92dcb408e561909bbd4bdf4a4948c4d57c467d21aa238c34ba43be050398be963191fa2b49828bc1e4eeed224b40dbe9dc3e570890a71a974a2f4527edb1b07105071755105edcb2af2f269facfb89180903a572a99b46456e80d4a01685a80b233278805f2c876678e731f4ec4f52075aeef6b2b023efbb8a3637ef507c4c37c27e428152ec1817fcba640ad601cb09f72f0fbe2d274a2410203010001a321301f301d0603551d0e04160414c28bf33dd5a9a17338e5b1d1a6edd8c7d141ed0b300d06092a864886f70d01010b0500038202010084e20458b2aafd7fc27146b0986f9324f4260f244920417a77c9bf15e2e2d22d2725bdd8093ec261c3779c3ca03312516506f9410075b90595b41345956d8eb2786fb5994f195611382c2b99dba13381b0100a30bc9e6e47248bf4325e2f6eec9d789216dc7536e753bf1f4be603d9fa2e6f5e192b4eb988b8cdb0bb1e8668a9225426f7d4636479f73ed24ad1d2657c31e63c93d9679b9080171b3bd1bf10a3b92b80bd790fbf62d3644900cd08eae8b9bf9c2567be98dc8cdd2ae19a8d57a3e3e2de899f81f1279f578989e6af906f80c8c2b67651730ee7e568c1af5bcb845b6d685dc55332a9984aeceaea3b7e883447edf1c76b155d95253e39b9710eaa22efa6c81468829702b5dce7126538f3ca70c2f0ad9a5795435fdb1f715f20d60359ef9a9926c7050116e802df651727447848827815f70bd82af3cedd08783156102d2d8ce995c4c43b8e47e91a3e6927f3505a5d395e6bebb84542c570903eeab4382a1c2151f1471c7a06a34dc4d268d8fa72e93bdcd2dccc4302ecac47b9e7e3d8bc9b46d21cd097874a24d529548018dc190ff568c6aa428f0a5eedff1a347730931c74f19277538e49647a4ad7254f4c1ec7d4da12cce9e1fad9607534e66ab40a56b473d9d7e3d563fd03cad2052bad365c5a29f8ae54f09b60dbca3ea768d7767cbe1c133ca08ce725c1c1370f4aab8e5b6e286f52dc0be8d0982b5a">
<description>This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/u/fdroid. </description>
<mirror>http://foobarfoobarfoobar.onion/fdroid/repo</mirror>
<mirror>https://foo.bar/fdroid/repo</mirror>
@@ -94,9 +94,9 @@
<added>2017-12-22</added>
<sig>056c9f1554c40ba59a2103009c82b420</sig>
<permissions>ACCESS_NETWORK_STATE,ACCESS_WIFI_STATE,CHANGE_WIFI_MULTICAST_STATE,INTERNET,READ_EXTERNAL_STORAGE,WRITE_EXTERNAL_STORAGE</permissions>
- <uses-permission maxSdkVersion="18" name="android.permission.READ_EXTERNAL_STORAGE"/>
- <uses-permission maxSdkVersion="18" name="android.permission.WRITE_EXTERNAL_STORAGE"/>
- <uses-permission-sdk-23 maxSdkVersion="27" name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
+ <uses-permission name="android.permission.READ_EXTERNAL_STORAGE" maxSdkVersion="18"/>
+ <uses-permission name="android.permission.WRITE_EXTERNAL_STORAGE" maxSdkVersion="18"/>
+ <uses-permission-sdk-23 name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" maxSdkVersion="27"/>
</package>
</application>
<application id="fake.ota.update">
@@ -182,9 +182,9 @@
<added>2013-12-31</added>
<sig>eb41d4d6082bb3e81c3d58dbf7fc7332</sig>
<permissions>ACCESS_NETWORK_STATE,ACCESS_WIFI_STATE,BLUETOOTH,BLUETOOTH_ADMIN,CHANGE_NETWORK_STATE,CHANGE_WIFI_MULTICAST_STATE,CHANGE_WIFI_STATE,INTERNET,NFC,RECEIVE_BOOT_COMPLETED</permissions>
- <uses-permission maxSdkVersion="22" name="android.permission.ACCESS_NETWORK_STATE"/>
- <uses-permission maxSdkVersion="18" name="android.permission.BLUETOOTH_ADMIN"/>
- <uses-permission-sdk-23 maxSdkVersion="25" name="android.permission.WRITE_SETTINGS"/>
+ <uses-permission name="android.permission.ACCESS_NETWORK_STATE" maxSdkVersion="22"/>
+ <uses-permission name="android.permission.BLUETOOTH_ADMIN" maxSdkVersion="18"/>
+ <uses-permission-sdk-23 name="android.permission.WRITE_SETTINGS" maxSdkVersion="25"/>
</package>
</application>
<application id="obb.main.twoversions">
```
2020-04-15 21:43:41 +02:00
|
|
|
"""Fill in field from metadata or localized block
|
2017-07-19 10:59:05 +02:00
|
|
|
|
|
|
|
For name/summary/description, they can come only from the app source,
|
|
|
|
or from a dir in fdroiddata. They can be entirely missing from the
|
|
|
|
metadata file if there is localized versions. This will fetch those
|
|
|
|
from the localized version if its not available in the metadata file.
|
index: xml.dom.minidom no longer sorts attribs
It seems now that xml.dom.minidom preserves the order of attributes, rather
than sorting them. We assume alpha-sort, so this manually
This diff in the test suite running on Debian/testing pointed it out:
https://gitlab.com/fdroid/fdroidserver/-/jobs/486970383
```diff
--- /builds/fdroid/fdroidserver/tests/repo/index.xml 2020-04-11 13:36:57.000000000 +0000
+++ repo/index.xml 2020-04-11 13:41:44.000000000 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<fdroid>
- <repo icon="fdroid-icon.png" name="My First F-Droid Repo Demo" pubkey="308204e1308202c9a003020102020434597643300d06092a864886f70d01010b050030213110300e060355040b1307462d44726f6964310d300b06035504031304736f7661301e170d3136303931333230313930395a170d3434303133303230313930395a30213110300e060355040b1307462d44726f6964310d300b06035504031304736f766130820222300d06092a864886f70d01010105000382020f003082020a028202010086ef94b5aacf2ba4f38c875f4194b44f5644392e3715575d7c92828577e692c352b567172823851c8c72347fbc9d99684cd7ca3e1db3e4cca126382c53f2a5869fb4c19bdec989b2930501af3e758ff40588915fe96b10076ce3346a193a0277d79e83e30fd8657c20e35260dd085aa32eac7c4b85786ffefbf1555cafe2bc928443430cdbba48cfbe701e12ae86e676477932730d4fc7c00af820aef85038a5b4df084cf6470d110dc4c49ea1b749b80b34709d199b3db516b223625c5de4501e861f7d261b3838f8f616aa78831d618d41d25872dc810c9b2087b5a9e146ca95be740316dcdbcb77314e23ab87d4487913b800b1113c0603ea2294188b71d3e49875df097b56f9151211fc6832f9790c5c83d17481f14ad37915fd164f4fd713f6732a15f4245714b84cd665bdbd085660ea33ad7d7095dcc414f09e3903604a40facc2314a115c0045bb50e9df38efb57e1b8e7cc105f340a26eeb46aba0fa6672953eee7f1f92dcb408e561909bbd4bdf4a4948c4d57c467d21aa238c34ba43be050398be963191fa2b49828bc1e4eeed224b40dbe9dc3e570890a71a974a2f4527edb1b07105071755105edcb2af2f269facfb89180903a572a99b46456e80d4a01685a80b233278805f2c876678e731f4ec4f52075aeef6b2b023efbb8a3637ef507c4c37c27e428152ec1817fcba640ad601cb09f72f0fbe2d274a2410203010001a321301f301d0603551d0e04160414c28bf33dd5a9a17338e5b1d1a6edd8c7d141ed0b300d06092a864886f70d01010b0500038202010084e20458b2aafd7fc27146b0986f9324f4260f244920417a77c9bf15e2e2d22d2725bdd8093ec261c3779c3ca03312516506f9410075b90595b41345956d8eb2786fb5994f195611382c2b99dba13381b0100a30bc9e6e47248bf4325e2f6eec9d789216dc7536e753bf1f4be603d9fa2e6f5e192b4eb988b8cdb0bb1e8668a9225426f7d4636479f73ed24ad1d2657c31e63c93d9679b9080171b3bd1bf10a3b92b80bd790fbf62d3644900cd08eae8b9bf9c2567be98dc8cdd2ae19a8d57a3e3e2de899f81f1279f578989e6af906f80c8c2b67651730ee7e568c1af5bcb845b6d685dc55332a9984aeceaea3b7e883447edf1c76b155d95253e39b9710eaa22efa6c81468829702b5dce7126538f3ca70c2f0ad9a5795435fdb1f715f20d60359ef9a9926c7050116e802df651727447848827815f70bd82af3cedd08783156102d2d8ce995c4c43b8e47e91a3e6927f3505a5d395e6bebb84542c570903eeab4382a1c2151f1471c7a06a34dc4d268d8fa72e93bdcd2dccc4302ecac47b9e7e3d8bc9b46d21cd097874a24d529548018dc190ff568c6aa428f0a5eedff1a347730931c74f19277538e49647a4ad7254f4c1ec7d4da12cce9e1fad9607534e66ab40a56b473d9d7e3d563fd03cad2052bad365c5a29f8ae54f09b60dbca3ea768d7767cbe1c133ca08ce725c1c1370f4aab8e5b6e286f52dc0be8d0982b5a" timestamp="1480431575" url="https://MyFirstFDroidRepo.org/fdroid/repo" version="21">
+ <repo name="My First F-Droid Repo Demo" icon="fdroid-icon.png" url="https://MyFirstFDroidRepo.org/fdroid/repo" version="21" timestamp="1480431575" pubkey="308204e1308202c9a003020102020434597643300d06092a864886f70d01010b050030213110300e060355040b1307462d44726f6964310d300b06035504031304736f7661301e170d3136303931333230313930395a170d3434303133303230313930395a30213110300e060355040b1307462d44726f6964310d300b06035504031304736f766130820222300d06092a864886f70d01010105000382020f003082020a028202010086ef94b5aacf2ba4f38c875f4194b44f5644392e3715575d7c92828577e692c352b567172823851c8c72347fbc9d99684cd7ca3e1db3e4cca126382c53f2a5869fb4c19bdec989b2930501af3e758ff40588915fe96b10076ce3346a193a0277d79e83e30fd8657c20e35260dd085aa32eac7c4b85786ffefbf1555cafe2bc928443430cdbba48cfbe701e12ae86e676477932730d4fc7c00af820aef85038a5b4df084cf6470d110dc4c49ea1b749b80b34709d199b3db516b223625c5de4501e861f7d261b3838f8f616aa78831d618d41d25872dc810c9b2087b5a9e146ca95be740316dcdbcb77314e23ab87d4487913b800b1113c0603ea2294188b71d3e49875df097b56f9151211fc6832f9790c5c83d17481f14ad37915fd164f4fd713f6732a15f4245714b84cd665bdbd085660ea33ad7d7095dcc414f09e3903604a40facc2314a115c0045bb50e9df38efb57e1b8e7cc105f340a26eeb46aba0fa6672953eee7f1f92dcb408e561909bbd4bdf4a4948c4d57c467d21aa238c34ba43be050398be963191fa2b49828bc1e4eeed224b40dbe9dc3e570890a71a974a2f4527edb1b07105071755105edcb2af2f269facfb89180903a572a99b46456e80d4a01685a80b233278805f2c876678e731f4ec4f52075aeef6b2b023efbb8a3637ef507c4c37c27e428152ec1817fcba640ad601cb09f72f0fbe2d274a2410203010001a321301f301d0603551d0e04160414c28bf33dd5a9a17338e5b1d1a6edd8c7d141ed0b300d06092a864886f70d01010b0500038202010084e20458b2aafd7fc27146b0986f9324f4260f244920417a77c9bf15e2e2d22d2725bdd8093ec261c3779c3ca03312516506f9410075b90595b41345956d8eb2786fb5994f195611382c2b99dba13381b0100a30bc9e6e47248bf4325e2f6eec9d789216dc7536e753bf1f4be603d9fa2e6f5e192b4eb988b8cdb0bb1e8668a9225426f7d4636479f73ed24ad1d2657c31e63c93d9679b9080171b3bd1bf10a3b92b80bd790fbf62d3644900cd08eae8b9bf9c2567be98dc8cdd2ae19a8d57a3e3e2de899f81f1279f578989e6af906f80c8c2b67651730ee7e568c1af5bcb845b6d685dc55332a9984aeceaea3b7e883447edf1c76b155d95253e39b9710eaa22efa6c81468829702b5dce7126538f3ca70c2f0ad9a5795435fdb1f715f20d60359ef9a9926c7050116e802df651727447848827815f70bd82af3cedd08783156102d2d8ce995c4c43b8e47e91a3e6927f3505a5d395e6bebb84542c570903eeab4382a1c2151f1471c7a06a34dc4d268d8fa72e93bdcd2dccc4302ecac47b9e7e3d8bc9b46d21cd097874a24d529548018dc190ff568c6aa428f0a5eedff1a347730931c74f19277538e49647a4ad7254f4c1ec7d4da12cce9e1fad9607534e66ab40a56b473d9d7e3d563fd03cad2052bad365c5a29f8ae54f09b60dbca3ea768d7767cbe1c133ca08ce725c1c1370f4aab8e5b6e286f52dc0be8d0982b5a">
<description>This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/u/fdroid. </description>
<mirror>http://foobarfoobarfoobar.onion/fdroid/repo</mirror>
<mirror>https://foo.bar/fdroid/repo</mirror>
@@ -94,9 +94,9 @@
<added>2017-12-22</added>
<sig>056c9f1554c40ba59a2103009c82b420</sig>
<permissions>ACCESS_NETWORK_STATE,ACCESS_WIFI_STATE,CHANGE_WIFI_MULTICAST_STATE,INTERNET,READ_EXTERNAL_STORAGE,WRITE_EXTERNAL_STORAGE</permissions>
- <uses-permission maxSdkVersion="18" name="android.permission.READ_EXTERNAL_STORAGE"/>
- <uses-permission maxSdkVersion="18" name="android.permission.WRITE_EXTERNAL_STORAGE"/>
- <uses-permission-sdk-23 maxSdkVersion="27" name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
+ <uses-permission name="android.permission.READ_EXTERNAL_STORAGE" maxSdkVersion="18"/>
+ <uses-permission name="android.permission.WRITE_EXTERNAL_STORAGE" maxSdkVersion="18"/>
+ <uses-permission-sdk-23 name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" maxSdkVersion="27"/>
</package>
</application>
<application id="fake.ota.update">
@@ -182,9 +182,9 @@
<added>2013-12-31</added>
<sig>eb41d4d6082bb3e81c3d58dbf7fc7332</sig>
<permissions>ACCESS_NETWORK_STATE,ACCESS_WIFI_STATE,BLUETOOTH,BLUETOOTH_ADMIN,CHANGE_NETWORK_STATE,CHANGE_WIFI_MULTICAST_STATE,CHANGE_WIFI_STATE,INTERNET,NFC,RECEIVE_BOOT_COMPLETED</permissions>
- <uses-permission maxSdkVersion="22" name="android.permission.ACCESS_NETWORK_STATE"/>
- <uses-permission maxSdkVersion="18" name="android.permission.BLUETOOTH_ADMIN"/>
- <uses-permission-sdk-23 maxSdkVersion="25" name="android.permission.WRITE_SETTINGS"/>
+ <uses-permission name="android.permission.ACCESS_NETWORK_STATE" maxSdkVersion="22"/>
+ <uses-permission name="android.permission.BLUETOOTH_ADMIN" maxSdkVersion="18"/>
+ <uses-permission-sdk-23 name="android.permission.WRITE_SETTINGS" maxSdkVersion="25"/>
</package>
</application>
<application id="obb.main.twoversions">
```
2020-04-15 21:43:41 +02:00
|
|
|
|
|
|
|
Attributes should be alpha-sorted, so they must be added in
|
|
|
|
alpha- sort order.
|
|
|
|
|
|
|
|
"""
|
2017-07-19 10:59:05 +02:00
|
|
|
|
|
|
|
el = doc.createElement(name)
|
|
|
|
value = app.get(key)
|
|
|
|
lkey = key[:1].lower() + key[1:]
|
|
|
|
localized = app.get('localized')
|
|
|
|
if not value and localized:
|
|
|
|
for lang in ['en-US'] + [x for x in localized.keys()]:
|
|
|
|
if not lang.startswith('en'):
|
|
|
|
continue
|
|
|
|
if lang in localized:
|
|
|
|
value = localized[lang].get(lkey)
|
|
|
|
if value:
|
|
|
|
break
|
|
|
|
if not value and localized and len(localized) > 1:
|
|
|
|
lang = list(localized.keys())[0]
|
|
|
|
value = localized[lang].get(lkey)
|
|
|
|
if not value:
|
|
|
|
value = default
|
2020-01-13 15:43:42 +01:00
|
|
|
if not value and name == 'name' and app.get('AutoName'):
|
|
|
|
value = app['AutoName']
|
2017-07-19 10:59:05 +02:00
|
|
|
el.appendChild(doc.createTextNode(value))
|
|
|
|
parent.appendChild(el)
|
|
|
|
|
2017-03-29 18:10:04 +02:00
|
|
|
root = doc.createElement("fdroid")
|
|
|
|
doc.appendChild(root)
|
|
|
|
|
|
|
|
repoel = doc.createElement("repo")
|
index: xml.dom.minidom no longer sorts attribs
It seems now that xml.dom.minidom preserves the order of attributes, rather
than sorting them. We assume alpha-sort, so this manually
This diff in the test suite running on Debian/testing pointed it out:
https://gitlab.com/fdroid/fdroidserver/-/jobs/486970383
```diff
--- /builds/fdroid/fdroidserver/tests/repo/index.xml 2020-04-11 13:36:57.000000000 +0000
+++ repo/index.xml 2020-04-11 13:41:44.000000000 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<fdroid>
- <repo icon="fdroid-icon.png" name="My First F-Droid Repo Demo" pubkey="308204e1308202c9a003020102020434597643300d06092a864886f70d01010b050030213110300e060355040b1307462d44726f6964310d300b06035504031304736f7661301e170d3136303931333230313930395a170d3434303133303230313930395a30213110300e060355040b1307462d44726f6964310d300b06035504031304736f766130820222300d06092a864886f70d01010105000382020f003082020a028202010086ef94b5aacf2ba4f38c875f4194b44f5644392e3715575d7c92828577e692c352b567172823851c8c72347fbc9d99684cd7ca3e1db3e4cca126382c53f2a5869fb4c19bdec989b2930501af3e758ff40588915fe96b10076ce3346a193a0277d79e83e30fd8657c20e35260dd085aa32eac7c4b85786ffefbf1555cafe2bc928443430cdbba48cfbe701e12ae86e676477932730d4fc7c00af820aef85038a5b4df084cf6470d110dc4c49ea1b749b80b34709d199b3db516b223625c5de4501e861f7d261b3838f8f616aa78831d618d41d25872dc810c9b2087b5a9e146ca95be740316dcdbcb77314e23ab87d4487913b800b1113c0603ea2294188b71d3e49875df097b56f9151211fc6832f9790c5c83d17481f14ad37915fd164f4fd713f6732a15f4245714b84cd665bdbd085660ea33ad7d7095dcc414f09e3903604a40facc2314a115c0045bb50e9df38efb57e1b8e7cc105f340a26eeb46aba0fa6672953eee7f1f92dcb408e561909bbd4bdf4a4948c4d57c467d21aa238c34ba43be050398be963191fa2b49828bc1e4eeed224b40dbe9dc3e570890a71a974a2f4527edb1b07105071755105edcb2af2f269facfb89180903a572a99b46456e80d4a01685a80b233278805f2c876678e731f4ec4f52075aeef6b2b023efbb8a3637ef507c4c37c27e428152ec1817fcba640ad601cb09f72f0fbe2d274a2410203010001a321301f301d0603551d0e04160414c28bf33dd5a9a17338e5b1d1a6edd8c7d141ed0b300d06092a864886f70d01010b0500038202010084e20458b2aafd7fc27146b0986f9324f4260f244920417a77c9bf15e2e2d22d2725bdd8093ec261c3779c3ca03312516506f9410075b90595b41345956d8eb2786fb5994f195611382c2b99dba13381b0100a30bc9e6e47248bf4325e2f6eec9d789216dc7536e753bf1f4be603d9fa2e6f5e192b4eb988b8cdb0bb1e8668a9225426f7d4636479f73ed24ad1d2657c31e63c93d9679b9080171b3bd1bf10a3b92b80bd790fbf62d3644900cd08eae8b9bf9c2567be98dc8cdd2ae19a8d57a3e3e2de899f81f1279f578989e6af906f80c8c2b67651730ee7e568c1af5bcb845b6d685dc55332a9984aeceaea3b7e883447edf1c76b155d95253e39b9710eaa22efa6c81468829702b5dce7126538f3ca70c2f0ad9a5795435fdb1f715f20d60359ef9a9926c7050116e802df651727447848827815f70bd82af3cedd08783156102d2d8ce995c4c43b8e47e91a3e6927f3505a5d395e6bebb84542c570903eeab4382a1c2151f1471c7a06a34dc4d268d8fa72e93bdcd2dccc4302ecac47b9e7e3d8bc9b46d21cd097874a24d529548018dc190ff568c6aa428f0a5eedff1a347730931c74f19277538e49647a4ad7254f4c1ec7d4da12cce9e1fad9607534e66ab40a56b473d9d7e3d563fd03cad2052bad365c5a29f8ae54f09b60dbca3ea768d7767cbe1c133ca08ce725c1c1370f4aab8e5b6e286f52dc0be8d0982b5a" timestamp="1480431575" url="https://MyFirstFDroidRepo.org/fdroid/repo" version="21">
+ <repo name="My First F-Droid Repo Demo" icon="fdroid-icon.png" url="https://MyFirstFDroidRepo.org/fdroid/repo" version="21" timestamp="1480431575" pubkey="308204e1308202c9a003020102020434597643300d06092a864886f70d01010b050030213110300e060355040b1307462d44726f6964310d300b06035504031304736f7661301e170d3136303931333230313930395a170d3434303133303230313930395a30213110300e060355040b1307462d44726f6964310d300b06035504031304736f766130820222300d06092a864886f70d01010105000382020f003082020a028202010086ef94b5aacf2ba4f38c875f4194b44f5644392e3715575d7c92828577e692c352b567172823851c8c72347fbc9d99684cd7ca3e1db3e4cca126382c53f2a5869fb4c19bdec989b2930501af3e758ff40588915fe96b10076ce3346a193a0277d79e83e30fd8657c20e35260dd085aa32eac7c4b85786ffefbf1555cafe2bc928443430cdbba48cfbe701e12ae86e676477932730d4fc7c00af820aef85038a5b4df084cf6470d110dc4c49ea1b749b80b34709d199b3db516b223625c5de4501e861f7d261b3838f8f616aa78831d618d41d25872dc810c9b2087b5a9e146ca95be740316dcdbcb77314e23ab87d4487913b800b1113c0603ea2294188b71d3e49875df097b56f9151211fc6832f9790c5c83d17481f14ad37915fd164f4fd713f6732a15f4245714b84cd665bdbd085660ea33ad7d7095dcc414f09e3903604a40facc2314a115c0045bb50e9df38efb57e1b8e7cc105f340a26eeb46aba0fa6672953eee7f1f92dcb408e561909bbd4bdf4a4948c4d57c467d21aa238c34ba43be050398be963191fa2b49828bc1e4eeed224b40dbe9dc3e570890a71a974a2f4527edb1b07105071755105edcb2af2f269facfb89180903a572a99b46456e80d4a01685a80b233278805f2c876678e731f4ec4f52075aeef6b2b023efbb8a3637ef507c4c37c27e428152ec1817fcba640ad601cb09f72f0fbe2d274a2410203010001a321301f301d0603551d0e04160414c28bf33dd5a9a17338e5b1d1a6edd8c7d141ed0b300d06092a864886f70d01010b0500038202010084e20458b2aafd7fc27146b0986f9324f4260f244920417a77c9bf15e2e2d22d2725bdd8093ec261c3779c3ca03312516506f9410075b90595b41345956d8eb2786fb5994f195611382c2b99dba13381b0100a30bc9e6e47248bf4325e2f6eec9d789216dc7536e753bf1f4be603d9fa2e6f5e192b4eb988b8cdb0bb1e8668a9225426f7d4636479f73ed24ad1d2657c31e63c93d9679b9080171b3bd1bf10a3b92b80bd790fbf62d3644900cd08eae8b9bf9c2567be98dc8cdd2ae19a8d57a3e3e2de899f81f1279f578989e6af906f80c8c2b67651730ee7e568c1af5bcb845b6d685dc55332a9984aeceaea3b7e883447edf1c76b155d95253e39b9710eaa22efa6c81468829702b5dce7126538f3ca70c2f0ad9a5795435fdb1f715f20d60359ef9a9926c7050116e802df651727447848827815f70bd82af3cedd08783156102d2d8ce995c4c43b8e47e91a3e6927f3505a5d395e6bebb84542c570903eeab4382a1c2151f1471c7a06a34dc4d268d8fa72e93bdcd2dccc4302ecac47b9e7e3d8bc9b46d21cd097874a24d529548018dc190ff568c6aa428f0a5eedff1a347730931c74f19277538e49647a4ad7254f4c1ec7d4da12cce9e1fad9607534e66ab40a56b473d9d7e3d563fd03cad2052bad365c5a29f8ae54f09b60dbca3ea768d7767cbe1c133ca08ce725c1c1370f4aab8e5b6e286f52dc0be8d0982b5a">
<description>This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/u/fdroid. </description>
<mirror>http://foobarfoobarfoobar.onion/fdroid/repo</mirror>
<mirror>https://foo.bar/fdroid/repo</mirror>
@@ -94,9 +94,9 @@
<added>2017-12-22</added>
<sig>056c9f1554c40ba59a2103009c82b420</sig>
<permissions>ACCESS_NETWORK_STATE,ACCESS_WIFI_STATE,CHANGE_WIFI_MULTICAST_STATE,INTERNET,READ_EXTERNAL_STORAGE,WRITE_EXTERNAL_STORAGE</permissions>
- <uses-permission maxSdkVersion="18" name="android.permission.READ_EXTERNAL_STORAGE"/>
- <uses-permission maxSdkVersion="18" name="android.permission.WRITE_EXTERNAL_STORAGE"/>
- <uses-permission-sdk-23 maxSdkVersion="27" name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
+ <uses-permission name="android.permission.READ_EXTERNAL_STORAGE" maxSdkVersion="18"/>
+ <uses-permission name="android.permission.WRITE_EXTERNAL_STORAGE" maxSdkVersion="18"/>
+ <uses-permission-sdk-23 name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" maxSdkVersion="27"/>
</package>
</application>
<application id="fake.ota.update">
@@ -182,9 +182,9 @@
<added>2013-12-31</added>
<sig>eb41d4d6082bb3e81c3d58dbf7fc7332</sig>
<permissions>ACCESS_NETWORK_STATE,ACCESS_WIFI_STATE,BLUETOOTH,BLUETOOTH_ADMIN,CHANGE_NETWORK_STATE,CHANGE_WIFI_MULTICAST_STATE,CHANGE_WIFI_STATE,INTERNET,NFC,RECEIVE_BOOT_COMPLETED</permissions>
- <uses-permission maxSdkVersion="22" name="android.permission.ACCESS_NETWORK_STATE"/>
- <uses-permission maxSdkVersion="18" name="android.permission.BLUETOOTH_ADMIN"/>
- <uses-permission-sdk-23 maxSdkVersion="25" name="android.permission.WRITE_SETTINGS"/>
+ <uses-permission name="android.permission.ACCESS_NETWORK_STATE" maxSdkVersion="22"/>
+ <uses-permission name="android.permission.BLUETOOTH_ADMIN" maxSdkVersion="18"/>
+ <uses-permission-sdk-23 name="android.permission.WRITE_SETTINGS" maxSdkVersion="25"/>
</package>
</application>
<application id="obb.main.twoversions">
```
2020-04-15 21:43:41 +02:00
|
|
|
repoel.setAttribute("icon", os.path.basename(repodict['icon']))
|
2017-03-29 18:10:04 +02:00
|
|
|
if 'maxage' in repodict:
|
|
|
|
repoel.setAttribute("maxage", str(repodict['maxage']))
|
index: xml.dom.minidom no longer sorts attribs
It seems now that xml.dom.minidom preserves the order of attributes, rather
than sorting them. We assume alpha-sort, so this manually
This diff in the test suite running on Debian/testing pointed it out:
https://gitlab.com/fdroid/fdroidserver/-/jobs/486970383
```diff
--- /builds/fdroid/fdroidserver/tests/repo/index.xml 2020-04-11 13:36:57.000000000 +0000
+++ repo/index.xml 2020-04-11 13:41:44.000000000 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<fdroid>
- <repo icon="fdroid-icon.png" name="My First F-Droid Repo Demo" pubkey="308204e1308202c9a003020102020434597643300d06092a864886f70d01010b050030213110300e060355040b1307462d44726f6964310d300b06035504031304736f7661301e170d3136303931333230313930395a170d3434303133303230313930395a30213110300e060355040b1307462d44726f6964310d300b06035504031304736f766130820222300d06092a864886f70d01010105000382020f003082020a028202010086ef94b5aacf2ba4f38c875f4194b44f5644392e3715575d7c92828577e692c352b567172823851c8c72347fbc9d99684cd7ca3e1db3e4cca126382c53f2a5869fb4c19bdec989b2930501af3e758ff40588915fe96b10076ce3346a193a0277d79e83e30fd8657c20e35260dd085aa32eac7c4b85786ffefbf1555cafe2bc928443430cdbba48cfbe701e12ae86e676477932730d4fc7c00af820aef85038a5b4df084cf6470d110dc4c49ea1b749b80b34709d199b3db516b223625c5de4501e861f7d261b3838f8f616aa78831d618d41d25872dc810c9b2087b5a9e146ca95be740316dcdbcb77314e23ab87d4487913b800b1113c0603ea2294188b71d3e49875df097b56f9151211fc6832f9790c5c83d17481f14ad37915fd164f4fd713f6732a15f4245714b84cd665bdbd085660ea33ad7d7095dcc414f09e3903604a40facc2314a115c0045bb50e9df38efb57e1b8e7cc105f340a26eeb46aba0fa6672953eee7f1f92dcb408e561909bbd4bdf4a4948c4d57c467d21aa238c34ba43be050398be963191fa2b49828bc1e4eeed224b40dbe9dc3e570890a71a974a2f4527edb1b07105071755105edcb2af2f269facfb89180903a572a99b46456e80d4a01685a80b233278805f2c876678e731f4ec4f52075aeef6b2b023efbb8a3637ef507c4c37c27e428152ec1817fcba640ad601cb09f72f0fbe2d274a2410203010001a321301f301d0603551d0e04160414c28bf33dd5a9a17338e5b1d1a6edd8c7d141ed0b300d06092a864886f70d01010b0500038202010084e20458b2aafd7fc27146b0986f9324f4260f244920417a77c9bf15e2e2d22d2725bdd8093ec261c3779c3ca03312516506f9410075b90595b41345956d8eb2786fb5994f195611382c2b99dba13381b0100a30bc9e6e47248bf4325e2f6eec9d789216dc7536e753bf1f4be603d9fa2e6f5e192b4eb988b8cdb0bb1e8668a9225426f7d4636479f73ed24ad1d2657c31e63c93d9679b9080171b3bd1bf10a3b92b80bd790fbf62d3644900cd08eae8b9bf9c2567be98dc8cdd2ae19a8d57a3e3e2de899f81f1279f578989e6af906f80c8c2b67651730ee7e568c1af5bcb845b6d685dc55332a9984aeceaea3b7e883447edf1c76b155d95253e39b9710eaa22efa6c81468829702b5dce7126538f3ca70c2f0ad9a5795435fdb1f715f20d60359ef9a9926c7050116e802df651727447848827815f70bd82af3cedd08783156102d2d8ce995c4c43b8e47e91a3e6927f3505a5d395e6bebb84542c570903eeab4382a1c2151f1471c7a06a34dc4d268d8fa72e93bdcd2dccc4302ecac47b9e7e3d8bc9b46d21cd097874a24d529548018dc190ff568c6aa428f0a5eedff1a347730931c74f19277538e49647a4ad7254f4c1ec7d4da12cce9e1fad9607534e66ab40a56b473d9d7e3d563fd03cad2052bad365c5a29f8ae54f09b60dbca3ea768d7767cbe1c133ca08ce725c1c1370f4aab8e5b6e286f52dc0be8d0982b5a" timestamp="1480431575" url="https://MyFirstFDroidRepo.org/fdroid/repo" version="21">
+ <repo name="My First F-Droid Repo Demo" icon="fdroid-icon.png" url="https://MyFirstFDroidRepo.org/fdroid/repo" version="21" timestamp="1480431575" pubkey="308204e1308202c9a003020102020434597643300d06092a864886f70d01010b050030213110300e060355040b1307462d44726f6964310d300b06035504031304736f7661301e170d3136303931333230313930395a170d3434303133303230313930395a30213110300e060355040b1307462d44726f6964310d300b06035504031304736f766130820222300d06092a864886f70d01010105000382020f003082020a028202010086ef94b5aacf2ba4f38c875f4194b44f5644392e3715575d7c92828577e692c352b567172823851c8c72347fbc9d99684cd7ca3e1db3e4cca126382c53f2a5869fb4c19bdec989b2930501af3e758ff40588915fe96b10076ce3346a193a0277d79e83e30fd8657c20e35260dd085aa32eac7c4b85786ffefbf1555cafe2bc928443430cdbba48cfbe701e12ae86e676477932730d4fc7c00af820aef85038a5b4df084cf6470d110dc4c49ea1b749b80b34709d199b3db516b223625c5de4501e861f7d261b3838f8f616aa78831d618d41d25872dc810c9b2087b5a9e146ca95be740316dcdbcb77314e23ab87d4487913b800b1113c0603ea2294188b71d3e49875df097b56f9151211fc6832f9790c5c83d17481f14ad37915fd164f4fd713f6732a15f4245714b84cd665bdbd085660ea33ad7d7095dcc414f09e3903604a40facc2314a115c0045bb50e9df38efb57e1b8e7cc105f340a26eeb46aba0fa6672953eee7f1f92dcb408e561909bbd4bdf4a4948c4d57c467d21aa238c34ba43be050398be963191fa2b49828bc1e4eeed224b40dbe9dc3e570890a71a974a2f4527edb1b07105071755105edcb2af2f269facfb89180903a572a99b46456e80d4a01685a80b233278805f2c876678e731f4ec4f52075aeef6b2b023efbb8a3637ef507c4c37c27e428152ec1817fcba640ad601cb09f72f0fbe2d274a2410203010001a321301f301d0603551d0e04160414c28bf33dd5a9a17338e5b1d1a6edd8c7d141ed0b300d06092a864886f70d01010b0500038202010084e20458b2aafd7fc27146b0986f9324f4260f244920417a77c9bf15e2e2d22d2725bdd8093ec261c3779c3ca03312516506f9410075b90595b41345956d8eb2786fb5994f195611382c2b99dba13381b0100a30bc9e6e47248bf4325e2f6eec9d789216dc7536e753bf1f4be603d9fa2e6f5e192b4eb988b8cdb0bb1e8668a9225426f7d4636479f73ed24ad1d2657c31e63c93d9679b9080171b3bd1bf10a3b92b80bd790fbf62d3644900cd08eae8b9bf9c2567be98dc8cdd2ae19a8d57a3e3e2de899f81f1279f578989e6af906f80c8c2b67651730ee7e568c1af5bcb845b6d685dc55332a9984aeceaea3b7e883447edf1c76b155d95253e39b9710eaa22efa6c81468829702b5dce7126538f3ca70c2f0ad9a5795435fdb1f715f20d60359ef9a9926c7050116e802df651727447848827815f70bd82af3cedd08783156102d2d8ce995c4c43b8e47e91a3e6927f3505a5d395e6bebb84542c570903eeab4382a1c2151f1471c7a06a34dc4d268d8fa72e93bdcd2dccc4302ecac47b9e7e3d8bc9b46d21cd097874a24d529548018dc190ff568c6aa428f0a5eedff1a347730931c74f19277538e49647a4ad7254f4c1ec7d4da12cce9e1fad9607534e66ab40a56b473d9d7e3d563fd03cad2052bad365c5a29f8ae54f09b60dbca3ea768d7767cbe1c133ca08ce725c1c1370f4aab8e5b6e286f52dc0be8d0982b5a">
<description>This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/u/fdroid. </description>
<mirror>http://foobarfoobarfoobar.onion/fdroid/repo</mirror>
<mirror>https://foo.bar/fdroid/repo</mirror>
@@ -94,9 +94,9 @@
<added>2017-12-22</added>
<sig>056c9f1554c40ba59a2103009c82b420</sig>
<permissions>ACCESS_NETWORK_STATE,ACCESS_WIFI_STATE,CHANGE_WIFI_MULTICAST_STATE,INTERNET,READ_EXTERNAL_STORAGE,WRITE_EXTERNAL_STORAGE</permissions>
- <uses-permission maxSdkVersion="18" name="android.permission.READ_EXTERNAL_STORAGE"/>
- <uses-permission maxSdkVersion="18" name="android.permission.WRITE_EXTERNAL_STORAGE"/>
- <uses-permission-sdk-23 maxSdkVersion="27" name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
+ <uses-permission name="android.permission.READ_EXTERNAL_STORAGE" maxSdkVersion="18"/>
+ <uses-permission name="android.permission.WRITE_EXTERNAL_STORAGE" maxSdkVersion="18"/>
+ <uses-permission-sdk-23 name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" maxSdkVersion="27"/>
</package>
</application>
<application id="fake.ota.update">
@@ -182,9 +182,9 @@
<added>2013-12-31</added>
<sig>eb41d4d6082bb3e81c3d58dbf7fc7332</sig>
<permissions>ACCESS_NETWORK_STATE,ACCESS_WIFI_STATE,BLUETOOTH,BLUETOOTH_ADMIN,CHANGE_NETWORK_STATE,CHANGE_WIFI_MULTICAST_STATE,CHANGE_WIFI_STATE,INTERNET,NFC,RECEIVE_BOOT_COMPLETED</permissions>
- <uses-permission maxSdkVersion="22" name="android.permission.ACCESS_NETWORK_STATE"/>
- <uses-permission maxSdkVersion="18" name="android.permission.BLUETOOTH_ADMIN"/>
- <uses-permission-sdk-23 maxSdkVersion="25" name="android.permission.WRITE_SETTINGS"/>
+ <uses-permission name="android.permission.ACCESS_NETWORK_STATE" maxSdkVersion="22"/>
+ <uses-permission name="android.permission.BLUETOOTH_ADMIN" maxSdkVersion="18"/>
+ <uses-permission-sdk-23 name="android.permission.WRITE_SETTINGS" maxSdkVersion="25"/>
</package>
</application>
<application id="obb.main.twoversions">
```
2020-04-15 21:43:41 +02:00
|
|
|
repoel.setAttribute("name", repodict['name'])
|
|
|
|
pubkey, repo_pubkey_fingerprint = extract_pubkey()
|
|
|
|
repoel.setAttribute("pubkey", pubkey.decode('utf-8'))
|
|
|
|
repoel.setAttribute("timestamp", '%d' % repodict['timestamp'].timestamp())
|
2017-03-29 18:10:04 +02:00
|
|
|
repoel.setAttribute("url", repodict['address'])
|
index: xml.dom.minidom no longer sorts attribs
It seems now that xml.dom.minidom preserves the order of attributes, rather
than sorting them. We assume alpha-sort, so this manually
This diff in the test suite running on Debian/testing pointed it out:
https://gitlab.com/fdroid/fdroidserver/-/jobs/486970383
```diff
--- /builds/fdroid/fdroidserver/tests/repo/index.xml 2020-04-11 13:36:57.000000000 +0000
+++ repo/index.xml 2020-04-11 13:41:44.000000000 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<fdroid>
- <repo icon="fdroid-icon.png" name="My First F-Droid Repo Demo" pubkey="308204e1308202c9a003020102020434597643300d06092a864886f70d01010b050030213110300e060355040b1307462d44726f6964310d300b06035504031304736f7661301e170d3136303931333230313930395a170d3434303133303230313930395a30213110300e060355040b1307462d44726f6964310d300b06035504031304736f766130820222300d06092a864886f70d01010105000382020f003082020a028202010086ef94b5aacf2ba4f38c875f4194b44f5644392e3715575d7c92828577e692c352b567172823851c8c72347fbc9d99684cd7ca3e1db3e4cca126382c53f2a5869fb4c19bdec989b2930501af3e758ff40588915fe96b10076ce3346a193a0277d79e83e30fd8657c20e35260dd085aa32eac7c4b85786ffefbf1555cafe2bc928443430cdbba48cfbe701e12ae86e676477932730d4fc7c00af820aef85038a5b4df084cf6470d110dc4c49ea1b749b80b34709d199b3db516b223625c5de4501e861f7d261b3838f8f616aa78831d618d41d25872dc810c9b2087b5a9e146ca95be740316dcdbcb77314e23ab87d4487913b800b1113c0603ea2294188b71d3e49875df097b56f9151211fc6832f9790c5c83d17481f14ad37915fd164f4fd713f6732a15f4245714b84cd665bdbd085660ea33ad7d7095dcc414f09e3903604a40facc2314a115c0045bb50e9df38efb57e1b8e7cc105f340a26eeb46aba0fa6672953eee7f1f92dcb408e561909bbd4bdf4a4948c4d57c467d21aa238c34ba43be050398be963191fa2b49828bc1e4eeed224b40dbe9dc3e570890a71a974a2f4527edb1b07105071755105edcb2af2f269facfb89180903a572a99b46456e80d4a01685a80b233278805f2c876678e731f4ec4f52075aeef6b2b023efbb8a3637ef507c4c37c27e428152ec1817fcba640ad601cb09f72f0fbe2d274a2410203010001a321301f301d0603551d0e04160414c28bf33dd5a9a17338e5b1d1a6edd8c7d141ed0b300d06092a864886f70d01010b0500038202010084e20458b2aafd7fc27146b0986f9324f4260f244920417a77c9bf15e2e2d22d2725bdd8093ec261c3779c3ca03312516506f9410075b90595b41345956d8eb2786fb5994f195611382c2b99dba13381b0100a30bc9e6e47248bf4325e2f6eec9d789216dc7536e753bf1f4be603d9fa2e6f5e192b4eb988b8cdb0bb1e8668a9225426f7d4636479f73ed24ad1d2657c31e63c93d9679b9080171b3bd1bf10a3b92b80bd790fbf62d3644900cd08eae8b9bf9c2567be98dc8cdd2ae19a8d57a3e3e2de899f81f1279f578989e6af906f80c8c2b67651730ee7e568c1af5bcb845b6d685dc55332a9984aeceaea3b7e883447edf1c76b155d95253e39b9710eaa22efa6c81468829702b5dce7126538f3ca70c2f0ad9a5795435fdb1f715f20d60359ef9a9926c7050116e802df651727447848827815f70bd82af3cedd08783156102d2d8ce995c4c43b8e47e91a3e6927f3505a5d395e6bebb84542c570903eeab4382a1c2151f1471c7a06a34dc4d268d8fa72e93bdcd2dccc4302ecac47b9e7e3d8bc9b46d21cd097874a24d529548018dc190ff568c6aa428f0a5eedff1a347730931c74f19277538e49647a4ad7254f4c1ec7d4da12cce9e1fad9607534e66ab40a56b473d9d7e3d563fd03cad2052bad365c5a29f8ae54f09b60dbca3ea768d7767cbe1c133ca08ce725c1c1370f4aab8e5b6e286f52dc0be8d0982b5a" timestamp="1480431575" url="https://MyFirstFDroidRepo.org/fdroid/repo" version="21">
+ <repo name="My First F-Droid Repo Demo" icon="fdroid-icon.png" url="https://MyFirstFDroidRepo.org/fdroid/repo" version="21" timestamp="1480431575" pubkey="308204e1308202c9a003020102020434597643300d06092a864886f70d01010b050030213110300e060355040b1307462d44726f6964310d300b06035504031304736f7661301e170d3136303931333230313930395a170d3434303133303230313930395a30213110300e060355040b1307462d44726f6964310d300b06035504031304736f766130820222300d06092a864886f70d01010105000382020f003082020a028202010086ef94b5aacf2ba4f38c875f4194b44f5644392e3715575d7c92828577e692c352b567172823851c8c72347fbc9d99684cd7ca3e1db3e4cca126382c53f2a5869fb4c19bdec989b2930501af3e758ff40588915fe96b10076ce3346a193a0277d79e83e30fd8657c20e35260dd085aa32eac7c4b85786ffefbf1555cafe2bc928443430cdbba48cfbe701e12ae86e676477932730d4fc7c00af820aef85038a5b4df084cf6470d110dc4c49ea1b749b80b34709d199b3db516b223625c5de4501e861f7d261b3838f8f616aa78831d618d41d25872dc810c9b2087b5a9e146ca95be740316dcdbcb77314e23ab87d4487913b800b1113c0603ea2294188b71d3e49875df097b56f9151211fc6832f9790c5c83d17481f14ad37915fd164f4fd713f6732a15f4245714b84cd665bdbd085660ea33ad7d7095dcc414f09e3903604a40facc2314a115c0045bb50e9df38efb57e1b8e7cc105f340a26eeb46aba0fa6672953eee7f1f92dcb408e561909bbd4bdf4a4948c4d57c467d21aa238c34ba43be050398be963191fa2b49828bc1e4eeed224b40dbe9dc3e570890a71a974a2f4527edb1b07105071755105edcb2af2f269facfb89180903a572a99b46456e80d4a01685a80b233278805f2c876678e731f4ec4f52075aeef6b2b023efbb8a3637ef507c4c37c27e428152ec1817fcba640ad601cb09f72f0fbe2d274a2410203010001a321301f301d0603551d0e04160414c28bf33dd5a9a17338e5b1d1a6edd8c7d141ed0b300d06092a864886f70d01010b0500038202010084e20458b2aafd7fc27146b0986f9324f4260f244920417a77c9bf15e2e2d22d2725bdd8093ec261c3779c3ca03312516506f9410075b90595b41345956d8eb2786fb5994f195611382c2b99dba13381b0100a30bc9e6e47248bf4325e2f6eec9d789216dc7536e753bf1f4be603d9fa2e6f5e192b4eb988b8cdb0bb1e8668a9225426f7d4636479f73ed24ad1d2657c31e63c93d9679b9080171b3bd1bf10a3b92b80bd790fbf62d3644900cd08eae8b9bf9c2567be98dc8cdd2ae19a8d57a3e3e2de899f81f1279f578989e6af906f80c8c2b67651730ee7e568c1af5bcb845b6d685dc55332a9984aeceaea3b7e883447edf1c76b155d95253e39b9710eaa22efa6c81468829702b5dce7126538f3ca70c2f0ad9a5795435fdb1f715f20d60359ef9a9926c7050116e802df651727447848827815f70bd82af3cedd08783156102d2d8ce995c4c43b8e47e91a3e6927f3505a5d395e6bebb84542c570903eeab4382a1c2151f1471c7a06a34dc4d268d8fa72e93bdcd2dccc4302ecac47b9e7e3d8bc9b46d21cd097874a24d529548018dc190ff568c6aa428f0a5eedff1a347730931c74f19277538e49647a4ad7254f4c1ec7d4da12cce9e1fad9607534e66ab40a56b473d9d7e3d563fd03cad2052bad365c5a29f8ae54f09b60dbca3ea768d7767cbe1c133ca08ce725c1c1370f4aab8e5b6e286f52dc0be8d0982b5a">
<description>This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/u/fdroid. </description>
<mirror>http://foobarfoobarfoobar.onion/fdroid/repo</mirror>
<mirror>https://foo.bar/fdroid/repo</mirror>
@@ -94,9 +94,9 @@
<added>2017-12-22</added>
<sig>056c9f1554c40ba59a2103009c82b420</sig>
<permissions>ACCESS_NETWORK_STATE,ACCESS_WIFI_STATE,CHANGE_WIFI_MULTICAST_STATE,INTERNET,READ_EXTERNAL_STORAGE,WRITE_EXTERNAL_STORAGE</permissions>
- <uses-permission maxSdkVersion="18" name="android.permission.READ_EXTERNAL_STORAGE"/>
- <uses-permission maxSdkVersion="18" name="android.permission.WRITE_EXTERNAL_STORAGE"/>
- <uses-permission-sdk-23 maxSdkVersion="27" name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
+ <uses-permission name="android.permission.READ_EXTERNAL_STORAGE" maxSdkVersion="18"/>
+ <uses-permission name="android.permission.WRITE_EXTERNAL_STORAGE" maxSdkVersion="18"/>
+ <uses-permission-sdk-23 name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" maxSdkVersion="27"/>
</package>
</application>
<application id="fake.ota.update">
@@ -182,9 +182,9 @@
<added>2013-12-31</added>
<sig>eb41d4d6082bb3e81c3d58dbf7fc7332</sig>
<permissions>ACCESS_NETWORK_STATE,ACCESS_WIFI_STATE,BLUETOOTH,BLUETOOTH_ADMIN,CHANGE_NETWORK_STATE,CHANGE_WIFI_MULTICAST_STATE,CHANGE_WIFI_STATE,INTERNET,NFC,RECEIVE_BOOT_COMPLETED</permissions>
- <uses-permission maxSdkVersion="22" name="android.permission.ACCESS_NETWORK_STATE"/>
- <uses-permission maxSdkVersion="18" name="android.permission.BLUETOOTH_ADMIN"/>
- <uses-permission-sdk-23 maxSdkVersion="25" name="android.permission.WRITE_SETTINGS"/>
+ <uses-permission name="android.permission.ACCESS_NETWORK_STATE" maxSdkVersion="22"/>
+ <uses-permission name="android.permission.BLUETOOTH_ADMIN" maxSdkVersion="18"/>
+ <uses-permission-sdk-23 name="android.permission.WRITE_SETTINGS" maxSdkVersion="25"/>
</package>
</application>
<application id="obb.main.twoversions">
```
2020-04-15 21:43:41 +02:00
|
|
|
repoel.setAttribute("version", str(repodict['version']))
|
|
|
|
|
2017-03-29 18:10:04 +02:00
|
|
|
addElement('description', repodict['description'], doc, repoel)
|
|
|
|
for mirror in repodict.get('mirrors', []):
|
|
|
|
addElement('mirror', mirror, doc, repoel)
|
|
|
|
|
|
|
|
root.appendChild(repoel)
|
|
|
|
|
|
|
|
for command in ('install', 'uninstall'):
|
|
|
|
for packageName in requestsdict[command]:
|
|
|
|
element = doc.createElement(command)
|
|
|
|
root.appendChild(element)
|
|
|
|
element.setAttribute('packageName', packageName)
|
|
|
|
|
|
|
|
for appid, appdict in apps.items():
|
|
|
|
app = metadata.App(appdict)
|
|
|
|
|
2020-11-13 11:19:24 +01:00
|
|
|
if app.get('Disabled') is not None:
|
2017-03-29 18:10:04 +02:00
|
|
|
continue
|
|
|
|
|
|
|
|
# Get a list of the apks for this app...
|
|
|
|
apklist = []
|
2020-01-13 15:43:42 +01:00
|
|
|
name_from_apk = None
|
2017-08-09 17:14:51 +02:00
|
|
|
apksbyversion = collections.defaultdict(lambda: [])
|
2017-03-29 18:10:04 +02:00
|
|
|
for apk in apks:
|
2017-08-09 17:14:51 +02:00
|
|
|
if apk.get('versionCode') and apk.get('packageName') == appid:
|
|
|
|
apksbyversion[apk['versionCode']].append(apk)
|
2020-01-13 15:43:42 +01:00
|
|
|
if name_from_apk is None:
|
|
|
|
name_from_apk = apk.get('name')
|
2017-08-09 17:14:51 +02:00
|
|
|
for versionCode, apksforver in apksbyversion.items():
|
2017-09-20 00:58:19 +02:00
|
|
|
fdroidsig = fdroid_signing_key_fingerprints.get(appid, {}).get('signer')
|
2017-08-09 17:14:51 +02:00
|
|
|
fdroid_signed_apk = None
|
|
|
|
name_match_apk = None
|
|
|
|
for x in apksforver:
|
|
|
|
if fdroidsig and x.get('signer', None) == fdroidsig:
|
|
|
|
fdroid_signed_apk = x
|
|
|
|
if common.apk_release_filename.match(x.get('apkName', '')):
|
|
|
|
name_match_apk = x
|
|
|
|
# choose which of the available versions is most
|
|
|
|
# suiteable for index v0
|
|
|
|
if fdroid_signed_apk:
|
|
|
|
apklist.append(fdroid_signed_apk)
|
|
|
|
elif name_match_apk:
|
|
|
|
apklist.append(name_match_apk)
|
|
|
|
else:
|
|
|
|
apklist.append(apksforver[0])
|
2017-03-29 18:10:04 +02:00
|
|
|
|
|
|
|
if len(apklist) == 0:
|
|
|
|
continue
|
|
|
|
|
|
|
|
apel = doc.createElement("application")
|
|
|
|
apel.setAttribute("id", app.id)
|
|
|
|
root.appendChild(apel)
|
|
|
|
|
|
|
|
addElement('id', app.id, doc, apel)
|
|
|
|
if app.added:
|
|
|
|
addElement('added', app.added.strftime('%Y-%m-%d'), doc, apel)
|
|
|
|
if app.lastUpdated:
|
|
|
|
addElement('lastupdated', app.lastUpdated.strftime('%Y-%m-%d'), doc, apel)
|
2017-07-19 10:59:05 +02:00
|
|
|
|
2020-01-13 15:43:42 +01:00
|
|
|
addElementCheckLocalized('name', app, 'Name', doc, apel, name_from_apk)
|
2017-07-19 10:59:05 +02:00
|
|
|
addElementCheckLocalized('summary', app, 'Summary', doc, apel)
|
|
|
|
|
2017-03-29 18:10:04 +02:00
|
|
|
if app.icon:
|
|
|
|
addElement('icon', app.icon, doc, apel)
|
|
|
|
|
2017-07-19 10:59:05 +02:00
|
|
|
addElementCheckLocalized('desc', app, 'Description', doc, apel,
|
2020-11-17 14:17:08 +01:00
|
|
|
'No description available')
|
2017-07-19 10:59:05 +02:00
|
|
|
|
2017-03-29 18:10:04 +02:00
|
|
|
addElement('license', app.License, doc, apel)
|
|
|
|
if app.Categories:
|
|
|
|
addElement('categories', ','.join(app.Categories), doc, apel)
|
|
|
|
# We put the first (primary) category in LAST, which will have
|
|
|
|
# the desired effect of making clients that only understand one
|
|
|
|
# category see that one.
|
|
|
|
addElement('category', app.Categories[0], doc, apel)
|
|
|
|
addElement('web', app.WebSite, doc, apel)
|
|
|
|
addElement('source', app.SourceCode, doc, apel)
|
|
|
|
addElement('tracker', app.IssueTracker, doc, apel)
|
|
|
|
addElementNonEmpty('changelog', app.Changelog, doc, apel)
|
|
|
|
addElementNonEmpty('author', app.AuthorName, doc, apel)
|
|
|
|
addElementNonEmpty('email', app.AuthorEmail, doc, apel)
|
|
|
|
addElementNonEmpty('donate', app.Donate, doc, apel)
|
|
|
|
addElementNonEmpty('bitcoin', app.Bitcoin, doc, apel)
|
|
|
|
addElementNonEmpty('litecoin', app.Litecoin, doc, apel)
|
|
|
|
addElementNonEmpty('flattr', app.FlattrID, doc, apel)
|
2017-12-12 10:53:34 +01:00
|
|
|
addElementNonEmpty('liberapay', app.LiberapayID, doc, apel)
|
2020-03-10 15:56:03 +01:00
|
|
|
addElementNonEmpty('openCollective', app.OpenCollective, doc, apel)
|
2017-03-29 18:10:04 +02:00
|
|
|
|
|
|
|
# These elements actually refer to the current version (i.e. which
|
|
|
|
# one is recommended. They are historically mis-named, and need
|
|
|
|
# changing, but stay like this for now to support existing clients.
|
|
|
|
addElement('marketversion', app.CurrentVersion, doc, apel)
|
|
|
|
addElement('marketvercode', app.CurrentVersionCode, doc, apel)
|
|
|
|
|
|
|
|
if app.Provides:
|
|
|
|
pv = app.Provides.split(',')
|
|
|
|
addElementNonEmpty('provides', ','.join(pv), doc, apel)
|
|
|
|
if app.RequiresRoot:
|
|
|
|
addElement('requirements', 'root', doc, apel)
|
|
|
|
|
|
|
|
# Sort the apk list into version order, just so the web site
|
|
|
|
# doesn't have to do any work by default...
|
|
|
|
apklist = sorted(apklist, key=lambda apk: apk['versionCode'], reverse=True)
|
|
|
|
|
|
|
|
if 'antiFeatures' in apklist[0]:
|
|
|
|
app.AntiFeatures.extend(apklist[0]['antiFeatures'])
|
|
|
|
if app.AntiFeatures:
|
|
|
|
addElementNonEmpty('antifeatures', ','.join(app.AntiFeatures), doc, apel)
|
|
|
|
|
|
|
|
# Check for duplicates - they will make the client unhappy...
|
|
|
|
for i in range(len(apklist) - 1):
|
2017-05-30 14:52:33 +02:00
|
|
|
first = apklist[i]
|
|
|
|
second = apklist[i + 1]
|
|
|
|
if first['versionCode'] == second['versionCode'] \
|
|
|
|
and first['sig'] == second['sig']:
|
|
|
|
if first['hash'] == second['hash']:
|
|
|
|
raise FDroidException('"{0}/{1}" and "{0}/{2}" are exact duplicates!'.format(
|
|
|
|
repodir, first['apkName'], second['apkName']))
|
|
|
|
else:
|
|
|
|
raise FDroidException('duplicates: "{0}/{1}" - "{0}/{2}"'.format(
|
|
|
|
repodir, first['apkName'], second['apkName']))
|
2017-03-29 18:10:04 +02:00
|
|
|
|
|
|
|
current_version_code = 0
|
|
|
|
current_version_file = None
|
|
|
|
for apk in apklist:
|
|
|
|
file_extension = common.get_file_extension(apk['apkName'])
|
|
|
|
# find the APK for the "Current Version"
|
|
|
|
if current_version_code < int(app.CurrentVersionCode):
|
|
|
|
current_version_file = apk['apkName']
|
2021-01-14 14:43:37 +01:00
|
|
|
if current_version_code < apk['versionCode']:
|
|
|
|
current_version_code = apk['versionCode']
|
2017-03-29 18:10:04 +02:00
|
|
|
|
|
|
|
apkel = doc.createElement("package")
|
|
|
|
apel.appendChild(apkel)
|
2018-04-17 12:15:51 +02:00
|
|
|
|
|
|
|
versionName = apk.get('versionName')
|
|
|
|
if not versionName:
|
|
|
|
versionCodeStr = str(apk['versionCode']) # TODO build.versionCode should be int!
|
eliminate app.builds everywhere, it should be app['Builds']
The .txt format was the last place where the lowercase "builds" was used,
this converts references everywhere to be "Builds". This makes it possible
to load metadata YAML files with any YAML parser, then have it possible to
use fdroidserver methods on that data, like metadata.write_metadata().
The test files in tests/metadata/dump/*.yaml were manually edited by cutting
the builds: block and putting it the sort order for Builds: so the contents
should be unchanged.
```
sed -i \
-e 's/app\.builds/app.get('Builds', \[\])/g' \
-e "s/app\.get(Builds, \[\]) =/app\['Builds'] =/g" \
-e "s/app\.get(Builds, \[\]) =/app\['Builds'] =/g" \
-e "s/app\.get(Builds, \[\])/app.get('Builds', \[\])/g" \
-e "s/app\.get('Builds', \[\])\.append/app\['Builds'\].append/g" \
-e "s/app\['builds'\]/app.get('Builds', [])/g" \
*/*.*
```
2020-12-09 16:01:21 +01:00
|
|
|
for build in app.get('Builds', []):
|
2018-04-17 12:15:51 +02:00
|
|
|
if build['versionCode'] == versionCodeStr and 'versionName' in build:
|
|
|
|
versionName = build['versionName']
|
|
|
|
break
|
|
|
|
if versionName:
|
|
|
|
addElement('version', versionName, doc, apkel)
|
|
|
|
|
2017-03-29 18:10:04 +02:00
|
|
|
addElement('versioncode', str(apk['versionCode']), doc, apkel)
|
|
|
|
addElement('apkname', apk['apkName'], doc, apkel)
|
|
|
|
addElementIfInApk('srcname', apk, 'srcname', doc, apkel)
|
|
|
|
|
|
|
|
hashel = doc.createElement("hash")
|
|
|
|
hashel.setAttribute('type', 'sha256')
|
|
|
|
hashel.appendChild(doc.createTextNode(apk['hash']))
|
|
|
|
apkel.appendChild(hashel)
|
|
|
|
|
|
|
|
addElement('size', str(apk['size']), doc, apkel)
|
|
|
|
addElementIfInApk('sdkver', apk,
|
|
|
|
'minSdkVersion', doc, apkel)
|
|
|
|
addElementIfInApk('targetSdkVersion', apk,
|
|
|
|
'targetSdkVersion', doc, apkel)
|
|
|
|
addElementIfInApk('maxsdkver', apk,
|
|
|
|
'maxSdkVersion', doc, apkel)
|
|
|
|
addElementIfInApk('obbMainFile', apk,
|
|
|
|
'obbMainFile', doc, apkel)
|
|
|
|
addElementIfInApk('obbMainFileSha256', apk,
|
|
|
|
'obbMainFileSha256', doc, apkel)
|
|
|
|
addElementIfInApk('obbPatchFile', apk,
|
|
|
|
'obbPatchFile', doc, apkel)
|
|
|
|
addElementIfInApk('obbPatchFileSha256', apk,
|
|
|
|
'obbPatchFileSha256', doc, apkel)
|
|
|
|
if 'added' in apk:
|
|
|
|
addElement('added', apk['added'].strftime('%Y-%m-%d'), doc, apkel)
|
|
|
|
|
|
|
|
if file_extension == 'apk': # sig is required for APKs, but only APKs
|
|
|
|
addElement('sig', apk['sig'], doc, apkel)
|
|
|
|
|
|
|
|
old_permissions = set()
|
|
|
|
sorted_permissions = sorted(apk['uses-permission'])
|
|
|
|
for perm in sorted_permissions:
|
2018-09-03 18:07:40 +02:00
|
|
|
perm_name = perm[0]
|
2017-03-29 18:10:04 +02:00
|
|
|
if perm_name.startswith("android.permission."):
|
|
|
|
perm_name = perm_name[19:]
|
|
|
|
old_permissions.add(perm_name)
|
2017-04-03 11:29:21 +02:00
|
|
|
addElementNonEmpty('permissions', ','.join(sorted(old_permissions)), doc, apkel)
|
2017-03-29 18:10:04 +02:00
|
|
|
|
|
|
|
for permission in sorted_permissions:
|
|
|
|
permel = doc.createElement('uses-permission')
|
2018-09-03 18:07:40 +02:00
|
|
|
if permission[1] is not None:
|
|
|
|
permel.setAttribute('maxSdkVersion', '%d' % permission[1])
|
2017-03-29 18:10:04 +02:00
|
|
|
apkel.appendChild(permel)
|
index: xml.dom.minidom no longer sorts attribs
It seems now that xml.dom.minidom preserves the order of attributes, rather
than sorting them. We assume alpha-sort, so this manually
This diff in the test suite running on Debian/testing pointed it out:
https://gitlab.com/fdroid/fdroidserver/-/jobs/486970383
```diff
--- /builds/fdroid/fdroidserver/tests/repo/index.xml 2020-04-11 13:36:57.000000000 +0000
+++ repo/index.xml 2020-04-11 13:41:44.000000000 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<fdroid>
- <repo icon="fdroid-icon.png" name="My First F-Droid Repo Demo" pubkey="308204e1308202c9a003020102020434597643300d06092a864886f70d01010b050030213110300e060355040b1307462d44726f6964310d300b06035504031304736f7661301e170d3136303931333230313930395a170d3434303133303230313930395a30213110300e060355040b1307462d44726f6964310d300b06035504031304736f766130820222300d06092a864886f70d01010105000382020f003082020a028202010086ef94b5aacf2ba4f38c875f4194b44f5644392e3715575d7c92828577e692c352b567172823851c8c72347fbc9d99684cd7ca3e1db3e4cca126382c53f2a5869fb4c19bdec989b2930501af3e758ff40588915fe96b10076ce3346a193a0277d79e83e30fd8657c20e35260dd085aa32eac7c4b85786ffefbf1555cafe2bc928443430cdbba48cfbe701e12ae86e676477932730d4fc7c00af820aef85038a5b4df084cf6470d110dc4c49ea1b749b80b34709d199b3db516b223625c5de4501e861f7d261b3838f8f616aa78831d618d41d25872dc810c9b2087b5a9e146ca95be740316dcdbcb77314e23ab87d4487913b800b1113c0603ea2294188b71d3e49875df097b56f9151211fc6832f9790c5c83d17481f14ad37915fd164f4fd713f6732a15f4245714b84cd665bdbd085660ea33ad7d7095dcc414f09e3903604a40facc2314a115c0045bb50e9df38efb57e1b8e7cc105f340a26eeb46aba0fa6672953eee7f1f92dcb408e561909bbd4bdf4a4948c4d57c467d21aa238c34ba43be050398be963191fa2b49828bc1e4eeed224b40dbe9dc3e570890a71a974a2f4527edb1b07105071755105edcb2af2f269facfb89180903a572a99b46456e80d4a01685a80b233278805f2c876678e731f4ec4f52075aeef6b2b023efbb8a3637ef507c4c37c27e428152ec1817fcba640ad601cb09f72f0fbe2d274a2410203010001a321301f301d0603551d0e04160414c28bf33dd5a9a17338e5b1d1a6edd8c7d141ed0b300d06092a864886f70d01010b0500038202010084e20458b2aafd7fc27146b0986f9324f4260f244920417a77c9bf15e2e2d22d2725bdd8093ec261c3779c3ca03312516506f9410075b90595b41345956d8eb2786fb5994f195611382c2b99dba13381b0100a30bc9e6e47248bf4325e2f6eec9d789216dc7536e753bf1f4be603d9fa2e6f5e192b4eb988b8cdb0bb1e8668a9225426f7d4636479f73ed24ad1d2657c31e63c93d9679b9080171b3bd1bf10a3b92b80bd790fbf62d3644900cd08eae8b9bf9c2567be98dc8cdd2ae19a8d57a3e3e2de899f81f1279f578989e6af906f80c8c2b67651730ee7e568c1af5bcb845b6d685dc55332a9984aeceaea3b7e883447edf1c76b155d95253e39b9710eaa22efa6c81468829702b5dce7126538f3ca70c2f0ad9a5795435fdb1f715f20d60359ef9a9926c7050116e802df651727447848827815f70bd82af3cedd08783156102d2d8ce995c4c43b8e47e91a3e6927f3505a5d395e6bebb84542c570903eeab4382a1c2151f1471c7a06a34dc4d268d8fa72e93bdcd2dccc4302ecac47b9e7e3d8bc9b46d21cd097874a24d529548018dc190ff568c6aa428f0a5eedff1a347730931c74f19277538e49647a4ad7254f4c1ec7d4da12cce9e1fad9607534e66ab40a56b473d9d7e3d563fd03cad2052bad365c5a29f8ae54f09b60dbca3ea768d7767cbe1c133ca08ce725c1c1370f4aab8e5b6e286f52dc0be8d0982b5a" timestamp="1480431575" url="https://MyFirstFDroidRepo.org/fdroid/repo" version="21">
+ <repo name="My First F-Droid Repo Demo" icon="fdroid-icon.png" url="https://MyFirstFDroidRepo.org/fdroid/repo" version="21" timestamp="1480431575" pubkey="308204e1308202c9a003020102020434597643300d06092a864886f70d01010b050030213110300e060355040b1307462d44726f6964310d300b06035504031304736f7661301e170d3136303931333230313930395a170d3434303133303230313930395a30213110300e060355040b1307462d44726f6964310d300b06035504031304736f766130820222300d06092a864886f70d01010105000382020f003082020a028202010086ef94b5aacf2ba4f38c875f4194b44f5644392e3715575d7c92828577e692c352b567172823851c8c72347fbc9d99684cd7ca3e1db3e4cca126382c53f2a5869fb4c19bdec989b2930501af3e758ff40588915fe96b10076ce3346a193a0277d79e83e30fd8657c20e35260dd085aa32eac7c4b85786ffefbf1555cafe2bc928443430cdbba48cfbe701e12ae86e676477932730d4fc7c00af820aef85038a5b4df084cf6470d110dc4c49ea1b749b80b34709d199b3db516b223625c5de4501e861f7d261b3838f8f616aa78831d618d41d25872dc810c9b2087b5a9e146ca95be740316dcdbcb77314e23ab87d4487913b800b1113c0603ea2294188b71d3e49875df097b56f9151211fc6832f9790c5c83d17481f14ad37915fd164f4fd713f6732a15f4245714b84cd665bdbd085660ea33ad7d7095dcc414f09e3903604a40facc2314a115c0045bb50e9df38efb57e1b8e7cc105f340a26eeb46aba0fa6672953eee7f1f92dcb408e561909bbd4bdf4a4948c4d57c467d21aa238c34ba43be050398be963191fa2b49828bc1e4eeed224b40dbe9dc3e570890a71a974a2f4527edb1b07105071755105edcb2af2f269facfb89180903a572a99b46456e80d4a01685a80b233278805f2c876678e731f4ec4f52075aeef6b2b023efbb8a3637ef507c4c37c27e428152ec1817fcba640ad601cb09f72f0fbe2d274a2410203010001a321301f301d0603551d0e04160414c28bf33dd5a9a17338e5b1d1a6edd8c7d141ed0b300d06092a864886f70d01010b0500038202010084e20458b2aafd7fc27146b0986f9324f4260f244920417a77c9bf15e2e2d22d2725bdd8093ec261c3779c3ca03312516506f9410075b90595b41345956d8eb2786fb5994f195611382c2b99dba13381b0100a30bc9e6e47248bf4325e2f6eec9d789216dc7536e753bf1f4be603d9fa2e6f5e192b4eb988b8cdb0bb1e8668a9225426f7d4636479f73ed24ad1d2657c31e63c93d9679b9080171b3bd1bf10a3b92b80bd790fbf62d3644900cd08eae8b9bf9c2567be98dc8cdd2ae19a8d57a3e3e2de899f81f1279f578989e6af906f80c8c2b67651730ee7e568c1af5bcb845b6d685dc55332a9984aeceaea3b7e883447edf1c76b155d95253e39b9710eaa22efa6c81468829702b5dce7126538f3ca70c2f0ad9a5795435fdb1f715f20d60359ef9a9926c7050116e802df651727447848827815f70bd82af3cedd08783156102d2d8ce995c4c43b8e47e91a3e6927f3505a5d395e6bebb84542c570903eeab4382a1c2151f1471c7a06a34dc4d268d8fa72e93bdcd2dccc4302ecac47b9e7e3d8bc9b46d21cd097874a24d529548018dc190ff568c6aa428f0a5eedff1a347730931c74f19277538e49647a4ad7254f4c1ec7d4da12cce9e1fad9607534e66ab40a56b473d9d7e3d563fd03cad2052bad365c5a29f8ae54f09b60dbca3ea768d7767cbe1c133ca08ce725c1c1370f4aab8e5b6e286f52dc0be8d0982b5a">
<description>This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/u/fdroid. </description>
<mirror>http://foobarfoobarfoobar.onion/fdroid/repo</mirror>
<mirror>https://foo.bar/fdroid/repo</mirror>
@@ -94,9 +94,9 @@
<added>2017-12-22</added>
<sig>056c9f1554c40ba59a2103009c82b420</sig>
<permissions>ACCESS_NETWORK_STATE,ACCESS_WIFI_STATE,CHANGE_WIFI_MULTICAST_STATE,INTERNET,READ_EXTERNAL_STORAGE,WRITE_EXTERNAL_STORAGE</permissions>
- <uses-permission maxSdkVersion="18" name="android.permission.READ_EXTERNAL_STORAGE"/>
- <uses-permission maxSdkVersion="18" name="android.permission.WRITE_EXTERNAL_STORAGE"/>
- <uses-permission-sdk-23 maxSdkVersion="27" name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
+ <uses-permission name="android.permission.READ_EXTERNAL_STORAGE" maxSdkVersion="18"/>
+ <uses-permission name="android.permission.WRITE_EXTERNAL_STORAGE" maxSdkVersion="18"/>
+ <uses-permission-sdk-23 name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" maxSdkVersion="27"/>
</package>
</application>
<application id="fake.ota.update">
@@ -182,9 +182,9 @@
<added>2013-12-31</added>
<sig>eb41d4d6082bb3e81c3d58dbf7fc7332</sig>
<permissions>ACCESS_NETWORK_STATE,ACCESS_WIFI_STATE,BLUETOOTH,BLUETOOTH_ADMIN,CHANGE_NETWORK_STATE,CHANGE_WIFI_MULTICAST_STATE,CHANGE_WIFI_STATE,INTERNET,NFC,RECEIVE_BOOT_COMPLETED</permissions>
- <uses-permission maxSdkVersion="22" name="android.permission.ACCESS_NETWORK_STATE"/>
- <uses-permission maxSdkVersion="18" name="android.permission.BLUETOOTH_ADMIN"/>
- <uses-permission-sdk-23 maxSdkVersion="25" name="android.permission.WRITE_SETTINGS"/>
+ <uses-permission name="android.permission.ACCESS_NETWORK_STATE" maxSdkVersion="22"/>
+ <uses-permission name="android.permission.BLUETOOTH_ADMIN" maxSdkVersion="18"/>
+ <uses-permission-sdk-23 name="android.permission.WRITE_SETTINGS" maxSdkVersion="25"/>
</package>
</application>
<application id="obb.main.twoversions">
```
2020-04-15 21:43:41 +02:00
|
|
|
permel.setAttribute('name', permission[0])
|
2017-03-29 18:10:04 +02:00
|
|
|
for permission_sdk_23 in sorted(apk['uses-permission-sdk-23']):
|
|
|
|
permel = doc.createElement('uses-permission-sdk-23')
|
2018-09-03 18:07:40 +02:00
|
|
|
if permission_sdk_23[1] is not None:
|
|
|
|
permel.setAttribute('maxSdkVersion', '%d' % permission_sdk_23[1])
|
2017-03-29 18:10:04 +02:00
|
|
|
apkel.appendChild(permel)
|
index: xml.dom.minidom no longer sorts attribs
It seems now that xml.dom.minidom preserves the order of attributes, rather
than sorting them. We assume alpha-sort, so this manually
This diff in the test suite running on Debian/testing pointed it out:
https://gitlab.com/fdroid/fdroidserver/-/jobs/486970383
```diff
--- /builds/fdroid/fdroidserver/tests/repo/index.xml 2020-04-11 13:36:57.000000000 +0000
+++ repo/index.xml 2020-04-11 13:41:44.000000000 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<fdroid>
- <repo icon="fdroid-icon.png" name="My First F-Droid Repo Demo" pubkey="308204e1308202c9a003020102020434597643300d06092a864886f70d01010b050030213110300e060355040b1307462d44726f6964310d300b06035504031304736f7661301e170d3136303931333230313930395a170d3434303133303230313930395a30213110300e060355040b1307462d44726f6964310d300b06035504031304736f766130820222300d06092a864886f70d01010105000382020f003082020a028202010086ef94b5aacf2ba4f38c875f4194b44f5644392e3715575d7c92828577e692c352b567172823851c8c72347fbc9d99684cd7ca3e1db3e4cca126382c53f2a5869fb4c19bdec989b2930501af3e758ff40588915fe96b10076ce3346a193a0277d79e83e30fd8657c20e35260dd085aa32eac7c4b85786ffefbf1555cafe2bc928443430cdbba48cfbe701e12ae86e676477932730d4fc7c00af820aef85038a5b4df084cf6470d110dc4c49ea1b749b80b34709d199b3db516b223625c5de4501e861f7d261b3838f8f616aa78831d618d41d25872dc810c9b2087b5a9e146ca95be740316dcdbcb77314e23ab87d4487913b800b1113c0603ea2294188b71d3e49875df097b56f9151211fc6832f9790c5c83d17481f14ad37915fd164f4fd713f6732a15f4245714b84cd665bdbd085660ea33ad7d7095dcc414f09e3903604a40facc2314a115c0045bb50e9df38efb57e1b8e7cc105f340a26eeb46aba0fa6672953eee7f1f92dcb408e561909bbd4bdf4a4948c4d57c467d21aa238c34ba43be050398be963191fa2b49828bc1e4eeed224b40dbe9dc3e570890a71a974a2f4527edb1b07105071755105edcb2af2f269facfb89180903a572a99b46456e80d4a01685a80b233278805f2c876678e731f4ec4f52075aeef6b2b023efbb8a3637ef507c4c37c27e428152ec1817fcba640ad601cb09f72f0fbe2d274a2410203010001a321301f301d0603551d0e04160414c28bf33dd5a9a17338e5b1d1a6edd8c7d141ed0b300d06092a864886f70d01010b0500038202010084e20458b2aafd7fc27146b0986f9324f4260f244920417a77c9bf15e2e2d22d2725bdd8093ec261c3779c3ca03312516506f9410075b90595b41345956d8eb2786fb5994f195611382c2b99dba13381b0100a30bc9e6e47248bf4325e2f6eec9d789216dc7536e753bf1f4be603d9fa2e6f5e192b4eb988b8cdb0bb1e8668a9225426f7d4636479f73ed24ad1d2657c31e63c93d9679b9080171b3bd1bf10a3b92b80bd790fbf62d3644900cd08eae8b9bf9c2567be98dc8cdd2ae19a8d57a3e3e2de899f81f1279f578989e6af906f80c8c2b67651730ee7e568c1af5bcb845b6d685dc55332a9984aeceaea3b7e883447edf1c76b155d95253e39b9710eaa22efa6c81468829702b5dce7126538f3ca70c2f0ad9a5795435fdb1f715f20d60359ef9a9926c7050116e802df651727447848827815f70bd82af3cedd08783156102d2d8ce995c4c43b8e47e91a3e6927f3505a5d395e6bebb84542c570903eeab4382a1c2151f1471c7a06a34dc4d268d8fa72e93bdcd2dccc4302ecac47b9e7e3d8bc9b46d21cd097874a24d529548018dc190ff568c6aa428f0a5eedff1a347730931c74f19277538e49647a4ad7254f4c1ec7d4da12cce9e1fad9607534e66ab40a56b473d9d7e3d563fd03cad2052bad365c5a29f8ae54f09b60dbca3ea768d7767cbe1c133ca08ce725c1c1370f4aab8e5b6e286f52dc0be8d0982b5a" timestamp="1480431575" url="https://MyFirstFDroidRepo.org/fdroid/repo" version="21">
+ <repo name="My First F-Droid Repo Demo" icon="fdroid-icon.png" url="https://MyFirstFDroidRepo.org/fdroid/repo" version="21" timestamp="1480431575" pubkey="308204e1308202c9a003020102020434597643300d06092a864886f70d01010b050030213110300e060355040b1307462d44726f6964310d300b06035504031304736f7661301e170d3136303931333230313930395a170d3434303133303230313930395a30213110300e060355040b1307462d44726f6964310d300b06035504031304736f766130820222300d06092a864886f70d01010105000382020f003082020a028202010086ef94b5aacf2ba4f38c875f4194b44f5644392e3715575d7c92828577e692c352b567172823851c8c72347fbc9d99684cd7ca3e1db3e4cca126382c53f2a5869fb4c19bdec989b2930501af3e758ff40588915fe96b10076ce3346a193a0277d79e83e30fd8657c20e35260dd085aa32eac7c4b85786ffefbf1555cafe2bc928443430cdbba48cfbe701e12ae86e676477932730d4fc7c00af820aef85038a5b4df084cf6470d110dc4c49ea1b749b80b34709d199b3db516b223625c5de4501e861f7d261b3838f8f616aa78831d618d41d25872dc810c9b2087b5a9e146ca95be740316dcdbcb77314e23ab87d4487913b800b1113c0603ea2294188b71d3e49875df097b56f9151211fc6832f9790c5c83d17481f14ad37915fd164f4fd713f6732a15f4245714b84cd665bdbd085660ea33ad7d7095dcc414f09e3903604a40facc2314a115c0045bb50e9df38efb57e1b8e7cc105f340a26eeb46aba0fa6672953eee7f1f92dcb408e561909bbd4bdf4a4948c4d57c467d21aa238c34ba43be050398be963191fa2b49828bc1e4eeed224b40dbe9dc3e570890a71a974a2f4527edb1b07105071755105edcb2af2f269facfb89180903a572a99b46456e80d4a01685a80b233278805f2c876678e731f4ec4f52075aeef6b2b023efbb8a3637ef507c4c37c27e428152ec1817fcba640ad601cb09f72f0fbe2d274a2410203010001a321301f301d0603551d0e04160414c28bf33dd5a9a17338e5b1d1a6edd8c7d141ed0b300d06092a864886f70d01010b0500038202010084e20458b2aafd7fc27146b0986f9324f4260f244920417a77c9bf15e2e2d22d2725bdd8093ec261c3779c3ca03312516506f9410075b90595b41345956d8eb2786fb5994f195611382c2b99dba13381b0100a30bc9e6e47248bf4325e2f6eec9d789216dc7536e753bf1f4be603d9fa2e6f5e192b4eb988b8cdb0bb1e8668a9225426f7d4636479f73ed24ad1d2657c31e63c93d9679b9080171b3bd1bf10a3b92b80bd790fbf62d3644900cd08eae8b9bf9c2567be98dc8cdd2ae19a8d57a3e3e2de899f81f1279f578989e6af906f80c8c2b67651730ee7e568c1af5bcb845b6d685dc55332a9984aeceaea3b7e883447edf1c76b155d95253e39b9710eaa22efa6c81468829702b5dce7126538f3ca70c2f0ad9a5795435fdb1f715f20d60359ef9a9926c7050116e802df651727447848827815f70bd82af3cedd08783156102d2d8ce995c4c43b8e47e91a3e6927f3505a5d395e6bebb84542c570903eeab4382a1c2151f1471c7a06a34dc4d268d8fa72e93bdcd2dccc4302ecac47b9e7e3d8bc9b46d21cd097874a24d529548018dc190ff568c6aa428f0a5eedff1a347730931c74f19277538e49647a4ad7254f4c1ec7d4da12cce9e1fad9607534e66ab40a56b473d9d7e3d563fd03cad2052bad365c5a29f8ae54f09b60dbca3ea768d7767cbe1c133ca08ce725c1c1370f4aab8e5b6e286f52dc0be8d0982b5a">
<description>This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/u/fdroid. </description>
<mirror>http://foobarfoobarfoobar.onion/fdroid/repo</mirror>
<mirror>https://foo.bar/fdroid/repo</mirror>
@@ -94,9 +94,9 @@
<added>2017-12-22</added>
<sig>056c9f1554c40ba59a2103009c82b420</sig>
<permissions>ACCESS_NETWORK_STATE,ACCESS_WIFI_STATE,CHANGE_WIFI_MULTICAST_STATE,INTERNET,READ_EXTERNAL_STORAGE,WRITE_EXTERNAL_STORAGE</permissions>
- <uses-permission maxSdkVersion="18" name="android.permission.READ_EXTERNAL_STORAGE"/>
- <uses-permission maxSdkVersion="18" name="android.permission.WRITE_EXTERNAL_STORAGE"/>
- <uses-permission-sdk-23 maxSdkVersion="27" name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
+ <uses-permission name="android.permission.READ_EXTERNAL_STORAGE" maxSdkVersion="18"/>
+ <uses-permission name="android.permission.WRITE_EXTERNAL_STORAGE" maxSdkVersion="18"/>
+ <uses-permission-sdk-23 name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" maxSdkVersion="27"/>
</package>
</application>
<application id="fake.ota.update">
@@ -182,9 +182,9 @@
<added>2013-12-31</added>
<sig>eb41d4d6082bb3e81c3d58dbf7fc7332</sig>
<permissions>ACCESS_NETWORK_STATE,ACCESS_WIFI_STATE,BLUETOOTH,BLUETOOTH_ADMIN,CHANGE_NETWORK_STATE,CHANGE_WIFI_MULTICAST_STATE,CHANGE_WIFI_STATE,INTERNET,NFC,RECEIVE_BOOT_COMPLETED</permissions>
- <uses-permission maxSdkVersion="22" name="android.permission.ACCESS_NETWORK_STATE"/>
- <uses-permission maxSdkVersion="18" name="android.permission.BLUETOOTH_ADMIN"/>
- <uses-permission-sdk-23 maxSdkVersion="25" name="android.permission.WRITE_SETTINGS"/>
+ <uses-permission name="android.permission.ACCESS_NETWORK_STATE" maxSdkVersion="22"/>
+ <uses-permission name="android.permission.BLUETOOTH_ADMIN" maxSdkVersion="18"/>
+ <uses-permission-sdk-23 name="android.permission.WRITE_SETTINGS" maxSdkVersion="25"/>
</package>
</application>
<application id="obb.main.twoversions">
```
2020-04-15 21:43:41 +02:00
|
|
|
permel.setAttribute('name', permission_sdk_23[0])
|
2017-03-29 18:10:04 +02:00
|
|
|
if 'nativecode' in apk:
|
|
|
|
addElement('nativecode', ','.join(sorted(apk['nativecode'])), doc, apkel)
|
|
|
|
addElementNonEmpty('features', ','.join(sorted(apk['features'])), doc, apkel)
|
|
|
|
|
|
|
|
if current_version_file is not None \
|
2017-03-31 15:50:15 +02:00
|
|
|
and common.config['make_current_version_link'] \
|
2017-03-29 18:10:04 +02:00
|
|
|
and repodir == 'repo': # only create these
|
2017-03-31 15:50:15 +02:00
|
|
|
namefield = common.config['current_version_name_source']
|
2020-01-13 15:43:42 +01:00
|
|
|
name = app.get(namefield)
|
|
|
|
if not name and namefield == 'Name':
|
|
|
|
name = app.get('localized', {}).get('en-US', {}).get('name')
|
|
|
|
if not name:
|
|
|
|
name = app.id
|
|
|
|
sanitized_name = re.sub(b'''[ '"&%?+=/]''', b'', name.encode('utf-8'))
|
2017-06-01 10:29:30 +02:00
|
|
|
apklinkname = sanitized_name + os.path.splitext(current_version_file)[1].encode('utf-8')
|
2017-04-03 20:24:00 +02:00
|
|
|
current_version_path = os.path.join(repodir, current_version_file).encode('utf-8', 'surrogateescape')
|
2017-03-29 18:10:04 +02:00
|
|
|
if os.path.islink(apklinkname):
|
|
|
|
os.remove(apklinkname)
|
|
|
|
os.symlink(current_version_path, apklinkname)
|
|
|
|
# also symlink gpg signature, if it exists
|
2017-04-03 20:24:00 +02:00
|
|
|
for extension in (b'.asc', b'.sig'):
|
2017-03-29 18:10:04 +02:00
|
|
|
sigfile_path = current_version_path + extension
|
|
|
|
if os.path.exists(sigfile_path):
|
|
|
|
siglinkname = apklinkname + extension
|
|
|
|
if os.path.islink(siglinkname):
|
|
|
|
os.remove(siglinkname)
|
|
|
|
os.symlink(sigfile_path, siglinkname)
|
|
|
|
|
2017-03-31 15:50:15 +02:00
|
|
|
if common.options.pretty:
|
2017-03-29 18:10:04 +02:00
|
|
|
output = doc.toprettyxml(encoding='utf-8')
|
|
|
|
else:
|
|
|
|
output = doc.toxml(encoding='utf-8')
|
|
|
|
|
|
|
|
with open(os.path.join(repodir, 'index.xml'), 'wb') as f:
|
|
|
|
f.write(output)
|
|
|
|
|
2020-08-20 14:38:42 +02:00
|
|
|
if 'repo_keyalias' in common.config \
|
|
|
|
or (common.options.nosign and 'repo_pubkey' in common.config):
|
2017-03-29 18:10:04 +02:00
|
|
|
|
2017-03-31 15:50:15 +02:00
|
|
|
if common.options.nosign:
|
2017-09-13 18:03:57 +02:00
|
|
|
logging.info(_("Creating unsigned index in preparation for signing"))
|
2017-03-29 18:10:04 +02:00
|
|
|
else:
|
2017-09-13 18:03:57 +02:00
|
|
|
logging.info(_("Creating signed index with this key (SHA256):"))
|
2017-03-29 18:10:04 +02:00
|
|
|
logging.info("%s" % repo_pubkey_fingerprint)
|
|
|
|
|
|
|
|
# Create a jar of the index...
|
2017-03-31 15:50:15 +02:00
|
|
|
jar_output = 'index_unsigned.jar' if common.options.nosign else 'index.jar'
|
2017-03-29 18:10:04 +02:00
|
|
|
p = FDroidPopen(['jar', 'cf', jar_output, 'index.xml'], cwd=repodir)
|
|
|
|
if p.returncode != 0:
|
2017-05-22 21:33:52 +02:00
|
|
|
raise FDroidException("Failed to create {0}".format(jar_output))
|
2017-03-29 18:10:04 +02:00
|
|
|
|
|
|
|
# Sign the index...
|
|
|
|
signed = os.path.join(repodir, 'index.jar')
|
2017-03-31 15:50:15 +02:00
|
|
|
if common.options.nosign:
|
2017-03-29 18:10:04 +02:00
|
|
|
# Remove old signed index if not signing
|
|
|
|
if os.path.exists(signed):
|
|
|
|
os.remove(signed)
|
|
|
|
else:
|
2017-03-31 15:50:15 +02:00
|
|
|
signindex.config = common.config
|
2017-03-29 18:10:04 +02:00
|
|
|
signindex.sign_jar(signed)
|
|
|
|
|
|
|
|
# Copy the repo icon into the repo directory...
|
|
|
|
icon_dir = os.path.join(repodir, 'icons')
|
2020-10-01 10:02:05 +02:00
|
|
|
repo_icon = common.config.get('repo_icon', common.default_config['repo_icon'])
|
|
|
|
iconfilename = os.path.join(icon_dir, os.path.basename(repo_icon))
|
|
|
|
if os.path.exists(repo_icon):
|
|
|
|
shutil.copyfile(common.config['repo_icon'], iconfilename)
|
|
|
|
else:
|
|
|
|
logging.warning(_('repo_icon %s does not exist, generating placeholder.')
|
|
|
|
% repo_icon)
|
|
|
|
os.makedirs(os.path.dirname(iconfilename), exist_ok=True)
|
|
|
|
try:
|
|
|
|
import qrcode
|
|
|
|
qrcode.make(common.config['repo_url']).save(iconfilename)
|
|
|
|
except Exception:
|
|
|
|
exampleicon = os.path.join(common.get_examples_dir(),
|
|
|
|
common.default_config['repo_icon'])
|
|
|
|
shutil.copy(exampleicon, iconfilename)
|
2017-03-29 18:10:04 +02:00
|
|
|
|
|
|
|
|
|
|
|
def extract_pubkey():
|
|
|
|
"""
|
|
|
|
Extracts and returns the repository's public key from the keystore.
|
|
|
|
:return: public key in hex, repository fingerprint
|
|
|
|
"""
|
2017-03-31 15:50:15 +02:00
|
|
|
if 'repo_pubkey' in common.config:
|
|
|
|
pubkey = unhexlify(common.config['repo_pubkey'])
|
2017-03-29 18:10:04 +02:00
|
|
|
else:
|
2018-08-03 04:36:00 +02:00
|
|
|
env_vars = {'LC_ALL': 'C.UTF-8',
|
|
|
|
'FDROID_KEY_STORE_PASS': common.config['keystorepass']}
|
2017-03-31 15:50:15 +02:00
|
|
|
p = FDroidPopenBytes([common.config['keytool'], '-exportcert',
|
|
|
|
'-alias', common.config['repo_keyalias'],
|
|
|
|
'-keystore', common.config['keystore'],
|
2017-04-11 21:34:49 +02:00
|
|
|
'-storepass:env', 'FDROID_KEY_STORE_PASS']
|
2020-08-04 17:26:29 +02:00
|
|
|
+ list(common.config['smartcardoptions']),
|
2017-04-11 21:34:49 +02:00
|
|
|
envs=env_vars, output=False, stderr_to_stdout=False)
|
2017-03-29 18:10:04 +02:00
|
|
|
if p.returncode != 0 or len(p.output) < 20:
|
|
|
|
msg = "Failed to get repo pubkey!"
|
2017-03-31 15:50:15 +02:00
|
|
|
if common.config['keystore'] == 'NONE':
|
2017-03-29 18:10:04 +02:00
|
|
|
msg += ' Is your crypto smartcard plugged in?'
|
2017-05-22 21:33:52 +02:00
|
|
|
raise FDroidException(msg)
|
2017-03-29 18:10:04 +02:00
|
|
|
pubkey = p.output
|
|
|
|
repo_pubkey_fingerprint = common.get_cert_fingerprint(pubkey)
|
|
|
|
return hexlify(pubkey), repo_pubkey_fingerprint
|
|
|
|
|
|
|
|
|
2017-07-19 12:59:20 +02:00
|
|
|
def get_mirror_service_urls(url):
|
|
|
|
'''Get direct URLs from git service for use by fdroidclient
|
2017-03-29 18:10:04 +02:00
|
|
|
|
2017-04-11 12:28:36 +02:00
|
|
|
Via 'servergitmirrors', fdroidserver can create and push a mirror
|
|
|
|
to certain well known git services like gitlab or github. This
|
|
|
|
will always use the 'master' branch since that is the default
|
2017-07-19 12:59:20 +02:00
|
|
|
branch in git. The files are then accessible via alternate URLs,
|
|
|
|
where they are served in their raw format via a CDN rather than
|
|
|
|
from git.
|
2017-04-11 12:28:36 +02:00
|
|
|
'''
|
|
|
|
|
|
|
|
if url.startswith('git@'):
|
2020-12-08 19:44:39 +01:00
|
|
|
url = re.sub(r'^git@([^:]+):(.+)', r'https://\1/\2', url)
|
2017-04-11 12:28:36 +02:00
|
|
|
|
|
|
|
segments = url.split("/")
|
2017-05-17 20:37:49 +02:00
|
|
|
|
|
|
|
if segments[4].endswith('.git'):
|
|
|
|
segments[4] = segments[4][:-4]
|
|
|
|
|
2017-04-11 12:28:36 +02:00
|
|
|
hostname = segments[2]
|
2017-05-17 20:37:49 +02:00
|
|
|
user = segments[3]
|
|
|
|
repo = segments[4]
|
2017-03-29 18:10:04 +02:00
|
|
|
branch = "master"
|
|
|
|
folder = "fdroid"
|
|
|
|
|
2017-07-19 12:59:20 +02:00
|
|
|
urls = []
|
2017-03-29 18:10:04 +02:00
|
|
|
if hostname == "github.com":
|
2017-07-19 12:59:20 +02:00
|
|
|
# Github-like RAW segments "https://raw.githubusercontent.com/user/repo/branch/folder"
|
2017-04-11 12:28:36 +02:00
|
|
|
segments[2] = "raw.githubusercontent.com"
|
|
|
|
segments.extend([branch, folder])
|
2017-07-19 12:59:20 +02:00
|
|
|
urls.append('/'.join(segments))
|
2017-03-29 18:10:04 +02:00
|
|
|
elif hostname == "gitlab.com":
|
2018-01-17 22:02:07 +01:00
|
|
|
# Both these Gitlab URLs will work with F-Droid, but only the first will work in the browser
|
|
|
|
# This is because the `raw` URLs are not served with the correct mime types, so any
|
|
|
|
# index.html which is put in the repo will not be rendered. Putting an index.html file in
|
|
|
|
# the repo root is a common way for to make information about the repo available to end user.
|
|
|
|
|
2017-07-19 12:59:20 +02:00
|
|
|
# Gitlab-like Pages segments "https://user.gitlab.io/repo/folder"
|
|
|
|
gitlab_pages = ["https:", "", user + ".gitlab.io", repo, folder]
|
|
|
|
urls.append('/'.join(gitlab_pages))
|
2020-12-08 19:44:39 +01:00
|
|
|
# GitLab Raw "https://gitlab.com/user/repo/-/raw/branch/folder"
|
|
|
|
gitlab_raw = segments + ['-', 'raw', branch, folder]
|
2018-01-17 22:02:07 +01:00
|
|
|
urls.append('/'.join(gitlab_raw))
|
2017-07-19 12:59:20 +02:00
|
|
|
|
|
|
|
return urls
|
2017-03-29 18:10:04 +02:00
|
|
|
|
2017-03-29 23:33:09 +02:00
|
|
|
|
2019-01-10 14:48:29 +01:00
|
|
|
def download_repo_index(url_str, etag=None, verify_fingerprint=True, timeout=600):
|
2018-12-17 14:03:12 +01:00
|
|
|
"""Downloads and verifies index file, then returns its data.
|
|
|
|
|
|
|
|
Downloads the repository index from the given :param url_str and
|
|
|
|
verifies the repository's fingerprint if :param verify_fingerprint
|
|
|
|
is not False.
|
2017-03-29 23:33:09 +02:00
|
|
|
|
|
|
|
:raises: VerificationException() if the repository could not be verified
|
|
|
|
|
2017-05-02 17:05:48 +02:00
|
|
|
:return: A tuple consisting of:
|
|
|
|
- The index in JSON format or None if the index did not change
|
|
|
|
- The new eTag as returned by the HTTP request
|
2018-12-17 14:03:12 +01:00
|
|
|
|
2017-03-29 23:33:09 +02:00
|
|
|
"""
|
|
|
|
url = urllib.parse.urlsplit(url_str)
|
|
|
|
|
|
|
|
fingerprint = None
|
|
|
|
if verify_fingerprint:
|
|
|
|
query = urllib.parse.parse_qs(url.query)
|
|
|
|
if 'fingerprint' not in query:
|
2017-09-13 18:03:57 +02:00
|
|
|
raise VerificationException(_("No fingerprint in URL."))
|
2017-03-29 23:33:09 +02:00
|
|
|
fingerprint = query['fingerprint'][0]
|
|
|
|
|
|
|
|
url = urllib.parse.SplitResult(url.scheme, url.netloc, url.path + '/index-v1.jar', '', '')
|
2019-01-10 14:48:29 +01:00
|
|
|
download, new_etag = net.http_get(url.geturl(), etag, timeout)
|
2017-05-02 17:05:48 +02:00
|
|
|
|
|
|
|
if download is None:
|
|
|
|
return None, new_etag
|
2017-03-29 23:33:09 +02:00
|
|
|
|
|
|
|
with tempfile.NamedTemporaryFile() as fp:
|
2017-05-02 17:05:48 +02:00
|
|
|
fp.write(download)
|
2019-03-22 17:15:58 +01:00
|
|
|
fp.flush()
|
2018-12-17 14:03:12 +01:00
|
|
|
index, public_key, public_key_fingerprint = get_index_from_jar(fp.name, fingerprint)
|
|
|
|
index["repo"]["pubkey"] = hexlify(public_key).decode()
|
|
|
|
index["repo"]["fingerprint"] = public_key_fingerprint
|
|
|
|
index["apps"] = [metadata.App(app) for app in index["apps"]]
|
|
|
|
return index, new_etag
|
2017-03-29 23:33:09 +02:00
|
|
|
|
|
|
|
|
2018-12-17 14:03:12 +01:00
|
|
|
def get_index_from_jar(jarfile, fingerprint=None):
|
|
|
|
"""Returns the data, public key, and fingerprint from index-v1.jar
|
2017-03-29 23:33:09 +02:00
|
|
|
|
2020-10-22 14:39:18 +02:00
|
|
|
:param fingerprint is the SHA-256 fingerprint of signing key. Only
|
|
|
|
hex digits count, all other chars will can be discarded.
|
|
|
|
|
2018-12-17 14:03:12 +01:00
|
|
|
:raises: VerificationException() if the repository could not be verified
|
2020-10-22 14:39:18 +02:00
|
|
|
|
2018-12-17 14:03:12 +01:00
|
|
|
"""
|
2017-03-29 23:33:09 +02:00
|
|
|
|
2018-12-17 14:03:12 +01:00
|
|
|
logging.debug(_('Verifying index signature:'))
|
|
|
|
common.verify_jar_signature(jarfile)
|
|
|
|
with zipfile.ZipFile(jarfile) as jar:
|
|
|
|
public_key, public_key_fingerprint = get_public_key_from_jar(jar)
|
|
|
|
if fingerprint is not None:
|
2020-10-22 14:39:18 +02:00
|
|
|
fingerprint = re.sub(r'[^0-9A-F]', r'', fingerprint.upper())
|
|
|
|
if fingerprint != public_key_fingerprint:
|
2018-12-17 14:03:12 +01:00
|
|
|
raise VerificationException(_("The repository's fingerprint does not match."))
|
|
|
|
data = json.loads(jar.read('index-v1.json').decode())
|
|
|
|
return data, public_key, public_key_fingerprint
|
2017-03-29 23:33:09 +02:00
|
|
|
|
|
|
|
|
|
|
|
def get_public_key_from_jar(jar):
|
|
|
|
"""
|
|
|
|
Get the public key and its fingerprint from a JAR file.
|
|
|
|
|
|
|
|
:raises: VerificationException() if the JAR was not signed exactly once
|
|
|
|
|
|
|
|
:param jar: a zipfile.ZipFile object
|
|
|
|
:return: the public key from the jar and its fingerprint
|
|
|
|
"""
|
|
|
|
# extract certificate from jar
|
2019-01-30 14:12:51 +01:00
|
|
|
certs = [n for n in jar.namelist() if common.SIGNATURE_BLOCK_FILE_REGEX.match(n)]
|
2017-03-29 23:33:09 +02:00
|
|
|
if len(certs) < 1:
|
2017-09-13 18:03:57 +02:00
|
|
|
raise VerificationException(_("Found no signing certificates for repository."))
|
2017-03-29 23:33:09 +02:00
|
|
|
if len(certs) > 1:
|
2017-09-13 18:03:57 +02:00
|
|
|
raise VerificationException(_("Found multiple signing certificates for repository."))
|
2017-03-29 23:33:09 +02:00
|
|
|
|
|
|
|
# extract public key from certificate
|
2017-04-03 14:23:06 +02:00
|
|
|
public_key = common.get_certificate(jar.read(certs[0]))
|
2017-03-29 23:33:09 +02:00
|
|
|
public_key_fingerprint = common.get_cert_fingerprint(public_key).replace(' ', '')
|
|
|
|
|
|
|
|
return public_key, public_key_fingerprint
|