tests: don't use hardcoded port for http and https

[apt.git] / test / integration / test-cve-2013-1051-InRelease-parsing

diff --git a/test/integration/test-cve-2013-1051-InRelease-parsing b/test/integration/test-cve-2013-1051-InRelease-parsing
index 6764feffffc09cf56546a1094d0ad23fcb19e01d..7a3e5f1569d5bd91cd1cc24f9d297061fe618394 100755 (executable)
--- a/test/integration/test-cve-2013-1051-InRelease-parsing
+++ b/test/integration/test-cve-2013-1051-InRelease-parsing
@@ -12,16 +12,16 @@ insertpackage 'stable' 'good-pkg' 'all' '1.0'
 setupaptarchive
 
 changetowebserver
 setupaptarchive
 
 changetowebserver

-ARCHIVE='http://localhost:8080/'
+ARCHIVE="http://localhost:${APTHTTPPORT}"

 msgtest 'Initial apt-get update should work with' 'InRelease'
 msgtest 'Initial apt-get update should work with' 'InRelease'

-aptget update -qq && msgpass || msgfail
+testsuccess --nomsg aptget update

 
 # check that the setup is correct
 
 # check that the setup is correct

-testequal "good-pkg:
+testsuccessequal "good-pkg:

   Installed: (none)
   Candidate: 1.0
   Version table:
   Installed: (none)
   Candidate: 1.0
   Version table:

-     1.0 0
+     1.0 500

         500 ${ARCHIVE} stable/main i386 Packages" aptcache policy good-pkg
 
 # now exchange to the Packages file, note that this could be
         500 ${ARCHIVE} stable/main i386 Packages" aptcache policy good-pkg
 
 # now exchange to the Packages file, note that this could be


@@ -39,23 +39,28 @@ sed -i '/^-----BEGIN PGP SIGNATURE-----/,/^-----END PGP SIGNATURE-----/ s/^$/  /
 cat aptarchive/dists/stable/Release >> aptarchive/dists/stable/InRelease
 touch -d '+1hour' aptarchive/dists/stable/InRelease
 
 cat aptarchive/dists/stable/Release >> aptarchive/dists/stable/InRelease
 touch -d '+1hour' aptarchive/dists/stable/InRelease
 

-# ensure the update fails
-# useful for debugging to add "-o Debug::pkgAcquire::auth=true"
-msgtest 'apt-get update for should fail with the modified' 'InRelease'
-aptget update 2>&1 | grep -q 'Hash Sum mismatch' > /dev/null && msgpass || msgfail
+# ensure the update doesn't load bad data as good data
+# Note that we will pick up the InRelease itself as we download no other
+# indexes which would trigger a hashsum mismatch, but we ignore the 'bad'
+# part of the InRelease
+listcurrentlistsdirectory | sed '/_InRelease/ d' > listsdir.lst
+msgtest 'apt-get update should ignore unsigned data in the' 'InRelease'
+testsuccessequal "Get:1 http://localhost:${APTHTTPPORT} stable InRelease [$(stat -c%s aptarchive/dists/stable/InRelease) B]
+Reading package lists..." --nomsg aptget update
+testfileequal './listsdir.lst' "$(listcurrentlistsdirectory | sed '/_InRelease/ d')"

 
 # ensure there is no package
 
 # ensure there is no package

-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...

 Building dependency tree...
 E: Unable to locate package bad-mitm' aptget install bad-mitm -s
 
 # and verify that its not picked up
 Building dependency tree...
 E: Unable to locate package bad-mitm' aptget install bad-mitm -s
 
 # and verify that its not picked up

-testequal 'N: Unable to locate package bad-mitm' aptcache policy bad-mitm -q=0
+testsuccessequal 'N: Unable to locate package bad-mitm' aptcache policy bad-mitm -q=0

 
 # and that the right one is used
 
 # and that the right one is used

-testequal "good-pkg:
+testsuccessequal "good-pkg:

   Installed: (none)
   Candidate: 1.0
   Version table:
   Installed: (none)
   Candidate: 1.0
   Version table:

-     1.0 0
+     1.0 500

         500 ${ARCHIVE} stable/main i386 Packages" aptcache policy good-pkg
         500 ${ARCHIVE} stable/main i386 Packages" aptcache policy good-pkg