kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-19 13:20:10 +01:00
Code Activity
7,939 Commits 1 Branch 59 Tags 44 MiB
2cb12f9594
Commit Graph

7939 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jochen Sprickerhof
e7e8ad163b Merge branch 'flake8_E275' into 'master' 
Fix flake8 E275 missing whitespace after keyword

See merge request fdroid/fdroidserver!1161
 2022-07-31 08:02:05 +00:00
Jochen Sprickerhof
eb79522a36 Fix flake8 E275 missing whitespace after keyword 2022-07-31 09:48:14 +02:00
Jochen Sprickerhof
42ef7c3406 Merge branch 'defused_exception' into 'master' 
Catch DefusedXmlException (as ValueError)

See merge request fdroid/fdroidserver!1157
 2022-07-31 06:53:43 +00:00
Jochen Sprickerhof
7822db2881 Catch DefusedXmlException (as ValueError) 
defusedxml can't handle the nbsp in the strings.xml (etree can).
 2022-07-25 09:30:25 +02:00
Jochen Sprickerhof
7e1d974351 Reduce try/except block 2022-07-25 08:51:47 +02:00
Michael Pöhn
1151ba298f Merge branch 'exodus_scanner_logging' into 'master' 
scan_binary: Log matched class

See merge request fdroid/fdroidserver!1156
 2022-07-19 17:12:58 +00:00
Jochen Sprickerhof
f8452c4f0c scan_binary: Log matched class 2022-07-18 15:12:43 +02:00
Michael Pöhn
ffdd038cfa Merge branch 'finish-exodus-scanner' into 'master' 
Add tests for fdroid scanner code

Closes #806, #1008, and #566

See merge request fdroid/fdroidserver!1155
 2022-07-17 14:07:44 +00:00
Michael Pöhn
ab579be6b5 add some basic tests for scanner.main 2022-07-17 15:52:52 +02:00
Michael Pöhn
42d9ac446c get tests working on ci 2022-07-17 15:50:07 +02:00
Michael Pöhn
66adf4c508 add .ropeproject/ to .gitignore 2022-07-17 15:50:07 +02:00
Michael Pöhn
1c2b084410 🔧 improve scanner.scan_apk tests 
Refactor test function it a TestCase and split into separate test cases.
Fix and improve tests for scanning apks with embedded apks.
 2022-07-17 15:50:07 +02:00
Michael Pöhn
07a366a4d6 add tests for scanner.load_exodus_trackers_signatures 2022-07-17 15:50:07 +02:00
Michael Pöhn
544772d3ab add missing "or" to scanner cli synopsis 2022-07-17 15:50:07 +02:00
Michael Pöhn
a1677b5cb0 add test case for _exodus_compile_signatures 2022-07-17 15:50:07 +02:00
Michael Pöhn
94c9f0bef9 Merge branch 'exodus_scanner' into 'master' 
Integrate Exodus

Closes #806, #1008, and #566

See merge request fdroid/fdroidserver!1137
 2022-07-17 12:24:46 +00:00
