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

Eliminate remaining conduit unwrap() et al.

Browse Source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk
2026-03-09 23:54:10 +00:00
parent 715d0a11c6
commit 64dd481140
15 changed files with 64 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/api/client/register.rs
View File

@@ -233,8 +233,8 @@ pub(crate) async fn register_route(
let proposed_user_id = UserId::parse_with_server_name(
utils::random_string(RANDOM_USER_ID_LENGTH).to_lowercase(),
services.globals.server_name(),
)
.unwrap();
)?;
if !services.users.exists(&proposed_user_id).await {
break proposed_user_id;
}
@@ -295,8 +295,7 @@ pub(crate) async fn register_route(
let (worked, uiaainfo) = services
.uiaa
.try_auth(
&UserId::parse_with_server_name("", services.globals.server_name())
.unwrap(),
&UserId::parse_with_server_name("", services.globals.server_name())?,
"".into(),
auth,
&uiaainfo,
@@ -311,8 +310,7 @@ pub(crate) async fn register_route(
| Some(ref json) => {
uiaainfo.session = Some(utils::random_string(SESSION_ID_LENGTH));
services.uiaa.create(
&UserId::parse_with_server_name("", services.globals.server_name())
.unwrap(),
&UserId::parse_with_server_name("", services.globals.server_name())?,
"".into(),
&uiaainfo,
json,

9
src/api/client/voip.rs
View File

@@ -35,20 +35,19 @@ pub(crate) async fn turn_server_route(
)
.expect("time is valid");
let user = body.sender_user.unwrap_or_else(|| {
let random_user_id = || {
UserId::parse_with_server_name(
utils::random_string(RANDOM_USER_ID_LENGTH).to_lowercase(),
&services.server.name,
)
.unwrap()
});
};
let user = body.sender_user.map_or_else(random_user_id, Ok)?;
let username: String = format!("{}:{}", expiry.get(), user);
let mut mac = HmacSha1::new_from_slice(turn_secret.as_bytes())
.expect("HMAC can take key of any size");
mac.update(username.as_bytes());
mac.update(username.as_bytes());
let password: String = general_purpose::STANDARD.encode(mac.finalize().into_bytes());
(username, password)