Skip to content

p2p: return masked IP (not the actual IP) in addrbook#groupKey#4847

Merged
mergify[bot] merged 7 commits intomasterfrom
anton/4846-address-book
May 19, 2020
Merged

p2p: return masked IP (not the actual IP) in addrbook#groupKey#4847
mergify[bot] merged 7 commits intomasterfrom
anton/4846-address-book

Conversation

@melekes
Copy link
Contributor

@melekes melekes commented May 15, 2020 •
edited
Loading

@melekes melekes requested a review from tessr as a code owner May 15, 2020 10:14
@auto-comment
Copy link

auto-comment bot commented May 15, 2020 •
edited by melekes
Loading

👋 Thanks for creating a PR!

Before we can merge this PR, please make sure that all the following items have been
checked off. If any of the checklist items are not applicable, please leave them but
write a little note why.

  • Wrote tests
  • Updated CHANGELOG_PENDING.md
  • Linked to Github issue with discussion and accepted design OR link to spec that describes this work.
  • Updated relevant documentation (docs/) and code comments
  • Re-reviewed Files changed in the Github PR explorer
  • Applied Appropriate Labels

Thank you for your contribution to Tendermint! 🚀

@melekes melekes added the R:minor Release: Minor label May 15, 2020
@melekes melekes self-assigned this May 15, 2020
@melekes melekes changed the title p2p: return IP mask (not the actual IP) in addrbook#groupKey p2p: return masked IP (not the actual IP) in addrbook#groupKey May 15, 2020
melekes
melekes commented May 15, 2020
View reviewed changes
@tessr
Copy link
Contributor

tessr commented May 18, 2020

Blah, I think these test failures are genuine and a result of the merge - will investigate

@tac0turtle @tessr
lint: various fixes
d0c293d 
## Description

various linitng fixes
@tessr tessr force-pushed the anton/4846-address-book branch from cca0988 to d0c293d Compare May 19, 2020 09:53
@tessr tessr added the S:automerge Automatically merge PR when requirements pass label May 19, 2020
@codecov-commenter
Copy link

codecov-commenter commented May 19, 2020

Codecov Report

Merging #4847 into master will increase coverage by 0.30%.
The diff coverage is 35.84%.

@@            Coverage Diff             @@
##           master    #4847      +/-   ##
==========================================
+ Coverage   63.16%   63.46%   +0.30%     
==========================================
  Files         227      225       -2     
  Lines       21174    21136      -38     
==========================================
+ Hits        13374    13415      +41     
+ Misses       6704     6630      -74     
+ Partials     1096     1091       -5
Impacted Files Coverage Δ
blockchain/v1/reactor_fsm.go 74.42% <0.00%> (ø)
cmd/tendermint/commands/lite.go 24.65% <ø> (ø)
lite/proxy/proxy.go 0.00% <0.00%> (ø)
lite/proxy/wrapper.go 0.00% <ø> (ø)
lite2/rpc/client.go 0.00% <ø> (ø)
rpc/core/abci.go 0.00% <0.00%> (ø)
rpc/core/consensus.go 0.00% <0.00%> (ø)
rpc/core/dev.go 0.00% <0.00%> (ø)
rpc/core/events.go 0.00% <0.00%> (ø)
rpc/core/evidence.go 0.00% <0.00%> (ø)
... and 32 more

@mergify mergify bot merged commit 3fb80e5 into master May 19, 2020
@mergify mergify bot deleted the anton/4846-address-book branch May 19, 2020 10:13
@tessr tessr removed the R:minor Release: Minor label May 27, 2020
@EnderCrypto EnderCrypto mentioned this pull request Dec 18, 2020
Merged
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@tessr tessr tessr approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@melekes melekes

Labels

S:automerge Automatically merge PR when requirements pass

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

p2p: An attacker with a single IPv6 lease or /24 subnet can insert himself in all nodes' address books ~10000 times

4 participants

@melekes @tessr @codecov-commenter @tac0turtle