Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add filesize check for downloads with known size (bsc#408814) #128

Merged
merged 2 commits into from
Jul 30, 2018
Merged

Add filesize check for downloads with known size (bsc#408814) #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6a88da
Add filesize check for downloads with known size (bsc#408814)
bzeller Jul 25, 2018
7ba8643
Limit download size for metadata
bzeller Jul 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions tests/zypp/MediaSetAccess_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,34 @@ BOOST_AUTO_TEST_CASE(msa_remote_tests)
//file should be removed once the ManagedFile goes out of scope
BOOST_CHECK(check_file_exists(fPath) == false);

BOOST_CHECK(setaccess.doesFileExist("/test-big.txt"));
BOOST_CHECK(setaccess.doesFileExist("dir/test-big.txt"));

{
// providing a file with wrong filesize should throw
OnMediaLocation locPlain("dir/test-big.txt");
locPlain.setDownloadSize( zypp::ByteCount(500, zypp::ByteCount::B) );
BOOST_CHECK_THROW(setaccess.provideFile(locPlain), media::MediaFileSizeExceededException);

// using the correct file size should NOT throw
locPlain.setDownloadSize( zypp::ByteCount(7135, zypp::ByteCount::B) );
Pathname file = setaccess.provideFile( locPlain );
BOOST_CHECK(check_file_exists(file) == true);
}

{
// test the maximum filesize again with metalink downloads
// providing a file with wrong filesize should throw
OnMediaLocation locMeta("/test-big.txt");
locMeta.setDownloadSize( zypp::ByteCount(500, zypp::ByteCount::B) );
BOOST_CHECK_THROW(setaccess.provideFile(locMeta), media::MediaFileSizeExceededException);

// using the correct file size should NOT throw
locMeta.setDownloadSize( zypp::ByteCount(7135, zypp::ByteCount::B) );
Pathname file = setaccess.provideFile( locMeta );
BOOST_CHECK(check_file_exists(file) == true);
}

web.stop();
}

Expand Down
15 changes: 15 additions & 0 deletions tests/zypp/data/mediasetaccess/src1/cd1/dir/test-big.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.

Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.

Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.

Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.

Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.

Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.

Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.

Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
29 changes: 29 additions & 0 deletions tests/zypp/data/mediasetaccess/src1/cd1/test-big.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<metalink version="3.0"
xmlns="http://www.metalinker.org/"
generator="http://metalinks.sourceforge.net/"
>
<files>
<file name="test-big.txt">
<size>7135</size>
<verification>
<hash type="md4">818dcbb0bbb033aa8b8c9ddd269648d2</hash>
<hash type="md5">f69a3e53751eb3249c3c36c50290b8da</hash>
<hash type="sha1">edf0cf52765c9b5cfeddfd83b62f8517b119ca77</hash>
<hash type="sha256">b0343a8ee06d97c9786b65bcb64c49fbb7e1d517159fac4633ba56f7a521fef0</hash>
<hash type="sha384">202d21693dabe53ff5f2305d6b78844ffaa3b566b9644d61ca087cab752965b16d6a188def7a9463b5f17fdc50b3d105</hash>
<hash type="sha512">caf260dd5420a6a6df6a558eac69a901cd3e43dbfd37b54e0fb176940f3e09c3f96c7faa22e505777106ebf056c471be7556c8cba80331d6efdb9e763e66190b</hash>
<hash type="ripemd160">77fc06ff936163cfb6c1b0c68cb47a295a5bf8e3</hash>
<hash type="tiger192">2fcd624ba2ad1adb2ff23af58049b6f7b062754eadd031b1</hash>
<hash type="crc32">011209ae</hash>
<hash type="ed2k">818dcbb0bbb033aa8b8c9ddd269648d2</hash>
<pieces length="262144" type="sha1">
<hash piece="0">edf0cf52765c9b5cfeddfd83b62f8517b119ca77</hash>
</pieces>
</verification>
<resources>
<url type="http">http://localhost:10002/dir/test-big.txt</url>
</resources>
</file>
</files>
</metalink>
4 changes: 3 additions & 1 deletion zypp/MediaSetAccess.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,11 @@ IMPL_PTR_TYPE(MediaSetAccess);
struct ProvideFileOperation
{
Pathname result;
ByteCount expectedFileSize;
void operator()( media::MediaAccessId media, const Pathname &file )
{
media::MediaManager media_mgr;
media_mgr.provideFile(media, file);
media_mgr.provideFile(media, file, expectedFileSize);
result = media_mgr.localPath(media, file);
}
};
Expand Down Expand Up @@ -158,6 +159,7 @@ IMPL_PTR_TYPE(MediaSetAccess);
Pathname MediaSetAccess::provideFile( const OnMediaLocation & resource, ProvideFileOptions options, const Pathname &deltafile )
{
ProvideFileOperation op;
op.expectedFileSize = resource.downloadSize();
provide( boost::ref(op), resource, options, deltafile );
return op.result;
}
Expand Down
6 changes: 3 additions & 3 deletions zypp/media/MediaAccess.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,13 +337,13 @@ MediaAccess::release( const std::string & ejectDev )
// filename is interpreted relative to the attached url
// and a path prefix is preserved to destination
void
MediaAccess::provideFile( const Pathname & filename ) const
MediaAccess::provideFile(const Pathname & filename , const ByteCount &expectedFileSize) const
{
if ( !_handler ) {
ZYPP_THROW(MediaNotOpenException("provideFile(" + filename.asString() + ")"));
}

_handler->provideFile( filename );
_handler->provideFile( filename, expectedFileSize );
}

void
Expand Down Expand Up @@ -470,7 +470,7 @@ void MediaAccess::getFile( const Url &from, const Pathname &to )
try {
media.open( u );
media.attach();
media._handler->provideFileCopy( base, to );
media._handler->provideFileCopy( base, to, 0 );
media.release();
}
catch (const MediaException & excpt_r)
Expand Down
4 changes: 2 additions & 2 deletions zypp/media/MediaAccess.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ namespace zypp {
* \throws MediaException
*
**/
void provideFile( const Pathname & filename ) const;
void provideFile( const Pathname & filename, const ByteCount &expectedFileSize ) const;

/**
* Remove filename below attach point IFF handler downloads files
Expand Down Expand Up @@ -386,7 +386,7 @@ namespace zypp {
ZYPP_THROW(MediaBadFilenameException(_file.asString()));
} else if ( _media ) {
try {
_media->provideFile( _file );
_media->provideFile( _file, 0 );
_local_file = _media->localPath( _file );
}
catch (const MediaException & excpt_r)
Expand Down
4 changes: 2 additions & 2 deletions zypp/media/MediaCD.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -720,9 +720,9 @@ namespace zypp
//
// DESCRIPTION : Asserted that media is attached.
//
void MediaCD::getFile( const Pathname & filename ) const
void MediaCD::getFile(const Pathname & filename , const ByteCount &expectedFileSize_r) const
{
MediaHandler::getFile( filename );
MediaHandler::getFile( filename, expectedFileSize_r );
}

///////////////////////////////////////////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion zypp/media/MediaCD.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ namespace zypp {

virtual void attachTo (bool next = false);
virtual void releaseFrom( const std::string & ejectDev );
virtual void getFile( const Pathname & filename ) const;
virtual void getFile(const Pathname & filename, const ByteCount &expectedFileSize_r ) const override;
virtual void getDir( const Pathname & dirname, bool recurse_r ) const;
virtual void getDirInfo( std::list<std::string> & retlist,
const Pathname & dirname, bool dots = true ) const;
Expand Down
4 changes: 2 additions & 2 deletions zypp/media/MediaCIFS.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,9 +350,9 @@ namespace zypp {
//
// DESCRIPTION : Asserted that media is attached.
//
void MediaCIFS::getFile (const Pathname & filename) const
void MediaCIFS::getFile (const Pathname & filename, const ByteCount &expectedFileSize_r) const
{
MediaHandler::getFile( filename );
MediaHandler::getFile( filename, expectedFileSize_r );
}

///////////////////////////////////////////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion zypp/media/MediaCIFS.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ namespace zypp {

virtual void attachTo (bool next = false);
virtual void releaseFrom( const std::string & ejectDev );
virtual void getFile( const Pathname & filename ) const;
virtual void getFile( const Pathname & filename, const ByteCount &expectedFileSize_r ) const override;
virtual void getDir( const Pathname & dirname, bool recurse_r ) const;
virtual void getDirInfo( std::list<std::string> & retlist,
const Pathname & dirname, bool dots = true ) const;
Expand Down
Loading