refactor

Author: junkurihara

modoh-lib/src/httpsig_handler/handler_main.rs

@@ -45,7 +45,7 @@ where
   C: Send + Sync + Connect + Clone + 'static,
   B: Body + Send + Unpin + 'static,
   <B as Body>::Data: Send,
-  <B as Body>::Error: Into<Box<(dyn std::error::Error + Send + Sync + 'static)>>,
+  <B as Body>::Error: Into<Box<dyn std::error::Error + Send + Sync + 'static>>,
 {
   /// force to refetch notifier for the public keys
   pub(super) force_refetch_notify: Arc<tokio::sync::Notify>,

modoh-lib/src/hyper_client.rs

@@ -8,8 +8,8 @@ use crate::{
 use http::{Request, Response};
 use hyper::body::{Body, Incoming};
 use hyper_util::client::legacy::{
-  connect::{Connect, HttpConnector},
   Client,
+  connect::{Connect, HttpConnector},
 };
 use tracing::instrument;
 
@@ -20,7 +20,7 @@ where
   C: Send + Sync + Connect + Clone + 'static,
   B: Body + Send + Unpin + 'static,
   <B as Body>::Data: Send,
-  <B as Body>::Error: Into<Box<(dyn std::error::Error + Send + Sync + 'static)>>,
+  <B as Body>::Error: Into<Box<dyn std::error::Error + Send + Sync + 'static>>,
 {
   pub inner: Client<C, B>,
 }
@@ -30,7 +30,7 @@ where
   C: Send + Sync + Connect + Clone + 'static,
   B: Body + Send + Unpin + 'static,
   <B as Body>::Data: Send,
-  <B as Body>::Error: Into<Box<(dyn std::error::Error + Send + Sync + 'static)>>,
+  <B as Body>::Error: Into<Box<dyn std::error::Error + Send + Sync + 'static>>,
 {
   #[instrument(level = "debug", name = "http_request", skip_all)]
   /// wrapper request fn
@@ -71,7 +71,7 @@ impl<B> HttpClient<HttpConnector, B>
 where
   B: Body + Send + Unpin + 'static,
   <B as Body>::Data: Send,
-  <B as Body>::Error: Into<Box<(dyn std::error::Error + Send + Sync + 'static)>>,
+  <B as Body>::Error: Into<Box<dyn std::error::Error + Send + Sync + 'static>>,
 {
   /// Build inner client with http
   pub fn try_new(runtime_handle: tokio::runtime::Handle) -> Result<Self> {
@@ -96,7 +96,7 @@ impl<B> HttpClient<hyper_tls::HttpsConnector<HttpConnector>, B>
 where
   B: Body + Send + Unpin + 'static,
   <B as Body>::Data: Send,
-  <B as Body>::Error: Into<Box<(dyn std::error::Error + Send + Sync + 'static)>>,
+  <B as Body>::Error: Into<Box<dyn std::error::Error + Send + Sync + 'static>>,
 {
   /// Build inner client with hyper-tls
   pub fn try_new(runtime_handle: tokio::runtime::Handle) -> Result<Self> {
@@ -126,7 +126,7 @@ impl<B> HttpClient<hyper_rustls::HttpsConnector<HttpConnector>, B>
 where
   B: Body + Send + Unpin + 'static,
   <B as Body>::Data: Send,
-  <B as Body>::Error: Into<Box<(dyn std::error::Error + Send + Sync + 'static)>>,
+  <B as Body>::Error: Into<Box<dyn std::error::Error + Send + Sync + 'static>>,
 {
   /// Build forwarder
   pub fn try_new(runtime_handle: tokio::runtime::Handle) -> Result<Self> {

modoh-lib/src/relay/relay_handle_url.rs

@@ -16,11 +16,7 @@ fn is_looped(current_url: &Url) -> bool {
   let mut seen = vec![current_url.host_str().unwrap_or(HOSTNAME).to_ascii_lowercase()];
   let hostnames = current_url.query_pairs().filter_map(|(k, v)| {
     // filter "targethost" or "relayhost"
-    if k.contains("host") {
-      Some(v)
-    } else {
-      None
-    }
+    if k.contains("host") { Some(v) } else { None }
   });
   for h in hostnames {
     let hostname = h.to_ascii_lowercase();
@@ -37,7 +33,7 @@ where
   C: Send + Sync + Connect + Clone + 'static,
   B: Body + Send + Unpin + 'static,
   <B as Body>::Data: Send,
-  <B as Body>::Error: Into<Box<(dyn std::error::Error + Send + Sync + 'static)>>,
+  <B as Body>::Error: Into<Box<dyn std::error::Error + Send + Sync + 'static>>,
 {
   #[instrument(level = "debug", skip_all)]
   /// build next-hop url with loop detection and max subsequent nodes check
@@ -118,7 +114,7 @@ where
 mod tests {
   use super::*;
   use crate::hyper_client::HttpClient;
-  use hyper::{body::Incoming, HeaderMap};
+  use hyper::{HeaderMap, body::Incoming};
   use std::sync::Arc;
 
   #[test]
@@ -179,7 +175,10 @@ mod tests {
 
     let url = Url::parse("https://example1.com/proxy?targethost=example2.com&targetpath=/dns-query&relayhost[1]=example3.com&relaypath[1]=/proxy&relayhost[2]=example4.com&relaypath[2]=/proxy").unwrap();
     let next_hop_url = inner.build_nexthop_url(&url).unwrap();
-    assert_eq!(next_hop_url.as_str(), "https://example3.com/proxy?relayhost%5B1%5D=example4.com&relaypath%5B1%5D=%2Fproxy&targethost=example2.com&targetpath=%2Fdns-query");
+    assert_eq!(
+      next_hop_url.as_str(),
+      "https://example3.com/proxy?relayhost%5B1%5D=example4.com&relaypath%5B1%5D=%2Fproxy&targethost=example2.com&targetpath=%2Fdns-query"
+    );
 
     let url = Url::parse("https://example1.com/proxy?targethost=example2.com&targetpath=/dns-query&relayhost[1]=example3.com&relaypath[1]=/proxy&relayhost[2]=example4.com&relaypath[2]=/proxy&relayhost[3]=example5.com&relaypath[3]=/proxy").unwrap();
     let next_hop_url = inner.build_nexthop_url(&url);

modoh-lib/src/relay/relay_main.rs

@@ -5,14 +5,14 @@ use crate::{
   httpsig_handler::HttpSigKeysHandler,
   hyper_body::{BoxBody, IncomingOr},
   hyper_client::HttpClient,
-  message_util::{check_content_type, inspect_host, inspect_request_body, RequestType},
+  message_util::{RequestType, check_content_type, inspect_host, inspect_request_body},
   request_filter::RequestFilter,
   trace::*,
 };
 use http::{
+  Method, Request, Response,
   header::{self, HeaderMap, HeaderValue},
   request::Parts,
-  Method, Request, Response,
 };
 use hyper::body::{Body, Incoming};
 use hyper_util::client::legacy::connect::Connect;
@@ -26,7 +26,7 @@ where
   C: Send + Sync + Connect + Clone + 'static,
   B: Body + Send + Unpin + 'static,
   <B as Body>::Data: Send,
-  <B as Body>::Error: Into<Box<(dyn std::error::Error + Send + Sync + 'static)>>,
+  <B as Body>::Error: Into<Box<dyn std::error::Error + Send + Sync + 'static>>,
 {
   /// hyper client
   pub(super) inner: Arc<HttpClient<C, B>>,

modoh-lib/src/validator/validator_jwks_service.rs

@@ -1,7 +1,7 @@
 use super::validator_main::Validator;
 use crate::{constants::JWKS_REFETCH_DELAY_SEC, error::*, hyper_client::HttpClient, trace::*};
 use auth_validator::JwksHttpClient;
-use futures::{select, FutureExt};
+use futures::{FutureExt, select};
 use hyper::body::Body;
 use hyper_util::client::legacy::connect::Connect;
 use std::{sync::Arc, time::Duration};
@@ -12,7 +12,7 @@ where
   C: Send + Sync + Connect + Clone + 'static,
   B: Body + Send + Unpin + 'static,
   <B as Body>::Data: Send,
-  <B as Body>::Error: Into<Box<(dyn std::error::Error + Send + Sync + 'static)>>,
+  <B as Body>::Error: Into<Box<dyn std::error::Error + Send + Sync + 'static>>,
   HttpClient<C, B>: JwksHttpClient,
 {
   /// Check token expiration every 60 secs, and refresh if the token is about to expire.

modoh-lib/src/validator/validator_main.rs

@@ -6,8 +6,8 @@ use crate::{
   hyper_client::HttpClient,
 };
 use async_trait::async_trait;
-use auth_validator::{reexports::Claims, JwksHttpClient, TokenValidator};
-use http::{header, HeaderValue, Method, Request};
+use auth_validator::{JwksHttpClient, TokenValidator, reexports::Claims};
+use http::{HeaderValue, Method, Request, header};
 use http_body_util::{BodyExt, Empty};
 use hyper::body::{Body, Buf, Bytes};
 use hyper_util::client::legacy::connect::Connect;
@@ -80,7 +80,7 @@ where
   C: Send + Sync + Connect + Clone + 'static,
   B: Body + Send + Unpin + 'static,
   <B as Body>::Data: Send,
-  <B as Body>::Error: Into<Box<(dyn std::error::Error + Send + Sync + 'static)>>,
+  <B as Body>::Error: Into<Box<dyn std::error::Error + Send + Sync + 'static>>,
   HttpClient<C, B>: JwksHttpClient,
 {
   pub(super) inner: TokenValidator<HttpClient<C, B>>,
@@ -91,7 +91,7 @@ where
   C: Send + Sync + Connect + Clone + 'static,
   B: Body + Send + Unpin + 'static,
   <B as Body>::Data: Send,
-  <B as Body>::Error: Into<Box<(dyn std::error::Error + Send + Sync + 'static)>>,
+  <B as Body>::Error: Into<Box<dyn std::error::Error + Send + Sync + 'static>>,
   HttpClient<C, B>: JwksHttpClient,
 {
   #[instrument(name = "validate_request", skip_all)]