Marcus Hoffmann
fce4721695
add a vcs.TestCase
2020-08-25 21:32:29 +02:00
Marcus Hoffmann
03e723b1af
fix crash when scanner wants to remove the same file more than once
...
A file can be flagged for multiple problems (i.e. multiple unknown maven
repos in one build.gradle file that is included in a scandelete path).
The scanner will try to delete it once for every problem detected, we
don't really care, as long as the file is gone.
fixes fdroid/fdroidserver#759
2020-08-25 21:32:29 +02:00
Marcus Hoffmann
61736f3f50
scanner: add test for #759
2020-08-25 21:32:29 +02:00
Marcus Hoffmann
78491a0a5b
add used extlibs to scanignore path
...
fixes fdroid/fdroidserver#795
2020-08-25 21:32:29 +02:00
Marcus Hoffmann
f46e99a5c4
test for #796
...
The extlib test is in build because it tests the interaction between
prepare_source with a later scan as it is run from build.py
2020-08-25 21:31:07 +02:00
Marcus
8801d37649
Merge branch 'publish_json' into 'master'
...
Some publish.py improvements
Closes #820
See merge request fdroid/fdroidserver!787
2020-08-25 12:33:39 +00:00
Marcus Hoffmann
882f8cfe19
test_check_for_key_collisions: test with an actual collision
...
Genrated with this script:
https://gitlab.com/fdroid/fdroidserver/-/merge_requests/787#note_401275883
2020-08-24 21:19:59 +02:00
Marcus Hoffmann
d9a6bfb0a9
CI: install pyjks as dependency for tests
2020-08-24 21:11:55 +02:00
Marcus Hoffmann
a114c73c2d
publish: factor out the signing key creation into a method
2020-08-24 19:34:08 +02:00
Marcus Hoffmann
7813a17cf8
publish: extract a few functions out of main
...
publish is currently not reusable from other modules as everything is
happening in main. It's also not testable from python unittests.
There's already a function for getting the key_alias, so we can use
that.
Introduce tests for the split out functions.
2020-08-24 19:34:08 +02:00
Marcus Hoffmann
eaca3d5faa
publish: better json reporting
...
* newKeyAliases wasn't providing any useful information
* generatedKeys now contains the used keyalias as well
* signedApks now also records the used keyalias for each apk
2020-08-24 19:34:08 +02:00
Marcus Hoffmann
ca86c18e33
publish: reformat
2020-08-24 19:34:08 +02:00
Marcus
3954814a3b
Merge branch 'post-txt-refactor' into 'master'
...
Post .txt refactor
See merge request fdroid/fdroidserver!786
2020-08-24 17:05:39 +00:00
Hans-Christoph Steiner
0b92e60266
handle file type detection using Pythonic methods
...
This ditches the custom common.get_extension() for straight core Python
methods. This should make the code closer to Python conventions. For
example, pathlib also includes the "." in the extension it returns.
2020-08-24 17:05:49 +02:00
Hans-Christoph Steiner
da31120b5a
build: refactor missing srclibs error reporting for only .yml
2020-08-24 17:05:49 +02:00
Hans-Christoph Steiner
bd1f05e370
Merge branch 'yaml-is-king' into 'master'
...
remove all code for handling txt metadata
See merge request fdroid/fdroidserver!772
2020-08-24 14:57:19 +00:00
Michael Pöhn
5c3db9a7cc
rewritemeta: overwrite existing metadata only if no exception occurred
2020-08-20 20:40:15 +02:00
Michael Pöhn
c45ef453fd
remove SUPPORTED_FORMATS list from rewritemeta
2020-08-20 20:40:15 +02:00
Michael Pöhn
fac033314a
fix a comment and a warning
2020-08-20 20:40:15 +02:00
Michael Pöhn
f5a5fffb10
purge accepted_formats from config
2020-08-20 20:40:15 +02:00
Michael Pöhn
40cbbd3173
update changelog: remove txt metadata support
2020-08-20 20:40:15 +02:00
Michael Pöhn
f8bc51399e
remove txt from nightly default supported metadata formats
2020-08-20 20:40:15 +02:00
Michael Pöhn
4dc503ed28
remove txt form accepted format list
2020-08-20 20:40:15 +02:00
Michael Pöhn
fd2cfb0c7d
remove code for copying txt srclibs to buildserver
2020-08-20 20:40:15 +02:00
Michael Pöhn
681a27546c
fix linking to yml metadata in wiki
2020-08-20 20:40:15 +02:00
Michael Pöhn
cb368a674c
remove txt srclib support
2020-08-20 20:40:15 +02:00
Michael Pöhn
c8f25c2652
remove txt metadata support
2020-08-20 20:40:15 +02:00
Michael Pöhn
2ec90bb490
remove support for rewriting to txt
2020-08-20 20:40:15 +02:00
Michael Pöhn
bc1398f594
remove json metadata support
2020-08-20 20:40:15 +02:00
Hans-Christoph Steiner
29eea3f739
Merge branch 'androguard_minsdk' into 'master'
...
common: use androguard to figure out minSDK version
Closes #816
See merge request fdroid/fdroidserver!785
2020-08-20 12:45:28 +00:00
Marcus Hoffmann
ba28b44ae7
common: use androguard to figure out minSDK version
...
Closes : #816
2020-08-19 19:49:39 +02:00
Marcus
89dac62b10
Merge branch 'fix-gradlew-fdroid' into 'master'
...
gradlew-fdroid: fix random failures due to empty $line, closes #815
Closes #815
See merge request fdroid/fdroidserver!784
2020-08-19 15:12:26 +00:00
Hans-Christoph Steiner
f8a1b45df5
gradlew-fdroid: fix random failures due to empty $line, closes #815
2020-08-19 16:28:58 +02:00
Hans-Christoph Steiner
6258a939e6
Merge branch 'smartcard_hsm' into 'master'
...
switch publish to common.sign_apk and support smartcard HSMs for app signing
See merge request fdroid/fdroidserver!782
2020-08-17 10:09:35 +00:00
Marcus Hoffmann
a8e9653b96
update: make --create-key work with a HSM
2020-08-14 17:27:58 +02:00
Marcus Hoffmann
004d13a48a
make publish and update work with a smartcard HSM
...
Followup to fdroid/fdroidserver!779 .
We need to add smartcardoptions to every call to keytool and jarsigner
as well as handle when keypass not being required and not allowed for
pkcs11 keystores.
2020-08-14 17:27:58 +02:00
Marcus Hoffmann
066978cbcf
publish: use common signing method
...
This is currently still jarsigner based but will at least use sha256
when possible
2020-08-14 15:07:04 +02:00
Marcus Hoffmann
6128f93d26
publish: keystore "NONE" is a special case and doesn't need to exist
2020-08-14 15:06:33 +02:00
Marcus
11236deec6
Merge branch 'patch-1' into 'master'
...
Spelling: Deploy key, stripping, SSH
See merge request fdroid/fdroidserver!781
2020-08-13 15:03:42 +00:00
Marcus
a997ad7b84
Merge branch 'smartcard-hsm-fixes' into 'master'
...
Smart Card HSM fixes
See merge request fdroid/fdroidserver!779
2020-08-13 15:02:04 +00:00
Marcus Hoffmann
c3c6a20b7c
gradlew-fdroid: fix typo 6.5 -> 6.6
2020-08-11 19:04:19 +02:00
Marcus Hoffmann
d3e8766a3c
add gradle 6.6
2020-08-11 09:13:20 +02:00
Marcus
b3fb632846
Merge branch 'platform29-05' into 'master'
...
Add platform-29_r05
See merge request fdroid/fdroidserver!780
2020-08-11 07:09:20 +00:00
Allan Nordhøy
df7bc77465
Spelling: Deploy key, stripping, SSH
2020-08-10 10:53:23 +00:00
TacoTheDank
7c44669501
Add platform-29_r05
2020-08-09 20:06:30 -04:00
Hans-Christoph Steiner
226f490c52
declare LICENSE file in setup.cfg
2020-08-07 15:30:33 +02:00
Hans-Christoph Steiner
f779ce276a
'keypass' is not required in config if using a HSM
2020-08-07 15:30:33 +02:00
Hans-Christoph Steiner
d213c8b37c
update: validate smartcardoptions when using a HSM for the keystore
2020-08-07 15:30:33 +02:00
Hans-Christoph Steiner
7dcf4f5680
index: smartcardoptions is a list or tuple, but only lists can be added
2020-08-07 15:30:33 +02:00
Hans-Christoph Steiner
54257f8f6a
init: generate opensc-fdroid.cfg rather than copying from examples
...
This file is so simple, it is better to skip the complexity of trying to
find the installed examples folder, especially when considering Windows and
macOS, with their odd paths.
2020-08-07 15:30:33 +02:00