TheLanc3/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-03-17 18:21:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: windows, dll, pre-loading attack (#10608)

Browse Source 
Signed-off-by: fufesou <linlong1266@gmail.com>
This commit is contained in:
fufesou
2025-01-26 19:39:38 +08:00
committed by GitHub
parent fc2e27bcf0
commit f08cb0412d
7 changed files with 138 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/flutter.rs
View File

@@ -19,6 +19,7 @@ use serde_json::json;
use std::{
collections::{HashMap, HashSet},
ffi::CString,
io::{Error as IoError, ErrorKind as IoErrorKind},
os::raw::{c_char, c_int, c_void},
str::FromStr,
sync::{
@@ -50,7 +51,7 @@ lazy_static::lazy_static! {
#[cfg(target_os = "windows")]
lazy_static::lazy_static! {
pub static ref TEXTURE_RGBA_RENDERER_PLUGIN: Result<Library, LibError> = Library::open("texture_rgba_renderer_plugin.dll");
pub static ref TEXTURE_RGBA_RENDERER_PLUGIN: Result<Library, LibError> = load_plugin_in_app_path("texture_rgba_renderer_plugin.dll");
}
#[cfg(target_os = "linux")]
@@ -65,7 +66,37 @@ lazy_static::lazy_static! {
#[cfg(target_os = "windows")]
lazy_static::lazy_static! {
pub static ref TEXTURE_GPU_RENDERER_PLUGIN: Result<Library, LibError> = Library::open("flutter_gpu_texture_renderer_plugin.dll");
pub static ref TEXTURE_GPU_RENDERER_PLUGIN: Result<Library, LibError> = load_plugin_in_app_path("flutter_gpu_texture_renderer_plugin.dll");
}
// Move this function into `src/platform/windows.rs` if there're more calls to load plugins.
// Load dll with full path.
#[cfg(target_os = "windows")]
fn load_plugin_in_app_path(dll_name: &str) -> Result<Library, LibError> {
match std::env::current_exe() {
Ok(exe_file) => {
if let Some(cur_dir) = exe_file.parent() {
let full_path = cur_dir.join(dll_name);
if !full_path.exists() {
Err(LibError::OpeningLibraryError(IoError::new(
IoErrorKind::NotFound,
format!("{} not found", dll_name),
)))
} else {
Library::open(full_path)
}
} else {
Err(LibError::OpeningLibraryError(IoError::new(
IoErrorKind::Other,
format!(
"Invalid exe parent for {}",
exe_file.to_string_lossy().as_ref()
),
)))
}
}
Err(e) => Err(LibError::OpeningLibraryError(e)),
}
}
/// FFI for rustdesk core's main entry.
@@ -2076,11 +2107,7 @@ pub mod sessions {
}
pub(super) mod async_tasks {
use hbb_common::{
bail,
tokio::{self, select},
ResultType,
};
use hbb_common::{bail, tokio, ResultType};
use std::{
collections::HashMap,
sync::{