Skip to content
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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 2 commits into from
Oct 7, 2022
Merged

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

merged 2 commits into from
Oct 7, 2022

Conversation

mergify[bot]
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 @mergify
security/p2p: prevent peers who errored being added to the peer_set (#…
ef59427 
…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
cmwaters
cmwaters approved these changes Oct 7, 2022
View reviewed changes
Copy link
Contributor

@cmwaters cmwaters left a comment

Choose a reason for hiding this comment

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

LGTM

@jmalicevic jmalicevic merged commit 430afb2 into v0.34.x Oct 7, 2022
@jmalicevic jmalicevic deleted the mergify/bp/v0.34.x/pr-9500 branch October 7, 2022 12:27
jmalicevic added a commit that referenced this pull request Oct 10, 2022
@jmalicevic
Revert "security/p2p: prevent peers who errored being added to the pe…
3b4d8e9 
…er_set (backport #9500) (#9516)"

This reverts commit 430afb2.
@jmalicevic jmalicevic mentioned this pull request Dec 27, 2022
Closed
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cmwaters cmwaters

Assignees

@jmalicevic jmalicevic

Labels
None yet
Projects
Tendermint
Status: Done/Merged
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@cmwaters @jmalicevic