ARCHIVE/clio
1
0
Fork 0
mirror of https://github.com/XRPLF/clio.git synced 2025-12-06 01:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix mismatch error when owner is in wrong format (#641)

Browse Source 
Fixes #642
This commit is contained in:
cyan317
2023-05-16 14:26:08 +01:00
committed by GitHub
parent 6f93e1003e
commit 2e3e8cd779
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/rpc/handlers/LedgerEntry.h
View File

@@ -109,7 +109,10 @@ public:
validation::IfType<std::string>{validation::Uint256HexStringValidator}, validation::IfType<std::string>{validation::Uint256HexStringValidator},
validation::IfType<boost::json::object>{ validation::IfType<boost::json::object>{
validation::Section{ validation::Section{
{JS(owner), validation::Required{}, validation::AccountBase58Validator}, {JS(owner),
validation::Required{},
validation::WithCustomError{
validation::AccountBase58Validator, Status(ClioError::rpcMALFORMED_OWNER)}},
{JS(authorized), validation::Required{}, validation::AccountBase58Validator}, {JS(authorized), validation::Required{}, validation::AccountBase58Validator},
}, },
}}, }},
@@ -125,7 +128,10 @@ public:
validation::IfType<std::string>{validation::Uint256HexStringValidator}, validation::IfType<std::string>{validation::Uint256HexStringValidator},
validation::IfType<boost::json::object>{ validation::IfType<boost::json::object>{
validation::Section{ validation::Section{
{JS(owner), validation::Required{}, validation::AccountBase58Validator}, {JS(owner),
validation::Required{},
validation::WithCustomError{
validation::AccountBase58Validator, Status(ClioError::rpcMALFORMED_OWNER)}},
{JS(seq), validation::Required{}, validation::Type<uint32_t>{}}, {JS(seq), validation::Required{}, validation::Type<uint32_t>{}},
}, },
}}, }},

20
unittests/rpc/handlers/LedgerEntryTest.cpp
View File

@@ -135,8 +135,8 @@ generateTestValuesForParametersTest()
"authorized": "invalid" "authorized": "invalid"
} }
})", })",
"malformedAddress", "malformedOwner",
"Malformed address."}, "Malformed owner."},
ParamTestCaseBundle{ ParamTestCaseBundle{
"InvalidDepositPreauthJsonOwnerNotString", "InvalidDepositPreauthJsonOwnerNotString",
@@ -146,8 +146,8 @@ generateTestValuesForParametersTest()
"authorized": 123 "authorized": 123
} }
})", })",
"invalidParams", "malformedOwner",
"ownerNotString"}, "Malformed owner."},
ParamTestCaseBundle{ ParamTestCaseBundle{
"InvalidDepositPreauthJsonAuthorizedNotString", "InvalidDepositPreauthJsonAuthorizedNotString",
@@ -312,19 +312,19 @@ generateTestValuesForParametersTest()
"seq": 123 "seq": 123
} }
})", })",
"invalidParams", "malformedOwner",
"ownerNotString"}, "Malformed owner."},
ParamTestCaseBundle{ ParamTestCaseBundle{
"InvalidEscrowJsonAccountInvalid", "InvalidEscrowJsonAccountInvalid",
R"({ R"({
"ticket": { "escrow": {
"account": "123", "owner": "123",
"seq": 123 "seq": 123
} }
})", })",
"malformedAddress", "malformedOwner",
"Malformed address."}, "Malformed owner."},
ParamTestCaseBundle{ ParamTestCaseBundle{
"InvalidEscrowJsonSeqNotInt", "InvalidEscrowJsonSeqNotInt",