mirror/matrix-rust-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-rust-sdk.git synced 2026-06-21 22:58:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

crypto: update OwnUserIdentityData::is_device_signed to return bool

Browse Source 
As before: since all the callers end up calling `.is_ok()` on the result, and
the name implies it should return a bool, let's just return a bool.
This commit is contained in:
Richard van der Hoff
2024-08-14 18:41:14 +01:00
committed by Richard van der Hoff
parent 31b25b8754
commit 5f9a4fc6d1
2 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/matrix-sdk-crypto/src/identities/device.rs
View File

@@ -744,7 +744,7 @@ impl DeviceData {
|(own_identity, device_identity)| {
match device_identity {
UserIdentityData::Own(_) => {
own_identity.is_verified() && own_identity.is_device_signed(self).is_ok()
own_identity.is_verified() && own_identity.is_device_signed(self)
}
// If it's a device from someone else, first check
@@ -766,7 +766,7 @@ impl DeviceData {
match device_owner_identity {
// If it's one of our own devices, just check that
// we signed the device.
UserIdentityData::Own(identity) => identity.is_device_signed(self).is_ok(),
UserIdentityData::Own(identity) => identity.is_device_signed(self),
// If it's a device from someone else, check
// if the other user has signed this device.
UserIdentityData::Other(device_identity) => {

24
crates/matrix-sdk-crypto/src/identities/user.rs
View File

@@ -916,22 +916,17 @@ impl OwnUserIdentityData {
/// Check if the given device has been signed by this identity.
///
/// Only devices of our own user should be checked with this method, if a
/// device of a different user is given the signature check will always fail
/// even if a valid signature exists.
/// Only devices of our own user should be checked with this method. If a
/// device of a different user is given, the signature check will always
/// fail even if a valid signature exists.
///
/// # Arguments
///
/// * `device` - The device that should be checked for a valid signature.
///
/// Returns an empty result if the signature check succeeded, otherwise a
/// SignatureError indicating why the check failed.
pub(crate) fn is_device_signed(&self, device: &DeviceData) -> Result<(), SignatureError> {
if self.user_id() != device.user_id() {
return Err(SignatureError::UserIdMismatch);
}
self.self_signing_key.verify_device(device)
/// Returns `true` if the signature check succeeded, otherwise `false`.
pub(crate) fn is_device_signed(&self, device: &DeviceData) -> bool {
self.user_id() == device.user_id() && self.self_signing_key.verify_device(device).is_ok()
}
/// Mark our identity as verified.
@@ -995,8 +990,7 @@ impl OwnUserIdentityData {
devices
.into_iter()
.filter_map(|(device_id, device)| {
(device_id != own_device_id && self.is_device_signed(&device).is_ok())
.then_some(device_id)
(device_id != own_device_id && self.is_device_signed(&device)).then_some(device_id)
})
.collect()
}
@@ -1217,8 +1211,8 @@ pub(crate) mod tests {
let identity = get_own_identity();
let (first, second) = device(&response);
identity.is_device_signed(&first).unwrap_err();
identity.is_device_signed(&second).unwrap();
assert!(!identity.is_device_signed(&first));
assert!(identity.is_device_signed(&second));
let private_identity =
Arc::new(Mutex::new(PrivateCrossSigningIdentity::empty(second.user_id())));