Commits February 2019

commits@gajim.org

1 participants
58 discussions

[Git][gajim/python-nbxmpp][master] 2 commits: Fix xsend example
by Philipp Hörist 26 Feb '19

26 Feb '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 8f08104b by Philipp Hörist at 2019-02-25T21:54:02Z Fix xsend example Fixes #71 - - - - - 7d1b7f39 by Philipp Hörist at 2019-02-26T21:50:23Z Add Muclumbus API module - - - - - 6 changed files: - doc/examples/xsend.py - nbxmpp/const.py - nbxmpp/dispatcher_nb.py - + nbxmpp/modules/muclumbus.py - nbxmpp/protocol.py - nbxmpp/structs.py Changes: ===================================== doc/examples/xsend.py ===================================== @@ -2,18 +2,20 @@ import sys import os -import nbxmpp -import time import logging -try: - from gi.repository import GObject as gobject -except Exception: - import gobject + +import nbxmpp +from nbxmpp.const import Realm +from nbxmpp.const import Event +from gi.repository import GLib + +if sys.platform in ('win32', 'darwin'): + import certifi consoleloghandler = logging.StreamHandler() -root_log = logging.getLogger('nbxmpp') -#root_log.setLevel('DEBUG') -root_log.addHandler(consoleloghandler) +log = logging.getLogger('nbxmpp') +log.setLevel('INFO') +log.addHandler(consoleloghandler) if len(sys.argv) < 2: print("Syntax: xsend JID text") @@ -34,42 +36,93 @@ for mandatory in ['jid', 'password']: print('Please point ~/.xsend config file to valid JID for sending messages.') sys.exit(0) + class Connection: def __init__(self): self.jid = nbxmpp.protocol.JID(jidparams['jid']) self.password = jidparams['password'] - self.sm = nbxmpp.Smacks(self) # Stream Management self.client_cert = None + self.idle_queue = nbxmpp.idlequeue.get_idlequeue() + self.client = None - def on_auth(self, con, auth): - if not auth: - print('could not authenticate!') - sys.exit() - print('authenticated using ' + auth) - self.send_message(to_jid, text) + def _on_auth_successful(self): + print('authenticated') + self.client.bind() - def on_connected(self, con, con_type): + def _on_connection_active(self): + print('Connection active') + self.client.RegisterHandler('message', self._on_message) + self.send_presence() + + def _on_auth_failed(self, reason, text): + log.debug("Couldn't authenticate") + log.error(reason, text) + exit() + + def _on_message(self, con, stanza): + print('message received') + print(stanza.getBody()) + + def _on_connected(self, con, con_type): print('connected with ' + con_type) - auth = self.client.auth(self.jid.getNode(), self.password, resource=self.jid.getResource(), sasl=1, on_auth=self.on_auth) + self.client.auth(self.jid.getNode(), + get_password=self._get_password, + resource=self.jid.getResource()) - def get_password(self, cb, mech): - cb(self.password) + def _get_password(self, mech, password_cb): + password_cb(self.password) - def on_connection_failed(self): + def _on_connection_failed(self): print('could not connect!') def _event_dispatcher(self, realm, event, data): - pass + if realm == Realm.CONNECTING: + if event == Event.AUTH_SUCCESSFUL: + log.info(event) + self._on_auth_successful() + + elif event == Event.AUTH_FAILED: + log.error(event) + log.error(data) + self._on_auth_failed(*data) + + elif event == Event.SESSION_FAILED: + log.error(event) + + elif event == Event.BIND_FAILED: + log.error(event) + + elif event == Event.CONNECTION_ACTIVE: + log.info(event) + self._on_connection_active() + return def connect(self): - idle_queue = nbxmpp.idlequeue.get_idlequeue() - self.client = nbxmpp.NonBlockingClient(self.jid.getDomain(), idle_queue, caller=self) - self.con = self.client.connect(self.on_connected, self.on_connection_failed, secure_tuple=('tls', '', '', None, None)) + cacerts = '' + if sys.platform in ('win32', 'darwin'): + cacerts = certifi.where() + + self.client = nbxmpp.NonBlockingClient(self.jid.getDomain(), + self.idle_queue, + caller=self) + + self.client.connect(self._on_connected, + self._on_connection_failed, + secure_tuple=('tls', cacerts, '', None, None, False)) + + if sys.platform == 'win32': + timeout, in_seconds = 20, None + else: + timeout, in_seconds = 100, False - def send_message(self, to_jid, text): - id_ = self.client.send(nbxmpp.protocol.Message(to_jid, text, typ='chat')) - print('sent message with id ' + id_) - gobject.timeout_add(1000, self.quit) + if in_seconds: + GLib.timeout_add_seconds(timeout, self.process_connections) + else: + GLib.timeout_add(timeout, self.process_connections) + + def send_presence(self): + presence = nbxmpp.Presence() + self.client.send(presence) def quit(self): self.disconnect() @@ -78,8 +131,28 @@ class Connection: def disconnect(self): self.client.start_disconnect() + def process_connections(self): + try: + self.idle_queue.process() + except Exception: + # Otherwise, an exception will stop our loop + + if sys.platform == 'win32': + # On Windows process() calls select.select(), so we need this + # executed as often as possible. + timeout, in_seconds = 1, None + else: + timeout, in_seconds = 100, False + + if in_seconds: + GLib.timeout_add_seconds(timeout, self.process_connections) + else: + GLib.timeout_add(timeout, self.process_connections) + raise + return True # renew timeout (loop for ever) + con = Connection() con.connect() -ml = gobject.MainLoop() +ml = GLib.MainLoop() ml.run() ===================================== nbxmpp/const.py ===================================== @@ -290,6 +290,12 @@ class BookmarkStoreType(Enum): PRIVATE = 'private' +class AnonymityMode(Enum): + UNKNOWN = None + SEMI = 'semi' + NONE = 'none' + + MOODS = [ 'afraid', 'amazed', ===================================== nbxmpp/dispatcher_nb.py ===================================== @@ -66,6 +66,7 @@ from nbxmpp.modules.bookmarks import Bookmarks from nbxmpp.modules.openpgp import OpenPGP from nbxmpp.modules.omemo import OMEMO from nbxmpp.modules.annotations import Annotations +from nbxmpp.modules.muclumbus import Muclumbus from nbxmpp.modules.misc import unwrap_carbon from nbxmpp.modules.misc import unwrap_mam from nbxmpp.util import get_properties_struct @@ -199,6 +200,7 @@ class XMPPDispatcher(PlugIn): self._modules['OpenPGP'] = OpenPGP(self._owner) self._modules['OMEMO'] = OMEMO(self._owner) self._modules['Annotations'] = Annotations(self._owner) + self._modules['Muclumbus'] = Muclumbus(self._owner) for instance in self._modules.values(): for handler in instance.handlers: ===================================== nbxmpp/modules/muclumbus.py ===================================== @@ -0,0 +1,131 @@ +# 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_MUCLUMBUS +from nbxmpp.protocol import NS_DATA +from nbxmpp.protocol import NS_RSM +from nbxmpp.protocol import Node +from nbxmpp.protocol import Iq +from nbxmpp.protocol import isResultNode +from nbxmpp.structs import MuclumbusItem +from nbxmpp.structs import MuclumbusResult +from nbxmpp.const import AnonymityMode +from nbxmpp.modules.dataforms import extend_form +from nbxmpp.util import call_on_response +from nbxmpp.util import callback +from nbxmpp.util import raise_error + + +log = logging.getLogger('nbxmpp.m.muclumbus') + +# API Documentation +# https://search.jabber.network/docs/api + +class Muclumbus: + def __init__(self, client): + self._client = client + self.handlers = [] + + @call_on_response('_parameters_received') + def request_parameters(self, jid): + query = Iq(to=jid, typ='get') + query.addChild(node=Node('search', attrs={'xmlns': NS_MUCLUMBUS})) + return query + + @callback + def _parameters_received(self, stanza): + if not isResultNode(stanza): + return raise_error(log.info, stanza) + + search = stanza.getTag('search', namespace=NS_MUCLUMBUS) + if search is None: + return raise_error(log.warning, stanza, 'stanza-malformed') + + dataform = search.getTag('x', namespace=NS_DATA) + if dataform is None: + return raise_error(log.warning, stanza, 'stanza-malformed') + + log.info('Muclumbus parameters received') + return extend_form(node=dataform) + + @call_on_response('_search_received') + def set_search(self, jid, dataform, items_per_page=50, after=None): + search = Node('search', attrs={'xmlns': NS_MUCLUMBUS}) + search.addChild(node=dataform) + rsm = search.addChild('set', namespace=NS_RSM) + rsm.addChild('max').setData(items_per_page) + if after is not None: + rsm.addChild('after').setData(after) + query = Iq(to=jid, typ='get') + query.addChild(node=search) + return query + + @callback + def _search_received(self, stanza): + if not isResultNode(stanza): + return raise_error(log.info, stanza) + + result = stanza.getTag('result', namespace=NS_MUCLUMBUS) + if result is None: + return raise_error(log.warning, stanza, 'stanza-malformed') + + items = result.getTags('item') + if not items: + return MuclumbusResult(first=None, + last=None, + max=None, + end=True, + items=[]) + + set_ = result.getTag('set', namespace=NS_RSM) + if set_ is None: + return raise_error(log.warning, stanza, 'stanza-malformed') + + first = set_.getTagData('first') + last = set_.getTagData('last') + try: + max_ = int(set_.getTagData('max')) + except Exception: + return raise_error(log.warning, stanza, 'stanza-malformed') + + results = [] + for item in items: + jid = item.getAttr('address') + name = item.getTagData('name') + nusers = item.getTagData('nusers') + description = item.getTagData('description') + language = item.getTagData('language') + is_open = item.getTag('is-open') is not None + + try: + anonymity_mode = AnonymityMode(item.getTagData('anonymity-mode')) + except ValueError: + anonymity_mode = AnonymityMode.UNKNOWN + results.append(MuclumbusItem(jid=jid, + name=name, + nusers=nusers, + description=description, + language=language, + is_open=is_open, + anonymity_mode=anonymity_mode)) + return MuclumbusResult(first=first, + last=last, + max=max_, + end=len(items) < max_, + items=results) ===================================== nbxmpp/protocol.py ===================================== @@ -196,6 +196,7 @@ 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' +NS_MUCLUMBUS = 'https://xmlns.zombofant.net/muclumbus/search/1.0' #xmpp_stream_error_conditions = ''' #bad-format -- -- -- The entity has sent XML that cannot be processed. ===================================== nbxmpp/structs.py ===================================== @@ -100,6 +100,10 @@ AnnotationNote.__new__.__defaults__ = (None, None) EMEData = namedtuple('EMEData', 'name namespace') +MuclumbusResult = namedtuple('MuclumbusResult', 'first last max end items') + +MuclumbusItem = namedtuple('MuclumbusItem', 'jid name nusers description language is_open anonymity_mode') + class OMEMOBundle(namedtuple('OMEMOBundle', 'spk spk_signature ik otpks')): def pick_prekey(self): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/f37f2c9dfdbcb6f6fd5f9bd00… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/f37f2c9dfdbcb6f6fd5f9bd00… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][nbxmpp_0.6] Fix xsend example
by Philipp Hörist 25 Feb '19

