mirror of
https://github.com/monero-project/monero.git
synced 2024-10-01 11:49:47 -04:00
wallet2: reject standalone short payment IDs in monero: URI API
This commit is contained in:
parent
581994b61c
commit
1c44e65863
@ -12610,8 +12610,7 @@ std::string wallet2::make_uri(const std::string &address, const std::string &pay
|
||||
if (!payment_id.empty())
|
||||
{
|
||||
crypto::hash pid32;
|
||||
crypto::hash8 pid8;
|
||||
if (!wallet2::parse_long_payment_id(payment_id, pid32) && !wallet2::parse_short_payment_id(payment_id, pid8))
|
||||
if (!wallet2::parse_long_payment_id(payment_id, pid32))
|
||||
{
|
||||
error = "Invalid payment id";
|
||||
return std::string();
|
||||
@ -12705,8 +12704,7 @@ bool wallet2::parse_uri(const std::string &uri, std::string &address, std::strin
|
||||
return false;
|
||||
}
|
||||
crypto::hash hash;
|
||||
crypto::hash8 hash8;
|
||||
if (!wallet2::parse_long_payment_id(kv[1], hash) && !wallet2::parse_short_payment_id(kv[1], hash8))
|
||||
if (!wallet2::parse_long_payment_id(kv[1], hash))
|
||||
{
|
||||
error = "Invalid payment id: " + kv[1];
|
||||
return false;
|
||||
|
@ -144,9 +144,7 @@ TEST(uri, bad_payment_id)
|
||||
|
||||
TEST(uri, short_payment_id)
|
||||
{
|
||||
PARSE_URI("monero:" TEST_ADDRESS"?tx_payment_id=1234567890123456", true);
|
||||
ASSERT_EQ(address, TEST_ADDRESS);
|
||||
ASSERT_EQ(payment_id, "1234567890123456");
|
||||
PARSE_URI("monero:" TEST_ADDRESS"?tx_payment_id=1234567890123456", false);
|
||||
}
|
||||
|
||||
TEST(uri, long_payment_id)
|
||||
|
Loading…
Reference in New Issue
Block a user