Commits July 2018

commits@gajim.org

1 participants
87 discussions

[Git][gajim/gajim][master] Filetransfer UI: remove deprecated properties
by Philipp Hörist 08 Jul '18

08 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: dbb4c531 by André Apitzsch at 2018-07-08T22:48:28+02:00 Filetransfer UI: remove deprecated properties - - - - - 1 changed file: - gajim/data/gui/filetransfers.ui Changes: ===================================== gajim/data/gui/filetransfers.ui ===================================== --- a/gajim/data/gui/filetransfers.ui +++ b/gajim/data/gui/filetransfers.ui @@ -53,26 +53,6 @@ </object> </child> </object> - <object class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">gtk-clear</property> - </object> - <object class="GtkImage" id="image2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">media-playback-pause</property> - </object> - <object class="GtkImage" id="image3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">gtk-cancel</property> - </object> - <object class="GtkImage" id="image4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">gtk-close</property> - </object> <object class="GtkWindow" id="file_transfers_window"> <property name="can_focus">False</property> <property name="border_width">12</property> @@ -134,8 +114,7 @@ <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Removes completed, cancelled and failed file transfers from the list</property> - <property name="image">image1</property> + <property name="tooltip_text" translatable="yes">Remove completed, cancelled and failed file transfers from the list</property> <property name="use_underline">True</property> <signal name="clicked" handler="on_cleanup_button_clicked" swapped="no"/> <child internal-child="accessible"> @@ -159,7 +138,6 @@ <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> - <property name="image">image2</property> <property name="use_underline">True</property> <signal name="clicked" handler="on_pause_restore_button_clicked" swapped="no"/> </object> @@ -177,8 +155,7 @@ <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Cancels the selected file transfer and removes incomplete files</property> - <property name="image">image3</property> + <property name="tooltip_text" translatable="yes">Cancel the selected file transfer and remove incomplete files</property> <property name="use_underline">True</property> <signal name="clicked" handler="on_cancel_button_clicked" swapped="no"/> <child internal-child="accessible"> @@ -202,8 +179,7 @@ <property name="has_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Hides the window</property> - <property name="image">image4</property> + <property name="tooltip_text" translatable="yes">Hide the window</property> <property name="use_underline">True</property> <signal name="clicked" handler="on_close_button_clicked" swapped="no"/> </object> @@ -228,7 +204,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="xalign">0.5</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_notify_ft_complete_checkbox_toggled" swapped="no"/> <child internal-child="accessible"> View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/dbb4c5318c8aaf3fa131b4be4751ea4465… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/dbb4c5318c8aaf3fa131b4be4751ea4465… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fallback to account name when label is missing
by Philipp Hörist 08 Jul '18

08 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: c25a4a0a by Philipp Hörist at 2018-07-08T21:28:02+02:00 Fallback to account name when label is missing Fixes #9236 - - - - - 1 changed file: - gajim/common/app.py Changes: ===================================== gajim/common/app.py ===================================== --- a/gajim/common/app.py +++ b/gajim/common/app.py @@ -397,7 +397,8 @@ def get_enabled_accounts_with_labels(exclude_local=True): accounts = [] for acc in connections: if not exclude_local or acc != 'Local': - acc_label = config.get_per('accounts', acc, 'account_label') + acc_label = config.get_per( + 'accounts', acc, 'account_label') or acc accounts.append([acc, acc_label]) accounts.sort(key=lambda xs: str.lower(xs[1])) return accounts View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c25a4a0aabbaa8145bb1319c18d387f467… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c25a4a0aabbaa8145bb1319c18d387f467… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fixes account box with one account is shown
by Philipp Hörist 08 Jul '18

08 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0750d6f6 by Sophie Herold at 2018-07-08T19:50:49+02:00 Fixes account box with one account is shown - - - - - 2 changed files: - gajim/data/gui/join_groupchat_window.ui - gajim/dialogs.py Changes: ===================================== gajim/data/gui/join_groupchat_window.ui ===================================== --- a/gajim/data/gui/join_groupchat_window.ui +++ b/gajim/data/gui/join_groupchat_window.ui @@ -101,7 +101,7 @@ </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">9</property> + <property name="top_attach">8</property> </packing> </child> <child> @@ -118,14 +118,16 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">9</property> + <property name="top_attach">8</property> </packing> </child> <child> <object class="GtkLabel" id="account_label"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="no_show_all">True</property> <property name="halign">end</property> + <property name="margin_bottom">12</property> <property name="label" translatable="yes">Account</property> <property name="justify">right</property> <style> @@ -150,7 +152,7 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">3</property> + <property name="top_attach">2</property> </packing> </child> <child> @@ -166,7 +168,7 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="top_attach">1</property> </packing> </child> <child> @@ -183,7 +185,7 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">4</property> + <property name="top_attach">3</property> </packing> </child> <child> @@ -195,7 +197,7 @@ </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">6</property> + <property name="top_attach">5</property> </packing> </child> <child> @@ -211,7 +213,7 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">6</property> + <property name="top_attach">5</property> </packing> </child> <child> @@ -226,7 +228,7 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">5</property> + <property name="top_attach">4</property> </packing> </child> <child> @@ -241,7 +243,7 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">7</property> + <property name="top_attach">6</property> </packing> </child> <child> @@ -256,7 +258,7 @@ </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">8</property> + <property name="top_attach">7</property> </packing> </child> <child> @@ -273,28 +275,15 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">8</property> - </packing> - </child> - <child> - <object class="GtkBox"> - <property name="height_request">6</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="top_attach">7</property> </packing> </child> <child> <object class="GtkComboBox" id="account_combo"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="margin_bottom">12</property> <property name="model">account_liststore</property> <property name="id_column">0</property> <signal name="changed" handler="_on_account_combo_changed" swapped="no"/> @@ -320,7 +309,7 @@ </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">4</property> + <property name="top_attach">3</property> </packing> </child> <child> @@ -386,7 +375,7 @@ </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">3</property> + <property name="top_attach">2</property> </packing> </child> <child> @@ -404,7 +393,7 @@ </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">2</property> + <property name="top_attach">1</property> </packing> </child> <child> @@ -413,9 +402,6 @@ <child> <placeholder/> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">False</property> ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -2375,10 +2375,10 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): app.ged.register_event_handler('agent-info-error-received', ged.GUI1, self._nec_agent_info_error_received) - # Show account combobox if there is more than one account - if len(accounts) > 1: - self.account_combo.show() - self.account_label.show() + # Hide account combobox if there is only one account + if len(accounts) == 1: + self.account_combo.hide() + self.account_label.hide() self.account_combo.set_active_id(self.account) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0750d6f6efd42d7f14ea68d93e9bcb2d52… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0750d6f6efd42d7f14ea68d93e9bcb2d52… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix JoinGroupchat hotkey if zeroconf is active
by Philipp Hörist 08 Jul '18

08 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3438b060 by Philipp Hörist at 2018-07-08T19:50:27+02:00 Fix JoinGroupchat hotkey if zeroconf is active - - - - - 1 changed file: - gajim/roster_window.py Changes: ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -5521,9 +5521,10 @@ class RosterWindow: """ # find a connected account: for account in app.connections: + if account == 'Local': + continue if app.account_is_connected(account): - break - self.on_join_gc_activate(None, account) + self.on_join_gc_activate(None, account) return True def fill_column(self, col): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3438b06069bc4470aa56dfc8562d953e4b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3438b06069bc4470aa56dfc8562d953e4b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Refactor AdHocCommands into own module
by Philipp Hörist 08 Jul '18

08 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: a2d7283e by Philipp Hörist at 2018-07-08T19:39:57+02:00 Refactor AdHocCommands into own module - - - - - 7 changed files: - gajim/adhoc_commands.py - − gajim/common/commands.py - gajim/common/connection_handlers.py - gajim/common/modules/__init__.py - + gajim/common/modules/adhoc_commands.py - gajim/common/zeroconf/connection_handlers_zeroconf.py - gajim/common/zeroconf/connection_zeroconf.py Changes: ===================================== gajim/adhoc_commands.py ===================================== --- a/gajim/adhoc_commands.py +++ b/gajim/adhoc_commands.py @@ -25,12 +25,12 @@ # FIXME: think if we need caching command list. it may be wrong if there will # be entities that often change the list, it may be slow to fetch it every time -from gi.repository import GLib from gi.repository import Gtk import nbxmpp from gajim.common import app from gajim.common import dataforms +from gajim.common import ged from gajim import gtkgui_helpers from gajim import dialogs @@ -55,7 +55,7 @@ class CommandWindow: """ # an account object - self.account = app.connections[account] + self._con = app.connections[account] self.jid = jid self.commandnode = commandnode self.data_form_widget = None @@ -87,6 +87,14 @@ class CommandWindow: column = Gtk.TreeViewColumn("Command", renderer, text=0) self.command_treeview.append_column(column) + app.ged.register_event_handler( + 'adhoc-command-error', ged.CORE, self._on_command_error) + app.ged.register_event_handler( + 'adhoc-command-list', ged.CORE, self._on_command_list) + app.ged.register_event_handler('adhoc-command-action-response', + ged.CORE, + self._on_action_response) + self.initiate() def initiate(self): @@ -157,8 +165,13 @@ class CommandWindow: return False def on_adhoc_commands_window_destroy(self, *anything): - # TODO: do all actions that are needed to remove this object from memory - pass + app.ged.remove_event_handler( + 'adhoc-command-error', ged.CORE, self._on_command_error) + app.ged.remove_event_handler( + 'adhoc-command-list', ged.CORE, self._on_command_list) + app.ged.remove_event_handler('adhoc-command-action-response', + ged.CORE, + self._on_action_response) def on_adhoc_commands_window_delete_event(self, *anything): if self.stage_window_delete_cb: @@ -190,7 +203,7 @@ class CommandWindow: self.finish_button.set_sensitive(False) # request command list - self.request_command_list() + self._con.get_module('AdHocCommands').request_command_list(self.jid) self.retrieving_commands_spinner.start() # setup the callbacks @@ -304,7 +317,8 @@ class CommandWindow: return def on_yes(button): - self.send_cancel() + self._con.get_module('AdHocCommands').send_cancel( + self.jid, self.commandnode, self.sessionid) dialog.destroy() cb() @@ -371,7 +385,9 @@ class CommandWindow: self.finish_button.set_sensitive(False) self.sending_form_spinner.start() - self.send_command(action) + self._con.get_module('AdHocCommands').send_command( + self.jid, self.commandnode, self.sessionid, + self.data_form_widget.data_form, action) def stage3_next_form(self, command): if not isinstance(command, nbxmpp.Node): @@ -527,85 +543,15 @@ class CommandWindow: def stage5_restart_button_clicked(self, widget): self.restart() -# handling xml stanzas - def request_command_list(self): - """ - Request the command list. Change stage on delivery - """ - query = nbxmpp.Iq(typ='get', to=nbxmpp.JID(self.jid), - queryNS=nbxmpp.NS_DISCO_ITEMS) - query.setQuerynode(nbxmpp.NS_COMMANDS) - - def callback(response): - '''Called on response to query.''' - # FIXME: move to connection_handlers.py - # is error => error stage - error = response.getError() - if error: - # extracting error description - self.stage5(errorid=error) - return - - # no commands => no commands stage - # commands => command selection stage - query = response.getTag('query') - if query and query.getAttr('node') == nbxmpp.NS_COMMANDS: - items = query.getTags('item') - else: - items = [] - if len(items)==0: - self.commandlist = [] - self.stage4() - else: - self.commandlist = [(t.getAttr('node'), t.getAttr('name')) \ - for t in items] - self.stage2() - - self.account.connection.SendAndCallForResponse(query, callback) - - def send_command(self, action='execute'): - """ - Send the command with data form. Wait for reply - """ - # create the stanza - assert action in ('execute', 'prev', 'next', 'complete') - - stanza = nbxmpp.Iq(typ='set', to=self.jid) - cmdnode = stanza.addChild('command', namespace=nbxmpp.NS_COMMANDS, - attrs={'node':self.commandnode, 'action':action}) + def _on_command_error(self, obj): + self.stage5(errorid=obj.error) - if self.sessionid: - cmdnode.setAttr('sessionid', self.sessionid) - - if self.data_form_widget.data_form: - cmdnode.addChild(node=self.data_form_widget.data_form.get_purged()) - - def callback(response): - # FIXME: move to connection_handlers.py - err = response.getError() - if err: - self.stage5(errorid = err) - else: - self.stage3_next_form(response.getTag('command')) - - self.account.connection.SendAndCallForResponse(stanza, callback) - - def send_cancel(self): - """ - Send the command with action='cancel' - """ - assert self.commandnode - if self.sessionid and self.account.connection: - # we already have sessionid, so the service sent at least one reply. - stanza = nbxmpp.Iq(typ='set', to=self.jid) - stanza.addChild('command', namespace=nbxmpp.NS_COMMANDS, attrs={ - 'node':self.commandnode, - 'sessionid':self.sessionid, - 'action':'cancel' - }) - - self.account.connection.send(stanza) + def _on_command_list(self, obj): + self.commandlist = obj.commandlist + if not self.commandlist: + self.stage4() else: - # we did not received any reply from service; - # FIXME: we should wait and then send cancel; for now we do nothing - pass + self.stage2() + + def _on_action_response(self, obj): + self.stage3_next_form(obj.command) ===================================== gajim/common/commands.py deleted ===================================== --- a/gajim/common/commands.py +++ /dev/null @@ -1,433 +0,0 @@ -# -*- coding:utf-8 -*- -## src/common/commands.py -## -## Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org> -## Copyright (C) 2006-2007 Tomasz Melcer <liori AT exroot.org> -## Copyright (C) 2007 Jean-Marie Traissard <jim AT lapin.org> -## Copyright (C) 2008 Brendan Taylor <whateley AT gmail.com> -## Stephan Erb <steve-e AT h3c.de> -## -## 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 nbxmpp -from gajim.common import helpers -from gajim.common import dataforms -from gajim.common import app - -import logging -log = logging.getLogger('gajim.c.commands') - -class AdHocCommand: - commandnode = 'command' - commandname = 'The Command' - commandfeatures = (nbxmpp.NS_DATA,) - - @staticmethod - def isVisibleFor(samejid): - """ - This returns True if that command should be visible and invokable for - others - - samejid - True when command is invoked by an entity with the same bare - jid. - """ - return True - - def __init__(self, conn, jid, sessionid): - self.connection = conn - self.jid = jid - self.sessionid = sessionid - - def buildResponse(self, request, status = 'executing', defaultaction = None, - actions = None): - assert status in ('executing', 'completed', 'canceled') - - response = request.buildReply('result') - cmd = response.getTag('command', namespace=nbxmpp.NS_COMMANDS) - cmd.setAttr('sessionid', self.sessionid) - cmd.setAttr('node', self.commandnode) - cmd.setAttr('status', status) - if defaultaction is not None or actions is not None: - if defaultaction is not None: - assert defaultaction in ('cancel', 'execute', 'prev', 'next', - 'complete') - attrs = {'action': defaultaction} - else: - attrs = {} - - cmd.addChild('actions', attrs, actions) - return response, cmd - - def badRequest(self, stanza): - self.connection.connection.send(nbxmpp.Error(stanza, - nbxmpp.NS_STANZAS + ' bad-request')) - - def cancel(self, request): - response = self.buildResponse(request, status = 'canceled')[0] - self.connection.connection.send(response) - return False # finish the session - -class ChangeStatusCommand(AdHocCommand): - commandnode = 'change-status' - commandname = _('Change status information') - - def __init__(self, conn, jid, sessionid): - AdHocCommand.__init__(self, conn, jid, sessionid) - self.cb = self.first_step - - @staticmethod - def isVisibleFor(samejid): - """ - Change status is visible only if the entity has the same bare jid - """ - return samejid - - def execute(self, request): - return self.cb(request) - - def first_step(self, request): - # first query... - response, cmd = self.buildResponse(request, defaultaction = 'execute', - actions = ['execute']) - - cmd.addChild(node = dataforms.SimpleDataForm( - title = _('Change status'), - instructions = _('Set the presence type and description'), - fields = [ - dataforms.Field('list-single', - var = 'presence-type', - label = 'Type of presence:', - options = [ - ('chat', _('Free for chat')), - ('online', _('Online')), - ('away', _('Away')), - ('xa', _('Extended away')), - ('dnd', _('Do not disturb')), - ('offline', _('Offline - disconnect'))], - value = 'online', - required = True), - dataforms.Field('text-multi', - var = 'presence-desc', - label = _('Presence description:'))])) - - self.connection.connection.send(response) - - # for next invocation - self.cb = self.second_step - - return True # keep the session - - def second_step(self, request): - # check if the data is correct - try: - form = dataforms.SimpleDataForm(extend = request.getTag('command').\ - getTag('x')) - except Exception: - self.badRequest(request) - return False - - try: - presencetype = form['presence-type'].value - if not presencetype in \ - ('chat', 'online', 'away', 'xa', 'dnd', 'offline'): - self.badRequest(request) - return False - except Exception: # KeyError if there's no presence-type field in form or - # AttributeError if that field is of wrong type - self.badRequest(request) - return False - - try: - presencedesc = form['presence-desc'].value - except Exception: # same exceptions as in last comment - presencedesc = '' - - response, cmd = self.buildResponse(request, status = 'completed') - cmd.addChild('note', {}, _('The status has been changed.')) - - # if going offline, we need to push response so it won't go into - # queue and disappear - self.connection.connection.send(response, now = presencetype == 'offline') - - # send new status - app.interface.roster.send_status(self.connection.name, presencetype, - presencedesc) - - return False # finish the session - -def find_current_groupchats(account): - from gajim import message_control - rooms = [] - for gc_control in app.interface.msg_win_mgr.get_controls( - message_control.TYPE_GC) + \ - app.interface.minimized_controls[account].values(): - acct = gc_control.account - # check if account is the good one - if acct != account: - continue - room_jid = gc_control.room_jid - nick = gc_control.nick - if room_jid in app.gc_connected[acct] and \ - app.gc_connected[acct][room_jid]: - rooms.append((room_jid, nick,)) - return rooms - - -class LeaveGroupchatsCommand(AdHocCommand): - commandnode = 'leave-groupchats' - commandname = _('Leave Groupchats') - - def __init__(self, conn, jid, sessionid): - AdHocCommand.__init__(self, conn, jid, sessionid) - self.cb = self.first_step - - @staticmethod - def isVisibleFor(samejid): - """ - Leave groupchats is visible only if the entity has the same bare jid - """ - return samejid - - def execute(self, request): - return self.cb(request) - - def first_step(self, request): - # first query... - response, cmd = self.buildResponse(request, defaultaction = 'execute', - actions=['execute']) - options = [] - account = self.connection.name - for gc in find_current_groupchats(account): - options.append(('%s' %(gc[0]), _('%(nickname)s on %(room_jid)s') % \ - {'nickname': gc[1], 'room_jid': gc[0]})) - if not len(options): - response, cmd = self.buildResponse(request, status = 'completed') - cmd.addChild('note', {}, _('You have not joined a groupchat.')) - - self.connection.connection.send(response) - return False - - cmd.addChild(node=dataforms.SimpleDataForm( - title = _('Leave Groupchats'), - instructions = _('Choose the groupchats you want to leave'), - fields=[ - dataforms.Field('list-multi', - var = 'groupchats', - label = _('Groupchats'), - options = options, - required = True)])) - - self.connection.connection.send(response) - - # for next invocation - self.cb = self.second_step - - return True # keep the session - - def second_step(self, request): - # check if the data is correct - try: - form = dataforms.SimpleDataForm(extend = request.getTag('command').\ - getTag('x')) - except Exception: - self.badRequest(request) - return False - - try: - gc = form['groupchats'].values - except Exception: # KeyError if there's no groupchats in form - self.badRequest(request) - return False - account = self.connection.name - try: - for room_jid in gc: - gc_control = app.interface.msg_win_mgr.get_gc_control(room_jid, - account) - if not gc_control: - gc_control = app.interface.minimized_controls[account]\ - [room_jid] - gc_control.shutdown() - app.interface.roster.remove_groupchat(room_jid, account) - continue - gc_control.parent_win.remove_tab(gc_control, None, force = True) - except Exception: # KeyError if there's no such room opened - self.badRequest(request) - return False - response, cmd = self.buildResponse(request, status = 'completed') - note = _('You left the following groupchats:') - for room_jid in gc: - note += '\n\t' + room_jid - cmd.addChild('note', {}, note) - - self.connection.connection.send(response) - return False - - -class ConnectionCommands: - """ - This class depends on that it is a part of Connection() class - """ - - def __init__(self): - # a list of all commands exposed: node -> command class - self.__commands = {} - if app.config.get('remote_commands'): - for cmdobj in (ChangeStatusCommand, LeaveGroupchatsCommand): - self.__commands[cmdobj.commandnode] = cmdobj - - # a list of sessions; keys are tuples (jid, sessionid, node) - self.__sessions = {} - - def getOurBareJID(self): - return app.get_jid_from_account(self.name) - - def isSameJID(self, jid): - """ - Test if the bare jid given is the same as our bare jid - """ - return nbxmpp.JID(jid).getStripped() == self.getOurBareJID() - - def commandListQuery(self, con, iq_obj): - iq = iq_obj.buildReply('result') - jid = helpers.get_full_jid_from_iq(iq_obj) - q = iq.getTag('query') - # buildReply don't copy the node attribute. Re-add it - q.setAttr('node', nbxmpp.NS_COMMANDS) - - for node, cmd in self.__commands.items(): - if cmd.isVisibleFor(self.isSameJID(jid)): - q.addChild('item', { - # TODO: find the jid - 'jid': self.getOurBareJID() + '/' + self.server_resource, - 'node': node, - 'name': cmd.commandname}) - - self.connection.send(iq) - - def commandInfoQuery(self, con, iq_obj): - """ - Send disco#info result for query for command (JEP-0050, example 6.). - Return True if the result was sent, False if not - """ - try: - jid = helpers.get_full_jid_from_iq(iq_obj) - except helpers.InvalidFormat: - log.warning('Invalid JID: %s, ignoring it' % iq_obj.getFrom()) - return - node = iq_obj.getTagAttr('query', 'node') - - if node not in self.__commands: return False - - cmd = self.__commands[node] - if cmd.isVisibleFor(self.isSameJID(jid)): - iq = iq_obj.buildReply('result') - q = iq.getTag('query') - q.addChild('identity', attrs = {'type': 'command-node', - 'category': 'automation', - 'name': cmd.commandname}) - q.addChild('feature', attrs = {'var': nbxmpp.NS_COMMANDS}) - for feature in cmd.commandfeatures: - q.addChild('feature', attrs = {'var': feature}) - - self.connection.send(iq) - return True - - return False - - def commandItemsQuery(self, con, iq_obj): - """ - Send disco#items result for query for command. Return True if the result - was sent, False if not. - """ - jid = helpers.get_full_jid_from_iq(iq_obj) - node = iq_obj.getTagAttr('query', 'node') - - if node not in self.__commands: return False - - cmd = self.__commands[node] - if cmd.isVisibleFor(self.isSameJID(jid)): - iq = iq_obj.buildReply('result') - self.connection.send(iq) - return True - - return False - - def _CommandExecuteCB(self, con, iq_obj): - jid = helpers.get_full_jid_from_iq(iq_obj) - - cmd = iq_obj.getTag('command') - if cmd is None: return - - node = cmd.getAttr('node') - if node is None: return - - sessionid = cmd.getAttr('sessionid') - if sessionid is None: - # we start a new command session... only if we are visible for the jid - # and command exist - if node not in self.__commands.keys(): - self.connection.send( - nbxmpp.Error(iq_obj, nbxmpp.NS_STANZAS + ' item-not-found')) - raise nbxmpp.NodeProcessed - - newcmd = self.__commands[node] - if not newcmd.isVisibleFor(self.isSameJID(jid)): - return - - # generate new sessionid - sessionid = self.connection.getAnID() - - # create new instance and run it - obj = newcmd(conn = self, jid = jid, sessionid = sessionid) - rc = obj.execute(iq_obj) - if rc: - self.__sessions[(jid, sessionid, node)] = obj - raise nbxmpp.NodeProcessed - else: - # the command is already running, check for it - magictuple = (jid, sessionid, node) - if magictuple not in self.__sessions: - # we don't have this session... ha! - return - - action = cmd.getAttr('action') - obj = self.__sessions[magictuple] - - try: - if action == 'cancel': - rc = obj.cancel(iq_obj) - elif action == 'prev': - rc = obj.prev(iq_obj) - elif action == 'next': - rc = obj.next(iq_obj) - elif action == 'execute' or action is None: - rc = obj.execute(iq_obj) - elif action == 'complete': - rc = obj.complete(iq_obj) - else: - # action is wrong. stop the session, send error - raise AttributeError - except AttributeError: - # the command probably doesn't handle invoked action... - # stop the session, return error - del self.__sessions[magictuple] - return - - # delete the session if rc is False - if not rc: - del self.__sessions[magictuple] - - raise nbxmpp.NodeProcessed ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -42,7 +42,6 @@ from gajim.common import helpers from gajim.common import app from gajim.common import jingle_xtls from gajim.common.caps_cache import muc_caps_cache -from gajim.common.commands import ConnectionCommands from gajim.common.protocol.caps import ConnectionCaps from gajim.common.protocol.bytestream import ConnectionSocks5Bytestream from gajim.common.protocol.bytestream import ConnectionIBBytestream @@ -218,7 +217,7 @@ class ConnectionDisco: if not self.connection or self.connected < 2: return - if self.commandItemsQuery(con, iq_obj): + if self.get_module('AdHocCommands').command_items_query(iq_obj): raise nbxmpp.NodeProcessed node = iq_obj.getTagAttr('query', 'node') if node is None: @@ -226,7 +225,7 @@ class ConnectionDisco: self.connection.send(result) raise nbxmpp.NodeProcessed if node == nbxmpp.NS_COMMANDS: - self.commandListQuery(con, iq_obj) + self.get_module('AdHocCommands').command_list_query(iq_obj) raise nbxmpp.NodeProcessed def _DiscoverInfoGetCB(self, con, iq_obj): @@ -235,7 +234,7 @@ class ConnectionDisco: return node = iq_obj.getQuerynode() - if self.commandInfoQuery(con, iq_obj): + if self.get_module('AdHocCommands').command_info_query(iq_obj): raise nbxmpp.NodeProcessed id_ = iq_obj.getAttr('id') @@ -743,14 +742,12 @@ class ConnectionHandlersBase: return sess class ConnectionHandlers(ConnectionArchive313, -ConnectionSocks5Bytestream, ConnectionDisco, -ConnectionCommands, ConnectionCaps, +ConnectionSocks5Bytestream, ConnectionDisco, ConnectionCaps, ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): def __init__(self): ConnectionArchive313.__init__(self) ConnectionSocks5Bytestream.__init__(self) ConnectionIBBytestream.__init__(self) - ConnectionCommands.__init__(self) # Handle presences BEFORE caps app.nec.register_incoming_event(PresenceReceivedEvent) @@ -1339,8 +1336,6 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): nbxmpp.NS_MUC_ADMIN) con.RegisterHandler('iq', self._SecLabelCB, 'result', nbxmpp.NS_SECLABEL_CATALOG) - con.RegisterHandler('iq', self._CommandExecuteCB, 'set', - nbxmpp.NS_COMMANDS) con.RegisterHandler('iq', self._DiscoverInfoGetCB, 'get', nbxmpp.NS_DISCO_INFO) con.RegisterHandler('iq', self._DiscoverItemsGetCB, 'get', ===================================== gajim/common/modules/__init__.py ===================================== --- a/gajim/common/modules/__init__.py +++ b/gajim/common/modules/__init__.py @@ -18,6 +18,8 @@ from pathlib import Path log = logging.getLogger('gajim.c.m') +ZEROCONF_MODULES = ['adhoc_commands'] + imported_modules = [] _modules = {} @@ -31,12 +33,26 @@ for file in Path(__file__).parent.iterdir(): if file.stem == 'pep': # Register the PEP module first, because other modules # depend on it - imported_modules.insert(0, module) + imported_modules.insert(0, (module, file.stem)) else: - imported_modules.append(module) + imported_modules.append((module, file.stem)) class ModuleMock: + def __init__(self, name): + self._name = name + + # HTTPUpload + self.available = False + + # Blocking + self.blocked = [] + + # Privacy Lists + self.blocked_contacts = [] + self.blocked_groups = [] + self.blocked_all = False + def __getattr__(self, key): def _mock(self, *args, **kwargs): return @@ -48,7 +64,11 @@ def register(con, *args, **kwargs): return _modules[con.name] = {} for module in imported_modules: - instance, name = module.get_instance(con, *args, **kwargs) + mod, name = module + if con.name == 'Local': + if name not in ZEROCONF_MODULES: + continue + instance, name = mod.get_instance(con, *args, **kwargs) _modules[con.name][name] = instance @@ -60,7 +80,7 @@ def get(account, name): try: return _modules[account][name] except KeyError: - return ModuleMock() + return ModuleMock(name) def get_handlers(con): ===================================== gajim/common/modules/adhoc_commands.py ===================================== --- /dev/null +++ b/gajim/common/modules/adhoc_commands.py @@ -0,0 +1,573 @@ +# Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org> +# Copyright (C) 2006-2007 Tomasz Melcer <liori AT exroot.org> +# Copyright (C) 2007 Jean-Marie Traissard <jim AT lapin.org> +# Copyright (C) 2008 Brendan Taylor <whateley AT gmail.com> +# Stephan Erb <steve-e AT h3c.de> +# Copyright (C) 2018 Philipp Hörist <philipp AT hoerist.com> +# +# 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 logging +import nbxmpp + +from gajim.common import helpers +from gajim.common import dataforms +from gajim.common import app +from gajim.common.nec import NetworkIncomingEvent + +log = logging.getLogger('gajim.c.m.commands') + + +class AdHocCommand: + commandnode = 'command' + commandname = 'The Command' + commandfeatures = (nbxmpp.NS_DATA,) + + @staticmethod + def isVisibleFor(samejid): + """ + This returns True if that command should be visible and invokable for + others + + samejid - True when command is invoked by an entity with the same bare + jid. + """ + return True + + def __init__(self, conn, jid, sessionid): + self.connection = conn + self.jid = jid + self.sessionid = sessionid + + def buildResponse(self, request, status='executing', defaultaction=None, + actions=None): + assert status in ('executing', 'completed', 'canceled') + + response = request.buildReply('result') + cmd = response.getTag('command', namespace=nbxmpp.NS_COMMANDS) + cmd.setAttr('sessionid', self.sessionid) + cmd.setAttr('node', self.commandnode) + cmd.setAttr('status', status) + if defaultaction is not None or actions is not None: + if defaultaction is not None: + assert defaultaction in ('cancel', 'execute', 'prev', 'next', + 'complete') + attrs = {'action': defaultaction} + else: + attrs = {} + + cmd.addChild('actions', attrs, actions) + return response, cmd + + def badRequest(self, stanza): + self.connection.connection.send( + nbxmpp.Error(stanza, nbxmpp.NS_STANZAS + ' bad-request')) + + def cancel(self, request): + response = self.buildResponse(request, status='canceled')[0] + self.connection.connection.send(response) + return False # finish the session + + +class ChangeStatusCommand(AdHocCommand): + commandnode = 'change-status' + commandname = _('Change status information') + + def __init__(self, conn, jid, sessionid): + AdHocCommand.__init__(self, conn, jid, sessionid) + self.cb = self.first_step + + @staticmethod + def isVisibleFor(samejid): + """ + Change status is visible only if the entity has the same bare jid + """ + return samejid + + def execute(self, request): + return self.cb(request) + + def first_step(self, request): + # first query... + response, cmd = self.buildResponse(request, + defaultaction='execute', + actions=['execute']) + + cmd.addChild( + node=dataforms.SimpleDataForm( + title=_('Change status'), + instructions=_('Set the presence type and description'), + fields=[ + dataforms.Field( + 'list-single', + var='presence-type', + label='Type of presence:', + options=[ + ('chat', _('Free for chat')), + ('online', _('Online')), + ('away', _('Away')), + ('xa', _('Extended away')), + ('dnd', _('Do not disturb')), + ('offline', _('Offline - disconnect'))], + value='online', + required=True), + dataforms.Field( + 'text-multi', + var='presence-desc', + label=_('Presence description:')) + ] + ) + ) + + self.connection.connection.send(response) + + # for next invocation + self.cb = self.second_step + + return True # keep the session + + def second_step(self, request): + # check if the data is correct + try: + form = dataforms.SimpleDataForm( + extend=request.getTag('command').getTag('x')) + except Exception: + self.badRequest(request) + return False + + try: + presencetype = form['presence-type'].value + if presencetype not in ('chat', 'online', 'away', + 'xa', 'dnd', 'offline'): + self.badRequest(request) + return False + except Exception: + # KeyError if there's no presence-type field in form or + # AttributeError if that field is of wrong type + self.badRequest(request) + return False + + try: + presencedesc = form['presence-desc'].value + except Exception: # same exceptions as in last comment + presencedesc = '' + + response, cmd = self.buildResponse(request, status='completed') + cmd.addChild('note', {}, _('The status has been changed.')) + + # if going offline, we need to push response so it won't go into + # queue and disappear + self.connection.connection.send(response, + now=presencetype == 'offline') + + # send new status + app.interface.roster.send_status( + self.connection.name, presencetype, presencedesc) + + return False # finish the session + + +def find_current_groupchats(account): + from gajim import message_control + rooms = [] + for gc_control in app.interface.msg_win_mgr.get_controls( + message_control.TYPE_GC) + \ + app.interface.minimized_controls[account].values(): + acct = gc_control.account + # check if account is the good one + if acct != account: + continue + room_jid = gc_control.room_jid + nick = gc_control.nick + if (room_jid in app.gc_connected[acct] and + app.gc_connected[acct][room_jid]): + rooms.append((room_jid, nick,)) + return rooms + + +class LeaveGroupchatsCommand(AdHocCommand): + commandnode = 'leave-groupchats' + commandname = _('Leave Groupchats') + + def __init__(self, conn, jid, sessionid): + AdHocCommand.__init__(self, conn, jid, sessionid) + self.cb = self.first_step + + @staticmethod + def isVisibleFor(samejid): + """ + Leave groupchats is visible only if the entity has the same bare jid + """ + return samejid + + def execute(self, request): + return self.cb(request) + + def first_step(self, request): + # first query... + response, cmd = self.buildResponse(request, + defaultaction='execute', + actions=['execute']) + options = [] + account = self.connection.name + for gc in find_current_groupchats(account): + options.append( + ('%s' % gc[0], + _('%(nickname)s on %(room_jid)s') % {'nickname': gc[1], + 'room_jid': gc[0]})) + if not len(options): + response, cmd = self.buildResponse(request, status='completed') + cmd.addChild('note', {}, _('You have not joined a groupchat.')) + + self.connection.connection.send(response) + return False + + cmd.addChild( + node=dataforms.SimpleDataForm( + title=_('Leave Groupchats'), + instructions=_('Choose the groupchats you want to leave'), + fields=[ + dataforms.Field( + 'list-multi', + var='groupchats', + label=_('Groupchats'), + options=options, + required=True) + ] + ) + ) + + self.connection.connection.send(response) + + # for next invocation + self.cb = self.second_step + + return True # keep the session + + def second_step(self, request): + # check if the data is correct + try: + form = dataforms.SimpleDataForm( + extend=request.getTag('command').getTag('x')) + except Exception: + self.badRequest(request) + return False + + try: + gc = form['groupchats'].values + except Exception: # KeyError if there's no groupchats in form + self.badRequest(request) + return False + account = self.connection.name + try: + for room_jid in gc: + gc_control = app.interface.msg_win_mgr.get_gc_control( + room_jid, account) + if not gc_control: + gc_control = app.interface.minimized_controls[account][room_jid] + gc_control.shutdown() + app.interface.roster.remove_groupchat(room_jid, account) + continue + gc_control.parent_win.remove_tab(gc_control, None, force=True) + except Exception: # KeyError if there's no such room opened + self.badRequest(request) + return False + response, cmd = self.buildResponse(request, status='completed') + note = _('You left the following groupchats:') + for room_jid in gc: + note += '\n\t' + room_jid + cmd.addChild('note', {}, note) + + self.connection.connection.send(response) + return False + + +class AdHocCommands: + def __init__(self, con): + self._con = con + self._account = con.name + + self.handlers = [ + ('iq', self._execute_command_received, 'set', nbxmpp.NS_COMMANDS) + ] + + # a list of all commands exposed: node -> command class + self._commands = {} + if app.config.get('remote_commands'): + for cmdobj in (ChangeStatusCommand, LeaveGroupchatsCommand): + self._commands[cmdobj.commandnode] = cmdobj + + # a list of sessions; keys are tuples (jid, sessionid, node) + self._sessions = {} + + def get_own_bare_jid(self): + return self._con.get_own_jid().getStripped() + + def is_same_jid(self, jid): + """ + Test if the bare jid given is the same as our bare jid + """ + return nbxmpp.JID(jid).getStripped() == self.get_own_bare_jid() + + def command_list_query(self, stanza): + iq = stanza.buildReply('result') + jid = helpers.get_full_jid_from_iq(stanza) + q = iq.getTag('query') + # buildReply don't copy the node attribute. Re-add it + q.setAttr('node', nbxmpp.NS_COMMANDS) + + for node, cmd in self._commands.items(): + if cmd.isVisibleFor(self.is_same_jid(jid)): + q.addChild('item', { + # TODO: find the jid + 'jid': str(self._con.get_own_jid()), + 'node': node, + 'name': cmd.commandname}) + + self._con.connection.send(iq) + + def command_info_query(self, stanza): + """ + Send disco#info result for query for command (XEP-0050, example 6.). + Return True if the result was sent, False if not + """ + try: + jid = helpers.get_full_jid_from_iq(stanza) + except helpers.InvalidFormat: + log.warning('Invalid JID: %s, ignoring it' % stanza.getFrom()) + return + node = stanza.getTagAttr('query', 'node') + + if node not in self._commands: + return False + + cmd = self._commands[node] + if cmd.isVisibleFor(self.is_same_jid(jid)): + iq = stanza.buildReply('result') + q = iq.getTag('query') + q.addChild('identity', + attrs={'type': 'command-node', + 'category': 'automation', + 'name': cmd.commandname}) + q.addChild('feature', attrs={'var': nbxmpp.NS_COMMANDS}) + for feature in cmd.commandfeatures: + q.addChild('feature', attrs={'var': feature}) + + self._con.connection.send(iq) + return True + + return False + + def command_items_query(self, stanza): + """ + Send disco#items result for query for command. + Return True if the result was sent, False if not. + """ + jid = helpers.get_full_jid_from_iq(stanza) + node = stanza.getTagAttr('query', 'node') + + if node not in self._commands: + return False + + cmd = self._commands[node] + if cmd.isVisibleFor(self.is_same_jid(jid)): + iq = stanza.buildReply('result') + self._con.connection.send(iq) + return True + + return False + + def _execute_command_received(self, con, stanza): + jid = helpers.get_full_jid_from_iq(stanza) + + cmd = stanza.getTag('command') + if cmd is None: + log.error('Malformed stanza (no command node) %s', stanza) + raise nbxmpp.NodeProcessed + + node = cmd.getAttr('node') + if node is None: + log.error('Malformed stanza (no node attr) %s', stanza) + raise nbxmpp.NodeProcessed + + sessionid = cmd.getAttr('sessionid') + if sessionid is None: + # we start a new command session + # only if we are visible for the jid and command exist + if node not in self._commands.keys(): + self._con.connection.send( + nbxmpp.Error( + stanza, nbxmpp.NS_STANZAS + ' item-not-found')) + log.warning('Comand %s does not exist: %s', node, jid) + raise nbxmpp.NodeProcessed + + newcmd = self._commands[node] + if not newcmd.isVisibleFor(self.is_same_jid(jid)): + log.warning('Command not visible for jid: %s', jid) + raise nbxmpp.NodeProcessed + + # generate new sessionid + sessionid = self._con.connection.getAnID() + + # create new instance and run it + obj = newcmd(conn=self, jid=jid, sessionid=sessionid) + rc = obj.execute(stanza) + if rc: + self._sessions[(jid, sessionid, node)] = obj + log.info('Comand %s executed: %s', node, jid) + raise nbxmpp.NodeProcessed + else: + # the command is already running, check for it + magictuple = (jid, sessionid, node) + if magictuple not in self._sessions: + # we don't have this session... ha! + log.warning('Invalid session %s', magictuple) + raise nbxmpp.NodeProcessed + + action = cmd.getAttr('action') + obj = self._sessions[magictuple] + + try: + if action == 'cancel': + rc = obj.cancel(stanza) + elif action == 'prev': + rc = obj.prev(stanza) + elif action == 'next': + rc = obj.next(stanza) + elif action == 'execute' or action is None: + rc = obj.execute(stanza) + elif action == 'complete': + rc = obj.complete(stanza) + else: + # action is wrong. stop the session, send error + raise AttributeError + except AttributeError: + # the command probably doesn't handle invoked action... + # stop the session, return error + del self._sessions[magictuple] + log.warning('Wrong action %s %s', node, jid) + raise nbxmpp.NodeProcessed + + # delete the session if rc is False + if not rc: + del self._sessions[magictuple] + + raise nbxmpp.NodeProcessed + + def request_command_list(self, jid): + """ + Request the command list. + """ + log.info('Request Command List: %s', jid) + query = nbxmpp.Iq(typ='get', to=jid, queryNS=nbxmpp.NS_DISCO_ITEMS) + query.setQuerynode(nbxmpp.NS_COMMANDS) + + self._con.connection.SendAndCallForResponse( + query, self._command_list_received) + + def _command_list_received(self, stanza): + if not nbxmpp.isResultNode(stanza): + log.info('Error: %s', stanza.getError()) + + app.nec.push_incoming_event( + AdHocCommandError(None, conn=self._con, + error=stanza.getError())) + return + + items = stanza.getQueryPayload() + commandlist = [] + if items: + commandlist = [(t.getAttr('node'), t.getAttr('name')) for t in items] + + log.info('Received: %s', commandlist) + app.nec.push_incoming_event( + AdHocCommandListReceived( + None, conn=self._con, commandlist=commandlist)) + + def send_command(self, jid, node, session_id, + form, action='execute'): + """ + Send the command with data form. Wait for reply + """ + log.info('Send Command: %s %s %s %s', jid, node, session_id, action) + stanza = nbxmpp.Iq(typ='set', to=jid) + cmdnode = stanza.addChild('command', + namespace=nbxmpp.NS_COMMANDS, + attrs={'node': node, + 'action': action}) + + if session_id: + cmdnode.setAttr('sessionid', session_id) + + if form: + cmdnode.addChild(node=form.get_purged()) + + self._con.connection.SendAndCallForResponse( + stanza, self._action_response_received) + + def _action_response_received(self, stanza): + if not nbxmpp.isResultNode(stanza): + log.info('Error: %s', stanza.getError()) + + app.nec.push_incoming_event( + AdHocCommandError(None, conn=self._con, + error=stanza.getError())) + return + log.info('Received action response') + command = stanza.getTag('command') + app.nec.push_incoming_event( + AdHocCommandActionResponse( + None, conn=self._con, command=command)) + + def send_cancel(self, jid, node, session_id): + """ + Send the command with action='cancel' + """ + log.info('Cancel: %s %s %s', jid, node, session_id) + stanza = nbxmpp.Iq(typ='set', to=jid) + stanza.addChild('command', namespace=nbxmpp.NS_COMMANDS, + attrs={ + 'node': node, + 'sessionid': session_id, + 'action': 'cancel' + }) + + self._con.connection.SendAndCallForResponse( + stanza, self._cancel_result_received) + + def _cancel_result_received(self, stanza): + if not nbxmpp.isResultNode(stanza): + log.warning('Error: %s', stanza.getError()) + else: + log.info('Cancel successful') + + +class AdHocCommandError(NetworkIncomingEvent): + name = 'adhoc-command-error' + base_network_events = [] + + +class AdHocCommandListReceived(NetworkIncomingEvent): + name = 'adhoc-command-list' + base_network_events = [] + + +class AdHocCommandActionResponse(NetworkIncomingEvent): + name = 'adhoc-command-action-response' + base_network_events = [] + + +def get_instance(*args, **kwargs): + return AdHocCommands(*args, **kwargs), 'AdHocCommands' ===================================== gajim/common/zeroconf/connection_handlers_zeroconf.py ===================================== --- a/gajim/common/zeroconf/connection_handlers_zeroconf.py +++ b/gajim/common/zeroconf/connection_handlers_zeroconf.py @@ -26,7 +26,6 @@ import nbxmpp from gajim.common import app -from gajim.common.commands import ConnectionCommands from gajim.common.protocol.bytestream import ConnectionSocks5BytestreamZeroconf from gajim.common.connection_handlers_events import ZeroconfMessageReceivedEvent @@ -49,13 +48,12 @@ class ConnectionVcard: class ConnectionHandlersZeroconf(ConnectionVcard, -ConnectionSocks5BytestreamZeroconf, ConnectionCommands, +ConnectionSocks5BytestreamZeroconf, connection_handlers.ConnectionHandlersBase, connection_handlers.ConnectionJingle): def __init__(self): ConnectionVcard.__init__(self) ConnectionSocks5BytestreamZeroconf.__init__(self) - ConnectionCommands.__init__(self) connection_handlers.ConnectionJingle.__init__(self) connection_handlers.ConnectionHandlersBase.__init__(self) @@ -82,13 +80,13 @@ connection_handlers.ConnectionJingle): if not self.connection or self.connected < 2: return - if self.commandItemsQuery(con, iq_obj): + if self.get_module('AdHocCommands').command_items_query(iq_obj): raise nbxmpp.NodeProcessed node = iq_obj.getTagAttr('query', 'node') if node is None: result = iq_obj.buildReply('result') self.connection.send(result) raise nbxmpp.NodeProcessed - if node==nbxmpp.NS_COMMANDS: - self.commandListQuery(con, iq_obj) + if node == nbxmpp.NS_COMMANDS: + self.get_module('AdHocCommands').command_list_query(iq_obj) raise nbxmpp.NodeProcessed ===================================== gajim/common/zeroconf/connection_zeroconf.py ===================================== --- a/gajim/common/zeroconf/connection_zeroconf.py +++ b/gajim/common/zeroconf/connection_zeroconf.py @@ -47,6 +47,7 @@ from gi.repository import GLib from gajim.common.connection import CommonConnection from gajim.common import app from gajim.common import ged +from gajim.common import modules from gajim.common.zeroconf import client_zeroconf from gajim.common.zeroconf import zeroconf from gajim.common.zeroconf.connection_handlers_zeroconf import * @@ -69,6 +70,9 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): CommonConnection.__init__(self, name) self.is_zeroconf = True + # Register all modules + modules.register(self) + app.ged.register_event_handler('message-outgoing', ged.OUT_CORE, self._nec_message_outgoing) app.ged.register_event_handler('stanza-message-outgoing', ged.OUT_CORE, View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a2d7283e6e334417cd89512b5ac5efdd94… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a2d7283e6e334417cd89512b5ac5efdd94… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Register PEP module first
by Philipp Hörist 08 Jul '18

