Page MenuHomePhabricator
Files F3491702

D11466.diff
No OneTemporary
Actions

D11466.diff
View Options

diff --git a/services/identity/src/client_service.rs b/services/identity/src/client_service.rs
--- a/services/identity/src/client_service.rs
+++ b/services/identity/src/client_service.rs
@@ -756,7 +756,57 @@
&self,
request: tonic::Request<ExistingDeviceLoginRequest>,
) -> std::result::Result<tonic::Response<AuthResponse>, tonic::Status> {
- Err(tonic::Status::unimplemented("todo"))
+ let message = request.into_inner();
+ let challenge_response = ChallengeResponse::try_from(&message)?;
+ let ExistingDeviceLoginRequest {
+ user_id, device_id, ..
+ } = message;
+
+ let NonceChallenge { nonce } =
+ challenge_response.verify_and_get_message(&device_id)?;
+ self.verify_and_remove_nonce(&nonce).await?;
+
+ let (identifier_response, device_list_response) = tokio::join!(
+ self.client.get_user_identifier(&user_id),
+ self.client.get_current_device_list(&user_id)
+ );
+ let user_identifier = identifier_response
+ .map_err(handle_db_error)?
+ .ok_or_else(|| tonic::Status::not_found("user not found"))?;
+
+ let device_list = device_list_response
+ .map_err(handle_db_error)?
+ .ok_or_else(|| {
+ warn!("User {} does not have a valid device list.", user_id);
+ tonic::Status::aborted("device list error")
+ })?;
+
+ if !device_list.device_ids.contains(&device_id) {
+ return Err(tonic::Status::permission_denied(
+ "device not in device list",
+ ));
+ }
+
+ let login_time = chrono::Utc::now();
+ let token = AccessTokenData::with_created_time(
+ user_id.clone(),
+ device_id,
+ login_time,
+ user_identifier.into(),
+ &mut OsRng,
+ );
+ let access_token = token.access_token.clone();
+ self
+ .client
+ .put_access_token_data(token)
+ .await
+ .map_err(handle_db_error)?;
+
+ let response = AuthResponse {
+ user_id,
+ access_token,
+ };
+ Ok(Response::new(response))
}
async fn generate_nonce(
diff --git a/services/identity/src/grpc_utils.rs b/services/identity/src/grpc_utils.rs
--- a/services/identity/src/grpc_utils.rs
+++ b/services/identity/src/grpc_utils.rs
@@ -11,9 +11,10 @@
identity::IdentityInfo, EthereumIdentity, InboundKeyInfo, OutboundKeyInfo,
},
unauth::{
- DeviceKeyUpload, OpaqueLoginStartRequest, RegistrationStartRequest,
- ReservedRegistrationStartRequest, ReservedWalletRegistrationRequest,
- SecondaryDeviceKeysUploadRequest, WalletAuthRequest,
+ DeviceKeyUpload, ExistingDeviceLoginRequest, OpaqueLoginStartRequest,
+ RegistrationStartRequest, ReservedRegistrationStartRequest,
+ ReservedWalletRegistrationRequest, SecondaryDeviceKeysUploadRequest,
+ WalletAuthRequest,
},
},
};
@@ -39,6 +40,14 @@
}
}
+impl TryFrom<&ExistingDeviceLoginRequest> for ChallengeResponse {
+ type Error = Status;
+ fn try_from(value: &ExistingDeviceLoginRequest) -> Result<Self, Self::Error> {
+ serde_json::from_str(&value.challenge_response)
+ .map_err(|_| Status::invalid_argument("message format invalid"))
+ }
+}
+
impl ChallengeResponse {
pub fn verify_and_get_message<T: serde::de::DeserializeOwned>(
&self,

File Metadata

Mime Type
text/plain
Expires
Thu, Dec 19, 7:59 PM (20 h, 32 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2678719
Default Alt Text
D11466.diff (3 KB)

Event Timeline