Commits January 2019

commits@gajim.org

1 participants
85 discussions

[Git][gajim/gajim][master] Accounts: Update proxy combobox correctly
by Philipp Hörist 22 Jan '19

22 Jan '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: dad99f85 by Philipp Hörist at 2019-01-22T21:00:20Z Accounts: Update proxy combobox correctly - - - - - 1 changed file: - gajim/options_dialog.py Changes: ===================================== gajim/options_dialog.py ===================================== @@ -477,11 +477,11 @@ class ProxyComboOption(GenericOption): GenericOption.__init__(self, *args) self.combo = Gtk.ComboBoxText() - self.update_values() - - self.combo.connect('changed', self.on_value_change) self.combo.set_valign(Gtk.Align.CENTER) + self._signal_id = None + self.update_values() + button = get_image_button( 'preferences-system-symbolic', _('Manage Proxies')) button.set_action_name('app.manage-proxies') @@ -491,7 +491,18 @@ class ProxyComboOption(GenericOption): self.option_box.pack_start(button, False, True, 0) self.show_all() + def _block_signal(self, state): + if state: + if self._signal_id is None: + return + self.combo.disconnect(self._signal_id) + else: + self._signal_id = self.combo.connect('changed', + self.on_value_change) + self.combo.emit('changed') + def update_values(self): + self._block_signal(True) proxies = app.config.get_per('proxies') proxies.insert(0, _('No Proxy')) self.combo.remove_all() @@ -499,9 +510,13 @@ class ProxyComboOption(GenericOption): self.combo.insert_text(-1, value) if value == self.option_value or index == 0: self.combo.set_active(index) + self._block_signal(False) def on_value_change(self, combo): - self.set_value(combo.get_active_text()) + if combo.get_active() == 0: + self.set_value('') + else: + self.set_value(combo.get_active_text()) def on_row_activated(self): pass View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/dad99f85fccf30ab91b4c7babf2a24c1fa… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/dad99f85fccf30ab91b4c7babf2a24c1fa… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Roster: remove asserts
by Philipp Hörist 22 Jan '19