08 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 78d16c44 by Philipp Hörist at 2018-07-08T17:06:12+02:00 Register PEP module first Other modules depend on it - - - - - 1 changed file: - gajim/common/modules/__init__.py Changes: ===================================== gajim/common/modules/__init__.py ===================================== --- a/gajim/common/modules/__init__.py +++ b/gajim/common/modules/__init__.py @@ -28,7 +28,12 @@ for file in Path(__file__).parent.iterdir(): module = import_module('.%s' % file.stem, package='gajim.common.modules') if hasattr(module, 'get_instance'): log.info('Load module: %s', file.stem) - imported_modules.append(module) + if file.stem == 'pep': + # Register the PEP module first, because other modules + # depend on it + imported_modules.insert(0, module) + else: + imported_modules.append(module) class ModuleMock: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/78d16c44f3f9171a31add9e80e3f2658c0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/78d16c44f3f9171a31add9e80e3f2658c0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Refactor Privacy and Blocking into own modules
by Philipp Hörist 08 Jul '18

08 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: bd79fe62 by Philipp Hörist at 2018-07-08T16:44:14+02:00 Refactor Privacy and Blocking into own modules - - - - - 10 changed files: - gajim/common/connection.py - gajim/common/connection_handlers.py - gajim/common/connection_handlers_events.py - gajim/common/helpers.py - + gajim/common/modules/blocking.py - + gajim/common/modules/privacylists.py - gajim/dialogs.py - gajim/groupchat_control.py - gajim/roster_window.py - test/lib/gajim_mocks.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -103,11 +103,6 @@ class CommonConnection: self.priority = app.get_priority(name, 'offline') self.time_to_reconnect = None - self.blocked_list = [] - self.blocked_contacts = [] - self.blocked_groups = [] - self.blocked_all = False - self.seclabel_supported = False self.seclabel_catalogues = {} @@ -631,8 +626,6 @@ class Connection(CommonConnection, ConnectionHandlers): # Register all modules modules.register(self) - app.ged.register_event_handler('privacy-list-received', ged.CORE, - self._nec_privacy_list_received) app.ged.register_event_handler('agent-info-error-received', ged.CORE, self._nec_agent_info_error_received) app.ged.register_event_handler('agent-info-received', ged.CORE, @@ -651,8 +644,6 @@ class Connection(CommonConnection, ConnectionHandlers): ConnectionHandlers.cleanup(self) modules.unregister(self) - app.ged.remove_event_handler('privacy-list-received', ged.CORE, - self._nec_privacy_list_received) app.ged.remove_event_handler('agent-info-error-received', ged.CORE, self._nec_agent_info_error_received) app.ged.remove_event_handler('agent-info-received', ged.CORE, @@ -702,7 +693,7 @@ class Connection(CommonConnection, ConnectionHandlers): # Do not try to reco while we are already trying self.time_to_reconnect = None if self.connected < 2: # connection failed - log.debug('reconnect') + log.info('Reconnect') self.connected = 1 app.nec.push_incoming_event(OurShowEvent(None, conn=self, show='connecting')) @@ -710,12 +701,14 @@ class Connection(CommonConnection, ConnectionHandlers): self.on_connect_auth = self._discover_server_at_connection self.connect_and_init(self.old_show, self.status, self.USE_GPG) else: + log.info('Reconnect successfull') # reconnect succeeded self.time_to_reconnect = None self.retrycount = 0 # We are doing disconnect at so many places, better use one function in all def disconnect(self, on_purpose=False): + log.info('Disconnect: on_purpose: %s', on_purpose) app.interface.music_track_changed(None, None, self.name) self.get_module('PEP').reset_stored_publish() self.on_purpose = on_purpose @@ -798,7 +791,7 @@ class Connection(CommonConnection, ConnectionHandlers): # END disconnectedReconnCB def _connection_lost(self): - log.debug('_connection_lost') + log.info('_connection_lost') self.disconnect(on_purpose = False) if self.removing_account: return @@ -882,38 +875,6 @@ class Connection(CommonConnection, ConnectionHandlers): app.nec.push_incoming_event(RegisterAgentInfoReceivedEvent( None, conn=self, agent=data[0], config=conf, is_form=is_form)) - elif realm == nbxmpp.NS_PRIVACY: - if event == nbxmpp.features_nb.PRIVACY_LISTS_RECEIVED: - # data is (list) - app.nec.push_incoming_event(PrivacyListsReceivedEvent(None, - conn=self, lists_list=data)) - elif event == nbxmpp.features_nb.PRIVACY_LIST_RECEIVED: - # data is (resp) - if not data: - return - rules = [] - name = data.getTag('query').getTag('list').getAttr('name') - for child in data.getTag('query').getTag('list').getChildren(): - dict_item = child.getAttrs() - childs = [] - if 'type' in dict_item: - for scnd_child in child.getChildren(): - childs += [scnd_child.getName()] - rules.append({'action':dict_item['action'], - 'type':dict_item['type'], 'order':dict_item['order'], - 'value':dict_item['value'], 'child':childs}) - else: - for scnd_child in child.getChildren(): - childs.append(scnd_child.getName()) - rules.append({'action':dict_item['action'], - 'order':dict_item['order'], 'child':childs}) - app.nec.push_incoming_event(PrivacyListReceivedEvent(None, - conn=self, list_name=name, rules=rules)) - elif event == nbxmpp.features_nb.PRIVACY_LISTS_ACTIVE_DEFAULT: - # data is (dict) - app.nec.push_incoming_event(PrivacyListActiveDefaultEvent( - None, conn=self, active_list=data['active'], - default_list=data['default'])) def _select_next_host(self, hosts): """ @@ -952,6 +913,7 @@ class Connection(CommonConnection, ConnectionHandlers): if self.connection: return self.connection, '' + log.info('Connect') if self.sm.resuming and self.sm.location: # If resuming and server gave a location, connect from there hostname = self.sm.location @@ -1086,7 +1048,6 @@ class Connection(CommonConnection, ConnectionHandlers): app.config.set_per('proxies', p, 'type', 'bosh') app.config.set_per('proxies', p, 'bosh_uri', url) - def _connect_to_next_host(self, retry=False): log.debug('Connection to next host') if not self._hosts: @@ -1233,6 +1194,7 @@ class Connection(CommonConnection, ConnectionHandlers): if not self.connected: # We went offline during connecting process # FIXME - not possible, maybe it was when we used threads return + log.info('Connect successfull') _con_type = con_type if _con_type != self._current_type: log.info('Connecting to next host beacuse desired type is %s and returned is %s' @@ -1269,6 +1231,7 @@ class Connection(CommonConnection, ConnectionHandlers): msg=_('Connection with account %s has been lost. Retry ' 'connecting.') % self.name)) return + log.info('Connection accepted') self._hosts = [] self.connection_auto_accepted = False self.connected_hostname = self._current_host['host'] @@ -1389,6 +1352,7 @@ class Connection(CommonConnection, ConnectionHandlers): 'Retry connecting.') % self.name)) return + log.info('SSL Cert accepted') name = None if not app.config.get_per('accounts', self.name, 'anonymous_auth'): name = app.config.get_per('accounts', self.name, 'name') @@ -1420,6 +1384,7 @@ class Connection(CommonConnection, ConnectionHandlers): ConnectionHandlers._register_handlers(self, con, con_type) def __on_auth(self, con, auth): + log.info('auth') if not con: self.disconnect(on_purpose=True) app.nec.push_incoming_event(ConnectionLostEvent(None, conn=self, @@ -1472,207 +1437,11 @@ class Connection(CommonConnection, ConnectionHandlers): def add_lang(self, stanza): stanza.setAttr('xml:lang', i18n.LANG) - def get_privacy_lists(self): - if not app.account_is_connected(self.name): - return - nbxmpp.features_nb.getPrivacyLists(self.connection) - def send_keepalive(self): # nothing received for the last foo seconds if self.connection: self.connection.send(' ') - def get_active_default_lists(self): - if not app.account_is_connected(self.name): - return - nbxmpp.features_nb.getActiveAndDefaultPrivacyLists(self.connection) - - def del_privacy_list(self, privacy_list): - if not app.account_is_connected(self.name): - return - def _on_del_privacy_list_result(result): - if result: - app.nec.push_incoming_event(PrivacyListRemovedEvent(None, - conn=self, list_name=privacy_list)) - else: - app.nec.push_incoming_event(InformationEvent( - None, dialog_name='privacy-list-error', args=privacy_list)) - nbxmpp.features_nb.delPrivacyList(self.connection, privacy_list, - _on_del_privacy_list_result) - - def get_privacy_list(self, title): - if not app.account_is_connected(self.name): - return - nbxmpp.features_nb.getPrivacyList(self.connection, title) - - def set_privacy_list(self, listname, tags): - if not app.account_is_connected(self.name): - return - nbxmpp.features_nb.setPrivacyList(self.connection, listname, tags) - - def set_active_list(self, listname): - if not app.account_is_connected(self.name): - return - nbxmpp.features_nb.setActivePrivacyList(self.connection, listname, - 'active') - - def set_default_list(self, listname): - if not app.account_is_connected(self.name): - return - nbxmpp.features_nb.setDefaultPrivacyList(self.connection, listname) - - def build_privacy_rule(self, name, action, order=1): - """ - Build a Privacy rule stanza for invisibility - """ - iq = nbxmpp.Iq('set', nbxmpp.NS_PRIVACY, xmlns='') - l = iq.setQuery().setTag('list', {'name': name}) - i = l.setTag('item', {'action': action, 'order': str(order)}) - i.setTag('presence-out') - return iq - - def build_invisible_rule(self): - iq = nbxmpp.Iq('set', nbxmpp.NS_PRIVACY, xmlns='') - l = iq.setQuery().setTag('list', {'name': 'invisible'}) - if self.name in app.interface.status_sent_to_groups and \ - len(app.interface.status_sent_to_groups[self.name]) > 0: - for group in app.interface.status_sent_to_groups[self.name]: - i = l.setTag('item', {'type': 'group', 'value': group, - 'action': 'allow', 'order': '1'}) - i.setTag('presence-out') - if self.name in app.interface.status_sent_to_users and \ - len(app.interface.status_sent_to_users[self.name]) > 0: - for jid in app.interface.status_sent_to_users[self.name]: - i = l.setTag('item', {'type': 'jid', 'value': jid, - 'action': 'allow', 'order': '2'}) - i.setTag('presence-out') - i = l.setTag('item', {'action': 'deny', 'order': '3'}) - i.setTag('presence-out') - return iq - - def set_invisible_rule(self): - if not app.account_is_connected(self.name): - return - iq = self.build_invisible_rule() - self.connection.send(iq) - - def get_max_blocked_list_order(self): - max_order = 0 - for rule in self.blocked_list: - order = int(rule['order']) - if order > max_order: - max_order = order - return max_order - - def block_contacts(self, contact_list, message): - if self.privacy_default_list is None: - self.privacy_default_list = 'block' - if not self.privacy_rules_supported: - if self.blocking_supported: #XEP-0191 - iq = nbxmpp.Iq('set', xmlns='') - query = iq.setQuery(name='block') - query.setNamespace(nbxmpp.NS_BLOCKING) - for contact in contact_list: - query.addChild(name='item', attrs={'jid': contact.jid}) - self.connection.send(iq) - return - for contact in contact_list: - contact.show = 'offline' - self.send_custom_status('offline', message, contact.jid) - max_order = self.get_max_blocked_list_order() - new_rule = {'order': str(max_order + 1), - 'type': 'jid', - 'action': 'deny', - 'value': contact.jid} - self.blocked_list.append(new_rule) - self.blocked_contacts.append(contact.jid) - self.set_privacy_list(self.privacy_default_list, self.blocked_list) - if len(self.blocked_list) == 1: - self.set_default_list(self.privacy_default_list) - - def unblock_contacts(self, contact_list): - if not self.privacy_rules_supported: - if self.blocking_supported: #XEP-0191 - iq = nbxmpp.Iq('set', xmlns='') - query = iq.setQuery(name='unblock') - query.setNamespace(nbxmpp.NS_BLOCKING) - for contact in contact_list: - query.addChild(name='item', attrs={'jid': contact.jid}) - self.connection.send(iq) - return - self.new_blocked_list = [] - self.to_unblock = [] - for contact in contact_list: - self.to_unblock.append(contact.jid) - if contact.jid in self.blocked_contacts: - self.blocked_contacts.remove(contact.jid) - for rule in self.blocked_list: - if rule['action'] != 'deny' or rule['type'] != 'jid' \ - or rule['value'] not in self.to_unblock: - self.new_blocked_list.append(rule) - if len(self.new_blocked_list) == 0: - self.blocked_list = [] - self.blocked_contacts = [] - self.blocked_groups = [] - self.set_default_list('') - self.del_privacy_list(self.privacy_default_list) - else: - self.set_privacy_list(self.privacy_default_list, self.new_blocked_list) - if not app.interface.roster.regroup: - show = app.SHOW_LIST[self.connected] - else: # accounts merged - show = helpers.get_global_show() - if show == 'invisible': - return - for contact in contact_list: - self.send_custom_status(show, self.status, contact.jid) - # Send a presence Probe to get the current Status - probe = nbxmpp.Presence(contact.jid, 'probe', frm=self.get_own_jid()) - self.connection.send(probe) - - def block_group(self, group, contact_list, message): - if not self.privacy_rules_supported: - return - self.blocked_groups.append(group) - for contact in contact_list: - self.send_custom_status('offline', message, contact.jid) - max_order = self.get_max_blocked_list_order() - new_rule = {'order': str(max_order + 1), - 'type': 'group', - 'action': 'deny', - 'value': group} - self.blocked_list.append(new_rule) - self.set_privacy_list(self.privacy_default_list, self.blocked_list) - if len(self.blocked_list) == 1: - self.set_default_list(self.privacy_default_list) - - def unblock_group(self, group, contact_list): - if not self.privacy_rules_supported: - return - if group in self.blocked_groups: - self.blocked_groups.remove(group) - self.new_blocked_list = [] - for rule in self.blocked_list: - if rule['action'] != 'deny' or rule['type'] != 'group' or \ - rule['value'] != group: - self.new_blocked_list.append(rule) - if len(self.new_blocked_list) == 0: - self.blocked_list = [] - self.blocked_contacts = [] - self.blocked_groups = [] - self.set_default_list('') - self.del_privacy_list(self.privacy_default_list) - else: - self.set_privacy_list(self.privacy_default_list, self.new_blocked_list) - if not app.interface.roster.regroup: - show = app.SHOW_LIST[self.connected] - else: # accounts merged - show = helpers.get_global_show() - if show == 'invisible': - return - for contact in contact_list: - self.send_custom_status(show, self.status, contact.jid) - def send_invisible_presence(self, msg, signed, initial = False): if not app.account_is_connected(self.name): return @@ -1694,15 +1463,17 @@ class Connection(CommonConnection, ConnectionHandlers): self.connection.send(p) # try to set the privacy rule - iq = self.build_invisible_rule() - self.connection.SendAndCallForResponse(iq, self._continue_invisible, - {'msg': msg, 'signed': signed, 'initial': initial}) + iq = self.get_module('PrivacyLists').set_invisible_rule( + callback=self._continue_invisible, + msg=msg, + signed=signed, + initial=initial) def _continue_invisible(self, con, iq_obj, msg, signed, initial): if iq_obj.getType() == 'error': # server doesn't support privacy lists return # active the privacy rule - self.set_active_list('invisible') + self.get_module('PrivacyLists').set_active_list('invisible') self.connected = app.SHOW_LIST.index('invisible') self.status = msg priority = app.get_priority(self.name, 'invisible') @@ -1777,42 +1548,35 @@ class Connection(CommonConnection, ConnectionHandlers): if len(result_array) != 0: self._stun_servers = self._hosts = [i for i in result_array] - def _request_privacy(self): - if not app.account_is_connected(self.name) or not self.connection: - return - iq = nbxmpp.Iq('get', nbxmpp.NS_PRIVACY, xmlns='') - id_ = self.connection.getAnID() - iq.setID(id_) - self.awaiting_answers[id_] = (PRIVACY_ARRIVED, ) - self.connection.send(iq) - - def _request_blocking(self): - if not app.account_is_connected(self.name) or not self.connection: - return - iq = nbxmpp.Iq('get', xmlns=None) - iq.setQuery('blocklist').setNamespace(nbxmpp.NS_BLOCKING) - self.connection.send(iq) - def _continue_connection_request_privacy(self): if self.privacy_rules_supported: if not self.privacy_rules_requested: self.privacy_rules_requested = True - self._request_privacy() + self.get_module('PrivacyLists').get_privacy_lists( + self._received_privacy) else: - if self.continue_connect_info and self.continue_connect_info[0]\ - == 'invisible': + # Privacy lists not supported + log.info('Privacy Lists not supported') + self._received_privacy(False) + + def _received_privacy(self, result): + if not result: + if (self.continue_connect_info and + self.continue_connect_info[0] == 'invisible'): # Trying to login as invisible but privacy list not # supported self.disconnect(on_purpose=True) - app.nec.push_incoming_event(OurShowEvent(None, conn=self, - show='offline')) + app.nec.push_incoming_event(OurShowEvent( + None, conn=self, show='offline')) app.nec.push_incoming_event(InformationEvent( - None, dialog_name='invisibility-not-supported', args=self.name)) + None, dialog_name='invisibility-not-supported', + args=self.name)) return if self.blocking_supported: - self._request_blocking() - # Ask metacontacts before roster - self.get_metacontacts() + self.get_module('Blocking').get_blocking_list() + + # Ask metacontacts before roster + self.get_metacontacts() def _nec_agent_info_error_received(self, obj): if obj.conn.name != self.name: @@ -1937,7 +1701,7 @@ class Connection(CommonConnection, ConnectionHandlers): def _change_from_invisible(self): if self.privacy_rules_supported: - self.set_active_list('') + self.get_module('PrivacyLists').set_active_list(None) def _update_status(self, show, msg, idle_time=None): xmpp_show = helpers.get_xmpp_show(show) @@ -2156,43 +1920,6 @@ class Connection(CommonConnection, ConnectionHandlers): iq2.setAttr('to', to) self.connection.send(iq) - def _nec_privacy_list_received(self, obj): - roster = app.interface.roster - if obj.conn.name != self.name: - return - if obj.list_name != self.privacy_default_list: - return - self.blocked_contacts = [] - self.blocked_groups = [] - self.blocked_list = [] - self.blocked_all = False - for rule in obj.rules: - if rule['action'] == 'allow': - if not 'type' in rule: - self.blocked_all = False - elif rule['type'] == 'jid' and rule['value'] in \ - self.blocked_contacts: - self.blocked_contacts.remove(rule['value']) - elif rule['type'] == 'group' and rule['value'] in \ - self.blocked_groups: - self.blocked_groups.remove(rule['value']) - elif rule['action'] == 'deny': - if not 'type' in rule: - self.blocked_all = True - elif rule['type'] == 'jid' and rule['value'] not in \ - self.blocked_contacts: - self.blocked_contacts.append(rule['value']) - elif rule['type'] == 'group' and rule['value'] not in \ - self.blocked_groups: - self.blocked_groups.append(rule['value']) - self.blocked_list.append(rule) - - if 'type' in rule: - if rule['type'] == 'jid': - roster.draw_contact(rule['value'], self.name) - if rule['type'] == 'group': - roster.draw_group(rule['value'], self.name) - def bookmarks_available(self): if self.private_storage_supported: return True ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -771,8 +771,6 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): self.continue_connect_info = None - self.privacy_default_list = None - app.nec.register_incoming_event(StreamConflictReceivedEvent) app.nec.register_incoming_event(MessageReceivedEvent) app.nec.register_incoming_event(ArchivingErrorReceivedEvent) @@ -798,8 +796,6 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): ged.POSTGUI, self._nec_unsubscribed_presence_received_end) app.ged.register_event_handler('agent-removed', ged.CORE, self._nec_agent_removed) - app.ged.register_event_handler('blocking', ged.CORE, - self._nec_blocking) def cleanup(self): ConnectionHandlersBase.cleanup(self) @@ -823,7 +819,6 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): ged.POSTGUI, self._nec_unsubscribed_presence_received_end) app.ged.remove_event_handler('agent-removed', ged.CORE, self._nec_agent_removed) - app.ged.remove_event_handler('blocking', ged.CORE, self._nec_blocking) def add_sha(self, p, send_caps=True): p = self.get_module('VCardAvatars').add_update_node(p) @@ -912,21 +907,6 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): conn=self)) GLib.timeout_add_seconds(10, self.discover_servers) del self.awaiting_answers[id_] - elif self.awaiting_answers[id_][0] == PRIVACY_ARRIVED: - del self.awaiting_answers[id_] - if iq_obj.getType() != 'error': - for list_ in iq_obj.getQueryPayload(): - if list_.getName() == 'default': - self.privacy_default_list = list_.getAttr('name') - self.get_privacy_list(self.privacy_default_list) - break - # Ask metacontacts before roster - self.get_metacontacts() - else: - # That should never happen, but as it's blocking in the - # connection process, we don't take the risk - self.privacy_rules_supported = False - self._continue_connection_request_privacy() def _nec_iq_error_received(self, obj): if obj.conn.name != self.name: @@ -1181,27 +1161,6 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): app.nec.push_incoming_event(MucAdminReceivedEvent(None, conn=self, stanza=iq_obj)) - def _PrivacySetCB(self, con, iq_obj): - """ - Privacy lists (XEP 016) - - A list has been set. - """ - log.debug('PrivacySetCB') - if not self.connection or self.connected < 2: - return - result = iq_obj.buildReply('result') - q = result.getTag('query') - if q: - result.delChild(q) - self.connection.send(result) - - for list_ in iq_obj.getQueryPayload(): - if list_.getName() == 'list': - self.get_privacy_list(list_.getAttr('name')) - - raise nbxmpp.NodeProcessed - def _getRoster(self): log.debug('getRosterCB') if not self.connection: @@ -1342,42 +1301,6 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): jid_from = helpers.get_full_jid_from_iq(iq_obj) jingle_xtls.handle_new_cert(con, iq_obj, jid_from) - def _BlockingSetCB(self, con, iq_obj): - log.debug('_BlockingSetCB') - app.nec.push_incoming_event( - BlockingEvent(None, conn=self, stanza=iq_obj)) - reply = nbxmpp.Iq(typ='result', attrs={'id': iq_obj.getID()}, - to=iq_obj.getFrom(), frm=iq_obj.getTo(), xmlns=None) - self.connection.send(reply) - raise nbxmpp.NodeProcessed - - def _BlockingResultCB(self, con, iq_obj): - log.debug('_BlockingResultCB') - app.nec.push_incoming_event( - BlockingEvent(None, conn=self, stanza=iq_obj)) - raise nbxmpp.NodeProcessed - - def _nec_blocking(self, obj): - if obj.conn.name != self.name: - return - if obj.unblock_all: - self.blocked_contacts = [] - elif obj.blocklist: - self.blocked_contacts = obj.blocklist - else: - for jid in obj.blocked_jids: - if jid not in self.blocked_contacts: - self.blocked_contacts.append(jid) - contact_list = app.contacts.get_contacts(self.name, jid) - for contact in contact_list: - contact.show = 'offline' - for jid in obj.unblocked_jids: - if jid in self.blocked_contacts: - self.blocked_contacts.remove(jid) - # Send a presence Probe to get the current Status - probe = nbxmpp.Presence(jid, 'probe', frm=self.get_own_jid()) - self.connection.send(probe) - def _StreamCB(self, con, obj): log.debug('StreamCB') app.nec.push_incoming_event(StreamReceivedEvent(None, @@ -1422,7 +1345,7 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): nbxmpp.NS_DISCO_INFO) con.RegisterHandler('iq', self._DiscoverItemsGetCB, 'get', nbxmpp.NS_DISCO_ITEMS) - con.RegisterHandler('iq', self._PrivacySetCB, 'set', nbxmpp.NS_PRIVACY) + con.RegisterHandler('iq', self._ArchiveCB, ns=nbxmpp.NS_MAM_1) con.RegisterHandler('iq', self._ArchiveCB, ns=nbxmpp.NS_MAM_2) con.RegisterHandler('iq', self._JingleCB, 'result') @@ -1437,10 +1360,6 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): nbxmpp.NS_PUBKEY_PUBKEY) con.RegisterHandler('iq', self._PubkeyResultCB, 'result', nbxmpp.NS_PUBKEY_PUBKEY) - con.RegisterHandler('iq', self._BlockingSetCB, 'set', - nbxmpp.NS_BLOCKING) - con.RegisterHandler('iq', self._BlockingResultCB, 'result', - nbxmpp.NS_BLOCKING) for handler in modules.get_handlers(self): con.RegisterHandler(*handler) ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -1759,22 +1759,6 @@ class UniqueRoomIdNotSupportedEvent(nec.NetworkIncomingEvent): name = 'unique-room-id-not-supported' base_network_events = [] -class PrivacyListsReceivedEvent(nec.NetworkIncomingEvent): - name = 'privacy-lists-received' - base_network_events = [] - -class PrivacyListReceivedEvent(nec.NetworkIncomingEvent): - name = 'privacy-list-received' - base_network_events = [] - -class PrivacyListRemovedEvent(nec.NetworkIncomingEvent): - name = 'privacy-list-removed' - base_network_events = [] - -class PrivacyListActiveDefaultEvent(nec.NetworkIncomingEvent): - name = 'privacy-list-active-default' - base_network_events = [] - class NonAnonymousServerErrorEvent(nec.NetworkIncomingEvent): name = 'non-anonymous-server-error' base_network_events = [] @@ -2479,43 +2463,3 @@ class InformationEvent(nec.NetworkIncomingEvent): else: self.args = (self.args,) return True - -class BlockingEvent(nec.NetworkIncomingEvent): - name = 'blocking' - base_network_events = [] - - def init(self): - self.blocklist = [] - self.blocked_jids = [] - self.unblocked_jids = [] - self.unblock_all = False - - def generate(self): - block_list = self.stanza.getTag( - 'blocklist', namespace=nbxmpp.NS_BLOCKING) - if block_list is not None: - for item in block_list.getTags('item'): - self.blocklist.append(item.getAttr('jid')) - app.log('blocking').info( - 'Blocklist Received: %s', self.blocklist) - return True - - block_tag = self.stanza.getTag('block', namespace=nbxmpp.NS_BLOCKING) - if block_tag is not None: - for item in block_tag.getTags('item'): - self.blocked_jids.append(item.getAttr('jid')) - app.log('blocking').info( - 'Blocking Push - blocked JIDs: %s', self.blocked_jids) - - unblock_tag = self.stanza.getTag( - 'unblock', namespace=nbxmpp.NS_BLOCKING) - if unblock_tag is not None: - if not unblock_tag.getTags('item'): - self.unblock_all = True - app.log('blocking').info('Blocking Push - unblocked all') - return True - for item in unblock_tag.getTags('item'): - self.unblocked_jids.append(item.getAttr('jid')) - app.log('blocking').info( - 'Blocking Push - unblocked JIDs: %s', self.unblocked_jids) - return True ===================================== gajim/common/helpers.py ===================================== --- a/gajim/common/helpers.py +++ b/gajim/common/helpers.py @@ -1385,12 +1385,15 @@ def update_optional_features(account = None): app.connections[a].status) def jid_is_blocked(account, jid): - return ((jid in app.connections[account].blocked_contacts) or \ - app.connections[account].blocked_all) + con = app.connections[account] + return (jid in con.get_module('Blocking').blocked or + jid in con.get_module('PrivacyLists').blocked_contacts or + con.get_module('PrivacyLists').blocked_all) def group_is_blocked(account, group): - return ((group in app.connections[account].blocked_groups) or \ - app.connections[account].blocked_all) + con = app.connections[account] + return (group in con.get_module('PrivacyLists').blocked_groups or + con.get_module('PrivacyLists').blocked_all) def get_subscription_request_msg(account=None): s = app.config.get_per('accounts', account, 'subscription_request_msg') ===================================== gajim/common/modules/blocking.py ===================================== --- /dev/null +++ b/gajim/common/modules/blocking.py @@ -0,0 +1,156 @@ +# 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-0191: Blocking Command + +import logging + +import nbxmpp + +from gajim.common import app +from gajim.common.nec import NetworkIncomingEvent + +log = logging.getLogger('gajim.c.m.blocking') + + +class Blocking: + def __init__(self, con): + self._con = con + self._account = con.name + + self.blocked = [] + + self.handlers = [ + ('iq', self._blocking_push_received, 'set', nbxmpp.NS_BLOCKING) + ] + + def get_blocking_list(self): + iq = nbxmpp.Iq('get', nbxmpp.NS_BLOCKING) + iq.setQuery('blocklist') + log.info('Request list') + self._con.connection.SendAndCallForResponse( + iq, self._blocking_list_received) + + def _blocking_list_received(self, stanza): + if not nbxmpp.isResultNode(stanza): + log.info('Error: %s', stanza.getError()) + return + + self.blocked = [] + blocklist = stanza.getTag('blocklist', namespace=nbxmpp.NS_BLOCKING) + if blocklist is None: + log.error('No blocklist node') + return + + for item in blocklist.getTags('item'): + self.blocked.append(item.getAttr('jid')) + log.info('Received list: %s', self.blocked) + + app.nec.push_incoming_event( + BlockingEvent(None, conn=self._con, changed=self.blocked)) + + def _blocking_push_received(self, conn, stanza): + reply = stanza.buildReply('result') + childs = reply.getChildren() + for child in childs: + reply.delChild(child) + self._con.connection.send(reply) + + changed_list = [] + + unblock = stanza.getTag('unblock', namespace=nbxmpp.NS_BLOCKING) + if unblock is not None: + items = unblock.getTags('item') + if not items: + # Unblock all + changed_list = list(self.blocked) + self.blocked = [] + for jid in self.blocked: + self._presence_probe(jid) + log.info('Unblock all Push') + return + + for item in items: + # Unblock some contacts + jid = item.getAttr('jid') + changed_list.append(jid) + if jid not in self.blocked: + continue + self.blocked.remove(jid) + self._presence_probe(jid) + log.info('Unblock Push: %s', jid) + + block = stanza.getTag('block', namespace=nbxmpp.NS_BLOCKING) + if block is not None: + for item in block.getTags('item'): + jid = item.getAttr('jid') + if jid in self.blocked: + continue + changed_list.append(jid) + self.blocked.append(jid) + self._set_contact_offline(jid) + log.info('Block Push: %s', jid) + + app.nec.push_incoming_event( + BlockingEvent(None, conn=self._con, changed=changed_list)) + + raise nbxmpp.NodeProcessed + + def _set_contact_offline(self, jid): + contact_list = app.contacts.get_contacts(self._account, jid) + for contact in contact_list: + contact.show = 'offline' + + def _presence_probe(self, jid): + log.info('Presence probe: %s', jid) + # Send a presence Probe to get the current Status + probe = nbxmpp.Presence(jid, 'probe', frm=self._con.get_own_jid()) + self._con.connection.send(probe) + + def block(self, contact_list): + if not self._con.blocking_supported: + return + iq = nbxmpp.Iq('set', nbxmpp.NS_BLOCKING) + query = iq.setQuery(name='block') + + for contact in contact_list: + query.addChild(name='item', attrs={'jid': contact.jid}) + log.info('Block: %s', contact.jid) + self._con.connection.SendAndCallForResponse( + iq, self._default_result_handler, {}) + + def unblock(self, contact_list): + if not self._con.blocking_supported: + return + iq = nbxmpp.Iq('set', nbxmpp.NS_BLOCKING) + query = iq.setQuery(name='unblock') + + for contact in contact_list: + query.addChild(name='item', attrs={'jid': contact.jid}) + log.info('Unblock: %s', contact.jid) + self._con.connection.SendAndCallForResponse( + iq, self._default_result_handler, {}) + + def _default_result_handler(self, conn, stanza): + if not nbxmpp.isResultNode(stanza): + log.warning('Operation failed: %s', stanza.getError()) + + +class BlockingEvent(NetworkIncomingEvent): + name = 'blocking' + base_network_events = [] + + +def get_instance(*args, **kwargs): + return Blocking(*args, **kwargs), 'Blocking' ===================================== gajim/common/modules/privacylists.py ===================================== --- /dev/null +++ b/gajim/common/modules/privacylists.py @@ -0,0 +1,450 @@ +# 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-0016: Privacy Lists + +import logging + +import nbxmpp + +from gajim.common import app +from gajim.common import helpers +from gajim.common.nec import NetworkIncomingEvent +from gajim.common.connection_handlers_events import InformationEvent + + +log = logging.getLogger('gajim.c.m.privacylists') + + +class PrivacyLists: + def __init__(self, con): + self._con = con + self._account = con.name + + self.default_list = None + self.active_list = None + self.blocked_contacts = [] + self.blocked_groups = [] + self.blocked_list = [] + self.blocked_all = False + + self.handlers = [ + ('iq', self._list_push_received, 'set', nbxmpp.NS_PRIVACY) + ] + + def _list_push_received(self, con, stanza): + result = stanza.buildReply('result') + result.delChild(result.getTag('query')) + self._con.connection.send(result) + + for list_ in stanza.getQueryPayload(): + if list_.getName() == 'list': + name = list_.getAttr('name') + log.info('Received Push: %s', name) + self.get_privacy_list(name) + + raise nbxmpp.NodeProcessed + + def get_privacy_lists(self, callback=None): + log.info('Request lists') + iq = nbxmpp.Iq('get', nbxmpp.NS_PRIVACY) + self._con.connection.SendAndCallForResponse( + iq, self._privacy_lists_received, {'callback': callback}) + + def _privacy_lists_received(self, conn, stanza, callback): + lists = [] + new_default = None + result = nbxmpp.isResultNode(stanza) + if not result: + log.warning('List not available: %s', stanza.getError()) + else: + for list_ in stanza.getQueryPayload(): + name = list_.getAttr('name') + if list_.getName() == 'active': + self.active_list = name + elif list_.getName() == 'default': + new_default = name + else: + lists.append(name) + + log.info('Received lists: %s', lists) + + # Download default list if we dont have it + if self.default_list != new_default: + self.default_list = new_default + if new_default is not None: + log.info('Found new default list: %s', new_default) + self.get_privacy_list(new_default) + + if callback: + callback(result) + else: + app.nec.push_incoming_event( + PrivacyListsReceivedEvent(None, + conn=self._con, + active_list=self.active_list, + default_list=self.default_list, + lists=lists)) + + def get_privacy_list(self, name): + log.info('Request list: %s', name) + list_ = nbxmpp.Node('list', {'name': name}) + iq = nbxmpp.Iq('get', nbxmpp.NS_PRIVACY, payload=[list_]) + self._con.connection.SendAndCallForResponse( + iq, self._privacy_list_received) + + def _privacy_list_received(self, stanza): + if not nbxmpp.isResultNode(stanza): + log.warning('List not available: %s', stanza.getError()) + return + + rules = [] + list_ = stanza.getQueryPayload()[0] + name = list_.getAttr('name') + + for child in list_.getChildren(): + + item = child.getAttrs() + + childs = [] + for scnd_child in child.getChildren(): + childs.append(scnd_child.getName()) + + item['child'] = childs + if len(item) not in (3, 5): + log.warning('Wrong count of attrs: %s', stanza) + continue + rules.append(item) + + log.info('Received list: %s', name) + + if name == self.default_list: + self._default_list_received(rules) + + app.nec.push_incoming_event(PrivacyListReceivedEvent( + None, conn=self._con, list_name=name, rules=rules)) + + def del_privacy_list(self, name): + log.info('Remove list: %s', name) + + def _del_privacy_list_result(stanza): + if not nbxmpp.isResultNode(stanza): + log.warning('List deletion failed: %s', stanza.getError()) + app.nec.push_incoming_event(InformationEvent( + None, dialog_name='privacy-list-error', args=name)) + else: + app.nec.push_incoming_event(PrivacyListRemovedEvent( + None, conn=self._con, list_name=name)) + + node = nbxmpp.Node('list', {'name': name}) + iq = nbxmpp.Iq('set', nbxmpp.NS_PRIVACY, payload=[node]) + self._con.connection.SendAndCallForResponse( + iq, _del_privacy_list_result) + + def set_privacy_list(self, name, rules): + node = nbxmpp.Node('list', {'name': name}) + iq = nbxmpp.Iq('set', nbxmpp.NS_PRIVACY, payload=[node]) + for item in rules: + childs = item.get('child', []) + for child in childs: + node.setTag(child) + item.pop('child', None) + node.setTag('item', item) + log.info('Update list: %s %s', name, rules) + self._con.connection.SendAndCallForResponse( + iq, self._default_result_handler, {}) + + def _default_list_received(self, rules): + roster = app.interface.roster + + for rule in rules: + if rule['action'] == 'allow': + if 'type' not in rule: + self.blocked_all = False + + elif rule['type'] == 'jid': + if rule['value'] in self.blocked_contacts: + self.blocked_contacts.remove(rule['value']) + + elif rule['type'] == 'group': + if rule['value'] in self.blocked_groups: + self.blocked_groups.remove(rule['value']) + + elif rule['action'] == 'deny': + if 'type' not in rule: + self.blocked_all = True + + elif rule['type'] == 'jid': + if rule['value'] not in self.blocked_contacts: + self.blocked_contacts.append(rule['value']) + + elif rule['type'] == 'group': + if rule['value'] not in self.blocked_groups: + self.blocked_groups.append(rule['value']) + + self.blocked_list.append(rule) + + if 'type' in rule: + if rule['type'] == 'jid': + roster.draw_contact(rule['value'], self._account) + if rule['type'] == 'group': + roster.draw_group(rule['value'], self._account) + + def set_active_list(self, name=None): + log.info('Set active list: %s', name) + attr = {} + if name: + attr['name'] = name + node = nbxmpp.Node('active', attr) + iq = nbxmpp.Iq('set', nbxmpp.NS_PRIVACY, payload=[node]) + self._con.connection.SendAndCallForResponse( + iq, self._default_result_handler, {}) + + def set_default_list(self, name=None): + log.info('Set default list: %s', name) + attr = {} + if name: + attr['name'] = name + node = nbxmpp.Node('default', attr) + iq = nbxmpp.Iq('set', nbxmpp.NS_PRIVACY, payload=[node]) + self._con.connection.SendAndCallForResponse( + iq, self._default_result_handler, {}) + + def _default_result_handler(self, conn, stanza): + if not nbxmpp.isResultNode(stanza): + log.warning('Operation failed: %s', stanza.getError()) + + def _build_invisible_rule(self): + node = nbxmpp.Node('list', {'name': 'invisible'}) + iq = nbxmpp.Iq('set', nbxmpp.NS_PRIVACY, payload=[node]) + if self._account in app.interface.status_sent_to_groups and \ + len(app.interface.status_sent_to_groups[self._account]) > 0: + for group in app.interface.status_sent_to_groups[self._account]: + item = node.setTag('item', {'type': 'group', + 'value': group, + 'action': 'allow', + 'order': '1'}) + item.setTag('presence-out') + + if self._account in app.interface.status_sent_to_users and \ + len(app.interface.status_sent_to_users[self._account]) > 0: + for jid in app.interface.status_sent_to_users[self._account]: + item = node.setTag('item', {'type': 'jid', + 'value': jid, + 'action': 'allow', + 'order': '2'}) + item.setTag('presence-out') + + item = node.setTag('item', {'action': 'deny', 'order': '3'}) + item.setTag('presence-out') + return iq + + def set_invisible_rule(self, callback=None, **kwargs): + log.info('Update invisible list') + iq = self._build_invisible_rule() + if callback is None: + callback = self._default_result_handler + self._con.connection.SendAndCallForResponse( + iq, callback, kwargs) + + def _get_max_blocked_list_order(self): + max_order = 0 + for rule in self.blocked_list: + order = int(rule['order']) + if order > max_order: + max_order = order + return max_order + + def block_gc_contact(self, jid): + if jid in self.blocked_contacts: + return + log.info('Block GC contact: %s', jid) + + if self.default_list is None: + self.default_list = 'block' + + max_order = self._get_max_blocked_list_order() + new_rule = {'order': str(max_order + 1), + 'type': 'jid', + 'action': 'deny', + 'value': jid, + 'child': ['message', 'iq', 'presence-out']} + self.blocked_list.append(new_rule) + self.blocked_contacts.append(jid) + self.set_privacy_list(self.default_list, self.blocked_list) + if len(self.blocked_list) == 1: + self.set_default_list(self.default_list) + + def block_contacts(self, contact_list, message): + if not self._con.privacy_rules_supported: + self._con.get_module('Blocking').block(contact_list) + return + + if self.default_list is None: + self.default_list = 'block' + for contact in contact_list: + log.info('Block contacts: %s', contact.jid) + contact.show = 'offline' + self._con.send_custom_status('offline', message, contact.jid) + max_order = self._get_max_blocked_list_order() + new_rule = {'order': str(max_order + 1), + 'type': 'jid', + 'action': 'deny', + 'value': contact.jid} + self.blocked_list.append(new_rule) + self.blocked_contacts.append(contact.jid) + self.set_privacy_list(self.default_list, self.blocked_list) + if len(self.blocked_list) == 1: + self.set_default_list(self.default_list) + + def unblock_gc_contact(self, jid): + new_blocked_list = [] + # needed for draw_contact: + if jid not in self.blocked_contacts: + return + + self.blocked_contacts.remove(jid) + + log.info('Unblock GC contact: %s', jid) + for rule in self.blocked_list: + if rule['action'] != 'deny' or rule['type'] != 'jid' \ + or rule['value'] != jid: + new_blocked_list.append(rule) + + if len(new_blocked_list) == 0: + self.blocked_list = [] + self.blocked_contacts = [] + self.blocked_groups = [] + self.set_default_list(None) + self.del_privacy_list(self.default_list) + else: + self.set_privacy_list(self.default_list, new_blocked_list) + + def unblock_contacts(self, contact_list): + if not self._con.privacy_rules_supported: + self._con.get_module('Blocking').unblock(contact_list) + return + + new_blocked_list = [] + to_unblock = [] + for contact in contact_list: + log.info('Unblock contacts: %s', contact.jid) + to_unblock.append(contact.jid) + if contact.jid in self.blocked_contacts: + self.blocked_contacts.remove(contact.jid) + for rule in self.blocked_list: + if rule['action'] != 'deny' or rule['type'] != 'jid' \ + or rule['value'] not in to_unblock: + new_blocked_list.append(rule) + + if len(new_blocked_list) == 0: + self.blocked_list = [] + self.blocked_contacts = [] + self.blocked_groups = [] + self.set_default_list(None) + self.del_privacy_list(self.default_list) + else: + self.set_privacy_list(self.default_list, new_blocked_list) + if not app.interface.roster.regroup: + show = app.SHOW_LIST[self._con.connected] + else: # accounts merged + show = helpers.get_global_show() + if show == 'invisible': + return + for contact in contact_list: + self._con.send_custom_status(show, self._con.status, contact.jid) + self._presence_probe(contact.jid) + + def block_group(self, group, contact_list, message): + if not self._con.privacy_rules_supported: + return + if group in self.blocked_groups: + return + self.blocked_groups.append(group) + + log.info('Block group: %s', group) + + if self.default_list is None: + self.default_list = 'block' + + for contact in contact_list: + self._con.send_custom_status('offline', message, contact.jid) + + max_order = self._get_max_blocked_list_order() + new_rule = {'order': str(max_order + 1), + 'type': 'group', + 'action': 'deny', + 'value': group} + + self.blocked_list.append(new_rule) + self.set_privacy_list(self.default_list, self.blocked_list) + if len(self.blocked_list) == 1: + self.set_default_list(self.default_list) + + def unblock_group(self, group, contact_list): + if not self._con.privacy_rules_supported: + return + + if group not in self.blocked_groups: + return + self.blocked_groups.remove(group) + + log.info('Unblock group: %s', group) + new_blocked_list = [] + for rule in self.blocked_list: + if rule['action'] != 'deny' or rule['type'] != 'group' or \ + rule['value'] != group: + new_blocked_list.append(rule) + + if len(new_blocked_list) == 0: + self.blocked_list = [] + self.blocked_contacts = [] + self.blocked_groups = [] + self.set_default_list('') + self.del_privacy_list(self.default_list) + else: + self.set_privacy_list(self.default_list, new_blocked_list) + if not app.interface.roster.regroup: + show = app.SHOW_LIST[self._con.connected] + else: # accounts merged + show = helpers.get_global_show() + if show == 'invisible': + return + for contact in contact_list: + self._con.send_custom_status(show, self._con.status, contact.jid) + + def _presence_probe(self, jid): + log.info('Presence probe: %s', jid) + # Send a presence Probe to get the current Status + probe = nbxmpp.Presence(jid, 'probe', frm=self._con.get_own_jid()) + self._con.connection.send(probe) + + +class PrivacyListsReceivedEvent(NetworkIncomingEvent): + name = 'privacy-lists-received' + base_network_events = [] + + +class PrivacyListReceivedEvent(NetworkIncomingEvent): + name = 'privacy-list-received' + base_network_events = [] + + +class PrivacyListRemovedEvent(NetworkIncomingEvent): + name = 'privacy-list-removed' + base_network_events = [] + + +def get_instance(*args, **kwargs): + return PrivacyLists(*args, **kwargs), 'PrivacyLists' ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -4100,8 +4100,8 @@ class PrivacyListWindow: app.ged.register_event_handler('privacy-list-received', ged.GUI1, self._nec_privacy_list_received) - app.ged.register_event_handler('privacy-list-active-default', - ged.GUI1, self._nec_privacy_list_active_default) + app.ged.register_event_handler('privacy-lists-received', ged.GUI1, + self._nec_privacy_lists_received) self.window.show_all() self.add_edit_vbox.hide() @@ -4118,10 +4118,10 @@ class PrivacyListWindow: del app.interface.instances[self.account][key_name] app.ged.remove_event_handler('privacy-list-received', ged.GUI1, self._nec_privacy_list_received) - app.ged.remove_event_handler('privacy-list-active-default', - ged.GUI1, self._nec_privacy_list_active_default) + app.ged.remove_event_handler('privacy-lists-received', ged.GUI1, + self._nec_privacy_lists_received) - def _nec_privacy_list_active_default(self, obj): + def _nec_privacy_lists_received(self, obj): if obj.conn.name != self.account: return if obj.active_list == self.privacy_list_name: @@ -4166,7 +4166,8 @@ class PrivacyListWindow: self.privacy_list_active_checkbutton.set_sensitive(True) self.privacy_list_default_checkbutton.set_sensitive(True) self.reset_fields() - app.connections[self.account].get_active_default_lists() + con = app.connections[self.account] + con.get_module('PrivacyLists').get_privacy_lists() def _nec_privacy_list_received(self, obj): if obj.conn.name != self.account: @@ -4176,7 +4177,8 @@ class PrivacyListWindow: self.privacy_list_received(obj.rules) def refresh_rules(self): - app.connections[self.account].get_privacy_list(self.privacy_list_name) + con = app.connections[self.account] + con.get_module('PrivacyLists').get_privacy_list(self.privacy_list_name) def on_delete_rule_button_clicked(self, widget): model = self.list_of_rules_combobox.get_model() @@ -4186,8 +4188,9 @@ class PrivacyListWindow: for rule in self.global_rules: if rule != _rule: tags.append(self.global_rules[rule]) - app.connections[self.account].set_privacy_list( - self.privacy_list_name, tags) + con = app.connections[self.account] + con.get_module('PrivacyLists').set_privacy_list( + self.privacy_list_name, tags) self.privacy_list_received(tags) self.add_edit_vbox.hide() if not tags: # we removed latest rule @@ -4279,18 +4282,20 @@ class PrivacyListWindow: self.edit_send_status_checkbutton.set_sensitive(True) def on_privacy_list_active_checkbutton_toggled(self, widget): + name = None if widget.get_active(): - app.connections[self.account].set_active_list( - self.privacy_list_name) - else: - app.connections[self.account].set_active_list(None) + name = self.privacy_list_name + + con = app.connections[self.account] + con.get_module('PrivacyLists').set_active_list(name) def on_privacy_list_default_checkbutton_toggled(self, widget): + name = None if widget.get_active(): - app.connections[self.account].set_default_list( - self.privacy_list_name) - else: - app.connections[self.account].set_default_list(None) + name = self.privacy_list_name + + con = app.connections[self.account] + con.get_module('PrivacyLists').set_default_list(name) def on_new_rule_button_clicked(self, widget): self.reset_fields() @@ -4362,8 +4367,9 @@ class PrivacyListWindow: else: tags.append(current_tags) - app.connections[self.account].set_privacy_list( - self.privacy_list_name, tags) + con = app.connections[self.account] + con.get_module('PrivacyLists').set_privacy_list( + self.privacy_list_name, tags) self.refresh_rules() self.add_edit_vbox.hide() if 'privacy_lists' in app.interface.instances[self.account]: @@ -4419,7 +4425,7 @@ class PrivacyListsWindow: app.ged.register_event_handler('privacy-lists-received', ged.GUI1, self._nec_privacy_lists_received) - app.ged.register_event_handler('privacy-lists-removed', ged.GUI1, + app.ged.register_event_handler('privacy-list-removed', ged.GUI1, self._nec_privacy_lists_removed) self.window.show_all() @@ -4435,14 +4441,18 @@ class PrivacyListsWindow: del app.interface.instances[self.account]['privacy_lists'] app.ged.remove_event_handler('privacy-lists-received', ged.GUI1, self._nec_privacy_lists_received) - app.ged.remove_event_handler('privacy-lists-removed', ged.GUI1, + app.ged.remove_event_handler('privacy-list-removed', ged.GUI1, self._nec_privacy_lists_removed) def remove_privacy_list_from_combobox(self, privacy_list): if privacy_list not in self.privacy_lists_save: return - privacy_list_index = self.privacy_lists_save.index(privacy_list) - self.list_of_privacy_lists_combobox.remove_text(privacy_list_index) + + model = self.list_of_privacy_lists_combobox.get_model() + for entry in model: + if entry[0] == privacy_list: + model.remove(entry.iter) + self.privacy_lists_save.remove(privacy_list) def add_privacy_list_to_combobox(self, privacy_list): @@ -4477,32 +4487,32 @@ class PrivacyListsWindow: def on_delete_privacy_list_button_clicked(self, widget): active_list = self.privacy_lists_save[ self.list_of_privacy_lists_combobox.get_active()] - app.connections[self.account].del_privacy_list(active_list) + con = app.connections[self.account] + con.get_module('PrivacyLists').del_privacy_list(active_list) def privacy_list_removed(self, active_list): self.privacy_lists_save.remove(active_list) - self.privacy_lists_received({'lists': self.privacy_lists_save}) + self.privacy_lists_received(self.privacy_lists_save) def _nec_privacy_lists_removed(self, obj): if obj.conn.name != self.account: return - self.privacy_list_removed(obj.lists_list) + self.privacy_list_removed(obj.list_name) def privacy_lists_received(self, lists): - if not lists: - return privacy_lists = [] - for privacy_list in lists['lists']: + for privacy_list in lists: privacy_lists.append(privacy_list) self.draw_privacy_lists_in_combobox(privacy_lists) def _nec_privacy_lists_received(self, obj): if obj.conn.name != self.account: return - self.privacy_lists_received(obj.lists_list) + self.privacy_lists_received(obj.lists) def privacy_lists_refresh(self): - app.connections[self.account].get_privacy_lists() + con = app.connections[self.account] + con.get_module('PrivacyLists').get_privacy_lists() def on_new_privacy_list_button_clicked(self, widget): name = self.new_privacy_list_entry.get_text() ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -2919,46 +2919,15 @@ class GroupchatControl(ChatControlBase): def on_block(self, widget, nick): fjid = self.room_jid + '/' + nick - connection = app.connections[self.account] - default = connection.privacy_default_list - if fjid in connection.blocked_contacts: - return - max_order = connection.get_max_blocked_list_order() - new_rule = {'order': str(max_order + 1), 'type': 'jid', - 'action': 'deny', 'value' : fjid, 'child': ['message', 'iq', - 'presence-out']} - connection.blocked_list.append(new_rule) - connection.blocked_contacts.append(fjid) + con = app.connections[self.account] + con.get_module('PrivacyLists').block_gc_contact(fjid) self.draw_contact(nick) - connection.set_privacy_list(default, connection.blocked_list) - if len(connection.blocked_list) == 1: - connection.set_default_list(default) def on_unblock(self, widget, nick): fjid = self.room_jid + '/' + nick - connection = app.connections[self.account] - default = connection.privacy_default_list - connection.new_blocked_list = [] - # needed for draw_contact: - if fjid in connection.blocked_contacts: - connection.blocked_contacts.remove(fjid) + con = app.connections[self.account] + con.get_module('PrivacyLists').unblock_gc_contact(fjid) self.draw_contact(nick) - for rule in connection.blocked_list: - if rule['action'] != 'deny' or rule['type'] != 'jid' \ - or rule['value'] != fjid: - connection.new_blocked_list.append(rule) - - if len(connection.new_blocked_list) == 0: - connection.blocked_list = [] - connection.blocked_contacts = [] - connection.blocked_groups = [] - connection.set_default_list('') - connection.del_privacy_list(default) - if 'privay_list_block' in app.interface.instances[self.account]: - del app.interface.instances[self.account]\ - ['privay_list_block'] - else: - connection.set_privacy_list(default, connection.new_blocked_list) def on_voice_checkmenuitem_activate(self, widget, nick): if widget.get_active(): ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -2812,12 +2812,8 @@ class RosterWindow: on_response_ok = (remove, list_), transient_for=self.window) def _nec_blocking(self, obj): - if obj.unblock_all or obj.blocklist: - jids = app.contacts.get_jid_list(obj.conn.name) - self._idle_draw_jids_of_account(jids, obj.conn.name) - else: - for jid in obj.blocked_jids + obj.unblocked_jids: - self.draw_contact(jid, obj.conn.name) + for jid in obj.changed: + self.draw_contact(jid, obj.conn.name) def on_block(self, widget, list_, group=None): """ @@ -2834,13 +2830,15 @@ class RosterWindow: if group is None: for acct in accounts: l_ = [i[0] for i in list_ if i[1] == acct] - app.connections[acct].block_contacts(l_, msg) + con = app.connections[acct] + con.get_module('PrivacyLists').block_contacts(l_, msg) for contact in l_: self.draw_contact(contact.jid, acct) else: for acct in accounts: l_ = [i[0] for i in list_ if i[1] == acct] - app.connections[acct].block_group(group, l_, msg) + con = app.connections[acct] + con.get_module('PrivacyLists').block_group(group, l_, msg) self.draw_group(group, acct) for contact in l_: self.draw_contact(contact.jid, acct) @@ -2874,13 +2872,15 @@ class RosterWindow: if group is None: for acct in accounts: l_ = [i[0] for i in list_ if i[1] == acct] - app.connections[acct].unblock_contacts(l_) + con = app.connections[acct] + con.get_module('PrivacyLists').unblock_contacts(l_) for contact in l_: self.draw_contact(contact.jid, acct) else: for acct in accounts: l_ = [i[0] for i in list_ if i[1] == acct] - app.connections[acct].unblock_group(group, l_) + con = app.connections[acct] + con.get_module('PrivacyLists').unblock_group(group, l_) self.draw_group(group, acct) for contact in l_: self.draw_contact(contact.jid, acct) @@ -3462,7 +3462,8 @@ class RosterWindow: for account in account_list: if app.SHOW_LIST[app.connections[account].connected] == \ 'invisible': - app.connections[account].set_invisible_rule() + con = app.connections[account] + con.get_module('PrivacyLists').set_invisible_rule() # 3. send directed presence for (contact, account) in contact_list: ===================================== test/lib/gajim_mocks.py ===================================== --- a/test/lib/gajim_mocks.py +++ b/test/lib/gajim_mocks.py @@ -20,8 +20,6 @@ class MockConnection(Mock, ConnectionHandlers): self.connected = 2 self.pep = {} - self.blocked_contacts = {} - self.blocked_groups = {} self.sessions = {} self.nested_group_delimiter = '::' self.server_resource = 'Gajim' View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/bd79fe629f7fbaaead18694dd52b5bd56d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/bd79fe629f7fbaaead18694dd52b5bd56d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix method call
by Philipp Hörist 08 Jul '18

