LeonMMcoset/leonwww
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix query param stripping from protocol before match

Browse Source
This commit is contained in:
Face
2025-09-05 18:05:46 +03:00
parent 54ee98e698
commit f55e7f726a
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dns/src/gurt_server.rs
View File

@@ -127,6 +127,7 @@ impl GurtHandler for AppHandler {
}; };
log::info!("Handler started for {} {} from {}", ctx.method(), ctx.path(), ctx.remote_addr); log::info!("Handler started for {} {} from {}", ctx.method(), ctx.path(), ctx.remote_addr);
log::info!("Handler type will be: {:?}", handler_type);
let result = match handler_type { let result = match handler_type {
HandlerType::Index => routes::index(app_state).await, HandlerType::Index => routes::index(app_state).await,
@@ -240,7 +241,6 @@ pub async fn start(cli: crate::Cli) -> std::io::Result<()> {
.route(Route::post("/auth/create-domain-invite"), AppHandler { app_state: app_state.clone(), rate_limit_state: None, handler_type: HandlerType::CreateDomainInvite }) .route(Route::post("/auth/create-domain-invite"), AppHandler { app_state: app_state.clone(), rate_limit_state: None, handler_type: HandlerType::CreateDomainInvite })
.route(Route::post("/auth/redeem-domain-invite"), AppHandler { app_state: app_state.clone(), rate_limit_state: None, handler_type: HandlerType::RedeemDomainInvite }) .route(Route::post("/auth/redeem-domain-invite"), AppHandler { app_state: app_state.clone(), rate_limit_state: None, handler_type: HandlerType::RedeemDomainInvite })
.route(Route::get("/auth/domains"), AppHandler { app_state: app_state.clone(), rate_limit_state: None, handler_type: HandlerType::GetUserDomains }) .route(Route::get("/auth/domains"), AppHandler { app_state: app_state.clone(), rate_limit_state: None, handler_type: HandlerType::GetUserDomains })
.route(Route::get("/auth/domains/*"), AppHandler { app_state: app_state.clone(), rate_limit_state: None, handler_type: HandlerType::GetUserDomains })
.route(Route::post("/domain"), AppHandler { app_state: app_state.clone(), rate_limit_state: Some(rate_limit_state), handler_type: HandlerType::CreateDomain }) .route(Route::post("/domain"), AppHandler { app_state: app_state.clone(), rate_limit_state: Some(rate_limit_state), handler_type: HandlerType::CreateDomain })
.route(Route::get("/domain/*"), AppHandler { app_state: app_state.clone(), rate_limit_state: None, handler_type: HandlerType::GetDomain }) .route(Route::get("/domain/*"), AppHandler { app_state: app_state.clone(), rate_limit_state: None, handler_type: HandlerType::GetDomain })
.route(Route::post("/domain/*"), AppHandler { app_state: app_state.clone(), rate_limit_state: None, handler_type: HandlerType::CreateDomainRecord }) .route(Route::post("/domain/*"), AppHandler { app_state: app_state.clone(), rate_limit_state: None, handler_type: HandlerType::CreateDomainRecord })

11
protocol/library/src/server.rs
View File

@@ -129,8 +129,15 @@ impl Route {
} }
pub fn matches_path(&self, path: &str) -> bool { pub fn matches_path(&self, path: &str) -> bool {
self.path_pattern == path || // Strip query parameters from path for matching
(self.path_pattern.ends_with('*') && path.starts_with(&self.path_pattern[..self.path_pattern.len()-1])) let path_without_query = if let Some(query_pos) = path.find('?') {
&path[..query_pos]
} else {
path
};
self.path_pattern == path_without_query ||
(self.path_pattern.ends_with('*') && path_without_query.starts_with(&self.path_pattern[..self.path_pattern.len()-1]))
} }
} }