blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

moves merkle proof size sanity check to Shred{Code,Data}::merkle_branch (#28266)

This commit is contained in:
behzad nouri 2022-10-06 18:54:24 +00:00 committed by GitHub
parent 2d936784dd
commit d9ef04772d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
ledger/src/shred/merkle.rs
View File

@ -167,11 +167,15 @@ impl ShredData {
let proof_size = self.proof_size()?; let proof_size = self.proof_size()?;
let offset = Self::SIZE_OF_HEADERS + Self::capacity(proof_size)?; let offset = Self::SIZE_OF_HEADERS + Self::capacity(proof_size)?;
let size = SIZE_OF_MERKLE_ROOT + usize::from(proof_size) * SIZE_OF_MERKLE_PROOF_ENTRY; let size = SIZE_OF_MERKLE_ROOT + usize::from(proof_size) * SIZE_OF_MERKLE_PROOF_ENTRY;
MerkleBranch::try_from( let merkle_branch = MerkleBranch::try_from(
self.payload self.payload
.get(offset..offset + size) .get(offset..offset + size)
.ok_or(Error::InvalidPayloadSize(self.payload.len()))?, .ok_or(Error::InvalidPayloadSize(self.payload.len()))?,
) )?;
if merkle_branch.proof.len() != usize::from(proof_size) {
return Err(Error::InvalidMerkleProof);
}
Ok(merkle_branch)
} }
fn merkle_tree_node(&self) -> Result<Hash, Error> { fn merkle_tree_node(&self) -> Result<Hash, Error> {
@ -230,13 +234,9 @@ impl ShredData {
} }
fn sanitize(&self, verify_merkle_proof: bool) -> Result<(), Error> { fn sanitize(&self, verify_merkle_proof: bool) -> Result<(), Error> {
match self.common_header.shred_variant { let shred_variant = self.common_header.shred_variant;
ShredVariant::MerkleData(proof_size) => { if !matches!(shred_variant, ShredVariant::MerkleData(_)) {
if self.merkle_branch()?.proof.len() != usize::from(proof_size) { return Err(Error::InvalidShredVariant);
return Err(Error::InvalidProofSize(proof_size));
}
}
_ => return Err(Error::InvalidShredVariant),
} }
if !verify_merkle_proof { if !verify_merkle_proof {
debug_assert_matches!(self.verify_merkle_proof(), Ok(true)); debug_assert_matches!(self.verify_merkle_proof(), Ok(true));
@ -283,11 +283,15 @@ impl ShredCode {
let proof_size = self.proof_size()?; let proof_size = self.proof_size()?;
let offset = Self::SIZE_OF_HEADERS + Self::capacity(proof_size)?; let offset = Self::SIZE_OF_HEADERS + Self::capacity(proof_size)?;
let size = SIZE_OF_MERKLE_ROOT + usize::from(proof_size) * SIZE_OF_MERKLE_PROOF_ENTRY; let size = SIZE_OF_MERKLE_ROOT + usize::from(proof_size) * SIZE_OF_MERKLE_PROOF_ENTRY;
MerkleBranch::try_from( let merkle_branch = MerkleBranch::try_from(
self.payload self.payload
.get(offset..offset + size) .get(offset..offset + size)
.ok_or(Error::InvalidPayloadSize(self.payload.len()))?, .ok_or(Error::InvalidPayloadSize(self.payload.len()))?,
) )?;
if merkle_branch.proof.len() != usize::from(proof_size) {
return Err(Error::InvalidMerkleProof);
}
Ok(merkle_branch)
} }
fn merkle_tree_node(&self) -> Result<Hash, Error> { fn merkle_tree_node(&self) -> Result<Hash, Error> {
@ -364,13 +368,9 @@ impl ShredCode {
} }
fn sanitize(&self, verify_merkle_proof: bool) -> Result<(), Error> { fn sanitize(&self, verify_merkle_proof: bool) -> Result<(), Error> {
match self.common_header.shred_variant { let shred_variant = self.common_header.shred_variant;
ShredVariant::MerkleCode(proof_size) => { if !matches!(shred_variant, ShredVariant::MerkleCode(_)) {
if self.merkle_branch()?.proof.len() != usize::from(proof_size) { return Err(Error::InvalidShredVariant);
return Err(Error::InvalidProofSize(proof_size));
}
}
_ => return Err(Error::InvalidShredVariant),
} }
if !verify_merkle_proof { if !verify_merkle_proof {
debug_assert_matches!(self.verify_merkle_proof(), Ok(true)); debug_assert_matches!(self.verify_merkle_proof(), Ok(true));