Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 4 commits: Fix typo
by Philipp Hörist 11 Feb '19

11 Feb '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: f8373012 by Philipp Hörist at 2019-02-11T19:58:42Z Fix typo - - - - - 94160d83 by Philipp Hörist at 2019-02-11T20:05:20Z Adapt to AffiliationResult changes in nbxmpp - - - - - dede4ba4 by Philipp Hörist at 2019-02-11T20:41:39Z Adapt to MucConfigResult changes in nbxmpp - - - - - c2038b0f by Philipp Hörist at 2019-02-11T21:24:20Z Adapt to BlockingListResult changes in nbxmpp - - - - - 4 changed files: - gajim/common/modules/muc.py - gajim/common/modules/presence.py - gajim/gtk/blocking.py - gajim/gtk/groupchat_config.py Changes: ===================================== gajim/common/modules/muc.py ===================================== @@ -22,6 +22,7 @@ import nbxmpp from nbxmpp.const import InviteType from nbxmpp.const import PresenceType from nbxmpp.structs import StanzaHandler +from nbxmpp.util import is_error_result from gajim.common import app from gajim.common import helpers @@ -429,7 +430,7 @@ class MUC(BaseModule): self._nbxmpp('MUC').invite(room, to, reason, password, continue_, type_) def _config_received(self, result): - if result.is_error: + if is_error_result(result): return app.nec.push_incoming_event(NetworkEvent( ===================================== gajim/common/modules/presence.py ===================================== @@ -92,7 +92,7 @@ class Presence: contacts = app.contacts.get_jid_list(self._account) if properties.jid.getBare() not in contacts and not properties.is_self_bare: # Handle only presence from roster contacts - log.warning('Unkown presence received') + log.warning('Unknown presence received') log.warning(stanza) return ===================================== gajim/gtk/blocking.py ===================================== @@ -14,8 +14,10 @@ import logging +from nbxmpp.util import is_error_result from gi.repository import Gtk from gi.repository import Gdk +from gi.repository import GLib from gajim.common import app from gajim.common.i18n import _ @@ -67,15 +69,16 @@ class BlockingList(Gtk.ApplicationWindow): dialog = HigDialog( self, Gtk.MessageType.INFO, Gtk.ButtonsType.OK, _('Error!'), - error) + GLib.markup_escape_text(str(error))) dialog.popup() def _on_blocking_list_received(self, result): + is_error = is_error_result(result) self._disable_spinner() - self._set_grid_state(not result.is_error) + self._set_grid_state(not is_error) - if result.is_error: - self._show_error(result.error) + if is_error: + self._show_error(result) else: self._prev_blocked_jids = set(result.blocking_list) @@ -85,8 +88,8 @@ class BlockingList(Gtk.ApplicationWindow): def _on_save_result(self, result): self._await_results -= 1 - if result.is_error and not self._received_errors: - self._show_error(result.error) + if is_error_result(result) and not self._received_errors: + self._show_error(result) self._received_errors = True if not self._await_results: ===================================== gajim/gtk/groupchat_config.py ===================================== @@ -15,6 +15,7 @@ import logging import nbxmpp +from nbxmpp.util import is_error_result from gi.repository import Gdk from gi.repository import Gtk @@ -65,7 +66,8 @@ class GroupchatConfig(Gtk.ApplicationWindow): con.get_module('MUC').get_affiliation( self.jid, affiliation, - callback=self._on_affiliations_received) + callback=self._on_affiliations_received, + user_data=affiliation) if form is not None: self._ui.stack.set_visible_child_name('config') @@ -352,28 +354,28 @@ class GroupchatConfig(Gtk.ApplicationWindow): con.get_module('MUC').set_affiliation(self.jid, diff_dict) @ensure_not_destroyed - def _on_affiliations_received(self, result): - if result.is_error: + def _on_affiliations_received(self, result, affiliation): + if is_error_result(result): log.info('Error while requesting %s affiliations: %s', - result.affiliation, result.error) + affiliation, result) return - if result.affiliation == 'outcast': + if affiliation == 'outcast': self._ui.stack.get_child_by_name('outcast').show() for jid, attrs in result.users.items(): - affiliation_edit, jid_edit = self._allowed_to_edit(result.affiliation) - if result.affiliation == 'outcast': + affiliation_edit, jid_edit = self._allowed_to_edit(affiliation) + if affiliation == 'outcast': reason = attrs.get('reason') self._ui.outcast_store.append( [jid, reason, None, - result.affiliation, + affiliation, None, affiliation_edit, jid_edit]) - self._affiliations[jid] = {'affiliation': result.affiliation, + self._affiliations[jid] = {'affiliation': affiliation, 'reason': reason} else: nick = attrs.get('nick') @@ -382,11 +384,11 @@ class GroupchatConfig(Gtk.ApplicationWindow): [jid, nick, role, - result.affiliation, - _(result.affiliation.capitalize()), + affiliation, + _(affiliation.capitalize()), affiliation_edit, jid_edit]) - self._affiliations[jid] = {'affiliation': result.affiliation, + self._affiliations[jid] = {'affiliation': affiliation, 'nick': nick} if role is not None: self._ui.role_column.set_visible(True) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/4a2c23b893b415df1e4ab205cd468e0df… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/4a2c23b893b415df1e4ab205cd468e0df… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 7 commits: MUC: Parse ofrom and lower handler priority
by Philipp Hörist 11 Feb '19

