Commits January 2019

commits@gajim.org

1 participants
85 discussions

[Git][gajim/python-nbxmpp][master] Dont print log message on valid show
by Philipp Hörist 04 Jan '19

04 Jan '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: ba07eccc by Philipp Hörist at 2019-01-04T00:21:16Z Dont print log message on valid show - - - - - 1 changed file: - nbxmpp/modules/presence.py Changes: ===================================== nbxmpp/modules/presence.py ===================================== @@ -84,6 +84,9 @@ class BasePresence: @staticmethod def _parse_show(stanza): + show = stanza.getShow() + if show is None: + return PresenceShow.ONLINE try: return PresenceShow(stanza.getShow()) except ValueError: View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/ba07eccc070bdecb926ec600fa… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/ba07eccc070bdecb926ec600fa… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Raise version to 0.9.90.3
by Philipp Hörist 04 Jan '19

04 Jan '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 48c04eb9 by Philipp Hörist at 2019-01-04T00:16:57Z Raise version to 0.9.90.3 - - - - - 1 changed file: - nbxmpp/__init__.py Changes: ===================================== nbxmpp/__init__.py ===================================== @@ -15,4 +15,4 @@ from .client_nb import NonBlockingClient from .plugin import PlugIn from .smacks import Smacks -__version__ = "0.9.90.2" +__version__ = "0.9.90.3" View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/48c04eb978b4967b360b7b5a1b… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/48c04eb978b4967b360b7b5a1b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove ping timeout on disconnect handler
by Philipp Hörist 03 Jan '19

03 Jan '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5fd1e7b4 by Philipp Hörist at 2019-01-03T23:49:59Z Remove ping timeout on disconnect handler - - - - - 2 changed files: - gajim/common/connection.py - gajim/common/modules/ping.py Changes: ===================================== gajim/common/connection.py ===================================== @@ -675,6 +675,7 @@ class Connection(CommonConnection, ConnectionHandlers): def _disconnect(self): log.info('Set state disconnected') + self.get_module('Ping').remove_timeout() self.connected = 0 self.disable_reconnect_timer() ===================================== gajim/common/modules/ping.py ===================================== @@ -66,10 +66,8 @@ class Ping: self.remove_timeout() def _reconnect(self) -> None: - if not app.config.get_per('accounts', self._account, 'active'): - # Account may have been disabled + if not app.account_is_connected(self._account): return - # We haven't got the pong in time, disco and reconnect log.warning('No reply received for keepalive ping. Reconnecting...') self._con.disconnect(immediately=True) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5fd1e7b4bfb61e6f983dfaa25a4de6b639… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5fd1e7b4bfb61e6f983dfaa25a4de6b639… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Fix tests
by Philipp Hörist 03 Jan '19

03 Jan '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: aa44a60c by Philipp Hörist at 2019-01-03T23:19:00Z Fix tests - - - - - 1 changed file: - test/unit/test_xmpp_dispatcher_nb.py Changes: ===================================== test/unit/test_xmpp_dispatcher_nb.py ===================================== @@ -47,17 +47,17 @@ class TestDispatcherNB(unittest.TestCase): self.dispatcher.RegisterHandler('message', _got_message) # should be able to parse a normal message - self.dispatcher.ProcessNonBlocking('<message><body>hello</body></message>') + self.dispatcher.ProcessNonBlocking('<message from="test(a)test.at"><body>hello</body></message>') self.assertEqual(1, len(msgs)) - self.dispatcher.ProcessNonBlocking('<message><x:y/></message>') + self.dispatcher.ProcessNonBlocking('<message from="test(a)test.at"><x:y/></message>') self.assertEqual(2, len(msgs)) # we should not have been disconnected after that message self.con.pollend.assert_not_called() self.con.disconnect.assert_not_called() # we should be able to keep parsing - self.dispatcher.ProcessNonBlocking('<message><body>still here?</body></message>') + self.dispatcher.ProcessNonBlocking('<message from="test(a)test.at"><body>still here?</body></message>') self.assertEqual(3, len(msgs)) def test_process_non_blocking(self): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/aa44a60c7833fa9f97776a37c3… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/aa44a60c7833fa9f97776a37c3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 10 commits: Remove unnecessary event classes
by Philipp Hörist 03 Jan '19

