Commits February 2019

commits@gajim.org

1 participants
58 discussions

[Git][gajim/gajim][master] Remove unused code
by Philipp Hörist 06 Feb '19

06 Feb '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 959be5b8 by Philipp Hörist at 2019-02-06T19:42:26Z Remove unused code - - - - - 1 changed file: - gajim/gui_interface.py Changes: ===================================== gajim/gui_interface.py ===================================== @@ -1289,46 +1289,6 @@ class Interface: self.instances[obj.conn.name]['online_dialog']['plain_connection'] = \ PlainConnectionDialog(obj.conn.name, on_ok, on_cancel) - def handle_event_insecure_ssl_connection(self, obj): - # ('INSECURE_SSL_CONNECTION', account, (connection, connection_type)) - def on_ok(is_checked): - if not is_checked[0]: - on_cancel() - return - del self.instances[obj.conn.name]['online_dialog']['insecure_ssl'] - if is_checked[1]: - app.config.set_per('accounts', obj.conn.name, - 'warn_when_insecure_ssl_connection', False) - if obj.conn.connected == 0: - # We have been disconnecting (too long time since window is - # opened) - # re-connect with auto-accept - obj.conn.connection_auto_accepted = True - show, msg = obj.conn.continue_connect_info[:2] - self.roster.send_status(obj.conn.name, show, msg) - return - obj.conn.connection_accepted(obj.xmpp_client, obj.conn_type) - - def on_cancel(): - del self.instances[obj.conn.name]['online_dialog']['insecure_ssl'] - obj.conn.disconnect(reconnect=False) - app.nec.push_incoming_event(OurShowEvent(None, conn=obj.conn, - show='offline')) - - pritext = _('Insecure connection') - sectext = _('You are about to send your password on an insecure ' - 'connection. You should install PyOpenSSL to prevent that. Are you ' - 'sure you want to do that?') - checktext1 = _('Yes, I really want to connect insecurely') - checktext2 = _('_Do not ask me again') - if 'insecure_ssl' in self.instances[obj.conn.name]['online_dialog']: - self.instances[obj.conn.name]['online_dialog']['insecure_ssl'].\ - destroy() - self.instances[obj.conn.name]['online_dialog']['insecure_ssl'] = \ - ConfirmationDialogDoubleCheck(pritext, sectext, checktext1, - checktext2, on_response_ok=on_ok, on_response_cancel=on_cancel, - is_modal=False) - def create_core_handlers_list(self): self.handlers = { 'DB_ERROR': [self.handle_event_db_error], @@ -1346,8 +1306,6 @@ class Interface: 'gpg-password-required': [self.handle_event_gpg_password_required], 'http-auth-received': [self.handle_event_http_auth], 'information': [self.handle_event_information], - 'insecure-ssl-connection': \ - [self.handle_event_insecure_ssl_connection], 'iq-error-received': [self.handle_event_iq_error], 'jingle-connected-received': [self.handle_event_jingle_connected], 'jingle-disconnected-received': [ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/959be5b8ee5de499082be53a7c676fb19a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/959be5b8ee5de499082be53a7c676fb19a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Clean up OpenSSL code
by Philipp Hörist 06 Feb '19

06 Feb '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 36a00839 by André Apitzsch at 2019-02-06T19:25:55Z Clean up OpenSSL code - - - - - 6 changed files: - README.md - gajim/common/connection.py - gajim/common/jingle_content.py - gajim/common/jingle_ft.py - gajim/common/jingle_xtls.py - setup.cfg Changes: ===================================== README.md ===================================== @@ -8,7 +8,7 @@ - python3-gi-cairo - gir1.2-gtk-3.0 (>=3.22) - python3-nbxmpp (>=0.9.90.4) -- python3-openssl (>=0.14) +- python3-openssl (>=16.2) - python3-cssutils (>=1.0.2) - python3-keyring - python3-precis-i18n ===================================== gajim/common/connection.py ===================================== @@ -1170,17 +1170,6 @@ class Connection(CommonConnection, ConnectionHandlers): app.nec.push_incoming_event(OurShowEvent(None, conn=self, show='offline')) return False - if _con_type in ('tls', 'ssl') and con.Connection.ssl_lib != 'PYOPENSSL' \ - and app.config.get_per('accounts', self.name, - 'warn_when_insecure_ssl_connection') and \ - not self.connection_auto_accepted: - # Pyopenssl is not used - app.nec.push_incoming_event( - NetworkEvent('insecure-ssl-connection', - conn=self, - xmpp_client=con, - conn_type=_con_type)) - return True return self.connection_accepted(con, con_type) def connection_accepted(self, con, con_type): ===================================== gajim/common/jingle_content.py ===================================== @@ -230,12 +230,8 @@ class JingleContent: configpaths.get('MY_CERT'), SELF_SIGNED_CERTIFICATE) + '.cert' cert = load_cert_file(certpath) if cert: - try: - digest_algo = (cert.get_signature_algorithm() - .decode('utf-8').split('With')[0]) - except AttributeError: - # Old py-OpenSSL is missing get_signature_algorithm - digest_algo = "sha256" + digest_algo = (cert.get_signature_algorithm() + .decode('utf-8').split('With')[0]) security.addChild('fingerprint').addData(cert.digest( digest_algo).decode('utf-8')) for m in ('x509', ): # supported authentication methods ===================================== gajim/common/jingle_ft.py ===================================== @@ -116,12 +116,11 @@ class JingleFileTransfer(JingleContent): State.CAND_SENT_AND_RECEIVED : StateCandSentAndRecv(self) } - if jingle_xtls.PYOPENSSL_PRESENT: - cert_name = os.path.join(configpaths.get('MY_CERT'), - jingle_xtls.SELF_SIGNED_CERTIFICATE) - if not (os.path.exists(cert_name + '.cert') - and os.path.exists(cert_name + '.pkey')): - jingle_xtls.make_certs(cert_name, 'gajim') + cert_name = os.path.join(configpaths.get('MY_CERT'), + jingle_xtls.SELF_SIGNED_CERTIFICATE) + if not (os.path.exists(cert_name + '.cert') + and os.path.exists(cert_name + '.pkey')): + jingle_xtls.make_certs(cert_name, 'gajim') def __state_changed(self, nextstate, args=None): # Executes the next state action and sets the next state ===================================== gajim/common/jingle_xtls.py ===================================== @@ -15,15 +15,14 @@ import logging import os +from OpenSSL import SSL, crypto + import nbxmpp from gajim.common import app from gajim.common import configpaths log = logging.getLogger('gajim.c.jingle_xtls') - -PYOPENSSL_PRESENT = False - # key-exchange id -> [callback, args], accept that session once key-exchange completes pending_contents = {} @@ -36,16 +35,8 @@ def approve_pending_content(id_): args = pending_contents[id_][1] cb(*args) -try: - import OpenSSL.SSL - PYOPENSSL_PRESENT = True -except ImportError: - log.info("PyOpenSSL not available") - -if PYOPENSSL_PRESENT: - from OpenSSL import SSL, crypto - TYPE_RSA = crypto.TYPE_RSA - TYPE_DSA = crypto.TYPE_DSA +TYPE_RSA = crypto.TYPE_RSA +TYPE_DSA = crypto.TYPE_DSA SELF_SIGNED_CERTIFICATE = 'localcert' DH_PARAMS = 'dh_params.pem' @@ -76,13 +67,12 @@ def load_cert_file(cert_path, cert_store=None): elif 'END CERTIFICATE' in line and begin > -1: cert = ''.join(lines[begin:i+2]) try: - x509cert = OpenSSL.crypto.load_certificate( - OpenSSL.crypto.FILETYPE_PEM, cert) + x509cert = crypto.load_certificate(crypto.FILETYPE_PEM, cert) if cert_store: cert_store.add_cert(x509cert) f.close() return x509cert - except OpenSSL.crypto.Error as exception_obj: + except crypto.Error as exception_obj: log.warning('Unable to load a certificate from file %s: %s', cert_path, exception_obj.args[0][0][2]) except Exception: @@ -190,12 +180,8 @@ def check_cert(jid, fingerprint): if os.path.exists(certpath): cert = load_cert_file(certpath) if cert: - try: - digest_algo = cert.get_signature_algorithm().decode('utf-8').\ - split('With')[0] - except AttributeError: - # Old py-OpenSSL is missing get_signature_algorithm - digest_algo = "sha256" + digest_algo = cert.get_signature_algorithm().decode('utf-8')\ + .split('With')[0] if cert.digest(digest_algo) == fingerprint: return True return False ===================================== setup.cfg ===================================== @@ -24,7 +24,7 @@ install_requires = keyring nbxmpp>=0.9.90.4 precis-i18n>=1.0.0 - pyOpenSSL>=0.12 + pyOpenSSL>=16.2 [options.package_data] gajim = View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/36a0083942ff35316d286036cb7eedc80d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/36a0083942ff35316d286036cb7eedc80d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] AMR codec added
by Philipp Hörist 06 Feb '19

06 Feb '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: a3c316ab by streaps at 2019-02-06T19:18:58Z AMR codec added - - - - - 1 changed file: - gajim/common/jingle_rtp.py Changes: ===================================== gajim/common/jingle_rtp.py ===================================== @@ -360,16 +360,19 @@ class JingleAudio(JingleRTPContent): Farstream.MediaType.AUDIO, 48000), Farstream.Codec.new(Farstream.CODEC_ID_ANY, 'SPEEX', Farstream.MediaType.AUDIO, 32000), - Farstream.Codec.new(Farstream.CODEC_ID_ANY, 'SPEEX', - Farstream.MediaType.AUDIO, 16000), Farstream.Codec.new(Farstream.CODEC_ID_ANY, 'G722', Farstream.MediaType.AUDIO, 8000), Farstream.Codec.new(Farstream.CODEC_ID_ANY, 'SPEEX', - Farstream.MediaType.AUDIO, 8000), + Farstream.MediaType.AUDIO, 16000), Farstream.Codec.new(Farstream.CODEC_ID_ANY, 'PCMA', Farstream.MediaType.AUDIO, 8000), Farstream.Codec.new(Farstream.CODEC_ID_ANY, 'PCMU', - Farstream.MediaType.AUDIO, 8000)] + Farstream.MediaType.AUDIO, 8000), + Farstream.Codec.new(Farstream.CODEC_ID_ANY, 'SPEEX', + Farstream.MediaType.AUDIO, 8000), + Farstream.Codec.new(Farstream.CODEC_ID_ANY, 'AMR', + Farstream.MediaType.AUDIO, 8000), + ] # disable all other codecs disable_codecs = [] View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a3c316abaa3d4d3594a7ce836cfe6eaebd… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a3c316abaa3d4d3594a7ce836cfe6eaebd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Fix error when parsing bookmarks
by Philipp Hörist 05 Feb '19

05 Feb '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 135a5d84 by Philipp Hörist at 2019-02-05T22:19:14Z Fix error when parsing bookmarks - - - - - 1 changed file: - nbxmpp/modules/bookmarks.py Changes: ===================================== nbxmpp/modules/bookmarks.py ===================================== @@ -126,9 +126,9 @@ class Bookmarks: log.info('Error: %s', stanza.getError()) return [] + bookmarks = [] if type_ == BookmarkStoreType.PUBSUB: item = get_pubsub_item(stanza) - bookmarks = [] storage_node = item.getTag('storage', namespace=NS_BOOKMARKS) if type_ == BookmarkStoreType.PRIVATE: View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/135a5d84ccfcb6d4664259599c… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/135a5d84ccfcb6d4664259599c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Support domain based name for GSSAPI
by Philipp Hörist 05 Feb '19

05 Feb '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: f19ef1d9 by Philipp Hörist at 2019-02-05T19:50:41Z Support domain based name for GSSAPI - - - - - 2 changed files: - nbxmpp/auth.py - nbxmpp/protocol.py Changes: ===================================== nbxmpp/auth.py ===================================== @@ -29,6 +29,7 @@ from nbxmpp.protocol import Node from nbxmpp.protocol import NodeProcessed from nbxmpp.protocol import SASL_ERROR_CONDITIONS from nbxmpp.protocol import SASL_AUTH_MECHS +from nbxmpp.protocol import NS_DOMAIN_BASED_NAME from nbxmpp.util import b64decode from nbxmpp.util import b64encode from nbxmpp.const import GSSAPIState @@ -77,6 +78,7 @@ class SASL(PlugIn): self._method = None self._channel_binding = None + self._domain_based_name = None def _setup_mechs(self): if self._owner.connected in ('ssl', 'tls'): @@ -139,6 +141,11 @@ class SASL(PlugIn): log.info('Available mechanisms: %s', available_mechs) + hostname = stanza.getTag('hostname', namespace=NS_DOMAIN_BASED_NAME) + if hostname is not None: + self._domain_based_name = hostname.getData() + log.info('Found domain based name: %s', self._domain_based_name) + if not available_mechs: log.error('No available auth mechanisms found') self._abort_auth('invalid-mechanism') @@ -192,7 +199,8 @@ class SASL(PlugIn): elif self._chosen_mechanism == 'GSSAPI': self._method = GSSAPI(self._owner.Connection) - self._method.initiate(self._owner.xmpp_hostname) + self._method.initiate(self._domain_based_name or + self._owner.xmpp_hostname) else: log.error('Unknown auth mech') ===================================== nbxmpp/protocol.py ===================================== @@ -190,6 +190,7 @@ NS_HASHES_BLAKE2B_256 = 'urn:xmpp:hash-function-text-names:id-blake2b256' NS_HASHES_BLAKE2B_512 = 'urn:xmpp:hash-function-text-names:id-blake2b512' NS_OPENPGP = 'urn:xmpp:openpgp:0' NS_BOOKMARK_CONVERSION = 'urn:xmpp:bookmarks-conversion:0' +NS_DOMAIN_BASED_NAME = 'urn:xmpp:domain-based-name:1' #xmpp_stream_error_conditions = ''' #bad-format -- -- -- The entity has sent XML that cannot be processed. View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/f19ef1d9382670eca23cedc003… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/f19ef1d9382670eca23cedc003… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][nbxmpp_0.6] Update CHANGELOG
by Philipp Hörist 05 Feb '19

05 Feb '19

Philipp Hörist pushed to branch nbxmpp_0.6 at gajim / python-nbxmpp Commits: 50ced8c1 by Philipp Hörist at 2019-02-05T19:41:57Z Update CHANGELOG - - - - - 1 changed file: - ChangeLog Changes: ===================================== ChangeLog ===================================== @@ -1,3 +1,8 @@ +python-nbxmpp 0.6.10 (TBA) + + * Add support for domain based name in features for GSSAPI + * Fix usage of BOSH + python-nbxmpp 0.6.9 (10 January 2019) * Always bind after SM failed Fixes #64 View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/50ced8c108277fc1979c314201… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/50ced8c108277fc1979c314201… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][nbxmpp_0.6] Fix typo
by Philipp Hörist 05 Feb '19

05 Feb '19

Philipp Hörist pushed to branch nbxmpp_0.6 at gajim / python-nbxmpp Commits: cd95704b by Philipp Hörist at 2019-02-05T19:37:43Z Fix typo - - - - - 1 changed file: - nbxmpp/auth_nb.py Changes: ===================================== nbxmpp/auth_nb.py ===================================== @@ -124,7 +124,7 @@ class SASL(PlugIn): self.channel_binding = channel_binding self.enabled_auth_mechs = auth_mechs self.realm = None - self._domain_based_hostname = None + self._domain_based_name = None def plugin(self, owner): if 'version' not in self._owner.Dispatcher.Stream._document_attrs: View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/cd95704b0b6bb60c4763b9b95f… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/cd95704b0b6bb60c4763b9b95f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][nbxmpp_0.6] Support domain based name for GSSAPI
by Philipp Hörist 05 Feb '19

05 Feb '19

Philipp Hörist pushed to branch nbxmpp_0.6 at gajim / python-nbxmpp Commits: 4d712393 by Philipp Hörist at 2019-02-05T19:33:48Z Support domain based name for GSSAPI - - - - - 2 changed files: - nbxmpp/auth_nb.py - nbxmpp/protocol.py Changes: ===================================== nbxmpp/auth_nb.py ===================================== @@ -24,7 +24,7 @@ See client_nb.py from __future__ import unicode_literals from .protocol import NS_SASL, NS_SESSION, NS_STREAMS, NS_BIND, NS_AUTH -from .protocol import NS_STREAM_MGMT +from .protocol import NS_STREAM_MGMT, NS_DOMAIN_BASED_NAME from .protocol import Node, NodeProcessed, isResultNode, Iq, Protocol, JID from .plugin import PlugIn import sys @@ -124,6 +124,7 @@ class SASL(PlugIn): self.channel_binding = channel_binding self.enabled_auth_mechs = auth_mechs self.realm = None + self._domain_based_hostname = None def plugin(self, owner): if 'version' not in self._owner.Dispatcher.Stream._document_attrs: @@ -189,6 +190,10 @@ class SASL(PlugIn): in feats.getTag('mechanisms', namespace=NS_SASL).getTags('mechanism') ) & self.enabled_auth_mechs + hostname = feats.getTag('hostname', namespace=NS_DOMAIN_BASED_NAME) + if hostname is not None: + self._domain_based_name = hostname.getData() + # Password based authentication mechanism ordered by strength. # If the server supports a mechanism disable all weaker mechanisms. password_auth_mechs_strength = ['SCRAM-SHA-1-PLUS', 'SCRAM-SHA-1', @@ -229,9 +234,9 @@ class SASL(PlugIn): raise NodeProcessed if 'GSSAPI' in self.mecs and have_kerberos: self.mecs.remove('GSSAPI') + hostname = self._domain_based_name or self._owner.xmpp_hostname try: - self.gss_vc = kerberos.authGSSClientInit('xmpp@' + \ - self._owner.xmpp_hostname)[1] + self.gss_vc = kerberos.authGSSClientInit('xmpp@%s' % hostname)[1] kerberos.authGSSClientStep(self.gss_vc, '') response = kerberos.authGSSClientResponse(self.gss_vc) node=Node('auth', attrs={'xmlns': NS_SASL, ===================================== nbxmpp/protocol.py ===================================== @@ -190,6 +190,7 @@ NS_HASHES_SHA3_512 = 'urn:xmpp:hash-function-text-names:sha3-512' NS_HASHES_BLAKE2B_256 = 'urn:xmpp:hash-function-text-names:id-blake2b256' NS_HASHES_BLAKE2B_512 = 'urn:xmpp:hash-function-text-names:id-blake2b512' NS_OPENPGP = 'urn:xmpp:openpgp:0' +NS_DOMAIN_BASED_NAME = 'urn:xmpp:domain-based-name:1' #xmpp_stream_error_conditions = ''' #bad-format -- -- -- The entity has sent XML that cannot be processed. View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/4d7123936d42279acab414ed0d… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/4d7123936d42279acab414ed0d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Add modules to store publish list
by Philipp Hörist 04 Feb '19

04 Feb '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: fa7f6f2b by Philipp Hörist at 2019-02-02T23:15:28Z Add modules to store publish list - - - - - a89bec0b by Philipp Hörist at 2019-02-04T20:59:33Z Refactor Bookmarks - Simplify modules because nbxmpp handles more stuff - - - - - 10 changed files: - gajim/common/connection.py - gajim/common/modules/__init__.py - gajim/common/modules/bookmarks.py - gajim/groupchat_control.py - gajim/gtk/bookmarks.py - gajim/gtk/discovery.py - gajim/gtk/start_chat.py - gajim/gui_interface.py - gajim/gui_menu_builder.py - gajim/roster_window.py Changes: ===================================== gajim/common/connection.py ===================================== @@ -1497,7 +1497,7 @@ class Connection(CommonConnection, ConnectionHandlers): self.get_module('VCardTemp').request_vcard() # Get bookmarks - self.get_module('Bookmarks').get_bookmarks() + self.get_module('Bookmarks').request_bookmarks() # Get annotations self.get_module('Annotations').get_annotations() @@ -1625,7 +1625,7 @@ class Connection(CommonConnection, ConnectionHandlers): # ask our VCard self.get_module('VCardTemp').request_vcard() - self.get_module('Bookmarks').get_bookmarks() + self.get_module('Bookmarks').request_bookmarks() self.get_module('Annotations').get_annotations() self.get_module('Blocking').get_blocking_list() ===================================== gajim/common/modules/__init__.py ===================================== @@ -37,6 +37,8 @@ _modules = {} # type: Dict[str, Dict[str, Any]] _store_publish_modules = [ 'UserMood', 'UserActivity', + 'UserLocation', + 'UserTune', ] # type: List[str] for file in Path(__file__).parent.iterdir(): ===================================== gajim/common/modules/bookmarks.py ===================================== @@ -15,96 +15,97 @@ # XEP-0048: Bookmarks from typing import Any -from typing import Dict from typing import List from typing import Optional import logging import copy -from collections import OrderedDict import nbxmpp +from nbxmpp.structs import BookmarkData +from nbxmpp.const import BookmarkStoreType from gi.repository import GLib from gajim.common import app -from gajim.common import helpers -from gajim.common.const import PEPEventType from gajim.common.nec import NetworkEvent -from gajim.common.exceptions import StanzaMalformed -from gajim.common.modules.pep import AbstractPEPModule -from gajim.common.modules.pep import AbstractPEPData -from gajim.common.modules.util import from_xs_boolean -from gajim.common.modules.util import to_xs_boolean +from gajim.common.modules.base import BaseModule +from gajim.common.modules.util import event_node log = logging.getLogger('gajim.c.m.bookmarks') -class BookmarksData(AbstractPEPData): +class Bookmarks(BaseModule): - type_ = PEPEventType.BOOKMARKS - - -class Bookmarks(AbstractPEPModule): - - name = 'storage' - namespace = 'storage:bookmarks' - pep_class = BookmarksData - store_publish = False - _log = log + _nbxmpp_extends = 'Bookmarks' + _nbxmpp_methods = [ + 'request_bookmarks', + 'store_bookmarks', + ] def __init__(self, con): - AbstractPEPModule.__init__(self, con) - - self.bookmarks = {} - self.conversion = False + BaseModule.__init__(self, con) + self._register_pubsub_handler(self._bookmark_event_received) + self._conversion = False + self._bookmarks = [] self._join_timeouts = [] self._request_in_progress = False - def pass_disco(self, from_, _identities, features, _data, _node): - if nbxmpp.NS_BOOKMARK_CONVERSION not in features: - return - self.conversion = True - log.info('Discovered Bookmarks Conversion: %s', from_) + @property + def conversion(self): + return self._conversion - def _extract_info(self, item): - storage = item.getTag('storage', namespace=self.namespace) - if storage is None: - raise StanzaMalformed('No storage node') - return storage + @property + def bookmarks(self): + return self._bookmarks - def _notification_received(self, jid: nbxmpp.JID, user_pep: Any) -> None: - if self._request_in_progress: - log.info('Ignore update, pubsub request in progress') - return + @bookmarks.setter + def bookmarks(self, value): + self._bookmarks = value + + @event_node(nbxmpp.NS_BOOKMARKS) + def _bookmark_event_received(self, _con, _stanza, properties): + bookmarks = properties.pubsub_event.data - if not self._con.get_own_jid().bareMatch(jid): - log.warning('%s has an open access bookmarks node', jid) + if not properties.is_self_message: + log.warning('%s has an open access bookmarks node', properties.jid) return if not self._pubsub_support() or not self.conversion: return - old_bookmarks = self._convert_to_set(self.bookmarks) - self.bookmarks = self._parse_bookmarks(user_pep.data) + if self._request_in_progress: + log.info('Ignore update, pubsub request in progress') + return + + old_bookmarks = self._convert_to_set(self._bookmarks) + self._bookmarks = bookmarks self._act_on_changed_bookmarks(old_bookmarks) 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: + return + self._conversion = True + log.info('Discovered Bookmarks Conversion: %s', from_) + def _act_on_changed_bookmarks(self, old_bookmarks): - new_bookmarks = self._convert_to_set(self.bookmarks) + new_bookmarks = self._convert_to_set(self._bookmarks) changed = new_bookmarks - old_bookmarks if not changed: return join = [jid for jid, autojoin in changed if autojoin] + bookmarks = [] for jid in join: log.info('Schedule autojoin in 10s for: %s', jid) + bookmarks.append(self.get_bookmark_from_jid(jid)) # If another client creates a MUC, the MUC is locked until the # configuration is finished. Give the user some time to finish # the configuration. timeout_id = GLib.timeout_add_seconds( - 10, self._join_with_timeout, join) + 10, self._join_with_timeout, bookmarks) self._join_timeouts.append(timeout_id) # TODO: leave mucs @@ -113,256 +114,122 @@ class Bookmarks(AbstractPEPModule): @staticmethod def _convert_to_set(bookmarks): set_ = set() - for jid in bookmarks: - set_.add((jid, bookmarks[jid]['autojoin'])) + for bookmark in bookmarks: + set_.add((bookmark.jid, bookmark.autojoin)) return set_ + def get_bookmark_from_jid(self, jid): + for bookmark in self._bookmarks: + if bookmark.jid == jid: + return bookmark + def get_sorted_bookmarks(self, short_name=False): # This returns a sorted by name copy of the bookmarks - sorted_bookmarks = {} - for jid, bookmarks in self.bookmarks.items(): - bookmark_copy = copy.deepcopy(bookmarks) - if not bookmark_copy['name']: + sorted_bookmarks = [] + for bookmark in self._bookmarks: + bookmark_copy = copy.deepcopy(bookmark) + if not bookmark_copy.name: # No name was given for this bookmark # Use the first part of JID instead - name = jid.split("@")[0] - bookmark_copy['name'] = name + name = bookmark_copy.jid.split("@")[0] + bookmark_copy = bookmark_copy._replace(name=name) if short_name: - name = bookmark_copy['name'] + name = bookmark_copy.name name = (name[:42] + '..') if len(name) > 42 else name - bookmark_copy['name'] = name + bookmark_copy = bookmark_copy._replace(name=name) + + sorted_bookmarks.append(bookmark_copy) - sorted_bookmarks[jid] = bookmark_copy - return OrderedDict( - sorted(sorted_bookmarks.items(), - key=lambda bookmark: bookmark[1]['name'].lower())) + sorted_bookmarks.sort(key=lambda x: x.name.lower()) + return sorted_bookmarks def _pubsub_support(self) -> bool: return (self._con.get_module('PEP').supported and self._con.get_module('PubSub').publish_options) - def get_bookmarks(self): + def request_bookmarks(self): if not app.account_is_connected(self._account): return + self._request_in_progress = True + type_ = BookmarkStoreType.PRIVATE if self._pubsub_support() and self.conversion: - self._request_pubsub_bookmarks() - else: - self._request_private_bookmarks() + type_ = BookmarkStoreType.PUBSUB - def _request_pubsub_bookmarks(self) -> None: - log.info('Request Bookmarks (PubSub)') - self._request_in_progress = True - self._con.get_module('PubSub').send_pb_retrieve( - '', 'storage:bookmarks', cb=self._bookmarks_received) + self._nbxmpp('Bookmarks').request_bookmarks( + type_, callback=self._bookmarks_received) - def _request_private_bookmarks(self) -> None: - self._request_in_progress = True - iq = nbxmpp.Iq(typ='get') - query = iq.addChild(name='query', namespace=nbxmpp.NS_PRIVATE) - query.addChild(name='storage', namespace='storage:bookmarks') - log.info('Request Bookmarks (PrivateStorage)') - self._con.connection.SendAndCallForResponse( - iq, self._bookmarks_received, {}) - - def _bookmarks_received(self, _con, stanza): + def _bookmarks_received(self, bookmarks): self._request_in_progress = False - if not nbxmpp.isResultNode(stanza): - log.info('No bookmarks found: %s', stanza.getError()) - else: - log.info('Received Bookmarks') - storage = self._get_storage_node(stanza) - if storage is not None: - self.bookmarks = self._parse_bookmarks(storage) - self.auto_join_bookmarks() - + self._bookmarks = bookmarks + self.auto_join_bookmarks() app.nec.push_incoming_event( NetworkEvent('bookmarks-received', account=self._account)) - @staticmethod - def _get_storage_node(stanza): - node = stanza.getTag('pubsub', namespace=nbxmpp.NS_PUBSUB) - if node is None: - node = stanza.getTag('event', namespace=nbxmpp.NS_PUBSUB_EVENT) - if node is None: - # Private Storage - query = stanza.getQuery() - if query is None: - return - storage = query.getTag('storage', - namespace=nbxmpp.NS_BOOKMARKS) - if storage is None: - return - return storage - - items_node = node.getTag('items') - if items_node is None: - return - if items_node.getAttr('node') != nbxmpp.NS_BOOKMARKS: - return - - item_node = items_node.getTag('item') - if item_node is None: - return - - storage = item_node.getTag('storage', namespace=nbxmpp.NS_BOOKMARKS) - if storage is None: - return - return storage - - @staticmethod - def _parse_bookmarks(storage: nbxmpp.Node) -> Dict[str, Dict[str, Any]]: - bookmarks = {} - confs = storage.getTags('conference') - for conf in confs: - autojoin_val = conf.getAttr('autojoin') - if not autojoin_val: # not there (it's optional) - autojoin_val = False - - try: - jid = helpers.parse_jid(conf.getAttr('jid')) - except helpers.InvalidFormat: - log.warning('Invalid JID: %s, ignoring it', - conf.getAttr('jid')) - continue - - bookmark = { - 'name': conf.getAttr('name'), - 'password': conf.getTagData('password'), - 'nick': conf.getTagData('nick'), - } - - try: - bookmark['autojoin'] = from_xs_boolean(autojoin_val) - except ValueError as error: - log.warning(error) - continue - - log.debug('Found Bookmark: %s', jid) - bookmarks[jid] = bookmark - - return bookmarks - - @staticmethod - def _build_storage_node(bookmarks): - storage_node = nbxmpp.Node( - tag='storage', attrs={'xmlns': 'storage:bookmarks'}) - for jid, bm in bookmarks.items(): - conf_node = storage_node.addChild(name="conference") - conf_node.setAttr('jid', jid) - conf_node.setAttr('autojoin', to_xs_boolean(bm['autojoin'])) - conf_node.setAttr('name', bm['name']) - # Only add optional elements if not empty - # Note: need to handle both None and '' as empty - # thus shouldn't use "is not None" - if bm.get('nick', None): - conf_node.setTagData('nick', bm['nick']) - if bm.get('password', None): - conf_node.setTagData('password', bm['password']) - return storage_node - - def _build_node(self, _data): - pass - - @staticmethod - def get_bookmark_publish_options() -> nbxmpp.Node: - options = nbxmpp.Node(nbxmpp.NS_DATA + ' x', - attrs={'type': 'submit'}) - field = options.addChild('field', - attrs={'var': 'FORM_TYPE', 'type': 'hidden'}) - field.setTagData('value', nbxmpp.NS_PUBSUB_PUBLISH_OPTIONS) - field = options.addChild('field', attrs={'var': 'pubsub#access_model'}) - field.setTagData('value', 'whitelist') - return options - def store_bookmarks(self): if not app.account_is_connected(self._account): return - storage_node = self._build_storage_node(self.bookmarks) + type_ = BookmarkStoreType.PRIVATE if self._pubsub_support() and self.conversion: - self._pubsub_store(storage_node) - else: - self._private_store(storage_node) + type_ = BookmarkStoreType.PUBSUB + + self._nbxmpp('Bookmarks').store_bookmarks(self._bookmarks, type_) app.nec.push_incoming_event( NetworkEvent('bookmarks-received', account=self._account)) - def _pubsub_store(self, storage_node: nbxmpp.Node) -> None: - self._con.get_module('PubSub').send_pb_publish( - '', 'storage:bookmarks', storage_node, 'current', - options=self.get_bookmark_publish_options(), - cb=self._pubsub_store_result) - log.info('Publish Bookmarks (PubSub)') - - def _private_store(self, storage_node: nbxmpp.Node) -> None: - iq = nbxmpp.Iq('set', nbxmpp.NS_PRIVATE, payload=storage_node) - log.info('Publish Bookmarks (PrivateStorage)') - self._con.connection.SendAndCallForResponse( - iq, self._private_store_result) - - @staticmethod - def _pubsub_store_result(_con, stanza): - if not nbxmpp.isResultNode(stanza): - log.error('Error: %s', stanza.getError()) - return - - @staticmethod - def _private_store_result(stanza: nbxmpp.Iq) -> None: - if not nbxmpp.isResultNode(stanza): - log.error('Error: %s', stanza.getError()) - return - - def _join_with_timeout(self, bookmarks: Optional[List[str]] = None) -> None: + def _join_with_timeout(self, bookmarks: List[Any]) -> None: self._join_timeouts.pop(0) self.auto_join_bookmarks(bookmarks) - def auto_join_bookmarks(self, bookmarks: Optional[List[str]] = None) -> None: + def auto_join_bookmarks(self, bookmarks: Optional[List[Any]] = None) -> None: if app.is_invisible(self._account): return + if bookmarks is None: - bookmarks = self.bookmarks.keys() + bookmarks = self._bookmarks - for jid in bookmarks: - bookmark = self.bookmarks[jid] - if bookmark['autojoin']: + for bookmark in bookmarks: + if bookmark.autojoin: # Only join non-opened groupchats. Opened one are already # auto-joined on re-connection - if jid not in app.gc_connected[self._account]: + if bookmark.jid not in app.gc_connected[self._account]: # we are not already connected - log.info('Autojoin Bookmark: %s', jid) - minimize = app.config.get_per('rooms', jid, + log.info('Autojoin Bookmark: %s', bookmark.jid) + minimize = app.config.get_per('rooms', bookmark.jid, 'minimize_on_autojoin', True) app.interface.join_gc_room( - self._account, jid, bookmark['nick'], - bookmark['password'], minimize=minimize) + self._account, bookmark.jid, bookmark.nick, + bookmark.password, minimize=minimize) def add_bookmark(self, name, jid, autojoin, password, nick): - self.bookmarks[jid] = { - 'name': name, - 'autojoin': autojoin, - 'password': password, - 'nick': nick, - } - + bookmark = BookmarkData(jid=jid, + name=name, + autojoin=autojoin, + password=password, + nick=nick) + self._bookmarks.append(bookmark) self.store_bookmarks() def remove(self, jid: str, publish: bool = True) -> None: - if self.bookmarks.pop(jid, None) is None: + bookmark = self.get_bookmark_from_jid(jid) + if bookmark is None: return + self.bookmark.remove(bookmark) if publish: self.store_bookmarks() def get_name_from_bookmark(self, jid: str) -> str: fallback = jid.split('@')[0] - try: - return self.bookmarks[jid]['name'] or fallback - except KeyError: + bookmark = self.get_bookmark_from_jid(jid) + if bookmark is None: return fallback + return bookmark.name or fallback def is_bookmark(self, jid: str) -> bool: - return jid in self.bookmarks + return self.get_bookmark_from_jid(jid) is not None def purge_pubsub_bookmarks(self) -> None: log.info('Purge/Delete Bookmarks on PubSub, ' ===================================== gajim/groupchat_control.py ===================================== @@ -468,7 +468,7 @@ class GroupchatControl(ChatControlBase): # Bookmarks con = app.connections[self.account] - bookmarked = self.room_jid in con.get_module('Bookmarks').bookmarks + bookmarked = con.get_module('Bookmarks').is_bookmark(self.room_jid) self._get_action('bookmark-').set_enabled(self.is_connected and not bookmarked) ===================================== gajim/gtk/bookmarks.py ===================================== @@ -16,6 +16,7 @@ from enum import IntEnum from gi.repository import Gtk from gi.repository import Gdk +from nbxmpp.structs import BookmarkData from gajim.common import app from gajim.common import helpers @@ -57,14 +58,14 @@ class ManageBookmarksWindow: con = app.connections[account] bookmarks = con.get_module('Bookmarks').get_sorted_bookmarks() - for jid, bookmark in bookmarks.items(): + for bookmark in bookmarks: self.treestore.append(iter_, [account, - bookmark['name'], - jid, - bookmark['autojoin'], - bookmark['password'], - bookmark['nick'], - bookmark['name']]) + bookmark.name, + bookmark.jid, + bookmark.autojoin, + bookmark.password, + bookmark.nick, + bookmark.name]) self.view = self.xml.get_object('bookmarks_treeview') self.view.set_model(self.treestore) @@ -190,20 +191,17 @@ class ManageBookmarksWindow: for account in self.treestore: acct = account[1] con = app.connections[acct] - con.get_module('Bookmarks').bookmarks = {} + bookmarks = [] for bm in account.iterchildren(): # create the bookmark-dict - bmdict = { - 'name': bm[Row.ROOM_NAME], - 'autojoin': bm[Row.AUTOJOIN], - 'password': bm[Row.PASSWORD], - 'nick': bm[Row.NICK], - } - - jid = bm[Row.ROOM_JID] - con.get_module('Bookmarks').bookmarks[jid] = bmdict - + bookmark = BookmarkData(jid=bm[Row.ROOM_JID], + name=bm[Row.ROOM_NAME], + autojoin=bm[Row.AUTOJOIN], + password=bm[Row.PASSWORD], + nick=bm[Row.NICK]) + bookmarks.append(bookmark) + con.get_module('Bookmarks').bookmarks = bookmarks con.get_module('Bookmarks').store_bookmarks() self.window.destroy() ===================================== gajim/gtk/discovery.py ===================================== @@ -1707,7 +1707,7 @@ class MucBrowser(AgentBrowser): return room_jid = model[iter_][0] - if room_jid in con.get_module('Bookmarks').bookmarks: + if con.get_module('Bookmarks').is_bookmark(room_jid): ErrorDialog( _('Bookmark already set'), _('Group Chat "%s" is already in your bookmarks.') % room_jid, ===================================== gajim/gtk/start_chat.py ===================================== @@ -92,8 +92,8 @@ class StartChatDialog(Gtk.ApplicationWindow): con = app.connections[account] bookmarks = con.get_module('Bookmarks').bookmarks groupchats = {} - for jid, bookmark in bookmarks.items(): - groupchats[jid] = bookmark['name'] + for bookmark in bookmarks: + groupchats[bookmark.jid] = bookmark.name for jid in app.contacts.get_gc_list(account): if jid in groupchats: ===================================== gajim/gui_interface.py ===================================== @@ -1552,11 +1552,10 @@ class Interface: return con = app.connections[account] - bookmarks = con.get_module('Bookmarks').bookmarks - bookmark = bookmarks.get(room_jid, None) + bookmark = con.get_module('Bookmarks').get_bookmark_from_jid(room_jid) if bookmark is not None: app.interface.join_gc_room( - account, room_jid, bookmark['nick'], bookmark['password']) + account, bookmark.jid, bookmark.nick, bookmark.password) return try: ===================================== gajim/gui_menu_builder.py ===================================== @@ -167,14 +167,13 @@ show_bookmarked=False, force_resource=False): r_jids = [] # list of room jids for account in connected_accounts: con = app.connections[account] - boomarks = con.get_module('Bookmarks').bookmarks - for jid in boomarks.keys(): - if jid in r_jids: + for bookmark in con.get_module('Bookmarks').bookmarks: + if bookmark.jid in r_jids: continue - if jid not in app.gc_connected[account] or not \ - app.gc_connected[account][jid]: - rooms2.append((jid, account)) - r_jids.append(jid) + if bookmark.jid not in app.gc_connected[account] or not \ + app.gc_connected[account][bookmark.jid]: + rooms2.append((bookmark.jid, account)) + r_jids.append(bookmark.jid) if not rooms2: return @@ -736,7 +735,7 @@ def get_groupchat_menu(control_id, account, jid): def get_bookmarks_menu(account, rebuild=False): con = app.connections[account] - boomarks = con.get_module('Bookmarks').get_sorted_bookmarks(short_name=True) + bookmarks = con.get_module('Bookmarks').get_sorted_bookmarks(short_name=True) menu = Gio.Menu() @@ -749,19 +748,17 @@ def get_bookmarks_menu(account, rebuild=False): # Build Bookmarks section = Gio.Menu() - for jid, bookmark in boomarks.items(): - name = bookmark['name'] - + for bookmark in bookmarks: action = 'app.{}-activate-bookmark'.format(account) - menuitem = Gio.MenuItem.new(name, action) + menuitem = Gio.MenuItem.new(bookmark.name, action) # Create Variant Dict dict_ = {'account': GLib.Variant('s', account), - 'jid': GLib.Variant('s', jid)} - if bookmark['nick']: - dict_['nick'] = GLib.Variant('s', bookmark['nick']) - if bookmark['password']: - dict_['password'] = GLib.Variant('s', bookmark['password']) + 'jid': GLib.Variant('s', bookmark.jid)} + if bookmark.nick: + dict_['nick'] = GLib.Variant('s', bookmark.nick) + if bookmark.password: + dict_['password'] = GLib.Variant('s', bookmark.password) variant_dict = GLib.Variant('a{sv}', dict_) menuitem.set_action_and_target_value(action, variant_dict) ===================================== gajim/roster_window.py ===================================== @@ -2706,9 +2706,9 @@ class RosterWindow: ### FIXME: order callbacks in itself... ################################################################################ - def on_bookmark_menuitem_activate(self, widget, account, jid, bookmark): + def on_bookmark_menuitem_activate(self, widget, account, bookmark): app.interface.join_gc_room( - account, jid, bookmark['nick'], bookmark['password']) + account, bookmark.jid, bookmark.nick, bookmark.password) def on_info(self, widget, contact, account): """ @@ -5421,15 +5421,13 @@ class RosterWindow: bookmarks = con.get_module('Bookmarks').get_sorted_bookmarks( short_name=True) - for jid, bookmark in bookmarks.items(): - name = bookmark['name'] - + for bookmark in bookmarks: # Do not use underline. - item = Gtk.MenuItem.new_with_label(name) + item = Gtk.MenuItem.new_with_label(bookmark.name) item.set_use_underline(False) item.connect( 'activate', self.on_bookmark_menuitem_activate, - account, jid, bookmark) + account, bookmark) gc_sub_menu.append(item) def show_appropriate_context_menu(self, event, iters): View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/cef5b04d82b9c3c9ab57379102511916f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/cef5b04d82b9c3c9ab57379102511916f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Add Bookmarks (XEP-0048) module
by Philipp Hörist 04 Feb '19

04 Feb '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: d142c6f0 by Philipp Hörist at 2019-02-04T20:57:54Z Add Bookmarks (XEP-0048) module - - - - - 6 changed files: - nbxmpp/const.py - nbxmpp/dispatcher_nb.py - + nbxmpp/modules/bookmarks.py - nbxmpp/modules/pubsub.py - nbxmpp/structs.py - nbxmpp/util.py Changes: ===================================== nbxmpp/const.py ===================================== @@ -285,6 +285,11 @@ class Error(Enum): return self.value +class BookmarkStoreType(Enum): + PUBSUB = 'pubsub' + PRIVATE = 'private' + + MOODS = [ 'afraid', 'amazed', ===================================== nbxmpp/dispatcher_nb.py ===================================== @@ -62,6 +62,7 @@ from nbxmpp.modules.tune import Tune from nbxmpp.modules.mood import Mood from nbxmpp.modules.location import Location from nbxmpp.modules.user_avatar import UserAvatar +from nbxmpp.modules.bookmarks import Bookmarks from nbxmpp.modules.misc import unwrap_carbon from nbxmpp.modules.misc import unwrap_mam from nbxmpp.util import get_properties_struct @@ -191,6 +192,7 @@ class XMPPDispatcher(PlugIn): self._modules['Tune'] = Tune(self._owner) self._modules['Location'] = Location(self._owner) self._modules['UserAvatar'] = UserAvatar(self._owner) + self._modules['Bookmarks'] = Bookmarks(self._owner) for instance in self._modules.values(): for handler in instance.handlers: ===================================== nbxmpp/modules/bookmarks.py ===================================== @@ -0,0 +1,190 @@ +# Copyright (C) 2018 Philipp Hörist <philipp AT hoerist.com> +# +# This file is part of nbxmpp. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 3 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; If not, see <http://www.gnu.org/licenses/>. + +import logging + +from nbxmpp.protocol import NS_BOOKMARKS +from nbxmpp.protocol import NS_PUBSUB_EVENT +from nbxmpp.protocol import NS_PRIVATE +from nbxmpp.protocol import isResultNode +from nbxmpp.protocol import Node +from nbxmpp.protocol import Iq +from nbxmpp.structs import StanzaHandler +from nbxmpp.structs import BookmarkData +from nbxmpp.const import BookmarkStoreType +from nbxmpp.util import from_xs_boolean +from nbxmpp.util import to_xs_boolean +from nbxmpp.util import validate_jid +from nbxmpp.util import call_on_response +from nbxmpp.util import callback +from nbxmpp.modules.pubsub import get_pubsub_item +from nbxmpp.modules.pubsub import get_pubsub_request +from nbxmpp.modules.pubsub import get_bookmark_publish_options + +log = logging.getLogger('nbxmpp.m.bookmarks') + + +class Bookmarks: + def __init__(self, client): + self._client = client + self.handlers = [ + StanzaHandler(name='message', + callback=self._process_pubsub_bookmarks, + ns=NS_PUBSUB_EVENT, + priority=16), + ] + + def _process_pubsub_bookmarks(self, _con, _stanza, properties): + if not properties.is_pubsub_event: + return + + if properties.pubsub_event.node != NS_BOOKMARKS: + return + + item = properties.pubsub_event.item + + bookmarks = [] + storage_node = item.getTag('storage', namespace=NS_BOOKMARKS) + if storage_node.getChildren(): + bookmarks = self._parse_bookmarks(storage_node) + + pubsub_event = properties.pubsub_event._replace(data=bookmarks) + log.info('Received bookmarks from: %s', properties.jid) + for bookmark in bookmarks: + log.info(bookmark) + + properties.pubsub_event = pubsub_event + + @staticmethod + def _parse_bookmarks(storage): + bookmarks = [] + confs = storage.getTags('conference') + for conf in confs: + autojoin = conf.getAttr('autojoin') + if autojoin is None: + autojoin = False + else: + try: + autojoin = from_xs_boolean(autojoin) + except ValueError as error: + log.warning(error) + log.warning(storage) + autojoin = False + + try: + jid = validate_jid(conf.getAttr('jid')) + except Exception: + log.warning('Invalid JID: %s, ignoring it', + conf.getAttr('jid')) + continue + + bookmark = BookmarkData( + jid=jid, + name=conf.getAttr('name'), + autojoin=autojoin, + password=conf.getTagData('password'), + nick=conf.getTagData('nick')) + bookmarks.append(bookmark) + + return bookmarks + + @staticmethod + def get_private_request(): + iq = Iq(typ='get') + query = iq.addChild(name='query', namespace=NS_PRIVATE) + query.addChild(name='storage', namespace=NS_BOOKMARKS) + return iq + + @call_on_response('_bookmarks_received') + def request_bookmarks(self, type_): + jid = self._client.get_bound_jid().getBare() + if type_ == BookmarkStoreType.PUBSUB: + log.info('Request bookmarks (PubSub)') + request = get_pubsub_request(jid, NS_BOOKMARKS, max_items=1) + return request, {'type_': type_} + if type_ == BookmarkStoreType.PRIVATE: + log.info('Request bookmarks (Private Storage)') + return self.get_private_request(), {'type_': type_} + + @callback + def _bookmarks_received(self, stanza, type_): + if not isResultNode(stanza): + log.info('Error: %s', stanza.getError()) + return [] + + if type_ == BookmarkStoreType.PUBSUB: + item = get_pubsub_item(stanza) + bookmarks = [] + storage_node = item.getTag('storage', namespace=NS_BOOKMARKS) + + if type_ == BookmarkStoreType.PRIVATE: + query = stanza.getQuery() + storage_node = query.getTag('storage', namespace=NS_BOOKMARKS) + + if storage_node.getChildren(): + bookmarks = self._parse_bookmarks(storage_node) + + from_ = stanza.getFrom() + if from_ is None: + from_ = self._client.get_bound_jid().getBare() + log.info('Received bookmarks from: %s', from_) + for bookmark in bookmarks: + log.info(bookmark) + return bookmarks + + @staticmethod + def _build_storage_node(bookmarks): + storage_node = Node(tag='storage', attrs={'xmlns': NS_BOOKMARKS}) + for bookmark in bookmarks: + conf_node = storage_node.addChild(name="conference") + conf_node.setAttr('jid', bookmark.jid) + conf_node.setAttr('autojoin', to_xs_boolean(bookmark.autojoin)) + if bookmark.name: + conf_node.setAttr('name', bookmark.name) + if bookmark.nick: + conf_node.setTagData('nick', bookmark.nick) + if bookmark.password: + conf_node.setTagData('password', bookmark.password) + return storage_node + + def store_bookmarks(self, bookmarks, type_): + if type_ == BookmarkStoreType.PUBSUB: + self._store_with_pubsub(bookmarks) + elif type_ == BookmarkStoreType.PRIVATE: + self._store_with_private(bookmarks) + + def _store_with_pubsub(self, bookmarks): + log.info('Store Bookmarks (PubSub)') + jid = self._client.get_bound_jid().getBare() + item = self._build_storage_node(bookmarks) + options = get_bookmark_publish_options() + self._client.get_module('PubSub').publish(jid, + NS_BOOKMARKS, + item, + id_='current', + options=options) + + @call_on_response('_on_private_store_result') + def _store_with_private(self, bookmarks): + log.info('Store Bookmarks (Private Storage)') + storage_node = self._build_storage_node(bookmarks) + return Iq('set', NS_PRIVATE, payload=storage_node) + + @staticmethod + def _on_private_store_result(_con, stanza): + if not isResultNode(stanza): + log.info('Error: %s', stanza.getError()) ===================================== nbxmpp/modules/pubsub.py ===================================== @@ -19,6 +19,9 @@ import logging from nbxmpp.protocol import NS_PUBSUB from nbxmpp.protocol import NS_PUBSUB_EVENT +from nbxmpp.protocol import NS_PUBSUB_PUBLISH_OPTIONS +from nbxmpp.protocol import NS_DATA +from nbxmpp.protocol import Node from nbxmpp.protocol import Iq from nbxmpp.protocol import isResultNode from nbxmpp.structs import StanzaHandler @@ -87,3 +90,21 @@ def get_pubsub_request(jid, node, id_=None, max_items=None): if id_ is not None: items.addChild('item', {'id': id_}) return query + + +def get_pubsub_item(stanza): + pubsub_node = stanza.getTag('pubsub') + items_node = pubsub_node.getTag('items') + return items_node.getTag('item') + + +def get_bookmark_publish_options(): + # TODO: Make generic + options = Node(NS_DATA + ' x', + attrs={'type': 'submit'}) + field = options.addChild('field', + attrs={'var': 'FORM_TYPE', 'type': 'hidden'}) + field.setTagData('value', NS_PUBSUB_PUBLISH_OPTIONS) + field = options.addChild('field', attrs={'var': 'pubsub#access_model'}) + field.setTagData('value', 'whitelist') + return options ===================================== nbxmpp/structs.py ===================================== @@ -74,6 +74,9 @@ AvatarMetaData.__new__.__defaults__ = (None,) * len(AvatarMetaData._fields) AvatarData = namedtuple('AvatarData', 'jid sha data') AvatarData.__new__.__defaults__ = (None,) * len(AvatarData._fields) +BookmarkData = namedtuple('BookmarkData', 'jid name nick autojoin password') +BookmarkData.__new__.__defaults__ = (None, None, None, None) + class TuneData(namedtuple('TuneData', 'artist length rating source title track uri')): ===================================== nbxmpp/util.py ===================================== @@ -159,11 +159,35 @@ def callback(func): @wraps(func) def func_wrapper(self, _con, stanza, **kwargs): cb = kwargs.pop('callback', None) - if cb is None: - return - if cb() is not None: - result = func(self, stanza, **kwargs) + result = func(self, stanza, **kwargs) + if cb is not None and cb() is not None: cb()(result) return func_wrapper + + +def from_xs_boolean(value): + if value in ('1', 'true', 'True'): + return True + + if value in ('0', 'false', 'False', ''): + return False + + raise ValueError('Cant convert %s to python boolean' % value) + + +def to_xs_boolean(value): + # Convert to xs:boolean ('true', 'false') + # from a python boolean (True, False) or None + if value is True: + return 'true' + + if value is False: + return 'false' + + if value is None: + return 'false' + + raise ValueError( + 'Cant convert %s to xs:boolean' % value) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/d142c6f0901f5173c2f5037cb3… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/d142c6f0901f5173c2f5037cb3… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2019