properly format multiline error messages

[apt.git] / test / integration / test-apt-update-nofallback

diff --git a/test/integration/test-apt-update-nofallback b/test/integration/test-apt-update-nofallback
index 321472c2efd8505fc148131d460379411dba7c74..d9166eefd10589177aec610a012687dd9c876fec 100755 (executable)
--- a/test/integration/test-apt-update-nofallback
+++ b/test/integration/test-apt-update-nofallback
@@ -8,14 +8,15 @@ set -e
 
 simulate_mitm_and_inject_evil_package()
 {
 
 simulate_mitm_and_inject_evil_package()
 {

-    rm -f $APTARCHIVE/dists/unstable/InRelease
-    rm -f $APTARCHIVE/dists/unstable/Release.gpg
+    redatereleasefiles '+1 hour'
+    rm -f "$APTARCHIVE/dists/unstable/InRelease"
+    rm -f "$APTARCHIVE/dists/unstable/Release.gpg"

     inject_evil_package
 }
 
 inject_evil_package()
 {
     inject_evil_package
 }
 
 inject_evil_package()
 {

-    cat > $APTARCHIVE/dists/unstable/main/binary-i386/Packages <<EOF
+    cat > "$APTARCHIVE/dists/unstable/main/binary-i386/Packages" <<EOF

 Package: evil
 Installed-Size: 29
 Maintainer: Joe Sixpack <joe@example.org>
 Package: evil
 Installed-Size: 29
 Maintainer: Joe Sixpack <joe@example.org>


@@ -27,34 +28,33 @@ Description: an autogenerated evil package
 EOF
     # avoid ims hit
     touch -d '+1hour' aptarchive/dists/unstable/main/binary-i386/Packages
 EOF
     # avoid ims hit
     touch -d '+1hour' aptarchive/dists/unstable/main/binary-i386/Packages

+    compressfile aptarchive/dists/unstable/main/binary-i386/Packages

 }
 
 assert_update_is_refused_and_last_good_state_used()
 {
 }
 
 assert_update_is_refused_and_last_good_state_used()
 {

-    testequal "E: The repository 'file: unstable Release.gpg' is no longer signed." aptget update -qq
+    testfailuremsg "E: The repository 'file:${APTARCHIVE} unstable Release' is no longer signed.
+N: Updating from such a repository can't be done securely, and is therefore disabled by default.
+N: See apt-secure(8) manpage for repository creation and user configuration details." aptget update

 
     assert_repo_is_intact
 }
 
 assert_repo_is_intact()
 {
 
     assert_repo_is_intact
 }
 
 assert_repo_is_intact()
 {

-    testequal "foo/unstable 2.0 all" apt list -q
-    testsuccess "" aptget install -y -s foo
-    testfailure "" aptget install -y evil
+    testsuccessequal "foo/unstable 2.0 all" apt list -qq
+    testsuccess aptget install -y -s foo
+    testfailure aptget install -y evil
+    testsuccess aptget source foo --print-uris

 
     LISTDIR=rootdir/var/lib/apt/lists
 
     LISTDIR=rootdir/var/lib/apt/lists

-    if ! ( ls $LISTDIR/*InRelease >/dev/null 2>&1 || 
-            ls $LISTDIR/*Release.gpg >/dev/null 2>&1 ); then
-        echo "Can not find InRelease/Release.gpg in $(ls $LISTDIR)"
-        msgfail
-    fi
+    testempty find "$LISTDIR" -name 'InRelease' -o -name 'Release.gpg'

 }
 
 setupaptarchive_with_lists_clean()
 {
     setupaptarchive --no-update
 }
 
 setupaptarchive_with_lists_clean()
 {
     setupaptarchive --no-update

-    rm -f rootdir/var/lib/apt/lists/_*
-    #rm -rf rootdir/var/lib/apt/lists
+    rm -rf rootdir/var/lib/apt/lists

 }
 
 test_from_inrelease_to_unsigned()
 }
 
 test_from_inrelease_to_unsigned()


@@ -62,20 +62,24 @@ test_from_inrelease_to_unsigned()
     # setup archive with InRelease file
     setupaptarchive_with_lists_clean
     testsuccess aptget update
     # setup archive with InRelease file
     setupaptarchive_with_lists_clean
     testsuccess aptget update

+    listcurrentlistsdirectory > lists.before

 
     simulate_mitm_and_inject_evil_package
     assert_update_is_refused_and_last_good_state_used
 
     simulate_mitm_and_inject_evil_package
     assert_update_is_refused_and_last_good_state_used

+    testfileequal lists.before "$(listcurrentlistsdirectory)"

 }
 
 test_from_release_gpg_to_unsigned()
 {
     # setup archive with Release/Release.gpg (but no InRelease)
     setupaptarchive_with_lists_clean
 }
 
 test_from_release_gpg_to_unsigned()
 {
     # setup archive with Release/Release.gpg (but no InRelease)
     setupaptarchive_with_lists_clean

-    rm $APTARCHIVE/dists/unstable/InRelease
+    rm "$APTARCHIVE/dists/unstable/InRelease"

     testsuccess aptget update
     testsuccess aptget update

+    listcurrentlistsdirectory > lists.before

 
     simulate_mitm_and_inject_evil_package
     assert_update_is_refused_and_last_good_state_used
 
     simulate_mitm_and_inject_evil_package
     assert_update_is_refused_and_last_good_state_used

+    testfileequal lists.before "$(listcurrentlistsdirectory)"

 }
 
 test_from_inrelease_to_unsigned_with_override()
 }
 
 test_from_inrelease_to_unsigned_with_override()


@@ -86,15 +90,16 @@ test_from_inrelease_to_unsigned_with_override()
 
     # simulate moving to a unsigned but otherwise valid repo
     simulate_mitm_and_inject_evil_package
 
     # simulate moving to a unsigned but otherwise valid repo
     simulate_mitm_and_inject_evil_package

-    generatereleasefiles
+    generatereleasefiles '+2 hours'
+    find "$APTARCHIVE" -name '*Packages*' -exec touch -d '+2 hours' {} \;

 
     # and ensure we can update to it (with enough force) 
 
     # and ensure we can update to it (with enough force) 

-    testsuccess aptget update --allow-insecure-repositories \
-        -o Acquire::AllowDowngradeToInsecureRepositories=1
+    testwarning aptget update --allow-insecure-repositories \
+        -o Acquire::AllowDowngradeToInsecureRepositories=1 -o Debug::pkgAcquire::Worker=1 -o Debug::pkgAcquire::Auth=1

     # but that the individual packages are still considered untrusted
     # but that the individual packages are still considered untrusted

-    testequal "WARNING: The following packages cannot be authenticated!
+    testfailureequal "WARNING: The following packages cannot be authenticated!

   evil
   evil

-E: There are problems and -y was used without --force-yes" aptget install -qq -y evil
+E: There were unauthenticated packages and -y was used without --allow-unauthenticated" aptget install -qq -y evil

 }
 
 test_cve_2012_0214()
 }
 
 test_cve_2012_0214()


@@ -108,7 +113,7 @@ test_cve_2012_0214()
     # the unauthenticated Release file too giving the false impression that
     # Release was authenticated
     #
     # the unauthenticated Release file too giving the false impression that
     # Release was authenticated
     #

-    # Note that this is pretty much impossible nowdays because:
+    # Note that this is pretty much impossible nowadays because:

     # a) InRelease is left as is, not split to InRelease/Release as it was 
     #    in the old days
     # b) we refuse to go from signed->unsigned
     # a) InRelease is left as is, not split to InRelease/Release as it was 
     #    in the old days
     # b) we refuse to go from signed->unsigned


@@ -118,15 +123,17 @@ test_cve_2012_0214()
     # setup archive with InRelease
     setupaptarchive_with_lists_clean
     testsuccess aptget update
     # setup archive with InRelease
     setupaptarchive_with_lists_clean
     testsuccess aptget update

+    listcurrentlistsdirectory > lists.before

 
     # do what CVE-2012-0214 did
 
     # do what CVE-2012-0214 did

-    rm $APTARCHIVE/dists/unstable/InRelease
-    rm $APTARCHIVE/dists/unstable/Release.gpg
+    rm "$APTARCHIVE/dists/unstable/InRelease"
+    rm "$APTARCHIVE/dists/unstable/Release.gpg"

     inject_evil_package
     # build valid Release file
     aptftparchive -qq release ./aptarchive > aptarchive/dists/unstable/Release 
 
     assert_update_is_refused_and_last_good_state_used
     inject_evil_package
     # build valid Release file
     aptftparchive -qq release ./aptarchive > aptarchive/dists/unstable/Release 
 
     assert_update_is_refused_and_last_good_state_used

+    testfileequal lists.before "$(listcurrentlistsdirectory)"

 
     # ensure there is no _Release file downloaded
     testfailure ls rootdir/var/lib/apt/lists/*_Release
 
     # ensure there is no _Release file downloaded
     testfailure ls rootdir/var/lib/apt/lists/*_Release


@@ -137,15 +144,16 @@ test_subvert_inrelease()
     # setup archive with InRelease
     setupaptarchive_with_lists_clean
     testsuccess aptget update
     # setup archive with InRelease
     setupaptarchive_with_lists_clean
     testsuccess aptget update

+    listcurrentlistsdirectory > lists.before

 
     # replace InRelease with something else
 
     # replace InRelease with something else

-    mv $APTARCHIVE/dists/unstable/Release $APTARCHIVE/dists/unstable/InRelease
+    mv "$APTARCHIVE/dists/unstable/Release" "$APTARCHIVE/dists/unstable/InRelease"

 
 

-    testequal "W: Failed to fetch file:${APTARCHIVE}/dists/unstable/InRelease  Does not start with a cleartext signature
-
-E: Some index files failed to download. They have been ignored, or old ones used instead." aptget update -qq
+    testfailuremsg "E: Failed to fetch file:${APTARCHIVE}/dists/unstable/InRelease  Clearsigned file isn't valid, got 'NOSPLIT' (does the network require authentication?)
+E: Some index files failed to download. They have been ignored, or old ones used instead." aptget update

 
     # ensure we keep the repo
 
     # ensure we keep the repo

+    testfileequal lists.before "$(listcurrentlistsdirectory)"

     assert_repo_is_intact
 }
 
     assert_repo_is_intact
 }
 


@@ -154,46 +162,46 @@ test_inrelease_to_invalid_inrelease()
     # setup archive with InRelease
     setupaptarchive_with_lists_clean
     testsuccess aptget update
     # setup archive with InRelease
     setupaptarchive_with_lists_clean
     testsuccess aptget update

+    listcurrentlistsdirectory > lists.before

 
     # now remove InRelease and subvert Release do no longer verify
 
     # now remove InRelease and subvert Release do no longer verify

-    sed -i 's/Codename.*/Codename: evil!'/ $APTARCHIVE/dists/unstable/InRelease
+    sed -i 's/^Codename:.*/Codename: evil!/' "$APTARCHIVE/dists/unstable/InRelease"

     inject_evil_package
 
     inject_evil_package
 

-    testequal "W: An error occurred during the signature verification. The repository is not updated and the previous index files will be used. GPG error: file: unstable InRelease: The following signatures were invalid: BADSIG 5A90D141DBAC8DAE Joe Sixpack (APT Testcases Dummy) <joe@example.org>
-
+    testwarningequal "W: An error occurred during the signature verification. The repository is not updated and the previous index files will be used. GPG error: file:${APTARCHIVE} unstable InRelease: The following signatures were invalid: BADSIG 5A90D141DBAC8DAE Joe Sixpack (APT Testcases Dummy) <joe@example.org>

 W: Failed to fetch file:${APTARCHIVE}/dists/unstable/InRelease  The following signatures were invalid: BADSIG 5A90D141DBAC8DAE Joe Sixpack (APT Testcases Dummy) <joe@example.org>
 W: Failed to fetch file:${APTARCHIVE}/dists/unstable/InRelease  The following signatures were invalid: BADSIG 5A90D141DBAC8DAE Joe Sixpack (APT Testcases Dummy) <joe@example.org>

-

 W: Some index files failed to download. They have been ignored, or old ones used instead." aptget update -qq
 
     # ensure we keep the repo
 W: Some index files failed to download. They have been ignored, or old ones used instead." aptget update -qq
 
     # ensure we keep the repo

+    testfailure grep 'evil' rootdir/var/lib/apt/lists/*InRelease
+    testfileequal lists.before "$(listcurrentlistsdirectory)"

     assert_repo_is_intact
     assert_repo_is_intact

-    testfailure grep "evil" rootdir/var/lib/apt/lists/*InRelease

 }
 
 test_release_gpg_to_invalid_release_release_gpg()
 {
     # setup archive with InRelease
     setupaptarchive_with_lists_clean
 }
 
 test_release_gpg_to_invalid_release_release_gpg()
 {
     # setup archive with InRelease
     setupaptarchive_with_lists_clean

-    rm $APTARCHIVE/dists/unstable/InRelease
+    rm "$APTARCHIVE/dists/unstable/InRelease"

     testsuccess aptget update
     testsuccess aptget update

+    listcurrentlistsdirectory > lists.before

 
     # now subvert Release do no longer verify
 
     # now subvert Release do no longer verify

-    echo "Some evil data" >>  $APTARCHIVE/dists/unstable/Release
+    echo "Some evil data" >> "$APTARCHIVE/dists/unstable/Release"

     inject_evil_package
 
     inject_evil_package
 

-    testequal "W: An error occurred during the signature verification. The repository is not updated and the previous index files will be used. GPG error: file: unstable Release.gpg: The following signatures were invalid: BADSIG 5A90D141DBAC8DAE Joe Sixpack (APT Testcases Dummy) <joe@example.org>
-
-W: Failed to fetch file:${APTARCHIVE}/dists/unstable/Release.gpg  
-
+    testwarningequal "W: An error occurred during the signature verification. The repository is not updated and the previous index files will be used. GPG error: file:${APTARCHIVE} unstable Release: The following signatures were invalid: BADSIG 5A90D141DBAC8DAE Joe Sixpack (APT Testcases Dummy) <joe@example.org>
+W: Failed to fetch file:${APTARCHIVE}/dists/unstable/Release.gpg  The following signatures were invalid: BADSIG 5A90D141DBAC8DAE Joe Sixpack (APT Testcases Dummy) <joe@example.org>

 W: Some index files failed to download. They have been ignored, or old ones used instead." aptget update -qq
 
 W: Some index files failed to download. They have been ignored, or old ones used instead." aptget update -qq
 

+    testfailure grep 'evil' rootdir/var/lib/apt/lists/*Release
+    testfileequal lists.before "$(listcurrentlistsdirectory)"

     assert_repo_is_intact
     assert_repo_is_intact

-    testfailure grep "evil" rootdir/var/lib/apt/lists/*Release

 }
 
 
 }
 
 

-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"

 
 setupenvironment
 configarchitecture "i386"
 
 setupenvironment
 configarchitecture "i386"


@@ -203,7 +211,7 @@ buildsimplenativepackage 'foo' 'all' '2.0'
 
 # setup the archive and ensure we have a single package that installs fine
 setupaptarchive
 
 # setup the archive and ensure we have a single package that installs fine
 setupaptarchive

-APTARCHIVE=$(readlink -f ./aptarchive)
+APTARCHIVE="$(readlink -f ./aptarchive)"

 assert_repo_is_intact
 
 # test the various cases where a repo may go from signed->unsigned
 assert_repo_is_intact
 
 # test the various cases where a repo may go from signed->unsigned


@@ -217,7 +225,7 @@ test_from_release_gpg_to_unsigned
 msgmsg "test_cve_2012_0214"
 test_cve_2012_0214
 
 msgmsg "test_cve_2012_0214"
 test_cve_2012_0214
 

-# ensure InRelase can not be subverted
+# ensure InRelease can not be subverted

 msgmsg "test_subvert_inrelease"
 test_subvert_inrelease
 
 msgmsg "test_subvert_inrelease"
 test_subvert_inrelease
 


@@ -229,6 +237,6 @@ test_inrelease_to_invalid_inrelease
 msgmsg "test_release_gpg_to_invalid_release_release_gpg"
 test_release_gpg_to_invalid_release_release_gpg
 
 msgmsg "test_release_gpg_to_invalid_release_release_gpg"
 test_release_gpg_to_invalid_release_release_gpg
 

-# ensure we can ovveride the downgrade error
-msgmsg "test_from_inrelease_to_unsigned"
+# ensure we can override the downgrade error
+msgmsg "test_from_inrelease_to_unsigned_with_override"

 test_from_inrelease_to_unsigned_with_override
 test_from_inrelease_to_unsigned_with_override