03 Jan '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 371756c2 by Philipp Hörist at 2019-01-03T08:06:44Z Remove unnecessary event classes - - - - - 1399c41d by Philipp Hörist at 2019-01-03T08:06:49Z Remove old dbus module We now use Gio DBus - - - - - f3d5babc by Philipp Hörist at 2019-01-03T09:19:25Z Register handlers in CommonConnection class - - - - - 0441ccd4 by Philipp Hörist at 2019-01-03T09:19:29Z Move 'agent-removed' handler into Gateway module - - - - - b05f0e14 by Philipp Hörist at 2019-01-03T09:19:53Z Move methods into Connection class - - - - - eb9f340a by Philipp Hörist at 2019-01-03T09:41:22Z Remove star imports - - - - - 4631f503 by Philipp Hörist at 2019-01-03T09:46:31Z Remove unused code - - - - - c0fb6453 by Philipp Hörist at 2019-01-03T10:25:45Z Move MUC message logging into message module - - - - - cdb37828 by Philipp Hörist at 2019-01-03T10:52:26Z Move message error handler into message module - - - - - b6003286 by Philipp Hörist at 2019-01-03T23:11:28Z Refactor message handlers - Adapt to nbxmpp now unwraping MAM messages - Use nbxmpp properties - Save message-id to database - - - - - 16 changed files: - gajim/common/connection.py - gajim/common/connection_handlers.py - gajim/common/connection_handlers_events.py - − gajim/common/dbus_support.py - gajim/common/logger.py - gajim/common/modules/gateway.py - gajim/common/modules/mam.py - gajim/common/modules/message.py - gajim/common/modules/util.py - gajim/common/zeroconf/client_zeroconf.py - gajim/common/zeroconf/connection_handlers_zeroconf.py - gajim/common/zeroconf/connection_zeroconf.py - gajim/gtk/features.py - gajim/gtk/themes.py - gajim/gui_interface.py - gajim/session.py Changes: ===================================== gajim/common/connection.py ===================================== @@ -58,10 +58,22 @@ from gajim.common import app from gajim.common import gpg from gajim.common import passwords from gajim.common import idle +from gajim.common import modules +from gajim.common import ged +from gajim.common.nec import NetworkEvent from gajim.common.i18n import _ -from gajim.common.connection_handlers import * from gajim.common.contacts import GC_Contact -from gajim.common import modules +from gajim.common.connection_handlers import ConnectionHandlers +from gajim.common.connection_handlers_events import OurShowEvent +from gajim.common.connection_handlers_events import BadGPGPassphraseEvent +from gajim.common.connection_handlers_events import GPGPasswordRequiredEvent +from gajim.common.connection_handlers_events import InformationEvent +from gajim.common.connection_handlers_events import StanzaMessageOutgoingEvent +from gajim.common.connection_handlers_events import GcStanzaMessageOutgoingEvent +from gajim.common.connection_handlers_events import ConnectionLostEvent +from gajim.common.connection_handlers_events import NewAccountConnectedEvent +from gajim.common.connection_handlers_events import NewAccountNotConnectedEvent +from gajim.common.connection_handlers_events import MessageSentEvent log = logging.getLogger('gajim.c.connection') @@ -100,16 +112,15 @@ class CommonConnection: self.time_to_reconnect = None self._reconnect_timer_source = None + # If handlers have been registered + self.handlers_registered = False + self.pep = {} # Do we continue connection when we get roster (send presence,get vcard..) self.continue_connect_info = None # Remember where we are in the register agent process self.agent_registrations = {} - # To know the groupchat jid associated with a stanza ID. Useful to - # request vcard or os info... to a real JID but act as if it comes from - # the fake jid - self.groupchat_jids = {} # {ID : groupchat_jid} self.roster_supported = True self.addressing_supported = False @@ -123,6 +134,24 @@ class CommonConnection: self.get_config_values_or_default() + def _register_new_handlers(self, con): + for handler in modules.get_handlers(self): + if len(handler) == 5: + name, func, typ, ns, priority = handler + con.RegisterHandler(name, func, typ, ns, priority=priority) + else: + con.RegisterHandler(*handler) + self.handlers_registered = True + + def _unregister_new_handlers(self, con): + if not con: + return + for handler in modules.get_handlers(self): + if len(handler) > 4: + handler = handler[:4] + con.UnregisterHandler(*handler) + self.handlers_registered = False + def _compute_resource(self): resource = app.config.get_per('accounts', self.name, 'resource') # All valid resource substitution strings should be added to this hash. @@ -421,11 +450,15 @@ class CommonConnection: def _event_dispatcher(self, realm, event, data): if realm == '': if event == 'STANZA RECEIVED': - app.nec.push_incoming_event(StanzaReceivedEvent( - None, conn=self, stanza_str=str(data))) + app.nec.push_incoming_event( + NetworkEvent('stanza-received', + conn=self, + stanza_str=str(data))) elif event == 'DATA SENT': - app.nec.push_incoming_event(StanzaSentEvent( - None, conn=self, stanza_str=str(data))) + app.nec.push_incoming_event( + NetworkEvent('stanza-sent', + conn=self, + stanza_str=str(data))) def change_status(self, show, msg, auto=False): if not msg: @@ -479,6 +512,7 @@ class CommonConnection: self._change_from_invisible() self._update_status(show, msg, idle_time=idle_time) + class Connection(CommonConnection, ConnectionHandlers): def __init__(self, name): CommonConnection.__init__(self, name) @@ -536,9 +570,7 @@ class Connection(CommonConnection, ConnectionHandlers): # END __init__ def cleanup(self): - ConnectionHandlers.cleanup(self) modules.unregister(self) - app.ged.remove_event_handler('message-outgoing', ged.OUT_CORE, self._nec_message_outgoing) app.ged.remove_event_handler('gc-message-outgoing', ged.OUT_CORE, @@ -653,7 +685,7 @@ class Connection(CommonConnection, ConnectionHandlers): app.proxy65_manager.disconnect(self.connection) self.terminate_sessions() self.remove_all_transfers() - ConnectionHandlers._unregister_handlers(self) + self._unregister_new_handlers(self.connection) self.connection = None def _set_reconnect_timer(self): @@ -732,8 +764,8 @@ class Connection(CommonConnection, ConnectionHandlers): reason = _('Server %(name)s answered wrongly to ' 'register request: %(error)s') % {'name': data[0], 'error': data[3]} - app.nec.push_incoming_event(AccountNotCreatedEvent( - None, conn=self, reason=reason)) + app.nec.push_incoming_event(NetworkEvent( + 'account-not-created', conn=self, reason=reason)) return is_form = data[2] conf = data[1] @@ -743,15 +775,16 @@ class Connection(CommonConnection, ConnectionHandlers): def _on_register_result(result): if not nbxmpp.isResultNode(result): reason = result.getErrorMsg() or result.getError() - app.nec.push_incoming_event(AccountNotCreatedEvent( - None, conn=self, reason=reason)) + app.nec.push_incoming_event(NetworkEvent( + 'account-not-created', conn=self, reason=reason)) return if app.is_installed('GPG'): self.USE_GPG = True self.gpg = gpg.GnuPG() app.nec.push_incoming_event( - AccountCreatedEvent(None, conn=self, - account_info=self.new_account_info)) + NetworkEvent('account-created', + conn=self, + account_info=self.new_account_info)) self.new_account_info = None self.new_account_form = None if self.connection: @@ -773,8 +806,8 @@ class Connection(CommonConnection, ConnectionHandlers): # requested config has changed since first connection reason = _('Server %s provided a different ' 'registration form') % data[0] - app.nec.push_incoming_event(AccountNotCreatedEvent( - None, conn=self, reason=reason)) + app.nec.push_incoming_event(NetworkEvent( + 'account-not-created', conn=self, reason=reason)) return nbxmpp.features_nb.register(self.connection, self._hostname, self.new_account_form, @@ -1039,9 +1072,12 @@ class Connection(CommonConnection, ConnectionHandlers): if self.client_cert and app.config.get_per('accounts', self.name, 'client_cert_encrypted'): - app.nec.push_incoming_event(ClientCertPassphraseEvent( - None, conn=self, con=con, port=port, - secure_tuple=secure_tuple)) + app.nec.push_incoming_event( + NetworkEvent('client-cert-passphrase', + conn=self, + con=con, + port=port, + secure_tuple=secure_tuple)) return self.on_client_cert_passphrase('', con, port, secure_tuple) @@ -1115,8 +1151,10 @@ class Connection(CommonConnection, ConnectionHandlers): con.RegisterDisconnectHandler(self.disconnect) if _con_type == 'plain' and app.config.get_per('accounts', self.name, 'action_when_plaintext_connection') == 'warn': - app.nec.push_incoming_event(PlainConnectionEvent(None, conn=self, - xmpp_client=con)) + app.nec.push_incoming_event( + NetworkEvent('plain-connection', + conn=self, + xmpp_client=con)) return True if _con_type == 'plain' and app.config.get_per('accounts', self.name, 'action_when_plaintext_connection') == 'disconnect': @@ -1129,8 +1167,11 @@ class Connection(CommonConnection, ConnectionHandlers): 'warn_when_insecure_ssl_connection') and \ not self.connection_auto_accepted: # Pyopenssl is not used - app.nec.push_incoming_event(InsecureSSLConnectionEvent(None, - conn=self, xmpp_client=con, conn_type=_con_type)) + app.nec.push_incoming_event( + NetworkEvent('insecure-ssl-connection', + conn=self, + xmpp_client=con, + conn_type=_con_type)) return True return self.connection_accepted(con, con_type) @@ -1187,9 +1228,11 @@ class Connection(CommonConnection, ConnectionHandlers): self.process_ssl_errors() return - app.nec.push_incoming_event(SSLErrorEvent(None, conn=self, - error_num=errnum, - cert=cert)) + app.nec.push_incoming_event( + NetworkEvent('ssl-error', + conn=self, + error_num=errnum, + cert=cert)) @staticmethod def _calculate_cert_sha256(cert): @@ -1286,8 +1329,8 @@ class Connection(CommonConnection, ConnectionHandlers): if self.password is not None: on_password(self.password) else: - app.nec.push_incoming_event(PasswordRequiredEvent( - None, conn=self, on_password=on_password)) + app.nec.push_incoming_event(NetworkEvent( + 'password-required', conn=self, on_password=on_password)) def _auth(self): self._register_handlers(self.connection, self._current_type) @@ -1311,8 +1354,11 @@ class Connection(CommonConnection, ConnectionHandlers): app.con_types[self.name] = con_type # notify the gui about con_type app.nec.push_incoming_event( - ConnectionTypeEvent(None, conn=self, connection_type=con_type)) + NetworkEvent('connection-type', + conn=self, + connection_type=con_type)) ConnectionHandlers._register_handlers(self, con, con_type) + self._register_new_handlers(con) def _on_auth_successful(self): if self._unregister_account: @@ -1365,8 +1411,11 @@ class Connection(CommonConnection, ConnectionHandlers): app.config.set_per('accounts', self.name, 'name', self.connection.User) new_jid = app.get_jid_from_account(self.name) - app.nec.push_incoming_event(AnonymousAuthEvent( - None, conn=self, old_jid=old_jid, new_jid=new_jid)) + app.nec.push_incoming_event( + NetworkEvent('anonymous-auth', + conn=self, + old_jid=old_jid, + new_jid=new_jid)) self.connected = 2 self.retrycount = 0 @@ -1447,7 +1496,7 @@ class Connection(CommonConnection, ConnectionHandlers): self.get_module('Blocking').get_blocking_list() # Inform GUI we just signed in - app.nec.push_incoming_event(SignedInEvent(None, conn=self)) + app.nec.push_incoming_event(NetworkEvent('signed-in', conn=self)) def get_signed_presence(self, msg, callback=None): if app.config.get_per('accounts', self.name, 'gpg_sign_presence'): @@ -1494,6 +1543,86 @@ class Connection(CommonConnection, ConnectionHandlers): self.get_module('Roster').request_roster() elif self._connect_machine_calls == 4: self.send_first_presence() + self.discover_ft_proxies() + + def discover_ft_proxies(self): + if not app.config.get_per('accounts', self.name, 'use_ft_proxies'): + return + + cfg_proxies = app.config.get_per('accounts', self.name, + 'file_transfer_proxies') + our_jid = helpers.parse_jid(app.get_jid_from_account(self.name) + \ + '/' + self.server_resource) + testit = app.config.get_per('accounts', self.name, + 'test_ft_proxies_on_startup') + if cfg_proxies: + proxies = [e.strip() for e in cfg_proxies.split(',')] + for proxy in proxies: + app.proxy65_manager.resolve(proxy, self.connection, our_jid, + testit=testit) + + def send_first_presence(self): + if self.connected > 1 and self.continue_connect_info: + msg = self.continue_connect_info[1] + sign_msg = self.continue_connect_info[2] + signed = '' + send_first_presence = True + if sign_msg: + signed = self.get_signed_presence(msg, + self._send_first_presence) + if signed is None: + app.nec.push_incoming_event(GPGPasswordRequiredEvent(None, + conn=self, callback=self._send_first_presence)) + # _send_first_presence will be called when user enter + # passphrase + send_first_presence = False + if send_first_presence: + self._send_first_presence(signed) + + def _send_first_presence(self, signed=''): + show = self.continue_connect_info[0] + msg = self.continue_connect_info[1] + sign_msg = self.continue_connect_info[2] + if sign_msg and not signed: + signed = self.get_signed_presence(msg) + if signed is None: + app.nec.push_incoming_event(BadGPGPassphraseEvent(None, + conn=self)) + self.USE_GPG = False + signed = '' + self.connected = app.SHOW_LIST.index(show) + sshow = helpers.get_xmpp_show(show) + # send our presence + if show == 'invisible': + self.send_invisible_presence(msg, signed, True) + return + if show not in ['offline', 'online', 'chat', 'away', 'xa', 'dnd']: + return + priority = app.get_priority(self.name, sshow) + + self.get_module('Presence').send_presence( + priority=priority, + show=sshow, + status=msg, + sign=signed) + + if self.connection: + self.priority = priority + app.nec.push_incoming_event(OurShowEvent(None, conn=self, + show=show)) + + if not self.avatar_conversion: + # ask our VCard + self.get_module('VCardTemp').request_vcard() + + self.get_module('Bookmarks').get_bookmarks() + self.get_module('Annotations').get_annotations() + self.get_module('Blocking').get_blocking_list() + + # Inform GUI we just signed in + app.nec.push_incoming_event(NetworkEvent('signed-in', conn=self)) + self.get_module('PEP').send_stored_publish() + self.continue_connect_info = None def send_custom_status(self, show, msg, jid): if show not in app.SHOW_LIST: ===================================== gajim/common/connection_handlers.py ===================================== @@ -30,16 +30,15 @@ import operator import nbxmpp 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.connection_handlers_events import * -from gajim.common.const import KindConstant from gajim.common.jingle import ConnectionJingle from gajim.common.protocol.bytestream import ConnectionSocks5Bytestream from gajim.common.protocol.bytestream import ConnectionIBBytestream +from gajim.common.connection_handlers_events import StreamReceivedEvent +from gajim.common.connection_handlers_events import PresenceReceivedEvent +from gajim.common.connection_handlers_events import StreamConflictReceivedEvent +from gajim.common.connection_handlers_events import NotificationEvent log = logging.getLogger('gajim.c.connection_handlers') @@ -53,69 +52,6 @@ class ConnectionHandlersBase: # IDs of sent messages (https://trac.gajim.org/ticket/8222) self.sent_message_ids = [] - # We decrypt GPG messages one after the other. Keep queue in mem - self.gpg_messages_to_decrypt = [] - - app.ged.register_event_handler('gc-message-received', ged.CORE, - self._nec_gc_message_received) - - def cleanup(self): - app.ged.remove_event_handler('gc-message-received', ged.CORE, - self._nec_gc_message_received) - - def _check_for_mam_compliance(self, room_jid, stanza_id): - namespace = muc_caps_cache.get_mam_namespace(room_jid) - if stanza_id is None and namespace == nbxmpp.NS_MAM_2: - log.warning('%s announces mam:2 without stanza-id', room_jid) - - def _nec_gc_message_received(self, obj): - if obj.conn.name != self.name: - return - - if obj.stanza.getType() == 'error': - return - - self._check_for_mam_compliance(obj.jid, obj.stanza_id) - - if (app.config.should_log(obj.conn.name, obj.jid) and - obj.msgtxt and obj.nick): - # if not obj.nick, it means message comes from room itself - # usually it hold description and can be send at each connection - # so don't store it in logs - app.logger.insert_into_logs(self.name, - obj.jid, - obj.timestamp, - KindConstant.GC_MSG, - message=obj.msgtxt, - contact_name=obj.nick, - additional_data=obj.additional_data, - stanza_id=obj.stanza_id) - app.logger.set_room_last_message_time(obj.room_jid, obj.timestamp) - self.get_module('MAM').save_archive_id( - obj.room_jid, obj.stanza_id, obj.timestamp) - - # process and dispatch an error message - def dispatch_error_message(self, msg, msgtxt, session, frm, tim): - error_msg = msg.getErrorMsg() - - if not error_msg: - error_msg = msgtxt - msgtxt = None - - subject = msg.getSubject() - - if session.is_loggable(): - app.logger.insert_into_logs(self.name, - nbxmpp.JID(frm).getStripped(), - tim, - KindConstant.ERROR, - message=error_msg, - subject=subject) - - app.nec.push_incoming_event(MessageErrorEvent(None, conn=self, - fjid=frm, error_code=msg.getErrorCode(), error_msg=error_msg, - msg=msgtxt, time_=tim, session=session, stanza=msg)) - def get_sessions(self, jid): """ Get all sessions for the given full jid @@ -253,117 +189,13 @@ class ConnectionHandlers(ConnectionSocks5Bytestream, def __init__(self): ConnectionSocks5Bytestream.__init__(self) ConnectionIBBytestream.__init__(self) - - # Handle presences BEFORE caps - app.nec.register_incoming_event(PresenceReceivedEvent) - ConnectionJingle.__init__(self) ConnectionHandlersBase.__init__(self) - self.continue_connect_info = None - - # If handlers have been registered - self.handlers_registered = False - + app.nec.register_incoming_event(PresenceReceivedEvent) app.nec.register_incoming_event(StreamConflictReceivedEvent) app.nec.register_incoming_event(NotificationEvent) - app.ged.register_event_handler('agent-removed', ged.CORE, - self._nec_agent_removed) - - def cleanup(self): - ConnectionHandlersBase.cleanup(self) - app.ged.remove_event_handler('agent-removed', ged.CORE, - self._nec_agent_removed) - - def _nec_agent_removed(self, obj): - if obj.conn.name != self.name: - return - for jid in obj.jid_list: - log.debug('Removing contact %s due to unregistered transport %s', - jid, obj.agent) - self.get_module('Presence').unsubscribe(jid) - # Transport contacts can't have 2 resources - if jid in app.to_be_removed[self.name]: - # This way we'll really remove it - app.to_be_removed[self.name].remove(jid) - - def discover_ft_proxies(self): - cfg_proxies = app.config.get_per('accounts', self.name, - 'file_transfer_proxies') - our_jid = helpers.parse_jid(app.get_jid_from_account(self.name) + \ - '/' + self.server_resource) - testit = app.config.get_per('accounts', self.name, - 'test_ft_proxies_on_startup') - if cfg_proxies: - proxies = [e.strip() for e in cfg_proxies.split(',')] - for proxy in proxies: - app.proxy65_manager.resolve(proxy, self.connection, our_jid, - testit=testit) - - def send_first_presence(self): - if self.connected > 1 and self.continue_connect_info: - msg = self.continue_connect_info[1] - sign_msg = self.continue_connect_info[2] - signed = '' - send_first_presence = True - if sign_msg: - signed = self.get_signed_presence(msg, - self._send_first_presence) - if signed is None: - app.nec.push_incoming_event(GPGPasswordRequiredEvent(None, - conn=self, callback=self._send_first_presence)) - # _send_first_presence will be called when user enter - # passphrase - send_first_presence = False - if send_first_presence: - self._send_first_presence(signed) - - def _send_first_presence(self, signed=''): - show = self.continue_connect_info[0] - msg = self.continue_connect_info[1] - sign_msg = self.continue_connect_info[2] - if sign_msg and not signed: - signed = self.get_signed_presence(msg) - if signed is None: - app.nec.push_incoming_event(BadGPGPassphraseEvent(None, - conn=self)) - self.USE_GPG = False - signed = '' - self.connected = app.SHOW_LIST.index(show) - sshow = helpers.get_xmpp_show(show) - # send our presence - if show == 'invisible': - self.send_invisible_presence(msg, signed, True) - return - if show not in ['offline', 'online', 'chat', 'away', 'xa', 'dnd']: - return - priority = app.get_priority(self.name, sshow) - - self.get_module('Presence').send_presence( - priority=priority, - show=sshow, - status=msg, - sign=signed) - - if self.connection: - self.priority = priority - app.nec.push_incoming_event(OurShowEvent(None, conn=self, - show=show)) - - if not self.avatar_conversion: - # ask our VCard - self.get_module('VCardTemp').request_vcard() - - self.get_module('Bookmarks').get_bookmarks() - self.get_module('Annotations').get_annotations() - self.get_module('Blocking').get_blocking_list() - - # Inform GUI we just signed in - app.nec.push_incoming_event(SignedInEvent(None, conn=self)) - self.get_module('PEP').send_stored_publish() - self.continue_connect_info = None - def _PubkeyGetCB(self, con, iq_obj): log.info('PubkeyGetCB') jid_from = helpers.get_full_jid_from_iq(iq_obj) @@ -408,20 +240,3 @@ class ConnectionHandlers(ConnectionSocks5Bytestream, nbxmpp.NS_PUBKEY_PUBKEY) con.RegisterHandler('iq', self._PubkeyResultCB, 'result', nbxmpp.NS_PUBKEY_PUBKEY) - - for handler in modules.get_handlers(self): - if len(handler) == 5: - name, func, typ, ns, priority = handler - con.RegisterHandler(name, func, typ, ns, priority=priority) - else: - con.RegisterHandler(*handler) - self.handlers_registered = True - - def _unregister_handlers(self): - if not self.connection: - return - for handler in modules.get_handlers(self): - if len(handler) > 4: - handler = handler[:4] - self.connection.UnregisterHandler(*handler) - self.handlers_registered = False ===================================== gajim/common/connection_handlers_events.py ===================================== @@ -66,9 +66,6 @@ class MessageSentEvent(nec.NetworkIncomingEvent): self.conn.sent_message_ids = self.conn.sent_message_ids[-20000:] return True -class MessageNotSentEvent(nec.NetworkIncomingEvent): - name = 'message-not-sent' - class MessageErrorEvent(nec.NetworkIncomingEvent): name = 'message-error' @@ -85,9 +82,6 @@ class MessageErrorEvent(nec.NetworkIncomingEvent): return True return False -class AnonymousAuthEvent(nec.NetworkIncomingEvent): - name = 'anonymous-auth' - class JingleRequestReceivedEvent(nec.NetworkIncomingEvent): name = 'jingle-request-received' @@ -133,12 +127,6 @@ class JingleErrorReceivedEvent(nec.NetworkIncomingEvent): self.sid = self.jingle_session.sid return True -class AccountCreatedEvent(nec.NetworkIncomingEvent): - name = 'account-created' - -class AccountNotCreatedEvent(nec.NetworkIncomingEvent): - name = 'account-not-created' - class NewAccountConnectedEvent(nec.NetworkIncomingEvent): name = 'new-account-connected' @@ -165,15 +153,6 @@ class NewAccountConnectedEvent(nec.NetworkIncomingEvent): class NewAccountNotConnectedEvent(nec.NetworkIncomingEvent): name = 'new-account-not-connected' -class ConnectionTypeEvent(nec.NetworkIncomingEvent): - name = 'connection-type' - -class StanzaReceivedEvent(nec.NetworkIncomingEvent): - name = 'stanza-received' - -class StanzaSentEvent(nec.NetworkIncomingEvent): - name = 'stanza-sent' - class BadGPGPassphraseEvent(nec.NetworkIncomingEvent): name = 'bad-gpg-passphrase' @@ -191,9 +170,6 @@ class ConnectionLostEvent(nec.NetworkIncomingEvent): show='offline')) return True -class GPGTrustKeyEvent(nec.NetworkIncomingEvent): - name = 'gpg-trust-key' - class GPGPasswordRequiredEvent(nec.NetworkIncomingEvent): name = 'gpg-password-required' @@ -201,42 +177,6 @@ class GPGPasswordRequiredEvent(nec.NetworkIncomingEvent): self.keyid = app.config.get_per('accounts', self.conn.name, 'keyid') return True -class PlainConnectionEvent(nec.NetworkIncomingEvent): - name = 'plain-connection' - -class InsecureSSLConnectionEvent(nec.NetworkIncomingEvent): - name = 'insecure-ssl-connection' - -class SSLErrorEvent(nec.NetworkIncomingEvent): - name = 'ssl-error' - -class UpdateGCAvatarEvent(nec.NetworkIncomingEvent): - name = 'update-gc-avatar' - - def generate(self): - return True - -class UpdateRosterAvatarEvent(nec.NetworkIncomingEvent): - name = 'update-roster-avatar' - - def generate(self): - return True - -class UpdateRoomAvatarEvent(nec.NetworkIncomingEvent): - name = 'update-room-avatar' - - def generate(self): - return True - -class ZeroconfNameConflictEvent(nec.NetworkIncomingEvent): - name = 'zeroconf-name-conflict' - -class PasswordRequiredEvent(nec.NetworkIncomingEvent): - name = 'password-required' - -class SignedInEvent(nec.NetworkIncomingEvent): - name = 'signed-in' - class FileRequestReceivedEvent(nec.NetworkIncomingEvent): name = 'file-request-received' @@ -737,10 +677,6 @@ class GcMessageOutgoingEvent(nec.NetworkOutgoingEvent): def generate(self): return True - -class ClientCertPassphraseEvent(nec.NetworkIncomingEvent): - name = 'client-cert-passphrase' - class InformationEvent(nec.NetworkIncomingEvent): name = 'information' @@ -756,10 +692,3 @@ class InformationEvent(nec.NetworkIncomingEvent): else: self.args = (self.args,) return True - - -class StyleChanged(nec.NetworkIncomingEvent): - name = 'style-changed' - - def generate(self): - return True ===================================== gajim/common/dbus_support.py deleted ===================================== @@ -1,165 +0,0 @@ -# Copyright (C) 2005 Andrew Sayman <lorien420 AT myrealbox.com> -# Dimitur Kirov <dkirov AT gmail.com> -# Copyright (C) 2005-2006 Nikos Kouremenos <kourem AT gmail.com> -# Copyright (C) 2005-2014 Yann Leboulanger <asterix AT lagaule.org> -# Copyright (C) 2006 Jean-Marie Traissard <jim AT lapin.org> -# Stefan Bethge <stefan AT lanpartei.de> -# Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> -# -# This file is part of Gajim. -# -# Gajim is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published -# by the Free Software Foundation; version 3 only. -# -# Gajim is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Gajim. If not, see <http://www.gnu.org/licenses/>. - -import sys -import logging - -from gajim.common import exceptions -from gajim.common.i18n import _ - -_GAJIM_ERROR_IFACE = 'org.gajim.dbus.Error' - -log = logging.getLogger('gajim.c.dbus') - -try: - import dbus - from dbus.mainloop.glib import DBusGMainLoop - DBusGMainLoop(set_as_default=True) -except ImportError: - supported = False - if sys.platform not in ('win32', 'darwin'): - print(_('D-Bus python bindings are missing in this computer')) - print(_('D-Bus capabilities of Gajim cannot be used')) -else: - try: - # test if dbus-x11 is installed - _bus = dbus.SystemBus() - _bus = dbus.SessionBus() - supported = True # does user have D-Bus bindings? - except dbus.DBusException: - supported = False - if sys.platform not in ('win32', 'darwin'): - print(_('D-Bus does not run correctly on this machine')) - print(_('D-Bus capabilities of Gajim cannot be used')) - except exceptions.SystemBusNotPresent: - print(_('D-Bus does not run correctly on this machine: system bus not ' - 'present')) - except exceptions.SessionBusNotPresent: - print(_('D-Bus does not run correctly on this machine: session bus not ' - 'present')) - -class SystemBus: - """ - A Singleton for the DBus SystemBus - """ - - def __init__(self): - self.system_bus = None - - def SystemBus(self): - if not supported: - raise exceptions.DbusNotSupported - - if not self.present(): - raise exceptions.SystemBusNotPresent - return self.system_bus - - def bus(self): - return self.SystemBus() - - def present(self): - if not supported: - return False - if self.system_bus is None: - try: - self.system_bus = dbus.SystemBus() - except dbus.DBusException: - self.system_bus = None - return False - if self.system_bus is None: - return False - # Don't exit Gajim when dbus is stopped - self.system_bus.set_exit_on_disconnect(False) - return True - -system_bus = SystemBus() - -class SessionBus: - """ - A Singleton for the D-Bus SessionBus - """ - - def __init__(self): - self.session_bus = None - - def SessionBus(self): - if not supported: - raise exceptions.DbusNotSupported - - if not self.present(): - raise exceptions.SessionBusNotPresent - return self.session_bus - - def bus(self): - return self.SessionBus() - - def present(self): - if not supported: - return False - if self.session_bus is None: - try: - self.session_bus = dbus.SessionBus() - except dbus.DBusException: - self.session_bus = None - return False - if self.session_bus is None: - return False - return True - -session_bus = SessionBus() - -def get_interface(interface, path, start_service=True): - """ - Get an interface on the current SessionBus. If the interface isn't running, - try to start it first - """ - if not supported: - return None - if session_bus.present(): - bus = session_bus.SessionBus() - else: - return None - try: - obj = bus.get_object('org.freedesktop.DBus', '/org/freedesktop/DBus') - dbus_iface = dbus.Interface(obj, 'org.freedesktop.DBus') - running_services = dbus_iface.ListNames() - started = True - if interface not in running_services: - # try to start the service - started = start_service and dbus_iface.StartServiceByName( - interface, dbus.UInt32(0)) == 1 - if not started: - return None - obj = bus.get_object(interface, path) - return dbus.Interface(obj, interface) - except Exception as error: - log.debug(error) - return None - - -if supported: - class MissingArgument(dbus.DBusException): - _dbus_error_name = _GAJIM_ERROR_IFACE + '.MissingArgument' - - class InvalidArgument(dbus.DBusException): - '''Raised when one of the provided arguments is invalid.''' - _dbus_error_name = _GAJIM_ERROR_IFACE + '.InvalidArgument' ===================================== gajim/common/logger.py ===================================== @@ -72,6 +72,7 @@ LOGS_SQL_STATEMENT = ''' subject TEXT, additional_data TEXT, stanza_id TEXT, + message_id TEXT, encryption TEXT, encryption_state TEXT, marker INTEGER @@ -228,6 +229,13 @@ class Logger: ] self._execute_multiple(con, statements) + if self._get_user_version(con) < 3: + statements = [ + 'ALTER TABLE logs ADD COLUMN "message_id" TEXT', + 'PRAGMA user_version=3' + ] + self._execute_multiple(con, statements) + def _migrate_cache(self, con): if self._get_user_version(con) == 0: # All migrations from 0.16.9 until 1.0.0 ===================================== gajim/common/modules/gateway.py ===================================== @@ -51,6 +51,13 @@ class Gateway: for jid in app.contacts.get_jid_list(self._account): if jid.endswith('@' + agent): jid_list.append(jid) + log.info('Removing contact %s due to unregistered transport %s', + jid, agent) + self._con.get_module('Presence').unsubscribe(jid) + # Transport contacts can't have 2 resources + if jid in app.to_be_removed[self._account]: + # This way we'll really remove it + app.to_be_removed[self._account].remove(jid) app.nec.push_incoming_event( NetworkEvent('agent-removed', ===================================== gajim/common/modules/mam.py ===================================== @@ -19,6 +19,7 @@ import time from datetime import datetime, timedelta import nbxmpp +from nbxmpp.structs import StanzaHandler from gajim.common import app from gajim.common.nec import NetworkEvent @@ -33,8 +34,6 @@ from gajim.common.modules.misc import parse_delay from gajim.common.modules.misc import parse_oob from gajim.common.modules.misc import parse_correction from gajim.common.modules.misc import parse_eme -from gajim.common.modules.util import is_self_message -from gajim.common.modules.util import is_muc_pm log = logging.getLogger('gajim.c.m.archiving') @@ -45,8 +44,9 @@ class MAM: self._account = con.name self.handlers = [ - ('message', self._mam_message_received, '', nbxmpp.NS_MAM_1), - ('message', self._mam_message_received, '', nbxmpp.NS_MAM_2), + StanzaHandler(name='message', + callback=self._mam_message_received, + priority=51), ] self.available = False @@ -72,132 +72,91 @@ class MAM: account=self._account, feature=self.archiving_namespace)) - def _from_valid_archive(self, stanza, message, groupchat): - if groupchat: - expected_archive = message.getFrom() + def _from_valid_archive(self, stanza, properties): + if properties.type.is_groupchat: + expected_archive = properties.jid else: expected_archive = self._con.get_own_jid() - archive_jid = stanza.getFrom() - if archive_jid is None: - if groupchat: - return - # Message from our own archive - return self._con.get_own_jid() - - if archive_jid.bareMatch(expected_archive): - return archive_jid + return properties.mam.archive.bareMatch(expected_archive) - def _get_unique_id(self, result, message, groupchat, self_message, muc_pm): - stanza_id = result.getAttr('id') - if groupchat: - return stanza_id, None + def _get_unique_id(self, properties): + if properties.type.is_groupchat: + return properties.mam.id, None - origin_id = message.getOriginID() - if self_message: - return None, origin_id + if properties.is_self_message: + return None, properties.id - if muc_pm: - return stanza_id, origin_id + if properties.is_muc_pm: + return properties.mam.id, properties.id - if self._con.get_own_jid().bareMatch(message.getFrom()): + if self._con.get_own_jid().bareMatch(properties.jid): # message we sent - return stanza_id, origin_id + return properties.mam.id, properties.id # A message we received - return stanza_id, None + return properties.mam.id, None + + def _mam_message_received(self, _con, stanza, properties): + if not properties.is_mam_message: + return - def _mam_message_received(self, _con, stanza): app.nec.push_incoming_event( NetworkIncomingEvent('raw-mam-message-received', conn=self._con, stanza=stanza)) - result = stanza.getTag('result', protocol=True) - queryid = result.getAttr('queryid') - forwarded = result.getTag('forwarded', - namespace=nbxmpp.NS_FORWARD, - protocol=True) - message = forwarded.getTag('message', protocol=True) - - groupchat = message.getType() == 'groupchat' - - archive_jid = self._from_valid_archive(stanza, message, groupchat) - if archive_jid is None: - log.warning('Message from invalid archive %s', stanza) + if not self._from_valid_archive(stanza, properties): + log.warning('Message from invalid archive %s', + properties.mam.archive) raise nbxmpp.NodeProcessed - log.info('Received message from archive: %s', archive_jid) - if not self._is_valid_request(archive_jid, queryid): - log.warning('Invalid MAM Message: unknown query id') + log.info('Received message from archive: %s', properties.mam.archive) + if not self._is_valid_request(properties): + log.warning('Invalid MAM Message: unknown query id %s', + properties.mam.query_id) log.debug(stanza) raise nbxmpp.NodeProcessed - # Timestamp parsing - # 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 - - # Fix for self messaging - if not groupchat: - to = message.getTo() - if to is None: - # Some servers dont set the 'to' attribute when - # we send a message to ourself - message.setTo(self._con.get_own_jid()) - event_attrs = {} + groupchat = properties.type.is_groupchat + if groupchat: - event_attrs.update(self._parse_gc_attrs(message)) + event_attrs.update(self._parse_gc_attrs(properties)) else: - event_attrs.update(self._parse_chat_attrs(message)) - - self_message = is_self_message(message, groupchat) - muc_pm = is_muc_pm(message, event_attrs['with_'], groupchat) + event_attrs.update(self._parse_chat_attrs(stanza, properties)) - stanza_id, origin_id = self._get_unique_id( - result, message, groupchat, self_message, muc_pm) - message_id = message.getID() + stanza_id, message_id = self._get_unique_id(properties) - # Check for duplicates - namespace = self.archiving_namespace - if groupchat: - namespace = muc_caps_cache.get_mam_namespace( - archive_jid.getStripped()) - - if namespace == nbxmpp.NS_MAM_2: + if properties.mam.is_ver_2: # Search only with stanza-id for duplicates on mam:2 if app.logger.find_stanza_id(self._account, - archive_jid.getStripped(), + str(properties.mam.archive), stanza_id, - origin_id, + message_id, groupchat=groupchat): - log.info('Found duplicate with stanza-id') + log.info('Found duplicate with stanza-id: %s, message-id: %s', + stanza_id, message_id) raise nbxmpp.NodeProcessed - msgtxt = message.getTagData('body') - event_attrs.update( {'conn': self._con, 'additional_data': AdditionalDataDict(), 'encrypted': False, - 'timestamp': delay_timestamp, - 'self_message': self_message, + 'timestamp': properties.mam.timestamp, + 'self_message': properties.is_self_message, 'groupchat': groupchat, - 'muc_pm': muc_pm, + 'muc_pm': properties.is_muc_pm, 'stanza_id': stanza_id, - 'origin_id': origin_id, - 'message_id': message_id, + 'origin_id': message_id, + 'message_id': properties.id, 'correct_id': None, - 'archive_jid': archive_jid, - 'msgtxt': msgtxt, - 'message': message, - 'stanza': message, - 'namespace': namespace, + 'archive_jid': properties.mam.archive, + 'msgtxt': properties.body, + 'message': stanza, + 'stanza': stanza, + 'namespace': properties.mam.namespace, }) if groupchat: @@ -217,26 +176,18 @@ class MAM: raise nbxmpp.NodeProcessed @staticmethod - def _parse_gc_attrs(message): - with_ = message.getFrom() - nick = message.getFrom().getResource() - - # Get the real jid if we have it + def _parse_gc_attrs(properties): real_jid = None - muc_user = message.getTag('x', namespace=nbxmpp.NS_MUC_USER) - if muc_user is not None: - real_jid = muc_user.getTagAttr('item', 'jid') - if real_jid is not None: - real_jid = nbxmpp.JID(real_jid) - - return {'with_': with_, - 'nick': nick, + if properties.muc_user is not None: + real_jid = properties.muc_user.jid + return {'with_': properties.jid, + 'nick': properties.muc_nickname, 'real_jid': real_jid, 'kind': KindConstant.GC_MSG} - def _parse_chat_attrs(self, message): - frm = message.getFrom() - to = message.getTo() + def _parse_chat_attrs(self, stanza, properties): + frm = properties.jid + to = stanza.getTo() if frm.bareMatch(self._con.get_own_jid()): with_ = to kind = KindConstant.CHAT_MSG_SENT @@ -290,17 +241,15 @@ class MAM: message=event.msgtxt, contact_name=event.nick, additional_data=event.additional_data, - stanza_id=stanza_id) + stanza_id=stanza_id, + message_id=event.message_id) app.nec.push_incoming_event( MamDecryptedMessageReceived(None, **vars(event))) - def _is_valid_request(self, jid, query_id): - if query_id is None: - return False - - valid_id = self._mam_query_ids.get(jid.getStripped(), None) - return valid_id == query_id + def _is_valid_request(self, properties): + valid_id = self._mam_query_ids.get(str(properties.mam.archive), None) + return valid_id == properties.mam.query_id def _get_query_id(self, jid): query_id = self._con.connection.getAnID() ===================================== gajim/common/modules/message.py ===================================== @@ -18,13 +18,16 @@ import time import logging import nbxmpp +from nbxmpp.structs import StanzaHandler +from nbxmpp.const import MessageType from gajim.common import app -from gajim.common import helpers +from gajim.common import caps_cache from gajim.common.i18n import _ from gajim.common.nec import NetworkIncomingEvent from gajim.common.nec import NetworkEvent from gajim.common.helpers import AdditionalDataDict +from gajim.common.const import KindConstant from gajim.common.modules.security_labels import parse_securitylabel from gajim.common.modules.user_nickname import parse_nickname from gajim.common.modules.misc import parse_delay @@ -34,8 +37,7 @@ from gajim.common.modules.misc import parse_attention from gajim.common.modules.misc import parse_form from gajim.common.modules.misc import parse_oob from gajim.common.modules.misc import parse_xhtml -from gajim.common.modules.util import is_self_message -from gajim.common.modules.util import is_muc_pm +from gajim.common.connection_handlers_events import MessageErrorEvent log = logging.getLogger('gajim.c.m.message') @@ -46,30 +48,26 @@ class Message: self._con = con self._account = con.name - self.handlers = [('message', self._message_received)] + self.handlers = [ + StanzaHandler(name='message', + callback=self._message_received, + priority=50), + ] # XEPs for which this message module should not be executed self._message_namespaces = set([nbxmpp.NS_PUBSUB_EVENT, nbxmpp.NS_ROSTERX, - nbxmpp.NS_MAM_1, - nbxmpp.NS_MAM_2, - nbxmpp.NS_CONFERENCE, - nbxmpp.NS_IBB, - nbxmpp.NS_CAPTCHA,]) + nbxmpp.NS_IBB]) def _message_received(self, _con, stanza, properties): + if properties.is_mam_message: + return # Check if a child of the message contains any # namespaces that we handle in other modules. # nbxmpp executes less common handlers last if self._message_namespaces & set(stanza.getProperties()): return - muc_user = stanza.getTag('x', namespace=nbxmpp.NS_MUC_USER) - if muc_user is not None and (stanza.getType() != 'error'): - if muc_user.getChildren(): - # Not a PM, handled by MUC module - return - log.info('Received from %s', stanza.getFrom()) app.nec.push_incoming_event(NetworkEvent( @@ -84,49 +82,36 @@ class Message: # Ugly, we treat the from attr as the remote jid, # to make that work with sent carbons we have to do this. # TODO: Check where in Gajim and plugins we depend on that behavior - stanza.setFrom(stanza.getTo().getBare()) + stanza.setFrom(stanza.getTo()) from_ = stanza.getFrom() - type_ = stanza.getType() - if type_ is None: - type_ = 'normal' - - self_message = is_self_message(stanza, type_ == 'groupchat') - muc_pm = is_muc_pm(stanza, from_, type_ == 'groupchat') - - id_ = stanza.getID() - - fjid = None - if from_ is not None: - try: - fjid = helpers.parse_jid(str(from_)) - except helpers.InvalidFormat: - log.warning('Invalid JID: %s, ignoring it', - stanza.getFrom()) - return + fjid = str(from_) + jid = from_.getBare() + resource = from_.getResource() - jid, resource = app.get_room_and_nick_from_fjid(fjid) + type_ = properties.type # Check for duplicates - stanza_id, origin_id = self._get_unique_id( - stanza, forwarded, sent, self_message, muc_pm) + stanza_id, message_id = self._get_unique_id(properties) # Check groupchat messages for duplicates, # We do this because of MUC History messages - if type_ == 'groupchat' or self_message or muc_pm: - if type_ == 'groupchat': + if (properties.type.is_groupchat or + properties.is_self_message or + properties.is_muc_pm): + if properties.type.is_groupchat: archive_jid = stanza.getFrom().getStripped() else: archive_jid = self._con.get_own_jid().getStripped() if app.logger.find_stanza_id(self._account, archive_jid, stanza_id, - origin_id, - type_ == 'groupchat'): + message_id, + properties.type.is_groupchat): return - thread_id = stanza.getThread() - msgtxt = stanza.getBody() + thread_id = properties.thread + msgtxt = properties.body # TODO: remove all control UI stuff gc_control = app.interface.msg_win_mgr.get_gc_control( @@ -136,7 +121,7 @@ class Message: gc_control = minimized.get(jid) if gc_control and jid == fjid: - if type_ == 'error': + if properties.type.is_error: if msgtxt: msgtxt = _('error while sending %(message)s ( %(error)s )') % { 'message': msgtxt, 'error': stanza.getErrorMsg()} @@ -145,11 +130,11 @@ class Message: # TODO: why is this here? if stanza.getTag('html'): stanza.delChild('html') - type_ = 'groupchat' + type_ = MessageType.GROUPCHAT session = None - if type_ != 'groupchat': - if muc_pm and type_ == 'error': + if not properties.type.is_groupchat: + if properties.is_muc_pm and properties.type.is_error: session = self._con.find_session(fjid, thread_id) if not session: session = self._con.get_latest_session(fjid) @@ -168,7 +153,7 @@ class Message: 'conn': self._con, 'stanza': stanza, 'account': self._account, - 'id_': id_, + 'id_': properties.id, 'encrypted': False, 'additional_data': AdditionalDataDict(), 'forwarded': forwarded, @@ -177,13 +162,14 @@ class Message: 'jid': jid, 'resource': resource, 'stanza_id': stanza_id, - 'unique_id': stanza_id or origin_id, - 'mtype': type_, + 'unique_id': stanza_id or message_id, + 'message_id': properties.id, + 'mtype': type_.value, 'msgtxt': msgtxt, 'thread_id': thread_id, 'session': session, - 'self_message': self_message, - 'muc_pm': muc_pm, + 'self_message': properties.is_self_message, + 'muc_pm': properties.is_muc_pm, 'gc_control': gc_control } @@ -248,9 +234,19 @@ class Message: if event.gc_control: event.gc_control.print_conversation(event.msgtxt) else: - self._con.dispatch_error_message( - event.stanza, event.msgtxt, - event.session, event.fjid, timestamp) + self._log_error_message(event) + error_msg = event.stanza.getErrorMsg() or event.msgtxt + msgtxt = None if error_msg == event.msgtxt else event.msgtxt + app.nec.push_incoming_event( + MessageErrorEvent(None, + conn=self._con, + fjid=event.fjid, + error_code=event.stanza.getErrorCode(), + error_msg=error_msg, + msg=msgtxt, + time_=event.timestamp, + session=event.session, + stanza=event.stanza)) return if groupchat: @@ -264,42 +260,77 @@ class Message: app.nec.push_incoming_event(NetworkEvent('gc-message-received', **vars(event))) + # TODO: Some plugins modify msgtxt in the GUI event + self._log_muc_message(event) return app.nec.push_incoming_event( DecryptedMessageReceivedEvent( None, **vars(event))) - def _get_unique_id(self, stanza, _forwarded, _sent, self_message, _muc_pm): - if stanza.getType() == 'groupchat': - # TODO: Disco the MUC check if 'urn:xmpp:mam:2' is announced - return self._get_stanza_id(stanza), None + def _log_error_message(self, event): + error_msg = event.stanza.getErrorMsg() or event.msgtxt + if app.config.should_log(self._account, event.jid): + app.logger.insert_into_logs(self._account, + event.jid, + event.timestamp, + KindConstant.ERROR, + message=error_msg, + subject=event.subject) + + def _log_muc_message(self, event): + if event.mtype == 'error': + return - if stanza.getType() != 'chat': + self._check_for_mam_compliance(event.room_jid, event.stanza_id) + + if (app.config.should_log(self._account, event.jid) and + event.msgtxt and event.nick): + # if not event.nick, it means message comes from room itself + # usually it hold description and can be send at each connection + # so don't store it in logs + app.logger.insert_into_logs(self._account, + event.jid, + event.timestamp, + KindConstant.GC_MSG, + message=event.msgtxt, + contact_name=event.nick, + additional_data=event.additional_data, + stanza_id=event.stanza_id, + message_id=event.message_id) + app.logger.set_room_last_message_time(event.room_jid, event.timestamp) + self._con.get_module('MAM').save_archive_id( + event.room_jid, event.stanza_id, event.timestamp) + + @staticmethod + def _check_for_mam_compliance(room_jid, stanza_id): + namespace = caps_cache.muc_caps_cache.get_mam_namespace(room_jid) + if stanza_id is None and namespace == nbxmpp.NS_MAM_2: + log.warning('%s announces mam:2 without stanza-id', room_jid) + + def _get_unique_id(self, properties): + if properties.is_self_message: + # Deduplicate self message with message-id + return None, properties.id + + if properties.stanza_id.by is None: + # We can not verify who sent this stanza-id, ignore it. return None, None - # Messages we receive live - if self._con.get_module('MAM').archiving_namespace != nbxmpp.NS_MAM_2: + if properties.type.is_groupchat: + namespace = caps_cache.muc_caps_cache.get_mam_namespace( + properties.jid.getBare()) + archive = properties.jid + else: + namespace = self._con.get_module('MAM').archiving_namespace + archive = self._con.get_own_jid() + + if namespace != nbxmpp.NS_MAM_2: # Only mam:2 ensures valid stanza-id return None, None - if self_message: - return self._get_stanza_id(stanza), stanza.getOriginID() - return self._get_stanza_id(stanza), None - - def _get_stanza_id(self, stanza): - stanza_id, by = stanza.getStanzaIDAttrs() - if by is None: - # We can not verify who set this stanza-id, ignore it. - return - if stanza.getType() == 'groupchat': - if stanza.getFrom().bareMatch(by): - # by attribute must match the server - return stanza_id - elif self._con.get_own_jid().bareMatch(by): - # by attribute must match the server - return stanza_id - return + if archive.bareMatch(properties.stanza_id.by): + return properties.stanza_id.id, None class MessageReceivedEvent(NetworkIncomingEvent): ===================================== gajim/common/modules/util.py ===================================== @@ -16,35 +16,6 @@ from typing import Union -import nbxmpp - -from gajim.common import app - - -def is_self_message(message: nbxmpp.Node, - groupchat: bool = False) -> bool: - if groupchat: - return False - frm = message.getFrom() - to = message.getTo() - return frm.bareMatch(to) - - -def is_muc_pm(message: nbxmpp.Node, - jid: nbxmpp.JID, - groupchat: bool = False) -> bool: - if groupchat: - return False - muc_user = message.getTag('x', namespace=nbxmpp.NS_MUC_USER) - if muc_user is not None: - return muc_user.getChildren() == [] - - # muc#user namespace was added in MUC 1.28 so we need a fallback - # Check if we know the jid - if app.logger.jid_is_room_jid(jid.getStripped()): - return True - return False - def from_xs_boolean(value: Union[str, bool]) -> bool: if isinstance(value, bool): ===================================== gajim/common/zeroconf/client_zeroconf.py ===================================== @@ -15,18 +15,6 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -from unittest.mock import Mock - -from gajim.common import app -import nbxmpp -from nbxmpp.idlequeue import IdleObject -from nbxmpp import dispatcher_nb, simplexml -from nbxmpp.plugin import PlugIn -from nbxmpp.plugin import * -from nbxmpp.transports_nb import DATA_RECEIVED, DATA_SENT, DATA_ERROR -from gajim.common.zeroconf import zeroconf - -from nbxmpp.protocol import * import socket import platform import ssl @@ -34,13 +22,26 @@ import errno import sys import os import string +import logging from random import Random +from unittest.mock import Mock -import logging -log = logging.getLogger('gajim.c.z.client_zeroconf') +import nbxmpp +from nbxmpp import dispatcher_nb +from nbxmpp import simplexml +from nbxmpp.plugin import PlugIn +from nbxmpp.idlequeue import IdleObject +from nbxmpp.transports_nb import DATA_RECEIVED +from nbxmpp.transports_nb import DATA_SENT +from nbxmpp.transports_nb import DATA_ERROR +from gajim.common import app +from gajim.common.zeroconf import zeroconf from gajim.common.zeroconf import roster_zeroconf +log = logging.getLogger('gajim.c.z.client_zeroconf') + + MAX_BUFF_LEN = 65536 TYPE_SERVER, TYPE_CLIENT = range(2) @@ -288,6 +289,7 @@ class P2PClient(IdleObject): del self.conn_holder.ids_of_awaiting_messages[self.fd] self.conn_holder.remove_connection(self.sock_hash) if 'Dispatcher' in self.__dict__: + self._caller._unregister_new_handlers(self) self.Dispatcher.PlugOut() if 'P2PConnection' in self.__dict__: self.P2PConnection.PlugOut() @@ -338,6 +340,8 @@ class P2PClient(IdleObject): self.RegisterHandler('iq', self._caller._JingleCB, 'error') self.RegisterHandler('iq', self._caller._JingleCB, 'set', nbxmpp.NS_JINGLE) + self._caller._register_new_handlers(self) + class P2PConnection(IdleObject, PlugIn): def __init__(self, sock_hash, _sock, addresses=None, caller=None, ===================================== gajim/common/zeroconf/connection_handlers_zeroconf.py ===================================== @@ -32,12 +32,14 @@ from gajim.common import connection_handlers from gajim.common.i18n import _ from gajim.common.helpers import AdditionalDataDict from gajim.common.nec import NetworkIncomingEvent, NetworkEvent +from gajim.common.const import KindConstant from gajim.common.modules.user_nickname import parse_nickname from gajim.common.modules.misc import parse_eme from gajim.common.modules.misc import parse_correction from gajim.common.modules.misc import parse_attention from gajim.common.modules.misc import parse_oob from gajim.common.modules.misc import parse_xhtml +from gajim.common.connection_handlers_events import MessageErrorEvent log = logging.getLogger('gajim.c.z.connection_handlers_zeroconf') @@ -163,10 +165,31 @@ class ConnectionHandlersZeroconf(ConnectionSocks5BytestreamZeroconf, if event.mtype == 'error': if not event.msgtxt: event.msgtxt = _('message') - self.dispatch_error_message( - event.stanza, event.msgtxt, - event.session, event.fjid, event.timestamp) + self._log_error_message(event) + error_msg = event.stanza.getErrorMsg() or event.msgtxt + msgtxt = None if error_msg == event.msgtxt else event.msgtxt + app.nec.push_incoming_event( + MessageErrorEvent(None, + conn=self, + fjid=event.fjid, + error_code=event.stanza.getErrorCode(), + error_msg=error_msg, + msg=msgtxt, + time_=event.timestamp, + session=event.session, + stanza=event.stanza)) + return app.nec.push_incoming_event( DecryptedMessageReceivedEvent(None, **vars(event))) + + def _log_error_message(self, event): + error_msg = event.stanza.getErrorMsg() or event.msgtxt + if app.config.should_log(self.name, event.jid): + app.logger.insert_into_logs(self.name, + event.jid, + event.timestamp, + KindConstant.ERROR, + message=error_msg, + subject=event.subject) ===================================== gajim/common/zeroconf/connection_zeroconf.py ===================================== @@ -29,6 +29,8 @@ import socket import getpass +import logging +import time import nbxmpp from gi.repository import GLib @@ -36,12 +38,18 @@ from gi.repository import GLib from gajim.common import app from gajim.common import ged from gajim.common import modules +from gajim.common.nec import NetworkEvent 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 * -from gajim.common.connection_handlers_events import * +from gajim.common.zeroconf.connection_handlers_zeroconf import ConnectionHandlersZeroconf +from gajim.common.zeroconf.connection_handlers_zeroconf import STATUS_LIST +from gajim.common.connection_handlers_events import OurShowEvent +from gajim.common.connection_handlers_events import InformationEvent +from gajim.common.connection_handlers_events import ConnectionLostEvent +from gajim.common.connection_handlers_events import MessageSentEvent +from gajim.common.connection_handlers_events import MessageErrorEvent log = logging.getLogger('gajim.c.connection_zeroconf') @@ -240,8 +248,10 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): self.disconnect() app.nec.push_incoming_event(OurShowEvent(None, conn=self, show='offline')) - app.nec.push_incoming_event(ZeroconfNameConflictEvent(None, conn=self, - alt_name=alt_name)) + app.nec.push_incoming_event( + NetworkEvent('zeroconf-name-conflict', + conn=self, + alt_name=alt_name)) def _on_error(self, message): app.nec.push_incoming_event(InformationEvent( @@ -362,7 +372,7 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): check = self.connection.announce() else: self.connected = STATUS_LIST.index(show) - app.nec.push_incoming_event(SignedInEvent(None, conn=self)) + app.nec.push_incoming_event(NetworkEvent('signed-in', conn=self)) # stay offline when zeroconf does something wrong if check: ===================================== gajim/gtk/features.py ===================================== @@ -112,12 +112,6 @@ class FeaturesDialog(Gtk.Dialog): _('Requires: pybonjour and bonjour SDK running (%(url)s)') % {'url': 'https://developer.apple.com/opensource/)'}, None), - Feature(_('Command line Control'), - self.dbus_available(), - _('Enables you to control Gajim with via commandline'), - _('Requires: python-dbus'), - _('Feature not available under Windows'), - None), Feature(_('OpenPGP Message Encryption'), app.is_installed('GPG'), _('Enables Gajim to encrypt chat messages with OpenPGP'), @@ -159,10 +153,6 @@ class FeaturesDialog(Gtk.Dialog): None) ] - def dbus_available(self): - from gajim.common import dbus_support - return dbus_support.supported - def some_keyring_available(self): if os.name == 'nt': return True ===================================== gajim/gtk/themes.py ===================================== @@ -21,11 +21,11 @@ from gi.repository import Gtk from gi.repository import Gdk from gajim.common import app +from gajim.common.nec import NetworkEvent from gajim.common.i18n import _ from gajim.common.const import StyleAttr from gajim.common.const import DialogButton from gajim.common.const import ButtonAction -from gajim.common.connection_handlers_events import StyleChanged from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import NewConfirmationDialog @@ -388,18 +388,18 @@ class Option(Gtk.ListBoxRow): color_string = color.to_string() app.css_config.set_value( self._option.selector, self._option.attr, color_string, pre=True) - app.nec.push_incoming_event(StyleChanged(None)) + app.nec.push_incoming_event(NetworkEvent('style-changed')) def _on_font_set(self, font_button): desc = font_button.get_font_desc() app.css_config.set_font(self._option.selector, desc, pre=True) - app.nec.push_incoming_event(StyleChanged(None,)) + app.nec.push_incoming_event(NetworkEvent('style-changed')) def _on_remove(self, *args): self.get_parent().remove(self) app.css_config.remove_value( self._option.selector, self._option.attr, pre=True) - app.nec.push_incoming_event(StyleChanged(None)) + app.nec.push_incoming_event(NetworkEvent('style-changed')) self.destroy() def __eq__(self, other): ===================================== gajim/gui_interface.py ===================================== @@ -85,10 +85,10 @@ from gajim.common import socks5 from gajim.common import helpers from gajim.common import passwords from gajim.common import logging_helpers +from gajim.common.nec import NetworkEvent from gajim.common.i18n import _ from gajim.common.connection_handlers_events import ( - OurShowEvent, FileTransferCompletedEvent, - UpdateRosterAvatarEvent, UpdateGCAvatarEvent, UpdateRoomAvatarEvent) + OurShowEvent, FileTransferCompletedEvent) from gajim.common.modules.httpupload import HTTPUploadProgressEvent from gajim.common.connection import Connection @@ -614,22 +614,6 @@ class Interface: self.gpg_passphrase[obj.keyid] = request request.add_callback(obj.conn.name, obj.callback) - @staticmethod - def handle_event_gpg_trust_key(obj): - #('GPG_ALWAYS_TRUST', account, callback) - def on_yes(checked): - if checked: - obj.conn.gpg.always_trust.append(obj.keyID) - obj.callback(True) - - def on_no(): - obj.callback(False) - - YesNoDialog(_('Untrusted OpenPGP key'), _('The OpenPGP key ' - 'used to encrypt this chat is not trusted. Do you really want to ' - 'encrypt this message?'), checktext=_('_Do not ask me again'), - on_response_yes=on_yes, on_response_no=on_no) - def handle_event_password_required(self, obj): #('PASSWORD_REQUIRED', account, None) account = obj.conn.name @@ -1359,7 +1343,6 @@ class Interface: 'muc-invitation': [self.handle_event_gc_invitation], 'muc-decline': [self.handle_event_gc_decline], 'gpg-password-required': [self.handle_event_gpg_password_required], - 'gpg-trust-key': [self.handle_event_gpg_trust_key], 'http-auth-received': [self.handle_event_http_auth], 'information': [self.handle_event_information], 'insecure-ssl-connection': \ @@ -2116,13 +2099,13 @@ class Interface: def update_avatar(account=None, jid=None, contact=None, room_avatar=False): if room_avatar: app.nec.push_incoming_event( - UpdateRoomAvatarEvent(None, account=account, jid=jid)) + NetworkEvent('update-room-avatar', account=account, jid=jid)) elif contact is None: app.nec.push_incoming_event( - UpdateRosterAvatarEvent(None, account=account, jid=jid)) + NetworkEvent('update-roster-avatar', account=account, jid=jid)) else: app.nec.push_incoming_event( - UpdateGCAvatarEvent(None, contact=contact)) + NetworkEvent('update-gc-avatar', contact=contact)) def save_avatar(self, data, publish=False): """ ===================================== gajim/session.py ===================================== @@ -134,7 +134,8 @@ class ChatControlSession: message=msg_to_log, subject=obj.subject, additional_data=obj.additional_data, - stanza_id=obj.unique_id) + stanza_id=obj.unique_id, + message_id=obj.message_id) self.conn.get_module('MAM').save_archive_id( None, obj.stanza_id, obj.timestamp) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/fcb33a10e711d15ccd0c1fd5fc5b3a12f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/fcb33a10e711d15ccd0c1fd5fc5b3a12f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 5 commits: Better detect MUC PMs
by Philipp Hörist 03 Jan '19

03 Jan '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 5cca4c7d by Philipp Hörist at 2019-01-03T11:48:03Z Better detect MUC PMs - - - - - 2386104f by Philipp Hörist at 2019-01-03T11:54:09Z Add is_self_message property - - - - - 6b2b6f8b by Philipp Hörist at 2019-01-03T13:48:36Z Split base message handler - - - - - a2a68ffe by Philipp Hörist at 2019-01-03T15:55:43Z Unwrap MAM messages - - - - - 46707d9d by Philipp Hörist at 2019-01-03T19:45:50Z Never return None on show parsing - - - - - 6 changed files: - nbxmpp/dispatcher_nb.py - nbxmpp/modules/message.py - nbxmpp/modules/misc.py - nbxmpp/modules/muc.py - nbxmpp/modules/presence.py - nbxmpp/structs.py Changes: ===================================== nbxmpp/dispatcher_nb.py ===================================== @@ -34,6 +34,7 @@ from nbxmpp.protocol import NS_STREAMS from nbxmpp.protocol import NS_HTTP_BIND from nbxmpp.protocol import NodeProcessed from nbxmpp.protocol import InvalidFrom +from nbxmpp.protocol import InvalidStanza from nbxmpp.protocol import Iq from nbxmpp.protocol import Presence from nbxmpp.protocol import Message @@ -55,6 +56,7 @@ from nbxmpp.modules.vcard_avatar import VCardAvatar from nbxmpp.modules.captcha import Captcha from nbxmpp.modules.entity_caps import EntityCaps from nbxmpp.modules.misc import unwrap_carbon +from nbxmpp.modules.misc import unwrap_mam from nbxmpp.util import get_properties_struct @@ -517,6 +519,7 @@ class XMPPDispatcher(PlugIn): log.warning('Message addressed to someone else: %s', stanza) return + # Unwrap carbon try: stanza, properties.carbon_type = unwrap_carbon(stanza, own_jid) except InvalidFrom as exc: @@ -526,6 +529,12 @@ class XMPPDispatcher(PlugIn): log.info(exc) return + # Unwrap mam + try: + stanza, properties.mam = unwrap_mam(stanza, own_jid) + except InvalidStanza: + return + typ = stanza.getType() if name == 'message' and not typ: typ = 'normal' ===================================== nbxmpp/modules/message.py ===================================== @@ -20,6 +20,7 @@ import logging from nbxmpp.protocol import NodeProcessed from nbxmpp.structs import StanzaHandler from nbxmpp.structs import ErrorProperties +from nbxmpp.structs import StanzaIDData from nbxmpp.const import MessageType log = logging.getLogger('nbxmpp.m.message') @@ -31,6 +32,9 @@ class BaseMessage: self.handlers = [ StanzaHandler(name='message', callback=self._process_message_base, + priority=5), + StanzaHandler(name='message', + callback=self._process_message_after_base, priority=10), ] @@ -38,13 +42,23 @@ class BaseMessage: properties.type = self._parse_type(stanza) properties.jid = stanza.getFrom() properties.id = stanza.getID() - properties.body = stanza.getBody() - properties.thread = stanza.getThread() - properties.subject = stanza.getSubject() + properties.self_message = self._parse_self_message(stanza, properties) + + # Stanza ID + id_, by = stanza.getStanzaIDAttrs() + properties.stanza_id = StanzaIDData(id=id_, by=by) if properties.type.is_error: properties.error = ErrorProperties(stanza) + @staticmethod + def _process_message_after_base(_con, stanza, properties): + # This handler runs after decryption handlers had the chance + # to decrypt the body + properties.body = stanza.getBody() + properties.thread = stanza.getThread() + properties.subject = stanza.getSubject() + @staticmethod def _parse_type(stanza): type_ = stanza.getType() @@ -57,3 +71,9 @@ class BaseMessage: log.warning('Message with invalid type: %s', type_) log.warning(stanza) raise NodeProcessed + + @staticmethod + def _parse_self_message(stanza, properties): + if properties.type.is_groupchat: + return False + return stanza.getFrom().bareMatch(stanza.getTo()) ===================================== nbxmpp/modules/misc.py ===================================== @@ -20,9 +20,14 @@ import logging from nbxmpp.protocol import NS_CARBONS from nbxmpp.protocol import NS_FORWARD from nbxmpp.protocol import NS_MUC_USER +from nbxmpp.protocol import NS_MAM_1 +from nbxmpp.protocol import NS_MAM_2 from nbxmpp.protocol import NodeProcessed from nbxmpp.protocol import InvalidFrom +from nbxmpp.protocol import InvalidStanza from nbxmpp.protocol import Message +from nbxmpp.structs import MAMData +from nbxmpp.modules.delay import parse_delay log = logging.getLogger('nbxmpp.m.misc') @@ -43,6 +48,8 @@ def unwrap_carbon(stanza, own_jid): message = Message(node=forwarded.getTag('message')) type_ = carbon.getName() + + # Fill missing to/from to = message.getTo() if to is None: message.setTo(own_jid.getBare()) @@ -64,3 +71,49 @@ def unwrap_carbon(stanza, own_jid): raise NodeProcessed('Drop MUC-PM "received"-Carbon') return message, type_ + + +def unwrap_mam(stanza, own_jid): + result = stanza.getTag('result', namespace=NS_MAM_2) + if result is None: + result = stanza.getTag('result', namespace=NS_MAM_1) + if result is None: + return stanza, None + + query_id = result.getAttr('queryid') + if query_id is None: + log.warning('No queryid on MAM message') + log.warning(stanza) + raise InvalidStanza + + id_ = result.getAttr('id') + if id_ is None: + log.warning('No id on MAM message') + log.warning(stanza) + raise InvalidStanza + + forwarded = result.getTag('forwarded', namespace=NS_FORWARD) + message = Message(node=forwarded.getTag('message')) + + # Fill missing to/from + to = message.getTo() + if to is None: + message.setTo(own_jid.getBare()) + + frm = message.getFrom() + if frm is None: + message.setFrom(own_jid.getBare()) + + # Timestamp parsing + # 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 InvalidStanza + + return message, MAMData(id=id_, + query_id=query_id, + archive=stanza.getFrom(), + namespace=result.getNamespace(), + timestamp=delay_timestamp) ===================================== nbxmpp/modules/muc.py ===================================== @@ -99,8 +99,7 @@ class MUC: properties.from_muc = True properties.muc_nickname = properties.jid.getResource() - @staticmethod - def _process_muc_user_presence(_con, stanza, properties): + def _process_muc_user_presence(self, _con, stanza, properties): muc_user = stanza.getTag('x', namespace=NS_MUC_USER) if muc_user is None: return @@ -112,7 +111,7 @@ class MUC: if alternate is not None: try: alternate = JID(validate_jid(alternate)) - except InvalidJid as error: + except InvalidJid: log.warning('Invalid alternate JID provided') log.warning(stanza) alternate = None @@ -155,23 +154,15 @@ class MUC: if codes: properties.muc_status_codes = codes - item = muc_user.getTag('item') - if item is not None: - item_dict = item.getAttrs() - if 'role' in item_dict: - item_dict['role'] = Role(item_dict['role']) - if 'affiliation' in item_dict: - item_dict['affiliation'] = Affiliation(item_dict['affiliation']) - if 'jid' in item_dict: - item_dict['jid'] = JID(item_dict['jid']) - item_dict['actor'] = item.getTagAttr('actor', 'nick') - item_dict['reason'] = item.getTagData('reason') - properties.muc_user = MucUserData(**item_dict) + properties.muc_user = self._parse_muc_user(muc_user) - @staticmethod - def _process_groupchat_message(_con, _stanza, properties): + def _process_groupchat_message(self, _con, stanza, properties): properties.from_muc = True properties.muc_nickname = properties.jid.getResource() or None + + muc_user = stanza.getTag('x', namespace=NS_MUC_USER) + if muc_user is not None: + properties.muc_user = self._parse_muc_user(muc_user) @staticmethod def _process_message(_con, stanza, properties): @@ -180,7 +171,7 @@ class MUC: return # MUC Private message - if properties.type == MessageType.CHAT: + if properties.type == MessageType.CHAT and not muc_user.getChildren(): properties.muc_private_message = True return @@ -502,3 +493,27 @@ class MUC: return CommonResult(jid=stanza.getFrom(), error=stanza.getError()) return CommonResult(jid=stanza.getFrom()) + + @staticmethod + def _parse_muc_user(muc_user): + item = muc_user.getTag('item') + if item is not None: + item_dict = item.getAttrs() + if 'role' in item_dict: + item_dict['role'] = Role(item_dict['role']) + else: + item_dict['role'] = None + + if 'affiliation' in item_dict: + item_dict['affiliation'] = Affiliation(item_dict['affiliation']) + else: + item_dict['affiliation'] = None + + if 'jid' in item_dict: + item_dict['jid'] = JID(item_dict['jid']) + else: + item_dict['jid'] = None + + item_dict['actor'] = item.getTagAttr('actor', 'nick') + item_dict['reason'] = item.getTagData('reason') + return MucUserData(**item_dict) ===================================== nbxmpp/modules/presence.py ===================================== @@ -84,11 +84,9 @@ class BasePresence: @staticmethod def _parse_show(stanza): - show = stanza.getShow() - if show is None: - return PresenceShow.ONLINE try: - return PresenceShow(show) + return PresenceShow(stanza.getShow()) except ValueError: log.warning('Presence with invalid show') log.warning(stanza) + return PresenceShow.ONLINE ===================================== nbxmpp/structs.py ===================================== @@ -20,6 +20,8 @@ from collections import namedtuple from nbxmpp.protocol import JID from nbxmpp.protocol import NS_STANZAS +from nbxmpp.protocol import NS_MAM_1 +from nbxmpp.protocol import NS_MAM_2 from nbxmpp.const import MessageType from nbxmpp.const import AvatarState from nbxmpp.const import StatusCode @@ -53,6 +55,23 @@ EntityCapsData.__new__.__defaults__ = (None, None, None) HTTPAuthData = namedtuple('HTTPAuthData', 'id method url body') HTTPAuthData.__new__.__defaults__ = (None, None, None, None) +StanzaIDData = namedtuple('StanzaIDData', 'id by') +StanzaIDData.__new__.__defaults__ = (None, None) + + +class MAMData(namedtuple('MAMData', 'id query_id archive namespace timestamp')): + + __slots__ = [] + + @property + def is_ver_1(self): + return self.namespace == NS_MAM_1 + + @property + def is_ver_2(self): + return self.namespace == NS_MAM_2 + + class Properties: pass @@ -62,6 +81,7 @@ class MessageProperties: self.carbon_type = None self.type = MessageType.NORMAL self.id = None + self.stanza_id = None self.jid = None self.subject = None self.body = None @@ -78,8 +98,15 @@ class MessageProperties: self.muc_private_message = False self.muc_invite = None self.muc_decline = None + self.muc_user = None self.captcha = None self.voice_request = None + self.self_message = False + self.mam = None + + @property + def is_mam_message(self): + return self.mam is not None @property def is_http_auth(self): @@ -112,6 +139,10 @@ class MessageProperties: def is_voice_request(self): return self.voice_request is not None + @property + def is_self_message(self): + return self.self_message + class IqProperties: def __init__(self): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/2c8f64557619fcc2d7065fbae… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/2c8f64557619fcc2d7065fbae… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add missing get_instance() for Gateway/IQ module
by Philipp Hörist 03 Jan '19