Jochen Sprickerhof
3bd09ef7f4 Integrate Exodus (Closes: #566, #1008) 
Code taken from:

https://github.com/Exodus-Privacy/exodus-core/blob/v1/exodus_core/analysis/static_analysis.py
 2022-07-17 12:09:03 +00:00
Jochen Sprickerhof
ea9299f216 Use binary scanner with fdroid scanner path/to.apk 
Closes: #806
 2022-07-17 12:09:03 +00:00
Hans-Christoph Steiner
dc723e7108 Merge branch 'gradle-release-checksums.py' into 'master' 
update to gradle v7.5

See merge request fdroid/fdroidserver!1153
 2022-07-14 23:26:54 +00:00
fdroid-bot
848e29294c gradle v7.5 2022-07-14 23:10:37 +00:00
Hans-Christoph Steiner
3b1ab74354
gitlab-ci: 'Safety' now needs git to run 
Unhandled exception happened: [Errno 2] No such file or directory: 'git'
https://gitlab.com/fdroid/fdroidserver/-/jobs/2724632572
 2022-07-14 16:09:28 -07:00
Hans-Christoph Steiner
33f3b5d7a4 Merge branch 'linsui-master-patch-07322' into 'master' 
NDK r25

See merge request fdroid/fdroidserver!1151
 2022-07-14 21:54:20 +00:00
linsui
534c170615 NDK r25 2022-07-14 06:35:55 +00:00
Hans-Christoph Steiner
15a562e8b9 Merge branch 'ndk' into 'master' 
Update preinstalled NDK to r23c

See merge request fdroid/fdroidserver!1145
 2022-06-14 11:03:43 +00:00
linsui
5472cf88b8 Update preinstalled NDK to r23c 2022-06-14 11:03:42 +00:00
Jochen Sprickerhof
6f8afd340d Merge branch 'fix-ci-post-1134' into 'master' 
fix CI jobs post !1134

See merge request fdroid/fdroidserver!1144
 2022-06-10 11:01:45 +00:00
Hans-Christoph Steiner
e2d9dedbb1 build: add test to ensure the flags are passed to the buildserver 
!1141
 2022-06-08 21:15:51 +02:00
Hans-Christoph Steiner
2bf6848391 test_find_apksigner_system_package_android_home if build_tools is new enough 2022-06-08 20:39:44 +02:00
Hans-Christoph Steiner
f04af445dd gitlab-ci: upgrade 'servergitmirrors' job to Debian/bullseye-backports 
apksigner is now a requirement !1134
 2022-06-08 20:39:44 +02:00
Hans-Christoph Steiner
09e2c37404 gitlab-ci: port fedora job to fdroid/sdkmanager and Java 17 
This is also needed to support _apksigner_ as in !1134
 2022-06-08 19:37:29 +02:00
Hans-Christoph Steiner
39c1b11a14 Merge branch 'apksigner-entry-jar' into 'master' 
use apksigner to sign index-v2 with modern, supported algorithms

Closes #1005

See merge request fdroid/fdroidserver!1134
 2022-06-08 13:41:42 +00:00
Hans-Christoph Steiner
fe22958476
run-tests: skip tests that require apksigner when running on Java8 
The buildserver VM has not been upgraded yet to bullseye, so it is still on
Debian/stretch.  The buildserver VM does not need to run `fdroid update`,
`fdroid signindex`, etc. so this new apksigner requirement should not
affect app builds even though they are stuck on Debian/stretch.
 2022-06-07 16:56:25 +02:00
Hans-Christoph Steiner
3182b77d18
use apksigner to sign index-v2 with modern, supported algorithms 
The current signing method uses apksigner to sign the JAR so that it
will automatically select algorithms that are compatible with Android
SDK 23, which added the most recent algorithms:
https://developer.android.com/reference/java/security/Signature

This signing method uses then inherits the default signing algothim
settings, since Java and Android both maintain those.  That helps
avoid a repeat of being stuck on an old signing algorithm.  That means
specifically that this call to apksigner does not specify any of the
algorithms.

The old indexes must be signed by SHA1withRSA otherwise they will no
longer be compatible with old Androids.

apksigner 30.0.0+ is available in Debian/bullseye, Debian/buster-backports,
Ubuntu 21.10, and Ubuntu 20.04 from the fdroid PPA.  Here's a quick way to
test:

for f in `ls -1 /opt/android-sdk/build-tools/*/apksigner | sort ` /usr/bin/apksigner; do printf "$f : "; $f sign --v4-signing-enabled false; done

closes #1005
 2022-06-07 16:56:23 +02:00
Hans-Christoph Steiner
07a6ad6c1e Merge branch 'archive_sigs' into 'master' 
Archive _src.tar.gz.asc not .log.gz.asc

See merge request fdroid/fdroidserver!1143
 2022-06-07 11:37:54 +00:00
Jochen Sprickerhof
e6c875b77e Archive _src.tar.gz.asc not .log.gz.asc 2022-06-07 11:37:29 +00:00
Hans-Christoph Steiner
759fafd3ff Merge branch 'fix_nosign' into 'master' 
Fix --nosign semantics

See merge request fdroid/fdroidserver!1125
 2022-06-07 11:36:23 +00:00
Hans-Christoph Steiner
7544761e86
index: add test for --nosign config and file generation 2022-06-07 13:22:06 +02:00
Jochen Sprickerhof
9933f54093 Fix --nosign semantics 
This reverts parts of 197ca7e36 as it never triggered the
FDroidException as 'keystore' not in common.config is always False.
 2022-06-07 13:22:02 +02:00
Hans-Christoph Steiner
c3243c2cdf Merge branch 'index-v2' into 'master' 
Updates for index-v2

See merge request fdroid/fdroidserver!1140
 2022-06-07 10:52:12 +00:00
Jochen Sprickerhof
1073dd57f7 Make webBaseUrl configurable 2022-06-04 11:56:04 +02:00
Jochen Sprickerhof
72e3d07acb Simplify primary mirror logic 
Assume repo_url/archive_url to be valid URL and mark it as a primary
mirror.
 2022-06-04 11:56:04 +02:00
Hans-Christoph Steiner
dc971b39ee Merge branch 'scan_binary_server' into 'master' 
Pass --scan-binary to build server

See merge request fdroid/fdroidserver!1141
 2022-06-03 14:39:13 +00:00
Jochen Sprickerhof
edc9390628 Pass --scan-binary to build server 2022-06-03 14:27:58 +00:00
Hans-Christoph Steiner
0d1df0564f Merge branch 'archive_sigs' into 'master' 
Archive .idsig and .log.gz.asc files as well

See merge request fdroid/fdroidserver!1138
 2022-06-03 11:06:44 +00:00
Jochen Sprickerhof
8a2f013508 Archive .idsig and .log.gz.asc files as well 2022-06-03 10:56:22 +00:00
Hans-Christoph Steiner
94faece5ba Merge branch 'fix_pylint' into 'master' 
explicitly re-raising exceptions

See merge request fdroid/fdroidserver!1139
 2022-06-03 10:53:33 +00:00
Jochen Sprickerhof
4ce79a7eaa explicitly re-raising exceptions 
To fix pylint.
 2022-06-01 22:52:22 +02:00
Jochen Sprickerhof
2d0645c1c4 Merge branch 'get_apk_id_api_call' into 'master' 
allow common.get_apk_id() to be used in the API

See merge request fdroid/fdroidserver!1118
 2022-05-31 09:43:51 +00:00
Hans-Christoph Steiner
c6dcc82ca4 allow common.get_apk_id() to be used in the API 
If a project uses fdroidserver as a library, then just calls
common.get_apk_id(), it will now work.  Before, that project would have had
to include something like `common.config = {}` to avoid a stacktrace.
 2022-05-26 22:18:21 +02:00
Hans-Christoph Steiner
9605d4ecad Merge branch 'fix_issue_1006' into 'master' 
[import] Fix crash when no Gradle subdir is found

Closes #1006

See merge request fdroid/fdroidserver!1136
 2022-05-26 18:45:54 +00:00