Skip to content
This repository has been archived by the owner on May 21, 2024. It is now read-only.

OTA-3716: Full file download If a byte range request fails #1416

Merged
merged 1 commit into from
Oct 16, 2019
Merged

OTA-3716: Full file download If a byte range request fails #1416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 22 additions & 12 deletions src/libaktualizr/package_manager/packagemanagerinterface.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,18 +96,18 @@ bool PackageManagerInterface::fetchTarget(const Uptane::Target& target, Uptane::
LOG_WARNING << "Skipping download of target with length 0";
return true;
}
DownloadMetaStruct ds(target, std::move(progress_cb), token);
std::unique_ptr<DownloadMetaStruct> ds = std_::make_unique<DownloadMetaStruct>(target, progress_cb, token);
if (exists == TargetStatus::kIncomplete) {
auto target_check = storage_->checkTargetFile(target);
ds.downloaded_length = target_check->first;
ds->downloaded_length = target_check->first;
auto target_handle = storage_->openTargetFile(target);
::restoreHasherState(ds.hasher(), target_handle.get());
::restoreHasherState(ds->hasher(), target_handle.get());
target_handle->rclose();
ds.fhandle = target_handle->toWriteHandle();
ds->fhandle = target_handle->toWriteHandle();
} else {
// If the target was found, but is oversized or the hash doesn't match,
// just start over.
ds.fhandle = storage_->allocateTargetFile(false, target);
ds->fhandle = storage_->allocateTargetFile(false, target);
}

std::string target_url = target.uri();
Expand All @@ -117,17 +117,27 @@ bool PackageManagerInterface::fetchTarget(const Uptane::Target& target, Uptane::

HttpResponse response;
for (;;) {
response = http_->download(target_url, DownloadHandler, ProgressHandler, &ds,
static_cast<curl_off_t>(ds.downloaded_length));
response = http_->download(target_url, DownloadHandler, ProgressHandler, ds.get(),
static_cast<curl_off_t>(ds->downloaded_length));

if (response.curl_code == CURLE_RANGE_ERROR) {
LOG_WARNING << "The image server doesn't support byte range requests,"
" try to download the image from the beginning: "
<< target_url;
ds = std_::make_unique<DownloadMetaStruct>(target, progress_cb, token);
ds->fhandle = storage_->allocateTargetFile(false, target);
continue;
}

if (!response.wasInterrupted()) {
break;
}
ds.fhandle.reset();
ds->fhandle.reset();
// sleep if paused or abort the download
if (!token->canContinue()) {
throw Uptane::Exception("image", "Download of a target was aborted");
}
ds.fhandle = storage_->openTargetFile(target)->toWriteHandle();
ds->fhandle = storage_->openTargetFile(target)->toWriteHandle();
}
LOG_TRACE << "Download status: " << response.getStatusStr() << std::endl;
if (!response.isOk()) {
Expand All @@ -136,11 +146,11 @@ bool PackageManagerInterface::fetchTarget(const Uptane::Target& target, Uptane::
}
throw Uptane::Exception("image", "Could not download file, error: " + response.error_message);
}
if (!target.MatchHash(Uptane::Hash(ds.hash_type, ds.hasher().getHexDigest()))) {
ds.fhandle->wabort();
if (!target.MatchHash(Uptane::Hash(ds->hash_type, ds->hasher().getHexDigest()))) {
ds->fhandle->wabort();
throw Uptane::TargetHashMismatch(target.filename());
}
ds.fhandle->wcommit();
ds->fhandle->wcommit();
result = true;
} catch (const Uptane::Exception& e) {
LOG_WARNING << "Error while downloading a target: " << e.what();
Expand Down
10 changes: 2 additions & 8 deletions tests/test_backend_failure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,7 @@ def test_backend_failure_sanity_imagerepo_update_after_metadata_download_failure
@with_uptane_backend(start_generic_server=True)
@with_images(images_to_install=[(('primary-hw-ID-001', 'primary-ecu-id'), 'primary-image.img')])
@with_imagerepo(handlers=[
# TODO: test fails because aktualizr issues byte range request
# that are not supported by server
# https://saeljira.it.here.com/browse/OTA-3716
#DownloadInterruptionHandler(number_of_failures=1, url='/targets/primary-image.img'),
DownloadInterruptionHandler(number_of_failures=1, url='/targets/primary-image.img'),
MalformedImageHandler(number_of_failures=1, url='/targets/primary-image.img'),
])
@with_director(start=False)
Expand All @@ -113,10 +110,7 @@ def test_backend_failure_sanity_imagerepo_update_after_image_download_failure(in
"""
@with_uptane_backend(start_generic_server=True)
@with_customrepo(handlers=[
# TODO: This test fails because the issue with image download
# from a server that doesn't support byte range requests
# DownloadInterruptionHandler(number_of_failures=1, url='/primary-image.img'),
# https://saeljira.it.here.com/browse/OTA-3716
DownloadInterruptionHandler(number_of_failures=1, url='/primary-image.img'),
MalformedImageHandler(number_of_failures=1, url='/primary-image.img')
# TODO: this test fails too, although httpclient.cc sets
# CURLOPT_LOW_SPEED_TIME and CURLOPT_LOW_SPEED_TIME
Expand Down