22 Jan '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: b0742377 by Philipp Hörist at 2019-01-20T13:29:48Z Roster: remove asserts - - - - - 1a7d930f by Philipp Hörist at 2019-01-21T21:45:19Z Add blocking list dialog - - - - - 8 changed files: - gajim/app_actions.py - gajim/application.py - gajim/common/modules/blocking.py - gajim/common/modules/privacylists.py - + gajim/data/gui/blocking_list.ui - + gajim/gtk/blocking.py - gajim/gui_menu_builder.py - gajim/roster_window.py Changes: ===================================== gajim/app_actions.py ===================================== @@ -44,6 +44,7 @@ from gajim.gtk.history import HistoryWindow from gajim.gtk.accounts import AccountsWindow from gajim.gtk.proxies import ManageProxies from gajim.gtk.discovery import ServiceDiscoveryWindow +from gajim.gtk.blocking import BlockingList # General Actions @@ -211,6 +212,15 @@ def on_mam_preferences(action, param): window.present() +def on_blocking_list(action, param): + account = param.get_string() + window = app.get_app_window(MamPreferences, account) + if window is None: + BlockingList(account) + else: + window.present() + + def on_history_sync(action, param): account = param.get_string() if 'history_sync' in interface.instances[account]: ===================================== gajim/application.py ===================================== @@ -469,6 +469,7 @@ class GajimApplication(Gtk.Application): ('-archive', a.on_mam_preferences, 'feature', 's'), ('-sync-history', a.on_history_sync, 'online', 's'), ('-privacylists', a.on_privacy_lists, 'feature', 's'), + ('-blocking', a.on_blocking_list, 'feature', 's'), ('-send-server-message', a.on_send_server_message, 'online', 's'), ('-set-motd', a.on_set_motd, 'online', 's'), ('-update-motd', a.on_update_motd, 'online', 's'), @@ -517,3 +518,6 @@ class GajimApplication(Gtk.Application): elif event.feature == nbxmpp.NS_PRIVACY: action = '%s-privacylists' % event.account self.lookup_action(action).set_enabled(True) + elif event.feature == nbxmpp.NS_BLOCKING: + action = '%s-blocking' % event.account + self.lookup_action(action).set_enabled(True) ===================================== gajim/common/modules/blocking.py ===================================== @@ -15,15 +15,26 @@ # XEP-0191: Blocking Command import logging +from functools import wraps import nbxmpp from gajim.common import app +from gajim.common.nec import NetworkEvent from gajim.common.nec import NetworkIncomingEvent log = logging.getLogger('gajim.c.m.blocking') +def ensure_online(func): + @wraps(func) + def func_wrapper(self, *args, **kwargs): + if not app.account_is_connected(self._account): + return + return func(self, *args, **kwargs) + return func_wrapper + + class Blocking: def __init__(self, con): self._con = con @@ -37,37 +48,48 @@ class Blocking: self.supported = False + self._nbmxpp_methods = [ + 'block', + 'unblock', + ] + + def __getattr__(self, key): + if key not in self._nbmxpp_methods: + raise AttributeError + if not app.account_is_connected(self._account): + log.warning('Account %s not connected, cant use %s', + self._account, key) + return + module = self._con.connection.get_module('Blocking') + return getattr(module, key) + def pass_disco(self, from_, _identities, features, _data, _node): if nbxmpp.NS_BLOCKING not in features: return self.supported = True + app.nec.push_incoming_event( + NetworkEvent('feature-discovered', + account=self._account, + feature=nbxmpp.NS_BLOCKING)) + log.info('Discovered blocking: %s', from_) - def get_blocking_list(self) -> None: - if not self.supported: - return - iq = nbxmpp.Iq('get', nbxmpp.NS_BLOCKING) - iq.setQuery('blocklist') + @ensure_online + def get_blocking_list(self, callback=None): log.info('Request list') - self._con.connection.SendAndCallForResponse( - iq, self._blocking_list_received) + if callback is None: + callback = self._blocking_list_received - def _blocking_list_received(self, stanza: nbxmpp.Iq) -> None: - if not nbxmpp.isResultNode(stanza): - log.info('Error: %s', stanza.getError()) - return + self._con.connection.get_module('Blocking').get_blocking_list( + callback=callback) - self.blocked = [] - blocklist = stanza.getTag('blocklist', namespace=nbxmpp.NS_BLOCKING) - if blocklist is None: - log.error('No blocklist node') + def _blocking_list_received(self, result): + if result.is_error: + log.info('Error: %s', result.error) return - for item in blocklist.getTags('item'): - self.blocked.append(item.getAttr('jid')) - log.info('Received list: %s', self.blocked) - + self.blocked = result.blocking_list app.nec.push_incoming_event( BlockingEvent(None, conn=self._con, changed=self.blocked)) @@ -129,35 +151,6 @@ class Blocking: probe = nbxmpp.Presence(jid, 'probe', frm=self._con.get_own_jid()) self._con.connection.send(probe) - def block(self, contact_list): - if not self.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.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, {}) - - @staticmethod - def _default_result_handler(_con, stanza): - if not nbxmpp.isResultNode(stanza): - log.warning('Operation failed: %s', stanza.getError()) - class BlockingEvent(NetworkIncomingEvent): name = 'blocking' ===================================== gajim/common/modules/privacylists.py ===================================== @@ -304,7 +304,8 @@ class PrivacyLists: def block_contacts(self, contact_list, message): if not self.supported: - self._con.get_module('Blocking').block(contact_list) + jid_list = [contact.jid for contact in contact_list] + self._con.get_module('Blocking').block(jid_list) return if self.default_list is None: @@ -350,7 +351,8 @@ class PrivacyLists: def unblock_contacts(self, contact_list): if not self.supported: - self._con.get_module('Blocking').unblock(contact_list) + jid_list = [contact.jid for contact in contact_list] + self._con.get_module('Blocking').unblock(jid_list) return new_blocked_list = [] ===================================== gajim/data/gui/blocking_list.ui ===================================== @@ -0,0 +1,147 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<interface> + <requires lib="gtk+" version="3.12"/> + <object class="GtkListStore" id="blocking_store"> + <columns> +  + <column type="gchararray"/> + </columns> + </object> + <object class="GtkGrid" id="blocking_grid"> + <property name="width_request">400</property> + <property name="height_request">300</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_left">18</property> + <property name="margin_right">18</property> + <property name="margin_top">18</property> + <property name="margin_bottom">18</property> + <property name="row_spacing">5</property> + <property name="column_spacing">10</property> + <child> + <object class="GtkButtonBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="spacing">5</property> + <property name="layout_style">start</property> + <child> + <object class="GtkButton" id="add_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <signal name="clicked" handler="_on_add" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">list-add-symbolic</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + <property name="non_homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkButton" id="remove_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <signal name="clicked" handler="_on_remove" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">list-remove-symbolic</property> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + <property name="non_homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="save_button"> + <property name="label">Save</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="halign">end</property> + <property name="always_show_image">True</property> + <signal name="clicked" handler="_on_save" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkOverlay" id="overlay"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkScrolledWindow"> + <property name="height_request">150</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkTreeView" id="block_view"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="model">blocking_store</property> + <property name="search_column">0</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection2"/> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn1"> + <property name="title" translatable="yes">Jabber ID</property> + <property name="expand">True</property> + <property name="clickable">True</property> + <property name="sort_indicator">True</property> + <property name="sort_column_id">0</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext3"> + <property name="editable">True</property> + <property name="placeholder_text">user(a)example.org</property> + <signal name="edited" handler="_jid_edited" swapped="no"/> + </object> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="index">-1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">2</property> + </packing> + </child> + </object> +</interface> ===================================== gajim/gtk/blocking.py ===================================== @@ -0,0 +1,150 @@ +# 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 + +from gi.repository import Gtk +from gi.repository import Gdk + +from gajim.common import app +from gajim.common.i18n import _ + +from gajim.gtk.util import get_builder +from gajim.gtk.dialogs import HigDialog + +log = logging.getLogger('gajim.gtk.blocking_list') + + +class BlockingList(Gtk.ApplicationWindow): + def __init__(self, account): + Gtk.ApplicationWindow.__init__(self) + self.set_application(app.app) + self.set_position(Gtk.WindowPosition.CENTER) + self.set_show_menubar(False) + self.set_title(_('Blocking List for %s') % account) + + self.connect('key-press-event', self._on_key_press) + + self.account = account + self._con = app.connections[account] + self._prev_blocked_jids = set() + self._await_results = 2 + self._received_errors = False + + self._ui = get_builder('blocking_list.ui') + self.add(self._ui.blocking_grid) + + self._spinner = Gtk.Spinner() + self._ui.overlay.add_overlay(self._spinner) + + self._set_grid_state(False) + self._ui.connect_signals(self) + self.show_all() + + self._activate_spinner() + + self._con.get_module('Blocking').get_blocking_list( + callback=self._on_blocking_list_received) + + def _reset_after_error(self): + self._received_errors = False + self._await_results = 2 + self._disable_spinner() + self._set_grid_state(True) + + def _show_error(self, error): + dialog = HigDialog( + self, Gtk.MessageType.INFO, Gtk.ButtonsType.OK, + _('Error!'), + error) + dialog.popup() + + def _on_blocking_list_received(self, result): + self._disable_spinner() + self._set_grid_state(not result.is_error) + + if result.is_error: + self._show_error(result.error) + + else: + self._prev_blocked_jids = set(result.blocking_list) + self._ui.blocking_store.clear() + for item in result.blocking_list: + self._ui.blocking_store.append((item,)) + + def _on_save_result(self, result): + self._await_results -= 1 + if result.is_error and not self._received_errors: + self._show_error(result.error) + self._received_errors = True + + if not self._await_results: + if self._received_errors: + self._reset_after_error() + else: + self.destroy() + + def _set_grid_state(self, state): + self._ui.blocking_grid.set_sensitive(state) + + def _jid_edited(self, _renderer, path, new_text): + iter_ = self._ui.blocking_store.get_iter(path) + self._ui.blocking_store.set_value(iter_, 0, new_text) + + def _on_add(self, _button): + self._ui.blocking_store.append(['']) + + def _on_remove(self, _button): + mod, paths = self._ui.block_view.get_selection().get_selected_rows() + for path in paths: + iter_ = mod.get_iter(path) + self._ui.blocking_store.remove(iter_) + + def _on_save(self, _button): + self._activate_spinner() + self._set_grid_state(False) + + blocked_jids = set() + for item in self._ui.blocking_store: + blocked_jids.add(item[0].lower()) + + unblock_jids = self._prev_blocked_jids - blocked_jids + if unblock_jids: + self._con.get_module('Blocking').unblock( + unblock_jids, callback=self._on_save_result) + else: + self._await_results -= 1 + + block_jids = blocked_jids - self._prev_blocked_jids + if block_jids: + self._con.get_module('Blocking').block( + block_jids, callback=self._on_save_result) + else: + self._await_results -= 1 + + if not self._await_results: + # No changes + self.destroy() + + def _activate_spinner(self): + self._spinner.show() + self._spinner.start() + + def _disable_spinner(self): + self._spinner.hide() + self._spinner.stop() + + def _on_key_press(self, _widget, event): + if event.keyval == Gdk.KEY_Escape: + self.destroy() ===================================== gajim/gui_menu_builder.py ===================================== @@ -788,6 +788,7 @@ def get_account_menu(account): ('-start-single-chat', _('Send Single Message…')), (_('Advanced'), [ ('-archive', _('Archiving Preferences')), + ('-blocking', _('Blocking List')), ('-sync-history', _('Synchronise History')), ('-privacylists', _('Privacy Lists')), ('-server-info', _('Server Info')), ===================================== gajim/roster_window.py ===================================== @@ -388,7 +388,6 @@ class RosterWindow: parent_iters = self._get_contact_iter( big_brother_contact.jid, big_brother_account, big_brother_contact, self.model) - assert parent_iters, 'Big brother is not yet in roster!' # Do not confuse get_contact_iter: Sync groups of family members contact.groups = big_brother_contact.groups[:] @@ -445,7 +444,6 @@ class RosterWindow: if group not in app.groups[account]: app.groups[account][group] = {'expand': is_expanded} - assert added_iters, '%s has not been added to roster!' % contact.jid return added_iters def _remove_entity(self, contact, account, groups=None): @@ -464,7 +462,6 @@ class RosterWindow: """ iters = self._get_contact_iter(contact.jid, account, contact, self.model) - assert iters, '%s shall be removed but is not in roster' % contact.jid parent_iter = self.model.iter_parent(iters[0]) parent_type = self.model[parent_iter][Column.TYPE] @@ -484,10 +481,6 @@ class RosterWindow: return False # Remove us and empty groups from the model for i in iters: - assert self.model[i][Column.JID] == contact.jid and \ - self.model[i][Column.ACCOUNT] == account, \ - "Invalidated iters of %s" % contact.jid - parent_i = self.model.iter_parent(i) parent_type = self.model[parent_i][Column.TYPE] @@ -529,10 +522,6 @@ class RosterWindow: big_brother_contact = app.contacts.get_first_contact_from_jid( big_brother_account, big_brother_jid) - assert not self._get_contact_iter(big_brother_jid, - big_brother_account, big_brother_contact, self.model), \ - 'Big brother %s already in roster\n Family: %s' \ - % (big_brother_jid, family) self._add_entity(big_brother_contact, big_brother_account) brothers = [] @@ -548,9 +537,6 @@ class RosterWindow: # or brother already added continue - assert not self._get_contact_iter(_jid, _account, - _contact, self.model), \ - "%s already in roster.\n Family: %s" % (_jid, nearby_family) self._add_entity(_contact, _account, big_brother_contact=big_brother_contact, big_brother_account=big_brother_account) @@ -582,8 +568,6 @@ class RosterWindow: # Family might not be up to date. # Only try to remove what is actually in the roster continue - assert iters, '%s shall be removed but is not in roster \ - \n Family: %s' % (_jid, family) family_in_roster = True @@ -594,31 +578,14 @@ class RosterWindow: # The contact on top old_big_account = _account old_big_contact = _contact - old_big_jid = _jid continue - ok = self._remove_entity(_contact, _account) - assert ok, '%s was not removed' % _jid - assert not self._get_contact_iter(_jid, _account, _contact, - self.model), '%s is removed but still in roster' % _jid + self._remove_entity(_contact, _account) if not family_in_roster: return False - assert old_big_jid, 'No Big Brother in nearby family %s (Family: %s)' %\ - (nearby_family, family) - iters = self._get_contact_iter(old_big_jid, old_big_account, - old_big_contact, self.model) - assert iters, 'Old Big Brother %s is not in roster anymore' % \ - old_big_jid - assert not self.model.iter_children(iters[0]), \ - 'Old Big Brother %s still has children' % old_big_jid - - ok = self._remove_entity(old_big_contact, old_big_account) - assert ok, "Old Big Brother %s not removed" % old_big_jid - assert not self._get_contact_iter(old_big_jid, old_big_account, - old_big_contact, self.model), \ - 'Old Big Brother %s is removed but still in roster' % old_big_jid + self._remove_entity(old_big_contact, old_big_account) return True @@ -682,9 +649,6 @@ class RosterWindow: jid = app.get_jid_from_account(account) contact = app.contacts.get_first_contact_from_jid(account, jid) - assert not self._get_contact_iter(jid, account, contact, - self.model), 'Self contact %s already in roster' % jid - child_iterA = self._get_account_iter(account, self.model) self._iters[account]['contacts'][jid] = [self.model.append(child_iterA, [None, app.nicks[account], 'self_contact', jid, account, None, @@ -1047,7 +1011,6 @@ class RosterWindow: def _really_draw_account(self, account): child_iter = self._get_account_iter(account, self.model) if not child_iter: - assert False, 'Account iter of %s could not be found.' % account return num_of_accounts = app.get_number_of_connected_accounts() View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/46707606687671488314f947cf5eeaac1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/46707606687671488314f947cf5eeaac1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] Windows: Use HEAD of nbxmpp_0.6 branch
by Philipp Hörist 21 Jan '19

