FabInfra-Mirror/bffh
1
0
Fork 0
mirror of https://gitlab.com/fabinfra/fabaccess/bffh.git synced 2025-06-11 19:03:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

add some error handling, mostly to quiet warnings

Browse Source
This commit is contained in:
Jonathan Krebs
2024-12-13 14:55:57 +01:00
parent fbfb76c34e
commit 2b0fe0e868
7 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
bffhd/capnp/user.rs
View File

@ -109,7 +109,7 @@ impl manage::Server for User {
if let Some(mut user) = self.session.users.get_user(uid) {
if let Ok(true) = user.check_password(old_pw.as_bytes()) {
user.set_pw(new_pw.as_bytes());
self.session.users.put_user(uid, &user);
pry!(self.session.users.put_user(uid, &user));
}
}
Promise::ok(())
@ -143,9 +143,9 @@ impl admin::Server for User {
// Only update if needed
if !target.userdata.roles.iter().any(|r| r.as_str() == rolename) {
target.userdata.roles.push(rolename.to_string());
self.session
pry!(self.session
.users
.put_user(self.user.get_username(), &target);
.put_user(self.user.get_username(), &target));
}
}
@ -168,9 +168,9 @@ impl admin::Server for User {
// Only update if needed
if target.userdata.roles.iter().any(|r| r.as_str() == rolename) {
target.userdata.roles.retain(|r| r.as_str() != rolename);
self.session
pry!(self.session
.users
.put_user(self.user.get_username(), &target);
.put_user(self.user.get_username(), &target));
}
}
@ -185,7 +185,7 @@ impl admin::Server for User {
let uid = self.user.get_username();
if let Some(mut user) = self.session.users.get_user(uid) {
user.set_pw(new_pw.as_bytes());
self.session.users.put_user(uid, &user);
pry!(self.session.users.put_user(uid, &user));
}
Promise::ok(())
}
@ -299,7 +299,8 @@ impl card_d_e_s_fire_e_v2::Server for User {
.insert("cardtoken".to_string(), token.to_string());
user.userdata.kv.insert("cardkey".to_string(), card_key);
self.session.users.put_user(self.user.get_username(), &user);
pry!(self.session.users.put_user(self.user.get_username(), &user));
Promise::ok(())
}
@ -338,7 +339,7 @@ impl card_d_e_s_fire_e_v2::Server for User {
}
}
self.session.users.put_user(self.user.get_username(), &user);
pry!(self.session.users.put_user(self.user.get_username(), &user));
Promise::ok(())
}

4
bffhd/capnp/user_system.rs
View File

@ -89,8 +89,8 @@ impl manage::Server for Users {
if !username.is_empty() && !password.is_empty() {
if self.session.users.get_user(username).is_none() {
let user = db::User::new_with_plain_pw(username, password);
self.session.users.put_user(username, &user);
let mut builder = builder.init_successful();
pry!(self.session.users.put_user(username, &user));
let builder = builder.init_successful();
User::fill(&self.session, user, builder);
} else {
let mut builder = builder.init_failed();