Also resolve trust in non-bridge key share check

tulir · tulir · commit 423d42a065e7 · 2023-03-22T22:16:17.000+02:00
diff --git a/mautrix/crypto/key_share.py b/mautrix/crypto/key_share.py
@@ -76,7 +76,7 @@ async def default_allow_key_share(
                 code=RoomKeyWithheldCode.BLACKLISTED,
                 reason="You have been blacklisted by this device",
             )
-        elif device.trust >= self.share_keys_min_trust:
+        elif await self.resolve_trust(device) >= self.share_keys_min_trust:
             self.log.debug(f"Accepting key request from trusted device {device.device_id}")
             return True
         else:

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ async def default_allow_key_share(`
`76`	`76`	`code=RoomKeyWithheldCode.BLACKLISTED,`
`77`	`77`	`reason="You have been blacklisted by this device",`
`78`	`78`	`)`
`79`		`- elif device.trust >= self.share_keys_min_trust:`
	`79`	`+ elif await self.resolve_trust(device) >= self.share_keys_min_trust:`
`80`	`80`	`self.log.debug(f"Accepting key request from trusted device {device.device_id}")`
`81`	`81`	`return True`
`82`	`82`	`else:`