diff options
Diffstat (limited to 'nbxmpp/modules')
-rw-r--r-- | nbxmpp/modules/bits_of_binary.py | 2 | ||||
-rw-r--r-- | nbxmpp/modules/ibb.py | 2 | ||||
-rw-r--r-- | nbxmpp/modules/omemo.py | 16 | ||||
-rw-r--r-- | nbxmpp/modules/openpgp.py | 6 | ||||
-rw-r--r-- | nbxmpp/modules/user_avatar.py | 2 | ||||
-rw-r--r-- | nbxmpp/modules/vcard_temp.py | 2 |
6 files changed, 14 insertions, 16 deletions
diff --git a/nbxmpp/modules/bits_of_binary.py b/nbxmpp/modules/bits_of_binary.py index 250e9b2..dfe4935 100644 --- a/nbxmpp/modules/bits_of_binary.py +++ b/nbxmpp/modules/bits_of_binary.py @@ -60,7 +60,7 @@ def parse_bob_data(stanza: Node) -> Optional[BobData]: return None try: - bob_data = b64decode(bob_data, return_type=bytes) + bob_data = b64decode(bob_data) except Exception: log.warning('Unable to decode data') log.exception(stanza) diff --git a/nbxmpp/modules/ibb.py b/nbxmpp/modules/ibb.py index c68e524..40fb237 100644 --- a/nbxmpp/modules/ibb.py +++ b/nbxmpp/modules/ibb.py @@ -113,7 +113,7 @@ class IBB(BaseModule): raise NodeProcessed try: - decoded_data = b64decode(data.getData(), return_type=bytes) + decoded_data = b64decode(data.getData()) except Exception: self._log.exception('Failed to decode IBB data') self._client.send_stanza(ErrorStanza(stanza, ERR_BAD_REQUEST)) diff --git a/nbxmpp/modules/omemo.py b/nbxmpp/modules/omemo.py index 0ecec80..fd77af0 100644 --- a/nbxmpp/modules/omemo.py +++ b/nbxmpp/modules/omemo.py @@ -194,7 +194,7 @@ def _parse_omemo_message(stanza): iv_node = header.getTag('iv') try: - iv = b64decode(iv_node.getData(), bytes) + iv = b64decode(iv_node.getData()) except Exception as error: raise MalformedStanzaError('failed to decode iv: %s' % error, stanza) @@ -202,7 +202,7 @@ def _parse_omemo_message(stanza): payload_node = encrypted.getTag('payload') if payload_node is not None: try: - payload = b64decode(payload_node.getData(), bytes) + payload = b64decode(payload_node.getData()) except Exception as error: raise MalformedStanzaError('failed to decode payload: %s' % error, stanza) @@ -227,7 +227,7 @@ def _parse_omemo_message(stanza): raise MalformedStanzaError(error, stanza) try: - keys[int(rid)] = (b64decode(kn.getData(), bytes), prekey) + keys[int(rid)] = (b64decode(kn.getData()), prekey) except Exception as error: raise MalformedStanzaError('failed to decode key: %s' % error, stanza) @@ -273,8 +273,7 @@ def _parse_bundle(item): result = {} signed_prekey_node = bundle.getTag('signedPreKeyPublic') try: - result['spk'] = {'key': b64decode(signed_prekey_node.getData(), - bytes)} + result['spk'] = {'key': b64decode(signed_prekey_node.getData())} except Exception as error: error = 'Failed to decode signedPreKeyPublic: %s' % error raise MalformedStanzaError(error, item) @@ -287,15 +286,14 @@ def _parse_bundle(item): signed_signature_node = bundle.getTag('signedPreKeySignature') try: - result['spk_signature'] = b64decode(signed_signature_node.getData(), - bytes) + result['spk_signature'] = b64decode(signed_signature_node.getData()) except Exception as error: error = 'Failed to decode signedPreKeySignature: %s' % error raise MalformedStanzaError(error, item) identity_key_node = bundle.getTag('identityKey') try: - result['ik'] = b64decode(identity_key_node.getData(), bytes) + result['ik'] = b64decode(identity_key_node.getData()) except Exception as error: error = 'Failed to decode IdentityKey: %s' % error raise MalformedStanzaError(error, item) @@ -312,7 +310,7 @@ def _parse_bundle(item): raise MalformedStanzaError('Invalid prekey: %s' % error, item) try: - key = b64decode(prekey.getData(), bytes) + key = b64decode(prekey.getData()) except Exception as error: raise MalformedStanzaError( 'Failed to decode preKeyPublic: %s' % error, item) diff --git a/nbxmpp/modules/openpgp.py b/nbxmpp/modules/openpgp.py index 5ff8238..ce1abe8 100644 --- a/nbxmpp/modules/openpgp.py +++ b/nbxmpp/modules/openpgp.py @@ -74,7 +74,7 @@ class OpenPGP(BaseModule): self._log.info('Encrypted message received') try: - properties.openpgp = b64decode(data, return_type=bytes) + properties.openpgp = b64decode(data) except Exception: self._log.warning('b64decode failed') self._log.warning(stanza) @@ -390,7 +390,7 @@ def _parse_public_key(jid, item): raise ValueError('data node missing') try: - key = b64decode(data.getData(), return_type=bytes) + key = b64decode(data.getData()) except Exception as error: raise ValueError(f'decoding error: {error}') @@ -432,7 +432,7 @@ def _parse_secret_key(item): raise ValueError('secretkey data missing') try: - key = b64decode(data, return_type=bytes) + key = b64decode(data) except Exception as error: raise ValueError(f'decoding error: {error}') diff --git a/nbxmpp/modules/user_avatar.py b/nbxmpp/modules/user_avatar.py index 2911134..31f7815 100644 --- a/nbxmpp/modules/user_avatar.py +++ b/nbxmpp/modules/user_avatar.py @@ -220,7 +220,7 @@ def _get_avatar_data(item, id_): raise MalformedStanzaError('data node empty', item) try: - avatar = b64decode(data, return_type=bytes) + avatar = b64decode(data) except Exception as error: raise MalformedStanzaError(f'decoding error: {error}', item) diff --git a/nbxmpp/modules/vcard_temp.py b/nbxmpp/modules/vcard_temp.py index 7d3483b..26ef002 100644 --- a/nbxmpp/modules/vcard_temp.py +++ b/nbxmpp/modules/vcard_temp.py @@ -138,6 +138,6 @@ class VCard: if not avatar: return None, None - avatar = b64decode(avatar, return_type=bytes) + avatar = b64decode(avatar) avatar_sha = hashlib.sha1(avatar).hexdigest() return avatar, avatar_sha |