Commit graph

8916 commits

Author SHA1 Message Date
Hans-Christoph Steiner
f7dc89e9ba index: error if duplicate package files are in repo
Looks like the ~index-v2 work removed this error case, and the old bash
integration test case failed to catch it.  This reestablishes this error.

@mindston's refactoring of the old bash test suite caught this issue, e.g.
!1587
2025-02-12 18:38:05 +01:00
Jochen Sprickerhof
6df9d0ecba Merge branch 'autoname' into 'master'
checkupdates: sort the order of dirs when finding autoname

See merge request fdroid/fdroidserver!1601
2025-02-07 17:26:17 +00:00
linsui
a7e56598d6 checkupdates: sort the order of dirs when finding autoname 2025-02-07 22:16:18 +08:00
Hans-Christoph Steiner
9215f5e4b1 Merge branch 'triple-t' into 'master'
update.py: fix triple-t metadata extract when there is no subdir

See merge request fdroid/fdroidserver!1599
2025-01-27 13:49:11 +00:00
linsui
2b725a5966 update.py: fix triple-t metadata extract when there is no subdir 2025-01-27 13:47:36 +00:00
Hans-Christoph Steiner
7c376209e0 Merge branch 'testcommon-rename-to-shared_test_code' into 'master'
tests: rename testcommon module to shared_test_code

See merge request fdroid/fdroidserver!1583
2025-01-27 10:21:58 +00:00
Hans-Christoph Steiner
66d220bd9f tests: rename testcommon module to shared_test_code
This name always confuses me, since there is also test_common.py. And this
module is not actually a test suite, even though it starts with "test".
This also makes for better tab completion, e.g.

python3 -m unittest tests/te[Tab] -> tests/test_
2025-01-27 10:11:19 +00:00
linsui
f9431aaf0f Merge branch 'gradle' into 'master'
gradle v8.12.1

See merge request fdroid/fdroidserver!1598
2025-01-26 04:20:00 +00:00
linsui
0c6e976a01 gradle v8.12.1 2025-01-26 12:09:54 +08:00
Hans-Christoph Steiner
6e1c1f4cc0
make -C locale update 2025-01-21 17:03:56 +01:00
Hans-Christoph Steiner
f719efcba0
version 2.3.5 2025-01-21 16:43:22 +01:00
Hans-Christoph Steiner
e45709beef
update CHANGELOG.md 2025-01-21 16:43:16 +01:00
Hans-Christoph Steiner
0930937939 Merge branch 'ban-apksigner-v33' into 'master'
ban apksigner v33, it has bugs verifying APKs with v3/v3.1 sigs

See merge request fdroid/fdroidserver!1593
2025-01-21 15:00:24 +00:00
Hans-Christoph Steiner
2ac925a249 ban apksigner v33, it has bugs verifying APKs with v3/v3.1 sigs 2025-01-21 15:00:23 +00:00
Hans-Christoph Steiner
afd1a89ca5 Merge branch 'updatedebianimagetrick' into 'master'
Fix vagrant image download issue

See merge request fdroid/fdroidserver!1595
2025-01-21 14:08:09 +00:00
Licaon_Kter
f3102d81b1 Fix vagrant image download issue 2025-01-21 15:57:12 +02:00
Hans-Christoph Steiner
c8c2b1be78 Merge branch 'updatedebianimage' into 'master'
Use latest Bookworm images for makebuildserver

See merge request fdroid/fdroidserver!1594
2025-01-21 13:49:50 +00:00
Licaon_Kter
9e03dba11e Use latest Bookworm images for makebuildserver 2025-01-21 13:36:56 +02:00
Hans-Christoph Steiner
1fc8053936 Merge branch 'fix-ci' into 'master'
two CI fixes: remove broken arch job and ignore one checkupdates test on macOS

See merge request fdroid/fdroidserver!1592
2025-01-21 09:34:12 +00:00
Hans-Christoph Steiner
9b5a67340e checkupdates: skip test_get_upstream_main_branch on macOS
This test checks the detection of the default initial branch. It is a hard
thing to test since different platform configurations have different
defaults.  checkupdates is basically only used on GNU/Linux anyway.

Here's the failure:
https://gitlab.com/fdroid/fdroidserver/-/jobs/8896420261
2025-01-20 15:37:54 +01:00
Hans-Christoph Steiner
594099a10c gitlab-ci: remove arch_pip_install job
https://gitlab.com/fdroid/fdroidserver/-/jobs/8898887965

It broke and no one seems to want to maintain it.
2025-01-20 15:28:25 +01:00
Hans-Christoph Steiner
f14c3e38c8 Merge branch 'merge_weblate' into 'master'
weblate

See merge request fdroid/fdroidserver!1591
2025-01-20 14:04:35 +00:00
大王叫我来巡山
d588afd3f9 Translated using Weblate: Chinese (Simplified Han script) (zh_Hans) by 大王叫我来巡山 <hamburger2048@users.noreply.hosted.weblate.org>
Currently translated at 100.0% (612 of 612 strings)

