Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] MUC: Adapt to nbxmpp changes
by Philipp Hörist 19 Oct '20

19 Oct '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: db05b124 by lovetox at 2020-10-19T22:33:40+02:00 MUC: Adapt to nbxmpp changes - - - - - 4 changed files: - gajim/command_system/implementation/standard.py - gajim/common/modules/muc.py - gajim/groupchat_control.py - gajim/gtk/groupchat_config.py Changes: ===================================== gajim/command_system/implementation/standard.py ===================================== @@ -350,7 +350,7 @@ def kick(self, who, reason): if who not in app.contacts.get_nick_list(self.account, self.room_jid): raise CommandError(_("Nickname not found")) self.connection.get_module('MUC').set_role( - self.room_jid, who, 'none', reason or str()) + self.room_jid, who, 'none', reason) @command(raw=True) # Do not translate moderator, participant, visitor, none ===================================== gajim/common/modules/muc.py ===================================== @@ -23,7 +23,6 @@ from nbxmpp.const import PresenceType from nbxmpp.const import StatusCode from nbxmpp.structs import StanzaHandler -from nbxmpp.util import is_error_result from nbxmpp.errors import StanzaError from gi.repository import GLib @@ -230,14 +229,16 @@ def configure_room(self, room_jid): self._nbxmpp('MUC').request_config(room_jid, callback=self._on_room_config) - def _on_room_config(self, result): - if is_error_result(result): - self._log.info(result) + def _on_room_config(self, task): + try: + result = task.finish() + except StanzaError as error: + self._log.info(error) app.nec.push_incoming_event(NetworkEvent( 'muc-configuration-failed', account=self._account, - room_jid=result.jid, - error=result)) + room_jid=error.jid, + error=error)) return self._log.info('Configure room: %s', result.jid) @@ -261,14 +262,16 @@ def _apply_config(form, config=None): else: field.value = value - def _on_config_result(self, result): - if is_error_result(result): - self._log.info(result) + def _on_config_result(self, task): + try: + result = task.finish() + except StanzaError as error: + self._log.info(error) app.nec.push_incoming_event(NetworkEvent( 'muc-configuration-failed', account=self._account, - room_jid=result.jid, - error=result)) + room_jid=error.jid, + error=error)) return self._con.get_module('Discovery').disco_muc( @@ -716,19 +719,19 @@ def send_captcha(self, room_jid, form_node): form_node, callback=self._on_captcha_result) - def _on_captcha_result(self, result): - if not is_error_result(result): - return - - muc_data = self._manager.get(result.jid) - if muc_data is None: - return - self._manager.set_state(result.jid, MUCJoinedState.CAPTCHA_FAILED) - app.nec.push_incoming_event( - NetworkEvent('muc-captcha-error', - account=self._account, - room_jid=str(result.jid), - error_text=to_user_string(result))) + def _on_captcha_result(self, task): + try: + task.finish() + except StanzaError as error: + muc_data = self._manager.get(error.jid) + if muc_data is None: + return + self._manager.set_state(error.jid, MUCJoinedState.CAPTCHA_FAILED) + app.nec.push_incoming_event( + NetworkEvent('muc-captcha-error', + account=self._account, + room_jid=str(error.jid), + error_text=to_user_string(error))) def _on_config_change(self, _con, _stanza, properties): if not properties.is_muc_config_change: ===================================== gajim/groupchat_control.py ===================================== @@ -33,7 +33,7 @@ from nbxmpp.const import StatusCode from nbxmpp.const import Affiliation from nbxmpp.const import PresenceType -from nbxmpp.util import is_error_result +from nbxmpp.errors import StanzaError from nbxmpp.modules.vcard_temp import VCard from gi.repository import Gtk @@ -546,9 +546,11 @@ def _on_configure_room(self, _action, _param): self.room_jid, contact.affiliation.value) - def _on_configure_form_received(self, result): - if is_error_result(result): - log.info(result) + def _on_configure_form_received(self, task): + try: + result = task.finish() + except StanzaError as error: + log.info(error) return GroupchatConfig(self.account, result.jid, 'owner', result.form) ===================================== gajim/gtk/groupchat_config.py ===================================== @@ -15,7 +15,7 @@ import logging from nbxmpp.namespaces import Namespace -from nbxmpp.util import is_error_result +from nbxmpp.errors import StanzaError from gi.repository import Gdk from gi.repository import Gtk @@ -26,7 +26,6 @@ from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dataform import DataFormWidget from gajim.gtk.util import get_builder -from gajim.gtk.util import ensure_not_destroyed log = logging.getLogger('gajim.gtk.groupchat_config') @@ -353,11 +352,13 @@ def _set_affiliations(self): con = app.connections[self.account] con.get_module('MUC').set_affiliation(self.jid, diff_dict) - @ensure_not_destroyed - def _on_affiliations_received(self, result, affiliation): - if is_error_result(result): + def _on_affiliations_received(self, task): + affiliation = task.get_user_data() + try: + result = task.finish() + except StanzaError as error: log.info('Error while requesting %s affiliations: %s', - affiliation, result.condition) + affiliation, error.condition) return if affiliation == 'outcast': View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/db05b1243cf7996903e74264ccc3b915… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/db05b1243cf7996903e74264ccc3b915… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] MUC: Refactor module
by Philipp Hörist 19 Oct '20

