Page MenuHomePhabricator
Files F2842206

D13421.id44407.diff
No OneTemporary
Actions

D13421.id44407.diff
View Options

diff --git a/services/identity/src/database/device_list.rs b/services/identity/src/database/device_list.rs
--- a/services/identity/src/database/device_list.rs
+++ b/services/identity/src/database/device_list.rs
@@ -1946,9 +1946,10 @@
devices_data: &[DeviceRow],
) {
if !verify_device_list_match(list, devices_data) {
- error!(
- errorType = error_types::DEVICE_LIST_DB_LOG,
- "Device list for user (userID={}) out of sync!", user_id
+ info!(
+ "Device list for user (userID={1}) mismatch devices data. {0}",
+ "Primary device will be selected basing only on devices with data.",
+ redact_sensitive_data(user_id)
);
return;
}
@@ -1961,7 +1962,7 @@
info!(
"No valid primary device found for user (userID={}).\
Skipping device list reorder.",
- user_id
+ redact_sensitive_data(user_id)
);
return;
};
@@ -1977,12 +1978,16 @@
else {
error!(
errorType = error_types::DEVICE_LIST_DB_LOG,
- "Primary device not found in device list (userID={})", user_id
+ "Detected primary device not found in device list (userID={})",
+ redact_sensitive_data(user_id)
);
return;
};
list.swap(0, primary_device_idx);
- info!("Reordered device list for user (userID={})", user_id);
+ info!(
+ "Reordered device list for user (userID={})",
+ redact_sensitive_data(user_id)
+ );
}
// checks if device list matches given devices data
@@ -2007,12 +2012,25 @@
let device_list_set = list.iter().collect::<HashSet<_>>();
- if let Some(unknown_device_id) = device_list_set
- .symmetric_difference(&actual_device_ids)
- .next()
+ // devices on device list but with no keys uploaded
+ // this is normal in some flows
+ if let Some(unknown_device_id) =
+ device_list_set.difference(&actual_device_ids).next()
{
debug!(
- "Device list and data out of sync (unknown deviceID={})",
+ "Device list and data out of sync (unregistered deviceID={})",
+ unknown_device_id
+ );
+ return false;
+ }
+
+ // devices that have devices data (keys etc) but not on device list
+ // this should never happen in any login flow and means we have corrupt state
+ if let Some(unknown_device_id) =
+ actual_device_ids.difference(&device_list_set).next()
+ {
+ warn!(
+ "Device ID={} registered, but not on device list!",
unknown_device_id
);
return false;

File Metadata

Mime Type
text/plain
Expires
Mon, Sep 30, 12:32 PM (21 h, 55 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2205216
Default Alt Text
D13421.id44407.diff (2 KB)

Event Timeline