Skip to content

security/p2p: prevent peers who errored being added to the peer_set (backport #9500)#9515

Draft
mergify[bot] wants to merge 3 commits intov0.37.xfrom
mergify/bp/v0.37.x/pr-9500
Draft

security/p2p: prevent peers who errored being added to the peer_set (backport #9500)#9515
mergify[bot] wants to merge 3 commits intov0.37.xfrom
mergify/bp/v0.37.x/pr-9500

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Oct 6, 2022

This is an automatic backport of pull request #9500 done by Mergify.

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@jmalicevic @cmwaters @mergify
security/p2p: prevent peers who errored being added to the peer_set (#…
4975790 
…9500)

* Mark failed removal of peer to address security bug

Co-authored-by: Callum Waters <cmwaters19@gmail.com>
(cherry picked from commit c0bdb24)
@mergify mergify bot requested a review from a team October 6, 2022 07:02
@jmalicevic jmalicevic mentioned this pull request Oct 6, 2022
Closed
6 tasks
@jmalicevic jmalicevic self-assigned this Oct 6, 2022
@jmalicevic jmalicevic added the S:wip Work in progress (prevents stalebot from automatically closing) label Oct 6, 2022
@jmalicevic
Copy link
Contributor

jmalicevic commented Oct 6, 2022

Added the wip label to prevent a merge until we cut 0.37. Otherwise ready for review.

cmwaters
cmwaters approved these changes Oct 7, 2022
View reviewed changes
Copy link
Contributor

@cmwaters cmwaters left a comment •
edited
Loading

Choose a reason for hiding this comment

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

You can also put the PR in draft mode if you're concerned about someone merging it too soon but I think this will make this approval void

@jmalicevic
Copy link
Contributor

jmalicevic commented Oct 7, 2022

I think the wip tag will prevent it from being merged automatically.

@cmwaters
Copy link
Contributor

cmwaters commented Oct 7, 2022

I think the wip tag will prevent it from being merged automatically.

But not someone from accidentally pressing the green button 😄

@jmalicevic jmalicevic marked this pull request as draft October 7, 2022 13:58
@jmalicevic jmalicevic mentioned this pull request Dec 27, 2022
Closed
6 tasks
@jmalicevic jmalicevic mentioned this pull request Jan 9, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@cmwaters cmwaters cmwaters approved these changes

Reviewers whose approvals may not affect merge requirements

At least 1 approving review is required to merge this pull request.

Assignees

@jmalicevic jmalicevic

Labels

S:wip Work in progress (prevents stalebot from automatically closing)

Projects

Tendermint
Status: Blocked

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@jmalicevic @cmwaters