Ophir LOJKINE
33125565d3
* Check for 404 before redirecting on no-extension paths The commit improves routing logic by checking if a path would result in a 404 fixes https://github.com/sqlpage/SQLPage/issues/971 before adding a trailing slash. This prevents unnecessary redirects when a custom 404 handler exists. * Fix test function signature formatting in routing module (#973) Co-authored-by: Cursor Agent <cursoragent@cursor.com> * Simplify path resolution and redirect logic The shorter code more clearly handles finding files with .sql extensions and decides whether to add trailing slashes based on index file presence. * clippy --------- Co-authored-by: Cursor Agent <cursoragent@cursor.com>
100 lines
3.0 KiB
Rust
100 lines
3.0 KiB
Rust
use actix_web::{
|
|
http::{self, StatusCode},
|
|
test,
|
|
};
|
|
|
|
use crate::common::req_path;
|
|
|
|
#[actix_web::test]
|
|
async fn test_privileged_paths_are_not_accessible() {
|
|
let resp_result = req_path("/sqlpage/migrations/0001_init.sql").await;
|
|
assert!(
|
|
resp_result.is_err(),
|
|
"Accessing a migration file should be forbidden, but received success: {resp_result:?}"
|
|
);
|
|
let resp = resp_result.unwrap_err().error_response();
|
|
assert_eq!(resp.status(), StatusCode::FORBIDDEN);
|
|
let srv_resp = actix_web::test::TestRequest::default().to_srv_response(resp);
|
|
let body = test::read_body(srv_resp).await;
|
|
assert!(String::from_utf8_lossy(&body)
|
|
.to_lowercase()
|
|
.contains("forbidden"),);
|
|
}
|
|
|
|
#[actix_web::test]
|
|
async fn test_404_fallback() {
|
|
for f in [
|
|
"/tests/errors/does_not_exist.sql",
|
|
"/tests/errors/does_not_exist.html",
|
|
"/tests/errors/does_not_exist/",
|
|
] {
|
|
let resp_result = req_path(f).await;
|
|
let resp = resp_result.unwrap();
|
|
assert_eq!(resp.status(), http::StatusCode::OK, "{f} isnt 200");
|
|
|
|
let body = test::read_body(resp).await;
|
|
assert!(body.starts_with(b"<!DOCTYPE html>"));
|
|
let body = String::from_utf8(body.to_vec()).unwrap();
|
|
assert!(body.contains("But the "));
|
|
assert!(body.contains("404.sql"));
|
|
assert!(body.contains("file saved the day!"));
|
|
assert!(!body.contains("error"));
|
|
}
|
|
}
|
|
|
|
#[actix_web::test]
|
|
async fn test_default_404() {
|
|
for f in [
|
|
"/i-do-not-exist.html",
|
|
"/i-do-not-exist.sql",
|
|
"/i-do-not-exist/",
|
|
] {
|
|
let resp_result = req_path(f).await;
|
|
let resp = resp_result.unwrap();
|
|
assert_eq!(
|
|
resp.status(),
|
|
http::StatusCode::NOT_FOUND,
|
|
"{f} should return 404"
|
|
);
|
|
|
|
let body = test::read_body(resp).await;
|
|
assert!(body.starts_with(b"<!DOCTYPE html>"));
|
|
let body = String::from_utf8(body.to_vec()).unwrap();
|
|
let msg = "The page you were looking for does not exist";
|
|
assert!(
|
|
body.contains(msg),
|
|
"{f} should contain '{msg}' but got:\n{body}"
|
|
);
|
|
assert!(!body.contains("error"));
|
|
}
|
|
}
|
|
|
|
#[actix_web::test]
|
|
async fn test_default_404_with_redirect() {
|
|
let resp_result = req_path("/i-do-not-exist").await;
|
|
let resp = resp_result.unwrap();
|
|
assert_eq!(
|
|
resp.status(),
|
|
http::StatusCode::NOT_FOUND,
|
|
"/i-do-not-exist should return 404"
|
|
);
|
|
|
|
let resp_result = req_path("/i-do-not-exist/").await;
|
|
let resp = resp_result.unwrap();
|
|
assert_eq!(
|
|
resp.status(),
|
|
http::StatusCode::NOT_FOUND,
|
|
"/i-do-not-exist/ should return 404"
|
|
);
|
|
|
|
let body = test::read_body(resp).await;
|
|
assert!(body.starts_with(b"<!DOCTYPE html>"));
|
|
let body = String::from_utf8(body.to_vec()).unwrap();
|
|
let msg = "The page you were looking for does not exist";
|
|
assert!(
|
|
body.contains(msg),
|
|
"/i-do-not-exist/ should contain '{msg}' but got:\n{body}"
|
|
);
|
|
assert!(!body.contains("error"));
|
|
}
|