21 Jan '19

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: 14b4488b by Philipp Hörist at 2019-01-21T21:47:14Z Windows: Use HEAD of nbxmpp_0.6 branch - - - - - 1 changed file: - win/_base.sh Changes: ===================================== win/_base.sh ===================================== @@ -100,7 +100,7 @@ function install_deps { mingw-w64-"${ARCH}"-"${PYTHON_ID}"-six PIP_REQUIREMENTS="\ -nbxmpp==0.6.9 +git+https://dev.gajim.org/gajim/python-nbxmpp.git@nbxmpp_0.6 git+https://dev.gajim.org/lovetox/pybonjour-python3.git git+https://github.com/enthought/pywin32-ctypes.git keyring View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/14b4488b07a460278a98b5ade16c85f5c1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/14b4488b07a460278a98b5ade16c85f5c1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][nbxmpp_0.6] BOSH: Fix setting language on stream
by Philipp Hörist 21 Jan '19

21 Jan '19

Philipp Hörist pushed to branch nbxmpp_0.6 at gajim / python-nbxmpp Commits: e55aad7c by Philipp Hörist at 2019-01-21T21:39:09Z BOSH: Fix setting language on stream - - - - - 1 changed file: - nbxmpp/bosh.py Changes: ===================================== nbxmpp/bosh.py ===================================== @@ -44,7 +44,6 @@ class NonBlockingBOSH(NonBlockingTransport): idlequeue, estabilish_tls, certs, tls_version, cipher_list) self.bosh_sid = None - self.bosh_xml_lang = self._owner.lang self.http_version = 'HTTP/1.1' self.http_persistent = True @@ -413,7 +412,7 @@ class NonBlockingBOSH(NonBlockingTransport): t = BOSHBody( attrs={ 'to': self.bosh_to, 'sid': self.bosh_sid, - 'xml:lang': self.bosh_xml_lang, + 'xml:lang': self._owner.lang, 'xmpp:restart': 'true', 'secure': self.bosh_secure, 'xmlns:xmpp': 'urn:xmpp:xbosh'}) @@ -424,7 +423,7 @@ class NonBlockingBOSH(NonBlockingTransport): 'route': 'xmpp:%s:%s' % (self.route_host, self.route_port), 'to': self.bosh_to, 'wait': str(self.bosh_wait), - 'xml:lang': self.bosh_xml_lang, + 'xml:lang': self._owner.lang, 'xmpp:version': '1.0', 'ver': '1.6', 'xmlns:xmpp': 'urn:xmpp:xbosh'}) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/e55aad7ccbce3be42f374e73f8… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/e55aad7ccbce3be42f374e73f8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Add Blocking (XEP-0191) module
by Philipp Hörist 21 Jan '19

21 Jan '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: d85cb5e5 by Philipp Hörist at 2019-01-21T21:33:26Z Add Blocking (XEP-0191) module - - - - - f90126ec by Philipp Hörist at 2019-01-21T21:33:26Z BOSH: Fix setting language on stream - - - - - 4 changed files: - nbxmpp/bosh.py - nbxmpp/dispatcher_nb.py - + nbxmpp/modules/blocking.py - nbxmpp/structs.py Changes: ===================================== nbxmpp/bosh.py ===================================== @@ -45,7 +45,6 @@ class NonBlockingBOSH(NonBlockingTransport): idlequeue, estabilish_tls, certs, tls_version, cipher_list) self.bosh_sid = None - self.bosh_xml_lang = self._owner.lang self.http_version = 'HTTP/1.1' self.http_persistent = True @@ -414,7 +413,7 @@ class NonBlockingBOSH(NonBlockingTransport): t = BOSHBody( attrs={ 'to': self.bosh_to, 'sid': self.bosh_sid, - 'xml:lang': self.bosh_xml_lang, + 'xml:lang': self._owner.lang, 'xmpp:restart': 'true', 'secure': self.bosh_secure, 'xmlns:xmpp': 'urn:xmpp:xbosh'}) @@ -425,7 +424,7 @@ class NonBlockingBOSH(NonBlockingTransport): 'route': 'xmpp:%s:%s' % (self.route_host, self.route_port), 'to': self.bosh_to, 'wait': str(self.bosh_wait), - 'xml:lang': self.bosh_xml_lang, + 'xml:lang': self._owner.lang, 'xmpp:version': '1.0', 'ver': '1.6', 'xmlns:xmpp': 'urn:xmpp:xbosh'}) ===================================== nbxmpp/dispatcher_nb.py ===================================== @@ -55,6 +55,7 @@ from nbxmpp.modules.signed import Signed from nbxmpp.modules.vcard_avatar import VCardAvatar from nbxmpp.modules.captcha import Captcha from nbxmpp.modules.entity_caps import EntityCaps +from nbxmpp.modules.blocking import Blocking from nbxmpp.modules.misc import unwrap_carbon from nbxmpp.modules.misc import unwrap_mam from nbxmpp.util import get_properties_struct @@ -177,6 +178,7 @@ class XMPPDispatcher(PlugIn): self._modules['Signed'] = Signed(self._owner) self._modules['VCardAvatar'] = VCardAvatar(self._owner) self._modules['EntityCaps'] = EntityCaps(self._owner) + self._modules['Blocking'] = Blocking(self._owner) for instance in self._modules.values(): for handler in instance.handlers: ===================================== nbxmpp/modules/blocking.py ===================================== @@ -0,0 +1,81 @@ +# Copyright (C) 2018 Philipp Hörist <philipp AT hoerist.com> +# +# This file is part of nbxmpp. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 3 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; If not, see <http://www.gnu.org/licenses/>. + +import logging + +from nbxmpp.protocol import NS_BLOCKING +from nbxmpp.protocol import Iq +from nbxmpp.protocol import isResultNode +from nbxmpp.structs import BlockingListResult +from nbxmpp.structs import CommonResult +from nbxmpp.util import call_on_response +from nbxmpp.util import callback + +log = logging.getLogger('nbxmpp.m.blocking') + + +class Blocking: + def __init__(self, client): + self._client = client + self.handlers = [] + + @call_on_response('_blocking_list_received') + def get_blocking_list(self): + iq = Iq('get', NS_BLOCKING) + iq.setQuery('blocklist') + return iq + + @callback + def _blocking_list_received(self, stanza): + blocked = [] + if not isResultNode(stanza): + log.info('Error: %s', stanza.getErrorMsg()) + return BlockingListResult(blocking_list=blocked, + error=stanza.getErrorMsg()) + + blocklist = stanza.getTag('blocklist', namespace=NS_BLOCKING) + for item in blocklist.getTags('item'): + blocked.append(item.getAttr('jid')) + + log.info('Received blocking list: %s', blocked) + return BlockingListResult(blocking_list=blocked) + + @call_on_response('_default_response') + def block(self, jids): + log.info('Block: %s', jids) + iq = Iq('set', NS_BLOCKING) + query = iq.setQuery(name='block') + for jid in jids: + query.addChild(name='item', attrs={'jid': jid}) + return iq + + @call_on_response('_default_response') + def unblock(self, jids): + log.info('Unblock: %s', jids) + iq = Iq('set', NS_BLOCKING) + query = iq.setQuery(name='unblock') + for jid in jids: + query.addChild(name='item', attrs={'jid': jid}) + return iq + + @callback + def _default_response(self, stanza): + if not isResultNode(stanza): + log.info('Error: %s', stanza.getErrorMsg()) + return CommonResult(jid=stanza.getFrom(), + error=stanza.getErrorMsg()) + return CommonResult(jid=stanza.getFrom()) ===================================== nbxmpp/structs.py ===================================== @@ -294,14 +294,23 @@ class CommonResult(BaseResult, namedtuple('CommonResult', 'jid error')): CommonResult.__new__.__defaults__ = (None,) + class AffiliationResult(BaseResult, namedtuple('AffiliationResult', 'jid affiliation users error')): pass AffiliationResult.__new__.__defaults__ = (None, None) + class MucConfigResult(BaseResult, namedtuple('MucConfigResult', 'jid form error')): pass MucConfigResult.__new__.__defaults__ = (None, None) + + +class BlockingListResult(BaseResult, namedtuple('BlockingListResult', + 'blocking_list error')): + pass + +BlockingListResult.__new__.__defaults__ = (None,) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/00189cbbcfd51063c2bb3ebe0… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/00189cbbcfd51063c2bb3ebe0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Drop support for TLS 1.1 and older
by Philipp Hörist 20 Jan '19

20 Jan '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: eb820d0e by André Apitzsch at 2019-01-20T16:10:12Z Drop support for TLS 1.1 and older - - - - - 00189cbb by Philipp Hörist at 2019-01-20T17:15:07Z Merge branch 'tls' into 'master' Drop support for TLS 1.1 and older Closes #61 See merge request gajim/python-nbxmpp!26 - - - - - 1 changed file: - nbxmpp/tls_nb.py Changes: ===================================== nbxmpp/tls_nb.py ===================================== @@ -255,10 +255,10 @@ class NonBlockingTLS(PlugIn): :param mycerts: path to pem file with certificates of user trusted servers :param tls_version: The lowest supported TLS version. If None is - provided, version 1.0 is used. For example setting to 1.1 will - enable TLS 1.1, TLS 1.2 and all further protocols + provided, version 1.2 is used. For example setting to 1.3 will + enable TLS 1.3 and all further protocols :param cipher_list: list of ciphers to use when connection to server. If - None is provided, a default list is used: HIGH:!aNULL:RC4-SHA + None is provided, a default list is used: HIGH:!aNULL """ PlugIn.__init__(self) self.cacerts = cacerts @@ -287,10 +287,7 @@ class NonBlockingTLS(PlugIn): return res def _dumpX509(self, cert, stream=sys.stderr): - try: - print("Digest (SHA-2 256):" + cert.digest("sha256"), file=stream) - except ValueError: # Old OpenSSL version - pass + print("Digest (SHA-2 256):" + cert.digest("sha256"), file=stream) print("Digest (SHA-1):" + cert.digest("sha1"), file=stream) print("Digest (MD5):" + cert.digest("md5"), file=stream) print("Serial #:" + cert.get_serial_number(), file=stream) @@ -368,40 +365,17 @@ class NonBlockingTLS(PlugIn): # See http://docs.python.org/dev/library/ssl.html tcpsock._sslContext = OpenSSL.SSL.Context(OpenSSL.SSL.SSLv23_METHOD) flags = OpenSSL.SSL.OP_NO_SSLv2 | OpenSSL.SSL.OP_NO_SSLv3 | \ - OpenSSL.SSL.OP_SINGLE_DH_USE - try: - flags |= OpenSSL.SSL.OP_NO_TICKET - except AttributeError as e: - # py-OpenSSL < 0.9 or old OpenSSL - flags |= 16384 + OpenSSL.SSL.OP_NO_TLSv1 | OpenSSL.SSL.OP_NO_TLSv1_1 | \ + OpenSSL.SSL.OP_SINGLE_DH_USE | OpenSSL.SSL.OP_NO_TICKET if self.alpn: # XEP-0368 set ALPN Protocol tcpsock._sslContext.set_alpn_protos([b'xmpp-client']) - try: - # OpenSSL 1.0.1d supports TLS 1.1 and TLS 1.2 and - # fixes renegotiation in TLS 1.1, 1.2 by using the correct TLS version. - if OpenSSL.SSL.OPENSSL_VERSION_NUMBER >= 0x1000104f: - if self.tls_version != '1.0': - flags |= OpenSSL.SSL.OP_NO_TLSv1 - if self.tls_version not in ('1.0', '1.1'): - try: - flags |= OpenSSL.SSL.OP_NO_TLSv1_1 - except AttributeError as e: - # older py-OpenSSL - flags |= 0x10000000 - except AttributeError as e: - pass # much older py-OpenSSL - - tcpsock._sslContext.set_options(flags) - try: # Supported only pyOpenSSL >= 0.14 - # Disable session resumption, protection against Triple Handshakes TLS attack - tcpsock._sslContext.set_session_cache_mode(OpenSSL.SSL.SESS_CACHE_OFF) - except AttributeError as e: - pass + # Disable session resumption, protection against Triple Handshakes TLS attack + tcpsock._sslContext.set_session_cache_mode(OpenSSL.SSL.SESS_CACHE_OFF) # NonBlockingHTTPBOSH instance has no attribute _owner if hasattr(tcpsock, '_owner') and tcpsock._owner._caller.client_cert \ View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/97f5f4a2ecbbe3390f4e111a9… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/97f5f4a2ecbbe3390f4e111a9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix destroying a MUC
by Philipp Hörist 19 Jan '19

19 Jan '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 46707606 by Philipp Hörist at 2019-01-19T22:05:36Z Fix destroying a MUC - Only close the tab if we initiated the destruction - - - - - 4 changed files: - gajim/common/modules/bookmarks.py - gajim/common/modules/muc.py - gajim/groupchat_control.py - gajim/gtk/bookmarks.py Changes: ===================================== gajim/common/modules/bookmarks.py ===================================== @@ -286,6 +286,9 @@ class Bookmarks(AbstractPEPModule): else: self._private_store(storage_node) + app.nec.push_incoming_event( + NetworkEvent('bookmarks-received', account=self._account)) + def _pubsub_store(self, storage_node: nbxmpp.Node) -> None: self._con.get_module('PubSub').send_pb_publish( '', 'storage:bookmarks', storage_node, 'current', @@ -344,8 +347,12 @@ class Bookmarks(AbstractPEPModule): } self.store_bookmarks() - app.nec.push_incoming_event( - NetworkEvent('bookmarks-received', account=self._account)) + + def remove(self, jid: str, publish: bool = True) -> None: + if self.bookmarks.pop(jid, None) is None: + return + if publish: + self.store_bookmarks() def get_name_from_bookmark(self, jid: str) -> str: fallback = jid.split('@')[0] @@ -354,6 +361,9 @@ class Bookmarks(AbstractPEPModule): except KeyError: return fallback + def is_bookmark(self, jid: str) -> bool: + return jid in self.bookmarks + def purge_pubsub_bookmarks(self) -> None: log.info('Purge/Delete Bookmarks on PubSub, ' 'because publish options are not available') ===================================== gajim/common/modules/muc.py ===================================== @@ -84,7 +84,7 @@ class MUC: 'cancel_config', 'send_captcha', 'decline', - 'request_voice' + 'request_voice', 'destroy', ] ===================================== gajim/groupchat_control.py ===================================== @@ -182,6 +182,9 @@ class GroupchatControl(ChatControlBase): # if True, the room has mentioned us self.attention_flag = False + # True if we initiated room destruction + self._wait_for_destruction = False + # sorted list of nicks who mentioned us (last at the end) self.attention_list = [] self.nick_hits = [] @@ -651,14 +654,10 @@ class GroupchatControl(ChatControlBase): _('Invalid group chat JID'), _('The group chat JID has not allowed characters.')) return + + self._wait_for_destruction = True con = app.connections[self.account] con.get_module('MUC').destroy(self.room_jid, reason, jid) - con.get_module('Bookmarks').bookmarks.pop(self.room_jid, None) - con.get_module('Bookmarks').store_bookmarks() - gui_menu_builder.build_bookmark_menu(self.account) - self.force_non_minimizable = True - self.parent_win.remove_tab(self, self.parent_win.CLOSE_COMMAND) - self.force_non_minimizable = False # Ask for a reason DoubleInputDialog(_('Destroying %s') % '\u200E' + \ @@ -2227,6 +2226,14 @@ class GroupchatControl(ChatControlBase): self.autorejoin = False self.got_disconnected() + con = app.connections[self.account] + con.get_module('Bookmarks').remove(self.room_jid) + + if self._wait_for_destruction: + self.force_non_minimizable = True + self.parent_win.remove_tab(self, self.parent_win.CLOSE_COMMAND) + self.force_non_minimizable = False + def get_role_iter(self, role: str) -> Optional[Gtk.TreeIter]: try: ref = self._role_refs[role] ===================================== gajim/gtk/bookmarks.py ===================================== @@ -21,8 +21,6 @@ from gajim.common import app from gajim.common import helpers from gajim.common.i18n import _ -from gajim import gui_menu_builder - from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.util import get_builder @@ -207,7 +205,6 @@ class ManageBookmarksWindow: con.get_module('Bookmarks').bookmarks[jid] = bmdict con.get_module('Bookmarks').store_bookmarks() - gui_menu_builder.build_bookmark_menu(acct) self.window.destroy() def on_cancel_button_clicked(self, widget): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/46707606687671488314f947cf5eeaac13… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/46707606687671488314f947cf5eeaac13… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Deal with stanza-id not added by a mam archive
by Philipp Hörist 19 Jan '19

19 Jan '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 31d9b397 by Philipp Hörist at 2019-01-19T20:35:58Z Deal with stanza-id not added by a mam archive Fixes #9550 - - - - - 1 changed file: - gajim/common/modules/message.py Changes: ===================================== gajim/common/modules/message.py ===================================== @@ -331,6 +331,8 @@ class Message: if archive.bareMatch(properties.stanza_id.by): return properties.stanza_id.id, None + # stanza-id not added by the archive, ignore it. + return None, None class MessageReceivedEvent(NetworkIncomingEvent): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/31d9b397441b8c239d4094022827b514aa… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/31d9b397441b8c239d4094022827b514aa… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Detect invalid user mood
by Philipp Hörist 19 Jan '19

19 Jan '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7c7df9d4 by Philipp Hörist at 2019-01-19T20:21:16Z Detect invalid user mood Fixes #9546, #9547 - - - - - 3e362874 by Philipp Hörist at 2019-01-19T20:21:20Z Detect invalid user activity - - - - - 2 changed files: - gajim/common/modules/user_activity.py - gajim/common/modules/user_mood.py Changes: ===================================== gajim/common/modules/user_activity.py ===================================== @@ -65,6 +65,9 @@ class UserActivity(AbstractPEPModule): if activity_tag is None: raise StanzaMalformed('No activity node') + if not activity_tag.getChildren(): + return None + for child in activity_tag.getChildren(): name = child.getName().strip() data = child.getData().strip() @@ -76,17 +79,22 @@ class UserActivity(AbstractPEPModule): subactivity_name = subactivity.getName().strip() activity_dict['subactivity'] = subactivity_name - return activity_dict or None + if 'activity' not in activity_dict: + raise StanzaMalformed('No activity value found') + return activity_dict def _build_node(self, data): item = nbxmpp.Node('activity', {'xmlns': self.namespace}) if data is None: return item + activity, subactivity, message = data - if activity: - i = item.addChild(activity) - if subactivity: - i.addChild(subactivity) + if not activity: + return item + + i = item.addChild(activity) + if subactivity: + i.addChild(subactivity) if message: i = item.addChild('text') i.addData(message) ===================================== gajim/common/modules/user_mood.py ===================================== @@ -67,6 +67,9 @@ class UserMood(AbstractPEPModule): if mood_tag is None: raise StanzaMalformed('No mood node') + if not mood_tag.getChildren(): + return None + for child in mood_tag.getChildren(): name = child.getName().strip() if name == 'text': @@ -74,15 +77,20 @@ class UserMood(AbstractPEPModule): else: mood_dict['mood'] = name - return mood_dict or None + if 'mood' not in mood_dict: + raise StanzaMalformed('No mood value found') + return mood_dict def _build_node(self, data: Optional[Tuple[str, str]]) -> nbxmpp.Node: item = nbxmpp.Node('mood', {'xmlns': nbxmpp.NS_MOOD}) if data is None: return item + mood, text = data - if mood: - item.addChild(mood) + if not mood: + return item + item.addChild(mood) + if text: item.addChild('text', payload=text) return item View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/cf8eafffb28fa4acb48e4eda44be35b7d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/cf8eafffb28fa4acb48e4eda44be35b7d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Detect full language code
by Philipp Hörist 19 Jan '19

19 Jan '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: cf8eafff by Philipp Hörist at 2019-01-19T19:40:06Z Detect full language code Previously we only used short language codes (en, de, fr) - Add conversion method to rfc5646 format - - - - - 3 changed files: - gajim/common/connection.py - gajim/common/i18n.py - gajim/conversation_textview.py Changes: ===================================== gajim/common/connection.py ===================================== @@ -1059,11 +1059,14 @@ class Connection(CommonConnection, ConnectionHandlers): secure_tuple = (self._current_type, cacerts, mycerts, tls_version, cipher_list, self._current_host['alpn']) + lang = i18n.get_rfc5646_lang() + log.info('Set stream language: %s', lang) + con = nbxmpp.NonBlockingClient( domain=self._hostname, caller=self, idlequeue=app.idlequeue, - lang=i18n.LANG) + lang=lang) if self._sm_resume_data: con.set_resume_data(self._sm_resume_data) ===================================== gajim/common/i18n.py ===================================== @@ -69,21 +69,33 @@ def iter_locale_dirs(): if locale_dir.is_dir(): yield str(locale_dir) + def get_default_lang(): if os.name == "nt": import ctypes windll = ctypes.windll.kernel32 - lang = locale.windows_locale[windll.GetUserDefaultUILanguage()] - return lang[:2] + return locale.windows_locale[windll.GetUserDefaultUILanguage()] if sys.platform == "darwin": from AppKit import NSLocale + # FIXME: This returns a two letter language code (en, de, fr) + # We need a way to get en_US, de_DE etc. return NSLocale.currentLocale().languageCode() - default = locale.getdefaultlocale()[0] - if default is not None: - return default[:2] - return 'en' + return locale.getdefaultlocale()[0] or 'en' + + +def get_rfc5646_lang(lang=None): + if lang is None: + lang = LANG + return lang.replace('_', '-') + + +def get_short_lang_code(lang=None): + if lang is None: + lang = LANG + return lang[:2] + def initialize_direction_mark(): from gi.repository import Gtk ===================================== gajim/conversation_textview.py ===================================== @@ -553,7 +553,7 @@ class ConversationTextview(GObject.GObject): % phrase_for_url else: link = 'http://%s.wikipedia.org/wiki/Special:Search?search=%s'\ - % (i18n.LANG, phrase_for_url) + % (i18n.get_short_lang_code(), phrase_for_url) item = Gtk.MenuItem.new_with_mnemonic(_('Read _Wikipedia Article')) id_ = item.connect('activate', self.visit_url_from_menuitem, link) self.handlers[id_] = item @@ -569,7 +569,7 @@ class ConversationTextview(GObject.GObject): % phrase_for_url else: link = 'http://%s.wiktionary.org/wiki/Special:Search?search=%s'\ - % (i18n.LANG, phrase_for_url) + % (i18n.get_short_lang_code(), phrase_for_url) id_ = item.connect('activate', self.visit_url_from_menuitem, link) self.handlers[id_] = item else: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/cf8eafffb28fa4acb48e4eda44be35b7db… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/cf8eafffb28fa4acb48e4eda44be35b7db… You're receiving this email because of your account on dev.gajim.org.

1 0

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

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits January 2019