CalvinBackup/tauri
1
0
Fork 0
mirror of https://github.com/tauri-apps/tauri.git synced 2026-04-01 10:01:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): scope should not strip the first path component, closes #3592 (#3602)

Browse Source
This commit is contained in:
Lucas Fernandes Nogueira
2022-03-03 13:09:46 -03:00
committed by GitHub
parent 929a83dd4d
commit 4d0e2eccd9
2 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.changes/fix-path-scope-first-component.md Normal file
View File

@@ -0,0 +1,5 @@
---
"tauri": patch
---
Fixes filesystem and asset scope stripping the first component of the allowed path.

26
core/tauri/src/api/path.rs
View File

@@ -138,18 +138,22 @@ pub fn parse<P: AsRef<Path>>(
) -> crate::api::Result<PathBuf> {
let mut p = PathBuf::new();
let mut components = path.as_ref().components();
if let Some(Component::Normal(str)) = components.next() {
if let Some(base_directory) = BaseDirectory::from_variable(&str.to_string_lossy()) {
p.push(resolve_path(
config,
package_info,
env,
"",
Some(base_directory),
)?);
} else {
p.push(str);
match components.next() {
Some(Component::Normal(str)) => {
if let Some(base_directory) = BaseDirectory::from_variable(&str.to_string_lossy()) {
p.push(resolve_path(
config,
package_info,
env,
"",
Some(base_directory),
)?);
} else {
p.push(str);
}
}
Some(component) => p.push(component),
None => (),
}
for component in components {