1542824816

Committed 07 Nov 2024 04:43PM UTC coverage: 79.85% (+0.08%) from 79.772%

Build # 1542824816

Build Type

push

gitlab-ci

Committed by

web-flow

Commit Message

Merge pull request #1692 from lluiscampos/4.0.x-bugfixes-manifest

4.0.x: Bugfixes for Artifact manifest

Run Details

26 of 28 new or added lines in 4 files covered. (92.86%)

1 existing line in 1 file now uncovered.

7149 of 8953 relevant lines covered (79.85%)

12223.2 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

64.1

/src/artifact/v3/version/version.cpp

// Copyright 2023 Northern.tech AS
//
//    Licensed under the Apache License, Version 2.0 (the "License");
//    you may not use this file except in compliance with the License.
//    You may obtain a copy of the License at
//
//        http://www.apache.org/licenses/LICENSE-2.0
//
//    Unless required by applicable law or agreed to in writing, software
//    distributed under the License is distributed on an "AS IS" BASIS,
//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
//    See the License for the specific language governing permissions and
//    limitations under the License.

#include <artifact/v3/version/version.hpp>

#include <string>
#include <vector>

#include <common/common.hpp>
#include <common/expected.hpp>
#include <common/error.hpp>
#include <common/json.hpp>

#include <artifact/sha/sha.hpp>


namespace mender {
namespace artifact {
namespace v3 {
namespace version {

namespace io = mender::common::io;
namespace expected = mender::common::expected;
namespace error = mender::common::error;
namespace json = mender::common::json;
namespace sha = mender::sha;

const int supported_parser_version {3};
const string supported_parser_format {"mender"};

const ErrorCategoryClass ErrorCategory {};

const char *ErrorCategoryClass::name() const noexcept {
        return "VersionParserErrorCategory";
}

string ErrorCategoryClass::message(int code) const {
        switch (code) {
        case NoError:
                return "Success";
        case ParseError:
                return "Parse error";
        case VersionError:
                return "Wrong Artifact version";
        case FormatError:
                return "Wrong Artifact format";
        default:
                return "Unknown";
        }
}

error::Error MakeError(ErrorCode code, const string &msg) {
        return error::Error(error_condition(code, ErrorCategory), msg);
}


ExpectedVersion Parse(io::Reader &reader) {
        Version v {};

        sha::Reader sha_reader {reader};

        auto expected_json = json::Load(sha_reader);
        if (!expected_json) {
                return expected::unexpected(MakeError(
                        ParseError,
                        "Failed to parse the version header JSON: " + expected_json.error().message));
        }

        const json::Json version_json = expected_json.value();

        auto version = version_json.Get("version").and_then(json::ToInt64);

        if (!version) {
                return expected::unexpected(MakeError(VersionError, version.error().message));
        }

        if (version.value() != supported_parser_version) {
                return expected::unexpected(MakeError(
                        FormatError,
                        "Only version " + std::to_string(supported_parser_version)
                                + " is supported, received version " + std::to_string(version.value())));
        }
        v.version = supported_parser_version;

        auto format = version_json.Get("format").and_then(json::ToString);

        if (!format) {
                return expected::unexpected(MakeError(FormatError, format.error().message));
        }

        if (format != supported_parser_format) {
                return expected::unexpected(MakeError(
                        FormatError,
                        "The client only understands the 'mender' Artifact type. Got format: "
                                + format.value()));
        }
        v.format = supported_parser_format;

        auto expected_sha = sha_reader.ShaSum();
        if (!expected_sha) {
                expected::unexpected(
                        MakeError(FormatError, "Invalid ShaSum: " + expected_sha.error().message));
        }
        v.shasum = expected_sha.value();

        return v;
}

} // namespace version
} // namespace v3
} // namespace artifact
} // namespace mender

