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: avoid panic with invalid proposal data #97

Merged
merged 4 commits into from
Apr 24, 2023
Merged

fix: avoid panic with invalid proposal data #97

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f7543dd
fix: avoid panic with invalid proposal data
mpetrun5 Apr 19, 2023
db5b183
Lint
mpetrun5 Apr 19, 2023
79c1e2d
Change extract deposit data error return type
mpetrun5 Apr 21, 2023
59344e4
Merge branch 'main' into mpetrun5/avoid-extract-data-panic
mpetrun5 Apr 24, 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
38 changes: 24 additions & 14 deletions bridge/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -736,24 +736,28 @@ pub mod pallet {
/// recipient data bytes bytes 64 - END
///
/// Only fungible transfer is supported so far.
fn extract_deposit_data(data: &Vec<u8>) -> Option<(u128, MultiLocation)> {
fn extract_deposit_data(data: &Vec<u8>) -> Result<(u128, MultiLocation), Error<T>> {
mpetrun5 marked this conversation as resolved.
Show resolved Hide resolved
if data.len() < 64 {
return None
return Err(Error::<T>::InvalidDepositData)
mpetrun5 marked this conversation as resolved.
Show resolved Hide resolved
}
let amount: u128 = U256::from_big_endian(&data[0..32])
.try_into()
.expect("Amount convert failed. qed.");
let recipient_len: usize = U256::from_big_endian(&data[32..64])
.try_into()
.expect("Length convert failed. qed.");
if data.len() != (64 + recipient_len) {
return None

let amount: u128 = match U256::from_big_endian(&data[0..32]).try_into() {
Ok(v) => v,
Err(_) => return Err(Error::<T>::InvalidDepositData),
};
let recipient_len: usize = match U256::from_big_endian(&data[32..64]).try_into() {
Ok(v) => v,
Err(_) => return Err(Error::<T>::InvalidDepositData),
};
mpetrun5 marked this conversation as resolved.
Show resolved Hide resolved
if (data.len() - 64) != recipient_len {
return Err(Error::<T>::InvalidDepositData)
mpetrun5 marked this conversation as resolved.
Show resolved Hide resolved
}

let recipient = data[64..data.len()].to_vec();
if let Ok(location) = <MultiLocation>::decode(&mut recipient.as_slice()) {
Some((amount, location))
Ok((amount, location))
} else {
None
Err(Error::<T>::InvalidDepositData)
mpetrun5 marked this conversation as resolved.
Show resolved Hide resolved
}
}

Expand Down Expand Up @@ -800,8 +804,7 @@ pub mod pallet {
let asset_id =
Self::rid_to_assetid(&proposal.resource_id).ok_or(Error::<T>::AssetNotBound)?;
// Extract Receipt from proposal data to get corresponding location (MultiLocation)
let (amount, location) =
Self::extract_deposit_data(&proposal.data).ok_or(Error::<T>::InvalidDepositData)?;
let (amount, location) = Self::extract_deposit_data(&proposal.data)?;

// convert the asset decimal
let decimal_converted_asset =
Expand Down Expand Up @@ -1657,6 +1660,12 @@ pub mod pallet {
resource_id: NativeResourceId::get(),
data: SygmaBridge::create_deposit_data(amount, b"invalid recipient".to_vec()),
};
let empty_data_proposal = Proposal {
origin_domain_id: DEST_DOMAIN_ID,
deposit_nonce: 3,
resource_id: UsdcResourceId::get(),
data: vec![],
};

let proposals = vec![
valid_native_transfer_proposal,
Expand All @@ -1665,6 +1674,7 @@ pub mod pallet {
invalid_domainid_proposal,
invalid_resourceid_proposal,
invalid_recipient_proposal,
empty_data_proposal,
];

let final_message = SygmaBridge::construct_ecdsa_signing_proposals_data(&proposals);
Expand Down