Merge pull request #295 from whisperfish/locked-for-hyper

Add HTTP 423 LOCKED handling
whisperfish · Mar 13, 2024 · b0fd817 · b0fd817
2 parents 689a4c2 + c88ab0e
commit b0fd817
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/libsignal-service-hyper/src/push_service.rs b/libsignal-service-hyper/src/push_service.rs
@@ -182,6 +182,19 @@ impl HyperPushService {
                     })?;
                 Err(ServiceError::StaleDevices(stale_devices))
             },
+            StatusCode::LOCKED => {
+                let locked = Self::json(&mut response).await.map_err(|e| {
+                    tracing::error!(
+                        ?response,
+                        "Failed to decode HTTP 423 response: {}",
+                        e
+                    );
+                    ServiceError::UnhandledResponseCode {
+                        http_code: StatusCode::LOCKED.as_u16(),
+                    }
+                })?;
+                Err(ServiceError::Locked(locked))
+            },
             StatusCode::PRECONDITION_REQUIRED => {
                 let proof_required =
                     Self::json(&mut response).await.map_err(|e| {

diff --git a/libsignal-service/src/push_service.rs b/libsignal-service/src/push_service.rs
@@ -290,8 +290,8 @@ impl RegistrationSessionMetadataResponse {
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct RegistrationLockFailure {
-    pub length: u32,
-    pub time_remaining: u64,
+    pub length: Option<u32>,
+    pub time_remaining: Option<u64>,
     #[serde(rename = "backup_credentials")]
     pub svr1_credentials: Option<AuthCredentials>,
     pub svr2_credentials: Option<AuthCredentials>,