11 Feb '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 704d9aa3 by Philipp Hörist at 2019-02-11T19:38:24Z MUC: Parse ofrom and lower handler priority The handler should run before decryption handlers - - - - - f45a1278 by Philipp Hörist at 2019-02-11T20:00:18Z OpenPGP: Raise priority on message handler - - - - - deba7180 by Philipp Hörist at 2019-02-11T20:01:07Z Add OMEMO (XEP-0384) module - - - - - 4feb9d4a by Philipp Hörist at 2019-02-11T20:30:06Z Simplify AffiliationResult - - - - - f5e499ce by Philipp Hörist at 2019-02-11T20:30:21Z Simplify MucConfigResult - - - - - b63d59c2 by Philipp Hörist at 2019-02-11T20:30:47Z Simplify BlockingListResult - - - - - 7d504905 by Philipp Hörist at 2019-02-11T20:30:59Z Simplify CommonResult - - - - - 7 changed files: - nbxmpp/dispatcher_nb.py - nbxmpp/modules/muc.py - + nbxmpp/modules/omemo.py - nbxmpp/modules/openpgp.py - nbxmpp/protocol.py - nbxmpp/structs.py - nbxmpp/util.py Changes: ===================================== nbxmpp/dispatcher_nb.py ===================================== @@ -64,6 +64,7 @@ from nbxmpp.modules.location import Location from nbxmpp.modules.user_avatar import UserAvatar from nbxmpp.modules.bookmarks import Bookmarks from nbxmpp.modules.openpgp import OpenPGP +from nbxmpp.modules.omemo import OMEMO from nbxmpp.modules.misc import unwrap_carbon from nbxmpp.modules.misc import unwrap_mam from nbxmpp.util import get_properties_struct @@ -195,6 +196,7 @@ class XMPPDispatcher(PlugIn): self._modules['UserAvatar'] = UserAvatar(self._owner) self._modules['Bookmarks'] = Bookmarks(self._owner) self._modules['OpenPGP'] = OpenPGP(self._owner) + self._modules['OMEMO'] = OMEMO(self._owner) for instance in self._modules.values(): for handler in instance.handlers: ===================================== nbxmpp/modules/muc.py ===================================== @@ -25,6 +25,7 @@ from nbxmpp.protocol import NS_MUC_REQUEST from nbxmpp.protocol import NS_MUC_ADMIN from nbxmpp.protocol import NS_MUC_OWNER from nbxmpp.protocol import NS_CAPTCHA +from nbxmpp.protocol import NS_ADDRESS from nbxmpp.protocol import JID from nbxmpp.protocol import Iq from nbxmpp.protocol import Message @@ -71,7 +72,7 @@ class MUC: StanzaHandler(name='message', callback=self._process_groupchat_message, typ='groupchat', - priority=11), + priority=6), StanzaHandler(name='message', callback=self._process_mediated_invite, typ='normal', @@ -160,11 +161,17 @@ class MUC: def _process_groupchat_message(self, _con, stanza, properties): properties.from_muc = True properties.muc_nickname = properties.jid.getResource() or None - + muc_user = stanza.getTag('x', namespace=NS_MUC_USER) if muc_user is not None: properties.muc_user = self._parse_muc_user(muc_user) + addresses = stanza.getTag('addresses', namespace=NS_ADDRESS) + if addresses is not None: + address = addresses.getTag('address', attrs={'type': 'ofrom'}) + if address is not None: + properties.muc_ofrom = JID(address.getAttr('jid')) + @staticmethod def _process_message(_con, stanza, properties): muc_user = stanza.getTag('x', namespace=NS_MUC_USER) @@ -293,18 +300,12 @@ class MUC: iq = Iq(typ='get', to=jid, queryNS=NS_MUC_ADMIN) item = iq.setQuery().setTag('item') item.setAttr('affiliation', affiliation) - return iq, {'affiliation': affiliation} + return iq @callback - def _affiliation_received(self, stanza, affiliation): + def _affiliation_received(self, stanza): if not isResultNode(stanza): - log.info('Affiliation error: %s %s %s', - stanza.getFrom(), - stanza.getError(), - affiliation) - return AffiliationResult(jid=stanza.getFrom(), - affiliation=affiliation, - error=stanza.getError()) + return raise_error(log.info, stanza) room_jid = stanza.getFrom() query = stanza.getTag('query', namespace=NS_MUC_ADMIN) @@ -326,12 +327,10 @@ class MUC: if reason: users_dict[jid]['reason'] = reason - log.info('%s affiliations received from %s: %s', - affiliation, room_jid, users_dict) + log.info('Affiliations received from %s: %s', + room_jid, users_dict) - return AffiliationResult(jid=room_jid, - affiliation=affiliation, - users=users_dict) + return AffiliationResult(jid=room_jid, users=users_dict) @call_on_response('_default_response') def destroy(self, room_jid, reason='', jid=''): @@ -365,9 +364,7 @@ class MUC: @callback def _config_received(self, stanza): if not isResultNode(stanza): - log.info('Error: %s', stanza.getError()) - return MucConfigResult(jid=stanza.getFrom(), - error=stanza.getError()) + return raise_error(log.info, stanza) jid = stanza.getFrom() payload = stanza.getQueryPayload() ===================================== nbxmpp/modules/omemo.py ===================================== @@ -0,0 +1,443 @@ +# Copyright (C) 2019 Philipp Hörist <philipp AT hoerist.com> +# +# This file is part of nbxmpp. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 3 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; If not, see <http://www.gnu.org/licenses/>. + +import logging + +from nbxmpp.protocol import NS_OMEMO_TEMP +from nbxmpp.protocol import NS_OMEMO_TEMP_DL +from nbxmpp.protocol import NS_OMEMO_TEMP_BUNDLE +from nbxmpp.protocol import NS_PUBSUB_EVENT +from nbxmpp.protocol import NS_EME +from nbxmpp.protocol import NS_HINTS +from nbxmpp.protocol import NodeProcessed +from nbxmpp.protocol import Node +from nbxmpp.protocol import isResultNode +from nbxmpp.protocol import StanzaMalformed +from nbxmpp.util import call_on_response +from nbxmpp.util import callback +from nbxmpp.util import b64decode +from nbxmpp.util import b64encode +from nbxmpp.util import raise_error +from nbxmpp.structs import StanzaHandler +from nbxmpp.structs import OMEMOMessage +from nbxmpp.structs import OMEMOBundle +from nbxmpp.modules.pubsub import get_pubsub_request + +log = logging.getLogger('nbxmpp.m.omemo') + + +class OMEMO: + def __init__(self, client): + self._client = client + self.handlers = [ + StanzaHandler(name='message', + callback=self._process_omemo_devicelist, + ns=NS_PUBSUB_EVENT, + priority=16), + StanzaHandler(name='message', + callback=self._process_omemo_message, + ns=NS_OMEMO_TEMP, + priority=7), + ] + + def _process_omemo_message(self, _con, stanza, properties): + try: + properties.omemo = self._parse_omemo_message(stanza) + log.info('Received message') + except StanzaMalformed as error: + log.warning(error) + log.warning(stanza) + return + + @staticmethod + def _parse_omemo_message(stanza): + ''' + <message> + <encrypted xmlns='eu.siacs.conversations.axolotl'> + <header sid='27183'> + <key rid='31415'>BASE64ENCODED...</key> + <key prekey="true" rid='12321'>BASE64ENCODED...</key> +  + <iv>BASE64ENCODED...</iv> + </header> + <payload>BASE64ENCODED</payload> + </encrypted> + <store xmlns='urn:xmpp:hints'/> + </message> + ''' + encrypted = stanza.getTag('encrypted', namespace=NS_OMEMO_TEMP) + if encrypted is None: + raise StanzaMalformed('No encrypted node found') + + header = encrypted.getTag('header') + if header is None: + raise StanzaMalformed('header node not found') + + try: + sid = int(header.getAttr('sid')) + except Exception as error: + raise StanzaMalformed('sid attr not found') + + iv_node = header.getTag('iv') + try: + iv = b64decode(iv_node.getData(), bytes) + except Exception as error: + raise StanzaMalformed('failed to decode iv: %s' % error) + + payload = None + payload_node = encrypted.getTag('payload') + if payload_node is not None: + try: + payload = b64decode(payload_node.getData(), bytes) + except Exception as error: + raise StanzaMalformed('failed to decode payload: %s' % error) + + key_nodes = header.getTags('key') + if not key_nodes: + raise StanzaMalformed('no keys found') + + keys = {} + for kn in key_nodes: + rid = kn.getAttr('rid') + if rid is None: + raise StanzaMalformed('rid not found') + + prekey = kn.getAttr('prekey') == 'true' + + try: + keys[int(rid)] = (b64decode(kn.getData(), bytes), prekey) + except Exception as error: + raise StanzaMalformed('failed to decode key: %s' % error) + + return OMEMOMessage(sid=sid, iv=iv, keys=keys, payload=payload) + + def _process_omemo_devicelist(self, _con, stanza, properties): + if not properties.is_pubsub_event: + return + + if properties.pubsub_event.node != NS_OMEMO_TEMP_DL: + return + + if properties.pubsub_event.retracted: + # Retracts should not happen and its unclear how we should react + raise NodeProcessed + + if properties.pubsub_event.deleted: + log.info('Devicelist node deleted by %s', properties.jid) + return + + item = properties.pubsub_event.item + try: + devices = self._parse_devicelist(item) + except StanzaMalformed as error: + log.warning(error) + log.warning(stanza) + raise NodeProcessed + + if not devices: + pubsub_event = properties.pubsub_event._replace(empty=True) + log.info('Received OMEMO devicelist: %s - no devices set', + properties.jid) + else: + pubsub_event = properties.pubsub_event._replace(data=devices) + log.info('Received OMEMO devicelist: %s - %s', + properties.jid, devices) + + properties.pubsub_event = pubsub_event + + @staticmethod + def _parse_devicelist(item): + ''' + <items node='eu.siacs.conversations.axolotl.devicelist'> + <item id='current'> + <list xmlns='eu.siacs.conversations.axolotl'> + <device id='12345' /> + <device id='4223' /> + </list> + </item> + </items> + ''' + list_node = item.getTag('list', namespace=NS_OMEMO_TEMP) + if list_node is None: + raise StanzaMalformed('No list node found') + + if not list_node.getChildren(): + return [] + + result = [] + devices_nodes = list_node.getChildren() + for dn in devices_nodes: + _id = dn.getAttr('id') + if _id: + result.append(int(_id)) + + return result + + def set_devicelist(self, devicelist=None): + item = Node('list', attrs={'xmlns': NS_OMEMO_TEMP}) + for device in devicelist: + item.addChild('device').setAttr('id', device) + + log.info('Set devicelist: %s', devicelist) + jid = self._client.get_bound_jid().getBare() + self._client.get_module('PubSub').publish( + jid, NS_OMEMO_TEMP_DL, item, id_='current') + + @call_on_response('_devicelist_received') + def request_devicelist(self, jid=None): + if jid is None: + jid = self._client.get_bound_jid().getBare() + log.info('Request devicelist from: %s', jid) + return get_pubsub_request(jid, NS_OMEMO_TEMP_DL, max_items=1) + + @callback + def _devicelist_received(self, stanza): + if not isResultNode(stanza): + return raise_error(log.info, stanza) + + pubsub_node = stanza.getTag('pubsub') + items_node = pubsub_node.getTag('items') + item = items_node.getTag('item') + + try: + return self._parse_devicelist(item) + except StanzaMalformed as error: + return raise_error(log.warning, stanza, + 'stanza-malformed', error) + + def set_bundle(self, bundle, device_id): + item = self._create_bundle(bundle) + log.info('Set bundle') + + node = '%s:%s' % (NS_OMEMO_TEMP_BUNDLE, device_id) + jid = self._client.get_bound_jid().getBare() + self._client.get_module('PubSub').publish( + jid, node, item, id_='current') + + @staticmethod + def _create_bundle(bundle): + ''' + <publish node='eu.siacs.conversations.axolotl.bundles:31415'> + <item id='current'> + <bundle xmlns='eu.siacs.conversations.axolotl'> + <signedPreKeyPublic signedPreKeyId='1'> + BASE64ENCODED... + </signedPreKeyPublic> + <signedPreKeySignature> + BASE64ENCODED... + </signedPreKeySignature> + <identityKey> + BASE64ENCODED... + </identityKey> + <prekeys> + <preKeyPublic preKeyId='1'> + BASE64ENCODED... + </preKeyPublic> + <preKeyPublic preKeyId='2'> + BASE64ENCODED... + </preKeyPublic> + <preKeyPublic preKeyId='3'> + BASE64ENCODED... + </preKeyPublic> +  + </prekeys> + </bundle> + </item> + </publish> + ''' + bundle_node = Node('bundle', attrs={'xmlns': NS_OMEMO_TEMP}) + prekey_pub_node = bundle_node.addChild( + 'signedPreKeyPublic', + attrs={'signedPreKeyId': bundle.spk['id']}) + prekey_pub_node.addData(b64encode(bundle.spk['key'])) + + prekey_sig_node = bundle_node.addChild('signedPreKeySignature') + prekey_sig_node.addData(b64encode(bundle.spk_signature)) + + identity_key_node = bundle_node.addChild('identityKey') + identity_key_node.addData(b64encode(bundle.ik)) + + prekeys = bundle_node.addChild('prekeys') + for key in bundle.otpks: + pre_key_public = prekeys.addChild('preKeyPublic', + attrs={'preKeyId': key['id']}) + pre_key_public.addData(b64encode(key['key'])) + return bundle_node + + @call_on_response('_bundle_received') + def request_bundle(self, jid, device_id): + log.info('Request bundle from: %s %s', jid, device_id) + node = '%s:%s' % (NS_OMEMO_TEMP_BUNDLE, device_id) + return get_pubsub_request(jid, node, max_items=1) + + @callback + def _bundle_received(self, stanza): + if not isResultNode(stanza): + return raise_error(log.info, stanza) + + pubsub_node = stanza.getTag('pubsub') + items_node = pubsub_node.getTag('items') + item = items_node.getTag('item') + + try: + return self._parse_bundle(item) + except StanzaMalformed as error: + return raise_error(log.warning, stanza, + 'stanza-malformed', error) + + @staticmethod + def _parse_bundle(item): + ''' + <item id='current'> + <bundle xmlns='eu.siacs.conversations.axolotl'> + <signedPreKeyPublic signedPreKeyId='1'> + BASE64ENCODED... + </signedPreKeyPublic> + <signedPreKeySignature> + BASE64ENCODED... + </signedPreKeySignature> + <identityKey> + BASE64ENCODED... + </identityKey> + <prekeys> + <preKeyPublic preKeyId='1'> + BASE64ENCODED... + </preKeyPublic> + <preKeyPublic preKeyId='2'> + BASE64ENCODED... + </preKeyPublic> + <preKeyPublic preKeyId='3'> + BASE64ENCODED... + </preKeyPublic> +  + </prekeys> + </bundle> + </item> + ''' + bundle = item.getTag('bundle', namespace=NS_OMEMO_TEMP) + if bundle is None: + raise StanzaMalformed('No bundle node found') + + result = {} + signed_prekey_node = bundle.getTag('signedPreKeyPublic') + try: + result['spk'] = {'key': b64decode(signed_prekey_node.getData(), bytes)} + except Exception as error: + raise StanzaMalformed('Failed to decode ' + 'signedPreKeyPublic: %s' % error) + + signed_prekey_id = signed_prekey_node.getAttr('signedPreKeyId') + try: + result['spk']['id'] = int(signed_prekey_id) + except Exception as error: + raise StanzaMalformed('Invalid signedPreKeyId: %s' % error) + + signed_signature_node = bundle.getTag('signedPreKeySignature') + try: + result['spk_signature'] = b64decode(signed_signature_node.getData(), bytes) + except Exception as error: + raise StanzaMalformed('Failed to decode ' + 'signedPreKeySignature: %s' % error) + + identity_key_node = bundle.getTag('identityKey') + try: + result['ik'] = b64decode(identity_key_node.getData(), bytes) + except Exception as error: + raise StanzaMalformed('Failed to decode ' + 'signedPreKeySignature: %s' % error) + + prekeys = bundle.getTag('prekeys') + if prekeys is None or not prekeys.getChildren(): + raise StanzaMalformed('No prekeys node found') + + result['otpks'] = [] + for prekey in prekeys.getChildren(): + try: + id_ = int(prekey.getAttr('preKeyId')) + except Exception as error: + raise StanzaMalformed('Invalid prekey: %s' % error) + + try: + key = b64decode(prekey.getData(), bytes) + except Exception as error: + raise StanzaMalformed('Failed to decode preKeyPublic: %s' % error) + + result['otpks'].append({'key': key, 'id': id_}) + + return OMEMOBundle(**result) + + +def create_omemo_message(stanza, omemo_message, store_hint=True, + node_whitelist=None): + ''' + <message> + <encrypted xmlns='eu.siacs.conversations.axolotl'> + <header sid='27183'> + <key rid='31415'>BASE64ENCODED...</key> + <key prekey="true" rid='12321'>BASE64ENCODED...</key> +  + <iv>BASE64ENCODED...</iv> + </header> + <payload>BASE64ENCODED</payload> + </encrypted> + <store xmlns='urn:xmpp:hints'/> + </message> + ''' + + if node_whitelist is not None: + cleanup_stanza(stanza, node_whitelist) + + encrypted = Node('encrypted', attrs={'xmlns': NS_OMEMO_TEMP}) + header = Node('header', attrs={'sid': omemo_message.sid}) + for rid, (key, prekey) in omemo_message.keys.items(): + attrs = {'rid': rid} + if prekey: + attrs['prekey'] = 'true' + child = header.addChild('key', attrs=attrs) + child.addData(b64encode(key)) + + header.addChild('iv').addData(b64encode(omemo_message.iv)) + encrypted.addChild(node=header) + + payload = encrypted.addChild('payload') + payload.addData(b64encode(omemo_message.payload)) + + stanza.addChild(node=encrypted) + + stanza.addChild(node=Node('encryption', attrs={'xmlns': NS_EME, + 'name': 'OMEMO', + 'namespace': NS_OMEMO_TEMP})) + + stanza.setBody("You received a message encrypted with " + "OMEMO but your client doesn't support OMEMO.") + + if store_hint: + stanza.addChild(node=Node('store', attrs={'xmlns': NS_HINTS})) + + +def cleanup_stanza(stanza, node_whitelist): + whitelisted_nodes = [] + for tag, ns in node_whitelist: + node = stanza.getTag(tag, namespace=ns) + if node is not None: + whitelisted_nodes.append(node) + + for node in list(stanza.getChildren()): + stanza.delChild(node) + + for node in whitelisted_nodes: + stanza.addChild(node=node) ===================================== nbxmpp/modules/openpgp.py ===================================== @@ -56,7 +56,7 @@ class OpenPGP: StanzaHandler(name='message', callback=self._process_openpgp_message, ns=NS_OPENPGP, - priority=6), + priority=7), ] def _process_openpgp_message(self, _con, stanza, properties): ===================================== nbxmpp/protocol.py ===================================== @@ -121,7 +121,6 @@ NS_MUC_CONFIG = NS_MUC + '#roomconfig' NS_MUC_REQUEST = NS_MUC + '#request' NS_NICK = 'http://jabber.org/protocol/nick' # XEP-0172 NS_OFFLINE = 'http://www.jabber.org/jeps/jep-0030.html' # XEP-0013 -NS_OMEMO = 'urn:xmpp:omemo:0' # XEP-0384 NS_PHYSLOC = 'http://jabber.org/protocol/physloc' # XEP-0112 NS_PING = 'urn:xmpp:ping' # XEP-0199 NS_PRESENCE = 'presence' # Jabberd2 @@ -191,8 +190,12 @@ NS_HASHES_BLAKE2B_512 = 'urn:xmpp:hash-function-text-names:id-blake2b512' NS_OPENPGP = 'urn:xmpp:openpgp:0' NS_OPENPGP_PK = 'urn:xmpp:openpgp:0:public-keys' NS_OPENPGP_SK = 'urn:xmpp:openpgp:0:secret-key' +NS_OMEMO_TEMP = 'eu.siacs.conversations.axolotl' +NS_OMEMO_TEMP_DL = 'eu.siacs.conversations.axolotl.devicelist' +NS_OMEMO_TEMP_BUNDLE = 'eu.siacs.conversations.axolotl.bundles' NS_BOOKMARK_CONVERSION = 'urn:xmpp:bookmarks-conversion:0' NS_DOMAIN_BASED_NAME = 'urn:xmpp:domain-based-name:1' +NS_HINTS = 'urn:xmpp:hints' #xmpp_stream_error_conditions = ''' #bad-format -- -- -- The entity has sent XML that cannot be processed. ===================================== nbxmpp/structs.py ===================================== @@ -16,6 +16,7 @@ # along with this program; If not, see <http://www.gnu.org/licenses/>. import time +import random from collections import namedtuple from nbxmpp.protocol import JID @@ -33,6 +34,9 @@ StanzaHandler = namedtuple('StanzaHandler', 'name callback typ ns xmlns system priority') StanzaHandler.__new__.__defaults__ = ('', '', None, False, 50) +CommonResult = namedtuple('CommonResult', 'jid') +CommonResult.__new__.__defaults__ = (None,) + InviteData = namedtuple('InviteData', 'muc from_ reason password type continued thread') @@ -50,6 +54,11 @@ MucUserData.__new__.__defaults__ = (None, None, None, None, None) MucDestroyed = namedtuple('MucDestroyed', 'alternate reason password') MucDestroyed.__new__.__defaults__ = (None, None, None) +MucConfigResult = namedtuple('MucConfigResult', 'jid form') +MucConfigResult.__new__.__defaults__ = (None,) + +AffiliationResult = namedtuple('AffiliationResult', 'jid users') + EntityCapsData = namedtuple('EntityCapsData', 'hash node ver') EntityCapsData.__new__.__defaults__ = (None, None, None) @@ -78,10 +87,19 @@ AvatarData.__new__.__defaults__ = (None,) * len(AvatarData._fields) BookmarkData = namedtuple('BookmarkData', 'jid name nick autojoin password') BookmarkData.__new__.__defaults__ = (None, None, None, None) +BlockingListResult = namedtuple('BlockingListResult', 'blocking_list') + PGPPublicKey = namedtuple('PGPPublicKey', 'jid key date') PGPKeyMetadata = namedtuple('PGPKeyMetadata', 'jid fingerprint date') +OMEMOMessage = namedtuple('OMEMOMessage', 'sid iv keys payload') + + +class OMEMOBundle(namedtuple('OMEMOBundle', 'spk spk_signature ik otpks')): + def pick_prekey(self): + return random.SystemRandom().choice(self.otpks) + class CommonError(namedtuple('CommonError', 'type message')): def __str__(self): @@ -146,6 +164,7 @@ class MessageProperties: self.muc_invite = None self.muc_decline = None self.muc_user = None + self.muc_ofrom = None self.captcha = None self.voice_request = None self.self_message = False @@ -153,12 +172,17 @@ class MessageProperties: self.pubsub = False self.pubsub_event = None self.openpgp = None + self.omemo = None self.encrypted = None @property def is_encrypted(self): return self.encrypted is not None + @property + def is_omemo(self): + return self.omemo is not None + @property def is_openpgp(self): return self.openpgp is not None @@ -348,36 +372,3 @@ class ErrorProperties: def __str__(self): return '%s %s' % (self.type, self.message) - - -class BaseResult: - @property - def is_error(self): - return self.error is not None - - -class CommonResult(BaseResult, namedtuple('CommonResult', 'jid error')): - pass - -CommonResult.__new__.__defaults__ = (None,) - - -class AffiliationResult(BaseResult, namedtuple('AffiliationResult', - 'jid affiliation users error')): - pass - -AffiliationResult.__new__.__defaults__ = (None, None) - - -class MucConfigResult(BaseResult, namedtuple('MucConfigResult', - 'jid form error')): - pass - -MucConfigResult.__new__.__defaults__ = (None, None) - - -class BlockingListResult(BaseResult, namedtuple('BlockingListResult', - 'blocking_list error')): - pass - -BlockingListResult.__new__.__defaults__ = (None,) ===================================== nbxmpp/util.py ===================================== @@ -36,6 +36,8 @@ log = logging.getLogger('nbxmpp.util') def b64decode(data, return_type=str): + if not data: + raise ValueError('No data to decode') if isinstance(data, str): data = data.encode() result = base64.b64decode(data) @@ -45,6 +47,8 @@ def b64decode(data, return_type=str): def b64encode(data, return_type=str): + if not data: + raise ValueError('No data to encode') if isinstance(data, str): data = data.encode() result = base64.b64encode(data) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/988398bbd01453a314bbe47e2… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/988398bbd01453a314bbe47e2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: MAM: Detect nbxmpp supported encryptions
by Philipp Hörist 11 Feb '19

