Commits December 2018

commits@gajim.org

1 participants
81 discussions

[Git][gajim/python-nbxmpp][master] 4 commits: Add jid validation
by Philipp Hörist 21 Dec '18

21 Dec '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 8eb805d2 by Philipp Hörist at 2018-12-21T12:07:15Z Add jid validation - - - - - 9da76c1b by Philipp Hörist at 2018-12-21T12:21:51Z Move code into setup.cfg - - - - - 960a3ef0 by Philipp Hörist at 2018-12-21T12:24:22Z Update README.md - - - - - ec4c203b by Philipp Hörist at 2018-12-21T12:29:09Z Use GPL v3 on new code - - - - - 9 changed files: - README.md - nbxmpp/misc.py - nbxmpp/modules/eme.py - nbxmpp/modules/http_auth.py - nbxmpp/protocol.py - nbxmpp/smacks.py - nbxmpp/util.py - setup.cfg - setup.py Changes: ===================================== README.md ===================================== @@ -5,7 +5,7 @@ python-nbxmpp is a Python library that provides a way for Python applications to ## Features * Asynchronous - * Supports ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1, DIGEST-MD5, PLAIN, and X-MESSENGER-OAUTH2 authentication mechanisms. + * Supports ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1(PLUS), SCRAM-SHA-256(PLUS) and PLAIN authentication mechanisms. * Supports connection via proxies * Suppors TLS * Supports [BOSH (XEP-0124)](https://xmpp.org/extensions/xep-0124.html) ===================================== nbxmpp/misc.py ===================================== @@ -4,7 +4,7 @@ # # 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 2 +# 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, ===================================== nbxmpp/modules/eme.py ===================================== @@ -4,7 +4,7 @@ # # 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 2 +# 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, ===================================== nbxmpp/modules/http_auth.py ===================================== @@ -4,7 +4,7 @@ # # 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 2 +# 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, ===================================== nbxmpp/protocol.py ===================================== @@ -650,6 +650,9 @@ class XMLNotWellFormed(StreamError): class InvalidStanza(Exception): pass +class InvalidJid(Exception): + pass + stream_exceptions = {'bad-format': BadFormat, 'bad-namespace-prefix': BadNamespacePrefix, 'conflict': Conflict, ===================================== nbxmpp/smacks.py ===================================== @@ -4,7 +4,7 @@ # # 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 2 +# 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, ===================================== nbxmpp/util.py ===================================== @@ -4,7 +4,7 @@ # # 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 2 +# 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, @@ -15,9 +15,19 @@ # 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 socket import base64 from collections import namedtuple +import precis_i18n.codec + +from nbxmpp.protocol import JID +from nbxmpp.protocol import InvalidJid +from nbxmpp.stringprepare import nameprep + +log = logging.getLogger('nbxmpp.util') + StanzaHandler = namedtuple('StanzaHandler', 'name callback typ ns xmlns system priority') StanzaHandler.__new__.__defaults__ = ('', '', None, False, 50) @@ -84,3 +94,74 @@ def get_property_dict(name): if name == 'iq': return IqPropertyDict() return PropertyBase() + + +def validate_jid(jid_string): + jid = JID(jid_string) + return prep(jid.getNode(), + jid.getDomain(), + jid.getResource()) + + +def prep(user, server, resource): + """ + Perform stringprep on all JID fragments and return the full jid + """ + + ip_address = False + + try: + socket.inet_aton(server) + ip_address = True + except socket.error: + pass + + if not ip_address and hasattr(socket, 'inet_pton'): + try: + socket.inet_pton(socket.AF_INET6, server.strip('[]')) + server = '[%s]' % server.strip('[]') + ip_address = True + except (socket.error, ValueError): + pass + + if not ip_address: + if server is not None: + if server.endswith('.'): # RFC7622, 3.2 + server = server[:-1] + if not server or len(server.encode('utf-8')) > 1023: + raise InvalidJid('Server must be between 1 and 1023 bytes') + try: + server = nameprep.prepare(server) + except UnicodeError: + raise InvalidJid('Invalid character in hostname') + else: + raise InvalidJid('Server address required') + + if user is not None: + if not user or len(user.encode('utf-8')) > 1023: + raise InvalidJid('Username must be between 1 and 1023 bytes') + try: + user = user.encode('UsernameCaseMapped').decode('utf-8') + except UnicodeError: + raise InvalidJid('Invalid character in username') + else: + user = None + + if resource is not None: + if not resource or len(resource.encode('utf-8')) > 1023: + raise InvalidJid('Resource must be between 1 and 1023 bytes') + try: + resource = resource.encode('OpaqueString').decode('utf-8') + except UnicodeError: + raise InvalidJid('Invalid character in resource') + else: + resource = None + + if user: + if resource: + return '%s@%s/%s' % (user, server, resource) + return '%s@%s' % (user, server) + + if resource: + return '%s/%s' % (server, resource) + return server ===================================== setup.cfg ===================================== @@ -1,2 +1,21 @@ [metadata] +name = nbxmpp +version = attr: nbxmpp.__version__ +description = Non blocking Jabber/XMPP module +author = Yann Leboulanger, Philipp Hoerist +author_email = gajim-devel(a)gajim.org +url = http://dev.gajim.org/gajim/python-nbxmpp license_file = COPYING +license = GPL v3 +classifiers = + Programming Language :: Python :: 3 + +[options] +python_requires = >=3.5 +packages = find: +install_requires = + precis-i18n>=1.0.0 + +[options.packages.find] +exclude = + test* ===================================== setup.py ===================================== @@ -2,11 +2,4 @@ from setuptools import setup -setup(name='nbxmpp', - version='0.9.90.2', - description='Non blocking Jabber/XMPP module', - author='Yann Leboulanger', - author_email='asterix(a)lagaule.org', - url='http://dev.gajim.org/gajim/python-nbxmpp', - packages=['nbxmpp', 'nbxmpp.modules'], - ) +setup() View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/5bea073ba9ef04f5fa58e440a… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/5bea073ba9ef04f5fa58e440a… 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 21 Dec '18

21 Dec '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 5bea073b by Philipp Hörist at 2018-12-21T11:34:54Z Fix test - - - - - 1 changed file: - test/unit/test_xmpp_dispatcher_nb.py Changes: ===================================== test/unit/test_xmpp_dispatcher_nb.py ===================================== @@ -8,6 +8,8 @@ from test import lib from nbxmpp import dispatcher_nb from nbxmpp import protocol +from nbxmpp.protocol import JID + class TestDispatcherNB(unittest.TestCase): ''' @@ -19,6 +21,7 @@ class TestDispatcherNB(unittest.TestCase): # Setup mock client self.client = Mock() + self.client.get_bound_jid.return_value = JID('test(a)test.test') self.client.defaultNamespace = protocol.NS_CLIENT self.client.Connection = Mock() # mock transport self.con = self.client.Connection View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/5bea073ba9ef04f5fa58e440ae… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/5bea073ba9ef04f5fa58e440ae… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Use nbxmpp properties for HTTPAuth
by Philipp Hörist 21 Dec '18

21 Dec '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 85e79e7b by Philipp Hörist at 2018-12-21T11:23:26Z Use nbxmpp properties for HTTPAuth nbxmpp implements HTTPAuth now, so we dont need to parse it anymore - - - - - 3 changed files: - gajim/common/connection_handlers.py - gajim/common/modules/http_auth.py - gajim/common/modules/message.py Changes: ===================================== gajim/common/connection_handlers.py ===================================== @@ -420,7 +420,11 @@ class ConnectionHandlers(ConnectionSocks5Bytestream, app.nec.push_incoming_event(IqErrorReceivedEvent(None, conn=self, stanza=iq_obj)) - def _IqCB(self, con, iq_obj): + def _IqCB(self, con, iq_obj, properties): + if properties.is_http_auth: + self.get_module('HTTPAuth').delegate(iq_obj, properties) + raise nbxmpp.NodeProcessed + id_ = iq_obj.getID() app.nec.push_incoming_event(NetworkEvent('raw-iq-received', ===================================== gajim/common/modules/http_auth.py ===================================== @@ -19,7 +19,7 @@ import logging import nbxmpp from gajim.common import app -from gajim.common.nec import NetworkIncomingEvent +from gajim.common.nec import NetworkEvent log = logging.getLogger('gajim.c.m.http_auth') @@ -29,12 +29,9 @@ class HTTPAuth: self._con = con self._account = con.name - self.handlers = [ - ('iq', self.answer_request, 'get', nbxmpp.NS_HTTP_AUTH), - ('message', self.answer_request, '', nbxmpp.NS_HTTP_AUTH) - ] + self.handlers = [] - def answer_request(self, _con, stanza): + def delegate(self, stanza, properties): log.info('Auth request received') auto_answer = app.config.get_per( 'accounts', self._account, 'http_auth') @@ -42,21 +39,14 @@ class HTTPAuth: self.build_http_auth_answer(stanza, auto_answer) raise nbxmpp.NodeProcessed - iq_id = stanza.getTagAttr('confirm', 'id') - method = stanza.getTagAttr('confirm', 'method') - url = stanza.getTagAttr('confirm', 'url') - # In case it's a message with a body - msg = stanza.getTagData('body') - app.nec.push_incoming_event( - HttpAuthReceivedEvent(None, conn=self._con, - iq_id=iq_id, - method=method, - url=url, - msg=msg, - stanza=stanza)) - - raise nbxmpp.NodeProcessed + NetworkEvent('http-auth-received', + conn=self._con, + iq_id=properties['id'], + method=properties['method'], + url=properties['url'], + msg=properties['body'], + stanza=stanza)) def build_http_auth_answer(self, stanza, answer): if answer == 'yes': @@ -72,9 +62,5 @@ class HTTPAuth: self._con.connection.send(err) -class HttpAuthReceivedEvent(NetworkIncomingEvent): - name = 'http-auth-received' - - def get_instance(*args, **kwargs): return HTTPAuth(*args, **kwargs), 'HTTPAuth' ===================================== gajim/common/modules/message.py ===================================== @@ -50,8 +50,7 @@ class Message: self.handlers = [('message', self._message_received)] # XEPs for which this message module should not be executed - self._message_namespaces = set([nbxmpp.NS_HTTP_AUTH, - nbxmpp.NS_PUBSUB_EVENT, + self._message_namespaces = set([nbxmpp.NS_PUBSUB_EVENT, nbxmpp.NS_ROSTERX, nbxmpp.NS_MAM_1, nbxmpp.NS_MAM_2, @@ -60,6 +59,10 @@ class Message: nbxmpp.NS_CAPTCHA,]) def _message_received(self, _con, stanza, properties): + if properties.is_http_auth: + self._con.get_module('HTTPAuth').delegate(stanza, properties) + raise nbxmpp.NodeProcessed + # Check if a child of the message contains any # namespaces that we handle in other modules. # nbxmpp executes less common handlers last View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/85e79e7b279843d945230714f881f2fad4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/85e79e7b279843d945230714f881f2fad4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Add EME (XEP-0380) module
by Philipp Hörist 21 Dec '18

