Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Use nbxmpp's compute_caps_hash()
by Philipp Hörist 29 Jun '19

29 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: a4c7b013 by Philipp Hörist at 2019-06-29T15:41:23Z Use nbxmpp's compute_caps_hash() - - - - - 4 changed files: - gajim/common/caps_cache.py - gajim/common/helpers.py - gajim/common/modules/caps.py - test/no_gui/unit/test_caps_cache.py Changes: ===================================== gajim/common/caps_cache.py ===================================== @@ -27,8 +27,6 @@ CapsCache caches features to hash relationships. The cache is queried through ClientCaps objects which are hold by contact instances. """ -import base64 -import hashlib import logging import nbxmpp @@ -102,55 +100,6 @@ def create_suitable_client_caps(node, caps_hash, hash_method, fjid=None): client_caps = ClientCaps(caps_hash, node, hash_method) return client_caps -def compute_caps_hash(identities, features, dataforms=None, hash_method='sha-1'): - """ - Compute caps hash according to XEP-0115, V1.5 - """ - if dataforms is None: - dataforms = [] - - def sort_identities_key(i): - return (i.category, i.type, i.lang or '') - - def sort_dataforms_key(dataform): - return dataform['FORM_TYPE'].value - - S = '' - identities.sort(key=sort_identities_key) - for i in identities: - c = i.category - type_ = i.type - lang = i.lang or '' - name = i.name or '' - S += '%s/%s/%s/%s<' % (c, type_, lang, name) - features.sort() - for f in features: - S += '%s<' % f - dataforms.sort(key=sort_dataforms_key) - for dataform in dataforms: - # fields indexed by var - fields = {} - for f in dataform.iter_fields(): - values = f.getTags('value') - fields[f.var] = [value.getData() for value in values] - form_type = fields.get('FORM_TYPE') - if form_type: - S += form_type[0] + '<' - del fields['FORM_TYPE'] - for var in sorted(fields.keys()): - S += '%s<' % var - values = sorted(fields[var]) - for value in values: - S += '%s<' % value - - if hash_method == 'sha-1': - hash_ = hashlib.sha1(S.encode('utf-8')) - elif hash_method == 'md5': - hash_ = hashlib.md5(S.encode('utf-8')) - else: - return '' - return base64.b64encode(hash_.digest()).decode('utf-8') - ################################################################################ ### Internal classes of this module @@ -184,15 +133,6 @@ class AbstractClientCaps: """ raise NotImplementedError - def get_hash_validation_strategy(self): - return self._is_hash_valid - - def _is_hash_valid(self, identities, features, dataforms): - """ - To be implemented by subclasses - """ - raise NotImplementedError - class ClientCaps(AbstractClientCaps): """ @@ -210,12 +150,6 @@ class ClientCaps(AbstractClientCaps): connection.get_module('Discovery').disco_contact( jid, '%s#%s' % (self._node, self._hash)) - def _is_hash_valid(self, identities, features, dataforms): - computed_hash = compute_caps_hash( - identities, features, dataforms=dataforms, - hash_method=self._hash_method) - return computed_hash == self._hash - class OldClientCaps(AbstractClientCaps): """ @@ -231,8 +165,6 @@ class OldClientCaps(AbstractClientCaps): def _discover(self, connection, jid): connection.get_module('Discovery').disco_contact(jid) - def _is_hash_valid(self, identities, features, dataforms): - return True class NoClientCaps(AbstractClientCaps): """ @@ -248,8 +180,6 @@ class NoClientCaps(AbstractClientCaps): def _discover(self, connection, jid): connection.get_module('Discovery').disco_contact(jid) - def _is_hash_valid(self, identities, features, dataforms): - return True class NullClientCaps(AbstractClientCaps): """ @@ -282,9 +212,6 @@ class NullClientCaps(AbstractClientCaps): def _discover(self, connection, jid): pass - def _is_hash_valid(self, identities, features, dataforms): - return False - class CapsCache: """ ===================================== gajim/common/helpers.py ===================================== @@ -56,7 +56,9 @@ from encodings.punycode import punycode_encode from functools import wraps import nbxmpp +from nbxmpp.util import compute_caps_hash from nbxmpp.stringprepare import nameprep +from nbxmpp.structs import DiscoInfo from gi.repository import GLib import precis_i18n.codec # pylint: disable=unused-import @@ -1117,9 +1119,10 @@ def update_optional_features(account=None): # Give plugins the possibility to add their features app.plugin_manager.extension_point('update_caps', account_) - app.caps_hash[account_] = caps_cache.compute_caps_hash( - [app.gajim_identity], - app.gajim_common_features + features) + app.caps_hash[account_] = compute_caps_hash(DiscoInfo( + None, None, [app.gajim_identity], + app.gajim_common_features + features, + []), compare=False) # re-send presence with new hash connected = app.connections[account_].connected if connected > 1 and app.SHOW_LIST[connected] != 'invisible': ===================================== gajim/common/modules/caps.py ===================================== @@ -20,6 +20,7 @@ import nbxmpp from nbxmpp.structs import StanzaHandler from nbxmpp.util import is_error_result +from nbxmpp.util import compute_caps_hash from gajim.common import caps_cache from gajim.common import app @@ -120,18 +121,18 @@ class Caps(BaseModule): # the identities and features return - validate = contact.client_caps.get_hash_validation_strategy() - hash_is_valid = validate(info.identities, info.features, info.dataforms) - - if hash_is_valid: - cache_item.set_and_store(info.identities, info.features) - else: + try: + compute_caps_hash(info) + except Exception as error: + self._log.warning('Disco info malformed: %s %s', + contact.get_full_jid(), error) + self._log.warning(info) node = caps_hash = hash_method = None contact.client_caps = self._create_suitable_client_caps( node, caps_hash, hash_method) - self._log.warning( - 'Computed and retrieved caps hash differ. Ignoring ' - 'caps of contact %s', contact.get_full_jid()) + else: + cache_item.set_and_store(info.identities, info.features) + app.nec.push_incoming_event( NetworkEvent('caps-update', conn=self._con, ===================================== test/no_gui/unit/test_caps_cache.py ===================================== @@ -2,134 +2,12 @@ Tests for capabilities and the capabilities cache ''' import unittest -import weakref - from unittest.mock import MagicMock, Mock -from nbxmpp import NS_MUC, NS_PING, NS_XHTML_IM, Iq + +from nbxmpp import NS_MUC, NS_PING, NS_XHTML_IM from nbxmpp.structs import DiscoIdentity -from nbxmpp.modules.discovery import Discovery from gajim.common import caps_cache as caps -EXAMPLES = [ -'''<iq type='result'> -<query xmlns='http://jabber.org/protocol/disco#info' node='http://psi-im.org#q07IKJEyjvHSyhy//CH0CxmKi8w='> -<identity xml:lang='en' category='client' name='Psi 0.11' type='pc'/> -<identity xml:lang='el' category='client' name='Ψ 0.11' type='pc'/> -<feature var='http://jabber.org/protocol/caps'/> -<feature var='http://jabber.org/protocol/disco#info'/> -<feature var='http://jabber.org/protocol/disco#items'/> -<feature var='http://jabber.org/protocol/muc'/> -<x xmlns='jabber:x:data' type='result'> -<field var='FORM_TYPE' type='hidden'> -<value>urn:xmpp:dataforms:softwareinfo</value> -</field> -<field var='ip_version'> -<value>ipv4</value> -<value>ipv6</value> -</field> -<field var='os'> -<value>Mac</value> -</field> -<field var='os_version'> -<value>10.5.1</value> -</field> -<field var='software'> -<value>Psi</value> -</field> -<field var='software_version'> -<value>0.11</value> -</field> -</x> -</query> -</iq> -''', - -'''<iq type='result'> -<query node="http://bombusmod.net.ru/caps#tbBQGBMv8g8U7kW55TEZZRnMCJ4=" xmlns="http://jabber.org/protocol/disco#info"> -<identity category="client" name="BombusMod" type="mobile"/> -<feature var="http://jabber.org/protocol/chatstates"/> -<feature var="http://jabber.org/protocol/disco#info"/> -<feature var="http://jabber.org/protocol/disco#items"/> -<feature var="http://jabber.org/protocol/rosterx"/> -<feature var="jabber:iq:last"/> -<feature var="jabber:iq:privacy"/> -<feature var="jabber:iq:roster"/> -<feature var="jabber:iq:time"/> -<feature var="jabber:iq:version"/> -<feature var="jabber:x:oob"/> -<feature var="urn:xmpp:ping"/> -<feature var="urn:xmpp:receipts"/> -<feature var="urn:xmpp:time"/> -</query> -</iq> -''', - -'''<iq type='result'> -<query node="http://jappix.org/#qRsaGbKTz8EwAOakYO00InkZUxM=" xmlns="http://jabber.org/protocol/disco#info"> - <identity category="client" name="Jappix" type="web"/> - <feature var="http://jabber.org/protocol/activity"/> - <feature var="http://jabber.org/protocol/activity+notify"/> - <feature var="http://jabber.org/protocol/caps"/> - <feature var="http://jabber.org/protocol/chatstates"/> - <feature var="http://jabber.org/protocol/commands"/> - <feature var="http://jabber.org/protocol/disco#info"/> - <feature var="http://jabber.org/protocol/disco#items"/> - <feature var="http://jabber.org/protocol/geoloc"/> - <feature var="http://jabber.org/protocol/geoloc+notify"/> - <feature var="http://jabber.org/protocol/http-auth"/> - <feature var="http://jabber.org/protocol/httpbind"/> - <feature var="http://jabber.org/protocol/mood"/> - <feature var="http://jabber.org/protocol/mood+notify"/> - <feature var="http://jabber.org/protocol/muc"/> - <feature var="http://jabber.org/protocol/muc#admin"/> - <feature var="http://jabber.org/protocol/muc#owner"/> - <feature var="http://jabber.org/protocol/muc#roomconfig"/> - <feature var="http://jabber.org/protocol/muc#user"/> - <feature var="http://jabber.org/protocol/nick"/> - <feature var="http://jabber.org/protocol/pubsub#retrieve-items"/> - <feature var="http://jabber.org/protocol/rosterx"/> - <feature var="http://jabber.org/protocol/tune"/> - <feature var="http://jabber.org/protocol/tune+notify"/> - <feature var="http://jabber.org/protocol/xhtml-im"/> - <feature var="ipv6"/> - <feature var="jabber:iq:last"/> - <feature var="jabber:iq:oob"/> - <feature var="jabber:iq:privacy"/> - <feature var="jabber:iq:private"/> - <feature var="jabber:iq:register"/> - <feature var="jabber:iq:roster"/> - <feature var="jabber:iq:search"/> - <feature var="jabber:iq:version"/> - <feature var="jabber:x:data"/> - <feature var="jabber:x:oob"/> - <feature var="urn:ietf:params:xml:ns:vcard-4.0"/> - <feature var="urn:ietf:rfc:3264"/> - <feature var="urn:xmpp:avatar:data"/> - <feature var="urn:xmpp:avatar:metadata"/> - <feature var="urn:xmpp:delay"/> - <feature var="urn:xmpp:extdisco:1"/> - <feature var="urn:xmpp:inbox"/> - <feature var="urn:xmpp:inbox+notify"/> - <feature var="urn:xmpp:jingle:1"/> - <feature var="urn:xmpp:jingle:apps:rtp:1"/> - <feature var="urn:xmpp:jingle:apps:rtp:audio"/> - <feature var="urn:xmpp:jingle:apps:rtp:rtcp-fb:0"/> - <feature var="urn:xmpp:jingle:apps:rtp:rtp-hdrext:0"/> - <feature var="urn:xmpp:jingle:apps:rtp:video"/> - <feature var="urn:xmpp:jingle:apps:rtp:zrtp:1"/> - <feature var="urn:xmpp:jingle:transports:ice-udp:1"/> - <feature var="urn:xmpp:mam:0"/> - <feature var="urn:xmpp:microblog:0"/> - <feature var="urn:xmpp:microblog:0+notify"/> - <feature var="urn:xmpp:ping"/> - <feature var="urn:xmpp:receipts"/> - <feature var="urn:xmpp:time"/> - <feature var="urn:xmpp:tmp:jingle:apps:dtls:0"/> - <feature var="vcard-temp"/> -</query> -</iq>''', -] - class CommonCapsTest(unittest.TestCase): @@ -214,19 +92,6 @@ class TestCapsCache(CommonCapsTest): self.assertEqual(0, connection.get_module('Discovery').disco_contact.call_count) - def test_hash(self): - '''tests the hash computation''' - for example in EXAMPLES: - stanza = Iq(node=example) - disco_module = Discovery(None) - weak_callback = weakref.WeakMethod(self.disco_info_received) - disco_module._disco_info_received(None, stanza, callback=weak_callback) - - def disco_info_received(self, info): - computed_hash = caps.compute_caps_hash(info.identities, info.features, info.dataforms) - hash_ = info.node.split('#')[1] - self.assertEqual(hash_, computed_hash) - class TestClientCaps(CommonCapsTest): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a4c7b0132f3671a765a8f707bf23840343… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a4c7b0132f3671a765a8f707bf23840343… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Add compare argument to compute_caps_hash()
by Philipp Hörist 29 Jun '19

29 Jun '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 54d8fea2 by Philipp Hörist at 2019-06-29T15:37:42Z Add compare argument to compute_caps_hash() - - - - - 2 changed files: - nbxmpp/structs.py - nbxmpp/util.py Changes: ===================================== nbxmpp/structs.py ===================================== @@ -112,13 +112,26 @@ AdHocCommandNote = namedtuple('AdHocCommandNote', 'text type') IBBData = namedtuple('IBBData', 'block_size sid seq type data') IBBData.__new__.__defaults__ = (None, None, None, None, None) -DiscoInfo = namedtuple('DiscoInfo', 'jid node identities features dataforms') - DiscoItems = namedtuple('DiscoItems', 'jid node items') DiscoItem = namedtuple('DiscoItem', 'jid name node') DiscoItem.__new__.__defaults__ = (None, None) +class DiscoInfo(namedtuple('DiscoInfo', 'jid node identities features dataforms')): + + __slots__ = [] + + def __new__(cls, jid, node, identities, features, dataforms): + return super(DiscoInfo, cls).__new__(cls, jid, node, identities, + features, dataforms) + + def get_caps_hash(self): + try: + return self.node.split('#')[1] + except Exception: + return None + + class DiscoIdentity(namedtuple('DiscoIdentity', 'category type name lang')): __slots__ = [] ===================================== nbxmpp/util.py ===================================== @@ -257,12 +257,14 @@ def text_to_color(text, background_color): return rc, gc, bc -def compute_caps_hash(info): +def compute_caps_hash(info, compare=True): """ Compute caps hash according to XEP-0115, V1.5 https://xmpp.org/extensions/xep-0115.html#ver-proc :param: info DiscoInfo + :param: compare If True an exception is raised if the hash announced in + the node attr is not equal to what is calculated """ # Initialize an empty string S. string_ = '' @@ -367,4 +369,8 @@ def compute_caps_hash(info): string_ += '%s<' % value hash_ = hashlib.sha1(string_.encode()) - return b64encode(hash_.digest()) + b64hash = b64encode(hash_.digest()) + if compare and b64hash != info.get_caps_hash(): + raise DiscoInfoMalformed('Caps hashes differ: %s != %s' % ( + b64hash, info.get_caps_hash())) + return b64hash View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/54d8fea2057e5b301ef4ed167f… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/54d8fea2057e5b301ef4ed167f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Add method and tests for entity caps hash computation
by Philipp Hörist 29 Jun '19

29 Jun '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: f57bd1ae by Philipp Hörist at 2019-06-29T08:59:48Z Add method and tests for entity caps hash computation - - - - - 5 changed files: - nbxmpp/modules/discovery.py - nbxmpp/protocol.py - nbxmpp/structs.py - nbxmpp/util.py - + test/unit/test_entity_caps.py Changes: ===================================== nbxmpp/modules/discovery.py ===================================== @@ -49,37 +49,7 @@ class Discovery: def _disco_info_received(self, stanza): if not isResultNode(stanza): return raise_error(log.info, stanza) - - idenities = [] - features = [] - dataforms = [] - - query = stanza.getQuery() - for node in query.getTags('identity'): - attrs = node.getAttrs() - try: - idenities.append( - DiscoIdentity(category=attrs['category'], - type=attrs['type'], - name=attrs.get('name'), - lang=attrs.get('xml:lang'))) - except Exception: - return raise_error(log.warning, stanza, 'stanza-malformed') - - for node in query.getTags('feature'): - try: - features.append(node.getAttr('var')) - except Exception: - return raise_error(log.warning, stanza, 'stanza-malformed') - - for node in query.getTags('x', namespace=NS_DATA): - dataforms.append(extend_form(node)) - - return DiscoInfo(jid=stanza.getFrom(), - node=query.getAttr('node'), - identities=idenities, - features=features, - dataforms=dataforms) + return parse_disco_info(stanza) @call_on_response('_disco_items_received') def disco_items(self, jid, node=None): @@ -90,24 +60,59 @@ class Discovery: def _disco_items_received(self, stanza): if not isResultNode(stanza): return raise_error(log.info, stanza) + return parse_disco_items(stanza) - items = [] - - query = stanza.getQuery() - for node in query.getTags('item'): - attrs = node.getAttrs() - try: - items.append( - DiscoItem(jid=attrs['jid'], - name=attrs.get('name'), - node=attrs.get('node'))) - except Exception: - return raise_error(log.warning, stanza, 'stanza-malformed') - return DiscoItems(jid=stanza.getFrom(), - node=query.getAttr('node'), - items=items) +def parse_disco_info(stanza): + idenities = [] + features = [] + dataforms = [] + query = stanza.getQuery() + for node in query.getTags('identity'): + attrs = node.getAttrs() + try: + idenities.append( + DiscoIdentity(category=attrs['category'], + type=attrs['type'], + name=attrs.get('name'), + lang=attrs.get('xml:lang'))) + except Exception: + return raise_error(log.warning, stanza, 'stanza-malformed') + + for node in query.getTags('feature'): + try: + features.append(node.getAttr('var')) + except Exception: + return raise_error(log.warning, stanza, 'stanza-malformed') + + for node in query.getTags('x', namespace=NS_DATA): + dataforms.append(extend_form(node)) + + return DiscoInfo(jid=stanza.getFrom(), + node=query.getAttr('node'), + identities=idenities, + features=features, + dataforms=dataforms) + + +def parse_disco_items(stanza): + items = [] + + query = stanza.getQuery() + for node in query.getTags('item'): + attrs = node.getAttrs() + try: + items.append( + DiscoItem(jid=attrs['jid'], + name=attrs.get('name'), + node=attrs.get('node'))) + except Exception: + return raise_error(log.warning, stanza, 'stanza-malformed') + + return DiscoItems(jid=stanza.getFrom(), + node=query.getAttr('node'), + items=items) def get_disco_request(namespace, jid, node=None): ===================================== nbxmpp/protocol.py ===================================== @@ -664,6 +664,9 @@ class InvalidJid(Exception): class StanzaMalformed(Exception): pass +class DiscoInfoMalformed(Exception): + pass + stream_exceptions = {'bad-format': BadFormat, 'bad-namespace-prefix': BadNamespacePrefix, 'conflict': Conflict, ===================================== nbxmpp/structs.py ===================================== @@ -113,14 +113,35 @@ IBBData = namedtuple('IBBData', 'block_size sid seq type data') IBBData.__new__.__defaults__ = (None, None, None, None, None) DiscoInfo = namedtuple('DiscoInfo', 'jid node identities features dataforms') -DiscoIdentity = namedtuple('DiscoIdentity', 'category type name lang') -DiscoIdentity.__new__.__defaults__ = (None, None) DiscoItems = namedtuple('DiscoItems', 'jid node items') DiscoItem = namedtuple('DiscoItem', 'jid name node') DiscoItem.__new__.__defaults__ = (None, None) +class DiscoIdentity(namedtuple('DiscoIdentity', 'category type name lang')): + + __slots__ = [] + + def __new__(cls, category, type, name=None, lang=None): + return super(DiscoIdentity, cls).__new__(cls, category, type, name, lang) + + def __eq__(self, other): + return str(self) == str(other) + + def __ne__(self, other): + return not self.__eq__(other) + + def __str__(self): + return '%s/%s/%s/%s' % (self.category, + self.type, + self.lang or '', + self.name or '') + + def __hash__(self): + return hash(str(self)) + + class AdHocCommand(namedtuple('AdHocCommand', 'jid node name sessionid status data actions notes')): __slots__ = [] ===================================== nbxmpp/util.py ===================================== @@ -27,6 +27,7 @@ import precis_i18n.codec from nbxmpp.protocol import JID from nbxmpp.protocol import InvalidJid +from nbxmpp.protocol import DiscoInfoMalformed from nbxmpp.stringprepare import nameprep from nbxmpp.structs import Properties from nbxmpp.structs import IqProperties @@ -254,3 +255,116 @@ def text_to_color(text, background_color): bc = 0.2 * bb_inv + 0.8 * blue return rc, gc, bc + + +def compute_caps_hash(info): + """ + Compute caps hash according to XEP-0115, V1.5 + https://xmpp.org/extensions/xep-0115.html#ver-proc + + :param: info DiscoInfo + """ + # Initialize an empty string S. + string_ = '' + + # Sort the service discovery identities by category and then by type and + # then by xml:lang (if it exists), formatted as + # CATEGORY '/' [TYPE] '/' [LANG] '/' [NAME]. Note that each slash is + # included even if the LANG or NAME is not included (in accordance with + # XEP-0030, the category and type MUST be included). + # For each identity, append the 'category/type/lang/name' to S, followed by + # the '<' character. + # Sort the supported service discovery features. + + def sort_identities_key(i): + return (i.category, i.type, i.lang or '') + + identities = sorted(info.identities, key=sort_identities_key) + for identity in identities: + string_ += '%s<' % str(identity) + + # If the response includes more than one service discovery identity with + # the same category/type/lang/name, consider the entire response + # to be ill-formed. + if len(set(identities)) != len(identities): + raise DiscoInfoMalformed('Non-unique identity found') + + # Sort the supported service discovery features. + # For each feature, append the feature to S, followed by the '<' character. + features = sorted(info.features) + for feature in features: + string_ += '%s<' % feature + + # If the response includes more than one service discovery feature with the + # same XML character data, consider the entire response to be ill-formed. + if len(set(features)) != len(features): + raise DiscoInfoMalformed('Non-unique feature found') + + # If the response includes more than one extended service discovery + # information form with the same FORM_TYPE or the FORM_TYPE field contains + # more than one <value/> element with different XML character data, + # consider the entire response to be ill-formed. + + # If the response includes an extended service discovery information form + # where the FORM_TYPE field is not of type "hidden" or the form does not + # include a FORM_TYPE field, ignore the form but continue processing. + + dataforms = [] + form_type_values = [] + for dataform in info.dataforms: + form_type = dataform.vars.get('FORM_TYPE') + if form_type is None: + # Ignore dataform because of missing FORM_TYPE + continue + if form_type.type_ != 'hidden': + # Ignore dataform because of wrong type + continue + + values = form_type.getTags('value') + if len(values) != 1: + raise DiscoInfoMalformed('Form should have exactly ' + 'one FORM_TYPE value') + value = values[0].getData() + + dataforms.append(dataform) + form_type_values.append(value) + + if len(set(form_type_values)) != len(form_type_values): + raise DiscoInfoMalformed('Non-unique FORM_TYPE value found') + + # If the service discovery information response includes XEP-0128 data + # forms, sort the forms by the FORM_TYPE (i.e., by the XML character data + # of the <value/> element). + + # For each extended service discovery information form: + # - Append the XML character data of the FORM_TYPE field's <value/> + # element, followed by the '<' character. + # - Sort the fields by the value of the "var" attribute. + # - For each field other than FORM_TYPE: + # - Append the value of the "var" attribute, followed by the + # '<' character. + # - Sort values by the XML character data of the <value/> element. + # - For each <value/> element, append the XML character data, + # followed by the '<' character. + + def sort_dataforms_key(dataform): + return dataform['FORM_TYPE'].getTagData('value') + + dataforms = sorted(dataforms, key=sort_dataforms_key) + for dataform in dataforms: + string_ += '%s<' % dataform['FORM_TYPE'].getTagData('value') + + fields = {} + for field in dataform.iter_fields(): + if field.var == 'FORM_TYPE': + continue + values = field.getTags('value') + fields[field.var] = sorted([value.getData() for value in values]) + + for var in sorted(fields.keys()): + string_ += '%s<' % var + for value in fields[var]: + string_ += '%s<' % value + + hash_ = hashlib.sha1(string_.encode()) + return b64encode(hash_.digest()) ===================================== test/unit/test_entity_caps.py ===================================== @@ -0,0 +1,197 @@ +import unittest + +from nbxmpp.util import compute_caps_hash +from nbxmpp.modules.discovery import parse_disco_info +from nbxmpp.protocol import Iq +from nbxmpp.protocol import DiscoInfoMalformed + +class EntityCaps(unittest.TestCase): + + def test_multiple_field_values(self): + node = """ + <iq from='benvolio(a)capulet.lit/230193' id='disco1' to='juliet(a)capulet.lit/chamber' type='result'> + <query xmlns='http://jabber.org/protocol/disco#info' node='http://psi-im.org#q07IKJEyjvHSyhy//CH0CxmKi8w='> + <identity xml:lang='en' category='client' name='Psi 0.11' type='pc'/> + <identity xml:lang='el' category='client' name='Ψ 0.11' type='pc'/> + <feature var='http://jabber.org/protocol/caps'/> + <feature var='http://jabber.org/protocol/disco#info'/> + <feature var='http://jabber.org/protocol/disco#items'/> + <feature var='http://jabber.org/protocol/muc'/> + <x xmlns='jabber:x:data' type='result'> + <field var='FORM_TYPE' type='hidden'> + <value>urn:xmpp:dataforms:softwareinfo</value> + </field> + <field var='ip_version'> + <value>ipv4</value> + <value>ipv6</value> + </field> + <field var='os'> + <value>Mac</value> + </field> + <field var='os_version'> + <value>10.5.1</value> + </field> + <field var='software'> + <value>Psi</value> + </field> + <field var='software_version'> + <value>0.11</value> + </field> + </x> + </query> + </iq>""" + + info = parse_disco_info(Iq(node=node)) + hash_ = compute_caps_hash(info) + self.assertEqual(hash_, 'q07IKJEyjvHSyhy//CH0CxmKi8w=') + + def test_ignore_invalid_forms(self): + node = """ + <iq from='benvolio(a)capulet.lit/230193' id='disco1' to='juliet(a)capulet.lit/chamber' type='result'> + <query xmlns='http://jabber.org/protocol/disco#info' node='http://psi-im.org#q07IKJEyjvHSyhy//CH0CxmKi8w='> + <identity xml:lang='en' category='client' name='Psi 0.11' type='pc'/> + <identity xml:lang='el' category='client' name='Ψ 0.11' type='pc'/> + <feature var='http://jabber.org/protocol/caps'/> + <feature var='http://jabber.org/protocol/disco#info'/> + <feature var='http://jabber.org/protocol/disco#items'/> + <feature var='http://jabber.org/protocol/muc'/> + <x xmlns='jabber:x:data' type='result'> + <field var='FORM_TYPE' type='hidden'> + <value>urn:xmpp:dataforms:softwareinfo</value> + </field> + <field var='ip_version'> + <value>ipv4</value> + <value>ipv6</value> + </field> + <field var='os'> + <value>Mac</value> + </field> + <field var='os_version'> + <value>10.5.1</value> + </field> + <field var='software'> + <value>Psi</value> + </field> + <field var='software_version'> + <value>0.11</value> + </field> + </x> + <x xmlns='jabber:x:data' type='result'> + <field var='FORM_TYPE'> + <value>urn:xmpp:dataforms:softwareinfo</value> + </field> + <field var='ip_version'> + <value>ipv4</value> + <value>ipv6</value> + </field> + </x> + <x xmlns='jabber:x:data' type='result'> + <field var='ip_version'> + <value>ipv4</value> + <value>ipv6</value> + </field> + </x> + </query> + </iq>""" + + info = parse_disco_info(Iq(node=node)) + hash_ = compute_caps_hash(info) + self.assertEqual(hash_, 'q07IKJEyjvHSyhy//CH0CxmKi8w=') + + def test_multiple_form_type_values(self): + node = """ + <iq from='benvolio(a)capulet.lit/230193' id='disco1' to='juliet(a)capulet.lit/chamber' type='result'> + <query xmlns='http://jabber.org/protocol/disco#info' node='http://psi-im.org#q07IKJEyjvHSyhy//CH0CxmKi8w='> + <identity xml:lang='en' category='client' name='Psi 0.11' type='pc'/> + <identity xml:lang='el' category='client' name='Ψ 0.11' type='pc'/> + <feature var='http://jabber.org/protocol/caps'/> + <feature var='http://jabber.org/protocol/disco#info'/> + <feature var='http://jabber.org/protocol/disco#items'/> + <feature var='http://jabber.org/protocol/muc'/> + <x xmlns='jabber:x:data' type='result'> + <field var='FORM_TYPE' type='hidden'> + <value>urn:xmpp:dataforms:softwareinfo</value> + <value>urn:xmpp:dataforms:softwareinfo_test</value> + </field> + <field var='ip_version'> + <value>ipv4</value> + <value>ipv6</value> + </field> + </x> + </query> + </iq>""" + + info = parse_disco_info(Iq(node=node)) + with self.assertRaises(DiscoInfoMalformed): + hash_ = compute_caps_hash(info) + + def test_non_unique_form_type_value(self): + node = """ + <iq from='benvolio(a)capulet.lit/230193' id='disco1' to='juliet(a)capulet.lit/chamber' type='result'> + <query xmlns='http://jabber.org/protocol/disco#info' node='http://psi-im.org#q07IKJEyjvHSyhy//CH0CxmKi8w='> + <identity xml:lang='en' category='client' name='Psi 0.11' type='pc'/> + <identity xml:lang='el' category='client' name='Ψ 0.11' type='pc'/> + <feature var='http://jabber.org/protocol/caps'/> + <feature var='http://jabber.org/protocol/disco#info'/> + <feature var='http://jabber.org/protocol/disco#items'/> + <feature var='http://jabber.org/protocol/muc'/> + <x xmlns='jabber:x:data' type='result'> + <field var='FORM_TYPE' type='hidden'> + <value>urn:xmpp:dataforms:softwareinfo</value> + </field> + <field var='ip_version'> + <value>ipv4</value> + <value>ipv6</value> + </field> + </x> + <x xmlns='jabber:x:data' type='result'> + <field var='FORM_TYPE' type='hidden'> + <value>urn:xmpp:dataforms:softwareinfo</value> + </field> + <field var='ip_version'> + <value>ipv4</value> + <value>ipv6</value> + </field> + </x> + </query> + </iq>""" + + info = parse_disco_info(Iq(node=node)) + with self.assertRaises(DiscoInfoMalformed): + hash_ = compute_caps_hash(info) + + def test_non_unique_feature(self): + node = """ + <iq from='benvolio(a)capulet.lit/230193' id='disco1' to='juliet(a)capulet.lit/chamber' type='result'> + <query xmlns='http://jabber.org/protocol/disco#info' node='http://psi-im.org#q07IKJEyjvHSyhy//CH0CxmKi8w='> + <identity xml:lang='en' category='client' name='Psi 0.11' type='pc'/> + <identity xml:lang='el' category='client' name='Ψ 0.11' type='pc'/> + <feature var='http://jabber.org/protocol/caps'/> + <feature var='http://jabber.org/protocol/muc'/> + <feature var='http://jabber.org/protocol/disco#info'/> + <feature var='http://jabber.org/protocol/disco#items'/> + <feature var='http://jabber.org/protocol/muc'/> + </query> + </iq>""" + + info = parse_disco_info(Iq(node=node)) + with self.assertRaises(DiscoInfoMalformed): + hash_ = compute_caps_hash(info) + + def test_non_unique_identity(self): + node = """ + <iq from='benvolio(a)capulet.lit/230193' id='disco1' to='juliet(a)capulet.lit/chamber' type='result'> + <query xmlns='http://jabber.org/protocol/disco#info' node='http://psi-im.org#q07IKJEyjvHSyhy//CH0CxmKi8w='> + <identity xml:lang='en' category='client' name='Psi 0.11' type='pc'/> + <identity xml:lang='en' category='client' name='Psi 0.11' type='pc'/> + <feature var='http://jabber.org/protocol/caps'/> + <feature var='http://jabber.org/protocol/muc'/> + <feature var='http://jabber.org/protocol/disco#info'/> + <feature var='http://jabber.org/protocol/disco#items'/> + <feature var='http://jabber.org/protocol/muc'/> + </query> + </iq>""" + + info = parse_disco_info(Iq(node=node)) + with self.assertRaises(DiscoInfoMalformed): + hash_ = compute_caps_hash(info) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/f57bd1aef78ee7ddb37045efe7… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/f57bd1aef78ee7ddb37045efe7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix detection of httpupload max-file-size
by Philipp Hörist 28 Jun '19

