Page MenuHomePhorge
Files F33014141

D5208.1768375365.diff
No OneTemporary
Actions

Size
2 KB
Referenced Files
None
Subscribers
None

D5208.1768375365.diff
View Options

diff --git a/services/identity/src/service.rs b/services/identity/src/service.rs
--- a/services/identity/src/service.rs
+++ b/services/identity/src/service.rs
@@ -176,6 +176,7 @@
let login_finish_result = pake_login_finish(
&user_id,
&device_id,
+ &user_public_key,
client,
server_login,
&pake_credential_finalization,
@@ -226,6 +227,7 @@
let mut user_id: String = String::new();
let mut device_id: String = String::new();
let mut server_login: Option<ServerLogin<Cipher>> = None;
+ let mut user_public_key: String = String::new();
let mut num_messages_received = 0;
while let Some(message) = in_stream.next().await {
match message {
@@ -276,6 +278,8 @@
}
user_id = pake_credential_request_and_user_id.user_id;
device_id = pake_credential_request_and_user_id.device_id;
+ user_public_key =
+ pake_credential_request_and_user_id.user_public_key;
}
Ok(LoginRequest {
data:
@@ -287,6 +291,7 @@
let login_finish_result = pake_login_finish(
&user_id,
&device_id,
+ &user_public_key,
client,
server_login,
&pake_credential_finalization,
@@ -542,6 +547,7 @@
async fn pake_login_finish(
user_id: &str,
device_id: &str,
+ user_public_key: &str,
client: DatabaseClient,
server_login: Option<ServerLogin<Cipher>>,
pake_credential_finalization: &[u8],
@@ -564,7 +570,7 @@
);
return Err(Status::aborted("user not found"));
}
- match server_login
+ server_login
.ok_or_else(|| {
error!("Server login missing in {:?} PAKE workflow", pake_workflow);
Status::aborted("login failed")
@@ -575,21 +581,32 @@
error!("Failed to deserialize credential finalization bytes: {}", e);
Status::aborted("login failed")
})?,
- ) {
- Ok(_) => Ok(PakeLoginResponseStruct {
- data: Some(AccessToken(
- put_token_helper(client, AuthType::Password, user_id, device_id, rng)
- .await?,
- )),
- }),
- Err(e) => {
+ )
+ .map_err(|e| {
error!(
"Encountered a PAKE protocol error when finishing login: {}",
e
);
- Err(Status::aborted("server error"))
- }
+ Status::aborted("server error")
+ })?;
+ if matches!(pake_workflow, PakeWorkflow::Login) {
+ client
+ .update_users_table(
+ user_id.to_string(),
+ device_id.to_string(),
+ None,
+ None,
+ Some(user_public_key.to_string()),
+ )
+ .await
+ .map_err(handle_db_error)?;
}
+ Ok(PakeLoginResponseStruct {
+ data: Some(AccessToken(
+ put_token_helper(client, AuthType::Password, user_id, device_id, rng)
+ .await?,
+ )),
+ })
}
async fn pake_registration_start(

File Metadata

Mime Type
text/plain
Expires
Wed, Jan 14, 7:22 AM (12 h, 7 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5930968
Default Alt Text
D5208.1768375365.diff (2 KB)

Event Timeline