Page MenuHomePhorge
Files F33070213

D12343.1768442533.diff
No OneTemporary
Actions

Size
13 KB
Referenced Files
None
Subscribers
None

D12343.1768442533.diff
View Options

diff --git a/services/commtest/src/identity/olm_account_infos.rs b/services/commtest/src/identity/olm_account_infos.rs
--- a/services/commtest/src/identity/olm_account_infos.rs
+++ b/services/commtest/src/identity/olm_account_infos.rs
@@ -1,4 +1,3 @@
-use lazy_static::lazy_static;
use rand::{distributions::Alphanumeric, Rng};
use serde::{Deserialize, Serialize};
@@ -42,39 +41,6 @@
}
}
-lazy_static! {
- pub static ref DEFAULT_CLIENT_KEYS: ClientPublicKeys = ClientPublicKeys {
- primary_identity_public_keys: IdentityPublicKeys {
- ed25519: "cSlL+VLLJDgtKSPlIwoCZg0h0EmHlQoJC08uV/O+jvg".to_string(),
- curve25519: "Y4ZIqzpE1nv83kKGfvFP6rifya0itRg2hifqYtsISnk".to_string(),
- },
- notification_identity_public_keys: IdentityPublicKeys {
- ed25519: "D0BV2Y7Qm36VUtjwyQTJJWYAycN7aMSJmhEsRJpW2mk".to_string(),
- curve25519: "DYmV8VdkjwG/VtC8C53morogNJhpTPT/4jzW0/cxzQo".to_string(),
- }
- };
- pub static ref MOCK_CLIENT_KEYS_1: ClientPublicKeys = ClientPublicKeys {
- primary_identity_public_keys: IdentityPublicKeys {
- ed25519: "lbp5cS9fH5NnWIJbZ57wGBzDBGvmjoq6gMBHsIyXfJ4".to_string(),
- curve25519: "x74rEeVzfTcjm+B2yLN/wgfvHEzEtphQ/JeQfIrzPzQ".to_string(),
- },
- notification_identity_public_keys: IdentityPublicKeys {
- ed25519: "+mi3TltiSK2883cm0TK2mkSKPcQb+WVfshltTSVgA2Y".to_string(),
- curve25519: "GI8V9FwOYIqxB2TzQN31nXKR8y3/B3k+ZOCgxkTlUlI".to_string(),
- },
- };
- pub static ref MOCK_CLIENT_KEYS_2: ClientPublicKeys = ClientPublicKeys {
- primary_identity_public_keys: IdentityPublicKeys {
- ed25519: "ZXx1ADCFxFm6P+UmVhX0A1tuqUoBU7lYjig/gMzSEJI".to_string(),
- curve25519: "zHfP5eeD3slrgidtNRknHw3NKtJ7hA+vinaT3ACIhRA".to_string(),
- },
- notification_identity_public_keys: IdentityPublicKeys {
- ed25519: "TqzVFQLnJvt9JfMVU54d6InEd/wQV3DCplBuj5axTlU".to_string(),
- curve25519: "nRVVaf+Iz2MfEFtQtzrvV/EmTivqKpOeHlCt9OWYUxM".to_string(),
- },
- };
-}
-
pub fn generate_random_olm_key() -> String {
rand::thread_rng()
.sample_iter(&Alphanumeric)
diff --git a/services/commtest/tests/identity_device_list_tests.rs b/services/commtest/tests/identity_device_list_tests.rs
--- a/services/commtest/tests/identity_device_list_tests.rs
+++ b/services/commtest/tests/identity_device_list_tests.rs
@@ -6,6 +6,7 @@
login_user_device, logout_user_device, register_user_device,
register_user_device_with_device_list, DEVICE_TYPE, PLACEHOLDER_CODE_VERSION,
};
+use commtest::identity::olm_account_infos::ClientPublicKeys;
use commtest::identity::SigningCapableAccount;
use commtest::service_addr;
use grpc_clients::identity::authenticated::ChainedInterceptedAuthClient;
@@ -28,11 +29,9 @@
// - [ios, web] - mobile should be first
#[tokio::test]
async fn test_device_list_rotation() {
- use commtest::identity::olm_account_infos::{
- DEFAULT_CLIENT_KEYS as DEVICE_KEYS_ANDROID,
- MOCK_CLIENT_KEYS_1 as DEVICE_KEYS_WEB,
- MOCK_CLIENT_KEYS_2 as DEVICE_KEYS_IOS,
- };
+ let device_keys_web = ClientPublicKeys::default();
+ let device_keys_ios = ClientPublicKeys::default();
+ let device_keys_android = ClientPublicKeys::default();
// Create viewer (user that doesn't change devices)
let viewer = register_user_device(None, None).await;
@@ -46,14 +45,13 @@
.await
.expect("Couldn't connect to identity service");
- let android_device_id =
- &DEVICE_KEYS_ANDROID.primary_identity_public_keys.ed25519;
- let web_device_id = &DEVICE_KEYS_WEB.primary_identity_public_keys.ed25519;
- let ios_device_id = &DEVICE_KEYS_IOS.primary_identity_public_keys.ed25519;
+ let android_device_id = device_keys_android.device_id();
+ let web_device_id = device_keys_web.device_id();
+ let ios_device_id = device_keys_ios.device_id();
// 1. Register user with primary Android device
let android =
- register_user_device(Some(&DEVICE_KEYS_ANDROID), Some(DeviceType::Android))
+ register_user_device(Some(&device_keys_android), Some(DeviceType::Android))
.await;
let user_id = android.user_id.clone();
let username = android.username.clone();
@@ -61,7 +59,7 @@
// 2. Log in a web device
let _web = login_user_device(
&username,
- Some(&DEVICE_KEYS_WEB),
+ Some(&device_keys_web),
Some(DeviceType::Web),
false,
)
@@ -73,7 +71,7 @@
// 4. Log in an iOS device
let _ios = login_user_device(
&username,
- Some(&DEVICE_KEYS_IOS),
+ Some(&device_keys_ios),
Some(DeviceType::Ios),
false,
)
@@ -254,11 +252,9 @@
#[tokio::test]
async fn test_keyserver_force_login() {
- use commtest::identity::olm_account_infos::{
- DEFAULT_CLIENT_KEYS as DEVICE_KEYS_ANDROID,
- MOCK_CLIENT_KEYS_1 as DEVICE_KEYS_KEYSERVER_1,
- MOCK_CLIENT_KEYS_2 as DEVICE_KEYS_KEYSERVER_2,
- };
+ let device_keys_android = ClientPublicKeys::default();
+ let device_keys_keyserver_1 = ClientPublicKeys::default();
+ let device_keys_keyserver_2 = ClientPublicKeys::default();
// Create viewer (user that doesn't change devices)
let viewer = register_user_device(None, None).await;
@@ -272,16 +268,13 @@
.await
.expect("Couldn't connect to identity service");
- let android_device_id =
- &DEVICE_KEYS_ANDROID.primary_identity_public_keys.ed25519;
- let keyserver_1_device_id =
- &DEVICE_KEYS_KEYSERVER_1.primary_identity_public_keys.ed25519;
- let keyserver_2_device_id =
- &DEVICE_KEYS_KEYSERVER_2.primary_identity_public_keys.ed25519;
+ let android_device_id = device_keys_android.device_id();
+ let keyserver_1_device_id = device_keys_keyserver_1.device_id();
+ let keyserver_2_device_id = device_keys_keyserver_2.device_id();
// 1. Register user with primary Android device
let android =
- register_user_device(Some(&DEVICE_KEYS_ANDROID), Some(DeviceType::Android))
+ register_user_device(Some(&device_keys_android), Some(DeviceType::Android))
.await;
let user_id = android.user_id.clone();
let username = android.username.clone();
@@ -289,7 +282,7 @@
// 2. Log in on keyserver 1
let _keyserver_1 = login_user_device(
&username,
- Some(&DEVICE_KEYS_KEYSERVER_1),
+ Some(&device_keys_keyserver_1),
Some(DeviceType::Keyserver),
false,
)
@@ -298,7 +291,7 @@
// 3. Log in on keyserver 2 with force = true
let _keyserver_2 = login_user_device(
&username,
- Some(&DEVICE_KEYS_KEYSERVER_2),
+ Some(&device_keys_keyserver_2),
Some(DeviceType::Keyserver),
true,
)
diff --git a/services/commtest/tests/tunnelbroker_integration_tests.rs b/services/commtest/tests/tunnelbroker_integration_tests.rs
--- a/services/commtest/tests/tunnelbroker_integration_tests.rs
+++ b/services/commtest/tests/tunnelbroker_integration_tests.rs
@@ -3,9 +3,6 @@
}
use commtest::identity::device::register_user_device;
-use commtest::identity::olm_account_infos::{
- MOCK_CLIENT_KEYS_1, MOCK_CLIENT_KEYS_2,
-};
use commtest::service_addr;
use commtest::tunnelbroker::socket::{
create_socket, receive_message, send_message, WebSocketMessageToDevice,
@@ -59,8 +56,8 @@
#[tokio::test]
async fn test_messages_order() {
- let sender = register_user_device(Some(&MOCK_CLIENT_KEYS_1), None).await;
- let receiver = register_user_device(Some(&MOCK_CLIENT_KEYS_2), None).await;
+ let sender = register_user_device(None, None).await;
+ let receiver = register_user_device(None, None).await;
let messages = vec![
WebSocketMessageToDevice {
diff --git a/services/commtest/tests/tunnelbroker_persist_tests.rs b/services/commtest/tests/tunnelbroker_persist_tests.rs
--- a/services/commtest/tests/tunnelbroker_persist_tests.rs
+++ b/services/commtest/tests/tunnelbroker_persist_tests.rs
@@ -2,9 +2,6 @@
tonic::include_proto!("tunnelbroker");
}
use commtest::identity::device::register_user_device;
-use commtest::identity::olm_account_infos::{
- MOCK_CLIENT_KEYS_1, MOCK_CLIENT_KEYS_2,
-};
use commtest::service_addr;
use commtest::tunnelbroker::socket::{
create_socket, receive_message, send_message, WebSocketMessageToDevice,
@@ -60,8 +57,8 @@
#[tokio::test]
async fn persist_websocket_messages() {
- let sender = register_user_device(Some(&MOCK_CLIENT_KEYS_1), None).await;
- let receiver = register_user_device(Some(&MOCK_CLIENT_KEYS_2), None).await;
+ let sender = register_user_device(None, None).await;
+ let receiver = register_user_device(None, None).await;
// Send message to not connected client
let mut sender_socket = create_socket(&sender).await.unwrap();
diff --git a/services/commtest/tests/tunnelbroker_recipient_confirmation_tests.rs b/services/commtest/tests/tunnelbroker_recipient_confirmation_tests.rs
--- a/services/commtest/tests/tunnelbroker_recipient_confirmation_tests.rs
+++ b/services/commtest/tests/tunnelbroker_recipient_confirmation_tests.rs
@@ -1,7 +1,4 @@
use commtest::identity::device::register_user_device;
-use commtest::identity::olm_account_infos::{
- MOCK_CLIENT_KEYS_1, MOCK_CLIENT_KEYS_2,
-};
use commtest::tunnelbroker::socket::{
create_socket, receive_message, send_message, WebSocketMessageToDevice,
};
@@ -15,8 +12,8 @@
#[tokio::test]
async fn deliver_until_confirmation_not_connected() {
- let sender = register_user_device(Some(&MOCK_CLIENT_KEYS_1), None).await;
- let receiver = register_user_device(Some(&MOCK_CLIENT_KEYS_2), None).await;
+ let sender = register_user_device(None, None).await;
+ let receiver = register_user_device(None, None).await;
// send message to not connected client
let mut sender_socket = create_socket(&sender).await.unwrap();
@@ -59,8 +56,8 @@
#[tokio::test]
async fn deliver_until_confirmation_connected() {
- let sender = register_user_device(Some(&MOCK_CLIENT_KEYS_1), None).await;
- let receiver = register_user_device(Some(&MOCK_CLIENT_KEYS_2), None).await;
+ let sender = register_user_device(None, None).await;
+ let receiver = register_user_device(None, None).await;
// send message to connected client
let mut receiver_socket = create_socket(&receiver).await.unwrap();
@@ -98,8 +95,8 @@
#[tokio::test]
async fn test_confirming_deleted_message() {
- let sender = register_user_device(Some(&MOCK_CLIENT_KEYS_1), None).await;
- let receiver = register_user_device(Some(&MOCK_CLIENT_KEYS_2), None).await;
+ let sender = register_user_device(None, None).await;
+ let receiver = register_user_device(None, None).await;
// send message to connected client
let mut receiver_socket = create_socket(&receiver).await.unwrap();
@@ -153,8 +150,8 @@
#[tokio::test]
async fn test_confirming() {
- let sender = register_user_device(Some(&MOCK_CLIENT_KEYS_1), None).await;
- let receiver = register_user_device(Some(&MOCK_CLIENT_KEYS_2), None).await;
+ let sender = register_user_device(None, None).await;
+ let receiver = register_user_device(None, None).await;
// send message to connected client
let mut receiver_socket = create_socket(&receiver).await.unwrap();
diff --git a/services/commtest/tests/tunnelbroker_sender_confirmation_tests.rs b/services/commtest/tests/tunnelbroker_sender_confirmation_tests.rs
--- a/services/commtest/tests/tunnelbroker_sender_confirmation_tests.rs
+++ b/services/commtest/tests/tunnelbroker_sender_confirmation_tests.rs
@@ -1,7 +1,4 @@
use commtest::identity::device::register_user_device;
-use commtest::identity::olm_account_infos::{
- DEFAULT_CLIENT_KEYS, MOCK_CLIENT_KEYS_1, MOCK_CLIENT_KEYS_2,
-};
use commtest::tunnelbroker::socket::{create_socket, receive_message};
use futures_util::{SinkExt, StreamExt};
use tokio_tungstenite::tungstenite::Message;
@@ -14,8 +11,8 @@
#[tokio::test]
async fn get_confirmation() {
- let sender = register_user_device(Some(&MOCK_CLIENT_KEYS_1), None).await;
- let receiver = register_user_device(Some(&MOCK_CLIENT_KEYS_2), None).await;
+ let sender = register_user_device(None, None).await;
+ let receiver = register_user_device(None, None).await;
let client_message_id = "mockID".to_string();
@@ -53,7 +50,7 @@
#[tokio::test]
async fn get_serialization_error() {
- let sender = register_user_device(Some(&DEFAULT_CLIENT_KEYS), None).await;
+ let sender = register_user_device(None, None).await;
let message = "some bad json".to_string();
let mut sender_socket = create_socket(&sender).await.unwrap();
@@ -74,7 +71,7 @@
#[tokio::test]
async fn get_invalid_request_error() {
- let sender = register_user_device(Some(&DEFAULT_CLIENT_KEYS), None).await;
+ let sender = register_user_device(None, None).await;
let mut sender_socket = create_socket(&sender).await.unwrap();
sender_socket
diff --git a/services/commtest/tests/tunnelbroker_websocket_messages_tests.rs b/services/commtest/tests/tunnelbroker_websocket_messages_tests.rs
--- a/services/commtest/tests/tunnelbroker_websocket_messages_tests.rs
+++ b/services/commtest/tests/tunnelbroker_websocket_messages_tests.rs
@@ -1,5 +1,4 @@
use commtest::identity::device::register_user_device;
-use commtest::identity::olm_account_infos::MOCK_CLIENT_KEYS_1;
use commtest::tunnelbroker::socket::create_socket;
use futures_util::{SinkExt, StreamExt};
use tokio_tungstenite::tungstenite::{Error, Message, Message::Close};
@@ -8,7 +7,7 @@
#[tokio::test]
async fn test_ping_pong() {
- let device = register_user_device(Some(&MOCK_CLIENT_KEYS_1), None).await;
+ let device = register_user_device(None, None).await;
let ping_message = vec![1, 2, 3, 4, 5];
@@ -32,7 +31,7 @@
#[tokio::test]
async fn test_close_message() {
- let device = register_user_device(Some(&MOCK_CLIENT_KEYS_1), None).await;
+ let device = register_user_device(None, None).await;
let mut socket = create_socket(&device).await.unwrap();
socket

File Metadata

Mime Type
text/plain
Expires
Thu, Jan 15, 2:02 AM (9 h, 33 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5935279
Default Alt Text
D12343.1768442533.diff (13 KB)

Event Timeline