1	// Copyright 2023 Northern.tech AS
2	//
3	// Licensed under the Apache License, Version 2.0 (the "License");
4	// you may not use this file except in compliance with the License.
5	// You may obtain a copy of the License at
6	//
7	// http://www.apache.org/licenses/LICENSE-2.0
8	//
9	// Unless required by applicable law or agreed to in writing, software
10	// distributed under the License is distributed on an "AS IS" BASIS,
11	// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12	// See the License for the specific language governing permissions and
13	// limitations under the License.
14
15	#include <artifact/v3/version/version.hpp>
16
17	#include <string>
18	#include <vector>
19
20	#include <common/common.hpp>
21	#include <common/expected.hpp>
22	#include <common/error.hpp>
23	#include <common/json.hpp>
24
25	#include <artifact/sha/sha.hpp>
26
27
28	namespace mender {
29	namespace artifact {
30	namespace v3 {
31	namespace version {
32
33	namespace io = mender::common::io;
34	namespace expected = mender::common::expected;
35	namespace error = mender::common::error;
36	namespace json = mender::common::json;
37	namespace sha = mender::sha;
38
39	const int supported_parser_version {3};
40	const string supported_parser_format {"mender"};
41
42	const ErrorCategoryClass ErrorCategory {};
43
44	const char *ErrorCategoryClass::name() const noexcept {	×
45	return "VersionParserErrorCategory";	×
46	}
47
48	string ErrorCategoryClass::message(int code) const {	×
49	switch (code) {	×
50	case NoError:
51	return "Success";	×
52	case ParseError:
53	return "Parse error";	×
54	case VersionError:
55	return "Wrong Artifact version";	×
56	case FormatError:
57	return "Wrong Artifact format";	×
58	default:
59	return "Unknown";	×
60	}
61	}
62
63	error::Error MakeError(ErrorCode code, const string &msg) {	×
64	return error::Error(error_condition(code, ErrorCategory), msg);	4✔
65	}
66
67
68	ExpectedVersion Parse(io::Reader &reader) {	151✔
69	Version v {};	302✔
70
71	sha::Reader sha_reader {reader};	302✔
72
73	auto expected_json = json::Load(sha_reader);	151✔
74	if (!expected_json) {	151✔
75	return expected::unexpected(MakeError(	2✔
76	ParseError,
77	"Failed to parse the version header JSON: " + expected_json.error().message));	6✔
78	}
79
80	const json::Json version_json = expected_json.value();	149✔
81
82	auto version = version_json.Get("version").and_then(json::ToInt64);	298✔
83
84	if (!version) {	149✔
85	return expected::unexpected(MakeError(VersionError, version.error().message));	×
86	}
87
88	if (version.value() != supported_parser_version) {	149✔
89	return expected::unexpected(MakeError(	1✔
90	FormatError,
91	"Only version " + std::to_string(supported_parser_version)	2✔
92	+ " is supported, received version " + std::to_string(version.value())));	5✔
93	}
94	v.version = supported_parser_version;	148✔
95
96	auto format = version_json.Get("format").and_then(json::ToString);	296✔
97
98	if (!format) {	148✔
99	return expected::unexpected(MakeError(FormatError, format.error().message));	×
100	}
101
102	if (format != supported_parser_format) {	148✔
103	return expected::unexpected(MakeError(	1✔
104	FormatError,
105	"The client only understands the 'mender' Artifact type. Got format: "
106	+ format.value()));	3✔
107	}
108	v.format = supported_parser_format;
109
110	auto expected_sha = sha_reader.ShaSum();	147✔
111	if (!expected_sha) {	147✔
NEW 112	expected::unexpected(	×
NEW 113	MakeError(FormatError, "Invalid ShaSum: " + expected_sha.error().message));	×
114	}
115	v.shasum = expected_sha.value();	147✔
116
117	return v;	147✔
118	}
119
120	} // namespace version
121	} // namespace v3
122	} // namespace artifact
123	} // namespace mender

mendersoftware / mender / 1542824816

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous