Page MenuHomePhorge
Files F33135868

D15378.1768501898.diff
No OneTemporary
Actions

Size
10 KB
Referenced Files
None
Subscribers
None

D15378.1768501898.diff
View Options

diff --git a/native/native_rust_library/src/identity/device_list.rs b/native/native_rust_library/src/identity/device_list.rs
--- a/native/native_rust_library/src/identity/device_list.rs
+++ b/native/native_rust_library/src/identity/device_list.rs
@@ -160,7 +160,7 @@
.collect();
let result = PeersDeviceLists {
- users_device_lists: users_device_lists,
+ users_device_lists,
users_devices_platform_details: nested_users_devices_platform_details,
};
diff --git a/services/blob/src/database/client.rs b/services/blob/src/database/client.rs
--- a/services/blob/src/database/client.rs
+++ b/services/blob/src/database/client.rs
@@ -1,4 +1,3 @@
-use aws_config::default_provider::retry_config;
use aws_sdk_dynamodb::{
operation::put_item::PutItemOutput,
types::{
diff --git a/services/commtest/src/identity/device.rs b/services/commtest/src/identity/device.rs
--- a/services/commtest/src/identity/device.rs
+++ b/services/commtest/src/identity/device.rs
@@ -97,7 +97,6 @@
let username: String = rand::thread_rng()
.sample_iter(&Alphanumeric)
.take(7)
- .map(char::from)
.collect();
let device_keys = keys.map(Cow::Borrowed).unwrap_or_default();
diff --git a/services/commtest/src/identity/olm_account.rs b/services/commtest/src/identity/olm_account.rs
--- a/services/commtest/src/identity/olm_account.rs
+++ b/services/commtest/src/identity/olm_account.rs
@@ -132,6 +132,5 @@
rand::thread_rng()
.sample_iter(&Alphanumeric)
.take(43)
- .map(char::from)
.collect()
}
diff --git a/services/identity/src/database.rs b/services/identity/src/database.rs
--- a/services/identity/src/database.rs
+++ b/services/identity/src/database.rs
@@ -1043,13 +1043,12 @@
.item
.map(DBIdentity::try_from)
.transpose()
- .map_err(|e| {
+ .inspect_err(|_| {
error!(
user_id = redact_sensitive_data(user_id),
errorType = error_types::GENERIC_DB_LOG,
"Database item is missing an identifier"
);
- e
})
}
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
@@ -1,3 +1,5 @@
+#![allow(clippy::result_large_err)]
+
use std::{
collections::{HashMap, HashSet},
sync::LazyLock,
@@ -31,7 +33,6 @@
USERS_TABLE_PARTITION_KEY,
},
ddb_utils::is_transaction_conflict,
- device_list::RawDeviceList,
error::{DeviceListError, Error},
grpc_services::{
protos::{self, unauth::DeviceType},
@@ -160,25 +161,6 @@
pub raw_payload: String,
}
-impl DeviceListUpdate {
- pub fn new_unsigned(
- devices: Vec<String>,
- ) -> Result<Self, crate::error::Error> {
- let timestamp = Utc::now();
- let raw_list = RawDeviceList {
- devices: devices.clone(),
- timestamp: timestamp.timestamp_millis(),
- };
- Ok(Self {
- devices,
- timestamp,
- current_primary_signature: None,
- last_primary_signature: None,
- raw_payload: serde_json::to_string(&raw_list)?,
- })
- }
-}
-
impl DeviceRow {
#[tracing::instrument(skip_all)]
pub fn from_device_key_upload(
diff --git a/services/identity/src/database/farcaster.rs b/services/identity/src/database/farcaster.rs
--- a/services/identity/src/database/farcaster.rs
+++ b/services/identity/src/database/farcaster.rs
@@ -24,6 +24,7 @@
pub struct FarcasterUserData(pub FarcasterUser);
impl DatabaseClient {
+ #[allow(clippy::result_large_err)]
#[tracing::instrument(skip_all)]
pub async fn get_farcaster_users(
&self,
diff --git a/services/identity/src/device_list.rs b/services/identity/src/device_list.rs
--- a/services/identity/src/device_list.rs
+++ b/services/identity/src/device_list.rs
@@ -331,7 +331,7 @@
let previous_set: HashSet<_> = previous_device_list.iter().collect();
let new_set: HashSet<_> = new_device_list.iter().collect();
- return new_set.difference(&previous_set).count() == 1;
+ new_set.difference(&previous_set).count() == 1
}
/// Returns `true` if `new_device_list` contains exactly one fewer device
@@ -343,7 +343,7 @@
let previous_set: HashSet<_> = previous_device_list.iter().collect();
let new_set: HashSet<_> = new_device_list.iter().collect();
- return previous_set.difference(&new_set).count() == 1;
+ previous_set.difference(&new_set).count() == 1
}
fn primary_device_changed(
diff --git a/services/identity/src/grpc_services/authenticated.rs b/services/identity/src/grpc_services/authenticated.rs
--- a/services/identity/src/grpc_services/authenticated.rs
+++ b/services/identity/src/grpc_services/authenticated.rs
@@ -182,20 +182,14 @@
let content_prekey = DBPrekey::from(content_key);
let notif_prekey = DBPrekey::from(notif_key);
- if let Err(err) = content_prekey.verify(&device_id) {
- error!(
- errorType = error_types::GRPC_SERVICES_LOG,
- "Content prekey verification failed: {err}"
- );
+ if let Err(_err) = content_prekey.verify(&device_id) {
+ warn!(device_id, "Content prekey verification failed");
return Err(Status::invalid_argument(
tonic_status_messages::MALFORMED_KEY,
));
}
- if let Err(err) = notif_prekey.verify(&notif_signing_pub_key) {
- error!(
- errorType = error_types::GRPC_SERVICES_LOG,
- "Notif prekey verification failed: {err}"
- );
+ if let Err(_err) = notif_prekey.verify(&notif_signing_pub_key) {
+ warn!(device_id, "Notif prekey verification failed");
return Err(Status::invalid_argument(
tonic_status_messages::MALFORMED_KEY,
));
diff --git a/services/reports/src/service.rs b/services/reports/src/service.rs
--- a/services/reports/src/service.rs
+++ b/services/reports/src/service.rs
@@ -201,6 +201,7 @@
email: ReportEmail,
}
+#[allow(clippy::result_large_err)]
fn process_report(
input: ReportInput,
user_id: Option<String>,
diff --git a/services/tunnelbroker/src/constants.rs b/services/tunnelbroker/src/constants.rs
--- a/services/tunnelbroker/src/constants.rs
+++ b/services/tunnelbroker/src/constants.rs
@@ -27,6 +27,8 @@
pub const FARCASTER_REQUEST_TIMEOUT: Duration = Duration::from_secs(8);
pub const MEDIA_MIRROR_TIMEOUT: Duration = Duration::from_secs(5);
+pub const MESSAGE_TTL_AFTER_DELETION_REQUEST: chrono::Duration =
+ chrono::Duration::hours(24);
pub mod dynamodb {
// This table holds messages which could not be immediately delivered to
@@ -45,6 +47,7 @@
pub const PARTITION_KEY: &str = "deviceID";
pub const DEVICE_ID: &str = "deviceID";
pub const PAYLOAD: &str = "payload";
+ pub const EXPIRATION_TIME: &str = "expirationTimeUnix";
pub const MESSAGE_ID: &str = "messageID";
pub const SORT_KEY: &str = "messageID";
}
diff --git a/services/tunnelbroker/src/database/mod.rs b/services/tunnelbroker/src/database/mod.rs
--- a/services/tunnelbroker/src/database/mod.rs
+++ b/services/tunnelbroker/src/database/mod.rs
@@ -14,7 +14,7 @@
use tracing::{debug, error, warn};
use crate::constants::dynamodb::{device_tokens, undelivered_messages, users};
-use crate::constants::error_types;
+use crate::constants::{error_types, MESSAGE_TTL_AFTER_DELETION_REQUEST};
pub mod message;
pub mod message_id;
@@ -303,10 +303,6 @@
&self,
device_id: &str,
) -> Result<(), Error> {
- const MESSAGE_TTL_AFTER_DELETION_REQUEST: chrono::Duration =
- chrono::Duration::hours(24);
- const EXPIRATION_TIME: &str = "expirationTimeUnix";
-
let messages = self.retrieve_messages(device_id).await.map_err(|e| {
error!("DynamoDB client failed to retrieve messages: {:?}", e);
Error::AwsSdk(e.into())
@@ -318,7 +314,10 @@
let update_requests = messages
.into_iter()
.map(|mut attrs| {
- attrs.insert(EXPIRATION_TIME.to_string(), expiration_attr.clone());
+ attrs.insert(
+ undelivered_messages::EXPIRATION_TIME.to_string(),
+ expiration_attr.clone(),
+ );
let put_request =
PutRequest::builder().set_item(Some(attrs)).build().unwrap();
WriteRequest::builder().put_request(put_request).build()
diff --git a/services/tunnelbroker/src/farcaster/mod.rs b/services/tunnelbroker/src/farcaster/mod.rs
--- a/services/tunnelbroker/src/farcaster/mod.rs
+++ b/services/tunnelbroker/src/farcaster/mod.rs
@@ -24,6 +24,7 @@
}
impl FarcasterClient {
+ #[allow(clippy::result_large_err)]
pub fn new(
farcaster_api_url: reqwest::Url,
db_client: DatabaseClient,
diff --git a/services/tunnelbroker/src/token_distributor/token_connection.rs b/services/tunnelbroker/src/token_distributor/token_connection.rs
--- a/services/tunnelbroker/src/token_distributor/token_connection.rs
+++ b/services/tunnelbroker/src/token_distributor/token_connection.rs
@@ -43,6 +43,7 @@
}
impl TokenConnection {
+ #[allow(clippy::too_many_arguments)]
pub(crate) fn start(
db: DatabaseClient,
config: TokenDistributorConfig,
@@ -336,7 +337,7 @@
);
}
}
- FarcasterPayload::RefreshSelfDirectCastsInbox { payload, .. } => {
+ FarcasterPayload::RefreshSelfDirectCastsInbox { .. } => {
debug!("Processing refresh-self-direct-casts-inbox message");
}
FarcasterPayload::Unseen { .. } => {
diff --git a/shared/comm-lib/src/database.rs b/shared/comm-lib/src/database.rs
--- a/shared/comm-lib/src/database.rs
+++ b/shared/comm-lib/src/database.rs
@@ -703,10 +703,8 @@
AttributeValue::Bs(set) => set.len(),
AttributeValue::N(_) => NUMBER_BYTE_SIZE,
AttributeValue::Ns(set) => set.len() * NUMBER_BYTE_SIZE,
- AttributeValue::S(string) => string.as_bytes().len(),
- AttributeValue::Ss(set) => {
- set.iter().map(|string| string.as_bytes().len()).sum()
- }
+ AttributeValue::S(string) => string.len(),
+ AttributeValue::Ss(set) => set.iter().map(|string| string.len()).sum(),
_ => return Err(UnknownAttributeTypeError),
};
@@ -717,7 +715,7 @@
value: &AttributeMap,
) -> Result<usize, UnknownAttributeTypeError> {
value.iter().try_fold(0, |a, (attr, value)| {
- Ok(a + attr.as_bytes().len() + calculate_attr_value_size_in_db(value)?)
+ Ok(a + attr.len() + calculate_attr_value_size_in_db(value)?)
})
}
diff --git a/shared/comm-opaque2/src/server/login.rs b/shared/comm-opaque2/src/server/login.rs
--- a/shared/comm-opaque2/src/server/login.rs
+++ b/shared/comm-opaque2/src/server/login.rs
@@ -11,7 +11,7 @@
#[derive(Clone, Serialize, Deserialize, Debug)]
pub struct Login {
state: Option<ServerLogin<Cipher>>,
- #[serde(default = "OsRng::default", skip)]
+ #[serde(default, skip)]
rng: OsRng,
pub session_key: Option<Vec<u8>>,
}

File Metadata

Mime Type
text/plain
Expires
Thu, Jan 15, 6:31 PM (5 h, 30 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5939341
Default Alt Text
D15378.1768501898.diff (10 KB)

Event Timeline