03 Jan '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: fcb33a10 by Philipp Hörist at 2019-01-03T00:00:31Z Add missing get_instance() for Gateway/IQ module - - - - - 2 changed files: - gajim/common/modules/gateway.py - gajim/common/modules/iq.py Changes: ===================================== gajim/common/modules/gateway.py ===================================== @@ -93,3 +93,7 @@ class Gateway: prompt=prompt, prompt_jid=prompt_jid, stanza=stanza)) + + +def get_instance(*args, **kwargs): + return Gateway(*args, **kwargs), 'Gateway' ===================================== gajim/common/modules/iq.py ===================================== @@ -85,3 +85,7 @@ class Iq: if len(id_) > 3 and id_[2] == '_': sid = id_[3:] return sid + + +def get_instance(*args, **kwargs): + return Iq(*args, **kwargs), 'Iq' View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/fcb33a10e711d15ccd0c1fd5fc5b3a12f8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/fcb33a10e711d15ccd0c1fd5fc5b3a12f8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Remove unused code
by Philipp Hörist 02 Jan '19

02 Jan '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: d622439a by Philipp Hörist at 2019-01-02T23:50:00Z Remove unused code - - - - - d1ccfd51 by Philipp Hörist at 2019-01-02T23:50:22Z MUC: Dont check for unique room id support This feature was remove from XEP-0045 in Version 1.25 (2012-02-08). We simply now use an uuid instead. - - - - - 6 changed files: - gajim/common/connection.py - gajim/common/connection_handlers.py - gajim/common/connection_handlers_events.py - gajim/common/zeroconf/connection_handlers_zeroconf.py - gajim/dialogs.py - gajim/gui_interface.py Changes: ===================================== gajim/common/connection.py ===================================== @@ -1653,22 +1653,6 @@ class Connection(CommonConnection, ConnectionHandlers): show=show, caps=ptype != 'unavailable') - def check_unique_room_id_support(self, server, instance): - if not app.account_is_connected(self.name): - return - iq = nbxmpp.Iq(typ='get', to=server) - iq.setAttr('id', 'unique1') - iq.addChild('unique', namespace=nbxmpp.NS_MUC_UNIQUE) - def _on_response(resp): - if not nbxmpp.isResultNode(resp): - app.nec.push_incoming_event(UniqueRoomIdNotSupportedEvent( - None, conn=self, instance=instance, server=server)) - return - app.nec.push_incoming_event(UniqueRoomIdSupportedEvent(None, - conn=self, instance=instance, server=server, - room_id=resp.getTag('unique').getData())) - self.connection.SendAndCallForResponse(iq, _on_response) - def join_gc(self, nick, room_jid, password, change_nick=False, rejoin=False): # FIXME: This room JID needs to be normalized; see #1364 ===================================== gajim/common/connection_handlers.py ===================================== @@ -260,11 +260,6 @@ class ConnectionHandlers(ConnectionSocks5Bytestream, ConnectionJingle.__init__(self) ConnectionHandlersBase.__init__(self) - # IDs of disco#items requests - self.disco_items_ids = [] - # IDs of disco#info requests - self.disco_info_ids = [] - self.continue_connect_info = None # If handlers have been registered ===================================== gajim/common/connection_handlers_events.py ===================================== @@ -37,88 +37,6 @@ from gajim.common.file_props import FilesProp log = logging.getLogger('gajim.c.connection_handlers_events') -class HelperEvent: - def get_jid_resource(self, check_fake_jid=False): - if check_fake_jid and hasattr(self, 'id_') and \ - self.id_ in self.conn.groupchat_jids: - self.fjid = self.conn.groupchat_jids[self.id_] - del self.conn.groupchat_jids[self.id_] - else: - self.fjid = helpers.get_full_jid_from_iq(self.stanza) - if self.fjid is None: - self.jid = None - else: - self.jid, self.resource = app.get_room_and_nick_from_fjid(self.fjid) - - def get_id(self): - self.id_ = self.stanza.getID() - - def get_gc_control(self): - self.gc_control = app.interface.msg_win_mgr.get_gc_control(self.jid, - self.conn.name) - - # If gc_control is missing - it may be minimized. Try to get it - # from there. If it's not there - then it's missing anyway and - # will remain set to None. - if not self.gc_control: - minimized = app.interface.minimized_controls[self.conn.name] - self.gc_control = minimized.get(self.jid) - - def get_oob_data(self, stanza): - oob_node = stanza.getTag('x', namespace=nbxmpp.NS_X_OOB) - if oob_node is not None: - oob_url = oob_node.getTagData('url') - if oob_url is not None: - 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.set_value('gajim', 'oob_desc', oob_desc) - - def get_stanza_id(self, stanza, query=False): - if query: - # On a MAM query the stanza-id is maybe not set, so - # get the id of the stanza - return stanza.getAttr('id') - stanza_id, by = stanza.getStanzaIDAttrs() - if by is None: - # We can not verify who set this stanza-id, ignore it. - return - if stanza.getType() == 'groupchat': - if stanza.getFrom().bareMatch(by): - # by attribute must match the server - return stanza_id - elif self.conn.get_own_jid().bareMatch(by): - # by attribute must match the server - return stanza_id - return - - @staticmethod - def get_forwarded_message(stanza): - forwarded = stanza.getTag('forwarded', - namespace=nbxmpp.NS_FORWARD, - protocol=True) - if forwarded is not None: - return forwarded.getTag('message', protocol=True) - - def _is_self_message(self, message): - if self.self_message is not None: - return self.self_message - own_jid = self.conn.get_own_jid() - frm = message.getFrom() - to = message.getTo() - # If 'to' is not set we assume own jid - self.self_message = frm.bareMatch(to or own_jid) - return self.self_message - - def _is_muc_pm(self, message): - if self.muc_pm is not None: - return self.muc_pm - self.muc_pm = False - muc_user = message.getTag('x', namespace=nbxmpp.NS_MUC_USER) - if muc_user is not None: - self.muc_pm = muc_user.getChildren() == [] - return self.muc_pm - class StreamReceivedEvent(nec.NetworkIncomingEvent): name = 'stream-received' @@ -151,7 +69,7 @@ class MessageSentEvent(nec.NetworkIncomingEvent): class MessageNotSentEvent(nec.NetworkIncomingEvent): name = 'message-not-sent' -class MessageErrorEvent(nec.NetworkIncomingEvent, HelperEvent): +class MessageErrorEvent(nec.NetworkIncomingEvent): name = 'message-error' def init(self): @@ -160,7 +78,7 @@ class MessageErrorEvent(nec.NetworkIncomingEvent, HelperEvent): def generate(self): if self.zeroconf: return True - self.get_id() + self.id_ = self.stanza.getID() #only alert for errors of explicitly sent messages (see https://trac.gajim.org/ticket/8222) if self.id_ in self.conn.sent_message_ids: self.conn.sent_message_ids.remove(self.id_) @@ -292,15 +210,6 @@ class InsecureSSLConnectionEvent(nec.NetworkIncomingEvent): class SSLErrorEvent(nec.NetworkIncomingEvent): name = 'ssl-error' -class UniqueRoomIdSupportedEvent(nec.NetworkIncomingEvent): - name = 'unique-room-id-supported' - -class UniqueRoomIdNotSupportedEvent(nec.NetworkIncomingEvent): - name = 'unique-room-id-not-supported' - -class NonAnonymousServerErrorEvent(nec.NetworkIncomingEvent): - name = 'non-anonymous-server-error' - class UpdateGCAvatarEvent(nec.NetworkIncomingEvent): name = 'update-gc-avatar' @@ -328,7 +237,7 @@ class PasswordRequiredEvent(nec.NetworkIncomingEvent): class SignedInEvent(nec.NetworkIncomingEvent): name = 'signed-in' -class FileRequestReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): +class FileRequestReceivedEvent(nec.NetworkIncomingEvent): name = 'file-request-received' def init(self): @@ -336,7 +245,7 @@ class FileRequestReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): self.FT_content = None def generate(self): - self.get_id() + self.id_ = self.stanza.getID() self.fjid = self.conn._ft_get_from(self.stanza) self.jid = app.get_jid_without_resource(self.fjid) if self.jingle_content: ===================================== gajim/common/zeroconf/connection_handlers_zeroconf.py ===================================== @@ -54,20 +54,11 @@ class DecryptedMessageReceivedEvent(NetworkIncomingEvent): name = 'decrypted-message-received' -class ConnectionVcard: - def add_sha(self, p, *args): - return p - def add_caps(self, p): - return p - - -class ConnectionHandlersZeroconf(ConnectionVcard, -ConnectionSocks5BytestreamZeroconf, -connection_handlers.ConnectionHandlersBase, -connection_handlers.ConnectionJingle): +class ConnectionHandlersZeroconf(ConnectionSocks5BytestreamZeroconf, + connection_handlers.ConnectionHandlersBase, + connection_handlers.ConnectionJingle): def __init__(self): - ConnectionVcard.__init__(self) ConnectionSocks5BytestreamZeroconf.__init__(self) connection_handlers.ConnectionJingle.__init__(self) connection_handlers.ConnectionHandlersBase.__init__(self) ===================================== gajim/dialogs.py ===================================== @@ -30,8 +30,8 @@ from typing import List # pylint: disable=unused-import from typing import Tuple # pylint: disable=unused-import import os +import uuid import logging -from random import randrange from gi.repository import Gtk from gi.repository import Gdk @@ -1459,21 +1459,12 @@ class TransformChatToMUC: path = self.guests_store.get_path(iter_) self.guests_treeview.get_selection().select_path(path) - app.ged.register_event_handler('unique-room-id-supported', ged.GUI1, - self._nec_unique_room_id_supported) - app.ged.register_event_handler('unique-room-id-not-supported', - ged.GUI1, self._nec_unique_room_id_not_supported) - # show all self.window.show_all() self.xml.connect_signals(self) def on_chat_to_muc_window_destroy(self, widget): - app.ged.remove_event_handler('unique-room-id-supported', ged.GUI1, - self._nec_unique_room_id_supported) - app.ged.remove_event_handler('unique-room-id-not-supported', ged.GUI1, - self._nec_unique_room_id_not_supported) self.instances.remove(self) def on_chat_to_muc_window_key_press_event(self, widget, event): @@ -1486,11 +1477,7 @@ class TransformChatToMUC: server = model[row][0].strip() if server == '': return - app.connections[self.account].check_unique_room_id_support(server, self) - def _nec_unique_room_id_supported(self, obj): - if obj.instance != self: - return guest_list = [] guests = self.guests_treeview.get_selection().get_selected_rows() for guest in guests[1]: @@ -1498,7 +1485,7 @@ class TransformChatToMUC: guest_list.append(self.guests_store[iter_][2]) for guest in self.auto_jids: guest_list.append(guest) - room_jid = obj.room_id + '@' + obj.server + room_jid = str(uuid.uuid4()) + '@' + server app.automatic_rooms[self.account][room_jid] = {} app.automatic_rooms[self.account][room_jid]['invities'] = guest_list app.automatic_rooms[self.account][room_jid]['continue_tag'] = True @@ -1509,13 +1496,6 @@ class TransformChatToMUC: def on_cancel_button_clicked(self, widget): self.window.destroy() - def _nec_unique_room_id_not_supported(self, obj): - if obj.instance != self: - return - obj.room_id = app.nicks[self.account].lower().replace(' ', '') + \ - str(randrange(9999999)) - self._nec_unique_room_id_supported(obj) - class Dialog(Gtk.Dialog): def __init__(self, parent, title, buttons, default=None, on_response_ok=None, on_response_cancel=None): ===================================== gajim/gui_interface.py ===================================== @@ -1273,13 +1273,6 @@ class Interface: self.instances[account]['online_dialog']['ssl_error'].set_title( _('SSL Certificate Verification for %s') % account) - def handle_event_non_anonymous_server(self, obj): - account = obj.conn.name - server = app.config.get_per('accounts', account, 'hostname') - ErrorDialog(_('Non Anonymous Server'), sectext='Server "%s"' - 'does not support anonymous connection' % server, - transient_for=self.roster.window) - def handle_event_plain_connection(self, obj): # ('PLAIN_CONNECTION', account, (connection)) def on_ok(is_checked): @@ -1392,7 +1385,6 @@ class Interface: [self.handle_event_roster_item_exchange], 'signed-in': [self.handle_event_signed_in], 'ssl-error': [self.handle_event_ssl_error], - 'non-anonymous-server-error': [self.handle_event_non_anonymous_server], 'stream-conflict-received': [self.handle_event_resource_conflict], 'subscribe-presence-received': [ self.handle_event_subscribe_presence], View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/9ae6654dd37189392258eb0d32690c2b2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/9ae6654dd37189392258eb0d32690c2b2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 4 commits: Add self bare property
by Philipp Hörist 02 Jan '19

