itsscb/askama
1
0
Fork 0
mirror of https://github.com/askama-rs/askama.git synced 2025-09-28 13:30:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: canonicalize paths to ensure hashmap lookups behave as expected

Browse Source
This commit is contained in:
Luca Palmieri 2024-12-15 12:08:39 +01:00
parent f0ac41df30
commit 2cf65d18cc
1 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
rinja_derive/src/config.rs
View File

@ -182,27 +182,40 @@ impl Config {
start_at: Option<&Path>,
file_info: Option<FileInfo<'_>>,
) -> Result<Arc<Path>, CompileError> {
if let Some(root) = start_at {
let relative = root.with_file_name(path);
if relative.exists() {
return Ok(relative.into());
fn _find_template(config: &Config, path: &str, start_at: Option<&Path>) -> Option<PathBuf> {
if let Some(root) = start_at {
let relative = root.with_file_name(path);
if relative.exists() {
return Some(relative);
}
}
for dir in &config.dirs {
let rooted = dir.join(path);
if rooted.exists() {
return Some(rooted);
}
}
None
}
for dir in &self.dirs {
let rooted = dir.join(path);
if rooted.exists() {
return Ok(rooted.into());
}
let Some(path) = _find_template(self, path, start_at) else {
return Err(CompileError::new(
format!(
"template {:?} not found in directories {:?}",
path, self.dirs
),
file_info,
));
};
match path.canonicalize() {
Ok(p) => Ok(p.into()),
Err(e) => Err(CompileError::no_file_info(
format_args!("could not canonicalize path {path:?}: {e}"),
None,
)),
}
Err(CompileError::new(
format!(
"template {:?} not found in directories {:?}",
path, self.dirs
),
file_info,
))
}
}