08 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3cfd82b0 by Philipp Hörist at 2018-07-08T10:31:05+02:00 Fix method call - - - - - 1 changed file: - gajim/common/connection.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -2467,7 +2467,7 @@ class Connection(CommonConnection, ConnectionHandlers): self.connection.send(iq) i = 0 self.get_module('Bookmarks').bookmarks.pop(jid, None) - self.store_bookmarks() + self.get_module('Bookmarks').store_bookmarks() def send_gc_status(self, nick, jid, show, status, auto=False): if not app.account_is_connected(self.name): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3cfd82b0c2a654cc860a3f6418e567179c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3cfd82b0c2a654cc860a3f6418e567179c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Fix pylint errors in dataforms module
by Philipp Hörist 07 Jul '18

07 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: af7ac921 by Philipp Hörist at 2018-07-07T19:36:24+02:00 Fix pylint errors in dataforms module - - - - - e918ac85 by Philipp Hörist at 2018-07-07T20:00:09+02:00 Remove streamhost redirect After asking around this is a dead feature. Because servers cannot be sure if clients support redirection, a server using this feature would essentially risk that his users are not able to connect at all. - - - - - 3a6f6670 by Philipp Hörist at 2018-07-07T20:01:47+02:00 Check if we have a nbxmpp Client object In some cases the XMPPDispatcher which handles the callbacks is not yet created. - - - - - 4 changed files: - gajim/common/connection.py - gajim/common/connection_handlers.py - gajim/common/connection_handlers_events.py - gajim/common/dataforms.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -593,7 +593,6 @@ class Connection(CommonConnection, ConnectionHandlers): self.connected_hostname = None # Holds the full jid we received on the bind event self.registered_name = None - self.redirected = None self.last_time_to_reconnect = None self.new_account_info = None self.new_account_form = None @@ -794,12 +793,7 @@ class Connection(CommonConnection, ConnectionHandlers): # show error dialog self._connection_lost() else: - if self.redirected: - self.disconnect(on_purpose=True) - self.connect() - return - else: - self.disconnect() + self.disconnect() self.on_purpose = False # END disconnectedReconnCB @@ -988,25 +982,21 @@ class Connection(CommonConnection, ConnectionHandlers): self.name, 'try_connecting_for_foo_secs') proxy = helpers.get_proxy_info(self.name) use_srv = app.config.get_per('accounts', self.name, 'use_srv') - if self.redirected: - use_custom = True - custom_h = self.redirected['host'] - custom_p = self.redirected['port'] - else: - use_custom = app.config.get_per('accounts', self.name, - 'use_custom_host') - if use_custom: - custom_h = app.config.get_per('accounts', self.name, - 'custom_host') - custom_p = app.config.get_per('accounts', self.name, - 'custom_port') - try: - helpers.idn_to_ascii(custom_h) - except Exception: - app.nec.push_incoming_event(InformationEvent( - None, dialog_name='invalid-custom-hostname', - args=custom_h)) - use_custom = False + + use_custom = app.config.get_per('accounts', self.name, + 'use_custom_host') + if use_custom: + custom_h = app.config.get_per('accounts', self.name, + 'custom_host') + custom_p = app.config.get_per('accounts', self.name, + 'custom_port') + try: + helpers.idn_to_ascii(custom_h) + except Exception: + app.nec.push_incoming_event(InformationEvent( + None, dialog_name='invalid-custom-hostname', + args=custom_h)) + use_custom = False # create connection if it doesn't already exist self.connected = 1 @@ -1018,10 +1008,8 @@ class Connection(CommonConnection, ConnectionHandlers): h = custom_h p = custom_p ssl_p = custom_p - if not self.redirected: - use_srv = False + use_srv = False - self.redirected = None # SRV resolver self._proxy = proxy self._hosts = [ @@ -1148,11 +1136,6 @@ class Connection(CommonConnection, ConnectionHandlers): self._current_host = host - if self.redirected: - self.disconnect(on_purpose=True) - self.connect() - return - self._current_type = self._current_host['type'] port = self._current_host['port'] ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -774,7 +774,6 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): self.privacy_default_list = None app.nec.register_incoming_event(StreamConflictReceivedEvent) - app.nec.register_incoming_event(StreamOtherHostReceivedEvent) app.nec.register_incoming_event(MessageReceivedEvent) app.nec.register_incoming_event(ArchivingErrorReceivedEvent) app.nec.register_incoming_event( @@ -799,8 +798,6 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): ged.POSTGUI, self._nec_unsubscribed_presence_received_end) app.ged.register_event_handler('agent-removed', ged.CORE, self._nec_agent_removed) - app.ged.register_event_handler('stream-other-host-received', ged.CORE, - self._nec_stream_other_host_received) app.ged.register_event_handler('blocking', ged.CORE, self._nec_blocking) @@ -826,8 +823,6 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): ged.POSTGUI, self._nec_unsubscribed_presence_received_end) app.ged.remove_event_handler('agent-removed', ged.CORE, self._nec_agent_removed) - app.ged.remove_event_handler('stream-other-host-received', ged.CORE, - self._nec_stream_other_host_received) app.ged.remove_event_handler('blocking', ged.CORE, self._nec_blocking) def add_sha(self, p, send_caps=True): @@ -1383,11 +1378,6 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): probe = nbxmpp.Presence(jid, 'probe', frm=self.get_own_jid()) self.connection.send(probe) - def _nec_stream_other_host_received(self, obj): - if obj.conn.name != self.name: - return - self.redirected = obj.redirected - def _StreamCB(self, con, obj): log.debug('StreamCB') app.nec.push_incoming_event(StreamReceivedEvent(None, @@ -1456,5 +1446,7 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): con.RegisterHandler(*handler) def _unregister_handlers(self): + if not self.connection: + return for handler in modules.get_handlers(self): self.connection.UnregisterHandler(*handler) ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -331,28 +331,6 @@ class StreamConflictReceivedEvent(nec.NetworkIncomingEvent): self.conn = self.base_event.conn return True -class StreamOtherHostReceivedEvent(nec.NetworkIncomingEvent): - name = 'stream-other-host-received' - base_network_events = ['stream-received'] - - def generate(self): - self.conn = self.base_event.conn - self.stanza = self.base_event.stanza - other_host = self.stanza.getTag('see-other-host') - if other_host and self.conn._current_type in ('ssl', 'tls'): - host = other_host.getData() - if ':' in host: - host_l = host.split(':', 1) - h = host_l[0] - p = host_l[1] - else: - h = host - p = 5222 - if h.startswith('[') and h.endswith(']'): - h = h[1:-1] - self.redirected = {'host': h, 'port': p} - return True - class PresenceHelperEvent: def _generate_show(self): self.show = self.stanza.getShow() ===================================== gajim/common/dataforms.py ===================================== --- a/gajim/common/dataforms.py +++ b/gajim/common/dataforms.py @@ -1,46 +1,50 @@ -# this will go to src/common/xmpp later, for now it is in src/common -# -*- coding:utf-8 -*- -## src/common/dataforms.py -## -## Copyright (C) 2006-2007 Tomasz Melcer <liori AT exroot.org> -## Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org> -## Copyright (C) 2007 Stephan Erb <steve-e AT h3c.de> -## -## 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/>. -## +# Copyright (C) 2006-2007 Tomasz Melcer <liori AT exroot.org> +# Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org> +# Copyright (C) 2007 Stephan Erb <steve-e AT h3c.de> +# +# 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/>. """ -This module contains wrappers for different parts of data forms (JEP 0004). For +This module contains wrappers for different parts of data forms (XEP-0004). For information how to use them, read documentation """ import nbxmpp + from gajim.common import helpers + # exceptions used in this module -# base class -class Error(Exception): pass +class Error(Exception): + pass + + # when we get nbxmpp.Node which we do not understand -class UnknownDataForm(Error): pass +class UnknownDataForm(Error): + pass + + # when we get nbxmpp.Node which contains bad fields -class WrongFieldValue(Error): pass +class WrongFieldValue(Error): + pass + # helper class to change class of already existing object class ExtendedNode(nbxmpp.Node, object): @classmethod - def __new__(cls, *a, **b): + def __new__(cls, *a, **b): if 'extend' not in b.keys() or not b['extend']: return object.__new__(cls) @@ -49,23 +53,25 @@ class ExtendedNode(nbxmpp.Node, object): extend.__class__ = cls return extend + # helper to create fields from scratch def Field(typ, **attrs): ''' Helper function to create a field of given type. ''' f = { - 'boolean': BooleanField, - 'fixed': StringField, - 'hidden': StringField, - 'text-private': StringField, - 'text-single': StringField, - 'jid-multi': JidMultiField, - 'jid-single': JidSingleField, - 'list-multi': ListMultiField, - 'list-single': ListSingleField, - 'text-multi': TextMultiField, + 'boolean': BooleanField, + 'fixed': StringField, + 'hidden': StringField, + 'text-private': StringField, + 'text-single': StringField, + 'jid-multi': JidMultiField, + 'jid-single': JidSingleField, + 'list-multi': ListMultiField, + 'list-single': ListSingleField, + 'text-multi': TextMultiField, }[typ](typ=typ, **attrs) return f + def ExtendField(node): """ Helper function to extend a node to field of appropriate type @@ -73,23 +79,24 @@ def ExtendField(node): # when validation (XEP-122) will go in, we could have another classes # like DateTimeField - so that dicts in Field() and ExtendField() will # be different... - typ=node.getAttr('type') + typ = node.getAttr('type') f = { - 'boolean': BooleanField, - 'fixed': StringField, - 'hidden': StringField, - 'text-private': StringField, - 'text-single': StringField, - 'jid-multi': JidMultiField, - 'jid-single': JidSingleField, - 'list-multi': ListMultiField, - 'list-single': ListSingleField, - 'text-multi': TextMultiField, + 'boolean': BooleanField, + 'fixed': StringField, + 'hidden': StringField, + 'text-private': StringField, + 'text-single': StringField, + 'jid-multi': JidMultiField, + 'jid-single': JidSingleField, + 'list-multi': ListMultiField, + 'list-single': ListSingleField, + 'text-multi': TextMultiField, } if typ not in f: typ = 'text-single' return f[typ](extend=node) + def ExtendForm(node): """ Helper function to extend a node to form of appropriate type @@ -99,6 +106,7 @@ def ExtendForm(node): else: return SimpleDataForm(extend=node) + class DataField(ExtendedNode): """ Keeps data about one field - var, field type, labels, instructions... Base @@ -107,7 +115,7 @@ class DataField(ExtendedNode): """ def __init__(self, typ=None, var=None, value=None, label=None, desc=None, - required=False, options=None, extend=None): + required=False, options=None, extend=None): if extend is None: ExtendedNode.__init__(self, 'field') @@ -118,7 +126,7 @@ class DataField(ExtendedNode): self.value = value if label is not None: self.label = label - if desc is not None: + if desc is not None: self.desc = desc self.required = required self.options = options @@ -162,10 +170,10 @@ class DataField(ExtendedNode): """ Human-readable field name """ - l = self.getAttr('label') - if not l: - l = self.var - return l + label_ = self.getAttr('label') + if not label_: + label_ = self.var + return label_ @label.setter def label(self, value): @@ -236,6 +244,7 @@ class DataField(ExtendedNode): def is_valid(self): return True + class Uri(nbxmpp.Node): def __init__(self, uri_tag): nbxmpp.Node.__init__(self, node=uri_tag) @@ -270,6 +279,7 @@ class Uri(nbxmpp.Node): def uri_data(self): self.setData(None) + class Media(nbxmpp.Node): def __init__(self, media_tag): nbxmpp.Node.__init__(self, node=media_tag) @@ -292,6 +302,7 @@ class Media(nbxmpp.Node): for element in self.getTags('uri'): self.delChild(element) + class BooleanField(DataField): @property def value(self): @@ -304,7 +315,7 @@ class BooleanField(DataField): if v in ('1', 'true'): return True if v is None: - return False # default value is False + return False # default value is False raise WrongFieldValue @value.setter @@ -317,6 +328,7 @@ class BooleanField(DataField): if t is not None: self.delChild(t) + class StringField(DataField): """ Covers fields of types: fixed, hidden, text-private, text-single @@ -341,9 +353,10 @@ class StringField(DataField): def value(self): try: self.delChild(self.getTag('value')) - except ValueError: # if there already were no value tag + except ValueError: # if there already were no value tag pass + class ListField(DataField): """ Covers fields of types: jid-multi, jid-single, list-multi, list-single @@ -359,17 +372,18 @@ class ListField(DataField): v = element.getTagData('value') if v is None: raise WrongFieldValue - l = element.getAttr('label') - if not l: - l = v - options.append((l, v)) + label = element.getAttr('label') + if not label: + label = v + options.append((label, v)) return options @options.setter def options(self, values): del self.options for value, label in values: - self.addChild('option', {'label': label}).setTagData('value', value) + self.addChild('option', + {'label': label}).setTagData('value', value) @options.deleter def options(self): @@ -381,10 +395,11 @@ class ListField(DataField): v = element.getTagData('value') if v is None: raise WrongFieldValue - l = element.getAttr('label') - if not l: - l = v - yield (v, l) + label = element.getAttr('label') + if not label: + label = v + yield (v, label) + class ListSingleField(ListField, StringField): """ @@ -397,6 +412,7 @@ class ListSingleField(ListField, StringField): return False return True + class JidSingleField(ListSingleField): """ Covers jid-single fields @@ -406,12 +422,13 @@ class JidSingleField(ListSingleField): try: helpers.parse_jid(self.value) return True - except: + except Exception: return False if self.required: return False return True + class ListMultiField(ListField): """ Covers list-multi fields @@ -449,6 +466,7 @@ class ListMultiField(ListField): return False return True + class JidMultiField(ListMultiField): """ Covers jid-multi fields @@ -458,13 +476,14 @@ class JidMultiField(ListMultiField): for value in self.values: try: helpers.parse_jid(value) - except: + except Exception: return False return True if self.required: return False return True + class TextMultiField(DataField): @property def value(self): @@ -489,6 +508,7 @@ class TextMultiField(DataField): for element in self.getTags('value'): self.delChild(element) + class DataRecord(ExtendedNode): """ The container for data fields - an xml element which has DataField elements @@ -560,6 +580,7 @@ class DataRecord(ExtendedNode): return False return True + class DataForm(ExtendedNode): def __init__(self, type_=None, title=None, instructions=None, extend=None): if extend is None: @@ -567,11 +588,11 @@ class DataForm(ExtendedNode): nbxmpp.Node.__init__(self, 'x', attrs={'xmlns': nbxmpp.NS_DATA}) if type_ is not None: - self.type_=type_ + self.type_ = type_ if title is not None: - self.title=title + self.title = title if instructions is not None: - self.instructions=instructions + self.instructions = instructions @property def type_(self): @@ -623,7 +644,8 @@ class DataForm(ExtendedNode): @instructions.setter def instructions(self, value): del self.instructions - if value == '': return + if value == '': + return for line in value.split('\n'): self.addChild('instructions').setData(line) @@ -632,11 +654,12 @@ class DataForm(ExtendedNode): for value in self.getTags('instructions'): self.delChild(value) + class SimpleDataForm(DataForm, DataRecord): - def __init__(self, type_=None, title=None, instructions=None, fields=None, \ - extend=None): + def __init__(self, type_=None, title=None, instructions=None, fields=None, + extend=None): DataForm.__init__(self, type_=type_, title=title, - instructions=instructions, extend=extend) + instructions=instructions, extend=extend) DataRecord.__init__(self, fields=fields, extend=self, associated=self) def get_purged(self): @@ -647,12 +670,12 @@ class SimpleDataForm(DataForm, DataRecord): for f in c.iter_fields(): if f.required: # add <value> if there is not - if hasattr(f, 'value') and not f.value: + if hasattr(f, 'value') and not f.value: f.value = '' # Keep all required fields continue - if (hasattr(f, 'value') and not f.value and f.value != 0) or ( - hasattr(f, 'values') and len(f.values) == 0): + if ((hasattr(f, 'value') and not f.value and f.value != 0) or + (hasattr(f, 'values') and len(f.values) == 0)): to_be_removed.append(f) else: del f.label @@ -662,11 +685,12 @@ class SimpleDataForm(DataForm, DataRecord): c.delChild(f) return c + class MultipleDataForm(DataForm): def __init__(self, type_=None, title=None, instructions=None, items=None, - extend=None): + extend=None): DataForm.__init__(self, type_=type_, title=title, - instructions=instructions, extend=extend) + instructions=instructions, extend=extend) # all records, recorded into DataRecords if extend is None: if items is not None: View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/ff2fab73a15732511ba6d4490b35347e7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/ff2fab73a15732511ba6d4490b35347e7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Parse input sent via XMLConsole
by Philipp Hörist 07 Jul '18

07 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: ff2fab73 by Philipp Hörist at 2018-07-07T19:20:28+02:00 Parse input sent via XMLConsole This allows us to show the user an error if the stanza is invalid. Until now the server would instantly disconnect us. Also this fixes the problem that XMLConsole input was not counted for streammanagement. Fixes #8563 - - - - - 1 changed file: - gajim/dialogs.py Changes: ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -3503,7 +3503,14 @@ class XMLConsoleWindow(Gtk.Window): begin_iter, end_iter = buffer_.get_bounds() stanza = buffer_.get_text(begin_iter, end_iter, True) if stanza: - app.connections[self.account].send_stanza(stanza) + try: + node = nbxmpp.Protocol(node=stanza) + if node.getNamespace() == 'http://www.gajim.org/xmlns/undeclared': + node.setNamespace(nbxmpp.NS_CLIENT) + except Exception as error: + ErrorDialog(_('Invalid Node'), str(error)) + return + app.connections[self.account].connection.send(node) buffer_.set_text('') def on_input(self, button, *args): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ff2fab73a15732511ba6d4490b35347e7b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ff2fab73a15732511ba6d4490b35347e7b… 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 July 2018