Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(net): Rate-limit MetaAddrChange::Responded from peers #6738

Merged
merged 2 commits into from
May 23, 2023
Merged

fix(net): Rate-limit MetaAddrChange::Responded from peers #6738

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23b58ce
Rate-limit MetaAddrChange::Responded from peers
teor2345 May 21, 2023
74ac9f4
Document rate-limits on the address book updater channel
teor2345 May 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Rate-limit MetaAddrChange::Responded from peers
  • Loading branch information
@teor2345
teor2345 committed May 21, 2023
commit 23b58ced4b5656f4d9fb2ed6dd63fd1d842efbc3
36 changes: 24 additions & 12 deletions zebra-network/src/peer/handshake.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1010,18 +1010,10 @@ where
"addr" => connected_addr.get_transient_addr_label(),
);

if let Some(book_addr) = connected_addr.get_address_book_addr() {
if matches!(msg, Message::Ping(_) | Message::Pong(_)) {
// the collector doesn't depend on network activity,
// so this await should not hang
let _ = inbound_ts_collector
.send(MetaAddr::new_responded(
book_addr,
&remote_services,
))
.await;
}
}
// # Security
//
// Peer messages are not rate-limited, so we can't send anything
// to a shared channel or do anything expensive here.
}
Err(err) => {
metrics::counter!(
Expand All @@ -1031,6 +1023,12 @@ where
"addr" => connected_addr.get_transient_addr_label(),
);

// # Security
//
// Peer errors are rate-limited because:
// - opening connections is rate-limited
// - the number of connections is limited
// - after the first error, the peer is disconnected
if let Some(book_addr) = connected_addr.get_address_book_addr() {
let _ = inbound_ts_collector
.send(MetaAddr::new_errored(book_addr, remote_services))
Expand Down Expand Up @@ -1295,6 +1293,20 @@ async fn send_periodic_heartbeats_run_loop(
&remote_services,
)
.await?;

// # Security
//
// Peer heartbeats are rate-limited because:
// - opening connections is rate-limited
// - the number of connections is limited
// - Zebra initiates each heartbeat using a timer
if let Some(book_addr) = connected_addr.get_address_book_addr() {
// the collector doesn't depend on network activity,
// so this await should not hang
let _ = heartbeat_ts_collector
.send(MetaAddr::new_responded(book_addr, &remote_services))
.await;
}
}

unreachable!("unexpected IntervalStream termination")
Expand Down