11 Feb '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6f61f053 by Philipp Hörist at 2019-02-11T19:29:20Z MAM: Detect nbxmpp supported encryptions - - - - - 4a2c23b8 by Philipp Hörist at 2019-02-11T19:32:41Z Correctly remove bookmark after MUC was destroyed - - - - - 2 changed files: - gajim/common/modules/bookmarks.py - gajim/common/modules/mam.py Changes: ===================================== gajim/common/modules/bookmarks.py ===================================== @@ -222,7 +222,7 @@ class Bookmarks(BaseModule): bookmark = self.get_bookmark_from_jid(jid) if bookmark is None: return - self.bookmark.remove(bookmark) + self._bookmarks.remove(bookmark) if publish: self.store_bookmarks() ===================================== gajim/common/modules/mam.py ===================================== @@ -164,14 +164,18 @@ class MAM: else: event = MamMessageReceivedEvent(None, **event_attrs) - app.plugin_manager.extension_point( - 'decrypt', self._con, event, self._decryption_finished) - - if not event.encrypted: - eme = parse_eme(event.message) - if eme is not None: - event.msgtxt = eme + if properties.is_encrypted: + event.additional_data['encrypted'] = properties.encrypted.additional_data self._decryption_finished(event) + else: + app.plugin_manager.extension_point( + 'decrypt', self._con, event, self._decryption_finished) + + if not event.encrypted: + eme = parse_eme(event.message) + if eme is not None: + event.msgtxt = eme + self._decryption_finished(event) raise nbxmpp.NodeProcessed View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/1256372d36384b48242faf0c7ad15ad1f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/1256372d36384b48242faf0c7ad15ad1f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Handle nbxmpp error results
by Philipp Hörist 09 Feb '19

09 Feb '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1256372d by Philipp Hörist at 2019-02-09T23:39:10Z Handle nbxmpp error results - - - - - 3 changed files: - gajim/common/modules/blocking.py - gajim/common/modules/bookmarks.py - gajim/common/modules/user_avatar.py Changes: ===================================== gajim/common/modules/blocking.py ===================================== @@ -17,6 +17,7 @@ import logging import nbxmpp +from nbxmpp.util import is_error_result from gajim.common import app from gajim.common.nec import NetworkEvent @@ -62,8 +63,8 @@ class Blocking(BaseModule): log.info('Discovered blocking: %s', from_) def _blocking_list_received(self, result): - if result.is_error: - log.info('Error: %s', result.error) + if is_error_result(result): + log.info('Error: %s', result) return self.blocked = result.blocking_list ===================================== gajim/common/modules/bookmarks.py ===================================== @@ -22,6 +22,7 @@ import logging import copy import nbxmpp +from nbxmpp.util import is_error_result from nbxmpp.structs import BookmarkData from nbxmpp.const import BookmarkStoreType from gi.repository import GLib @@ -161,6 +162,10 @@ class Bookmarks(BaseModule): type_, callback=self._bookmarks_received) def _bookmarks_received(self, bookmarks): + if is_error_result(bookmarks): + log.info('Error: %s', bookmarks) + bookmarks = [] + self._request_in_progress = False self._bookmarks = bookmarks self.auto_join_bookmarks() ===================================== gajim/common/modules/user_avatar.py ===================================== @@ -17,6 +17,7 @@ import logging import nbxmpp +from nbxmpp.util import is_error_result from gajim.common import app from gajim.common.modules.base import BaseModule @@ -65,6 +66,10 @@ class UserAvatar(BaseModule): jid, data.id, callback=self._avatar_received) def _avatar_received(self, result): + if is_error_result(result): + log.info('Error: %s', result) + return + log.info('Received Avatar: %s %s', result.jid, result.sha) app.interface.save_avatar(result.data) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1256372d36384b48242faf0c7ad15ad1f2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1256372d36384b48242faf0c7ad15ad1f2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Return consistent error results
by Philipp Hörist 09 Feb '19

09 Feb '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 988398bb by Philipp Hörist at 2019-02-09T22:58:51Z Return consistent error results - - - - - 6 changed files: - nbxmpp/modules/blocking.py - nbxmpp/modules/bookmarks.py - nbxmpp/modules/muc.py - nbxmpp/modules/pubsub.py - nbxmpp/modules/user_avatar.py - nbxmpp/util.py Changes: ===================================== nbxmpp/modules/blocking.py ===================================== @@ -24,6 +24,7 @@ from nbxmpp.structs import BlockingListResult from nbxmpp.structs import CommonResult from nbxmpp.util import call_on_response from nbxmpp.util import callback +from nbxmpp.util import raise_error log = logging.getLogger('nbxmpp.m.blocking') @@ -43,9 +44,7 @@ class Blocking: def _blocking_list_received(self, stanza): blocked = [] if not isResultNode(stanza): - log.info('Error: %s', stanza.getErrorMsg()) - return BlockingListResult(blocking_list=blocked, - error=stanza.getErrorMsg()) + return raise_error(log.info, stanza) blocklist = stanza.getTag('blocklist', namespace=NS_BLOCKING) for item in blocklist.getTags('item'): @@ -75,7 +74,5 @@ class Blocking: @callback def _default_response(self, stanza): if not isResultNode(stanza): - log.info('Error: %s', stanza.getErrorMsg()) - return CommonResult(jid=stanza.getFrom(), - error=stanza.getErrorMsg()) + return raise_error(log.info, stanza) return CommonResult(jid=stanza.getFrom()) ===================================== nbxmpp/modules/bookmarks.py ===================================== @@ -31,6 +31,7 @@ from nbxmpp.util import to_xs_boolean from nbxmpp.util import validate_jid from nbxmpp.util import call_on_response from nbxmpp.util import callback +from nbxmpp.util import raise_error from nbxmpp.modules.pubsub import get_pubsub_item from nbxmpp.modules.pubsub import get_pubsub_request from nbxmpp.modules.pubsub import get_bookmark_publish_options @@ -123,8 +124,7 @@ class Bookmarks: @callback def _bookmarks_received(self, stanza, type_): if not isResultNode(stanza): - log.info('Error: %s', stanza.getError()) - return [] + return raise_error(log.info, stanza) bookmarks = [] if type_ == BookmarkStoreType.PUBSUB: @@ -187,4 +187,4 @@ class Bookmarks: @staticmethod def _on_private_store_result(_con, stanza): if not isResultNode(stanza): - log.info('Error: %s', stanza.getError()) + return raise_error(log.info, stanza) ===================================== nbxmpp/modules/muc.py ===================================== @@ -50,6 +50,7 @@ from nbxmpp.structs import MucDestroyed from nbxmpp.util import validate_jid from nbxmpp.util import call_on_response from nbxmpp.util import callback +from nbxmpp.util import raise_error from nbxmpp.modules.dataforms import extend_form log = logging.getLogger('nbxmpp.m.muc') @@ -488,9 +489,7 @@ class MUC: @callback def _default_response(self, stanza): if not isResultNode(stanza): - log.info('Error: %s', stanza.getError()) - return CommonResult(jid=stanza.getFrom(), - error=stanza.getError()) + return raise_error(log.info, stanza) return CommonResult(jid=stanza.getFrom()) @staticmethod ===================================== nbxmpp/modules/pubsub.py ===================================== @@ -29,6 +29,7 @@ from nbxmpp.structs import PubSubEventData from nbxmpp.structs import CommonResult from nbxmpp.util import call_on_response from nbxmpp.util import callback +from nbxmpp.util import raise_error log = logging.getLogger('nbxmpp.m.pubsub') @@ -93,9 +94,7 @@ class PubSub: @callback def _default_response(self, stanza): if not isResultNode(stanza): - log.info('Error: %s', stanza.getError()) - return CommonResult(jid=stanza.getFrom(), - error=stanza.getError()) + return raise_error(log.info, stanza) return CommonResult(jid=stanza.getFrom()) ===================================== nbxmpp/modules/user_avatar.py ===================================== @@ -29,6 +29,7 @@ from nbxmpp.structs import AvatarMetaData from nbxmpp.structs import AvatarData from nbxmpp.util import call_on_response from nbxmpp.util import callback +from nbxmpp.util import raise_error from nbxmpp.modules.pubsub import get_pubsub_request log = logging.getLogger('nbxmpp.m.user_avatar') @@ -54,6 +55,11 @@ class UserAvatar: item = properties.pubsub_event.item metadata = item.getTag('metadata', namespace=NS_AVATAR_METADATA) + if metadata is None: + log.warning('No metadata node found') + log.warning(stanza) + raise NodeProcessed + if not metadata.getChildren(): pubsub_event = properties.pubsub_event._replace(empty=True) log.info('Received avatar metadata: %s - no avatar set', @@ -83,8 +89,7 @@ class UserAvatar: jid = JID(self._client.get_bound_jid().getBare()) if not isResultNode(stanza): - log.info('Error: %s', stanza.getError()) - raise NodeProcessed + return raise_error(log.warning, stanza) pubsub_node = stanza.getTag('pubsub') items_node = pubsub_node.getTag('items') @@ -93,16 +98,18 @@ class UserAvatar: sha = item.getAttr('id') data_node = item.getTag('data', namespace=NS_AVATAR_DATA) if data_node is None: - log.warning('No data node found') - log.warning(stanza) - raise NodeProcessed + return raise_error(log.warning, stanza, 'stanza-malformed', + 'No data node found') data = data_node.getData() if data is None: - log.warning('Data node empty') - log.warning(stanza) - raise NodeProcessed + return raise_error(log.warning, stanza, 'stanza-malformed', + 'Data node empty') + + try: + data = base64.b64decode(data.encode('utf-8')) + except Exception as error: + return raise_error(log.warning, stanza, 'stanza-malformed', error) - data = base64.b64decode(data.encode('utf-8')) log.info('Received avatar data: %s %s', jid, sha) return AvatarData(jid, sha, data) ===================================== nbxmpp/util.py ===================================== @@ -202,6 +202,8 @@ def to_xs_boolean(value): def raise_error(log_method, stanza, type_=None, message=None): + if message is not None: + message = str(message) if type_ is None: type_ = stanza.getError() message = stanza.getErrorMsg() View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/988398bbd01453a314bbe47e2c… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/988398bbd01453a314bbe47e2c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Windows: Add pygments to build
by Philipp Hörist 09 Feb '19

09 Feb '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5059f723 by Philipp Hörist at 2019-02-09T21:05:17Z Windows: Add pygments to build - - - - - 1 changed file: - win/_base.sh Changes: ===================================== win/_base.sh ===================================== @@ -96,7 +96,8 @@ function install_deps { mingw-w64-"${ARCH}"-"${PYTHON_ID}"-pyopenssl \ mingw-w64-"${ARCH}"-"${PYTHON_ID}"-docutils \ mingw-w64-"${ARCH}"-"${PYTHON_ID}"-certifi \ - mingw-w64-"${ARCH}"-"${PYTHON_ID}"-six + mingw-w64-"${ARCH}"-"${PYTHON_ID}"-six \ + mingw-w64-"${ARCH}"-"${PYTHON_ID}"-pygments build_pip install precis-i18n View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5059f72373a1109216178cb7593fd26ea5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5059f72373a1109216178cb7593fd26ea5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Fix test
by Philipp Hörist 09 Feb '19