25 Feb '19

Philipp Hörist pushed to branch nbxmpp_0.6 at gajim / python-nbxmpp Commits: ca4c80f9 by Philipp Hörist at 2019-02-25T21:24:49Z Fix xsend example Fixes #71 - - - - - 1 changed file: - doc/examples/xsend.py Changes: ===================================== doc/examples/xsend.py ===================================== @@ -2,17 +2,17 @@ import sys import os -import nbxmpp -import time import logging -try: - from gi.repository import GObject as gobject -except Exception: - import gobject + +import nbxmpp +from gi.repository import GLib + +if sys.platform in ('win32', 'darwin'): + import certifi consoleloghandler = logging.StreamHandler() root_log = logging.getLogger('nbxmpp') -#root_log.setLevel('DEBUG') +root_log.setLevel('DEBUG') root_log.addHandler(consoleloghandler) if len(sys.argv) < 2: @@ -38,19 +38,29 @@ class Connection: def __init__(self): self.jid = nbxmpp.protocol.JID(jidparams['jid']) self.password = jidparams['password'] - self.sm = nbxmpp.Smacks(self) # Stream Management self.client_cert = None + self.sm = nbxmpp.Smacks(self) + self.idle_queue = nbxmpp.idlequeue.get_idlequeue() + self.client = None def on_auth(self, con, auth): if not auth: print('could not authenticate!') sys.exit() print('authenticated using ' + auth) - self.send_message(to_jid, text) + con.RegisterHandler('message', self._on_message) + self.send_presence() + + def _on_message(self, con, stanza): + print('message received') + print(stanza.getBody()) def on_connected(self, con, con_type): print('connected with ' + con_type) - auth = self.client.auth(self.jid.getNode(), self.password, resource=self.jid.getResource(), sasl=1, on_auth=self.on_auth) + self.client.auth(self.jid.getNode(), + self.password, + resource=self.jid.getResource(), + on_auth=self.on_auth) def get_password(self, cb, mech): cb(self.password) @@ -62,14 +72,36 @@ class Connection: pass def connect(self): - idle_queue = nbxmpp.idlequeue.get_idlequeue() - self.client = nbxmpp.NonBlockingClient(self.jid.getDomain(), idle_queue, caller=self) - self.con = self.client.connect(self.on_connected, self.on_connection_failed, secure_tuple=('tls', '', '', None, None)) + cacerts = '' + if sys.platform in ('win32', 'darwin'): + cacerts = certifi.where() + + self.client = nbxmpp.NonBlockingClient(self.jid.getDomain(), + self.idle_queue, + caller=self) + + self.client.connect(self.on_connected, + self.on_connection_failed, + secure_tuple=('tls', cacerts, '', None, None, False)) + + if sys.platform == 'win32': + timeout, in_seconds = 20, None + else: + timeout, in_seconds = 100, False + + if in_seconds: + GLib.timeout_add_seconds(timeout, self.process_connections) + else: + GLib.timeout_add(timeout, self.process_connections) def send_message(self, to_jid, text): id_ = self.client.send(nbxmpp.protocol.Message(to_jid, text, typ='chat')) print('sent message with id ' + id_) - gobject.timeout_add(1000, self.quit) + GLib.timeout_add(1000, self.quit) + + def send_presence(self): + presence = nbxmpp.Presence() + self.client.send(presence) def quit(self): self.disconnect() @@ -78,8 +110,28 @@ class Connection: def disconnect(self): self.client.start_disconnect() + def process_connections(self): + try: + self.idle_queue.process() + except Exception: + # Otherwise, an exception will stop our loop + + if sys.platform == 'win32': + # On Windows process() calls select.select(), so we need this + # executed as often as possible. + timeout, in_seconds = 1, None + else: + timeout, in_seconds = 100, False + + if in_seconds: + GLib.timeout_add_seconds(timeout, self.process_connections) + else: + GLib.timeout_add(timeout, self.process_connections) + raise + return True # renew timeout (loop for ever) + con = Connection() con.connect() -ml = gobject.MainLoop() +ml = GLib.MainLoop() ml.run() View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/ca4c80f90c9abde44d9899e9c7… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/ca4c80f90c9abde44d9899e9c7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Delay: Improve discovering server added delays
by Philipp Hörist 25 Feb '19