19 Oct '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: cbb21973 by lovetox at 2020-10-19T22:30:39+02:00 MUC: Refactor module - Use tasks - - - - - 3 changed files: - + nbxmpp/modules/muc/__init__.py - nbxmpp/modules/muc.py → nbxmpp/modules/muc/muc.py - + nbxmpp/modules/muc/util.py Changes: ===================================== nbxmpp/modules/muc/__init__.py ===================================== @@ -0,0 +1 @@ +from .muc import MUC ===================================== nbxmpp/modules/muc.py → nbxmpp/modules/muc/muc.py ===================================== @@ -15,43 +15,45 @@ # You should have received a copy of the GNU General Public License # along with this program; If not, see <http://www.gnu.org/licenses/>. -from dataclasses import dataclass from nbxmpp.namespaces import Namespace from nbxmpp.protocol import ERR_NOT_ACCEPTABLE from nbxmpp.protocol import JID -from nbxmpp.protocol import Iq from nbxmpp.protocol import Message from nbxmpp.protocol import DataForm from nbxmpp.protocol import DataField -from nbxmpp.protocol import isResultNode from nbxmpp.protocol import NodeProcessed from nbxmpp.protocol import StanzaMalformed -from nbxmpp.protocol import InvalidJid -from nbxmpp.simplexml import Node from nbxmpp.structs import StanzaHandler from nbxmpp.const import InviteType from nbxmpp.const import MessageType from nbxmpp.const import StatusCode -from nbxmpp.const import Affiliation -from nbxmpp.const import Role from nbxmpp.structs import DeclineData from nbxmpp.structs import InviteData from nbxmpp.structs import VoiceRequest from nbxmpp.structs import AffiliationResult -from nbxmpp.structs import CommonResult from nbxmpp.structs import MucConfigResult -from nbxmpp.structs import MucUserData from nbxmpp.structs import MucDestroyed from nbxmpp.task import iq_request_task -from nbxmpp.util import call_on_response -from nbxmpp.util import callback -from nbxmpp.util import raise_error from nbxmpp.errors import is_error +from nbxmpp.errors import StanzaError from nbxmpp.modules.util import raise_if_error from nbxmpp.modules.util import parse_xmpp_uri +from nbxmpp.modules.util import process_response from nbxmpp.modules.dataforms import extend_form from nbxmpp.modules.base import BaseModule +from nbxmpp.modules.muc.util import MucInfoResult +from nbxmpp.modules.muc.util import make_affiliation_request +from nbxmpp.modules.muc.util import make_destroy_request +from nbxmpp.modules.muc.util import make_set_config_request +from nbxmpp.modules.muc.util import make_config_request +from nbxmpp.modules.muc.util import make_cancel_config_request +from nbxmpp.modules.muc.util import make_set_affiliation_request +from nbxmpp.modules.muc.util import make_set_role_request +from nbxmpp.modules.muc.util import make_captcha_request +from nbxmpp.modules.muc.util import build_direct_invite +from nbxmpp.modules.muc.util import build_mediated_invite +from nbxmpp.modules.muc.util import parse_muc_user class MUC(BaseModule): @@ -165,7 +167,7 @@ class MUC(BaseModule): properties.muc_status_codes = codes try: - properties.muc_user = self._parse_muc_user(muc_user) + properties.muc_user = parse_muc_user(muc_user) except StanzaMalformed as error: self._log.warning(error) self._log.warning(stanza) @@ -186,8 +188,8 @@ class MUC(BaseModule): muc_user = stanza.getTag('x', namespace=Namespace.MUC_USER) if muc_user is not None: try: - properties.muc_user = self._parse_muc_user(muc_user, - is_presence=False) + properties.muc_user = parse_muc_user(muc_user, + is_presence=False) except StanzaMalformed as error: self._log.warning(error) self._log.warning(stanza) @@ -342,20 +344,16 @@ class MUC(BaseModule): form['muc#request_allow'].value = True self._client.send_stanza(Message(to=muc_jid, payload=form)) - @call_on_response('_affiliation_received') + @iq_request_task def get_affiliation(self, jid, affiliation): - iq = Iq(typ='get', to=jid, queryNS=Namespace.MUC_ADMIN) - item = iq.setQuery().setTag('item') - item.setAttr('affiliation', affiliation) - return iq - - @callback - def _affiliation_received(self, stanza): - if not isResultNode(stanza): - return raise_error(self._log.info, stanza) - - room_jid = stanza.getFrom() - query = stanza.getTag('query', namespace=Namespace.MUC_ADMIN) + _task = yield + + response = yield make_affiliation_request(jid, affiliation) + if response.isError(): + raise StanzaError(response) + + room_jid = response.getFrom() + query = response.getTag('query', namespace=Namespace.MUC_ADMIN) items = query.getTags('item') users_dict = {} for item in items: @@ -378,19 +376,14 @@ class MUC(BaseModule): self._log.info('Affiliations received from %s: %s', room_jid, users_dict) - return AffiliationResult(jid=room_jid, users=users_dict) + yield AffiliationResult(jid=room_jid, users=users_dict) - @call_on_response('_default_response') - def destroy(self, room_jid, reason='', jid=''): - iq = Iq(typ='set', queryNS=Namespace.MUC_OWNER, to=room_jid) - destroy = iq.setQuery().setTag('destroy') - if reason: - destroy.setTagData('reason', reason) - if jid: - destroy.setAttr('jid', jid) - self._log.info('Destroy room: %s, reason: %s, alternate: %s', - room_jid, reason, jid) - return iq + @iq_request_task + def destroy(self, room_jid, reason=None, jid=None): + _task = yield + + response = yield make_destroy_request(room_jid, reason, jid) + yield process_response(response) @iq_request_task def request_info(self, jid, request_vcard=True, allow_redirect=False): @@ -428,79 +421,52 @@ class MUC(BaseModule): vcard=vcard, redirected=redirected) - @call_on_response('_default_response') + @iq_request_task def set_config(self, room_jid, form): - iq = Iq(typ='set', to=room_jid, queryNS=Namespace.MUC_OWNER) - query = iq.setQuery() - form.setAttr('type', 'submit') - query.addChild(node=form) - self._log.info('Set config for %s', room_jid) - return iq - - @call_on_response('_config_received') + _task = yield + + response = yield make_set_config_request(room_jid, form) + yield process_response(response) + + @iq_request_task def request_config(self, room_jid): - iq = Iq(typ='get', - queryNS=Namespace.MUC_OWNER, - to=room_jid) - self._log.info('Request config for %s', room_jid) - return iq + task = yield - @callback - def _config_received(self, stanza): - if not isResultNode(stanza): - return raise_error(self._log.info, stanza) + response = yield make_config_request(room_jid) + if response.isError(): + raise StanzaError(response) - jid = stanza.getFrom() - payload = stanza.getQueryPayload() + jid = response.getFrom() + payload = response.getQueryPayload() for form in payload: if form.getNamespace() == Namespace.DATA: dataform = extend_form(node=form) self._log.info('Config form received for %s', jid) - return MucConfigResult(jid=jid, - form=dataform) - return MucConfigResult(jid=jid) + yield MucConfigResult(jid=jid, form=dataform) - @call_on_response('_default_response') + yield MucConfigResult(jid=jid) + + @iq_request_task def cancel_config(self, room_jid): - cancel = Node(tag='x', attrs={'xmlns': Namespace.DATA, - 'type': 'cancel'}) - iq = Iq(typ='set', - queryNS=Namespace.MUC_OWNER, - payload=cancel, - to=room_jid) - self._log.info('Cancel config for %s', room_jid) - return iq - - @call_on_response('_default_response') + _task = yield + + response = yield make_cancel_config_request(room_jid) + yield process_response(response) + + @iq_request_task def set_affiliation(self, room_jid, users_dict): - iq = Iq(typ='set', to=room_jid, queryNS=Namespace.MUC_ADMIN) - item = iq.setQuery() - for jid in users_dict: - affiliation = users_dict[jid].get('affiliation') - reason = users_dict[jid].get('reason') - nick = users_dict[jid].get('nick') - item_tag = item.addChild('item', {'jid': jid, - 'affiliation': affiliation}) - if reason is not None: - item_tag.setTagData('reason', reason) - - if nick is not None: - item_tag.setAttr('nick', nick) - self._log.info('Set affiliation for %s: %s', room_jid, users_dict) - return iq - - @call_on_response('_default_response') - def set_role(self, room_jid, nick, role, reason=''): - iq = Iq(typ='set', to=room_jid, queryNS=Namespace.MUC_ADMIN) - item = iq.setQuery().setTag('item') - item.setAttr('nick', nick) - item.setAttr('role', role) - if reason: - item.addChild(name='reason', payload=reason) - self._log.info('Set role for %s: %s %s %s', - room_jid, nick, role, reason) - return iq + _task = yield + + response = yield make_set_affiliation_request(room_jid, users_dict) + yield process_response(response) + + @iq_request_task + def set_role(self, room_jid, nick, role, reason=None): + _task = yield + + response = yield make_set_role_request(room_jid, nick, role, reason) + yield process_response(response) def set_subject(self, room_jid, subject): message = Message(room_jid, typ='groupchat', subject=subject) @@ -529,106 +495,22 @@ class MUC(BaseModule): def invite(self, room, to, password, reason=None, continue_=False, type_=InviteType.MEDIATED): if type_ == InviteType.DIRECT: - invite = self._build_direct_invite( + invite = build_direct_invite( room, to, reason, password, continue_) else: - invite = self._build_mediated_invite( + invite = build_mediated_invite( room, to, reason, password, continue_) return self._client.send_stanza(invite) - @staticmethod - def _build_direct_invite(room, to, reason, password, continue_): - message = Message(to=to) - attrs = {'jid': room} - if reason: - attrs['reason'] = reason - if continue_: - attrs['continue'] = 'true' - if password: - attrs['password'] = password - message.addChild(name='x', attrs=attrs, - namespace=Namespace.CONFERENCE) - return message - - @staticmethod - def _build_mediated_invite(room, to, reason, password, continue_): - message = Message(to=room) - muc_user = message.addChild('x', namespace=Namespace.MUC_USER) - invite = muc_user.addChild('invite', attrs={'to': to}) - if continue_: - invite.addChild(name='continue') - if reason: - invite.setTagData('reason', reason) - if password: - muc_user.setTagData('password', password) - return message - - @call_on_response('_default_response') + @iq_request_task def send_captcha(self, room_jid, form_node): - iq = Iq(typ='set', to=room_jid) - captcha = iq.addChild(name='captcha', namespace=Namespace.CAPTCHA) - captcha.addChild(node=form_node) - return iq + _task = yield + + response = yield make_captcha_request(room_jid, form_node) + yield process_response(response) def cancel_captcha(self, room_jid, message_id): message = Message(typ='error', to=room_jid) message.setID(message_id) message.setError(ERR_NOT_ACCEPTABLE) self._client.send_stanza(message) - - @callback - def _default_response(self, stanza): - if not isResultNode(stanza): - return raise_error(self._log.info, stanza) - return CommonResult(jid=stanza.getFrom()) - - @staticmethod - def _parse_muc_user(muc_user, is_presence=True): - item = muc_user.getTag('item') - if item is None: - return None - - item_dict = item.getAttrs() - - role = item_dict.get('role') - if role is not None: - try: - role = Role(role) - except ValueError: - raise StanzaMalformed('invalid role %s' % role) - - elif is_presence: - # role attr MUST be included in all presence broadcasts - raise StanzaMalformed('role attr missing') - - affiliation = item_dict.get('affiliation') - if affiliation is not None: - try: - affiliation = Affiliation(affiliation) - except ValueError: - raise StanzaMalformed('invalid affiliation %s' % affiliation) - - elif is_presence: - # affiliation attr MUST be included in all presence broadcasts - raise StanzaMalformed('affiliation attr missing') - - jid = item_dict.get('jid') - if jid is not None: - try: - jid = JID.from_string(jid) - except InvalidJid as error: - raise StanzaMalformed('invalid jid %s, %s' % (jid, error)) - - return MucUserData(affiliation=affiliation, - jid=jid, - nick=item.getAttr('nick'), - role=role, - actor=item.getTagAttr('actor', 'nick'), - reason=item.getTagData('reason')) - - -@dataclass -class MucInfoResult: - info: object - vcard: object = None - redirected: bool = False ===================================== nbxmpp/modules/muc/util.py ===================================== @@ -0,0 +1,189 @@ +# Copyright (C) 2020 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/>. + + +from dataclasses import dataclass + +from nbxmpp.namespaces import Namespace +from nbxmpp.protocol import Iq +from nbxmpp.protocol import JID +from nbxmpp.protocol import InvalidJid +from nbxmpp.protocol import StanzaMalformed +from nbxmpp.protocol import Message +from nbxmpp.simplexml import Node +from nbxmpp.const import Affiliation +from nbxmpp.const import Role +from nbxmpp.structs import MucUserData + + +@dataclass +class MucInfoResult: + info: object + vcard: object = None + redirected: bool = False + + +def make_affiliation_request(jid, affiliation): + iq = Iq(typ='get', to=jid, queryNS=Namespace.MUC_ADMIN) + item = iq.setQuery().setTag('item') + item.setAttr('affiliation', affiliation) + return iq + + +def make_set_affiliation_request(room_jid, users_dict): + iq = Iq(typ='set', to=room_jid, queryNS=Namespace.MUC_ADMIN) + item = iq.setQuery() + for jid in users_dict: + affiliation = users_dict[jid].get('affiliation') + reason = users_dict[jid].get('reason') + nick = users_dict[jid].get('nick') + item_tag = item.addChild('item', {'jid': jid, + 'affiliation': affiliation}) + if reason is not None: + item_tag.setTagData('reason', reason) + + if nick is not None: + item_tag.setAttr('nick', nick) + + return iq + + +def make_destroy_request(room_jid, reason, jid): + iq = Iq(typ='set', queryNS=Namespace.MUC_OWNER, to=room_jid) + destroy = iq.setQuery().setTag('destroy') + + if reason: + destroy.setTagData('reason', reason) + + if jid: + destroy.setAttr('jid', jid) + + return iq + + +def make_set_config_request(room_jid, form): + iq = Iq(typ='set', to=room_jid, queryNS=Namespace.MUC_OWNER) + query = iq.setQuery() + form.setAttr('type', 'submit') + query.addChild(node=form) + return iq + + +def make_config_request(room_jid): + iq = Iq(typ='get', + queryNS=Namespace.MUC_OWNER, + to=room_jid) + return iq + + +def make_cancel_config_request(room_jid): + cancel = Node(tag='x', attrs={'xmlns': Namespace.DATA, + 'type': 'cancel'}) + iq = Iq(typ='set', + queryNS=Namespace.MUC_OWNER, + payload=cancel, + to=room_jid) + return iq + + +def make_set_role_request(room_jid, nick, role, reason): + iq = Iq(typ='set', to=room_jid, queryNS=Namespace.MUC_ADMIN) + item = iq.setQuery().setTag('item') + item.setAttr('nick', nick) + item.setAttr('role', role) + if reason: + item.addChild(name='reason', payload=reason) + + return iq + + +def make_captcha_request(room_jid, form_node): + iq = Iq(typ='set', to=room_jid) + captcha = iq.addChild(name='captcha', namespace=Namespace.CAPTCHA) + captcha.addChild(node=form_node) + return iq + + +def build_direct_invite(room, to, reason, password, continue_): + message = Message(to=to) + attrs = {'jid': room} + if reason: + attrs['reason'] = reason + if continue_: + attrs['continue'] = 'true' + if password: + attrs['password'] = password + message.addChild(name='x', attrs=attrs, + namespace=Namespace.CONFERENCE) + return message + + +def build_mediated_invite(room, to, reason, password, continue_): + message = Message(to=room) + muc_user = message.addChild('x', namespace=Namespace.MUC_USER) + invite = muc_user.addChild('invite', attrs={'to': to}) + if continue_: + invite.addChild(name='continue') + if reason: + invite.setTagData('reason', reason) + if password: + muc_user.setTagData('password', password) + return message + + +def parse_muc_user(muc_user, is_presence=True): + item = muc_user.getTag('item') + if item is None: + return None + + item_dict = item.getAttrs() + + role = item_dict.get('role') + if role is not None: + try: + role = Role(role) + except ValueError: + raise StanzaMalformed('invalid role %s' % role) + + elif is_presence: + # role attr MUST be included in all presence broadcasts + raise StanzaMalformed('role attr missing') + + affiliation = item_dict.get('affiliation') + if affiliation is not None: + try: + affiliation = Affiliation(affiliation) + except ValueError: + raise StanzaMalformed('invalid affiliation %s' % affiliation) + + elif is_presence: + # affiliation attr MUST be included in all presence broadcasts + raise StanzaMalformed('affiliation attr missing') + + jid = item_dict.get('jid') + if jid is not None: + try: + jid = JID.from_string(jid) + except InvalidJid as error: + raise StanzaMalformed('invalid jid %s, %s' % (jid, error)) + + return MucUserData(affiliation=affiliation, + jid=jid, + nick=item.getAttr('nick'), + role=role, + actor=item.getTagAttr('actor', 'nick'), + reason=item.getTagData('reason')) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/cbb21973cf1c7f22da387ef4… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/cbb21973cf1c7f22da387ef4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add .gitattributes
by Philipp Hörist 19 Oct '20

