Invoice Acceptor: ensure asset ID match between RFQ and HTLC #1299
+129
−9
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ffranr
requested changes
Jan 14, 2025
tapchannel/aux_invoice_manager.go
Outdated
|
|
||
| assetID := s.assetIDFromQuote(rfqID) | ||
| for _, v := range htlc.Balances() { | ||
| if v.AssetID.Val != *assetID { |
There was a problem hiding this comment.
To avoid dereference of nil at *assetID I think assetIDFromQuote should return asset.ID, error (error in case of missing policy for HTLC).
There was a problem hiding this comment.
This is unaddressed. By returning the identifier directly, we can do if !ident.HasId() {.
|
TODO
|
GeorgeTsagk
force-pushed
the
inv-accept-asset-id-match
branch
2 times, most recently
from
ef54607 to
5e76383
Compare
Pull Request Test Coverage Report for Build 12906816979Details
💛 - Coveralls |
GeorgeTsagk
force-pushed
the
inv-accept-asset-id-match
branch
from
5e76383 to
5b235ef
Compare
GeorgeTsagk
commented
Jan 21, 2025
| @@ -422,6 +431,42 @@ func TestAuxInvoiceManager(t *testing.T) { | |||
| }, | |||
| }, | |||
| }, | |||
| { | |||
| name: "asset invoice, wrong asset htlc", | |||
There was a problem hiding this comment.
Added coverage for this in our unit test cases
guggero
reviewed
Jan 21, 2025
tapchannel/aux_invoice_manager.go
Outdated
|
|
||
| assetID := s.assetIDFromQuote(rfqID) | ||
| for _, v := range htlc.Balances() { | ||
| if v.AssetID.Val != *assetID { |
There was a problem hiding this comment.
This is unaddressed. By returning the identifier directly, we can do if !ident.HasId() {.
We add a simple identifierFromQuote function that fetches the asset specifier associated with a certain accepted quote identified by its rfq ID. We will later use this in the handleInvoice function to compare the identifier of the quote with that of the HTLCs.
GeorgeTsagk
force-pushed
the
inv-accept-asset-id-match
branch
from
5b235ef to
6066385
Compare
ffranr
reviewed
Jan 21, 2025
In this commit we utilize the previously defined helper in order to define a new htlc validation function. The validation currently includes checking that the asset ID of the rfq and the HTLCs always match. This is done as an extra strict check to guard against HTLC and RFQ asset specifier mismatch, which can lead to malicious behavior where a quote for a different asset is being accounted for when accepting an asset HTLC.
For test cases where an RFQ does not exist we fail earlier, so we need to update the expected behavior on the tests. We also need to be more strict when creating dummy RFQs, as now the request with the asset specifier needs to be present, for the new checks to take place.
GeorgeTsagk
force-pushed
the
inv-accept-asset-id-match
branch
from
6066385 to
845e0f6
Compare
guggero
approved these changes
Jan 22, 2025
Comment on lines
+394
to
+396
| if !identifier.HasId() { | ||
| return fmt.Errorf("asset specifier has empty assetID") | ||
| } |
There was a problem hiding this comment.
This can be moved to before the loop.
Comment on lines
+398
to
+401
| if v.AssetID.Val != *identifier.UnwrapIdToPtr() { | ||
| return fmt.Errorf("mismatch between htlc asset ID " + | ||
| "and rfq asset ID") | ||
| } |
There was a problem hiding this comment.
This feels very much against the whole Option paradigm... We could add an ID() or IDOption() method to the specifier that returns the underlying fn.Option directly, then we could do this the "intended" way:
err := fn.MapOptionZ(
identifier.IdOption(), func(id asset.ID) error {
if v.AssetID.Val != id {
return fmt.Errorf("mismatch between " +
"htlc asset ID and rfq asset " +
"ID")
}
return nil
},
)
if err != nil {
return err
}
But non-blocking.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR adds an extra strictness check which requires the asset ID of the RFQ quote and HTLC records to match. This is done as an extra strict check to guard against HTLC and RFQ asset ID mismatch, which can lead to malicious behavior where a quote for a different asset is being accounted for when accepting an asset HTLC.
Closes #1255