28 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1e1ced9a by Philipp Hörist at 2019-06-28T22:16:36Z Fix detection of httpupload max-file-size - - - - - 1 changed file: - gajim/common/modules/httpupload.py Changes: ===================================== gajim/common/modules/httpupload.py ===================================== @@ -83,12 +83,13 @@ class HTTPUpload(BaseModule): self._log.info('Discovered component: %s', info.jid) for form in info.dataforms: - form_dict = form.asDict() - if form_dict.get('FORM_TYPE') != self.httpupload_namespace: + form_type = form.vars.get('FORM_TYPE') + if (form_type is None or + form_type.value != self.httpupload_namespace): continue - size = form_dict.get('max-file-size') + size = form.vars.get('max-file-size') if size is not None: - self.max_file_size = int(size) + self.max_file_size = int(size.value) break if self.max_file_size is None: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1e1ced9ae712705278d1a2954ece7fd738… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1e1ced9ae712705278d1a2954ece7fd738… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Remove outdated comment
by Philipp Hörist 28 Jun '19

28 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8ce0c62c by Philipp Hörist at 2019-06-28T21:38:13Z Remove outdated comment - - - - - 9caa3aad by Philipp Hörist at 2019-06-28T21:47:21Z Use nbxmpp's dataforms module - - - - - 20301d36 by Philipp Hörist at 2019-06-28T21:47:25Z Remove unused dataforms module This was a copy of nbxmpp's dataforms module - - - - - 12 changed files: - gajim/common/caps_cache.py - gajim/common/connection_handlers_events.py - gajim/common/modules/adhoc_commands.py - − gajim/common/modules/dataforms.py - gajim/common/modules/pubsub.py - gajim/dataforms_widget.py - gajim/gtk/account_wizard.py - gajim/gtk/adhoc.py - gajim/gtk/dataform.py - gajim/gtk/search.py - gajim/gtk/service_registration.py - test/gtk/dataform.py Changes: ===================================== gajim/common/caps_cache.py ===================================== @@ -105,9 +105,6 @@ def create_suitable_client_caps(node, caps_hash, hash_method, fjid=None): def compute_caps_hash(identities, features, dataforms=None, hash_method='sha-1'): """ Compute caps hash according to XEP-0115, V1.5 - - dataforms are nbxmpp.DataForms objects as common.dataforms don't allow several - values without a field type list-multi """ if dataforms is None: dataforms = [] ===================================== gajim/common/connection_handlers_events.py ===================================== @@ -21,6 +21,7 @@ import logging import OpenSSL.crypto import nbxmpp +from nbxmpp.modules import dataforms from gajim.common import nec from gajim.common import helpers @@ -28,7 +29,6 @@ from gajim.common import app from gajim.common import i18n from gajim.common.i18n import _ from gajim.common.helpers import AdditionalDataDict -from gajim.common.modules import dataforms from gajim.common.const import KindConstant, SSLError from gajim.common.jingle_transport import JingleTransportSocks5 from gajim.common.file_props import FilesProp ===================================== gajim/common/modules/adhoc_commands.py ===================================== @@ -21,12 +21,12 @@ import nbxmpp from nbxmpp.structs import StanzaHandler +from nbxmpp.modules import dataforms from gajim.common import app from gajim.common import helpers from gajim.common.i18n import _ from gajim.common.nec import NetworkIncomingEvent -from gajim.common.modules import dataforms from gajim.common.modules.base import BaseModule ===================================== gajim/common/modules/dataforms.py deleted ===================================== @@ -1,760 +0,0 @@ -# Copyright (C) 2006-2007 Tomasz Melcer <liori AT exroot.org> -# Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org> -# Copyright (C) 2007 Stephan Erb <steve-e AT h3c.de> -# -# This file is part of Gajim. -# -# Gajim is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published -# by the Free Software Foundation; version 3 only. -# -# Gajim is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Gajim. If not, see <http://www.gnu.org/licenses/>. - -# XEP-0004: Data Forms - -import nbxmpp - -from gajim.common import helpers - - -# exceptions used in this module -class Error(Exception): - pass - - -# when we get nbxmpp.Node which we do not understand -class UnknownDataForm(Error): - pass - - -# when we get nbxmpp.Node which contains bad fields -class WrongFieldValue(Error): - pass - - -# helper class to change class of already existing object -class ExtendedNode(nbxmpp.Node): - @classmethod - def __new__(cls, *args, **kwargs): - if 'extend' not in kwargs.keys() or not kwargs['extend']: - return object.__new__(cls) - - extend = kwargs['extend'] - assert issubclass(cls, extend.__class__) - extend.__class__ = cls - return extend - - -# helper to create fields from scratch -def create_field(typ, **attrs): - ''' Helper function to create a field of given type. ''' - field = { - 'boolean': BooleanField, - 'fixed': StringField, - 'hidden': StringField, - 'text-private': StringField, - 'text-single': StringField, - 'jid-multi': JidMultiField, - 'jid-single': JidSingleField, - 'list-multi': ListMultiField, - 'list-single': ListSingleField, - 'text-multi': TextMultiField, - }[typ](typ=typ, **attrs) - return field - - -def extend_field(node): - """ - Helper function to extend a node to field of appropriate type - """ - # when validation (XEP-122) will go in, we could have another classes - # like DateTimeField - so that dicts in create_field() and - # extend_field() will be different... - typ = node.getAttr('type') - field = { - 'boolean': BooleanField, - 'fixed': StringField, - 'hidden': StringField, - 'text-private': StringField, - 'text-single': StringField, - 'jid-multi': JidMultiField, - 'jid-single': JidSingleField, - 'list-multi': ListMultiField, - 'list-single': ListSingleField, - 'text-multi': TextMultiField, - } - if typ not in field: - typ = 'text-single' - return field[typ](extend=node) - - -def extend_form(node): - """ - Helper function to extend a node to form of appropriate type - """ - if node.getTag('reported') is not None: - return MultipleDataForm(extend=node) - return SimpleDataForm(extend=node) - - -class DataField(ExtendedNode): - """ - Keeps data about one field - var, field type, labels, instructions... Base - class for different kinds of fields. Use create_field() function to construct one - of these - """ - - def __init__(self, typ=None, var=None, value=None, label=None, desc=None, - required=False, options=None, extend=None): - - if extend is None: - ExtendedNode.__init__(self, 'field') - - self.type_ = typ - self.var = var - if value is not None: - self.value = value - if label is not None: - self.label = label - if desc is not None: - self.desc = desc - self.required = required - self.options = options - - @property - def type_(self): - """ - Type of field. Recognized values are: 'boolean', 'fixed', 'hidden', - 'jid-multi', 'jid-single', 'list-multi', 'list-single', 'text-multi', - 'text-private', 'text-single'. If you set this to something different, - DataField will store given name, but treat all data as text-single - """ - type_ = self.getAttr('type') - if type_ is None: - return 'text-single' - return type_ - - @type_.setter - def type_(self, value): - assert isinstance(value, str) - self.setAttr('type', value) - - @property - def var(self): - """ - Field identifier - """ - return self.getAttr('var') - - @var.setter - def var(self, value): - assert isinstance(value, str) - self.setAttr('var', value) - - @var.deleter - def var(self): - self.delAttr('var') - - @property - def label(self): - """ - Human-readable field name - """ - label_ = self.getAttr('label') - if not label_: - label_ = self.var - return label_ - - @label.setter - def label(self, value): - assert isinstance(value, str) - self.setAttr('label', value) - - @label.deleter - def label(self): - if self.getAttr('label'): - self.delAttr('label') - - @property - def description(self): - """ - Human-readable description of field meaning - """ - return self.getTagData('desc') or '' - - @description.setter - def description(self, value): - assert isinstance(value, str) - if value == '': - del self.description - else: - self.setTagData('desc', value) - - @description.deleter - def description(self): - desc = self.getTag('desc') - if desc is not None: - self.delChild(desc) - - @property - def required(self): - """ - Controls whether this field required to fill. Boolean - """ - return bool(self.getTag('required')) - - @required.setter - def required(self, value): - required = self.getTag('required') - if required and not value: - self.delChild(required) - elif not required and value: - self.addChild('required') - - @property - def media(self): - """ - Media data - """ - media = self.getTag('media', namespace=nbxmpp.NS_DATA_MEDIA) - if media: - return Media(media) - - @media.setter - def media(self, value): - del self.media - self.addChild(node=value) - - @media.deleter - def media(self): - media = self.getTag('media') - if media is not None: - self.delChild(media) - - @staticmethod - def is_valid(): - return True, '' - - -class Uri(nbxmpp.Node): - def __init__(self, uri_tag): - nbxmpp.Node.__init__(self, node=uri_tag) - - @property - def type_(self): - """ - uri type - """ - return self.getAttr('type') - - @type_.setter - def type_(self, value): - self.setAttr('type', value) - - @type_.deleter - def type_(self): - self.delAttr('type') - - @property - def uri_data(self): - """ - uri data - """ - return self.getData() - - @uri_data.setter - def uri_data(self, value): - self.setData(value) - - @uri_data.deleter - def uri_data(self): - self.setData(None) - - -class Media(nbxmpp.Node): - def __init__(self, media_tag): - nbxmpp.Node.__init__(self, node=media_tag) - - @property - def uris(self): - """ - URIs of the media element. - """ - return map(Uri, self.getTags('uri')) - - @uris.setter - def uris(self, value): - del self.uris - for uri in value: - self.addChild(node=uri) - - @uris.deleter - def uris(self): - for element in self.getTags('uri'): - self.delChild(element) - - -class BooleanField(DataField): - @property - def value(self): - """ - Value of field. May contain True, False or None - """ - value = self.getTagData('value') - if value in ('0', 'false'): - return False - if value in ('1', 'true'): - return True - if value is None: - return False # default value is False - raise WrongFieldValue - - @value.setter - def value(self, value): - self.setTagData('value', value and '1' or '0') - - @value.deleter - def value(self): - value = self.getTag('value') - if value is not None: - self.delChild(value) - - -class StringField(DataField): - """ - Covers fields of types: fixed, hidden, text-private, text-single - """ - - @property - def value(self): - """ - Value of field. May be any string - """ - return self.getTagData('value') or '' - - @value.setter - def value(self, value): - assert isinstance(value, str) - if value == '' and not self.required: - del self.value - return - self.setTagData('value', value) - - @value.deleter - def value(self): - try: - self.delChild(self.getTag('value')) - except ValueError: # if there already were no value tag - pass - - def is_valid(self): - if not self.required: - return True, '' - if not self.value: - return False, '' - return True, '' - - -class ListField(DataField): - """ - Covers fields of types: jid-multi, jid-single, list-multi, list-single - """ - - @property - def options(self): - """ - Options - """ - options = [] - for element in self.getTags('option'): - value = element.getTagData('value') - if value is None: - raise WrongFieldValue - label = element.getAttr('label') - if not label: - label = value - options.append((label, value)) - return options - - @options.setter - def options(self, values): - del self.options - for value, label in values: - self.addChild('option', - {'label': label}).setTagData('value', value) - - @options.deleter - def options(self): - for element in self.getTags('option'): - self.delChild(element) - - def iter_options(self): - for element in self.iterTags('option'): - value = element.getTagData('value') - if value is None: - raise WrongFieldValue - label = element.getAttr('label') - if not label: - label = value - yield (value, label) - - -class ListSingleField(ListField, StringField): - """ - Covers list-single field - """ - def is_valid(self): - if not self.required: - return True, '' - if not self.value: - return False, '' - return True, '' - - -class JidSingleField(ListSingleField): - """ - Covers jid-single fields - """ - def is_valid(self): - if self.value: - try: - helpers.parse_jid(self.value) - return True, '' - except Exception as error: - return False, error - if self.required: - return False, '' - return True, '' - - -class ListMultiField(ListField): - """ - Covers list-multi fields - """ - - @property - def values(self): - """ - Values held in field - """ - values = [] - for element in self.getTags('value'): - values.append(element.getData()) - return values - - @values.setter - def values(self, values): - del self.values - for value in values: - self.addChild('value').setData(value) - - @values.deleter - def values(self): - for element in self.getTags('value'): - self.delChild(element) - - def iter_values(self): - for element in self.getTags('value'): - yield element.getData() - - def is_valid(self): - if not self.required: - return True, '' - if not self.values: - return False, '' - return True, '' - - -class JidMultiField(ListMultiField): - """ - Covers jid-multi fields - """ - def is_valid(self): - if self.values: - for value in self.values: - try: - helpers.parse_jid(value) - except Exception as error: - return False, error - return True, '' - if self.required: - return False, '' - return True, '' - - -class TextMultiField(DataField): - @property - def value(self): - """ - Value held in field - """ - value = '' - for element in self.iterTags('value'): - value += '\n' + element.getData() - return value[1:] - - @value.setter - def value(self, value): - del self.value - if value == '': - return - for line in value.split('\n'): - self.addChild('value').setData(line) - - @value.deleter - def value(self): - for element in self.getTags('value'): - self.delChild(element) - - def is_valid(self): - if not self.required: - return True, '' - if not self.value: - return False, '' - return True, '' - - -class DataRecord(ExtendedNode): - """ - The container for data fields - an xml element which has DataField elements - as children - """ - def __init__(self, fields=None, associated=None, extend=None): - self.associated = associated - self.vars = {} - if extend is None: - # we have to build this object from scratch - nbxmpp.Node.__init__(self) - - if fields is not None: - self.fields = fields - else: - # we already have nbxmpp.Node inside - try to convert all - # fields into DataField objects - if fields is None: - for field in self.iterTags('field'): - if not isinstance(field, DataField): - extend_field(field) - self.vars[field.var] = field - else: - for field in self.getTags('field'): - self.delChild(field) - self.fields = fields - - @property - def fields(self): - """ - List of fields in this record - """ - return self.getTags('field') - - @fields.setter - def fields(self, fields): - del self.fields - for field in fields: - if not isinstance(field, DataField): - extend_field(field) - self.addChild(node=field) - - @fields.deleter - def fields(self): - for element in self.getTags('field'): - self.delChild(element) - - def iter_fields(self): - """ - Iterate over fields in this record. Do not take associated into account - """ - for field in self.iterTags('field'): - yield field - - def iter_with_associated(self): - """ - Iterate over associated, yielding both our field and associated one - together - """ - for field in self.associated.iter_fields(): - yield self[field.var], field - - def __getitem__(self, item): - return self.vars[item] - - def is_valid(self): - for field in self.iter_fields(): - if not field.is_valid()[0]: - return False - return True - - -class DataForm(ExtendedNode): - def __init__(self, type_=None, title=None, instructions=None, extend=None): - if extend is None: - # we have to build form from scratch - nbxmpp.Node.__init__(self, 'x', attrs={'xmlns': nbxmpp.NS_DATA}) - - if type_ is not None: - self.type_ = type_ - if title is not None: - self.title = title - if instructions is not None: - self.instructions = instructions - - @property - def type_(self): - """ - Type of the form. Must be one of: 'form', 'submit', 'cancel', 'result'. - 'form' - this form is to be filled in; you will be able soon to do: - filledform = DataForm(replyto=thisform) - """ - return self.getAttr('type') - - @type_.setter - def type_(self, type_): - assert type_ in ('form', 'submit', 'cancel', 'result') - self.setAttr('type', type_) - - @property - def title(self): - """ - Title of the form - - Human-readable, should not contain any \\r\\n. - """ - return self.getTagData('title') - - @title.setter - def title(self, title): - self.setTagData('title', title) - - @title.deleter - def title(self): - try: - self.delChild('title') - except ValueError: - pass - - @property - def instructions(self): - """ - Instructions for this form - - Human-readable, may contain \\r\\n. - """ - # TODO: the same code is in TextMultiField. join them - value = '' - for valuenode in self.getTags('instructions'): - value += '\n' + valuenode.getData() - return value[1:] - - @instructions.setter - def instructions(self, value): - del self.instructions - if value == '': - return - for line in value.split('\n'): - self.addChild('instructions').setData(line) - - @instructions.deleter - def instructions(self): - for value in self.getTags('instructions'): - self.delChild(value) - - @property - def is_reported(self): - return self.getTag('reported') is not None - - -class SimpleDataForm(DataForm, DataRecord): - def __init__(self, type_=None, title=None, instructions=None, fields=None, - extend=None): - DataForm.__init__(self, type_=type_, title=title, - instructions=instructions, extend=extend) - DataRecord.__init__(self, fields=fields, extend=self, associated=self) - - def get_purged(self): - simple_form = SimpleDataForm(extend=self) - del simple_form.title - simple_form.instructions = '' - to_be_removed = [] - for field in simple_form.iter_fields(): - if field.required: - # add <value> if there is not - if hasattr(field, 'value') and not field.value: - field.value = '' - # Keep all required fields - continue - if ((hasattr(field, 'value') and - not field.value and - field.value != 0) or - (hasattr(field, 'values') and not field.values)): - to_be_removed.append(field) - else: - del field.label - del field.description - del field.media - for field in to_be_removed: - simple_form.delChild(field) - return simple_form - - -class MultipleDataForm(DataForm): - def __init__(self, type_=None, title=None, instructions=None, items=None, - extend=None): - DataForm.__init__(self, type_=type_, title=title, - instructions=instructions, extend=extend) - # all records, recorded into DataRecords - if extend is None: - if items is not None: - self.items = items - else: - # we already have nbxmpp.Node inside - try to convert all - # fields into DataField objects - if items is None: - self.items = list(self.iterTags('item')) - else: - for item in self.getTags('item'): - self.delChild(item) - self.items = items - reported_tag = self.getTag('reported') - self.reported = DataRecord(extend=reported_tag) - - @property - def items(self): - """ - A list of all records - """ - return list(self.iter_records()) - - @items.setter - def items(self, records): - del self.items - for record in records: - if not isinstance(record, DataRecord): - DataRecord(extend=record) - self.addChild(node=record) - - @items.deleter - def items(self): - for record in self.getTags('item'): - self.delChild(record) - - def iter_records(self): - for record in self.getTags('item'): - yield record - -# -# @reported.setter -# def reported(self, record): -# try: -# self.delChild('reported') -# except Exception: -# pass -# -# record.setName('reported') -# self.addChild(node=record) ===================================== gajim/common/modules/pubsub.py ===================================== @@ -21,9 +21,9 @@ # XEP-0060: Publish-Subscribe import nbxmpp +from nbxmpp.modules import dataforms from gajim.common import app -from gajim.common.modules import dataforms from gajim.common.nec import NetworkIncomingEvent from gajim.common.modules.base import BaseModule ===================================== gajim/dataforms_widget.py ===================================== @@ -30,8 +30,9 @@ from gi.repository import GdkPixbuf from gi.repository import GObject from gi.repository import GLib +from nbxmpp.modules import dataforms + from gajim import gtkgui_helpers -from gajim.common.modules import dataforms from gajim.common import helpers from gajim.common import app from gajim.common.i18n import _ ===================================== gajim/gtk/account_wizard.py ===================================== @@ -18,13 +18,14 @@ from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GLib +from nbxmpp.modules import dataforms + from gajim.common import app from gajim.common import ged from gajim.common import configpaths from gajim.common import helpers from gajim.common import connection from gajim.common.i18n import _ -from gajim.common.modules import dataforms from gajim import dataforms_widget from gajim import gui_menu_builder ===================================== gajim/gtk/adhoc.py ===================================== @@ -16,14 +16,14 @@ import logging from enum import IntEnum from gi.repository import Gtk + from nbxmpp.util import is_error_result from nbxmpp.const import AdHocAction +from nbxmpp.modules import dataforms from gajim.common import app from gajim.common.i18n import _ -from gajim.common.modules import dataforms - from gajim.gtk.dataform import DataFormWidget from gajim.gtk.util import ensure_not_destroyed from gajim.gtk.util import find_widget ===================================== gajim/gtk/dataform.py ===================================== @@ -17,12 +17,13 @@ from gi.repository import GLib from gi.repository import GObject from gi.repository import Pango +from nbxmpp.modules.dataforms import extend_form + from gajim.gtkgui_helpers import scale_pixbuf_from_data from gajim.common import app from gajim.common.i18n import _ from gajim.common.helpers import open_uri -from gajim.common.modules.dataforms import extend_form from gajim.gtk.util import MultiLineLabel from gajim.gtk.util import MaxWidthComboBoxText ===================================== gajim/gtk/search.py ===================================== @@ -20,12 +20,12 @@ from enum import IntEnum from gi.repository import Gtk +from nbxmpp.modules import dataforms + from gajim.common import app from gajim.common import ged from gajim.common.i18n import _ -from gajim.common.modules import dataforms - from gajim.gui_menu_builder import SearchMenu from gajim.gtk.dataform import DataFormWidget ===================================== gajim/gtk/service_registration.py ===================================== @@ -17,8 +17,9 @@ from enum import IntEnum from gi.repository import Gtk +from nbxmpp.modules import dataforms + from gajim.common import app -from gajim.common.modules import dataforms from gajim.common.i18n import _ from gajim.gtk.dataform import DataFormWidget ===================================== test/gtk/dataform.py ===================================== @@ -2,9 +2,9 @@ from base64 import b64decode from gi.repository import Gtk import nbxmpp +from nbxmpp.modules.dataforms import extend_form from gajim.gtk.dataform import DataFormWidget -from gajim.common.modules.dataforms import extend_form from gajim.common.const import CSSPriority from gajim.common import app View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/9c53fcbd898bd0d61e5d16f8eac586fda… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/9c53fcbd898bd0d61e5d16f8eac586fda… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] DataForms: Detect <reported> element
by Philipp Hörist 28 Jun '19

28 Jun '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: f9532825 by Philipp Hörist at 2019-06-28T21:36:55Z DataForms: Detect <reported> element - - - - - 1 changed file: - nbxmpp/modules/dataforms.py Changes: ===================================== nbxmpp/modules/dataforms.py ===================================== @@ -667,6 +667,10 @@ class DataForm(ExtendedNode): for value in self.getTags('instructions'): self.delChild(value) + @property + def is_reported(self): + return self.getTag('reported') is not None + class SimpleDataForm(DataForm, DataRecord): def __init__(self, type_=None, title=None, instructions=None, fields=None, View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/f9532825b89abf55d6d41a0b7a… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/f9532825b89abf55d6d41a0b7a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Use nbxmpp's Discovery module
by Philipp Hörist 28 Jun '19

28 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9c53fcbd by Philipp Hörist at 2019-06-28T21:32:02Z Use nbxmpp's Discovery module - - - - - 21 changed files: - gajim/common/app.py - gajim/common/caps_cache.py - gajim/common/logger.py - gajim/common/modules/blocking.py - gajim/common/modules/bookmarks.py - gajim/common/modules/bytestream.py - gajim/common/modules/caps.py - gajim/common/modules/carbons.py - gajim/common/modules/discovery.py - gajim/common/modules/httpupload.py - gajim/common/modules/mam.py - gajim/common/modules/muc.py - gajim/common/modules/pep.py - gajim/common/modules/privacylists.py - gajim/common/modules/pubsub.py - gajim/common/modules/security_labels.py - gajim/common/modules/vcard_temp.py - gajim/gtk/discovery.py - gajim/gtk/join_groupchat.py - gajim/gtk/pep_config.py - test/no_gui/unit/test_caps_cache.py Changes: ===================================== gajim/common/app.py ===================================== @@ -38,6 +38,7 @@ from pathlib import Path from collections import namedtuple import nbxmpp +from nbxmpp.structs import DiscoIdentity from gi.repository import Gdk import gajim @@ -143,7 +144,9 @@ socks5queue = None gupnp_igd = None -gajim_identity = {'type': 'pc', 'category': 'client', 'name': 'Gajim'} +gajim_identity = DiscoIdentity(category='client', + type='pc', + name='Gajim') gajim_common_features = [ nbxmpp.NS_BYTESTREAM, ===================================== gajim/common/caps_cache.py ===================================== @@ -30,7 +30,6 @@ through ClientCaps objects which are hold by contact instances. import base64 import hashlib import logging -from collections import namedtuple import nbxmpp from nbxmpp.const import Affiliation @@ -114,19 +113,18 @@ def compute_caps_hash(identities, features, dataforms=None, hash_method='sha-1') dataforms = [] def sort_identities_key(i): - return (i['category'], i.get('type', ''), i.get('xml:lang', '')) + return (i.category, i.type, i.lang or '') def sort_dataforms_key(dataform): - f = dataform.getField('FORM_TYPE') - return (bool(f), f.getValue()) + return dataform['FORM_TYPE'].value S = '' identities.sort(key=sort_identities_key) for i in identities: - c = i['category'] - type_ = i.get('type', '') - lang = i.get('xml:lang', '') - name = i.get('name', '') + c = i.category + type_ = i.type + lang = i.lang or '' + name = i.name or '' S += '%s/%s/%s/%s<' % (c, type_, lang, name) features.sort() for f in features: @@ -135,15 +133,16 @@ def compute_caps_hash(identities, features, dataforms=None, hash_method='sha-1') for dataform in dataforms: # fields indexed by var fields = {} - for f in dataform.getChildren(): - fields[f.getVar()] = f + for f in dataform.iter_fields(): + values = f.getTags('value') + fields[f.var] = [value.getData() for value in values] form_type = fields.get('FORM_TYPE') if form_type: - S += form_type.getValue() + '<' + S += form_type[0] + '<' del fields['FORM_TYPE'] for var in sorted(fields.keys()): S += '%s<' % var - values = sorted(fields[var].getValues()) + values = sorted(fields[var]) for value in values: S += '%s<' % value @@ -331,27 +330,10 @@ class CapsCache: features = property(_get_features, _set_features) def _get_identities(self): - list_ = [] - for i in self._identities: - # transforms it back in a dict - d = dict() - d['category'] = i[0] - if i[1]: - d['type'] = i[1] - if i[2]: - d['xml:lang'] = i[2] - if i[3]: - d['name'] = i[3] - list_.append(d) - return list_ + return self._identities def _set_identities(self, value): - self._identities = [] - for identity in value: - # dict are not hashable, so transform it into a tuple - t = (identity['category'], identity.get('type'), - identity.get('xml:lang'), identity.get('name')) - self._identities.append(self.__names.setdefault(t, t)) + self._identities = value identities = property(_get_identities, _set_identities) @@ -432,37 +414,15 @@ class CapsCache: class MucCapsCache: - DiscoInfo = namedtuple('DiscoInfo', ['identities', 'features', 'data']) - def __init__(self): self.cache = {} - def append(self, stanza): - jid = stanza.getFrom() - identities, features, data = [], [], [] - query_childs = stanza.getQueryChildren() - if not query_childs: - log.warning('%s returned empty disco info', jid) - return - - for child in query_childs: - if child.getName() == 'identity': - attr = {} - for key in child.getAttrs().keys(): - attr[key] = child.getAttr(key) - identities.append(attr) - elif child.getName() == 'feature': - features.append(child.getAttr('var')) - elif child.getName() == 'x': - if child.getNamespace() == nbxmpp.NS_DATA: - from gajim.common.modules import dataforms - data.append(dataforms.extend_form(node=child)) - - if nbxmpp.NS_MUC not in features: + def append(self, info): + if nbxmpp.NS_MUC not in info.features: # Not a MUC, don't cache info return - self.cache[jid] = self.DiscoInfo(identities, features, data) + self.cache[info.jid] = info def is_cached(self, jid): return jid in self.cache @@ -498,7 +458,7 @@ class MucCapsCache: return allowed if jid in self.cache: - for form in self.cache[jid].data: + for form in self.cache[jid].dataforms: try: allowed = form['muc#roominfo_changesubject'].value except KeyError: @@ -520,7 +480,7 @@ class MucCapsCache: def get_room_infos(self, jid): room_info = {} if jid in self.cache: - for form in self.cache[jid].data: + for form in self.cache[jid].dataforms: try: room_info['name'] = form['muc#roomconfig_roomname'].value except KeyError: ===================================== gajim/common/logger.py ===================================== @@ -38,6 +38,8 @@ from gzip import GzipFile from io import BytesIO from gi.repository import GLib +from nbxmpp.structs import DiscoIdentity + from gajim.common import exceptions from gajim.common import app from gajim.common import configpaths @@ -1027,8 +1029,10 @@ class Logger: type_ = data[i + 1] lang = data[i + 2] name = data[i + 3] - identities.append({'category': category, 'type': type_, - 'xml:lang': lang, 'name': name}) + identities.append(DiscoIdentity(category=category, + type=type_, + lang=lang, + name=name)) i += 4 i += 1 while i < len(data): @@ -1046,10 +1050,12 @@ class Logger: data = [] for identity in identities: # there is no FEAT category - if identity['category'] == 'FEAT': + if identity.category == 'FEAT': return - data.extend((identity.get('category'), identity.get('type', ''), - identity.get('xml:lang', ''), identity.get('name', ''))) + data.extend((identity.category, + identity.type, + identity.lang or '', + identity.name or '')) data.append('FEAT') data.extend(features) data = '\0'.join(data) ===================================== gajim/common/modules/blocking.py ===================================== @@ -50,8 +50,8 @@ class Blocking(BaseModule): self.supported = False - def pass_disco(self, from_, _identities, features, _data, _node): - if nbxmpp.NS_BLOCKING not in features: + def pass_disco(self, info): + if nbxmpp.NS_BLOCKING not in info.features: return self.supported = True @@ -60,7 +60,7 @@ class Blocking(BaseModule): account=self._account, feature=nbxmpp.NS_BLOCKING)) - self._log.info('Discovered blocking: %s', from_) + self._log.info('Discovered blocking: %s', info.jid) def _blocking_list_received(self, result): if is_error_result(result): ===================================== gajim/common/modules/bookmarks.py ===================================== @@ -82,11 +82,11 @@ class Bookmarks(BaseModule): app.nec.push_incoming_event( NetworkEvent('bookmarks-received', account=self._account)) - def pass_disco(self, from_, _identities, features, _data, _node): - if nbxmpp.NS_BOOKMARK_CONVERSION not in features: + def pass_disco(self, info): + if nbxmpp.NS_BOOKMARK_CONVERSION not in info.features: return self._conversion = True - self._log.info('Discovered Bookmarks Conversion: %s', from_) + self._log.info('Discovered Bookmarks Conversion: %s', info.jid) def _act_on_changed_bookmarks(self, old_bookmarks): new_bookmarks = self._convert_to_set(self._bookmarks) ===================================== gajim/common/modules/bytestream.py ===================================== @@ -95,16 +95,16 @@ class Bytestream(BaseModule): callback=self._ResultCB), ] - def pass_disco(self, from_, _identities, features, _data, _node): - if nbxmpp.NS_BYTESTREAM not in features: + def pass_disco(self, info): + if nbxmpp.NS_BYTESTREAM not in info.features: return if app.config.get_per('accounts', self._account, 'use_ft_proxies'): - log.info('Discovered proxy: %s', from_) + log.info('Discovered proxy: %s', info.jid) our_fjid = self._con.get_own_jid() testit = app.config.get_per( 'accounts', self._account, 'test_ft_proxies_on_startup') app.proxy65_manager.resolve( - from_, self._con.connection, str(our_fjid), + info.jid, self._con.connection, str(our_fjid), default=self._account, testit=testit) raise nbxmpp.NodeProcessed ===================================== gajim/common/modules/caps.py ===================================== @@ -19,6 +19,7 @@ import nbxmpp from nbxmpp.structs import StanzaHandler +from nbxmpp.util import is_error_result from gajim.common import caps_cache from gajim.common import app @@ -94,16 +95,21 @@ class Caps(BaseModule): self._account, room_jid, resource) return contact - def contact_info_received(self, from_, identities, features, data, node): + def contact_info_received(self, info): """ callback to update our caps cache with queried information after we have retrieved an unknown caps hash via a disco """ - bare_jid = from_.getStripped() - contact = self._get_contact_or_gc_contact_for_jid(from_) + if is_error_result(info): + self._log.info(info) + return + + bare_jid = info.jid.getBare() + + contact = self._get_contact_or_gc_contact_for_jid(info.jid) if not contact: - self._log.info('Received Disco from unknown contact %s', from_) + self._log.info('Received Disco from unknown contact %s', info.jid) return lookup = contact.client_caps.get_cache_lookup_strategy() @@ -115,10 +121,10 @@ class Caps(BaseModule): return validate = contact.client_caps.get_hash_validation_strategy() - hash_is_valid = validate(identities, features, data) + hash_is_valid = validate(info.identities, info.features, info.dataforms) if hash_is_valid: - cache_item.set_and_store(identities, features) + cache_item.set_and_store(info.identities, info.features) else: node = caps_hash = hash_method = None contact.client_caps = self._create_suitable_client_caps( @@ -126,11 +132,10 @@ class Caps(BaseModule): self._log.warning( 'Computed and retrieved caps hash differ. Ignoring ' 'caps of contact %s', contact.get_full_jid()) - app.nec.push_incoming_event( NetworkEvent('caps-update', conn=self._con, - fjid=str(from_), + fjid=str(info.jid), jid=bare_jid)) ===================================== gajim/common/modules/carbons.py ===================================== @@ -25,12 +25,12 @@ class Carbons(BaseModule): self.supported = False - def pass_disco(self, from_, _identities, features, _data, _node): - if nbxmpp.NS_CARBONS not in features: + def pass_disco(self, info): + if nbxmpp.NS_CARBONS not in info.features: return self.supported = True - self._log.info('Discovered carbons: %s', from_) + self._log.info('Discovered carbons: %s', info.jid) iq = nbxmpp.Iq('set') iq.setTag('enable', namespace=nbxmpp.NS_CARBONS) ===================================== gajim/common/modules/discovery.py ===================================== @@ -14,13 +14,11 @@ # XEP-0030: Service Discovery -import weakref - import nbxmpp from nbxmpp.structs import StanzaHandler +from nbxmpp.util import is_error_result from gajim.common import app -from gajim.common import helpers from gajim.common.caps_cache import muc_caps_cache from gajim.common.nec import NetworkIncomingEvent from gajim.common.modules.base import BaseModule @@ -28,6 +26,13 @@ from gajim.common.connection_handlers_events import InformationEvent class Discovery(BaseModule): + + _nbxmpp_extends = 'Discovery' + _nbxmpp_methods = [ + 'disco_info', + 'disco_items', + ] + def __init__(self, con): BaseModule.__init__(self, con) @@ -44,125 +49,38 @@ class Discovery(BaseModule): def disco_contact(self, jid, node=None): success_cb = self._con.get_module('Caps').contact_info_received - self._disco(nbxmpp.NS_DISCO_INFO, jid, node, success_cb, None) - - def disco_items(self, jid, node=None, success_cb=None, error_cb=None): - self._disco(nbxmpp.NS_DISCO_ITEMS, jid, node, success_cb, error_cb) - - def disco_info(self, jid, node=None, success_cb=None, error_cb=None): - self._disco(nbxmpp.NS_DISCO_INFO, jid, node, success_cb, error_cb) - - def _disco(self, namespace, jid, node, success_cb, error_cb): - if success_cb is None: - raise ValueError('success_cb is required') - if not app.account_is_connected(self._account): - return - iq = nbxmpp.Iq(typ='get', to=jid, queryNS=namespace) - if node: - iq.setQuerynode(node) - - log_str = 'Request info: %s %s' - if namespace == nbxmpp.NS_DISCO_ITEMS: - log_str = 'Request items: %s %s' - self._log.info(log_str, jid, node or '') - - # Create weak references so we can pass GUI object methods - weak_success_cb = weakref.WeakMethod(success_cb) - if error_cb is not None: - weak_error_cb = weakref.WeakMethod(error_cb) - else: - weak_error_cb = None - self._con.connection.SendAndCallForResponse( - iq, self._disco_response, {'success_cb': weak_success_cb, - 'error_cb': weak_error_cb}) - - def _disco_response(self, _con, stanza, success_cb, error_cb): - if not nbxmpp.isResultNode(stanza): - if error_cb is not None: - error_cb()(stanza.getFrom(), stanza.getError()) - else: - self._log.info('Error: %s', stanza.getError()) - return - - from_ = stanza.getFrom() - node = stanza.getQuerynode() - if stanza.getQueryNS() == nbxmpp.NS_DISCO_INFO: - identities, features, data, node = self.parse_info_response(stanza) - success_cb()(from_, identities, features, data, node) - - elif stanza.getQueryNS() == nbxmpp.NS_DISCO_ITEMS: - items = self.parse_items_response(stanza) - success_cb()(from_, node, items) - else: - self._log.warning('Wrong query namespace: %s', stanza) - - def parse_items_response(self, stanza): - payload = stanza.getQueryPayload() - items = [] - for item in payload: - # CDATA payload is not processed, only nodes - if not isinstance(item, nbxmpp.simplexml.Node): - continue - attr = item.getAttrs() - if 'jid' not in attr: - self._log.warning('No jid attr in disco items: %s', stanza) - continue - try: - attr['jid'] = helpers.parse_jid(attr['jid']) - except helpers.InvalidFormat: - self._log.warning('Invalid jid attr in disco items: %s', stanza) - continue - items.append(attr) - return items - - @classmethod - def parse_info_response(cls, stanza): - identities, features, data, node = [], [], [], None - query = stanza.getTag('query') - node = query.getAttr('node') - if not node: - node = '' - - childs = stanza.getQueryChildren() - if not childs: - childs = [] - - for i in childs: - if i.getName() == 'identity': - attr = {} - for key in i.getAttrs().keys(): - attr[key] = i.getAttr(key) - identities.append(attr) - elif i.getName() == 'feature': - var = i.getAttr('var') - if var: - features.append(var) - elif i.getName() == 'x' and i.getNamespace() == nbxmpp.NS_DATA: - data.append(nbxmpp.DataForm(node=i)) - - return identities, features, data, node + self.disco_info(jid, node, callback=success_cb) def discover_server_items(self): server = self._con.get_own_jid().getDomain() - self.disco_items(server, success_cb=self._server_items_received) + self.disco_items(server, callback=self._server_items_received) + + def _server_items_received(self, result): + if is_error_result(result): + self._log.warning('Server disco failed') + self._log.error(result) + return - def _server_items_received(self, _from, _node, items): self._log.info('Server items received') - for item in items: - if 'node' in item: + self._log.debug(result) + for item in result.items: + if item.node is not None: # Only disco components continue - self.disco_info(item['jid'], - success_cb=self._server_items_info_received) + self.disco_info(item.jid, callback=self._server_items_info_received) + + def _server_items_info_received(self, result): + if is_error_result(result): + self._log.warning('Server item disco info failed') + self._log.warning(result) + return - def _server_items_info_received(self, from_, *args): - from_ = from_.getStripped() - self._log.info('Server item info received: %s', from_) - self._parse_transports(from_, *args) + self._log.info('Server item info received: %s', result.jid) + self._parse_transports(result) try: - self._con.get_module('MUC').pass_disco(from_, *args) - self._con.get_module('HTTPUpload').pass_disco(from_, *args) - self._con.get_module('Bytestream').pass_disco(from_, *args) + self._con.get_module('MUC').pass_disco(result) + self._con.get_module('HTTPUpload').pass_disco(result) + self._con.get_module('Bytestream').pass_disco(result) except nbxmpp.NodeProcessed: pass @@ -171,62 +89,69 @@ class Discovery(BaseModule): def discover_account_info(self): own_jid = self._con.get_own_jid().getStripped() - self.disco_info(own_jid, success_cb=self._account_info_received) + self.disco_info(own_jid, callback=self._account_info_received) - def _account_info_received(self, from_, *args): - from_ = from_.getStripped() - self._log.info('Account info received: %s', from_) + def _account_info_received(self, result): + if is_error_result(result): + self._log.warning('Account disco info failed') + self._log.warning(result) + return + + self._log.info('Account info received: %s', result.jid) - self._con.get_module('MAM').pass_disco(from_, *args) - self._con.get_module('PEP').pass_disco(from_, *args) - self._con.get_module('PubSub').pass_disco(from_, *args) - self._con.get_module('Bookmarks').pass_disco(from_, *args) + self._con.get_module('MAM').pass_disco(result) + self._con.get_module('PEP').pass_disco(result) + self._con.get_module('PubSub').pass_disco(result) + self._con.get_module('Bookmarks').pass_disco(result) - features = args[1] - if 'urn:xmpp:pep-vcard-conversion:0' in features: + if 'urn:xmpp:pep-vcard-conversion:0' in result.features: self._con.avatar_conversion = True def discover_server_info(self): # Calling this method starts the connect_maschine() server = self._con.get_own_jid().getDomain() - self.disco_info(server, success_cb=self._server_info_received) + self.disco_info(server, callback=self._server_info_received) + + def _server_info_received(self, result): + if is_error_result(result): + self._log.error('Server disco info failed') + self._log.error(result) + return - def _server_info_received(self, from_, *args): - self._log.info('Server info received: %s', from_) + self._log.info('Server info received: %s', result.jid) - self._con.get_module('SecLabels').pass_disco(from_, *args) - self._con.get_module('Blocking').pass_disco(from_, *args) - self._con.get_module('VCardTemp').pass_disco(from_, *args) - self._con.get_module('Carbons').pass_disco(from_, *args) - self._con.get_module('PrivacyLists').pass_disco(from_, *args) - self._con.get_module('HTTPUpload').pass_disco(from_, *args) + self._con.get_module('SecLabels').pass_disco(result) + self._con.get_module('Blocking').pass_disco(result) + self._con.get_module('VCardTemp').pass_disco(result) + self._con.get_module('Carbons').pass_disco(result) + self._con.get_module('PrivacyLists').pass_disco(result) + self._con.get_module('HTTPUpload').pass_disco(result) - features = args[1] - if nbxmpp.NS_REGISTER in features: + if nbxmpp.NS_REGISTER in result.features: self._con.register_supported = True - if nbxmpp.NS_ADDRESS in features: + if nbxmpp.NS_ADDRESS in result.features: self._con.addressing_supported = True self._con.connect_machine(restart=True) - def _parse_transports(self, from_, identities, _features, _data, _node): - for identity in identities: - category = identity.get('category') - if category not in ('gateway', 'headline'): + def _parse_transports(self, info): + for identity in info.identities: + if identity.category not in ('gateway', 'headline'): continue - transport_type = identity.get('type') + self._log.info('Found transport: %s %s %s', - from_, category, transport_type) - jid = str(from_) + info.jid, info.category, identity.type) + + jid = str(info.jid) if jid not in app.transport_type: - app.transport_type[jid] = transport_type - app.logger.save_transport_type(jid, transport_type) + app.transport_type[jid] = identity.type + app.logger.save_transport_type(jid, identity.type) - if transport_type in self._con.available_transports: - self._con.available_transports[transport_type].append(jid) + if identity.type in self._con.available_transports: + self._con.available_transports[identity.type].append(jid) else: - self._con.available_transports[transport_type] = [jid] + self._con.available_transports[identity.type] = [jid] def _answer_disco_items(self, _con, stanza, _properties): from_ = stanza.getFrom() @@ -260,7 +185,7 @@ class Discovery(BaseModule): query = iq.setQuery() if node: query.setAttr('node', node) - query.addChild('identity', attrs=app.gajim_identity) + query.addChild('identity', attrs=app.gajim_identity._asdict()) client_version = 'http://gajim.org#' + app.caps_hash[self._account] if node in (None, client_version): @@ -279,32 +204,31 @@ class Discovery(BaseModule): callback() return - iq = nbxmpp.Iq(typ='get', to=jid, queryNS=nbxmpp.NS_DISCO_INFO) self._log.info('Request MUC info %s', jid) - self._con.connection.SendAndCallForResponse( - iq, self._muc_info_response, {'callback': callback}) + self.disco_info(jid, + callback=self._muc_info_response, + user_data=callback) - def _muc_info_response(self, _con, stanza, callback): - if not nbxmpp.isResultNode(stanza): - error = stanza.getError() - if error == 'item-not-found': + def _muc_info_response(self, result, callback): + if is_error_result(result): + if result.type == 'item-not-found': # Groupchat does not exist - self._log.info('MUC does not exist: %s', stanza.getFrom()) + self._log.info('MUC does not exist: %s', result.jid) callback() else: - self._log.info('MUC disco error: %s', error) + self._log.info('MUC disco error: %s', result) app.nec.push_incoming_event( InformationEvent( None, dialog_name='unable-join-groupchat', kwargs={ - 'server':stanza.getFrom(), - 'error': error})) + 'server': result.jid, + 'error': str(result)})) return - self._log.info('MUC info received: %s', stanza.getFrom()) - muc_caps_cache.append(stanza) + self._log.info('MUC info received: %s', result.jid) + muc_caps_cache.append(result) callback() ===================================== gajim/common/modules/httpupload.py ===================================== @@ -71,22 +71,22 @@ class HTTPUpload(BaseModule): ged.OUT_PREGUI, self.handle_outgoing_stanza) - def pass_disco(self, from_, _identities, features, data, _node): - if NS_HTTPUPLOAD_0 in features: + def pass_disco(self, info): + if NS_HTTPUPLOAD_0 in info.features: self.httpupload_namespace = NS_HTTPUPLOAD_0 - elif NS_HTTPUPLOAD in features: + elif NS_HTTPUPLOAD in info.features: self.httpupload_namespace = NS_HTTPUPLOAD else: return - self.component = from_ - self._log.info('Discovered component: %s', from_) + self.component = info.jid + self._log.info('Discovered component: %s', info.jid) - for form in data: + for form in info.dataforms: form_dict = form.asDict() - if form_dict.get('FORM_TYPE', None) != self.httpupload_namespace: + if form_dict.get('FORM_TYPE') != self.httpupload_namespace: continue - size = form_dict.get('max-file-size', None) + size = form_dict.get('max-file-size') if size is not None: self.max_file_size = int(size) break ===================================== gajim/common/modules/mam.py ===================================== @@ -52,16 +52,17 @@ class MAM(BaseModule): # Holds archive jids where catch up was successful self._catch_up_finished = [] - def pass_disco(self, from_, _identities, features, _data, _node): - if nbxmpp.NS_MAM_2 in features: + def pass_disco(self, info): + if nbxmpp.NS_MAM_2 in info.features: self.archiving_namespace = nbxmpp.NS_MAM_2 - elif nbxmpp.NS_MAM_1 in features: + elif nbxmpp.NS_MAM_1 in info.features: self.archiving_namespace = nbxmpp.NS_MAM_1 else: return self.available = True - self._log.info('Discovered MAM %s: %s', self.archiving_namespace, from_) + self._log.info('Discovered MAM %s: %s', + self.archiving_namespace, info.jid) app.nec.push_incoming_event( NetworkEvent('feature-discovered', ===================================== gajim/common/modules/muc.py ===================================== @@ -103,16 +103,16 @@ class MUC(BaseModule): self._muc_data = {} - def pass_disco(self, from_, identities, features, _data, _node): - for identity in identities: - if identity.get('category') != 'conference': + def pass_disco(self, info): + for identity in info.identities: + if identity.category != 'conference': continue - if identity.get('type') != 'text': + if identity.type != 'text': continue - if nbxmpp.NS_MUC in features: - self._log.info('Discovered MUC: %s', from_) + if nbxmpp.NS_MUC in info.features: + self._log.info('Discovered MUC: %s', info.jid) # TODO: make this nicer - self._con.muc_jid['jabber'] = from_ + self._con.muc_jid['jabber'] = str(info.jid) raise nbxmpp.NodeProcessed def _get_muc_data(self, room_jid): ===================================== gajim/common/modules/pep.py ===================================== @@ -15,12 +15,8 @@ # XEP-0163: Personal Eventing Protocol from typing import Any -from typing import Dict -from typing import List from typing import Tuple -import nbxmpp - from gajim.common.types import ConnectionT from gajim.common.modules.base import BaseModule @@ -31,16 +27,11 @@ class PEP(BaseModule): self.supported = False - def pass_disco(self, - from_: nbxmpp.JID, - identities: List[Dict[str, str]], - _features: List[str], - _data: List[nbxmpp.DataForm], - _node: str) -> None: - for identity in identities: - if identity['category'] == 'pubsub': - if identity.get('type') == 'pep': - self._log.info('Discovered PEP support: %s', from_) + def pass_disco(self, info): + for identity in info.identities: + if identity.category == 'pubsub': + if identity.type == 'pep': + self._log.info('Discovered PEP support: %s', info.jid) self.supported = True ===================================== gajim/common/modules/privacylists.py ===================================== @@ -45,12 +45,12 @@ class PrivacyLists(BaseModule): self.supported = False - def pass_disco(self, from_, _identities, features, _data, _node): - if nbxmpp.NS_PRIVACY not in features: + def pass_disco(self, info): + if nbxmpp.NS_PRIVACY not in info.features: return self.supported = True - self._log.info('Discovered XEP-0016: Privacy Lists: %s', from_) + self._log.info('Discovered XEP-0016: Privacy Lists: %s', info.jid) app.nec.push_incoming_event( NetworkEvent('feature-discovered', ===================================== gajim/common/modules/pubsub.py ===================================== @@ -34,12 +34,12 @@ class PubSub(BaseModule): self.publish_options = False - def pass_disco(self, from_, _identities, features, _data, _node): - if nbxmpp.NS_PUBSUB_PUBLISH_OPTIONS not in features: + def pass_disco(self, info): + if nbxmpp.NS_PUBSUB_PUBLISH_OPTIONS not in info.features: # Remove stored bookmarks accessible to everyone. self._con.get_module('Bookmarks').purge_pubsub_bookmarks() return - self._log.info('Discovered Pubsub publish options: %s', from_) + self._log.info('Discovered Pubsub publish options: %s', info.jid) self.publish_options = True def send_pb_subscription_query(self, jid, cb, **kwargs): ===================================== gajim/common/modules/security_labels.py ===================================== @@ -28,12 +28,12 @@ class SecLabels(BaseModule): self._catalogs = {} self.supported = False - def pass_disco(self, from_, _identities, features, _data, _node): - if nbxmpp.NS_SECLABEL not in features: + def pass_disco(self, info): + if nbxmpp.NS_SECLABEL not in info.features: return self.supported = True - self._log.info('Discovered security labels: %s', from_) + self._log.info('Discovered security labels: %s', info.jid) def request_catalog(self, jid): server = app.get_jid_from_account(self._account).split("@")[1] ===================================== gajim/common/modules/vcard_temp.py ===================================== @@ -36,12 +36,12 @@ class VCardTemp(BaseModule): self.room_jids = [] self.supported = False - def pass_disco(self, from_, _identities, features, _data, _node): - if nbxmpp.NS_VCARD not in features: + def pass_disco(self, info): + if nbxmpp.NS_VCARD not in info.features: return self.supported = True - self._log.info('Discovered vcard-temp: %s', from_) + self._log.info('Discovered vcard-temp: %s', info.jid) app.nec.push_incoming_event(NetworkEvent('feature-discovered', account=self._account, ===================================== gajim/gtk/discovery.py ===================================== @@ -46,6 +46,8 @@ import weakref import uuid import nbxmpp +from nbxmpp.util import is_error_result +from nbxmpp.structs import DiscoIdentity from gi.repository import GLib from gi.repository import Gtk @@ -290,7 +292,7 @@ class ServicesCache: # Grab the first identity with an icon for identity in identities: try: - cat, type_ = identity['category'], identity['type'] + cat, type_ = identity.category, identity.type info = _agent_type_info[(cat, type_)] except KeyError: continue @@ -318,7 +320,7 @@ class ServicesCache: # First pass, we try to find a ToplevelAgentBrowser for identity in identities: try: - cat, type_ = identity['category'], identity['type'] + cat, type_ = identity.category, identity.type info = _agent_type_info[(cat, type_)] except KeyError: continue @@ -329,7 +331,7 @@ class ServicesCache: # Second pass, we haven't found a ToplevelAgentBrowser for identity in identities: try: - cat, type_ = identity['category'], identity['type'] + cat, type_ = identity.category, identity.type info = _agent_type_info[(cat, type_)] except KeyError: continue @@ -369,7 +371,7 @@ class ServicesCache: self._cbs[cbkey] = [cb] con = app.connections[self.account] con.get_module('Discovery').disco_info( - jid, node, self._disco_info_received, self._disco_info_error) + jid, node, callback=self._disco_info_received) def get_items(self, jid, node, cb, force=False, nofetch=False, args=()): """ @@ -395,56 +397,73 @@ class ServicesCache: self._cbs[cbkey] = [cb] con = app.connections[self.account] con.get_module('Discovery').disco_items( - jid, node, self._disco_items_received, self._disco_items_error) + jid, node, callback=self._disco_items_received) - def _disco_info_received(self, from_, identities, features, data, node): + def _disco_info_received(self, result): """ Callback for when we receive an agent's info array is (agent, node, identities, features, data) """ + + if is_error_result(result): + self._disco_info_error(result) + return + + identities = result.identities if not identities: # Ejabberd doesn't send identities when using admin nodes - identities = [{'category': 'server', 'type': 'im', 'name': node}] + identities = [DiscoIdentity(category='server', + type='im', + name=result.node)] - self._on_agent_info(str(from_), node, identities, features, data) + self._on_agent_info(str(result.jid), result.node, result.identities, + result.features, result.dataforms) - def _disco_info_error(self, from_, error): + def _disco_info_error(self, result): """ Callback for when a query fails. Even after the browse and agents namespaces """ - addr = get_agent_address(from_) + addr = get_agent_address(result.jid) # Call callbacks cbkey = ('info', addr) if cbkey in self._cbs: for cb in self._cbs[cbkey]: - cb(str(from_), '', 0, 0, 0) + cb(str(result.jid), '', 0, 0, 0) # clean_closure may have beaten us to it if cbkey in self._cbs: del self._cbs[cbkey] - def _on_agent_info(self, fjid, node, identities, features, data): + def _on_agent_info(self, fjid, node, identities, features, dataforms): addr = get_agent_address(fjid, node) # Store in cache - self._info[addr] = (identities, features, data) + self._info[addr] = (identities, features, dataforms) # Call callbacks cbkey = ('info', addr) if cbkey in self._cbs: for cb in self._cbs[cbkey]: - cb(fjid, node, identities, features, data) + cb(fjid, node, identities, features, dataforms) # clean_closure may have beaten us to it if cbkey in self._cbs: del self._cbs[cbkey] - def _disco_items_received(self, from_, node, items): + def _disco_items_received(self, result): """ Callback for when we receive an agent's items array is (agent, node, items) """ - addr = get_agent_address(from_, node) + if is_error_result(result): + self._disco_items_error(result) + return + + addr = get_agent_address(result.jid, result.node) + + items = [] + for item in result.items: + items.append(item._asdict()) # Store in cache self._items[addr] = items @@ -453,23 +472,23 @@ class ServicesCache: cbkey = ('items', addr) if cbkey in self._cbs: for cb in self._cbs[cbkey]: - cb(str(from_), node, items) + cb(str(result.jid), result.node, items) # clean_closure may have beaten us to it if cbkey in self._cbs: del self._cbs[cbkey] - def _disco_items_error(self, from_, error): + def _disco_items_error(self, result): """ Callback for when a query fails. Even after the browse and agents namespaces """ - addr = get_agent_address(from_) + addr = get_agent_address(result.jid) # Call callbacks cbkey = ('items', addr) if cbkey in self._cbs: for cb in self._cbs[cbkey]: - cb(str(from_), '', 0) + cb(str(result.jid), '', 0) # clean_closure may have beaten us to it if cbkey in self._cbs: del self._cbs[cbkey] @@ -479,13 +498,13 @@ class ServiceDiscoveryWindow: """ Class that represents the Services Discovery window """ - def __init__(self, account, jid='', node='', address_entry=False, + def __init__(self, account, jid='', node=None, address_entry=False, parent=None, initial_identities=None): self._account = account self.parent = parent if not jid: jid = app.config.get_per('accounts', account, 'hostname') - node = '' + node = None self.jid = None self.browser = None @@ -718,7 +737,7 @@ class ServiceDiscoveryWindow: except helpers.InvalidFormat as s: ErrorDialog(_('Invalid Server Name'), str(s)) return - self.travel(jid, '') + self.travel(jid, None) def _on_go_button_clicked(self, widget): jid = self._ui.address_comboboxtext_entry.get_text() @@ -741,7 +760,7 @@ class ServiceDiscoveryWindow: self.address_comboboxtext.append_text(j) app.config.set('latest_disco_addresses', ' '.join(self.latest_addresses)) - self.travel(jid, '') + self.travel(jid, None) def _on_services_treeview_row_activated(self, widget, path, col=0): if self.browser: @@ -849,11 +868,11 @@ class AgentBrowser: if len(identities) > 1: # Check if an identity with server category is present for _index, identity in enumerate(identities): - if identity['category'] == 'server' and 'name' in identity: - name = identity['name'] + if identity.category == 'server' and identity.name is not None: + name = identity.name break - elif 'name' in identities[0]: - name = identities[0]['name'] + elif identities[0].name is not None: + name = identities[0].name if name: self.window._set_window_banner_text(self._get_agent_address(), name) @@ -1016,7 +1035,7 @@ class AgentBrowser: GLib.source_remove(self._pulse_timeout) self.window.progressbar.hide() # The server returned an error - if items == 0: + if not items: if not self.window.address_comboboxtext: # We can't travel anywhere else. self.window.destroy() @@ -1088,7 +1107,7 @@ class AgentBrowser: Called when an item should be updated in the model with further info. The result of a disco#info query """ - name = identities[0].get('name', '') + name = identities[0].name or '' if name: self.model[iter_][2] = name @@ -1123,7 +1142,9 @@ class ToplevelAgentBrowser(AgentBrowser): type_ = app.get_transport_name_from_jid(self.jid, use_config_setting=False) if type_: - identity = {'category': '_jid', 'type': type_} + identity = DiscoIdentity(category='_jid', + type=type_, + name=None) identities.append(identity) # Set the pixmap for the row icon_name = self.cache.get_icon(identities, addr=addr) @@ -1321,7 +1342,6 @@ class ToplevelAgentBrowser(AgentBrowser): jid = model[iter_][0] if jid: ServiceRegistration(self.account, jid) - self.window.destroy(chain=True) def _on_join_button_clicked(self, widget): """ @@ -1366,7 +1386,7 @@ class ToplevelAgentBrowser(AgentBrowser): type_ = app.get_transport_name_from_jid( jid, use_config_setting=False) if type_: - identity = {'category': '_jid', 'type': type_} + identity = DiscoIdentity(category='_jid', type=type_) klass = self.cache.get_browser([identity]) if klass: self.browse_button.set_sensitive(True) @@ -1530,7 +1550,7 @@ class ToplevelAgentBrowser(AgentBrowser): type_ = app.get_transport_name_from_jid( jid, use_config_setting=False) if type_: - identity = {'category': '_jid', 'type': type_} + identity = DiscoIdentity(category='_jid', type=type_) identities.append(identity) cat_args = ('_jid', type_) else: @@ -1561,7 +1581,7 @@ class ToplevelAgentBrowser(AgentBrowser): if not identities: descr = "<b>%s</b>" % addr else: - name = identities[0].get('name', '') + name = identities[0].name or '' if name: descr = "<b>%s</b>\n%s" % (name, addr) else: @@ -1576,7 +1596,7 @@ class ToplevelAgentBrowser(AgentBrowser): cat, type_ = None, None for identity in identities: try: - cat, type_ = identity['category'], identity['type'] + cat, type_ = identity.category, identity.type except KeyError: continue break @@ -1839,19 +1859,19 @@ class MucBrowser(AgentBrowser): self._fetch_source = GLib.idle_add(self._start_info_query) def _update_info(self, iter_, jid, node, identities, features, data): - name = identities[0].get('name', '') + name = identities[0].name or '' for form in data: - typefield = form.getField('FORM_TYPE') - if typefield and typefield.getValue() == \ + typefield = form.vars.get('FORM_TYPE') + if typefield and typefield.value == \ 'http://jabber.org/protocol/muc#roominfo': # Fill model row from the form's fields - users = form.getField('muc#roominfo_occupants') - descr = form.getField('muc#roominfo_description') + users = form.vars.get('muc#roominfo_occupants') + descr = form.vars.get('muc#roominfo_description') if users: - self.model[iter_][3] = int(users.getValue()) - self.model[iter_][4] = users.getValue() - if descr and descr.getValue(): - self.model[iter_][5] = descr.getValue() + self.model[iter_][3] = int(users.value) + self.model[iter_][4] = users.value + if descr and descr.value: + self.model[iter_][5] = descr.value # Only set these when we find a form with additional info # Some servers don't support forms and put extra info in # the name attribute, so we preserve it in that case. @@ -1963,7 +1983,8 @@ class DiscussionGroupsBrowser(AgentBrowser): Called when we got basic information about new node from query. Show the item """ - name = item.get('name', '') + + name = item['name'] or '' if self.subscriptions is not None: dunno = False ===================================== gajim/gtk/join_groupchat.py ===================================== @@ -12,10 +12,14 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -import nbxmpp + from gi.repository import Gtk from gi.repository import Gdk +import nbxmpp +from nbxmpp.util import is_error_result +from nbxmpp.structs import DiscoIdentity + from gajim.common import app from gajim.common import helpers from gajim.common.i18n import _ @@ -272,23 +276,26 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): server = self.server_combo.get_active_text().strip() con = app.connections[self.account] con.get_module('Discovery').disco_info( - server, - success_cb=self._disco_info_received, - error_cb=self._disco_info_error) + server, callback=self._disco_info_received) def _disco_info_error(self, from_, error): ErrorDialog(_('Wrong server'), _('%s is not a groupchat server') % from_, transient_for=self) - def _disco_info_received(self, from_, identities, features, data, node): - if nbxmpp.NS_MUC not in features: + def _disco_info_received(self, result): + if is_error_result(result): + ErrorDialog(_('Wrong server'), + _('%s is not a groupchat server') % result.jid, + transient_for=self) + return + if nbxmpp.NS_MUC not in result.features: ErrorDialog(_('Wrong server'), - _('%s is not a groupchat server') % from_, + _('%s is not a groupchat server') % result.jid, transient_for=self) return - jid = str(from_) + jid = str(result.jid) if jid in app.interface.instances[self.account]['disco']: app.interface.instances[self.account]['disco'][jid].window.\ present() @@ -297,7 +304,8 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): # Object will add itself to the window dict ServiceDiscoveryWindow( self.account, jid, - initial_identities=[{'category': 'conference', - 'type': 'text'}]) + initial_identities=[DiscoIdentity(category='conference', + type='text', + name=None)]) except GajimGeneralException: pass ===================================== gajim/gtk/pep_config.py ===================================== @@ -14,6 +14,7 @@ from gi.repository import Gdk from gi.repository import Gtk +from nbxmpp.util import is_error_result from gajim.common import app from gajim.common import ged @@ -83,18 +84,17 @@ class ManagePEPServicesWindow(Gtk.ApplicationWindow): jid = self._con.get_own_jid().getStripped() self._con.get_module('Discovery').disco_items( - jid, - success_cb=self._items_received, - error_cb=self._items_error) + jid, callback=self._items_received) - def _items_received(self, from_, node, items): - jid = self._con.get_own_jid().getStripped() - for item in items: - if item['jid'] == jid and 'node' in item: - self.treestore.append([item['node']]) + def _items_received(self, result): + if is_error_result(result): + ErrorDialog('Error', str(result)) + return - def _items_error(self, from_, error): - ErrorDialog('Error', error) + jid = result.jid.getBare() + for item in result.items: + if item.jid == jid and item.node is not None: + self.treestore.append([item.node]) def _node_removed(self, jid, node): if jid != app.get_jid_from_account(self.account): ===================================== test/no_gui/unit/test_caps_cache.py ===================================== @@ -2,14 +2,16 @@ Tests for capabilities and the capabilities cache ''' import unittest +import weakref from unittest.mock import MagicMock, Mock from nbxmpp import NS_MUC, NS_PING, NS_XHTML_IM, Iq +from nbxmpp.structs import DiscoIdentity +from nbxmpp.modules.discovery import Discovery from gajim.common import caps_cache as caps -from gajim.common.modules.discovery import Discovery EXAMPLES = [ -'''<iq> +'''<iq type='result'> <query xmlns='http://jabber.org/protocol/disco#info' node='http://psi-im.org#q07IKJEyjvHSyhy//CH0CxmKi8w='> <identity xml:lang='en' category='client' name='Psi 0.11' type='pc'/> <identity xml:lang='el' category='client' name='Ψ 0.11' type='pc'/> @@ -42,7 +44,7 @@ EXAMPLES = [ </iq> ''', -'''<iq> +'''<iq type='result'> <query node="http://bombusmod.net.ru/caps#tbBQGBMv8g8U7kW55TEZZRnMCJ4=" xmlns="http://jabber.org/protocol/disco#info"> <identity category="client" name="BombusMod" type="mobile"/> <feature var="http://jabber.org/protocol/chatstates"/> @@ -62,7 +64,7 @@ EXAMPLES = [ </iq> ''', -'''<iq> +'''<iq type='result'> <query node="http://jappix.org/#qRsaGbKTz8EwAOakYO00InkZUxM=" xmlns="http://jabber.org/protocol/disco#info"> <identity category="client" name="Jappix" type="web"/> <feature var="http://jabber.org/protocol/activity"/> @@ -137,10 +139,12 @@ class CommonCapsTest(unittest.TestCase): self.client_caps = (self.caps_method, self.caps_hash) self.node = "http://gajim.org" - self.identity = {'category': 'client', 'type': 'pc', 'name':'Gajim'} + self.identity = DiscoIdentity(category='client', + type='pc', + name='Gajim') self.identities = [self.identity] - self.features = [NS_MUC, NS_XHTML_IM] # NS_MUC not supported! + self.features = [NS_MUC, NS_XHTML_IM] # Simulate a filled db db_caps_cache = [ @@ -169,8 +173,8 @@ class TestCapsCache(CommonCapsTest): self.assertEqual(1, len(identities)) identity = identities[0] - self.assertEqual('client', identity['category']) - self.assertEqual('pc', identity['type']) + self.assertEqual('client', identity.category) + self.assertEqual('pc', identity.type) def test_set_and_store(self): ''' Test client_caps update gets logged into db ''' @@ -214,10 +218,14 @@ class TestCapsCache(CommonCapsTest): '''tests the hash computation''' for example in EXAMPLES: stanza = Iq(node=example) - identities, features, data, node = Discovery.parse_info_response(stanza) - computed_hash = caps.compute_caps_hash(identities, features, data) - hash_ = node.split('#')[1] - self.assertEqual(hash_, computed_hash) + disco_module = Discovery(None) + weak_callback = weakref.WeakMethod(self.disco_info_received) + disco_module._disco_info_received(None, stanza, callback=weak_callback) + + def disco_info_received(self, info): + computed_hash = caps.compute_caps_hash(info.identities, info.features, info.dataforms) + hash_ = info.node.split('#')[1] + self.assertEqual(hash_, computed_hash) class TestClientCaps(CommonCapsTest): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9c53fcbd898bd0d61e5d16f8eac586fda8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9c53fcbd898bd0d61e5d16f8eac586fda8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Improve str() output of CommonError
by Philipp Hörist 28 Jun '19

