Page MenuHomePhabricator
Differential D14467

[backup] Return keyserver device ID in latest backup info endpoint
ClosedPublic
Actions

Authored by bartek on Mar 20 2025, 4:02 AM.
Tags
None
Referenced Files
F6214511: D14467.id47478.diff
Thu, Apr 24, 1:09 AM
F6204030: D14467.id.diff
Wed, Apr 23, 9:05 PM
F6197065: D14467.diff
Wed, Apr 23, 3:10 PM
Unknown Object (File)
Fri, Apr 11, 4:19 AM
Unknown Object (File)
Fri, Apr 11, 3:48 AM
Unknown Object (File)
Thu, Apr 10, 2:32 PM
Unknown Object (File)
Thu, Apr 10, 9:15 AM
Unknown Object (File)
Mon, Apr 7, 11:15 AM
View All 36 Files
Subscribers
ashoat
tomek

Details

Reviewers
kamil
Commits
rCOMMbefb888d494e: [backup] Return keyserver device ID in latest backup info endpoint
Summary

Address server-side of ENG-10236. Implemented approach 2 from task comments.

Depends on D14466

Test Plan

Using Postman, called the endpoint for user with- and without keyserver. Verified that returned device ID matches my keyserver device ID.

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

bartek created this revision.Mar 20 2025, 4:02 AM
bartek held this revision as a draft.
Herald added subscribers: tomek, ashoat. · View Herald TranscriptMar 20 2025, 4:02 AM
bartek updated this revision to Diff 47478.Mar 20 2025, 4:10 AM

Add missing reference

Harbormaster failed remote builds in B33774: Diff 47478!Mar 20 2025, 4:22 AM
Harbormaster failed remote builds in B33773: Diff 47477!Mar 20 2025, 4:28 AM
bartek published this revision for review.Mar 23 2025, 11:51 PM
bartek added inline comments.
shared/comm-lib/src/backup/mod.rs
15 ↗(On Diff #47477)

I missed committing this

bartek added a child revision: D14489: [lib][native] Add keyserverDeviceID to LatestBackupInfo.Mar 24 2025, 3:30 AM
kamil accepted this revision.Mar 24 2025, 3:56 AM
kamil added inline comments.
services/backup/src/identity/mod.rs
59 ↗(On Diff #47478)

If this is easy I would add tests for it, in e.g. identity_integration_tests.rs

This revision is now accepted and ready to land.Mar 24 2025, 3:56 AM
bartek added inline comments.Mar 24 2025, 6:07 AM
services/backup/src/identity/mod.rs
59 ↗(On Diff #47478)

We have test_device_list_multifetch which tests this RPC call

bartek updated this revision to Diff 47527.Mar 24 2025, 6:08 AM

Add serde rename directive

Harbormaster failed remote builds in B33816: Diff 47527!Mar 24 2025, 6:20 AM
This revision was landed with ongoing or failed builds.Mar 24 2025, 6:55 AM
Closed by commit rCOMMbefb888d494e: [backup] Return keyserver device ID in latest backup info endpoint (authored by bartek). · Explain Why
This revision was automatically updated to reflect the committed changes.
bartek added a commit: rCOMMbefb888d494e: [backup] Return keyserver device ID in latest backup info endpoint.

Revision Contents
Changeset List

PathSize
native/
native_rust_library/
src/
3 lines
services/
backup/
src/
http/
handlers/
7 lines
identity/
52 lines
shared/
comm-lib/
src/
backup/
2 lines

Diff 47527

View Options

native/native_rust_library/src/backup.rs

Show First 20 Lines • Show All 118 Lines • ▼ Show 20 Lines let RawDeviceList {
timestamp: raw_timestamp, timestamp: raw_timestamp,
} = signed_list.as_raw()?; } = signed_list.as_raw()?;
let timestamp = let timestamp =
DateTime::from_timestamp_millis(raw_timestamp).ok_or_else(|| { DateTime::from_timestamp_millis(raw_timestamp).ok_or_else(|| {
error!( error!(
errorType = error_types::GRPC_SERVICES_LOG, errorType = error_types::GRPC_SERVICES_LOG,
"Failed to parse RawDeviceList timestamp!" "Failed to parse RawDeviceList timestamp!"
); );
tonic::Status::invalid_argument("invalid timestamp") tonic::Status::invalid_argument(
tonic_status_messages::INVALID_TIMESTAMP,
)
})?; })?;
Ok(DeviceListUpdate { Ok(DeviceListUpdate {
devices, devices,
timestamp, timestamp,
current_primary_signature: signed_list.cur_primary_signature, current_primary_signature: signed_list.cur_primary_signature,
last_primary_signature: signed_list.last_primary_signature, last_primary_signature: signed_list.last_primary_signature,
raw_payload: signed_list.raw_device_list, raw_payload: signed_list.raw_device_list,
}) })
▲ Show 20 Lines • Show All 428 Lines • Show Last 20 Lines
View Options

services/backup/src/http/handlers/backup.rs

Show First 20 Lines • Show All 118 Lines • ▼ Show 20 Lines let RawDeviceList {
timestamp: raw_timestamp, timestamp: raw_timestamp,
} = signed_list.as_raw()?; } = signed_list.as_raw()?;
let timestamp = let timestamp =
DateTime::from_timestamp_millis(raw_timestamp).ok_or_else(|| { DateTime::from_timestamp_millis(raw_timestamp).ok_or_else(|| {
error!( error!(
errorType = error_types::GRPC_SERVICES_LOG, errorType = error_types::GRPC_SERVICES_LOG,
"Failed to parse RawDeviceList timestamp!" "Failed to parse RawDeviceList timestamp!"
); );
tonic::Status::invalid_argument("invalid timestamp") tonic::Status::invalid_argument(
tonic_status_messages::INVALID_TIMESTAMP,
)
})?; })?;
Ok(DeviceListUpdate { Ok(DeviceListUpdate {
devices, devices,
timestamp, timestamp,
current_primary_signature: signed_list.cur_primary_signature, current_primary_signature: signed_list.cur_primary_signature,
last_primary_signature: signed_list.last_primary_signature, last_primary_signature: signed_list.last_primary_signature,
raw_payload: signed_list.raw_device_list, raw_payload: signed_list.raw_device_list,
}) })
▲ Show 20 Lines • Show All 428 Lines • Show Last 20 Lines
View Options

services/backup/src/identity/mod.rs

Show First 20 Lines • Show All 118 Lines • ▼ Show 20 Lines let RawDeviceList {
timestamp: raw_timestamp, timestamp: raw_timestamp,
} = signed_list.as_raw()?; } = signed_list.as_raw()?;
let timestamp = let timestamp =
DateTime::from_timestamp_millis(raw_timestamp).ok_or_else(|| { DateTime::from_timestamp_millis(raw_timestamp).ok_or_else(|| {
error!( error!(
errorType = error_types::GRPC_SERVICES_LOG, errorType = error_types::GRPC_SERVICES_LOG,
"Failed to parse RawDeviceList timestamp!" "Failed to parse RawDeviceList timestamp!"
); );
tonic::Status::invalid_argument("invalid timestamp") tonic::Status::invalid_argument(
tonic_status_messages::INVALID_TIMESTAMP,
)
})?; })?;
Ok(DeviceListUpdate { Ok(DeviceListUpdate {
devices, devices,
timestamp, timestamp,
current_primary_signature: signed_list.cur_primary_signature, current_primary_signature: signed_list.cur_primary_signature,
last_primary_signature: signed_list.last_primary_signature, last_primary_signature: signed_list.last_primary_signature,
raw_payload: signed_list.raw_device_list, raw_payload: signed_list.raw_device_list,
}) })
▲ Show 20 Lines • Show All 428 Lines • Show Last 20 Lines
View Options

shared/comm-lib/src/backup/mod.rs

Show First 20 Lines • Show All 118 Lines • ▼ Show 20 Lines let RawDeviceList {
timestamp: raw_timestamp, timestamp: raw_timestamp,
} = signed_list.as_raw()?; } = signed_list.as_raw()?;
let timestamp = let timestamp =
DateTime::from_timestamp_millis(raw_timestamp).ok_or_else(|| { DateTime::from_timestamp_millis(raw_timestamp).ok_or_else(|| {
error!( error!(
errorType = error_types::GRPC_SERVICES_LOG, errorType = error_types::GRPC_SERVICES_LOG,
"Failed to parse RawDeviceList timestamp!" "Failed to parse RawDeviceList timestamp!"
); );
tonic::Status::invalid_argument("invalid timestamp") tonic::Status::invalid_argument(
tonic_status_messages::INVALID_TIMESTAMP,
)
})?; })?;
Ok(DeviceListUpdate { Ok(DeviceListUpdate {
devices, devices,
timestamp, timestamp,
current_primary_signature: signed_list.cur_primary_signature, current_primary_signature: signed_list.cur_primary_signature,
last_primary_signature: signed_list.last_primary_signature, last_primary_signature: signed_list.last_primary_signature,
raw_payload: signed_list.raw_device_list, raw_payload: signed_list.raw_device_list,
}) })
▲ Show 20 Lines • Show All 428 Lines • Show Last 20 Lines