Skip to content

Commit

Permalink
Fix amount overflow in Offer parsing and building
Browse files Browse the repository at this point in the history
An overflow can occur when multiplying the offer amount by the requested
quantity when checking if the given amount is enough. Return an error
instead of overflowing.
  • Loading branch information
jkczyz committed Feb 15, 2023
1 parent 2c566c6 commit c41ba4d
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 1 deletion.
29 changes: 29 additions & 0 deletions lightning/src/offers/invoice_request.rs
Original file line number Diff line number Diff line change
Expand Up @@ -828,6 +828,18 @@ mod tests {
Ok(_) => panic!("expected error"),
Err(e) => assert_eq!(e, SemanticError::MissingAmount),
}

match OfferBuilder::new("foo".into(), recipient_pubkey())
.amount_msats(1000)
.supported_quantity(Quantity::Unbounded)
.build().unwrap()
.request_invoice(vec![1; 32], payer_pubkey()).unwrap()
.quantity(u64::max_value()).unwrap()
.build()
{
Ok(_) => panic!("expected error"),
Err(e) => assert_eq!(e, SemanticError::InvalidAmount),
}
}

#[test]
Expand Down Expand Up @@ -1123,6 +1135,23 @@ mod tests {
assert_eq!(e, ParseError::InvalidSemantics(SemanticError::UnsupportedCurrency));
},
}

let invoice_request = OfferBuilder::new("foo".into(), recipient_pubkey())
.amount_msats(1000)
.supported_quantity(Quantity::Unbounded)
.build().unwrap()
.request_invoice(vec![1; 32], payer_pubkey()).unwrap()
.quantity(u64::max_value()).unwrap()
.build_unchecked()
.sign(payer_sign).unwrap();

let mut buffer = Vec::new();
invoice_request.write(&mut buffer).unwrap();

match InvoiceRequest::try_from(buffer) {
Ok(_) => panic!("expected error"),
Err(e) => assert_eq!(e, ParseError::InvalidSemantics(SemanticError::InvalidAmount)),
}
}

#[test]
Expand Down
3 changes: 2 additions & 1 deletion lightning/src/offers/offer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,8 @@ impl OfferContents {
};

if !self.expects_quantity() || quantity.is_some() {
let expected_amount_msats = offer_amount_msats * quantity.unwrap_or(1);
let expected_amount_msats = offer_amount_msats.checked_mul(quantity.unwrap_or(1))
.ok_or(SemanticError::InvalidAmount)?;
let amount_msats = amount_msats.unwrap_or(expected_amount_msats);

if amount_msats < expected_amount_msats {
Expand Down

0 comments on commit c41ba4d

Please sign in to comment.