hex/wstunnel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add more logs

Browse source
This commit is contained in:
Σrebe - Romain GERARD 2024-01-17 00:20:54 +01:00
parent 81fb524059
commit 27df033448
No known key found for this signature in database
GPG key ID: 7A42B4B97E0332F4
2 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/tunnel/client.rs
View file

@ -4,6 +4,7 @@ use crate::{tunnel, WsClientConfig};
use futures_util::pin_mut; use futures_util::pin_mut;
use hyper::header::COOKIE; use hyper::header::COOKIE;
use jsonwebtoken::TokenData; use jsonwebtoken::TokenData;
use log::debug;
use std::future::Future; use std::future::Future;
use std::ops::Deref; use std::ops::Deref;
use std::sync::Arc; use std::sync::Arc;
@ -25,19 +26,20 @@ where
W: AsyncWrite + Send + 'static, W: AsyncWrite + Send + 'static,
{ {
// Connect to server with the correct protocol // Connect to server with the correct protocol
let (ws_rx, ws_tx) = match client_cfg.remote_addr.scheme() { let (ws_rx, ws_tx, response) = match client_cfg.remote_addr.scheme() {
TransportScheme::Ws | TransportScheme::Wss => { TransportScheme::Ws | TransportScheme::Wss => {
tunnel::transport::websocket::connect(request_id, client_cfg, remote_cfg) tunnel::transport::websocket::connect(request_id, client_cfg, remote_cfg)
.await .await
.map(|(r, w, _response)| (TunnelReader::Websocket(r), TunnelWriter::Websocket(w)))? .map(|(r, w, response)| (TunnelReader::Websocket(r), TunnelWriter::Websocket(w), response))?
} }
TransportScheme::Http | TransportScheme::Https => { TransportScheme::Http | TransportScheme::Https => {
tunnel::transport::http2::connect(request_id, client_cfg, remote_cfg) tunnel::transport::http2::connect(request_id, client_cfg, remote_cfg)
.await .await
.map(|(r, w, _response)| (TunnelReader::Http2(r), TunnelWriter::Http2(w)))? .map(|(r, w, response)| (TunnelReader::Http2(r), TunnelWriter::Http2(w), response))?
} }
}; };
debug!("Server response: {:?}", response);
let (local_rx, local_tx) = duplex_stream; let (local_rx, local_tx) = duplex_stream;
let (close_tx, close_rx) = oneshot::channel::<()>(); let (close_tx, close_rx) = oneshot::channel::<()>();
@ -121,6 +123,7 @@ where
}; };
// Connect to endpoint // Connect to endpoint
debug!("Server response: {:?}", response);
let remote = response let remote = response
.headers .headers
.get(COOKIE) .get(COOKIE)

16
src/tunnel/server.rs
View file

@ -20,7 +20,7 @@ use hyper::header::{COOKIE, SEC_WEBSOCKET_PROTOCOL};
use hyper::http::HeaderValue; use hyper::http::HeaderValue;
use hyper::server::conn::{http1, http2}; use hyper::server::conn::{http1, http2};
use hyper::service::service_fn; use hyper::service::service_fn;
use hyper::{http, Request, Response, StatusCode}; use hyper::{http, Request, Response, StatusCode, Version};
use hyper_util::rt::TokioExecutor; use hyper_util::rt::TokioExecutor;
use jsonwebtoken::TokenData; use jsonwebtoken::TokenData;
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
@ -569,14 +569,20 @@ pub async fn run_server(server_config: Arc<WsServerConfig>) -> anyhow::Result<()
move |req: Request<Incoming>| { move |req: Request<Incoming>| {
let server_config = server_config.clone(); let server_config = server_config.clone();
async move { async move {
if !fastwebsockets::upgrade::is_upgrade_request(&req) { if fastwebsockets::upgrade::is_upgrade_request(&req) {
ws_server_upgrade(server_config.clone(), client_addr, req)
.map(|response| Ok::<_, anyhow::Error>(response.map(Either::Left)))
.await
} else if req.version() == Version::HTTP_2 {
http_server_upgrade(server_config.clone(), client_addr, req) http_server_upgrade(server_config.clone(), client_addr, req)
.map::<anyhow::Result<_>, _>(Ok) .map::<anyhow::Result<_>, _>(Ok)
.await .await
} else { } else {
ws_server_upgrade(server_config.clone(), client_addr, req) error!("Invalid protocol version request, got {:?} while expecting either websocket http1 upgrade or http2", req.version());
.map(|response| Ok::<_, anyhow::Error>(response.map(Either::Left))) Ok(http::Response::builder()
.await .status(StatusCode::BAD_REQUEST)
.body(Either::Left("Invalid protocol request".to_string()))
.unwrap())
} }
} }
} }