19 Oct '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: f9f6910e by lovetox at 2020-10-19T20:12:40+02:00 Add .gitattributes - - - - - 1 changed file: - + .gitattributes Changes: ===================================== .gitattributes ===================================== @@ -0,0 +1,5 @@ +*.css diff=css +*.html diff=html +*.xhtml diff=html +*.py diff=python +*.md diff=markdown \ No newline at end of file View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f9f6910e9e04856e941501e0a980edcb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f9f6910e9e04856e941501e0a980edcb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Register: Refactor module
by Philipp Hörist 19 Oct '20

19 Oct '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 1cb28e12 by lovetox at 2020-10-19T17:07:13+02:00 Register: Refactor module - Use tasks - - - - - 6 changed files: - nbxmpp/errors.py - − nbxmpp/modules/register.py - + nbxmpp/modules/register/__init__.py - + nbxmpp/modules/register/register.py - + nbxmpp/modules/register/util.py - nbxmpp/structs.py Changes: ===================================== nbxmpp/errors.py ===================================== @@ -135,3 +135,21 @@ class CancelledError(BaseError): def __init__(self): BaseError.__init__(self, is_fatal=True) self.text = 'Task has been cancelled' + + +class RegisterStanzaError(StanzaError): + def __init__(self, stanza, data): + StanzaError.__init__(self, stanza) + self._data = data + + def get_data(self): + return self._data + + +class ChangePasswordStanzaError(StanzaError): + def __init__(self, stanza, form): + StanzaError.__init__(self, stanza) + self._form = form + + def get_form(self): + return self._form ===================================== nbxmpp/modules/register.py deleted ===================================== @@ -1,207 +0,0 @@ -# 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/>. - -from nbxmpp.namespaces import Namespace -from nbxmpp.protocol import Iq -from nbxmpp.protocol import isResultNode -from nbxmpp.structs import CommonResult -from nbxmpp.structs import CommonError -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 -from nbxmpp.modules.base import BaseModule - - -class Register(BaseModule): - def __init__(self, client): - BaseModule.__init__(self, client) - - self._client = client - self.handlers = [] - - @call_on_response('_default_response') - def unregister(self, jid=None): - iq = Iq('set', to=jid) - query = iq.setQuery() - query.setNamespace(Namespace.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.domain - return Iq('get', Namespace.REGISTER, to=jid) - - @callback - def _on_register_form(self, stanza): - if not isResultNode(stanza): - return raise_error(self._log.info, stanza) - - query = stanza.getQuery() - instructions = query.getTagData('instructions') or None - - data = 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)) - - if (data.form is None and - data.fields_form is None and - data.oob_url is None): - return raise_error(self._log.info, stanza, 'stanza-malformed') - return data - - @call_on_response('_on_submit_result') - def submit_register_form(self, jid, form): - if jid is None: - jid = self._client.domain - - iq = Iq('set', Namespace.REGISTER, to=jid) - - if form.is_fake_form(): - query = iq.getTag('query') - for field in form.iter_fields(): - if field.var == 'fakeform': - continue - query.addChild(field.var, payload=[field.value]) - return iq - - iq.setQueryPayload(form) - return iq - - @callback - def _on_submit_result(self, stanza): - if isResultNode(stanza): - return CommonResult(jid=stanza.getFrom()) - - query = stanza.getTag('query', namespace=Namespace.REGISTER) - if query is None: - return RegisterError(stanza, None) - - instructions = query.getTagData('instructions') or None - - data = 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)) - - return RegisterError(stanza, data) - - @callback - def _default_response(self, stanza): - if not isResultNode(stanza): - return raise_error(self._log.info, stanza) - return CommonResult(jid=stanza.getFrom()) - - @staticmethod - def _parse_oob_url(query): - oob = query.getTag('x', namespace=Namespace.X_OOB) - if oob is not None: - return oob.getTagData('url') or None - return None - - def _parse_form(self, stanza): - query = stanza.getTag('query', namespace=Namespace.REGISTER) - form = query.getTag('x', namespace=Namespace.DATA) - if form is None: - return None - - form = extend_form(node=form) - field = form.vars.get('FORM_TYPE') - if field is None: - self._log.warning('No FORM_TYPE found') - self._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', - instructions=query.getTagData('instructions'), - fields=fields) - - @call_on_response('_on_password_change') - def change_password(self, password): - domain = self._client.get_bound_jid().domain - username = self._client.get_bound_jid().localpart - iq = Iq('set', Namespace.REGISTER, to=domain) - 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(self._log.info, stanza) - - form = get_form(stanza.getQuery(), - 'jabber:iq:register:changepassword') - if form is None: - return raise_error(self._log.info, stanza) - return ChangePasswordResult(successful=False, form=form) - - @call_on_response('_default_response') - def change_password_with_form(self, form): - domain = self._client.get_bound_jid().domain - iq = Iq('set', Namespace.REGISTER, to=domain) - iq.setQueryPayload(form) - return iq - - -class RegisterError(CommonError): - def __init__(self, stanza, data): - CommonError.__init__(self, stanza) - self._data = data - - def get_data(self): - return self._data ===================================== nbxmpp/modules/register/__init__.py ===================================== @@ -0,0 +1 @@ +from .register import Register ===================================== nbxmpp/modules/register/register.py ===================================== @@ -0,0 +1,102 @@ +# Copyright (C) 2020 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/>. + +from nbxmpp.namespaces import Namespace +from nbxmpp.protocol import Iq +from nbxmpp.util import get_form +from nbxmpp.task import iq_request_task +from nbxmpp.errors import StanzaError +from nbxmpp.errors import RegisterStanzaError +from nbxmpp.errors import ChangePasswordStanzaError +from nbxmpp.modules.base import BaseModule +from nbxmpp.modules.util import process_response +from nbxmpp.modules.register.util import _make_unregister_request +from nbxmpp.modules.register.util import _make_register_form +from nbxmpp.modules.register.util import _make_password_change_request +from nbxmpp.modules.register.util import _make_password_change_with_form +from nbxmpp.modules.register.util import _parse_register_data + + +class Register(BaseModule): + def __init__(self, client): + BaseModule.__init__(self, client) + + self._client = client + self.handlers = [] + + @iq_request_task + def unregister(self, jid=None): + _task = yield + + response = yield _make_unregister_request(jid) + yield process_response(response) + + @iq_request_task + def request_register_form(self, jid=None): + _task = yield + + if jid is None: + jid = self._client.domain + + response = yield Iq('get', Namespace.REGISTER, to=jid) + if response.isError(): + raise StanzaError(response) + + yield _parse_register_data(response) + + @iq_request_task + def submit_register_form(self, form, jid=None): + _task = yield + + if jid is None: + jid = self._client.domain + + response = yield _make_register_form(jid, form) + if not response.isError(): + yield process_response(response) + + else: + data = _parse_register_data(response) + raise RegisterStanzaError(response, data) + + @iq_request_task + def change_password(self, password): + _task = yield + + response = yield _make_password_change_request( + self._client.domain, self._client.username, password) + if not response.isError(): + yield process_response(response) + + else: + query = response.getQuery() + if query is None: + raise StanzaError(response) + + form = get_form(query, 'jabber:iq:register:changepassword') + if form is None or response.getType() != 'modify': + raise StanzaError(response) + + raise ChangePasswordStanzaError(response, form) + + @iq_request_task + def change_password_with_form(self, form): + _task = yield + + response = yield _make_password_change_with_form(self._client.domain, + form) + yield process_response(response) ===================================== nbxmpp/modules/register/util.py ===================================== @@ -0,0 +1,131 @@ +# 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/>. + +from nbxmpp.namespaces import Namespace +from nbxmpp.protocol import Iq +from nbxmpp.const import REGISTER_FIELDS +from nbxmpp.structs import RegisterData +from nbxmpp.errors import StanzaError +from nbxmpp.errors import MalformedStanzaError +from nbxmpp.modules.dataforms import create_field +from nbxmpp.modules.dataforms import extend_form +from nbxmpp.modules.dataforms import SimpleDataForm +from nbxmpp.modules.bits_of_binary import parse_bob_data + + +def _make_password_change_request(domain, username, password): + iq = Iq('set', Namespace.REGISTER, to=domain) + query = iq.getQuery() + query.setTagData('username', username) + query.setTagData('password', password) + return iq + + +def _make_password_change_with_form(domain, form): + iq = Iq('set', Namespace.REGISTER, to=domain) + iq.setQueryPayload(form) + return iq + + +def _make_register_form(jid, form): + iq = Iq('set', Namespace.REGISTER, to=jid) + if form.is_fake_form(): + query = iq.getTag('query') + for field in form.iter_fields(): + if field.var == 'fakeform': + continue + query.addChild(field.var, payload=[field.value]) + return iq + + iq.setQueryPayload(form) + return iq + + +def _make_unregister_request(jid): + iq = Iq('set', to=jid) + query = iq.setQuery() + query.setNamespace(Namespace.REGISTER) + query.addChild('remove') + return iq + + +def _parse_oob_url(query): + oob = query.getTag('x', namespace=Namespace.X_OOB) + if oob is not None: + return oob.getTagData('url') or None + return None + + +def _parse_form(stanza): + query = stanza.getTag('query', namespace=Namespace.REGISTER) + form = query.getTag('x', namespace=Namespace.DATA) + if form is None: + return None + + form = extend_form(node=form) + field = form.vars.get('FORM_TYPE') + if field is None: + return None + + # Invalid urn:xmpp:captcha used by ejabberd + # See https://github.com/processone/ejabberd/issues/3045 + if field.value in ('jabber:iq:register', 'urn:xmpp:captcha'): + return form + return None + + +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', + instructions=query.getTagData('instructions'), + fields=fields) + + +def _parse_register_data(response): + query = response.getTag('query', namespace=Namespace.REGISTER) + if query is None: + raise StanzaError(response) + + instructions = query.getTagData('instructions') or None + + data = RegisterData(instructions=instructions, + form=_parse_form(response), + fields_form=_parse_fields_form(query), + oob_url=_parse_oob_url(query), + bob_data=parse_bob_data(query)) + + if (data.form is None and + data.fields_form is None and + data.oob_url is None): + raise MalformedStanzaError('invalid register response', response) + + return data ===================================== nbxmpp/structs.py ===================================== @@ -120,9 +120,6 @@ SecurityLabel = namedtuple('SecurityLabel', 'displaymarking') RegisterData = namedtuple('RegisterData', 'instructions form fields_form oob_url bob_data') -ChangePasswordResult = namedtuple('ChangePasswordResult', 'successful form') -ChangePasswordResult.__new__.__defaults__ = (None,) - HTTPUploadData = namedtuple('HTTPUploadData', 'put_uri get_uri headers') HTTPUploadData.__new__.__defaults__ = (None,) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/1cb28e12cfccaf64459dd34a… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/1cb28e12cfccaf64459dd34a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 5 commits: XMLConsole: Fix displaying AccountWizard stanzas
by Philipp Hörist 19 Oct '20