25 Feb '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: f37f2c9d by Philipp Hörist at 2019-02-24T21:20:05Z Delay: Improve discovering server added delays - - - - - 1 changed file: - nbxmpp/modules/delay.py Changes: ===================================== nbxmpp/modules/delay.py ===================================== @@ -44,16 +44,21 @@ class Delay: # to indicate when the user has set the subject, # the 'from' attr on these delays is the MUC server # but we treat it as user timestamp - properties.user_timestamp = parse_delay( - stanza, from_=properties.jid.getBare()) + jids = [properties.jid.getBare(), + properties.jid.getDomain()] + + properties.user_timestamp = parse_delay(stanza, from_=jids) else: - jid = self._client.get_bound_jid().getDomain() - timestamp = parse_delay(stanza, from_=jid) - if timestamp is not None: - properties.timestamp = timestamp + if properties.from_muc: + # Some servers use the MUC JID, others the domain + jids = [properties.jid.getBare(), + properties.jid.getDomain()] + else: + jids = [self._client.get_bound_jid().getDomain()] - properties.user_timestamp = parse_delay(stanza, not_from=[jid]) + properties.timestamp = parse_delay(stanza, from_=jids) + properties.user_timestamp = parse_delay(stanza, not_from=jids) @staticmethod def _process_presence_delay(_con, stanza, properties): @@ -85,7 +90,7 @@ def parse_delay(stanza, epoch=True, convert='utc', from_=None, not_from=None): delay_from = delay.getAttr('from') if from_ is not None: - if delay_from != from_: + if delay_from not in from_: continue if not_from is not None: if delay_from in not_from: View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/f37f2c9dfdbcb6f6fd5f9bd00c… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/f37f2c9dfdbcb6f6fd5f9bd00c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Raise nbxmpp version
by Philipp Hörist 24 Feb '19

24 Feb '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3bf75594 by Philipp Hörist at 2019-02-24T19:20:28Z Raise nbxmpp version - - - - - 6c06d2c4 by Philipp Hörist at 2019-02-24T19:23:55Z 1.1.92 - - - - - 3 changed files: - gajim/__init__.py - gajim/gajim.py - setup.cfg Changes: ===================================== gajim/__init__.py ===================================== @@ -1,7 +1,7 @@ import os import subprocess -__version__ = "1.1.91.1" +__version__ = "1.1.92" IS_FLATPAK = False if os.path.exists('/app/share/run-as-flatpak'): ===================================== gajim/gajim.py ===================================== @@ -26,7 +26,7 @@ from distutils.version import LooseVersion as V from gajim.common import i18n -_MIN_NBXMPP_VER = "0.9.90.4" +_MIN_NBXMPP_VER = "0.9.91" _MIN_GTK_VER = "3.22.0" ===================================== setup.cfg ===================================== @@ -22,7 +22,7 @@ test_suite = test install_requires = cssutils>=1.0.2 keyring - nbxmpp>=0.9.90.4 + nbxmpp>=0.9.91 precis-i18n>=1.0.0 pyOpenSSL>=16.2 View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/e3f8f050c02b48f79766bb5b812f9fb9e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/e3f8f050c02b48f79766bb5b812f9fb9e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 0.9.91
by Philipp Hörist 24 Feb '19

24 Feb '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 1abe1eab by Philipp Hörist at 2019-02-24T16:22:11Z 0.9.91 - - - - - 1 changed file: - nbxmpp/__init__.py Changes: ===================================== nbxmpp/__init__.py ===================================== @@ -15,4 +15,4 @@ from .client_nb import NonBlockingClient from .plugin import PlugIn from .smacks import Smacks -__version__ = "0.9.90.4" +__version__ = "0.9.91" View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/1abe1eab36b389bf2138ef8948… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/1abe1eab36b389bf2138ef8948… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: OpenPGP: Dont fail on empty keylist
by Philipp Hörist 24 Feb '19

24 Feb '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 92b6173d by Philipp Hörist at 2019-02-24T08:48:53Z OpenPGP: Dont fail on empty keylist Fixes #68 - - - - - f6f6895e by Philipp Hörist at 2019-02-24T16:20:17Z OMEMO: Add support for key transport messages - - - - - 2 changed files: - nbxmpp/modules/omemo.py - nbxmpp/modules/openpgp.py Changes: ===================================== nbxmpp/modules/omemo.py ===================================== @@ -25,6 +25,7 @@ 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 Message from nbxmpp.protocol import isResultNode from nbxmpp.protocol import StanzaMalformed from nbxmpp.util import call_on_response @@ -435,6 +436,25 @@ def create_omemo_message(stanza, omemo_message, store_hint=True, stanza.addChild(node=Node('store', attrs={'xmlns': NS_HINTS})) +def get_key_transport_message(typ, jid, omemo_message): + message = Message(typ=typ, to=jid) + + 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) + + message.addChild(node=encrypted) + return message + + def cleanup_stanza(stanza, node_whitelist): whitelisted_nodes = [] for tag, ns in node_whitelist: ===================================== nbxmpp/modules/openpgp.py ===================================== @@ -128,6 +128,9 @@ class OpenPGP: @staticmethod def _parse_keylist(jid, item): + if item is None: + return [] + keylist_node = item.getTag('public-keys-list', namespace=NS_OPENPGP) if keylist_node is None: raise StanzaMalformed('No public-keys-list node found') View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/e83b5d4d07444224dcab693f5… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/e83b5d4d07444224dcab693f5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: Remove unused code
by Philipp Hörist 19 Feb '19

19 Feb '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 12389f40 by Philipp Hörist at 2019-02-19T19:38:57Z Remove unused code - - - - - 12d909d6 by Philipp Hörist at 2019-02-19T19:38:57Z LastActivity: Use BaseModule and StanzaHandler - - - - - 0963f444 by Philipp Hörist at 2019-02-19T23:31:24Z Use nbxmpp's parsed EME data - - - - - e3f8f050 by Philipp Hörist at 2019-02-19T23:31:28Z Zeroconf: Fix missing attrs - - - - - 8 changed files: - gajim/common/const.py - gajim/common/modules/last_activity.py - gajim/common/modules/mam.py - gajim/common/modules/message.py - gajim/common/modules/misc.py - gajim/common/modules/util.py - gajim/common/zeroconf/client_zeroconf.py - gajim/common/zeroconf/connection_handlers_zeroconf.py Changes: ===================================== gajim/common/const.py ===================================== @@ -200,6 +200,23 @@ class MUCUser(IntEnum): AFFILIATION_TEXT = 4 +EME_MESSAGES = { + 'urn:xmpp:otr:0': + _('This message was encrypted with OTR ' + 'and could not be decrypted.'), + 'jabber:x:encrypted': + _('This message was encrypted with Legacy ' + 'OpenPGP and could not be decrypted. You can install ' + 'the PGP plugin to handle those messages.'), + 'urn:xmpp:openpgp:0': + _('This message was encrypted with ' + 'OpenPGP for XMPP and could not be decrypted.'), + 'fallback': + _('This message was encrypted with %s ' + 'and could not be decrypted.') +} + + ACTIVITIES = { 'doing_chores': { 'category': _('Doing Chores'), ===================================== gajim/common/modules/last_activity.py ===================================== @@ -17,31 +17,37 @@ import logging import nbxmpp +from nbxmpp.structs import StanzaHandler from gajim.common import app from gajim.common import idle +from gajim.common.modules.base import BaseModule log = logging.getLogger('gajim.c.m.last_activity') -class LastActivity: +class LastActivity(BaseModule): def __init__(self, con): - self._con = con - self._account = con.name + BaseModule.__init__(self, con) - self.handlers = [('iq', self._answer_request, 'get', nbxmpp.NS_LAST)] + self.handlers = [ + StanzaHandler(name='iq', + typ='get', + callback=self._answer_request, + ns=nbxmpp.NS_LAST), + ] - def _answer_request(self, _con, stanza): - log.info('Request from %s', stanza.getFrom()) - if not app.account_is_connected(self._account): - return + def _answer_request(self, _con, stanza, properties): + log.info('Request from %s', properties.jid) allow_send = app.config.get_per( 'accounts', self._account, 'send_idle_time') if app.is_installed('IDLE') and allow_send: iq = stanza.buildReply('result') query = iq.setQuery() - query.attrs['seconds'] = idle.Monitor.get_idle_sec() + seconds = idle.Monitor.get_idle_sec() + query.attrs['seconds'] = seconds + log.info('Respond with seconds: %s', seconds) else: iq = stanza.buildReply('error') err = nbxmpp.ErrorNode(nbxmpp.ERR_SERVICE_UNAVAILABLE) ===================================== gajim/common/modules/mam.py ===================================== @@ -33,7 +33,7 @@ from gajim.common.helpers import AdditionalDataDict from gajim.common.modules.misc import parse_delay from gajim.common.modules.misc import parse_oob from gajim.common.modules.misc import parse_correction -from gajim.common.modules.misc import parse_eme +from gajim.common.modules.util import get_eme_message log = logging.getLogger('gajim.c.m.archiving') @@ -170,11 +170,9 @@ class MAM: 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 + if properties.eme is not None: + event.msgtxt = get_eme_message(properties.eme) self._decryption_finished(event) raise nbxmpp.NodeProcessed ===================================== gajim/common/modules/message.py ===================================== @@ -28,10 +28,10 @@ from gajim.common.nec import NetworkIncomingEvent from gajim.common.nec import NetworkEvent from gajim.common.helpers import AdditionalDataDict from gajim.common.const import KindConstant +from gajim.common.modules.util import get_eme_message from gajim.common.modules.security_labels import parse_securitylabel from gajim.common.modules.user_nickname import parse_nickname from gajim.common.modules.misc import parse_delay -from gajim.common.modules.misc import parse_eme from gajim.common.modules.misc import parse_correction from gajim.common.modules.misc import parse_attention from gajim.common.modules.misc import parse_form @@ -187,9 +187,8 @@ class Message: 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.eme is not None: + event.msgtxt = get_eme_message(properties.eme) self._on_message_decrypted(event) def _on_message_decrypted(self, event): ===================================== gajim/common/modules/misc.py ===================================== @@ -19,50 +19,11 @@ import logging import nbxmpp from gajim.common import app -from gajim.common.i18n import _ from gajim.common.modules.date_and_time import parse_datetime log = logging.getLogger('gajim.c.m.misc') -# XEP-0380: Explicit Message Encryption - -_eme_namespaces = { - 'urn:xmpp:otr:0': - _('This message was encrypted with OTR ' - 'and could not be decrypted.'), - 'jabber:x:encrypted': - _('This message was encrypted with Legacy ' - 'OpenPGP and could not be decrypted. You can install ' - 'the PGP plugin to handle those messages.'), - 'urn:xmpp:openpgp:0': - _('This message was encrypted with ' - 'OpenPGP for XMPP and could not be decrypted.'), - 'fallback': - _('This message was encrypted with %s ' - 'and could not be decrypted.') -} - - -def parse_eme(stanza): - enc_tag = stanza.getTag('encryption', namespace=nbxmpp.NS_EME) - if enc_tag is None: - return - - ns = enc_tag.getAttr('namespace') - if ns is None: - log.warning('No namespace on EME message') - return - - if ns in _eme_namespaces: - log.info('Found not decrypted message: %s', ns) - return _eme_namespaces.get(ns) - - enc_name = enc_tag.getAttr('name') - log.info('Found not decrypted message: %s', enc_name or ns) - return _eme_namespaces.get('fallback') % enc_name or ns - - # XEP-0203: Delayed Delivery def parse_delay(stanza, epoch=True, convert='utc', from_=None, not_from=None): @@ -157,24 +118,3 @@ def parse_xhtml(stanza): if app.config.get('ignore_incoming_xhtml'): return None return stanza.getXHTML() - - -# XEP-0319: Last User Interaction in Presence - -def parse_idle(stanza): - idle_tag = stanza.getTag('idle', namespace=nbxmpp.NS_IDLE) - if idle_tag is None: - return - - since = idle_tag.getAttr('since') - if since is None: - log.warning('No since attr in idle node') - log.warning(stanza) - return - - timestamp = parse_datetime(since, convert='utc', epoch=True) - if timestamp is None: - log.warning('Invalid timestamp received: %s', since) - log.warning(stanza) - - return timestamp ===================================== gajim/common/modules/util.py ===================================== @@ -20,6 +20,7 @@ from functools import wraps from functools import partial from gajim.common import app +from gajim.common.const import EME_MESSAGES def from_xs_boolean(value: Union[str, bool]) -> bool: @@ -73,3 +74,10 @@ def store_publish(func): return return func(self, *args, **kwargs) return func_wrapper + + +def get_eme_message(eme_data): + try: + return EME_MESSAGES[eme_data.namespace] + except KeyError: + return EME_MESSAGES['fallback'] % eme_data.name ===================================== gajim/common/zeroconf/client_zeroconf.py ===================================== @@ -28,6 +28,7 @@ from unittest.mock import Mock import nbxmpp from nbxmpp import dispatcher_nb from nbxmpp import simplexml +from nbxmpp.structs import StanzaHandler from nbxmpp.plugin import PlugIn from nbxmpp.idlequeue import IdleObject from nbxmpp.transports_nb import DATA_RECEIVED @@ -322,8 +323,10 @@ class P2PClient(IdleObject): def _register_handlers(self): self._caller.peerhost = self.Connection._sock.getsockname() - self.RegisterHandler('message', lambda conn, - data: self._caller._messageCB(self.Server, conn, data)) + + self.RegisterHandler(*StanzaHandler(name='message', + callback=self._caller._messageCB)) + self.RegisterHandler('iq', self._caller._siSetCB, 'set', nbxmpp.NS_SI) self.RegisterHandler('iq', self._caller._siErrorCB, 'error', nbxmpp.NS_SI) ===================================== gajim/common/zeroconf/connection_handlers_zeroconf.py ===================================== @@ -27,14 +27,13 @@ import nbxmpp from gajim.common import app from gajim.common.protocol.bytestream import ConnectionSocks5BytestreamZeroconf -from gajim.common.zeroconf.zeroconf import Constant from gajim.common import connection_handlers from gajim.common.i18n import _ from gajim.common.helpers import AdditionalDataDict from gajim.common.nec import NetworkIncomingEvent, NetworkEvent from gajim.common.const import KindConstant from gajim.common.modules.user_nickname import parse_nickname -from gajim.common.modules.misc import parse_eme +from gajim.common.modules.util import get_eme_message from gajim.common.modules.misc import parse_correction from gajim.common.modules.misc import parse_attention from gajim.common.modules.misc import parse_oob @@ -65,11 +64,14 @@ class ConnectionHandlersZeroconf(ConnectionSocks5BytestreamZeroconf, connection_handlers.ConnectionJingle.__init__(self) connection_handlers.ConnectionHandlersBase.__init__(self) - def _messageCB(self, ip, con, stanza): + def _messageCB(self, con, stanza, properties): """ Called when we receive a message """ - log.debug('Zeroconf MessageCB') + log.info('Zeroconf MessageCB') + + # Dont trust from attr set by sender + stanza.setFrom(con._owner.to) app.nec.push_incoming_event(NetworkEvent( 'raw-message-received', @@ -85,13 +87,6 @@ class ConnectionHandlersZeroconf(ConnectionSocks5BytestreamZeroconf, fjid = str(stanza.getFrom()) - if fjid is None: - for key in self.connection.zeroconf.contacts: - if ip == self.connection.zeroconf.contacts[key][ - Constant.ADDRESS]: - fjid = key - break - jid, resource = app.get_room_and_nick_from_fjid(fjid) thread_id = stanza.getThread() @@ -118,6 +113,7 @@ class ConnectionHandlersZeroconf(ConnectionSocks5BytestreamZeroconf, 'jid': jid, 'resource': resource, 'unique_id': id_, + 'message_id': properties.id, 'mtype': type_, 'msgtxt': msgtxt, 'thread_id': thread_id, @@ -132,9 +128,8 @@ class ConnectionHandlersZeroconf(ConnectionSocks5BytestreamZeroconf, app.plugin_manager.extension_point( 'decrypt', self, event, self._on_message_decrypted) if not event.encrypted: - eme = parse_eme(event.stanza) - if eme is not None: - event.msgtxt = eme + if properties.eme is not None: + event.msgtxt = get_eme_message(properties.eme) self._on_message_decrypted(event) def _on_message_decrypted(self, event): View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/72fc96ae6374db9e438a439f2d6487403… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/72fc96ae6374db9e438a439f2d6487403… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Annotations: Fix log message
by Philipp Hörist 19 Feb '19

19 Feb '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: b7cb8019 by Philipp Hörist at 2019-02-19T16:52:43Z Annotations: Fix log message - - - - - e83b5d4d by Philipp Hörist at 2019-02-19T18:01:17Z EME: Use namedtuple - - - - - 3 changed files: - nbxmpp/modules/annotations.py - nbxmpp/modules/eme.py - nbxmpp/structs.py Changes: ===================================== nbxmpp/modules/annotations.py ===================================== @@ -86,7 +86,7 @@ class Annotations: log.info('Received annotations from %s:', self.domain) for note in notes: - log.info(notes) + log.info(note) return notes @call_on_response('_default_response') ===================================== nbxmpp/modules/eme.py ===================================== @@ -19,6 +19,7 @@ import logging from nbxmpp.protocol import NS_EME from nbxmpp.structs import StanzaHandler +from nbxmpp.structs import EMEData log = logging.getLogger('nbxmpp.m.eme') @@ -35,16 +36,15 @@ class EME: @staticmethod def _process_eme(_con, stanza, properties): - enc_tag = stanza.getTag('encryption', namespace=NS_EME) - if enc_tag is None: + encryption = stanza.getTag('encryption', namespace=NS_EME) + if encryption is None: return - ns = enc_tag.getAttr('namespace') - if ns is None: + name = encryption.getAttr('name') + namespace = encryption.getAttr('namespace') + if namespace is None: log.warning('No namespace on message') return - properties.eme = {} - properties.eme['namespace'] = ns - properties.eme['name'] = enc_tag.getAttr('name') + properties.eme = EMEData(name=name, namespace=namespace) log.info('Found data: %s', properties.eme) ===================================== nbxmpp/structs.py ===================================== @@ -98,6 +98,8 @@ OMEMOMessage = namedtuple('OMEMOMessage', 'sid iv keys payload') AnnotationNote = namedtuple('AnnotationNote', 'jid data cdate mdate') AnnotationNote.__new__.__defaults__ = (None, None) +EMEData = namedtuple('EMEData', 'name namespace') + class OMEMOBundle(namedtuple('OMEMOBundle', 'spk spk_signature ik otpks')): def pick_prekey(self): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/30876f0e6b45d480cfc95dcb4… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/30876f0e6b45d480cfc95dcb4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Remove atom modules
by Philipp Hörist 18 Feb '19

18 Feb '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 54a99926 by Philipp Hörist at 2019-02-18T18:46:47Z Remove atom modules - - - - - 11c5fd29 by Philipp Hörist at 2019-02-18T22:02:05Z Remove not used PEP module code - - - - - 72fc96ae by Philipp Hörist at 2019-02-18T22:02:14Z Refactor Annotations - Simplify modules because nbxmpp handles more stuff - - - - - 8 changed files: - gajim/common/connection.py - gajim/common/modules/annotations.py - − gajim/common/modules/atom.py - gajim/common/modules/pep.py - − gajim/gtk/atom.py - gajim/gui_interface.py - gajim/roster_window.py - gajim/vcard.py Changes: ===================================== gajim/common/connection.py ===================================== @@ -683,7 +683,6 @@ class Connection(CommonConnection, ConnectionHandlers): self.disable_reconnect_timer() app.interface.music_track_changed(None, None, self.name) - self.get_module('PEP').reset_stored_publish() self.get_module('VCardAvatars').avatar_advertised = False app.proxy65_manager.disconnect(self.connection) @@ -1489,7 +1488,7 @@ class Connection(CommonConnection, ConnectionHandlers): self.get_module('Bookmarks').request_bookmarks() # Get annotations - self.get_module('Annotations').get_annotations() + self.get_module('Annotations').request_annotations() # Blocking self.get_module('Blocking').get_blocking_list() @@ -1615,13 +1614,12 @@ class Connection(CommonConnection, ConnectionHandlers): self.get_module('VCardTemp').request_vcard() self.get_module('Bookmarks').request_bookmarks() - self.get_module('Annotations').get_annotations() + self.get_module('Annotations').request_annotations() self.get_module('Blocking').get_blocking_list() # Inform GUI we just signed in app.nec.push_incoming_event(NetworkEvent('signed-in', conn=self)) modules.send_stored_publish(self.name) - self.get_module('PEP').send_stored_publish() self.continue_connect_info = None def send_custom_status(self, show, msg, jid): ===================================== gajim/common/modules/annotations.py ===================================== @@ -16,87 +16,49 @@ from typing import Any from typing import Dict # pylint: disable=unused-import -from typing import List # pylint: disable=unused-import from typing import Tuple import logging -import nbxmpp +from nbxmpp.util import is_error_result -from gajim.common import app -from gajim.common import helpers from gajim.common.types import ConnectionT +from gajim.common.modules.base import BaseModule log = logging.getLogger('gajim.c.m.annotations') -class Annotations: - def __init__(self, con: ConnectionT) -> None: - self._con = con - self._account = con.name - self._server = self._con.get_own_jid().getDomain() +class Annotations(BaseModule): - self.handlers = [] # type: List[Tuple[Any, ...]] - self.annotations = {} # type: Dict[str, str] + _nbxmpp_extends = 'Annotations' + _nbxmpp_methods = [ + 'request_annotations', + 'set_annotations', + ] - def get_annotations(self) -> None: - if not app.account_is_connected(self._account): - return - - log.info('Request annotations for %s', self._server) - iq = nbxmpp.Iq(typ='get') - iq2 = iq.addChild(name='query', namespace=nbxmpp.NS_PRIVATE) - iq2.addChild(name='storage', namespace='storage:rosternotes') + def __init__(self, con: ConnectionT): + BaseModule.__init__(self, con) - self._con.connection.SendAndCallForResponse(iq, self._result_received) + self._register_callback('request_annotations', + self._annotations_received) + self._annotations = {} # type: Dict[str, Any] - def _result_received(self, stanza: nbxmpp.Iq) -> None: - if not nbxmpp.isResultNode(stanza): - log.info('Error: %s', stanza.getError()) - return + def set_annotations(self): + self._nbxmpp('Annotations').set_annotations(self._annotations.values()) - log.info('Received annotations from %s', self._server) - self.annotations = {} - query = stanza.getTag('query') - storage_node = query.getTag('storage') - if storage_node is None: + def _annotations_received(self, result): + if is_error_result(result): + self._annotations = {} return + for note in result: + self._annotations[note.jid] = note - notes = storage_node.getTags('note') - if notes is None: - return + def get_note(self, jid): + return self._annotations.get(jid) - for note in notes: - try: - jid = helpers.parse_jid(note.getAttr('jid')) - except helpers.InvalidFormat: - log.warning('Invalid JID: %s, ignoring it', - note.getAttr('jid')) - continue - self.annotations[jid] = note.getData() - - def store_annotations(self) -> None: - if not app.account_is_connected(self._account): - return - - iq = nbxmpp.Iq(typ='set') - iq2 = iq.addChild(name='query', namespace=nbxmpp.NS_PRIVATE) - iq3 = iq2.addChild(name='storage', namespace='storage:rosternotes') - for jid in self.annotations: - if self.annotations[jid]: - iq4 = iq3.addChild(name='note') - iq4.setAttr('jid', jid) - iq4.setData(self.annotations[jid]) - - self._con.connection.SendAndCallForResponse( - iq, self._store_result_received) - - @staticmethod - def _store_result_received(stanza: nbxmpp.Iq) -> None: - if not nbxmpp.isResultNode(stanza): - log.warning('Storing rosternotes failed: %s', stanza.getError()) - return - log.info('Storing rosternotes successful') + def set_note(self, note): + self._annotations[note.jid] = note + self.set_annotations() def get_instance(*args: Any, **kwargs: Any) -> Tuple[Annotations, str]: ===================================== gajim/common/modules/atom.py deleted ===================================== @@ -1,226 +0,0 @@ -# Copyright (C) 2006 Jean-Marie Traissard <jim AT lapin.org> -# Tomasz Melcer <liori AT exroot.org> -# Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org> -# -# This file is part of Gajim. -# -# Gajim 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; version 3 only. -# -# Gajim 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 Gajim. If not, see <http://www.gnu.org/licenses/>. - -""" -Atom (rfc 4287) feed parser, used to read data from atom-over-pubsub transports -and services. Very simple. Actually implements only atom:entry. -Implement more features if you need -""" - -# XEP-0277: Microblogging over XMPP - -# Module is disabled for now because Gajim lacks a good UI for that -# register the module in connection.py with register_module() to activate again - -import logging -import time - -import nbxmpp - -from gajim.common.const import PEPEventType -from gajim.common.exceptions import StanzaMalformed -from gajim.common.modules.pep import AbstractPEPModule, AbstractPEPData - -log = logging.getLogger('gajim.c.m.atom') - - -class AtomData(AbstractPEPData): - - type_ = PEPEventType.ATOM - - def __init__(self, atom): - self.data = atom - - def get_entry(self): - return self.data - - -class Atom(AbstractPEPModule): - - name = 'atom' - namespace = 'urn:xmpp:microblog:0' - pep_class = AtomData - store_publish = False - _log = log - - def _extract_info(self, item): - entry = item.getTag('entry', namespace=nbxmpp.NS_ATOM) - if entry is None: - StanzaMalformed('no entry node') - - return OldEntry(node=entry) or None - - def _build_node(self, data): - raise NotImplementedError - - -class PersonConstruct(nbxmpp.Node): - """ - Not used for now, as we don't need authors/contributors - in pubsub.com feeds. They rarely exist there - """ - - def __init__(self, node): - ''' Create person construct from node. ''' - nbxmpp.Node.__init__(self, node=node) - - def get_name(self): - return self.getTagData('name') - - name = property( - get_name, None, None, - '''Conveys a human-readable name for the person. Should not be None, - although some badly generated atom feeds don't put anything here - (this is non-standard behavior, still pubsub.com sometimes - does that.)''') - - def get_uri(self): - return self.getTagData('uri') - - uri = property( - get_uri, None, None, - '''Conveys an IRI associated with the person. - Might be None when not set.''') - - def get_email(self): - return self.getTagData('email') - - email = property( - get_email, None, None, - '''Conveys an e-mail address associated with the person. - Might be None when not set.''') - - -class Entry(nbxmpp.Node): - def __init__(self, node=None): - nbxmpp.Node.__init__(self, 'entry', node=node) - - def __repr__(self): - return '<Atom:Entry object of id="%r">' % self.getAttr('id') - - -class OldEntry(nbxmpp.Node): - """ - Parser for feeds from pubsub.com. They use old Atom 0.3 format with their - extensions - """ - - def __init__(self, node=None): - ''' Create new Atom 0.3 entry object. ''' - nbxmpp.Node.__init__(self, 'entry', node=node) - - def __repr__(self): - return '<Atom0.3:Entry object of id="%r">' % self.getAttr('id') - - def get_feed_title(self): - """ - Return title of feed, where the entry was created. - The result is the feed name concatenated with source-feed title - """ - if self.parent is not None: - main_feed = self.parent.getTagData('title') - else: - main_feed = None - - if self.getTag('feed') is not None: - source_feed = self.getTag('feed').getTagData('title') - else: - source_feed = None - - if main_feed is not None and source_feed is not None: - return '%s: %s' % (main_feed, source_feed) - if main_feed is not None: - return main_feed - if source_feed is not None: - return source_feed - return '' - - feed_title = property( - get_feed_title, None, None, - ''' Title of feed. It is built from entry''s original feed title - and title of feed which delivered this entry. ''') - - def get_feed_link(self): - """ - Get source link - """ - try: - link = self.getTag('feed').getTags('link', {'rel': 'alternate'}) - return link[1].getData() - except Exception: - return None - - feed_link = property( - get_feed_link, None, None, - ''' Link to main webpage of the feed. ''') - - def get_title(self): - """ - Get an entry's title - """ - return self.getTagData('title') - - title = property( - get_title, None, None, - ''' Entry's title. ''') - - def get_uri(self): - """ - Get the uri the entry points to (entry's first link element with - rel='alternate' or without rel attribute) - """ - for element in self.getTags('link'): - if 'rel' in element.attrs and element.attrs['rel'] != 'alternate': - continue - try: - return element.attrs['href'] - except AttributeError: - pass - return None - - uri = property( - get_uri, None, None, - ''' URI that is pointed by the entry. ''') - - def get_updated(self): - """ - Get the time the entry was updated last time - - This should be standarized, but pubsub.com sends it in human-readable - format. We won't try to parse it. - (Atom 0.3 uses the word «modified» for that). - - If there's no time given in the entry, we try with <published> - and <issued> elements. - """ - for name in ('updated', 'modified', 'published', 'issued'): - date = self.getTagData(name) - if date is not None: - break - - if date is None: - # it is not in the standard format - return time.asctime() - - return date - - updated = property( - get_updated, None, None, - ''' Last significant modification time. ''') - - feed_tagline = '' ===================================== gajim/common/modules/pep.py ===================================== @@ -23,30 +23,18 @@ import logging import nbxmpp -from gajim.common import app -from gajim.common.exceptions import StanzaMalformed -from gajim.common.nec import NetworkIncomingEvent -from gajim.common.const import PEPEventType from gajim.common.types import ConnectionT -from gajim.common.types import PEPHandlersDict # pylint: disable=unused-import -from gajim.common.types import PEPNotifyCallback +from gajim.common.modules.base import BaseModule + log = logging.getLogger('gajim.c.m.pep') -class PEP: +class PEP(BaseModule): def __init__(self, con: ConnectionT) -> None: - self._con = con - self._account = con.name - - self.handlers = [ - ('message', self._pep_event_received, - 'headline', nbxmpp.NS_PUBSUB_EVENT) - ] + BaseModule.__init__(self, con) self.supported = False - self._pep_handlers = {} # type: PEPHandlersDict - self._store_publish_modules = [] # type: List[Any] def pass_disco(self, from_: nbxmpp.JID, @@ -60,177 +48,6 @@ class PEP: log.info('Discovered PEP support: %s', from_) self.supported = True - def register_pep_handler( - self, - namespace: str, - notify_handler: PEPNotifyCallback) -> None: - if namespace in self._pep_handlers: - self._pep_handlers[namespace].append(notify_handler) - else: - self._pep_handlers[namespace] = [notify_handler] - - module_instance = notify_handler.__self__ # type: ignore - if module_instance.store_publish: - if module_instance not in self._store_publish_modules: - self._store_publish_modules.append(module_instance) - - def _pep_event_received(self, - _con: ConnectionT, - stanza: nbxmpp.Message) -> None: - jid = stanza.getFrom() - event = stanza.getTag('event', namespace=nbxmpp.NS_PUBSUB_EVENT) - items = event.getTag('items') - if items is None: - log.warning('Malformed PEP event (no items node): %s', stanza) - raise nbxmpp.NodeProcessed - - namespace = items.getAttr('node') - if namespace is None: - log.warning('Malformed PEP event (no node attr): %s', stanza) - raise nbxmpp.NodeProcessed - - log.info('PEP notification received: %s %s', jid, namespace) - - handlers = self._pep_handlers.get(namespace, None) - if handlers is None: - raise nbxmpp.NodeProcessed - - # Check if this is a retraction - retract = items.getTag('retract') - if retract is not None: - id_ = retract.getAttr('id') - log.info('Received retract of id: %s', id_) - raise nbxmpp.NodeProcessed - - # Check if we have items - items_ = items.getTags('item') - if items_ is None: - log.warning('Malformed PEP event received: %s', stanza) - raise nbxmpp.NodeProcessed - for handler in handlers: - handler(jid, items_[0]) - raise nbxmpp.NodeProcessed - - def send_stored_publish(self) -> None: - for module in self._store_publish_modules: - module.send_stored_publish() - - def reset_stored_publish(self) -> None: - for module in self._store_publish_modules: - module.reset_stored_publish() - - -class AbstractPEPData: - - type_ = PEPEventType.ABSTRACT - - def __init__(self, data: Any) -> None: - self.data = data - - def as_markup_text(self) -> str: # pylint: disable=no-self-use - '''SHOULD be implemented by subclasses''' - return '' - - def __eq__(self, other: Any) -> bool: - return other == self.type_ - - def __bool__(self) -> bool: - return self.data is not None - - def __str__(self) -> str: - return str(self.data) - - -class AbstractPEPModule: - - name = '' - namespace = '' - pep_class = AbstractPEPData - store_publish = True - _log = log - - def __init__(self, con: ConnectionT) -> None: - self._con = con - self._account = con.name - - self.handlers = [] # type: List[Tuple[Any, ...]] - - self._stored_publish = None - - self._con.get_module('PEP').register_pep_handler( - self.namespace, self._pep_notify_received) - - def _pep_notify_received(self, jid: nbxmpp.JID, item: nbxmpp.Node) -> None: - try: - data = self._extract_info(item) - except StanzaMalformed as error: - log.warning('%s, %s: %s', jid, error, item) - return - - self._log.info('Received: %s %s', jid, data) - user_pep = self.pep_class(data) - self._notification_received(jid, user_pep) - app.nec.push_incoming_event( - PEPReceivedEvent(None, - conn=self._con, - jid=str(jid), - pep_type=self.name, - user_pep=user_pep)) - - def _extract_info(self, item: nbxmpp.Node) -> Any: - '''To be implemented by subclasses''' - raise NotImplementedError - - def _build_node(self, data: Any) -> nbxmpp.Node: - '''To be implemented by subclasses''' - raise NotImplementedError - - def _notification_received(self, jid: nbxmpp.JID, user_pep: Any) -> None: - for contact in app.contacts.get_contacts(self._account, str(jid)): - if user_pep: - contact.pep[self.name] = user_pep - else: - contact.pep.pop(self.name, None) - - if jid == self._con.get_own_jid().getStripped(): - if user_pep: - self._con.pep[self.name] = user_pep - else: - self._con.pep.pop(self.name, None) - - def send_stored_publish(self) -> None: - if self._stored_publish is not None: - self._log.info('Send stored publish') - self.send(self._stored_publish) - self._stored_publish = None - - def reset_stored_publish(self) -> None: - self._log.info('Reset stored publish') - self._stored_publish = None - - def send(self, data: Any) -> None: - if not self._con.get_module('PEP').supported: - return - - if self._con.connected == 1: - # We are connecting, save activity and send it later - self._stored_publish = data - return - - if data: - self._log.info('Send: %s', data) - else: - self._log.info('Remove') - - item = self._build_node(data) - - self._con.get_module('PubSub').send_pb_publish( - '', self.namespace, item, 'current') - - -class PEPReceivedEvent(NetworkIncomingEvent): - name = 'pep-received' - def get_instance(*args: Any, **kwargs: Any) -> Tuple[PEP, str]: return PEP(*args, **kwargs), 'PEP' ===================================== gajim/gtk/atom.py deleted ===================================== @@ -1,152 +0,0 @@ -# Copyright (C) 2006 Tomasz Melcer <liori AT exroot.org> -# Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org> -# Copyright (C) 2007 Nikos Kouremenos <kourem AT gmail.com> -# Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> -# -# This file is part of Gajim. -# -# Gajim 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; version 3 only. -# -# Gajim 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 Gajim. If not, see <http://www.gnu.org/licenses/>. - -from typing import List # pylint: disable=unused-import -from typing import Any # pylint: disable=unused-import - -from gi.repository import Gdk -from gi.repository import GLib - -from gajim.common import helpers -from gajim.common import i18n -from gajim.common.i18n import _ - -from gajim.gtk.util import get_builder - -class AtomWindow: - window = None - entries = [] # type: List[Any] - - @classmethod - def newAtomEntry(cls, entry): - """ - Queue new entry, open window if there's no one opened - """ - cls.entries.append(entry) - - if cls.window is None: - cls.window = AtomWindow() - else: - cls.window.updateCounter() - - @classmethod - def windowClosed(cls): - cls.window = None - - def __init__(self): - """ - Create new window... only if we have anything to show - """ - assert self.__class__.entries - - self.entry = None # the entry actually displayed - - self.xml = get_builder('atom_entry_window.ui') - self.window = self.xml.get_object('atom_entry_window') - for name in ('new_entry_label', 'feed_title_label', - 'feed_title_eventbox', 'feed_tagline_label', 'entry_title_label', - 'entry_title_eventbox', 'last_modified_label', 'close_button', - 'next_button'): - self.__dict__[name] = self.xml.get_object(name) - - self.displayNextEntry() - - self.xml.connect_signals(self) - self.window.show_all() - - self.entry_title_eventbox.add_events(Gdk.EventMask.BUTTON_PRESS_MASK) - self.feed_title_eventbox.add_events(Gdk.EventMask.BUTTON_PRESS_MASK) - - def displayNextEntry(self): - """ - Get next entry from the queue and display it in the window - """ - assert self.__class__.entries - - newentry = self.__class__.entries.pop(0) - - # fill the fields - if newentry.feed_link is not None: - self.feed_title_label.set_markup( - '%s' % \ - GLib.markup_escape_text(newentry.feed_title)) - else: - self.feed_title_label.set_markup(GLib.markup_escape_text( - newentry.feed_title)) - - self.feed_tagline_label.set_markup( - '%s' % GLib.markup_escape_text( - newentry.feed_tagline)) - - if newentry.title: - if newentry.uri is not None: - self.entry_title_label.set_markup( - '%s' % \ - GLib.markup_escape_text(newentry.title)) - else: - self.entry_title_label.set_markup(GLib.markup_escape_text( - newentry.title)) - else: - self.entry_title_label.set_markup('') - - self.last_modified_label.set_text(newentry.updated) - - # update the counters - self.updateCounter() - - self.entry = newentry - - def updateCounter(self): - """ - Display number of events on the top of window, sometimes it needs to be - changed - """ - count = len(self.__class__.entries) - if count: - self.new_entry_label.set_text(i18n.ngettext( - 'You have received new entries (and %d not displayed):', - 'You have received new entries (and %d not displayed):', count, - count, count)) - self.next_button.set_sensitive(True) - else: - self.new_entry_label.set_text(_('You have received new entry:')) - self.next_button.set_sensitive(False) - - def on_close_button_clicked(self, widget): - self.window.destroy() - self.windowClosed() - - def on_next_button_clicked(self, widget): - self.displayNextEntry() - - def on_entry_title_eventbox_button_press_event(self, widget, event): - #FIXME: make it using special gtk2.10 widget - if event.button == 1: # left click - uri = self.entry.uri - if uri is not None: - helpers.launch_browser_mailer('url', uri) - return True - - def on_feed_title_eventbox_button_press_event(self, widget, event): - #FIXME: make it using special gtk2.10 widget - if event.button == 1: # left click - uri = self.entry.feed_uri - if uri is not None: - helpers.launch_browser_mailer('url', uri) - return True ===================================== gajim/gui_interface.py ===================================== @@ -94,7 +94,8 @@ from gajim.common.connection_handlers_events import ( from gajim.common.modules.httpupload import HTTPUploadProgressEvent from gajim.common.connection import Connection from gajim.common.file_props import FilesProp -from gajim.common.const import AvatarSize, SSLError, PEPEventType +from gajim.common.const import AvatarSize +from gajim.common.const import SSLError from gajim import roster_window from gajim.common import ged @@ -117,7 +118,6 @@ from gajim.gtk.filechoosers import FileChooserDialog from gajim.gtk.emoji_data import emoji_data from gajim.gtk.emoji_data import emoji_ascii_data from gajim.gtk.groupchat_config import GroupchatConfig -from gajim.gtk.atom import AtomWindow from gajim.gtk.filetransfer import FileTransfersWindow from gajim.gtk.util import get_show_in_roster from gajim.gtk.util import get_show_in_systray @@ -1035,13 +1035,6 @@ class Interface: def handle_event_metacontacts(obj): app.contacts.define_metacontacts(obj.conn.name, obj.meta_list) - @staticmethod - def handle_atom_entry(obj): - if obj != PEPEventType.ATOM: - return - if obj.get_entry(): - AtomWindow.newAtomEntry(obj.get_entry()) - def handle_event_zc_name_conflict(self, obj): def on_ok(new_name): app.config.set_per('accounts', obj.conn.name, 'name', new_name) @@ -1292,7 +1285,6 @@ class Interface: self.handlers = { 'DB_ERROR': [self.handle_event_db_error], 'file-send-error': [self.handle_event_file_send_error], - 'pep-received': [self.handle_atom_entry], 'bad-gpg-passphrase': [self.handle_event_bad_gpg_passphrase], 'bookmarks-received': [self.handle_event_bookmarks], 'client-cert-passphrase': [ ===================================== gajim/roster_window.py ===================================== @@ -2620,15 +2620,6 @@ class RosterWindow: for jid in obj.jid_list: self.remove_contact(jid, obj.conn.name, backend=True) - def _nec_pep_received(self, obj): - if obj.user_pep.type_ != PEPEventType.LOCATION: - return - - if obj.jid == app.get_jid_from_account(obj.conn.name): - self.draw_account(obj.conn.name) - - self.draw_pep(obj.jid, obj.conn.name, obj.pep_type) - def _on_mood_received(self, event): if event.is_self_message: self.draw_account(event.account) @@ -5828,8 +5819,6 @@ class RosterWindow: self._nec_connection_type) app.ged.register_event_handler('agent-removed', ged.GUI1, self._nec_agent_removed) - app.ged.register_event_handler('pep-received', ged.GUI1, - self._nec_pep_received) app.ged.register_event_handler('nickname-received', ged.GUI1, self._on_nickname_received) app.ged.register_event_handler('mood-received', ged.GUI1, ===================================== gajim/vcard.py ===================================== @@ -32,6 +32,7 @@ import binascii from gi.repository import Gtk from gi.repository import GLib from gi.repository import Gdk +from nbxmpp.structs import AnnotationNote from gajim import gtkgui_helpers from gajim.gui_menu_builder import show_save_as_menu @@ -108,10 +109,10 @@ class VcardWindow: self.fill_jabber_page() con = app.connections[self.account] - annotations = con.get_module('Annotations').annotations - if self.contact.jid in annotations: + note = con.get_module('Annotations').get_note(self.contact.jid) + if note is not None: buffer_ = self.xml.get_object('textview_annotation').get_buffer() - buffer_.set_text(annotations[self.contact.jid]) + buffer_.set_text(note.data) for widget_name in ('URL_label', 'EMAIL_WORK_USERID_label', @@ -140,12 +141,13 @@ class VcardWindow: del app.interface.instances[self.account]['infos'][self.contact.jid] buffer_ = self.xml.get_object('textview_annotation').get_buffer() new_annotation = buffer_.get_text(buffer_.get_start_iter(), - buffer_.get_end_iter(), True) + buffer_.get_end_iter(), + True) con = app.connections[self.account] - annotations = con.get_module('Annotations').annotations - if new_annotation != annotations.get(self.contact.jid, ''): - annotations[self.contact.jid] = new_annotation - con.get_module('Annotations').store_annotations() + note = con.get_module('Annotations').get_note(self.contact.jid) + if note is None or new_annotation != note.data: + new_note = AnnotationNote(jid=self.contact.jid, data=new_annotation) + con.get_module('Annotations').set_note(new_note) app.ged.remove_event_handler('version-result-received', ged.GUI1, self.set_os_info) app.ged.remove_event_handler('time-result-received', ged.GUI1, View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/67ddbf73cd04d0d1a7de718a9fe025452… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/67ddbf73cd04d0d1a7de718a9fe025452… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Add Annotations (XEP-0145) module
by Philipp Hörist 18 Feb '19

18 Feb '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: bcceae50 by Philipp Hörist at 2019-02-18T21:51:38Z Add Annotations (XEP-0145) module - - - - - 30876f0e by Philipp Hörist at 2019-02-18T21:52:58Z IQ: Add getQueryChild() - - - - - 4 changed files: - nbxmpp/dispatcher_nb.py - + nbxmpp/modules/annotations.py - nbxmpp/protocol.py - nbxmpp/structs.py Changes: ===================================== nbxmpp/dispatcher_nb.py ===================================== @@ -65,6 +65,7 @@ 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.annotations import Annotations from nbxmpp.modules.misc import unwrap_carbon from nbxmpp.modules.misc import unwrap_mam from nbxmpp.util import get_properties_struct @@ -197,6 +198,7 @@ class XMPPDispatcher(PlugIn): self._modules['Bookmarks'] = Bookmarks(self._owner) self._modules['OpenPGP'] = OpenPGP(self._owner) self._modules['OMEMO'] = OMEMO(self._owner) + self._modules['Annotations'] = Annotations(self._owner) for instance in self._modules.values(): for handler in instance.handlers: ===================================== nbxmpp/modules/annotations.py ===================================== @@ -0,0 +1,112 @@ +# 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_PRIVATE +from nbxmpp.protocol import NS_ROSTERNOTES +from nbxmpp.protocol import Iq +from nbxmpp.protocol import Node +from nbxmpp.protocol import isResultNode +from nbxmpp.structs import AnnotationNote +from nbxmpp.structs import CommonResult +from nbxmpp.modules.date_and_time import parse_datetime +from nbxmpp.util import validate_jid +from nbxmpp.util import call_on_response +from nbxmpp.util import callback +from nbxmpp.util import raise_error + +log = logging.getLogger('nbxmpp.m.annotations') + + +class Annotations: + def __init__(self, client): + self._client = client + self.handlers = [] + + @property + def domain(self): + return self._client.get_bound_jid().getDomain() + + @call_on_response('_annotations_received') + def request_annotations(self): + log.info('Request annotations for %s', self.domain) + payload = Node('storage', attrs={'xmlns': NS_ROSTERNOTES}) + return Iq(typ='get', queryNS=NS_PRIVATE, payload=payload) + + @callback + def _annotations_received(self, stanza): + if not isResultNode(stanza): + return raise_error(log.info, stanza) + + storage = stanza.getQueryChild('storage') + if storage is None: + return raise_error(log.warning, stanza, 'stanza-malformed', + 'No annotations found') + + nodes = storage.getTags('note') + if not nodes: + return raise_error(log.info, stanza, 'is-empty', + 'No annotations found') + + notes = [] + for note in nodes: + try: + jid = validate_jid(note.getAttr('jid')) + except Exception: + log.warning('Invalid JID: %s, ignoring it', + note.getAttr('jid')) + continue + + cdate = note.getAttr('cdate') + if cdate is not None: + cdate = parse_datetime(cdate, epoch=True) + + mdate = note.getAttr('mdate') + if mdate is not None: + mdate = parse_datetime(mdate, epoch=True) + + data = note.getData() + notes.append(AnnotationNote(jid=jid, cdate=cdate, + mdate=mdate, data=data)) + + log.info('Received annotations from %s:', self.domain) + for note in notes: + log.info(notes) + return notes + + @call_on_response('_default_response') + def set_annotations(self, notes): + log.info('Set annotations for %s:', self.domain) + for note in notes: + log.info(note) + storage = Node('storage', attrs={'xmlns': NS_ROSTERNOTES}) + for note in notes: + node = Node('note', attrs={'jid': note.jid}) + node.setData(note.data) + if note.cdate is not None: + node.setAttr('cdate', note.cdate) + if note.mdate is not None: + node.setAttr('mdate', note.mdate) + storage.addChild(node=node) + return Iq(typ='set', queryNS=NS_PRIVATE, payload=storage) + + @callback + def _default_response(self, stanza): + if not isResultNode(stanza): + return raise_error(log.info, stanza) + return CommonResult(jid=stanza.getFrom()) ===================================== nbxmpp/protocol.py ===================================== @@ -1393,6 +1393,22 @@ class Iq(Protocol): if tag: return tag.getChildren() + def getQueryChild(self, name=None): + """ + Return the 'query' child element with name, or the first element + which is not an error element + """ + query = self.getQuery() + if not query: + return + for node in query.getChildren(): + if name is not None: + if node.getName() == name: + return node + else: + if node.getName() != 'error': + return node + def setQuery(self, name=None): """ Change the name of the query node, creating it if needed. Keep the ===================================== nbxmpp/structs.py ===================================== @@ -95,6 +95,9 @@ PGPKeyMetadata = namedtuple('PGPKeyMetadata', 'jid fingerprint date') OMEMOMessage = namedtuple('OMEMOMessage', 'sid iv keys payload') +AnnotationNote = namedtuple('AnnotationNote', 'jid data cdate mdate') +AnnotationNote.__new__.__defaults__ = (None, None) + class OMEMOBundle(namedtuple('OMEMOBundle', 'spk spk_signature ik otpks')): def pick_prekey(self): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/54ea05ea7dc78de70b5e4dec7… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/54ea05ea7dc78de70b5e4dec7… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2019