28 Jun '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 372fc63c by Philipp Hörist at 2019-06-28T21:18:47Z Improve str() output of CommonError - - - - - ff2e13a9 by Philipp Hörist at 2019-06-28T21:19:37Z Extend Discovery module (XEP-0030) Add disco_info and disco_items methods - - - - - 3 changed files: - nbxmpp/dispatcher.py - nbxmpp/modules/discovery.py - nbxmpp/structs.py Changes: ===================================== nbxmpp/dispatcher.py ===================================== @@ -69,6 +69,7 @@ from nbxmpp.modules.muclumbus import Muclumbus from nbxmpp.modules.software_version import SoftwareVersion from nbxmpp.modules.adhoc import AdHoc from nbxmpp.modules.ibb import IBB +from nbxmpp.modules.discovery import Discovery from nbxmpp.modules.misc import unwrap_carbon from nbxmpp.modules.misc import unwrap_mam from nbxmpp.util import get_properties_struct @@ -206,6 +207,7 @@ class XMPPDispatcher(PlugIn): self._modules['SoftwareVersion'] = SoftwareVersion(self._owner) self._modules['AdHoc'] = AdHoc(self._owner) self._modules['IBB'] = IBB(self._owner) + self._modules['Discovery'] = Discovery(self._owner) for instance in self._modules.values(): for handler in instance.handlers: ===================================== nbxmpp/modules/discovery.py ===================================== @@ -18,13 +18,100 @@ import logging from nbxmpp.protocol import Iq +from nbxmpp.protocol import NS_DISCO_INFO +from nbxmpp.protocol import NS_DISCO_ITEMS +from nbxmpp.protocol import NS_DATA +from nbxmpp.protocol import isResultNode +from nbxmpp.modules.dataforms import extend_form +from nbxmpp.structs import DiscoIdentity +from nbxmpp.structs import DiscoInfo +from nbxmpp.structs import DiscoItems +from nbxmpp.structs import DiscoItem +from nbxmpp.util import call_on_response +from nbxmpp.util import callback +from nbxmpp.util import raise_error log = logging.getLogger('nbxmpp.m.discovery') +class Discovery: + def __init__(self, client): + self._client = client + self.handlers = [] + + @call_on_response('_disco_info_received') + def disco_info(self, jid, node=None): + log.info('Disco info: %s, node: %s', jid, node) + return get_disco_request(NS_DISCO_INFO, jid, node) + + @callback + def _disco_info_received(self, stanza): + if not isResultNode(stanza): + return raise_error(log.info, stanza) + + idenities = [] + features = [] + dataforms = [] + + query = stanza.getQuery() + for node in query.getTags('identity'): + attrs = node.getAttrs() + try: + idenities.append( + DiscoIdentity(category=attrs['category'], + type=attrs['type'], + name=attrs.get('name'), + lang=attrs.get('xml:lang'))) + except Exception: + return raise_error(log.warning, stanza, 'stanza-malformed') + + for node in query.getTags('feature'): + try: + features.append(node.getAttr('var')) + except Exception: + return raise_error(log.warning, stanza, 'stanza-malformed') + + for node in query.getTags('x', namespace=NS_DATA): + dataforms.append(extend_form(node)) + + return DiscoInfo(jid=stanza.getFrom(), + node=query.getAttr('node'), + identities=idenities, + features=features, + dataforms=dataforms) + + @call_on_response('_disco_items_received') + def disco_items(self, jid, node=None): + log.info('Disco items: %s, node: %s', jid, node) + return get_disco_request(NS_DISCO_ITEMS, jid, node) + + @callback + def _disco_items_received(self, stanza): + if not isResultNode(stanza): + return raise_error(log.info, stanza) + + items = [] + + query = stanza.getQuery() + for node in query.getTags('item'): + attrs = node.getAttrs() + try: + items.append( + DiscoItem(jid=attrs['jid'], + name=attrs.get('name'), + node=attrs.get('node'))) + except Exception: + return raise_error(log.warning, stanza, 'stanza-malformed') + + return DiscoItems(jid=stanza.getFrom(), + node=query.getAttr('node'), + items=items) + + + def get_disco_request(namespace, jid, node=None): iq = Iq('get', to=jid, queryNS=namespace) - if node is not None: + if node: iq.getQuery().setAttr('node', node) return iq ===================================== nbxmpp/structs.py ===================================== @@ -112,6 +112,15 @@ AdHocCommandNote = namedtuple('AdHocCommandNote', 'text type') IBBData = namedtuple('IBBData', 'block_size sid seq type data') IBBData.__new__.__defaults__ = (None, None, None, None, None) +DiscoInfo = namedtuple('DiscoInfo', 'jid node identities features dataforms') +DiscoIdentity = namedtuple('DiscoIdentity', 'category type name lang') +DiscoIdentity.__new__.__defaults__ = (None, None) + +DiscoItems = namedtuple('DiscoItems', 'jid node items') +DiscoItem = namedtuple('DiscoItem', 'jid name node') +DiscoItem.__new__.__defaults__ = (None, None) + + class AdHocCommand(namedtuple('AdHocCommand', 'jid node name sessionid status data actions notes')): __slots__ = [] @@ -138,8 +147,8 @@ class OMEMOBundle(namedtuple('OMEMOBundle', 'spk spk_signature ik otpks')): class CommonError(namedtuple('CommonError', 'type message jid')): def __str__(self): if self.message is not None: - return '%s: %s' % (self.type, self.message) - return self.type + return 'Error from %s %s: %s' % (self.jid, self.type, self.message) + return 'Error from %s: %s' % (self.jid, self.type) class TuneData(namedtuple('TuneData', 'artist length rating source title track uri')): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/3d57126268db971d05629ae1b… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/3d57126268db971d05629ae1b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 6 commits: Fix iPython View
by Philipp Hörist 25 Jun '19

