ARCHIVE/clio
1
0
Fork 0
mirror of https://github.com/XRPLF/clio.git synced 2025-11-27 23:25:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add custom error for malformed owner and request (#417)

Browse Source 
Fixes #274
This commit is contained in:
Alex Kremer
2022-11-22 22:05:03 +00:00
committed by GitHub
parent 9803e86158
commit 75c0d22f87
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/rpc/Errors.cpp
View File

@@ -55,6 +55,10 @@ getErrorInfo(ClioError code)
{ClioError::rpcMALFORMED_CURRENCY,
"malformedCurrency",
"Malformed currency."},
{ClioError::rpcMALFORMED_REQUEST,
"malformedRequest",
"Malformed request."},
{ClioError::rpcMALFORMED_OWNER, "malformedOwner", "Malformed owner."},
};
auto matchByCode = [code](auto const& info) { return info.code == code; };

2
src/rpc/Errors.h
View File

@@ -17,6 +17,8 @@ namespace RPC {
*/
enum class ClioError {
rpcMALFORMED_CURRENCY = 5000,
rpcMALFORMED_REQUEST = 5001,
rpcMALFORMED_OWNER = 5002,
};
/**

14
src/rpc/handlers/LedgerEntry.cpp
View File

@@ -29,6 +29,9 @@ doLedgerEntry(Context const& context)
auto lgrInfo = std::get<ripple::LedgerInfo>(v);
ripple::uint256 key;
// Note: according to docs, only 1 of the below should be specified at any
// time. see https://xrpl.org/ledger_entry.html#ledger_entry
if (request.contains(JS(index)))
{
if (!request.at(JS(index)).is_string())
@@ -325,24 +328,24 @@ doLedgerEntry(Context const& context)
{
if (!request.at(JS(ticket)).is_string())
return Status{
RippledError::rpcINVALID_PARAMS, "ticketNotString"};
ClioError::rpcMALFORMED_REQUEST, "ticketNotString"};
if (!key.parseHex(request.at(JS(ticket)).as_string().c_str()))
return Status{
RippledError::rpcINVALID_PARAMS, "malformedTicket"};
ClioError::rpcMALFORMED_REQUEST, "malformedTicket"};
}
else if (
!request.at(JS(ticket)).as_object().contains(JS(owner)) ||
!request.at(JS(ticket)).as_object().at(JS(owner)).is_string())
{
return Status{RippledError::rpcINVALID_PARAMS, "malformedOwner"};
return Status{ClioError::rpcMALFORMED_REQUEST};
}
else if (
!request.at(JS(ticket)).as_object().contains(JS(ticket_seq)) ||
!request.at(JS(ticket)).as_object().at(JS(ticket_seq)).is_int64())
{
return Status{
RippledError::rpcINVALID_PARAMS, "malformedTicketSeq"};
ClioError::rpcMALFORMED_REQUEST, "malformedTicketSeq"};
}
else
{
@@ -354,8 +357,7 @@ doLedgerEntry(Context const& context)
.c_str());
if (!id)
return Status{
RippledError::rpcINVALID_PARAMS, "malformedOwner"};
return Status{ClioError::rpcMALFORMED_OWNER};
else
{
std::uint32_t seq = request.at(JS(offer))