19 Oct '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: a9e1ac97 by lovetox at 2020-10-19T15:29:24+02:00 XMLConsole: Fix displaying AccountWizard stanzas - - - - - e0cc2916 by lovetox at 2020-10-19T17:03:57+02:00 AccountWizard: Adapt to nbxmpp changes - - - - - 5bc09e09 by lovetox at 2020-10-19T17:04:09+02:00 ChangePassword: Adapt to nbxmpp changes - - - - - 20344c9c by lovetox at 2020-10-19T17:04:23+02:00 RemoveAccount: Adapt to nbxmpp changes - - - - - 1e5f7000 by lovetox at 2020-10-19T17:06:36+02:00 Assistant: Set DIALOG type hint - - - - - 5 changed files: - gajim/gtk/account_wizard.py - gajim/gtk/assistant.py - gajim/gtk/change_password.py - gajim/gtk/remove_account.py - gajim/gtk/xml_console.py Changes: ===================================== gajim/gtk/account_wizard.py ===================================== @@ -27,7 +27,9 @@ from nbxmpp.const import Mode from nbxmpp.const import StreamError from nbxmpp.const import ConnectionProtocol from nbxmpp.const import ConnectionType -from nbxmpp.util import is_error_result +from nbxmpp.errors import StanzaError +from nbxmpp.errors import MalformedStanzaError +from nbxmpp.errors import RegisterStanzaError from gajim.common import app from gajim.common import configpaths @@ -46,7 +48,6 @@ from gajim.gtk.assistant import SuccessPage from gajim.gtk.dataform import DataFormWidget from gajim.gtk.util import get_builder from gajim.gtk.util import open_window -from gajim.gtk.util import ensure_not_destroyed log = logging.getLogger('gajim.gtk.account_wizard') @@ -425,12 +426,13 @@ class AccountWizard(Assistant): i += 1 return domain - @ensure_not_destroyed - def _on_register_form(self, result): - if is_error_result(result): + def _on_register_form(self, task): + try: + result = task.finish() + except (StanzaError, MalformedStanzaError) as error: self._show_error_page(_('Error'), _('Error'), - result.get_text()) + error.get_text()) self._disconnect() return @@ -460,14 +462,36 @@ class AccountWizard(Assistant): form = self.get_page('form').get_submit_form() self._client.get_module('Register').submit_register_form( - None, form, callback=self._on_register_result) - @ensure_not_destroyed - def _on_register_result(self, result): - if is_error_result(result): - self._on_register_error(result) + def _on_register_result(self, task): + try: + task.finish() + except RegisterStanzaError as error: + self._set_error_text(error) + if error.type != 'modify': + self.get_page('form').remove_form() + self._disconnect() + return + + register_data = error.get_data() + form = register_data.form + if register_data.form is None: + form = register_data.fields_form + + if form is not None: + self.get_page('form').add_form(form) + + else: + self.get_page('form').remove_form() + self._disconnect() + return + + except (StanzaError, MalformedStanzaError) as error: + self._set_error_text(error) + self.get_page('form').remove_form() + self._disconnect() return username, password = self.get_page('form').get_credentials() @@ -489,31 +513,13 @@ class AccountWizard(Assistant): self.get_page('form').remove_form() self._disconnect() - def _on_register_error(self, result): - error_text = result.get_text() + def _set_error_text(self, error): + error_text = error.get_text() if not error_text: error_text = _('The server rejected the registration ' 'without an error message') self._show_error_page(_('Error'), _('Error'), error_text) - register_data = result.get_data() - if register_data is None: - # IQ error did not have the payload included - self.get_page('form').remove_form() - self._disconnect() - return - - form = register_data.form - if register_data.form is None: - form = register_data.fields_form - - if form is not None: - self.get_page('form').add_form(form) - - else: - self.get_page('form').remove_form() - self._disconnect() - def _on_destroy(self, *args): self._disconnect() self._destroyed = True ===================================== gajim/gtk/assistant.py ===================================== @@ -49,6 +49,7 @@ class Assistant(Gtk.ApplicationWindow, EventHelper): self.set_default_size(width, height) self.set_resizable(True) self.set_transient_for(transient_for) + self.set_type_hint(Gdk.WindowTypeHint.DIALOG) self._pages = {} self._buttons = {} ===================================== gajim/gtk/change_password.py ===================================== @@ -16,7 +16,8 @@ import logging from gi.repository import Gtk -from nbxmpp.util import is_error_result +from nbxmpp.errors import StanzaError +from nbxmpp.errors import ChangePasswordStanzaError from gajim.common import app from gajim.common.i18n import _ @@ -26,7 +27,6 @@ from gajim.common.helpers import to_user_string from gajim.gtk.assistant import Assistant from gajim.gtk.assistant import Page from gajim.gtk.dataform import DataFormWidget -from gajim.gtk.util import ensure_not_destroyed log = logging.getLogger('gajim.gtk.change_password') @@ -119,17 +119,20 @@ class ChangePassword(Assistant): self._con.get_module('Register').change_password( password, callback=self._on_change_password) - @ensure_not_destroyed - def _on_change_password(self, result): - if is_error_result(result): - error_text = to_user_string(result) + def _on_change_password(self, task): + try: + task.finish() + except ChangePasswordStanzaError as error: + self.get_page('next_stage').set_form(error.get_form()) + self.show_page('next_stage', Gtk.StackTransitionType.SLIDE_LEFT) + + except StanzaError as error: + error_text = to_user_string(error) self.get_page('error').set_text(error_text) self.show_page('error', Gtk.StackTransitionType.SLIDE_LEFT) - elif result.successful: - self.show_page('success') + else: - self.get_page('next_stage').set_form(result.form) - self.show_page('next_stage', Gtk.StackTransitionType.SLIDE_LEFT) + self.show_page('success') def _on_destroy(self, *args): self._destroyed = True ===================================== gajim/gtk/remove_account.py ===================================== @@ -16,7 +16,7 @@ import logging from gi.repository import Gtk -from nbxmpp.util import is_error_result +from nbxmpp.errors import StanzaError from gajim.common import app from gajim.common import ged @@ -26,7 +26,6 @@ from gajim.common.helpers import event_filter from gajim.gtk.assistant import Assistant from gajim.gtk.assistant import Page -from gajim.gtk.util import ensure_not_destroyed log = logging.getLogger('gajim.gtk.remove_account') @@ -149,12 +148,13 @@ class RemoveAccount(Assistant): self._con.disconnect(gracefully=True, reconnect=False) self._account_removed = True - @ensure_not_destroyed - def _on_remove_response(self, result): - if is_error_result(result): + def _on_remove_response(self, task): + try: + task.finish() + except StanzaError as error: self._con.set_remove_account(False) - error_text = to_user_string(result) + error_text = to_user_string(error) self.get_page('error').set_text(error_text) self.show_page('error') return ===================================== gajim/gtk/xml_console.py ===================================== @@ -346,7 +346,10 @@ class XMLConsoleWindow(Gtk.ApplicationWindow, EventHelper): self._print_stanza(event, 'outgoing') def _print_stanza(self, event, kind): - account_label = app.get_account_label(event.account) + if event.account == 'AccountWizard': + account_label = 'Account Wizard' + else: + account_label = app.get_account_label(event.account) stanza = event.stanza if not isinstance(stanza, str): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/30f2b9758cab02f17a679474197aa72… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/30f2b9758cab02f17a679474197aa72… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] DOAP: Add XEP-0233
by Philipp Hörist 19 Oct '20