25 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: c5a8cbc3 by Daniel Brötzmann at 2019-06-25T22:13:26Z Fix iPython View - - - - - d5276eae by Daniel Brötzmann at 2019-06-25T22:13:26Z IPython: Abort if not installed - - - - - d0a7bc3d by Daniel Brötzmann at 2019-06-25T22:13:26Z IPython: Fix some linting errors - - - - - 5d812cbe by Daniel Brötzmann at 2019-06-25T22:13:26Z IPython: Add window title - - - - - 181027dd by Philipp Hörist at 2019-06-25T22:13:26Z IPython: Simplify stream code - - - - - 4757fd95 by Philipp Hörist at 2019-06-25T22:13:26Z IPython: Support only IPython 5.0.0+ - - - - - 2 changed files: - gajim/dev/ipython_view.py - gajim/gui_interface.py Changes: ===================================== gajim/dev/ipython_view.py ===================================== @@ -19,13 +19,29 @@ # Copyright (c) 2007, IBM Corporation # All rights reserved. -## Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - -## * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -## * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -## * Neither the name of the IBM Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - -## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: + +# * Redistributions of source code must retain the above copyright notice, +# this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the following disclaimer in the documentation +# and/or other materials provided with the distribution. +# * Neither the name of the IBM Corporation nor the names of its contributors +# may be used to endorse or promote products derived from this software +# without specific prior written permission. + +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. """ Provides IPython console widget @@ -45,6 +61,7 @@ import sys import os from io import StringIO from functools import reduce +from pkg_resources import parse_version from gi.repository import Gtk from gi.repository import Gdk @@ -52,30 +69,25 @@ from gi.repository import GObject from gi.repository import GLib from gi.repository import Pango -try: - import IPython -except ImportError: - IPython = None - -HAS_IPYTHON5 = True -try: - from pygments.token import Token - # pylint: disable=ungrouped-imports - from IPython.core.displayhook import DisplayHook - from IPython.core.display_trap import DisplayTrap - # pylint: enable=ungrouped-imports - - class MyPromptDisplayHook(DisplayHook): - def __init__(self, shell, view): - DisplayHook.__init__(self, shell=shell) - self.view = view - - def write_output_prompt(self): - tokens = self.shell.prompts.out_prompt_tokens() - self.view.write('\n') - self.view.write(tokens) -except Exception: - HAS_IPYTHON5 = False +import IPython + +from pygments.token import Token +# pylint: disable=ungrouped-imports +from IPython.core.displayhook import DisplayHook +from IPython.core.display_trap import DisplayTrap +# pylint: enable=ungrouped-imports + + +class MyPromptDisplayHook(DisplayHook): + def __init__(self, shell, view): + DisplayHook.__init__(self, shell=shell) + self.view = view + + def write_output_prompt(self): + tokens = self.shell.prompts.out_prompt_tokens() + self.view.write('\n') + self.view.write(tokens) + class IterableIPShell: """ @@ -117,16 +129,8 @@ class IterableIPShell: io = IPython.utils.io if input_func: - if IPython.version_info[0] >= 1: - IPython.terminal.interactiveshell.raw_input_original = input_func - else: - IPython.frontend.terminal.interactiveshell.raw_input_original = input_func - if cin: - io.stdin = io.IOStream(cin) - if cout: - io.stdout = io.IOStream(cout) - if cerr: - io.stderr = io.IOStream(cerr) + IPython.terminal.interactiveshell.raw_input_original = input_func + # This is to get rid of the blockage that accurs during # IPython.Shell.InteractiveShell.user_setup() @@ -135,52 +139,53 @@ class IterableIPShell: os.environ['TERM'] = 'dumb' excepthook = sys.excepthook - if IPython.version_info[0] >= 5: - from traitlets.config.loader import Config - else: - from IPython.config.loader import Config + from traitlets.config.loader import Config cfg = Config() cfg.InteractiveShell.colors = "Linux" - # InteractiveShell's __init__ overwrites io.stdout,io.stderr with - # sys.stdout, sys.stderr, this makes sure they are right + # InteractiveShell's __init__ gets a reference of stdout and stderr + # so we save the standard here to revert it after init old_stdout, old_stderr = sys.stdout, sys.stderr - sys.stdout, sys.stderr = io.stdout.stream, io.stderr.stream + sys.stdout, sys.stderr = cout, cerr # InteractiveShell inherits from SingletonConfigurable so use instance() - if IPython.version_info[0] >= 1: - self.IP = IPython.terminal.embed.InteractiveShellEmbed.instance(config=cfg, user_ns=user_ns, user_module=user_global_ns) - else: - self.IP = IPython.frontend.terminal.embed.InteractiveShellEmbed.instance(config=cfg, user_ns=user_ns) + self.IP = IPython.terminal.embed.InteractiveShellEmbed.instance( + config=cfg, user_ns=user_ns, user_module=user_global_ns) + # Set back stdout and stderr to what it was before sys.stdout, sys.stderr = old_stdout, old_stderr self.IP.system = lambda cmd: self.shell(self.IP.var_expand(cmd), header='IPython system call: ', local_ns=user_ns) - #global_ns=user_global_ns) - #verbose=self.IP.rc.system_verbose) self.IP.raw_input = input_func sys.excepthook = excepthook self.iter_more = 0 self.history_level = 0 self.complete_sep = re.compile(r'[\s\{\}\[\]\(\)]') - self.updateNamespace({'exit':lambda: None}) - self.updateNamespace({'quit':lambda: None}) - #self.IP.readline_startup_hook(self.IP.pre_readline) + self.updateNamespace({'exit': lambda: None}) + self.updateNamespace({'quit': lambda: None}) + # Workaround for updating namespace with sys.modules # self.__update_namespace() + # Avoid using input splitter when not really needed. + # Perhaps it could work even before 5.8.0 + # But it definitely does not work any more with >= 7.0.0 + self.no_input_splitter = parse_version(IPython.release.version) >= \ + parse_version('5.8.0') + self.lines = [] + def __update_namespace(self): ''' Update self.IP namespace for autocompletion with sys.modules ''' for k, v in sys.modules.items(): - if not '.' in k: - self.IP.user_ns.update({k:v}) + if '.' not in k: + self.IP.user_ns.update({k: v}) def execute(self): """ @@ -211,14 +216,22 @@ class IterableIPShell: except Exception: self.IP.showtraceback() else: - self.IP.input_splitter.push(line) - self.iter_more = self.IP.input_splitter.push_accepts_more() + if self.no_input_splitter: + self.lines.append(self.IP.raw_input(self.prompt)) + self.iter_more = self.IP.check_complete( + '\n'.join(self.lines))[0] == 'incomplete' + else: + self.IP.input_splitter.push(line) + self.iter_more = self.IP.input_splitter.push_accepts_more() + self.prompt = self.generatePrompt(self.iter_more) if not self.iter_more: - if IPython.version_info[0] >= 2: - source_raw = self.IP.input_splitter.raw_reset() + if self.no_input_splitter: + source_raw = '\n'.join(self.lines) + self.lines = [] else: - source_raw = self.IP.input_splitter.source_raw_reset()[1] + source_raw = self.IP.input_splitter.raw_reset() + self.IP.run_cell(source_raw, store_history=True) self.IP.rl_do_indent = False else: @@ -240,24 +253,8 @@ class IterableIPShell: @rtype: string ''' - # Backwards compatibility with ipyton-0.11 - # - ver = IPython.__version__ - if '0.11' in ver: - prompt = self.IP.hooks.generate_prompt(is_continuation) - else: - # Prompt for IPython >=5.0: - if hasattr(self.IP, 'prompts'): - if is_continuation: - prompt = self.IP.prompts.continuation_prompt_tokens(self.IP.prompts) - else: - prompt = self.IP.prompts.in_prompt_tokens(self.IP.prompts) - # Prompt for IPython < 5.0 - elif hasattr(self.IP, 'prompt_manager'): - if is_continuation: - prompt = self.IP.prompt_manager.render('in2') - else: - prompt = self.IP.prompt_manager.render('in') + # TODO: Update to IPython 5.x and later + prompt = "In [%d]: " % self.IP.execution_count return prompt @@ -335,13 +332,14 @@ class IterableIPShell: @rtype: string ''' for i in range(len(str1)): - if not str2.startswith(str1[:i+1]): + if not str2.startswith(str1[:i + 1]): return str1[:i] return str1 if possibilities[1]: - common_prefix = reduce(_commonPrefix, possibilities[1]) or line[-1] - completed = line[:-len(split_line[-1])]+common_prefix + common_prefix = \ + reduce(_commonPrefix, possibilities[1]) or line[-1] + completed = line[:-len(split_line[-1])] + common_prefix else: completed = line else: @@ -383,9 +381,10 @@ class ConsoleView(Gtk.TextView): self.override_font(Pango.FontDescription('Mono')) self.set_cursor_visible(True) self.text_buffer = self.get_buffer() - self.mark = self.text_buffer.create_mark('scroll_mark', - self.text_buffer.get_end_iter(), - False) + self.mark = self.text_buffer.create_mark( + 'scroll_mark', + self.text_buffer.get_end_iter(), + False) for code in self.ANSI_COLORS: self.text_buffer.create_tag(code, foreground=self.ANSI_COLORS[code], @@ -393,22 +392,24 @@ class ConsoleView(Gtk.TextView): self.text_buffer.create_tag('0') self.text_buffer.create_tag('notouch', editable=False) self.color_pat = re.compile(r'\x01?\x1b\[(.*?)m\x02?') - if HAS_IPYTHON5: - self.style_dict = { - Token.Prompt: '0;32', - Token.PromptNum: '1;32', - Token.OutPrompt: '0;31', - Token.OutPromptNum: '1;31', - } + + self.style_dict = { + Token.Prompt: '0;32', + Token.PromptNum: '1;32', + Token.OutPrompt: '0;31', + Token.OutPromptNum: '1;31', + } + self.line_start = \ self.text_buffer.create_mark('line_start', - self.text_buffer.get_end_iter(), True) + self.text_buffer.get_end_iter(), + True) self.connect('key-press-event', self.onKeyPress) def write(self, text, editable=False): if isinstance(text, str): GLib.idle_add(self._write, text, editable) - elif IPython.version_info[0] >= 5: + else: GLib.idle_add(self._write5, text, editable) def _write5(self, text, editable=False): @@ -420,18 +421,18 @@ class ConsoleView(Gtk.TextView): @param editable: If true, added text is editable. @type editable: boolean """ - start_mark = self.text_buffer.create_mark(None, - self.text_buffer.get_end_iter(), - True) + start_mark = self.text_buffer.create_mark( + None, self.text_buffer.get_end_iter(), True) for token, segment in text: tag = self.style_dict[token] - self.text_buffer.insert_with_tags_by_name(self.text_buffer.get_end_iter(), - segment, tag) + self.text_buffer.insert_with_tags_by_name( + self.text_buffer.get_end_iter(), segment, tag) if not editable: - self.text_buffer.apply_tag_by_name('notouch', - self.text_buffer.get_iter_at_mark(start_mark), - self.text_buffer.get_end_iter()) + self.text_buffer.apply_tag_by_name( + 'notouch', + self.text_buffer.get_iter_at_mark(start_mark), + self.text_buffer.get_end_iter()) self.text_buffer.delete_mark(start_mark) self.scroll_mark_onscreen(self.mark) @@ -444,31 +445,31 @@ class ConsoleView(Gtk.TextView): @param editable: If true, added text is editable. @type editable: boolean """ - if isinstance(text, list) and IPython.version_info[0] >= 5: + if isinstance(text, list): self._write5(text, editable) return segments = self.color_pat.split(text) segment = segments.pop(0) - start_mark = self.text_buffer.create_mark(None, - self.text_buffer.get_end_iter(), - True) + start_mark = self.text_buffer.create_mark( + None, self.text_buffer.get_end_iter(), True) self.text_buffer.insert(self.text_buffer.get_end_iter(), segment) if segments: ansi_tags = self.color_pat.findall(text) for tag in ansi_tags: i = segments.index(tag) - self.text_buffer.insert_with_tags_by_name(self.text_buffer.get_end_iter(), - segments[i+1], str(tag)) + self.text_buffer.insert_with_tags_by_name( + self.text_buffer.get_end_iter(), segments[i + 1], str(tag)) segments.pop(i) if not editable: - self.text_buffer.apply_tag_by_name('notouch', - self.text_buffer.get_iter_at_mark(start_mark), - self.text_buffer.get_end_iter()) + self.text_buffer.apply_tag_by_name( + 'notouch', + self.text_buffer.get_iter_at_mark(start_mark), + self.text_buffer.get_end_iter()) + self.text_buffer.delete_mark(start_mark) self.scroll_mark_onscreen(self.mark) - def showPrompt(self, prompt): GLib.idle_add(self._showPrompt, prompt) @@ -495,7 +496,8 @@ class ConsoleView(Gtk.TextView): """ iter_ = self.text_buffer.get_iter_at_mark(self.line_start) iter_.forward_to_line_end() - self.text_buffer.delete(self.text_buffer.get_iter_at_mark(self.line_start), iter_) + self.text_buffer.delete( + self.text_buffer.get_iter_at_mark(self.line_start), iter_) self._write(text, True) def getCurrentLine(self): @@ -526,11 +528,12 @@ class ConsoleView(Gtk.TextView): 'notouch', self.text_buffer.get_iter_at_mark(self.line_start), iter_) - self._write('\n'+text) + self._write('\n' + text) if text: self._write('\n') self._showPrompt(self.prompt) - self.text_buffer.move_mark(self.line_start, self.text_buffer.get_end_iter()) + self.text_buffer.move_mark( + self.line_start, self.text_buffer.get_end_iter()) self.text_buffer.place_cursor(self.text_buffer.get_end_iter()) if self.IP.rl_do_indent: @@ -570,11 +573,11 @@ class ConsoleView(Gtk.TextView): return True elif not event.string: pass - elif start_iter.compare(insert_iter) <= 0 and \ - start_iter.compare(selection_iter) <= 0: + elif (start_iter.compare(insert_iter) <= 0 and + start_iter.compare(selection_iter) <= 0): pass - elif start_iter.compare(insert_iter) > 0 and \ - start_iter.compare(selection_iter) > 0: + elif (start_iter.compare(insert_iter) > 0 and + start_iter.compare(selection_iter) > 0): self.text_buffer.place_cursor(start_iter) elif insert_iter.compare(selection_iter) < 0: self.text_buffer.move_mark(insert_mark, start_iter) @@ -588,6 +591,7 @@ class ConsoleView(Gtk.TextView): For some reason we can't extend onKeyPress directly (bug #500900) """ + class IPythonView(ConsoleView, IterableIPShell): ''' Sub-class of both modified IPython shell and L{ConsoleView} this makes @@ -601,11 +605,11 @@ class IPythonView(ConsoleView, IterableIPShell): self.cout = StringIO() IterableIPShell.__init__(self, cout=self.cout, cerr=self.cout, input_func=self.raw_input) - if HAS_IPYTHON5: - displayhook = MyPromptDisplayHook(shell=self.IP, view=self) - self.IP.displayhook = displayhook - self.IP.display_trap = DisplayTrap(hook=displayhook) -# self.connect('key_press_event', self.keyPress) + + displayhook = MyPromptDisplayHook(shell=self.IP, view=self) + self.IP.displayhook = displayhook + self.IP.display_trap = DisplayTrap(hook=displayhook) + self.interrupt = False self.execute() self.prompt = self.generatePrompt(False) @@ -644,7 +648,8 @@ class IPythonView(ConsoleView, IterableIPShell): @return: True if event should not trickle. @rtype: boolean """ - if event.get_state() & Gdk.ModifierType.CONTROL_MASK and event.keyval == 99: + if (event.get_state() & Gdk.ModifierType.CONTROL_MASK and + event.keyval == 99): self.interrupt = True self._processLine() return True @@ -665,7 +670,7 @@ class IPythonView(ConsoleView, IterableIPShell): slice_ = self.getCurrentLine() self.write('\n') for symbol in possibilities: - self.write(symbol+'\n') + self.write(symbol + '\n') self.showPrompt(self.prompt) self.changeLine(completed or slice_) return True ===================================== gajim/gui_interface.py ===================================== @@ -38,6 +38,7 @@ import time import logging from functools import partial from threading import Thread +from importlib.util import find_spec from gi.repository import Gtk from gi.repository import GLib @@ -2074,6 +2075,13 @@ class Interface: @staticmethod def create_ipython_window(): + # Check if IPython is installed + ipython = find_spec('IPython') + is_installed = ipython is not None + if not is_installed: + # Abort early to avoid tracebacks + print('IPython is not installed') + return try: from gajim.dev.ipython_view import IPythonView except ImportError: @@ -2087,6 +2095,7 @@ class Interface: font = 'Luxi Mono 10' window = Gtk.Window() + window.set_title(_('Gajim: IPython Console')) window.set_size_request(750, 550) window.set_resizable(True) sw = Gtk.ScrolledWindow() View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/3ded70a5fdf6a816df47e087fccf49ce5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/3ded70a5fdf6a816df47e087fccf49ce5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: XML Console: Add keyboard shortcuts
by Philipp Hörist 25 Jun '19

