enforces hash domain for ping-pong protocol (#28433)
https://github.com/solana-labs/solana/pull/27193 added hash domain to ping-pong protocol. For backward compatibility responses both with and without domain were generated and accepted. Now that all clusters are upgraded, this commit enforces the hash domain by removing the response without the domain.
This commit is contained in:
parent
f58c6c7c76
commit
e283461d99
|
@ -430,15 +430,10 @@ impl AncestorHashesService {
|
|||
return None;
|
||||
}
|
||||
stats.ping_count += 1;
|
||||
// Respond both with and without domain so that the other node
|
||||
// will accept the response regardless of its upgrade status.
|
||||
// TODO: remove domain = false once cluster is upgraded.
|
||||
for domain in [false, true] {
|
||||
if let Ok(pong) = Pong::new(domain, &ping, keypair) {
|
||||
let pong = RepairProtocol::Pong(pong);
|
||||
if let Ok(pong_bytes) = serialize(&pong) {
|
||||
let _ignore = ancestor_socket.send_to(&pong_bytes[..], from_addr);
|
||||
}
|
||||
if let Ok(pong) = Pong::new(&ping, keypair) {
|
||||
let pong = RepairProtocol::Pong(pong);
|
||||
if let Ok(pong_bytes) = serialize(&pong) {
|
||||
let _ignore = ancestor_socket.send_to(&pong_bytes[..], from_addr);
|
||||
}
|
||||
}
|
||||
None
|
||||
|
|
|
@ -900,16 +900,11 @@ impl ServeRepair {
|
|||
}
|
||||
packet.meta.set_discard(true);
|
||||
stats.ping_count += 1;
|
||||
// Respond both with and without domain so that the other node
|
||||
// will accept the response regardless of its upgrade status.
|
||||
// TODO: remove domain = false once cluster is upgraded.
|
||||
for domain in [false, true] {
|
||||
if let Ok(pong) = Pong::new(domain, &ping, keypair) {
|
||||
let pong = RepairProtocol::Pong(pong);
|
||||
if let Ok(pong_bytes) = serialize(&pong) {
|
||||
let from_addr = packet.meta.socket_addr();
|
||||
pending_pongs.push((pong_bytes, from_addr));
|
||||
}
|
||||
if let Ok(pong) = Pong::new(&ping, keypair) {
|
||||
let pong = RepairProtocol::Pong(pong);
|
||||
if let Ok(pong_bytes) = serialize(&pong) {
|
||||
let from_addr = packet.meta.socket_addr();
|
||||
pending_pongs.push((pong_bytes, from_addr));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -2173,18 +2173,14 @@ impl ClusterInfo {
|
|||
I: IntoIterator<Item = (SocketAddr, Ping)>,
|
||||
{
|
||||
let keypair = self.keypair();
|
||||
let mut pongs_and_dests = Vec::new();
|
||||
for (addr, ping) in pings {
|
||||
// Respond both with and without domain so that the other node will
|
||||
// accept the response regardless of its upgrade status.
|
||||
// TODO: remove domain = false once cluster is upgraded.
|
||||
for domain in [false, true] {
|
||||
if let Ok(pong) = Pong::new(domain, &ping, &keypair) {
|
||||
let pong = Protocol::PongMessage(pong);
|
||||
pongs_and_dests.push((addr, pong));
|
||||
}
|
||||
}
|
||||
}
|
||||
let pongs_and_dests: Vec<_> = pings
|
||||
.into_iter()
|
||||
.filter_map(|(addr, ping)| {
|
||||
let pong = Pong::new(&ping, &keypair).ok()?;
|
||||
let pong = Protocol::PongMessage(pong);
|
||||
Some((addr, pong))
|
||||
})
|
||||
.collect();
|
||||
if pongs_and_dests.is_empty() {
|
||||
None
|
||||
} else {
|
||||
|
@ -3320,9 +3316,7 @@ RPC Enabled Nodes: 1"#;
|
|||
let pongs: Vec<(SocketAddr, Pong)> = pings
|
||||
.iter()
|
||||
.zip(&remote_nodes)
|
||||
.map(|(ping, (keypair, socket))| {
|
||||
(*socket, Pong::new(/*domain:*/ true, ping, keypair).unwrap())
|
||||
})
|
||||
.map(|(ping, (keypair, socket))| (*socket, Pong::new(ping, keypair).unwrap()))
|
||||
.collect();
|
||||
let now = now + Duration::from_millis(1);
|
||||
cluster_info.handle_batch_pong_messages(pongs, now);
|
||||
|
@ -3365,7 +3359,7 @@ RPC Enabled Nodes: 1"#;
|
|||
.collect();
|
||||
let pongs: Vec<_> = pings
|
||||
.iter()
|
||||
.map(|ping| Pong::new(/*domain:*/ false, ping, &this_node).unwrap())
|
||||
.map(|ping| Pong::new(ping, &this_node).unwrap())
|
||||
.collect();
|
||||
let recycler = PacketBatchRecycler::default();
|
||||
let packets = cluster_info
|
||||
|
@ -3377,9 +3371,9 @@ RPC Enabled Nodes: 1"#;
|
|||
&recycler,
|
||||
)
|
||||
.unwrap();
|
||||
assert_eq!(remote_nodes.len() * 2, packets.len());
|
||||
assert_eq!(remote_nodes.len(), packets.len());
|
||||
for (packet, (_, socket), pong) in izip!(
|
||||
packets.into_iter().step_by(2),
|
||||
packets.into_iter(),
|
||||
remote_nodes.into_iter(),
|
||||
pongs.into_iter()
|
||||
) {
|
||||
|
|
|
@ -104,17 +104,9 @@ impl<T: Serialize> Signable for Ping<T> {
|
|||
}
|
||||
|
||||
impl Pong {
|
||||
pub fn new<T: Serialize>(
|
||||
domain: bool,
|
||||
ping: &Ping<T>,
|
||||
keypair: &Keypair,
|
||||
) -> Result<Self, Error> {
|
||||
pub fn new<T: Serialize>(ping: &Ping<T>, keypair: &Keypair) -> Result<Self, Error> {
|
||||
let token = serialize(&ping.token)?;
|
||||
let hash = if domain {
|
||||
hash::hashv(&[PING_PONG_HASH_PREFIX, &token])
|
||||
} else {
|
||||
hash::hash(&token)
|
||||
};
|
||||
let hash = hash::hashv(&[PING_PONG_HASH_PREFIX, &token]);
|
||||
let pong = Pong {
|
||||
from: keypair.pubkey(),
|
||||
hash,
|
||||
|
@ -203,11 +195,6 @@ impl PingCache {
|
|||
_ => {
|
||||
let ping = pingf()?;
|
||||
let token = serialize(&ping.token).ok()?;
|
||||
// For backward compatibility, for now responses both with and
|
||||
// without domain are accepted.
|
||||
// TODO: remove no domain case once cluster is upgraded.
|
||||
let hash = hash::hash(&token);
|
||||
self.pending_cache.put(hash, node);
|
||||
let hash = hash::hashv(&[PING_PONG_HASH_PREFIX, &token]);
|
||||
self.pending_cache.put(hash, node);
|
||||
self.pings.put(node, now);
|
||||
|
@ -303,12 +290,7 @@ mod tests {
|
|||
assert!(ping.verify());
|
||||
assert!(ping.sanitize().is_ok());
|
||||
|
||||
let pong = Pong::new(/*domain:*/ false, &ping, &keypair).unwrap();
|
||||
assert!(pong.verify());
|
||||
assert!(pong.sanitize().is_ok());
|
||||
assert_eq!(hash::hash(&ping.token), pong.hash);
|
||||
|
||||
let pong = Pong::new(/*domian:*/ true, &ping, &keypair).unwrap();
|
||||
let pong = Pong::new(&ping, &keypair).unwrap();
|
||||
assert!(pong.verify());
|
||||
assert!(pong.sanitize().is_ok());
|
||||
assert_eq!(
|
||||
|
@ -370,10 +352,7 @@ mod tests {
|
|||
assert!(ping.is_none());
|
||||
}
|
||||
Some(ping) => {
|
||||
let domain = rng.gen_ratio(1, 2);
|
||||
let pong = Pong::new(domain, ping, keypair).unwrap();
|
||||
assert!(cache.add(&pong, *socket, now));
|
||||
let pong = Pong::new(!domain, ping, keypair).unwrap();
|
||||
let pong = Pong::new(ping, keypair).unwrap();
|
||||
assert!(cache.add(&pong, *socket, now));
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue