diff options
author | Timo Kösters <timo@koesters.xyz> | 2023-02-07 15:26:34 +0100 |
---|---|---|
committer | Timo Kösters <timo@koesters.xyz> | 2023-02-07 16:29:41 +0100 |
commit | a4f18f99ad2d02635fb72a0053d551878339ffca (patch) | |
tree | ccc39817146ed4f1751f02f8fe15de65df1988db /src/database | |
parent | 06df04f61c86c856cb7308b012a2d27695585862 (diff) | |
download | conduit-a4f18f99ad2d02635fb72a0053d551878339ffca.zip |
fix: ignore bad user ids
Diffstat (limited to 'src/database')
-rw-r--r-- | src/database/mod.rs | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/database/mod.rs b/src/database/mod.rs index 78bb358..46ba5b3 100644 --- a/src/database/mod.rs +++ b/src/database/mod.rs @@ -800,10 +800,17 @@ impl KeyValueDatabase { } if services().globals.database_version()? < 12 { - for username in services().users.list_local_users().unwrap() { - let user = - UserId::parse_with_server_name(username, services().globals.server_name()) - .unwrap(); + for username in services().users.list_local_users()? { + let user = match UserId::parse_with_server_name( + username.clone(), + services().globals.server_name(), + ) { + Ok(u) => u, + Err(e) => { + warn!("Invalid username {username}: {e}"); + continue; + } + }; let raw_rules_list = services() .account_data |