diff options
| author | Timo Kösters <timo@koesters.xyz> | 2023-07-10 23:10:27 +0200 |
|---|---|---|
| committer | Timo Kösters <timo@koesters.xyz> | 2023-07-10 23:10:27 +0200 |
| commit | c3966f501c5dbb495ca4ef8c044fac7049645594 (patch) | |
| tree | 51185a56031374725ad221fc88be9660cefd7580 /src | |
| parent | ad06d475debc9657d36414bebb5a28f1ba3efcc7 (diff) | |
| download | conduit-c3966f501c5dbb495ca4ef8c044fac7049645594.zip | |
fix: nheko e2ee verification bug
Diffstat (limited to 'src')
| -rw-r--r-- | src/api/client_server/keys.rs | 12 | ||||
| -rw-r--r-- | src/database/key_value/users.rs | 1 |
2 files changed, 0 insertions, 13 deletions
diff --git a/src/api/client_server/keys.rs b/src/api/client_server/keys.rs index ba89ece..21f71b6 100644 --- a/src/api/client_server/keys.rs +++ b/src/api/client_server/keys.rs @@ -151,18 +151,6 @@ pub async fn upload_signatures_route( let key = serde_json::to_value(key) .map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Invalid key JSON"))?; - let is_signed_key = match key.get("usage") { - Some(usage) => usage - .as_array() - .map(|usage| !usage.contains(&json!("master"))) - .unwrap_or(false), - None => true, - }; - - if !is_signed_key { - continue; - } - for signature in key .get("signatures") .ok_or(Error::BadRequest( diff --git a/src/database/key_value/users.rs b/src/database/key_value/users.rs index 1cabab0..359a072 100644 --- a/src/database/key_value/users.rs +++ b/src/database/key_value/users.rs @@ -592,7 +592,6 @@ impl service::users::Data for KeyValueDatabase { &serde_json::to_vec(&cross_signing_key).expect("CrossSigningKey::to_vec always works"), )?; - // TODO: Should we notify about this change? self.mark_device_key_update(target_id)?; Ok(()) |