services/identity/src/database.rs
317–318 ↗	(On Diff #29510)	I think this is the same concern as @varun had in https://phab.comm.dev/D8452#250578 - single batch is limited to 25 items and we need to split into chunks - he did this in D8631 Leaving a link to AWS docs: https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_BatchWriteItem.html
services/identity/src/ddb_utils.rs
28–29 ↗	(On Diff #29510)	This comment is no longer relevant, since we have only one table now
30 ↗	(On Diff #29510)	I like this usage of local imports ;)

varun requested changes to this revision.Aug 4 2023, 12:06 PM

varun added inline comments.

services/identity/src/database.rs
317–318 ↗	(On Diff #29510)	yep batchWriteItem has limits on size/number of items that we need to adhere to

This revision now requires changes to proceed.Aug 4 2023, 12:06 PM

Address feedback

services/identity/src/ddb_utils.rs
30 ↗	(On Diff #29510)	thanks :)

bartek accepted this revision.Aug 8 2023, 9:59 AM

Harbormaster completed remote builds in B21592: Diff 29631.Aug 8 2023, 10:10 AM

varun requested changes to this revision.Aug 8 2023, 10:19 AM

varun added inline comments.

services/identity/src/database.rs
378 ↗	(On Diff #29631)	we need to follow the BatchWriteItem limit here, too, right?

This revision now requires changes to proceed.Aug 8 2023, 10:19 AM

Chunkify other BatchWriteItem

services/identity/src/database.rs
378 ↗	(On Diff #29631)	yea, my bad. New devices should only be writing 20 items, and the `refreshKeysRequest` requests 10. So it shouldn't cause an issue. However, better to be safe than sorry.

Harbormaster completed remote builds in B21593: Diff 29632.Aug 8 2023, 10:50 AM

sorry I didn't catch this earlier but we should be consistent about onetime vs one-time/oneTime/OneTime/one_time. the latter matches the white paper, so we should remove all uses of the former. i noted a couple instances where we're using the wrong format inline, but it's not an exhaustive list. some other comments inline too.

also, we have to update the add_user_to_users_table function, right?

services/commtest/tests/identity_onetime_key_tests.rs
18 ↗	(On Diff #29632)	identity
35 ↗	(On Diff #29632)	fwiw i feel like a full test would also check that we can retrieve the one-time keys as well.
services/identity/src/constants.rs
91 ↗	(On Diff #29632)	one-time
services/terraform/modules/shared/dynamodb.tf
257 ↗	(On Diff #29632)	i think it should be one-time
258 ↗	(On Diff #29632)	one-time

This revision now requires changes to proceed.Aug 9 2023, 3:14 PM

In D8675#259065, @varun wrote:

sorry I didn't catch this earlier but we should be consistent about onetime vs one-time/oneTime/OneTime/one_time. the latter matches the white paper, so we should remove all uses of the former. i noted a couple instances where we're using the wrong format inline, but it's not an exhaustive list. some other comments inline too.

also, we have to update the add_user_to_users_table function, right?

Sigh, I was going off the naming you had in constants.rs. Do you mind if I just create a follow up task to rename all instances of onetime/ONETIME to one-time/ONE_TIME. I really don't want to deal with those kinds of rebase conflicts in the current stack....

• jon planned changes to this revision.Aug 11 2023, 8:14 AM

• jon marked an inline comment as done.

• jon added inline comments.

services/commtest/tests/identity_onetime_key_tests.rs
35 ↗	(On Diff #29632)	This is done in D8722
services/identity/src/database.rs
1045–1071 ↗	(On Diff #29632)	Removing this here means that `add_user_...` method needs to be updated with adding the otk's to the related table

"onetime" -> "one-time" for this diff

Harbormaster completed remote builds in B21743: Diff 29881.Aug 15 2023, 7:17 AM

uggh, not sure why, but I got a stale patch when doing the one-time refactor

Re-apply feedback which was lost during bad arc patch

Address feedback

Missed a comment

Harbormaster completed remote builds in B21766: Diff 29919.Aug 15 2023, 10:56 AM

Harbormaster completed remote builds in B21767: Diff 29920.Aug 15 2023, 11:01 AM

Removing this here means that add_user_... method needs to be updated with adding the otk's to the related table

sorry to keep requesting changes but i'm still not seeing this change in the diff

services/identity/src/constants.rs
93 ↗	(On Diff #29632)	are you sure we want to remove this comment?

This revision now requires changes to proceed.Aug 16 2023, 6:59 AM

Address comments, refactor one time key addtions to single method

Re-introduce comment which was accidentally deleted due to bad rebase

Harbormaster completed remote builds in B21819: Diff 29991.Aug 17 2023, 12:43 AM

Harbormaster completed remote builds in B21820: Diff 29992.Aug 17 2023, 12:46 AM

• jon added inline comments.Aug 17 2023, 6:55 AM

services/identity/src/constants.rs
93 ↗	(On Diff #29632)	Another victim of the bad patch.

Remove now unused import

Rebase on master

Harbormaster completed remote builds in B21854: Diff 30028.Aug 17 2023, 10:42 AM

Harbormaster completed remote builds in B21853: Diff 30027.

can you please create a follow up task for renaming affected db methods? e.g. add_user_to_users_table -> add_user_to_ddb, add_password_user_to_users_table -> add_password_user_to_ddb, add_device_to_users_table -> add_device_to_ddb (these are just suggestions, i'm open to other names)

services/identity/src/constants.rs
94–97 ↗	(On Diff #30028)	nit on comment location and `PARTITION_KEY` naming

This revision is now accepted and ready to land.Aug 17 2023, 11:50 AM

Emphasize PARTITION_KEY in comment

• jon marked an inline comment as done.Aug 20 2023, 9:55 PM

Harbormaster completed remote builds in B21928: Diff 30115.Aug 20 2023, 10:13 PM

Closed by commit rCOMMbdabed9dccb1: [Identity] Add DDB table for one-time-keys (authored by • jon). · Explain WhyAug 20 2023, 10:24 PM

This revision was automatically updated to reflect the committed changes.

• jon added a commit: rCOMMbdabed9dccb1: [Identity] Add DDB table for one-time-keys.

Revision Contents
Changeset List

Path

Size

services/

commtest/

tests/

identity_one_time_key_tests.rs

35 lines

identity/

src/

1 line

12 lines

111 lines

58 lines

1 line

terraform/

modules/

shared/

dynamodb.tf

17 lines

Diff 30027

View Options

services/commtest/tests/identity_one_time_key_tests.rs

use constant_time_eq::constant_time_eq;		use constant_time_eq::constant_time_eq;
use std::collections::{HashMap, HashSet};		use std::collections::{HashMap, HashSet};
use std::fmt::{Display, Formatter, Result as FmtResult};		use std::fmt::{Display, Formatter, Result as FmtResult};
use std::str::FromStr;		use std::str::FromStr;
use std::sync::Arc;		use std::sync::Arc;

		use crate::ddb_utils::{into_one_time_put_requests, OlmAccountType};
use crate::error::{DBItemAttributeError, DBItemError, Error};		use crate::error::{DBItemAttributeError, DBItemError, Error};
use aws_config::SdkConfig;		use aws_config::SdkConfig;
use aws_sdk_dynamodb::model::{AttributeValue, PutRequest, WriteRequest};		use aws_sdk_dynamodb::model::{AttributeValue, PutRequest, WriteRequest};
use aws_sdk_dynamodb::output::{		use aws_sdk_dynamodb::output::{
DeleteItemOutput, GetItemOutput, PutItemOutput, QueryOutput,		DeleteItemOutput, GetItemOutput, PutItemOutput, QueryOutput,
};		};
use aws_sdk_dynamodb::{types::Blob, Client};		use aws_sdk_dynamodb::{types::Blob, Client};
use chrono::{DateTime, Utc};		use chrono::{DateTime, Utc};
use serde::{Deserialize, Serialize};		use serde::{Deserialize, Serialize};
use tracing::{debug, error, info, warn};		use tracing::{debug, error, info, warn};

use crate::client_service::{FlattenedDeviceKeyUpload, UserRegistrationInfo};		use crate::client_service::{FlattenedDeviceKeyUpload, UserRegistrationInfo};
use crate::config::CONFIG;		use crate::config::CONFIG;
use crate::constants::{		use crate::constants::{
ACCESS_TOKEN_SORT_KEY, ACCESS_TOKEN_TABLE,		ACCESS_TOKEN_SORT_KEY, ACCESS_TOKEN_TABLE,
ACCESS_TOKEN_TABLE_AUTH_TYPE_ATTRIBUTE, ACCESS_TOKEN_TABLE_CREATED_ATTRIBUTE,		ACCESS_TOKEN_TABLE_AUTH_TYPE_ATTRIBUTE, ACCESS_TOKEN_TABLE_CREATED_ATTRIBUTE,
ACCESS_TOKEN_TABLE_PARTITION_KEY, ACCESS_TOKEN_TABLE_TOKEN_ATTRIBUTE,		ACCESS_TOKEN_TABLE_PARTITION_KEY, ACCESS_TOKEN_TABLE_TOKEN_ATTRIBUTE,
ACCESS_TOKEN_TABLE_VALID_ATTRIBUTE, NONCE_TABLE,		ACCESS_TOKEN_TABLE_VALID_ATTRIBUTE, NONCE_TABLE,
NONCE_TABLE_CREATED_ATTRIBUTE, NONCE_TABLE_PARTITION_KEY,		NONCE_TABLE_CREATED_ATTRIBUTE, NONCE_TABLE_PARTITION_KEY,
RESERVED_USERNAMES_TABLE, RESERVED_USERNAMES_TABLE_PARTITION_KEY,		RESERVED_USERNAMES_TABLE, RESERVED_USERNAMES_TABLE_PARTITION_KEY,
USERS_TABLE, USERS_TABLE_DEVICES_ATTRIBUTE,		USERS_TABLE, USERS_TABLE_DEVICES_ATTRIBUTE,
USERS_TABLE_DEVICES_MAP_CONTENT_ONETIME_KEYS_ATTRIBUTE_NAME,
USERS_TABLE_DEVICES_MAP_CONTENT_PREKEY_ATTRIBUTE_NAME,		USERS_TABLE_DEVICES_MAP_CONTENT_PREKEY_ATTRIBUTE_NAME,
USERS_TABLE_DEVICES_MAP_CONTENT_PREKEY_SIGNATURE_ATTRIBUTE_NAME,		USERS_TABLE_DEVICES_MAP_CONTENT_PREKEY_SIGNATURE_ATTRIBUTE_NAME,
USERS_TABLE_DEVICES_MAP_DEVICE_TYPE_ATTRIBUTE_NAME,		USERS_TABLE_DEVICES_MAP_DEVICE_TYPE_ATTRIBUTE_NAME,
USERS_TABLE_DEVICES_MAP_KEY_PAYLOAD_ATTRIBUTE_NAME,		USERS_TABLE_DEVICES_MAP_KEY_PAYLOAD_ATTRIBUTE_NAME,
USERS_TABLE_DEVICES_MAP_KEY_PAYLOAD_SIGNATURE_ATTRIBUTE_NAME,		USERS_TABLE_DEVICES_MAP_KEY_PAYLOAD_SIGNATURE_ATTRIBUTE_NAME,
USERS_TABLE_DEVICES_MAP_NOTIF_ONETIME_KEYS_ATTRIBUTE_NAME,
USERS_TABLE_DEVICES_MAP_NOTIF_PREKEY_ATTRIBUTE_NAME,		USERS_TABLE_DEVICES_MAP_NOTIF_PREKEY_ATTRIBUTE_NAME,
USERS_TABLE_DEVICES_MAP_NOTIF_PREKEY_SIGNATURE_ATTRIBUTE_NAME,		USERS_TABLE_DEVICES_MAP_NOTIF_PREKEY_SIGNATURE_ATTRIBUTE_NAME,
USERS_TABLE_DEVICES_MAP_SOCIAL_PROOF_ATTRIBUTE_NAME,		USERS_TABLE_DEVICES_MAP_SOCIAL_PROOF_ATTRIBUTE_NAME,
USERS_TABLE_PARTITION_KEY, USERS_TABLE_REGISTRATION_ATTRIBUTE,		USERS_TABLE_PARTITION_KEY, USERS_TABLE_REGISTRATION_ATTRIBUTE,
USERS_TABLE_USERNAME_ATTRIBUTE, USERS_TABLE_USERNAME_INDEX,		USERS_TABLE_USERNAME_ATTRIBUTE, USERS_TABLE_USERNAME_INDEX,
USERS_TABLE_WALLET_ADDRESS_ATTRIBUTE, USERS_TABLE_WALLET_ADDRESS_INDEX,		USERS_TABLE_WALLET_ADDRESS_ATTRIBUTE, USERS_TABLE_WALLET_ADDRESS_INDEX,
};		};
use crate::id::generate_uuid;		use crate::id::generate_uuid;
▲ Show 20 Lines • Show All 247 Lines • ▼ Show 20 Lines	self
.await		.await
.map_err(\|e\| Error::AwsSdk(e.into()))?;		.map_err(\|e\| Error::AwsSdk(e.into()))?;

Ok(())		Ok(())
}		}

pub async fn append_one_time_prekeys(		pub async fn append_one_time_prekeys(
&self,		&self,
user_id: String,
device_id: String,		device_id: String,
content_one_time_keys: Vec<String>,		content_one_time_keys: Vec<String>,
notif_one_time_keys: Vec<String>,		notif_one_time_keys: Vec<String>,
) -> Result<(), Error> {		) -> Result<(), Error> {
let notif_keys_av: Vec<AttributeValue> = notif_one_time_keys		use crate::constants::one_time_keys_table;
.into_iter()
.map(AttributeValue::S)
.collect();
let content_keys_av: Vec<AttributeValue> = content_one_time_keys
.into_iter()
.map(AttributeValue::S)
.collect();

let update_expression =		let mut otk_requests = into_one_time_put_requests(
format!("SET {0}.#{1}.{2} = list_append({0}.#{1}.{2}, :n), {0}.#{1}.{3} = list_append({0}.#{1}.{3}, :i)",		&device_id,
USERS_TABLE_DEVICES_ATTRIBUTE,		content_one_time_keys,
"deviceID",		OlmAccountType::Content,
USERS_TABLE_DEVICES_MAP_NOTIF_ONETIME_KEYS_ATTRIBUTE_NAME,
USERS_TABLE_DEVICES_MAP_CONTENT_ONETIME_KEYS_ATTRIBUTE_NAME
);		);
let expression_attribute_names =		let notif_otk_requests: Vec<WriteRequest> = into_one_time_put_requests(
HashMap::from([(format!("#{}", "deviceID"), device_id)]);		&device_id,
let expression_attribute_values = HashMap::from([		notif_one_time_keys,
(":n".to_string(), AttributeValue::L(notif_keys_av)),		OlmAccountType::Notification,
(":i".to_string(), AttributeValue::L(content_keys_av)),		);
]);		otk_requests.extend(notif_otk_requests);

self		self
.client		.client
.update_item()		.batch_write_item()
.table_name(USERS_TABLE)		.request_items(one_time_keys_table::NAME, otk_requests)
.key(USERS_TABLE_PARTITION_KEY, AttributeValue::S(user_id))
.update_expression(update_expression)
.set_expression_attribute_names(Some(expression_attribute_names))
.set_expression_attribute_values(Some(expression_attribute_values))
.send()		.send()
.await		.await
.map_err(\|e\| Error::AwsSdk(e.into()))?;		.map_err(\|e\| Error::AwsSdk(e.into()))?;

Ok(())		Ok(())
}		}

async fn add_device_to_users_table(		async fn add_device_to_users_table(
&self,		&self,
user_id: String,		user_id: String,
flattened_device_key_upload: FlattenedDeviceKeyUpload,		flattened_device_key_upload: FlattenedDeviceKeyUpload,
social_proof: Option<String>,		social_proof: Option<String>,
) -> Result<(), Error> {		) -> Result<(), Error> {
		use crate::constants::one_time_keys_table;

		// Avoid borrowing from lifetime of flattened_device_key_upload
		let device_id = flattened_device_key_upload.device_id_key.clone();
		let content_one_time_keys =
		flattened_device_key_upload.content_onetime_keys.clone();
		let notif_one_time_keys =
		flattened_device_key_upload.notif_onetime_keys.clone();

let device_info =		let device_info =
create_device_info(flattened_device_key_upload.clone(), social_proof);		create_device_info(flattened_device_key_upload, social_proof);
let update_expression =		let update_expression =
format!("SET {}.#{} = :v", USERS_TABLE_DEVICES_ATTRIBUTE, "deviceID",);		format!("SET {}.#{} = :v", USERS_TABLE_DEVICES_ATTRIBUTE, "deviceID",);
let expression_attribute_names = HashMap::from([(		let expression_attribute_names =
format!("#{}", "deviceID"),		HashMap::from([(format!("#{}", "deviceID"), device_id.clone())]);
flattened_device_key_upload.device_id_key,
)]);
let expression_attribute_values =		let expression_attribute_values =
HashMap::from([(":v".to_string(), AttributeValue::M(device_info))]);		HashMap::from([(":v".to_string(), AttributeValue::M(device_info))]);

self		self
.client		.client
.update_item()		.update_item()
.table_name(USERS_TABLE)		.table_name(USERS_TABLE)
.key(USERS_TABLE_PARTITION_KEY, AttributeValue::S(user_id))		.key(USERS_TABLE_PARTITION_KEY, AttributeValue::S(user_id))
.update_expression(update_expression)		.update_expression(update_expression)
.set_expression_attribute_names(Some(expression_attribute_names))		.set_expression_attribute_names(Some(expression_attribute_names))
.set_expression_attribute_values(Some(expression_attribute_values))		.set_expression_attribute_values(Some(expression_attribute_values))
.send()		.send()
.await		.await
.map_err(\|e\| Error::AwsSdk(e.into()))?;		.map_err(\|e\| Error::AwsSdk(e.into()))?;

		let content_otk_requests = into_one_time_put_requests(
		&device_id,
		content_one_time_keys,
		OlmAccountType::Content,
		);
		let notif_otk_requests = into_one_time_put_requests(
		&device_id,
		notif_one_time_keys,
		OlmAccountType::Notification,
		);

		self
		.client
		.batch_write_item()
		.request_items(one_time_keys_table::NAME, content_otk_requests)
		.request_items(one_time_keys_table::NAME, notif_otk_requests)
		.send()
		.await
		.map_err(\|e\| Error::AwsSdk(e.into()))?;

Ok(())		Ok(())
}		}

pub async fn update_user_password(		pub async fn update_user_password(
&self,		&self,
user_id: String,		user_id: String,
password_file: Vec<u8>,		password_file: Vec<u8>,
) -> Result<(), Error> {		) -> Result<(), Error> {
▲ Show 20 Lines • Show All 660 Lines • ▼ Show 20 Lines	(
AttributeValue::S(flattened_device_key_upload.content_prekey),		AttributeValue::S(flattened_device_key_upload.content_prekey),
),		),
(		(
USERS_TABLE_DEVICES_MAP_CONTENT_PREKEY_SIGNATURE_ATTRIBUTE_NAME		USERS_TABLE_DEVICES_MAP_CONTENT_PREKEY_SIGNATURE_ATTRIBUTE_NAME
.to_string(),		.to_string(),
AttributeValue::S(flattened_device_key_upload.content_prekey_signature),		AttributeValue::S(flattened_device_key_upload.content_prekey_signature),
),		),
(		(
USERS_TABLE_DEVICES_MAP_CONTENT_ONETIME_KEYS_ATTRIBUTE_NAME.to_string(),
AttributeValue::L(
flattened_device_key_upload
.content_onetime_keys
.into_iter()
.map(AttributeValue::S)
.collect(),
),
),
(
USERS_TABLE_DEVICES_MAP_NOTIF_PREKEY_ATTRIBUTE_NAME.to_string(),		USERS_TABLE_DEVICES_MAP_NOTIF_PREKEY_ATTRIBUTE_NAME.to_string(),
AttributeValue::S(flattened_device_key_upload.notif_prekey),		AttributeValue::S(flattened_device_key_upload.notif_prekey),
),		),
(		(
USERS_TABLE_DEVICES_MAP_NOTIF_PREKEY_SIGNATURE_ATTRIBUTE_NAME.to_string(),		USERS_TABLE_DEVICES_MAP_NOTIF_PREKEY_SIGNATURE_ATTRIBUTE_NAME.to_string(),
AttributeValue::S(flattened_device_key_upload.notif_prekey_signature),		AttributeValue::S(flattened_device_key_upload.notif_prekey_signature),
),		),
(
USERS_TABLE_DEVICES_MAP_NOTIF_ONETIME_KEYS_ATTRIBUTE_NAME.to_string(),
AttributeValue::L(
flattened_device_key_upload
.notif_onetime_keys
.into_iter()
.map(AttributeValue::S)
.collect(),
),
),
]);		]);

if let Some(social_proof) = social_proof {		if let Some(social_proof) = social_proof {
device_info.insert(		device_info.insert(
USERS_TABLE_DEVICES_MAP_SOCIAL_PROOF_ATTRIBUTE_NAME.to_string(),		USERS_TABLE_DEVICES_MAP_SOCIAL_PROOF_ATTRIBUTE_NAME.to_string(),
AttributeValue::S(social_proof),		AttributeValue::S(social_proof),
);		);
}		}
▲ Show 20 Lines • Show All 57 Lines • Show Last 20 Lines

View Options

services/identity/src/client_service.rs

use constant_time_eq::constant_time_eq;		use constant_time_eq::constant_time_eq;
use std::collections::{HashMap, HashSet};		use std::collections::{HashMap, HashSet};
use std::fmt::{Display, Formatter, Result as FmtResult};		use std::fmt::{Display, Formatter, Result as FmtResult};
use std::str::FromStr;		use std::str::FromStr;
use std::sync::Arc;		use std::sync::Arc;

		use crate::ddb_utils::{into_one_time_put_requests, OlmAccountType};
use crate::error::{DBItemAttributeError, DBItemError, Error};		use crate::error::{DBItemAttributeError, DBItemError, Error};
use aws_config::SdkConfig;		use aws_config::SdkConfig;
use aws_sdk_dynamodb::model::{AttributeValue, PutRequest, WriteRequest};		use aws_sdk_dynamodb::model::{AttributeValue, PutRequest, WriteRequest};
use aws_sdk_dynamodb::output::{		use aws_sdk_dynamodb::output::{
DeleteItemOutput, GetItemOutput, PutItemOutput, QueryOutput,		DeleteItemOutput, GetItemOutput, PutItemOutput, QueryOutput,
};		};
use aws_sdk_dynamodb::{types::Blob, Client};		use aws_sdk_dynamodb::{types::Blob, Client};
use chrono::{DateTime, Utc};		use chrono::{DateTime, Utc};
use serde::{Deserialize, Serialize};		use serde::{Deserialize, Serialize};
use tracing::{debug, error, info, warn};		use tracing::{debug, error, info, warn};

use crate::client_service::{FlattenedDeviceKeyUpload, UserRegistrationInfo};		use crate::client_service::{FlattenedDeviceKeyUpload, UserRegistrationInfo};
use crate::config::CONFIG;		use crate::config::CONFIG;
use crate::constants::{		use crate::constants::{
ACCESS_TOKEN_SORT_KEY, ACCESS_TOKEN_TABLE,		ACCESS_TOKEN_SORT_KEY, ACCESS_TOKEN_TABLE,
ACCESS_TOKEN_TABLE_AUTH_TYPE_ATTRIBUTE, ACCESS_TOKEN_TABLE_CREATED_ATTRIBUTE,		ACCESS_TOKEN_TABLE_AUTH_TYPE_ATTRIBUTE, ACCESS_TOKEN_TABLE_CREATED_ATTRIBUTE,
ACCESS_TOKEN_TABLE_PARTITION_KEY, ACCESS_TOKEN_TABLE_TOKEN_ATTRIBUTE,		ACCESS_TOKEN_TABLE_PARTITION_KEY, ACCESS_TOKEN_TABLE_TOKEN_ATTRIBUTE,
ACCESS_TOKEN_TABLE_VALID_ATTRIBUTE, NONCE_TABLE,		ACCESS_TOKEN_TABLE_VALID_ATTRIBUTE, NONCE_TABLE,
NONCE_TABLE_CREATED_ATTRIBUTE, NONCE_TABLE_PARTITION_KEY,		NONCE_TABLE_CREATED_ATTRIBUTE, NONCE_TABLE_PARTITION_KEY,
RESERVED_USERNAMES_TABLE, RESERVED_USERNAMES_TABLE_PARTITION_KEY,		RESERVED_USERNAMES_TABLE, RESERVED_USERNAMES_TABLE_PARTITION_KEY,
USERS_TABLE, USERS_TABLE_DEVICES_ATTRIBUTE,		USERS_TABLE, USERS_TABLE_DEVICES_ATTRIBUTE,
USERS_TABLE_DEVICES_MAP_CONTENT_ONETIME_KEYS_ATTRIBUTE_NAME,
USERS_TABLE_DEVICES_MAP_CONTENT_PREKEY_ATTRIBUTE_NAME,		USERS_TABLE_DEVICES_MAP_CONTENT_PREKEY_ATTRIBUTE_NAME,
USERS_TABLE_DEVICES_MAP_CONTENT_PREKEY_SIGNATURE_ATTRIBUTE_NAME,		USERS_TABLE_DEVICES_MAP_CONTENT_PREKEY_SIGNATURE_ATTRIBUTE_NAME,
USERS_TABLE_DEVICES_MAP_DEVICE_TYPE_ATTRIBUTE_NAME,		USERS_TABLE_DEVICES_MAP_DEVICE_TYPE_ATTRIBUTE_NAME,
USERS_TABLE_DEVICES_MAP_KEY_PAYLOAD_ATTRIBUTE_NAME,		USERS_TABLE_DEVICES_MAP_KEY_PAYLOAD_ATTRIBUTE_NAME,
USERS_TABLE_DEVICES_MAP_KEY_PAYLOAD_SIGNATURE_ATTRIBUTE_NAME,		USERS_TABLE_DEVICES_MAP_KEY_PAYLOAD_SIGNATURE_ATTRIBUTE_NAME,
USERS_TABLE_DEVICES_MAP_NOTIF_ONETIME_KEYS_ATTRIBUTE_NAME,
USERS_TABLE_DEVICES_MAP_NOTIF_PREKEY_ATTRIBUTE_NAME,		USERS_TABLE_DEVICES_MAP_NOTIF_PREKEY_ATTRIBUTE_NAME,
USERS_TABLE_DEVICES_MAP_NOTIF_PREKEY_SIGNATURE_ATTRIBUTE_NAME,		USERS_TABLE_DEVICES_MAP_NOTIF_PREKEY_SIGNATURE_ATTRIBUTE_NAME,
USERS_TABLE_DEVICES_MAP_SOCIAL_PROOF_ATTRIBUTE_NAME,		USERS_TABLE_DEVICES_MAP_SOCIAL_PROOF_ATTRIBUTE_NAME,
USERS_TABLE_PARTITION_KEY, USERS_TABLE_REGISTRATION_ATTRIBUTE,		USERS_TABLE_PARTITION_KEY, USERS_TABLE_REGISTRATION_ATTRIBUTE,
USERS_TABLE_USERNAME_ATTRIBUTE, USERS_TABLE_USERNAME_INDEX,		USERS_TABLE_USERNAME_ATTRIBUTE, USERS_TABLE_USERNAME_INDEX,
USERS_TABLE_WALLET_ADDRESS_ATTRIBUTE, USERS_TABLE_WALLET_ADDRESS_INDEX,		USERS_TABLE_WALLET_ADDRESS_ATTRIBUTE, USERS_TABLE_WALLET_ADDRESS_INDEX,
};		};
use crate::id::generate_uuid;		use crate::id::generate_uuid;
▲ Show 20 Lines • Show All 247 Lines • ▼ Show 20 Lines	self
.await		.await
.map_err(\|e\| Error::AwsSdk(e.into()))?;		.map_err(\|e\| Error::AwsSdk(e.into()))?;

Ok(())		Ok(())
}		}

pub async fn append_one_time_prekeys(		pub async fn append_one_time_prekeys(
&self,		&self,
user_id: String,
device_id: String,		device_id: String,
content_one_time_keys: Vec<String>,		content_one_time_keys: Vec<String>,
notif_one_time_keys: Vec<String>,		notif_one_time_keys: Vec<String>,
) -> Result<(), Error> {		) -> Result<(), Error> {
let notif_keys_av: Vec<AttributeValue> = notif_one_time_keys		use crate::constants::one_time_keys_table;
.into_iter()
.map(AttributeValue::S)
.collect();
let content_keys_av: Vec<AttributeValue> = content_one_time_keys
.into_iter()
.map(AttributeValue::S)
.collect();

let update_expression =		let mut otk_requests = into_one_time_put_requests(
format!("SET {0}.#{1}.{2} = list_append({0}.#{1}.{2}, :n), {0}.#{1}.{3} = list_append({0}.#{1}.{3}, :i)",		&device_id,
USERS_TABLE_DEVICES_ATTRIBUTE,		content_one_time_keys,
"deviceID",		OlmAccountType::Content,
USERS_TABLE_DEVICES_MAP_NOTIF_ONETIME_KEYS_ATTRIBUTE_NAME,
USERS_TABLE_DEVICES_MAP_CONTENT_ONETIME_KEYS_ATTRIBUTE_NAME
);		);
let expression_attribute_names =		let notif_otk_requests: Vec<WriteRequest> = into_one_time_put_requests(
HashMap::from([(format!("#{}", "deviceID"), device_id)]);		&device_id,
let expression_attribute_values = HashMap::from([		notif_one_time_keys,
(":n".to_string(), AttributeValue::L(notif_keys_av)),		OlmAccountType::Notification,
(":i".to_string(), AttributeValue::L(content_keys_av)),		);
]);		otk_requests.extend(notif_otk_requests);

self		self
.client		.client
.update_item()		.batch_write_item()
.table_name(USERS_TABLE)		.request_items(one_time_keys_table::NAME, otk_requests)
.key(USERS_TABLE_PARTITION_KEY, AttributeValue::S(user_id))
.update_expression(update_expression)
.set_expression_attribute_names(Some(expression_attribute_names))
.set_expression_attribute_values(Some(expression_attribute_values))
.send()		.send()
.await		.await
.map_err(\|e\| Error::AwsSdk(e.into()))?;		.map_err(\|e\| Error::AwsSdk(e.into()))?;

Ok(())		Ok(())
}		}

async fn add_device_to_users_table(		async fn add_device_to_users_table(
&self,		&self,
user_id: String,		user_id: String,
flattened_device_key_upload: FlattenedDeviceKeyUpload,		flattened_device_key_upload: FlattenedDeviceKeyUpload,
social_proof: Option<String>,		social_proof: Option<String>,
) -> Result<(), Error> {		) -> Result<(), Error> {
		use crate::constants::one_time_keys_table;

		// Avoid borrowing from lifetime of flattened_device_key_upload
		let device_id = flattened_device_key_upload.device_id_key.clone();
		let content_one_time_keys =
		flattened_device_key_upload.content_onetime_keys.clone();
		let notif_one_time_keys =
		flattened_device_key_upload.notif_onetime_keys.clone();

let device_info =		let device_info =
create_device_info(flattened_device_key_upload.clone(), social_proof);		create_device_info(flattened_device_key_upload, social_proof);
let update_expression =		let update_expression =
format!("SET {}.#{} = :v", USERS_TABLE_DEVICES_ATTRIBUTE, "deviceID",);		format!("SET {}.#{} = :v", USERS_TABLE_DEVICES_ATTRIBUTE, "deviceID",);
let expression_attribute_names = HashMap::from([(		let expression_attribute_names =
format!("#{}", "deviceID"),		HashMap::from([(format!("#{}", "deviceID"), device_id.clone())]);
flattened_device_key_upload.device_id_key,
)]);
let expression_attribute_values =		let expression_attribute_values =
HashMap::from([(":v".to_string(), AttributeValue::M(device_info))]);		HashMap::from([(":v".to_string(), AttributeValue::M(device_info))]);

self		self
.client		.client
.update_item()		.update_item()
.table_name(USERS_TABLE)		.table_name(USERS_TABLE)
.key(USERS_TABLE_PARTITION_KEY, AttributeValue::S(user_id))		.key(USERS_TABLE_PARTITION_KEY, AttributeValue::S(user_id))
.update_expression(update_expression)		.update_expression(update_expression)
.set_expression_attribute_names(Some(expression_attribute_names))		.set_expression_attribute_names(Some(expression_attribute_names))
.set_expression_attribute_values(Some(expression_attribute_values))		.set_expression_attribute_values(Some(expression_attribute_values))
.send()		.send()
.await		.await
.map_err(\|e\| Error::AwsSdk(e.into()))?;		.map_err(\|e\| Error::AwsSdk(e.into()))?;

		let content_otk_requests = into_one_time_put_requests(
		&device_id,
		content_one_time_keys,
		OlmAccountType::Content,
		);
		let notif_otk_requests = into_one_time_put_requests(
		&device_id,
		notif_one_time_keys,
		OlmAccountType::Notification,
		);

		self
		.client
		.batch_write_item()
		.request_items(one_time_keys_table::NAME, content_otk_requests)
		.request_items(one_time_keys_table::NAME, notif_otk_requests)
		.send()
		.await
		.map_err(\|e\| Error::AwsSdk(e.into()))?;

Ok(())		Ok(())
}		}

pub async fn update_user_password(		pub async fn update_user_password(
&self,		&self,
user_id: String,		user_id: String,
password_file: Vec<u8>,		password_file: Vec<u8>,
) -> Result<(), Error> {		) -> Result<(), Error> {
▲ Show 20 Lines • Show All 660 Lines • ▼ Show 20 Lines	(
AttributeValue::S(flattened_device_key_upload.content_prekey),		AttributeValue::S(flattened_device_key_upload.content_prekey),
),		),
(		(
USERS_TABLE_DEVICES_MAP_CONTENT_PREKEY_SIGNATURE_ATTRIBUTE_NAME		USERS_TABLE_DEVICES_MAP_CONTENT_PREKEY_SIGNATURE_ATTRIBUTE_NAME
.to_string(),		.to_string(),
AttributeValue::S(flattened_device_key_upload.content_prekey_signature),		AttributeValue::S(flattened_device_key_upload.content_prekey_signature),
),		),
(		(
USERS_TABLE_DEVICES_MAP_CONTENT_ONETIME_KEYS_ATTRIBUTE_NAME.to_string(),
AttributeValue::L(
flattened_device_key_upload
.content_onetime_keys
.into_iter()
.map(AttributeValue::S)
.collect(),
),
),
(
USERS_TABLE_DEVICES_MAP_NOTIF_PREKEY_ATTRIBUTE_NAME.to_string(),		USERS_TABLE_DEVICES_MAP_NOTIF_PREKEY_ATTRIBUTE_NAME.to_string(),
AttributeValue::S(flattened_device_key_upload.notif_prekey),		AttributeValue::S(flattened_device_key_upload.notif_prekey),
),		),
(		(
USERS_TABLE_DEVICES_MAP_NOTIF_PREKEY_SIGNATURE_ATTRIBUTE_NAME.to_string(),		USERS_TABLE_DEVICES_MAP_NOTIF_PREKEY_SIGNATURE_ATTRIBUTE_NAME.to_string(),
AttributeValue::S(flattened_device_key_upload.notif_prekey_signature),		AttributeValue::S(flattened_device_key_upload.notif_prekey_signature),
),		),
(
USERS_TABLE_DEVICES_MAP_NOTIF_ONETIME_KEYS_ATTRIBUTE_NAME.to_string(),
AttributeValue::L(
flattened_device_key_upload
.notif_onetime_keys
.into_iter()
.map(AttributeValue::S)
.collect(),
),
),
]);		]);

if let Some(social_proof) = social_proof {		if let Some(social_proof) = social_proof {
device_info.insert(		device_info.insert(
USERS_TABLE_DEVICES_MAP_SOCIAL_PROOF_ATTRIBUTE_NAME.to_string(),		USERS_TABLE_DEVICES_MAP_SOCIAL_PROOF_ATTRIBUTE_NAME.to_string(),
AttributeValue::S(social_proof),		AttributeValue::S(social_proof),
);		);
}		}
▲ Show 20 Lines • Show All 57 Lines • Show Last 20 Lines

View Options

services/identity/src/constants.rs

use constant_time_eq::constant_time_eq;		use constant_time_eq::constant_time_eq;
use std::collections::{HashMap, HashSet};		use std::collections::{HashMap, HashSet};
use std::fmt::{Display, Formatter, Result as FmtResult};		use std::fmt::{Display, Formatter, Result as FmtResult};
use std::str::FromStr;		use std::str::FromStr;
use std::sync::Arc;		use std::sync::Arc;

		use crate::ddb_utils::{into_one_time_put_requests, OlmAccountType};
use crate::error::{DBItemAttributeError, DBItemError, Error};		use crate::error::{DBItemAttributeError, DBItemError, Error};
use aws_config::SdkConfig;		use aws_config::SdkConfig;
use aws_sdk_dynamodb::model::{AttributeValue, PutRequest, WriteRequest};		use aws_sdk_dynamodb::model::{AttributeValue, PutRequest, WriteRequest};
use aws_sdk_dynamodb::output::{		use aws_sdk_dynamodb::output::{
DeleteItemOutput, GetItemOutput, PutItemOutput, QueryOutput,		DeleteItemOutput, GetItemOutput, PutItemOutput, QueryOutput,
};		};
use aws_sdk_dynamodb::{types::Blob, Client};		use aws_sdk_dynamodb::{types::Blob, Client};
use chrono::{DateTime, Utc};		use chrono::{DateTime, Utc};
use serde::{Deserialize, Serialize};		use serde::{Deserialize, Serialize};
use tracing::{debug, error, info, warn};		use tracing::{debug, error, info, warn};

use crate::client_service::{FlattenedDeviceKeyUpload, UserRegistrationInfo};		use crate::client_service::{FlattenedDeviceKeyUpload, UserRegistrationInfo};
use crate::config::CONFIG;		use crate::config::CONFIG;
use crate::constants::{		use crate::constants::{
ACCESS_TOKEN_SORT_KEY, ACCESS_TOKEN_TABLE,		ACCESS_TOKEN_SORT_KEY, ACCESS_TOKEN_TABLE,
ACCESS_TOKEN_TABLE_AUTH_TYPE_ATTRIBUTE, ACCESS_TOKEN_TABLE_CREATED_ATTRIBUTE,		ACCESS_TOKEN_TABLE_AUTH_TYPE_ATTRIBUTE, ACCESS_TOKEN_TABLE_CREATED_ATTRIBUTE,
ACCESS_TOKEN_TABLE_PARTITION_KEY, ACCESS_TOKEN_TABLE_TOKEN_ATTRIBUTE,		ACCESS_TOKEN_TABLE_PARTITION_KEY, ACCESS_TOKEN_TABLE_TOKEN_ATTRIBUTE,
ACCESS_TOKEN_TABLE_VALID_ATTRIBUTE, NONCE_TABLE,		ACCESS_TOKEN_TABLE_VALID_ATTRIBUTE, NONCE_TABLE,
NONCE_TABLE_CREATED_ATTRIBUTE, NONCE_TABLE_PARTITION_KEY,		NONCE_TABLE_CREATED_ATTRIBUTE, NONCE_TABLE_PARTITION_KEY,
RESERVED_USERNAMES_TABLE, RESERVED_USERNAMES_TABLE_PARTITION_KEY,		RESERVED_USERNAMES_TABLE, RESERVED_USERNAMES_TABLE_PARTITION_KEY,
USERS_TABLE, USERS_TABLE_DEVICES_ATTRIBUTE,		USERS_TABLE, USERS_TABLE_DEVICES_ATTRIBUTE,
USERS_TABLE_DEVICES_MAP_CONTENT_ONETIME_KEYS_ATTRIBUTE_NAME,
USERS_TABLE_DEVICES_MAP_CONTENT_PREKEY_ATTRIBUTE_NAME,		USERS_TABLE_DEVICES_MAP_CONTENT_PREKEY_ATTRIBUTE_NAME,
USERS_TABLE_DEVICES_MAP_CONTENT_PREKEY_SIGNATURE_ATTRIBUTE_NAME,		USERS_TABLE_DEVICES_MAP_CONTENT_PREKEY_SIGNATURE_ATTRIBUTE_NAME,
USERS_TABLE_DEVICES_MAP_DEVICE_TYPE_ATTRIBUTE_NAME,		USERS_TABLE_DEVICES_MAP_DEVICE_TYPE_ATTRIBUTE_NAME,
USERS_TABLE_DEVICES_MAP_KEY_PAYLOAD_ATTRIBUTE_NAME,		USERS_TABLE_DEVICES_MAP_KEY_PAYLOAD_ATTRIBUTE_NAME,
USERS_TABLE_DEVICES_MAP_KEY_PAYLOAD_SIGNATURE_ATTRIBUTE_NAME,		USERS_TABLE_DEVICES_MAP_KEY_PAYLOAD_SIGNATURE_ATTRIBUTE_NAME,
USERS_TABLE_DEVICES_MAP_NOTIF_ONETIME_KEYS_ATTRIBUTE_NAME,
USERS_TABLE_DEVICES_MAP_NOTIF_PREKEY_ATTRIBUTE_NAME,		USERS_TABLE_DEVICES_MAP_NOTIF_PREKEY_ATTRIBUTE_NAME,
USERS_TABLE_DEVICES_MAP_NOTIF_PREKEY_SIGNATURE_ATTRIBUTE_NAME,		USERS_TABLE_DEVICES_MAP_NOTIF_PREKEY_SIGNATURE_ATTRIBUTE_NAME,
USERS_TABLE_DEVICES_MAP_SOCIAL_PROOF_ATTRIBUTE_NAME,		USERS_TABLE_DEVICES_MAP_SOCIAL_PROOF_ATTRIBUTE_NAME,
USERS_TABLE_PARTITION_KEY, USERS_TABLE_REGISTRATION_ATTRIBUTE,		USERS_TABLE_PARTITION_KEY, USERS_TABLE_REGISTRATION_ATTRIBUTE,
USERS_TABLE_USERNAME_ATTRIBUTE, USERS_TABLE_USERNAME_INDEX,		USERS_TABLE_USERNAME_ATTRIBUTE, USERS_TABLE_USERNAME_INDEX,
USERS_TABLE_WALLET_ADDRESS_ATTRIBUTE, USERS_TABLE_WALLET_ADDRESS_INDEX,		USERS_TABLE_WALLET_ADDRESS_ATTRIBUTE, USERS_TABLE_WALLET_ADDRESS_INDEX,
};		};
use crate::id::generate_uuid;		use crate::id::generate_uuid;
▲ Show 20 Lines • Show All 247 Lines • ▼ Show 20 Lines	self
.await		.await
.map_err(\|e\| Error::AwsSdk(e.into()))?;		.map_err(\|e\| Error::AwsSdk(e.into()))?;

Ok(())		Ok(())
}		}

pub async fn append_one_time_prekeys(		pub async fn append_one_time_prekeys(
&self,		&self,
user_id: String,
device_id: String,		device_id: String,
content_one_time_keys: Vec<String>,		content_one_time_keys: Vec<String>,
notif_one_time_keys: Vec<String>,		notif_one_time_keys: Vec<String>,
) -> Result<(), Error> {		) -> Result<(), Error> {
let notif_keys_av: Vec<AttributeValue> = notif_one_time_keys		use crate::constants::one_time_keys_table;
.into_iter()
.map(AttributeValue::S)
.collect();
let content_keys_av: Vec<AttributeValue> = content_one_time_keys
.into_iter()
.map(AttributeValue::S)
.collect();

let update_expression =		let mut otk_requests = into_one_time_put_requests(
format!("SET {0}.#{1}.{2} = list_append({0}.#{1}.{2}, :n), {0}.#{1}.{3} = list_append({0}.#{1}.{3}, :i)",		&device_id,
USERS_TABLE_DEVICES_ATTRIBUTE,		content_one_time_keys,
"deviceID",		OlmAccountType::Content,
USERS_TABLE_DEVICES_MAP_NOTIF_ONETIME_KEYS_ATTRIBUTE_NAME,
USERS_TABLE_DEVICES_MAP_CONTENT_ONETIME_KEYS_ATTRIBUTE_NAME
);		);
let expression_attribute_names =		let notif_otk_requests: Vec<WriteRequest> = into_one_time_put_requests(
HashMap::from([(format!("#{}", "deviceID"), device_id)]);		&device_id,
let expression_attribute_values = HashMap::from([		notif_one_time_keys,
(":n".to_string(), AttributeValue::L(notif_keys_av)),		OlmAccountType::Notification,
(":i".to_string(), AttributeValue::L(content_keys_av)),		);
]);		otk_requests.extend(notif_otk_requests);

self		self
.client		.client
.update_item()		.batch_write_item()
.table_name(USERS_TABLE)		.request_items(one_time_keys_table::NAME, otk_requests)
.key(USERS_TABLE_PARTITION_KEY, AttributeValue::S(user_id))
.update_expression(update_expression)
.set_expression_attribute_names(Some(expression_attribute_names))
.set_expression_attribute_values(Some(expression_attribute_values))
.send()		.send()
.await		.await
.map_err(\|e\| Error::AwsSdk(e.into()))?;		.map_err(\|e\| Error::AwsSdk(e.into()))?;

Ok(())		Ok(())
}		}

async fn add_device_to_users_table(		async fn add_device_to_users_table(
&self,		&self,
user_id: String,		user_id: String,
flattened_device_key_upload: FlattenedDeviceKeyUpload,		flattened_device_key_upload: FlattenedDeviceKeyUpload,
social_proof: Option<String>,		social_proof: Option<String>,
) -> Result<(), Error> {		) -> Result<(), Error> {
		use crate::constants::one_time_keys_table;

		// Avoid borrowing from lifetime of flattened_device_key_upload
		let device_id = flattened_device_key_upload.device_id_key.clone();
		let content_one_time_keys =
		flattened_device_key_upload.content_onetime_keys.clone();
		let notif_one_time_keys =
		flattened_device_key_upload.notif_onetime_keys.clone();

let device_info =		let device_info =
create_device_info(flattened_device_key_upload.clone(), social_proof);		create_device_info(flattened_device_key_upload, social_proof);
let update_expression =		let update_expression =
format!("SET {}.#{} = :v", USERS_TABLE_DEVICES_ATTRIBUTE, "deviceID",);		format!("SET {}.#{} = :v", USERS_TABLE_DEVICES_ATTRIBUTE, "deviceID",);
let expression_attribute_names = HashMap::from([(		let expression_attribute_names =
format!("#{}", "deviceID"),		HashMap::from([(format!("#{}", "deviceID"), device_id.clone())]);
flattened_device_key_upload.device_id_key,
)]);
let expression_attribute_values =		let expression_attribute_values =
HashMap::from([(":v".to_string(), AttributeValue::M(device_info))]);		HashMap::from([(":v".to_string(), AttributeValue::M(device_info))]);

self		self
.client		.client
.update_item()		.update_item()
.table_name(USERS_TABLE)		.table_name(USERS_TABLE)
.key(USERS_TABLE_PARTITION_KEY, AttributeValue::S(user_id))		.key(USERS_TABLE_PARTITION_KEY, AttributeValue::S(user_id))
.update_expression(update_expression)		.update_expression(update_expression)
.set_expression_attribute_names(Some(expression_attribute_names))		.set_expression_attribute_names(Some(expression_attribute_names))
.set_expression_attribute_values(Some(expression_attribute_values))		.set_expression_attribute_values(Some(expression_attribute_values))
.send()		.send()
.await		.await
.map_err(\|e\| Error::AwsSdk(e.into()))?;		.map_err(\|e\| Error::AwsSdk(e.into()))?;

		let content_otk_requests = into_one_time_put_requests(
		&device_id,
		content_one_time_keys,
		OlmAccountType::Content,
		);
		let notif_otk_requests = into_one_time_put_requests(
		&device_id,
		notif_one_time_keys,
		OlmAccountType::Notification,
		);

		self
		.client
		.batch_write_item()
		.request_items(one_time_keys_table::NAME, content_otk_requests)
		.request_items(one_time_keys_table::NAME, notif_otk_requests)
		.send()
		.await
		.map_err(\|e\| Error::AwsSdk(e.into()))?;

Ok(())		Ok(())
}		}

pub async fn update_user_password(		pub async fn update_user_password(
&self,		&self,
user_id: String,		user_id: String,
password_file: Vec<u8>,		password_file: Vec<u8>,
) -> Result<(), Error> {		) -> Result<(), Error> {
▲ Show 20 Lines • Show All 660 Lines • ▼ Show 20 Lines	(
AttributeValue::S(flattened_device_key_upload.content_prekey),		AttributeValue::S(flattened_device_key_upload.content_prekey),
),		),
(		(
USERS_TABLE_DEVICES_MAP_CONTENT_PREKEY_SIGNATURE_ATTRIBUTE_NAME		USERS_TABLE_DEVICES_MAP_CONTENT_PREKEY_SIGNATURE_ATTRIBUTE_NAME
.to_string(),		.to_string(),
AttributeValue::S(flattened_device_key_upload.content_prekey_signature),		AttributeValue::S(flattened_device_key_upload.content_prekey_signature),
),		),
(		(
USERS_TABLE_DEVICES_MAP_CONTENT_ONETIME_KEYS_ATTRIBUTE_NAME.to_string(),
AttributeValue::L(
flattened_device_key_upload
.content_onetime_keys
.into_iter()
.map(AttributeValue::S)
.collect(),
),
),
(
USERS_TABLE_DEVICES_MAP_NOTIF_PREKEY_ATTRIBUTE_NAME.to_string(),		USERS_TABLE_DEVICES_MAP_NOTIF_PREKEY_ATTRIBUTE_NAME.to_string(),
AttributeValue::S(flattened_device_key_upload.notif_prekey),		AttributeValue::S(flattened_device_key_upload.notif_prekey),
),		),
(		(
USERS_TABLE_DEVICES_MAP_NOTIF_PREKEY_SIGNATURE_ATTRIBUTE_NAME.to_string(),		USERS_TABLE_DEVICES_MAP_NOTIF_PREKEY_SIGNATURE_ATTRIBUTE_NAME.to_string(),
AttributeValue::S(flattened_device_key_upload.notif_prekey_signature),		AttributeValue::S(flattened_device_key_upload.notif_prekey_signature),
),		),
(
USERS_TABLE_DEVICES_MAP_NOTIF_ONETIME_KEYS_ATTRIBUTE_NAME.to_string(),
AttributeValue::L(
flattened_device_key_upload
.notif_onetime_keys
.into_iter()
.map(AttributeValue::S)
.collect(),
),
),
]);		]);

if let Some(social_proof) = social_proof {		if let Some(social_proof) = social_proof {
device_info.insert(		device_info.insert(
USERS_TABLE_DEVICES_MAP_SOCIAL_PROOF_ATTRIBUTE_NAME.to_string(),		USERS_TABLE_DEVICES_MAP_SOCIAL_PROOF_ATTRIBUTE_NAME.to_string(),
AttributeValue::S(social_proof),		AttributeValue::S(social_proof),
);		);
}		}
▲ Show 20 Lines • Show All 57 Lines • Show Last 20 Lines

View Options

services/identity/src/database.rs

use constant_time_eq::constant_time_eq;		use constant_time_eq::constant_time_eq;
use std::collections::{HashMap, HashSet};		use std::collections::{HashMap, HashSet};
use std::fmt::{Display, Formatter, Result as FmtResult};		use std::fmt::{Display, Formatter, Result as FmtResult};
use std::str::FromStr;		use std::str::FromStr;
use std::sync::Arc;		use std::sync::Arc;

		use crate::ddb_utils::{into_one_time_put_requests, OlmAccountType};
use crate::error::{DBItemAttributeError, DBItemError, Error};		use crate::error::{DBItemAttributeError, DBItemError, Error};
use aws_config::SdkConfig;		use aws_config::SdkConfig;
use aws_sdk_dynamodb::model::{AttributeValue, PutRequest, WriteRequest};		use aws_sdk_dynamodb::model::{AttributeValue, PutRequest, WriteRequest};
use aws_sdk_dynamodb::output::{		use aws_sdk_dynamodb::output::{
DeleteItemOutput, GetItemOutput, PutItemOutput, QueryOutput,		DeleteItemOutput, GetItemOutput, PutItemOutput, QueryOutput,
};		};
use aws_sdk_dynamodb::{types::Blob, Client};		use aws_sdk_dynamodb::{types::Blob, Client};
use chrono::{DateTime, Utc};		use chrono::{DateTime, Utc};
use serde::{Deserialize, Serialize};		use serde::{Deserialize, Serialize};
use tracing::{debug, error, info, warn};		use tracing::{debug, error, info, warn};

use crate::client_service::{FlattenedDeviceKeyUpload, UserRegistrationInfo};		use crate::client_service::{FlattenedDeviceKeyUpload, UserRegistrationInfo};
use crate::config::CONFIG;		use crate::config::CONFIG;
use crate::constants::{		use crate::constants::{
ACCESS_TOKEN_SORT_KEY, ACCESS_TOKEN_TABLE,		ACCESS_TOKEN_SORT_KEY, ACCESS_TOKEN_TABLE,
ACCESS_TOKEN_TABLE_AUTH_TYPE_ATTRIBUTE, ACCESS_TOKEN_TABLE_CREATED_ATTRIBUTE,		ACCESS_TOKEN_TABLE_AUTH_TYPE_ATTRIBUTE, ACCESS_TOKEN_TABLE_CREATED_ATTRIBUTE,
ACCESS_TOKEN_TABLE_PARTITION_KEY, ACCESS_TOKEN_TABLE_TOKEN_ATTRIBUTE,		ACCESS_TOKEN_TABLE_PARTITION_KEY, ACCESS_TOKEN_TABLE_TOKEN_ATTRIBUTE,
ACCESS_TOKEN_TABLE_VALID_ATTRIBUTE, NONCE_TABLE,		ACCESS_TOKEN_TABLE_VALID_ATTRIBUTE, NONCE_TABLE,
NONCE_TABLE_CREATED_ATTRIBUTE, NONCE_TABLE_PARTITION_KEY,		NONCE_TABLE_CREATED_ATTRIBUTE, NONCE_TABLE_PARTITION_KEY,
RESERVED_USERNAMES_TABLE, RESERVED_USERNAMES_TABLE_PARTITION_KEY,		RESERVED_USERNAMES_TABLE, RESERVED_USERNAMES_TABLE_PARTITION_KEY,
USERS_TABLE, USERS_TABLE_DEVICES_ATTRIBUTE,		USERS_TABLE, USERS_TABLE_DEVICES_ATTRIBUTE,
USERS_TABLE_DEVICES_MAP_CONTENT_ONETIME_KEYS_ATTRIBUTE_NAME,
USERS_TABLE_DEVICES_MAP_CONTENT_PREKEY_ATTRIBUTE_NAME,		USERS_TABLE_DEVICES_MAP_CONTENT_PREKEY_ATTRIBUTE_NAME,
USERS_TABLE_DEVICES_MAP_CONTENT_PREKEY_SIGNATURE_ATTRIBUTE_NAME,		USERS_TABLE_DEVICES_MAP_CONTENT_PREKEY_SIGNATURE_ATTRIBUTE_NAME,
USERS_TABLE_DEVICES_MAP_DEVICE_TYPE_ATTRIBUTE_NAME,		USERS_TABLE_DEVICES_MAP_DEVICE_TYPE_ATTRIBUTE_NAME,
USERS_TABLE_DEVICES_MAP_KEY_PAYLOAD_ATTRIBUTE_NAME,		USERS_TABLE_DEVICES_MAP_KEY_PAYLOAD_ATTRIBUTE_NAME,
USERS_TABLE_DEVICES_MAP_KEY_PAYLOAD_SIGNATURE_ATTRIBUTE_NAME,		USERS_TABLE_DEVICES_MAP_KEY_PAYLOAD_SIGNATURE_ATTRIBUTE_NAME,
USERS_TABLE_DEVICES_MAP_NOTIF_ONETIME_KEYS_ATTRIBUTE_NAME,
USERS_TABLE_DEVICES_MAP_NOTIF_PREKEY_ATTRIBUTE_NAME,		USERS_TABLE_DEVICES_MAP_NOTIF_PREKEY_ATTRIBUTE_NAME,
USERS_TABLE_DEVICES_MAP_NOTIF_PREKEY_SIGNATURE_ATTRIBUTE_NAME,		USERS_TABLE_DEVICES_MAP_NOTIF_PREKEY_SIGNATURE_ATTRIBUTE_NAME,
USERS_TABLE_DEVICES_MAP_SOCIAL_PROOF_ATTRIBUTE_NAME,		USERS_TABLE_DEVICES_MAP_SOCIAL_PROOF_ATTRIBUTE_NAME,
USERS_TABLE_PARTITION_KEY, USERS_TABLE_REGISTRATION_ATTRIBUTE,		USERS_TABLE_PARTITION_KEY, USERS_TABLE_REGISTRATION_ATTRIBUTE,
USERS_TABLE_USERNAME_ATTRIBUTE, USERS_TABLE_USERNAME_INDEX,		USERS_TABLE_USERNAME_ATTRIBUTE, USERS_TABLE_USERNAME_INDEX,
USERS_TABLE_WALLET_ADDRESS_ATTRIBUTE, USERS_TABLE_WALLET_ADDRESS_INDEX,		USERS_TABLE_WALLET_ADDRESS_ATTRIBUTE, USERS_TABLE_WALLET_ADDRESS_INDEX,
};		};
use crate::id::generate_uuid;		use crate::id::generate_uuid;
▲ Show 20 Lines • Show All 247 Lines • ▼ Show 20 Lines	self
.await		.await
.map_err(\|e\| Error::AwsSdk(e.into()))?;		.map_err(\|e\| Error::AwsSdk(e.into()))?;

Ok(())		Ok(())
}		}

pub async fn append_one_time_prekeys(		pub async fn append_one_time_prekeys(
&self,		&self,
user_id: String,
device_id: String,		device_id: String,
content_one_time_keys: Vec<String>,		content_one_time_keys: Vec<String>,
notif_one_time_keys: Vec<String>,		notif_one_time_keys: Vec<String>,
) -> Result<(), Error> {		) -> Result<(), Error> {
let notif_keys_av: Vec<AttributeValue> = notif_one_time_keys		use crate::constants::one_time_keys_table;
.into_iter()
.map(AttributeValue::S)
.collect();
let content_keys_av: Vec<AttributeValue> = content_one_time_keys
.into_iter()
.map(AttributeValue::S)
.collect();

let update_expression =		let mut otk_requests = into_one_time_put_requests(
format!("SET {0}.#{1}.{2} = list_append({0}.#{1}.{2}, :n), {0}.#{1}.{3} = list_append({0}.#{1}.{3}, :i)",		&device_id,
USERS_TABLE_DEVICES_ATTRIBUTE,		content_one_time_keys,
"deviceID",		OlmAccountType::Content,
USERS_TABLE_DEVICES_MAP_NOTIF_ONETIME_KEYS_ATTRIBUTE_NAME,
USERS_TABLE_DEVICES_MAP_CONTENT_ONETIME_KEYS_ATTRIBUTE_NAME
);		);
let expression_attribute_names =		let notif_otk_requests: Vec<WriteRequest> = into_one_time_put_requests(
HashMap::from([(format!("#{}", "deviceID"), device_id)]);		&device_id,
let expression_attribute_values = HashMap::from([		notif_one_time_keys,
(":n".to_string(), AttributeValue::L(notif_keys_av)),		OlmAccountType::Notification,
(":i".to_string(), AttributeValue::L(content_keys_av)),		);
]);		otk_requests.extend(notif_otk_requests);

self		self
.client		.client
.update_item()		.batch_write_item()
.table_name(USERS_TABLE)		.request_items(one_time_keys_table::NAME, otk_requests)
.key(USERS_TABLE_PARTITION_KEY, AttributeValue::S(user_id))
.update_expression(update_expression)
.set_expression_attribute_names(Some(expression_attribute_names))
.set_expression_attribute_values(Some(expression_attribute_values))
.send()		.send()
.await		.await
.map_err(\|e\| Error::AwsSdk(e.into()))?;		.map_err(\|e\| Error::AwsSdk(e.into()))?;

Ok(())		Ok(())
}		}

async fn add_device_to_users_table(		async fn add_device_to_users_table(
&self,		&self,
user_id: String,		user_id: String,
flattened_device_key_upload: FlattenedDeviceKeyUpload,		flattened_device_key_upload: FlattenedDeviceKeyUpload,
social_proof: Option<String>,		social_proof: Option<String>,
) -> Result<(), Error> {		) -> Result<(), Error> {
		use crate::constants::one_time_keys_table;

		// Avoid borrowing from lifetime of flattened_device_key_upload
		let device_id = flattened_device_key_upload.device_id_key.clone();
		let content_one_time_keys =
		flattened_device_key_upload.content_onetime_keys.clone();
		let notif_one_time_keys =
		flattened_device_key_upload.notif_onetime_keys.clone();

let device_info =		let device_info =
create_device_info(flattened_device_key_upload.clone(), social_proof);		create_device_info(flattened_device_key_upload, social_proof);
let update_expression =		let update_expression =
format!("SET {}.#{} = :v", USERS_TABLE_DEVICES_ATTRIBUTE, "deviceID",);		format!("SET {}.#{} = :v", USERS_TABLE_DEVICES_ATTRIBUTE, "deviceID",);
let expression_attribute_names = HashMap::from([(		let expression_attribute_names =
format!("#{}", "deviceID"),		HashMap::from([(format!("#{}", "deviceID"), device_id.clone())]);
flattened_device_key_upload.device_id_key,
)]);
let expression_attribute_values =		let expression_attribute_values =
HashMap::from([(":v".to_string(), AttributeValue::M(device_info))]);		HashMap::from([(":v".to_string(), AttributeValue::M(device_info))]);

self		self
.client		.client
.update_item()		.update_item()
.table_name(USERS_TABLE)		.table_name(USERS_TABLE)
.key(USERS_TABLE_PARTITION_KEY, AttributeValue::S(user_id))		.key(USERS_TABLE_PARTITION_KEY, AttributeValue::S(user_id))
.update_expression(update_expression)		.update_expression(update_expression)
.set_expression_attribute_names(Some(expression_attribute_names))		.set_expression_attribute_names(Some(expression_attribute_names))
.set_expression_attribute_values(Some(expression_attribute_values))		.set_expression_attribute_values(Some(expression_attribute_values))
.send()		.send()
.await		.await
.map_err(\|e\| Error::AwsSdk(e.into()))?;		.map_err(\|e\| Error::AwsSdk(e.into()))?;

		let content_otk_requests = into_one_time_put_requests(
		&device_id,
		content_one_time_keys,
		OlmAccountType::Content,
		);
		let notif_otk_requests = into_one_time_put_requests(
		&device_id,
		notif_one_time_keys,
		OlmAccountType::Notification,
		);

		self
		.client
		.batch_write_item()
		.request_items(one_time_keys_table::NAME, content_otk_requests)
		.request_items(one_time_keys_table::NAME, notif_otk_requests)
		.send()
		.await
		.map_err(\|e\| Error::AwsSdk(e.into()))?;

Ok(())		Ok(())
}		}

pub async fn update_user_password(		pub async fn update_user_password(
&self,		&self,
user_id: String,		user_id: String,
password_file: Vec<u8>,		password_file: Vec<u8>,
) -> Result<(), Error> {		) -> Result<(), Error> {
▲ Show 20 Lines • Show All 660 Lines • ▼ Show 20 Lines	(
AttributeValue::S(flattened_device_key_upload.content_prekey),		AttributeValue::S(flattened_device_key_upload.content_prekey),
),		),
(		(
USERS_TABLE_DEVICES_MAP_CONTENT_PREKEY_SIGNATURE_ATTRIBUTE_NAME		USERS_TABLE_DEVICES_MAP_CONTENT_PREKEY_SIGNATURE_ATTRIBUTE_NAME
.to_string(),		.to_string(),
AttributeValue::S(flattened_device_key_upload.content_prekey_signature),		AttributeValue::S(flattened_device_key_upload.content_prekey_signature),
),		),
(		(
USERS_TABLE_DEVICES_MAP_CONTENT_ONETIME_KEYS_ATTRIBUTE_NAME.to_string(),
AttributeValue::L(
flattened_device_key_upload
.content_onetime_keys
.into_iter()
.map(AttributeValue::S)
.collect(),
),
),
(
USERS_TABLE_DEVICES_MAP_NOTIF_PREKEY_ATTRIBUTE_NAME.to_string(),		USERS_TABLE_DEVICES_MAP_NOTIF_PREKEY_ATTRIBUTE_NAME.to_string(),
AttributeValue::S(flattened_device_key_upload.notif_prekey),		AttributeValue::S(flattened_device_key_upload.notif_prekey),
),		),
(		(
USERS_TABLE_DEVICES_MAP_NOTIF_PREKEY_SIGNATURE_ATTRIBUTE_NAME.to_string(),		USERS_TABLE_DEVICES_MAP_NOTIF_PREKEY_SIGNATURE_ATTRIBUTE_NAME.to_string(),
AttributeValue::S(flattened_device_key_upload.notif_prekey_signature),		AttributeValue::S(flattened_device_key_upload.notif_prekey_signature),
),		),
(
USERS_TABLE_DEVICES_MAP_NOTIF_ONETIME_KEYS_ATTRIBUTE_NAME.to_string(),
AttributeValue::L(
flattened_device_key_upload
.notif_onetime_keys
.into_iter()
.map(AttributeValue::S)
.collect(),
),
),
]);		]);

if let Some(social_proof) = social_proof {		if let Some(social_proof) = social_proof {
device_info.insert(		device_info.insert(
USERS_TABLE_DEVICES_MAP_SOCIAL_PROOF_ATTRIBUTE_NAME.to_string(),		USERS_TABLE_DEVICES_MAP_SOCIAL_PROOF_ATTRIBUTE_NAME.to_string(),
AttributeValue::S(social_proof),		AttributeValue::S(social_proof),
);		);
}		}
▲ Show 20 Lines • Show All 57 Lines • Show Last 20 Lines

View Options

services/identity/src/ddb_utils.rs

View Options

services/identity/src/main.rs

View Options

services/terraform/modules/shared/dynamodb.tf

[Identity] Add DDB table for one-time-keysClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 30027

services/commtest/tests/identity_one_time_key_tests.rs

services/identity/src/client_service.rs

services/identity/src/constants.rs

services/identity/src/database.rs

services/identity/src/ddb_utils.rs

services/identity/src/main.rs

services/terraform/modules/shared/dynamodb.tf

[Identity] Add DDB table for one-time-keys
ClosedPublic
Actions

Revision Contents
Changeset List