21 Dec '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 6016d303 by Philipp Hörist at 2018-12-21T06:37:34Z Add EME (XEP-0380) module - - - - - af28de82 by Philipp Hörist at 2018-12-21T11:09:12Z Add HTTPAuth (XEP-0070) module - - - - - 6 changed files: - nbxmpp/dispatcher_nb.py - + nbxmpp/modules/__init__.py - + nbxmpp/modules/eme.py - + nbxmpp/modules/http_auth.py - nbxmpp/util.py - setup.py Changes: ===================================== nbxmpp/dispatcher_nb.py ===================================== @@ -41,8 +41,10 @@ from nbxmpp.protocol import Protocol from nbxmpp.protocol import Node from nbxmpp.protocol import Error from nbxmpp.protocol import ERR_FEATURE_NOT_IMPLEMENTED +from nbxmpp.modules.eme import EME +from nbxmpp.modules.http_auth import HTTPAuth from nbxmpp.misc import unwrap_carbon -from nbxmpp.util import PropertyDict +from nbxmpp.util import get_property_dict log = logging.getLogger('nbxmpp.dispatcher_nb') @@ -96,6 +98,7 @@ class XMPPDispatcher(PlugIn): def __init__(self): PlugIn.__init__(self) self.handlers = {} + self._modules = {} self._expected = {} self._defaultHandler = None self._pendingExceptions = [] @@ -144,6 +147,14 @@ class XMPPDispatcher(PlugIn): """ self.handlers = handlers + def _register_modules(self): + self._modules['EME'] = EME(self._owner) + self._modules['HTTPAuth'] = HTTPAuth(self._owner) + + for instance in self._modules.values(): + for handler in instance.handlers: + self.RegisterHandler(*handler) + def _init(self): """ Register default namespaces/protocols/handlers. Used internally @@ -158,6 +169,7 @@ class XMPPDispatcher(PlugIn): self.RegisterProtocol('message', Message) self.RegisterDefaultHandler(self.returnStanzaHandler) self.RegisterEventHandler(self._owner._caller._event_dispatcher) + self._register_modules() self.on_responses = {} def plugin(self, owner): @@ -178,6 +190,7 @@ class XMPPDispatcher(PlugIn): """ Prepare instance to be destructed """ + self._modules = {} self.Stream.dispatch = None self.Stream.features = None self.Stream.destroy() @@ -464,8 +477,8 @@ class XMPPDispatcher(PlugIn): # Convert simplexml to Protocol object stanza = self.handlers[xmlns][name]['type'](node=stanza) - properties = PropertyDict() - if stanza.getName() == 'message': + properties = get_property_dict(name) + 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 ===================================== nbxmpp/modules/__init__.py ===================================== ===================================== nbxmpp/modules/eme.py ===================================== @@ -0,0 +1,50 @@ +# Copyright (C) 2018 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 2 +# 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_EME +from nbxmpp.util import StanzaHandler + +log = logging.getLogger('nbxmpp.m.eme') + + +class EME: + def __init__(self, client): + self._client = client + self.handlers = [ + StanzaHandler(name='message', + callback=self._process_eme, + ns=NS_EME, + priority=40) + ] + + @staticmethod + def _process_eme(_con, stanza, properties): + enc_tag = stanza.getTag('encryption', namespace=NS_EME) + if enc_tag is None: + return + + ns = enc_tag.getAttr('namespace') + if ns is None: + log.warning('No namespace on message') + return + + properties.eme = {} + properties.eme['namespace'] = ns + properties.eme['name'] = enc_tag.getAttr('name') + log.info('Found data: %s', properties.eme) ===================================== nbxmpp/modules/http_auth.py ===================================== @@ -0,0 +1,50 @@ +# Copyright (C) 2018 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 2 +# 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_HTTP_AUTH +from nbxmpp.util import StanzaHandler + +log = logging.getLogger('nbxmpp.m.http_auth') + + +class HTTPAuth: + def __init__(self, client): + self._client = client + self.handlers = [ + StanzaHandler(name='message', + callback=self._process_http_auth, + ns=NS_HTTP_AUTH, + priority=40), + StanzaHandler(name='iq', + callback=self._process_http_auth, + typ='get', + ns=NS_HTTP_AUTH, + priority=40) + ] + + @staticmethod + def _process_http_auth(_con, stanza, properties): + confirm = stanza.getTag('confirm', namespace=NS_HTTP_AUTH) + if confirm is None: + return + + http_auth = confirm.getAttrs().copy() + http_auth['body'] = stanza.getTagData('body') + properties.http_auth = http_auth + log.info('Found data: %s', http_auth) ===================================== nbxmpp/util.py ===================================== @@ -16,6 +16,10 @@ # along with this program; If not, see <http://www.gnu.org/licenses/>. import base64 +from collections import namedtuple + +StanzaHandler = namedtuple('StanzaHandler', 'name callback typ ns xmlns system priority') +StanzaHandler.__new__.__defaults__ = ('', '', None, False, 50) def b64decode(data, return_type=str): @@ -36,15 +40,47 @@ def b64encode(data, return_type=str): return result.decode() -class PropertyDict: +class PropertyBase: def __init__(self): - self.__data = {} + self._data = {} def __getattr__(self, key): - return self.__data[key] + return self._data[key] def __setattr__(self, key, value): - if '__' in key: + if '_data' in key: super().__setattr__(key, value) else: - self.__data[key] = value + self._data[key] = value + + +class MessagePropertyDict(PropertyBase): + def __init__(self): + self._data = { + 'carbon_type': None, + 'eme': None, + 'http_auth': None, + } + + @property + def is_http_auth(self): + return self._data['http_auth'] is not None + + +class IqPropertyDict(PropertyBase): + def __init__(self): + self._data = { + 'http_auth': None, + } + + @property + def is_http_auth(self): + return self._data['http_auth'] is not None + + +def get_property_dict(name): + if name == 'message': + return MessagePropertyDict() + if name == 'iq': + return IqPropertyDict() + return PropertyBase() ===================================== setup.py ===================================== @@ -8,5 +8,5 @@ setup(name='nbxmpp', author='Yann Leboulanger', author_email='asterix(a)lagaule.org', url='http://dev.gajim.org/gajim/python-nbxmpp', - packages=['nbxmpp'], + packages=['nbxmpp', 'nbxmpp.modules'], ) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/6b2a9da405c02434831465b9b… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/6b2a9da405c02434831465b9b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Add more message stanza processing logic
by Philipp Hörist 20 Dec '18

20 Dec '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 6b2a9da4 by Philipp Hörist at 2018-12-20T22:16:03Z Add more message stanza processing logic - Unwrap carbons before calling handlers - Introduce PropertyDict which can be passed through the handler chain - Add JID.getBare() as alias for getStripped() to make the purpose more evident - - - - - 4 changed files: - nbxmpp/dispatcher_nb.py - + nbxmpp/misc.py - nbxmpp/protocol.py - nbxmpp/util.py Changes: ===================================== nbxmpp/dispatcher_nb.py ===================================== @@ -25,6 +25,7 @@ import locale import re import uuid import logging +import inspect from xml.parsers.expat import ExpatError from nbxmpp.simplexml import NodeBuilder @@ -32,6 +33,7 @@ from nbxmpp.plugin import PlugIn from nbxmpp.protocol import NS_STREAMS from nbxmpp.protocol import NS_HTTP_BIND from nbxmpp.protocol import NodeProcessed +from nbxmpp.protocol import InvalidFrom from nbxmpp.protocol import Iq from nbxmpp.protocol import Presence from nbxmpp.protocol import Message @@ -39,6 +41,8 @@ from nbxmpp.protocol import Protocol from nbxmpp.protocol import Node from nbxmpp.protocol import Error from nbxmpp.protocol import ERR_FEATURE_NOT_IMPLEMENTED +from nbxmpp.misc import unwrap_carbon +from nbxmpp.util import PropertyDict log = logging.getLogger('nbxmpp.dispatcher_nb') @@ -430,8 +434,11 @@ class XMPPDispatcher(PlugIn): if not session: session = self session.Stream._mini_dom = None - name = stanza.getName() + # Count stanza + self._owner.Smacks.count_incoming(stanza.getName()) + + name = stanza.getName() if name == 'features': self._owner.got_features = True session.Stream.features = stanza @@ -449,43 +456,63 @@ class XMPPDispatcher(PlugIn): if name not in ('features', 'stream'): log.warning('Unknown stanza: %s', stanza) else: - log.debug('Got %s / %s stanza' % (xmlns, name)) + log.debug('Got %s / %s stanza', xmlns, name) name = 'unknown' else: - log.debug('Got %s / %s stanza' % (xmlns, name)) + log.debug('Got %s / %s stanza', xmlns, name) # Convert simplexml to Protocol object stanza = self.handlers[xmlns][name]['type'](node=stanza) + properties = PropertyDict() + if stanza.getName() == '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) + elif not to.bareMatch(own_jid): + log.warning('Message addressed to someone else: %s', stanza) + return + + try: + stanza, properties.carbon_type = unwrap_carbon(stanza, own_jid) + except InvalidFrom as exc: + log.warning(exc) + return + except NodeProcessed as exc: + log.info(exc) + return + typ = stanza.getType() if name == 'message' and not typ: typ = 'normal' elif not typ: typ = '' - stanza.props = stanza.getProperties() - ID = stanza.getID() + stanza.props = stanza.getProperties() log.debug('type: %s, properties: %s', typ, stanza.props) - # If server supports stream management - if hasattr(self._owner, 'Smacks'): - self._owner.Smacks.count_incoming(stanza.getName()) - + _id = stanza.getID() processed = False - if ID in session._expected: - if isinstance(session._expected[ID], tuple): - cb, args = session._expected[ID] + if _id in session._expected: + if isinstance(session._expected[_id], tuple): + cb, args = session._expected[_id] log.debug('Expected stanza arrived. Callback %s(%s) found', cb, args) try: - cb(session,stanza,**args) + cb(session, stanza, **args) except NodeProcessed: pass except Exception: raise else: log.debug('Expected stanza arrived') - session._expected[ID] = stanza + session._expected[_id] = stanza processed = True # Gather specifics depending on stanza properties @@ -511,7 +538,13 @@ class XMPPDispatcher(PlugIn): if not processed or handler['system']: try: log.info('Call handler: %s', handler['func'].__qualname__) - handler['func'](session, stanza) + # Backwards compatibility until all handlers support + # properties + signature = inspect.signature(handler['func']) + if 'properties' in signature.parameters: + handler['func'](session, stanza, properties) + else: + handler['func'](session, stanza) except NodeProcessed: processed = True except Exception: ===================================== nbxmpp/misc.py ===================================== @@ -0,0 +1,65 @@ +# Copyright (C) 2018 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 2 +# 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_CARBONS +from nbxmpp.protocol import NS_FORWARD +from nbxmpp.protocol import NS_MUC_USER +from nbxmpp.protocol import NodeProcessed +from nbxmpp.protocol import InvalidFrom +from nbxmpp.protocol import Message + +log = logging.getLogger('nbxmpp.misc') + + +def unwrap_carbon(stanza, own_jid): + carbon = stanza.getTag('received', namespace=NS_CARBONS) + if carbon is None: + carbon = stanza.getTag('sent', namespace=NS_CARBONS) + if carbon is None: + return stanza, None + + # Carbon must be from our bare jid + if not stanza.getFrom() == own_jid.getBare(): + raise InvalidFrom('Invalid from: %s' % stanza.getAttr('from')) + + forwarded = carbon.getTag('forwarded', namespace=NS_FORWARD) + message = Message(node=forwarded.getTag('message')) + + type_ = carbon.getName() + to = message.getTo() + if to is None: + message.setTo(own_jid.getBare()) + + frm = message.getFrom() + if frm is None: + message.setFrom(own_jid.getBare()) + + if type_ == 'received': + if message.getFrom().bareMatch(own_jid): + # Drop 'received' Carbons from ourself, we already + # got the message with the 'sent' Carbon or via the + # message itself + raise NodeProcessed('Drop "received"-Carbon from ourself') + + if message.getTag('x', namespace=NS_MUC_USER) is not None: + # A MUC broadcasts messages sent to us to all resources + # there is no need to process the received carbon + raise NodeProcessed('Drop MUC-PM "received"-Carbon') + + return message, type_ ===================================== nbxmpp/protocol.py ===================================== @@ -647,6 +647,9 @@ class UnsupportedVersion(StreamError): class XMLNotWellFormed(StreamError): pass +class InvalidStanza(Exception): + pass + stream_exceptions = {'bad-format': BadFormat, 'bad-namespace-prefix': BadNamespacePrefix, 'conflict': Conflict, @@ -747,6 +750,12 @@ class JID: """ return self.__str__(0) + def getBare(self): + """ + Return the bare representation of JID. I.e. string value w/o resource + """ + return self.__str__(0) + def __eq__(self, other): """ Compare the JID to another instance or to string for equality ===================================== nbxmpp/util.py ===================================== @@ -17,6 +17,7 @@ import base64 + def b64decode(data, return_type=str): if isinstance(data, str): data = data.encode() @@ -25,6 +26,7 @@ def b64decode(data, return_type=str): return result return result.decode() + def b64encode(data, return_type=str): if isinstance(data, str): data = data.encode() @@ -32,3 +34,17 @@ def b64encode(data, return_type=str): if return_type == bytes: return result return result.decode() + + +class PropertyDict: + def __init__(self): + self.__data = {} + + def __getattr__(self, key): + return self.__data[key] + + def __setattr__(self, key, value): + if '__' in key: + super().__setattr__(key, value) + else: + self.__data[key] = value View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/6b2a9da405c02434831465b9b7… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/6b2a9da405c02434831465b9b7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove carbon processing
by Philipp Hörist 20 Dec '18

20 Dec '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 42c1909d by Philipp Hörist at 2018-12-20T22:18:23Z Remove carbon processing nbxmpp does that now for us - - - - - 2 changed files: - gajim/common/modules/carbons.py - gajim/common/modules/message.py Changes: ===================================== gajim/common/modules/carbons.py ===================================== @@ -49,61 +49,5 @@ class Carbons: log.warning('Carbons deactivated (user setting)') -def parse_carbon(con, stanza): - carbon = stanza.getTag( - 'received', namespace=nbxmpp.NS_CARBONS, protocol=True) - if carbon is None: - carbon = stanza.getTag( - 'sent', namespace=nbxmpp.NS_CARBONS, protocol=True) - if carbon is None: - return stanza, False, False - - # Carbon must be from our bare jid - own_jid = con.get_own_jid() - if not stanza.getFrom().bareMatch(own_jid): - log.warning('Ignore message because from is invalid %s', - stanza.getFrom()) - raise nbxmpp.NodeProcessed - - forwarded = carbon.getTag('forwarded', - namespace=nbxmpp.NS_FORWARD, - protocol=True) - message = forwarded.getTag('message', protocol=True) - - type_ = carbon.getName() - to = message.getTo() - frm = message.getFrom() - log.info('Received type: %s, from: %s', type_, frm) - - if type_ == 'received': - sent = False - if message.getFrom().bareMatch(own_jid): - # Drop 'received' Carbons from ourself, we already - # got the message with the 'sent' Carbon or via the - # message itself - log.info('Drop "received"-Carbon from ourself: %s') - raise nbxmpp.NodeProcessed - if message.getTag('x', namespace=nbxmpp.NS_MUC_USER) is not None: - # A MUC broadcasts messages sent to us to all resources - # there is no need to process carbons for these messages - log.info('Drop MUC-PM "received"-Carbon') - raise nbxmpp.NodeProcessed - - elif type_ == 'sent': - if frm is None: - frm = own_jid.getStripped() - message.setTo(frm) - if to is None: - to = own_jid.getStripped() - message.setFrom(to) - sent = True - - else: - log.warning('Ignore invalid carbon: %s', stanza) - raise nbxmpp.NodeProcessed - - return message, sent, True - - def get_instance(*args, **kwargs): return Carbons(*args, **kwargs), 'Carbons' ===================================== gajim/common/modules/message.py ===================================== @@ -27,7 +27,6 @@ from gajim.common.nec import NetworkEvent from gajim.common.helpers import AdditionalDataDict from gajim.common.modules.security_labels import parse_securitylabel from gajim.common.modules.user_nickname import parse_nickname -from gajim.common.modules.carbons import parse_carbon from gajim.common.modules.misc import parse_delay from gajim.common.modules.misc import parse_eme from gajim.common.modules.misc import parse_correction @@ -60,24 +59,7 @@ class Message: nbxmpp.NS_IBB, nbxmpp.NS_CAPTCHA,]) - def _message_received(self, _con, stanza): - # 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. - # - # Implementation Note: However, if the client does - # check the 'to' address then it is suggested to check at most the - # bare JID portion (not the full JID) - - own_jid = self._con.get_own_jid().getStripped() - to = stanza.getTo() - if to is None: - stanza.setTo(own_jid) - elif not to.bareMatch(own_jid): - log.warning('Message addressed to someone else: %s', stanza) - raise nbxmpp.NodeProcessed - + def _message_received(self, _con, stanza, properties): # Check if a child of the message contains any # namespaces that we handle in other modules. # nbxmpp executes less common handlers last @@ -98,20 +80,19 @@ class Message: stanza=stanza, account=self._account)) - if stanza.getFrom() == self._con.get_own_jid(warn=True): - # Drop messages sent from our own full jid - # It can happen that when we sent message to our own bare jid - # that the server routes that message back to us - log.info('Received message from self: %s, message is dropped', - stanza.getFrom()) - return - - stanza, sent, forwarded = parse_carbon(self._con, stanza) + forwarded = properties.carbon_type is not None + sent = properties.carbon_type == 'sent' + if sent: + # Ugly, we treat the from attr as the remote jid, + # to make that work with sent carbons we have to do this. + # TODO: Check where in Gajim and plugins we depend on that behavior + stanza.setFrom(stanza.getTo().getBare()) from_ = stanza.getFrom() type_ = stanza.getType() if type_ is None: type_ = 'normal' + self_message = is_self_message(stanza, type_ == 'groupchat') muc_pm = is_muc_pm(stanza, from_, type_ == 'groupchat') @@ -138,7 +119,7 @@ class Message: if type_ == 'groupchat': archive_jid = stanza.getFrom().getStripped() else: - archive_jid = own_jid + archive_jid = self._con.get_own_jid().getStripped() if app.logger.find_stanza_id(self._account, archive_jid, stanza_id, View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/42c1909d3b5899f43cf19d65d7b115b1ec… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/42c1909d3b5899f43cf19d65d7b115b1ec… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 13 commits: Add feature-discovered event
by Philipp Hörist 19 Dec '18

19 Dec '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7286f428 by Philipp Hörist at 2018-12-18T21:41:06Z Add feature-discovered event This lets us move more GUI code out of the common module - - - - - ced387e7 by Philipp Hörist at 2018-12-18T21:49:07Z Remove legacy code - - - - - de4cd80b by Philipp Hörist at 2018-12-18T21:52:29Z Make namedtuple local - - - - - 99cfb8f6 by Philipp Hörist at 2018-12-18T23:11:24Z Cleanup Gajims disco features - - - - - b935ce70 by Philipp Hörist at 2018-12-19T01:18:12Z Add more log output when calling handlers - - - - - 1fec6681 by Philipp Hörist at 2018-12-19T22:00:09Z Move MUC config change handling into MUC module - Remove status conditions code, since the XEP made a namespace bump to :1 and is now backwards compatible its useless - XEP-0045 mentions status code 100 can be in messages but there is no case given where this would ever happen, so its removed from message handling - - - - - e9f4c505 by Philipp Hörist at 2018-12-19T22:00:50Z Refactor MUC captcha challenge code - - - - - 5f555193 by Philipp Hörist at 2018-12-19T22:00:56Z Send active instead of gone as last chatstate - Also attempt to fix #9446 - - - - - ce683995 by Philipp Hörist at 2018-12-19T22:00:56Z Catch mediated invites only if type is normal https://xmpp.org/extensions/xep-0045.html#invite-mediated - - - - - 56d2c6bc by Philipp Hörist at 2018-12-19T22:24:38Z Raise nbxmpp version - - - - - 8b5adb06 by Philipp Hörist at 2018-12-19T22:24:39Z Allow setting handler priority - - - - - c614ac69 by Philipp Hörist at 2018-12-19T22:24:44Z Refactor voice approval - - - - - 1f975df8 by Philipp Hörist at 2018-12-19T22:24:49Z Remove incorrect comment - - - - - 19 changed files: - gajim/application.py - gajim/common/app.py - gajim/common/configpaths.py - gajim/common/connection.py - gajim/common/connection_handlers.py - gajim/common/connection_handlers_events.py - gajim/common/ged.py - gajim/common/helpers.py - gajim/common/modules/chatstates.py - gajim/common/modules/mam.py - gajim/common/modules/message.py - gajim/common/modules/muc.py - gajim/common/modules/privacylists.py - gajim/common/modules/vcard_temp.py - gajim/gajim.py - gajim/groupchat_control.py - gajim/gtk/single_message.py - gajim/remote_control.py - setup.cfg Changes: ===================================== gajim/application.py ===================================== @@ -38,10 +38,14 @@ from datetime import datetime from pathlib import Path from urllib.parse import unquote -from gi.repository import GLib, Gio, Gtk +import nbxmpp +from gi.repository import Gio +from gi.repository import GLib +from gi.repository import Gtk import gajim from gajim.common import app +from gajim.common import ged from gajim.common import configpaths from gajim.common import logging_helpers from gajim.common import exceptions @@ -227,6 +231,10 @@ class GajimApplication(Gtk.Application): from gajim import gui_menu_builder gui_menu_builder.build_accounts_menu() + app.ged.register_event_handler('feature-discovered', + ged.CORE, + self._on_feature_discovered) + def _open_uris(self, uris): for uri in uris: app.log('uri_handler').info('open %s', uri) @@ -498,3 +506,14 @@ class GajimApplication(Gtk.Application): elif new_state and state == 'online': # We go online self.lookup_action(account + action_name).set_enabled(True) + + def _on_feature_discovered(self, event): + if event.feature == nbxmpp.NS_VCARD: + action = '%s-profile' % event.account + self.lookup_action(action).set_enabled(True) + elif event.feature in (nbxmpp.NS_MAM_1, nbxmpp.NS_MAM_2): + action = '%s-archive' % event.account + self.lookup_action(action).set_enabled(True) + elif event.feature == nbxmpp.NS_PRIVACY: + action = '%s-privacylists' % event.account + self.lookup_action(action).set_enabled(True) ===================================== gajim/common/app.py ===================================== @@ -67,13 +67,6 @@ plugin_manager = None # Plugins Manager logger = cast(LoggerT, None) -# For backwards compatibility needed -# some plugins use that -gajimpaths = configpaths.gajimpaths - - -RecentGroupchat = namedtuple('RecentGroupchat', ['room', 'server', 'nickname']) - css_config = None os_info = None # used to cache os information @@ -149,17 +142,43 @@ socks5queue = None gupnp_igd = None gajim_identity = {'type': 'pc', 'category': 'client', 'name': 'Gajim'} -gajim_common_features = [nbxmpp.NS_BYTESTREAM, nbxmpp.NS_SI, nbxmpp.NS_FILE, - nbxmpp.NS_MUC, nbxmpp.NS_MUC_USER, nbxmpp.NS_MUC_ADMIN, nbxmpp.NS_MUC_OWNER, - nbxmpp.NS_MUC_CONFIG, nbxmpp.NS_COMMANDS, nbxmpp.NS_DISCO_INFO, 'ipv6', - 'jabber:iq:gateway', nbxmpp.NS_LAST, nbxmpp.NS_PRIVACY, nbxmpp.NS_PRIVATE, - nbxmpp.NS_REGISTER, nbxmpp.NS_VERSION, nbxmpp.NS_DATA, nbxmpp.NS_ENCRYPTED, - 'msglog', 'sslc2s', 'stringprep', nbxmpp.NS_PING, nbxmpp.NS_TIME_REVISED, - nbxmpp.NS_SSN, nbxmpp.NS_MOOD, nbxmpp.NS_ACTIVITY, nbxmpp.NS_NICK, - nbxmpp.NS_ROSTERX, nbxmpp.NS_SECLABEL, nbxmpp.NS_HASHES_2, - nbxmpp.NS_HASHES_MD5, nbxmpp.NS_HASHES_SHA1, nbxmpp.NS_HASHES_SHA256, - nbxmpp.NS_HASHES_SHA512, nbxmpp.NS_CONFERENCE, nbxmpp.NS_CORRECT, - nbxmpp.NS_EME, 'urn:xmpp:avatar:metadata+notify', 'storage:bookmarks+notify'] + +gajim_common_features = [ + nbxmpp.NS_BYTESTREAM, + nbxmpp.NS_SI, + nbxmpp.NS_FILE, + nbxmpp.NS_MUC, + nbxmpp.NS_COMMANDS, + nbxmpp.NS_DISCO_INFO, + nbxmpp.NS_LAST, + nbxmpp.NS_DATA, + nbxmpp.NS_ENCRYPTED, + nbxmpp.NS_PING, + nbxmpp.NS_TIME_REVISED, + nbxmpp.NS_VERSION, + nbxmpp.NS_ROSTERX, + nbxmpp.NS_SECLABEL, + nbxmpp.NS_CONFERENCE, + nbxmpp.NS_CORRECT, + nbxmpp.NS_EME, + nbxmpp.NS_HASHES, + nbxmpp.NS_HASHES_2, + nbxmpp.NS_HASHES_MD5, + nbxmpp.NS_HASHES_SHA1, + nbxmpp.NS_HASHES_SHA256, + nbxmpp.NS_HASHES_SHA512, + nbxmpp.NS_HASHES_SHA3_256, + nbxmpp.NS_HASHES_SHA3_512, + nbxmpp.NS_HASHES_BLAKE2B_256, + nbxmpp.NS_HASHES_BLAKE2B_512, + nbxmpp.NS_JINGLE, + nbxmpp.NS_JINGLE_FILE_TRANSFER_5, + nbxmpp.NS_JINGLE_XTLS, + nbxmpp.NS_JINGLE_BYTESTREAM, + nbxmpp.NS_JINGLE_IBB, + nbxmpp.NS_AVATAR_METADATA + '+notify', + nbxmpp.NS_BOOKMARKS + '+notify', +] # Optional features gajim supports per account gajim_optional_features = {} # type: Dict[str, List[str]] @@ -580,6 +599,9 @@ def get_recent_groupchats(account): recent_groupchats = config.get_per( 'accounts', account, 'recent_groupchats').split() + RecentGroupchat = namedtuple('RecentGroupchat', + ['room', 'server', 'nickname']) + recent_list = [] for groupchat in recent_groupchats: jid = nbxmpp.JID(groupchat) ===================================== gajim/common/configpaths.py ===================================== @@ -241,7 +241,3 @@ class ConfigPaths: _paths = ConfigPaths() - -# For backwards compatibility needed -# some plugins use that -gajimpaths = _paths ===================================== gajim/common/connection.py ===================================== @@ -1684,14 +1684,6 @@ class Connection(CommonConnection, ConnectionHandlers): show=show, caps=ptype != 'unavailable') - def send_captcha(self, jid, form_node): - if not app.account_is_connected(self.name): - return - iq = nbxmpp.Iq(typ='set', to=jid) - captcha = iq.addChild(name='captcha', namespace=nbxmpp.NS_CAPTCHA) - captcha.addChild(node=form_node) - self.connection.send(iq) - def check_unique_room_id_support(self, server, instance): if not app.account_is_connected(self.name): return ===================================== gajim/common/connection_handlers.py ===================================== @@ -585,12 +585,18 @@ class ConnectionHandlers(ConnectionSocks5Bytestream, nbxmpp.NS_PUBKEY_PUBKEY) for handler in modules.get_handlers(self): - con.RegisterHandler(*handler) + if len(handler) == 5: + name, func, typ, ns, priority = handler + con.RegisterHandler(name, func, typ, ns, priority=priority) + else: + con.RegisterHandler(*handler) self.handlers_registered = True def _unregister_handlers(self): if not self.connection: return for handler in modules.get_handlers(self): + if len(handler) > 4: + handler = handler[:4] self.connection.UnregisterHandler(*handler) self.handlers_registered = False ===================================== gajim/common/connection_handlers_events.py ===================================== @@ -40,27 +40,6 @@ from gajim.common.file_props import FilesProp log = logging.getLogger('gajim.c.connection_handlers_events') -CONDITION_TO_CODE = { - 'realjid-public': 100, - 'affiliation-changed': 101, - 'unavailable-shown': 102, - 'unavailable-not-shown': 103, - 'configuration-changed': 104, - 'self-presence': 110, - 'logging-enabled': 170, - 'logging-disabled': 171, - 'non-anonymous': 172, - 'semi-anonymous': 173, - 'fully-anonymous': 174, - 'room-created': 201, - 'nick-assigned': 210, - 'banned': 301, - 'new-nick': 303, - 'kicked': 307, - 'removed-affiliation': 321, - 'removed-membership': 322, - 'removed-shutdown': 332, -} class HelperEvent: def get_jid_resource(self, check_fake_jid=False): @@ -378,14 +357,7 @@ class GcPresenceReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): self.status_code = ['destroyed'] else: self.reason = self.stanza.getReason() - conditions = self.stanza.getStatusConditions() - if conditions: - self.status_code = [] - for condition in conditions: - if condition in CONDITION_TO_CODE: - self.status_code.append(CONDITION_TO_CODE[condition]) - else: - self.status_code = self.stanza.getStatusCode() + self.status_code = self.stanza.getStatusCode() self.role = self.stanza.getRole() self.affiliation = self.stanza.getAffiliation() @@ -429,60 +401,12 @@ class GcMessageReceivedEvent(nec.NetworkIncomingEvent): # message from server self.nick = '' - conditions = self.stanza.getStatusConditions() - if conditions: - self.status_code = [] - for condition in conditions: - if condition in CONDITION_TO_CODE: - self.status_code.append(CONDITION_TO_CODE[condition]) - else: - self.status_code = self.stanza.getStatusCode() - if not self.stanza.getTag('body'): # no <body> - # It could be a config change. See - # http://www.xmpp.org/extensions/xep-0045.html#roomconfig-notify - if self.stanza.getTag('x'): - if self.status_code != []: - app.nec.push_incoming_event(GcConfigChangedReceivedEvent( - None, conn=self.conn, msg_event=self)) - if self.msg_obj.form_node: - # It could be a voice request. See - # http://www.xmpp.org/extensions/xep-0045.html#voiceapprove - from gajim.gtk.single_message import SingleMessageWindow - SingleMessageWindow( - self.conn.name, self.fjid, - action='receive', from_whom=self.fjid, - subject='', message='', resource='', session=None, - form_node=self.msg_obj.form_node) return from gajim.common.modules.security_labels import parse_securitylabel self.displaymarking = parse_securitylabel(self.stanza) - self.captcha_form = None - captcha_tag = self.stanza.getTag('captcha', namespace=nbxmpp.NS_CAPTCHA) - if captcha_tag: - self.captcha_form = captcha_tag.getTag('x', - namespace=nbxmpp.NS_DATA) - for field in self.captcha_form.getTags('field'): - for media in field.getTags('media'): - for uri in media.getTags('uri'): - uri_data = uri.getData() - if uri_data.startswith('cid:'): - uri_data = uri_data[4:] - found = False - for data in self.stanza.getTags('data', - namespace=nbxmpp.NS_BOB): - if data.getAttr('cid') == uri_data: - uri.setData(data.getData()) - found = True - if not found: - self.conn.get_module('BitsOfBinary').get_bob_data( - uri_data, self.fjid, - self.conn._dispatch_gc_msg_with_captcha, - [self.stanza, self.msg_obj], 0) - return - from gajim.common.modules.misc import parse_correction self.correct_id = parse_correction(self.stanza) ===================================== gajim/common/ged.py ===================================== @@ -24,6 +24,7 @@ Global Events Dispatcher module. import logging import traceback +import inspect from nbxmpp import NodeProcessed @@ -84,13 +85,19 @@ class GlobalEventsDispatcher: Error: %s''', handler, priority, event_name, error) def raise_event(self, event_name, *args, **kwargs): - log.debug('%s Args: %s', event_name, str(args)) + log.debug('Raise event: %s', event_name) if event_name in self.handlers: node_processed = False # Iterate over a copy of the handlers list, so while iterating # the original handlers list can be modified for _priority, handler in list(self.handlers[event_name]): try: + if inspect.ismethod(handler): + log.debug('Call handler %s on %s', + handler.__name__, + handler.__self__) + else: + log.debug('Call handler %s', handler.__name__) if handler(*args, **kwargs): return True except NodeProcessed: ===================================== gajim/common/helpers.py ===================================== @@ -1161,56 +1161,47 @@ def prepare_and_validate_gpg_keyID(account, jid, keyID): return keyID def update_optional_features(account=None): - if account: + if account is not None: accounts = [account] else: - accounts = [a for a in app.connections] - for a in accounts: - app.gajim_optional_features[a] = [] - if app.config.get_per('accounts', a, 'subscribe_mood'): - app.gajim_optional_features[a].append(nbxmpp.NS_MOOD + '+notify') - if app.config.get_per('accounts', a, 'subscribe_activity'): - app.gajim_optional_features[a].append(nbxmpp.NS_ACTIVITY + \ - '+notify') - if app.config.get_per('accounts', a, 'publish_tune'): - app.gajim_optional_features[a].append(nbxmpp.NS_TUNE) - if app.config.get_per('accounts', a, 'publish_location'): - app.gajim_optional_features[a].append(nbxmpp.NS_LOCATION) - if app.config.get_per('accounts', a, 'subscribe_tune'): - app.gajim_optional_features[a].append(nbxmpp.NS_TUNE + '+notify') - if app.config.get_per('accounts', a, 'subscribe_nick'): - app.gajim_optional_features[a].append(nbxmpp.NS_NICK + '+notify') - if app.config.get_per('accounts', a, 'subscribe_location'): - app.gajim_optional_features[a].append(nbxmpp.NS_LOCATION + \ - '+notify') + accounts = app.connections.keys() + + for account_ in accounts: + features = [] + app.gajim_optional_features[account_] = features + if app.config.get_per('accounts', account_, 'subscribe_mood'): + features.append(nbxmpp.NS_MOOD + '+notify') + if app.config.get_per('accounts', account_, 'subscribe_activity'): + features.append(nbxmpp.NS_ACTIVITY + '+notify') + if app.config.get_per('accounts', account_, 'subscribe_tune'): + features.append(nbxmpp.NS_TUNE + '+notify') + if app.config.get_per('accounts', account_, 'subscribe_nick'): + features.append(nbxmpp.NS_NICK + '+notify') + if app.config.get_per('accounts', account_, 'subscribe_location'): + features.append(nbxmpp.NS_LOCATION + '+notify') if app.config.get('outgoing_chat_state_notifactions') != 'disabled': - app.gajim_optional_features[a].append(nbxmpp.NS_CHATSTATES) + features.append(nbxmpp.NS_CHATSTATES) if not app.config.get('ignore_incoming_xhtml'): - app.gajim_optional_features[a].append(nbxmpp.NS_XHTML_IM) - if app.config.get_per('accounts', a, 'answer_receipts'): - app.gajim_optional_features[a].append(nbxmpp.NS_RECEIPTS) - app.gajim_optional_features[a].append(nbxmpp.NS_JINGLE) + features.append(nbxmpp.NS_XHTML_IM) + if app.config.get_per('accounts', account_, 'answer_receipts'): + features.append(nbxmpp.NS_RECEIPTS) if app.is_installed('FARSTREAM'): - app.gajim_optional_features[a].append(nbxmpp.NS_JINGLE_RTP) - app.gajim_optional_features[a].append(nbxmpp.NS_JINGLE_RTP_AUDIO) - app.gajim_optional_features[a].append(nbxmpp.NS_JINGLE_RTP_VIDEO) - app.gajim_optional_features[a].append(nbxmpp.NS_JINGLE_ICE_UDP) - app.gajim_optional_features[a].append( - nbxmpp.NS_JINGLE_FILE_TRANSFER_5) - app.gajim_optional_features[a].append(nbxmpp.NS_JINGLE_XTLS) - app.gajim_optional_features[a].append(nbxmpp.NS_JINGLE_BYTESTREAM) - app.gajim_optional_features[a].append(nbxmpp.NS_JINGLE_IBB) + features.append(nbxmpp.NS_JINGLE_RTP) + features.append(nbxmpp.NS_JINGLE_RTP_AUDIO) + features.append(nbxmpp.NS_JINGLE_RTP_VIDEO) + features.append(nbxmpp.NS_JINGLE_ICE_UDP) # Give plugins the possibility to add their features - app.plugin_manager.extension_point('update_caps', a) + app.plugin_manager.extension_point('update_caps', account_) - app.caps_hash[a] = caps_cache.compute_caps_hash([app.gajim_identity], - app.gajim_common_features + app.gajim_optional_features[a]) + app.caps_hash[account_] = caps_cache.compute_caps_hash( + [app.gajim_identity], + app.gajim_common_features + features) # re-send presence with new hash - connected = app.connections[a].connected + connected = app.connections[account_].connected if connected > 1 and app.SHOW_LIST[connected] != 'invisible': - app.connections[a].change_status(app.SHOW_LIST[connected], - app.connections[a].status) + app.connections[account_].change_status( + app.SHOW_LIST[connected], app.connections[account_].status) def jid_is_blocked(account, jid): con = app.connections[account] ===================================== gajim/common/modules/chatstates.py ===================================== @@ -171,6 +171,11 @@ class Chatstate: if contact is not None: contact = contact.as_contact() else: + # Contact not found, maybe we left the group chat + # or the contact was removed from the roster + log.info( + 'Contact %s not found, reset chatstate', jid) + self._chatstates.pop(jid, None) self._last_mouse_activity.pop(jid, None) self._last_keyboard_activity.pop(jid, None) continue @@ -206,14 +211,21 @@ class Chatstate: current_state = self._chatstates.get(contact.jid) setting = app.config.get('outgoing_chat_state_notifications') if setting == 'disabled': - # Send a last 'gone' state after user disabled chatstates + # Send a last 'active' state after user disabled chatstates if current_state is not None: - log.info('Send: %-10s - %s', State.GONE, contact.jid) - app.nec.push_outgoing_event( - MessageOutgoingEvent(None, - account=self._account, - jid=contact.jid, - chatstate=str(State.GONE))) + log.info('Send: %-10s - %s', State.ACTIVE, contact.jid) + + event_attrs = {'account': self._account, + 'jid': contact.jid, + 'chatstate': str(State.ACTIVE)} + + if contact.is_groupchat(): + app.nec.push_outgoing_event( + GcMessageOutgoingEvent(None, **event_attrs)) + else: + app.nec.push_outgoing_event( + MessageOutgoingEvent(None, **event_attrs)) + self._chatstates.pop(contact.jid, None) self._last_mouse_activity.pop(contact.jid, None) self._last_keyboard_activity.pop(contact.jid, None) ===================================== gajim/common/modules/mam.py ===================================== @@ -21,6 +21,7 @@ from datetime import datetime, timedelta import nbxmpp from gajim.common import app +from gajim.common.nec import NetworkEvent from gajim.common.nec import NetworkIncomingEvent from gajim.common.const import ArchiveState from gajim.common.const import KindConstant @@ -65,9 +66,11 @@ class MAM: self.available = True log.info('Discovered MAM %s: %s', self.archiving_namespace, from_) - # TODO: Move this GUI code out - action = app.app.lookup_action('%s-archive' % self._account) - action.set_enabled(True) + + app.nec.push_incoming_event( + NetworkEvent('feature-discovered', + account=self._account, + feature=self.archiving_namespace)) def _from_valid_archive(self, stanza, message, groupchat): if groupchat: ===================================== gajim/common/modules/message.py ===================================== @@ -28,7 +28,6 @@ from gajim.common.helpers import AdditionalDataDict from gajim.common.modules.security_labels import parse_securitylabel from gajim.common.modules.user_nickname import parse_nickname from gajim.common.modules.carbons import parse_carbon -from gajim.common.modules.bits_of_binary import parse_bob_data from gajim.common.modules.misc import parse_delay from gajim.common.modules.misc import parse_eme from gajim.common.modules.misc import parse_correction @@ -58,7 +57,8 @@ class Message: nbxmpp.NS_MAM_1, nbxmpp.NS_MAM_2, nbxmpp.NS_CONFERENCE, - nbxmpp.NS_IBB]) + nbxmpp.NS_IBB, + nbxmpp.NS_CAPTCHA,]) def _message_received(self, _con, stanza): # https://tools.ietf.org/html/rfc6120#section-8.1.1.1 @@ -259,8 +259,6 @@ class Message: event.additional_data.set_value( 'gajim', 'user_timestamp', user_timestamp) - parse_bob_data(event.stanza) - event_attr = { 'popup': False, 'msg_log_id': None, ===================================== gajim/common/modules/muc.py ===================================== @@ -22,11 +22,13 @@ import weakref import nbxmpp from gajim.common import i18n -from gajim.common.modules import dataforms from gajim.common import app from gajim.common import helpers from gajim.common.caps_cache import muc_caps_cache +from gajim.common.nec import NetworkEvent from gajim.common.nec import NetworkIncomingEvent +from gajim.common.modules import dataforms +from gajim.common.modules.bits_of_binary import parse_bob_data log = logging.getLogger('gajim.c.m.muc') @@ -37,8 +39,11 @@ class MUC: self._account = con.name self.handlers = [ - ('message', self._mediated_invite, '', nbxmpp.NS_MUC_USER), + ('message', self._on_config_change, '', nbxmpp.NS_MUC_USER), + ('message', self._mediated_invite, 'normal', nbxmpp.NS_MUC_USER), ('message', self._direct_invite, '', nbxmpp.NS_CONFERENCE), + ('message', self._on_captcha_challenge, '', nbxmpp.NS_CAPTCHA), + ('message', self._on_voice_request, '', nbxmpp.NS_DATA, 45), ] def pass_disco(self, from_, identities, features, _data, _node): @@ -110,6 +115,62 @@ class MUC: log.info('Set subject for %s', room_jid) self._con.connection.send(message) + def _on_voice_request(self, _con, stanza): + data_form = stanza.getTag('x', namespace=nbxmpp.NS_DATA) + if data_form is None: + return + + if stanza.getBody(): + return + + room_jid = str(stanza.getFrom()) + contact = app.contacts.get_groupchat_contact(self._account, room_jid) + if contact is None: + return + + data_form = dataforms.extend_form(data_form) + try: + if data_form['FORM_TYPE'].value != nbxmpp.NS_MUC_REQUEST: + return + except KeyError: + return + + app.nec.push_incoming_event( + NetworkEvent('voice-approval', + account=self._account, + room_jid=room_jid, + form=data_form)) + raise nbxmpp.NodeProcessed + + def _on_captcha_challenge(self, _con, stanza): + captcha = stanza.getTag('captcha', namespace=nbxmpp.NS_CAPTCHA) + if captcha is None: + return + + parse_bob_data(stanza) + room_jid = str(stanza.getFrom()) + contact = app.contacts.get_groupchat_contact(self._account, room_jid) + if contact is None: + return + + log.info('Captcha challenge received from %s', room_jid) + data_form = captcha.getTag('x', namespace=nbxmpp.NS_DATA) + data_form = dataforms.extend_form(node=data_form) + app.nec.push_incoming_event( + NetworkEvent('captcha-challenge', + account=self._account, + room_jid=room_jid, + form=data_form)) + raise nbxmpp.NodeProcessed + + def send_captcha(self, room_jid, form_node): + if not app.account_is_connected(self._account): + return + iq = nbxmpp.Iq(typ='set', to=room_jid) + captcha = iq.addChild(name='captcha', namespace=nbxmpp.NS_CAPTCHA) + captcha.addChild(node=form_node) + self._con.connection.send(iq) + def request_config(self, room_jid): if not app.account_is_connected(self._account): return @@ -154,6 +215,41 @@ class MUC: self._con.connection.SendAndCallForResponse( iq, self._default_response, {}) + def _on_config_change(self, _con, stanza): + muc_user = stanza.getTag('x', namespace=nbxmpp.NS_MUC_USER) + if muc_user is None: + return + + if stanza.getBody(): + return + + room_list = app.contacts.get_gc_list(self._account) + room_jid = str(stanza.getFrom()) + if room_jid not in room_list: + # Message not from a group chat + return + + # https://xmpp.org/extensions/xep-0045.html#registrar-statuscodes + change_codes = ['100', '102', '103', '104', + '170', '171', '172', '173', '174'] + + codes = set() + for status in muc_user.getTags('status'): + code = status.getAttr('code') + if code in change_codes: + codes.add(code) + + if not codes: + return + + log.info('Received config change: %s', codes) + app.nec.push_incoming_event( + NetworkEvent('gc-config-changed-received', + account=self._account, + room_jid=room_jid, + status_codes=codes)) + raise nbxmpp.NodeProcessed + def destroy(self, room_jid, reason='', jid=''): if not app.account_is_connected(self._account): return @@ -272,6 +368,9 @@ class MUC: if stanza.getType() == 'error': return + if stanza.getBody(): + return + decline = muc_user.getTag('decline') if decline is not None: ===================================== gajim/common/modules/privacylists.py ===================================== @@ -20,6 +20,7 @@ import nbxmpp from gajim.common import app from gajim.common import helpers +from gajim.common.nec import NetworkEvent from gajim.common.nec import NetworkIncomingEvent from gajim.common.connection_handlers_events import InformationEvent @@ -51,9 +52,11 @@ class PrivacyLists: self.supported = True log.info('Discovered XEP-0016: Privacy Lists: %s', from_) - # TODO: Move this GUI code out - action = app.app.lookup_action('%s-privacylists' % self._account) - action.set_enabled(True) + + app.nec.push_incoming_event( + NetworkEvent('feature-discovered', + account=self._account, + feature=nbxmpp.NS_PRIVACY)) def _list_push_received(self, _con, stanza): result = stanza.buildReply('result') ===================================== gajim/common/modules/vcard_temp.py ===================================== @@ -23,6 +23,7 @@ import nbxmpp from gajim.common import app from gajim.common.const import RequestAvatar +from gajim.common.nec import NetworkEvent from gajim.common.nec import NetworkIncomingEvent from gajim.common.connection_handlers_events import InformationEvent @@ -47,9 +48,10 @@ class VCardTemp: self.supported = True log.info('Discovered vcard-temp: %s', from_) - # TODO: Move this GUI code out - action = app.app.lookup_action('%s-profile' % self._account) - action.set_enabled(True) + + app.nec.push_incoming_event(NetworkEvent('feature-discovered', + account=self._account, + feature=nbxmpp.NS_VCARD)) @staticmethod def _node_to_dict(node): ===================================== gajim/gajim.py ===================================== @@ -24,10 +24,9 @@ from ctypes import CDLL, byref, create_string_buffer from ctypes.util import find_library from distutils.version import LooseVersion as V -# Install _() in namespace from gajim.common import i18n -_MIN_NBXMPP_VER = "0.9.90" +_MIN_NBXMPP_VER = "0.9.90.2" _MIN_GTK_VER = "3.22.0" ===================================== gajim/groupchat_control.py ===================================== @@ -44,7 +44,6 @@ from gajim import gtkgui_helpers from gajim import gui_menu_builder from gajim import message_control from gajim import vcard -from gajim import dataforms_widget from gajim.common.const import AvatarSize from gajim.common.caps_cache import muc_caps_cache @@ -53,7 +52,6 @@ from gajim.common import app from gajim.common import helpers from gajim.common.helpers import launch_browser_mailer from gajim.common.helpers import AdditionalDataDict -from gajim.common.modules import dataforms from gajim.common import ged from gajim.common import i18n from gajim.common.i18n import _ @@ -72,11 +70,13 @@ from gajim.gtk.dialogs import ConfirmationDialogCheck from gajim.gtk.dialogs import DoubleInputDialog from gajim.gtk.dialogs import InputDialog from gajim.gtk.dialogs import ChangeNickDialog +from gajim.gtk.single_message import SingleMessageWindow from gajim.gtk.filechoosers import AvatarChooserDialog from gajim.gtk.add_contact import AddNewContactWindow from gajim.gtk.tooltips import GCTooltip from gajim.gtk.groupchat_config import GroupchatConfig from gajim.gtk.adhoc_commands import CommandWindow +from gajim.gtk.dataform import DataFormWidget from gajim.gtk.util import NickCompletionGenerator from gajim.gtk.util import get_icon_name from gajim.gtk.util import get_affiliation_surface @@ -330,6 +330,10 @@ class GroupchatControl(ChatControlBase): self._nec_decrypted_message_received) app.ged.register_event_handler('gc-stanza-message-outgoing', ged.OUT_POSTCORE, self._message_sent) + app.ged.register_event_handler('captcha-challenge', ged.GUI1, + self._on_captcha_challenge) + app.ged.register_event_handler('voice-approval', ged.GUI1, + self._on_voice_approval) self.is_connected = False # disable win, we are not connected yet ChatControlBase.got_disconnected(self) @@ -1073,6 +1077,59 @@ class GroupchatControl(ChatControlBase): return self._update_banner_state_image() + def _on_voice_approval(self, event): + if event.account != self.account: + return + if event.room_jid != self.room_jid: + return + SingleMessageWindow(self.account, + self.room_jid, + action='receive', + from_whom=self.room_jid, + form_node=event.form) + + def _on_captcha_challenge(self, event): + if event.account != self.account: + return + if event.room_jid != self.room_jid: + return + + if self.form_widget: + self.form_widget.hide() + self.form_widget.destroy() + self.btn_box.destroy() + + self.form_widget = DataFormWidget(event.form) + + def on_send_dataform_clicked(widget): + if not self.form_widget: + return + form_node = self.form_widget.get_submit_form() + con = app.connections[self.account] + con.get_module('MUC').send_captcha(self.room_jid, form_node) + self.form_widget.hide() + self.form_widget.destroy() + self.btn_box.destroy() + self.form_widget = None + del self.btn_box + + # self.form_widget.connect('validated', on_send_dataform_clicked) + self.form_widget.show_all() + vbox = self.xml.get_object('gc_textviews_vbox') + vbox.pack_start(self.form_widget, False, True, 0) + + valid_button = Gtk.Button(stock=Gtk.STOCK_OK) + valid_button.connect('clicked', on_send_dataform_clicked) + self.btn_box = Gtk.HButtonBox() + self.btn_box.set_layout(Gtk.ButtonBoxStyle.END) + self.btn_box.pack_start(valid_button, True, True, 0) + self.btn_box.show_all() + vbox.pack_start(self.btn_box, False, False, 0) + if self.parent_win: + self.parent_win.redraw_tab(self, 'attention') + else: + self.attention_flag = True + def _nec_mam_decrypted_message_received(self, obj): if obj.conn.name != self.account: return @@ -1090,45 +1147,7 @@ class GroupchatControl(ChatControlBase): def _nec_gc_message_received(self, obj): if obj.room_jid != self.room_jid or obj.conn.name != self.account: return - if obj.captcha_form: - if self.form_widget: - self.form_widget.hide() - self.form_widget.destroy() - self.btn_box.destroy() - dataform = dataforms.extend_form(node=obj.captcha_form) - self.form_widget = dataforms_widget.DataFormWidget(dataform) - - def on_send_dataform_clicked(widget): - if not self.form_widget: - return - form_node = self.form_widget.data_form.get_purged() - form_node.type_ = 'submit' - obj.conn.send_captcha(self.room_jid, form_node) - self.form_widget.hide() - self.form_widget.destroy() - self.btn_box.destroy() - self.form_widget = None - del self.btn_box - - self.form_widget.connect('validated', on_send_dataform_clicked) - self.form_widget.show_all() - vbox = self.xml.get_object('gc_textviews_vbox') - vbox.pack_start(self.form_widget, False, True, 0) - - valid_button = Gtk.Button(stock=Gtk.STOCK_OK) - valid_button.connect('clicked', on_send_dataform_clicked) - self.btn_box = Gtk.HButtonBox() - self.btn_box.set_layout(Gtk.ButtonBoxStyle.END) - self.btn_box.pack_start(valid_button, True, True, 0) - self.btn_box.show_all() - vbox.pack_start(self.btn_box, False, False, 0) - if self.parent_win: - self.parent_win.redraw_tab(self, 'attention') - else: - self.attention_flag = True - if '100' in obj.status_code: - # Room is not anonymous - self.is_anonymous = False + if not obj.nick: # message from server self.print_conversation( @@ -1416,40 +1435,40 @@ class GroupchatControl(ChatControlBase): else: self.subject_button.show() - def _nec_gc_config_changed_received(self, obj): - # statuscode is a list + def _nec_gc_config_changed_received(self, event): # http://www.xmpp.org/extensions/xep-0045.html#roomconfig-notify - # http://www.xmpp.org/extensions/xep-0045.html#registrar-statuscodes... - # -init - if obj.room_jid != self.room_jid or obj.conn.name != self.account: + if event.account != self.account: + return + + if event.room_jid != self.room_jid: return changes = [] - if '100' in obj.status_code: + if '100' in event.status_codes: # Can be a presence (see chg_contact_status in groupchat_control.py) changes.append(_('Any occupant is allowed to see your full JID')) self.is_anonymous = False - if '102' in obj.status_code: + if '102' in event.status_codes: changes.append(_('Room now shows unavailable members')) - if '103' in obj.status_code: + if '103' in event.status_codes: changes.append(_('Room now does not show unavailable members')) - if '104' in obj.status_code: + if '104' in event.status_codes: changes.append(_('A setting not related to privacy has been ' 'changed')) app.connections[self.account].get_module('Discovery').disco_muc( self.room_jid, self.update_actions, update=True) - if '170' in obj.status_code: + if '170' in event.status_codes: # Can be a presence (see chg_contact_status in groupchat_control.py) changes.append(_('Room logging is now enabled')) - if '171' in obj.status_code: + if '171' in event.status_codes: changes.append(_('Room logging is now disabled')) - if '172' in obj.status_code: + if '172' in event.status_codes: changes.append(_('Room is now non-anonymous')) self.is_anonymous = False - if '173' in obj.status_code: + if '173' in event.status_codes: changes.append(_('Room is now semi-anonymous')) self.is_anonymous = True - if '174' in obj.status_code: + if '174' in event.status_codes: changes.append(_('Room is now fully anonymous')) self.is_anonymous = True @@ -2172,6 +2191,10 @@ class GroupchatControl(ChatControlBase): ged.GUI1, self._nec_mam_decrypted_message_received) app.ged.remove_event_handler('gc-stanza-message-outgoing', ged.OUT_POSTCORE, self._message_sent) + app.ged.remove_event_handler('captcha-challenge', ged.GUI1, + self._on_captcha_challenge) + app.ged.remove_event_handler('voice-approval', ged.GUI1, + self._on_voice_approval) if self.is_connected: app.connections[self.account].send_gc_status(self.nick, ===================================== gajim/gtk/single_message.py ===================================== @@ -20,12 +20,11 @@ from gi.repository import GLib from gajim.common import app from gajim.common import helpers from gajim.common.i18n import _ -from gajim.common.modules import dataforms from gajim.common.connection_handlers_events import MessageOutgoingEvent -from gajim.dataforms_widget import DataFormWidget from gajim.conversation_textview import ConversationTextview +from gajim.gtk.dataform import DataFormWidget from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import AspellDictError from gajim.gtk.util import get_builder @@ -83,9 +82,7 @@ class SingleMessageWindow: parent_box = self.xml.get_object('conversation_scrolledwindow').\ get_parent() if form_node: - dataform = dataforms.extend_form(node=form_node) - dataform.type_ = 'submit' - self.form_widget = DataFormWidget(dataform) + self.form_widget = DataFormWidget(form_node) self.form_widget.show_all() parent_box.add(self.form_widget) parent_box.child_set_property(self.form_widget, 'position', @@ -282,7 +279,7 @@ class SingleMessageWindow: message = self.message_tv_buffer.get_text(begin, end, True) if self.form_widget: - form_node = self.form_widget.data_form + form_node = self.form_widget.get_submit_form() else: form_node = None ===================================== gajim/remote_control.py ===================================== @@ -385,8 +385,8 @@ class GajimRemote(Server): # event has not been handled at GUI level return self.raise_signal('GCMessage', (obj.conn.name, [obj.fjid, obj.msgtxt, - obj.timestamp, obj.delayed, obj.xhtml_msgtxt, obj.status_code, - obj.displaymarking, obj.captcha_form, obj.needs_highlight])) + obj.timestamp, obj.delayed, obj.xhtml_msgtxt, + obj.displaymarking, obj.needs_highlight])) def on_our_status(self, obj): self.raise_signal('AccountPresence', (obj.show, obj.conn.name)) ===================================== setup.cfg ===================================== @@ -22,7 +22,7 @@ test_suite = test install_requires = cssutils>=1.0.2 keyring - nbxmpp>=0.9.90 + nbxmpp>=0.9.90.2 precis-i18n>=1.0.0 pyOpenSSL>=0.12 View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/89d994093393d3ec010facfab6b3fc480… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/89d994093393d3ec010facfab6b3fc480… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 3 commits: Add namespace
by Philipp Hörist 19 Dec '18