Co-authored-by: 大王叫我来巡山 <hamburger2048@users.noreply.hosted.weblate.org>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/zh_Hans/
Translation: F-Droid/F-Droid Server
2025-01-20 14:53:42 +01:00
Максим Горпиніч
eecfcbe547 Translated using Weblate: Ukrainian (uk) by Максим Горпиніч <mgorpinic2005@gmail.com>
Currently translated at 100.0% (612 of 612 strings)

Co-authored-by: Максим Горпиніч <mgorpinic2005@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/uk/
Translation: F-Droid/F-Droid Server
2025-01-20 14:53:42 +01:00
Reno Tx
06eb722b13 Translated using Weblate: Serbian (sr) by Reno Tx <renotx@users.noreply.hosted.weblate.org>
Currently translated at 100.0% (612 of 612 strings)

Co-authored-by: Reno Tx <renotx@users.noreply.hosted.weblate.org>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/sr/
Translation: F-Droid/F-Droid Server
2025-01-20 14:53:42 +01:00
Besnik Bleta
d969181b55 Translated using Weblate: Albanian (sq) by Besnik Bleta <besnik@programeshqip.org>
Currently translated at 97.7% (598 of 612 strings)

Co-authored-by: Besnik Bleta <besnik@programeshqip.org>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/sq/
Translation: F-Droid/F-Droid Server
2025-01-20 14:53:42 +01:00
Andrey
49d18e494b Translated using Weblate: Russian (ru) by Andrey <andrey@mailbox.org>
Currently translated at 100.0% (612 of 612 strings)

Co-authored-by: Andrey <andrey@mailbox.org>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/ru/
Translation: F-Droid/F-Droid Server
2025-01-20 14:53:42 +01:00
Golubev Alexander
a9404dbb42 Translated using Weblate: Russian (ru) by Golubev Alexander <fatzer2@gmail.com>
Currently translated at 100.0% (612 of 612 strings)

Co-authored-by: Golubev Alexander <fatzer2@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/ru/
Translation: F-Droid/F-Droid Server
2025-01-20 14:53:42 +01:00
Dmitry
89f44e0fed Translated using Weblate: Russian (ru) by Dmitry <dmitrydmitry761@gmail.com>
Currently translated at 100.0% (612 of 612 strings)

Co-authored-by: Dmitry <dmitrydmitry761@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/ru/
Translation: F-Droid/F-Droid Server
2025-01-20 14:53:42 +01:00
ssantos
a3f9b244d9 Translated using Weblate: Portuguese (Portugal) (pt_PT) by ssantos <ssantos@web.de>
Currently translated at 100.0% (612 of 612 strings)

Co-authored-by: ssantos <ssantos@web.de>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/pt_PT/
Translation: F-Droid/F-Droid Server
2025-01-20 14:53:42 +01:00
LucasMZ
787612b93f Translated using Weblate: Portuguese (Brazil) (pt_BR) by LucasMZ <git@lucasmz.dev>
Currently translated at 100.0% (612 of 612 strings)

Co-authored-by: LucasMZ <git@lucasmz.dev>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/pt_BR/
Translation: F-Droid/F-Droid Server
2025-01-20 14:53:42 +01:00
Liner Seven
d742fc4f65 Translated using Weblate: Japanese (ja) by Liner Seven <linour7gmekiblo@gmail.com>
Currently translated at 100.0% (612 of 612 strings)

Co-authored-by: Liner Seven <linour7gmekiblo@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/ja/
Translation: F-Droid/F-Droid Server
2025-01-20 14:53:42 +01:00
Aindriú Mac Giolla Eoin
f78492e8ad Translated using Weblate: Irish (ga) by Aindriú Mac Giolla Eoin <aindriu80@gmail.com>
Currently translated at 100.0% (612 of 612 strings)

Co-authored-by: Aindriú Mac Giolla Eoin <aindriu80@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/ga/
Translation: F-Droid/F-Droid Server
2025-01-20 14:53:42 +01:00
Armand Camponovo
7720402d72 Translated using Weblate: French (fr) by Armand Camponovo <contact@camarm.dev>
Currently translated at 96.7% (592 of 612 strings)

Co-authored-by: Armand Camponovo <contact@camarm.dev>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/fr/
Translation: F-Droid/F-Droid Server
2025-01-20 14:53:42 +01:00
Sylvain Pichon
eb616643c4 Translated using Weblate: French (fr) by Sylvain Pichon <Sp_@users.noreply.hosted.weblate.org>
Currently translated at 96.5% (591 of 612 strings)

Translated using Weblate: French (fr) by Sylvain Pichon <Sp_@users.noreply.hosted.weblate.org>

Currently translated at 95.7% (586 of 612 strings)

