rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-26 17:32:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #6381

Browse source 
e719760 Fix receive order leakage with tx fluffing (vtnerd)
This commit is contained in:
luigi1111 2020-04-04 13:12:31 -05:00
commit d1f3d3376d
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
2 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/cryptonote_protocol/levin_notify.cpp
View file

@ -363,7 +363,10 @@ namespace levin
}); });
for (auto& connection : connections) for (auto& connection : connections)
{
std::sort(connection.first.begin(), connection.first.end()); // don't leak receive order
make_payload_send_txs(*zone_->p2p, std::move(connection.first), connection.second, zone_->pad_txs); make_payload_send_txs(*zone_->p2p, std::move(connection.first), connection.second, zone_->pad_txs);
}
if (next_flush != std::chrono::steady_clock::time_point::max()) if (next_flush != std::chrono::steady_clock::time_point::max())
fluff_flush::queue(std::move(zone_), next_flush); fluff_flush::queue(std::move(zone_), next_flush);

20
tests/unit_tests/levin.cpp
View file

@ -462,8 +462,8 @@ TEST_F(levin_notify, fluff_without_padding)
} }
std::vector<cryptonote::blobdata> txs(2); std::vector<cryptonote::blobdata> txs(2);
txs[0].resize(100, 'e'); txs[0].resize(100, 'f');
txs[1].resize(200, 'f'); txs[1].resize(200, 'e');
ASSERT_EQ(10u, contexts_.size()); ASSERT_EQ(10u, contexts_.size());
{ {
@ -479,6 +479,7 @@ TEST_F(levin_notify, fluff_without_padding)
for (++context; context != contexts_.end(); ++context) for (++context; context != contexts_.end(); ++context)
EXPECT_EQ(1u, context->process_send_queue()); EXPECT_EQ(1u, context->process_send_queue());
std::sort(txs.begin(), txs.end());
ASSERT_EQ(9u, receiver_.notified_size()); ASSERT_EQ(9u, receiver_.notified_size());
for (unsigned count = 0; count < 9; ++count) for (unsigned count = 0; count < 9; ++count)
{ {
@ -510,8 +511,8 @@ TEST_F(levin_notify, fluff_with_padding)
} }
std::vector<cryptonote::blobdata> txs(2); std::vector<cryptonote::blobdata> txs(2);
txs[0].resize(100, 'e'); txs[0].resize(100, 'f');
txs[1].resize(200, 'f'); txs[1].resize(200, 'e');
ASSERT_EQ(10u, contexts_.size()); ASSERT_EQ(10u, contexts_.size());
{ {
@ -527,6 +528,7 @@ TEST_F(levin_notify, fluff_with_padding)
for (++context; context != contexts_.end(); ++context) for (++context; context != contexts_.end(); ++context)
EXPECT_EQ(1u, context->process_send_queue()); EXPECT_EQ(1u, context->process_send_queue());
std::sort(txs.begin(), txs.end());
ASSERT_EQ(9u, receiver_.notified_size()); ASSERT_EQ(9u, receiver_.notified_size());
for (unsigned count = 0; count < 9; ++count) for (unsigned count = 0; count < 9; ++count)
{ {
@ -558,8 +560,8 @@ TEST_F(levin_notify, private_fluff_without_padding)
} }
std::vector<cryptonote::blobdata> txs(2); std::vector<cryptonote::blobdata> txs(2);
txs[0].resize(100, 'e'); txs[0].resize(100, 'f');
txs[1].resize(200, 'f'); txs[1].resize(200, 'e');
ASSERT_EQ(10u, contexts_.size()); ASSERT_EQ(10u, contexts_.size());
{ {
@ -572,6 +574,7 @@ TEST_F(levin_notify, private_fluff_without_padding)
io_service_.reset(); io_service_.reset();
ASSERT_LT(0u, io_service_.poll()); ASSERT_LT(0u, io_service_.poll());
std::sort(txs.begin(), txs.end());
EXPECT_EQ(0u, context->process_send_queue()); EXPECT_EQ(0u, context->process_send_queue());
for (++context; context != contexts_.end(); ++context) for (++context; context != contexts_.end(); ++context)
{ {
@ -610,8 +613,8 @@ TEST_F(levin_notify, private_fluff_with_padding)
} }
std::vector<cryptonote::blobdata> txs(2); std::vector<cryptonote::blobdata> txs(2);
txs[0].resize(100, 'e'); txs[0].resize(100, 'f');
txs[1].resize(200, 'f'); txs[1].resize(200, 'e');
ASSERT_EQ(10u, contexts_.size()); ASSERT_EQ(10u, contexts_.size());
{ {
@ -624,6 +627,7 @@ TEST_F(levin_notify, private_fluff_with_padding)
io_service_.reset(); io_service_.reset();
ASSERT_LT(0u, io_service_.poll()); ASSERT_LT(0u, io_service_.poll());
std::sort(txs.begin(), txs.end());
EXPECT_EQ(0u, context->process_send_queue()); EXPECT_EQ(0u, context->process_send_queue());
for (++context; context != contexts_.end(); ++context) for (++context; context != contexts_.end(); ++context)
{ {