···33333434 let users = state.users.lock().await;
3535 let user_id = auth_data.user_id;
3636- let user = users
3737- .iter()
3838- .find(|u| u.id == user_id)
3939- .ok_or(SrvErr!("User not found"))?;
3636+ let user = users.iter().find(|u| u.id == user_id).ok_or(SrvErr!("User not found"))?;
4037 let verifying_key = user.pub_key.clone();
41384239 // NOTE (key chaining):
···6259 let sig_vec = BASE64_STANDARD
6360 .decode(&auth_data.signature)
6461 .map_err(|e| SrvErr!("base64 decode fail", e))?;
6565- let sig_bytes: [u8; 64] = sig_vec
6666- .try_into()
6767- .map_err(|e| SrvErr!("invalid signature length", e))?;
6262+ let sig_bytes: [u8; 64] =
6363+ sig_vec.try_into().map_err(|e| SrvErr!("invalid signature length", e))?;
6864 let signature = Signature::from_bytes(&sig_bytes);
69657066 if let Err(err) = verifying_key.verify_strict(&body_bytes, &signature) {
+6-16
server/src/handlers.rs
···2222 };
23232424 // todo check
2525- let pub_key_arr: [u8; 32] = pub_key_bytes
2626- .as_slice()
2727- .try_into()
2828- .map_err(|_| SrvErr!("Invalid pubkey length"))?;
2525+ let pub_key_arr: [u8; 32] =
2626+ pub_key_bytes.as_slice().try_into().map_err(|_| SrvErr!("Invalid pubkey length"))?;
2927 let pub_key = VerifyingKey::from_bytes(&pub_key_arr)
3028 .map_err(|e| SrvErr!("Invalid public key bytes", e))?;
3129···3836 admin_id_guard.replace(user_id.clone());
3937 }
40384141- users.push(User {
4242- id: user_id.clone(),
4343- pub_key,
4444- });
3939+ users.push(User { id: user_id.clone(), pub_key });
45404641 return Ok(Json(CreateAccountResponse { user_id, is_admin }));
4742}
···6661 }
67626863 let mut friend_requests = state.friend_requests.lock().await;
6969- let mut friend_request_link = DirectedFriendRequestLink {
7070- sender_id: friend_id,
7171- accepter_id: user_id,
7272- };
6464+ let mut friend_request_link =
6565+ DirectedFriendRequestLink { sender_id: friend_id, accepter_id: user_id };
73667467 // if we remove sucessfully the link, it means a request already existed
7568 // so we are making the friendship official
···124117125118 for ping in pings {
126119 let link = UndirectedLink::new(user_id.clone(), ping.receiver_id.clone());
127127- pings_state
128128- .get_mut(&link)
129129- .unwrap()
130130- .add(EncryptedPing(ping.encrypted_ping)); // We assured that a ringbuffer exists because it was created when the link was created, hence the .unwrap()
120120+ pings_state.get_mut(&link).unwrap().add(EncryptedPing(ping.encrypted_ping)); // We assured that a ringbuffer exists because it was created when the link was created, hence the .unwrap()
131121 }
132122133123 return Ok(());