fix: penalize oversized notfound messages - #7348
Conversation
|
@coderabbitai review |
✅ Action performedReview finished.
|
✅ No Merge Conflicts DetectedThis PR currently has no conflicts with other open PRs. |
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Repository UI Review profile: CHILL Plan: Pro Run ID: 📥 CommitsReviewing files that changed from the base of the PR and between c4a51eecab3fa50c202ffe5376f520d424d96a4a and a97b7b4. 📒 Files selected for processing (2)
🚧 Files skipped from review as they are similar to previous changes (2)
WalkthroughThis PR adds a defensive validation layer to NOTFOUND message processing. PeerManagerImpl now reads the incoming NOTFOUND vInv and rejects it immediately (Misbehaving score 20) if its size exceeds MAX_PEER_OBJECT_IN_FLIGHT + MAX_BLOCKS_IN_TRANSIT_PER_PEER; otherwise it proceeds with the existing per-inventory cleanup for known types. A functional test sends an oversized NOTFOUND and asserts the misbehavior log entry. Sequence Diagram(s)sequenceDiagram
participant RemotePeer
participant PeerManager
participant Node
RemotePeer->>PeerManager: SEND msg_notfound (vInv)
PeerManager->>PeerManager: read vInv and compute size
alt size > MAX_PEER_OBJECT_IN_FLIGHT + MAX_BLOCKS_IN_TRANSIT_PER_PEER
PeerManager->>Node: Misbehaving(peer, score=20)
Note right of PeerManager: return early
else size within limits
PeerManager->>PeerManager: iterate vInv, erase m_object_in_flight/announced entries
PeerManager->>RemotePeer: continue normal processing
end
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~20 minutes Suggested reviewers
🚥 Pre-merge checks | ✅ 4 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (4 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
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. Comment |
There was a problem hiding this comment.
🧹 Nitpick comments (1)
test/functional/p2p_tx_download.py (1)
147-149: ⚡ Quick winAvoid hardcoded oversized-count literals in this test.
+ 17and"notfound message size = 117"bake in current protocol limits. Derive both from named constants so this stays valid if limits change.Suggested refactor
def test_oversized_notfound(self): self.log.info('Check that oversized notfound increases misbehavior score') - invs = [CInv(t=1, h=i) for i in range(MAX_GETDATA_IN_FLIGHT + 17)] - with self.nodes[0].assert_debug_log(["Misbehaving", "notfound message size = 117"]): + oversized_count = MAX_GETDATA_IN_FLIGHT + 17 # 1 above current C++ notfound limit path + invs = [CInv(t=1, h=i) for i in range(oversized_count)] + with self.nodes[0].assert_debug_log(["Misbehaving", f"notfound message size = {oversized_count}"]): self.nodes[0].p2ps[0].send_message(msg_notfound(vec=invs)) self.nodes[0].p2ps[0].sync_with_ping()🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@test/functional/p2p_tx_download.py` around lines 147 - 149, Replace the hardcoded "+ 17" and "117" by deriving both values from named constants and the actual serialized message size: introduce a small named constant (e.g. EXTRA_NOTFOUND_INV_COUNT) and build invs as CInv(t=1, h=i) for i in range(MAX_GETDATA_IN_FLIGHT + EXTRA_NOTFOUND_INV_COUNT); then compute the expected debug string dynamically from the serialized notfound message (e.g. expected = f"notfound message size = {len(msg_notfound(vec=invs).serialize())}" or equivalent) and use that in self.nodes[0].assert_debug_log instead of the literal "notfound message size = 117", keeping references to CInv, MAX_GETDATA_IN_FLIGHT, msg_notfound and assert_debug_log to locate the changes.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Nitpick comments:
In `@test/functional/p2p_tx_download.py`:
- Around line 147-149: Replace the hardcoded "+ 17" and "117" by deriving both
values from named constants and the actual serialized message size: introduce a
small named constant (e.g. EXTRA_NOTFOUND_INV_COUNT) and build invs as CInv(t=1,
h=i) for i in range(MAX_GETDATA_IN_FLIGHT + EXTRA_NOTFOUND_INV_COUNT); then
compute the expected debug string dynamically from the serialized notfound
message (e.g. expected = f"notfound message size =
{len(msg_notfound(vec=invs).serialize())}" or equivalent) and use that in
self.nodes[0].assert_debug_log instead of the literal "notfound message size =
117", keeping references to CInv, MAX_GETDATA_IN_FLIGHT, msg_notfound and
assert_debug_log to locate the changes.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository UI
Review profile: CHILL
Plan: Pro
Run ID: 2220f6ad-bdbd-40da-920c-3278cc73bb3b
📥 Commits
Reviewing files that changed from the base of the PR and between 317917a and 641f39b04d13e708666ee89080c2b875493d1d61.
📒 Files selected for processing (2)
src/net_processing.cpptest/functional/p2p_tx_download.py
|
Addressed CodeRabbit nitpick in follow-up commit: introduced named NOTFOUND-size constants and derived the oversized test count/assertion from those constants instead of hardcoded literals. Validation: |
|
@coderabbitai review |
✅ Action performedReview finished.
|
|
CI follow-up: the only red check is |
|
CI is green after the CI-only empty rerun commit |
|
✅ Review complete (commit a97b7b4) |
thepastaclaw
left a comment
There was a problem hiding this comment.
Code Review
Small, focused fix that moves NOTFOUND deserialization out of cs_main and applies a misbehavior penalty when vInv exceeds the per-peer in-flight budget. Logic and lock ordering are correct, and the functional test exercises the new path. One minor consistency observation: the chosen penalty (10) is half of what sibling inventory-vector oversize checks use (20).
💬 1 nitpick(s)
|
CI follow-up correction: the red job was |
thepastaclaw
left a comment
There was a problem hiding this comment.
Code Review
Both agents independently report no findings on the cumulative head at af5d8c0e. The PR moves NOTFOUND vector deserialization out from under cs_main, adds a 20-point misbehavior penalty for oversized notfound vectors (matching the established pattern for inv/getdata/addr/headers), and includes focused functional test coverage. The latest delta from c4a51eecab is a CI-only rerun commit, so there are no carried-forward prior findings and no resolved findings.
thepastaclaw
left a comment
There was a problem hiding this comment.
Code Review
Both agents independently found no in-scope issues in this PR, which adds a misbehavior penalty (score 20) for oversized notfound inventory vectors and reorders deserialization before cs_main. CodeRabbit reported zero inline findings. The change is consistent with existing conventions for other inv-vector messages and includes functional test coverage. No carried-forward prior findings exist.
UdjinM6
left a comment
There was a problem hiding this comment.
looks good but you should drop empty "ci retrigger" commits
b9e5b53 to
a97b7b4
Compare
thepastaclaw
left a comment
There was a problem hiding this comment.
Code Review
Both agents found no in-scope issues in this PR, which adds a misbehavior penalty for oversized notfound messages and a functional test covering it. The change mirrors handling for other inventory-vector messages and matches upstream Bitcoin Core. No carried-forward prior findings exist (prior review at b9e5b531 was clean), and CodeRabbit reported 0 inline findings.
|
CI follow-up on the current red checks:
I’m leaving the branch unchanged; both failures look unrelated to this PR and need a maintainer rerun if CI needs to be refreshed. |
|
Done — the empty CI-retrigger commits are no longer on the branch. Current head is |
|
CI follow-up on the current red check:
Leaving the branch unchanged; maintainers can rerun CI if they want a clean runner result. |
|
This pull request has conflicts, please rebase. |
a97b7b4 fix: align oversized notfound penalty (PastaClaw) a43a27f test: avoid hardcoded oversized notfound count (PastaClaw) f84962b fix: penalize oversized notfound messages (PastaClaw) Pull request description: # fix: penalize oversized notfound messages ## Issue being fixed or feature implemented Oversized `notfound` inventory vectors were ignored after deserialization. This change gives them a small misbehavior score, matching the defensive treatment used for other inventory-vector messages, and avoids holding `cs_main` while deserializing the vector. ## What was done? - Deserialize `notfound` inventory vectors before taking `cs_main`. - Return early with a small misbehavior score when a `notfound` vector exceeds the maximum outstanding object/block request count. - Add functional coverage for the oversized `notfound` path. ## How Has This Been Tested? Environment: macOS 15.6 arm64, local Dash Core autotools build from this branch. - `git diff --check` - Local build configured with: ```bash ./configure --without-gui --disable-bench --disable-fuzz-binary \ --disable-tests --disable-wallet ``` - `make -j8 src/dashd src/dash-cli` - Initial parallel build hit a generated dependency-file race while building `dash-cli`; `dashd` linked successfully. - `make -j1 src/dash-cli` - `test/functional/p2p_tx_download.py --cachedir=/tmp/dash_func_cache_notfound` ## Breaking Changes None. ## Checklist - [x] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [x] I have added or updated relevant unit/integration/functional/e2e tests - [ ] I have made corresponding changes to the documentation - [ ] I have assigned this pull request to a milestone *(for repository code-owners and collaborators only)* ACKs for top commit: UdjinM6: utACK a97b7b4 Tree-SHA512: 35ff6b0b9e12e377e5600f4b0b2caee9582d0b4022dad04727fab54599807a5659c1837e43d30205386be34ce4dda33d4d9f687101ce67e8a694fb1a614d3914 (cherry picked from commit 6a051f5)
a97b7b4 fix: align oversized notfound penalty (PastaClaw) a43a27f test: avoid hardcoded oversized notfound count (PastaClaw) f84962b fix: penalize oversized notfound messages (PastaClaw) Pull request description: # fix: penalize oversized notfound messages ## Issue being fixed or feature implemented Oversized `notfound` inventory vectors were ignored after deserialization. This change gives them a small misbehavior score, matching the defensive treatment used for other inventory-vector messages, and avoids holding `cs_main` while deserializing the vector. ## What was done? - Deserialize `notfound` inventory vectors before taking `cs_main`. - Return early with a small misbehavior score when a `notfound` vector exceeds the maximum outstanding object/block request count. - Add functional coverage for the oversized `notfound` path. ## How Has This Been Tested? Environment: macOS 15.6 arm64, local Dash Core autotools build from this branch. - `git diff --check` - Local build configured with: ```bash ./configure --without-gui --disable-bench --disable-fuzz-binary \ --disable-tests --disable-wallet ``` - `make -j8 src/dashd src/dash-cli` - Initial parallel build hit a generated dependency-file race while building `dash-cli`; `dashd` linked successfully. - `make -j1 src/dash-cli` - `test/functional/p2p_tx_download.py --cachedir=/tmp/dash_func_cache_notfound` ## Breaking Changes None. ## Checklist - [x] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [x] I have added or updated relevant unit/integration/functional/e2e tests - [ ] I have made corresponding changes to the documentation - [ ] I have assigned this pull request to a milestone *(for repository code-owners and collaborators only)* ACKs for top commit: UdjinM6: utACK a97b7b4 Tree-SHA512: 35ff6b0b9e12e377e5600f4b0b2caee9582d0b4022dad04727fab54599807a5659c1837e43d30205386be34ce4dda33d4d9f687101ce67e8a694fb1a614d3914 (cherry picked from commit 6a051f5)
24920a0 chore: prepare v23.1.8 release (pasta) 2194248 Merge #7348: fix: penalize oversized notfound messages (pasta) f5c72c3 Merge #7347: fix: punish invalid dstx messages (pasta) 550caf7 Merge #7465: fix(qt): handle pixel-sized fonts when scaling widgets (pasta) e203710 Merge #7419: fix(net): bound CoinJoin message vector intake (pasta) 5f5b960 Merge #7418: fix(net): bound signing message vector intake (Pasta) 7cc2cca Merge #7450: test: make governance vote fixtures wire-valid (Pasta) f011c80 Merge #7440: fix(net): bound governance vote signature deserialization (Pasta) 4b4d96a Merge #7442: fix(net): authorize governance inv responses via the net-layer per-peer request tracker (Pasta) f855b13 Merge #7444: fix(net): bound bloom message vectors before allocation (Pasta) 5b5c6fb Merge #7415: fix: bound pending sig share queue (Pasta) 9bbe808 Merge #7416: fix(net): bound quorum data response vectors (Pasta) da42f50 Merge #7424: fix: bound ChainLock seen cache (Pasta) 5b310df Merge #7438: fix: bound SPORK signature deserialization (Pasta) e118d0c Merge #7259: fix: dangling point to cj client (Pasta) 9921621 Merge #7439: refactor: add bounded vector deserialization (Pasta) 89bdf7c Merge #7414: fix(net): throttle per-object governance vote sync requests (Pasta) 44c396d Merge #7402: fix: bound pending recovered sig queue to prevent remote OOM (Pasta) 05cfe27 Merge #7351: fix: limit signing share sessions per peer (pasta) 3ef3a5b Merge #7408: fix: bound DKG contribution blob intake (pasta) 0ea6532 Merge #7387: test: migrate governance inv cache coverage to unit tests (Pasta) 8ffdf7f Merge #7398: backport: compact block relay hardening (bitcoin#26898, bitcoin#27626, bitcoin#27743, bitcoin#26969, bitcoin#29412, bitcoin#32646, bitcoin#33296) (Pasta) 2915142 backport: bitcoin#27608 - p2p: Avoid prematurely clearing download state for other peers (PastaClaw) 90b5473 Merge #7396: fix: run of circular-dependencies with python3.15 (Pasta) b003cdc Merge #7395: ci: update GitHub Actions pins for Node 24 (pasta) 97c3dd1 Merge #7394: fix: stabilize par help text in manpages (pasta) 8f8616b Merge #7372: backport: bitcoin#32693: depends: fix cmake compatibility error for freetype (pasta) 48f72be Merge #7360: fix: empty platformP2PPort deprecated field in protx listdiff results (pasta) a8cccff Merge #7298: fix(qt): keep PoSe score visible when hiding banned masternodes (pasta) Pull request description: Release PR for Dash Core v23.1.8, a patch release on top of v23.1.7. Fast-forwards from `v23.1.x` (currently at `chore: prepare v23.1.7 release`), 29 commits, no merge commits, no conflicts. ## Contents Backports of PRs already reviewed and merged on `develop`: `#7259` `#7347` `#7348` `#7351` `#7298` `#7360` `#7372` `#7387` `#7394` `#7395` `#7396` `#7398` `#7402` `#7408` `#7414` `#7415` `#7416` `#7418` `#7419` `#7424` `#7438` `#7439` `#7440` `#7442` `#7444` `#7450` `#7465` Plus `backport: bitcoin#27608`, a single commit taken from Dash #7237 because #7398's compact-block hardening depends on it. The rest of that v0.26 batch is intentionally not included on v23.1.x. The commit is byte-identical to its reviewed counterpart inside #7237. And release preparation: version bump, regenerated man pages, release notes, archived 23.1.7 notes. ## Note for reviewers: this branch was rebuilt An earlier revision of this PR was discarded and the branch rebuilt from scratch. Review comments on the previous revision point at commits that no longer exist, though the feedback itself was carried over (see below). The reason: several commits titled `Merge #NNNN` in the earlier revision contained substantial code that exists nowhere upstream — apparently written from a description of each PR rather than ported from its diff. For example, `feature_llmq_simplepose.py` is byte-identical between v23.1.7 and `develop`, yet the earlier `Merge #7408` rewrote 66 lines of it; `test/functional/p2p_governance_invs.py` does not exist on `develop` at all, yet had grown from 62 to 148 lines. That mislabeling matters because a commit titled `Merge #NNNN` invites less scrutiny, not more. It also had consequences: the earlier revision was **missing #7440 entirely**, and contained eleven consecutive commits that did not compile (code written against newer upstream APIs this branch does not have — `Misbehaving(Peer&)`, and `PeerIsBanned` used five commits before it was declared). Every commit on this branch has now been diffed against its upstream merge commit. Where a backport differs, it is because v23.1.x predates an upstream refactor and the change had to be applied to the pre-refactor file — for example #7418 and #7438 patch `signing_shares.cpp` / `spork.cpp` where upstream patches `net_signing.cpp` / `net_processing.cpp`. ## Dropped from this branch - **#7350** (`net: don't lock cs_main while reading blocks`) — dropped on review feedback. It is a 110-line lock-structure refactor of `ProcessGetBlockData` with no measured benefit, and it would add avoidable churn to the eventual master→develop merge-back. Nothing on this branch depends on it: #7398's compact-block work precedes it, and the remaining 14 commits replay with zero conflicts once it is removed. Thanks @knst. ## Added after the initial review pass - **#7351** (`fix: limit signing share sessions per peer`) — cherry-picked as a single commit and placed before #7402, matching upstream's merge order. The include block additionally carries `<ranges>`: upstream's diff adds only `<algorithm>` because develop already had it, whereas v23.1.x did not and the backported `GetSessionCount()` / `GetAnnouncementSessionCount()` use `std::ranges::count_if`. - **#7465** (`fix(qt): handle pixel-sized fonts when scaling widgets`) — cherry-picked from the five upstream commits. `optiontests.cpp` additionally includes `qt/guiutil_font.h`, because `fontsLoaded()` and `updateFonts()` are declared there on v23.1.x while develop declares them in `qt/guiutil.h`, which is all the upstream test includes. Two further backports were added later and applied without any adaptation -- their diffs are byte-for-byte identical to upstream: - **#7347** (`fix: punish invalid dstx messages`) - **#7348** (`fix: penalize oversized notfound messages`) ## Adaptations worth flagging - **#7360** — upstream gates `platformP2PPort` / `platformHTTPPort` in `protx listdiff` behind `IsServiceDeprecatedRPCEnabled()`. On 23.x those deprecated fields are deliberately not enforced through gating (see `bbcd9d543e6`), so shipping the gate as-is would silently drop two fields that v23.1.7 always returned. Changed to `if (true)` with a comment, per review feedback, keeping the block aligned with `develop`. The substantive fix from #7360 — reading the live port from `netInfo` instead of the always-zero scalar — is retained. - **#7415** — the pending-map caps (`MAX_PENDING_SIG_SHARES_PER_NODE`, `MAX_PENDING_SIG_SHARES_TOTAL`) are backported. The additional bound upstream places on batches awaiting verification is not, because it guards a condition that does not exist here: upstream's dispatcher pushes one task per batch inside an inner loop, whereas v23.1.x pushes a single looping worker per 10 ms tick. There is no unbounded task queue to bound. - **Man pages** — regenerated without the `lock` debug category, which only exists under `DEBUG_LOCKCONTENTION` and so is absent from release binaries. Thanks @UdjinM6 for catching this. ## Known CI failure macOS jobs are expected to fail. `actions/upload-artifact@v6` rejects filenames containing `:`, and the Xcode SDK ships Perl man pages with `::` in the name. A release-branch-only workaround existed on the earlier revision but was dropped as it corresponds to no upstream PR. This is accepted for this release. ## Testing - Every commit through #7465 compiles individually (verified for 27 of the 29; the three additions below were verified at the tip) — verified individually, not just at the tip. - Full build clean; no new warnings. - Unit tests pass. - Functional tests pass: `feature_llmq_signing` (both variants), `feature_llmq_chainlocks`, `feature_llmq_dkgerrors`, `feature_llmq_is_cl_conflicts`, `p2p_instantsend`, `feature_dip3_deterministicmns` (both wallet types), `rpc_coinjoin`. - Qt unit tests pass (32 cases, run under the `cocoa` platform plugin so the pixel-sized font regression from #7465 actually executes rather than self-skipping). - Lint: one pre-existing `lint-cppcheck-dash` failure, identical on v23.1.7, in files this branch does not touch. Top commit has no ACKs. Tree-SHA512: 0fa469c9a33820aa85fbb8b90c5877409d09490f746f1300b05ceda470a600765f900bec42e5aad5d90a2d46b44e28c20e44dc4a8fe719553a072298069eaec4
Upstream landed its own "release: prepare v23.1.8" (dashpay#7493) plus parallel merges of several PRs this branch had already backported, so most conflicts are two adaptations of the same change rather than divergent intent. Resolutions: - Release artifacts (manpages, flatpak metainfo, release notes, configure.ac): took upstream's published v23.1.8 text as the base, then re-added the CoinJoin/wallet, GUI, and credits content that upstream's copy lacked. - LLMQ/net/test files where upstream carried a refined superset (dashpay#7351, dashpay#7347, dashpay#7348, dashpay#7465): took upstream. - CoinJoin client lifetime, overviewpage mixing-state, dmnstate platform ports, and coinjoin_tests: kept this branch's versions. - test/functional/p2p_governance_invs.py: accepted upstream's removal in favor of the src/test/governance_inv_tests.cpp migration (dashpay#7387). Auto-merge produced two duplicate definitions that would not compile (IsSyncableObject in governance.cpp, UnserializeBatchedSigShares in signing_shares.cpp); both were reduced to a single definition. Co-Authored-By: Claude <noreply@anthropic.com>
fix: penalize oversized notfound messages
Issue being fixed or feature implemented
Oversized
notfoundinventory vectors were ignored after deserialization. Thischange gives them a small misbehavior score, matching the defensive treatment
used for other inventory-vector messages, and avoids holding
cs_mainwhiledeserializing the vector.
What was done?
notfoundinventory vectors before takingcs_main.notfoundvector exceedsthe maximum outstanding object/block request count.
notfoundpath.How Has This Been Tested?
Environment: macOS 15.6 arm64, local Dash Core autotools build from this branch.
git diff --checkLocal build configured with:
make -j8 src/dashd src/dash-clidash-cli;dashdlinked successfully.make -j1 src/dash-clitest/functional/p2p_tx_download.py --cachedir=/tmp/dash_func_cache_notfoundBreaking Changes
None.
Checklist
(for repository code-owners and collaborators only)