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.

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

[Draft] Verify consensus message author matches with the sender #15386

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
41 changes: 41 additions & 0 deletions consensus/src/epoch_manager.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1446,6 +1446,7 @@ impl<P: OnChainConfigProvider> EpochManager<P> {
BlockStage::EPOCH_MANAGER_RECEIVED,
);
}
self.check_author(peer_id, &consensus_msg)?;
// we can't verify signatures from a different epoch
let maybe_unverified_event = self.check_epoch(peer_id, consensus_msg).await?;

Expand Down Expand Up @@ -1512,6 +1513,46 @@ impl<P: OnChainConfigProvider> EpochManager<P> {
Ok(())
}

fn check_author(&mut self, peer_id: AccountAddress, msg: &ConsensusMsg) -> anyhow::Result<()> {
let author = match msg {
ConsensusMsg::CommitMessage(commit) => commit.author(),
ConsensusMsg::ProposalMsg(proposal) => proposal.proposal().author(),
ConsensusMsg::VoteMsg(vote) => Some(vote.vote().author()),
ConsensusMsg::OrderVoteMsg(order_vote) => Some(order_vote.order_vote().author()),
ConsensusMsg::CommitVoteMsg(commit_vote) => Some(commit_vote.author()),
ConsensusMsg::BatchMsg(batch) => Some(batch.author()),
ConsensusMsg::RoundTimeoutMsg(round_timeout) => Some(round_timeout.author()),
ConsensusMsg::BatchResponse(batch_response) => Some(batch_response.author()),
ConsensusMsg::BatchRequestMsg(batch_request) => Some(batch_request.source()),

ConsensusMsg::CommitDecisionMsg(_)
| ConsensusMsg::DAGMessage(_)
| ConsensusMsg::EpochChangeProof(_)
| ConsensusMsg::EpochRetrievalRequest(_)
| ConsensusMsg::ProofOfStoreMsg(_)
| ConsensusMsg::SyncInfo(_)
| ConsensusMsg::RandGenMessage(_)
| ConsensusMsg::BatchResponseV2(_)
| ConsensusMsg::BlockRetrievalRequest(_)
| ConsensusMsg::BlockRetrievalResponse(_)
// For SignedBatchInfo, the verify function will check the author
| ConsensusMsg::SignedBatchInfo(_) => None,
};

if let Some(author) = author {
if author != peer_id {
bail!(
"Received {:?} message from peer {} with different author {}",
discriminant(msg),
peer_id,
author
);
}
}

Ok(())
}

async fn check_epoch(
&mut self,
peer_id: AccountAddress,
Expand Down
7 changes: 7 additions & 0 deletions consensus/src/pipeline/commit_reliable_broadcast.rs
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,13 @@ impl CommitMessage {
_ => None,
}
}

pub fn author(&self) -> Option<PeerId> {
match self {
CommitMessage::Vote(vote) => Some(vote.author()),
_ => None,
}
}
}

impl RBMessage for CommitMessage {}
Expand Down
Loading