Fix unix domain socket binding for reverse tunnel #362
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
|
Hello, Thank you for the PR. |
erebe
reviewed
Sep 30, 2024
| @@ -50,9 +50,14 @@ impl Stream for UnixListenerStream { | |||
| pub async fn run_server(socket_path: &Path) -> Result<UnixListenerStream, anyhow::Error> { | |||
| info!("Starting Unix socket server listening cnx on {:?}", socket_path); | |||
|
|
|||
| let path_to_delete = !socket_path.exists(); | |||
| if socket_path.exists() { | |||
There was a problem hiding this comment.
If the unix socket path, already exist we should not delete it. As it is not owned by wstunnel.
erebe
reviewed
Sep 30, 2024
| #[derive(Hash, Eq, PartialEq, Clone, Debug)] | ||
| pub enum BindAddr { | ||
| Socket(SocketAddr), | ||
| Unix(String), // Unix socket path |
There was a problem hiding this comment.
You can use PathBuf instead of a string I think.
erebe
reviewed
Sep 30, 2024
| @@ -194,9 +194,10 @@ impl WsServer { | |||
| let header = ppp::v2::Builder::with_addresses( | |||
| ppp::v2::Version::Two | ppp::v2::Command::Proxy, | |||
| ppp::v2::Protocol::Stream, | |||
| (client_address, tx.local_addr()?), | |||
| (client_address, tx.local_addr().unwrap()), | |||
erebe
reviewed
Sep 30, 2024
| ) | ||
| .build()?; | ||
| .build() |
erebe
reviewed
Sep 30, 2024
| @@ -302,7 +308,6 @@ impl WsServer { | |||
| move |req: Request<Incoming>| { | |||
| http_server_upgrade(server.clone(), restrictions.clone(), restrict_path.clone(), client_addr, req) | |||
| .map::<anyhow::Result<_>, _>(Ok) | |||
| .instrument(mk_span()) | |||
erebe
reviewed
Sep 30, 2024
| @@ -337,7 +342,6 @@ impl WsServer { | |||
| .unwrap()) | |||
| } | |||
| } | |||
| .instrument(mk_span()) | |||
erebe
reviewed
Sep 30, 2024
| @@ -383,12 +387,20 @@ impl WsServer { | |||
| } | |||
| }; | |||
|
|
|||
| let span = span!(Level::INFO, "cnx", peer = peer_addr.to_string(),); | |||
erebe
reviewed
Sep 30, 2024
| // https://github.com/erebe/wstunnel/issues/358 | ||
| // disabled, to avoid conflict with --connection-min-idle flag, that open idle connections | ||
| .header_read_timeout(None) | ||
| .header_read_timeout(Duration::from_secs(10)) |
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.
I case of unix domain socket, local host:port is always 0.0.0.0:0 and when another client wants to connect with a different unix socket path, it binds it to the existing connection.