Co-authored-by: Sylvain Pichon <Sp_@users.noreply.hosted.weblate.org>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/fr/
Translation: F-Droid/F-Droid Server
2025-01-20 14:53:42 +01:00
gallegonovato
11574b717e Translated using Weblate: Spanish (es) by gallegonovato <fran-carro@hotmail.es>
Currently translated at 100.0% (612 of 612 strings)

Co-authored-by: gallegonovato <fran-carro@hotmail.es>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/es/
Translation: F-Droid/F-Droid Server
2025-01-20 14:53:42 +01:00
VfBFan
6e0b9c94b2 Translated using Weblate: German (de) by VfBFan <drop0815@posteo.de>
Currently translated at 100.0% (612 of 612 strings)

Co-authored-by: VfBFan <drop0815@posteo.de>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/de/
Translation: F-Droid/F-Droid Server
2025-01-20 14:53:42 +01:00
Fjuro
c1f0914476 Translated using Weblate: Czech (cs) by Fjuro <fjuro@alius.cz>
Currently translated at 100.0% (612 of 612 strings)

Co-authored-by: Fjuro <fjuro@alius.cz>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/cs/
Translation: F-Droid/F-Droid Server
2025-01-20 14:53:42 +01:00
pitroig
8831217ca1 Translated using Weblate: Catalan (ca) by pitroig <ona@riseup.net>
Currently translated at 100.0% (612 of 612 strings)

Co-authored-by: pitroig <ona@riseup.net>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/ca/
Translation: F-Droid/F-Droid Server
2025-01-20 14:53:42 +01:00
Hans-Christoph Steiner
3000cfcd04
pick-complete-translations.py: auto cherry-pick complete langs 2025-01-20 14:53:08 +01:00
Hans-Christoph Steiner
d4b348bd93 Merge branch 'nettests_localhost' into 'master'
test_net: figure out the proper IP protocol for localhost

See merge request fdroid/fdroidserver!1589
2025-01-20 10:34:01 +00:00
Simon Chopin
89a282c12e test_net: figure out the proper IP protocol for localhost
On some systems, localhost is only defined for 127.0.0.1 (e.g. Ubuntu
and Debian containers). However, there is code that hardcodes possible
values for localhost, making it possible to open an IPv6 socket for
localhost.

On those systems, the socket will be open but urllib3 will resolve
localhost *only* to 127.0.0.1, thus failing miserably to connect.

To resolve the situation, rather than defaulting to IPv6 we actually
resolve localhost and use the socket family of the first result. On my
current system (upcoming Ubuntu Plucky) if localhost=::1 is defined in
/etc/hosts it will come up as the first result, if not 127.0.0.1 will.

V2: Use self.port rather than a forgotten hardcoded port.

Fixes: f01628ca6b "fix localhost network tests on systems with IPv6"
2025-01-20 10:33:49 +00:00
Hans-Christoph Steiner
2716f93e79 Merge branch 'verify-handle-corrupt-json' into 'master'
verify: handle corrupt verified.json

See merge request fdroid/fdroidserver!1580
2025-01-20 09:48:32 +00:00
Hans-Christoph Steiner
5b1b1d12a1 verify: handle corrupt verified.json
verified.json can get quite large on verification.f-droid.org, and for some
unknown reason, it sometimes corrupts it when writing it out.  All the data
is already available in all the other JSON files, so this just automatically
reconstructs it.  Its a hack, but it took me much less time than I've
already spent trying to troubleshoot why it writes out corrupt verified.json.
2025-01-20 09:48:20 +00:00
Jochen Sprickerhof
4c88b19bae Merge branch 'apk-v1-signature-regex-fix' into 'master'
match the full file name when looking for the v1 signature block

See merge request fdroid/fdroidserver!1588
2025-01-15 15:24:37 +00:00
Hans-Christoph Steiner
f5a6aa2cbf bandit no longer includes B410 lxml check
https://github.com/PyCQA/bandit/pull/1212
2025-01-15 15:07:24 +01:00
Hans-Christoph Steiner
20caa6fa1c match the full file name when looking for the v1 signature block
ZipFile.namelist() produces a string per file.  The filename could contain
newline chars, including at the beginning and end.  ^$ in regex matches
around newline chars.  \A\Z matches the beginning/end of the full string.

This is exactly the same as obfusk's r'\AMETA-INF/(?s:.)*\.(DSA|EC|RSA)\Z'
but in a readable format that is also easily searchable, and standard for
this code base.

https://github.com/obfusk/fdroid-fakesigner-poc/blob/master/fdroidserver-regex.patch

#1251
2025-01-15 14:45:35 +01:00
linsui
0bb240fac6 Merge branch 'gradle' into 'master'
update to gradle v8.12

See merge request fdroid/fdroidserver!1584
2024-12-22 07:11:51 +00:00
linsui
c70684ea25 update to gradle v8.12 2024-12-22 15:00:47 +08:00
Hans-Christoph Steiner
3b64dcee7a
version 2.3.4 2024-12-12 17:43:43 +01:00