char
/
matrix-rust-sdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

device: Store the device keys with the algorithm and device id. 

This will ensure that we can check the signature of the device later on.
master
Damir Jelić 2020-07-14 12:00:29 +02:00
parent 8206394918
commit 41cfbaf520
2 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
matrix_sdk_crypto/src/device.rs
View File

@ -36,7 +36,7 @@ pub struct Device {
user_id: Arc<UserId>, user_id: Arc<UserId>,
device_id: Arc<DeviceId>, device_id: Arc<DeviceId>,
algorithms: Arc<Vec<Algorithm>>, algorithms: Arc<Vec<Algorithm>>,
keys: Arc<BTreeMap<KeyAlgorithm, String>>, keys: Arc<BTreeMap<AlgorithmAndDeviceId, String>>,
display_name: Arc<Option<String>>, display_name: Arc<Option<String>>,
deleted: Arc<AtomicBool>, deleted: Arc<AtomicBool>,
trust_state: Arc<Atomic<TrustState>>, trust_state: Arc<Atomic<TrustState>>,
@ -75,7 +75,7 @@ impl Device {
display_name: Option<String>, display_name: Option<String>,
trust_state: TrustState, trust_state: TrustState,
algorithms: Vec<Algorithm>, algorithms: Vec<Algorithm>,
keys: BTreeMap<KeyAlgorithm, String>, keys: BTreeMap<AlgorithmAndDeviceId, String>,
) -> Self { ) -> Self {
Device { Device {
user_id: Arc::new(user_id), user_id: Arc::new(user_id),
@ -105,11 +105,12 @@ impl Device {
/// Get the key of the given key algorithm belonging to this device. /// Get the key of the given key algorithm belonging to this device.
pub fn get_key(&self, algorithm: KeyAlgorithm) -> Option<&String> { pub fn get_key(&self, algorithm: KeyAlgorithm) -> Option<&String> {
self.keys.get(&algorithm) self.keys
.get(&AlgorithmAndDeviceId(algorithm, self.device_id.to_string()))
} }
/// Get a map containing all the device keys. /// Get a map containing all the device keys.
pub fn keys(&self) -> &BTreeMap<KeyAlgorithm, String> { pub fn keys(&self) -> &BTreeMap<AlgorithmAndDeviceId, String> {
&self.keys &self.keys
} }
@ -132,13 +133,6 @@ impl Device {
pub(crate) fn update_device(&mut self, device_keys: &DeviceKeys) -> Result<(), SignatureError> { pub(crate) fn update_device(&mut self, device_keys: &DeviceKeys) -> Result<(), SignatureError> {
self.verify_device_keys(device_keys)?; self.verify_device_keys(device_keys)?;
let mut keys = BTreeMap::new();
for (key_id, key) in device_keys.keys.iter() {
let key_id = key_id.0;
let _ = keys.insert(key_id, key.clone());
}
let display_name = Arc::new( let display_name = Arc::new(
device_keys device_keys
.unsigned .unsigned
@ -151,7 +145,7 @@ impl Device {
&mut self.algorithms, &mut self.algorithms,
Arc::new(device_keys.algorithms.clone()), Arc::new(device_keys.algorithms.clone()),
); );
let _ = mem::replace(&mut self.keys, Arc::new(keys)); let _ = mem::replace(&mut self.keys, Arc::new(device_keys.keys.clone()));
let _ = mem::replace(&mut self.display_name, display_name); let _ = mem::replace(&mut self.display_name, display_name);
Ok(()) Ok(())
@ -159,8 +153,7 @@ impl Device {
fn is_signed_by_device(&self, json: &mut Value) -> Result<(), SignatureError> { fn is_signed_by_device(&self, json: &mut Value) -> Result<(), SignatureError> {
let signing_key = self let signing_key = self
.keys .get_key(KeyAlgorithm::Ed25519)
.get(&KeyAlgorithm::Ed25519)
.ok_or(SignatureError::MissingSigningKey)?; .ok_or(SignatureError::MissingSigningKey)?;
let json_object = json.as_object_mut().ok_or(SignatureError::NotAnObject)?; let json_object = json.as_object_mut().ok_or(SignatureError::NotAnObject)?;
@ -232,7 +225,10 @@ impl From<&OlmMachine> for Device {
.iter() .iter()
.map(|(key, value)| { .map(|(key, value)| {
( (
AlgorithmAndDeviceId(
KeyAlgorithm::try_from(key.as_ref()).unwrap(), KeyAlgorithm::try_from(key.as_ref()).unwrap(),
machine.device_id().clone(),
),
value.to_owned(), value.to_owned(),
) )
}) })
@ -249,18 +245,11 @@ impl TryFrom<&DeviceKeys> for Device {
type Error = SignatureError; type Error = SignatureError;
fn try_from(device_keys: &DeviceKeys) -> Result<Self, Self::Error> { fn try_from(device_keys: &DeviceKeys) -> Result<Self, Self::Error> {
let mut keys = BTreeMap::new();
for (key_id, key) in device_keys.keys.iter() {
let key_id = key_id.0;
let _ = keys.insert(key_id, key.clone());
}
let device = Device { let device = Device {
user_id: Arc::new(device_keys.user_id.clone()), user_id: Arc::new(device_keys.user_id.clone()),
device_id: Arc::new(device_keys.device_id.clone()), device_id: Arc::new(device_keys.device_id.clone()),
algorithms: Arc::new(device_keys.algorithms.clone()), algorithms: Arc::new(device_keys.algorithms.clone()),
keys: Arc::new(keys), keys: Arc::new(device_keys.keys.clone()),
display_name: Arc::new( display_name: Arc::new(
device_keys device_keys
.unsigned .unsigned

9
matrix_sdk_crypto/src/store/sqlite.rs
View File

@ -29,7 +29,7 @@ use zeroize::Zeroizing;
use super::{Account, CryptoStore, CryptoStoreError, InboundGroupSession, Result, Session}; use super::{Account, CryptoStore, CryptoStoreError, InboundGroupSession, Result, Session};
use crate::device::{Device, TrustState}; use crate::device::{Device, TrustState};
use crate::memory_stores::{DeviceStore, GroupSessionStore, SessionStore, UserDevices}; use crate::memory_stores::{DeviceStore, GroupSessionStore, SessionStore, UserDevices};
use matrix_sdk_common::api::r0::keys::KeyAlgorithm; use matrix_sdk_common::api::r0::keys::{AlgorithmAndDeviceId, KeyAlgorithm};
use matrix_sdk_common::events::Algorithm; use matrix_sdk_common::events::Algorithm;
use matrix_sdk_common::identifiers::{DeviceId, RoomId, UserId}; use matrix_sdk_common::identifiers::{DeviceId, RoomId, UserId};
@ -468,7 +468,10 @@ impl SqliteStore {
let key = &row.1; let key = &row.1;
keys.insert(algorithm, key.to_owned()); keys.insert(
AlgorithmAndDeviceId(algorithm, device_id.clone()),
key.to_owned(),
);
} }
let device = Device::new( let device = Device::new(
@ -541,7 +544,7 @@ impl SqliteStore {
", ",
) )
.bind(device_row_id) .bind(device_row_id)
.bind(key_algorithm.to_string()) .bind(key_algorithm.0.to_string())
.bind(key) .bind(key)
.execute(&mut *connection) .execute(&mut *connection)
.await?; .await?;