Commits

commits@gajim.org

17632 discussions

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

09 Dec '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6e30d3af by Philipp Hörist at 2018-12-09T17:48:44Z Adapt to nbxmpp API changes - Remove support for OAUTH2 - Remove insecure password dialog, its impossible now that a user can connect plain by mistake - Refactor requesting the password - Add possibility to delete passwords - - - - - 6 changed files: - gajim/common/config.py - gajim/common/connection.py - gajim/common/connection_handlers_events.py - gajim/common/passwords.py - gajim/gtk/accounts.py - gajim/gui_interface.py Changes: ===================================== gajim/common/config.py ===================================== @@ -391,9 +391,6 @@ class Config: 'subscription_request_msg': [opt_str, '', _('Message that is sent to contacts you want to add')], 'enable_message_carbons': [opt_bool, True, _('If enabled and if server supports this feature, Gajim will receive messages sent and received by other resources.')], 'ft_send_local_ips': [opt_bool, True, _('If enabled, Gajim will send your local IPs so your contact can connect to your machine to transfer files.')], - 'oauth2_refresh_token': [opt_str, '', _('Latest token for OAuth 2.0 authentication.')], - 'oauth2_client_id': [opt_str, '0000000044077801', _('client_id for OAuth 2.0 authentication.')], - 'oauth2_redirect_url': [opt_str, 'https%3A%2F%2Fgajim.org%2Fmsnauth%2Findex.cgi', _('redirect_url for OAuth 2.0 authentication.')], 'opened_chat_controls': [opt_str, '', _('Space separated list of JIDs for which chat window will be re-opened on next startup.')], 'recent_groupchats': [opt_str, ''], 'httpupload_verify': [opt_bool, True, _('HTTP Upload: Enable HTTPS Verification')], ===================================== gajim/common/connection.py ===================================== @@ -87,7 +87,7 @@ class CommonConnection: self.connected = 0 self.connection = None # xmpppy ClientCommon instance self.is_zeroconf = False - self.password = '' + self.password = None self.server_resource = self._compute_resource() self.gpg = None self.USE_GPG = False @@ -500,7 +500,6 @@ class Connection(CommonConnection, ConnectionHandlers): self.new_account_info = None self.new_account_form = None self.last_sent = [] - self.password = passwords.get_password(name) self._unregister_account = False self._unregister_account_cb = None @@ -510,7 +509,6 @@ class Connection(CommonConnection, ConnectionHandlers): self.register_supported = False # Do we auto accept insecure connection self.connection_auto_accepted = False - self.pasword_callback = None self.on_connect_success = None self.on_connect_failure = None @@ -1273,25 +1271,45 @@ class Connection(CommonConnection, ConnectionHandlers): return log.info('SSL Cert accepted') - name = None - if not app.config.get_per('accounts', self.name, 'anonymous_auth'): - name = app.config.get_per('accounts', self.name, 'name') + self._auth() + + def _get_password(self, mechanism, on_password): + if not mechanism.startswith('SCRAM') and not mechanism == 'PLAIN': + log.error('No password method for %s known', mechanism) + return + + if self.password is not None: + # Passord already known + on_password(self.password) + return + + pass_saved = app.config.get_per('accounts', self.name, 'savepass') + if pass_saved: + # Request password from keyring only if the user chose to save + # his password + self.password = passwords.get_password(self.name) + if self.password is not None: + on_password(self.password) + else: + app.nec.push_incoming_event(PasswordRequiredEvent( + None, conn=self, on_password=on_password)) + + def _auth(self): self._register_handlers(self.connection, self._current_type) - 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: - log.warning('Unknown authentication mechanisms %s', mech) - if not auth_mechs: - auth_mechs = None + if app.config.get_per('accounts', self.name, 'anonymous_auth'): + name = None + auth_mechs = {'ANONYMOUS'} else: - auth_mechs = set(auth_mechs) - self.connection.auth(user=name, - password=self.password, + name = app.config.get_per('accounts', self.name, 'name') + auth_mechs = app.config.get_per( + 'accounts', self.name, 'authentication_mechanisms').split() + auth_mechs = set(auth_mechs) if auth_mechs else None + + self.connection.auth(name, + get_password=self._get_password, resource=self.server_resource, - sasl=True, auth_mechs=auth_mechs) def _register_handlers(self, con, con_type): @@ -1795,66 +1813,6 @@ class Connection(CommonConnection, ConnectionHandlers): caps=ptype != 'unavailable', idle_time=idle_time) - def get_password(self, callback, type_): - if app.config.get_per('accounts', self.name, 'anonymous_auth') and \ - type_ != 'ANONYMOUS': - app.nec.push_incoming_event( - NonAnonymousServerErrorEvent(None, conn=self)) - self.disconnect(reconnect=False) - return - self.pasword_callback = (callback, type_) - if type_ == 'X-MESSENGER-OAUTH2': - client_id = app.config.get_per('accounts', self.name, - 'oauth2_client_id') - refresh_token = app.config.get_per('accounts', self.name, - 'oauth2_refresh_token') - if refresh_token: - renew_url = ( - 'https://oauth.live.com/token?client_id=' - '%s&redirect_uri=https%%3A%%2F%%2Foauth.live.' - 'com%%2Fdesktop&grant_type=refresh_token&' - 'refresh_token=%s') % (client_id, refresh_token) - result = helpers.download_image(self.name, {'src': renew_url})[0] - if result: - dict_ = json.loads(result) - if 'access_token' in dict_: - self.set_password(dict_['access_token']) - return - script_url = app.config.get_per('accounts', self.name, - 'oauth2_redirect_url') - token_url = ( - 'https://oauth.live.com/authorize?client_id=' - '%s&scope=wl.messenger%%20wl.offline_access&' - 'response_type=code&redirect_uri=%s') % (client_id, script_url) - helpers.launch_browser_mailer('url', token_url) - self.disconnect(reconnect=False) - app.nec.push_incoming_event( - Oauth2CredentialsRequiredEvent(None, conn=self)) - return - if self.password: - self.set_password(self.password) - return - app.nec.push_incoming_event(PasswordRequiredEvent(None, conn=self)) - - def set_password(self, password): - self.password = password - if self.pasword_callback: - callback, type_ = self.pasword_callback - if self._current_type == 'plain' and type_ == 'PLAIN' and \ - app.config.get_per('accounts', self.name, - 'warn_when_insecure_password'): - app.nec.push_incoming_event(InsecurePasswordEvent(None, - conn=self)) - return - callback(password) - self.pasword_callback = None - - def accept_insecure_password(self): - if self.pasword_callback: - callback = self.pasword_callback[0] - callback(self.password) - self.pasword_callback = None - def unregister_account(self, on_remove_success): self._unregister_account = True self._unregister_account_cb = on_remove_success ===================================== gajim/common/connection_handlers_events.py ===================================== @@ -681,9 +681,6 @@ class PEPReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): class PlainConnectionEvent(nec.NetworkIncomingEvent): name = 'plain-connection' -class InsecurePasswordEvent(nec.NetworkIncomingEvent): - name = 'insecure-password' - class InsecureSSLConnectionEvent(nec.NetworkIncomingEvent): name = 'insecure-ssl-connection' @@ -723,9 +720,6 @@ class ZeroconfNameConflictEvent(nec.NetworkIncomingEvent): class PasswordRequiredEvent(nec.NetworkIncomingEvent): name = 'password-required' -class Oauth2CredentialsRequiredEvent(nec.NetworkIncomingEvent): - name = 'oauth2-credentials-required' - class SignedInEvent(nec.NetworkIncomingEvent): name = 'signed-in' ===================================== gajim/common/passwords.py ===================================== @@ -43,10 +43,14 @@ class PasswordStorage: def get_password(self, account_name): """Return the password for account_name, or None if not found.""" raise NotImplementedError + def save_password(self, account_name, password): """Save password for account_name. Return a bool indicating success.""" raise NotImplementedError + def delete_password(self, account_name): + """Delete password for account_name. Return a bool indicating success.""" + raise NotImplementedError class SecretPasswordStorage(PasswordStorage): """ Store password using Keyring """ @@ -69,6 +73,10 @@ class SecretPasswordStorage(PasswordStorage): log.debug('getting password') return self.keyring.get_password('gajim', account_name) + def delete_password(self, account_name): + return self.keyring.delete_password('gajim', account_name) + + class PasswordStorageManager(PasswordStorage): """Access all the implemented password storage backends, knowing which ones are available and which we prefer to use. @@ -118,17 +126,27 @@ class PasswordStorageManager(PasswordStorage): return pw def save_password(self, account_name, password): + if account_name in app.connections: + app.connections[account_name].password = password + if not app.config.get_per('accounts', account_name, 'savepass'): + return True + if self.preferred_backend: if self.preferred_backend.save_password(account_name, password): app.config.set_per('accounts', account_name, 'password', self.preferred_backend.identifier) - if account_name in app.connections: - app.connections[account_name].password = password - return True + else: + app.config.set_per('accounts', account_name, 'password', password) + return True - app.config.set_per('accounts', account_name, 'password', password) + def delete_password(self, account_name): if account_name in app.connections: - app.connections[account_name].password = password + app.connections[account_name].password = None + + if not self.preferred_backend: + self.preferred_backend.delete_password(account_name) + else: + app.config.set_per('accounts', account_name, 'password', None) return True def set_preferred_backend(self): @@ -148,7 +166,8 @@ def get_storage(): def get_password(account_name): return get_storage().get_password(account_name) +def delete_password(account_name): + return get_storage().delete_password(account_name) + def save_password(account_name, password): - if account_name in app.connections: - app.connections[account_name].set_password(password) return get_storage().save_password(account_name, password) ===================================== gajim/gtk/accounts.py ===================================== @@ -810,4 +810,4 @@ class LoginDialog(OptionsDialog): def on_destroy(self, *args): savepass = app.config.get_per('accounts', self.account, 'savepass') if not savepass: - passwords.save_password(self.account, '') + passwords.delete_password(self.account) ===================================== gajim/gui_interface.py ===================================== @@ -107,7 +107,6 @@ from gajim.gtk.dialogs import WarningDialog from gajim.gtk.dialogs import InformationDialog from gajim.gtk.dialogs import InputDialog from gajim.gtk.dialogs import YesNoDialog -from gajim.gtk.dialogs import InputTextDialog from gajim.gtk.dialogs import PlainConnectionDialog from gajim.gtk.dialogs import SSLErrorDialog from gajim.gtk.dialogs import ConfirmationDialogDoubleCheck @@ -713,45 +712,19 @@ class Interface: text = _('Enter your password for account %s') % account def on_ok(passphrase, save): - if save: - app.config.set_per('accounts', account, 'savepass', True) - passwords.save_password(account, passphrase) - obj.conn.set_password(passphrase) + app.config.set_per('accounts', account, 'savepass', save) + passwords.save_password(account, passphrase) + obj.on_password(passphrase) del self.pass_dialog[account] def on_cancel(): - self.roster.set_state(account, 'offline') - self.roster.update_status_combobox() + obj.conn.disconnect(reconnect=False, immediately=True) del self.pass_dialog[account] self.pass_dialog[account] = dialogs.PassphraseDialog( _('Password Required'), text, _('Save password'), ok_handler=on_ok, cancel_handler=on_cancel) - def handle_oauth2_credentials(self, obj): - account = obj.conn.name - def on_ok(refresh): - app.config.set_per('accounts', account, 'oauth2_refresh_token', - refresh) - st = app.config.get_per('accounts', account, 'last_status') - msg = helpers.from_one_line(app.config.get_per('accounts', - account, 'last_status_msg')) - app.interface.roster.send_status(account, st, msg) - del self.pass_dialog[account] - - def on_cancel(): - app.config.set_per('accounts', account, 'oauth2_refresh_token', - '') - self.roster.set_state(account, 'offline') - self.roster.update_status_combobox() - del self.pass_dialog[account] - - instruction = _('Please copy / paste the refresh token from the website' - ' that has just been opened.') - self.pass_dialog[account] = InputTextDialog( - _('Oauth2 Credentials'), instruction, is_modal=False, - ok_handler=on_ok, cancel_handler=on_cancel) - def handle_event_roster_info(self, obj): #('ROSTER_INFO', account, (jid, name, sub, ask, groups)) account = obj.conn.name @@ -1454,48 +1427,6 @@ class Interface: checktext2, on_response_ok=on_ok, on_response_cancel=on_cancel, is_modal=False) - def handle_event_insecure_password(self, obj): - # ('INSECURE_PASSWORD', account, ()) - def on_ok(is_checked): - if not is_checked[0]: - on_cancel() - return - del self.instances[obj.conn.name]['online_dialog']\ - ['insecure_password'] - if is_checked[1]: - app.config.set_per('accounts', obj.conn.name, - 'warn_when_insecure_password', False) - if obj.conn.connected == 0: - # We have been disconnecting (too long time since window is - # opened) - # re-connect with auto-accept - obj.conn.connection_auto_accepted = True - show, msg = obj.conn.continue_connect_info[:2] - self.roster.send_status(obj.conn.name, show, msg) - return - obj.conn.accept_insecure_password() - - def on_cancel(): - del self.instances[obj.conn.name]['online_dialog']\ - ['insecure_password'] - obj.conn.disconnect(reconnect=False) - app.nec.push_incoming_event(OurShowEvent(None, conn=obj.conn, - show='offline')) - - pritext = _('Insecure connection') - sectext = _('You are about to send your password unencrypted on an ' - 'insecure connection. Are you sure you want to do that?') - checktext1 = _('Yes, I really want to connect insecurely') - checktext2 = _('_Do not ask me again') - if 'insecure_password' in self.instances[obj.conn.name]\ - ['online_dialog']: - self.instances[obj.conn.name]['online_dialog']\ - ['insecure_password'].destroy() - self.instances[obj.conn.name]['online_dialog']['insecure_password'] = \ - ConfirmationDialogDoubleCheck(pritext, sectext, checktext1, - checktext2, on_response_ok=on_ok, on_response_cancel=on_cancel, - is_modal=False) - def create_core_handlers_list(self): self.handlers = { 'DB_ERROR': [self.handle_event_db_error], @@ -1515,7 +1446,6 @@ class Interface: 'gpg-trust-key': [self.handle_event_gpg_trust_key], 'http-auth-received': [self.handle_event_http_auth], 'information': [self.handle_event_information], - 'insecure-password': [self.handle_event_insecure_password], 'insecure-ssl-connection': \ [self.handle_event_insecure_ssl_connection], 'iq-error-received': [self.handle_event_iq_error], @@ -1530,7 +1460,6 @@ class Interface: 'message-sent': [self.handle_event_msgsent], 'metacontacts-received': [self.handle_event_metacontacts], 'muc-owner-received': [self.handle_event_gc_config], - 'oauth2-credentials-required': [self.handle_oauth2_credentials], 'our-show': [self.handle_event_status], 'password-required': [self.handle_event_password_required], 'plain-connection': [self.handle_event_plain_connection], View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6e30d3af6473d41de42f1d60cd0363215b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6e30d3af6473d41de42f1d60cd0363215b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Rewrite auth module from scratch
by Philipp Hörist 09 Dec '18

