Fixed json parsing with hexadecimal characters

* replace \x with \u00 to follow JSON spec
* fixes #2475 and #2495
* added unit tests for json parsing
This commit is contained in:
zjeffer 2023-09-10 20:36:27 +02:00
parent f744d906be
commit 8f5d0098d6
3 changed files with 71 additions and 14 deletions

View File

@ -3,6 +3,12 @@
#include <fmt/ostream.h> #include <fmt/ostream.h>
#include <json/json.h> #include <json/json.h>
#include <algorithm>
#include <codecvt>
#include <iostream>
#include <locale>
#include <regex>
#if (FMT_VERSION >= 90000) #if (FMT_VERSION >= 90000)
template <> template <>
@ -12,25 +18,30 @@ struct fmt::formatter<Json::Value> : ostream_formatter {};
namespace waybar::util { namespace waybar::util {
struct JsonParser { class JsonParser {
JsonParser() {} public:
JsonParser() = default;
const Json::Value parse(const std::string& data) const { Json::Value parse(const std::string& jsonStr) {
Json::Value root(Json::objectValue); Json::Value root;
if (data.empty()) {
// replace all occurrences of "\x" with "\u00", because JSON doesn't allow "\x" escape sequences
std::string modifiedJsonStr = replaceHexadecimalEscape(jsonStr);
std::istringstream jsonStream(modifiedJsonStr);
std::string errs;
if (!Json::parseFromStream(m_readerBuilder, jsonStream, &root, &errs)) {
throw std::runtime_error("Error parsing JSON: " + errs);
}
return root; return root;
} }
std::unique_ptr<Json::CharReader> const reader(builder_.newCharReader());
std::string err;
bool res = reader->parse(data.c_str(), data.c_str() + data.size(), &root, &err);
if (!res) throw std::runtime_error(err);
return root;
}
~JsonParser() = default;
private: private:
Json::CharReaderBuilder builder_; Json::CharReaderBuilder m_readerBuilder;
};
static std::string replaceHexadecimalEscape(const std::string& str) {
static std::regex re("\\\\x");
return std::regex_replace(str, re, "\\u00");
}
};
} // namespace waybar::util } // namespace waybar::util

45
test/JsonParser.cpp Normal file
View File

@ -0,0 +1,45 @@
#include "util/json.hpp"
#if __has_include(<catch2/catch_test_macros.hpp>)
#include <catch2/catch_test_macros.hpp>
#else
#include <catch2/catch.hpp>
#endif
TEST_CASE("Simple json", "[json]") {
SECTION("Parse simple json") {
std::string stringToTest = R"({"number": 5, "string": "test"})";
waybar::util::JsonParser parser;
Json::Value jsonValue = parser.parse(stringToTest);
REQUIRE(jsonValue["number"].asInt() == 5);
REQUIRE(jsonValue["string"].asString() == "test");
}
}
TEST_CASE("Json with unicode", "[json]") {
SECTION("Parse json with unicode") {
std::string stringToTest = R"({"test": "\xab"})";
waybar::util::JsonParser parser;
Json::Value jsonValue = parser.parse(stringToTest);
// compare with "\u00ab" because "\xab" is replaced with "\u00ab" in the parser
REQUIRE(jsonValue["test"].asString() == "\u00ab");
}
}
TEST_CASE("Json with emoji", "[json]") {
SECTION("Parse json with emoji") {
std::string stringToTest = R"({"test": "😊"})";
waybar::util::JsonParser parser;
Json::Value jsonValue = parser.parse(stringToTest);
REQUIRE(jsonValue["test"].asString() == "😊");
}
}
TEST_CASE("Json with chinese characters", "[json]") {
SECTION("Parse json with chinese characters") {
std::string stringToTest = R"({"test": ""})";
waybar::util::JsonParser parser;
Json::Value jsonValue = parser.parse(stringToTest);
REQUIRE(jsonValue["test"].asString() == "你好");
}
}

View File

@ -8,6 +8,7 @@ test_dep = [
] ]
test_src = files( test_src = files(
'main.cpp', 'main.cpp',
'JsonParser.cpp',
'SafeSignal.cpp', 'SafeSignal.cpp',
'config.cpp', 'config.cpp',
'../src/config.cpp', '../src/config.cpp',