tuxmain/rust-rpxy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix proxy response bug, add log for response object

Browse source
This commit is contained in:
Jun Kurihara 2022-07-10 11:21:17 +09:00
commit 8a4149cbf2
No known key found for this signature in database
GPG key ID: 48ADFD173ED22B03
4 changed files with 50 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/msg_handler/handler.rs
View file

@ -1,5 +1,5 @@
// Highly motivated by https://github.com/felipenoris/hyper-reverse-proxy // Highly motivated by https://github.com/felipenoris/hyper-reverse-proxy
use super::{utils_headers::*, utils_request::*, utils_synth_response::*}; use super::{utils_headers::*, utils_request::*, utils_response::ResLog, utils_synth_response::*};
use crate::{backend::Upstream, constants::*, error::*, globals::Globals, log::*}; use crate::{backend::Upstream, constants::*, error::*, globals::Globals, log::*};
use hyper::{ use hyper::{
client::connect::Connect, client::connect::Connect,
@ -30,7 +30,7 @@ where
listen_addr: SocketAddr, listen_addr: SocketAddr,
tls_enabled: bool, tls_enabled: bool,
) -> Result<Response<Body>> { ) -> Result<Response<Body>> {
req.log(&client_addr, Some("(Incoming)")); req.log(&client_addr, Some("(Request from Client)"));
// Here we start to handle with server_name // Here we start to handle with server_name
// Find backend application for given server_name, and drop if incoming request is invalid as request. // Find backend application for given server_name, and drop if incoming request is invalid as request.
@ -92,7 +92,7 @@ where
return http_error(StatusCode::SERVICE_UNAVAILABLE); return http_error(StatusCode::SERVICE_UNAVAILABLE);
}; };
// debug!("Request to be forwarded: {:?}", req_forwarded); // debug!("Request to be forwarded: {:?}", req_forwarded);
req_forwarded.log(&client_addr, Some("(Forwarding)")); req_forwarded.log(&client_addr, Some("(Request to Backend)"));
// Forward request to // Forward request to
let mut res_backend = match self.forwarder.request(req_forwarded).await { let mut res_backend = match self.forwarder.request(req_forwarded).await {
@ -102,7 +102,11 @@ where
return http_error(StatusCode::BAD_REQUEST); return http_error(StatusCode::BAD_REQUEST);
} }
}; };
debug!("Response from backend: {:?}", res_backend.status()); res_backend.log(
&backend.server_name,
&client_addr,
Some("(Response from Backend)"),
);
// let response_log = res_backend.status().to_string(); // let response_log = res_backend.status().to_string();
if res_backend.status() == StatusCode::SWITCHING_PROTOCOLS { if res_backend.status() == StatusCode::SWITCHING_PROTOCOLS {
@ -152,6 +156,11 @@ where
// Generate response to client // Generate response to client
if self.generate_response_forwarded(&mut res_backend).is_ok() { if self.generate_response_forwarded(&mut res_backend).is_ok() {
// info!("{} => {}", request_log, response_log); // info!("{} => {}", request_log, response_log);
res_backend.log(
&backend.server_name,
&client_addr,
Some("(Response to Client)"),
);
Ok(res_backend) Ok(res_backend)
} else { } else {
// info!("{} => {}", request_log, StatusCode::BAD_GATEWAY); // info!("{} => {}", request_log, StatusCode::BAD_GATEWAY);
@ -168,8 +177,8 @@ where
response: &mut Response<B>, response: &mut Response<B>,
) -> Result<()> { ) -> Result<()> {
let headers = response.headers_mut(); let headers = response.headers_mut();
remove_hop_header(headers);
remove_connection_header(headers); remove_connection_header(headers);
remove_hop_header(headers);
append_header_entry_with_comma( append_header_entry_with_comma(
headers, headers,
"server", "server",

1
src/msg_handler/mod.rs
View file

@ -1,6 +1,7 @@
mod handler; mod handler;
mod utils_headers; mod utils_headers;
mod utils_request; mod utils_request;
mod utils_response;
mod utils_synth_response; mod utils_synth_response;
pub use handler::HttpMessageHandler; pub use handler::HttpMessageHandler;

4
src/msg_handler/utils_request.rs
View file

@ -4,10 +4,10 @@ use std::fmt::Display;
//////////////////////////////////////////////////// ////////////////////////////////////////////////////
// Functions of utils for request messages // Functions of utils for request messages
pub trait MsgLog { pub trait ReqLog {
fn log<T: Display + ToCanonical>(self, src: &T, extra: Option<&str>); fn log<T: Display + ToCanonical>(self, src: &T, extra: Option<&str>);
} }
impl<B> MsgLog for &Request<B> { impl<B> ReqLog for &Request<B> {
fn log<T: Display + ToCanonical>(self, src: &T, extra: Option<&str>) { fn log<T: Display + ToCanonical>(self, src: &T, extra: Option<&str>) {
let canonical_src = src.to_canonical(); let canonical_src = src.to_canonical();

33
src/msg_handler/utils_response.rs Normal file
View file

@ -0,0 +1,33 @@
use crate::{log::*, utils::*};
use hyper::Response;
use std::fmt::Display;
////////////////////////////////////////////////////
// Functions of utils for request messages
pub trait ResLog {
fn log<T1: Display, T2: Display + ToCanonical>(
self,
server_name: &T1,
client_addr: &T2,
extra: Option<&str>,
);
}
impl<B> ResLog for &Response<B> {
fn log<T1: Display, T2: Display + ToCanonical>(
self,
server_name: &T1,
client_addr: &T2,
extra: Option<&str>,
) {
let canonical_client_addr = client_addr.to_canonical();
info!(
"{} <- {} -- {} {:?} {:?} {}",
canonical_client_addr,
server_name,
self.status(),
self.version(),
self.headers(),
extra.map_or_else(|| "", |v| v)
);
}
}