hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

If an ID contains invalid filename characters, encode it using base64

Browse Source
This commit is contained in:
Robin Fackler 2022-11-23 15:07:56 +01:00
parent e1516d809f
commit 29978f1a3e
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
libs/hbb_common/src/config.rs
View File

@ -11,7 +11,9 @@ use std::{
use anyhow::Result; use anyhow::Result;
use directories_next::ProjectDirs; use directories_next::ProjectDirs;
use rand::Rng; use rand::Rng;
use regex::Regex;
use serde_derive::{Deserialize, Serialize}; use serde_derive::{Deserialize, Serialize};
use sodiumoxide::base64;
use sodiumoxide::crypto::sign; use sodiumoxide::crypto::sign;
use crate::{ use crate::{
@ -849,7 +851,17 @@ impl PeerConfig {
} }
fn path(id: &str) -> PathBuf { fn path(id: &str) -> PathBuf {
let path: PathBuf = [PEERS, id.replace(":", "_").as_str()].iter().collect(); let mut id_encoded: String;
//If the id contains invalid chars, encode it
let forbidden_paths = Regex::new(r".*[<>:/\\|\?\*].*").unwrap();
if forbidden_paths.is_match(id) {
id_encoded =
("base64_".to_string() + base64::encode(id, base64::Variant::Original).as_str())
} else {
id_encoded = id.to_string();
}
let path: PathBuf = [PEERS, id_encoded.as_str()].iter().collect();
Config::with_extension(Config::path(path)) Config::with_extension(Config::path(path))
} }
@ -871,27 +883,23 @@ impl PeerConfig {
.file_stem() .file_stem()
.map(|p| p.to_str().unwrap_or("")) .map(|p| p.to_str().unwrap_or(""))
.unwrap_or("") .unwrap_or("")
.replace("_", ":")
.to_owned(); .to_owned();
//rename PeerConfig files if they contain ":" let id_decoded_string: String;
//to stay backward compatible with *nix if id.starts_with("base64_") {
let current_filename = p let id_decoded = base64::decode(&id[7..], base64::Variant::Original)
.file_name() .unwrap_or(Vec::new());
.unwrap_or(OsStr::new("")) id_decoded_string =
.to_str() String::from_utf8_lossy(&id_decoded).as_ref().to_owned();
.unwrap_or(""); } else {
if current_filename.contains(":") { id_decoded_string = id;
if let Some(path) = p.parent() {
fs::rename(p, path.join(current_filename.replace(":", "_"))).ok();
}
} }
let c = PeerConfig::load(&id); let c = PeerConfig::load(&id_decoded_string);
if c.info.platform.is_empty() { if c.info.platform.is_empty() {
fs::remove_file(&p).ok(); fs::remove_file(&p).ok();
} }
(id, t, c) (id_decoded_string, t, c)
}) })
.filter(|p| !p.2.info.platform.is_empty()) .filter(|p| !p.2.info.platform.is_empty())
.collect(); .collect();