Various fixes

- set default frontend rule position to TREE for config - remove debug warnings - apply clippy suggestions Signed-off-by: Eloi DEMOLIS <[email protected]>
sozu-proxy · Feb 10, 2025 · 8eee269 · 8eee269
1 parent 4eb3555
commit 8eee269
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 33 deletions.
diff --git a/bin/src/ctl/request_builder.rs b/bin/src/ctl/request_builder.rs
@@ -76,11 +76,7 @@ impl CommandManager {
 
     pub fn reload_configuration(&mut self, path: Option<String>) -> Result<(), CtlError> {
         debug!("Reloading configuration…");
-        let path = match path {
-            Some(p) => p,
-            None => String::new(),
-        };
-        self.send_request(RequestType::ReloadConfiguration(path).into())
+        self.send_request(RequestType::ReloadConfiguration(path.unwrap_or_default()).into())
     }
 
     pub fn list_frontends(
@@ -246,10 +242,7 @@ impl CommandManager {
                     path: PathRule::from_cli_options(path_prefix, path_regex, path_equals),
                     method: method.map(String::from),
                     position: RulePosition::Tree.into(),
-                    tags: match tags {
-                        Some(tags) => tags,
-                        None => BTreeMap::new(),
-                    },
+                    tags: tags.unwrap_or_default(),
                     required_auth: todo!(),
                     redirect: todo!(),
                     redirect_scheme: todo!(),
@@ -302,10 +295,7 @@ impl CommandManager {
                     path: PathRule::from_cli_options(path_prefix, path_regex, path_equals),
                     method: method.map(String::from),
                     position: RulePosition::Tree.into(),
-                    tags: match tags {
-                        Some(tags) => tags,
-                        None => BTreeMap::new(),
-                    },
+                    tags: tags.unwrap_or_default(),
                     required_auth: todo!(),
                     redirect: todo!(),
                     redirect_scheme: todo!(),

diff --git a/command/src/config.rs b/command/src/config.rs
@@ -624,7 +624,7 @@ pub struct FileClusterFrontendConfig {
     pub certificate_chain: Option<String>,
     #[serde(default)]
     pub tls_versions: Vec<TlsVersion>,
-    #[serde(default)]
+    #[serde(default = "default_rule_position")]
     pub position: RulePosition,
     pub tags: Option<BTreeMap<String, String>>,
     pub required_auth: Option<bool>,
@@ -727,7 +727,7 @@ impl FileClusterFrontendConfig {
             redirect_template: self.redirect_template.clone(),
             rewrite_host: self.rewrite_host.clone(),
             rewrite_path: self.rewrite_path.clone(),
-            rewrite_port: self.rewrite_port.clone(),
+            rewrite_port: self.rewrite_port,
             headers: self.headers.clone(),
         })
     }
@@ -848,7 +848,7 @@ impl FileClusterConfig {
                 self.authorized_hashes
                     .iter()
                     .map(|hash| {
-                        hex::decode(&hash)
+                        hex::decode(hash)
                             .map_err(|_| ConfigError::InvalidHash(hash.clone()))
                             .and_then(|v| {
                                 v.try_into()
@@ -887,7 +887,7 @@ pub struct HttpFrontendConfig {
     pub certificate_chain: Option<Vec<String>>,
     #[serde(default)]
     pub tls_versions: Vec<TlsVersion>,
-    #[serde(default)]
+    #[serde(default = "default_rule_position")]
     pub position: RulePosition,
     pub tags: Option<BTreeMap<String, String>>,
     pub required_auth: bool,
@@ -900,6 +900,10 @@ pub struct HttpFrontendConfig {
     pub headers: Vec<Header>,
 }
 
+fn default_rule_position() -> RulePosition {
+    RulePosition::Tree
+}
+
 impl HttpFrontendConfig {
     pub fn generate_requests(&self, cluster_id: &str) -> Vec<Request> {
         let mut v = Vec::new();

diff --git a/lib/src/protocol/kawa_h1/answers.rs b/lib/src/protocol/kawa_h1/answers.rs
@@ -1007,9 +1007,7 @@ impl HttpAnswers {
                     name.into(),
                 ];
                 variables_once = vec![location.into()];
-                // custom_name_owner = name;
-                // &custom_name_owner
-                unsafe { &from_utf8_unchecked(variables[3].as_bytes()) }
+                unsafe { from_utf8_unchecked(variables[3].as_bytes()) }
             }
         };
         // kawa::debug_kawa(&template.kawa);

diff --git a/lib/src/protocol/kawa_h1/mod.rs b/lib/src/protocol/kawa_h1/mod.rs
@@ -1394,9 +1394,6 @@ impl<Front: SocketHandler, L: ListenerHandler + L7ListenerHandler> Http<Front, L
                     self.set_answer(DefaultAnswer::Answer301 { location });
                     return Err(RetrieveClusterError::Redirected);
                 }
-                warn!("{:?}", body);
-                warn!("{:?}", headers_request);
-                warn!("{:?}", headers_response);
                 apply_header_edits(&mut self.request_stream, headers_request);
                 self.request_stream.blocks.extend(body);
                 self.context.headers_response = headers_response;

diff --git a/lib/src/router/mod.rs b/lib/src/router/mod.rs
@@ -65,11 +65,11 @@ impl Router {
         }
     }
 
-    pub fn lookup<'a, 'b>(
-        &'a self,
-        hostname: &'b str,
-        path: &'b str,
-        method: &'b Method,
+    pub fn lookup<'a>(
+        &self,
+        hostname: &'a str,
+        path: &'a str,
+        method: &'a Method,
     ) -> Result<RouteResult, RouterError> {
         let hostname_b = hostname.as_bytes();
         let path_b = path.as_bytes();
@@ -529,7 +529,7 @@ pub enum PathRule {
     Equals(String),
 }
 
-#[derive(PartialEq, Eq)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum PathRuleResult {
     Regex,
     Prefix(usize),
@@ -697,7 +697,7 @@ impl RewriteParts {
         }
         Some(Self(result))
     }
-    pub fn run(&self, host_captures: &Vec<&str>, path_captures: &Vec<&str>) -> String {
+    pub fn run(&self, host_captures: &[&str], path_captures: &[&str]) -> String {
         let mut cap = 0;
         for part in &self.0 {
             cap += match part {
@@ -977,7 +977,7 @@ impl RouteResult {
                 }
                 PathRule::Regex(regex) => captures_path.extend(
                     regex
-                        .captures(&path)
+                        .captures(path)
                         .unwrap()
                         .iter()
                         .map(|c| unsafe { from_utf8_unchecked(c.unwrap().as_bytes()) }),
@@ -1028,7 +1028,7 @@ impl RouteResult {
                     .push(unsafe { from_utf8_unchecked(&domain[..domain.len() - suffix.len()]) }),
                 DomainRule::Regex(regex) => captures_host.extend(
                     regex
-                        .captures(&domain)
+                        .captures(domain)
                         .unwrap()
                         .iter()
                         .skip(1)
@@ -1065,7 +1065,7 @@ impl RouteResult {
                     }
                     TrieSubMatch::Regexp(part, regex) => captures_host.extend(
                         regex
-                            .captures(&part)
+                            .captures(part)
                             .unwrap()
                             .iter()
                             .skip(1)