studio/tuwunel
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'hatomist/fix/sso-origin-overwrite'

Browse Source
This commit is contained in:
Jason Volk
2026-03-03 06:12:26 +00:00
parent 5a55f84104 6bed0d38f4
commit d00cfcb85a
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/service/users/mod.rs
View File

@@ -236,13 +236,17 @@ impl Service {
} }
} }
let is_sentinel = password.is_some_and(|p| p == "*");
match password.map(utils::hash::password) { match password.map(utils::hash::password) {
| None => { | None => {
self.db.userid_password.insert(user_id, b""); self.db.userid_password.insert(user_id, b"");
}, },
| Some(Ok(hash)) => { | Some(Ok(hash)) => {
self.db.userid_password.insert(user_id, hash); self.db.userid_password.insert(user_id, hash);
self.db.userid_origin.insert(user_id, "password"); if !is_sentinel {
self.db.userid_origin.insert(user_id, "password");
}
}, },
| Some(Err(e)) => { | Some(Err(e)) => {
return Err!(Request(InvalidParam( return Err!(Request(InvalidParam(