09 Feb '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: ee45ce4a by Philipp Hörist at 2019-02-09T20:55:01Z Fix test - - - - - 1 changed file: - test/unit/test_xmpp_dispatcher_nb.py Changes: ===================================== test/unit/test_xmpp_dispatcher_nb.py ===================================== @@ -88,7 +88,8 @@ class TestDispatcherNB(unittest.TestCase): self._simulate_connect() stanza = "<iq type='get' />" def send(data): - self.assertEqual(lib.xml2str_sorted(data), '<iq xmlns="jabber:client" type="error"><error code="501" type="cancel"><feature-not-implemented xmlns="urn:ietf:params:xml:ns:xmpp-stanzas" /><text xmlns="urn:ietf:params:xml:ns:xmpp-stanzas">The feature requested is not implemented by the recipient or server and therefore cannot be processed.</text></error></iq>') + print(lib.xml2str_sorted(data)) + self.assertEqual(lib.xml2str_sorted(data), '<iq xmlns="jabber:client" from="test(a)test.test" to="test(a)test.test" type="error"><error code="501" type="cancel"><feature-not-implemented xmlns="urn:ietf:params:xml:ns:xmpp-stanzas" /><text xmlns="urn:ietf:params:xml:ns:xmpp-stanzas">The feature requested is not implemented by the recipient or server and therefore cannot be processed.</text></error></iq>') self.client.send = send self.dispatcher.ProcessNonBlocking(stanza) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/ee45ce4a91240aab898c0151b1… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/ee45ce4a91240aab898c0151b1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove unused import
by Philipp Hörist 09 Feb '19

09 Feb '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4442db54 by Philipp Hörist at 2019-02-09T20:45:18Z Remove unused import - - - - - 1 changed file: - gajim/common/gpg.py Changes: ===================================== gajim/common/gpg.py ===================================== @@ -20,7 +20,6 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. import os -import logging from gajim.common import app if app.is_installed('GPG'): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4442db5461ee9f0dd892a48f1d1cde9036… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4442db5461ee9f0dd892a48f1d1cde9036… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Add OpenPGP (XEP-0373) module
by Philipp Hörist 09 Feb '19

