magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: nheko e2ee verification bug

Browse source
This commit is contained in:
Timo Kösters 2023-07-10 23:10:27 +02:00
parent ad06d475de
commit c3966f501c
No known key found for this signature in database
GPG key ID: 0B25E636FBA7E4CB
2 changed files with 0 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/api/client_server/keys.rs
View file

@ -151,18 +151,6 @@ pub async fn upload_signatures_route(
let key = serde_json::to_value(key) let key = serde_json::to_value(key)
.map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Invalid key JSON"))?; .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 for signature in key
.get("signatures") .get("signatures")
.ok_or(Error::BadRequest( .ok_or(Error::BadRequest(

1
src/database/key_value/users.rs
View file

@ -592,7 +592,6 @@ impl service::users::Data for KeyValueDatabase {
&serde_json::to_vec(&cross_signing_key).expect("CrossSigningKey::to_vec always works"), &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)?; self.mark_device_key_update(target_id)?;
Ok(()) Ok(())