Author: dmacvicar Date: Tue Oct 28 17:31:15 2008 New Revision: 11529 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11529&view=rev Log: - more progress on fetcher capablity to use remote signed index. - support for content file - testcases - only missing, honour the autodiscovery of index flags Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/directory.yast trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/SHA1SUMS trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/SHA1SUMS.asc trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/SHA1SUMS.key trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/directory.yast trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/subdir1-file1.txt trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/subdir1-file2.txt trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir2/ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir2/SHA1SUMS trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir2/SHA1SUMS.asc trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir2/SHA1SUMS.key trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir2/directory.yast trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir2/subdir2-file1.txt trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/content trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/content.asc trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/content.key trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/directory.yast trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/subdir1/ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/subdir1/directory.yast trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/subdir1/subdir1-file1.txt trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/subdir1/subdir1-file2.txt trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/subdir2/ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/subdir2/directory.yast trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/subdir2/subdir2-file1.txt trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/content trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/content.asc trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/content.key trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/directory.yast trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/subdir1/ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/subdir1/directory.yast trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/subdir1/subdir1-file1.txt trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/subdir1/subdir1-file2.txt trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/subdir2/ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/subdir2/directory.yast trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/subdir2/subdir2-file1.txt Modified: trunk/libzypp/tests/zypp/Fetcher_test.cc trunk/libzypp/zypp/Fetcher.cc trunk/libzypp/zypp/Fetcher.h Modified: trunk/libzypp/tests/zypp/Fetcher_test.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/Fetcher_test.cc?rev=11529&r1=11528&r2=11529&view=diff ============================================================================== --- trunk/libzypp/tests/zypp/Fetcher_test.cc (original) +++ trunk/libzypp/tests/zypp/Fetcher_test.cc Tue Oct 28 17:31:15 2008 @@ -23,28 +23,6 @@ #define DATADIR (Pathname(TESTS_SRC_DIR) + "/zypp/data/Fetcher/remote-site") -BOOST_AUTO_TEST_CASE(fetcher_simple) -{ - MediaSetAccess media( (DATADIR).asUrl(), "/" ); - Fetcher fetcher; - - { - filesystem::TmpDir dest; - OnMediaLocation loc("/complexdir/subdir1/subdir1-file1.txt"); - loc.setChecksum(CheckSum::sha1("f1d2d2f924e986ac86fdf7b36c94bcdf32beec15")); - fetcher.enqueueDigested(loc); - fetcher.start(dest.path(), media); - fetcher.reset(); - // now we break the checksum and it should fail - loc.setChecksum(CheckSum::sha1("f1d2d2f924e986ac86fdf7b36c94bcdf32beec16")); - fetcher.enqueueDigested(loc); - BOOST_CHECK_THROW( fetcher.start( dest.path(), media ), Exception); - fetcher.reset(); - - } - -} - BOOST_AUTO_TEST_CASE(fetcher) { MediaSetAccess media( ( DATADIR).asUrl(), "/" ); @@ -100,6 +78,68 @@ //MIL << fetcher; } +BOOST_AUTO_TEST_CASE(fetcher_simple) +{ + MediaSetAccess media( (DATADIR).asUrl(), "/" ); + Fetcher fetcher; + + { + filesystem::TmpDir dest; + OnMediaLocation loc("/complexdir/subdir1/subdir1-file1.txt"); + loc.setChecksum(CheckSum::sha1("f1d2d2f924e986ac86fdf7b36c94bcdf32beec15")); + fetcher.enqueueDigested(loc); + fetcher.start(dest.path(), media); + fetcher.reset(); + // now we break the checksum and it should fail + loc.setChecksum(CheckSum::sha1("f1d2d2f924e986ac86fdf7b36c94bcdf32beec16")); + fetcher.enqueueDigested(loc); + BOOST_CHECK_THROW( fetcher.start( dest.path(), media ), Exception); + fetcher.reset(); + + } + +} + +BOOST_AUTO_TEST_CASE(content_index) +{ + MediaSetAccess media( ( DATADIR).asUrl(), "/" ); + Fetcher fetcher; + + // test transfering one file by setting the index + { + filesystem::TmpDir dest; + OnMediaLocation loc("/contentindex/subdir1/subdir1-file1.txt"); + // trust the key manually + getZYpp()->keyRing()->importKey(PublicKey(DATADIR + "/contentindex/content.key"), true); + fetcher.addIndex(OnMediaLocation("/contentindex/content", 1)); + fetcher.enqueue(loc); + fetcher.start(dest.path(), media); + fetcher.reset(); + } + +} + +BOOST_AUTO_TEST_CASE(content_index_broken) +{ + MediaSetAccess media( ( DATADIR).asUrl(), "/" ); + Fetcher fetcher; + + { + filesystem::TmpDir dest; + OnMediaLocation loc("/contentindex-broken-digest/subdir1/subdir1-file1.txt",1); + // key was already imported as trusted + fetcher.addIndex(OnMediaLocation("/contentindex-broken-digest/content", 1)); + fetcher.enqueue(loc); + fetcher.start(dest.path(), media); + fetcher.reset(); + // now retrieve a file that is modified, so the checksum has to fail + loc = OnMediaLocation("/contentindex-broken-digest/subdir1/subdir1-file2.txt",1); + fetcher.enqueue(loc); + BOOST_CHECK_THROW( fetcher.start( dest.path(), media ), Exception); + fetcher.reset(); + } +} + BOOST_AUTO_TEST_CASE(fetcher_remove) { // at this point the key is already trusted Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/directory.yast URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/directory.yast?rev=11529&view=auto ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/directory.yast (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/directory.yast Tue Oct 28 17:31:15 2008 @@ -0,0 +1,2 @@ +subdir1/ +subdir2/ Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/SHA1SUMS URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/SHA1SUMS?rev=11529&view=auto ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/SHA1SUMS (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/SHA1SUMS Tue Oct 28 17:31:15 2008 @@ -0,0 +1,2 @@ +f1d2d2f924e986ac86fdf7b36c94bcdf32beec15 subdir1-file1.txt +e242ed3bffccdf271b7fbaf34ed72d089537b42f subdir1-file2.txt Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/SHA1SUMS.asc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/SHA1SUMS.asc?rev=11529&view=auto ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/SHA1SUMS.asc (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/SHA1SUMS.asc Tue Oct 28 17:31:15 2008 @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.9 (GNU/Linux) + +iEYEABECAAYFAkjaaxUACgkQm+zCtd2wN1ZLgACfcqpLHAavAr8cIjenaR3pJHpo +WoMAmwdbZQX2b9Yw6mY1aGbarwsEon6I +=/0VZ +-----END PGP SIGNATURE----- Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/SHA1SUMS.key URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/SHA1SUMS.key?rev=11529&view=auto ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/SHA1SUMS.key (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/SHA1SUMS.key Tue Oct 28 17:31:15 2008 @@ -0,0 +1,49 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2.0.9 (GNU/Linux) + +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 +aVStjbDRYEnTHQOGsVy9 +=ZZx0 +-----END PGP PUBLIC KEY BLOCK----- Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/directory.yast URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/directory.yast?rev=11529&view=auto ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/directory.yast (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/directory.yast Tue Oct 28 17:31:15 2008 @@ -0,0 +1,6 @@ +directory.yast +SHA1SUMS +SHA1SUMS.asc +SHA1SUMS.key +subdir1-file1.txt +subdir1-file2.txt Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/subdir1-file1.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/subdir1-file1.txt?rev=11529&view=auto ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/subdir1-file1.txt (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/subdir1-file1.txt Tue Oct 28 17:31:15 2008 @@ -0,0 +1 @@ +foo Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/subdir1-file2.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/subdir1-file2.txt?rev=11529&view=auto ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/subdir1-file2.txt (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/subdir1-file2.txt Tue Oct 28 17:31:15 2008 @@ -0,0 +1 @@ +bar Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir2/SHA1SUMS URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir2/SHA1SUMS?rev=11529&view=auto ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir2/SHA1SUMS (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir2/SHA1SUMS Tue Oct 28 17:31:15 2008 @@ -0,0 +1 @@ +f572d396fae9206628714fb2ce00f72e94f2258f subdir2-file1.txt Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir2/SHA1SUMS.asc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir2/SHA1SUMS.asc?rev=11529&view=auto ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir2/SHA1SUMS.asc (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir2/SHA1SUMS.asc Tue Oct 28 17:31:15 2008 @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.9 (GNU/Linux) + +iEYEABECAAYFAkjaayAACgkQm+zCtd2wN1Z3GwCfUjf9mRdFrB5UvOHAW/DoEzWL +mpEAnRmkzRLTY3hXiZ+95XCYG1csiMmF +=X6am +-----END PGP SIGNATURE----- Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir2/SHA1SUMS.key URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir2/SHA1SUMS.key?rev=11529&view=auto ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir2/SHA1SUMS.key (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir2/SHA1SUMS.key Tue Oct 28 17:31:15 2008 @@ -0,0 +1,49 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2.0.9 (GNU/Linux) + +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 +aVStjbDRYEnTHQOGsVy9 +=ZZx0 +-----END PGP PUBLIC KEY BLOCK----- Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir2/directory.yast URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir2/directory.yast?rev=11529&view=auto ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir2/directory.yast (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir2/directory.yast Tue Oct 28 17:31:15 2008 @@ -0,0 +1,5 @@ +directory.yast +SHA1SUMS +SHA1SUMS.asc +SHA1SUMS.key +subdir2-file1.txt Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir2/subdir2-file1.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir2/subdir2-file1.txt?rev=11529&view=auto ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir2/subdir2-file1.txt (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir2/subdir2-file1.txt Tue Oct 28 17:31:15 2008 @@ -0,0 +1 @@ +hello Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/content URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/content?rev=11529&view=auto ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/content (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/content Tue Oct 28 17:31:15 2008 @@ -0,0 +1,3 @@ +HASH SHA1 f1d2d2f924e986ac86fdf7b36c94bcdf32beec15 subdir1/subdir1-file1.txt +HASH SHA1 e242ed3bffccdf271b7fbaf34ed72d089537b42f subdir1/subdir1-file2.txt +HASH SHA1 f572d396fae9206628714fb2ce00f72e94f2258f subdir2/subdir2-file1.txt Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/content.asc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/content.asc?rev=11529&view=auto ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/content.asc (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/content.asc Tue Oct 28 17:31:15 2008 @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.9 (GNU/Linux) + +iEYEABECAAYFAkkHLgwACgkQm+zCtd2wN1ZD7QCghDVP3V6Pi/gBMoA6Flc77/4u +f30Anjf9MqPHx/YZXSFHrYtcst0welTn +=g7it +-----END PGP SIGNATURE----- Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/content.key URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/content.key?rev=11529&view=auto ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/content.key (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/content.key Tue Oct 28 17:31:15 2008 @@ -0,0 +1,49 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2.0.9 (GNU/Linux) + +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 +aVStjbDRYEnTHQOGsVy9 +=ZZx0 +-----END PGP PUBLIC KEY BLOCK----- Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/directory.yast URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/directory.yast?rev=11529&view=auto ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/directory.yast (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/directory.yast Tue Oct 28 17:31:15 2008 @@ -0,0 +1,3 @@ +directory.yast +subdir1/ +subdir2/ Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/subdir1/directory.yast URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/subdir1/directory.yast?rev=11529&view=auto ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/subdir1/directory.yast (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/subdir1/directory.yast Tue Oct 28 17:31:15 2008 @@ -0,0 +1,6 @@ +directory.yast +SHA1SUMS +SHA1SUMS.asc +SHA1SUMS.key +subdir1-file1.txt +subdir1-file2.txt Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/subdir1/subdir1-file1.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/subdir1/subdir1-file1.txt?rev=11529&view=auto ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/subdir1/subdir1-file1.txt (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/subdir1/subdir1-file1.txt Tue Oct 28 17:31:15 2008 @@ -0,0 +1 @@ +foo Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/subdir1/subdir1-file2.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/subdir1/subdir1-file2.txt?rev=11529&view=auto ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/subdir1/subdir1-file2.txt (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/subdir1/subdir1-file2.txt Tue Oct 28 17:31:15 2008 @@ -0,0 +1 @@ +bar OWNED Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/subdir2/directory.yast URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/subdir2/directory.yast?rev=11529&view=auto ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/subdir2/directory.yast (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/subdir2/directory.yast Tue Oct 28 17:31:15 2008 @@ -0,0 +1,5 @@ +directory.yast +SHA1SUMS +SHA1SUMS.asc +SHA1SUMS.key +subdir2-file1.txt Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/subdir2/subdir2-file1.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/subdir2/subdir2-file1.txt?rev=11529&view=auto ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/subdir2/subdir2-file1.txt (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/subdir2/subdir2-file1.txt Tue Oct 28 17:31:15 2008 @@ -0,0 +1 @@ +hello Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/content URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/content?rev=11529&view=auto ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/content (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/content Tue Oct 28 17:31:15 2008 @@ -0,0 +1,3 @@ +HASH SHA1 f1d2d2f924e986ac86fdf7b36c94bcdf32beec15 subdir1/subdir1-file1.txt +HASH SHA1 e242ed3bffccdf271b7fbaf34ed72d089537b42f subdir1/subdir1-file2.txt +HASH SHA1 f572d396fae9206628714fb2ce00f72e94f2258f subdir2/subdir2-file1.txt Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/content.asc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/content.asc?rev=11529&view=auto ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/content.asc (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/content.asc Tue Oct 28 17:31:15 2008 @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.9 (GNU/Linux) + +iEYEABECAAYFAkkHLgwACgkQm+zCtd2wN1ZD7QCghDVP3V6Pi/gBMoA6Flc77/4u +f30Anjf9MqPHx/YZXSFHrYtcst0welTn +=g7it +-----END PGP SIGNATURE----- Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/content.key URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/content.key?rev=11529&view=auto ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/content.key (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/content.key Tue Oct 28 17:31:15 2008 @@ -0,0 +1,49 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2.0.9 (GNU/Linux) + +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 +aVStjbDRYEnTHQOGsVy9 +=ZZx0 +-----END PGP PUBLIC KEY BLOCK----- Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/directory.yast URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/directory.yast?rev=11529&view=auto ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/directory.yast (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/directory.yast Tue Oct 28 17:31:15 2008 @@ -0,0 +1,2 @@ +subdir1/ +subdir2/ Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/subdir1/directory.yast URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/subdir1/directory.yast?rev=11529&view=auto ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/subdir1/directory.yast (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/subdir1/directory.yast Tue Oct 28 17:31:15 2008 @@ -0,0 +1,6 @@ +directory.yast +SHA1SUMS +SHA1SUMS.asc +SHA1SUMS.key +subdir1-file1.txt +subdir1-file2.txt Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/subdir1/subdir1-file1.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/subdir1/subdir1-file1.txt?rev=11529&view=auto ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/subdir1/subdir1-file1.txt (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/subdir1/subdir1-file1.txt Tue Oct 28 17:31:15 2008 @@ -0,0 +1 @@ +foo Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/subdir1/subdir1-file2.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/subdir1/subdir1-file2.txt?rev=11529&view=auto ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/subdir1/subdir1-file2.txt (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/subdir1/subdir1-file2.txt Tue Oct 28 17:31:15 2008 @@ -0,0 +1 @@ +bar Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/subdir2/directory.yast URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/subdir2/directory.yast?rev=11529&view=auto ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/subdir2/directory.yast (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/subdir2/directory.yast Tue Oct 28 17:31:15 2008 @@ -0,0 +1,5 @@ +directory.yast +SHA1SUMS +SHA1SUMS.asc +SHA1SUMS.key +subdir2-file1.txt Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/subdir2/subdir2-file1.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/subdir2/subdir2-file1.txt?rev=11529&view=auto ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/subdir2/subdir2-file1.txt (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/subdir2/subdir2-file1.txt Tue Oct 28 17:31:15 2008 @@ -0,0 +1 @@ +hello Modified: trunk/libzypp/zypp/Fetcher.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Fetcher.cc?rev=11529&r1=11528&r2=11529&view=diff ============================================================================== --- trunk/libzypp/zypp/Fetcher.cc (original) +++ trunk/libzypp/zypp/Fetcher.cc Tue Oct 28 17:31:15 2008 @@ -14,7 +14,6 @@ #include <list> #include <map> -#include "zypp/base/Flags.h" #include "zypp/base/Easy.h" #include "zypp/base/Logger.h" #include "zypp/base/PtrTypes.h" @@ -23,6 +22,8 @@ #include "zypp/Fetcher.h" #include "zypp/CheckSum.h" #include "zypp/base/UserRequestException.h" +#include "zypp/parser/susetags/ContentFileReader.h" +#include "zypp/parser/susetags/RepoIndex.h" using namespace std; @@ -89,11 +90,15 @@ { friend std::ostream & operator<<( std::ostream & str, const Fetcher::Impl & obj ); public: - Impl() {} + Impl(); + ~Impl() { MIL << endl; } + void setOptions( Fetcher::Options options ); + Fetcher::Options options() const; + void addIndex( const OnMediaLocation &resource ); void enqueue( const OnMediaLocation &resource, const FileChecker &checker = FileChecker() ); void enqueueDir( const OnMediaLocation &resource, bool recursive, const FileChecker &checker = FileChecker() ); @@ -124,6 +129,12 @@ * normally the same as the index file is located. */ void readIndex( const Pathname &index, const Pathname &basedir ); + + /** specific version of \ref readIndex for SHA1SUMS file */ + void readSha1sumsIndex( const Pathname &index, const Pathname &basedir ); + + /** specific version of \ref readIndex for SHA1SUMS file */ + void readContentFileIndex( const Pathname &index, const Pathname &basedir ); /** * tries to provide the file represented by job into dest_dir by @@ -159,6 +170,7 @@ list<Pathname> _caches; // checksums read from the indexes map _checksums; + Fetcher::Options _options; }; /////////////////////////////////////////////////////////////////// @@ -172,7 +184,18 @@ job->checkers.push_back(checker); _resources.push_back(job); } - + + Fetcher::Impl::Impl() + : _options(0) + { + } + + void Fetcher::Impl::setOptions( Fetcher::Options options ) + { _options = options; } + + Fetcher::Options Fetcher::Impl::options() const + { return _options; } + void Fetcher::Impl::enqueueDir( const OnMediaLocation &resource, bool recursive, const FileChecker &checker ) @@ -425,7 +448,46 @@ } } - void Fetcher::Impl::readIndex( const Pathname &index, const Pathname &basedir ) + // helper class to consume a content file + struct ContentReaderHelper : public parser::susetags::ContentFileReader + { + ContentReaderHelper() + { + setRepoIndexConsumer( bind( &ContentReaderHelper::consumeIndex, this, _1 ) ); + } + + void consumeIndex( const parser::susetags::RepoIndex_Ptr & data_r ) + { _repoindex = data_r; } + + parser::susetags::RepoIndex_Ptr _repoindex; + }; + + // generic function for reading indexes + void Fetcher::Impl::readIndex( const Pathname &index, const Pathname &basedir ) + { + if ( index.basename() == "SHA1SUMS" ) + readSha1sumsIndex(index, basedir); + else if ( index.basename() == "content" ) + readContentFileIndex(index, basedir); + else + WAR << index << ": index file format not known" << endl; + } + + // reads a content file index + void Fetcher::Impl::readContentFileIndex( const Pathname &index, const Pathname &basedir ) + { + ContentReaderHelper reader; + reader.parse(index); + MIL << index << " contains " << reader._repoindex->mediaFileChecksums.size() << " checksums." << endl; + for_( it, reader._repoindex->mediaFileChecksums.begin(), reader._repoindex->mediaFileChecksums.end() ) + { + // content file entries don't start with / + _checksums[(basedir + it->first).asString()] = it->second; + } + } + + // reads a SHA1SUMS file index + void Fetcher::Impl::readSha1sumsIndex( const Pathname &index, const Pathname &basedir ) { std::ifstream in( index.c_str() ); string buffer; @@ -522,6 +584,20 @@ provideToDest(media, (*it_res)->location, dest_dir); + // if the checksum is empty, but the checksum is in one of the + // indexes checksum, then add a checker + if ( (*it_res)->location.checksum().empty() ) + { + if ( _checksums.find((*it_res)->location.filename().asString()) + != _checksums.end() ) + { + // the checksum can be replaced with the one in the index. + CheckSum chksm = _checksums[(*it_res)->location.filename().asString()]; + ChecksumFileChecker digest_check(chksm); + (*it_res)->checkers.push_back(digest_check); + } + } + // validate job, this throws if not valid validate((*it_res)->location, dest_dir, (*it_res)->checkers); @@ -563,6 +639,16 @@ Fetcher::~Fetcher() {} + void Fetcher::setOptions( Fetcher::Options options ) + { + _pimpl->setOptions(options); + } + + Fetcher::Options Fetcher::options() const + { + return _pimpl->options(); + } + void Fetcher::enqueueDigested( const OnMediaLocation &resource, const FileChecker &checker ) { _pimpl->enqueueDigested(resource, checker); Modified: trunk/libzypp/zypp/Fetcher.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Fetcher.h?rev=11529&r1=11528&r2=11529&view=diff ============================================================================== --- trunk/libzypp/zypp/Fetcher.h (original) +++ trunk/libzypp/zypp/Fetcher.h Tue Oct 28 17:31:15 2008 @@ -15,6 +15,7 @@ #include <iosfwd> #include <list> +#include "zypp/base/Flags.h" #include "zypp/base/PtrTypes.h" #include "zypp/Pathname.h" #include "zypp/Url.h" @@ -41,7 +42,7 @@ * \code * MediaSetAccess access(url, path); * Fetcher fetcher; - * fetcher.enqueue( OnMediaLocation().filename("/content") ); + * fetcher.enqueue( OnMediaLocation().setLocation("/somefile") ); * fetcher.addCachePath("/tmp/cache") * fetcher.start( "/download-dir, access ); * fetcher.reset(); @@ -60,16 +61,67 @@ * * If you need to use more than one checker * \see CompositeFileChecker + * + * Additionally, you can automatically enqueue a job + * with a checksum checker by using \ref enqueueDigested + * which will use the \ref OnMediaLocation checksum + * automatically. + * + * \code + * location.setChecksum(CheckSum("sha1", "....")); + * fetcher.enqueueDigested(location); + * \endcode + * + * \note If the checksum of the location is empty, but + * \ref enqueueDigested is used, then the user will get a + * warning that the file has no checksum. + * + * Additionally, Fetcher supports checking the downloaded + * content by using signed indexes on the remote side. + * + * \code + * MediaSetAccess access(url, path); + * Fetcher fetcher; + * fetcher.addIndex(OnMediaLocation("/content")); + * fetcher.enqueue( OnMediaLocation().setLocation("/somefile") ); + * fetcher.start( "/download-dir, access ); + * fetcher.reset(); + * \endcode + * + * */ class Fetcher { friend std::ostream & operator<<( std::ostream & str, const Fetcher & obj ); - public: /** Implementation */ class Impl; public: + + /** + * Various option flags to change behavior + */ + enum Option + { + /** + * If a content file is found, it is + * downloaded and read. + */ + AutoAddContentFileIndexes = 0x0001, + /** + * If a SHA1SUMS file is found, it is + * downloaded and read. + */ + AutoAddSha1sumsIndexes = 0x0002, + /** + * If a content or SHA1SUMS file is found, + * it is downloaded and read. + */ + AutoAddIndexes = 0x0001 | 0x0002, + }; + ZYPP_DECLARE_FLAGS(Options, Option); + /** Default ctor */ Fetcher(); /** Dtor */ @@ -77,6 +129,17 @@ public: + /** + * Set the Fetcher options + * \see Fetcher::Options + */ + void setOptions( Options options ); + + /** + * Get current options + * \see Fetcher::Options + */ + Options options() const; /** * Adds an index containing metadata (for example @@ -89,10 +152,21 @@ * The index is relative to the media path, and * the listed files too. * + * Indexes in the SHA1SUM format, and YaST + * content file + * + * The file has to be signed or the user will be + * warned that the file is unsigned. You can + * place the signature next to the file adding the + * .asc extension. + * + * If you expect the key to not to be in the target + * system, then you can place it next to the index + * using adding the .key extension. + * */ void addIndex( const OnMediaLocation &resource ); - /** * Enqueue a object for transferal, they will not * be transfered until \ref start() is called @@ -172,13 +246,14 @@ */ void start( const Pathname &dest_dir, MediaSetAccess &media, - const ProgressData::ReceiverFnc & progress = ProgressData::ReceiverFnc() ); + const ProgressData::ReceiverFnc & progress = ProgressData::ReceiverFnc() ); private: /** Pointer to implementation */ RWCOW_pointer<Impl> _pimpl; }; /////////////////////////////////////////////////////////////////// + ZYPP_DECLARE_OPERATORS_FOR_FLAGS(Fetcher::Options); /** \relates Fetcher Stream output */ std::ostream & operator<<( std::ostream & str, const Fetcher & obj ); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org