Hopiu/lychee
1
0
Fork 0
mirror of https://github.com/Hopiu/lychee.git synced 2026-05-10 06:44:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: resolve index file inside a directory (#1752)

Browse source
This commit is contained in:
ocavue 2025-07-04 00:55:57 +10:00 committed by GitHub
parent 845f74bab0
commit 6bcb37c2dc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 145 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
fixtures/fragments-fallback-extensions/empty_dir/.gitkeep vendored Normal file
View file

14
fixtures/fragments-fallback-extensions/index.html vendored Normal file
View file

@ -0,0 +1,14 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>Fallback Extensions Fragments</title>
</head>
<body>
<a href="sub_dir#valid-id">1</a>
<a href="sub_dir#invalid-id">2</a>
<a href="empty_dir#invalid-id">3</a>
</body>
</html>

12
fixtures/fragments-fallback-extensions/sub_dir/index.html vendored Normal file
View file

@ -0,0 +1,12 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>Fallback Extensions Fragments</title>
</head>
<body>
<h1 id="valid-id">ID</h1>
</body>
</html>

18
lychee-bin/tests/cli.rs
View file

@ -1926,6 +1926,24 @@ mod cli {
.stdout(contains("0 Errors")); .stdout(contains("0 Errors"));
} }
#[test]
fn test_fragments_fallback_extensions() {
let mut cmd = main_command();
let input = fixtures_path().join("fragments-fallback-extensions");
cmd.arg("--include-fragments")
.arg("--fallback-extensions=html")
.arg("--no-progress")
.arg("--offline")
.arg("-v")
.arg(input)
.assert()
.failure()
.stdout(contains("3 Total"))
.stdout(contains("1 OK"))
.stdout(contains("2 Errors"));
}
/// Test relative paths /// Test relative paths
/// ///
/// Imagine a web server hosting a site with the following structure: /// Imagine a web server hosting a site with the following structure:

154
lychee-lib/src/checker/file.rs
View file

@ -105,65 +105,113 @@ impl FileChecker {
/// ///
/// Returns a `Status` indicating the result of the check. /// Returns a `Status` indicating the result of the check.
async fn check_path(&self, path: &Path, uri: &Uri) -> Status { async fn check_path(&self, path: &Path, uri: &Uri) -> Status {
if path.exists() { let file_path = self.resolve_file_path(path);
return self.check_existing_path(path, uri).await; let has_fragment = uri.url.fragment().is_some_and(|x| !x.is_empty());
// If file_path exists, check this file
if file_path.is_some() {
return self.check_file(&file_path.unwrap(), uri).await;
} }
// If path is a directory, and we cannot find an index file inside it,
self.check_with_fallback_extensions(path, uri).await // and we don't have a fragment, just return success. This is for
} // backward compatibility.
else if path.is_dir() && !has_fragment {
/// Checks an existing path, optionally verifying fragments for HTML files. return Status::Ok(StatusCode::OK);
///
/// # Arguments
///
/// * `path` - The path to check.
/// * `uri` - The original URI, used for error reporting.
///
/// # Returns
///
/// Returns a `Status` indicating the result of the check.
async fn check_existing_path(&self, path: &Path, uri: &Uri) -> Status {
// Only files can contain content with fragments.
// Skip if the uri doesn't have the fragment.
if self.include_fragments
&& path.is_file()
&& uri.url.fragment().is_some_and(|x| !x.is_empty())
{
self.check_fragment(path, uri).await
} else {
Status::Ok(StatusCode::OK)
}
}
/// Attempts to find a file by trying different extensions specified in `fallback_extensions`.
///
/// # Arguments
///
/// * `path` - The original path to check.
/// * `uri` - The original URI, used for error reporting.
///
/// # Returns
///
/// Returns a `Status` indicating the result of the check.
async fn check_with_fallback_extensions(&self, path: &Path, uri: &Uri) -> Status {
let mut path_buf = path.to_path_buf();
// If the path already has an extension, try it first
if path_buf.extension().is_some() && path_buf.exists() {
return self.check_existing_path(&path_buf, uri).await;
}
// Try fallback extensions
for ext in &self.fallback_extensions {
path_buf.set_extension(ext);
if path_buf.exists() {
return self.check_existing_path(&path_buf, uri).await;
}
} }
ErrorKind::InvalidFilePath(uri.clone()).into() ErrorKind::InvalidFilePath(uri.clone()).into()
} }
/// Resolves a path to an actual file, applying fallback extensions and directory index resolution.
///
/// # Arguments
///
/// * `path` - The path to resolve.
///
/// # Returns
///
/// Returns `Some(PathBuf)` with the resolved file path, or `None` if no valid file is found.
fn resolve_file_path(&self, path: &Path) -> Option<PathBuf> {
// If it's already a file, use it directly
if path.is_file() {
return Some(path.to_path_buf());
}
// Try fallback extensions
let mut path_buf = path.to_path_buf();
for ext in &self.fallback_extensions {
path_buf.set_extension(ext);
if path_buf.exists() && path_buf.is_file() {
return Some(path_buf);
}
}
// If it's a directory, try to find an index file
if path.is_dir() {
return self.get_index_file_path(path);
}
None
}
/// Tries to find an index file in the given directory, returning the first match.
///
/// Searches for `index.{ext}` files using fallback extensions, defaulting to `index.html`
/// if no fallback extensions are configured. This encapsulates both the "index" filename
/// convention and the extension resolution logic.
///
/// # Arguments
///
/// * `dir_path` - The directory to search for index files
///
/// # Returns
///
/// Returns `Some(PathBuf)` pointing to the first existing index file, or `None` if no index file is found.
fn get_index_file_path(&self, dir_path: &Path) -> Option<PathBuf> {
// In this function, we hardcode the filename `index` and the extension
// `.html` since `index.html` is the most common scenario when serving a
// page from a directory. However, various servers may support other
// filenames and extensions, such as `README.md`. We could enhance this by
// giving users the option to configure the index filename and extension.
let extensions_to_try = if self.fallback_extensions.is_empty() {
vec!["html".to_string()]
} else {
self.fallback_extensions.clone()
};
for ext in &extensions_to_try {
let index_path = dir_path.join(format!("index.{ext}"));
if index_path.is_file() {
return Some(index_path);
}
}
None
}
/// Checks a resolved file, optionally verifying fragments for HTML files.
///
/// # Arguments
///
/// * `file_path` - The resolved file path to check.
/// * `uri` - The original URI, used for error reporting.
///
/// # Returns
///
/// Returns a `Status` indicating the result of the check.
async fn check_file(&self, file_path: &Path, uri: &Uri) -> Status {
if !file_path.is_file() {
return ErrorKind::InvalidFilePath(uri.clone()).into();
}
// Check if we need to verify fragments
if self.include_fragments && uri.url.fragment().is_some_and(|x| !x.is_empty()) {
self.check_fragment(file_path, uri).await
} else {
Status::Ok(StatusCode::OK)
}
}
/// Checks for the existence of a fragment in an HTML file. /// Checks for the existence of a fragment in an HTML file.
/// ///
/// # Arguments /// # Arguments