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

crypt peer/peer_rdp/peer_os/socks5 password

Browse Source 
Signed-off-by: 21pages <pages21@163.com>
This commit is contained in:
21pages 2022-06-22 09:41:35 +08:00
parent e46019a171
commit 8667d68c6f
1 changed files with 55 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,9 @@
use crate::{ use crate::{
log, log,
password_security::config::{decrypt_str_or_original, encrypt_str_or_original}, password_security::config::{
decrypt_str_or_original, decrypt_vec_or_original, encrypt_str_or_original,
encrypt_vec_or_original,
},
}; };
use anyhow::Result; use anyhow::Result;
use directories_next::ProjectDirs; use directories_next::ProjectDirs;
@ -119,7 +122,7 @@ pub struct Config2 {
pub options: HashMap<String, String>, pub options: HashMap<String, String>,
} }
#[derive(Debug, Default, Serialize, Deserialize, Clone)] #[derive(Debug, Default, Serialize, Deserialize, Clone, PartialEq)]
pub struct PeerConfig { pub struct PeerConfig {
#[serde(default)] #[serde(default)]
pub password: Vec<u8>, pub password: Vec<u8>,
@ -173,7 +176,7 @@ pub struct PeerInfoSerde {
pub platform: String, pub platform: String,
} }
#[derive(Debug, Default, Serialize, Deserialize, Clone)] #[derive(Debug, Default, Serialize, Deserialize, Clone, PartialEq)]
pub struct TransferSerde { pub struct TransferSerde {
#[serde(default)] #[serde(default)]
pub write_jobs: Vec<String>, pub write_jobs: Vec<String>,
@ -212,7 +215,16 @@ fn patch(path: PathBuf) -> PathBuf {
impl Config2 { impl Config2 {
fn load() -> Config2 { fn load() -> Config2 {
Config::load_::<Config2>("2") let mut config = Config::load_::<Config2>("2");
if let Some(mut socks) = config.socks {
let (password, store) = decrypt_str_or_original(&socks.password, PASSWORD_ENC_VERSION);
socks.password = password;
config.socks = Some(socks);
if store {
config.store();
}
}
config
} }
pub fn file() -> PathBuf { pub fn file() -> PathBuf {
@ -220,7 +232,12 @@ impl Config2 {
} }
fn store(&self) { fn store(&self) {
Config::store_(self, "2"); let mut config = self.clone();
if let Some(mut socks) = config.socks {
socks.password = encrypt_str_or_original(&socks.password, PASSWORD_ENC_VERSION);
config.socks = Some(socks);
}
Config::store_(&config, "2");
} }
pub fn get() -> Config2 { pub fn get() -> Config2 {
@ -722,7 +739,28 @@ impl PeerConfig {
pub fn load(id: &str) -> PeerConfig { pub fn load(id: &str) -> PeerConfig {
let _ = CONFIG.read().unwrap(); // for lock let _ = CONFIG.read().unwrap(); // for lock
match confy::load_path(&Self::path(id)) { match confy::load_path(&Self::path(id)) {
Ok(config) => config, Ok(config) => {
let mut config: PeerConfig = config;
let mut store = false;
let (password, store2) =
decrypt_vec_or_original(&config.password, PASSWORD_ENC_VERSION);
config.password = password;
store = store || store2;
config.options.get_mut("rdp_password").map(|v| {
let (password, store2) = decrypt_str_or_original(v, PASSWORD_ENC_VERSION);
*v = password;
store = store || store2;
});
config.options.get_mut("os-password").map(|v| {
let (password, store2) = decrypt_str_or_original(v, PASSWORD_ENC_VERSION);
*v = password;
store = store || store2;
});
if store {
config.store(id);
}
config
}
Err(err) => { Err(err) => {
log::error!("Failed to load config: {}", err); log::error!("Failed to load config: {}", err);
Default::default() Default::default()
@ -732,7 +770,17 @@ impl PeerConfig {
pub fn store(&self, id: &str) { pub fn store(&self, id: &str) {
let _ = CONFIG.read().unwrap(); // for lock let _ = CONFIG.read().unwrap(); // for lock
if let Err(err) = confy::store_path(Self::path(id), self) { let mut config = self.clone();
config.password = encrypt_vec_or_original(&config.password, PASSWORD_ENC_VERSION);
config
.options
.get_mut("rdp_password")
.map(|v| *v = encrypt_str_or_original(v, PASSWORD_ENC_VERSION));
config
.options
.get_mut("os-password")
.map(|v| *v = encrypt_str_or_original(v, PASSWORD_ENC_VERSION));
if let Err(err) = confy::store_path(Self::path(id), config) {
log::error!("Failed to store config: {}", err); log::error!("Failed to store config: {}", err);
} }
} }