chore: improve reqwest error logs

Author: Threated

src/errors.rs

@@ -10,7 +10,7 @@ pub(crate) enum BeamConnectError {
     ProxyTimeoutError,
     #[error("Proxy rejected our authorization")]
     ProxyRejectedAuthorization,
-    #[error("Unable to communicate with Proxy: {0}")]
+    #[error("Unable to communicate with Proxy: {0:?}")]
     ProxyReqwestError(reqwest::Error),
     #[error("Unable to communicate with Proxy: {0}")]
     ProxyOtherError(String),
@@ -20,8 +20,10 @@ pub(crate) enum BeamConnectError {
     SerdeError(#[from] serde_json::Error),
     #[error("AppId {0} is not authorized to access URL {1}")]
     IdNotAuthorizedToAccessUrl(AppOrProxyId, Uri),
-    #[error("Unable to communicate with target host: {0}")]
-    CommunicationWithTargetFailed(String),
+    #[error("Unable to communicate with target host: {0:?}")]
+    CommunicationWithTargetFailed(reqwest::Error),
+    #[error("Lookup of local target {0} failed")]
+    NoLocalMapping(hyper::http::uri::Authority),
     #[error("Unable to fetch reply from target host: {0}")]
     FailedToReadTargetsReply(reqwest::Error),
     #[error("Response was not valid UTF-8: {0}")]

src/logic_reply.rs

@@ -116,19 +116,13 @@ async fn send_reply(task: &TaskRequest<HttpRequest>, config: &Config, resp: Resu
     }
 }
 
-// TODO: Take ownership of `task` to save clones
 async fn execute_http_task(task: &TaskRequest<HttpRequest>, config: &Config) -> Result<Response, BeamConnectError> {
     let task_req = &task.body;
-    let span = Span::current();
-    span.record("method", field::display(&task_req.method));
-    span.record("orig_url", field::display(&task_req.url));
+    let vhost = task_req.url.authority().expect("Url has an authority");
     let target = config
         .targets_local
-        .get(task_req.url.authority().unwrap()) //TODO unwrap
-        .ok_or_else(|| {
-            warn!("Lookup of local target {} failed", task_req.url.authority().unwrap());
-            BeamConnectError::CommunicationWithTargetFailed(String::from("Target not defined"))
-        })?;
+        .get(vhost) 
+        .ok_or_else(|| BeamConnectError::NoLocalMapping(vhost.clone()))?;
     match &task.from {
         AppOrProxyId::App(app) if target.can_be_accessed_by(app) => {},
         id => return Err(BeamConnectError::IdNotAuthorizedToAccessUrl(id.clone(), task_req.url.clone())),
@@ -155,7 +149,7 @@ async fn execute_http_task(task: &TaskRequest<HttpRequest>, config: &Config) ->
         .authority(target.replace.authority.to_owned())
         .build()?;
 
-    span.record("dst_url", field::display(&uri));
+    Span::current().record("dst_url", field::display(&uri));
     let mut headers = task_req.headers.clone();
     if target.reset_host {
         // This will lead to reqwest generating a new HOST header coresponding to the new hostname of the url.
@@ -171,7 +165,7 @@ async fn execute_http_task(task: &TaskRequest<HttpRequest>, config: &Config) ->
         .body(task_req.body.to_vec())
         .send()
         .await
-        .map_err(|e| BeamConnectError::CommunicationWithTargetFailed(e.to_string()))?;
+        .map_err(BeamConnectError::CommunicationWithTargetFailed)?;
     Ok(resp)
 }