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

New StructGuard variant to support non-void return types. #1714

Merged
merged 2 commits into from
Jul 8, 2020
+19 −11
Merged

New StructGuard variant to support non-void return types. #1714

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
930b9b8
New StructGuard variant to support non-void return types.
pattivacek Jul 8, 2020
43e6c39
Explicitly create Virtual Secondary directories securely.
pattivacek Jul 8, 2020
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
9 changes: 4 additions & 5 deletions src/libaktualizr/utilities/utils.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@ void Utils::copyDir(const boost::filesystem::path &from, const boost::filesystem
}

std::string Utils::readFileFromArchive(std::istream &as, const std::string &filename, const bool trim) {
StructGuard<struct archive> a(archive_read_new(), reinterpret_cast<void (*)(struct archive *)>(archive_read_free));
StructGuardInt<struct archive> a(archive_read_new(), archive_read_free);
if (a == nullptr) {
LOG_ERROR << "archive error: could not initialize archive object";
throw std::runtime_error("archive error");
Expand Down Expand Up @@ -545,7 +545,7 @@ static ssize_t write_cb(struct archive *a, void *client_data, const void *buffer
}

void Utils::writeArchive(const std::map<std::string, std::string> &entries, std::ostream &as) {
StructGuard<struct archive> a(archive_write_new(), reinterpret_cast<void (*)(struct archive *)>(archive_write_free));
StructGuardInt<struct archive> a(archive_write_new(), archive_write_free);
if (a == nullptr) {
LOG_ERROR << "archive error: could not initialize archive object";
throw std::runtime_error("archive error");
Expand Down Expand Up @@ -598,7 +598,7 @@ void Utils::removeFileFromArchive(const boost::filesystem::path &archive_path, c
throw std::runtime_error("Unable to parse provisioning credentials");
}

StructGuard<struct archive> a_in(archive_read_new(), reinterpret_cast<void (*)(struct archive *)>(archive_read_free));
StructGuardInt<struct archive> a_in(archive_read_new(), archive_read_free);
if (a_in == nullptr) {
LOG_ERROR << "archive error: could not initialize archive object";
throw std::runtime_error("archive error");
Expand All @@ -612,8 +612,7 @@ void Utils::removeFileFromArchive(const boost::filesystem::path &archive_path, c
throw std::runtime_error("archive error");
}

StructGuard<struct archive> a_out(archive_write_new(),
reinterpret_cast<void (*)(struct archive *)>(archive_write_free));
StructGuardInt<struct archive> a_out(archive_write_new(), archive_write_free);
if (a_out == nullptr) {
LOG_ERROR << "archive error: could not initialize archive object";
throw std::runtime_error("archive error");
Expand Down
2 changes: 2 additions & 0 deletions src/libaktualizr/utilities/utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,8 @@ class BasedPath {
// BTW local variables are destructed in reverse order of instantiation
template <typename T>
using StructGuard = std::unique_ptr<T, void (*)(T *)>;
template <typename T>
using StructGuardInt = std::unique_ptr<T, int (*)(T *)>;

class Socket {
public:
Expand Down
19 changes: 13 additions & 6 deletions tests/uptane_test_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ struct UptaneTestCommon {
static Primary::VirtualSecondaryConfig addDefaultSecondary(Config& config, const TemporaryDirectory& temp_dir,
const std::string& serial, const std::string& hw_id,
bool hardcoded_keys = true) {
boost::filesystem::path sec_dir = temp_dir / boost::filesystem::unique_path();
const boost::filesystem::path sec_dir = temp_dir / boost::filesystem::unique_path();
Utils::createDirectories(sec_dir, S_IRWXU);

Primary::VirtualSecondaryConfig ecu_config;
ecu_config.partial_verifying = false;
Expand All @@ -90,17 +91,23 @@ struct UptaneTestCommon {
}

static Primary::VirtualSecondaryConfig altVirtualConfiguration(const boost::filesystem::path& client_dir) {
Primary::VirtualSecondaryConfig ecu_config;
const boost::filesystem::path sec_dir = client_dir / boost::filesystem::unique_path();
Utils::createDirectories(sec_dir, S_IRWXU);

Primary::VirtualSecondaryConfig ecu_config;
ecu_config.partial_verifying = false;
ecu_config.full_client_dir = client_dir;
ecu_config.full_client_dir = sec_dir;
ecu_config.ecu_serial = "ecuserial3";
ecu_config.ecu_hardware_id = "hw_id3";
ecu_config.ecu_private_key = "sec.priv";
ecu_config.ecu_public_key = "sec.pub";
ecu_config.firmware_path = client_dir / "firmware.txt";
ecu_config.target_name_path = client_dir / "firmware_name.txt";
ecu_config.metadata_path = client_dir / "secondary_metadata";
ecu_config.firmware_path = sec_dir / "firmware.txt";
ecu_config.target_name_path = sec_dir / "firmware_name.txt";
ecu_config.metadata_path = sec_dir / "secondary_metadata";

// store hard-coded keys to make the tests run WAY faster
Utils::writeFile((ecu_config.full_client_dir / ecu_config.ecu_private_key), std::string(sec_private_key));
Utils::writeFile((ecu_config.full_client_dir / ecu_config.ecu_public_key), std::string(sec_public_key));

return ecu_config;
}
Expand Down