deduplicate main methods

[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 db4430ea32fdf86943b115d1feb90968f4e61b89..1b23d4f11cc09420817273f64dca1aec03e7ba0a 100755 (executable)
--- a/test/integration/test-apt-update-nofallback
+++ b/test/integration/test-apt-update-nofallback
@@ -9,14 +9,14 @@ set -e
 simulate_mitm_and_inject_evil_package()
 {
     redatereleasefiles '+1 hour'
 simulate_mitm_and_inject_evil_package()
 {
     redatereleasefiles '+1 hour'

-    rm -f $APTARCHIVE/dists/unstable/InRelease
-    rm -f $APTARCHIVE/dists/unstable/Release.gpg
+    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>


@@ -28,11 +28,14 @@ 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()
 {

-    testfailuremsg "E: The repository 'file: unstable Release' is no longer signed." aptget update
+    testfailuremsg "E: The repository 'file:${APTARCHIVE} unstable Release' is no longer signed.
+N: Updating such a repository securily is impossible and therefore disabled by default.
+N: See apt-secure(8) manpage for repository creation and user configuration details." aptget update -q=0

 
     assert_repo_is_intact
 }
 
     assert_repo_is_intact
 }


@@ -45,11 +48,7 @@ assert_repo_is_intact()
     testsuccess aptget source foo --print-uris
 
     LISTDIR=rootdir/var/lib/apt/lists
     testsuccess aptget source foo --print-uris
 
     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_with_lists_clean()


@@ -74,7 +73,7 @@ test_from_release_gpg_to_unsigned()
 {
     # setup archive with Release/Release.gpg (but no InRelease)
     setupaptarchive_with_lists_clean
 {
     # 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
     listcurrentlistsdirectory > lists.before
 
     testsuccess aptget update
     listcurrentlistsdirectory > lists.before
 


@@ -87,20 +86,20 @@ test_from_inrelease_to_unsigned_with_override()
 {
     # setup archive with InRelease file
     setupaptarchive_with_lists_clean
 {
     # setup archive with InRelease file
     setupaptarchive_with_lists_clean

-    # FIXME: is not what the server reported 4104 4106
-    testsuccess aptget update #-o Debug::pkgAcquire::Worker=1
+    testsuccess aptget update

 
     # 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) 
     testwarning aptget update --allow-insecure-repositories \
 
     # and ensure we can update to it (with enough force) 
     testwarning aptget update --allow-insecure-repositories \

-        -o Acquire::AllowDowngradeToInsecureRepositories=1
+        -o Acquire::AllowDowngradeToInsecureRepositories=1 -o Debug::pkgAcquire::Worker=1 -o Debug::pkgAcquire::Auth=1

     # but that the individual packages are still considered untrusted
     testfailureequal "WARNING: The following packages cannot be authenticated!
   evil
     # but that the individual packages are still considered untrusted
     testfailureequal "WARNING: The following packages cannot be authenticated!
   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()


@@ -114,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


@@ -127,8 +126,8 @@ test_cve_2012_0214()
     listcurrentlistsdirectory > lists.before
 
     # do what CVE-2012-0214 did
     listcurrentlistsdirectory > lists.before
 
     # 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 
     inject_evil_package
     # build valid Release file
     aptftparchive -qq release ./aptarchive > aptarchive/dists/unstable/Release 


@@ -148,11 +147,10 @@ test_subvert_inrelease()
     listcurrentlistsdirectory > lists.before
 
     # replace InRelease with something else
     listcurrentlistsdirectory > lists.before
 
     # replace InRelease with something else

-    mv $APTARCHIVE/dists/unstable/Release $APTARCHIVE/dists/unstable/InRelease
-
-    testfailureequal "W: Failed to fetch file:${APTARCHIVE}/dists/unstable/InRelease  Does not start with a cleartext signature
+    mv "$APTARCHIVE/dists/unstable/Release" "$APTARCHIVE/dists/unstable/InRelease"

 
 

-E: Some index files failed to download. They have been ignored, or old ones used instead." aptget update -qq
+    testfailuremsg "W: 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
     testfileequal lists.before "$(listcurrentlistsdirectory)"
 
     # ensure we keep the repo
     testfileequal lists.before "$(listcurrentlistsdirectory)"


@@ -167,13 +165,11 @@ test_inrelease_to_invalid_inrelease()
     listcurrentlistsdirectory > lists.before
 
     # now remove InRelease and subvert Release do no longer verify
     listcurrentlistsdirectory > lists.before
 
     # 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
 

-    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: 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


@@ -186,18 +182,16 @@ test_release_gpg_to_invalid_release_release_gpg()
 {
     # setup archive with InRelease
     setupaptarchive_with_lists_clean
 {
     # setup archive with InRelease
     setupaptarchive_with_lists_clean

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

     testsuccess aptget update
     listcurrentlistsdirectory > lists.before
 
     # now subvert Release do no longer verify
     testsuccess aptget update
     listcurrentlistsdirectory > lists.before
 
     # 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
 

-    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: unstable Release: 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 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: 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
 
     testfailure grep 'evil' rootdir/var/lib/apt/lists/*Release
 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


@@ -217,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