19 Oct '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 4f2e6246 by Daniel Brötzmann at 2020-10-19T14:38:20+02:00 DOAP: Add XEP-0233 - - - - - 1 changed file: - python-nbxmpp.doap Changes: ===================================== python-nbxmpp.doap ===================================== @@ -272,6 +272,13 @@ <xmpp:note>No cache: Only for captchas.</xmpp:note> </xmpp:SupportedXep> </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0233.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>1.0.0</xmpp:version> + </xmpp:SupportedXep> + </implements> <implements> <xmpp:SupportedXep> <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0258.html" /> View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/4f2e6246c87a44b55ea1fda1… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/4f2e6246c87a44b55ea1fda1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Fix GSSAPI support and switch to GSSAPI Python module
by Philipp Hörist 19 Oct '20

19 Oct '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 62741002 by Jelmer Vernooĳ at 2020-10-19T14:28:41+02:00 Fix GSSAPI support and switch to GSSAPI Python module - - - - - 5 changed files: - README.md - nbxmpp/auth.py - nbxmpp/client.py - nbxmpp/const.py - nbxmpp/protocol.py Changes: ===================================== README.md ===================================== @@ -11,6 +11,10 @@ - precis-i18n - idna +## Optional Runtime Requirements + +- python-gssapi (for GSSAPI authentication) + ## Features * List of [supported XEPs](https://dev.gajim.org/gajim/python-nbxmpp/-/wikis/Supported-XEPs-in-p… ===================================== nbxmpp/auth.py ===================================== @@ -29,17 +29,16 @@ from nbxmpp.protocol import SASL_AUTH_MECHS from nbxmpp.util import b64decode from nbxmpp.util import b64encode from nbxmpp.util import LogAdapter -from nbxmpp.const import GSSAPIState from nbxmpp.const import StreamState log = logging.getLogger('nbxmpp.auth') try: - kerberos = __import__('kerberos') - KERBEROS_AVAILABLE = True + gssapi = __import__('gssapi') + GSSAPI_AVAILABLE = True except ImportError: - KERBEROS_AVAILABLE = False + GSSAPI_AVAILABLE = False class SASL: @@ -91,7 +90,7 @@ class SASL: self._enabled_mechs.discard('SCRAM-SHA-256-PLUS') # channel_binding_data = None - if not KERBEROS_AVAILABLE: + if not GSSAPI_AVAILABLE: self._enabled_mechs.discard('GSSAPI') available_mechs = features.get_mechs() & self._enabled_mechs @@ -156,9 +155,16 @@ class SASL: elif chosen_mechanism == 'GSSAPI': self._method = GSSAPI(self._client) - self._method.initiate(domain_based_name or - self._client.domain) - + if domain_based_name: + hostname = domain_based_name + else: + hostname = self._client.domain + try: + self._method.initiate(hostname) + except AuthFail as error: + self._log.error(error) + self._abort_auth() + return else: self._log.error('Unknown auth mech') @@ -258,39 +264,41 @@ class ANONYMOUS: class GSSAPI: + # See https://tools.ietf.org/html/rfc4752#section-3.1 + _mechanism = 'GSSAPI' def __init__(self, client): self._client = client - self._gss_vc = None - self._state = GSSAPIState.STEP def initiate(self, hostname): - self._gss_vc = kerberos.authGSSClientInit('xmpp@%s' % hostname)[1] - kerberos.authGSSClientStep(self._gss_vc, '') - response = kerberos.authGSSClientResponse(self._gss_vc) + service = gssapi.Name( + 'xmpp@%s' % hostname, name_type=gssapi.NameType.hostbased_service) + try: + self.ctx = gssapi.SecurityContext( + name=service, usage="initiate", + flags=gssapi.RequirementFlag.integrity) + token = self.ctx.step() + except (gssapi.exceptions.GeneralError, gssapi.raw.misc.GSSError) as e: + raise AuthFail(e) node = Node('auth', attrs={'xmlns': Namespace.SASL, 'mechanism': 'GSSAPI'}, - payload=(response or '')) + payload=b64encode(token)) self._client.send_nonza(node) def response(self, server_message, *args, **kwargs): server_message = b64decode(server_message, bytes) - if self._state == GSSAPIState.STEP: - rc = kerberos.authGSSClientStep(self._gss_vc, server_message) - if rc != kerberos.AUTH_GSS_CONTINUE: - self._state = GSSAPIState.WRAP - elif self._state == GSSAPIState.WRAP: - rc = kerberos.authGSSClientUnwrap(self._gss_vc, server_message) - response = kerberos.authGSSClientResponse(self._gss_vc) - rc = kerberos.authGSSClientWrap( - self._gss_vc, - response, - kerberos.authGSSClientUserName(self._gss_vc)) - response = kerberos.authGSSClientResponse(self._gss_vc) - if not response: - response = '' - + try: + if not self.ctx.complete: + output_token = self.ctx.step(server_message) + else: + result = self.ctx.unwrap(server_message) + # TODO(jelmer): Log result.message + data = b'\x00\x00\x00\x00' + bytes(self.ctx.initiator_name) + output_token = self.ctx.wrap(data, False).message + except (gssapi.exceptions.GeneralError, gssapi.raw.misc.GSSError) as e: + raise AuthFail(e) + response = b64encode(output_token) node = Node('response', attrs={'xmlns': Namespace.SASL}, payload=response) ===================================== nbxmpp/client.py ===================================== @@ -279,6 +279,7 @@ class Client(Observable): def mechs(self): return set(self._allowed_mechs or set(['SCRAM-SHA-256', 'SCRAM-SHA-1', + 'GSSAPI', # 'SCRAM-SHA-256-PLUS', # 'SCRAM-SHA-1-PLUS', 'PLAIN'])) ===================================== nbxmpp/const.py ===================================== @@ -21,10 +21,6 @@ from functools import total_ordering from gi.repository import Gio -class GSSAPIState(IntEnum): - STEP = 0 - WRAP = 1 - class IqType(Enum): GET = 'get' ===================================== nbxmpp/protocol.py ===================================== @@ -40,8 +40,8 @@ SASL_AUTH_MECHS = [ 'SCRAM-SHA-256', 'SCRAM-SHA-1-PLUS', 'SCRAM-SHA-1', - 'PLAIN', 'GSSAPI', + 'PLAIN', 'EXTERNAL', 'ANONYMOUS', ] View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/627410029884fc85bd1b5d82… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/627410029884fc85bd1b5d82… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Annotations: Handle errors correctly
by Philipp Hörist 18 Oct '20

18 Oct '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 30f2b975 by lovetox at 2020-10-18T19:09:00+02:00 Annotations: Handle errors correctly - - - - - 1 changed file: - gajim/common/modules/annotations.py Changes: ===================================== gajim/common/modules/annotations.py ===================================== @@ -49,6 +49,7 @@ class Annotations(BaseModule): except (StanzaError, MalformedStanzaError) as error: self._log.warning(error) self._annotations = {} + return for note in annotations: self._annotations[note.jid] = note View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/30f2b9758cab02f17a679474197aa723… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/30f2b9758cab02f17a679474197aa723… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] StartChat: Adapt to nbxmpp changes
by Philipp Hörist 18 Oct '20

18 Oct '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: f4d748d4 by lovetox at 2020-10-18T13:23:51+02:00 StartChat: Adapt to nbxmpp changes - - - - - 1 changed file: - gajim/gtk/start_chat.py Changes: ===================================== gajim/gtk/start_chat.py ===================================== @@ -20,8 +20,9 @@ from gi.repository import Gtk from gi.repository import GLib from gi.repository import Pango -from nbxmpp.util import is_error_result +from nbxmpp.errors import is_error from nbxmpp.errors import StanzaError +from nbxmpp.errors import CancelledError from gajim.common import app from gajim.common.helpers import validate_jid @@ -32,11 +33,11 @@ from gajim.common.i18n import _ from gajim.common.i18n import get_rfc5646_lang from gajim.common.const import AvatarSize from gajim.common.const import MUC_DISCO_ERRORS +from gajim.common.modules.util import as_task from gajim.gtk.groupchat_info import GroupChatInfoScrolled from gajim.gtk.groupchat_nick import NickChooser from gajim.gtk.util import get_builder -from gajim.gtk.util import ensure_not_destroyed from gajim.gtk.util import get_icon_name from gajim.gtk.util import generate_account_badge @@ -307,7 +308,6 @@ class StartChatDialog(Gtk.ApplicationWindow): callback=self._disco_info_received, user_data=account) - @ensure_not_destroyed def _disco_info_received(self, task): try: result = task.finish() @@ -527,85 +527,79 @@ class StartChatDialog(Gtk.ApplicationWindow): else: self._start_iq_search(con, text) + @as_task def _start_iq_search(self, con, text): + _task = yield + if self._parameter_form is None: - con.get_module('Muclumbus').request_parameters( - app.settings.get('muclumbus_api_jid'), - callback=self._parameters_received, - user_data=(con, text)) - else: - self._parameter_form.vars['q'].value = text + result = yield con.get_module('Muclumbus').request_parameters( + app.settings.get('muclumbus_api_jid')) + + self._process_search_result(result, parameters=True) - con.get_module('Muclumbus').set_search( + self._parameter_form = result + self._parameter_form.type_ = 'submit' + + self._parameter_form.vars['q'].value = text + + result = yield con.get_module('Muclumbus').set_search( + app.settings.get('muclumbus_api_jid'), + self._parameter_form) + + self._process_search_result(result) + + while not result.end: + result = yield con.get_module('Muclumbus').set_search( app.settings.get('muclumbus_api_jid'), self._parameter_form, - callback=self._on_search_result, - user_data=(con, False)) + items_per_page=result.max, + after=result.last) + + self._process_search_result(result) + self._global_search_listbox.end_search() + + @as_task def _start_http_search(self, con, text): + _task = yield + self._keywords = text.split(' ') - con.get_module('Muclumbus').set_http_search( + result = yield con.get_module('Muclumbus').set_http_search( app.settings.get('muclumbus_api_http_uri'), - self._keywords, - callback=self._on_search_result, - user_data=(con, True)) + self._keywords) - @ensure_not_destroyed - def _parameters_received(self, result, user_data): - if is_error_result(result): - self._global_search_listbox.remove_progress() - self._show_error_page(to_user_string(result)) - return + self._process_search_result(result) + + while not result.end: + result = yield con.get_module('Muclumbus').set_http_search( + app.settings.get('muclumbus_api_http_uri'), + self._keywords, + after=result.last) + + self._process_search_result(result) - con, text = user_data - self._parameter_form = result - self._parameter_form.type_ = 'submit' - self._start_iq_search(con, text) + self._global_search_listbox.end_search() - @ensure_not_destroyed - def _on_search_result(self, result, user_data): + def _process_search_result(self, result, parameters=False): if self._search_stopped: - return + raise CancelledError() - if is_error_result(result): + if is_error(result): self._global_search_listbox.remove_progress() self._show_error_page(to_user_string(result)) + raise result + + if parameters: return for item in result.items: self._global_search_listbox.add(ResultRow(item)) - if result.end: - self._global_search_listbox.end_search() - return - - con, http = user_data - if http: - self._continue_http_search(result, con) - else: - self._continue_iq_search(result, con) - - def _continue_iq_search(self, result, con): - con.get_module('Muclumbus').set_search( - app.settings.get('muclumbus_api_jid'), - self._parameter_form, - items_per_page=result.max, - after=result.last, - callback=self._on_search_result, - user_data=(con, False)) - - def _continue_http_search(self, result, con): - con.get_module('Muclumbus').set_http_search( - app.settings.get('muclumbus_api_http_uri'), - self._keywords, - after=result.last, - callback=self._on_search_result, - user_data=(con, True)) - def _destroy(self, *args): if self._source_id is not None: GLib.source_remove(self._source_id) self._destroyed = True + app.cancel_tasks(self) class ContactRow(Gtk.ListBoxRow): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f4d748d4c2429d005a9eba81ce1bbb65… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f4d748d4c2429d005a9eba81ce1bbb65… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Muclumbus: Use tasks
by Philipp Hörist 18 Oct '20