25 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 800c5919 by Daniel Brötzmann at 2019-06-25T20:43:38Z XML Console: Add keyboard shortcuts Adds Ctrl+Enter to send and Ctrl+Up to paste the last message - - - - - 3ded70a5 by Daniel Brötzmann at 2019-06-25T20:43:38Z XML Console: Inherit from Gtk.ApplicationWindow and code formatting - - - - - 3 changed files: - gajim/app_actions.py - gajim/data/gui/xml_console_window.ui - gajim/gtk/xml_console.py Changes: ===================================== gajim/app_actions.py ===================================== @@ -34,7 +34,6 @@ from gajim.gtk.join_groupchat import JoinGroupchatWindow from gajim.gtk.start_chat import StartChatDialog from gajim.gtk.add_contact import AddNewContactWindow from gajim.gtk.single_message import SingleMessageWindow -from gajim.gtk.xml_console import XMLConsoleWindow from gajim.gtk.about import AboutDialog from gajim.gtk.privacy_list import PrivacyListsWindow from gajim.gtk.bookmarks import ManageBookmarksWindow @@ -45,7 +44,7 @@ from gajim.gtk.accounts import AccountsWindow from gajim.gtk.proxies import ManageProxies from gajim.gtk.discovery import ServiceDiscoveryWindow from gajim.gtk.blocking import BlockingList - +from gajim.gtk.xml_console import XMLConsoleWindow # General Actions @@ -245,11 +244,11 @@ def on_server_info(action, param): def on_xml_console(action, param): account = param.get_string() - if 'xml_console' in interface.instances[account]: - interface.instances[account]['xml_console'].present() + window = app.get_app_window(XMLConsoleWindow, account) + if window is None: + XMLConsoleWindow(account) else: - interface.instances[account]['xml_console'] = \ - XMLConsoleWindow(account) + window.present() def on_manage_proxies(action, param): ===================================== gajim/data/gui/xml_console_window.ui ===================================== @@ -84,7 +84,7 @@ <property name="halign">start</property> <property name="valign">center</property> <property name="active">True</property> - <signal name="notify::active" handler="on_enable" swapped="no"/> + <signal name="notify::active" handler="_on_enable" swapped="no"/> </object> </child> </object> @@ -96,7 +96,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="selection_mode">none</property> - <signal name="row-activated" handler="on_row_activated" swapped="no"/> + <signal name="row-activated" handler="_on_row_activated" swapped="no"/> <child> <object class="GtkListBoxRow"> <property name="visible">True</property> ===================================== gajim/gtk/xml_console.py ===================================== @@ -37,9 +37,16 @@ from gajim.gtk.const import SettingType UNDECLARED = 'http://www.gajim.org/xmlns/undeclared' -class XMLConsoleWindow(Gtk.Window): +class XMLConsoleWindow(Gtk.ApplicationWindow): def __init__(self, account): - Gtk.Window.__init__(self) + Gtk.ApplicationWindow.__init__(self) + self.set_application(app.app) + self.set_position(Gtk.WindowPosition.CENTER) + self.set_default_size(600, 600) + self.set_resizable(True) + self.set_show_menubar(False) + self.set_name('XMLConsoleWindow') + self.account = account self.enabled = True self.presence = True @@ -52,47 +59,48 @@ class XMLConsoleWindow(Gtk.Window): self.last_stanza = None self._ui = get_builder('xml_console_window.ui') - self.set_titlebar(self._ui.headerbar) + jid = app.get_jid_from_account(account) + self.set_titlebar(self._ui.headerbar) self._ui.headerbar.set_subtitle(jid) - self.set_default_size(600, 600) + self.add(self._ui.box) self._ui.paned.set_position(self._ui.paned.get_property('max-position')) button = get_image_button( 'edit-clear-all-symbolic', _('Clear')) - button.connect('clicked', self.on_clear) + button.connect('clicked', self._on_clear) self._ui.actionbar.pack_start(button) button = get_image_button( 'applications-system-symbolic', _('Filter')) - button.connect('clicked', self.on_filter_options) + button.connect('clicked', self._on_filter_options) self._ui.actionbar.pack_start(button) button = get_image_button( 'document-edit-symbolic', _('XML Input'), toggle=True) - button.connect('toggled', self.on_input) + button.connect('toggled', self._on_input) self._ui.actionbar.pack_start(button) button = get_image_button('insert-text-symbolic', _('Paste Last Input')) - button.connect('clicked', self.on_paste_last) + button.connect('clicked', self._on_paste_last) self._ui.actionbar.pack_start(button) button = get_image_button('mail-send-symbolic', _('Send')) - button.connect('clicked', self.on_send) + button.connect('clicked', self._on_send) self._ui.actionbar.pack_end(button) self._ui.actionbar.pack_start(self._ui.menubutton) - self.create_tags() + self._create_tags() self.show_all() self._ui.scrolled_input.hide() self._ui.menubutton.hide() - self.connect("destroy", self.on_destroy) - self.connect('key_press_event', self.on_key_press_event) + self.connect('destroy', self._on_destroy) + self.connect('key_press_event', self._on_key_press_event) self._ui.connect_signals(self) app.ged.register_event_handler( @@ -100,7 +108,7 @@ class XMLConsoleWindow(Gtk.Window): app.ged.register_event_handler( 'stanza-sent', ged.GUI1, self._nec_stanza_sent) - def create_tags(self): + def _create_tags(self): buffer_ = self._ui.textview.get_buffer() in_color = app.css_config.get_value( '.gajim-incoming-nickname', StyleAttr.COLOR) @@ -117,11 +125,18 @@ class XMLConsoleWindow(Gtk.Window): for tag_name in tags: buffer_.create_tag(tag_name) - def on_key_press_event(self, widget, event): + def _on_key_press_event(self, widget, event): if event.keyval == Gdk.KEY_Escape: self.destroy() - - def on_row_activated(self, listbox, row): + if (event.get_state() & Gdk.ModifierType.CONTROL_MASK and + event.keyval == Gdk.KEY_Return or + event.keyval == Gdk.KEY_KP_Enter): + self._on_send() + if (event.get_state() & Gdk.ModifierType.CONTROL_MASK and + event.keyval == Gdk.KEY_Up): + self._on_paste_last() + + def _on_row_activated(self, listbox, row): text = row.get_child().get_text() input_text = None if text == 'Presence': @@ -147,12 +162,12 @@ class XMLConsoleWindow(Gtk.Window): buffer_.set_text(input_text) self._ui.input_entry.grab_focus() - def on_send(self, *args): + def _on_send(self, *args): if not app.account_is_connected(self.account): - # if offline or connecting + # If offline or connecting ErrorDialog( _('Connection not available'), - _('Please make sure you are connected with "%s".') % + _('Please make sure you are connected with \'%s\'.') % self.account) return buffer_ = self._ui.input_entry.get_buffer() @@ -170,13 +185,13 @@ class XMLConsoleWindow(Gtk.Window): self.last_stanza = stanza buffer_.set_text('') - def on_paste_last(self, button): + def _on_paste_last(self, *args): buffer_ = self._ui.input_entry.get_buffer() if buffer_ is not None and self.last_stanza is not None: buffer_.set_text(self.last_stanza) self._ui.input_entry.grab_focus() - def on_input(self, button, *args): + def _on_input(self, button, *args): if button.get_active(): self._ui.paned.get_child2().show() self._ui.menubutton.show() @@ -185,55 +200,54 @@ class XMLConsoleWindow(Gtk.Window): self._ui.paned.get_child2().hide() self._ui.menubutton.hide() - def on_filter_options(self, *args): + def _on_filter_options(self, *args): if self.filter_dialog: self.filter_dialog.present() return options = [ Setting(SettingKind.SWITCH, 'Presence', SettingType.VALUE, self.presence, - callback=self.on_option, data='presence'), + callback=self._on_option, data='presence'), Setting(SettingKind.SWITCH, 'Message', SettingType.VALUE, self.message, - callback=self.on_option, data='message'), + callback=self._on_option, data='message'), - Setting(SettingKind.SWITCH, 'Iq', SettingType.VALUE, self.iq, - callback=self.on_option, data='iq'), + Setting(SettingKind.SWITCH, 'IQ', SettingType.VALUE, self.iq, + callback=self._on_option, data='iq'), - Setting(SettingKind.SWITCH, 'Stream\nManagement', + Setting(SettingKind.SWITCH, 'Stream Management', SettingType.VALUE, self.stream, - callback=self.on_option, data='stream'), + callback=self._on_option, data='stream'), Setting(SettingKind.SWITCH, 'In', SettingType.VALUE, self.incoming, - callback=self.on_option, data='incoming'), + callback=self._on_option, data='incoming'), Setting(SettingKind.SWITCH, 'Out', SettingType.VALUE, self.outgoing, - callback=self.on_option, data='outgoing'), + callback=self._on_option, data='outgoing'), ] self.filter_dialog = SettingsDialog(self, 'Filter', Gtk.DialogFlags.DESTROY_WITH_PARENT, options, self.account) - self.filter_dialog.connect('destroy', self.on_filter_destroyed) + self.filter_dialog.connect('destroy', self._on_filter_destroyed) - def on_filter_destroyed(self, win): + def _on_filter_destroyed(self, win): self.filter_dialog = None - def on_clear(self, *args): + def _on_clear(self, *args): self._ui.textview.get_buffer().set_text('') - def on_destroy(self, *args): - del app.interface.instances[self.account]['xml_console'] + def _on_destroy(self, *args): app.ged.remove_event_handler( 'stanza-received', ged.GUI1, self._nec_stanza_received) app.ged.remove_event_handler( 'stanza-sent', ged.GUI1, self._nec_stanza_sent) - def on_enable(self, switch, param): + def _on_enable(self, switch, param): self.enabled = switch.get_active() - def on_option(self, value, data): + def _on_option(self, value, data): setattr(self, data, value) value = not value table = self._ui.textview.get_buffer().get_tag_table() @@ -248,15 +262,15 @@ class XMLConsoleWindow(Gtk.Window): def _nec_stanza_received(self, obj): if obj.conn.name != self.account: return - self.print_stanza(obj.stanza_str, 'incoming') + self._print_stanza(obj.stanza_str, 'incoming') def _nec_stanza_sent(self, obj): if obj.conn.name != self.account: return - self.print_stanza(obj.stanza_str, 'outgoing') + self._print_stanza(obj.stanza_str, 'outgoing') - def print_stanza(self, stanza, kind): - # kind must be 'incoming' or 'outgoing' + def _print_stanza(self, stanza, kind): + # Kind must be 'incoming' or 'outgoing' if not self.enabled: return if not stanza: View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/617aad4a39ecd5b1d3bf976745f7dff97… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/617aad4a39ecd5b1d3bf976745f7dff97… 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