09 Dec '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: f2a20338 by Philipp Hörist at 2018-12-09T17:43:48Z Rewrite auth module from scratch - Move NonBlockingBind to own module - Add SCRAM-SHA-256 and SCRAM-SHA-256-PLUS support - Remove DIGEST-MD5 and X-MESSENGER-OAUTH2 support - - - - - 9 changed files: - nbxmpp/__init__.py - + nbxmpp/auth.py - − nbxmpp/auth_nb.py - + nbxmpp/bind.py - nbxmpp/client_nb.py - nbxmpp/const.py - nbxmpp/protocol.py - + nbxmpp/util.py - + test/unit/test_sasl_scram.py Changes: ===================================== nbxmpp/__init__.py ===================================== @@ -9,7 +9,7 @@ Thanks and credits to the xmpppy developers. See: http://xmpppy.sourceforge.net/ """ from .protocol import * -from . import simplexml, protocol, auth_nb, transports_nb, roster_nb +from . import simplexml, protocol, auth, transports_nb, roster_nb from . import dispatcher_nb, features_nb, idlequeue, bosh, tls_nb, proxy_connectors from .client_nb import NonBlockingClient from .plugin import PlugIn ===================================== nbxmpp/auth.py ===================================== @@ -0,0 +1,473 @@ +# 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 os +import hmac +import binascii +import logging +import hashlib +from hashlib import pbkdf2_hmac +from functools import partial + +from nbxmpp.plugin import PlugIn +from nbxmpp.protocol import NS_SASL +from nbxmpp.protocol import Node +from nbxmpp.protocol import NodeProcessed +from nbxmpp.protocol import SASL_ERROR_CONDITIONS +from nbxmpp.protocol import SASL_AUTH_MECHS +from nbxmpp.util import b64decode +from nbxmpp.util import b64encode +from nbxmpp.const import GSSAPIState + + +log = logging.getLogger('nbxmpp.auth') + +try: + kerberos = __import__('kerberos') + KERBEROS_AVAILABLE = True +except ImportError: + KERBEROS_AVAILABLE = False + + +class SASL(PlugIn): + """ + Implements SASL authentication. Can be plugged into NonBlockingClient + to start authentication + """ + + _default_mechs = set(['SCRAM-SHA-256-PLUS', + 'SCRAM-SHA-256', + 'SCRAM-SHA-1-PLUS', + 'SCRAM-SHA-1', + 'PLAIN']) + + def __init__(self, username, auth_mechs, get_password, on_finished): + """ + :param username: XMPP username + :param auth_mechs: Set of valid authentication mechanisms. + Possible entries are: + 'ANONYMOUS', 'EXTERNAL', 'GSSAPI', 'SCRAM-SHA-1-PLUS', + 'SCRAM-SHA-1', 'SCRAM-SHA-256', 'SCRAM-SHA-256-PLUS', 'PLAIN' + :param on_finished: Callback after SASL is finished + :param get_password: Callback that must return the password for the + chosen mechanism + """ + PlugIn.__init__(self) + self.username = username + self._on_finished = on_finished + self._get_password = get_password + + self._prefered_mechs = auth_mechs + self._enabled_mechs = self._prefered_mechs or self._default_mechs + self._chosen_mechanism = None + self._method = None + + self._channel_binding = None + + def _setup_mechs(self): + if self._owner.connected in ('ssl', 'tls'): + if self._owner.protocol_type == 'BOSH': + # PLUS would break if the server uses any kind of reverse proxy + self._enabled_mechs.discard('SCRAM-SHA-1-PLUS') + self._enabled_mechs.discard('SCRAM-SHA-256-PLUS') + else: + self._channel_binding = self._owner.Connection.NonBlockingTLS.get_channel_binding() + # TLS handshake is finished so channel binding data muss exist + if self._channel_binding is None: + raise ValueError('No channel binding data found') + + else: + self._enabled_mechs.discard('SCRAM-SHA-1-PLUS') + self._enabled_mechs.discard('SCRAM-SHA-256-PLUS') + if self._prefered_mechs is None: + # if the client didnt specify any auth mechs avoid + # sending the password over a plain connection + self._enabled_mechs.discard('PLAIN') + + if not KERBEROS_AVAILABLE: + self._enabled_mechs.discard('GSSAPI') + + def plugin(self, _owner): + self._setup_mechs() + self._owner.RegisterHandler( + 'challenge', self._on_challenge, xmlns=NS_SASL) + self._owner.RegisterHandler( + 'failure', self._on_failure, xmlns=NS_SASL) + self._owner.RegisterHandler( + 'success', self._on_success, xmlns=NS_SASL) + + # Execute the Handler manually, we already received the features + self._on_features(None, self._owner.Dispatcher.Stream.features) + + def plugout(self): + """ + Remove SASL handlers from owner's dispatcher. Used internally + """ + self._owner.UnregisterHandler( + 'challenge', self._on_challenge, xmlns=NS_SASL) + self._owner.UnregisterHandler( + 'failure', self._on_failure, xmlns=NS_SASL) + self._owner.UnregisterHandler( + 'success', self._on_success, xmlns=NS_SASL) + + def _on_features(self, _con, stanza): + """ + Used to determine if server supports SASL auth. Used internally + """ + if not stanza.getTag('mechanisms', namespace=NS_SASL): + return + + mechanisms = stanza.getTag('mechanisms', namespace=NS_SASL) + mechanisms = mechanisms.getTags('mechanism') + + mechs = set(mech.getData() for mech in mechanisms) + available_mechs = mechs & self._enabled_mechs + + log.info('Available mechanisms: %s', available_mechs) + + if not available_mechs: + log.error('No available auth mechanisms found') + self._abort_auth('invalid-mechanism') + return + + for mech in SASL_AUTH_MECHS: + if mech in available_mechs: + self._chosen_mechanism = mech + break + + if self._chosen_mechanism is None: + log.error('No available auth mechanisms found') + self._abort_auth('invalid-mechanism') + return + + log.info('Chosen auth mechanism: %s', self._chosen_mechanism) + self._auth() + + def _auth(self): + password_cb = partial(self._on_password, self.username) + + if self._chosen_mechanism == 'SCRAM-SHA-256-PLUS': + self._method = SCRAM_SHA_256_PLUS(self._owner.Connection, + self._channel_binding) + self._get_password(self._chosen_mechanism, password_cb) + + elif self._chosen_mechanism == 'SCRAM-SHA-256': + self._method = SCRAM_SHA_256(self._owner.Connection, None) + self._get_password(self._chosen_mechanism, password_cb) + + elif self._chosen_mechanism == 'SCRAM-SHA-1-PLUS': + self._method = SCRAM_SHA_1_PLUS(self._owner.Connection, + self._channel_binding) + self._get_password(self._chosen_mechanism, password_cb) + + elif self._chosen_mechanism == 'SCRAM-SHA-1': + self._method = SCRAM_SHA_1(self._owner.Connection, None) + self._get_password(self._chosen_mechanism, password_cb) + + elif self._chosen_mechanism == 'PLAIN': + self._method = PLAIN(self._owner.Connection) + self._get_password(self._chosen_mechanism, password_cb) + + elif self._chosen_mechanism == 'ANONYMOUS': + self._method = ANONYMOUS(self._owner.Connection) + self._method.initiate() + + elif self._chosen_mechanism == 'EXTERNAL': + self._method = EXTERNAL(self._owner.Connection) + self._method.initiate(self.username, self._owner.Server) + + elif self._chosen_mechanism == 'GSSAPI': + self._method = GSSAPI(self._owner.Connection) + self._method.initiate(self._owner.xmpp_hostname) + + else: + log.error('Unknown auth mech') + + def _on_password(self, username, password): + if password is None: + log.warning('No password supplied') + return + self._method.initiate(username, password) + + def _on_challenge(self, _con, stanza): + try: + self._method.response(stanza.getData()) + except AttributeError: + log.info('Mechanism has no response method') + self._abort_auth() + except AuthFail as error: + log.error(error) + self._abort_auth() + raise NodeProcessed + + def _on_success(self, _con, stanza): + log.info('Successfully authenticated with remote server') + try: + self._method.success(stanza.getData()) + except AttributeError: + pass + except AuthFail as error: + log.error(error) + self._abort_auth() + raise NodeProcessed + + self._on_finished(True, None, None) + raise NodeProcessed + + def _on_failure(self, _con, stanza): + text = stanza.getTagData('text') + reason = 'not-authorized' + childs = stanza.getChildren() + for child in childs: + name = child.getName() + if name == 'text': + continue + if name in SASL_ERROR_CONDITIONS: + reason = name + break + + log.info('Failed SASL authentification: %s %s', reason, text) + self._abort_auth(reason, text) + raise NodeProcessed + + def _abort_auth(self, reason='malformed-request', text=None): + node = Node('abort', attrs={'xmlns': NS_SASL}) + self._owner.send(node) + self._owner.Connection.start_disconnect() + self._on_finished(False, reason, text) + + +class PLAIN: + + _mechanism = 'PLAIN' + + def __init__(self, con): + self._con = con + + def initiate(self, username, password): + payload = b64encode('\x00%s\x00%s' % (username, password)) + node = Node('auth', + attrs={'xmlns': NS_SASL, 'mechanism': 'PLAIN'}, + payload=[payload]) + self._con.send(node) + + +class EXTERNAL: + + _mechanism = 'EXTERNAL' + + def __init__(self, con): + self._con = con + + def initiate(self, username, server): + payload = b64encode('%s@%s' % (username, server)) + node = Node('auth', + attrs={'xmlns': NS_SASL, 'mechanism': 'EXTERNAL'}, + payload=[payload]) + self._con.send(node) + + +class ANONYMOUS: + + _mechanism = 'ANONYMOUS' + + def __init__(self, con): + self._con = con + + def initiate(self): + node = Node('auth', attrs={'xmlns': NS_SASL, 'mechanism': 'ANONYMOUS'}) + self._con.send(node) + + +class GSSAPI: + + _mechanism = 'GSSAPI' + + def __init__(self, con): + self._con = con + self._gss_vc = None + self._state = GSSAPIState.STEP + + def initiate(self, hostname): + self._gss_vc = kerberos.authGSSClientInit('xmpp@%s' % hostname)[1] + kerberos.authGSSClientStep(self._gss_vc, '') + response = kerberos.authGSSClientResponse(self._gss_vc) + node = Node('auth', + attrs={'xmlns': NS_SASL, 'mechanism': 'GSSAPI'}, + payload=(response or '')) + self._con.send(node) + + def response(self, server_message, *args, **kwargs): + server_message = b64decode(server_message, bytes) + if self._state == GSSAPIState.STEP: + rc = kerberos.authGSSClientStep(self._gss_vc, server_message) + if rc != kerberos.AUTH_GSS_CONTINUE: + self._state = GSSAPIState.WRAP + elif self._state == GSSAPIState.WRAP: + rc = kerberos.authGSSClientUnwrap(self._gss_vc, server_message) + response = kerberos.authGSSClientResponse(self._gss_vc) + rc = kerberos.authGSSClientWrap( + self._gss_vc, + response, + kerberos.authGSSClientUserName(self._gss_vc)) + response = kerberos.authGSSClientResponse(self._gss_vc) + if not response: + response = '' + + node = Node('response', + attrs={'xmlns': NS_SASL}, + payload=response) + self._con.send(node) + + +class SCRAM: + + _mechanism = '' + _channel_binding = '' + _hash_method = '' + + def __init__(self, con, channel_binding): + self._con = con + self._channel_binding_data = channel_binding + self._client_nonce = '%x' % int(binascii.hexlify(os.urandom(24)), 16) + self._client_first_message_bare = None + self._server_signature = None + self._password = None + + @property + def nonce_length(self): + return len(self._client_nonce) + + @property + def _b64_channel_binding_data(self): + if self._mechanism.endswith('PLUS'): + return b64encode(b'%s%s' % (self._channel_binding.encode(), + self._channel_binding_data)) + return b64encode(self._channel_binding) + + @staticmethod + def _scram_parse(scram_data): + return dict(s.split('=', 1) for s in scram_data.split(',')) + + def initiate(self, username, password): + self._password = password + self._client_first_message_bare = 'n=%s,r=%s' % (username, + self._client_nonce) + client_first_message = '%s%s' % (self._channel_binding, + self._client_first_message_bare) + payload = b64encode(client_first_message) + node = Node('auth', + attrs={'xmlns': NS_SASL, 'mechanism': self._mechanism}, + payload=[payload]) + self._con.send(node) + + def response(self, server_first_message): + server_first_message = b64decode(server_first_message) + challenge = self._scram_parse(server_first_message) + + client_nonce = challenge['r'][:self.nonce_length] + if client_nonce != self._client_nonce: + raise AuthFail('Invalid client nonce received from server') + + salt = b64decode(challenge['s'], bytes) + iteration_count = int(challenge['i']) + + if iteration_count < 4096: + raise AuthFail('Salt iteration count to low: %s' % iteration_count) + + salted_password = pbkdf2_hmac(self._hash_method, + self._password.encode('utf8'), + salt, + iteration_count) + + client_final_message_wo_proof = 'c=%s,r=%s' % ( + self._b64_channel_binding_data, + challenge['r'] + ) + + client_key = self._hmac(salted_password, 'Client Key') + stored_key = self._h(client_key) + auth_message = '%s,%s,%s' % (self._client_first_message_bare, + server_first_message, + client_final_message_wo_proof) + client_signature = self._hmac(stored_key, auth_message) + client_proof = self._xor(client_key, client_signature) + + client_finale_message = 'c=%s,r=%s,p=%s' % ( + self._b64_channel_binding_data, + challenge['r'], + b64encode(client_proof) + ) + + server_key = self._hmac(salted_password, 'Server Key') + self._server_signature = self._hmac(server_key, auth_message) + + log.debug('Response: %s', client_finale_message) + payload = b64encode(client_finale_message) + node = Node('response', + attrs={'xmlns': NS_SASL}, + payload=[payload]) + self._con.send(node) + + def success(self, server_last_message): + server_last_message = b64decode(server_last_message) + success = self._scram_parse(server_last_message) + server_signature = b64decode(success['v'], bytes) + if server_signature != self._server_signature: + raise AuthFail('Invalid server signature') + + def _hmac(self, key, message): + return hmac.new(key=key, + msg=message.encode(), + digestmod=self._hash_method).digest() + + @staticmethod + def _xor(x, y): + return bytes([px ^ py for px, py in zip(x, y)]) + + def _h(self, data): + return hashlib.new(self._hash_method, data).digest() + + +class SCRAM_SHA_1(SCRAM): + + _mechanism = 'SCRAM-SHA-1' + _channel_binding = 'y,,' + _hash_method = 'sha1' + + +class SCRAM_SHA_1_PLUS(SCRAM_SHA_1): + + _mechanism = 'SCRAM-SHA-1-PLUS' + _channel_binding = 'p=tls-unique,,' + + +class SCRAM_SHA_256(SCRAM): + + _mechanism = 'SCRAM-SHA-256' + _channel_binding = 'y,,' + _hash_method = 'sha256' + + +class SCRAM_SHA_256_PLUS(SCRAM_SHA_256): + + _mechanism = 'SCRAM-SHA-256-PLUS' + _channel_binding = 'p=tls-unique,,' + + +class AuthFail(Exception): + pass ===================================== nbxmpp/auth_nb.py deleted ===================================== @@ -1,658 +0,0 @@ -## auth_nb.py -## based on auth.py, changes backported up to revision 1.41 -## -## Copyright (C) 2003-2005 Alexey "Snake" Nezhdanov -## modified by Dimitur Kirov <dkirov(a)gmail.com> -## -## 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, 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. - -""" -Provides plugs for SASL and NON-SASL authentication mechanisms. -Can be used both for client and transport authentication - -See client_nb.py -""" - -import re -import os -import binascii -import base64 -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() -def H(some): return hashlib.md5(some).digest() -def C(some): return b':'.join(some) - -try: - kerberos = __import__('kerberos') - have_kerberos = True -except ImportError: - have_kerberos = False - -GSS_STATE_STEP = 0 -GSS_STATE_WRAP = 1 -SASL_FAILURE_IN_PROGRESS = 'failure-in-process' -SASL_FAILURE = 'failure' -SASL_SUCCESS = 'success' -SASL_UNSUPPORTED = 'not-supported' -SASL_IN_PROCESS = 'in-process' - -# compile the search regex for _challenge_splitter -_challenge_regex = re.compile( - r'(\w+)=' # keyword - r'("[^"]+"|[^,]+)' # value - r',?', # optional comma separator - re.VERBOSE -) - -def _challenge_splitter(data): - """ - Helper function that creates a dict from challenge string. Used - for DIGEST-MD5 authentication. - - Sample challenge string: - - username="example.org",realm="somerealm", - nonce="OA6MG9tEQGm2hh",cnonce="OA6MHXh6VqTrRk", - nc=00000001,qop="auth,auth-int,auth-conf",charset=utf-8 - - Expected result for challan: - - dict['qop'] = ('auth','auth-int','auth-conf') - - dict['realm'] = 'somerealm' - """ - dict_ = {} - for match in _challenge_regex.finditer(data): - k = match.group(1) - v = match.group(2) - if v.startswith('"'): - v = v[1:-1] # Remove quote - if v.find(',') >= 0: - v = v.split(',') # Split using comma - dict_[k] = v - return dict_ - -def _scram_parse(chatter): - """Helper function. Used for SCRAM-SHA-1, SCRAM-SHA-1-PLUS authentication""" - return dict(s.split('=', 1) for s in chatter.split(',')) - -SASL_AUTHENTICATION_MECHANISMS = \ - set(['ANONYMOUS', 'EXTERNAL', 'GSSAPI', 'SCRAM-SHA-1-PLUS', 'SCRAM-SHA-1', - 'PLAIN', 'X-MESSENGER-OAUTH2']) - -class SASL(PlugIn): - """ - Implements SASL authentication. Can be plugged into NonBlockingClient - to start authentication - """ - - def __init__(self, username, password, on_sasl, channel_binding, - auth_mechs): - """ - :param username: XMPP username - :param password: XMPP password - :param on_sasl: Callback, will be called after each SASL auth-step. - :param channel_binding: TLS channel binding data, None if the - binding data is not available - :param auth_mechs: Set of valid authentication mechanisms. - Possible entries are: - 'ANONYMOUS', 'EXTERNAL', 'GSSAPI', 'SCRAM-SHA-1-PLUS', - 'SCRAM-SHA-1', 'DIGEST-MD5', 'PLAIN', 'X-MESSENGER-OAUTH2' - """ - PlugIn.__init__(self) - self.username = username - self.password = password - self.on_sasl = on_sasl - self.channel_binding = channel_binding - self.enabled_auth_mechs = auth_mechs - self.realm = None - - def plugin(self, owner): - if 'version' not in self._owner.Dispatcher.Stream._document_attrs: - self.startsasl = SASL_UNSUPPORTED - elif self._owner.Dispatcher.Stream.features: - try: - self.FeaturesHandler(self._owner.Dispatcher, - self._owner.Dispatcher.Stream.features) - except NodeProcessed: - pass - else: - self.startsasl = None - - def plugout(self): - """ - Remove SASL handlers from owner's dispatcher. Used internally - """ - if 'features' in self._owner.__dict__: - self._owner.UnregisterHandler('features', self.FeaturesHandler, - xmlns=NS_STREAMS) - if 'challenge' in self._owner.__dict__: - self._owner.UnregisterHandler('challenge', self.SASLHandler, - xmlns=NS_SASL) - if 'failure' in self._owner.__dict__: - self._owner.UnregisterHandler('failure', self.SASLHandler, - xmlns=NS_SASL) - if 'success' in self._owner.__dict__: - self._owner.UnregisterHandler('success', self.SASLHandler, - xmlns=NS_SASL) - - def auth(self): - """ - Start authentication. Result can be obtained via "SASL.startsasl" - attribute and will be either SASL_SUCCESS or SASL_FAILURE - - Note that successful auth will take at least two Dispatcher.Process() - calls. - """ - if self.startsasl: - pass - elif 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 FeaturesHandler(self, conn, feats): - """ - Used to determine if server supports SASL auth. Used internally - """ - if not feats.getTag('mechanisms', namespace=NS_SASL): - self.startsasl='not-supported' - log.info('SASL not supported by server') - return - - self.mecs = set( - mec.getData() - for mec - in feats.getTag('mechanisms', namespace=NS_SASL).getTags('mechanism') - ) & self.enabled_auth_mechs - - # Password based authentication mechanism ordered by strength. - # If the server supports a mechanism disable all weaker mechanisms. - password_auth_mechs_strength = ['SCRAM-SHA-1-PLUS', 'SCRAM-SHA-1', - 'DIGEST-MD5', 'PLAIN', 'X-MESSENGER-OAUTH2'] - if self.channel_binding is None: - password_auth_mechs_strength.remove('SCRAM-SHA-1-PLUS') - for i in range(0, len(password_auth_mechs_strength)): - if password_auth_mechs_strength[i] in self.mecs: - for m in password_auth_mechs_strength[i + 1:]: - self.mecs.discard(m) - break - - self._owner.RegisterHandler('challenge', self.SASLHandler, - xmlns=NS_SASL) - self._owner.RegisterHandler('failure', self.SASLHandler, xmlns=NS_SASL) - self._owner.RegisterHandler('success', self.SASLHandler, xmlns=NS_SASL) - self.MechanismHandler() - - def MechanismHandler(self): - if 'ANONYMOUS' in self.mecs and self.username is None: - self.mecs.remove('ANONYMOUS') - node = Node('auth', attrs={'xmlns': NS_SASL, - 'mechanism': 'ANONYMOUS'}) - self.mechanism = 'ANONYMOUS' - self.startsasl = SASL_IN_PROCESS - self._owner.send(str(node)) - raise NodeProcessed - if "EXTERNAL" in self.mecs: - self.mecs.remove('EXTERNAL') - sasl_data = '%s@%s' % (self.username, self._owner.Server) - sasl_data = base64.b64encode(sasl_data.encode('utf-8')).decode( - 'utf-8').replace('\n', '') - node = Node('auth', attrs={'xmlns': NS_SASL, - 'mechanism': 'EXTERNAL'}, payload=[sasl_data]) - self.mechanism = 'EXTERNAL' - self.startsasl = SASL_IN_PROCESS - self._owner.send(str(node)) - raise NodeProcessed - if 'GSSAPI' in self.mecs and have_kerberos: - self.mecs.remove('GSSAPI') - try: - self.gss_vc = kerberos.authGSSClientInit('xmpp@' + \ - self._owner.xmpp_hostname)[1] - kerberos.authGSSClientStep(self.gss_vc, '') - response = kerberos.authGSSClientResponse(self.gss_vc) - node=Node('auth', attrs={'xmlns': NS_SASL, - 'mechanism': 'GSSAPI'}, payload=(response or '')) - self.mechanism = 'GSSAPI' - self.gss_step = GSS_STATE_STEP - self.startsasl = SASL_IN_PROCESS - self._owner.send(str(node)) - raise NodeProcessed - except kerberos.GSSError as e: - log.info('GSSAPI authentication failed: %s' % str(e)) - if 'SCRAM-SHA-1-PLUS' in self.mecs and self.channel_binding is not None: - self.mecs.remove('SCRAM-SHA-1-PLUS') - self.mechanism = 'SCRAM-SHA-1-PLUS' - self._owner._caller.get_password(self.set_password, self.mechanism) - self.scram_step = 0 - self.startsasl = SASL_IN_PROCESS - raise NodeProcessed - if 'SCRAM-SHA-1' in self.mecs: - self.mecs.remove('SCRAM-SHA-1') - self.mechanism = 'SCRAM-SHA-1' - self._owner._caller.get_password(self.set_password, self.mechanism) - self.scram_step = 0 - self.startsasl = SASL_IN_PROCESS - raise NodeProcessed - if 'DIGEST-MD5' in self.mecs: - self.mecs.remove('DIGEST-MD5') - node = Node('auth', attrs={'xmlns': NS_SASL, - 'mechanism': 'DIGEST-MD5'}) - self.mechanism = 'DIGEST-MD5' - self.startsasl = SASL_IN_PROCESS - self._owner.send(str(node)) - raise NodeProcessed - if 'PLAIN' in self.mecs: - self.mecs.remove('PLAIN') - self.mechanism = 'PLAIN' - self._owner._caller.get_password(self.set_password, self.mechanism) - self.startsasl = SASL_IN_PROCESS - raise NodeProcessed - if 'X-MESSENGER-OAUTH2' in self.mecs: - self.mecs.remove('X-MESSENGER-OAUTH2') - self.mechanism = 'X-MESSENGER-OAUTH2' - self._owner._caller.get_password(self.set_password, self.mechanism) - self.startsasl = SASL_IN_PROCESS - raise NodeProcessed - self.startsasl = SASL_FAILURE - log.info('I can only use ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS,' - ' SCRAM-SHA-1, DIGEST-MD5, PLAIN and X-MESSENGER-OAUTH2' - ' mechanisms.') - if self.on_sasl: - self.on_sasl() - return - - def SASLHandler(self, conn, challenge): - """ - Perform next SASL auth step. Used internally - """ - if challenge.getNamespace() != NS_SASL: - return - - def scram_base64(s): - try: - s = s.encode('utf-8') - except: - pass - return ''.join(base64.b64encode(s).decode('utf-8').\ - split('\n')) - - incoming_data = challenge.getData() - data=base64.b64decode(incoming_data.encode('utf-8')) - - if self.mechanism != 'GSSAPI': - data=data.decode('utf-8') - - ### Handle Auth result - 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> - # answer from server - self.startsasl = SASL_FAILURE_IN_PROGRESS - raise NodeProcessed - if self.on_sasl: - self.on_sasl((reason, text)) - raise NodeProcessed - - if challenge.getName() == 'failure': - if self.startsasl == SASL_FAILURE_IN_PROGRESS: - self.MechanismHandler() - raise NodeProcessed - self.startsasl = SASL_FAILURE - - 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 - data = _scram_parse(data) - if data['v'] != scram_base64(self.scram_ServerSignature): - on_auth_fail('ServerSignature is wrong') - - self.startsasl = SASL_SUCCESS - log.info('Successfully authenticated with remote server.') - handlers = self._owner.Dispatcher.dumpHandlers() - - # Bosh specific dispatcher replugging - # save old features. They will be used in case we won't get response - # on stream restart after SASL auth (happens with XMPP over BOSH - # with Openfire) - old_features = self._owner.Dispatcher.Stream.features - self._owner.Dispatcher.PlugOut() - dispatcher_nb.Dispatcher.get_instance().PlugIn(self._owner, - after_SASL=True, old_features=old_features) - self._owner.Dispatcher.restoreHandlers(handlers) - self._owner.User = self.username - - if self.on_sasl: - self.on_sasl() - raise NodeProcessed - - ### Perform auth step - if self.mechanism != 'GSSAPI': - log.info('Got challenge:' + data) - else: - log.info('Got challenge') - - if self.mechanism == 'GSSAPI': - if self.gss_step == GSS_STATE_STEP: - rc = kerberos.authGSSClientStep(self.gss_vc, incoming_data) - if rc != kerberos.AUTH_GSS_CONTINUE: - self.gss_step = GSS_STATE_WRAP - elif self.gss_step == GSS_STATE_WRAP: - rc = kerberos.authGSSClientUnwrap(self.gss_vc, incoming_data) - response = kerberos.authGSSClientResponse(self.gss_vc) - rc = kerberos.authGSSClientWrap(self.gss_vc, response, - kerberos.authGSSClientUserName(self.gss_vc)) - response = kerberos.authGSSClientResponse(self.gss_vc) - if not response: - response = '' - self._owner.send(Node('response', attrs={'xmlns': NS_SASL}, - payload=response).__str__()) - raise NodeProcessed - if self.mechanism in ('SCRAM-SHA-1', 'SCRAM-SHA-1-PLUS'): - hashfn = hashlib.sha1 - - def HMAC(k, s): - return hmac.new(key=k, msg=s, digestmod=hashfn).digest() - - def XOR(x, y): - r = [px ^ py for px, py in zip(x, y)] - return bytes(r) - - def Hi(s, salt, iters): - ii = 1 - try: - s = s.encode('utf-8') - except: - pass - ui_1 = HMAC(s, salt + b'\0\0\0\01') - ui = ui_1 - for i in range(iters - 1): - ii += 1 - ui_1 = HMAC(s, ui_1) - ui = XOR(ui, ui_1) - return ui - - def scram_H(s): - return hashfn(s).digest() - - if self.scram_step == 0: - self.scram_step = 1 - self.scram_soup += ',' + data + ',' - data = _scram_parse(data) - # Check server nonce here. - # The first part of server nonce muss be the nonce send by client. - if (data['r'][:len(self.client_nonce)] != self.client_nonce): - on_auth_fail('Server nonce is incorrect') - raise NodeProcessed - if self.mechanism == 'SCRAM-SHA-1': - r = 'c=' + scram_base64(self.scram_gs2) - else: - # Channel binding data goes in here too. - r = 'c=' + scram_base64(self.scram_gs2.encode('utf-8') - + self.channel_binding) - r += ',r=' + data['r'] - self.scram_soup += r - self.scram_soup = self.scram_soup.encode('utf-8') - salt = base64.b64decode(data['s'].encode('utf-8')) - iter = int(data['i']) - SaltedPassword = Hi(self.password, salt, iter) - # TODO: Could cache this, along with salt+iter. - ClientKey = HMAC(SaltedPassword, b'Client Key') - StoredKey = scram_H(ClientKey) - ClientSignature = HMAC(StoredKey, self.scram_soup) - ClientProof = XOR(ClientKey, ClientSignature) - r += ',p=' + scram_base64(ClientProof) - ServerKey = HMAC(SaltedPassword, b'Server Key') - self.scram_ServerSignature = HMAC(ServerKey, self.scram_soup) - sasl_data = scram_base64(r) - node = Node('response', attrs={'xmlns': NS_SASL}, - payload=[sasl_data]) - self._owner.send(str(node)) - raise NodeProcessed - - if self.scram_step == 1: - data = _scram_parse(data) - if base64.b64decode(data['v'].encode('utf-8')).decode('utf-8') \ - != self.scram_ServerSignature: - # TODO: Not clear what to do here - need to abort. - raise Exception - node = Node('response', attrs={'xmlns': NS_SASL}); - self._owner.send(str(node)) - raise NodeProcessed - - # DIGEST-MD5 - # magic foo... - chal = _challenge_splitter(data) - if not self.realm and 'realm' in chal: - self.realm = chal['realm'] - if 'qop' in chal and ((chal['qop'] =='auth') or \ - (isinstance(chal['qop'], list) and 'auth' in chal['qop'])): - self.resp = {'username': self.username, - 'nonce': chal['nonce'], - 'cnonce': '%x' % int(binascii.hexlify(os.urandom(24)), 16), - 'nc': ('00000001'), # ToDo: Is this a tupel or only a string? - 'qop': 'auth', - 'digest-uri': 'xmpp/' + self._owner.Server, - 'charset': 'utf-8' - } - if self.realm: - self.resp['realm'] = self.realm - else: - self.resp['realm'] = self._owner.Server - # Password is now required - self._owner._caller.get_password(self.set_password, self.mechanism) - elif 'rspauth' in chal: - # Check rspauth value - if chal['rspauth'] != self.digest_rspauth: - on_auth_fail('rspauth is wrong') - self._owner.send(str(Node('response', attrs={'xmlns':NS_SASL}))) - else: - self.startsasl = SASL_FAILURE - log.info('Failed SASL authentification: unknown challenge') - if self.on_sasl: - self.on_sasl() - raise NodeProcessed - - @staticmethod - def _convert_to_iso88591(string): - try: - string = string.encode('iso-8859-1') - except UnicodeEncodeError: - pass - return string - - def set_password(self, password): - self.password = '' if password is None else password - if self.mechanism in ('SCRAM-SHA-1', 'SCRAM-SHA-1-PLUS'): - self.client_nonce = '%x' % int(binascii.hexlify(os.urandom(24)), 16) - self.scram_soup = 'n=' + self.username + ',r=' + self.client_nonce - if self.mechanism == 'SCRAM-SHA-1': - if self.channel_binding is None: - # Client doesn't support Channel Binding - self.scram_gs2 = 'n,,' # No CB yet. - else: - # Client supports CB, but server doesn't support CB - self.scram_gs2 = 'y,,' - else: - self.scram_gs2 = 'p=tls-unique,,' - sasl_data = base64.b64encode((self.scram_gs2 + self.scram_soup).\ - encode('utf-8')).decode('utf-8').replace('\n', '') - node = Node('auth', attrs={'xmlns': NS_SASL, - 'mechanism': self.mechanism}, payload=[sasl_data]) - elif self.mechanism == 'DIGEST-MD5': - hash_username = self._convert_to_iso88591(self.resp['username']) - hash_realm = self._convert_to_iso88591(self.resp['realm']) - hash_password = self._convert_to_iso88591(self.password) - A1 = C([H(C([hash_username, hash_realm, hash_password])), - self.resp['nonce'].encode('utf-8'), self.resp['cnonce'].encode( - 'utf-8')]) - A2 = C([b'AUTHENTICATE', self.resp['digest-uri'].encode('utf-8')]) - response = HH(C([HH(A1).encode('utf-8'), self.resp['nonce'].encode( - 'utf-8'), self.resp['nc'].encode('utf-8'), self.resp['cnonce'].\ - encode('utf-8'), self.resp['qop'].encode('utf-8'), HH(A2).\ - encode('utf-8')])) - A2 = C([b'', self.resp['digest-uri'].encode('utf-8')]) - self.digest_rspauth = HH(C([HH(A1).encode('utf-8'), self.resp[ - 'nonce'].encode('utf-8'), self.resp['nc'].encode('utf-8'), - self.resp['cnonce'].encode('utf-8'), self.resp['qop'].encode( - 'utf-8'), HH(A2).encode('utf-8')])) - self.resp['response'] = response - sasl_data = '' - for key in ('charset', 'username', 'realm', 'nonce', 'nc', 'cnonce', - 'digest-uri', 'response', 'qop'): - if key in ('nc', 'qop', 'response', 'charset'): - sasl_data += "%s=%s," % (key, self.resp[key]) - else: - sasl_data += '%s="%s",' % (key, self.resp[key]) - sasl_data = base64.b64encode(sasl_data[:-1].encode('utf-8')).\ - decode('utf-8').replace('\r', '').replace('\n', '') - node = Node('response', attrs={'xmlns': NS_SASL}, - payload=[sasl_data]) - elif self.mechanism == 'PLAIN': - sasl_data = '\x00%s\x00%s' % (self.username, self.password) - sasl_data = base64.b64encode(sasl_data.encode('utf-8')).decode( - 'utf-8').replace('\n', '') - node = Node('auth', attrs={'xmlns': NS_SASL, 'mechanism': 'PLAIN'}, - payload=[sasl_data]) - elif self.mechanism == 'X-MESSENGER-OAUTH2': - node = Node('auth', attrs={'xmlns': NS_SASL, - 'mechanism': 'X-MESSENGER-OAUTH2'}) - node.addData(password) - self._owner.send(str(node)) - - -class NonBlockingBind(PlugIn): - """ - Bind some JID to the current connection to allow router know of our - location. Must be plugged after successful SASL auth - """ - - def __init__(self): - PlugIn.__init__(self) - self._session_required = False - - 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, con, feats): - """ - Determine if server supports resource binding and set some internal - attributes accordingly. - """ - if not feats or not feats.getTag('bind', namespace=NS_BIND): - return - - session = feats.getTag('session', namespace=NS_SESSION) - if session is not None: - if session.getTag('optional') is None: - self._session_required = True - - self.NonBlockingBind() - - def plugout(self): - """ - Remove Bind handler from owner's dispatcher. Used internally - """ - self._owner.UnregisterHandler( - 'features', self.FeaturesHandler, xmlns=NS_STREAMS) - - def NonBlockingBind(self): - """ - Perform binding. Use provided resource name or random (if not provided). - """ - - 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=resource)]), - func=self._on_bound) - - def _on_bound(self, resp): - if isResultNode(resp): - 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._on_bind_successful() - else: - node = Node('session', attrs={'xmlns':NS_SESSION}) - iq = Protocol('iq', typ='set', payload=[node]) - self._owner.SendAndWaitForResponse( - iq, func=self._on_session) - return - if resp: - log.error('Binding failed: %s.', resp.getTag('error')) - else: - 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): - if isResultNode(resp): - log.info('Successfully started session') - self._on_bind_successful() - else: - 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) - self.PlugOut() ===================================== nbxmpp/bind.py ===================================== @@ -0,0 +1,126 @@ +# Copyright (C) 2003-2005 Alexey "Snake" Nezhdanov +# Copyright (C) Dimitur Kirov <dkirov AT gmail.com> +# Copyright (C) 2018 Philipp Hörist <philipp AT hoerist.com> +# +# This file is part of nbxmpp. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; If not, see <http://www.gnu.org/licenses/>. + +import logging + +from nbxmpp.plugin import PlugIn +from nbxmpp.protocol import NS_BIND +from nbxmpp.protocol import NS_SESSION +from nbxmpp.protocol import NS_STREAMS +from nbxmpp.protocol import NS_STREAM_MGMT +from nbxmpp.protocol import Node +from nbxmpp.protocol import isResultNode +from nbxmpp.protocol import Protocol +from nbxmpp.const import Realm +from nbxmpp.const import Event + +log = logging.getLogger('nbxmpp.bind') + + +class NonBlockingBind(PlugIn): + """ + Bind some JID to the current connection to allow router know of our + location. Must be plugged after successful SASL auth + """ + + def __init__(self): + PlugIn.__init__(self) + self._session_required = False + + def plugin(self, _owner): + self._owner.RegisterHandler( + 'features', self._on_features, xmlns=NS_STREAMS) + + def _on_features(self, _con, feats): + """ + Determine if server supports resource binding and set some internal + attributes accordingly. + """ + if not feats or not feats.getTag('bind', namespace=NS_BIND): + return + + session = feats.getTag('session', namespace=NS_SESSION) + if session is not None: + if session.getTag('optional') is None: + self._session_required = True + + self._bind() + + def plugout(self): + """ + Remove Bind handler from owner's dispatcher. Used internally + """ + self._owner.UnregisterHandler( + 'features', self._on_features, xmlns=NS_STREAMS) + + def _bind(self): + """ + Perform binding. Use provided resource name or random (if not provided). + """ + resource = [] + if self._owner._Resource: + resource = [Node('resource', payload=[self._owner._Resource])] + + payload = Node('bind', attrs={'xmlns': NS_BIND}, payload=resource) + node = Protocol('iq', typ='set', payload=[payload]) + + self._owner.Dispatcher.SendAndWaitForResponse(node, func=self._on_bind) + + def _on_bind(self, stanza): + if isResultNode(stanza): + bind = stanza.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._on_bind_successful() + else: + node = Node('session', attrs={'xmlns':NS_SESSION}) + iq = Protocol('iq', typ='set', payload=[node]) + self._owner.SendAndWaitForResponse( + iq, func=self._on_session) + return + if stanza: + log.error('Binding failed: %s.', stanza.getTag('error')) + else: + 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, stanza): + if isResultNode(stanza): + log.info('Successfully started session') + self._on_bind_successful() + else: + 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) + self.PlugOut() \ No newline at end of file ===================================== nbxmpp/client_nb.py ===================================== @@ -21,11 +21,11 @@ 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 . import transports_nb, dispatcher_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 .auth import SASL +from .bind import NonBlockingBind from .smacks import Smacks from .const import Realm from .const import Event @@ -135,13 +135,7 @@ class NonBlockingClient: if 'NonBlockingRoster' in self.__dict__: self.NonBlockingRoster.PlugOut() if 'SASL' in self.__dict__: - if 'startsasl' in self.SASL.__dict__ and \ - self.SASL.startsasl == 'failure-in-process': - sasl_failed = True - self.SASL.startsasl = 'failure' - self._on_start_sasl() - else: - self.SASL.PlugOut() + self.SASL.PlugOut() if 'NonBlockingTCP' in self.__dict__: self.NonBlockingTCP.PlugOut() if 'NonBlockingHTTP' in self.__dict__: @@ -521,77 +515,52 @@ class NonBlockingClient: ### follows code for authentication, resource bind, session and roster download ############################################################################### - def auth(self, user, password, resource='', sasl=True, auth_mechs=None): + def auth(self, user, get_password=None, resource='', auth_mechs=None): """ Authenticate connnection and bind resource. If resource is not provided random one or library name used :param user: XMPP username - :param password: XMPP password + :param get_password: Callback that must return the password for the + chosen mechanism :param resource: resource that shall be used for auth/connecting - :param sasl: Boolean indicating if SASL shall be used. (default: True) :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', - 'SCRAM-SHA-1', 'DIGEST-MD5', 'PLAIN', 'X-MESSENGER-OAUTH2', - 'XEP-0078' - """ - self._User, self._Password = user, password - self._Resource, self._sasl = resource, sasl - self._channel_binding = None - if self.connected in ('ssl', 'tls'): - try: - if self.protocol_type != 'BOSH': - self._channel_binding = self.Connection.NonBlockingTLS.get_channel_binding() - # TLS handshake is finished so channel binding data muss exist - assert (self._channel_binding is not None) - except NotImplementedError: - pass - if auth_mechs is None: - self._auth_mechs = SASL_AUTHENTICATION_MECHANISMS - else: - self._auth_mechs = auth_mechs - - self._on_doc_attrs() - - def _on_doc_attrs(self): - """ - Plug authentication objects and start auth + authentification mechanisms will be allowed. + See the auth module for possible values """ - if self._sasl: - auth_nb.SASL.get_instance(self._User, self._Password, - self._on_start_sasl, self._channel_binding, - self._auth_mechs).PlugIn(self) - if not hasattr(self, 'SASL'): + if 'SASL' in self.__dict__: + log.error('Auth not possible while another auth is in progress') return - self.SASL.auth() - return True + self._User = user + self._Resource = resource - def _on_start_sasl(self, data=None): - """ - Callback used by SASL, called on each auth step - """ - if self.SASL.startsasl == 'in-process': - return self.onreceive(None) + SASL.get_instance(self._User, + auth_mechs, + get_password, + self._on_sasl_finished).PlugIn(self) + + def _on_sasl_finished(self, success, reason, text): + if success: + self.SASL.PlugOut() + if self.protocol_type == 'BOSH': + self.Dispatcher.after_SASL = True + self.Dispatcher.StreamInit() - 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.Dispatcher.Event(Realm.CONNECTING, Event.AUTH_FAILED, data) - - elif self.SASL.startsasl == 'success': self.connected += '+sasl' - self.Dispatcher.Event(Realm.CONNECTING, Event.AUTH_SUCCESSFUL) + self.Dispatcher.Event(Realm.CONNECTING, + Event.AUTH_SUCCESSFUL) self._owner.Smacks.register_handlers() + else: + self.Dispatcher.Event(Realm.CONNECTING, + Event.AUTH_FAILED, + (reason, text)) def bind(self): # Check if we can resume - if self._owner.Smacks.resume_supported: - self._owner.Smacks.resume_request() + if self.Smacks.resume_supported: + self.Smacks.resume_request() else: # If we cant resume we bind and enable sm afterwards NonBlockingBind.get_instance().PlugIn(self) ===================================== nbxmpp/const.py ===================================== @@ -16,6 +16,7 @@ # along with this program; If not, see <http://www.gnu.org/licenses/>. from enum import Enum +from enum import IntEnum from enum import unique @unique @@ -38,3 +39,7 @@ class Event(Enum): def __str__(self): return self.value + +class GSSAPIState(IntEnum): + STEP = 0 + WRAP = 1 ===================================== nbxmpp/protocol.py ===================================== @@ -268,6 +268,17 @@ NS_BOOKMARK_CONVERSION = 'urn:xmpp:bookmarks-conversion:0' #for (k, v) in loc.items(): #print('%s = \'%s\'' % (k, v)) +SASL_AUTH_MECHS = [ + 'SCRAM-SHA-256-PLUS', + 'SCRAM-SHA-256', + 'SCRAM-SHA-1-PLUS', + 'SCRAM-SHA-1', + 'PLAIN', + 'GSSAPI', + 'EXTERNAL', + 'ANONYMOUS', +] + SASL_ERROR_CONDITIONS = [ 'aborted', 'account-disabled', ===================================== nbxmpp/util.py ===================================== @@ -0,0 +1,34 @@ +# 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 base64 + +def b64decode(data, return_type=str): + if isinstance(data, str): + data = data.encode() + result = base64.b64decode(data) + if return_type == bytes: + return result + return result.decode() + +def b64encode(data, return_type=str): + if isinstance(data, str): + data = data.encode() + result = base64.b64encode(data) + if return_type == bytes: + return result + return result.decode() ===================================== test/unit/test_sasl_scram.py ===================================== @@ -0,0 +1,28 @@ +import unittest +from unittest.mock import Mock + +from nbxmpp.auth import SCRAM_SHA_1 + + +class SCRAM(unittest.TestCase): + def setUp(self): + self.con = Mock() + self._method = SCRAM_SHA_1(self.con, None) + self._method._client_nonce = '4691d8f313ddb02d2eed511d5617a5c6f72efa671613c598' + + self._username = 'philw' + self._password = 'testtest123' + + self.auth = '<auth xmlns="urn:ietf:params:xml:ns:xmpp-sasl" mechanism="SCRAM-SHA-1">eSwsbj1waGlsdyxyPTQ2OTFkOGYzMTNkZGIwMmQyZWVkNTExZDU2MTdhNWM2ZjcyZWZhNjcxNjEzYzU5OA==</auth>' + self.challenge = 'cj00NjkxZDhmMzEzZGRiMDJkMmVlZDUxMWQ1NjE3YTVjNmY3MmVmYTY3MTYxM2M1OThDaEJpZGEyb0NJeks5S25QdGsxSUZnPT0scz1iZFkrbkRjdUhuVGFtNzgyaG9neHNnPT0saT00MDk2' + self.response = '<response xmlns="urn:ietf:params:xml:ns:xmpp-sasl">Yz1lU3dzLHI9NDY5MWQ4ZjMxM2RkYjAyZDJlZWQ1MTFkNTYxN2E1YzZmNzJlZmE2NzE2MTNjNTk4Q2hCaWRhMm9DSXpLOUtuUHRrMUlGZz09LHA9NUd5a09hWCtSWlllR3E2L2U3YTE2UDVBeFVrPQ==</response>' + self.success = 'dj1qMGtuNlVvT1FjTmJ0MGFlYnEwV1QzYWNkSW89' + + def test_auth(self): + self._method.initiate(self._username, self._password) + self.assertEqual(self.auth, str(self.con.send.call_args[0][0])) + + self._method.response(self.challenge) + self.assertEqual(self.response, str(self.con.send.call_args[0][0])) + + self._method.success(self.success) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/f2a203387891455c052d44f8b1… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/f2a203387891455c052d44f8b1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Find correct contact on private message
by Philipp Hörist 08 Dec '18

08 Dec '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 293156f6 by Philipp Hörist at 2018-12-08T23:01:18Z Find correct contact on private message get_contact() returns also a contact if only the bare jid matches, which for private messages is the groupchat contact object. - - - - - b8863e82 by Philipp Hörist at 2018-12-08T23:29:20Z MUC: Identify subject change correctly Fixes #9491 - - - - - 5 changed files: - gajim/common/connection_handlers_events.py - gajim/common/modules/message.py - gajim/groupchat_control.py - gajim/roster_window.py - gajim/session.py Changes: ===================================== gajim/common/connection_handlers_events.py ===================================== @@ -429,15 +429,6 @@ class GcMessageReceivedEvent(nec.NetworkIncomingEvent): # message from server self.nick = '' - self.subject = self.stanza.getSubject() - - if self.subject is not None: - app.nec.push_incoming_event( - nec.NetworkEvent('gc-subject-received', - nickname=self.msg_obj.resource, - **vars(self.msg_obj))) - return - conditions = self.stanza.getStatusConditions() if conditions: self.status_code = [] ===================================== gajim/common/modules/message.py ===================================== @@ -228,7 +228,10 @@ class Message: subject = event.stanza.getSubject() groupchat = event.mtype == 'groupchat' - muc_subject = subject and groupchat + + # XEP-0045: only a message that contains a <subject/> but no <body/> + # element shall be considered a subject change for MUC purposes. + muc_subject = subject and groupchat and not event.msgtxt # Determine timestamps if groupchat: @@ -287,6 +290,11 @@ class Message: event.session, event.fjid, timestamp) return + if muc_subject: + app.nec.push_incoming_event(NetworkEvent('gc-subject-received', + **vars(event))) + return + if groupchat: app.nec.push_incoming_event(GcMessageReceivedEvent( None, ===================================== gajim/groupchat_control.py ===================================== @@ -1406,7 +1406,7 @@ class GroupchatControl(ChatControlBase): self.draw_banner_text() def _nec_gc_subject_received(self, event): - if event.conn.name != self.account: + if event.account != self.account: return if event.jid != self.room_jid: return @@ -1415,7 +1415,7 @@ class GroupchatControl(ChatControlBase): return self.set_subject(event.subject) text = _('%(nick)s has set the subject to %(subject)s') % { - 'nick': event.nickname, 'subject': event.subject} + 'nick': event.resource, 'subject': event.subject} if event.delayed: date = time.strftime('%d-%m-%Y %H:%M:%S', ===================================== gajim/roster_window.py ===================================== @@ -2694,10 +2694,10 @@ class RosterWindow: def _nec_gc_subject_received(self, obj): contact = app.contacts.get_contact_with_highest_priority( - obj.conn.name, obj.jid) + obj.account, obj.jid) if contact: contact.status = obj.subject - self.draw_contact(obj.jid, obj.conn.name) + self.draw_contact(obj.jid, obj.account) def _nec_metacontacts_received(self, obj): self.redraw_metacontacts(obj.conn.name) ===================================== gajim/session.py ===================================== @@ -80,11 +80,13 @@ class ChatControlSession: """ if obj.session != self: return - contact = app.contacts.get_contact(self.conn.name, obj.jid, - obj.resource) - if not contact: - contact = app.contacts.get_gc_contact(self.conn.name, obj.jid, - obj.resource) + + if obj.muc_pm: + contact = app.contacts.get_gc_contact( + self.conn.name, obj.jid, obj.resource) + else: + contact = app.contacts.get_contact( + self.conn.name, obj.jid, obj.resource) if self.resource != obj.resource: self.resource = obj.resource if self.control: View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/d129f5559a88249f350bc6a0665f87610… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/d129f5559a88249f350bc6a0665f87610… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Count outgoing stanzas after session resume
by Philipp Hörist 08 Dec '18

08 Dec '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: c58e9751 by Philipp Hörist at 2018-12-08T00:16:11Z Count outgoing stanzas after session resume - - - - - 1 changed file: - nbxmpp/smacks.py Changes: ===================================== nbxmpp/smacks.py ===================================== @@ -60,7 +60,6 @@ class Smacks(PlugIn): self._session_id = None self._location = None - self._enable_sent = False def get_resume_data(self): if self.resume_supported: @@ -128,7 +127,7 @@ class Smacks(PlugIn): self._in_h += 1 def save_in_queue(self, stanza): - if not self._enable_sent: + if not self._enable_sent and not self.resumed: # We did not yet sent 'enable' so the server # will not count our stanzas return View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/c58e9751d779d09cb3460db03d… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/c58e9751d779d09cb3460db03d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] Use custom dict for additional data
by Philipp Hörist 07 Dec '18

07 Dec '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: 1c09b507 by Philipp Hörist at 2018-12-07T22:31:00Z Use custom dict for additional data This makes it easier to retrive and store values - - - - - 14 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/connection_handlers_events.py - gajim/common/events.py - gajim/common/helpers.py - gajim/common/logger.py - gajim/common/modules/httpupload.py - gajim/common/modules/mam.py - gajim/common/modules/message.py - gajim/common/modules/misc.py - gajim/common/zeroconf/connection_handlers_zeroconf.py - gajim/conversation_textview.py - gajim/groupchat_control.py - gajim/session.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -42,6 +42,7 @@ from gajim.common import helpers from gajim.common import ged from gajim.common import i18n from gajim.common.i18n import _ +from gajim.common.helpers import AdditionalDataDict from gajim.common.contacts import GC_Contact from gajim.common.const import AvatarSize from gajim.common.const import KindConstant @@ -933,7 +934,7 @@ class ChatControl(ChatControlBase): contact = self.contact if additional_data is None: - additional_data = {} + additional_data = AdditionalDataDict() if frm == 'status': if not app.config.get('print_status_in_chats'): ===================================== gajim/chat_control_base.py ===================================== @@ -38,6 +38,7 @@ from gajim.common import helpers from gajim.common import ged from gajim.common import i18n from gajim.common.i18n import _ +from gajim.common.helpers import AdditionalDataDict from gajim.common.contacts import GC_Contact from gajim.common.connection_handlers_events import MessageOutgoingEvent from gajim.common.const import StyleAttr @@ -905,7 +906,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): if other_tags_for_text is None: other_tags_for_text = [] if additional_data is None: - additional_data = {} + additional_data = AdditionalDataDict() textview.print_conversation_line(text, jid, kind, name, tim, other_tags_for_name, other_tags_for_time, other_tags_for_text, ===================================== gajim/common/connection_handlers_events.py ===================================== @@ -28,6 +28,7 @@ from gajim.common import helpers from gajim.common import app from gajim.common import i18n from gajim.common.i18n import _ +from gajim.common.helpers import AdditionalDataDict from gajim.common.modules import dataforms from gajim.common.modules.misc import parse_idle from gajim.common.modules.misc import parse_delay @@ -91,14 +92,12 @@ class HelperEvent: def get_oob_data(self, stanza): oob_node = stanza.getTag('x', namespace=nbxmpp.NS_X_OOB) if oob_node is not None: - if 'gajim' not in self.additional_data: - self.additional_data['gajim'] = {} oob_url = oob_node.getTagData('url') if oob_url is not None: - self.additional_data['gajim']['oob_url'] = oob_url + self.additional_data.set_value('gajim', 'oob_url', oob_url) oob_desc = oob_node.getTagData('desc') if oob_desc is not None: - self.additional_data['gajim']['oob_desc'] = oob_desc + self.additional_data.set_value('gajim', 'oob_desc', oob_desc) def get_stanza_id(self, stanza, query=False): if query: @@ -407,7 +406,7 @@ class GcMessageReceivedEvent(nec.NetworkIncomingEvent): def generate(self): self.stanza = self.msg_obj.stanza if not hasattr(self.msg_obj, 'additional_data'): - self.additional_data = {} + self.additional_data = AdditionalDataDict() else: self.additional_data = self.msg_obj.additional_data self.id_ = self.msg_obj.stanza.getID() @@ -626,18 +625,9 @@ class ConnectionTypeEvent(nec.NetworkIncomingEvent): class StanzaReceivedEvent(nec.NetworkIncomingEvent): name = 'stanza-received' - def init(self): - self.additional_data = {} - - def generate(self): - return True - class StanzaSentEvent(nec.NetworkIncomingEvent): name = 'stanza-sent' - def init(self): - self.additional_data = {} - class AgentRemovedEvent(nec.NetworkIncomingEvent): name = 'agent-removed' @@ -1158,7 +1148,7 @@ class MessageOutgoingEvent(nec.NetworkOutgoingEvent): name = 'message-outgoing' def init(self): - self.additional_data = {} + self.additional_data = AdditionalDataDict() self.message = None self.keyID = None self.type_ = 'chat' @@ -1211,7 +1201,7 @@ class GcMessageOutgoingEvent(nec.NetworkOutgoingEvent): name = 'gc-message-outgoing' def init(self): - self.additional_data = {} + self.additional_data = AdditionalDataDict() self.message = '' self.chatstate = None self.xhtml = None ===================================== gajim/common/events.py ===================================== @@ -81,7 +81,8 @@ class ChatEvent(Event): self.displaymarking = displaymarking self.sent_forwarded = sent_forwarded if additional_data is None: - additional_data = {} + from gajim.common.helpers import AdditionalDataDict + additional_data = AdditionalDataDict() self.additional_data = additional_data class NormalEvent(ChatEvent): ===================================== gajim/common/helpers.py ===================================== @@ -41,6 +41,7 @@ import time import logging import json import shutil +import collections from datetime import datetime, timedelta from distutils.version import LooseVersion as V from encodings.punycode import punycode_encode @@ -1485,3 +1486,51 @@ def load_json(path, key=None, default=None): if key is None: return json_dict return json_dict.get(key, default) + +class AdditionalDataDict(collections.UserDict): + def __init__(self, initialdata=None): + collections.UserDict.__init__(self, initialdata) + + @staticmethod + def _get_path_childs(full_path): + path_childs = [full_path] + if ':' in full_path: + path_childs = full_path.split(':') + return path_childs + + def set_value(self, full_path, key, value): + path_childs = self._get_path_childs(full_path) + _dict = self.data + for path in path_childs: + try: + _dict = _dict[path] + except KeyError: + _dict[path] = {} + _dict = _dict[path] + _dict[key] = value + + def get_value(self, full_path, key, default=None): + path_childs = self._get_path_childs(full_path) + _dict = self.data + for path in path_childs: + try: + _dict = _dict[path] + except KeyError: + return default + try: + return _dict[key] + except KeyError: + return default + + def remove_value(self, full_path, key): + path_childs = self._get_path_childs(full_path) + _dict = self.data + for path in path_childs: + try: + _dict = _dict[path] + except KeyError: + return + try: + del _dict[key] + except KeyError: + return ===================================== gajim/common/logger.py ===================================== @@ -41,6 +41,7 @@ from gi.repository import GLib from gajim.common import exceptions from gajim.common import app from gajim.common import configpaths +from gajim.common.helpers import AdditionalDataDict from gajim.common.i18n import _ from gajim.common.const import ( JIDConstant, KindConstant, ShowConstant, TypeConstant, @@ -265,8 +266,9 @@ class Logger: Row = namedtuple("Row", fields) named_row = Row(*row) if 'additional_data' in fields: + _dict = json.loads(named_row.additional_data or '{}') named_row = named_row._replace( - additional_data=json.loads(named_row.additional_data or '{}')) + additional_data=AdditionalDataDict(_dict)) # if an alias `account` for the field `account_id` is used for the # query, the account_id is converted to the account jid @@ -1355,7 +1357,8 @@ class Logger: if not kwargs['additional_data']: del kwargs['additional_data'] else: - kwargs['additional_data'] = json.dumps(kwargs["additional_data"]) + serialized_dict = json.dumps(kwargs["additional_data"].data) + kwargs['additional_data'] = serialized_dict sql = ''' INSERT INTO logs (account_id, jid_id, time, kind, {columns}) ===================================== gajim/common/modules/httpupload.py ===================================== @@ -118,10 +118,7 @@ class HTTPUpload: # to distinguish HTTP File Upload Link from pasted URL oob = event.msg_iq.addChild('x', namespace=nbxmpp.NS_X_OOB) oob.addChild('url').setData(message) - if 'gajim' in event.additional_data: - event.additional_data['gajim']['oob_url'] = message - else: - event.additional_data['gajim'] = {'oob_url': message} + event.additional_data.set_value('gajim', 'oob_url', message) def check_file_before_transfer(self, path, encryption, contact, session, groupchat=False): ===================================== gajim/common/modules/mam.py ===================================== @@ -27,6 +27,7 @@ from gajim.common.const import KindConstant from gajim.common.const import SyncThreshold from gajim.common.caps_cache import muc_caps_cache from gajim.common.helpers import get_sync_threshold +from gajim.common.helpers import AdditionalDataDict from gajim.common.modules.misc import parse_delay from gajim.common.modules.misc import parse_oob from gajim.common.modules.misc import parse_correction @@ -179,7 +180,7 @@ class MAM: event_attrs.update( {'conn': self._con, - 'additional_data': {}, + 'additional_data': AdditionalDataDict(), 'encrypted': False, 'timestamp': delay_timestamp, 'self_message': self_message, @@ -192,6 +193,7 @@ class MAM: 'archive_jid': archive_jid, 'msgtxt': msgtxt, 'message': message, + 'stanza': message, 'namespace': namespace, }) @@ -256,7 +258,7 @@ class MAM: 'gajim', 'user_timestamp', user_timestamp) event.correct_id = parse_correction(event.message) - parse_oob(event.message, event.additional_data) + parse_oob(event) with_ = event.with_.getStripped() if event.muc_pm: ===================================== gajim/common/modules/message.py ===================================== @@ -22,7 +22,9 @@ import nbxmpp from gajim.common import app from gajim.common import helpers from gajim.common.i18n import _ -from gajim.common.nec import NetworkIncomingEvent, NetworkEvent +from gajim.common.nec import NetworkIncomingEvent +from gajim.common.nec import NetworkEvent +from gajim.common.helpers import AdditionalDataDict from gajim.common.modules.security_labels import parse_securitylabel from gajim.common.modules.user_nickname import parse_nickname from gajim.common.modules.carbons import parse_carbon @@ -188,7 +190,7 @@ class Message: 'account': self._account, 'id_': id_, 'encrypted': False, - 'additional_data': {}, + 'additional_data': AdditionalDataDict(), 'forwarded': forwarded, 'sent': sent, 'fjid': fjid, @@ -266,7 +268,7 @@ class Message: 'timestamp': timestamp, 'delayed': user_timestamp is not None, } - parse_oob(event.stanza, event.additional_data) + parse_oob(event) for name, value in event_attr.items(): setattr(event, name, value) ===================================== gajim/common/modules/misc.py ===================================== @@ -108,27 +108,18 @@ def parse_delay(stanza, epoch=True, convert='utc', from_=None, not_from=None): # XEP-0066: Out of Band Data -def parse_oob(stanza, dict_=None, key='gajim'): - oob_node = stanza.getTag('x', namespace=nbxmpp.NS_X_OOB) +def parse_oob(event): + oob_node = event.stanza.getTag('x', namespace=nbxmpp.NS_X_OOB) if oob_node is None: return - result = {} + url = oob_node.getTagData('url') if url is not None: - result['oob_url'] = url + event.additional_data.set_value('gajim', 'oob_url', url) + desc = oob_node.getTagData('desc') if desc is not None: - result['oob_desc'] = desc - - if dict_ is None: - return result - - if key in dict_: - dict_[key] += result - else: - dict_[key] = result - - return dict_ + event.additional_data.set_value('gajim', 'oob_desc', desc) # XEP-0308: Last Message Correction ===================================== gajim/common/zeroconf/connection_handlers_zeroconf.py ===================================== @@ -30,6 +30,7 @@ from gajim.common.protocol.bytestream import ConnectionSocks5BytestreamZeroconf from gajim.common.zeroconf.zeroconf import Constant from gajim.common import connection_handlers from gajim.common.i18n import _ +from gajim.common.helpers import AdditionalDataDict from gajim.common.nec import NetworkIncomingEvent, NetworkEvent from gajim.common.modules.user_nickname import parse_nickname from gajim.common.modules.misc import parse_eme @@ -118,7 +119,7 @@ connection_handlers.ConnectionJingle): 'account': self.name, 'id_': id_, 'encrypted': False, - 'additional_data': {}, + 'additional_data': AdditionalDataDict(), 'forwarded': False, 'sent': False, 'timestamp': time.time(), @@ -165,7 +166,7 @@ connection_handlers.ConnectionJingle): 'stanza_id': event.unique_id } - parse_oob(event.stanza, event.additional_data) + parse_oob(event) for name, value in event_attr.items(): setattr(event, name, value) ===================================== gajim/conversation_textview.py ===================================== @@ -39,6 +39,7 @@ from gajim.common import app from gajim.common import helpers from gajim.common import i18n from gajim.common.i18n import _ +from gajim.common.helpers import AdditionalDataDict from gajim.common.fuzzyclock import FuzzyClock from gajim.common.const import StyleAttr @@ -666,7 +667,7 @@ class ConversationTextview(GObject.GObject): if not otext: return if additional_data is None: - additional_data = {} + additional_data = AdditionalDataDict() buffer_ = self.tv.get_buffer() if other_tags: insert_tags_func = buffer_.insert_with_tags_by_name @@ -686,13 +687,10 @@ class ConversationTextview(GObject.GObject): specials_limit = 100 # add oob text to the end - try: - gajim_data = additional_data['gajim'] - oob_url = gajim_data['oob_url'] - except KeyError: - pass - else: - oob_desc = additional_data['gajim'].get('oob_desc', 'URL:') + + oob_url = additional_data.get_value('gajim', 'oob_url') + if oob_url is not None: + oob_desc = additional_data.get_value('gajim', 'oob_desc', 'URL:') if oob_url != otext: otext += '\n{} {}'.format(oob_desc, oob_url) @@ -739,7 +737,7 @@ class ConversationTextview(GObject.GObject): (emots, links, formatting) """ if additional_data is None: - additional_data = {} + additional_data = AdditionalDataDict() # PluginSystem: adding GUI extension point for ConversationTextview self.plugin_modified = False @@ -941,7 +939,7 @@ class ConversationTextview(GObject.GObject): Print 'chat' type messages """ if additional_data is None: - additional_data = {} + additional_data = AdditionalDataDict() buffer_ = self.tv.get_buffer() buffer_.begin_user_action() insert_mark = None @@ -1172,14 +1170,11 @@ class ConversationTextview(GObject.GObject): @staticmethod def _get_encryption_details(additional_data): - encrypted = additional_data.get('encrypted') - if encrypted is None: - return - - name = encrypted.get('name') + name = additional_data.get_value('encrypted', 'name') if name is None: return - fingerprint = encrypted.get('fingerprint') + + fingerprint = additional_data.get_value('encrypted', 'fingerprint') return name, fingerprint def print_time(self, text, kind, tim, simple, direction_mark, other_tags_for_time, iter_): @@ -1260,7 +1255,7 @@ class ConversationTextview(GObject.GObject): if text_tags is None: text_tags = [] if additional_data is None: - additional_data = {} + additional_data = AdditionalDataDict() buffer_ = self.tv.get_buffer() if not mark: iter_ = buffer_.get_end_iter() ===================================== gajim/groupchat_control.py ===================================== @@ -55,6 +55,7 @@ from gajim.common import events from gajim.common import app from gajim.common import helpers from gajim.common.helpers import launch_browser_mailer +from gajim.common.helpers import AdditionalDataDict from gajim.common.modules import dataforms from gajim.common import ged from gajim.common import i18n @@ -1353,7 +1354,7 @@ class GroupchatControl(ChatControlBase): def print_old_conversation(self, text, contact='', tim=None, xhtml=None, displaymarking=None, msg_stanza_id=None, encrypted=None, additional_data=None): if additional_data is None: - additional_data = {} + additional_data = AdditionalDataDict() if contact: if contact == self.nick: # it's us @@ -1384,7 +1385,7 @@ class GroupchatControl(ChatControlBase): If contact is not set: it's a message from the server or help. """ if additional_data is None: - additional_data = {} + additional_data = AdditionalDataDict() other_tags_for_name = [] other_tags_for_text = [] if contact: ===================================== gajim/session.py ===================================== @@ -27,6 +27,7 @@ from gajim.common import events from gajim.common import app from gajim.common import contacts from gajim.common import ged +from gajim.common.helpers import AdditionalDataDict from gajim.common.const import KindConstant from gajim.gtk.single_message import SingleMessageWindow @@ -277,7 +278,7 @@ class ChatControlSession: fjid = jid if additional_data is None: - additional_data = {} + additional_data = AdditionalDataDict() # Try to catch the contact with correct resource if resource: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1c09b50791eecd26c706a53d877912e1d3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1c09b50791eecd26c706a53d877912e1d3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] DataFormWidget: Fix some UI issues
by Philipp Hörist 06 Dec '18

06 Dec '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: d129f555 by Philipp Hörist at 2018-12-06T22:06:10Z DataFormWidget: Fix some UI issues - Textview: Wrap text, set padding - ListMultiTreeView: Align checkboxes to the right - Add a adjustment element that sets default sizes on the columns - Allow two new options 'form-width' and 'left-width' to customize sizes - - - - - 3 changed files: - gajim/data/style/gajim.css - gajim/gtk/dataform.py - test/gtk/dataform.py Changes: ===================================== gajim/data/style/gajim.css ===================================== @@ -238,6 +238,7 @@ button.flat.link { padding: 0; border: 0; } .data-form-widget grid { margin: 18px; } .data-form-widget treeview { padding: 5px; } .data-form-widget scrolledwindow { border: 1px solid; border-color:@unfocused_borders; } +.data-form-widget textview { padding: 5px; } /*Image Preview*/ .preview-image { box-shadow: 0px 0px 3px 0px alpha(@theme_text_color, 0.2); } ===================================== gajim/gtk/dataform.py ===================================== @@ -66,6 +66,9 @@ class FormGrid(Gtk.Grid): self.row_count = 0 self.rows = [] + form_width = options.get('form-width', 435) + self.set_size_request(form_width, -1) + self._data_form = form_node self.title = None @@ -83,6 +86,8 @@ class FormGrid(Gtk.Grid): 'text-multi': TextMultiField } + self._add_row(SizeAdjustment(options)) + if form_node.title is not None: self.title = form_node.title self._add_row(Title(form_node.title)) @@ -149,6 +154,22 @@ class FormGrid(Gtk.Grid): self.get_parent().get_parent().emit('is-valid', value) +class SizeAdjustment: + def __init__(self, options): + self._left_box = Gtk.Box() + self._right_box = Gtk.Box() + + left_width = options.get('left-width', 100) + self._left_box.set_size_request(left_width, -1) + self._right_box.set_hexpand(True) + + def add(self, form_grid, row_number): + form_grid.attach(self._left_box, 0, row_number, 1, 1) + form_grid.attach_next_to(self._right_box, + self._left_box, + Gtk.PositionType.RIGHT, 1, 1) + + class Title: def __init__(self, title): self._label = Gtk.Label(label=title) @@ -179,7 +200,6 @@ class Field: self._label.set_line_wrap(True) self._label.set_line_wrap_mode(Pango.WrapMode.WORD) self._label.set_width_chars(15) - self._label.set_size_request(100, -1) self._label.set_xalign(bool(options.get('right_align'))) self._label.set_tooltip_text(field.description) @@ -318,6 +338,8 @@ class ListMutliTreeView(Gtk.TreeView): col = Gtk.TreeViewColumn() cell = Gtk.CellRendererToggle() cell.set_activatable(True) + cell.set_property('xalign', 1) + cell.set_property('xpad', 10) cell.connect('toggled', self._toggled) col.pack_start(cell, True) col.set_attributes(cell, active=2) @@ -470,11 +492,14 @@ class TextMultiField(Field): self._label.set_valign(Gtk.Align.START) self._widget = Gtk.ScrolledWindow() + self._widget.set_policy(Gtk.PolicyType.NEVER, + Gtk.PolicyType.AUTOMATIC) self._widget.set_propagate_natural_height(True) self._widget.set_min_content_height(100) self._widget.set_max_content_height(300) self._textview = Gtk.TextView() + self._textview.set_wrap_mode(Gtk.WrapMode.WORD_CHAR) self._textview.get_buffer().set_text(field.value) self._textview.get_buffer().connect('changed', self._changed) ===================================== test/gtk/dataform.py ===================================== @@ -112,7 +112,12 @@ class DataFormWindow(Gtk.Window): def __init__(self): Gtk.Window.__init__(self, title="Data Form Test") self.set_default_size(600, 600) - self._widget = DataFormWidget(extend_form(node=nbxmpp.Node(node=FORM))) + options = { + 'left-width': 100, + 'form-width': 435, + } + self._widget = DataFormWidget( + extend_form(node=nbxmpp.Node(node=FORM)), options) self.add(self._widget) self.show() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d129f5559a88249f350bc6a0665f87610f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d129f5559a88249f350bc6a0665f87610f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] 2 commits: Determine delay timestamp correctly
by Philipp Hörist 06 Dec '18

06 Dec '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: 6c2df541 by Philipp Hörist at 2018-12-06T19:52:30Z Determine delay timestamp correctly - Check the from attr on the delay node to determine if its a user timestamp or from the server - Dont use user timestamp for sorting - Record the user timestamp in additional data so its saved to the database Fixes #9444 - - - - - b4f43acb by Philipp Hörist at 2018-12-06T19:52:51Z Encode resource with correct profile Fixes #9465 - - - - - 5 changed files: - gajim/common/helpers.py - gajim/common/modules/mam.py - gajim/common/modules/message.py - gajim/common/modules/misc.py - + test/no_gui/unit/test_helpers.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -153,7 +153,7 @@ def parse_resource(resource): """ if resource: try: - return resource.encode('Nickname').decode('utf-8') + return resource.encode('OpaqueString').decode('utf-8') except UnicodeError: raise InvalidFormat('Invalid character in resource.') ===================================== gajim/common/modules/mam.py ===================================== @@ -130,12 +130,13 @@ class MAM: raise nbxmpp.NodeProcessed # Timestamp parsing - timestamp = parse_delay(forwarded) - if timestamp is None: + # Most servers dont set the 'from' attr, so we cant check for it + delay_timestamp = parse_delay(forwarded) + if delay_timestamp is None: + log.warning('No timestamp on MAM message') + log.warning(stanza) raise nbxmpp.NodeProcessed - user_timestamp = parse_delay(message) - # Fix for self messaging if not groupchat: to = message.getTo() @@ -180,8 +181,7 @@ class MAM: {'conn': self._con, 'additional_data': {}, 'encrypted': False, - 'timestamp': timestamp, - 'user_timestamp': user_timestamp, + 'timestamp': delay_timestamp, 'self_message': self_message, 'groupchat': groupchat, 'muc_pm': muc_pm, @@ -248,7 +248,12 @@ class MAM: # For example Chatstates, Receipts, Chatmarkers log.debug(event.message.getProperties()) return - log.debug(event.msgtxt) + + user_timestamp = parse_delay(event.stanza) + if user_timestamp is not None: + # Record it as a user timestamp + event.additional_data.set_value( + 'gajim', 'user_timestamp', user_timestamp) event.correct_id = parse_correction(event.message) parse_oob(event.message, event.additional_data) ===================================== gajim/common/modules/message.py ===================================== @@ -223,15 +223,40 @@ class Message: except nbxmpp.NodeProcessed: return - timestamp, delayed = parse_delay(event.stanza), True - if timestamp is None: + subject = event.stanza.getSubject() + groupchat = event.mtype == 'groupchat' + muc_subject = subject and groupchat + + # Determine timestamps + if groupchat: + delay_entity_jid = event.jid + else: + delay_entity_jid = self._con.get_own_jid().getDomain() + + if muc_subject: + # MUC Subjects can have a delay timestamp + # to indicate when the user has set the subject, + # the 'from' attr on these delays is the MUC server + # but we treat it as user timestamp timestamp = time.time() - delayed = False + user_timestamp = parse_delay(event.stanza, from_=delay_entity_jid) + + else: + timestamp = parse_delay(event.stanza, from_=delay_entity_jid) + if timestamp is None: + timestamp = time.time() + + user_timestamp = parse_delay(event.stanza, + not_from=[delay_entity_jid]) + + if user_timestamp is not None: + event.additional_data.set_value( + 'gajim', 'user_timestamp', user_timestamp) event_attr = { 'popup': False, 'msg_log_id': None, - 'subject': event.stanza.getSubject(), + 'subject': subject, 'displaymarking': parse_securitylabel(event.stanza), 'attention': parse_attention(event.stanza), 'correct_id': parse_correction(event.stanza), @@ -239,7 +264,7 @@ class Message: 'form_node': parse_form(event.stanza), 'xhtml': parse_xhtml(event.stanza), 'timestamp': timestamp, - 'delayed': delayed, + 'delayed': user_timestamp is not None, } parse_oob(event.stanza, event.additional_data) @@ -257,7 +282,7 @@ class Message: event.session, event.fjid, timestamp) return - if event.mtype == 'groupchat': + if groupchat: app.nec.push_incoming_event(GcMessageReceivedEvent( None, conn=self._con, ===================================== gajim/common/modules/misc.py ===================================== @@ -65,18 +65,45 @@ def parse_eme(stanza): # XEP-0203: Delayed Delivery -def parse_delay(stanza, epoch=True, convert='utc'): - timestamp = None - delay = stanza.getTagAttr( - 'delay', 'stamp', namespace=nbxmpp.NS_DELAY2) - if delay is not None: - timestamp = parse_datetime(delay, check_utc=True, +def parse_delay(stanza, epoch=True, convert='utc', from_=None, not_from=None): + ''' + Returns the first valid delay timestamp that matches + + :param epoch: Returns the timestamp as epoch + + :param convert: Converts the timestamp to either utc or local + + :param from_: Matches only delays that have the according + from attr set + + :param not_from: Matches only delays that have the according + from attr not set + ''' + delays = stanza.getTags('delay', namespace=nbxmpp.NS_DELAY2) + + for delay in delays: + stamp = delay.getAttr('stamp') + if stamp is None: + log.warning('Invalid timestamp received: %s', stamp) + log.warning(stanza) + continue + + delay_from = delay.getAttr('from') + if from_ is not None: + if delay_from != from_: + continue + if not_from is not None: + if delay_from in not_from: + continue + + timestamp = parse_datetime(stamp, check_utc=True, epoch=epoch, convert=convert) if timestamp is None: - log.warning('Invalid timestamp received: %s', delay) + log.warning('Invalid timestamp received: %s', stamp) log.warning(stanza) + continue - return timestamp + return timestamp # XEP-0066: Out of Band Data ===================================== test/no_gui/unit/test_helpers.py ===================================== @@ -0,0 +1,30 @@ +import unittest + +import nbxmpp + +from gajim.common.modules.misc import parse_delay + +class TestHelpers(unittest.TestCase): + + def test_parse_delay(self): + + node = """ + <message> + <delay xmlns='urn:xmpp:delay' from='capulet.com' stamp='2002-09-10T23:08:25Z' /> + <delay xmlns='urn:xmpp:delay' from='romeo.com' stamp='2010-09-10T23:08:25Z' /> + <delay xmlns='urn:xmpp:delay' stamp='2015-09-10T23:08:25Z' /> + </message> + """ + message = nbxmpp.Node(node=node) + + timestamp = parse_delay(message) + self.assertEqual(timestamp, 1031699305.0) + + timestamp = parse_delay(message, from_='capulet.com') + self.assertEqual(timestamp, 1031699305.0) + + timestamp = parse_delay(message, from_='romeo.com') + self.assertEqual(timestamp, 1284160105.0) + + timestamp = parse_delay(message, not_from=['romeo.com']) + self.assertEqual(timestamp, 1031699305.0) \ No newline at end of file View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b2ecc14cae3500507dda2361a437d8aa6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b2ecc14cae3500507dda2361a437d8aa6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] 2 commits: Fix pylint errors
by Philipp Hörist 05 Dec '18

05 Dec '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: 59147efa by Philipp Hörist at 2018-12-05T20:43:21Z Fix pylint errors - - - - - b2ecc14c by Philipp Hörist at 2018-12-05T20:43:39Z Use virtualenv for CI tests - - - - - 2 changed files: - .gitlab-ci.yml - gajim/common/zeroconf/client_zeroconf.py Changes: ===================================== .gitlab-ci.yml ===================================== @@ -1,28 +1,25 @@ before_script: - - sudo apt-get update -qq && sudo apt-get install -y -qq libtool pkg-config python3-openssl gir1.2-gtk-3.0 python3-gi python3-nbxmpp-nightly python3-cairo python3-pip + - sudo apt-get update -qq && sudo apt-get install -y -qq libtool pkg-config gir1.2-gtk-3.0 python3-gi python3-cairo - sudo apt-get build-dep -y -qq gajim-default-nightly - - sudo pip3 install pylint==2.1.1 stages: - test - build -run-test: - stage: test - script: - - python3 setup.py test -s test.no_gui - -run-mypy: +run-tests: stage: test script: + - rm -rf civenv-master + - virtualenv --system-site-packages civenv + - . ./civenv/bin/activate + - pip3 install mypy + - pip3 install nbxmpp + - pip3 install pylint==2.1.1 - mypy gajim - -run-pylint: - stage: test - script: - - pylint3 --version - - pylint --version - scripts/dev/pylint-ci.sh --jobs=2 gajim + - python3 setup.py test -s test.no_gui + - deactivate + - rm -rf civenv-master run-appdata: stage: test @@ -57,4 +54,4 @@ run-build: name: "gajim-default-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA" expire_in: 1 week paths: - - gajim-default-2???-??-??.tar.gz + - gajim-default-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA.tar.gz ===================================== gajim/common/zeroconf/client_zeroconf.py ===================================== @@ -240,10 +240,10 @@ class P2PClient(IdleObject): self.send_stream_header() def send_stream_header(self): - self.Dispatcher._metastream = Node('stream:stream') + self.Dispatcher._metastream = nbxmpp.Node('stream:stream') self.Dispatcher._metastream.setNamespace(self.Namespace) self.Dispatcher._metastream.setAttr('version', '1.0') - self.Dispatcher._metastream.setAttr('xmlns:stream', NS_STREAMS) + self.Dispatcher._metastream.setAttr('xmlns:stream', nbxmpp.NS_STREAMS) self.Dispatcher._metastream.setAttr('from', self.conn_holder.zeroconf.name) if self.to: @@ -252,7 +252,7 @@ class P2PClient(IdleObject): self.Dispatcher._metastream)[:-2]) def _check_stream_start(self, ns, tag, attrs): - if ns != NS_STREAMS or tag != 'stream': + if ns != nbxmpp.NS_STREAMS or tag != 'stream': log.error('Incorrect stream start: (%s,%s).Terminating!', tag, ns) self.Connection.disconnect() @@ -266,7 +266,7 @@ class P2PClient(IdleObject): self.send_stream_header() if 'version' in attrs and attrs['version'] == '1.0': # other part supports stream features - features = Node('stream:features') + features = nbxmpp.Node('stream:features') self.Dispatcher.send(features) while self.stanzaqueue: stanza, is_message = self.stanzaqueue.pop(0) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/bb81277c173c5b59df2db5b0ef137b1bd… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/bb81277c173c5b59df2db5b0ef137b1bd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Fix pylint errors
by Philipp Hörist 05 Dec '18

05 Dec '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: ace1113d by Philipp Hörist at 2018-12-05T20:40:12Z Fix pylint errors - - - - - 31417ffb by Philipp Hörist at 2018-12-05T20:41:44Z Use virtualenv for CI tests - - - - - 3 changed files: - .gitlab-ci.yml - gajim/common/zeroconf/client_zeroconf.py - setup.cfg Changes: ===================================== .gitlab-ci.yml ===================================== @@ -1,28 +1,25 @@ before_script: - - sudo apt-get update -qq && sudo apt-get install -y -qq libtool pkg-config python3-openssl gir1.2-gtk-3.0 python3-gi python3-nbxmpp-nightly python3-cairo python3-pip + - sudo apt-get update -qq && sudo apt-get install -y -qq libtool pkg-config gir1.2-gtk-3.0 python3-gi python3-cairo - sudo apt-get build-dep -y -qq gajim-default-nightly - - sudo pip3 install pylint==2.1.1 stages: - test - build -run-test: - stage: test - script: - - python3 setup.py test -s test.no_gui - -run-mypy: +run-tests: stage: test script: + - rm -rf civenv-master + - virtualenv --system-site-packages civenv + - . ./civenv/bin/activate + - pip3 install mypy + - pip3 install git+https://dev.gajim.org/gajim/python-nbxmpp.git@master + - pip3 install pylint==2.1.1 - mypy gajim - -run-pylint: - stage: test - script: - - pylint3 --version - - pylint --version - scripts/dev/pylint-ci.sh --jobs=2 gajim + - python3 setup.py test -s test.no_gui + - deactivate + - rm -rf civenv-master run-appdata: stage: test @@ -57,4 +54,4 @@ run-build: name: "gajim-default-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA" expire_in: 1 week paths: - - gajim-default-2???-??-??.tar.gz + - gajim-default-$CI_COMMIT_SHA.tar.gz ===================================== gajim/common/zeroconf/client_zeroconf.py ===================================== @@ -240,10 +240,10 @@ class P2PClient(IdleObject): self.send_stream_header() def send_stream_header(self): - self.Dispatcher._metastream = Node('stream:stream') + self.Dispatcher._metastream = nbxmpp.Node('stream:stream') self.Dispatcher._metastream.setNamespace(self.Namespace) self.Dispatcher._metastream.setAttr('version', '1.0') - self.Dispatcher._metastream.setAttr('xmlns:stream', NS_STREAMS) + self.Dispatcher._metastream.setAttr('xmlns:stream', nbxmpp.NS_STREAMS) self.Dispatcher._metastream.setAttr('from', self.conn_holder.zeroconf.name) if self.to: @@ -252,7 +252,7 @@ class P2PClient(IdleObject): self.Dispatcher._metastream)[:-2]) def _check_stream_start(self, ns, tag, attrs): - if ns != NS_STREAMS or tag != 'stream': + if ns != nbxmpp.NS_STREAMS or tag != 'stream': log.error('Incorrect stream start: (%s,%s).Terminating!', tag, ns) self.Connection.disconnect() @@ -266,7 +266,7 @@ class P2PClient(IdleObject): self.send_stream_header() if 'version' in attrs and attrs['version'] == '1.0': # other part supports stream features - features = Node('stream:features') + features = nbxmpp.Node('stream:features') self.Dispatcher.send(features) while self.stanzaqueue: stanza, is_message = self.stanzaqueue.pop(0) ===================================== setup.cfg ===================================== @@ -19,8 +19,6 @@ 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/compare/a979874fa1fa3a2c0ef608bb81d1c04b6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/a979874fa1fa3a2c0ef608bb81d1c04b6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Correctly remove ping timeout
by Philipp Hörist 05 Dec '18

05 Dec '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4968fe39 by Philipp Hörist at 2018-12-05T16:03:34Z Correctly remove ping timeout Fixes #9481 - - - - - e419f752 by Philipp Hörist at 2018-12-05T16:05:10Z Remove unused imports - - - - - a979874f by Philipp Hörist at 2018-12-05T16:05:29Z Sort imports - - - - - 4 changed files: - gajim/common/connection.py - gajim/common/connection_handlers.py - gajim/common/modules/ping.py - gajim/common/zeroconf/connection_zeroconf.py Changes: ===================================== gajim/common/connection.py ===================================== @@ -595,6 +595,7 @@ class Connection(CommonConnection, ConnectionHandlers): self.retrycount = 0 def disconnect(self, reconnect=True, immediately=False): + self.get_module('Ping').remove_timeout() if self.connection is None: if not reconnect: self._sm_resume_data = {} ===================================== gajim/common/connection_handlers.py ===================================== @@ -24,27 +24,26 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +import logging import operator -from time import time as time_time +import time import nbxmpp -from gajim.common import modules -from gajim.common import helpers from gajim.common import app +from gajim.common import ged +from gajim.common import helpers from gajim.common import jingle_xtls +from gajim.common import modules from gajim.common.caps_cache import muc_caps_cache -from gajim.common.protocol.bytestream import ConnectionSocks5Bytestream -from gajim.common.protocol.bytestream import ConnectionIBBytestream from gajim.common.connection_handlers_events import * - -from gajim.common import ged -from gajim.common.nec import NetworkEvent from gajim.common.const import KindConstant - from gajim.common.jingle import ConnectionJingle +from gajim.common.nec import NetworkEvent +from gajim.common.protocol.bytestream import ConnectionSocks5Bytestream +from gajim.common.protocol.bytestream import ConnectionIBBytestream + -import logging log = logging.getLogger('gajim.c.connection_handlers') # kind of events we can wait for an answer @@ -193,7 +192,7 @@ class ConnectionHandlersBase: if show is not None: app.logger.insert_into_logs(self.name, nbxmpp.JID(obj.jid).getStripped(), - time_time(), + time.time(), KindConstant.STATUS, message=obj.status, show=show) ===================================== gajim/common/modules/ping.py ===================================== @@ -21,6 +21,7 @@ import logging import time import nbxmpp +from gi.repository import GLib from gajim.common import app from gajim.common.nec import NetworkIncomingEvent @@ -34,7 +35,7 @@ class Ping: def __init__(self, con: ConnectionT) -> None: self._con = con self._account = con.name - self._alarm_time = None + self._timeout_id = None self.handlers = [ ('iq', self._answer_request, 'get', nbxmpp.NS_PING), @@ -50,19 +51,19 @@ class Ping: if not app.account_is_connected(self._account): return - to = app.config.get_per('accounts', self._account, 'hostname') - self._con.connection.SendAndCallForResponse(self._get_ping_iq(to), - self._keepalive_received) - log.info('Send keepalive') seconds = app.config.get_per('accounts', self._account, 'time_for_ping_alive_answer') - self._alarm_time = app.idlequeue.set_alarm(self._reconnect, seconds) + self._timeout_id = GLib.timeout_add_seconds(seconds, self._reconnect) + + to = app.config.get_per('accounts', self._account, 'hostname') + self._con.connection.SendAndCallForResponse(self._get_ping_iq(to), + self._keepalive_received) def _keepalive_received(self, _stanza: nbxmpp.Iq) -> None: log.info('Received keepalive') - app.idlequeue.remove_alarm(self._reconnect, self._alarm_time) + self.remove_timeout() def _reconnect(self) -> None: if not app.config.get_per('accounts', self._account, 'active'): @@ -118,6 +119,16 @@ class Ping: log.info('Send pong to %s', stanza.getFrom()) raise nbxmpp.NodeProcessed + def remove_timeout(self) -> None: + if self._timeout_id is None: + return + log.info('Remove ping timeout') + GLib.source_remove(self._timeout_id) + self._timeout_id = None + + def cleanup(self) -> None: + self.remove_timeout() + class PingSentEvent(NetworkIncomingEvent): name = 'ping-sent' ===================================== gajim/common/zeroconf/connection_zeroconf.py ===================================== @@ -27,24 +27,17 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -import os import socket -import random -random.seed() +import getpass import nbxmpp - -import signal -if os.name != 'nt': - signal.signal(signal.SIGPIPE, signal.SIG_DFL) -import getpass from gi.repository import GLib -from gajim.common.connection import CommonConnection from gajim.common import app from gajim.common import ged from gajim.common import modules from gajim.common.i18n import _ +from gajim.common.connection import CommonConnection from gajim.common.zeroconf import client_zeroconf from gajim.common.zeroconf import zeroconf from gajim.common.zeroconf.connection_handlers_zeroconf import * @@ -52,6 +45,7 @@ from gajim.common.connection_handlers_events import * log = logging.getLogger('gajim.c.connection_zeroconf') + class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): def __init__(self, name): ConnectionHandlersZeroconf.__init__(self) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/62253c804ab7d0378ddf778f07a0923e4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/62253c804ab7d0378ddf778f07a0923e4… 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