leyoda/cosmic-settings
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: hash password befote saving on user create and password update

Browse source
This commit is contained in:
Jonathan Capps 2025-04-18 13:16:48 +01:00 • committed by Michael Murphy
parent 646e4aabd9
commit 5159116544
3 changed files with 137 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cosmic-settings/Cargo.toml
View file

@ -88,6 +88,7 @@ gettext-rs = { version = "0.7.2", features = [
async-fn-stream = "0.2.2"
num-traits = "0.2"
num-derive = "0.4"
pwhash = "1"
[dependencies.cosmic-settings-subscriptions]
git = "https://github.com/pop-os/cosmic-settings-subscriptions"
@ -156,9 +157,7 @@ page-input = [
"dep:cosmic-settings-config",
"dep:udev",
]
page-legacy-applications = [
"dep:cosmic-comp-config",
]
page-legacy-applications = ["dep:cosmic-comp-config"]
page-networking = [
"xdg-portal",
"dep:cosmic-dbus-networkmanager",

12
cosmic-settings/src/pages/system/users/mod.rs
View file

@ -11,6 +11,7 @@ use cosmic::{
widget::{self, Space, column, icon, row, settings, text},
};
use cosmic_settings_page::{self as page, Section, section};
use pwhash::bcrypt;
use regex::Regex;
use slab::Slab;
use slotmap::SlotMap;
@ -556,7 +557,7 @@ impl Page {
self.dialog = None;
let uid = user.id;
let password = user.password;
let password_hashed = bcrypt::hash(user.password).unwrap();
return cosmic::Task::future(async move {
let Ok(conn) = zbus::Connection::system().await else {
@ -567,8 +568,10 @@ impl Page {
return;
};
match request_permission_on_denial(&conn, || user.set_password(&password, ""))
.await
match request_permission_on_denial(&conn, || {
user.set_password(&password_hashed, "")
})
.await
{
Err(why) => {
tracing::error!(?why, "failed to set password");
@ -652,9 +655,10 @@ impl Page {
}
};
let password_hashed = bcrypt::hash(password).unwrap();
match accounts_zbus::UserProxy::new(&conn, user_object_path).await {
Ok(user) => {
_ = user.set_password(&password, "").await;
_ = user.set_password(&password_hashed, "").await;
_ = user.set_icon_file(DEFAULT_ICON_FILE).await
}