09 Feb '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 622a4566 by Philipp Hörist at 2019-02-09T19:49:09Z Add OpenPGP (XEP-0373) module - - - - - 6 changed files: - nbxmpp/dispatcher_nb.py - + nbxmpp/modules/openpgp.py - nbxmpp/modules/pubsub.py - nbxmpp/protocol.py - nbxmpp/structs.py - nbxmpp/util.py Changes: ===================================== nbxmpp/dispatcher_nb.py ===================================== @@ -63,6 +63,7 @@ from nbxmpp.modules.mood import Mood from nbxmpp.modules.location import Location from nbxmpp.modules.user_avatar import UserAvatar from nbxmpp.modules.bookmarks import Bookmarks +from nbxmpp.modules.openpgp import OpenPGP from nbxmpp.modules.misc import unwrap_carbon from nbxmpp.modules.misc import unwrap_mam from nbxmpp.util import get_properties_struct @@ -193,6 +194,7 @@ class XMPPDispatcher(PlugIn): self._modules['Location'] = Location(self._owner) self._modules['UserAvatar'] = UserAvatar(self._owner) self._modules['Bookmarks'] = Bookmarks(self._owner) + self._modules['OpenPGP'] = OpenPGP(self._owner) for instance in self._modules.values(): for handler in instance.handlers: @@ -518,14 +520,19 @@ class XMPPDispatcher(PlugIn): # Convert simplexml to Protocol object stanza = self.handlers[xmlns][name]['type'](node=stanza) + own_jid = self._owner.get_bound_jid() properties = get_properties_struct(name) + + if name == 'iq': + if stanza.getFrom() is None and own_jid is not None: + stanza.setFrom(own_jid.getBare()) + if name == 'message': # https://tools.ietf.org/html/rfc6120#section-8.1.1.1 # If the stanza does not include a 'to' address then the client MUST # treat it as if the 'to' address were included with a value of the # client's full JID. - own_jid = self._owner.get_bound_jid() to = stanza.getTo() if to is None: stanza.setTo(own_jid) ===================================== nbxmpp/modules/openpgp.py ===================================== @@ -0,0 +1,380 @@ +# Copyright (C) 2019 Philipp Hörist <philipp AT hoerist.com> +# +# This file is part of nbxmpp. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 3 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; If not, see <http://www.gnu.org/licenses/>. + +import logging +import time +import random +import string + +from nbxmpp.protocol import NS_OPENPGP +from nbxmpp.protocol import NS_OPENPGP_PK +from nbxmpp.protocol import NS_OPENPGP_SK +from nbxmpp.protocol import NS_PUBSUB_EVENT +from nbxmpp.protocol import NS_CLIENT +from nbxmpp.protocol import NS_EME +from nbxmpp.protocol import NodeProcessed +from nbxmpp.protocol import Node +from nbxmpp.protocol import isResultNode +from nbxmpp.protocol import JID +from nbxmpp.protocol import StanzaMalformed +from nbxmpp.util import call_on_response +from nbxmpp.util import callback +from nbxmpp.util import b64decode +from nbxmpp.util import b64encode +from nbxmpp.util import raise_error +from nbxmpp.structs import StanzaHandler +from nbxmpp.structs import PGPKeyMetadata +from nbxmpp.structs import PGPPublicKey +from nbxmpp.modules.date_and_time import parse_datetime +from nbxmpp.modules.pubsub import get_pubsub_request + +log = logging.getLogger('nbxmpp.m.openpgp') + + +class OpenPGP: + def __init__(self, client): + self._client = client + self.handlers = [ + StanzaHandler(name='message', + callback=self._process_pubsub_openpgp, + ns=NS_PUBSUB_EVENT, + priority=16), + StanzaHandler(name='message', + callback=self._process_openpgp_message, + ns=NS_OPENPGP, + priority=6), + ] + + def _process_openpgp_message(self, _con, stanza, properties): + openpgp = stanza.getTag('openpgp', namespace=NS_OPENPGP) + if openpgp is None: + log.warning('No openpgp node found') + log.warning(stanza) + return + + data = openpgp.getData() + if not data: + log.warning('No data in openpgp node found') + log.warning(stanza) + return + + log.info('Encrypted message received') + try: + properties.openpgp = b64decode(data, return_type=bytes) + except Exception: + log.warning('b64decode failed') + log.warning(stanza) + return + + def _process_pubsub_openpgp(self, _con, stanza, properties): + if not properties.is_pubsub_event: + return + + if properties.pubsub_event.node != NS_OPENPGP_PK: + return + + ''' + <item> + <public-keys-list xmlns='urn:xmpp:openpgp:0'> + <pubkey-metadata + v4-fingerprint='1357B01865B2503C18453D208CAC2A9678548E35' + date='2018-03-01T15:26:12Z' + /> + <pubkey-metadata + v4-fingerprint='67819B343B2AB70DED9320872C6464AF2A8E4C02' + date='1953-05-16T12:00:00Z' + /> + </public-keys-list> + </item> + ''' + if properties.pubsub_event.retracted: + # Retracts should not happen and its unclear how we should react + raise NodeProcessed + + if properties.pubsub_event.deleted: + log.info('Keylist node deleted by %s', properties.jid) + return + + item = properties.pubsub_event.item + try: + data = self._parse_keylist(properties.jid, item) + except StanzaMalformed as error: + log.warning(error) + log.warning(stanza) + raise NodeProcessed + + if data is None: + pubsub_event = properties.pubsub_event._replace(empty=True) + log.info('Received PGP keylist: %s - no keys set', properties.jid) + else: + pubsub_event = properties.pubsub_event._replace(data=data) + log.info('Received PGP keylist: %s - %s', properties.jid, data) + + properties.pubsub_event = pubsub_event + + @staticmethod + def _parse_keylist(jid, item): + keylist_node = item.getTag('public-keys-list', namespace=NS_OPENPGP) + if keylist_node is None: + raise StanzaMalformed('No public-keys-list node found') + + metadata = keylist_node.getTags('pubkey-metadata') + if not metadata: + return [] + + data = [] + for key in metadata: + fingerprint = key.getAttr('v4-fingerprint') + date = key.getAttr('date') + if fingerprint is None or date is None: + raise StanzaMalformed('Invalid metadata node') + + timestamp = parse_datetime(date, epoch=True) + if timestamp is None: + raise StanzaMalformed('Invalid date timestamp: %s' % date) + + data.append(PGPKeyMetadata(jid, fingerprint, timestamp)) + return data + + def set_keylist(self, keylist): + item = Node('public-keys-list', {'xmlns': NS_OPENPGP}) + if keylist is not None: + for key in keylist: + date = time.strftime('%Y-%m-%dT%H:%M:%SZ', + time.gmtime(key.date)) + attrs = {'v4-fingerprint': key.fingerprint, + 'date': date} + item.addChild('pubkey-metadata', attrs=attrs) + + log.info('Set keylist: %s', keylist) + jid = self._client.get_bound_jid().getBare() + self._client.get_module('PubSub').publish( + jid, NS_OPENPGP_PK, item, id_='current') + + def set_public_key(self, key, fingerprint, date): + date = time.strftime( + '%Y-%m-%dT%H:%M:%SZ', time.gmtime(date)) + item = Node('pubkey', attrs={'xmlns': NS_OPENPGP, + 'date': date}) + data = item.addChild('data') + data.addData(b64encode(key)) + node = '%s:%s' % (NS_OPENPGP_PK, fingerprint) + + log.info('Set public key') + jid = self._client.get_bound_jid().getBare() + self._client.get_module('PubSub').publish( + jid, node, item, id_='current') + + @call_on_response('_public_key_received') + def request_public_key(self, jid, fingerprint): + log.info('Request public key from: %s %s', jid, fingerprint) + node = '%s:%s' % (NS_OPENPGP_PK, fingerprint) + return get_pubsub_request(jid, node, max_items=1) + + @callback + def _public_key_received(self, stanza): + jid = JID(stanza.getFrom().getBare()) + + if not isResultNode(stanza): + return raise_error(log.info, stanza) + + pubsub_node = stanza.getTag('pubsub') + items_node = pubsub_node.getTag('items') + item = items_node.getTag('item') + + pub_key = item.getTag('pubkey', namespace=NS_OPENPGP) + if pub_key is None: + return raise_error(log.warning, stanza, 'stanza-malformed', + 'PGP public key has no pubkey node') + + date = parse_datetime(pub_key.getAttr('date'), epoch=True) + + data = pub_key.getTag('data') + if data is None: + return raise_error(log.warning, stanza, 'stanza-malformed', + 'PGP public key has no data node') + + try: + key = b64decode(data.getData(), return_type=bytes) + except Exception as error: + return raise_error(log.warning, stanza, 'stanza-malformed', + str(error)) + + key = PGPPublicKey(jid, key, date) + log.info('Received public key: %s %s', key.jid, key.date) + return key + + @call_on_response('_keylist_received') + def request_keylist(self, jid): + log.info('Request keylist from: %s', jid) + return get_pubsub_request(jid, NS_OPENPGP_PK, max_items=1) + + @callback + def _keylist_received(self, stanza): + jid = JID(stanza.getFrom().getBare()) + + if not isResultNode(stanza): + return raise_error(log.info, stanza) + + pubsub_node = stanza.getTag('pubsub') + items_node = pubsub_node.getTag('items') + item = items_node.getTag('item') + + try: + keylist = self._parse_keylist(jid, item) + except StanzaMalformed as error: + return raise_error(log.warning, stanza, + 'stanza-malformed', str(error)) + log.info('Received keylist: %s', keylist) + return keylist + + @call_on_response('_secret_key_received') + def request_secret_key(self): + log.info('Request secret key') + jid = self._client.get_bound_jid().getBare() + return get_pubsub_request(jid, NS_OPENPGP_SK, max_items=1) + + @callback + def _secret_key_received(self, stanza): + if not isResultNode(stanza): + return raise_error(log.info, stanza) + + pubsub_node = stanza.getTag('pubsub') + items_node = pubsub_node.getTag('items') + item = items_node.getTag('item') + + sec_key = item.getTag('secretkey', namespace=NS_OPENPGP) + if sec_key is None: + return raise_error(log.warning, stanza, 'stanza-malformed', + 'PGP secretkey node not found') + + data = sec_key.getData() + if not data: + return raise_error(log.warning, stanza, 'stanza-malformed', + 'PGP secretkey has no data') + + try: + key = b64decode(data.getData(), return_type=bytes) + except Exception as error: + return raise_error(log.warning, stanza, 'stanza-malformed', + str(error)) + log.info('Received secret key') + return key + + def set_secret_key(self, secret_key): + item = Node('secretkey', {'xmlns': NS_OPENPGP}) + if secret_key is not None: + item.setData(b64encode(secret_key)) + + log.info('Set secret key') + jid = self._client.get_bound_jid().getBare() + self._client.get_module('PubSub').publish( + jid, NS_OPENPGP_SK, item, id_='current') + + +def parse_signcrypt(stanza): + ''' + <signcrypt xmlns='urn:xmpp:openpgp:0'> + <to jid='juliet(a)example.org'/> + <time stamp='2014-07-10T17:06:00+02:00'/> + <rpad> + f0rm1l4n4-mT8y33j!Y%fRSrcd^ZE4Q7VDt1L%WEgR!kv + </rpad> + <payload> + <body xmlns='jabber:client'> + This is a secret message. + </body> + </payload> + </signcrypt> + ''' + if stanza.getName() != 'signcrypt' or stanza.getNamespace() != NS_OPENPGP: + raise StanzaMalformed('Invalid signcrypt node') + + to = stanza.getTagAttr('to', 'jid') + if to is None: + raise StanzaMalformed('Invalid to attr') + + timestamp = stanza.getTagAttr('time', 'stamp') + if timestamp is None: + raise StanzaMalformed('Invalid timestamp') + + payload = stanza.getTag('payload') + if payload is None or payload.getChildren() is None: + raise StanzaMalformed('Invalid payload node') + return payload.getChildren(), to, timestamp + + +def create_signcrypt_node(stanza, not_encrypted_nodes): + ''' + <signcrypt xmlns='urn:xmpp:openpgp:0'> + <to jid='juliet(a)example.org'/> + <time stamp='2014-07-10T17:06:00+02:00'/> + <rpad> + f0rm1l4n4-mT8y33j!Y%fRSrcd^ZE4Q7VDt1L%WEgR!kv + </rpad> + <payload> + <body xmlns='jabber:client'> + This is a secret message. + </body> + </payload> + </signcrypt> + ''' + encrypted_nodes = [] + child_nodes = list(stanza.getChildren()) + for node in child_nodes: + if (node.getName(), node.getNamespace()) not in not_encrypted_nodes: + if not node.getNamespace(): + node.setNamespace(NS_CLIENT) + encrypted_nodes.append(node) + stanza.delChild(node) + + signcrypt = Node('signcrypt', attrs={'xmlns': NS_OPENPGP}) + signcrypt.addChild('to', attrs={'jid': stanza.getTo().getBare()}) + + timestamp = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime()) + signcrypt.addChild('time', attrs={'stamp': timestamp}) + + signcrypt.addChild('rpad').addData(get_rpad()) + + payload = signcrypt.addChild('payload') + + for node in encrypted_nodes: + payload.addChild(node=node) + + return signcrypt + + +def get_rpad(): + rpad_range = random.randint(30, 50) + return ''.join( + random.choice(string.ascii_letters) for _ in range(rpad_range)) + + +def create_message_stanza(stanza, encrypted_payload, with_fallback_text): + b64encoded_payload = b64encode(encrypted_payload) + + openpgp_node = Node('openpgp', attrs={'xmlns': NS_OPENPGP}) + openpgp_node.addData(b64encoded_payload) + stanza.addChild(node=openpgp_node) + + eme_node = Node('encryption', attrs={'xmlns': NS_EME, + 'namespace': NS_OPENPGP}) + stanza.addChild(node=eme_node) + + if with_fallback_text: + stanza.setBody( + '[This message is *encrypted* with OpenPGP (See :XEP:`0373`]') ===================================== nbxmpp/modules/pubsub.py ===================================== @@ -47,16 +47,34 @@ class PubSub: def _process_pubsub_base(self, _con, stanza, properties): properties.pubsub = True event = stanza.getTag('event', namespace=NS_PUBSUB_EVENT) - items = event.getTag('items') - if len(items.getChildren()) != 1: - log.warning('PubSub event with more than one item') - log.warning(stanza) - node = items.getAttr('node') - item = items.getTag('item') - if item is None: + + delete = event.getTag('delete') + if delete is not None: + node = delete.getAttr('node') + properties.pubsub_event = PubSubEventData( + node, empty=True, deleted=True) + return + + retract = event.getTag('retract') + if retract is not None: + node = retract.getAttr('node') + item = retract.getTag('item') + id_ = item.getAttr('id') + properties.pubsub_event = PubSubEventData( + node, id_, item, retracted=True) return - id_ = item.getAttr('id') - properties.pubsub_event = PubSubEventData(node, id_, item, None, False) + + items = event.getTag('items') + if items is not None: + if len(items.getChildren()) != 1: + log.warning('PubSub event with more than one item') + log.warning(stanza) + node = items.getAttr('node') + item = items.getTag('item') + if item is None: + return + id_ = item.getAttr('id') + properties.pubsub_event = PubSubEventData(node, id_, item) @call_on_response('_default_response') def publish(self, jid, node, item, id_=None, options=None): ===================================== nbxmpp/protocol.py ===================================== @@ -189,6 +189,8 @@ NS_HASHES_SHA3_512 = 'urn:xmpp:hash-function-text-names:sha3-512' NS_HASHES_BLAKE2B_256 = 'urn:xmpp:hash-function-text-names:id-blake2b256' NS_HASHES_BLAKE2B_512 = 'urn:xmpp:hash-function-text-names:id-blake2b512' NS_OPENPGP = 'urn:xmpp:openpgp:0' +NS_OPENPGP_PK = 'urn:xmpp:openpgp:0:public-keys' +NS_OPENPGP_SK = 'urn:xmpp:openpgp:0:secret-key' NS_BOOKMARK_CONVERSION = 'urn:xmpp:bookmarks-conversion:0' NS_DOMAIN_BASED_NAME = 'urn:xmpp:domain-based-name:1' @@ -655,6 +657,9 @@ class InvalidStanza(Exception): class InvalidJid(Exception): pass +class StanzaMalformed(Exception): + pass + stream_exceptions = {'bad-format': BadFormat, 'bad-namespace-prefix': BadNamespacePrefix, 'conflict': Conflict, @@ -807,6 +812,10 @@ class JID: """ return hash(str(self)) + def __repr__(self): + return str(self) + + class BOSHBody(Node): """ <body> tag that wraps usual XMPP stanzas in XMPP over BOSH ===================================== nbxmpp/structs.py ===================================== @@ -59,7 +59,8 @@ HTTPAuthData.__new__.__defaults__ = (None, None, None, None) StanzaIDData = namedtuple('StanzaIDData', 'id by') StanzaIDData.__new__.__defaults__ = (None, None) -PubSubEventData = namedtuple('PubSubEventData', 'node id item data empty') +PubSubEventData = namedtuple('PubSubEventData', 'node id item data empty deleted retracted') +PubSubEventData.__new__.__defaults__ = (None, None, None, False, False, False) MoodData = namedtuple('MoodData', 'mood text') @@ -77,6 +78,17 @@ AvatarData.__new__.__defaults__ = (None,) * len(AvatarData._fields) BookmarkData = namedtuple('BookmarkData', 'jid name nick autojoin password') BookmarkData.__new__.__defaults__ = (None, None, None, None) +PGPPublicKey = namedtuple('PGPPublicKey', 'jid key date') + +PGPKeyMetadata = namedtuple('PGPKeyMetadata', 'jid fingerprint date') + + +class CommonError(namedtuple('CommonError', 'type message')): + def __str__(self): + if self.message is not None: + return '%s: %s' % (self.type, self.message) + return self.type + class TuneData(namedtuple('TuneData', 'artist length rating source title track uri')): @@ -140,6 +152,16 @@ class MessageProperties: self.mam = None self.pubsub = False self.pubsub_event = None + self.openpgp = None + self.encrypted = None + + @property + def is_encrypted(self): + return self.encrypted is not None + + @property + def is_openpgp(self): + return self.openpgp is not None @property def is_pubsub(self): ===================================== nbxmpp/util.py ===================================== @@ -30,6 +30,7 @@ from nbxmpp.structs import Properties from nbxmpp.structs import IqProperties from nbxmpp.structs import MessageProperties from nbxmpp.structs import PresenceProperties +from nbxmpp.structs import CommonError log = logging.getLogger('nbxmpp.util') @@ -137,6 +138,7 @@ def call_on_response(cb): def response_decorator(func): @wraps(func) def func_wrapper(self, *args, **kwargs): + user_data = kwargs.pop('user_data', None) callback_ = kwargs.pop('callback', None) stanza = func(self, *args, **kwargs) @@ -145,6 +147,9 @@ def call_on_response(cb): else: stanza, attrs = stanza, {} + if user_data is not None: + attrs['user_data'] = user_data + if callback_ is not None: attrs['callback'] = weakref.WeakMethod(callback_) @@ -159,11 +164,14 @@ def callback(func): @wraps(func) def func_wrapper(self, _con, stanza, **kwargs): cb = kwargs.pop('callback', None) + user_data = kwargs.pop('user_data', None) result = func(self, stanza, **kwargs) if cb is not None and cb() is not None: - cb()(result) - + if user_data is not None: + cb()(result, user_data) + else: + cb()(result) return func_wrapper @@ -191,3 +199,18 @@ def to_xs_boolean(value): raise ValueError( 'Cant convert %s to xs:boolean' % value) + + +def raise_error(log_method, stanza, type_=None, message=None): + if type_ is None: + type_ = stanza.getError() + message = stanza.getErrorMsg() + error = CommonError(type_, message) + log_method(error) + if log_method.__name__ in ('warning', 'error'): + log_method(stanza) + return error + + +def is_error_result(result): + return isinstance(result, CommonError) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/622a456648aaef22fb73a3033c… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/622a456648aaef22fb73a3033c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Remove unused import
by Philipp Hörist 09 Feb '19

