Skip to content

fix(eth,p2p): use truncated names #21698#2441

Open
gzliudan wants to merge 1 commit into
XinFinOrg:dev-upgradefrom
gzliudan:p2p-addback
Open

fix(eth,p2p): use truncated names #21698#2441
gzliudan wants to merge 1 commit into
XinFinOrg:dev-upgradefrom
gzliudan:p2p-addback

Conversation

@gzliudan

@gzliudan gzliudan commented Jul 6, 2026

Copy link
Copy Markdown
Collaborator

Proposed changes

  • peer: return localAddr instead of name to prevent spam

We currently use the name (which can be freely set by the peer) in several log messages. This enables malicious actors to write spam into your geth log. This commit returns the localAddr instead of the freely settable name.

  • p2p: reduce usage of peer.Name in warn messages

  • eth, p2p: use truncated names

  • Update peer.go

Ref: ethereum#21698

Types of changes

What types of changes does your code introduce to XDC network?
Put an in the boxes that apply

  • build: Changes that affect the build system or external dependencies
  • ci: Changes to CI configuration files and scripts
  • chore: Changes that don't change source code or tests
  • docs: Documentation only changes
  • feat: A new feature
  • fix: A bug fix
  • perf: A code change that improves performance
  • refactor: A code change that neither fixes a bug nor adds a feature
  • revert: Revert something
  • style: Changes that do not affect the meaning of the code
  • test: Adding missing tests or correcting existing tests

Impacted Components

Which parts of the codebase does this PR touch?
Put an in the boxes that apply

  • Consensus
  • Account
  • Network
  • Geth
  • Smart Contract
  • External components
  • Not sure (Please specify below)

Checklist

Put an in the boxes once you have confirmed below actions (or provide reasons on not doing so) that

  • This PR has sufficient test coverage (unit/integration test) OR I have provided reason in the PR description for not having test coverage
  • Tested on a private network from the genesis block and monitored the chain operating correctly for multiple epochs.
  • Provide an end-to-end test plan in the PR description on how to manually test it on the devnet/testnet.
  • Tested the backwards compatibility.
  • Tested with XDC nodes running this version co-exist with those running the previous version.
  • Relevant documentation has been updated as part of this PR
  • N/A

@coderabbitai

coderabbitai Bot commented Jul 6, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

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.

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: c1ff6f1c-1337-4dfe-be7f-a60ded9de45c

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

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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

Comment @coderabbitai help to get the list of available commands.

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Pull request overview

This PR aims to reduce log-spam / log-injection potential from remote-controlled devp2p peer names by truncating names in common logging paths while keeping full names available for peer metadata (e.g., RPC/admin peer info).

Changes:

  • Move name truncation into (*p2p.Peer).Name() and introduce a full-name accessor (Fullname) for consumers that need the raw advertised name.
  • Update Peer.Info() to return the full advertised name instead of the abbreviated one.
  • Remove the local truncateName helper from p2p/server.go and use p.Name() when logging peer additions.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 5 comments.

File Description
p2p/server.go Switch peer-add debug logging to use Peer.Name() and remove the local truncation helper.
p2p/peer.go Implement abbreviated Name(), add a full-name accessor, and ensure Peer.Info() returns the full advertised name.

Comment thread p2p/peer.go Outdated
Comment thread p2p/peer.go
Comment thread p2p/server.go
Comment thread p2p/peer.go
Comment thread p2p/peer.go
* peer: return localAddr instead of name to prevent spam

We currently use the name (which can be freely set by the peer) in several log messages.
This enables malicious actors to write spam into your geth log.
This commit returns the localAddr instead of the freely settable name.

* p2p: reduce usage of peer.Name in warn messages

* eth, p2p: use truncated names

* Update peer.go

Co-authored-by: Marius van der Wijden <m.vanderwijden@live.de>
Co-authored-by: Felix Lange <fjl@twurst.com>

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Pull request overview

Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.

Comment thread p2p/peer.go
Comment thread p2p/server.go
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants