wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 02:21:16 +02:00
Code Activity

Merge pull request #13112 from NaN-git/fix-json-getInteger

Browse source 
bugfix in getInteger(const nlohmann::json &) and add bounds checks
This commit is contained in:
mergify[bot] 2025-04-30 21:20:49 +00:00 • committed by GitHub
commit 4548dd1abb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 54 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/nar-info.cc
View file

@ -176,7 +176,7 @@ NarInfo NarInfo::fromJSON(
std::nullopt); std::nullopt);
if (json.contains("downloadSize")) if (json.contains("downloadSize"))
res.fileSize = getInteger(valueAt(json, "downloadSize")); res.fileSize = getUnsigned(valueAt(json, "downloadSize"));
return res; return res;
} }

4
src/libstore/path-info.cc
View file

@ -200,7 +200,7 @@ UnkeyedValidPathInfo UnkeyedValidPathInfo::fromJSON(
auto & json = getObject(_json); auto & json = getObject(_json);
res.narHash = Hash::parseAny(getString(valueAt(json, "narHash")), std::nullopt); res.narHash = Hash::parseAny(getString(valueAt(json, "narHash")), std::nullopt);
res.narSize = getInteger(valueAt(json, "narSize")); res.narSize = getUnsigned(valueAt(json, "narSize"));
try { try {
auto references = getStringList(valueAt(json, "references")); auto references = getStringList(valueAt(json, "references"));
@ -224,7 +224,7 @@ UnkeyedValidPathInfo UnkeyedValidPathInfo::fromJSON(
if (json.contains("registrationTime")) if (json.contains("registrationTime"))
if (auto * rawRegistrationTime = getNullable(valueAt(json, "registrationTime"))) if (auto * rawRegistrationTime = getNullable(valueAt(json, "registrationTime")))
res.registrationTime = getInteger(*rawRegistrationTime); res.registrationTime = getInteger<time_t>(*rawRegistrationTime);
if (json.contains("ultimate")) if (json.contains("ultimate"))
res.ultimate = getBoolean(valueAt(json, "ultimate")); res.ultimate = getBoolean(valueAt(json, "ultimate"));

28
src/libutil-tests/json-utils.cc
View file

@ -128,19 +128,29 @@ TEST(getString, wrongAssertions) {
ASSERT_THROW(getString(valueAt(json, "boolean")), Error); ASSERT_THROW(getString(valueAt(json, "boolean")), Error);
} }
TEST(getInteger, rightAssertions) { TEST(getIntegralNumber, rightAssertions) {
auto simple = R"({ "int": 0 })"_json; auto simple = R"({ "int": 0, "signed": -1 })"_json;
ASSERT_EQ(getInteger(valueAt(getObject(simple), "int")), 0); ASSERT_EQ(getUnsigned(valueAt(getObject(simple), "int")), 0);
ASSERT_EQ(getInteger<int8_t>(valueAt(getObject(simple), "int")), 0);
ASSERT_EQ(getInteger<int8_t>(valueAt(getObject(simple), "signed")), -1);
} }
TEST(getInteger, wrongAssertions) { TEST(getIntegralNumber, wrongAssertions) {
auto json = R"({ "object": {}, "array": [], "string": "", "int": 0, "boolean": false })"_json; auto json = R"({ "object": {}, "array": [], "string": "", "int": 0, "signed": -256, "large": 128, "boolean": false })"_json;
ASSERT_THROW(getInteger(valueAt(json, "object")), Error); ASSERT_THROW(getUnsigned(valueAt(json, "object")), Error);
ASSERT_THROW(getInteger(valueAt(json, "array")), Error); ASSERT_THROW(getUnsigned(valueAt(json, "array")), Error);
ASSERT_THROW(getInteger(valueAt(json, "string")), Error); ASSERT_THROW(getUnsigned(valueAt(json, "string")), Error);
ASSERT_THROW(getInteger(valueAt(json, "boolean")), Error); ASSERT_THROW(getUnsigned(valueAt(json, "boolean")), Error);
ASSERT_THROW(getUnsigned(valueAt(json, "signed")), Error);
ASSERT_THROW(getInteger<int8_t>(valueAt(json, "object")), Error);
ASSERT_THROW(getInteger<int8_t>(valueAt(json, "array")), Error);
ASSERT_THROW(getInteger<int8_t>(valueAt(json, "string")), Error);
ASSERT_THROW(getInteger<int8_t>(valueAt(json, "boolean")), Error);
ASSERT_THROW(getInteger<int8_t>(valueAt(json, "large")), Error);
ASSERT_THROW(getInteger<int8_t>(valueAt(json, "signed")), Error);
} }
TEST(getBoolean, rightAssertions) { TEST(getBoolean, rightAssertions) {

22
src/libutil/include/nix/util/json-utils.hh
View file

@ -4,6 +4,7 @@
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>
#include <list> #include <list>
#include "nix/util/error.hh"
#include "nix/util/types.hh" #include "nix/util/types.hh"
namespace nix { namespace nix {
@ -35,7 +36,26 @@ const nlohmann::json * getNullable(const nlohmann::json & value);
const nlohmann::json::object_t & getObject(const nlohmann::json & value); const nlohmann::json::object_t & getObject(const nlohmann::json & value);
const nlohmann::json::array_t & getArray(const nlohmann::json & value); const nlohmann::json::array_t & getArray(const nlohmann::json & value);
const nlohmann::json::string_t & getString(const nlohmann::json & value); const nlohmann::json::string_t & getString(const nlohmann::json & value);
const nlohmann::json::number_integer_t & getInteger(const nlohmann::json & value); const nlohmann::json::number_unsigned_t & getUnsigned(const nlohmann::json & value);
template<typename T>
auto getInteger(const nlohmann::json & value) -> std::enable_if_t<std::is_signed_v<T> && std::is_integral_v<T>, T>
{
if (auto ptr = value.get_ptr<const nlohmann::json::number_unsigned_t *>()) {
if (*ptr <= std::make_unsigned_t<T>(std::numeric_limits<T>::max())) {
return *ptr;
}
} else if (auto ptr = value.get_ptr<const nlohmann::json::number_integer_t *>()) {
if (*ptr >= std::numeric_limits<T>::min() && *ptr <= std::numeric_limits<T>::max()) {
return *ptr;
}
} else {
auto typeName = value.is_number_float() ? "floating point number" : value.type_name();
throw Error("Expected JSON value to be an integral number but it is of type '%s': %s", typeName, value.dump());
}
throw Error("Out of range: JSON value '%s' cannot be casted to %d-bit integer", value.dump(), 8 * sizeof(T));
}
const nlohmann::json::boolean_t & getBoolean(const nlohmann::json & value); const nlohmann::json::boolean_t & getBoolean(const nlohmann::json & value);
Strings getStringList(const nlohmann::json & value); Strings getStringList(const nlohmann::json & value);
StringMap getStringMap(const nlohmann::json & value); StringMap getStringMap(const nlohmann::json & value);

13
src/libutil/json-utils.cc
View file

@ -92,9 +92,18 @@ const nlohmann::json::string_t & getString(const nlohmann::json & value)
return ensureType(value, nlohmann::json::value_t::string).get_ref<const nlohmann::json::string_t &>(); return ensureType(value, nlohmann::json::value_t::string).get_ref<const nlohmann::json::string_t &>();
} }
const nlohmann::json::number_integer_t & getInteger(const nlohmann::json & value) const nlohmann::json::number_unsigned_t & getUnsigned(const nlohmann::json & value)
{ {
return ensureType(value, nlohmann::json::value_t::number_integer).get_ref<const nlohmann::json::number_integer_t &>(); if (auto ptr = value.get<const nlohmann::json::number_unsigned_t *>()) {
return *ptr;
}
const char * typeName = value.type_name();
if (typeName == nlohmann::json(0).type_name()) {
typeName = value.is_number_float() ? "floating point number" : "signed integral number";
}
throw Error(
"Expected JSON value to be an unsigned integral number but it is of type '%s': %s",
typeName, value.dump());
} }
const nlohmann::json::boolean_t & getBoolean(const nlohmann::json & value) const nlohmann::json::boolean_t & getBoolean(const nlohmann::json & value)