19 Dec '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 8ab51592 by Philipp Hörist at 2018-12-19T21:04:19Z Add namespace - - - - - 68e363f4 by Philipp Hörist at 2018-12-19T22:12:25Z Refactor dispatcher - Allow to attach priority to handlers on register - Dispatch stanzas sorted for priority - Remove/Simplify code - - - - - c51e9a85 by Philipp Hörist at 2018-12-19T22:13:51Z Raise version to 0.9.90.2 - - - - - 5 changed files: - nbxmpp/__init__.py - nbxmpp/dispatcher_nb.py - nbxmpp/protocol.py - nbxmpp/roster_nb.py - setup.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.1" +__version__ = "0.9.90.2" ===================================== nbxmpp/dispatcher_nb.py ===================================== @@ -27,10 +27,18 @@ import uuid import logging from xml.parsers.expat import ExpatError -from . import simplexml -from .plugin import PlugIn -from .protocol import (NS_STREAMS, NS_HTTP_BIND, Iq, Presence, - Message, Protocol, Node, Error, ERR_FEATURE_NOT_IMPLEMENTED) +from nbxmpp.simplexml import NodeBuilder +from nbxmpp.plugin import PlugIn +from nbxmpp.protocol import NS_STREAMS +from nbxmpp.protocol import NS_HTTP_BIND +from nbxmpp.protocol import NodeProcessed +from nbxmpp.protocol import Iq +from nbxmpp.protocol import Presence +from nbxmpp.protocol import Message +from nbxmpp.protocol import Protocol +from nbxmpp.protocol import Node +from nbxmpp.protocol import Error +from nbxmpp.protocol import ERR_FEATURE_NOT_IMPLEMENTED log = logging.getLogger('nbxmpp.dispatcher_nb') @@ -177,7 +185,7 @@ class XMPPDispatcher(PlugIn): Send an initial stream header """ self._owner.Connection.sendqueue = [] - self.Stream = simplexml.NodeBuilder() + self.Stream = NodeBuilder() self.Stream.dispatch = self.dispatch self.Stream._dispatch_depth = 2 self.Stream.stream_header_received = self._check_stream_start @@ -258,7 +266,7 @@ class XMPPDispatcher(PlugIn): self.RegisterProtocol('unknown', Protocol, xmlns=xmlns) self.RegisterProtocol('default', Protocol, xmlns=xmlns) - def RegisterProtocol(self, tag_name, Proto, xmlns=None, order='info'): + def RegisterProtocol(self, tag_name, proto, xmlns=None, order='info'): """ Used to declare some top-level stanza name to dispatcher @@ -266,20 +274,18 @@ class XMPPDispatcher(PlugIn): presence protocols are registered by default. """ if not xmlns: - xmlns=self._owner.defaultNamespace - log.debug('Registering protocol "%s" as %s(%s)' %(tag_name, Proto, xmlns)) - self.handlers[xmlns][tag_name] = {type:Proto, 'default':[]} + xmlns = self._owner.defaultNamespace + log.debug('Registering protocol "%s" as %s(%s)', tag_name, proto, xmlns) + self.handlers[xmlns][tag_name] = {'type': proto, 'default': []} - def RegisterNamespaceHandler(self, xmlns, handler, typ='', ns='', - makefirst=0, system=0): + def RegisterNamespaceHandler(self, xmlns, handler, typ='', ns='', system=0): """ Register handler for processing all stanzas for specified namespace """ - self.RegisterHandler('default', handler, typ, ns, xmlns, makefirst, - system) + self.RegisterHandler('default', handler, typ, ns, xmlns, system) def RegisterHandler(self, name, handler, typ='', ns='', xmlns=None, - makefirst=False, system=False): + system=False, priority=50): """ Register user callback as stanzas handler of declared type @@ -295,40 +301,44 @@ class XMPPDispatcher(PlugIn): value will match :param ns: namespace of child that stanza must contain. :param xmlns: xml namespace - :param makefirst: insert handler in the beginning of handlers list instead - of adding it to the end. Note that more common handlers i.e. w/o "typ" - and " will be called first nevertheless. :param system: call handler even if NodeProcessed Exception were raised - already. + already. + :param priority: The priority of the handler, higher get called later """ if not xmlns: - xmlns=self._owner.defaultNamespace - log.debug('Registering handler %s for "%s" type->%s ns->%s(%s)' % - (handler, name, typ, ns, xmlns)) + xmlns = self._owner.defaultNamespace + if not typ and not ns: - typ='default' + typ = 'default' + + log.debug( + 'Registering handler %s for "%s" type->%s ns->%s(%s) priority->%s', + handler, name, typ, ns, xmlns, priority) + if xmlns not in self.handlers: self.RegisterNamespace(xmlns, 'warn') if name not in self.handlers[xmlns]: self.RegisterProtocol(name, Protocol, xmlns, 'warn') - if typ+ns not in self.handlers[xmlns][name]: - self.handlers[xmlns][name][typ+ns]=[] - if makefirst: - self.handlers[xmlns][name][typ+ns].insert(0, {'func':handler, - 'system':system}) - else: - self.handlers[xmlns][name][typ+ns].append({'func':handler, - 'system':system}) + + specific = typ + ns + if specific not in self.handlers[xmlns][name]: + self.handlers[xmlns][name][specific] = [] + + self.handlers[xmlns][name][specific].append( + {'func': handler, + 'system': system, + 'priority': priority, + 'specific': specific}) def RegisterHandlerOnce(self, name, handler, typ='', ns='', xmlns=None, - makefirst=0, system=0): + system=0): """ Unregister handler after first call (not implemented yet) """ # FIXME Drop or implement if not xmlns: xmlns = self._owner.defaultNamespace - self.RegisterHandler(name, handler, typ, ns, xmlns, makefirst, system) + self.RegisterHandler(name, handler, typ, ns, xmlns, system) def UnregisterHandler(self, name, handler, typ='', ns='', xmlns=None): """ @@ -338,18 +348,26 @@ class XMPPDispatcher(PlugIn): if not xmlns: xmlns = self._owner.defaultNamespace if not typ and not ns: - typ='default' + typ = 'default' if xmlns not in self.handlers: return if name not in self.handlers[xmlns]: return - if typ+ns not in self.handlers[xmlns][name]: + + specific = typ + ns + if specific not in self.handlers[xmlns][name]: return - for pack in self.handlers[xmlns][name][typ+ns]: - if pack['func'] == handler: + for handler_dict in self.handlers[xmlns][name][specific]: + if handler_dict['func'] == handler: try: - self.handlers[xmlns][name][typ+ns].remove(pack) + self.handlers[xmlns][name][specific].remove(handler_dict) + log.debug( + 'Unregister handler %s for "%s" type->%s ns->%s(%s)', + handler, name, typ, ns, xmlns) except ValueError: + log.warning( + 'Unregister failed: %s for "%s" type->%s ns->%s(%s)', + handler, name, typ, ns, xmlns) pass def RegisterDefaultHandler(self, handler): @@ -401,16 +419,11 @@ class XMPPDispatcher(PlugIn): else: log.warning('Received unhandled event: %s' % event) - def dispatch(self, stanza, session=None, direct=0): + def dispatch(self, stanza, session=None): """ Main procedure that performs XMPP stanza recognition and calling apppropriate handlers for it. Called by simplexml """ - # FIXME: Where do we set session and direct. Why? What are those intended - # to do? - - #log.info('dispatch called: stanza = %s, session = %s, direct= %s' - # % (stanza, session, direct)) self.Event('', 'STANZA RECEIVED', stanza) @@ -428,8 +441,6 @@ class XMPPDispatcher(PlugIn): xmlns = stanza.getNamespace() - # log.info('in dispatch, getting ns for %s, and the ns is %s' - # % (stanza, xmlns)) if xmlns not in self.handlers: log.warning('Unknown namespace: %s', xmlns) xmlns = 'unknown' @@ -438,14 +449,13 @@ class XMPPDispatcher(PlugIn): if name not in ('features', 'stream'): log.warning('Unknown stanza: %s', stanza) else: - log.debug('Got %s/%s stanza' % (xmlns, name)) + log.debug('Got %s / %s stanza' % (xmlns, name)) name = 'unknown' else: - log.debug('Got %s/%s stanza' % (xmlns, name)) + log.debug('Got %s / %s stanza' % (xmlns, name)) - if stanza.__class__.__name__ == 'Node': - # FIXME: this cannot work - stanza = self.handlers[xmlns][name][type](node=stanza) + # Convert simplexml to Protocol object + stanza = self.handlers[xmlns][name]['type'](node=stanza) typ = stanza.getType() if name == 'message' and not typ: @@ -461,48 +471,55 @@ class XMPPDispatcher(PlugIn): if hasattr(self._owner, 'Smacks'): self._owner.Smacks.count_incoming(stanza.getName()) - list_ = ['default'] # we will use all handlers: - if typ in self.handlers[xmlns][name]: - list_.append(typ) # from very common... - for prop in stanza.props: - if prop in self.handlers[xmlns][name]: - list_.append(prop) - if typ and typ+prop in self.handlers[xmlns][name]: - list_.append(typ+prop) # ...to very particular - - chain = self.handlers[xmlns]['default']['default'] - for key in list_: - if key: - chain = chain + self.handlers[xmlns][name][key] - log.debug('Chain: %s', [key for key in list_ if key]) - + processed = False if ID in session._expected: - user = 0 if isinstance(session._expected[ID], tuple): cb, args = session._expected[ID] - log.debug("Expected stanza arrived. Callback %s(%s) found!" % - (cb, args)) + log.debug('Expected stanza arrived. Callback %s(%s) found', + cb, args) try: cb(session,stanza,**args) - except Exception as typ: - if typ.__class__.__name__ != 'NodeProcessed': - raise + except NodeProcessed: + pass + except Exception: + raise else: - log.debug("Expected stanza arrived!") + log.debug('Expected stanza arrived') session._expected[ID] = stanza - else: - user = 1 + processed = True + + # Gather specifics depending on stanza properties + specifics = ['default'] + if typ and typ in self.handlers[xmlns][name]: + specifics.append(typ) + for prop in stanza.props: + if prop in self.handlers[xmlns][name]: + specifics.append(prop) + if typ and typ + prop in self.handlers[xmlns][name]: + specifics.append(typ + prop) + + # Create the handler chain + chain = [] + chain += self.handlers[xmlns]['default']['default'] + for specific in specifics: + chain += self.handlers[xmlns][name][specific] + + # Sort chain with priority + chain.sort(key=lambda x: x['priority']) + for handler in chain: - if user or handler['system']: + if not processed or handler['system']: try: - log.debug('Call handler: %s', handler['func']) + log.info('Call handler: %s', handler['func'].__qualname__) handler['func'](session, stanza) - except Exception as typ: - if typ.__class__.__name__ != 'NodeProcessed': - self._pendingExceptions.insert(0, sys.exc_info()) - return - user=0 - if user and self._defaultHandler: + except NodeProcessed: + processed = True + except Exception: + self._pendingExceptions.insert(0, sys.exc_info()) + return + + # Stanza was not processed call default handler + if not processed and self._defaultHandler: self._defaultHandler(session, stanza) def _WaitForData(self, data): @@ -592,7 +609,7 @@ class BOSHDispatcher(XMPPDispatcher): """ Send an initial stream header """ - self.Stream = simplexml.NodeBuilder() + self.Stream = NodeBuilder() self.Stream.dispatch = self.dispatch self.Stream._dispatch_depth = 2 self.Stream.stream_header_received = self._check_stream_start @@ -625,7 +642,7 @@ class BOSHDispatcher(XMPPDispatcher): self.restart = False return XMPPDispatcher.ProcessNonBlocking(self, data) - def dispatch(self, stanza, session=None, direct=0): + def dispatch(self, stanza, session=None): if stanza.getName() == 'body' and stanza.getNamespace() == NS_HTTP_BIND: stanza_attrs = stanza.getAttrs() @@ -643,6 +660,6 @@ class BOSHDispatcher(XMPPDispatcher): # rewrite it to jabber:client if child.getNamespace() == NS_HTTP_BIND: child.setNamespace(self._owner.defaultNamespace) - XMPPDispatcher.dispatch(self, child, session, direct) + XMPPDispatcher.dispatch(self, child, session) else: - XMPPDispatcher.dispatch(self, stanza, session, direct) + XMPPDispatcher.dispatch(self, stanza, session) ===================================== nbxmpp/protocol.py ===================================== @@ -118,6 +118,7 @@ NS_MUC_ADMIN = NS_MUC + '#admin' NS_MUC_OWNER = NS_MUC + '#owner' NS_MUC_UNIQUE = NS_MUC + '#unique' 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 ===================================== nbxmpp/roster_nb.py ===================================== @@ -331,7 +331,7 @@ class NonBlockingRoster(PlugIn): Also request roster from server if the 'request' argument is set. Used internally """ - self._owner.RegisterHandler('iq', self.RosterIqHandler, 'result', NS_ROSTER, makefirst = 1) + self._owner.RegisterHandler('iq', self.RosterIqHandler, 'result', NS_ROSTER) self._owner.RegisterHandler('iq', self.RosterIqHandler, 'set', NS_ROSTER) self._owner.RegisterHandler('presence', self.PresenceHandler) if request: ===================================== setup.py ===================================== @@ -3,7 +3,7 @@ from setuptools import setup setup(name='nbxmpp', - version='0.9.90.1', + version='0.9.90.2', description='Non blocking Jabber/XMPP module', author='Yann Leboulanger', author_email='asterix(a)lagaule.org', View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/730a1520220270f68cb38f17e… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/730a1520220270f68cb38f17e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Allow registering handlers for type normal
by Philipp Hörist 19 Dec '18

