forked from Mirrors/flatpak-builder
tests: Add a test for unsigned summary support
This relies on peer to peer support also being enabled; the test is skipped otherwise. Signed-off-by: Philip Withnall <withnall@endlessm.com>tingping/wmclass
Philip Withnall
Alexander Larsson
parent
024d835460
commit
4cb47a2112
|
|
@ -139,6 +139,7 @@ dist_test_scripts = \
|
|||
tests/test-builder.sh \
|
||||
tests/test-builder-python.sh \
|
||||
tests/test-oci.sh \
|
||||
tests/test-unsigned-summaries.sh \
|
||||
$(NULL)
|
||||
|
||||
test_programs = testdb test-doc-portal testlibrary
|
||||
|
|
|
|||
|
|
@ -284,6 +284,13 @@ skip_without_python2 () {
|
|||
fi
|
||||
}
|
||||
|
||||
skip_without_p2p () {
|
||||
if ! ${FLATPAK} remote-add --help | grep -q -e '--collection-id'; then
|
||||
echo "1..0 # SKIP this test requires peer to peer support (--enable-p2p)"
|
||||
exit 0
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
sed s#@testdir@#${test_builddir}# ${test_srcdir}/session.conf.in > session.conf
|
||||
dbus-daemon --fork --config-file=session.conf --print-address=3 --print-pid=4 \
|
||||
|
|
|
|||
|
|
@ -0,0 +1,143 @@
|
|||
#!/bin/bash
|
||||
#
|
||||
# Copyright © 2017 Endless Mobile, Inc.
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU Lesser General Public
|
||||
# License as published by the Free Software Foundation; either
|
||||
# version 2 of the License, or (at your option) any later version.
|
||||
#
|
||||
# This library 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
|
||||
# Lesser General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Lesser General Public
|
||||
# License along with this library; if not, write to the
|
||||
# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||
# Boston, MA 02111-1307, USA.
|
||||
#
|
||||
# Authors:
|
||||
# - Philip Withnall <withnall@endlessm.com>
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
. $(dirname $0)/libtest.sh
|
||||
|
||||
skip_without_bwrap
|
||||
skip_without_user_xattrs
|
||||
skip_without_p2p
|
||||
|
||||
echo "1..7"
|
||||
|
||||
# Configure a repository and set up a collection ID for it. Check that setting
|
||||
# the collection ID in the remote config disables summary signature checking.
|
||||
setup_repo
|
||||
install_repo
|
||||
|
||||
echo -e "[core]\ncollection-id=org.test.Collection" >> repos/test/config
|
||||
${FLATPAK} remote-modify ${U} test-repo --collection-id org.test.Collection
|
||||
|
||||
assert_file_has_content ${FL_DIR}/repo/config '^gpg-verify-summary=false$'
|
||||
assert_not_file_has_content ${FL_DIR}/repo/config '^gpg-verify-summary=true$'
|
||||
assert_file_has_content ${FL_DIR}/repo/config '^collection-id=org.test.Collection$'
|
||||
assert_file_has_content ${FL_DIR}/repo/config '^gpg-verify=true$'
|
||||
assert_not_file_has_content ${FL_DIR}/repo/config '^gpg-verify=false$'
|
||||
|
||||
echo "ok 1 repo config with collections"
|
||||
|
||||
# Test that building an app with a collection ID set produces the right
|
||||
# metadata in the resulting repository.
|
||||
DIR=$(mktemp -d)
|
||||
${FLATPAK} build-init ${DIR} org.test.App org.test.Platform org.test.Platform
|
||||
mkdir -p ${DIR}/files/a
|
||||
echo "a" > ${DIR}/files/a/data
|
||||
${FLATPAK} build-finish ${DIR} --socket=x11 --share=network --command=true
|
||||
${FLATPAK} build-export ${FL_GPGARGS} --update-appstream repos/test --collection-id org.test.Collection ${DIR} master
|
||||
update_repo
|
||||
|
||||
ostree --repo=repos/test refs > refs
|
||||
assert_file_has_content refs "^app/org.test.App/$ARCH/master$"
|
||||
assert_file_has_content refs '^ostree-metadata$'
|
||||
assert_file_has_content refs "^appstream/${ARCH}$"
|
||||
ostree --repo=repos/test refs --collections > refs-collections
|
||||
assert_file_has_content refs-collections "^(org.test.Collection, app/org.test.App/$ARCH/master)$"
|
||||
assert_file_has_content refs-collections '^(org.test.Collection, ostree-metadata)$'
|
||||
assert_file_has_content refs-collections "^(org.test.Collection, appstream/${ARCH})$"
|
||||
assert_has_file repos/test/summary.sig
|
||||
ostree --repo=repos/test summary --view > summary
|
||||
assert_file_has_content summary '^Collection ID (ostree.summary.collection-id): org.test.Collection$'
|
||||
assert_file_has_content summary '^xa.cache: '
|
||||
ostree --repo=repos/test show --raw ostree-metadata > metadata
|
||||
assert_file_has_content metadata "'xa.cache': "
|
||||
assert_file_has_content metadata "'ostree.collection-binding': <'org.test.Collection'>"
|
||||
assert_file_has_content metadata "'ostree.ref-binding': <\['ostree-metadata'\]>"
|
||||
|
||||
echo "ok 2 create app with collections"
|
||||
|
||||
# Try installing the app.
|
||||
${FLATPAK} ${U} install test-repo org.test.App master
|
||||
${FLATPAK} ${U} uninstall org.test.App
|
||||
|
||||
echo "ok 3 install app with collections"
|
||||
|
||||
# Regenerate the summary so it doesn’t contain xa.cache and is unsigned; try installing again.
|
||||
ostree --repo=repos/test summary --update
|
||||
assert_not_has_file repos/test/summary.sig
|
||||
ostree --repo=repos/test summary --view > summary
|
||||
assert_file_has_content summary '^Collection ID (ostree.summary.collection-id): org.test.Collection$'
|
||||
assert_not_file_has_content summary '^xa.cache: '
|
||||
|
||||
${FLATPAK} ${U} install test-repo org.test.App master
|
||||
${FLATPAK} ${U} uninstall org.test.App
|
||||
|
||||
echo "ok 4 install app with collections from unsigned summary"
|
||||
|
||||
# Try installing it from a flatpakref file. Don’t uninstall afterwards because
|
||||
# we need it for the next test.
|
||||
cat << EOF > org.test.App.flatpakref
|
||||
[Flatpak Ref]
|
||||
Title=Test App
|
||||
Name=org.test.App
|
||||
Branch=master
|
||||
Url=http://127.0.0.1:$(cat httpd-port-main)/test
|
||||
IsRuntime=False
|
||||
GPGKey=${FL_GPG_BASE64}
|
||||
#RuntimeRepo=http://127.0.0.1:$(cat httpd-port-main)/test
|
||||
CollectionID=org.test.Collection
|
||||
EOF
|
||||
|
||||
${FLATPAK} ${U} install --from ./org.test.App.flatpakref
|
||||
${FLATPAK} ${U} uninstall org.test.App
|
||||
|
||||
echo "ok 5 install app with collections from flatpakref"
|
||||
|
||||
# Update the repo metadata and check that it changes in the ostree-metadata branch
|
||||
# and the summary file.
|
||||
${FLATPAK} build-update-repo ${FL_GPGARGS} --title "New title" repos/test
|
||||
|
||||
assert_has_file repos/test/summary.sig
|
||||
ostree --repo=repos/test summary --view > summary
|
||||
assert_file_has_content summary '^Collection ID (ostree.summary.collection-id): org.test.Collection$'
|
||||
assert_file_has_content summary '^xa.title: '
|
||||
ostree --repo=repos/test show --raw ostree-metadata > metadata
|
||||
assert_file_has_content metadata "'xa.title': "
|
||||
assert_file_has_content metadata "'ostree.collection-binding': <'org.test.Collection'>"
|
||||
assert_file_has_content metadata "'ostree.ref-binding': <\['ostree-metadata'\]>"
|
||||
|
||||
echo "ok 6 update repo metadata"
|
||||
|
||||
# Try to update the app, which should pull the updated repository metadata as a
|
||||
# side effect. Before doing that, drop xa.title from the summary to check that
|
||||
# it’s actually coming from ostree-metadata.
|
||||
ostree --repo=repos/test summary --update
|
||||
assert_not_has_file repos/test/summary.sig
|
||||
ostree --repo=repos/test summary --view > summary
|
||||
assert_not_file_has_content summary '^xa.title: '
|
||||
|
||||
#${FLATPAK} ${U} update org.test.App
|
||||
${FLATPAK} ${U} install test-repo org.test.App master
|
||||
assert_file_has_content ${FL_DIR}/repo/config '^xa.title=New title$'
|
||||
# TODO: More
|
||||
|
||||
echo "ok 7 pull updated repo metadata"
|
||||
Loading…
Reference in New Issue