Skip to content

server.go: prevent partial mutation of currentNodeAnn in server.genNodeAnnouncement on netann.SignNodeAnnouncement failures #9815

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

mohamedawnallah
Copy link
Contributor

@mohamedawnallah mohamedawnallah commented May 16, 2025

Change Description

In this commit, we prevent partial mutation of the current node announcement during announcement signing. Previously, if node announcement signing failed, the current node announcement could become inconsistent.

Motivation and Context

This issue was discovered while working on issue #9455. Specifically, it was observed that:

  • The enforcement of a single DNS hostname address related to Bolt 07 occurs in WriteNetAddrs.

  • If there’s is an error, the error is correctly propagated from netann.SignNodeAnnouncement.

  • However, part of the current node announcement (e.g., Addresses []net.Addr or CLI field uris from getinfo) was still being updated, leading to inconsistencies when inspecting with the command:

    lncli --network=regtest getinfo | jq '.uris'

Steps to Test

Steps for reviewers to follow to test the change.

Pull Request Checklist

Testing

  • Your PR passes all CI checks.
  • Tests covering the positive and negative (error paths) are included.
  • Bug fixes contain tests triggering the bug to prevent regressions.

Code Style and Documentation

📝 Please see our Contribution Guidelines for further guidance.

In this commit, we prevent partial mutation of current
node announcement during announcement signing. If node
announcement signing failed the current node announcement
becomes inconsistent.
Copy link
Contributor

coderabbitai bot commented May 16, 2025

Important

Review skipped

Auto reviews are limited to specific labels.

🏷️ Labels to auto review (1)
  • llm-review

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.


Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Explain this complex logic.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai explain this code block.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and explain its main purpose.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@mohamedawnallah mohamedawnallah changed the title server.go: prevent partial mutation of currentNodeAnn in server.genNodeAnnouncement server.go: prevent partial mutation of currentNodeAnn in server.genNodeAnnouncement on netann.SignNodeAnnouncement failures May 16, 2025
@saubyk saubyk added this to the v0.20.0 milestone May 16, 2025
@saubyk saubyk added the p2p Code related to the peer-to-peer behaviour label May 16, 2025
@saubyk saubyk added this to lnd v0.20 May 16, 2025
@saubyk saubyk moved this to In progress in lnd v0.20 May 16, 2025
@saubyk saubyk moved this to Medium Priority in PR Review Priority May 16, 2025
Copy link
Contributor

@MPins MPins left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I haven’t found a good way to test this yet or assess the potential for announcement inconsistencies. If you have any suggestions on how to approach that, I’d be happy to try them out. That said, the change does seem to add robustness overall 👍

I also believe this change deserves a mention in the release notes.

@@ -3454,17 +3459,20 @@ func (s *server) genNodeAnnouncement(features *lnwire.RawFeatureVector,

// Apply the requested changes to the node announcement.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: consider updating the comment to reflect that the node announcement isn’t being modified yet.

@mohamedawnallah
Copy link
Contributor Author

mohamedawnallah commented May 23, 2025

I haven’t found a good way to test this yet or assess the potential for announcement inconsistencies. If you have any suggestions on how to approach that, I’d be happy to try them out. That said, the change does seem to add robustness overall 👍

Thanks for taking a look, @MPins! 🙏

This issue can be reproduced when SignNodeAnnouncement fails. This could potentially happen in any case where part of the logic returns an error in SignNodeAnnouncement.

You could simulate this error by:

  1. Modifying the code to return an error at that point to simulate SignNodeAnnouncement failure.
  2. Use any update announcement modifier like adding tcp address.
  3. Observe that the node announcement fails to update, but the current in-memory state now contains that invalid address
  4. Verify the inconsistent state by running lncli getinfo | jq ".uris" and seeing that tcp already there although the updatenodeannouncment RPC failed

Here are the relevant code references:

  • lnd/server.go

    Lines 3463 to 3469 in cbdd1c2

    // Sign a new update after applying all of the passed modifiers.
    err := netann.SignNodeAnnouncement(
    s.nodeSigner, s.identityKeyLoc, s.currentNodeAnn,
    )
    if err != nil {
    return lnwire.NodeAnnouncement{}, err
    }
  • // SignNodeAnnouncement signs the lnwire.NodeAnnouncement provided, which
    // should be the most recent, valid update, otherwise the timestamp may not
    // monotonically increase from the prior.
    func SignNodeAnnouncement(signer lnwallet.MessageSigner,
    keyLoc keychain.KeyLocator, nodeAnn *lnwire.NodeAnnouncement) error {
    // Create the DER-encoded ECDSA signature over the message digest.
    sig, err := SignAnnouncement(signer, keyLoc, nodeAnn)
    if err != nil {
    return err
    }
    // Parse the DER-encoded signature into a fixed-size 64-byte array.
    nodeAnn.Signature, err = lnwire.NewSigFromSignature(sig)
    return err
    }

This issue regards partial mutation would become more obvious when we explicitly returns error here in WriteNetAddrs incase of user passing more than one DNS address which not allowed in bolt 7 as part of PR #9455.

func WriteNetAddrs(buf *bytes.Buffer, addresses []net.Addr) error {
...
case *DNSHostnameAddress:
    if dnsHostnameAddressFound {
        return errors.New("cannot advertise multiple " +
            "DNS hostname addresses. See Bolt 07")
    }
    if err := WriteDNSHostnameAddr(addrBuf, a); err != nil {
        return err
    }
    dnsHostnameAddressFound = true
}

This issue regards partial mutation would become more obvious when we explicitly returns error here in WriteNetAddrs incase of user passing more than one DNS address which not allowed in bolt 7 as part of PR #9455.

@ellemouton – What do you think about this?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
p2p Code related to the peer-to-peer behaviour
Projects
Status: Medium Priority
Status: In progress
Development

Successfully merging this pull request may close these issues.

3 participants