09 Feb '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: fa710524 by Philipp Hörist at 2019-02-06T19:46:53Z Remove unused import - - - - - fc8c056e by Philipp Hörist at 2019-02-09T20:39:14Z Detect nbxmpp supported encryptions - Better handle logging for gnupg - - - - - 5 changed files: - gajim/common/const.py - gajim/common/gpg.py - gajim/common/logging_helpers.py - gajim/common/modules/message.py - gajim/gui_interface.py Changes: ===================================== gajim/common/const.py ===================================== @@ -9,6 +9,8 @@ Option.__new__.__defaults__ = (None,) * len(Option._fields) # type: ignore DialogButton = namedtuple('DialogButton', 'text callback action') DialogButton.__new__.__defaults__ = (None, None) # type: ignore +EncryptionData = namedtuple('EncryptionData', 'additional_data') +EncryptionData.__new__.__defaults__ = (None,) # type: ignore @unique class OptionKind(IntEnum): ===================================== gajim/common/gpg.py ===================================== @@ -25,7 +25,6 @@ from gajim.common import app if app.is_installed('GPG'): import gnupg - gnupg.logger = logging.getLogger('gajim.c.gnupg') class GnuPG(gnupg.GPG): def __init__(self): ===================================== gajim/common/logging_helpers.py ===================================== @@ -148,18 +148,21 @@ def init(): ) ) - # fake the root logger so we have 'gajim' root name instead of 'root' root_log = logging.getLogger('gajim') root_log.setLevel(logging.WARNING) root_log.addHandler(consoleloghandler) root_log.propagate = False - # handle nbxmpp logs too root_log = logging.getLogger('nbxmpp') root_log.setLevel(logging.WARNING) root_log.addHandler(consoleloghandler) root_log.propagate = False + root_log = logging.getLogger('gnupg') + root_log.setLevel(logging.WARNING) + root_log.addHandler(consoleloghandler) + root_log.propagate = False + def set_loglevels(loglevels_string): parseAndSetLogLevels(loglevels_string) ===================================== gajim/common/modules/message.py ===================================== @@ -175,13 +175,17 @@ class Message: event = MessageReceivedEvent(None, **event_attr) app.nec.push_incoming_event(event) - app.plugin_manager.extension_point( - 'decrypt', self._con, event, self._on_message_decrypted) - if not event.encrypted: - eme = parse_eme(event.stanza) - if eme is not None: - event.msgtxt = eme + if properties.is_encrypted: + event.additional_data['encrypted'] = properties.encrypted.additional_data self._on_message_decrypted(event) + else: + app.plugin_manager.extension_point( + 'decrypt', self._con, event, self._on_message_decrypted) + if not event.encrypted: + eme = parse_eme(event.stanza) + if eme is not None: + event.msgtxt = eme + self._on_message_decrypted(event) def _on_message_decrypted(self, event): try: ===================================== gajim/gui_interface.py ===================================== @@ -110,7 +110,6 @@ from gajim.gtk.dialogs import InputDialog from gajim.gtk.dialogs import YesNoDialog from gajim.gtk.dialogs import PlainConnectionDialog from gajim.gtk.dialogs import SSLErrorDialog -from gajim.gtk.dialogs import ConfirmationDialogDoubleCheck from gajim.gtk.dialogs import ChangeNickDialog from gajim.gtk.profile import ProfileWindow from gajim.gtk.join_groupchat import JoinGroupchatWindow View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/959be5b8ee5de499082be53a7c676fb19… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/959be5b8ee5de499082be53a7c676fb19… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits