mirror of
https://git.wownero.com/wownero/wownero.git
synced 2024-08-15 01:03:23 +00:00
Merge pull request #6361
68a6507
Fixed bug in ZMQ JSON-RPC method field (vtnerd)
This commit is contained in:
commit
5757d99208
3 changed files with 70 additions and 4 deletions
|
@ -50,6 +50,16 @@ constexpr const char id_field[] = "id";
|
||||||
constexpr const char method_field[] = "method";
|
constexpr const char method_field[] = "method";
|
||||||
constexpr const char params_field[] = "params";
|
constexpr const char params_field[] = "params";
|
||||||
constexpr const char result_field[] = "result";
|
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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void Message::toJson(rapidjson::Writer<rapidjson::StringBuffer>& dest) const
|
void Message::toJson(rapidjson::Writer<rapidjson::StringBuffer>& dest) const
|
||||||
|
@ -81,7 +91,7 @@ FullMessage::FullMessage(const std::string& json_string, bool request)
|
||||||
|
|
||||||
if (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)
|
OBJECT_HAS_MEMBER_OR_THROW(doc, params_field)
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -95,8 +105,7 @@ FullMessage::FullMessage(const std::string& json_string, bool request)
|
||||||
|
|
||||||
std::string FullMessage::getRequestType() const
|
std::string FullMessage::getRequestType() const
|
||||||
{
|
{
|
||||||
OBJECT_HAS_MEMBER_OR_THROW(doc, method_field)
|
return get_method_field(doc).GetString();
|
||||||
return doc[method_field].GetString();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const rapidjson::Value& FullMessage::getMessage() const
|
const rapidjson::Value& FullMessage::getMessage() const
|
||||||
|
|
|
@ -94,7 +94,8 @@ set(unit_tests_sources
|
||||||
wipeable_string.cpp
|
wipeable_string.cpp
|
||||||
is_hdd.cpp
|
is_hdd.cpp
|
||||||
aligned.cpp
|
aligned.cpp
|
||||||
rpc_version_str.cpp)
|
rpc_version_str.cpp
|
||||||
|
zmq_rpc.cpp)
|
||||||
|
|
||||||
set(unit_tests_headers
|
set(unit_tests_headers
|
||||||
unit_tests_utils.h)
|
unit_tests_utils.h)
|
||||||
|
@ -107,6 +108,7 @@ target_link_libraries(unit_tests
|
||||||
ringct
|
ringct
|
||||||
cryptonote_protocol
|
cryptonote_protocol
|
||||||
cryptonote_core
|
cryptonote_core
|
||||||
|
daemon_messages
|
||||||
blockchain_db
|
blockchain_db
|
||||||
lmdb_lib
|
lmdb_lib
|
||||||
rpc
|
rpc
|
||||||
|
|
55
tests/unit_tests/zmq_rpc.cpp
Normal file
55
tests/unit_tests/zmq_rpc.cpp
Normal file
|
@ -0,0 +1,55 @@
|
||||||
|
// Copyright (c) 2020, The Monero Project
|
||||||
|
//
|
||||||
|
// All rights reserved.
|
||||||
|
//
|
||||||
|
// Redistribution and use in source and binary forms, with or without modification, are
|
||||||
|
// permitted provided that the following conditions are met:
|
||||||
|
//
|
||||||
|
// 1. Redistributions of source code must retain the above copyright notice, this list of
|
||||||
|
// conditions and the following disclaimer.
|
||||||
|
//
|
||||||
|
// 2. Redistributions in binary form must reproduce the above copyright notice, this list
|
||||||
|
// of conditions and the following disclaimer in the documentation and/or other
|
||||||
|
// materials provided with the distribution.
|
||||||
|
//
|
||||||
|
// 3. Neither the name of the copyright holder nor the names of its contributors may be
|
||||||
|
// used to endorse or promote products derived from this software without specific
|
||||||
|
// prior written permission.
|
||||||
|
//
|
||||||
|
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
|
||||||
|
// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||||
|
// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
|
||||||
|
// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||||
|
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||||
|
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||||
|
// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
|
||||||
|
// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
|
#include <gtest/gtest.h>
|
||||||
|
|
||||||
|
#include "rpc/message.h"
|
||||||
|
#include "serialization/json_object.h"
|
||||||
|
|
||||||
|
TEST(ZmqFullMessage, InvalidRequest)
|
||||||
|
{
|
||||||
|
EXPECT_THROW(
|
||||||
|
(cryptonote::rpc::FullMessage{"{\"jsonrpc\":\"2.0\",\"id\":0,\"params\":[]}", true}),
|
||||||
|
cryptonote::json::MISSING_KEY
|
||||||
|
);
|
||||||
|
EXPECT_THROW(
|
||||||
|
(cryptonote::rpc::FullMessage{"{\"jsonrpc\":\"2.0\",\"id\":0,\"method\":3,\"params\":[]}", true}),
|
||||||
|
cryptonote::json::WRONG_TYPE
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST(ZmqFullMessage, Request)
|
||||||
|
{
|
||||||
|
static constexpr const char request[] = "{\"jsonrpc\":\"2.0\",\"id\":0,\"method\":\"foo\",\"params\":[]}";
|
||||||
|
EXPECT_NO_THROW(
|
||||||
|
(cryptonote::rpc::FullMessage{request, true})
|
||||||
|
);
|
||||||
|
|
||||||
|
cryptonote::rpc::FullMessage parsed{request, true};
|
||||||
|
EXPECT_STREQ("foo", parsed.getRequestType().c_str());
|
||||||
|
}
|
Loading…
Reference in a new issue