ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2026-08-23 23:30:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add "seed" to JSONRPC unit tests (RIPD-1099):

Browse Source 
There was a bug in version 0.30.1 where signing with an ed25519
key and a corrupt seed would cause the "sign" and "sign_for"
commands to return an unexpected error.  That bug was fixed in
the 0.31.0 release.

These unit tests verify the fix.  The error message for a corrupt
seed is also slightly improved.
This commit is contained in:
Scott Schurr
2016-05-05 12:53:36 -07:00
committed by Nik Bougalis
parent 1cf518e82c
commit 3a1fa4a552
4 changed files with 127 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/ripple/rpc/impl/KeypairForSignature.cpp
View File

@@ -65,31 +65,43 @@ std::pair<PublicKey, SecretKey>
keypairForSignature (Json::Value const& params, Json::Value& error)
{
bool const has_key_type = params.isMember (jss::key_type);
bool const hasPassphrase = params.isMember (jss::passphrase);
bool const hasSecret = params.isMember (jss::secret);
bool const hasSeed = params.isMember (jss::seed);
bool const hasSeedHex = params.isMember (jss::seed_hex);
int const n_secrets =
(hasPassphrase ? 1 : 0) +
(hasSecret ? 1 : 0) +
(hasSeed ? 1 : 0) +
(hasSeedHex ? 1 : 0);
// All of the secret types we allow, but only one at a time.
// The array should be constexpr, but that makes Visual Studio unhappy.
static char const* const secretTypes[]
{
jss::passphrase.c_str(),
jss::secret.c_str(),
jss::seed.c_str(),
jss::seed_hex.c_str()
};
if (n_secrets == 0)
// Identify which secret type is in use.
char const* secretType = nullptr;
int secretCount = 0;
for (auto t : secretTypes)
{
if (params.isMember (t))
{
++secretCount;
secretType = t;
}
}
if (secretCount == 0 || secretType == nullptr)
{
error = RPC::missing_field_error (jss::secret);
return { };
}
if (n_secrets > 1)
if (secretCount > 1)
{
// `passphrase`, `secret`, `seed`, and `seed_hex` are mutually exclusive.
error = rpcError (rpcBAD_SECRET);
return { };
}
if (has_key_type && hasSecret)
if (has_key_type && (secretType == jss::secret.c_str()))
{
// `secret` is deprecated.
error = rpcError (rpcBAD_SECRET);
@@ -121,7 +133,7 @@ keypairForSignature (Json::Value const& params, Json::Value& error)
if (!seed)
{
error = RPC::make_error (rpcBAD_SEED,
RPC::invalid_field_message (jss::secret));
RPC::invalid_field_message (secretType));
return { };
}