hueso/gajim-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[omemo] Dont fail on invalid session

Browse Source
This commit is contained in:
Philipp Hörist
2019-02-19 23:41:22 +01:00
parent 49ad0b1f84
commit 2f0aafba11
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
omemo/backend/liteaxolotlstore.py
View File

@@ -491,13 +491,17 @@ class LiteAxolotlStore(AxolotlStore):
def isTrusted(self, recipient_id, device_id): def isTrusted(self, recipient_id, device_id):
record = self.loadSession(recipient_id, device_id) record = self.loadSession(recipient_id, device_id)
identity_key = record.getSessionState().getRemoteIdentityKey()
try:
identity_key = record.getSessionState().getRemoteIdentityKey()
except Exception:
log.exception('Unable to determine trust for %s %s',
recipient_id, device_id)
return False
return self.getTrustForIdentity( return self.getTrustForIdentity(
recipient_id, identity_key) == Trust.TRUSTED recipient_id, identity_key) == Trust.TRUSTED
def isUntrusted(self, recipient_id, device_id): def isUntrustedIdentity(self, recipient_id, identity_key):
record = self.loadSession(recipient_id, device_id)
identity_key = record.getSessionState().getRemoteIdentityKey()
return self.getTrustForIdentity( return self.getTrustForIdentity(
recipient_id, identity_key) not in (Trust.TRUSTED, Trust.UNDECIDED) recipient_id, identity_key) not in (Trust.TRUSTED, Trust.UNDECIDED)

15
omemo/backend/state.py
View File

@@ -224,7 +224,8 @@ class OmemoState(DeviceManager):
raise Exception('Received Pre Key Message ' raise Exception('Received Pre Key Message '
'without PreKey => %s' % jid) 'without PreKey => %s' % jid)
if self._storage.isUntrusted(jid, device): identity_key = pre_key_message.getIdentityKey()
if self._storage.isUntrustedIdentity(jid, identity_key):
raise SenderNotTrusted raise SenderNotTrusted
session_cipher = self._get_session_cipher(jid, device) session_cipher = self._get_session_cipher(jid, device)
@@ -232,7 +233,7 @@ class OmemoState(DeviceManager):
log.info('%s => Process pre key message from %s', log.info('%s => Process pre key message from %s',
self._account, jid) self._account, jid)
key = session_cipher.decryptPkmsg(pre_key_message) key = session_cipher.decryptPkmsg(pre_key_message)
fingerprint = get_fingerprint(pre_key_message.getIdentityKey()) fingerprint = get_fingerprint(identity_key)
self.xmpp_con.set_bundle() self.xmpp_con.set_bundle()
self.add_device(jid, device) self.add_device(jid, device)
@@ -242,16 +243,16 @@ class OmemoState(DeviceManager):
message = WhisperMessage(serialized=key) message = WhisperMessage(serialized=key)
log.info('%s => Process message from %s', self._account, jid) log.info('%s => Process message from %s', self._account, jid)
session_record = self._storage.loadSession(jid, device)
identity_key = session_record.getSessionState().getRemoteIdentityKey()
fingerprint = get_fingerprint(identity_key)
session_cipher = self._get_session_cipher(jid, device) session_cipher = self._get_session_cipher(jid, device)
key = session_cipher.decryptMsg(message, textMsg=False) key = session_cipher.decryptMsg(message, textMsg=False)
if self._storage.isUntrusted(jid, device): session_record = self._storage.loadSession(jid, device)
identity_key = session_record.getSessionState().getRemoteIdentityKey()
if self._storage.isUntrustedIdentity(jid, identity_key):
raise SenderNotTrusted raise SenderNotTrusted
fingerprint = get_fingerprint(identity_key)
self.add_device(jid, device) self.add_device(jid, device)
return key, fingerprint return key, fingerprint