-
Notifications
You must be signed in to change notification settings - Fork 2.2k
routerrpc: reject payment to invoice that don't have payment secret or blinded paths #9752
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
Merged
ellemouton
merged 3 commits into
lightningnetwork:master
from
erickcestari:reject-payment-without-invoice
Jun 30, 2025
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,6 +15,7 @@ import ( | |
"github.com/btcsuite/btcd/wire" | ||
sphinx "github.com/lightningnetwork/lightning-onion" | ||
"github.com/lightningnetwork/lnd/channeldb" | ||
"github.com/lightningnetwork/lnd/clock" | ||
"github.com/lightningnetwork/lnd/feature" | ||
"github.com/lightningnetwork/lnd/fn/v2" | ||
"github.com/lightningnetwork/lnd/htlcswitch" | ||
|
@@ -118,6 +119,10 @@ type RouterBackend struct { | |
// ShouldSetExpEndorsement returns a boolean indicating whether the | ||
// experimental endorsement bit should be set. | ||
ShouldSetExpEndorsement func() bool | ||
|
||
// Clock is the clock used to validate payment requests expiry. | ||
// It is useful for testing. | ||
Clock clock.Clock | ||
} | ||
|
||
// MissionControl defines the mission control dependencies of routerrpc. | ||
|
@@ -980,11 +985,20 @@ func (r *RouterBackend) extractIntentFromSendRequest( | |
} | ||
|
||
// Next, we'll ensure that this payreq hasn't already expired. | ||
err = ValidatePayReqExpiry(payReq) | ||
err = ValidatePayReqExpiry(r.Clock, payReq) | ||
if err != nil { | ||
return nil, err | ||
} | ||
|
||
// An invoice must include either a payment address or | ||
// blinded paths. | ||
if payReq.PaymentAddr.IsNone() && | ||
len(payReq.BlindedPaymentPaths) == 0 { | ||
|
||
return nil, errors.New("payment request must contain " + | ||
"either a payment address or blinded paths") | ||
erickcestari marked this conversation as resolved.
Show resolved
Hide resolved
|
||
} | ||
|
||
// If the amount was not included in the invoice, then we let | ||
// the payer specify the amount of satoshis they wish to send. | ||
// We override the amount to pay with the amount provided from | ||
|
@@ -1001,7 +1015,7 @@ func (r *RouterBackend) extractIntentFromSendRequest( | |
if reqAmt != 0 { | ||
return nil, errors.New("amount must not be " + | ||
"specified when paying a non-zero " + | ||
" amount invoice") | ||
"amount invoice") | ||
} | ||
|
||
payIntent.Amount = *payReq.MilliSat | ||
|
@@ -1370,10 +1384,10 @@ func UnmarshalFeatures( | |
|
||
// ValidatePayReqExpiry checks if the passed payment request has expired. In | ||
// the case it has expired, an error will be returned. | ||
func ValidatePayReqExpiry(payReq *zpay32.Invoice) error { | ||
func ValidatePayReqExpiry(clock clock.Clock, payReq *zpay32.Invoice) error { | ||
expiry := payReq.Expiry() | ||
validUntil := payReq.Timestamp.Add(expiry) | ||
if time.Now().After(validUntil) { | ||
if clock.Now().After(validUntil) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. niiiiice! |
||
return fmt.Errorf("invoice expired. Valid until %v", validUntil) | ||
} | ||
|
||
|
This file contains hidden or 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
This file contains hidden or 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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.