diff options
Diffstat (limited to 'src/rpc/message.cpp')
| -rw-r--r-- | src/rpc/message.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/rpc/message.cpp b/src/rpc/message.cpp index 005c40ea2..9b1abc746 100644 --- a/src/rpc/message.cpp +++ b/src/rpc/message.cpp @@ -62,6 +62,17 @@ const rapidjson::Value& get_method_field(const rapidjson::Value& src) } } +void validate_id_field(const rapidjson::Value& src) +{ + const auto member = src.FindMember(id_field); + if (member == src.MemberEnd()) + return; + + // If present, JSON-RPC 2.0 request ids must be String, Number, or Null. + if (!member->value.IsString() && !member->value.IsNumber() && !member->value.IsNull()) + throw cryptonote::json::WRONG_TYPE{"Expected string, number or null"}; +} + void Message::toJson(rapidjson::Writer<epee::byte_stream>& dest) const { dest.StartObject(); @@ -80,7 +91,7 @@ FullMessage::FullMessage(std::string&& json_string, bool request) { /* Insitu parsing does not copy data from `contents` to DOM, accelerating string heavy content. */ - doc.ParseInsitu(std::addressof(contents[0])); + doc.ParseInsitu<rapidjson::kParseIterativeFlag>(std::addressof(contents[0])); if (doc.HasParseError() || !doc.IsObject()) { throw cryptonote::json::PARSE_FAIL(); @@ -92,6 +103,7 @@ FullMessage::FullMessage(std::string&& json_string, bool request) { get_method_field(doc); // throws on errors OBJECT_HAS_MEMBER_OR_THROW(doc, params_field) + validate_id_field(doc); } else { |