18 Oct '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: bd7195cb by lovetox at 2020-10-18T13:24:20+02:00 Muclumbus: Use tasks - - - - - 2 changed files: - nbxmpp/modules/muclumbus.py - nbxmpp/task.py Changes: ===================================== nbxmpp/modules/muclumbus.py ===================================== @@ -22,15 +22,16 @@ from gi.repository import Soup from nbxmpp.namespaces import Namespace from nbxmpp.protocol import Node from nbxmpp.protocol import Iq -from nbxmpp.protocol import isResultNode from nbxmpp.structs import MuclumbusItem from nbxmpp.structs import MuclumbusResult from nbxmpp.const import AnonymityMode from nbxmpp.modules.dataforms import extend_form -from nbxmpp.util import call_on_response -from nbxmpp.util import callback -from nbxmpp.util import raise_error +from nbxmpp.errors import StanzaError +from nbxmpp.errors import MalformedStanzaError +from nbxmpp.task import iq_request_task +from nbxmpp.task import http_request_task from nbxmpp.modules.base import BaseModule +from nbxmpp.modules.util import finalize # API Documentation @@ -52,84 +53,58 @@ class Muclumbus(BaseModule): self._proxy_resolver = proxy.get_resolver() self._soup_session.props.proxy_resolver = self._proxy_resolver - @call_on_response('_parameters_received') + @iq_request_task def request_parameters(self, jid): - query = Iq(to=jid, typ='get') - query.addChild(node=Node('search', - attrs={'xmlns': Namespace.MUCLUMBUS})) - return query + task = yield - @callback - def _parameters_received(self, stanza): - if not isResultNode(stanza): - return raise_error(self._log.info, stanza) + response = yield _make_parameter_request(jid) + if response.isError(): + raise StanzaError(response) - search = stanza.getTag('search', namespace=Namespace.MUCLUMBUS) + search = response.getTag('search', namespace=Namespace.MUCLUMBUS) if search is None: - return raise_error(self._log.warning, stanza, 'stanza-malformed') + raise MalformedStanzaError('search node missing', response) dataform = search.getTag('x', namespace=Namespace.DATA) if dataform is None: - return raise_error(self._log.warning, stanza, 'stanza-malformed') + raise MalformedStanzaError('dataform node missing', response) self._log.info('Muclumbus parameters received') - return extend_form(node=dataform) + yield finalize(task, extend_form(node=dataform)) - @call_on_response('_search_received') + @iq_request_task def set_search(self, jid, dataform, items_per_page=50, after=None): - search = Node('search', attrs={'xmlns': Namespace.MUCLUMBUS}) - search.addChild(node=dataform) - rsm = search.addChild('set', namespace=Namespace.RSM) - rsm.addChild('max').setData(items_per_page) - if after is not None: - rsm.addChild('after').setData(after) - query = Iq(to=jid, typ='get') - query.addChild(node=search) - return query - - def set_http_search(self, uri, keywords, after=None, - callback=None, user_data=None): - search = {'keywords': keywords} - if after is not None: - search['after'] = after - - message = Soup.Message.new('POST', uri) - message.set_request('application/json', - Soup.MemoryUse.COPY, - json.dumps(search).encode()) + _task = yield - self._soup_session.queue_message(message, - self._http_search_received, - callback, - user_data) + response = yield _make_search_query(jid, + dataform, + items_per_page, + after) + if response.isError(): + raise StanzaError(response) - @callback - def _search_received(self, stanza): - if not isResultNode(stanza): - return raise_error(self._log.info, stanza) - - result = stanza.getTag('result', namespace=Namespace.MUCLUMBUS) + result = response.getTag('result', namespace=Namespace.MUCLUMBUS) if result is None: - return raise_error(self._log.warning, stanza, 'stanza-malformed') + raise MalformedStanzaError('result node missing', response) items = result.getTags('item') if not items: - return MuclumbusResult(first=None, - last=None, - max=None, - end=True, - items=[]) + yield MuclumbusResult(first=None, + last=None, + max=None, + end=True, + items=[]) set_ = result.getTag('set', namespace=Namespace.RSM) if set_ is None: - return raise_error(self._log.warning, stanza, 'stanza-malformed') + raise MalformedStanzaError('set node missing', response) first = set_.getTagData('first') last = set_.getTagData('last') try: max_ = int(set_.getTagData('max')) except Exception: - return raise_error(self._log.warning, stanza, 'stanza-malformed') + raise MalformedStanzaError('invalid max value', response) results = [] for item in items: @@ -152,40 +127,47 @@ class Muclumbus(BaseModule): language=language or '', is_open=is_open, anonymity_mode=anonymity_mode)) - return MuclumbusResult(first=first, - last=last, - max=max_, - end=len(items) < max_, - items=results) + yield MuclumbusResult(first=first, + last=last, + max=max_, + end=len(items) < max_, + items=results) + + @http_request_task + def set_http_search(self, uri, keywords, after=None): + _task = yield + + search = {'keywords': keywords} + if after is not None: + search['after'] = after - def _http_search_received(self, _session, message, callback, user_data): + message = Soup.Message.new('POST', uri) + message.set_request('application/json', + Soup.MemoryUse.COPY, + json.dumps(search).encode()) - def exec_callback(muclumbus_result): - if user_data is None: - callback(muclumbus_result) - else: - callback(muclumbus_result, user_data) + response_message = yield message - soup_body = message.get_property('response-body') + soup_body = response_message.get_property('response-body') - if message.status_code != 200: + if response_message.status_code != 200: self._log.warning(soup_body.data) - exec_callback(MuclumbusResult(first=None, - last=None, - max=None, - end=True, - items=[])) + yield MuclumbusResult(first=None, + last=None, + max=None, + end=True, + items=[]) response = json.loads(soup_body.data) result = response['result'] items = result.get('items') if items is None: - exec_callback(MuclumbusResult(first=None, - last=None, - max=None, - end=True, - items=[])) + yield MuclumbusResult(first=None, + last=None, + max=None, + end=True, + items=[]) results = [] for item in items: @@ -203,8 +185,27 @@ class Muclumbus(BaseModule): is_open=item['is_open'], anonymity_mode=anonymity_mode)) - exec_callback(MuclumbusResult(first=None, - last=result['last'], - max=None, - end=not result['more'], - items=results)) + yield MuclumbusResult(first=None, + last=result['last'], + max=None, + end=not result['more'], + items=results) + + +def _make_parameter_request(jid): + query = Iq(to=jid, typ='get') + query.addChild(node=Node('search', + attrs={'xmlns': Namespace.MUCLUMBUS})) + return query + + +def _make_search_query(jid, dataform, items_per_page=50, after=None): + search = Node('search', attrs={'xmlns': Namespace.MUCLUMBUS}) + search.addChild(node=dataform) + rsm = search.addChild('set', namespace=Namespace.RSM) + rsm.addChild('max').setData(items_per_page) + if after is not None: + rsm.addChild('after').setData(after) + query = Iq(to=jid, typ='get') + query.addChild(node=search) + return query ===================================== nbxmpp/task.py ===================================== @@ -21,6 +21,8 @@ import logging from enum import IntEnum from functools import wraps +from gi.repository import Soup + from nbxmpp.errors import is_error from nbxmpp.errors import CancelledError from nbxmpp.simplexml import Node @@ -62,20 +64,33 @@ class TaskState(IntEnum): return self == TaskState.CANCELLED +def _setup_task(task, client, callback, user_data): + client.add_task(task) + task.set_finalize_func(client.remove_task) + task.set_user_data(user_data) + if callback is not None: + task.add_done_callback(callback) + task.start() + return task + + def iq_request_task(func): @wraps(func) - def func_wrapper(self, *args, - callback=None, user_data=None, **kwargs): + def func_wrapper(self, *args, callback=None, user_data=None, **kwargs): task = IqRequestTask(func(self, *args, **kwargs), self._log, self._client) - self._client.add_task(task) - task.set_finalize_func(self._client.remove_task) - task.set_user_data(user_data) - if callback is not None: - task.add_done_callback(callback) - task.start() - return task + return _setup_task(task, self._client, callback, user_data) + return func_wrapper + + +def http_request_task(func): + @wraps(func) + def func_wrapper(self, *args, callback=None, user_data=None, **kwargs): + task = HTTPRequestTask(func(self, *args, **kwargs), + self._log, + self._soup_session) + return _setup_task(task, self._client, callback, user_data) return func_wrapper @@ -287,3 +302,28 @@ class IqRequestTask(Task): def _finalize(self): self._client = None super()._finalize() + + +class HTTPRequestTask(Task): + + ''' + A Task for running HTTP requests + + ''' + + _process_types = (Soup.Message,) + + def __init__(self, gen, logger, session): + super().__init__(gen, logger) + self._session = session + + def _run_async(self, message): + self._session.queue_message(message, self._async_finished, None) + + def _async_finished(self, _session, message, _user_data): + if self._state != TaskState.CANCELLED: + self._next_step(message) + + def _finalize(self): + self._session = None + super()._finalize() View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/bd7195cb1f0647e97dec6799… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/bd7195cb1f0647e97dec6799… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits