max
/
tauri-plugins-workspace
mirror of https://github.com/tauri-apps/plugins-workspace
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 4fa05f7799 into 4089002880

Browse Source
pull/1939/merge
Amr Bashir 3 months ago committed by GitHub
parent 4089002880 4fa05f7799
commit 15551045a6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 112 additions and 19 deletions
Show Stats Download Patch File Download Diff File

128
plugins/fs/src/commands.rs
Unescape View File

@ -85,6 +85,7 @@ pub fn create<R: Runtime>(
options: Option<BaseOptions>,
) -> CommandResult<ResourceId> {
let resolved_path = resolve_path(
"create",
&webview,
&global_scope,
&command_scope,
@ -119,6 +120,7 @@ pub fn open<R: Runtime>(
options: Option<OpenOptions>,
) -> CommandResult<ResourceId> {
let (file, _path) = resolve_file(
"open",
&webview,
&global_scope,
&command_scope,
@ -172,6 +174,7 @@ pub async fn copy_file<R: Runtime>(
options: Option<CopyFileOptions>,
) -> CommandResult<()> {
let resolved_from_path = resolve_path(
"copy-file",
&webview,
&global_scope,
&command_scope,
@ -179,6 +182,7 @@ pub async fn copy_file<R: Runtime>(
options.as_ref().and_then(|o| o.from_path_base_dir),
)?;
let resolved_to_path = resolve_path(
"copy-file",
&webview,
&global_scope,
&command_scope,
@ -213,6 +217,7 @@ pub fn mkdir<R: Runtime>(
options: Option<MkdirOptions>,
) -> CommandResult<()> {
let resolved_path = resolve_path(
"mkdir",
&webview,
&global_scope,
&command_scope,
@ -260,6 +265,7 @@ pub async fn read_dir<R: Runtime>(
options: Option<BaseOptions>,
) -> CommandResult<Vec<DirEntry>> {
let resolved_path = resolve_path(
"read-dir",
&webview,
&global_scope,
&command_scope,
@ -336,8 +342,8 @@ pub async fn read<R: Runtime>(
Ok(tauri::ipc::Response::new(data))
}
#[tauri::command]
pub async fn read_file<R: Runtime>(
async fn read_file_inner<R: Runtime>(
permission: &str,
webview: Webview<R>,
global_scope: GlobalScope<Entry>,
command_scope: CommandScope<Entry>,
@ -345,6 +351,7 @@ pub async fn read_file<R: Runtime>(
options: Option<BaseOptions>,
) -> CommandResult<tauri::ipc::Response> {
let (mut file, path) = resolve_file(
permission,
&webview,
&global_scope,
&command_scope,
@ -372,6 +379,25 @@ pub async fn read_file<R: Runtime>(
Ok(tauri::ipc::Response::new(contents))
}
#[tauri::command]
pub async fn read_file<R: Runtime>(
webview: Webview<R>,
global_scope: GlobalScope<Entry>,
command_scope: CommandScope<Entry>,
path: SafeFilePath,
options: Option<BaseOptions>,
) -> CommandResult<tauri::ipc::Response> {
read_file_inner(
"read-file",
webview,
global_scope,
command_scope,
path,
options,
)
.await
}
// TODO, remove in v3, rely on `read_file` command instead
#[tauri::command]
pub async fn read_text_file<R: Runtime>(
@ -381,7 +407,15 @@ pub async fn read_text_file<R: Runtime>(
path: SafeFilePath,
options: Option<BaseOptions>,
) -> CommandResult<tauri::ipc::Response> {
read_file(webview, global_scope, command_scope, path, options).await
read_file_inner(
"read-text-file",
webview,
global_scope,
command_scope,
path,
options,
)
.await
}
#[tauri::command]
@ -393,6 +427,7 @@ pub fn read_text_file_lines<R: Runtime>(
options: Option<BaseOptions>,
) -> CommandResult<ResourceId> {
let resolved_path = resolve_path(
"read-text-file-lines",
&webview,
&global_scope,
&command_scope,
@ -457,6 +492,7 @@ pub fn remove<R: Runtime>(
options: Option<RemoveOptions>,
) -> CommandResult<()> {
let resolved_path = resolve_path(
"remove",
&webview,
&global_scope,
&command_scope,
@ -526,6 +562,7 @@ pub fn rename<R: Runtime>(
options: Option<RenameOptions>,
) -> CommandResult<()> {
let resolved_old_path = resolve_path(
"rename",
&webview,
&global_scope,
&command_scope,
@ -533,6 +570,7 @@ pub fn rename<R: Runtime>(
options.as_ref().and_then(|o| o.old_path_base_dir),
)?;
let resolved_new_path = resolve_path(
"rename",
&webview,
&global_scope,
&command_scope,
@ -580,6 +618,7 @@ pub async fn seek<R: Runtime>(
#[cfg(target_os = "android")]
fn get_metadata<R: Runtime, F: FnOnce(&PathBuf) -> std::io::Result<std::fs::Metadata>>(
permission: &str,
metadata_fn: F,
webview: &Webview<R>,
global_scope: &GlobalScope<Entry>,
@ -590,6 +629,7 @@ fn get_metadata<R: Runtime, F: FnOnce(&PathBuf) -> std::io::Result<std::fs::Meta
match path {
SafeFilePath::Url(url) => {
let (file, path) = resolve_file(
permission,
webview,
global_scope,
command_scope,
@ -611,6 +651,7 @@ fn get_metadata<R: Runtime, F: FnOnce(&PathBuf) -> std::io::Result<std::fs::Meta
})
}
SafeFilePath::Path(p) => get_fs_metadata(
permission,
metadata_fn,
webview,
global_scope,
@ -623,6 +664,7 @@ fn get_metadata<R: Runtime, F: FnOnce(&PathBuf) -> std::io::Result<std::fs::Meta
#[cfg(not(target_os = "android"))]
fn get_metadata<R: Runtime, F: FnOnce(&PathBuf) -> std::io::Result<std::fs::Metadata>>(
permission: &str,
metadata_fn: F,
webview: &Webview<R>,
global_scope: &GlobalScope<Entry>,
@ -631,6 +673,7 @@ fn get_metadata<R: Runtime, F: FnOnce(&PathBuf) -> std::io::Result<std::fs::Meta
options: Option<BaseOptions>,
) -> CommandResult<std::fs::Metadata> {
get_fs_metadata(
permission,
metadata_fn,
webview,
global_scope,
@ -641,6 +684,7 @@ fn get_metadata<R: Runtime, F: FnOnce(&PathBuf) -> std::io::Result<std::fs::Meta
}
fn get_fs_metadata<R: Runtime, F: FnOnce(&PathBuf) -> std::io::Result<std::fs::Metadata>>(
permission: &str,
metadata_fn: F,
webview: &Webview<R>,
global_scope: &GlobalScope<Entry>,
@ -649,6 +693,7 @@ fn get_fs_metadata<R: Runtime, F: FnOnce(&PathBuf) -> std::io::Result<std::fs::M
options: Option<BaseOptions>,
) -> CommandResult<std::fs::Metadata> {
let resolved_path = resolve_path(
permission,
webview,
global_scope,
command_scope,
@ -673,6 +718,7 @@ pub fn stat<R: Runtime>(
options: Option<BaseOptions>,
) -> CommandResult<FileInfo> {
let metadata = get_metadata(
"stat",
|p| std::fs::metadata(p),
&webview,
&global_scope,
@ -693,6 +739,7 @@ pub fn lstat<R: Runtime>(
options: Option<BaseOptions>,
) -> CommandResult<FileInfo> {
let metadata = get_metadata(
"lstat",
|p| std::fs::symlink_metadata(p),
&webview,
&global_scope,
@ -721,6 +768,7 @@ pub async fn truncate<R: Runtime>(
options: Option<BaseOptions>,
) -> CommandResult<()> {
let resolved_path = resolve_path(
"truncate",
&webview,
&global_scope,
&command_scope,
@ -789,23 +837,13 @@ fn default_create_value() -> bool {
true
}
#[tauri::command]
pub async fn write_file<R: Runtime>(
async fn write_file_inner<R: Runtime>(
permission: &str,
webview: Webview<R>,
global_scope: GlobalScope<Entry>,
command_scope: CommandScope<Entry>,
request: tauri::ipc::Request<'_>,
) -> CommandResult<()> {
let data = match request.body() {
tauri::ipc::InvokeBody::Raw(data) => Cow::Borrowed(data),
tauri::ipc::InvokeBody::Json(serde_json::Value::Array(data)) => Cow::Owned(
data.iter()
.flat_map(|v| v.as_number().and_then(|v| v.as_u64().map(|v| v as u8)))
.collect(),
),
_ => return Err(anyhow::anyhow!("unexpected invoke body").into()),
};
let path = request
.headers()
.get("path")
@ -816,6 +854,7 @@ pub async fn write_file<R: Runtime>(
.map_err(|_| anyhow::anyhow!("path is not a valid UTF-8").into())
})
.and_then(|p| SafeFilePath::from_str(&p).map_err(CommandError::from))?;
let options: Option<WriteFileOptions> = request
.headers()
.get("options")
@ -823,6 +862,7 @@ pub async fn write_file<R: Runtime>(
.and_then(|opts| serde_json::from_str(opts).ok());
let (mut file, path) = resolve_file(
permission,
&webview,
&global_scope,
&command_scope,
@ -858,6 +898,16 @@ pub async fn write_file<R: Runtime>(
},
)?;
let data = match request.body() {
tauri::ipc::InvokeBody::Raw(data) => Cow::Borrowed(data),
tauri::ipc::InvokeBody::Json(serde_json::Value::Array(data)) => Cow::Owned(
data.iter()
.flat_map(|v| v.as_number().and_then(|v| v.as_u64().map(|v| v as u8)))
.collect(),
),
_ => return Err(anyhow::anyhow!("unexpected invoke body").into()),
};
file.write_all(&data)
.map_err(|e| {
format!(
@ -868,6 +918,16 @@ pub async fn write_file<R: Runtime>(
.map_err(Into::into)
}
#[tauri::command]
pub async fn write_file<R: Runtime>(
webview: Webview<R>,
global_scope: GlobalScope<Entry>,
command_scope: CommandScope<Entry>,
request: tauri::ipc::Request<'_>,
) -> CommandResult<()> {
write_file_inner("write-file", webview, global_scope, command_scope, request).await
}
// TODO, remove in v3, rely on `write_file` command instead
#[tauri::command]
pub async fn write_text_file<R: Runtime>(
@ -876,7 +936,14 @@ pub async fn write_text_file<R: Runtime>(
command_scope: CommandScope<Entry>,
request: tauri::ipc::Request<'_>,
) -> CommandResult<()> {
write_file(webview, global_scope, command_scope, request).await
write_file_inner(
"write-text-file",
webview,
global_scope,
command_scope,
request,
)
.await
}
#[tauri::command]
@ -888,6 +955,7 @@ pub fn exists<R: Runtime>(
options: Option<BaseOptions>,
) -> CommandResult<bool> {
let resolved_path = resolve_path(
"exists",
&webview,
&global_scope,
&command_scope,
@ -906,6 +974,7 @@ pub async fn size<R: Runtime>(
options: Option<BaseOptions>,
) -> CommandResult<u64> {
let resolved_path = resolve_path(
"size",
&webview,
&global_scope,
&command_scope,
@ -948,16 +1017,25 @@ fn get_dir_size(path: &PathBuf) -> CommandResult<u64> {
#[cfg(not(target_os = "android"))]
pub fn resolve_file<R: Runtime>(
permission: &str,
webview: &Webview<R>,
global_scope: &GlobalScope<Entry>,
command_scope: &CommandScope<Entry>,
path: SafeFilePath,
open_options: OpenOptions,
) -> CommandResult<(File, PathBuf)> {
resolve_file_in_fs(webview, global_scope, command_scope, path, open_options)
resolve_file_in_fs(
permission,
webview,
global_scope,
command_scope,
path,
open_options,
)
}
fn resolve_file_in_fs<R: Runtime>(
permission: &str,
webview: &Webview<R>,
global_scope: &GlobalScope<Entry>,
command_scope: &CommandScope<Entry>,
@ -965,6 +1043,7 @@ fn resolve_file_in_fs<R: Runtime>(
open_options: OpenOptions,
) -> CommandResult<(File, PathBuf)> {
let path = resolve_path(
permission,
webview,
global_scope,
command_scope,
@ -985,6 +1064,7 @@ fn resolve_file_in_fs<R: Runtime>(
#[cfg(target_os = "android")]
pub fn resolve_file<R: Runtime>(
permission: &str,
webview: &Webview<R>,
global_scope: &GlobalScope<Entry>,
command_scope: &CommandScope<Entry>,
@ -1002,6 +1082,7 @@ pub fn resolve_file<R: Runtime>(
Ok((file, path))
}
SafeFilePath::Path(path) => resolve_file_in_fs(
permission,
webview,
global_scope,
command_scope,
@ -1012,6 +1093,7 @@ pub fn resolve_file<R: Runtime>(
}
pub fn resolve_path<R: Runtime>(
permission: &str,
webview: &Webview<R>,
global_scope: &GlobalScope<Entry>,
command_scope: &CommandScope<Entry>,
@ -1057,7 +1139,17 @@ pub fn resolve_path<R: Runtime>(
if fs_scope.scope.is_allowed(&path) || scope.is_allowed(&path) {
Ok(path)
} else {
Err(CommandError::Plugin(Error::PathForbidden(path)))
#[cfg(not(debug_assertions))]
return Err(CommandError::Plugin(Error::PathForbidden(path)));
#[cfg(debug_assertions)]
Err(
anyhow::anyhow!(
"forbidden path: {}, maybe it is not allowed on the scope for `allow-{permission}` permission in your capability file",
path.display()
)
)
.map_err(Into::into)
}
}

2
plugins/fs/src/mobile.rs
Unescape View File

@ -89,7 +89,7 @@ impl<R: Runtime> Fs<R> {
std::fs::File::from_raw_fd(fd)
})
} else {
todo!()
unimplemented!()
}
}
}

1
plugins/fs/src/watcher.rs
Unescape View File

@ -93,6 +93,7 @@ pub async fn watch<R: Runtime>(
let mut resolved_paths = Vec::with_capacity(paths.capacity());
for path in paths {
resolved_paths.push(resolve_path(
"watch",
&webview,
&global_scope,
&command_scope,

Write Preview
Loading…
Cancel
Save