gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

solana-dos can now DoS gossip nodes (#9652)

Browse Source 
automerge
This commit is contained in:
Michael Vines
2020-04-23 11:46:12 -07:00
committed by GitHub
parent 504160b11f
commit d1cbccd9ba
5 changed files with 62 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
core/src/gossip_service.rs
View File

@ -63,7 +63,7 @@ impl GossipService {
}
}
/// Discover Nodes and Archivers in a cluster
/// Discover Validators and Archivers in a cluster
pub fn discover_cluster(
entrypoint: &SocketAddr,
num_nodes: usize,
@ -76,16 +76,17 @@ pub fn discover_cluster(
None,
None,
)
.map(|(_all_peers, validators, archivers)| (validators, archivers))
}
pub fn discover(
entrypoint: Option<&SocketAddr>,
num_nodes: Option<usize>,
num_nodes: Option<usize>, // num_nodes only counts validators and archivers, excludes spy nodes
timeout: Option<u64>,
find_node_by_pubkey: Option<Pubkey>,
find_node_by_gossip_addr: Option<&SocketAddr>,
my_gossip_addr: Option<&SocketAddr>,
) -> std::io::Result<(Vec<ContactInfo>, Vec<ContactInfo>)> {
) -> std::io::Result<(Vec<ContactInfo>, Vec<ContactInfo>, Vec<ContactInfo>)> {
let exit = Arc::new(AtomicBool::new(false));
let (gossip_service, ip_echo, spy_ref) = make_gossip_node(entrypoint, &exit, my_gossip_addr);
@ -98,7 +99,7 @@ pub fn discover(
let _ip_echo_server = ip_echo.map(solana_net_utils::ip_echo_server);
let (met_criteria, secs, tvu_peers, storage_peers) = spy(
let (met_criteria, secs, all_peers, tvu_peers, storage_peers) = spy(
spy_ref.clone(),
num_nodes,
timeout,
@ -115,7 +116,7 @@ pub fn discover(
secs,
spy_ref.contact_info_trace()
);
return Ok((tvu_peers, storage_peers));
return Ok((all_peers, tvu_peers, storage_peers));
}
if !tvu_peers.is_empty() {
@ -123,7 +124,7 @@ pub fn discover(
"discover failed to match criteria by timeout...\n{}",
spy_ref.contact_info_trace()
);
return Ok((tvu_peers, storage_peers));
return Ok((all_peers, tvu_peers, storage_peers));
}
info!("discover failed...\n{}", spy_ref.contact_info_trace());
@ -178,9 +179,16 @@ fn spy(
timeout: Option<u64>,
find_node_by_pubkey: Option<Pubkey>,
find_node_by_gossip_addr: Option<&SocketAddr>,
) -> (bool, u64, Vec<ContactInfo>, Vec<ContactInfo>) {
) -> (
bool,
u64,
Vec<ContactInfo>,
Vec<ContactInfo>,
Vec<ContactInfo>,
) {
let now = Instant::now();
let mut met_criteria = false;
let mut all_peers: Vec<ContactInfo> = Vec::new();
let mut tvu_peers: Vec<ContactInfo> = Vec::new();
let mut storage_peers: Vec<ContactInfo> = Vec::new();
let mut i = 1;
@ -191,26 +199,32 @@ fn spy(
}
}
all_peers = spy_ref
.all_peers()
.into_iter()
.map(|x| x.0)
.collect::<Vec<_>>();
tvu_peers = spy_ref.all_tvu_peers().into_iter().collect::<Vec<_>>();
storage_peers = spy_ref.all_storage_peers();
let mut nodes: Vec<_> = tvu_peers.iter().chain(storage_peers.iter()).collect();
nodes.sort();
nodes.dedup();
let found_node_by_pubkey = if let Some(pubkey) = find_node_by_pubkey {
nodes.iter().any(|x| x.id == pubkey)
all_peers.iter().any(|x| x.id == pubkey)
} else {
false
};
let found_node_by_gossip_addr = if let Some(gossip_addr) = find_node_by_gossip_addr {
nodes.iter().any(|x| x.gossip == *gossip_addr)
all_peers.iter().any(|x| x.gossip == *gossip_addr)
} else {
false
};
if let Some(num) = num_nodes {
// Only consider validators and archives for `num_nodes`
let mut nodes: Vec<_> = tvu_peers.iter().chain(storage_peers.iter()).collect();
nodes.sort();
nodes.dedup();
if nodes.len() >= num {
if found_node_by_pubkey || found_node_by_gossip_addr {
met_criteria = true;
@ -234,6 +248,7 @@ fn spy(
(
met_criteria,
now.elapsed().as_secs(),
all_peers,
tvu_peers,
storage_peers,
)
@ -295,21 +310,21 @@ mod tests {
let spy_ref = Arc::new(cluster_info);
let (met_criteria, secs, tvu_peers, _) = spy(spy_ref.clone(), None, Some(1), None, None);
let (met_criteria, secs, _, tvu_peers, _) = spy(spy_ref.clone(), None, Some(1), None, None);
assert_eq!(met_criteria, false);
assert_eq!(secs, 1);
assert_eq!(tvu_peers, spy_ref.tvu_peers());
// Find num_nodes
let (met_criteria, _, _, _) = spy(spy_ref.clone(), Some(1), None, None, None);
let (met_criteria, _, _, _, _) = spy(spy_ref.clone(), Some(1), None, None, None);
assert_eq!(met_criteria, true);
let (met_criteria, _, _, _) = spy(spy_ref.clone(), Some(2), None, None, None);
let (met_criteria, _, _, _, _) = spy(spy_ref.clone(), Some(2), None, None, None);
assert_eq!(met_criteria, true);
// Find specific node by pubkey
let (met_criteria, _, _, _) = spy(spy_ref.clone(), None, None, Some(peer0), None);
let (met_criteria, _, _, _, _) = spy(spy_ref.clone(), None, None, Some(peer0), None);
assert_eq!(met_criteria, true);
let (met_criteria, _, _, _) = spy(
let (met_criteria, _, _, _, _) = spy(
spy_ref.clone(),
None,
Some(0),
@ -319,11 +334,11 @@ mod tests {
assert_eq!(met_criteria, false);
// Find num_nodes *and* specific node by pubkey
let (met_criteria, _, _, _) = spy(spy_ref.clone(), Some(1), None, Some(peer0), None);
let (met_criteria, _, _, _, _) = spy(spy_ref.clone(), Some(1), None, Some(peer0), None);
assert_eq!(met_criteria, true);
let (met_criteria, _, _, _) = spy(spy_ref.clone(), Some(3), Some(0), Some(peer0), None);
let (met_criteria, _, _, _, _) = spy(spy_ref.clone(), Some(3), Some(0), Some(peer0), None);
assert_eq!(met_criteria, false);
let (met_criteria, _, _, _) = spy(
let (met_criteria, _, _, _, _) = spy(
spy_ref.clone(),
Some(1),
Some(0),
@ -333,11 +348,11 @@ mod tests {
assert_eq!(met_criteria, false);
// Find specific node by gossip address
let (met_criteria, _, _, _) =
let (met_criteria, _, _, _, _) =
spy(spy_ref.clone(), None, None, None, Some(&peer0_info.gossip));
assert_eq!(met_criteria, true);
let (met_criteria, _, _, _) = spy(
let (met_criteria, _, _, _, _) = spy(
spy_ref.clone(),
None,
Some(0),