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

Add checks for empty array in accounts/accounts_proposed subscriptions (#387)

Browse Source 
Fixes #347
This commit is contained in:
Alex Kremer
2022-11-08 15:10:07 +01:00
committed by GitHub
parent 39157f8be4
commit bedca85c78
1 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/rpc/handlers/Subscribe.cpp
View File

@@ -313,25 +313,30 @@ doSubscribe(Context const& context)
if (request.contains(JS(accounts)))
{
if (!request.at(JS(accounts)).is_array())
auto const& jsonAccounts = request.at(JS(accounts));
if (!jsonAccounts.is_array())
return Status{Error::rpcINVALID_PARAMS, "accountsNotArray"};
boost::json::array accounts = request.at(JS(accounts)).as_array();
auto status = validateAccounts(accounts);
auto const& accounts = jsonAccounts.as_array();
if (accounts.empty())
return Status{Error::rpcACT_MALFORMED, "Account malformed."};
auto const status = validateAccounts(accounts);
if (status)
return status;
}
if (request.contains(JS(accounts_proposed)))
{
if (!request.at(JS(accounts_proposed)).is_array())
auto const& jsonAccounts = request.at(JS(accounts_proposed));
if (!jsonAccounts.is_array())
return Status{Error::rpcINVALID_PARAMS, "accountsProposedNotArray"};
boost::json::array accounts =
request.at(JS(accounts_proposed)).as_array();
auto status = validateAccounts(accounts);
auto const& accounts = jsonAccounts.as_array();
if (accounts.empty())
return Status{Error::rpcACT_MALFORMED, "Account malformed."};
auto const status = validateAccounts(accounts);
if (status)
return status;
}
@@ -393,25 +398,30 @@ doUnsubscribe(Context const& context)
if (request.contains(JS(accounts)))
{
if (!request.at(JS(accounts)).is_array())
auto const& jsonAccounts = request.at(JS(accounts));
if (!jsonAccounts.is_array())
return Status{Error::rpcINVALID_PARAMS, "accountsNotArray"};
boost::json::array accounts = request.at(JS(accounts)).as_array();
auto status = validateAccounts(accounts);
auto const& accounts = jsonAccounts.as_array();
if (accounts.empty())
return Status{Error::rpcACT_MALFORMED, "Account malformed."};
auto const status = validateAccounts(accounts);
if (status)
return status;
}
if (request.contains(JS(accounts_proposed)))
{
if (!request.at(JS(accounts_proposed)).is_array())
auto const& jsonAccounts = request.at(JS(accounts_proposed));
if (!jsonAccounts.is_array())
return Status{Error::rpcINVALID_PARAMS, "accountsProposedNotArray"};
boost::json::array accounts =
request.at(JS(accounts_proposed)).as_array();
auto status = validateAccounts(accounts);
auto const& accounts = jsonAccounts.as_array();
if (accounts.empty())
return Status{Error::rpcACT_MALFORMED, "Account malformed."};
auto const status = validateAccounts(accounts);
if (status)
return status;
}