Merge pull request #573 from fufesou/refact/fs-expose-fn-validate-path

Refact/fs expose fn validate path
This commit is contained in:
RustDesk
2026-07-24 17:08:35 +08:00
committed by GitHub
+2 -1
View File
@@ -553,7 +553,8 @@ fn validate_no_symlink_components(base: &PathBuf, name: &str) -> ResultType<()>
Ok(()) Ok(())
} }
fn join_validated_path(base: &PathBuf, name: &str) -> ResultType<PathBuf> { /// Validate an untrusted relative file name and existing path components before joining it.
pub fn join_validated_path(base: &PathBuf, name: &str) -> ResultType<PathBuf> {
validate_file_name_no_traversal(name)?; validate_file_name_no_traversal(name)?;
validate_no_symlink_components(base, name)?; validate_no_symlink_components(base, name)?;
Ok(TransferJob::join(base, name)) Ok(TransferJob::join(base, name))