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

Reinstate the use of bootstrap DoS mitigations removed along with tokio #3821

Merged
merged 93 commits into from
Apr 24, 2023
Merged

Reinstate the use of bootstrap DoS mitigations removed along with tokio #3821

merged 93 commits into from
Apr 24, 2023

Conversation

Ben-PH
Copy link
Contributor

@Ben-PH Ben-PH commented Apr 12, 2023 •
edited
Loading

  • document all added functions
  • try in sandbox /simulation/labnet
  • unit tests on the added/changed features
    • make tests compile
    • make tests pass
  • add logs allowing easy debugging in case the changes caused problems
  • if the API has changed, update the API specification

Ben-PH and others added 30 commits March 3, 2023 15:26
@Ben-PH
Make establisher get_listener non-async
7ae5b2d
@Ben-PH
Make establisher fn get_connector non-async
bdd8e54
@Ben-PH
Set the mockers to use a TcpStream as a duplex
b77875c
@Ben-PH
fix(bootstrap) : fix base_bootstrap_ip
4e6c89f
@Ben-PH
Duplex -> tokio::net::TcpStream. same for Listener
bf0301c
@Ben-PH
unify listener interface through trait
baac844
@Ben-PH
remove #[cfg(test)] from bootstrap establisher
1e00ce4
@Ben-PH
Add FIXME to where static lifetime is being used as a hot-fix
77d0b8e
@Ben-PH
Light house-keeping
710a8c8
@Ben-PH
Clear clippy lint
4d14a09
@Ben-PH
Some code-comments
7c131db
@Ben-PH
Using a blocking tcp interface, but things lock up
2150b03
@Ben-PH
Fix blocking by making the tokio conversion using non-blocking objects
2e086c1
@Ben-PH
Remove the async Tcp stuff from mock connector
a637e00
@Ben-PH
Use less async channels. Use Arc<AtomicBool> as signaller
725902f
@Ben-PH
Fewer async channels
0236535
@Ben-PH
So close to not using tokio...
b32246b
@Ben-PH
accept method now synchronous!!!
a7f3c51
@Ben-PH
Merge remote-tracking branch 'origin/testnet_21' into bootstrap/sync-…
c1c0936 
…accept
@Ben-PH
make connect synchronous
e8d53f1
@Ben-PH
Some cleanup
2cc4256
@Ben-PH
Clear clippy lint
fcdf28e
@Ben-PH
Fix upstream merge error
5732529
@Ben-PH
more cleanup
bf7f89f
@Ben-PH
Make listener blocking
78459e0
@Ben-PH
Make the Duplex a trait, thus mockable
dffa060
@Ben-PH
Start the server with the listener instead of estab trait
ea51448
@Ben-PH
Update comments
436517b
@Ben-PH
Remove mock-establisher interface entirely
11a3b24
@Ben-PH
Move the default get-listener into a struct method
e0a3089
Ben-PH added 14 commits April 7, 2023 19:13
@Ben-PH
Revert "Removes the tokio dependency from the bootstrap module (#3782…
d92ce87 
…)" (#3795)

This reverts commit 62e1781.
@Ben-PH
Apply self-review changes
81c1f41
@Ben-PH
Hide mocks behind testing flags/builds
5bb53af
@Ben-PH
Clear cargo-doc warnings
3ec51db
@Ben-PH
More whack-a-mole with CI ~warns~ errors
0aa8086
@Ben-PH
Remove the dependency on tokio in the bootstrap module (#3796)
f35e902
@Ben-PH
Fix missing network-controller export of runtime constructor
f7583f2
@Ben-PH
Comment providing context of why an unused variable is retained
de44109
@Ben-PH
Minor cleanup of mocking code
caf4d87
@Ben-PH
Bootstrap server binding read-message in a single read_exact (#3774)
56122d1
@Ben-PH
Expand the bandwith limit todo-comment
4bea0ab
@Ben-PH
Fix dependency management for when testing bootstrap server directly
748f7ac
@Ben-PH
Bootstrap/peek streams (#3820)
2a3b0f4
@Ben-PH
Set timeouts according to the time-window alloted
72d1f6b
@Ben-PH Ben-PH self-assigned this Apr 12, 2023
@Ben-PH Ben-PH added the bootstrap Issues related to the bootstrap label Apr 12, 2023
Ben-PH
Ben-PH commented Apr 12, 2023
View reviewed changes
Copy link
Contributor Author

@Ben-PH Ben-PH left a comment

Choose a reason for hiding this comment

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

self-reveiw

massa-bootstrap/src/server.rs Outdated Show resolved Hide resolved
massa-bootstrap/src/server.rs Outdated Show resolved Hide resolved
massa-bootstrap/src/server.rs Outdated Show resolved Hide resolved
@Ben-PH Ben-PH marked this pull request as ready for review April 12, 2023 17:07
@Ben-PH Ben-PH requested a review from modship April 12, 2023 17:07
@Ben-PH Ben-PH linked an issue Apr 12, 2023 that may be closed by this pull request
Bootstrap improvements tracking issue #3746
Closed
25 tasks
@Ben-PH Ben-PH mentioned this pull request Apr 12, 2023
Closed
25 tasks
@Ben-PH Ben-PH mentioned this pull request Apr 12, 2023
Merged
7 tasks
@Ben-PH Ben-PH changed the base branch from bootstrap/mocked-and-sync to testnet_22 April 19, 2023 16:24
@Ben-PH
Copy link
Contributor Author

Ben-PH commented Apr 24, 2023

Okay in sandbox, haven't tested in labnet. Unit tests pass.

modship
modship approved these changes Apr 24, 2023
View reviewed changes
Copy link
Member

@modship modship left a comment

Choose a reason for hiding this comment

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

nice ! that's really more readable like this

@Ben-PH Ben-PH merged commit 72237ba into testnet_22 Apr 24, 2023
@AurelienFT AurelienFT deleted the bootstrap/time-trial-revival branch May 29, 2023 09:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@modship modship modship approved these changes

Assignees

@Ben-PH Ben-PH

Labels
bootstrap Issues related to the bootstrap
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Bootstrap improvements tracking issue
2 participants
@Ben-PH @modship