fix(ws server): reply HTTP 403 on all failed conns #819
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
niklasad1
commented
Jul 7, 2022
| @@ -253,45 +254,12 @@ async fn handshake<M: Middleware>(socket: tokio::net::TcpStream, mode: Handshake | |||
| } | |||
| HandshakeResponse::Accept { conn_id, methods, resources, cfg, stop_monitor, middleware, id_provider } => { | |||
| tracing::debug!("Accepting new connection: {}", conn_id); | |||
| let key = { | |||
| let req = server.receive_request().await?; | |||
There was a problem hiding this comment.
refactored to this into a helper function because once this returns Err it's just dropped without sending a proper HTTP response.
so everything that returns an error we just send HTTP status code 403
niklasad1
commented
Jul 7, 2022
| Ok(key) => { | ||
| match key_and_headers { | ||
| Ok((key, headers)) => { | ||
| middleware.on_connect(remote_addr, &headers); |
There was a problem hiding this comment.
this will only be registered in the middleware on successful connections, it was like that before too.
maybe we should register this on failed ones as well?
There was a problem hiding this comment.
Hmm; if we want to log failed things, we probably should tweak the middleware thing to make it obvious when it's an error versus a normal connection, (maybe add a new method like on_connect_error?).
I think this is good as it stands for now though.
TarikGul
approved these changes
Jul 18, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closing #818