diff options
| author | tobtoht <tob@featherwallet.org> | 2026-05-19 19:59:47 +0000 |
|---|---|---|
| committer | tobtoht <tob@featherwallet.org> | 2026-05-19 19:59:47 +0000 |
| commit | 0059bb00955f5ab6e9fd1e229b9c91cf5dc1235d (patch) | |
| tree | f578ca77b065cda947c454a0f06666d420e52eb3 /src/rpc/message.cpp | |
| parent | 61ec6f41f89dd5f0821532c3583b1d2999a2ac56 (diff) | |
| parent | a16f514c67e95cec4946dc83dbad04ed1baad023 (diff) | |
| download | monzero-core-0059bb00955f5ab6e9fd1e229b9c91cf5dc1235d.tar.gz monzero-core-0059bb00955f5ab6e9fd1e229b9c91cf5dc1235d.tar.xz monzero-core-0059bb00955f5ab6e9fd1e229b9c91cf5dc1235d.zip | |
Merge pull request #10575
a16f514 rpc: reject invalid JSON-RPC ids in ZMQ requests (selsta)
Diffstat (limited to 'src/rpc/message.cpp')
| -rw-r--r-- | src/rpc/message.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/rpc/message.cpp b/src/rpc/message.cpp index bd47441dc..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(); @@ -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 { |