19 Dec '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 730a1520 by Philipp Hörist at 2018-12-19T14:37:55Z Allow registering handlers for type normal - - - - - 1 changed file: - nbxmpp/dispatcher_nb.py Changes: ===================================== nbxmpp/dispatcher_nb.py ===================================== @@ -448,7 +448,9 @@ class XMPPDispatcher(PlugIn): stanza = self.handlers[xmlns][name][type](node=stanza) typ = stanza.getType() - if not typ: + if name == 'message' and not typ: + typ = 'normal' + elif not typ: typ = '' stanza.props = stanza.getProperties() ID = stanza.getID() @@ -472,6 +474,7 @@ class XMPPDispatcher(PlugIn): for key in list_: if key: chain = chain + self.handlers[xmlns][name][key] + log.debug('Chain: %s', [key for key in list_ if key]) if ID in session._expected: user = 0 View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/730a1520220270f68cb38f17e4… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/730a1520220270f68cb38f17e4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Update status conditions to new namespace
by Philipp Hörist 19 Dec '18

19 Dec '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: d4e70c27 by Philipp Hörist at 2018-12-19T06:41:22Z Update status conditions to new namespace - - - - - 1 changed file: - nbxmpp/protocol.py Changes: ===================================== nbxmpp/protocol.py ===================================== @@ -57,7 +57,7 @@ NS_CHATMARKERS = 'urn:xmpp:chat-markers:0' # XEP-0333 NS_CHATSTATES = 'http://jabber.org/protocol/chatstates' # XEP-0085 NS_CHATTING = 'http://jabber.org/protocol/chatting' # XEP-0194 NS_CLIENT = 'jabber:client' -NS_CONDITIONS = 'urn:xmpp:muc:conditions:0' # XEP-0306 +NS_CONDITIONS = 'urn:xmpp:muc:conditions:1' # XEP-0306 NS_COMMANDS = 'http://jabber.org/protocol/commands' NS_COMPONENT_ACCEPT = 'jabber:component:accept' NS_COMPONENT_1 = 'http://jabberd.jabberstudio.org/ns/component/1.0' @@ -473,6 +473,28 @@ _errorcodes = { 'cancel': 'invalid-from' } +_status_conditions = { + 'realjid-public': 100, + 'affiliation-changed': 101, + 'unavailable-shown': 102, + 'unavailable-not-shown': 103, + 'configuration-changed': 104, + 'self-presence': 110, + 'logging-enabled': 170, + 'logging-disabled': 171, + 'non-anonymous': 172, + 'semi-anonymous': 173, + 'fully-anonymous': 174, + 'room-created': 201, + 'nick-assigned': 210, + 'banned': 301, + 'new-nick': 303, + 'kicked': 307, + 'removed-affiliation': 321, + 'removed-membership': 322, + 'removed-shutdown': 332, +} + STREAM_NOT_AUTHORIZED = 'urn:ietf:params:xml:ns:xmpp-streams not-authorized' STREAM_REMOTE_CONNECTION_FAILED = 'urn:ietf:params:xml:ns:xmpp-streams remote-connection-failed' SASL_MECHANISM_TOO_WEAK = 'urn:ietf:params:xml:ns:xmpp-sasl mechanism-too-weak' @@ -939,16 +961,21 @@ class Protocol(Node): """ return self.getTagAttr('error', 'code') - def getStatusConditions(self): + def getStatusConditions(self, as_code=False): """ Return the status conditions list as defined in XEP-0306. """ - conds = [] - condtag = self.getTag('conditions', namespace=NS_CONDITIONS) - if condtag: - for tag in condtag.getChildren(): - conds.append(tag.getName()) - return conds + result = set() + status_tags = self.getTags('status') + for status in status_tags: + if as_code: + code = status.getAttr('code') + if code is not None: + result.add(code) + else: + for condition in status.getChildren(): + result.add(condition.getName()) + return list(result) def setError(self, error, code=None): """ View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/d4e70c27f3af2ac761e650ec53… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/d4e70c27f3af2ac761e650ec53… You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits December 2018