Commits November 2019

commits@gajim.org

1 participants
84 discussions

[Git][gajim/gajim][master] Assistant: Add get_page()
by Philipp Hörist 29 Nov '19

29 Nov '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: fe6842af by Philipp Hörist at 2019-11-29T22:29:01Z Assistant: Add get_page() Use get_page() instead of page specific methods - - - - - 2 changed files: - gajim/gtk/assistant.py - test/gtk/assistant.py Changes: ===================================== gajim/gtk/assistant.py ===================================== @@ -114,11 +114,8 @@ class Assistant(Gtk.ApplicationWindow, EventHelper): self._set_buttons_visible(buttons) self._ui.stack.set_visible_child_full(name, transition) - def get_error_page(self): - return self._pages['error'] - - def get_success_page(self): - return self._pages['success'] + def get_page(self, name): + return self._pages[name] def _set_buttons_visible(self, buttons): for button in self._buttons.values(): ===================================== test/gtk/assistant.py ===================================== @@ -20,6 +20,16 @@ class TestAssistant(Assistant): self.add_default_page('error') self.add_default_page('success') + success_page = self.get_page('success') + success_page.set_title('Success') + success_page.set_heading('Success Heading') + success_page.set_text('This is the success text') + + error_page = self.get_page('error') + error_page.set_title('Error') + error_page.set_heading('Error Heading') + error_page.set_text('This is the error text') + self.add_button('forward', 'Forward', 'suggested-action') self.add_button('close', 'Close', 'destructive-action') self.add_button('back', 'Back') @@ -77,17 +87,9 @@ class TestAssistant(Assistant): self.set_default_button('forward') elif page_name == 'success': - success_page = self.get_success_page() - success_page.set_title('Success') - success_page.set_heading('Success Heading') - success_page.set_text('This is the success text') self.set_default_button('forward') elif page_name == 'error': - error_page = self.get_error_page() - error_page.set_title('Error') - error_page.set_heading('Error Heading') - error_page.set_text('This is the error text') self.set_default_button('back') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/fe6842af7a792415b208cd510a8a6a11b9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/fe6842af7a792415b208cd510a8a6a11b9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Assistant: Fix pylint error
by Philipp Hörist 29 Nov '19

29 Nov '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1452e842 by Philipp Hörist at 2019-11-29T21:27:01Z Assistant: Fix pylint error - - - - - 1 changed file: - gajim/gtk/assistant.py Changes: ===================================== gajim/gtk/assistant.py ===================================== @@ -35,10 +35,11 @@ class Assistant(Gtk.ApplicationWindow, EventHelper): (str, ) )) - def __init__(self, transient_for=None, - width=550, - height=400, - transition_duration=200): + def __init__(self, + transient_for=None, + width=550, + height=400, + transition_duration=200): Gtk.ApplicationWindow.__init__(self) EventHelper.__init__(self) self.set_application(Gio.Application.get_default()) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1452e84253fa98d65c3513467562f75e9c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1452e84253fa98d65c3513467562f75e9c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add base Assistant class
by Philipp Hörist 29 Nov '19

29 Nov '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 74b815b0 by Philipp Hörist at 2019-11-29T21:20:08Z Add base Assistant class - - - - - 4 changed files: - + gajim/data/gui/assistant.ui - gajim/data/style/gajim.css - + gajim/gtk/assistant.py - + test/gtk/assistant.py Changes: ===================================== gajim/data/gui/assistant.ui ===================================== @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<interface> + <requires lib="gtk+" version="3.20"/> + <object class="GtkGrid" id="main_grid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">6</property> + <child> + <object class="GtkBox" id="content_area"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkStack" id="stack"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <signal name="notify::visible-child-name" handler="_on_visible_child_name" swapped="no"/> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="action_area"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">12</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <style> + <class name="assistant-grid"/> + </style> + </object> +</interface> ===================================== gajim/data/style/gajim.css ===================================== @@ -273,4 +273,7 @@ button.flat.link { padding: 0; border: 0; } .gajim-scrolled { border: 1px solid; border-color:@unfocused_borders; } -#GroupchatJoin > box {padding: 18px; } \ No newline at end of file +#GroupchatJoin > box {padding: 18px; } + +.assistant-grid { padding: 18px; margin: 6px;} +.assistant-grid > box stack { padding: 18px; } ===================================== gajim/gtk/assistant.py ===================================== @@ -0,0 +1,197 @@ +# 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/>. + +from gi.repository import Gdk +from gi.repository import Gtk +from gi.repository import Gio +from gi.repository import GObject + +from gajim.gtk.util import get_builder +from gajim.gtk.util import EventHelper + + +class Assistant(Gtk.ApplicationWindow, EventHelper): + + __gsignals__ = dict( + button_clicked=( + GObject.SignalFlags.RUN_LAST | GObject.SignalFlags.ACTION, + None, + (str, ) + ), + page_changed=( + GObject.SignalFlags.RUN_LAST | GObject.SignalFlags.ACTION, + None, + (str, ) + )) + + def __init__(self, transient_for=None, + width=550, + height=400, + transition_duration=200): + Gtk.ApplicationWindow.__init__(self) + EventHelper.__init__(self) + self.set_application(Gio.Application.get_default()) + self.set_position(Gtk.WindowPosition.CENTER) + self.set_show_menubar(False) + self.set_name('Assistant') + self.set_default_size(width, height) + self.set_resizable(True) + self.set_transient_for(transient_for) + + self._pages = {} + self._buttons = {} + self._button_visible_func = None + + self._ui = get_builder('assistant.ui') + self.add(self._ui.main_grid) + + self._ui.stack.set_transition_duration(transition_duration) + + self.connect('key-press-event', self._on_key_press_event) + self.connect('destroy', self.__on_destroy) + self._ui.connect_signals(self) + + def show_all(self): + page_name = self._ui.stack.get_visible_child_name() + buttons = self._button_visible_func(self, page_name) + self._set_buttons_visible(buttons) + self.emit('page-changed', page_name) + Gtk.ApplicationWindow.show_all(self) + + def _on_key_press_event(self, _widget, event): + if event.keyval == Gdk.KEY_Escape: + self.destroy() + + def set_button_visible_func(self, func): + self._button_visible_func = func + + def set_default_button(self, button_name): + self._buttons[button_name].grab_default() + + def add_button(self, name, label, css_class=None): + button = Gtk.Button(label=label, + can_default=True, + no_show_all=True) + button.connect('clicked', self.__on_button_clicked) + if css_class is not None: + button.get_style_context().add_class(css_class) + self._buttons[name] = button + self._ui.action_area.pack_end(button, False, False, 0) + + def add_pages(self, pages): + self._pages = pages + for name, widget in pages.items(): + self._ui.stack.add_named(widget, name) + + def add_default_page(self, name): + if name == 'success': + page = SuccessPage() + elif name == 'error': + page = ErrorPage() + else: + raise ValueError('Unknown page: %s' % name) + + self._pages[name] = page + self._ui.stack.add_named(page, name) + + def get_current_page(self): + return self._ui.stack.get_visible_child_name() + + def show_page(self, name, transition=Gtk.StackTransitionType.NONE): + buttons = self._button_visible_func(self, name) + self._set_buttons_visible(buttons) + self._ui.stack.set_visible_child_full(name, transition) + + def get_error_page(self): + return self._pages['error'] + + def get_success_page(self): + return self._pages['success'] + + def _set_buttons_visible(self, buttons): + for button in self._buttons.values(): + button.hide() + + if buttons is None: + return + + for button_name in buttons: + self._buttons[button_name].show() + + def _on_visible_child_name(self, stack, _param): + self.set_title(stack.get_visible_child().title) + self.emit('page-changed', stack.get_visible_child_name()) + + def __on_button_clicked(self, button): + for button_name, button_ in self._buttons.items(): + if button_ == button: + self.emit('button-clicked', button_name) + return + + def __on_destroy(self, *args): + self._pages.clear() + self._buttons.clear() + + +class Page(Gtk.Box): + def __init__(self, icon_name, icon_css_class): + super().__init__(orientation=Gtk.Orientation.VERTICAL) + self.set_spacing(18) + self.set_valign(Gtk.Align.CENTER) + + self.title = '' + + self._heading = Gtk.Label() + self._heading.get_style_context().add_class('large-header') + self._heading.set_max_width_chars(30) + self._heading.set_line_wrap(True) + self._heading.set_halign(Gtk.Align.CENTER) + self._heading.set_justify(Gtk.Justification.CENTER) + + icon = Gtk.Image.new_from_icon_name(icon_name, Gtk.IconSize.DIALOG) + icon.get_style_context().add_class(icon_css_class) + + self._label = Gtk.Label() + self._label.set_max_width_chars(50) + self._label.set_line_wrap(True) + self._label.set_halign(Gtk.Align.CENTER) + self._label.set_justify(Gtk.Justification.CENTER) + + self.pack_start(self._heading, False, True, 0) + self.pack_start(icon, False, True, 0) + self.pack_start(self._label, False, True, 0) + self.show_all() + + def set_heading(self, heading): + self._heading.set_text(heading) + + def set_text(self, text): + self._label.set_text(text) + + def set_title(self, title): + self.title = title + + +class ErrorPage(Page): + def __init__(self): + Page.__init__(self, + icon_name='dialog-error-symbolic', + icon_css_class='error-color') + + +class SuccessPage(Page): + def __init__(self): + Page.__init__(self, + icon_name='object-select-symbolic', + icon_css_class='success-color') ===================================== test/gtk/assistant.py ===================================== @@ -0,0 +1,151 @@ +import gi +gi.require_version('Gtk', '3.0') +from gi.repository import Gtk + +from gajim.common.const import CSSPriority + +from gajim.gtk.assistant import Assistant + +from test.gtk import util +util.load_style('gajim.css', CSSPriority.APPLICATION) + + +class TestAssistant(Assistant): + def __init__(self): + Assistant.__init__(self) + + self.add_pages({'start': Start(), + 'progress': Progress()}) + + self.add_default_page('error') + self.add_default_page('success') + + self.add_button('forward', 'Forward', 'suggested-action') + self.add_button('close', 'Close', 'destructive-action') + self.add_button('back', 'Back') + + self.set_button_visible_func(self._visible_func) + + self.connect('button-clicked', self._on_button_clicked) + self.connect('page-changed', self._on_page_changed) + + self.show_all() + + @staticmethod + def _visible_func(_assistant, page_name): + if page_name == 'start': + return ['forward'] + + if page_name == 'progress': + return ['forward', 'back'] + + if page_name == 'success': + return ['forward', 'back'] + + if page_name == 'error': + return ['back', 'close'] + raise ValueError('page %s unknown' % page_name) + + def _on_button_clicked(self, _assistant, button_name): + page = self.get_current_page() + if button_name == 'forward': + if page == 'start': + self.show_page('progress', Gtk.StackTransitionType.SLIDE_LEFT) + elif page == 'progress': + self.show_page('success', Gtk.StackTransitionType.SLIDE_LEFT) + elif page == 'success': + self.show_page('error', Gtk.StackTransitionType.SLIDE_LEFT) + return + + if button_name == 'back': + if page == 'progress': + self.show_page('start') + if page == 'success': + self.show_page('progress') + if page == 'error': + self.show_page('success') + return + + if button_name == 'close': + self.destroy() + + def _on_page_changed(self, _assistant, page_name): + if page_name == 'start': + self.set_default_button('forward') + + elif page_name == 'progress': + self.set_default_button('forward') + + elif page_name == 'success': + success_page = self.get_success_page() + success_page.set_title('Success') + success_page.set_heading('Success Heading') + success_page.set_text('This is the success text') + self.set_default_button('forward') + + elif page_name == 'error': + error_page = self.get_error_page() + error_page.set_title('Error') + error_page.set_heading('Error Heading') + error_page.set_text('This is the error text') + self.set_default_button('back') + + +class Progress(Gtk.Box): + + title = 'Progress' + + def __init__(self): + super().__init__(orientation=Gtk.Orientation.VERTICAL) + self.set_spacing(18) + self.set_valign(Gtk.Align.CENTER) + label = Gtk.Label(label='Test label...') + label.set_max_width_chars(50) + label.set_line_wrap(True) + label.set_halign(Gtk.Align.CENTER) + label.set_justify(Gtk.Justification.CENTER) + spinner = Gtk.Spinner() + self.pack_start(label, False, True, 0) + self.pack_start(spinner, False, True, 0) + spinner.start() + self.show_all() + + +class Start(Gtk.Box): + + title = 'Start' + + def __init__(self): + super().__init__(orientation=Gtk.Orientation.VERTICAL) + self.set_spacing(18) + self.set_valign(Gtk.Align.CENTER) + heading = Gtk.Label(label='Test Assistant') + heading.get_style_context().add_class('large-header') + + label1 = Gtk.Label(label='This is label 1 with some text') + label1.set_max_width_chars(50) + label1.set_line_wrap(True) + label1.set_halign(Gtk.Align.CENTER) + label1.set_justify(Gtk.Justification.CENTER) + label1.set_margin_bottom(24) + + label2 = Gtk.Label(label='This is label 2 with some more text') + label2.set_max_width_chars(50) + label2.set_line_wrap(True) + label2.set_halign(Gtk.Align.CENTER) + label2.set_justify(Gtk.Justification.CENTER) + + self._server = Gtk.CheckButton.new_with_mnemonic('A fancy checkbox') + self._server.set_halign(Gtk.Align.CENTER) + + self.pack_start(heading, False, True, 0) + self.pack_start(label1, False, True, 0) + self.pack_start(label2, False, True, 0) + self.pack_start(self._server, False, True, 0) + self.show_all() + + +win = TestAssistant() +win.connect('destroy', Gtk.main_quit) +win.show_all() +Gtk.main() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/74b815b016dc90b2673ba53fa25f5765e5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/74b815b016dc90b2673ba53fa25f5765e5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Help menu: Add online hint and rename Content to Wiki
by Philipp Hörist 28 Nov '19

28 Nov '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 06844f23 by Daniel Brötzmann at 2019-11-28T11:34:36Z Help menu: Add online hint and rename Content to Wiki - - - - - 1 changed file: - gajim/data/gui/application_menu.ui Changes: ===================================== gajim/data/gui/application_menu.ui ===================================== @@ -43,11 +43,11 @@ <attribute name="label" translatable="yes">Help</attribute> <section> <item> - <attribute name="label" translatable="yes">Contents</attribute> + <attribute name="label" translatable="yes">Wiki (Online)</attribute> <attribute name="action">app.content</attribute> </item> <item> - <attribute name="label" translatable="yes">FAQ</attribute> + <attribute name="label" translatable="yes">FAQ (Online)</attribute> <attribute name="action">app.faq</attribute> </item> <item> View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/06844f2371634fb985dd7363b6b8614de0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/06844f2371634fb985dd7363b6b8614de0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 3 commits: BOB: Make parse_bob_data() return None on error
by Philipp Hörist 27 Nov '19

27 Nov '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: dab91c3d by Philipp Hörist at 2019-11-24T06:40:07Z BOB: Make parse_bob_data() return None on error - - - - - f28ff1df by Philipp Hörist at 2019-11-24T21:10:10Z Register: Add request_register_form() - - - - - dc337d8c by Philipp Hörist at 2019-11-26T22:07:48Z Register: Add change_password() - - - - - 6 changed files: - nbxmpp/const.py - nbxmpp/modules/bits_of_binary.py - nbxmpp/modules/captcha.py - nbxmpp/modules/register.py - nbxmpp/structs.py - nbxmpp/util.py Changes: ===================================== nbxmpp/const.py ===================================== @@ -553,4 +553,21 @@ CHATSTATES = [ 'gone', 'composing', 'paused' -] \ No newline at end of file +] + +REGISTER_FIELDS = [ + 'username', + 'nick', + 'password', + 'name', + 'first', + 'last', + 'email', + 'address', + 'city', + 'state', + 'zip', + 'phone', + 'url', + 'date', +] ===================================== nbxmpp/modules/bits_of_binary.py ===================================== @@ -19,7 +19,6 @@ import logging import hashlib from nbxmpp.protocol import NS_BOB -from nbxmpp.protocol import InvalidStanza from nbxmpp.structs import BobData from nbxmpp.util import b64decode @@ -29,7 +28,7 @@ log = logging.getLogger('nbxmpp.m.bob') def parse_bob_data(stanza): data_node = stanza.getTag('data', namespace=NS_BOB) if data_node is None: - return + return None cid = data_node.getAttr('cid') type_ = data_node.getAttr('type') @@ -39,42 +38,42 @@ def parse_bob_data(stanza): max_age = int(max_age) except Exception: log.exception(stanza) - raise InvalidStanza + return None if cid is None or type_ is None: log.warning('Invalid data node (no cid or type attr): %s', stanza) - raise InvalidStanza + return None try: algo_hash = cid.split('@')[0] algo, hash_ = algo_hash.split('+') except Exception: log.exception('Invalid cid: %s', stanza) - raise InvalidStanza + return None bob_data = data_node.getData() if not bob_data: log.warning('No bob data found: %s', stanza) - raise InvalidStanza + return None try: bob_data = b64decode(bob_data, return_type=bytes) except Exception: log.warning('Unable to decode data') log.exception(stanza) - raise InvalidStanza + return None try: sha = hashlib.new(algo) except ValueError as error: log.warning(stanza) log.warning(error) - raise InvalidStanza + return None sha.update(bob_data) if sha.hexdigest() != hash_: log.warning('Invalid hash: %s', stanza) - raise InvalidStanza + return None return BobData(algo=algo, hash_=hash_, ===================================== nbxmpp/modules/captcha.py ===================================== @@ -19,7 +19,6 @@ import logging from nbxmpp.protocol import NS_CAPTCHA from nbxmpp.protocol import NS_DATA -from nbxmpp.protocol import InvalidStanza from nbxmpp.structs import StanzaHandler from nbxmpp.structs import CaptchaData from nbxmpp.modules.dataforms import extend_form @@ -51,10 +50,7 @@ class Captcha: return form = extend_form(node=data_form) - try: - bob_data = parse_bob_data(stanza) - except InvalidStanza: - bob_data = None + bob_data = parse_bob_data(stanza) properties.captcha = CaptchaData(form=form, bob_data=bob_data) ===================================== nbxmpp/modules/register.py ===================================== @@ -17,13 +17,23 @@ import logging +from nbxmpp.protocol import NS_X_OOB +from nbxmpp.protocol import NS_DATA from nbxmpp.protocol import NS_REGISTER from nbxmpp.protocol import Iq from nbxmpp.protocol import isResultNode from nbxmpp.structs import CommonResult +from nbxmpp.structs import RegisterData +from nbxmpp.structs import ChangePasswordResult from nbxmpp.util import call_on_response from nbxmpp.util import callback from nbxmpp.util import raise_error +from nbxmpp.util import get_form +from nbxmpp.const import REGISTER_FIELDS +from nbxmpp.modules.bits_of_binary import parse_bob_data +from nbxmpp.modules.dataforms import extend_form +from nbxmpp.modules.dataforms import create_field +from nbxmpp.modules.dataforms import SimpleDataForm log = logging.getLogger('nbxmpp.m.register') @@ -42,8 +52,103 @@ class Register: query.addChild('remove') return iq + @call_on_response('_on_register_form') + def request_register_form(self, jid=None): + if jid is None: + jid = self._client.Server + return Iq('get', NS_REGISTER, to=jid) + + @callback + def _on_register_form(self, stanza): + query = stanza.getQuery() + + instructions = query.getTagData('instructions') or None + + return RegisterData(instructions=instructions, + form=self._parse_form(stanza), + fields_form=self._parse_fields_form(query), + oob_url=self._parse_oob_url(query), + bob_data=parse_bob_data(query)) + @callback def _default_response(self, stanza): if not isResultNode(stanza): return raise_error(log.info, stanza) return CommonResult(jid=stanza.getFrom()) + + @staticmethod + def _parse_oob_url(query): + oob = query.getTag('x', namespace=NS_X_OOB) + if oob is not None: + return oob.getTagData('url') or None + return None + + @staticmethod + def _parse_form(stanza): + form = stanza.getQuery().getTag('x', namespace=NS_DATA) + if form is None: + return None + + form = extend_form(node=form) + field = form.vars.get('FORM_TYPE') + if field is None: + log.warning('No FORM_TYPE found') + log.warning(stanza) + return None + + # Invalid urn:xmpp:captcha used by ejabberd + # See https://github.com/processone/ejabberd/issues/3093 + if field.value in ('jabber:iq:register', 'urn:xmpp:captcha'): + return form + return None + + @staticmethod + def _parse_fields_form(query): + fields = [] + for field in query.getChildren(): + field_name = field.getName() + if field_name not in REGISTER_FIELDS: + continue + + required = field_name in ('username', 'password') + typ = 'text-single' if field_name != 'password' else 'text-private' + fields.append(create_field(typ=typ, + var=field_name, + required=required)) + + if not fields: + return None + + fields.append(create_field(typ='hidden', var='fakeform')) + return SimpleDataForm(type_='form', fields=fields) + + @call_on_response('_on_password_change') + def change_password(self, password): + hostname = self._client.get_bound_jid().getDomain() + username = self._client.get_bound_jid().getNode() + iq = Iq('set', NS_REGISTER, to=hostname) + query = iq.getQuery() + query.setTagData('username', username) + query.setTagData('password', password) + return iq + + @callback + def _on_password_change(self, stanza): + if isResultNode(stanza): + return ChangePasswordResult(successful=True) + + if stanza.getQuery() is None: + return raise_error(log.info, stanza) + + form = get_form(stanza.getQuery(), + 'jabber:iq:register:changepassword') + if form is None: + return raise_error(log.info, stanza) + return ChangePasswordResult(successful=False, form=form) + + @call_on_response('_default_response') + def change_password_with_form(self, form): + hostname = self._client.get_bound_jid().getDomain() + iq = Iq('set', NS_REGISTER, to=hostname) + iq.setQueryPayload(form) + return iq ===================================== nbxmpp/structs.py ===================================== @@ -131,6 +131,10 @@ CorrectionData = namedtuple('CorrectionData', 'id') DisplayMarking = namedtuple('DisplayMarking', 'label fgcolor bgcolor') SecurityLabel = namedtuple('SecurityLabel', 'displaymarking') +RegisterData = namedtuple('RegisterData', 'instructions form fields_form oob_url bob_data') + +ChangePasswordResult = namedtuple('ChangePasswordResult', 'successful form') +ChangePasswordResult.__new__.__defaults__ = (None,) class DiscoInfo(namedtuple('DiscoInfo', 'stanza identities features dataforms timestamp')): ===================================== nbxmpp/util.py ===================================== @@ -321,3 +321,19 @@ def compute_caps_hash(info, compare=True): def generate_id(): return str(uuid.uuid4()) + + +def get_form(stanza, form_type): + forms = stanza.getTags('x', namespace=NS_DATA) + if not forms: + return None + + for form in forms: + form = extend_form(node=form) + field = form.vars.get('FORM_TYPE') + if field is None: + continue + + if field.value == form_type: + return form + return None View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/34a0ed853e7a948adae6758ae… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/34a0ed853e7a948adae6758ae… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ServerInfo: Match the correct FORM_TYPE
by Philipp Hörist 24 Nov '19

24 Nov '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6cb37a41 by Philipp Hörist at 2019-11-24T07:16:14Z ServerInfo: Match the correct FORM_TYPE - - - - - 1 changed file: - gajim/gtk/server_info.py Changes: ===================================== gajim/gtk/server_info.py ===================================== @@ -176,8 +176,8 @@ class ServerInfo(Gtk.ApplicationWindow, EventHelper): def _get_addresses(fields, dataforms): addresses = {} for form in dataforms: - type_ = form.vars.get('FORM_TYPE') - if type_ == 'http://jabber.org/network/serverinfo': + field = form.vars.get('FORM_TYPE') + if field.value != 'http://jabber.org/network/serverinfo': continue for address_type in fields: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6cb37a41471c1c273c976b77cf6e773c44… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6cb37a41471c1c273c976b77cf6e773c44… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Version 0.9.93
by Philipp Hörist 23 Nov '19

23 Nov '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 34a0ed85 by Philipp Hörist at 2019-11-23T19:01:23Z Version 0.9.93 - - - - - 2 changed files: - nbxmpp/__init__.py - setup.cfg Changes: ===================================== nbxmpp/__init__.py ===================================== @@ -15,4 +15,4 @@ from .client import NonBlockingClient from .plugin import PlugIn from .smacks import Smacks -__version__ = "0.9.92" +__version__ = "0.9.93" ===================================== setup.cfg ===================================== @@ -1,6 +1,6 @@ [metadata] name = nbxmpp -version = 0.9.92 +version = 0.9.93 description = Non blocking Jabber/XMPP module author = Yann Leboulanger, Philipp Hoerist author_email = gajim-devel(a)gajim.org View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/34a0ed853e7a948adae6758ae3… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/34a0ed853e7a948adae6758ae3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Refactor IQ callbacks
by Philipp Hörist 23 Nov '19

23 Nov '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: f3469e7d by Philipp Hörist at 2019-11-23T18:50:49Z Refactor IQ callbacks - Remove SendAndWaitForResponse(), there is no need for a timeout that ends the stream. We have other means of checking if the connection to the server was lost. - Don't wrap ProcessNonBlocking(), a server can send multiple stanzas in one packet, wraping this methods means we process callbacks after processing all stanzas in the packet. Which can lead to processing stanzas not in arrival order. Instead process callbacks inside dispatch(). - - - - - e207c934 by Philipp Hörist at 2019-11-23T18:53:32Z Remove unused session argument - - - - - 2 changed files: - nbxmpp/bind.py - nbxmpp/dispatcher.py Changes: ===================================== nbxmpp/bind.py ===================================== @@ -87,7 +87,7 @@ class NonBlockingBind(PlugIn): payload = Node('bind', attrs={'xmlns': NS_BIND}, payload=resource) node = Protocol('iq', typ='set', payload=[payload]) - self._owner.Dispatcher.SendAndWaitForResponse(node, func=self._on_bind) + self._owner.Dispatcher.SendAndCallForResponse(node, func=self._on_bind) def _on_bind(self, stanza): if isResultNode(stanza): @@ -104,7 +104,7 @@ class NonBlockingBind(PlugIn): else: node = Node('session', attrs={'xmlns':NS_SESSION}) iq = Protocol('iq', typ='set', payload=[node]) - self._owner.SendAndWaitForResponse( + self._owner.SendAndCallForResponse( iq, func=self._on_session) return if stanza: ===================================== nbxmpp/dispatcher.py ===================================== @@ -145,7 +145,7 @@ class XMPPDispatcher(PlugIn): self.RegisterEventHandler, self.UnregisterCycleHandler, self.RegisterCycleHandler, self.RegisterHandlerOnce, self.UnregisterHandler, self.RegisterProtocol, - self.SendAndWaitForResponse, self.SendAndCallForResponse, + self.SendAndCallForResponse, self.getAnID, self.Event, self.send, self.get_module] # \ufddo -> \ufdef range @@ -245,7 +245,6 @@ class XMPPDispatcher(PlugIn): self.RegisterDefaultHandler(self.returnStanzaHandler) self.RegisterEventHandler(self._owner._caller._event_dispatcher) self._register_modules() - self.on_responses = {} def plugin(self, owner): """ @@ -509,7 +508,7 @@ class XMPPDispatcher(PlugIn): else: log.warning('Received unhandled event: %s' % event) - def dispatch(self, stanza, session=None): + def dispatch(self, stanza): """ Main procedure that performs XMPP stanza recognition and calling apppropriate handlers for it. Called by simplexml @@ -517,9 +516,7 @@ class XMPPDispatcher(PlugIn): self.Event('', 'STANZA RECEIVED', stanza) - if not session: - session = self - session.Stream._mini_dom = None + self.Stream._mini_dom = None # Count stanza self._owner.Smacks.count_incoming(stanza.getName()) @@ -527,7 +524,7 @@ class XMPPDispatcher(PlugIn): name = stanza.getName() if name == 'features': self._owner.got_features = True - session.Stream.features = stanza + self.Stream.features = stanza elif name == 'error': if stanza.getTag('see-other-host'): self._owner.got_see_other_host = stanza @@ -608,21 +605,18 @@ class XMPPDispatcher(PlugIn): _id = stanza.getID() processed = False - if _id in session._expected: - if isinstance(session._expected[_id], tuple): - cb, args = session._expected[_id] - log.debug('Expected stanza arrived. Callback %s(%s) found', - cb, args) - try: - cb(session, stanza, **args) - except NodeProcessed: - pass - except Exception: - raise - else: - log.debug('Expected stanza arrived') - session._expected[_id] = stanza - processed = True + if _id in self._expected: + cb, args = self._expected[_id] + log.debug('Expected stanza arrived. Callback %s(%s) found', + cb, args) + try: + if args is None: + cb(stanza) + else: + cb(self, stanza, **args) + except NodeProcessed: + pass + return # Gather specifics depending on stanza properties specifics = ['default'] @@ -651,9 +645,9 @@ class XMPPDispatcher(PlugIn): # properties signature = inspect.signature(handler['func']) if len(signature.parameters) > 2: - handler['func'](session, stanza, properties) + handler['func'](self, stanza, properties) else: - handler['func'](session, stanza) + handler['func'](self, stanza) except NodeProcessed: processed = True except Exception: @@ -662,62 +656,16 @@ class XMPPDispatcher(PlugIn): # Stanza was not processed call default handler if not processed and self._defaultHandler: - self._defaultHandler(session, stanza) - - def _WaitForData(self, data): - """ - Internal wrapper around ProcessNonBlocking. Will check for - """ - if data is None: - return - res = self.ProcessNonBlocking(data) - # 0 result indicates that we have closed the connection, e.g. - # we have released dispatcher, so self._owner has no methods - if not res: - return - for (_id, _iq) in list(self._expected.items()): - if _iq is None: - # If the expected Stanza would have arrived, ProcessNonBlocking - # would have placed the reply stanza in there - continue - if _id in self.on_responses: - if len(self._expected) == 1: - if hasattr(self._owner, 'onreceive'): - # With BOSH we get a terminating body with multiple stanzas - # in it, we unplug BOSH before we parse the stanzas - self._owner.onreceive(None) - resp, args = self.on_responses[_id] - del self.on_responses[_id] - if args is None: - resp(_iq) - else: - resp(self._owner, _iq, **args) - del self._expected[_id] - - def SendAndWaitForResponse(self, stanza, timeout=None, func=None, args=None): - """ - Send stanza and wait for recipient's response to it. Will call transports - on_timeout callback if response is not retrieved in time - - Be aware: Only timeout of latest call of SendAndWait is active. - """ - if timeout is None: - timeout = DEFAULT_TIMEOUT_SECONDS - _waitid = self.send(stanza) - if func: - self.on_responses[_waitid] = (func, args) - if timeout: - self._owner.set_timeout(timeout) - self._owner.onreceive(self._WaitForData) - self._expected[_waitid] = None - return _waitid + self._defaultHandler(self, stanza) def SendAndCallForResponse(self, stanza, func=None, args=None): """ Put stanza on the wire and call back when recipient replies. Additional callback arguments can be specified in args """ - self.SendAndWaitForResponse(stanza, 0, func, args) + _waitid = self.send(stanza) + self._expected[_waitid] = (func, args) + return _waitid def send(self, stanza, now=False): """ @@ -785,7 +733,7 @@ class BOSHDispatcher(XMPPDispatcher): self.restart = False return XMPPDispatcher.ProcessNonBlocking(self, data) - def dispatch(self, stanza, session=None): + def dispatch(self, stanza): if stanza.getName() == 'body' and stanza.getNamespace() == NS_HTTP_BIND: stanza_attrs = stanza.getAttrs() @@ -803,6 +751,6 @@ class BOSHDispatcher(XMPPDispatcher): # rewrite it to jabber:client if child.getNamespace() == NS_HTTP_BIND: child.setNamespace(self._owner.defaultNamespace) - XMPPDispatcher.dispatch(self, child, session) + XMPPDispatcher.dispatch(self, child) else: - XMPPDispatcher.dispatch(self, stanza, session) + XMPPDispatcher.dispatch(self, stanza) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/7e700683e9f08a5095a2075d9… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/7e700683e9f08a5095a2075d9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ServerInfo: Add contact addresses
by Philipp Hörist 22 Nov '19

22 Nov '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 545d25ca by Daniel Brötzmann at 2019-11-22T21:29:33Z ServerInfo: Add contact addresses - - - - - 2 changed files: - gajim/data/gui/server_info.ui - gajim/gtk/server_info.py Changes: ===================================== gajim/data/gui/server_info.ui ===================================== @@ -9,6 +9,7 @@ <object class="GtkGrid" id="server"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">center</property> <property name="row_spacing">6</property> <property name="column_spacing">12</property> <child> @@ -101,22 +102,44 @@ </packing> </child> <child> - <object class="GtkBox" id="spacer1"> - <property name="width_request">160</property> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <child> - <placeholder/> - </child> + <property name="margin_top">12</property> + <property name="label" translatable="yes">Contact Addresses</property> + <style> + <class name="bold16"/> + </style> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">3</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="no_addresses_label"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="label" translatable="yes">No contact addresses published for this server.</property> + <property name="wrap">True</property> + <property name="max_width_chars">50</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + <property name="width">2</property> </packing> </child> <child> <placeholder/> </child> + <child> + <placeholder/> + </child> <style> <class name="margin-18"/> </style> ===================================== gajim/gtk/server_info.py ===================================== @@ -20,9 +20,11 @@ import nbxmpp from nbxmpp.util import is_error_result from gi.repository import Gtk from gi.repository import Gdk +from gi.repository import Pango from gajim.common import app from gajim.common import ged +from gajim.common.helpers import open_uri from gajim.common.i18n import _ from gajim.gtk.util import ensure_not_destroyed @@ -66,6 +68,9 @@ class ServerInfo(Gtk.ApplicationWindow, EventHelper): self.hostname, callback=self._software_version_received) self.request_last_activity() + server_info = con.get_module('Discovery').server_info + self._add_contact_addresses(server_info.dataforms) + self.cert = con.connection.Connection.ssl_certificate self._add_connection_info() @@ -142,6 +147,78 @@ class ServerInfo(Gtk.ApplicationWindow, EventHelper): iq = nbxmpp.Iq(to=self.hostname, typ='get', queryNS=nbxmpp.NS_LAST) con.connection.SendAndCallForResponse(iq, self._on_last_activity) + def _add_contact_addresses(self, dataforms): + fields = { + 'admin-addresses': _('Admin'), + 'support-addresses': _('Support'), + 'security-addresses': _('Security'), + 'feedback-addresses': _('Feedback'), + 'abuse-addresses': _('Abuse'), + 'sales-addresses': _('Sales'), + } + + addresses = self._get_addresses(fields, dataforms) + if addresses is None: + self._ui.no_addresses_label.set_visible(True) + return + + row_count = 4 + for address_type, values in addresses.items(): + label = self._get_address_type_label(fields[address_type]) + self._ui.server.attach(label, 0, row_count, 1, 1) + for index, value in enumerate(values): + last = index == len(values) - 1 + label = self._get_address_label(value, last=last) + self._ui.server.attach(label, 1, row_count, 1, 1) + row_count += 1 + + @staticmethod + def _get_addresses(fields, dataforms): + addresses = {} + for form in dataforms: + type_ = form.vars.get('FORM_TYPE') + if type_ == 'http://jabber.org/network/serverinfo': + continue + + for address_type in fields: + field = form.vars.get(address_type) + if field is None: + continue + + if field.type_ != 'list-multi': + continue + + if not field.values: + continue + addresses[address_type] = field.values + + return addresses or None + return None + + @staticmethod + def _get_address_type_label(text): + label = Gtk.Label(label=text) + label.set_halign(Gtk.Align.END) + label.set_valign(Gtk.Align.START) + label.get_style_context().add_class('dim-label') + return label + + def _get_address_label(self, address, last=False): + label = Gtk.Label() + label.set_markup('<a href="%s">%s</a>' % (address, address)) + label.set_ellipsize(Pango.EllipsizeMode.END) + label.set_xalign(0) + label.set_halign(Gtk.Align.START) + label.get_style_context().add_class('link-button') + label.connect('activate-link', self._on_activate_link) + if last: + label.set_margin_bottom(6) + return label + + def _on_activate_link(self, label, *args): + open_uri(label.get_text(), account=self.account) + return Gdk.EVENT_STOP + def _on_last_activity(self, stanza): if self._destroyed: # Window got closed in the meantime View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/545d25ca93e02cc7c2f680f327f2ee457a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/545d25ca93e02cc7c2f680f327f2ee457a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Discovery: Store Account/Server disco info
by Philipp Hörist 21 Nov '19

21 Nov '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 23d5a6e1 by Philipp Hörist at 2019-11-21T21:24:11Z Discovery: Store Account/Server disco info - - - - - 1 changed file: - gajim/common/modules/discovery.py Changes: ===================================== gajim/common/modules/discovery.py ===================================== @@ -47,6 +47,17 @@ class Discovery(BaseModule): ns=nbxmpp.NS_DISCO_ITEMS), ] + self._account_info = None + self._server_info = None + + @property + def account_info(self): + return self._account_info + + @property + def server_info(self): + return self._server_info + def disco_contact(self, jid, node=None): success_cb = self._con.get_module('Caps').contact_info_received self.disco_info(jid, node, callback=success_cb) @@ -99,6 +110,8 @@ class Discovery(BaseModule): self._log.info('Account info received: %s', result.jid) + self._account_info = result + self._con.get_module('MAM').pass_disco(result) self._con.get_module('PEP').pass_disco(result) self._con.get_module('PubSub').pass_disco(result) @@ -122,6 +135,8 @@ class Discovery(BaseModule): self._log.info('Server info received: %s', result.jid) + self._server_info = result + self._con.get_module('SecLabels').pass_disco(result) self._con.get_module('Blocking').pass_disco(result) self._con.get_module('VCardTemp').pass_disco(result) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/23d5a6e138beb525fc690205851dc278eb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/23d5a6e138beb525fc690205851dc278eb… 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 November 2019