02 Jan '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 0b6dc8c9 by Philipp Hörist at 2019-01-01T18:15:07Z Add self bare property - - - - - fbe98a3e by Philipp Hörist at 2019-01-02T15:55:17Z Add BaseIq handler - - - - - 29d1e2c0 by Philipp Hörist at 2019-01-02T15:56:06Z Use namedtuple for HTTPAuth data - - - - - 2c8f6455 by Philipp Hörist at 2019-01-02T23:10:16Z Add string representation for error enum - - - - - 7 changed files: - nbxmpp/const.py - nbxmpp/dispatcher_nb.py - nbxmpp/modules/http_auth.py - + nbxmpp/modules/iq.py - nbxmpp/modules/message.py - nbxmpp/modules/presence.py - nbxmpp/structs.py Changes: ===================================== nbxmpp/const.py ===================================== @@ -47,6 +47,29 @@ class GSSAPIState(IntEnum): WRAP = 1 +class IqType(Enum): + GET = 'get' + SET = 'set' + RESULT = 'result' + ERROR = 'error' + + @property + def is_get(self): + return self == IqType.GET + + @property + def is_set(self): + return self == IqType.SET + + @property + def is_result(self): + return self == IqType.RESULT + + @property + def is_error(self): + return self == IqType.ERROR + + class MessageType(Enum): NORMAL = 'normal' CHAT = 'chat' @@ -54,6 +77,26 @@ class MessageType(Enum): HEADLINE = 'headline' ERROR = 'error' + @property + def is_normal(self): + return self == MessageType.NORMAL + + @property + def is_chat(self): + return self == MessageType.CHAT + + @property + def is_groupchat(self): + return self == MessageType.GROUPCHAT + + @property + def is_headline(self): + return self == MessageType.HEADLINE + + @property + def is_error(self): + return self == MessageType.ERROR + class PresenceType(Enum): PROBE = 'probe' @@ -237,3 +280,6 @@ class Error(Enum): UNEXPECTED_REQUEST = 'unexpected-request' POLICY_VIOLATION = 'policy-violation' UNKNOWN_ERROR = 'unknown-error' + + def __str__(self): + return self.value ===================================== nbxmpp/dispatcher_nb.py ===================================== @@ -45,6 +45,7 @@ from nbxmpp.modules.eme import EME from nbxmpp.modules.http_auth import HTTPAuth from nbxmpp.modules.presence import BasePresence from nbxmpp.modules.message import BaseMessage +from nbxmpp.modules.iq import BaseIq from nbxmpp.modules.nickname import Nickname from nbxmpp.modules.delay import Delay from nbxmpp.modules.muc import MUC @@ -163,6 +164,7 @@ class XMPPDispatcher(PlugIn): def _register_modules(self): self._modules['BasePresence'] = BasePresence(self._owner) self._modules['BaseMessage'] = BaseMessage(self._owner) + self._modules['BaseIq'] = BaseIq(self._owner) self._modules['EME'] = EME(self._owner) self._modules['HTTPAuth'] = HTTPAuth(self._owner) self._modules['Nickname'] = Nickname(self._owner) ===================================== nbxmpp/modules/http_auth.py ===================================== @@ -19,6 +19,7 @@ import logging from nbxmpp.protocol import NS_HTTP_AUTH from nbxmpp.structs import StanzaHandler +from nbxmpp.structs import HTTPAuthData log = logging.getLogger('nbxmpp.m.http_auth') @@ -46,5 +47,5 @@ class HTTPAuth: http_auth = confirm.getAttrs().copy() http_auth['body'] = stanza.getTagData('body') - properties.http_auth = http_auth + properties.http_auth = HTTPAuthData(**http_auth) log.info('Found data: %s', http_auth) ===================================== nbxmpp/modules/iq.py ===================================== @@ -0,0 +1,60 @@ +# 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 3 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; If not, see <http://www.gnu.org/licenses/>. + +import logging + +from nbxmpp.protocol import Error as ErrorStanza +from nbxmpp.protocol import ERR_BAD_REQUEST +from nbxmpp.protocol import NodeProcessed +from nbxmpp.structs import StanzaHandler +from nbxmpp.structs import ErrorProperties +from nbxmpp.const import IqType + +log = logging.getLogger('nbxmpp.m.iq') + + +class BaseIq: + def __init__(self, client): + self._client = client + self.handlers = [ + StanzaHandler(name='iq', + callback=self._process_iq_base, + priority=10), + ] + + def _process_iq_base(self, _con, stanza, properties): + try: + properties.type = IqType(stanza.getType()) + except ValueError: + log.warning('Message with invalid type: %s', stanza.getType()) + log.warning(stanza) + self._client.send(ErrorStanza(stanza, ERR_BAD_REQUEST)) + raise NodeProcessed + + properties.jid = stanza.getFrom() + properties.id = stanza.getID() + + payloads = stanza.getPayload() + for payload in payloads: + if payload.getName() != 'error': + properties.payload = payload + break + + properties.query = stanza.getQuery() + + if properties.type.is_error: + properties.error = ErrorProperties(stanza) ===================================== nbxmpp/modules/message.py ===================================== @@ -19,6 +19,7 @@ import logging from nbxmpp.protocol import NodeProcessed from nbxmpp.structs import StanzaHandler +from nbxmpp.structs import ErrorProperties from nbxmpp.const import MessageType log = logging.getLogger('nbxmpp.m.message') @@ -41,9 +42,8 @@ class BaseMessage: properties.thread = stanza.getThread() properties.subject = stanza.getSubject() - if properties.type == MessageType.ERROR: - properties.error_code = stanza.getErrorCode() - properties.error_message = stanza.getErrorMsg() + if properties.type.is_error: + properties.error = ErrorProperties(stanza) @staticmethod def _parse_type(stanza): ===================================== nbxmpp/modules/presence.py ===================================== @@ -45,12 +45,12 @@ class BasePresence: properties.id = stanza.getID() properties.status = stanza.getStatus() - if properties.type == PresenceType.ERROR: + if properties.type.is_error: properties.error = ErrorProperties(stanza) own_jid = self._client.get_bound_jid() - if own_jid == stanza.getFrom(): - properties.self_presence = True + properties.self_presence = own_jid == properties.jid + properties.self_bare = properties.jid.bareMatch(own_jid) @staticmethod def _parse_priority(stanza): ===================================== nbxmpp/structs.py ===================================== @@ -50,6 +50,9 @@ MucDestroyed.__new__.__defaults__ = (None, None, None) EntityCapsData = namedtuple('EntityCapsData', 'hash node ver') EntityCapsData.__new__.__defaults__ = (None, None, None) +HTTPAuthData = namedtuple('HTTPAuthData', 'id method url body') +HTTPAuthData.__new__.__defaults__ = (None, None, None, None) + class Properties: pass @@ -65,8 +68,7 @@ class MessageProperties: self.thread = None self.user_timestamp = None self.timestamp = time.time() - self.error_code = None - self.error_message = None + self.error = None self.eme = None self.http_auth = None self.nickname = None @@ -113,6 +115,12 @@ class MessageProperties: class IqProperties: def __init__(self): + self.type = None + self.jid = None + self.id = None + self.error = None + self.query = None + self.payload = None self.http_auth = None @property @@ -130,6 +138,7 @@ class PresenceProperties: self.id = None self.nickname = None self.self_presence = False + self.self_bare = False self.from_muc = False self.status = '' self.timestamp = time.time() @@ -149,6 +158,10 @@ class PresenceProperties: def is_self_presence(self): return self.self_presence + @property + def is_self_bare(self): + return self.self_bare + @property def is_muc_destroyed(self): return self.muc_destroyed is not None View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/da5f7ab1da8e8c139fdcc0bad… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/da5f7ab1da8e8c139fdcc0bad… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Refactor Zeroconf presence
by Philipp Hörist 02 Jan '19

02 Jan '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: d121bbf4 by Philipp Hörist at 2019-01-02T15:10:30Z Refactor Zeroconf presence - - - - - d93fe8b1 by Philipp Hörist at 2019-01-02T15:53:06Z HTTPAuth: Use nbxmpp handlers - - - - - 9ae6654d by Philipp Hörist at 2019-01-02T23:19:23Z Add IQ and Gateway module - - - - - 14 changed files: - gajim/common/connection.py - gajim/common/connection_handlers.py - gajim/common/connection_handlers_events.py - gajim/common/modules/__init__.py - + gajim/common/modules/gateway.py - gajim/common/modules/http_auth.py - + gajim/common/modules/iq.py - gajim/common/modules/message.py - gajim/common/modules/presence.py - gajim/common/zeroconf/connection_handlers_zeroconf.py - gajim/common/zeroconf/connection_zeroconf.py - gajim/gtk/add_contact.py - gajim/gui_interface.py - gajim/roster_window.py Changes: ===================================== gajim/common/connection.py ===================================== @@ -367,12 +367,6 @@ class CommonConnection: additional_data=obj.additional_data, stanza_id=obj.stanza_id) - def unsubscribe_agent(self, agent): - """ - To be implemented by derived classes - """ - raise NotImplementedError - def update_contact(self, jid, name, groups): if self.connection: self.getRoster().set_item(jid=jid, name=name, groups=groups) @@ -1602,17 +1596,6 @@ class Connection(CommonConnection, ConnectionHandlers): return self.connection.send(stanza) - def unsubscribe_agent(self, agent): - if not app.account_is_connected(self.name): - return - iq = nbxmpp.Iq('set', nbxmpp.NS_REGISTER, to=agent) - iq.setQuery().setTag('remove') - id_ = self.connection.getAnID() - iq.setID(id_) - self.awaiting_answers[id_] = (AGENT_REMOVED, agent) - self.connection.send(iq) - self.getRoster().del_item(agent) - def send_new_account_infos(self, form, is_form): if is_form: # Get username and password and put them in new_account_info @@ -1656,20 +1639,6 @@ class Connection(CommonConnection, ConnectionHandlers): self.connection = con nbxmpp.features_nb.getRegInfo(con, self._hostname) - def request_gateway_prompt(self, jid, prompt=None): - def _on_prompt_result(resp): - app.nec.push_incoming_event(GatewayPromptReceivedEvent(None, - conn=self, stanza=resp)) - if prompt: - typ_ = 'set' - else: - typ_ = 'get' - iq = nbxmpp.Iq(typ=typ_, to=jid) - query = iq.addChild(name='query', namespace=nbxmpp.NS_GATEWAY) - if prompt: - query.setTagData('prompt', prompt) - self.connection.SendAndCallForResponse(iq, _on_prompt_result) - def getRoster(self): return self.get_module('Roster') ===================================== gajim/common/connection_handlers.py ===================================== @@ -38,25 +38,15 @@ from gajim.common.caps_cache import muc_caps_cache from gajim.common.connection_handlers_events import * 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 log = logging.getLogger('gajim.c.connection_handlers') -# kind of events we can wait for an answer -AGENT_REMOVED = 'agent_removed' - # basic connection handlers used here and in zeroconf class ConnectionHandlersBase: def __init__(self): - # List of IDs we are waiting answers for {id: (type_of_request, data), } - self.awaiting_answers = {} - # List of IDs that will produce a timeout is answer doesn't arrive - # {time_of_the_timeout: (id, message to send to gui), } - self.awaiting_timeouts = {} - # keep track of sessions this connection has with other JIDs self.sessions = {} @@ -291,39 +281,6 @@ class ConnectionHandlers(ConnectionSocks5Bytestream, app.ged.remove_event_handler('agent-removed', ged.CORE, self._nec_agent_removed) - def _ErrorCB(self, con, iq_obj): - log.debug('ErrorCB') - app.nec.push_incoming_event(IqErrorReceivedEvent(None, conn=self, - stanza=iq_obj)) - - def _IqCB(self, con, iq_obj, properties): - if properties.is_http_auth: - self.get_module('HTTPAuth').delegate(iq_obj, properties) - raise nbxmpp.NodeProcessed - - id_ = iq_obj.getID() - - app.nec.push_incoming_event(NetworkEvent('raw-iq-received', - conn=self, stanza=iq_obj)) - - # Check if we were waiting a timeout for this id - found_tim = None - for tim in self.awaiting_timeouts: - if id_ == self.awaiting_timeouts[tim][0]: - found_tim = tim - break - if found_tim: - del self.awaiting_timeouts[found_tim] - - if id_ not in self.awaiting_answers: - return - - if self.awaiting_answers[id_][0] == AGENT_REMOVED: - jid = self.awaiting_answers[id_][1] - app.nec.push_incoming_event(AgentRemovedEvent(None, conn=self, - agent=jid)) - del self.awaiting_answers[id_] - def _nec_agent_removed(self, obj): if obj.conn.name != self.name: return @@ -449,8 +406,6 @@ class ConnectionHandlers(ConnectionSocks5Bytestream, con.RegisterHandler('iq', self._JingleCB, 'result') con.RegisterHandler('iq', self._JingleCB, 'error') con.RegisterHandler('iq', self._JingleCB, 'set', nbxmpp.NS_JINGLE) - con.RegisterHandler('iq', self._ErrorCB, 'error') - con.RegisterHandler('iq', self._IqCB) con.RegisterHandler('iq', self._ResultCB, 'result') con.RegisterHandler('unknown', self._StreamCB, nbxmpp.NS_XMPP_STREAMS, xmlns=nbxmpp.NS_STREAMS) ===================================== gajim/common/connection_handlers_events.py ===================================== @@ -119,16 +119,6 @@ class HelperEvent: self.muc_pm = muc_user.getChildren() == [] return self.muc_pm -class IqErrorReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): - name = 'iq-error-received' - - def generate(self): - self.get_id() - self.get_jid_resource(check_fake_jid=True) - self.errmsg = self.stanza.getErrorMsg() - self.errcode = self.stanza.getErrorCode() - return True - class StreamReceivedEvent(nec.NetworkIncomingEvent): name = 'stream-received' @@ -144,28 +134,6 @@ class StreamConflictReceivedEvent(nec.NetworkIncomingEvent): class PresenceReceivedEvent(nec.NetworkIncomingEvent): name = 'presence-received' -class ZeroconfPresenceReceivedEvent(nec.NetworkIncomingEvent): - name = 'presence-received' - - def generate(self): - self.jid, self.resource = app.get_room_and_nick_from_fjid(self.fjid) - self.resource = 'local' - self.prio = 0 - self.keyID = None - self.idle_time = None - self.timestamp = 0 - self.avatar_sha = None - self.need_add_in_roster = False - if self.show == 'offline': - self.ptype = 'unavailable' - else: - self.ptype = None - self.user_nick = '' - self.errcode = None - self.errmsg = '' - self.popup = False # Do we want to open chat window ? - return True - class OurShowEvent(nec.NetworkIncomingEvent): name = 'our-show' @@ -288,16 +256,6 @@ class StanzaReceivedEvent(nec.NetworkIncomingEvent): class StanzaSentEvent(nec.NetworkIncomingEvent): name = 'stanza-sent' -class AgentRemovedEvent(nec.NetworkIncomingEvent): - name = 'agent-removed' - - def generate(self): - self.jid_list = [] - for jid in app.contacts.get_jid_list(self.conn.name): - if jid.endswith('@' + self.agent): - self.jid_list.append(jid) - return True - class BadGPGPassphraseEvent(nec.NetworkIncomingEvent): name = 'bad-gpg-passphrase' @@ -501,22 +459,6 @@ class FileTransferCompletedEvent(nec.NetworkIncomingEvent): self.jid = app.get_jid_without_resource(jid) return True -class GatewayPromptReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): - name = 'gateway-prompt-received' - - def generate(self): - self.get_jid_resource() - query = self.stanza.getTag('query') - if query: - self.desc = query.getTagData('desc') - self.prompt = query.getTagData('prompt') - self.prompt_jid = query.getTagData('jid') - else: - self.desc = None - self.prompt = None - self.prompt_jid = None - return True - class NotificationEvent(nec.NetworkIncomingEvent): name = 'notification' base_network_events = ['decrypted-message-received', ===================================== gajim/common/modules/__init__.py ===================================== @@ -26,7 +26,8 @@ from gajim.common.types import ConnectionT log = logging.getLogger('gajim.c.m') -ZEROCONF_MODULES = ['adhoc_commands', +ZEROCONF_MODULES = ['iq', + 'adhoc_commands', 'receipts', 'discovery', 'chatstates'] ===================================== gajim/common/modules/gateway.py ===================================== @@ -0,0 +1,95 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +# XEP-0100: Gateway Interaction + +import logging + +import nbxmpp + +from gajim.common import app +from gajim.common.nec import NetworkEvent + +log = logging.getLogger('gajim.c.m.gateway') + + +class Gateway: + def __init__(self, con): + self._con = con + self._account = con.name + + self.handlers = [] + + def unsubscribe(self, agent): + if not app.account_is_connected(self._account): + return + iq = nbxmpp.Iq('set', nbxmpp.NS_REGISTER, to=agent) + iq.setQuery().setTag('remove') + + self._con.connection.SendAndCallForResponse( + iq, self._on_unsubscribe_result) + self._con.getRoster().del_item(agent) + + def _on_unsubscribe_result(self, stanza): + if not nbxmpp.isResultNode(stanza): + log.info('Error: %s', stanza.getError()) + return + + agent = stanza.getFrom().getBare() + jid_list = [] + for jid in app.contacts.get_jid_list(self._account): + if jid.endswith('@' + agent): + jid_list.append(jid) + + app.nec.push_incoming_event( + NetworkEvent('agent-removed', + conn=self._con, + agent=agent, + jid_list=jid_list)) + + def request_gateway_prompt(self, jid, prompt=None): + typ_ = 'get' + if prompt: + typ_ = 'set' + iq = nbxmpp.Iq(typ=typ_, to=jid) + query = iq.addChild(name='query', namespace=nbxmpp.NS_GATEWAY) + if prompt: + query.setTagData('prompt', prompt) + self._con.connection.SendAndCallForResponse(iq, self._on_prompt_result) + + def _on_prompt_result(self, stanza): + jid = str(stanza.getFrom()) + fjid = stanza.getFrom().getBare() + resource = stanza.getFrom().getResource() + + query = stanza.getTag('query') + if query is not None: + desc = query.getTagData('desc') + prompt = query.getTagData('prompt') + prompt_jid = query.getTagData('jid') + else: + desc = None + prompt = None + prompt_jid = None + + app.nec.push_incoming_event( + NetworkEvent('gateway-prompt-received', + conn=self._con, + fjid=fjid, + jid=jid, + resource=resource, + desc=desc, + prompt=prompt, + prompt_jid=prompt_jid, + stanza=stanza)) ===================================== gajim/common/modules/http_auth.py ===================================== @@ -17,6 +17,8 @@ import logging import nbxmpp +from nbxmpp.structs import StanzaHandler +from nbxmpp.protocol import NS_HTTP_AUTH from gajim.common import app from gajim.common.nec import NetworkEvent @@ -29,9 +31,22 @@ class HTTPAuth: self._con = con self._account = con.name - self.handlers = [] + self.handlers = [ + StanzaHandler(name='message', + callback=self._http_auth, + ns=NS_HTTP_AUTH, + priority=45), + StanzaHandler(name='iq', + callback=self._http_auth, + typ='get', + ns=NS_HTTP_AUTH, + priority=45) + ] + + def _http_auth(self, _con, stanza, properties): + if not properties.is_http_auth: + return - def delegate(self, stanza, properties): log.info('Auth request received') auto_answer = app.config.get_per( 'accounts', self._account, 'http_auth') @@ -42,11 +57,12 @@ class HTTPAuth: app.nec.push_incoming_event( NetworkEvent('http-auth-received', conn=self._con, - iq_id=properties['id'], - method=properties['method'], - url=properties['url'], - msg=properties['body'], + iq_id=properties.http_auth.id, + method=properties.http_auth.method, + url=properties.http_auth.url, + msg=properties.http_auth.body, stanza=stanza)) + raise nbxmpp.NodeProcessed def build_http_auth_answer(self, stanza, answer): if answer == 'yes': ===================================== gajim/common/modules/iq.py ===================================== @@ -0,0 +1,87 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +# Iq handler + +import logging + +import nbxmpp +from nbxmpp.const import Error +from nbxmpp.structs import StanzaHandler + +from gajim.common import app +from gajim.common.nec import NetworkEvent +from gajim.common.file_props import FilesProp + + +log = logging.getLogger('gajim.c.m.iq') + + +class Iq: + def __init__(self, con): + self._con = con + self._account = con.name + + self.handlers = [ + StanzaHandler(name='iq', + callback=self._iq_error_received, + typ='error', + priority=51), + ] + + def _iq_error_received(self, _con, _stanza, properties): + log.info('Error: %s', properties.error) + if properties.error.type in (Error.JID_MALFORMED, + Error.FORBIDDEN, + Error.NOT_ACCEPTABLE): + sid = self._get_sid(properties.id) + file_props = FilesProp.getFileProp(self._account, sid) + if file_props: + if properties.error.type == Error.JID_MALFORMED: + file_props.error = -3 + else: + file_props.error = -4 + app.nec.push_incoming_event( + NetworkEvent('file-request-error', + conn=self._con, + jid=properties.jid.getBare(), + file_props=file_props, + error_msg=properties.error.message)) + self._con.disconnect_transfer(file_props) + raise nbxmpp.NodeProcessed + + if properties.error.type == Error.ITEM_NOT_FOUND: + sid = self._get_sid(properties.id) + file_props = FilesProp.getFileProp(self._account, sid) + if file_props: + app.nec.push_incoming_event( + NetworkEvent('file-send-error', + account=self._account, + jid=str(properties.jid), + file_props=file_props)) + self._con.disconnect_transfer(file_props) + raise nbxmpp.NodeProcessed + + app.nec.push_incoming_event( + NetworkEvent('iq-error-received', + account=self._account, + properties=properties)) + raise nbxmpp.NodeProcessed + + @staticmethod + def _get_sid(id_): + sid = id_ + if len(id_) > 3 and id_[2] == '_': + sid = id_[3:] + return sid ===================================== gajim/common/modules/message.py ===================================== @@ -58,10 +58,6 @@ class Message: nbxmpp.NS_CAPTCHA,]) def _message_received(self, _con, stanza, properties): - if properties.is_http_auth: - self._con.get_module('HTTPAuth').delegate(stanza, properties) - raise nbxmpp.NodeProcessed - # Check if a child of the message contains any # namespaces that we handle in other modules. # nbxmpp executes less common handlers last ===================================== gajim/common/modules/presence.py ===================================== @@ -136,6 +136,7 @@ class Presence: raise nbxmpp.NodeProcessed def _update_contact(self, event, properties): + # Note: A similar method also exists in connection_zeroconf jid = properties.jid.getBare() resource = properties.jid.getResource() ===================================== gajim/common/zeroconf/connection_handlers_zeroconf.py ===================================== @@ -44,8 +44,6 @@ log = logging.getLogger('gajim.c.z.connection_handlers_zeroconf') STATUS_LIST = ['offline', 'connecting', 'online', 'chat', 'away', 'xa', 'dnd', 'invisible'] -# kind of events we can wait for an answer -AGENT_REMOVED = 'agent_removed' class ZeroconfMessageReceivedEvent(NetworkIncomingEvent): ===================================== gajim/common/zeroconf/connection_zeroconf.py ===================================== @@ -131,9 +131,7 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): nickname=self.roster.getName(key), sub='both', ask='no', groups=self.roster.getGroups(key), avatar_sha=None)) - app.nec.push_incoming_event(ZeroconfPresenceReceivedEvent( - None, conn=self, fjid=key, show=self.roster.getStatus(key), - status=self.roster.getMessage(key))) + self._on_presence(key) #XXX open chat windows don't get refreshed (full name), add that return self.call_resolve_timeout @@ -145,16 +143,98 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): nickname=self.roster.getName(jid), sub='both', ask='no', groups=self.roster.getGroups(jid), avatar_sha=None)) - app.nec.push_incoming_event(ZeroconfPresenceReceivedEvent( - None, conn=self, fjid=jid, show=self.roster.getStatus(jid), - status=self.roster.getMessage(jid))) + self._on_presence(jid) def _on_remove_service(self, jid): self.roster.delItem(jid) # 'NOTIFY' (account, (jid, status, status message, resource, priority, # keyID, timestamp)) - app.nec.push_incoming_event(ZeroconfPresenceReceivedEvent( - None, conn=self, fjid=jid, show='offline', status='')) + self._on_presence(jid, show='offline', status='') + + def _on_presence(self, jid, show=None, status=None): + if status is None: + status = self.roster.getMessage(jid) + if show is None: + show = self.roster.getStatus(jid) + + ptype = 'unavailable' if show == 'offline' else None + + event_attrs = { + 'conn': self, + 'keyID': None, + 'prio': 0, + 'need_add_in_roster': False, + 'popup': False, + 'ptype': ptype, + 'jid': jid, + 'resource': 'local', + 'id_': None, + 'fjid': jid, + 'timestamp': 0, + 'avatar_sha': None, + 'user_nick': '', + 'idle_time': None, + 'show': show, + 'new_show': show, + 'old_show': 0, + 'status': status, + 'contact_list': [], + 'contact': None, + } + + event_ = NetworkEvent('presence-received', **event_attrs) + + self._update_contact(event_) + + app.nec.push_incoming_event(event_) + + def _update_contact(self, event): + jid = event.jid + + status_strings = ['offline', 'error', 'online', 'chat', 'away', + 'xa', 'dnd', 'invisible'] + + event.new_show = status_strings.index(event.show) + + contact = app.contacts.get_contact_strict(self.name, jid, '') + if contact is None: + contact = app.contacts.get_contact_strict(self.name, jid, 'local') + + if contact.show in status_strings: + event.old_show = status_strings.index(contact.show) + + # Update contact with presence data + contact.resource = 'local' + contact.show = event.show + contact.status = event.status + contact.priority = event.prio + attached_keys = app.config.get_per('accounts', self.name, + 'attached_gpg_keys').split() + if jid in attached_keys: + contact.keyID = attached_keys[attached_keys.index(jid) + 1] + else: + # Do not override assigned key + contact.keyID = event.keyID + contact.idle_time = event.idle_time + + event.contact = contact + + # It's not an agent + if event.old_show == 0 and event.new_show > 1: + if not jid in app.newly_added[self.name]: + app.newly_added[self.name].append(jid) + if jid in app.to_be_removed[self.name]: + app.to_be_removed[self.name].remove(jid) + elif event.old_show > 1 and event.new_show == 0 and self.connected > 1: + if not jid in app.to_be_removed[self.name]: + app.to_be_removed[self.name].append(jid) + if jid in app.newly_added[self.name]: + app.newly_added[self.name].remove(jid) + + if event.ptype == 'unavailable': + # TODO: This causes problems when another + # resource signs off! + self.stop_all_active_file_transfers(contact) def _on_name_conflictCB(self, alt_name): self.disconnect() @@ -208,9 +288,7 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): nickname=self.roster.getName(jid), sub='both', ask='no', groups=self.roster.getGroups(jid), avatar_sha=None)) - app.nec.push_incoming_event(ZeroconfPresenceReceivedEvent( - None, conn=self, fjid=jid, show=self.roster.getStatus(jid), - status=self.roster.getMessage(jid))) + self._on_presence(jid) self.connected = STATUS_LIST.index(show) ===================================== gajim/gtk/add_contact.py ===================================== @@ -115,7 +115,8 @@ class AddNewContactWindow(Gtk.ApplicationWindow): if account: for service in self.agents[type_]: - app.connections[account].request_gateway_prompt(service) + con = app.connections[account] + con.get_module('Gateway').request_gateway_prompt(service) self.protocol_combobox.set_active(0) self.auto_authorize_checkbutton.show() @@ -246,8 +247,8 @@ class AddNewContactWindow(Gtk.ApplicationWindow): transport = model[row][0] if self.account and not self.jid_escaped: self.adding_jid = (jid, transport, type_) - app.connections[self.account].request_gateway_prompt( - transport, jid) + con = app.connections[self.account] + con.get_module('Gateway').request_gateway_prompt(transport, jid) else: jid = jid.replace('@', '%') + '@' + transport self._add_jid(jid, type_) ===================================== gajim/gui_interface.py ===================================== @@ -87,7 +87,7 @@ from gajim.common import passwords from gajim.common import logging_helpers from gajim.common.i18n import _ from gajim.common.connection_handlers_events import ( - OurShowEvent, FileRequestErrorEvent, FileTransferCompletedEvent, + OurShowEvent, FileTransferCompletedEvent, UpdateRosterAvatarEvent, UpdateGCAvatarEvent, UpdateRoomAvatarEvent) from gajim.common.modules.httpupload import HTTPUploadProgressEvent @@ -199,38 +199,11 @@ class Interface: 'id': obj.iq_id}, sec_msg, on_response_yes=(on_yes, obj), on_response_no=(response, obj, 'no')) - def handle_event_iq_error(self, obj): - #('ERROR_ANSWER', account, (id_, fjid, errmsg, errcode)) - if str(obj.errcode) in ('400', '403', '406') and obj.id_: - # show the error dialog - sid = obj.id_ - if len(obj.id_) > 3 and obj.id_[2] == '_': - sid = obj.id_[3:] - file_props = FilesProp.getFileProp(obj.conn.name, sid) - if file_props: - if str(obj.errcode) == '400': - file_props.error = -3 - else: - file_props.error = -4 - app.nec.push_incoming_event(FileRequestErrorEvent(None, - conn=obj.conn, jid=obj.jid, file_props=file_props, - error_msg=obj.errmsg)) - obj.conn.disconnect_transfer(file_props) - return - elif str(obj.errcode) == '404': - sid = obj.id_ - if len(obj.id_) > 3 and obj.id_[2] == '_': - sid = obj.id_[3:] - file_props = FilesProp.getFileProp(obj.conn.name, sid) - if file_props: - self.handle_event_file_send_error(obj.conn.name, (obj.fjid, - file_props)) - obj.conn.disconnect_transfer(file_props) - return - - ctrl = self.msg_win_mgr.get_control(obj.fjid, obj.conn.name) + def handle_event_iq_error(self, event): + ctrl = self.msg_win_mgr.get_control(event.properties.jid.getBare(), + event.account) if ctrl and ctrl.type_id == message_control.TYPE_GC: - ctrl.print_conversation('Error %s: %s' % (obj.errcode, obj.errmsg)) + ctrl.print_conversation('Error: %s' % event.properties.error) @staticmethod def handle_event_connection_lost(obj): @@ -739,25 +712,23 @@ class Interface: def handle_event_bookmarks(self, obj): gui_menu_builder.build_bookmark_menu(obj.account) - def handle_event_file_send_error(self, account, array): - jid = array[0] - file_props = array[1] + def handle_event_file_send_error(self, event): ft = self.instances['file_transfers'] - ft.set_status(file_props, 'stop') + ft.set_status(event.file_props, 'stop') - if helpers.allow_popup_window(account): - ft.show_send_error(file_props) + if helpers.allow_popup_window(event.account): + ft.show_send_error(event.file_props) return - event = events.FileSendErrorEvent(file_props) - self.add_event(account, jid, event) + event = events.FileSendErrorEvent(event.file_props) + self.add_event(event.account, event.jid, event) - if helpers.allow_showing_notification(account): + if helpers.allow_showing_notification(event.account): event_type = _('File Transfer Error') app.notification.popup( - event_type, jid, account, + event_type, event.jid, event.account, 'file-send-error', 'gajim-ft_error', - event_type, file_props.name) + event_type, event.file_props.name) def handle_event_file_request_error(self, obj): # ('FILE_REQUEST_ERROR', account, (jid, file_props, error_msg)) @@ -1383,7 +1354,7 @@ class Interface: def create_core_handlers_list(self): self.handlers = { 'DB_ERROR': [self.handle_event_db_error], - 'FILE_SEND_ERROR': [self.handle_event_file_send_error], + 'file-send-error': [self.handle_event_file_send_error], 'pep-received': [self.handle_atom_entry], 'bad-gpg-passphrase': [self.handle_event_bad_gpg_passphrase], 'bookmarks-received': [self.handle_event_bookmarks], ===================================== gajim/roster_window.py ===================================== @@ -2774,7 +2774,7 @@ class RosterWindow: def remove(list_): for (contact, account) in list_: full_jid = contact.get_full_jid() - app.connections[account].unsubscribe_agent(full_jid) + app.connections[account].get_module('Gateway').unsubscribe(full_jid) # remove transport from treeview self.remove_contact(contact.jid, account, backend=True) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b37c578504cb930f55916074c0593a7b7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b37c578504cb930f55916074c0593a7b7… You're receiving this email because of your account on dev.gajim.org.

1 0

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

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits January 2019