diff options
| author | Lee Clagett <code@leeclagett.com> | 2020-02-28 16:45:51 -0500 |
|---|---|---|
| committer | Lee Clagett <code@leeclagett.com> | 2019-11-18 12:59:41 +0000 |
| commit | 68a6507c3f1e87955d9958afb68b173b51ae4389 (patch) | |
| tree | 8f9b83342e96778f571aefac92af72543056b3ac /src/rpc | |
| parent | Merge pull request #6198 (diff) | |
| download | monero-68a6507c3f1e87955d9958afb68b173b51ae4389.tar.xz | |
Fixed bug in ZMQ JSON-RPC method field
Diffstat (limited to 'src/rpc')
| -rw-r--r-- | src/rpc/message.cpp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/rpc/message.cpp b/src/rpc/message.cpp index 158b58005..689eb5e33 100644 --- a/src/rpc/message.cpp +++ b/src/rpc/message.cpp @@ -52,6 +52,16 @@ constexpr const char id_field[] = "id"; constexpr const char method_field[] = "method"; constexpr const char params_field[] = "params"; constexpr const char result_field[] = "result"; + +const rapidjson::Value& get_method_field(const rapidjson::Value& src) +{ + const auto member = src.FindMember(method_field); + if (member == src.MemberEnd()) + throw cryptonote::json::MISSING_KEY{method_field}; + if (!member->value.IsString()) + throw cryptonote::json::WRONG_TYPE{"Expected string"}; + return member->value; +} } rapidjson::Value Message::toJson(rapidjson::Document& doc) const @@ -120,7 +130,7 @@ FullMessage::FullMessage(const std::string& json_string, bool request) if (request) { - OBJECT_HAS_MEMBER_OR_THROW(doc, method_field) + get_method_field(doc); // throws on errors OBJECT_HAS_MEMBER_OR_THROW(doc, params_field) } else @@ -151,8 +161,7 @@ std::string FullMessage::getJson() std::string FullMessage::getRequestType() const { - OBJECT_HAS_MEMBER_OR_THROW(doc, method_field) - return doc[method_field].GetString(); + return get_method_field(doc).GetString(); } rapidjson::Value& FullMessage::getMessage() |