Skip to content

Commit

Permalink
Merge pull request #1021 from sozu-proxy/add-ids-to-error-when-cluste…
Browse files Browse the repository at this point in the history 
…r-or-backend-not-found

proper logging of RouterError::RouteNotFound
  • Loading branch information
@FlorentinDUBOIS
FlorentinDUBOIS authored Nov 13, 2023
2 parents 2a71e1c + 9b29dcf commit 9ab031b
Show file tree
Hide file tree
Showing 5 changed files with 75 additions and 80 deletions.
11 changes: 4 additions & 7 deletions lib/src/http.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -454,13 +454,10 @@ impl L7ListenerHandler for HttpListener {
*/
let host = unsafe { from_utf8_unchecked(hostname) };

let route = self
.fronts
.lookup(host.as_bytes(), uri.as_bytes(), method)
.ok_or_else(|| {
incr!("http.failed_backend_matching");
FrontendFromRequestError::NoClusterFound
})?;
let route = self.fronts.lookup(host, uri, method).map_err(|e| {
incr!("http.failed_backend_matching");
FrontendFromRequestError::NoClusterFound(e)
})?;

let now = Instant::now();

Expand Down
11 changes: 4 additions & 7 deletions lib/src/https.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -578,13 +578,10 @@ impl L7ListenerHandler for HttpsListener {
// chars in there
let host = unsafe { from_utf8_unchecked(hostname) };

let route = self
.fronts
.lookup(host.as_bytes(), uri.as_bytes(), method)
.ok_or_else(|| {
incr!("http.failed_backend_matching");
FrontendFromRequestError::NoClusterFound
})?;
let route = self.fronts.lookup(host, uri, method).map_err(|e| {
incr!("http.failed_backend_matching");
FrontendFromRequestError::NoClusterFound(e)
})?;

let now = Instant::now();

Expand Down
6 changes: 3 additions & 3 deletions lib/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -574,8 +574,8 @@ pub enum FrontendFromRequestError {
HostParse { host: String, error: String },
#[error("invalid remaining chars after hostname. Host: {0}")]
InvalidCharsAfterHost(String),
#[error("no cluster found")]
NoClusterFound,
#[error("no cluster: {0}")]
NoClusterFound(RouterError),
}

pub trait L7ListenerHandler {
Expand Down Expand Up @@ -637,7 +637,7 @@ pub enum RetrieveClusterError {
NoPath,
#[error("unauthorized route")]
UnauthorizedRoute,
#[error("failed to retrieve the frontend for the request: {0}")]
#[error("{0}")]
RetrieveFrontend(FrontendFromRequestError),
}

Expand Down
125 changes: 63 additions & 62 deletions lib/src/router/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use sozu_command::{

use crate::{protocol::http::parser::Method, router::pattern_trie::TrieNode};

#[derive(thiserror::Error, Debug)]
#[derive(thiserror::Error, Debug, PartialEq)]
pub enum RouterError {
#[error("Could not parse rule from frontend path {0:?}")]
InvalidPathRule(String),
Expand All @@ -24,6 +24,12 @@ pub enum RouterError {
AddRoute(String),
#[error("Could not remove route {0}")]
RemoveRoute(String),
#[error("no route for {method} {host} {path}")]
RouteNotFound {
host: String,
path: String,
method: Method,
},
}

pub struct Router {
Expand All @@ -47,27 +53,34 @@ impl Router {
}
}

pub fn lookup(&self, hostname: &[u8], path: &[u8], method: &Method) -> Option<Route> {
pub fn lookup(
&self,
hostname: &str,
path: &str,
method: &Method,
) -> Result<Route, RouterError> {
let hostname_b = hostname.as_bytes();
let path_b = path.as_bytes();
for (domain_rule, path_rule, method_rule, cluster_id) in &self.pre {
if domain_rule.matches(hostname)
&& path_rule.matches(path) != PathRuleResult::None
if domain_rule.matches(hostname_b)
&& path_rule.matches(path_b) != PathRuleResult::None
&& method_rule.matches(method) != MethodRuleResult::None
{
return Some(cluster_id.clone());
return Ok(cluster_id.clone());
}
}

if let Some((_, path_rules)) = self.tree.lookup(hostname, true) {
if let Some((_, path_rules)) = self.tree.lookup(hostname_b, true) {
let mut prefix_length = 0;
let mut route = None;

for (rule, method_rule, cluster_id) in path_rules {
match rule.matches(path) {
match rule.matches(path_b) {
PathRuleResult::Regex | PathRuleResult::Equals => {
match method_rule.matches(method) {
MethodRuleResult::Equals => return Some(cluster_id.clone()),
MethodRuleResult::Equals => return Ok(cluster_id.clone()),
MethodRuleResult::All => {
prefix_length = path.len();
prefix_length = path_b.len();
route = Some(cluster_id);
}
MethodRuleResult::None => {}
Expand All @@ -94,20 +107,24 @@ impl Router {
}

if let Some(cluster_id) = route {
return Some(cluster_id.clone());
return Ok(cluster_id.clone());
}
}

for (domain_rule, path_rule, method_rule, cluster_id) in self.post.iter() {
if domain_rule.matches(hostname)
&& path_rule.matches(path) != PathRuleResult::None
if domain_rule.matches(hostname_b)
&& path_rule.matches(path_b) != PathRuleResult::None
&& method_rule.matches(method) != MethodRuleResult::None
{
return Some(cluster_id.clone());
return Ok(cluster_id.clone());
}
}

None
Err(RouterError::RouteNotFound {
host: hostname.to_owned(),
path: path.to_owned(),
method: method.to_owned(),
})
}

pub fn add_http_front(&mut self, front: &HttpFrontend) -> Result<(), RouterError> {
Expand Down Expand Up @@ -704,8 +721,8 @@ mod tests {
));
println!("{:#?}", router.tree);
assert_eq!(
router.lookup("www.sozu.io".as_bytes(), "/api".as_bytes(), &Method::Get),
Some(Route::ClusterId("base".to_string()))
router.lookup("www.sozu.io", "/api", &Method::Get),
Ok(Route::ClusterId("base".to_string()))
);
assert!(router.add_tree_rule(
b"*.sozu.io",
Expand All @@ -715,12 +732,12 @@ mod tests {
));
println!("{:#?}", router.tree);
assert_eq!(
router.lookup("www.sozu.io".as_bytes(), "/ap".as_bytes(), &Method::Get),
Some(Route::ClusterId("base".to_string()))
router.lookup("www.sozu.io", "/ap", &Method::Get),
Ok(Route::ClusterId("base".to_string()))
);
assert_eq!(
router.lookup("www.sozu.io".as_bytes(), "/api".as_bytes(), &Method::Get),
Some(Route::ClusterId("api".to_string()))
router.lookup("www.sozu.io", "/api", &Method::Get),
Ok(Route::ClusterId("api".to_string()))
);
}

Expand All @@ -743,8 +760,8 @@ mod tests {
));
println!("{:#?}", router.tree);
assert_eq!(
router.lookup("www.sozu.io".as_bytes(), "/api".as_bytes(), &Method::Get),
Some(Route::ClusterId("base".to_string()))
router.lookup("www.sozu.io", "/api", &Method::Get),
Ok(Route::ClusterId("base".to_string()))
);
assert!(router.add_tree_rule(
b"api.sozu.io",
Expand All @@ -754,12 +771,12 @@ mod tests {
));
println!("{:#?}", router.tree);
assert_eq!(
router.lookup("www.sozu.io".as_bytes(), "/api".as_bytes(), &Method::Get),
Some(Route::ClusterId("base".to_string()))
router.lookup("www.sozu.io", "/api", &Method::Get),
Ok(Route::ClusterId("base".to_string()))
);
assert_eq!(
router.lookup("api.sozu.io".as_bytes(), "/api".as_bytes(), &Method::Get),
Some(Route::ClusterId("api".to_string()))
router.lookup("api.sozu.io", "/api", &Method::Get),
Ok(Route::ClusterId("api".to_string()))
);
}

Expand All @@ -782,26 +799,23 @@ mod tests {
));
println!("{:#?}", router.tree);
assert_eq!(
router.lookup("www.sozu.io".as_bytes(), "/".as_bytes(), &Method::Get),
Some(Route::ClusterId("base".to_string()))
router.lookup("www.sozu.io", "/", &Method::Get),
Ok(Route::ClusterId("base".to_string()))
);
assert_eq!(
router.lookup("www.doc.sozu.io".as_bytes(), "/".as_bytes(), &Method::Get),
Some(Route::ClusterId("doc".to_string()))
router.lookup("www.doc.sozu.io", "/", &Method::Get),
Ok(Route::ClusterId("doc".to_string()))
);
assert!(router.remove_tree_rule(
b"www./.*/.io",
&PathRule::Prefix("".to_string()),
&MethodRule::new(Some("GET".to_string()))
));
println!("{:#?}", router.tree);
assert!(router.lookup("www.sozu.io", "/", &Method::Get).is_err());
assert_eq!(
router.lookup("www.sozu.io".as_bytes(), "/".as_bytes(), &Method::Get),
None
);
assert_eq!(
router.lookup("www.doc.sozu.io".as_bytes(), "/".as_bytes(), &Method::Get),
Some(Route::ClusterId("doc".to_string()))
router.lookup("www.doc.sozu.io", "/", &Method::Get),
Ok(Route::ClusterId("doc".to_string()))
);
}

Expand Down Expand Up @@ -835,44 +849,31 @@ mod tests {
));

assert_eq!(
router.lookup(
"www.example.com".as_bytes(),
"/helloA".as_bytes(),
&Method::new(&b"GET"[..])
),
Some(Route::ClusterId("example".to_string()))
);
assert_eq!(
router.lookup(
"www.example.com".as_bytes(),
"/.well-known/acme-challenge".as_bytes(),
&Method::new(&b"GET"[..])
),
Some(Route::ClusterId("acme".to_string()))
router.lookup("www.example.com", "/helloA", &Method::new(&b"GET"[..])),
Ok(Route::ClusterId("example".to_string()))
);
assert_eq!(
router.lookup(
"www.test.example.com".as_bytes(),
"/".as_bytes(),
"www.example.com",
"/.well-known/acme-challenge",
&Method::new(&b"GET"[..])
),
None
Ok(Route::ClusterId("acme".to_string()))
);
assert!(router
.lookup("www.test.example.com", "/", &Method::new(&b"GET"[..]))
.is_err());
assert_eq!(
router.lookup(
"www.test.example.com".as_bytes(),
"/helloAB/".as_bytes(),
"www.test.example.com",
"/helloAB/",
&Method::new(&b"GET"[..])
),
Some(Route::ClusterId("examplewildcard".to_string()))
Ok(Route::ClusterId("examplewildcard".to_string()))
);
assert_eq!(
router.lookup(
"test1.example.com".as_bytes(),
"/helloAB/".as_bytes(),
&Method::new(&b"GET"[..])
),
Some(Route::ClusterId("exampleregex".to_string()))
router.lookup("test1.example.com", "/helloAB/", &Method::new(&b"GET"[..])),
Ok(Route::ClusterId("exampleregex".to_string()))
);
}
}
2 changes: 1 addition & 1 deletion lib/src/tcp.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,7 @@ impl TcpSession {
}
// TODO: should we return CloseSession here?
Err(connection_error) => {
error!("Error connecting to backend: {}", connection_error);
error!("Error connecting to backend: {}", connection_error)
}
}
} else if self.back_readiness().unwrap().event != Ready::EMPTY {
Expand Down

0 comments on commit 9ab031b

Please sign in to comment.