rustdesk/hbb_common
1
0
Fork 0
mirror of https://github.com/rustdesk/hbb_common.git synced 2026-04-02 22:16:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(password): set_salt, comments and logs

Browse Source 
Signed-off-by: fufesou <linlong1266@gmail.com>
This commit is contained in:
fufesou
2026-03-23 16:50:57 +08:00
parent f8358bd17e
commit 5519c4c289
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/config.rs
View File

@@ -1339,6 +1339,9 @@ impl Config {
!CONFIG.read().unwrap().password.is_empty() !CONFIG.read().unwrap().password.is_empty()
} }
// This shouldn't happen under normal circumstances because the salt
// should be automatically generated when migrating to hash storage.
// Actually, it is better to avoid calling set_salt at all.
pub fn set_salt(salt: &str) { pub fn set_salt(salt: &str) {
let mut config = CONFIG.write().unwrap(); let mut config = CONFIG.write().unwrap();
if salt == config.salt { if salt == config.salt {
@@ -1346,15 +1349,9 @@ impl Config {
} }
if !password_is_empty_or_not_hashed(&config.password) { if !password_is_empty_or_not_hashed(&config.password) {
if config.salt.is_empty() { if config.salt.is_empty() {
// This shouldn't happen under normal circumstances because the salt log::warn!("Salt is empty but permanent password is hashed and salt is empty");
// should be automatically generated when migrating to hash storage.
// However, if it does occur, it's best to log the error,
// even though this will result in logging many duplicate error messages.
log::warn!("Salt is empty but permanent password is hashed");
} else { } else {
log::error!( log::error!("Refusing to set salt because permanent password is hashed");
"Refusing to set salt because permanent password is hashed and salt is empty"
);
return; return;
} }
} }