Hans-Christoph Steiner
2508393884
Merge branch '290-make-rewrite-metadata-respect-key-word-sort-order' into 'master'
...
Resolve "make `fdroid rewritemeta` respect key-word sort order for YAML files"
Closes #290
See merge request !295
2017-07-04 12:24:17 +00:00
Michael Pöhn
6ab8551915
Merge branch '290-make-rewrite-metadata-respect-key-word-sort-order' into 'master'
...
rewritemeta: respect key-word sort order for YAML files
Closes #290
See merge request !263
2017-07-04 11:51:59 +00:00
Michael Pöhn
071ad46b55
moved some yaml test files into a separate forlder to avoid conflicts with other test cases
2017-07-04 13:35:05 +02:00
Michael Pöhn
1b362c2183
correct yaml-rewriting for buildozer flag
2017-07-04 13:27:45 +02:00
Michael Pöhn
0980fb4df8
import ruamel.ymal only when re-writing yaml metadata
2017-07-04 11:51:08 +02:00
Michael Pöhn
19d422da86
rewritemeta yaml: fixed boolen mapping for build flags
2017-07-04 11:51:08 +02:00
Michael Pöhn
cfd3e84250
use stored metadatapath instead of guessing it
2017-07-04 11:51:08 +02:00
Michael Pöhn
056a28f897
fix indentation
2017-07-04 11:51:08 +02:00
Hans-Christoph Steiner
3cb936ae92
fdroid update --create-metadata now outputs YAML format
...
As part of the push towards using YAML as the main metadata format, this
makes the blank template be a .yml file.
2017-07-04 11:51:08 +02:00
Michael Pöhn
75ebb6e8cc
fix building with yml metadata
2017-07-04 11:51:08 +02:00
Michael Pöhn
54963506a0
set required minimum ruamel.yaml version
2017-07-04 11:51:08 +02:00
Michael Pöhn
fc070ee657
refactored yaml tests into metadata test case; fixed typo
2017-07-04 11:51:08 +02:00
Michael Pöhn
cdec1a5b80
add ruamel yaml to buildserver depenencies
2017-07-04 11:51:08 +02:00
Michael Pöhn
7ab197be2e
completed ordered yaml field list
2017-07-04 11:51:08 +02:00
Michael Pöhn
f1e0089931
prettify write_yaml metadata
2017-07-04 11:51:08 +02:00
Michael Pöhn
7aa92abebc
yaml rewrite version code as int
2017-07-04 11:51:08 +02:00
Michael Pöhn
f9d4007ea6
rewrite metadata builds list to yaml
2017-07-04 11:51:08 +02:00
Michael Pöhn
fbd5e8772c
yaml metadata rewrite: correct blank line
2017-07-04 11:51:08 +02:00
Michael Pöhn
c46dec925e
add ruamel.yaml to setup.py
2017-07-04 11:51:08 +02:00
Michael Pöhn
735b7d0f33
fixed pyflakes/pep warings
2017-07-04 11:51:08 +02:00
Michael Pöhn
0f90ab9aac
rewrite to yaml works for app data now (builds still missing)
2017-07-04 11:51:08 +02:00
relan
86b403b599
makebuildserver: add NDK r15b
2017-07-04 11:44:25 +03:00
relan
ecdb2c685a
makebuildserver: fix NDK r14b provisioning
...
Replace r14 with r14b after a57bff7
2017-07-04 10:46:52 +03:00
Hans-Christoph Steiner
0be224b3e0
Merge branch 'repo-update-break-down' into 'master'
...
Break down the update.scan_apk() method into smaller pieces
See merge request !288
2017-07-03 22:08:43 +00:00
Torsten Grote
0bbe0c5db0
Break up the scan_apk() method and rename it to process_apk()
2017-07-03 18:37:01 -03:00
Hans-Christoph Steiner
607d1d2553
gitlab-ci: switch to new Debian/stretch image
...
ci-images-server!1
2017-07-03 20:41:26 +02:00
Hans-Christoph Steiner
e01a45d014
Merge branch 'archive-policy-fix' into 'master'
...
Archive policy overhaul
Closes #323 , #292 , and #166
See merge request !291
2017-07-03 09:07:08 +00:00
Hans-Christoph Steiner
f2432f7fa4
gitlab-ci: apt upgrade so that tests run with current updates
...
The MD5 signature stuff was failing in tests because the CI image was
using a quite old version of Java's jarsigner, which had not yet disabled
MD5.
2017-07-03 10:02:51 +02:00
Hans-Christoph Steiner
56ee5de2bd
update: invalidate cache if allow_disabled_algorithms changes
...
Since the cache contains implicitly the result of the jarsigner verify,
if the allow_disabled_algorithms config changes, then the apkcache is
invalid.
2017-07-03 10:02:51 +02:00
Hans-Christoph Steiner
e75cabfe77
update: write cache file if anything has changed it
...
This fixes a bug introduced in 04db6870
2017-07-03 10:02:51 +02:00
Hans-Christoph Steiner
5f0817d7bf
tests: make sure apkcache gets created
2017-07-03 10:02:51 +02:00
Hans-Christoph Steiner
39fd664778
update: create 'archive/' if needed when moving APKs
...
Normally, just 'repo/' is created by default, e.g. `fdroid init`. If APKs
are dumped into 'repo/', then have invalid signatures, then they'll be
automatically moved to 'archive/', which therefore needs to exist.
2017-07-03 10:02:51 +02:00
Hans-Christoph Steiner
746d4bd4cf
update: allow_disabled_algorithms option to keep MD5 sigs in repo
...
The new policy is to move APKs with invalid signatures to the archive,
and only add those APKs to the archive's index if they have valid MD5
signatures.
closes #323
closes #292
2017-07-03 10:02:51 +02:00
Hans-Christoph Steiner
b7260ea854
update: allow deprecated signatures only in the archive
...
In April 2017, Oracle's jarsigner and Google's apksigner both switched to
considering any APK signature that uses MD5 as unsigned. Any old build
is likely to have a MD5 signature. This sets up the archive as the only
place where these "disabled algorithms" are allowed in the repo, and
marks any APK signed by a "disabled algorithm" as having a "known
vulnerability"
This also now automatically moves APKs with invalid signatures to the
archive section.
#323
2017-06-28 23:53:42 +02:00
Hans-Christoph Steiner
0047f19d56
update: move duplicated code into move_apk_between_sections()
2017-06-28 23:53:42 +02:00
Hans-Christoph Steiner
e1492148fa
fix "Archive Policy:" field, APKs can move in/out of archive
...
The original logic was checking keepversions against the len() of ALL the
APKs in the repo/archive. The correct thing is to check against the
number of APKs available for the given packageName/appid.
closes #166
2017-06-28 23:53:42 +02:00
Hans-Christoph Steiner
be2926ffc8
tests: test moving files to and from the archive
...
#166
2017-06-28 23:53:42 +02:00
Hans-Christoph Steiner
0d3f4547a9
Merge branch 'random-small-fixes' into 'master'
...
Random small fixes
Closes #222
See merge request !292
2017-06-28 21:53:18 +00:00
Hans-Christoph Steiner
7de6e4dfed
init: update docs links for next steps
2017-06-28 23:14:57 +02:00
Hans-Christoph Steiner
214c9f7a2b
lint: check file extension for metadata
...
This helps keep fdroiddata clean, on @krt's request.
closes #222
2017-06-28 23:14:57 +02:00
Hans-Christoph Steiner
4b99a505b3
locale: fix broken source string
2017-06-28 23:14:57 +02:00
Hans-Christoph Steiner
9886e539d3
scan APKs for signs of "Master Key" exploit
...
This exploit is old, and was fixed in 4.4. But it was easy to exploit,
so it is still worth scanning for it. It is also easy to scan for, since
valid APKs should not have files with duplicate names. In theory, this
could look for duplicate file names for any file, but this limits the
false positives by only checking names of files related to executing code.
fdroidclient#40
2017-06-28 23:14:57 +02:00
Hans-Christoph Steiner
5fd014a852
update: move btlog import since btlog.py requires python3-git
...
To keep the dependencies limited to where they are needed.
2017-06-28 23:14:57 +02:00
Hans-Christoph Steiner
7f9f47496f
gitlab-ci: fix metadata_v0 test to run on the right commits
...
Checking out master will often mean its testing the wrong commit, since
merge requests rarely are in master.
2017-06-28 23:14:57 +02:00
Hans-Christoph Steiner
6e72ffb043
gitlab-ci: fix metadata_v0 test for new buildozer build flag
...
Just remove it, since 0.7.0 does not know about that build flag.
2017-06-22 16:33:11 +02:00
Hans-Christoph Steiner
8b09ef46a0
Merge branch 'buildozer-build' into 'master'
...
Added a method to build python/kivy projects using buildozer.
See merge request !290
2017-06-21 12:04:45 +00:00
lb@lb520
bab8f8ea02
Test metadata files updated.
2017-06-21 08:26:52 +02:00
Hans-Christoph Steiner
5e7e17e800
gitlab-ci: properly quote colons
2017-06-20 20:27:23 +02:00
Hans-Christoph Steiner
4939b8a530
gitlab-ci: ignore blank Description in metadata_v0 test
...
We'll eventually be moving to having the internal representation use a
'' or None when there is no Description, so no use in fixing this.
2017-06-20 18:15:12 +02:00
lb@lb520
0672a6f1ec
build.py corrected
2017-06-20 15:56:15 +02:00
