Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] CI: Fix test and build
by Philipp Hörist 25 Nov '18

25 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: e70ea74f by André Apitzsch at 2018-11-25T22:02:10Z CI: Fix test and build - - - - - 1 changed file: - setup.cfg Changes: ===================================== setup.cfg ===================================== @@ -19,6 +19,8 @@ classifiers = python_requires = >=3.5 packages = find: test_suite = test +dependency_links= + git+https://dev.gajim.org/gajim/python-nbxmpp.git#egg=nbxmpp-0.9.90 install_requires = cssutils>=1.0.2 keyring View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e70ea74f0d0965d3ff44049db0d5d10efd… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e70ea74f0d0965d3ff44049db0d5d10efd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Adapt to nbxmpp API changes
by Philipp Hörist 25 Nov '18

25 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5fa56684 by Philipp Hörist at 2018-11-25T19:02:20Z Adapt to nbxmpp API changes - - - - - 4 changed files: - gajim/common/connection.py - gajim/gajim.py - gajim/gtk/server_info.py - setup.cfg Changes: ===================================== gajim/common/connection.py ===================================== @@ -48,7 +48,8 @@ if sys.platform in ('win32', 'darwin'): import certifi import OpenSSL.crypto import nbxmpp -from nbxmpp import Smacks +from nbxmpp.const import Realm +from nbxmpp.const import Event from gajim import common from gajim.common import helpers @@ -522,6 +523,9 @@ class Connection(CommonConnection, ConnectionHandlers): self.last_sent = [] self.password = passwords.get_password(name) + self._unregister_account = False + self._unregister_account_cb = None + self.music_track_info = 0 self.register_supported = False @@ -545,7 +549,7 @@ class Connection(CommonConnection, ConnectionHandlers): # The SSL Errors that we can override with POSH self._posh_errors = [18, 19] - self.sm = Smacks(self) # Stream Management + self._sm_resume_data = {} # Register all modules modules.register(self) @@ -614,7 +618,6 @@ class Connection(CommonConnection, ConnectionHandlers): app.nec.push_incoming_event(OurShowEvent(None, conn=self, show='connecting')) self.retrycount += 1 - self.on_connect_auth = self._discover_server_at_connection self.connect_and_init(self.old_show, self.status, self.USE_GPG) else: log.info('Reconnect successfull') @@ -625,22 +628,26 @@ class Connection(CommonConnection, ConnectionHandlers): # We are doing disconnect at so many places, better use one function in all def disconnect(self, on_purpose=False): log.info('Disconnect: on_purpose: %s', on_purpose) - app.interface.music_track_changed(None, None, self.name) - self.get_module('PEP').reset_stored_publish() self.on_purpose = on_purpose self.connected = 0 self.time_to_reconnect = None + + if self.connection is None: + return + + app.interface.music_track_changed(None, None, self.name) + self.get_module('PEP').reset_stored_publish() self.get_module('VCardAvatars').avatar_advertised = False - if on_purpose: - self.sm = Smacks(self) - if self.connection: - # make sure previous connection is completely closed - app.proxy65_manager.disconnect(self.connection) - self.terminate_sessions() - self.remove_all_transfers() - self.connection.disconnect() - ConnectionHandlers._unregister_handlers(self) - self.connection = None + + if not on_purpose: + self._sm_resume_data = self.connection.get_resume_data() + + app.proxy65_manager.disconnect(self.connection) + self.terminate_sessions() + self.remove_all_transfers() + self.connection.disconnect() + ConnectionHandlers._unregister_handlers(self) + self.connection = None def set_oldst(self): # Set old state if self.old_show: @@ -663,11 +670,10 @@ class Connection(CommonConnection, ConnectionHandlers): self.old_show = app.SHOW_LIST[self.connected] self.connected = 0 if not self.on_purpose: - if not (self.sm and self.sm.resumption): + if not self.connection.resume_supported: app.nec.push_incoming_event(OurShowEvent(None, conn=self, show='offline')) else: - self.sm.enabled = False app.nec.push_incoming_event(OurShowEvent(None, conn=self, show='error')) if self.connection: @@ -714,20 +720,38 @@ class Connection(CommonConnection, ConnectionHandlers): title=_('Connection with account "%s" has been lost') % self.name, msg=_('Reconnect manually.'))) - def _on_resume_failed(self): - # SM resume failed, set all MUCs offline - # and lose the presence state of all contacts - app.nec.push_incoming_event(OurShowEvent( - None, conn=self, show='offline')) - def _event_dispatcher(self, realm, event, data): CommonConnection._event_dispatcher(self, realm, event, data) - if realm == nbxmpp.NS_STREAM_MGMT: - if event == 'RESUME FAILED': - log.info('Resume failed') + if realm == Realm.CONNECTING: + if event == Event.RESUME_FAILED: + log.info(event) self._on_resume_failed() - elif realm == nbxmpp.NS_REGISTER: + elif event == Event.RESUME_SUCCESSFUL: + log.info(event) + self._on_resume_successful() + + elif 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 + + if realm == nbxmpp.NS_REGISTER: if event == nbxmpp.features_nb.REGISTER_DATA_RECEIVED: # data is (agent, DataFrom, is_form, error_msg) if self.new_account_info and \ @@ -835,15 +859,7 @@ class Connection(CommonConnection, ConnectionHandlers): return self.connection, '' log.info('Connect') - if self.sm.resuming and self.sm.location: - # If resuming and server gave a location, connect from there - hostname = self.sm.location - self.try_connecting_for_foo_secs = app.config.get_per('accounts', - self.name, 'try_connecting_for_foo_secs') - use_custom = False - proxy = helpers.get_proxy_info(self.name) - - elif data: + if data: hostname = data['hostname'] self.try_connecting_for_foo_secs = 45 p = data['proxy'] @@ -861,6 +877,9 @@ class Connection(CommonConnection, ConnectionHandlers): custom_p = data['custom_port'] else: hostname = app.config.get_per('accounts', self.name, 'hostname') + # Connect from location if we resume + hostname = self._sm_resume_data.get('location') or hostname + self.try_connecting_for_foo_secs = app.config.get_per('accounts', self.name, 'try_connecting_for_foo_secs') proxy = helpers.get_proxy_info(self.name) @@ -1037,6 +1056,9 @@ class Connection(CommonConnection, ConnectionHandlers): caller=self, idlequeue=app.idlequeue) + if self._sm_resume_data: + con.set_resume_data(self._sm_resume_data) + # increase default timeout for server responses nbxmpp.dispatcher_nb.DEFAULT_TIMEOUT_SECONDS = \ self.try_connecting_for_foo_secs @@ -1284,7 +1306,7 @@ class Connection(CommonConnection, ConnectionHandlers): auth_mechs = app.config.get_per( 'accounts', self.name, 'authentication_mechanisms').split() for mech in auth_mechs: - if mech not in nbxmpp.auth_nb.SASL_AUTHENTICATION_MECHANISMS | set(['XEP-0078']): + if mech not in nbxmpp.auth_nb.SASL_AUTHENTICATION_MECHANISMS: log.warning('Unknown authentication mechanisms %s', mech) if not auth_mechs: auth_mechs = None @@ -1294,67 +1316,72 @@ class Connection(CommonConnection, ConnectionHandlers): password=self.password, resource=self.server_resource, sasl=True, - on_auth=self.__on_auth, auth_mechs=auth_mechs) def _register_handlers(self, con, con_type): self.peerhost = con.get_peerhost() app.con_types[self.name] = con_type # notify the gui about con_type - app.nec.push_incoming_event(ConnectionTypeEvent(None, - conn=self, connection_type=con_type)) + app.nec.push_incoming_event( + ConnectionTypeEvent(None, conn=self, connection_type=con_type)) ConnectionHandlers._register_handlers(self, con, con_type) - def __on_auth(self, con, auth): - log.info('auth') - if not con: - self.disconnect(on_purpose=True) - app.nec.push_incoming_event(ConnectionLostEvent(None, conn=self, - title=_('Could not connect to "%s"') % self._hostname, - msg=_('Check your connection or try again later.'))) - if self.on_connect_auth: - self.on_connect_auth(None) - self.on_connect_auth = None - return - if not self.connected: # We went offline during connecting process - if self.on_connect_auth: - self.on_connect_auth(None) - self.on_connect_auth = None - return - if hasattr(con, 'Resource'): - self.server_resource = con.Resource - if con._registered_name is not None: - log.info('Bound JID: %s', con._registered_name) - self.registered_name = con._registered_name + def _on_auth_successful(self): + if self._unregister_account: + self._on_unregister_account_connect() + else: + self.connection.bind() + + def _on_auth_failed(self, reason, text): + if not app.config.get_per('accounts', self.name, 'savepass'): + # Forget password, it's wrong + self.password = None + log.debug("Couldn't authenticate to %s", self._hostname) + self.disconnect(on_purpose=True) + app.nec.push_incoming_event( + OurShowEvent(None, conn=self, show='offline')) + app.nec.push_incoming_event(InformationEvent( + None, + conn=self, + level='error', + pri_txt=_('Authentication failed with "%s"') % self._hostname, + sec_txt=_('Please check your login and password for correctness.') + )) + + def _on_resume_failed(self): + # SM resume failed, set show to offline so we lose the presence + # state of all contacts + app.nec.push_incoming_event(OurShowEvent( + None, conn=self, show='offline')) + + def _on_resume_successful(self): + # Connection was successful, reset sm resume data + self._sm_resume_data = {} + + self.connected = 2 + self.retrycount = 0 + self.set_oldst() + + def _on_connection_active(self): + # Connection was successful, reset sm resume data + self._sm_resume_data = {} + + self.server_resource = self.connection.Resource + self.registered_name = self.connection.get_bound_jid() + log.info('Bound JID: %s', self.registered_name) + if app.config.get_per('accounts', self.name, 'anonymous_auth'): # Get jid given by server old_jid = app.get_jid_from_account(self.name) - app.config.set_per('accounts', self.name, 'name', con.User) + app.config.set_per('accounts', self.name, + 'name', self.connection.User) new_jid = app.get_jid_from_account(self.name) - app.nec.push_incoming_event(AnonymousAuthEvent(None, - conn=self, old_jid=old_jid, new_jid=new_jid)) - if auth: - self.connected = 2 - self.retrycount = 0 - if self.on_connect_auth: - self.on_connect_auth(con) - self.on_connect_auth = None - else: - if not app.config.get_per('accounts', self.name, 'savepass'): - # Forget password, it's wrong - self.password = None - log.debug("Couldn't authenticate to %s", self._hostname) - self.disconnect(on_purpose=True) - app.nec.push_incoming_event(OurShowEvent(None, conn=self, - show='offline')) - app.nec.push_incoming_event(InformationEvent(None, conn=self, - level='error', pri_txt=_('Authentication failed with "%s"') % \ - self._hostname, sec_txt=_('Please check your login and password' - ' for correctness.'))) - if self.on_connect_auth: - self.on_connect_auth(None) - self.on_connect_auth = None - # END connect + app.nec.push_incoming_event(AnonymousAuthEvent( + None, conn=self, old_jid=old_jid, new_jid=new_jid)) + + self.connected = 2 + self.retrycount = 0 + self._discover_server() def send_keepalive(self): # nothing received for the last foo seconds @@ -1434,11 +1461,9 @@ class Connection(CommonConnection, ConnectionHandlers): def connect_and_init(self, show, msg, sign_msg): self.continue_connect_info = [show, msg, sign_msg] - self.on_connect_auth = self._discover_server_at_connection self.connect_and_auth() - def _discover_server_at_connection(self, con): - self.connection = con + def _discover_server(self): if not app.account_is_connected(self.name): return @@ -1447,15 +1472,10 @@ class Connection(CommonConnection, ConnectionHandlers): self.pingalives, self.get_module('Ping').send_keepalive_ping) self.connection.onreceive(None) - # If we are not resuming, we ask for discovery info - # and archiving preferences - if not self.sm.supports_sm or (not self.sm.resuming and self.sm.enabled): - # This starts the connect_machine - self.get_module('Discovery').discover_server_info() - self.get_module('Discovery').discover_account_info() - self.get_module('Discovery').discover_server_items() + self.get_module('Discovery').discover_server_info() + self.get_module('Discovery').discover_account_info() + self.get_module('Discovery').discover_server_items() - self.sm.resuming = False # back to previous state # Discover Stun server(s) if self._proxy is None: hostname = app.config.get_per('accounts', self.name, 'hostname') @@ -1852,35 +1872,40 @@ class Connection(CommonConnection, ConnectionHandlers): self.pasword_callback = None def unregister_account(self, on_remove_success): - # no need to write this as a class method and keep the value of - # on_remove_success as a class property as pass it as an argument - def _on_unregister_account_connect(con): - self.on_connect_auth = None - self.removing_account = True - if app.account_is_connected(self.name): - hostname = app.config.get_per('accounts', self.name, 'hostname') - iq = nbxmpp.Iq(typ='set', to=hostname) - id_ = self.connection.getAnID() - iq.setID(id_) - iq.setTag(nbxmpp.NS_REGISTER + ' query').setTag('remove') - def _on_answer(con, result): - if result.getID() == id_: - on_remove_success(True) - return - app.nec.push_incoming_event(InformationEvent( - None, dialog_name='unregister-error', - kwargs={'server': hostname, 'error': result.getErrorMsg()})) - on_remove_success(False) - con.RegisterHandler('iq', _on_answer, 'result', system=True) - con.SendAndWaitForResponse(iq) - return - on_remove_success(False) - self.removing_account = False + self._unregister_account = True + self._unregister_account_cb = on_remove_success if self.connected == 0: - self.on_connect_auth = _on_unregister_account_connect self.connect_and_auth() else: - _on_unregister_account_connect(self.connection) + self._on_unregister_account_connect() + + def _on_unregister_account_connect(self): + self.removing_account = True + if app.account_is_connected(self.name): + hostname = app.config.get_per('accounts', self.name, 'hostname') + iq = nbxmpp.Iq(typ='set', to=hostname) + id_ = self.connection.getAnID() + iq.setID(id_) + iq.setTag(nbxmpp.NS_REGISTER + ' query').setTag('remove') + def _on_answer(con, result): + if result.getID() == id_: + self._on_unregister_finished(True) + return + app.nec.push_incoming_event(InformationEvent( + None, dialog_name='unregister-error', + kwargs={'server': hostname, 'error': result.getErrorMsg()})) + self._on_unregister_finished(False) + self.connection.RegisterHandler( + 'iq', _on_answer, 'result', system=True) + self.connection.SendAndWaitForResponse(iq) + return + self._on_unregister_finished(False) + self.removing_account = False + + def _on_unregister_finished(self, result): + self._unregister_account_cb(result) + self._unregister_account = False + self._unregister_account_cb = None def _reconnect_alarm(self): if not app.config.get_per('accounts', self.name, 'active'): ===================================== gajim/gajim.py ===================================== @@ -27,7 +27,7 @@ from distutils.version import LooseVersion as V # Install _() in namespace from gajim.common import i18n -_MIN_NBXMPP_VER = "0.6.8" +_MIN_NBXMPP_VER = "0.9.90" _MIN_GTK_VER = "3.22.0" ===================================== gajim/gtk/server_info.py ===================================== @@ -176,7 +176,7 @@ class ServerInfoDialog(Gtk.Dialog): con.get_module('Blocking').supported, nbxmpp.NS_BLOCKING, None), Feature('XEP-0198: Stream Management', - con.sm.enabled, nbxmpp.NS_STREAM_MGMT, None), + con.connection.sm_enabled, nbxmpp.NS_STREAM_MGMT, None), Feature('XEP-0258: Security Labels in XMPP', con.get_module('SecLabels').supported, nbxmpp.NS_SECLABEL, None), ===================================== setup.cfg ===================================== @@ -22,7 +22,7 @@ test_suite = test install_requires = cssutils>=1.0.2 keyring - nbxmpp>=0.6.8,<0.7.0 + nbxmpp>=0.9.90 precis-i18n>=1.0.0 pyOpenSSL>=0.12 View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5fa56684c71a892a25785240eff13876d7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5fa56684c71a892a25785240eff13876d7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Update .gitignore
by Philipp Hörist 25 Nov '18

25 Nov '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 823b7ae5 by Philipp Hörist at 2018-11-25T18:51:28Z Update .gitignore - - - - - 1 changed file: - .gitignore Changes: ===================================== .gitignore ===================================== @@ -1,2 +1,4 @@ build/ __pycache__/ +nbxmpp.egg-info +dist View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/823b7ae5ee2d78f33be18adc06… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/823b7ae5ee2d78f33be18adc06… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Test: Use Mock from standard library
by Philipp Hörist 25 Nov '18

25 Nov '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: fabdaa4e by André Apitzsch at 2018-11-25T13:16:55Z Test: Use Mock from standard library - - - - - 02604951 by Philipp Hörist at 2018-11-25T18:49:54Z Merge branch 'mock' into 'master' Test: Use Mock from standard library See merge request gajim/python-nbxmpp!20 - - - - - 5 changed files: - test/broken/test_xmpp_smacks.py - − test/lib/mock.py - test/lib/xmpp_mocks.py - test/unit/test_xmpp_client_nb.py - test/unit/test_xmpp_dispatcher_nb.py Changes: ===================================== test/broken/test_xmpp_smacks.py ===================================== @@ -18,7 +18,6 @@ class TestDispatcherNB(unittest.TestCase): # Setup mock client self.client = Mock() - self.client._caller = Mock() self.client.defaultNamespace = protocol.NS_CLIENT self.client.Connection = Mock() # mock transport self.con = self.client.Connection ===================================== test/lib/mock.py deleted ===================================== @@ -1,463 +0,0 @@ -# -# (c) Dave Kirby 2001 - 2005 -# mock(a)thedeveloperscoach.com -# -# Original call interceptor and call assertion code by Phil Dawes (pdawes(a)users.sourceforge.net) -# Call interceptor code enhanced by Bruce Cropley (cropleyb(a)yahoo.com.au) -# -# This Python module and associated files are released under the FreeBSD -# license. Essentially, you can do what you like with it except pretend you wrote -# it yourself. -# -# -# Copyright (c) 2005, Dave Kirby -# Copyright (c) 2009, Yann Leboulanger -# -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# * Neither the name of this library nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR -# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# mock(a)thedeveloperscoach.com - - -""" -Mock object library for Python. Mock objects can be used when unit testing -to remove a dependency on another production class. They are typically used -when the dependency would either pull in lots of other classes, or -significantly slow down the execution of the test. -They are also used to create exceptional conditions that cannot otherwise -be easily triggered in the class under test. -""" - -__version__ = "0.1.0" - -# Added in Python 2.1 -import inspect -import re - -class MockInterfaceError(Exception): - pass - -class Mock(object): - """ - The Mock class emulates any other class for testing purposes. - All method calls are stored for later examination. - """ - - def __init__(self, returnValues=None, realClass=None): - """ - The Mock class constructor takes a dictionary of method names and - the values they return. Methods that are not in the returnValues - dictionary will return None. - You may also supply a class whose interface is being mocked. - All calls will be checked to see if they appear in the original - interface. Any calls to methods not appearing in the real class - will raise a MockInterfaceError. Any calls that would fail due to - non-matching parameter lists will also raise a MockInterfaceError. - Both of these help to prevent the Mock class getting out of sync - with the class it is Mocking. - """ - self.mockCalledMethods = {} - self.mockAllCalledMethods = [] - self.mockReturnValues = returnValues or {} - self.mockExpectations = {} - self.realClass = realClass - self.realClassMethods = None - if realClass: - self.realClassMethods = dict(inspect.getmembers(realClass, inspect.isroutine)) - for retMethod in self.mockReturnValues.keys(): - if retMethod not in self.realClassMethods: - raise MockInterfaceError("Return value supplied for method '%s' that was not in the original class" % retMethod) - self._setupSubclassMethodInterceptors() - - def _setupSubclassMethodInterceptors(self): - methods = inspect.getmembers(self.realClass, inspect.isroutine) - baseMethods = dict(inspect.getmembers(Mock, inspect.ismethod)) - for m in methods: - name = m[0] - # Don't record calls to methods of Mock base class. - if not name in baseMethods: - self.__dict__[name] = MockCallable(name, self, handcrafted=True) - - def __getattr__(self, name): - return MockCallable(name, self) - - def mockAddReturnValues(self, **methodReturnValues ): - self.mockReturnValues.update(methodReturnValues) - - def mockSetExpectation(self, name, testFn, after=0, until=0): - self.mockExpectations.setdefault(name, []).append((testFn, after, until)) - - def _checkInterfaceCall(self, name, callParams, callKwParams): - """ - Check that a call to a method of the given name to the original - class with the given parameters would not fail. If it would fail, - raise a MockInterfaceError. - Based on the Python 2.3.3 Reference Manual section 5.3.4: Calls. - """ - if self.realClassMethods is None: - return - if name not in self.realClassMethods: - return - - func = self.realClassMethods[name] - try: - args, varargs, varkw, defaults = inspect.getargspec(func) - except TypeError: - # func is not a Python function. It is probably a builtin, - # such as __repr__ or __coerce__. TODO: Checking? - # For now assume params are OK. - return - - # callParams doesn't include self; args does include self. - numPosCallParams = 1 + len(callParams) - - if numPosCallParams > len(args) and not varargs: - raise MockInterfaceError("Original %s() takes at most %s arguments (%s given)" % - (name, len(args), numPosCallParams)) - - # Get the number of positional arguments that appear in the call, - # also check for duplicate parameters and unknown parameters - numPosSeen = _getNumPosSeenAndCheck(numPosCallParams, callKwParams, args, varkw) - - lenArgsNoDefaults = len(args) - len(defaults or []) - if numPosSeen < lenArgsNoDefaults: - raise MockInterfaceError("Original %s() takes at least %s arguments (%s given)" % (name, lenArgsNoDefaults, numPosSeen)) - - def mockGetAllCalls(self): - """ - Return a list of MockCall objects, - representing all the methods in the order they were called. - """ - return self.mockAllCalledMethods - getAllCalls = mockGetAllCalls # deprecated - kept for backward compatibility - - def mockGetNamedCalls(self, methodName): - """ - Return a list of MockCall objects, - representing all the calls to the named method in the order they were called. - """ - return self.mockCalledMethods.get(methodName, []) - getNamedCalls = mockGetNamedCalls # deprecated - kept for backward compatibility - - def mockCheckCall(self, index, name, *args, **kwargs): - '''test that the index-th call had the specified name and parameters''' - call = self.mockAllCalledMethods[index] - assert name == call.getName(), "%r != %r" % (name, call.getName()) - call.checkArgs(*args, **kwargs) - - -def _getNumPosSeenAndCheck(numPosCallParams, callKwParams, args, varkw): - """ - Positional arguments can appear as call parameters either named as - a named (keyword) parameter, or just as a value to be matched by - position. Count the positional arguments that are given by either - keyword or position, and check for duplicate specifications. - Also check for arguments specified by keyword that do not appear - in the method's parameter list. - """ - posSeen = {} - for arg in args[:numPosCallParams]: - posSeen[arg] = True - for kwp in callKwParams: - if kwp in posSeen: - raise MockInterfaceError("%s appears as both a positional and named parameter." % kwp) - if kwp in args: - posSeen[kwp] = True - elif not varkw: - raise MockInterfaceError("Original method does not have a parameter '%s'" % kwp) - return len(posSeen) - -class MockCall: - """ - MockCall records the name and parameters of a call to an instance - of a Mock class. Instances of MockCall are created by the Mock class, - but can be inspected later as part of the test. - """ - def __init__(self, name, params, kwparams ): - self.name = name - self.params = params - self.kwparams = kwparams - - def checkArgs(self, *args, **kwargs): - assert args == self.params, "%r != %r" % (args, self.params) - assert kwargs == self.kwparams, "%r != %r" % (kwargs, self.kwparams) - - def getParam( self, n ): - if isinstance(n, int): - return self.params[n] - elif isinstance(n, str): - return self.kwparams[n] - else: - raise IndexError('illegal index type for getParam') - - def getNumParams(self): - return len(self.params) - - def getNumKwParams(self): - return len(self.kwparams) - - def getName(self): - return self.name - - #pretty-print the method call - def __str__(self): - s = self.name + "(" - sep = '' - for p in self.params: - s = s + sep + repr(p) - sep = ', ' - items = sorted(self.kwparams.items()) - for k, v in items: - s = s + sep + k + '=' + repr(v) - sep = ', ' - s = s + ')' - return s - def __repr__(self): - return self.__str__() - -class MockCallable: - """ - Intercepts the call and records it, then delegates to either the mock's - dictionary of mock return values that was passed in to the constructor, - or a handcrafted method of a Mock subclass. - """ - def __init__(self, name, mock, handcrafted=False): - self.name = name - self.mock = mock - self.handcrafted = handcrafted - - def __call__(self, *params, **kwparams): - self.mock._checkInterfaceCall(self.name, params, kwparams) - thisCall = self.recordCall(params, kwparams) - self.checkExpectations(thisCall, params, kwparams) - return self.makeCall(params, kwparams) - - def recordCall(self, params, kwparams): - """ - Record the MockCall in an ordered list of all calls, and an ordered - list of calls for that method name. - """ - thisCall = MockCall(self.name, params, kwparams) - calls = self.mock.mockCalledMethods.setdefault(self.name, []) - calls.append(thisCall) - self.mock.mockAllCalledMethods.append(thisCall) - return thisCall - - def makeCall(self, params, kwparams): - if self.handcrafted: - allPosParams = (self.mock,) + params - func = _findFunc(self.mock.realClass, self.name) - if not func: - raise NotImplementedError - return func(*allPosParams, **kwparams) - else: - returnVal = self.mock.mockReturnValues.get(self.name) - if isinstance(returnVal, ReturnValuesBase): - returnVal = returnVal.next() - return returnVal - - def checkExpectations(self, thisCall, params, kwparams): - if self.name in self.mock.mockExpectations: - callsMade = len(self.mock.mockCalledMethods[self.name]) - for (expectation, after, until) in self.mock.mockExpectations[self.name]: - if callsMade > after and (until==0 or callsMade < until): - assert expectation(self.mock, thisCall, len(self.mock.mockAllCalledMethods)-1), 'Expectation failed: '+str(thisCall) - - -def _findFunc(cl, name): - """ Depth first search for a method with a given name. """ - if name in cl.__dict__: - return cl.__dict__[name] - for base in cl.__bases__: - func = _findFunc(base, name) - if func: - return func - return None - - - -class ReturnValuesBase: - def next(self): - try: - return self.iter.next() - except StopIteration: - raise AssertionError("No more return values") - def __iter__(self): - return self - -class ReturnValues(ReturnValuesBase): - def __init__(self, *values): - self.iter = iter(values) - - -class ReturnIterator(ReturnValuesBase): - def __init__(self, iterator): - self.iter = iter(iterator) - - -def expectParams(*params, **keywords): - '''check that the callObj is called with specified params and keywords - ''' - def fn(mockObj, callObj, idx): - return callObj.params == params and callObj.kwparams == keywords - return fn - - -def expectAfter(*methods): - '''check that the function is only called after all the functions in 'methods' - ''' - def fn(mockObj, callObj, idx): - calledMethods = [method.getName() for method in mockObj.mockGetAllCalls()] - #skip last entry, since that is the current call - calledMethods = calledMethods[:-1] - for method in methods: - if method not in calledMethods: - return False - return True - return fn - -def expectException(exception, *args, **kwargs): - ''' raise an exception when the method is called - ''' - def fn(mockObj, callObj, idx): - raise exception(*args, **kwargs) - return fn - - -def expectParam(paramIdx, cond): - '''check that the callObj is called with parameter specified by paramIdx (a position index or keyword) - fulfills the condition specified by cond. - cond is a function that takes a single argument, the value to test. - ''' - def fn(mockObj, callObj, idx): - param = callObj.getParam(paramIdx) - return cond(param) - return fn - -def EQ(value): - def testFn(param): - return param == value - return testFn - -def NE(value): - def testFn(param): - return param != value - return testFn - -def GT(value): - def testFn(param): - return param > value - return testFn - -def LT(value): - def testFn(param): - return param < value - return testFn - -def GE(value): - def testFn(param): - return param >= value - return testFn - -def LE(value): - def testFn(param): - return param <= value - return testFn - -def AND(*condlist): - def testFn(param): - for cond in condlist: - if not cond(param): - return False - return True - return testFn - -def OR(*condlist): - def testFn(param): - for cond in condlist: - if cond(param): - return True - return False - return testFn - -def NOT(cond): - def testFn(param): - return not cond(param) - return testFn - -def MATCHES(regex, *args, **kwargs): - compiled_regex = re.compile(regex, *args, **kwargs) - def testFn(param): - return compiled_regex.match(param) is not None - return testFn - -def SEQ(*sequence): - iterator = iter(sequence) - def testFn(param): - try: - cond = iterator.next() - except StopIteration: - raise AssertionError('SEQ exhausted') - return cond(param) - return testFn - -def IS(instance): - def testFn(param): - return param is instance - return testFn - -def ISINSTANCE(class_): - def testFn(param): - return isinstance(param, class_) - return testFn - -def ISSUBCLASS(class_): - def testFn(param): - return issubclass(param, class_) - return testFn - -def CONTAINS(val): - def testFn(param): - return val in param - return testFn - -def IN(container): - def testFn(param): - return param in container - return testFn - -def HASATTR(attr): - def testFn(param): - return hasattr(param, attr) - return testFn - -def HASMETHOD(method): - def testFn(param): - return hasattr(param, method) and callable(getattr(param, method)) - return testFn - -CALLABLE = callable ===================================== test/lib/xmpp_mocks.py ===================================== @@ -4,7 +4,7 @@ Module with dummy classes for unit testing of XMPP and related code. import threading, time -from test.lib.mock import Mock +from unittest.mock import Mock from nbxmpp import idlequeue ===================================== test/unit/test_xmpp_client_nb.py ===================================== @@ -5,9 +5,10 @@ It actually connects to a xmpp server. ''' import unittest +from unittest.mock import Mock from test.lib.xmpp_mocks import MockConnection, IdleQueueThread -from test.lib.mock import Mock + from nbxmpp import client_nb # (XMPP server hostname, c2s port). Script will connect to the machine. @@ -56,7 +57,7 @@ class TestNonBlockingClient(unittest.TestCase): self.client = client_nb.NonBlockingClient( domain=server_port[0], idlequeue=self.idlequeue_thread.iq, - caller=Mock(realClass=TempConnection)) + caller=Mock(spec=TempConnection)) self.client.connect( hostname=server_port[0], ===================================== test/unit/test_xmpp_dispatcher_nb.py ===================================== @@ -19,7 +19,6 @@ class TestDispatcherNB(unittest.TestCase): # Setup mock client self.client = Mock() - self.client._caller = Mock() 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/compare/633e0dd25ec69f63924d6d508… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/633e0dd25ec69f63924d6d508… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 5 commits: Refactor way to active connection
by Philipp Hörist 25 Nov '18

25 Nov '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: a228171c by Philipp Hörist at 2018-11-25T11:41:02Z Refactor way to active connection - Rewrite the Stream Managment implementation - Add new events to give clients more control over the connection process - Add new method bind(), so the client can choose when to bind - Remove support for legacy auth XEP-0078 - Pass auth failure text and reason to AUTH_FAILED event - - - - - 7f0707fa by Philipp Hörist at 2018-11-25T11:41:10Z Fix Tests - - - - - fd8a42b9 by Philipp Hörist at 2018-11-25T11:52:41Z Remove python2 legacy code - - - - - dae802bf by Philipp Hörist at 2018-11-25T11:52:47Z Sort imports - - - - - 633e0dd2 by Philipp Hörist at 2018-11-25T11:59:07Z Merge branch 'master' into 'master' Refactor and cleanup python2 code See merge request gajim/python-nbxmpp!21 - - - - - 17 changed files: - nbxmpp/auth_nb.py - nbxmpp/bosh.py - nbxmpp/client_nb.py - + nbxmpp/const.py - nbxmpp/dispatcher_nb.py - nbxmpp/idlequeue.py - nbxmpp/protocol.py - nbxmpp/proxy_connectors.py - nbxmpp/roster_nb.py - nbxmpp/simplexml.py - nbxmpp/smacks.py - nbxmpp/tls_nb.py - nbxmpp/transports_nb.py - setup.cfg - test/unit/test_xmpp_smacks.py → test/broken/test_xmpp_smacks.py - test/unit/test_xmpp_dispatcher_nb.py - test/unit/test_xmpp_transports_nb2.py Changes: ===================================== nbxmpp/auth_nb.py ===================================== @@ -21,22 +21,24 @@ Can be used both for client and transport authentication See client_nb.py """ -from __future__ import unicode_literals - -from .protocol import NS_SASL, NS_SESSION, NS_STREAMS, NS_BIND, NS_AUTH -from .protocol import NS_STREAM_MGMT -from .protocol import Node, NodeProcessed, isResultNode, Iq, Protocol, JID -from .plugin import PlugIn -import sys import re import os import binascii import base64 -from . import dispatcher_nb import hmac import hashlib - import logging + +from .protocol import NS_SASL, NS_SESSION, NS_STREAMS, NS_BIND +from .protocol import NS_STREAM_MGMT +from .protocol import Node, NodeProcessed, isResultNode, Protocol +from .protocol import SASL_ERROR_CONDITIONS +from .plugin import PlugIn +from .const import Realm +from .const import Event + +from . import dispatcher_nb + log = logging.getLogger('nbxmpp.auth_nb') def HH(some): return hashlib.md5(some).hexdigest() @@ -307,8 +309,8 @@ class SASL(PlugIn): data=data.decode('utf-8') ### Handle Auth result - def on_auth_fail(reason): - log.info('Failed SASL authentification: %s' % reason) + def on_auth_fail(reason, text=None): + log.info('Failed SASL authentification: %s %s', reason, text) self._owner.send(str(Node('abort', attrs={'xmlns': NS_SASL}))) if len(self.mecs) > 0: # There are other mechanisms to test, but wait for <failure> @@ -316,7 +318,7 @@ class SASL(PlugIn): self.startsasl = SASL_FAILURE_IN_PROGRESS raise NodeProcessed if self.on_sasl: - self.on_sasl() + self.on_sasl((reason, text)) raise NodeProcessed if challenge.getName() == 'failure': @@ -324,11 +326,19 @@ class SASL(PlugIn): self.MechanismHandler() raise NodeProcessed self.startsasl = SASL_FAILURE - try: - reason = challenge.getChildren()[0] - except Exception: - reason = challenge - on_auth_fail(reason) + + text = challenge.getTagData('text') + reason = 'not-authorized' + childs = challenge.getChildren() + for child in childs: + name = child.getName() + if name == 'text': + continue + if name in SASL_ERROR_CONDITIONS: + reason = name + break + on_auth_fail(reason, text) + elif challenge.getName() == 'success': if self.mechanism in ('SCRAM-SHA-1', 'SCRAM-SHA-1-PLUS'): # check data-with-success @@ -383,14 +393,9 @@ class SASL(PlugIn): def HMAC(k, s): return hmac.new(key=k, msg=s, digestmod=hashfn).digest() - if sys.version_info[0] == 2: - def XOR(x, y): - r = (chr(ord(px) ^ ord(py)) for px, py in zip(x, y)) - return bytes(b''.join(r)) - else: - def XOR(x, y): - r = [px ^ py for px, py in zip(x, y)] - return bytes(r) + def XOR(x, y): + r = [px ^ py for px, py in zip(x, y)] + return bytes(r) def Hi(s, salt, iters): ii = 1 @@ -555,101 +560,6 @@ class SASL(PlugIn): self._owner.send(str(node)) -class NonBlockingNonSASL(PlugIn): - """ - Implements old Non-SASL (XEP-0078) authentication used in jabberd1.4 and - transport authentication - """ - - def __init__(self, user, password, resource, on_auth): - """ - Caches username, password and resource for auth - """ - PlugIn.__init__(self) - self.user = user - if password is None: - self.password = '' - else: - self.password = password - self.resource = resource - self.on_auth = on_auth - - def plugin(self, owner): - """ - Determine the best auth method (digest/0k/plain) and use it for auth. - Returns used method name on success. Used internally - """ - log.info('Querying server about possible auth methods') - self.owner = owner - - owner.Dispatcher.SendAndWaitForResponse( - Iq('get', NS_AUTH, payload=[Node('username', payload=[self.user])]), - func=self._on_username) - - def _on_username(self, resp): - if not isResultNode(resp): - log.info('No result node arrived! Aborting...') - return self.on_auth(None) - - iq=Iq(typ='set', node=resp) - query = iq.getTag('query') - query.setTagData('username', self.user) - query.setTagData('resource', self.resource) - - if query.getTag('digest'): - log.info("Performing digest authentication") - query.setTagData('digest', - hashlib.sha1(self.owner.Dispatcher.Stream._document_attrs['id'] - + self.password).hexdigest()) - if query.getTag('password'): - query.delChild('password') - self._method = 'digest' - elif query.getTag('token'): - token = query.getTagData('token') - seq = query.getTagData('sequence') - log.info("Performing zero-k authentication") - - def hasher(s): - return hashlib.sha1(s).hexdigest() - - def hash_n_times(s, count): - return count and hasher(hash_n_times(s, count-1)) or s - - hash_ = hash_n_times(hasher(hasher(self.password) + token), - int(seq)) - query.setTagData('hash', hash_) - self._method='0k' - else: - log.warning("Secure methods unsupported, performing plain text \ - authentication") - self._method = 'plain' - self._owner._caller.get_password(self._on_password, self._method) - return - resp = self.owner.Dispatcher.SendAndWaitForResponse(iq, - func=self._on_auth) - - def _on_password(self, password): - self.password = '' if password is None else password - iq=Iq('set', NS_AUTH) - query = iq.getTag('query') - query.setTagData('username', self.user) - query.setTagData('resource', self.resource) - query.setTagData('password', self.password) - resp = self.owner.Dispatcher.SendAndWaitForResponse(iq, - func=self._on_auth) - - def _on_auth(self, resp): - if isResultNode(resp): - log.info('Sucessfully authenticated with remote host.') - self.owner.User = self.user - self.owner.Resource = self.resource - self.owner._registered_name = self.owner.User + '@' + \ - self.owner.Server+ '/' + self.owner.Resource - return self.on_auth(self._method) - log.info('Authentication failed!') - return self.on_auth(None) - - class NonBlockingBind(PlugIn): """ Bind some JID to the current connection to allow router know of our @@ -658,119 +568,91 @@ class NonBlockingBind(PlugIn): def __init__(self): PlugIn.__init__(self) - self.bound = None - self.supports_sm = False - self.resuming = False + self._session_required = False - def plugin(self, owner): - """ Start resource binding, if allowed at this time. Used internally. """ - if self._owner.Dispatcher.Stream.features: - try: - self.FeaturesHandler(self._owner.Dispatcher, - self._owner.Dispatcher.Stream.features) - except NodeProcessed: - pass - else: - self._owner.RegisterHandler('features', self.FeaturesHandler, - xmlns=NS_STREAMS) + def plugin(self, _owner): + self._owner.RegisterHandler( + 'features', self.FeaturesHandler, xmlns=NS_STREAMS) + # Execute the Handler manually, maybe we registered the features + # handler to late. This can happen when the client does not call + # bind() immediately + self.FeaturesHandler(None, self._owner.Dispatcher.Stream.features) - def FeaturesHandler(self, conn, feats): + def FeaturesHandler(self, con, feats): """ Determine if server supports resource binding and set some internal attributes accordingly. - - It also checks if server supports stream management """ - - if feats.getTag('sm', namespace=NS_STREAM_MGMT): - self.supports_sm = True # server supports stream management - if self.resuming: - self._owner._caller.sm.resume_request() - - if not feats.getTag('bind', namespace=NS_BIND): - log.info('Server does not requested binding.') - # we try to bind resource anyway - #self.bound='failure' - self.bound = [] + if not feats or not feats.getTag('bind', namespace=NS_BIND): return - self.session = -1 session = feats.getTag('session', namespace=NS_SESSION) if session is not None: if session.getTag('optional') is None: - self.session = 1 + self._session_required = True - self.bound = [] + self.NonBlockingBind() def plugout(self): """ Remove Bind handler from owner's dispatcher. Used internally """ - self._owner.UnregisterHandler('features', self.FeaturesHandler, - xmlns=NS_STREAMS) + self._owner.UnregisterHandler( + 'features', self.FeaturesHandler, xmlns=NS_STREAMS) - def NonBlockingBind(self, resource=None, on_bound=None): + def NonBlockingBind(self): """ Perform binding. Use provided resource name or random (if not provided). """ - if self.resuming: # We don't bind if we resume the stream - return - self.on_bound = on_bound - self._resource = resource - if self._resource: - self._resource = [Node('resource', payload=[self._resource])] - else: - self._resource = [] - self._owner.onreceive(None) + resource = [] + if self._owner._Resource: + resource = [Node('resource', payload=[self._owner._Resource])] + self._owner.Dispatcher.SendAndWaitForResponse( Protocol('iq', typ='set', payload=[Node('bind', - attrs={'xmlns': NS_BIND}, payload=self._resource)]), + attrs={'xmlns': NS_BIND}, payload=resource)]), func=self._on_bound) def _on_bound(self, resp): if isResultNode(resp): - if resp.getTag('bind') and resp.getTag('bind').getTagData('jid'): - self.bound.append(resp.getTag('bind').getTagData('jid')) - log.info('Successfully bound %s.' % self.bound[-1]) - jid = JID(resp.getTag('bind').getTagData('jid')) - self._owner._registered_name = jid - self._owner.User = jid.getNode() - self._owner.Resource = jid.getResource() - # Only negociate stream management after bounded - if self.supports_sm: - # starts negociation - sm = self._owner._caller.sm - sm.supports_sm = True - sm.set_owner(self._owner) - sm.negociate() - self._owner.Dispatcher.sm = sm - - if hasattr(self, 'session') and self.session == -1: + bind = resp.getTag('bind') + if bind is not None: + jid = bind.getTagData('jid') + log.info('Successfully bound %s', jid) + self._owner.set_bound_jid(jid) + + if not self._session_required: # Server don't want us to initialize a session - log.info('No session required.') - self._owner._caller.sm.resend_queue() #resend old messages still in the smacks queue - self.on_bound('ok') + log.info('No session required') + self._on_bind_successful() else: - self._owner.SendAndWaitForResponse(Protocol('iq', typ='set', - payload=[Node('session', attrs={'xmlns':NS_SESSION})]), - func=self._on_session) + node = Node('session', attrs={'xmlns':NS_SESSION}) + iq = Protocol('iq', typ='set', payload=[node]) + self._owner.SendAndWaitForResponse( + iq, func=self._on_session) + self.PlugOut() return if resp: - log.info('Binding failed: %s.' % resp.getTag('error')) - self.on_bound(None) + log.error('Binding failed: %s.', resp.getTag('error')) else: - log.info('Binding failed: timeout expired.') - self.on_bound(None) + log.error('Binding failed: timeout expired') + self._owner.Connection.start_disconnect() + self._owner.Dispatcher.Event(Realm.CONNECTING, Event.BIND_FAILED) + self.PlugOut() def _on_session(self, resp): - self._owner.onreceive(None) if isResultNode(resp): - log.info('Successfully opened session.') - self.session = 1 - self._owner._caller.sm.resend_queue() #resend old messages still in the smacks queue - self.on_bound('ok') + log.info('Successfully started session') + self._on_bind_successful() else: - log.error('Session open failed.') - self.session = 0 - self.on_bound(None) + log.error('Session open failed') + self._owner.Connection.start_disconnect() + self._owner.Dispatcher.Event(Realm.CONNECTING, Event.SESSION_FAILED) + self.PlugOut() + + def _on_bind_successful(self): + feats = self._owner.Dispatcher.Stream.features + if feats.getTag('sm', namespace=NS_STREAM_MGMT): + self._owner.Smacks.send_enable() + self._owner.Dispatcher.Event(Realm.CONNECTING, Event.CONNECTION_ACTIVE) ===================================== nbxmpp/bosh.py ===================================== @@ -20,14 +20,15 @@ import os import binascii import locale +import logging from hashlib import sha1 + from .transports_nb import NonBlockingTransport, NonBlockingHTTPBOSH,\ CONNECTED, CONNECTING, DISCONNECTED, DISCONNECTING,\ urisplit, DISCONNECT_TIMEOUT_SECONDS from .protocol import BOSHBody, Protocol, NS_CLIENT -from .simplexml import Node -import logging + log = logging.getLogger('nbxmpp.bosh') KEY_COUNT = 10 @@ -145,7 +146,7 @@ class NonBlockingBOSH(NonBlockingTransport): #Hack for making the non-secure warning dialog work if self._owner.got_features: - if (hasattr(self._owner, 'NonBlockingNonSASL') or hasattr(self._owner, 'SASL')): + if hasattr(self._owner, 'SASL'): self.send_BOSH(None) else: # If we already got features and no auth module was plugged yet, we are ===================================== nbxmpp/client_nb.py ===================================== @@ -19,11 +19,18 @@ Client class establishes connection to XMPP Server and handles authentication """ import socket +import logging + from . import transports_nb, dispatcher_nb, auth_nb, roster_nb, protocol, bosh from .protocol import NS_TLS +from .protocol import JID from .auth_nb import SASL_AUTHENTICATION_MECHANISMS +from .auth_nb import NonBlockingBind +from .smacks import Smacks +from .const import Realm +from .const import Event + -import logging log = logging.getLogger('nbxmpp.client_nb') @@ -57,7 +64,7 @@ class NonBlockingClient(object): # the EventDispatcher self._caller = caller self._owner = self - self._registered_name = None # our full jid, set after successful auth + self._registered_name = None # our full jid, set after successful bind self.connected = '' self.ip_addresses = [] self.socket = None @@ -72,6 +79,45 @@ class NonBlockingClient(object): self.protocol_type = 'XMPP' self.alpn = False + # Smacks must retain data over multiple connects/disconnects + Smacks.get_instance().PlugIn(self) + + def set_resume_data(self, data): + ''' + Dict with values we pass to Smacks for session resumption + This is only needed if between reconnects a new NonBlockingClient + instance is created + ''' + self.Smacks.set_resume_data(data) + + def get_resume_data(self): + ''' + returns a dict with values that are necessary to resume a stream + see set_resume_data() + ''' + if not self.sm_enabled or not self.resume_supported: + return {} + return self.Smacks.get_resume_data() + + @property + def sm_enabled(self): + return self.Smacks.enabled + + @property + def resume_supported(self): + return self.Smacks.resume_supported + + def set_bound_jid(self, jid): + if jid is None: + return + jid = JID(jid) + self._registered_name = jid + self.User = jid.getNode() + self.Resource = jid.getResource() + + def get_bound_jid(self): + return self._registered_name + def disconnect(self, message=''): """ Called on disconnection - disconnect callback is picked based on state of @@ -88,10 +134,6 @@ class NonBlockingClient(object): sasl_failed = False if 'NonBlockingRoster' in self.__dict__: self.NonBlockingRoster.PlugOut() - if 'NonBlockingBind' in self.__dict__: - self.NonBlockingBind.PlugOut() - if 'NonBlockingNonSASL' in self.__dict__: - self.NonBlockingNonSASL.PlugOut() if 'SASL' in self.__dict__: if 'startsasl' in self.SASL.__dict__ and \ self.SASL.startsasl == 'failure-in-process': @@ -479,8 +521,7 @@ class NonBlockingClient(object): ### follows code for authentication, resource bind, session and roster download ############################################################################### - def auth(self, user, password, resource='', sasl=True, on_auth=None, - auth_mechs=None): + def auth(self, user, password, resource='', sasl=True, auth_mechs=None): """ Authenticate connnection and bind resource. If resource is not provided random one or library name used @@ -489,8 +530,6 @@ class NonBlockingClient(object): :param password: XMPP password :param resource: resource that shall be used for auth/connecting :param sasl: Boolean indicating if SASL shall be used. (default: True) - :param on_auth: Callback, called after auth. On auth failure, argument - is None. :param auth_mechs: Set of valid authentification mechanisms. If None all authentification mechanisms will be allowed. Possible entries are: 'ANONYMOUS', 'EXTERNAL', 'GSSAPI', 'SCRAM-SHA-1-PLUS', @@ -509,33 +548,11 @@ class NonBlockingClient(object): except NotImplementedError: pass if auth_mechs is None: - self._auth_mechs = SASL_AUTHENTICATION_MECHANISMS | set(['XEP-0078']) + self._auth_mechs = SASL_AUTHENTICATION_MECHANISMS else: self._auth_mechs = auth_mechs - self.on_auth = on_auth - self._on_doc_attrs() - return - def _on_old_auth(self, res): - """ - Callback used by NON-SASL auth. On auth failure, res is None - """ - if res: - self.connected += '+old_auth' - self.on_auth(self, 'old_auth') - else: - self.on_auth(self, None) - - def _on_sasl_auth(self, res): - """ - Used internally. On auth failure, res is None - """ - self.onreceive(None) - if res: - self.connected += '+sasl' - self.on_auth(self, 'sasl') - else: - self.on_auth(self, None) + self._on_doc_attrs() def _on_doc_attrs(self): """ @@ -547,13 +564,7 @@ class NonBlockingClient(object): self._auth_mechs).PlugIn(self) if not hasattr(self, 'SASL'): return - if ('XEP-0078' in self._auth_mechs - and (not self._sasl or self.SASL.startsasl == 'not-supported')): - if not self._Resource: - self._Resource = 'xmpppy' - auth_nb.NonBlockingNonSASL.get_instance(self._User, self._Password, - self._Resource, self._on_old_auth).PlugIn(self) - return + self.SASL.auth() return True @@ -561,43 +572,30 @@ class NonBlockingClient(object): """ Callback used by SASL, called on each auth step """ - if data: - self.Dispatcher.ProcessNonBlocking(data) - if 'SASL' not in self.__dict__: - # SASL is pluged out, possible disconnect - return if self.SASL.startsasl == 'in-process': return self.onreceive(None) + if self.SASL.startsasl == 'failure': # wrong user/pass, stop auth if 'SASL' in self.__dict__: self.SASL.PlugOut() self.connected = None # FIXME: is this intended? We use ''elsewhere - self._on_sasl_auth(None) + self.Dispatcher.Event(Realm.CONNECTING, Event.AUTH_FAILED, data) + elif self.SASL.startsasl == 'success': - nb_bind = auth_nb.NonBlockingBind.get_instance() - sm = self._caller.sm - if sm._owner and sm.resumption: - nb_bind.resuming = True - sm.set_owner(self) - self.Dispatcher.sm = sm - nb_bind.PlugIn(self) - self.on_auth(self, 'sasl') - return + self.connected += '+sasl' + self.Dispatcher.Event(Realm.CONNECTING, Event.AUTH_SUCCESSFUL) - nb_bind.PlugIn(self) - self.onreceive(self._on_auth_bind) - return True + def bind(self): + self._owner.Smacks.register_handlers() - def _on_auth_bind(self, data): - # FIXME: Why use this callback and not bind directly? - if data: - self.Dispatcher.ProcessNonBlocking(data) - if self.NonBlockingBind.bound is None: - return - self.NonBlockingBind.NonBlockingBind(self._Resource, self._on_sasl_auth) - return True + # Check if we can resume + if self._owner.Smacks.resume_supported: + self._owner.Smacks.resume_request() + else: + # If we cant resume we bind and enable sm afterwards + NonBlockingBind.get_instance().PlugIn(self) def initRoster(self, version='', request=True): """ ===================================== nbxmpp/const.py ===================================== @@ -0,0 +1,40 @@ +# 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/>. + +from enum import Enum +from enum import unique + +@unique +class Realm(Enum): + CONNECTING = 'Connecting' + + def __str__(self): + return self.value + + +@unique +class Event(Enum): + AUTH_SUCCESSFUL = 'Auth successful' + AUTH_FAILED = 'Auth failed' + BIND_FAILED = 'Bind failed' + SESSION_FAILED = 'Session failed' + RESUME_SUCCESSFUL = 'Resume successful' + RESUME_FAILED = 'Resume failed' + CONNECTION_ACTIVE = 'Connection active' + + def __str__(self): + return self.value ===================================== nbxmpp/dispatcher_nb.py ===================================== @@ -20,22 +20,18 @@ Main xmpp decision making logic. Provides library with methods to assign different handlers to different XMPP stanzas and namespaces """ -from __future__ import unicode_literals -from . import simplexml import sys -import time import locale import re import uuid -import copy +import logging from xml.parsers.expat import ExpatError + +from . import simplexml from .plugin import PlugIn -from .protocol import (NS_DELAY2, NS_STREAMS, NS_XMPP_STREAMS, NS_HTTP_BIND, Iq, Presence, - Message, Protocol, Node, Error, ERR_FEATURE_NOT_IMPLEMENTED, StreamError) -import logging +from .protocol import (NS_STREAMS, NS_HTTP_BIND, Iq, Presence, + Message, Protocol, Node, Error, ERR_FEATURE_NOT_IMPLEMENTED) -if sys.version_info[0] == 2: - chr = unichr log = logging.getLogger('nbxmpp.dispatcher_nb') @@ -100,9 +96,6 @@ class XMPPDispatcher(PlugIn): self.SendAndWaitForResponse, self.SendAndCallForResponse, self.getAnID, self.Event, self.send] - # Let the dispatcher know if there is support for stream management - self.sm = None - # \ufddo -> \ufdef range c = '\ufdd0' r = c @@ -395,7 +388,7 @@ class XMPPDispatcher(PlugIn): if handler in self._cycleHandlers: self._cycleHandlers.remove(handler) - def Event(self, realm, event, data): + def Event(self, realm, event, data=None): """ Raise some event @@ -463,11 +456,9 @@ class XMPPDispatcher(PlugIn): log.debug('type: %s, properties: %s', typ, stanza.props) # If server supports stream management - if self.sm and self.sm.enabled and (stanza.getName() != 'r' and - stanza.getName() != 'a' and stanza.getName() != 'enabled' and - stanza.getName() != 'resumed'): - # increments the number of stanzas that has been handled - self.sm.in_h += 1 + 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... @@ -581,23 +572,8 @@ class XMPPDispatcher(PlugIn): self._owner.Connection.send(stanza, now) # If no ID then it is a whitespace - if self.sm and self.sm.enabled and ID: - # add timestamp to message stanza in queue - if (stanza.getName() == 'message' and - stanza.getType() in ('chat', 'groupchat')): - timestamp = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime()) - attrs = {'stamp': timestamp} - if stanza.getType() != 'groupchat': - # Dont leak our JID to Groupchats - attrs['from'] = stanza.getAttr('from') - stanza.addChild('delay', namespace=NS_DELAY2, attrs=attrs) - self.sm.uqueue.append(stanza) - self.sm.out_h += 1 - - if len(self.sm.uqueue) > self.sm.max_queue: - self.sm.request_ack() - if (self.sm.in_h - self.sm.last_sent_in_h) > 100: - self.sm.send_ack() + if hasattr(self._owner, 'Smacks') and ID: + self._owner.Smacks.save_in_queue(stanza) return ID ===================================== nbxmpp/idlequeue.py ===================================== @@ -18,21 +18,15 @@ Idlequeues are Gajim's network heartbeat. Transports can be plugged as idle objects and be informed about possible IO """ -from __future__ import unicode_literals - import os import errno -import sys import select import logging log = logging.getLogger('nbxmpp.idlequeue') # needed for get_idleqeue try: - if sys.version_info[0] == 2: - import gobject - else: - from gi.repository import GLib + from gi.repository import GLib HAVE_GLIB = True except ImportError: HAVE_GLIB = False @@ -43,24 +37,15 @@ if os.name == 'nt': elif os.name == 'posix': import fcntl -if sys.version_info[0] == 2 or not HAVE_GLIB: - FLAG_WRITE = 20 # write only 10100 - FLAG_READ = 19 # read only 10011 - FLAG_READ_WRITE = 23 # read and write 10111 - FLAG_CLOSE = 16 # wait for close 10000 - PENDING_READ = 3 # waiting read event 11 - PENDING_WRITE = 4 # waiting write event 100 - IS_CLOSED = 16 # channel closed 10000 -else: - FLAG_WRITE = GLib.IOCondition.OUT | GLib.IOCondition.HUP - FLAG_READ = GLib.IOCondition.IN | GLib.IOCondition.PRI | \ - GLib.IOCondition.HUP - FLAG_READ_WRITE = GLib.IOCondition.OUT | GLib.IOCondition.IN | \ - GLib.IOCondition.PRI | GLib.IOCondition.HUP - FLAG_CLOSE = GLib.IOCondition.HUP - PENDING_READ = GLib.IOCondition.IN # There is data to read. - PENDING_WRITE = GLib.IOCondition.OUT # Data CAN be written without blocking. - IS_CLOSED = GLib.IOCondition.HUP # Hung up (connection broken) +FLAG_WRITE = GLib.IOCondition.OUT | GLib.IOCondition.HUP +FLAG_READ = GLib.IOCondition.IN | GLib.IOCondition.PRI | \ + GLib.IOCondition.HUP +FLAG_READ_WRITE = GLib.IOCondition.OUT | GLib.IOCondition.IN | \ + GLib.IOCondition.PRI | GLib.IOCondition.HUP +FLAG_CLOSE = GLib.IOCondition.HUP +PENDING_READ = GLib.IOCondition.IN # There is data to read. +PENDING_WRITE = GLib.IOCondition.OUT # Data CAN be written without blocking. +IS_CLOSED = GLib.IOCondition.HUP # Hung up (connection broken) def get_idlequeue(): """ @@ -549,12 +534,9 @@ class GlibIdleQueue(IdleQueue): This method is called when we plug a new idle object. Start listening for events from fd """ - if sys.version_info[0] == 2: - res = gobject.io_add_watch(fd, flags, self._process_events, - priority=gobject.PRIORITY_LOW) - else: - res = GLib.io_add_watch(fd, GLib.PRIORITY_LOW, flags, - self._process_events) + res = GLib.io_add_watch(fd, GLib.PRIORITY_LOW, flags, + self._process_events) + # store the id of the watch, so that we can remove it on unplug self.events[fd] = res @@ -573,17 +555,11 @@ class GlibIdleQueue(IdleQueue): """ if not fd in self.events: return - if sys.version_info[0] == 2: - gobject.source_remove(self.events[fd]) - else: - GLib.source_remove(self.events[fd]) + + GLib.source_remove(self.events[fd]) del(self.events[fd]) def process(self): self._check_time_events() - if sys.version_info[0] == 2 or not HAVE_GLIB: - def current_time(self): - return gobject.get_current_time() * 1e6 - else: - current_time = GLib.get_real_time + current_time = GLib.get_real_time ===================================== nbxmpp/protocol.py ===================================== @@ -18,12 +18,12 @@ data structures, including jabber-objects like JID or different stanzas and sub- stanzas) handling routines """ -from .simplexml import Node, NodeBuilder import time -import string import hashlib from base64 import b64encode +from .simplexml import Node, NodeBuilder + def ascii_upper(s): return s.upper() @@ -267,6 +267,20 @@ NS_OPENPGP = 'urn:xmpp:openpgp:0' #for (k, v) in loc.items(): #print('%s = \'%s\'' % (k, v)) +SASL_ERROR_CONDITIONS = [ + 'aborted', + 'account-disabled', + 'credentials-expired', + 'encryption-required', + 'incorrect-encoding', + 'invalid-authzid', + 'invalid-mechanism', + 'mechanism-too-weak', + 'malformed-request', + 'not-authorized', + 'temporary-auth-failure', +] + ERRORS = { 'urn:ietf:params:xml:ns:xmpp-sasl aborted': ['', '', @@ -1466,33 +1480,6 @@ class Hashes2(Node): self.setAttr('algo', algo) self.setData(hash_) -class Acks(Node): - """ - Acknowledgement elements for Stream Management - """ - def __init__(self, nsp=NS_STREAM_MGMT): - Node.__init__(self, None, {}, [], None, None, False, None) - self.setNamespace(nsp) - - def buildAnswer(self, handled): - """ - handled is the number of stanzas handled - """ - self.setName('a') - self.setAttr('h', handled) - - def buildRequest(self): - self.setName('r') - - def buildEnable(self, resume=False): - self.setName('enable') - if resume: - self.setAttr('resume', 'true') - - def buildResume(self, handled, previd): - self.setName('resume') - self.setAttr('h', handled) - self.setAttr('previd', previd) class ErrorNode(Node): """ ===================================== nbxmpp/proxy_connectors.py ===================================== @@ -22,9 +22,11 @@ SOCKS5 proxy Authentication to NTLM (Microsoft implementation) proxies can be next. """ -import struct, socket -from base64 import b64encode +import struct +import socket import logging +from base64 import b64encode + log = logging.getLogger('nbxmpp.proxy_connectors') ===================================== nbxmpp/roster_nb.py ===================================== @@ -19,10 +19,12 @@ Simple roster implementation. Can be used though for different tasks like mass-renaming of contacts. """ -from .protocol import JID, Iq, Presence, Node, NodeProcessed, NS_MUC_USER, NS_ROSTER +import logging + +from .protocol import JID, Iq, Presence, Node, NS_MUC_USER, NS_ROSTER from .plugin import PlugIn -import logging + log = logging.getLogger('nbxmpp.roster_nb') ===================================== nbxmpp/simplexml.py ===================================== @@ -18,12 +18,10 @@ nodes and XML streams. I'm personally using it in many other separate projects. It is designed to be as standalone as possible """ -from __future__ import unicode_literals - -import sys +import logging import xml.parsers.expat from xml.parsers.expat import ExpatError -import logging + log = logging.getLogger('nbxmpp.simplexml') def XMLescape(txt): @@ -36,37 +34,20 @@ def XMLescape(txt): ENCODING='utf-8' -if sys.version_info[0] == 2: - def ustr(what): - """ - Converts object "what" to unicode string using it's own __str__ method if - accessible or unicode method otherwise - """ - if isinstance(what, unicode): - return what - try: - r = what.__str__() - except AttributeError: - r = unicode(what) - if not isinstance(r, unicode): - return unicode(r, ENCODING) - return r - -else: - def ustr(what): - """ - Converts object "what" to unicode string using it's own __str__ method if - accessible or unicode method otherwise - """ - if isinstance(what, str): - return what - try: - r = what.__str__() - except AttributeError: - r = str(what) - if not isinstance(r, str): - return str(r, ENCODING) - return r +def ustr(what): + """ + Converts object "what" to unicode string using it's own __str__ method if + accessible or unicode method otherwise + """ + if isinstance(what, str): + return what + try: + r = what.__str__() + except AttributeError: + r = str(what) + if not isinstance(r, str): + return str(r, ENCODING) + return r class Node(object): """ ===================================== nbxmpp/smacks.py ===================================== @@ -1,11 +1,36 @@ -from .protocol import Acks -from .protocol import NS_STREAM_MGMT -from .transports_nb import CONNECTED, CONNECTING, DISCONNECTED, DISCONNECTING +# 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 time import logging + +from nbxmpp.protocol import NS_STREAM_MGMT +from nbxmpp.protocol import NS_DELAY2 +from nbxmpp.simplexml import Node +from nbxmpp.transports_nb import DISCONNECTING +from nbxmpp.plugin import PlugIn +from nbxmpp.const import Realm +from nbxmpp.const import Event + + log = logging.getLogger('nbxmpp.smacks') -class Smacks(object): +class Smacks(PlugIn): """ This is Smacks is the Stream Management class. It takes care of requesting and sending acks. Also, it keeps track of the unhandled outgoing stanzas. @@ -14,213 +39,264 @@ class Smacks(object): number of handled stanzas """ - def __init__(self, con): - self.con = con # Connection object - self.out_h = 0 # Outgoing stanzas handled - self.in_h = 0 # Incoming stanzas handled - self.last_sent_in_h = 0 # Last acked stanza. - self.uqueue = [] # Unhandled stanzas queue - self.old_uqueue = [] # Unhandled stanzas queue of the last session - self.session_id = None - self.resumption = False # If server supports resume + def __init__(self): + PlugIn.__init__(self) + self._out_h = 0 # Outgoing stanzas handled + self._in_h = 0 # Incoming stanzas handled + self._acked_h = 0 # Last acked stanza + + self._uqueue = [] # Unhandled stanzas queue + self._old_uqueue = [] # Unhandled stanzas queue of the last session + # Max number of stanzas in queue before making a request - #be more agressive here (every message must be acked), this creates fewer message duplicates on failed resume) self.max_queue = 0 - self._owner = None - self.resuming = False - self.enabled = False # If SM is enabled - self.location = None - self.failed_resume = False # If last resuming attempt failed - self.supports_sm = False # If server supports sm - - def set_owner(self, owner): - self._owner = owner - # Register handlers - owner.Dispatcher.RegisterNamespace(NS_STREAM_MGMT) - owner.Dispatcher.RegisterHandler('enabled', self._neg_response, - xmlns=NS_STREAM_MGMT) - owner.Dispatcher.RegisterHandler('r', self.send_ack, - xmlns=NS_STREAM_MGMT) - owner.Dispatcher.RegisterHandler('a', self.check_ack, - xmlns=NS_STREAM_MGMT) - owner.Dispatcher.RegisterHandler('resumed', self.check_resume, - xmlns=NS_STREAM_MGMT) - owner.Dispatcher.RegisterHandler('failed', self.error_handling, - xmlns=NS_STREAM_MGMT) - - def _neg_response(self, disp, stanza): - r = stanza.getAttr('resume') - # When we receive enabled from the server, reset the IN count - self.in_h = 0 - log.info("Session resumption: %s" % r) - if r == 'true' or r == 'True' or r == '1': - self.resumption = True - self.session_id = stanza.getAttr('id') - if r == 'false' or r == 'False' or r == '0': - self.negociate(False) - l = stanza.getAttr('location') - if l: - self.location = l - if self.failed_resume: - self.con._discover_server_at_connection(self.con.connection) - self.failed_resume = False - - def negociate(self, resume=True): - # Every time we attempt to negociate, we must erase all previous info - # about any previous session - log.debug("Clearing smacks uqueue") - self.uqueue = [] - self.in_h = 0 - self.last_sent_in_h = 0 - self.out_h = 0 - self.session_id = None + + self.enabled = False # If SM is enabled + self._enable_sent = False # If we sent 'enable' + self.resumed = False # If the session was resumed + self.resume_in_progress = False + self.resume_supported = False # Does the session support resume + self._resume_jid = None # The JID from the previous session + + self._session_id = None + self._location = None + self._enable_sent = False + + def get_resume_data(self): + if self.resume_supported: + return { + 'out': self._out_h, + 'in': self._in_h, + 'session_id': self._session_id, + 'location': self._location, + 'uqueue': self._uqueue, + 'bound_jid': self._owner._registered_name + } + + def set_resume_data(self, data): + if data is None: + return + log.debug('Resume data set') + self._out_h = data.get('out') + self._in_h = data.get('in') + self._session_id = data.get('session_id') + self._location = data.get('location') + self._old_uqueue = data.get('uqueue') + self._resume_jid = data.get('bound_jid') + self.resume_supported = True + + def register_handlers(self): + self._owner.Dispatcher.RegisterNamespace(NS_STREAM_MGMT) + self._owner.Dispatcher.RegisterHandler( + 'enabled', self._on_enabled, xmlns=NS_STREAM_MGMT) + self._owner.Dispatcher.RegisterHandler( + 'r', self._send_ack, xmlns=NS_STREAM_MGMT) + self._owner.Dispatcher.RegisterHandler( + 'a', self._on_ack, xmlns=NS_STREAM_MGMT) + self._owner.Dispatcher.RegisterHandler( + 'resumed', self._on_resumed, xmlns=NS_STREAM_MGMT) + self._owner.Dispatcher.RegisterHandler( + 'failed', self._on_failed, xmlns=NS_STREAM_MGMT) + + def send_enable(self): + enable = Node(NS_STREAM_MGMT + ' enable', attrs={'resume': 'true'}) + self._owner.Connection.send(enable, now=False) + log.debug('Send enable') + self._enable_sent = True + + def _on_enabled(self, _disp, stanza): + if self.enabled: + log.error('Received "enabled", but SM is already enabled') + return + resume = stanza.getAttr('resume') + if resume in ('true', 'True', '1'): + self.resume_supported = True + self._session_id = stanza.getAttr('id') + + self._location = stanza.getAttr('location') self.enabled = True + log.info('Received enabled, location: %s, resume supported: %s, ' + 'session-id: %s', self._location, resume, self._session_id) + + def count_incoming(self, name): + if not self.enabled: + # Dont count while we didnt receive 'enabled' + return + if name in ('a', 'r', 'resumed', 'enabled'): + return + log.debug('IN, %s', name) + self._in_h += 1 + + def save_in_queue(self, stanza): + if not self._enable_sent: + # We did not yet sent 'enable' so the server + # will not count our stanzas + return + if (stanza.getName() == 'message' and + stanza.getType() in ('chat', 'groupchat')): + timestamp = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime()) + attrs = {'stamp': timestamp} + if stanza.getType() != 'groupchat': + # Dont leak our JID to Groupchats + attrs['from'] = stanza.getAttr('from') + stanza.addChild('delay', namespace=NS_DELAY2, attrs=attrs) + self._uqueue.append(stanza) + log.debug('OUT, %s', stanza.getName()) + self._out_h += 1 - stanza = Acks() - stanza.buildEnable(resume) - self._owner.Connection.send(stanza, now=True) + if len(self._uqueue) > self.max_queue: + self._request_ack() + # Send an ack after 100 unacked messages + if (self._in_h - self._acked_h) > 100: + self._send_ack() - def resend_queue(self): + def _resend_queue(self): """ Resends unsent stanzas when a new session is established. - This way there won't be any lost outgoing messages even on failed smacks resumes (but message duplicates are possible). - If your server supports revision 1.5 of smacks then even message duplicates are eliminated here :) + This way there won't be any lost outgoing messages even on failed + smacks resumes (but message duplicates are possible). """ - if self.old_uqueue: - log.info('Session resumption failed, replaying %s stanzas anyways...' % len(self.old_uqueue)) - for i in self.old_uqueue: - self._owner.Dispatcher.send(i, False) #use this send so that our stanzas actually increment out_h - self.old_uqueue = [] - + if not self._old_uqueue: + return + log.info('Resend %s stanzas', len(self._old_uqueue)) + for stanza in self._old_uqueue: + # Use dispatcher so we increment the counter + self._owner.Dispatcher.send(stanza) + self._old_uqueue = [] + def resume_request(self): - if not self.session_id: - self.resuming = False - log.error('Attempted to resume without a valid session id ') + if self._session_id is None: + log.error('Attempted to resume without a valid session id') return - #save old messages in an extra "queue" to avoid race conditions and to make it possible to replay stanzas even when resuming fails - #add messages here (instead of overwriting) so that repeated connection errors don't delete unacked stanzas (uqueue should be empty in this case anyways) - self.old_uqueue += self.uqueue - self.uqueue = [] - resume = Acks() - resume.buildResume(self.in_h, self.session_id) - self.last_sent_in_h = self.in_h - self._owner.Connection.send(resume, False) - - def send_ack(self, disp=None, stanza=None): - ack = Acks() - ack.buildAnswer(self.in_h) - self.last_sent_in_h = self.in_h - self._owner.Connection.send(ack, False) - + + # Save old messages in an extra "queue" to avoid race conditions + # and to make it possible to replay stanzas even when resuming fails + # Add messages here (instead of overwriting) so that repeated + # connection errors don't delete unacked stanzas + # (uqueue should be empty in this case anyways) + self._old_uqueue += self._uqueue + self._uqueue = [] + + resume = Node(NS_STREAM_MGMT + ' resume', + attrs={'h': self._in_h, 'previd': self._session_id}) + + self._acked_h = self._in_h + self.resume_in_progress = True + self._owner.Connection.send(resume, now=False) + + def _on_resumed(self, _disp, stanza): + """ + Checks if the number of stanzas sent are the same as the + number of stanzas received by the server. Resends stanzas not received + by the server in the last session. + """ + log.info('Session resumption succeeded, session-id: %s', + self._session_id) + self._validate_ack(stanza, self._old_uqueue) + # Set our out h to the h we received + self._out_h = int(stanza.getAttr('h')) + self.enabled = True + self.resumed = True + self.resume_in_progress = False + self._owner.set_bound_jid(self._resume_jid) + self._owner.Dispatcher.Event(Realm.CONNECTING, Event.RESUME_SUCCESSFUL) + self._resend_queue() + + def _send_ack(self, *args): + ack = Node(NS_STREAM_MGMT + ' a', attrs={'h': self._in_h}) + self._acked_h = self._in_h + log.debug('Send ack, h: %s', self._in_h) + self._owner.Connection.send(ack, now=False) + def send_closing_ack(self): if self._owner.Connection.get_state() != DISCONNECTING: - log.error("Not allowed to send closing smacks ack when not disconnecting!") return - ack = Acks() - ack.buildAnswer(self.in_h) - self.last_sent_in_h = self.in_h - self._owner.Connection.send(ack, True) + ack = Node(NS_STREAM_MGMT + ' a', attrs={'h': self._in_h}) + log.debug('Send closing ack, h: %s', self._in_h) + self._owner.Connection.send(ack, now=True) + + def _request_ack(self): + request = Node(NS_STREAM_MGMT + ' r') + log.debug('Request ack') + self._owner.Connection.send(request, now=False) - def request_ack(self): - r = Acks() - r.buildRequest() - self._owner.Connection.send(r, False) + def _on_ack(self, _disp, stanza): + log.debug('Ack received, h: %s', stanza.getAttr('h')) + self._validate_ack(stanza, self._uqueue) - def check_ack(self, disp, stanza): + def _validate_ack(self, stanza, queue): """ Checks if the number of stanzas sent are the same as the number of stanzas received by the server. Pops stanzas that were handled by the server from the queue. """ - h = stanza.getAttr('h') - if not h: + count_server = stanza.getAttr('h') + if count_server is None: log.error('Server did not send h attribute') return - h = int(h) - diff = self.out_h - h + count_server = int(count_server) + diff = self._out_h - count_server + queue_size = len(queue) if diff < 0: - log.error('Server and client number of stanzas handled mismatch (our h: %d, server h: %d, #queue: %d)' % (self.out_h, h, len(self.uqueue))) - while (len(self.uqueue)): #don't accumulate all messages in this case (they would otherwise all be resent on the next reconnect) - self.uqueue.pop(0) - elif len(self.uqueue) < diff: - log.error('Server and client number of stanzas handled mismatch (our h: %d, server h: %d, #queue: %d)' % (self.out_h, h, len(self.uqueue))) + log.error('Mismatch detected, our h: %d, server h: %d, queue: %d', + self._out_h, count_server, queue_size) + # Don't accumulate all messages in this case + # (they would otherwise all be resent on the next reconnect) + queue = [] + + elif queue_size < diff: + log.error('Mismatch detected, our h: %d, server h: %d, queue: %d', + self._out_h, count_server, queue_size) else: - log.debug('Got ack for outgoing stanzas (our h: %d, server h: %d, #queue: %d), removing %d messages from queue...' % (self.out_h, h, len(self.uqueue), len(self.uqueue) - diff)) - while (len(self.uqueue) > diff): - self.uqueue.pop(0) - - def check_resume(self, disp, stanza): - """ - Checks if the number of stanzas sent are the same as the - number of stanzas received by the server. Resends stanzas not received - by the server in the last session. - """ - log.info("Session resumption succeeded") - h = stanza.getAttr('h') - if not h: - log.error('Server did not send h attribute') - return - h = int(h) - diff = self.out_h - h + log.debug('Validate ack, our h: %d, server h: %d, queue: %d', + self._out_h, count_server, queue_size) + log.debug('removing %d stanzas from queue', queue_size - diff) - if diff < 0: - log.error('Server and client number of stanzas handled mismatch on session resumption (our h: %d, server h: %d. #queue: %d)' % (self.out_h, h, len(self.old_uqueue))) - self.old_uqueue = [] #that's weird, but we don't resend this stanzas if the server says we don't need to - elif len(self.old_uqueue) < diff: - log.error('Server and client number of stanzas handled mismatch on session resumption (our h: %d, server h: %d, #queue: %d)' % (self.out_h, h, len(self.old_uqueue))) + while len(queue) > diff: + queue.pop(0) + + def _on_failed(self, _disp, stanza): + ''' + This can be called after 'enable' and 'resume' + ''' + + log.error('StreamManagement negotiation failed') + error_text = stanza.getTagData('text') + if error_text is not None: + log.error(error_text) + + if stanza.getTag('item-not-found') is not None: + log.info('Session timed out, last server h: %s', + stanza.getAttr('h')) + self._validate_ack(stanza, self._old_uqueue) else: - log.info('Removing %d already acked stanzas from old outgoing queue (our h: %d, server h: %d, #queue: %d, remaining in queue: %d)' % (len(self.old_uqueue) - diff, self.out_h, h, len(self.old_uqueue), diff)) - while (len(self.old_uqueue) > diff): - self.old_uqueue.pop(0) + for tag in stanza.getTags(): + if tag.getName() != 'text': + log.error(tag.getName()) - self.enabled = True - self.resuming = True - self.con.set_oldst() - if self.old_uqueue: - log.info('Session resumed, replaying %s stanzas...' % len(self.old_uqueue)) - for i in self.old_uqueue: - self._owner.Connection.send(i, False) - self.old_uqueue = [] - - def error_handling(self, disp, stanza): - # If the server doesn't recognize previd, forget about resuming - # Ask for service discovery, etc.. - if stanza.getTag('item-not-found'): - self.resuming = False - self.enabled = False - # we need to bind a resource - self._owner.NonBlockingBind.resuming = False - self._owner.Dispatcher.Event(NS_STREAM_MGMT, 'RESUME FAILED', None) - self._owner._on_auth_bind(None) - self.failed_resume = True - - h = stanza.getAttr('h') - log.info('Session resumption failed (item-not-found), server h: %s' % str(h)) - if not h: - return - #prepare old_queue to contain only unacked stanzas for later resend (which is happening after our session is established properly) - h = int(h) - diff = self.out_h - h - - if diff < 0: - log.error('Server and client number of stanzas handled mismatch on session resumption (our h: %d, server h: %d, #queue: %d)' % (self.out_h, h, len(self.old_uqueue))) - self.old_uqueue = [] #that's weird, but we don't resend this stanzas if the server says we don't need to - elif len(self.old_uqueue) < diff: - log.error('Server and client number of stanzas handled mismatch on session resumption (our h: %d, server h: %d, #queue: %d)' % (self.out_h, h, len(self.old_uqueue))) - else: - log.info('Removing %d already acked stanzas from old outgoing queue (our h: %d, server h: %d, #queue: %d, remaining in queue: %d)' % (len(self.old_uqueue) - diff, self.out_h, h, len(self.old_uqueue), diff)) - while (len(self.old_uqueue) > diff): - self.old_uqueue.pop(0) - return + if self.resume_in_progress: + self._owner.Dispatcher.Event(Realm.CONNECTING, Event.RESUME_FAILED) + # We failed while resuming + self.resume_supported = False + self._owner.start_bind() + self._reset_state() - # Doesn't support resumption - if stanza.getTag('feature-not-implemented'): - log.info('Session resumption failed (feature-not-implemented)') - self.negociate(False) - return + def _reset_state(self): + # Reset all values to default + self._out_h = 0 + self._in_h = 0 + self._acked_h = 0 - if stanza.getTag('unexpected-request'): - log.error('Gajim failed to negociate Stream Management') - self.enabled = False - return + self._uqueue = [] + self._old_uqueue = [] + + self.enabled = False + self._enable_sent = False + self.resumed = False + self.resume_in_progress = False + self.resume_supported = False + + self._session_id = None + self._location = None + self._enable_sent = False ===================================== nbxmpp/tls_nb.py ===================================== @@ -15,20 +15,15 @@ ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. -from __future__ import print_function - -import socket import ssl -from .plugin import PlugIn - import sys import os import time -import io - import traceback - import logging + +from .plugin import PlugIn + log = logging.getLogger('nbxmpp.tls_nb') USE_PYOPENSSL = False @@ -338,10 +333,7 @@ class NonBlockingTLS(PlugIn): if not os.path.isfile(cert_path): return try: - if sys.version_info[0] > 2: - f = open(cert_path, encoding='utf-8') - else: - f = io.open(cert_path, encoding='utf-8') + f = open(cert_path, encoding='utf-8') lines = f.readlines() except (IOError, UnicodeError) as e: log.warning('Unable to open certificate file %s: %s' % \ ===================================== nbxmpp/transports_nb.py ===================================== @@ -24,14 +24,6 @@ Transports are not aware of XMPP stanzas and only responsible for low-level connection handling. """ -from __future__ import unicode_literals - -from .simplexml import ustr -from .plugin import PlugIn -from .idlequeue import IdleObject -from . import proxy_connectors -from . import tls_nb - import socket import errno import time @@ -39,13 +31,19 @@ import traceback import base64 import sys import locale +import logging try: from urllib.parse import urlparse except ImportError: from urlparse import urlparse -import logging +from .simplexml import ustr +from .plugin import PlugIn +from .idlequeue import IdleObject +from . import proxy_connectors +from . import tls_nb + log = logging.getLogger('nbxmpp.transports_nb') def urisplit(uri): @@ -304,8 +302,8 @@ class NonBlockingTransport(PlugIn): # FIXME: where and why does this need to be called def start_disconnect(self): self.set_state(DISCONNECTING) - if self._owner._caller.sm and self._owner._caller.sm.enabled: - self._owner._caller.sm.send_closing_ack() + if hasattr(self._owner, 'Smacks'): + self._owner.Smacks.send_closing_ack() class NonBlockingTCP(NonBlockingTransport, IdleObject): @@ -662,8 +660,6 @@ class NonBlockingTCP(NonBlockingTransport, IdleObject): except UnicodeDecodeError: for i in range(-1, -4, -1): char = received[i] - if sys.version_info[0] < 3: # with py2 we get a str - char = ord(char) if char & 0xc0 == 0xc0: self.received_bytes_buff = received[i:] received = received[:i] ===================================== setup.cfg ===================================== @@ -1,5 +1,2 @@ -[bdist_wheel] -universal = 1 - [metadata] license_file = COPYING ===================================== test/unit/test_xmpp_smacks.py → test/broken/test_xmpp_smacks.py ===================================== @@ -2,8 +2,7 @@ Tests for smacks.py Stream Management ''' import unittest - -from test.lib.mock import Mock +from unittest.mock import Mock from nbxmpp import dispatcher_nb from nbxmpp import protocol @@ -19,12 +18,11 @@ class TestDispatcherNB(unittest.TestCase): # Setup mock client self.client = Mock() - self.client.__str__ = lambda: 'Mock' # FIXME: why do I need this one? self.client._caller = Mock() self.client.defaultNamespace = protocol.NS_CLIENT self.client.Connection = Mock() # mock transport self.con = self.client.Connection - self.con.sm = smacks.Smacks(self.con) + self.con.sm = smacks.Smacks() def tearDown(self): # Unplug if needed @@ -33,8 +31,8 @@ class TestDispatcherNB(unittest.TestCase): def _simulate_connect(self): self.dispatcher.PlugIn(self.client) # client is owner - self.con.sm.set_owner(self.client) - self.dispatcher.sm = self.con.sm + self.con.sm.PlugIn(self.client) + # Simulate that we have established a connection self.dispatcher.StreamInit() self.dispatcher.ProcessNonBlocking("<stream:stream " ===================================== test/unit/test_xmpp_dispatcher_nb.py ===================================== @@ -2,11 +2,10 @@ Tests for dispatcher_nb.py ''' import unittest +from unittest.mock import Mock from test import lib -from test.lib.mock import Mock - from nbxmpp import dispatcher_nb from nbxmpp import protocol @@ -20,7 +19,6 @@ class TestDispatcherNB(unittest.TestCase): # Setup mock client self.client = Mock() - self.client.__str__ = lambda: 'Mock' # FIXME: why do I need this one? self.client._caller = Mock() self.client.defaultNamespace = protocol.NS_CLIENT self.client.Connection = Mock() # mock transport @@ -53,8 +51,8 @@ class TestDispatcherNB(unittest.TestCase): self.dispatcher.ProcessNonBlocking('<message><x:y/></message>') self.assertEqual(2, len(msgs)) # we should not have been disconnected after that message - self.assertEqual(0, len(self.con.mockGetNamedCalls('pollend'))) - self.assertEqual(0, len(self.con.mockGetNamedCalls('disconnect'))) + self.con.pollend.assert_not_called() + self.con.disconnect.assert_not_called() # we should be able to keep parsing self.dispatcher.ProcessNonBlocking('<message><body>still here?</body></message>') @@ -73,12 +71,13 @@ class TestDispatcherNB(unittest.TestCase): # no data processed, link shall still be active result = process('') self.assertEqual(result, '0') - self.assertEqual(0, len(self.con.mockGetNamedCalls('pollend')) + - len(self.con.mockGetNamedCalls('disconnect'))) + + self.con.pollend.assert_not_called() + self.con.disconnect.assert_not_called() # simulate disconnect result = process('</stream:stream>') - self.assertEqual(1, len(self.client.mockGetNamedCalls('disconnect'))) + self.client.disconnect.assert_called_once() def test_return_stanza_handler(self): ''' Test sasl_error_conditions transformation in protocol.py ''' ===================================== test/unit/test_xmpp_transports_nb2.py ===================================== @@ -117,9 +117,9 @@ class TestNonBlockingTCP(AbstractTransportTest): def test_connect_disconnect_plain(self): ''' Establish plain connection ''' self.client.do_connect(establish_tls=False) - self.assertEquals(self.client.socket.state, 'CONNECTED') + self.assertEqual(self.client.socket.state, 'CONNECTED') self.client.do_disconnect() - self.assertEquals(self.client.socket.state, 'DISCONNECTED') + self.assertEqual(self.client.socket.state, 'DISCONNECTED') # def test_connect_disconnect_ssl(self): # ''' Establish SSL (not TLS) connection ''' @@ -139,19 +139,19 @@ class TestNonBlockingTCP(AbstractTransportTest): sock.onreceive(self.expect_receive(data)) sock._do_receive() self.assertTrue(self.have_received_expected(), msg='Did not receive data') - self.assert_(self.client.socket.state == 'CONNECTED') + self.assertEqual(self.client.socket.state, 'CONNECTED') # transport shall do nothing as an non-fatal SSL is simulated sock._recv = lambda buffer: None sock.onreceive(self.assertFalse) # we did not receive anything... sock._do_receive() - self.assert_(self.client.socket.state == 'CONNECTED') + self.assertEqual(self.client.socket.state, 'CONNECTED') # transport shall disconnect as remote side closed the connection sock._recv = lambda buffer: '' sock.onreceive(self.assertFalse) # we did not receive anything... sock._do_receive() - self.assert_(self.client.socket.state == 'DISCONNECTED') + self.assertEqual(self.client.socket.state, 'DISCONNECTED') def test_do_send(self): ''' Test _do_send method by overwriting socket.send ''' View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/e2b03fd01edc257f365d9ab53… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/e2b03fd01edc257f365d9ab53… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Raise version
by Philipp Hörist 25 Nov '18

25 Nov '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: e2b03fd0 by Philipp Hörist at 2018-11-25T10:00:44Z Raise version - - - - - 2 changed files: - nbxmpp/__init__.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.6.8" +__version__ = "0.9.90" ===================================== setup.py ===================================== @@ -3,7 +3,7 @@ from setuptools import setup setup(name='nbxmpp', - version='0.6.8', + version='0.9.90', 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/commit/e2b03fd01edc257f365d9ab534… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/e2b03fd01edc257f365d9ab534… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Use setup.py to run tests
by Philipp Hörist 24 Nov '18

24 Nov '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 441e53cc by André Apitzsch at 2018-11-21T23:22:20Z Use setup.py to run tests - - - - - 12fa947e by Philipp Hörist at 2018-11-24T08:21:50Z Merge branch 'test' into 'master' Use setup.py to run tests See merge request gajim/python-nbxmpp!19 - - - - - 9 changed files: - .gitlab-ci.yml - test/lib/__init__.py - test/lib/xmpp_mocks.py - − test/runtests.py - test/unit/test_xmpp_client_nb.py - test/unit/test_xmpp_dispatcher_nb.py - test/unit/test_xmpp_smacks.py - test/unit/test_xmpp_transports_nb.py - test/unit/test_xmpp_transports_nb2.py Changes: ===================================== .gitlab-ci.yml ===================================== @@ -8,7 +8,7 @@ stages: run-test: stage: test script: - - ./test/runtests.py + - python3 setup.py test run-build: stage: build ===================================== test/lib/__init__.py ===================================== @@ -1,14 +1,3 @@ -import sys -import os -import getopt - -root = os.path.join(os.path.abspath(os.path.dirname(__file__)), '../..') - -# look for modules in the CWD, then gajim/test/lib, then gajim/src, -# then everywhere else -sys.path.insert(1, root) -sys.path.insert(1, root + '/test/lib') - def xml2str_sorted(data): s = "<" + data.name if data.namespace: @@ -38,5 +27,3 @@ def xml2str_sorted(data): s += "</" + data.name + ">" return s -def setup_env(): - pass ===================================== test/lib/xmpp_mocks.py ===================================== @@ -4,7 +4,7 @@ Module with dummy classes for unit testing of XMPP and related code. import threading, time -from mock import Mock +from test.lib.mock import Mock from nbxmpp import idlequeue ===================================== test/runtests.py deleted ===================================== @@ -1,53 +0,0 @@ -#!/usr/bin/env python3 - - -''' -Runs python-nbxmpp's Test Suite - -Unit tests tests will be run on each commit. -''' -from __future__ import print_function - -import sys -import unittest -import getopt -verbose = 1 - -try: - shortargs = 'hv:' - longargs = 'help verbose=' - opts, args = getopt.getopt(sys.argv[1:], shortargs, longargs.split()) -except getopt.error as msg: - print(msg) - print('for help use --help') - sys.exit(2) -for o, a in opts: - if o in ('-h', '--help'): - print('runtests [--help] [--verbose level]') - sys.exit() - elif o in ('-v', '--verbose'): - try: - verbose = int(a) - except Exception: - print('verbose must be a number >= 0') - sys.exit(2) - -# new test modules need to be added manually -modules = ( 'unit.test_xmpp_dispatcher_nb', - 'unit.test_xmpp_transports_nb', - 'unit.test_xmpp_smacks', - #'unit.test_xmpp_client_nb', gajim.org only supports TLS/SSL connections - 'unit.test_xmpp_transports_nb2', - 'unit.test_xml_vulnerability', - ) - -nb_errors = 0 -nb_failures = 0 - -for mod in modules: - suite = unittest.defaultTestLoader.loadTestsFromName(mod) - result = unittest.TextTestRunner(verbosity=verbose).run(suite) - nb_errors += len(result.errors) - nb_failures += len(result.failures) - -sys.exit(nb_errors + nb_failures) ===================================== test/unit/test_xmpp_client_nb.py ===================================== @@ -6,11 +6,8 @@ It actually connects to a xmpp server. import unittest -import lib -lib.setup_env() - -from xmpp_mocks import MockConnection, IdleQueueThread -from mock import Mock +from test.lib.xmpp_mocks import MockConnection, IdleQueueThread +from test.lib.mock import Mock from nbxmpp import client_nb # (XMPP server hostname, c2s port). Script will connect to the machine. @@ -19,6 +16,7 @@ xmpp_server_port = ('gajim.org', 5222) # [username, password, resource]. Script will authenticate to server above credentials = ['unittest', 'testtest', 'res'] +(a)unittest.skip("gajim.org only supports TLS/SSL connections") class TestNonBlockingClient(unittest.TestCase): ''' Test Cases class for NonBlockingClient. @@ -67,14 +65,14 @@ class TestNonBlockingClient(unittest.TestCase): on_connect_failure=lambda *args: self.connection.on_connect( False, *args)) - self.assert_(self.connection.wait(), + self.assertTrue(self.connection.wait(), msg='waiting for callback from client constructor') # if on_connect was called, client has to be connected and vice versa if self.connection.connect_succeeded: - self.assert_(self.client.get_connect_type()) + self.assertTrue(self.client.get_connect_type()) else: - self.assert_(not self.client.get_connect_type()) + self.assertTrue(not self.client.get_connect_type()) def client_auth(self, username, password, resource, sasl): ''' @@ -88,7 +86,7 @@ class TestNonBlockingClient(unittest.TestCase): self.client.auth(username, password, resource, sasl, on_auth=self.connection.on_auth) - self.assert_(self.connection.wait(), msg='waiting for authentication') + self.assertTrue(self.connection.wait(), msg='waiting for authentication') def do_disconnect(self): ''' @@ -108,13 +106,13 @@ class TestNonBlockingClient(unittest.TestCase): self.open_stream(xmpp_server_port) # if client is not connected, lets raise the AssertionError - self.assert_(self.client.get_connect_type()) + self.assertTrue(self.client.get_connect_type()) # client.disconnect() is already called from NBClient via # _on_connected_failure, no need to call it here self.client_auth(credentials[0], credentials[1], credentials[2], sasl=1) - self.assert_(self.connection.con) - self.assert_(self.connection.auth=='sasl', msg='Unable to auth via SASL') + self.assertTrue(self.connection.con) + self.assertTrue(self.connection.auth=='sasl', msg='Unable to auth via SASL') self.do_disconnect() @@ -124,14 +122,14 @@ class TestNonBlockingClient(unittest.TestCase): then disconnected. ''' self.open_stream(xmpp_server_port) - self.assert_(self.client.get_connect_type()) + self.assertTrue(self.client.get_connect_type()) self.client_auth(credentials[0], credentials[1], credentials[2], sasl=0) - self.assert_(self.connection.con) + self.assertTrue(self.connection.con) features = self.client.Dispatcher.Stream.features if not features.getTag('auth'): - print "Server doesn't support old authentication type, ignoring test" + print("Server doesn't support old authentication type, ignoring test") else: - self.assert_(self.connection.auth=='old_auth', + self.assertTrue(self.connection.auth=='old_auth', msg='Unable to auth via old_auth') self.do_disconnect() @@ -141,7 +139,7 @@ class TestNonBlockingClient(unittest.TestCase): nothing. ''' self.open_stream(('fdsfsdf.fdsf.fss', 5222)) - self.assert_(not self.client.get_connect_type()) + self.assertTrue(not self.client.get_connect_type()) def test_connect_to_wrong_port(self): ''' @@ -149,15 +147,15 @@ class TestNonBlockingClient(unittest.TestCase): IP but there shouldn't be XMPP server running on specified port. ''' self.open_stream((xmpp_server_port[0], 31337)) - self.assert_(not self.client.get_connect_type()) + self.assertTrue(not self.client.get_connect_type()) def test_connect_with_wrong_creds(self): ''' Connecting with invalid password. ''' self.open_stream(xmpp_server_port, wrong_pass=True) - self.assert_(self.client.get_connect_type()) + self.assertTrue(self.client.get_connect_type()) self.client_auth(credentials[0], 'wrong pass', credentials[2], sasl=1) - self.assert_(self.connection.auth is None) + self.assertTrue(self.connection.auth is None) self.do_disconnect() ===================================== test/unit/test_xmpp_dispatcher_nb.py ===================================== @@ -3,10 +3,9 @@ Tests for dispatcher_nb.py ''' import unittest -import lib -lib.setup_env() +from test import lib -from mock import Mock +from test.lib.mock import Mock from nbxmpp import dispatcher_nb from nbxmpp import protocol ===================================== test/unit/test_xmpp_smacks.py ===================================== @@ -3,10 +3,7 @@ Tests for smacks.py Stream Management ''' import unittest -import lib -lib.setup_env() - -from mock import Mock +from test.lib.mock import Mock from nbxmpp import dispatcher_nb from nbxmpp import protocol ===================================== test/unit/test_xmpp_transports_nb.py ===================================== @@ -4,9 +4,6 @@ Unit test for tranports classes. import unittest -import lib -lib.setup_env() - from nbxmpp import transports_nb ===================================== test/unit/test_xmpp_transports_nb2.py ===================================== @@ -6,10 +6,7 @@ unit tests of this module. import unittest import socket -import lib -lib.setup_env() - -from xmpp_mocks import IdleQueueThread, IdleMock +from test.lib.xmpp_mocks import IdleQueueThread, IdleMock from nbxmpp import transports_nb View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/7cefcdd5a2221cf279547ff98… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/7cefcdd5a2221cf279547ff98… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Dont fail when importing plugin_i18n for tests
by Philipp Hörist 21 Nov '18

21 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: cb056712 by Philipp Hörist at 2018-11-21T20:44:19Z Dont fail when importing plugin_i18n for tests - - - - - 1 changed file: - gajim/plugins/plugins_i18n.py Changes: ===================================== gajim/plugins/plugins_i18n.py ===================================== @@ -21,7 +21,13 @@ import gettext from gajim.common import configpaths DOMAIN = 'gajim_plugins' -plugin_user_dir = configpaths.get('PLUGINS_USER') +try: + plugin_user_dir = configpaths.get('PLUGINS_USER') +except KeyError: + # This allows to import the module for tests + print('No plugin translation path available') + plugin_user_dir = '' + plugins_locale_dir = os.path.join(plugin_user_dir, 'locale') try: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/cb0567125476a4ec83131e5d21de2a0319… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/cb0567125476a4ec83131e5d21de2a0319… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Unittest: Add more caps hash examples
by Philipp Hörist 21 Nov '18

21 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1196e1df by Philipp Hörist at 2018-11-21T19:02:44Z Unittest: Add more caps hash examples - - - - - 1 changed file: - test/no_gui/unit/test_caps_cache.py Changes: ===================================== test/no_gui/unit/test_caps_cache.py ===================================== @@ -8,8 +8,8 @@ from nbxmpp import NS_MUC, NS_PING, NS_XHTML_IM, Iq from gajim.common import caps_cache as caps from gajim.common.modules.discovery import Discovery -COMPLEX_EXAMPLE = ''' -<iq from='benvolio(a)capulet.lit/230193' id='disco1' to='juliet(a)capulet.lit/chamber' type='result'> +EXAMPLES = [ +'''<iq> <query xmlns='http://jabber.org/protocol/disco#info' node='http://psi-im.org#q07IKJEyjvHSyhy//CH0CxmKi8w='> <identity xml:lang='en' category='client' name='Psi 0.11' type='pc'/> <identity xml:lang='el' category='client' name='Ψ 0.11' type='pc'/> @@ -39,7 +39,94 @@ COMPLEX_EXAMPLE = ''' </field> </x> </query> -</iq>''' +</iq> +''', + +'''<iq> +<query node="http://bombusmod.net.ru/caps#tbBQGBMv8g8U7kW55TEZZRnMCJ4=" xmlns="http://jabber.org/protocol/disco#info"> +<identity category="client" name="BombusMod" type="mobile"/> +<feature var="http://jabber.org/protocol/chatstates"/> +<feature var="http://jabber.org/protocol/disco#info"/> +<feature var="http://jabber.org/protocol/disco#items"/> +<feature var="http://jabber.org/protocol/rosterx"/> +<feature var="jabber:iq:last"/> +<feature var="jabber:iq:privacy"/> +<feature var="jabber:iq:roster"/> +<feature var="jabber:iq:time"/> +<feature var="jabber:iq:version"/> +<feature var="jabber:x:oob"/> +<feature var="urn:xmpp:ping"/> +<feature var="urn:xmpp:receipts"/> +<feature var="urn:xmpp:time"/> +</query> +</iq> +''', + +'''<iq> +<query node="http://jappix.org/#qRsaGbKTz8EwAOakYO00InkZUxM=" xmlns="http://jabber.org/protocol/disco#info"> + <identity category="client" name="Jappix" type="web"/> + <feature var="http://jabber.org/protocol/activity"/> + <feature var="http://jabber.org/protocol/activity+notify"/> + <feature var="http://jabber.org/protocol/caps"/> + <feature var="http://jabber.org/protocol/chatstates"/> + <feature var="http://jabber.org/protocol/commands"/> + <feature var="http://jabber.org/protocol/disco#info"/> + <feature var="http://jabber.org/protocol/disco#items"/> + <feature var="http://jabber.org/protocol/geoloc"/> + <feature var="http://jabber.org/protocol/geoloc+notify"/> + <feature var="http://jabber.org/protocol/http-auth"/> + <feature var="http://jabber.org/protocol/httpbind"/> + <feature var="http://jabber.org/protocol/mood"/> + <feature var="http://jabber.org/protocol/mood+notify"/> + <feature var="http://jabber.org/protocol/muc"/> + <feature var="http://jabber.org/protocol/muc#admin"/> + <feature var="http://jabber.org/protocol/muc#owner"/> + <feature var="http://jabber.org/protocol/muc#roomconfig"/> + <feature var="http://jabber.org/protocol/muc#user"/> + <feature var="http://jabber.org/protocol/nick"/> + <feature var="http://jabber.org/protocol/pubsub#retrieve-items"/> + <feature var="http://jabber.org/protocol/rosterx"/> + <feature var="http://jabber.org/protocol/tune"/> + <feature var="http://jabber.org/protocol/tune+notify"/> + <feature var="http://jabber.org/protocol/xhtml-im"/> + <feature var="ipv6"/> + <feature var="jabber:iq:last"/> + <feature var="jabber:iq:oob"/> + <feature var="jabber:iq:privacy"/> + <feature var="jabber:iq:private"/> + <feature var="jabber:iq:register"/> + <feature var="jabber:iq:roster"/> + <feature var="jabber:iq:search"/> + <feature var="jabber:iq:version"/> + <feature var="jabber:x:data"/> + <feature var="jabber:x:oob"/> + <feature var="urn:ietf:params:xml:ns:vcard-4.0"/> + <feature var="urn:ietf:rfc:3264"/> + <feature var="urn:xmpp:avatar:data"/> + <feature var="urn:xmpp:avatar:metadata"/> + <feature var="urn:xmpp:delay"/> + <feature var="urn:xmpp:extdisco:1"/> + <feature var="urn:xmpp:inbox"/> + <feature var="urn:xmpp:inbox+notify"/> + <feature var="urn:xmpp:jingle:1"/> + <feature var="urn:xmpp:jingle:apps:rtp:1"/> + <feature var="urn:xmpp:jingle:apps:rtp:audio"/> + <feature var="urn:xmpp:jingle:apps:rtp:rtcp-fb:0"/> + <feature var="urn:xmpp:jingle:apps:rtp:rtp-hdrext:0"/> + <feature var="urn:xmpp:jingle:apps:rtp:video"/> + <feature var="urn:xmpp:jingle:apps:rtp:zrtp:1"/> + <feature var="urn:xmpp:jingle:transports:ice-udp:1"/> + <feature var="urn:xmpp:mam:0"/> + <feature var="urn:xmpp:microblog:0"/> + <feature var="urn:xmpp:microblog:0+notify"/> + <feature var="urn:xmpp:ping"/> + <feature var="urn:xmpp:receipts"/> + <feature var="urn:xmpp:time"/> + <feature var="urn:xmpp:tmp:jingle:apps:dtls:0"/> + <feature var="vcard-temp"/> +</query> +</iq>''', +] class CommonCapsTest(unittest.TestCase): @@ -125,10 +212,12 @@ class TestCapsCache(CommonCapsTest): def test_hash(self): '''tests the hash computation''' - stanza = Iq(node=COMPLEX_EXAMPLE) - identities, features, data, _ = Discovery.parse_info_response(stanza) - computed_hash = caps.compute_caps_hash(identities, features, data) - self.assertEqual('q07IKJEyjvHSyhy//CH0CxmKi8w=', computed_hash) + for example in EXAMPLES: + stanza = Iq(node=example) + identities, features, data, node = Discovery.parse_info_response(stanza) + computed_hash = caps.compute_caps_hash(identities, features, data) + hash_ = node.split('#')[1] + self.assertEqual(hash_, computed_hash) class TestClientCaps(CommonCapsTest): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1196e1df0d1c483d61d4ae23c97638fa39… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1196e1df0d1c483d61d4ae23c97638fa39… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Satisfy pylint/mypy
by Philipp Hörist 20 Nov '18

20 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 35b5a4d7 by Philipp Hörist at 2018-11-20T22:06:27Z Satisfy pylint/mypy - - - - - 2 changed files: - gajim/gtk/util.py - gajim/privatechat_control.py Changes: ===================================== gajim/gtk/util.py ===================================== @@ -180,7 +180,7 @@ def get_builder(file_name: str, widgets: List[str] = None) -> Builder: return Builder(file_name, widgets) -def set_urgency_hint(window: Any, setting: bool): +def set_urgency_hint(window: Any, setting: bool) -> None: if app.config.get('use_urgency_hint'): window.set_urgency_hint(setting) ===================================== gajim/privatechat_control.py ===================================== @@ -24,8 +24,6 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -import nbxmpp - from gajim import message_control from gajim.common import app View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/35b5a4d7a99b574254c32d1c72f886be18… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/35b5a4d7a99b574254c32d1c72f886be18… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits