Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Port Avahi to GDBus
by Philipp Hörist 03 Mar '19

03 Mar '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: ee6f65f4 by André Apitzsch at 2019-03-03T18:41:55Z Port Avahi to GDBus fixes #9147 - - - - - 2 changed files: - gajim/common/zeroconf/zeroconf.py - gajim/common/zeroconf/zeroconf_avahi.py Changes: ===================================== gajim/common/zeroconf/zeroconf.py ===================================== @@ -38,7 +38,9 @@ class ConstantRI(IntEnum): def test_avahi(): try: - import dbus # pylint: disable=unused-variable + import gi + gi.require_version('Avahi', '0.6') + from gi.repository import Avahi # pylint: disable=unused-variable except ImportError: return False return True ===================================== gajim/common/zeroconf/zeroconf_avahi.py ===================================== @@ -17,10 +17,11 @@ import logging log = logging.getLogger('gajim.c.z.zeroconf_avahi') -try: - import dbus.exceptions -except ImportError: - pass +import gi +gi.require_version('Avahi', '0.6') +from gi.repository import Avahi +from gi.repository import Gio +from gi.repository import GLib from gajim.common.i18n import _ from gajim.common.zeroconf.zeroconf import Constant, ConstantRI @@ -45,8 +46,9 @@ class Zeroconf: self.error_CB = error_CB self.service_browser = None + self.sb_connections = [] + self.connections = {} self.domain_browser = None - self.bus = None self.server = None self.contacts = {} # all current local contacts with data self.entrygroup = None @@ -60,6 +62,15 @@ class Zeroconf: # left blank for possible later usage pass + def _call(self, proxy, method_name): + try: + output = proxy.call_sync( + method_name, None, Gio.DBusCallFlags.NONE, -1, None) + if output: + return output[0] + except GLib.Error as e: + log.debug(str(e)) + def error_callback1(self, err): log.debug('Error while resolving: %s', str(err)) @@ -70,58 +81,67 @@ class Zeroconf: self.disconnect() self.disconnected_CB() - def new_service_callback(self, interface, protocol, name, stype, domain, - flags): + def new_service_callback(self, browser, interface, protocol, name, stype, + domain, flags): log.debug('Found service %s in domain %s on %i.%i.', name, domain, interface, protocol) if not self.connected: return # synchronous resolving - self.server.ResolveService(int(interface), int(protocol), name, stype, - domain, Protocol.UNSPEC, dbus.UInt32(0), - reply_handler=self.service_resolved_callback, - error_handler=self.error_callback1) - - def remove_service_callback(self, interface, protocol, name, stype, domain, - flags): + try: + output = self.server.call_sync( + 'ResolveService', + GLib.Variant('(iisssiu)', (interface, protocol, name, stype, + domain, Protocol.UNSPEC, 0)), + Gio.DBusCallFlags.NONE, -1, None) + self.service_resolved_callback(*output) + except GLib.Error as e: + self.error_callback1(e) + + def remove_service_callback(self, browser, interface, protocol, name, + stype, domain, flags): log.debug('Service %s in domain %s on %i.%i disappeared.', name, domain, interface, protocol) if not self.connected: return - if name != self.name: - for key in list(self.contacts.keys()): - val = self.contacts[key] - if val[Constant.BARE_NAME] == name: - # try to reduce instead of delete first - resolved_info = val[Constant.RESOLVED_INFO] - if len(resolved_info) > 1: - for i, _info in enumerate(resolved_info): - if resolved_info[i][ConstantRI.INTERFACE] == interface and resolved_info[i][ConstantRI.PROTOCOL] == protocol: - del self.contacts[key][Constant.RESOLVED_INFO][i] - # if still something left, don't remove - if len(self.contacts[key][Constant.RESOLVED_INFO]) > 1: - return - del self.contacts[key] - self.remove_serviceCB(key) - return + if name == self.name: + return + + for key in list(self.contacts.keys()): + val = self.contacts[key] + if val[Constant.BARE_NAME] == name: + # try to reduce instead of delete first + resolved_info = val[Constant.RESOLVED_INFO] + if len(resolved_info) > 1: + for i, _info in enumerate(resolved_info): + if resolved_info[i][ConstantRI.INTERFACE] == interface and resolved_info[i][ConstantRI.PROTOCOL] == protocol: + del self.contacts[key][Constant.RESOLVED_INFO][i] + # if still something left, don't remove + if len(self.contacts[key][Constant.RESOLVED_INFO]) > 1: + return + del self.contacts[key] + self.remove_serviceCB(key) + return def new_service_type(self, interface, protocol, stype, domain, flags): # Are we already browsing this domain for this type? if self.service_browser: return - object_path = self.server.ServiceBrowserNew(interface, protocol, \ - stype, domain, dbus.UInt32(0)) + self.service_browser = Avahi.ServiceBrowser.new_full( + interface, protocol, stype, domain, 0) - self.service_browser = dbus.Interface(self.bus.get_object( - DBUS_NAME, object_path), - DBUS_INTERFACE_SERVICE_BROWSER) - self.service_browser.connect_to_signal('ItemNew', - self.new_service_callback) - self.service_browser.connect_to_signal('ItemRemove', - self.remove_service_callback) - self.service_browser.connect_to_signal('Failure', self.error_callback) + self.avahi_client = Avahi.Client(flags=0,) + self.avahi_client.start() + con = self.service_browser.connect('new_service', self.new_service_callback) + self.sb_connections.append(con) + con = self.service_browser.connect('removed_service', self.remove_service_callback) + self.sb_connections.append(con) + con = self.service_browser.connect('failure', self.error_callback) + self.sb_connections.append(con) + + self.service_browser.attach(self.avahi_client) def new_domain_callback(self, interface, protocol, domain, flags): if domain != 'local': @@ -142,22 +162,13 @@ class Zeroconf: return txt_dict - @staticmethod - def string_to_byte_array(s): - r = [] - - for c in s: - r.append(dbus.Byte(c)) - - return r - def dict_to_txt_array(self, txt_dict): array = [] for k, v in txt_dict.items(): item = '%s=%s' % (k, v) item = item.encode('utf-8') - array.append(self.string_to_byte_array(item)) + array.append(item) return array @@ -206,10 +217,10 @@ class Zeroconf: (interface, protocol, host, aprotocol, address, int(port)), bare_name, txt) - # different handler when resolving all contacts def service_resolved_all_callback(self, interface, protocol, name, stype, - domain, host, aprotocol, address, port, txt, flags): + domain, host, aprotocol, address, port, + txt, flags): if not self.connected: return @@ -219,41 +230,45 @@ class Zeroconf: old_contact = self.contacts[name] self.contacts[name] = old_contact[0:Constant.TXT] + (txt,) + old_contact[Constant.TXT+1:] - def service_added_callback(self): - log.debug('Service successfully added') - - def service_committed_callback(self): - log.debug('Service successfully committed') - def service_updated_callback(self): log.debug('Service successfully updated') def service_add_fail_callback(self, err): log.debug('Error while adding service. %s', str(err)) if 'Local name collision' in str(err): - alternative_name = self.server.GetAlternativeServiceName(self.username) - self.name_conflictCB(alternative_name) + alternative_name = self.server.call_sync( + 'GetAlternativeServiceName', + GLib.Variant('(s)', (self.username,)), + Gio.DBusCallFlags.NONE, -1, None) + self.name_conflictCB(alternative_name[0]) return self.error_CB(_('Error while adding service. %s') % str(err)) self.disconnect() - def server_state_changed_callback(self, state, error): + def server_state_changed_callback(self, connection, sender_name, + object_path, interface_name, + signal_name, parameters): + state, _ = parameters log.debug('server state changed to %s', state) if state == ServerState.RUNNING: self.create_service() elif state in (ServerState.COLLISION, ServerState.REGISTERING): self.disconnect() - self.entrygroup.Reset() + if self.entrygroup: + self._call(self.entrygroup, 'Reset') - def entrygroup_state_changed_callback(self, state, error): + def entrygroup_state_changed_callback(self, connection, sender_name, + object_path, interface_name, + signal_name, parameters): + state, _ = parameters # the name is already present, so recreate if state == EntryGroup.COLLISION: log.debug('zeroconf.py: local name collision') self.service_add_fail_callback('Local name collision') elif state == EntryGroup.FAILURE: self.disconnect() - self.entrygroup.Reset() + self._call(self.entrygroup, 'Reset') log.debug('zeroconf.py: ENTRY_GROUP_FAILURE reached(that' ' should not happen)') @@ -272,11 +287,20 @@ class Zeroconf: try: if not self.entrygroup: # create an EntryGroup for publishing - self.entrygroup = dbus.Interface(self.bus.get_object( - DBUS_NAME, self.server.EntryGroupNew()), - DBUS_INTERFACE_ENTRY_GROUP) - self.entrygroup.connect_to_signal('StateChanged', - self.entrygroup_state_changed_callback) + object_path = self.server.call_sync( + 'EntryGroupNew', None, Gio.DBusCallFlags.NONE, -1, None) + + self.entrygroup = Gio.DBusProxy.new_for_bus_sync( + Gio.BusType.SYSTEM, Gio.DBusProxyFlags.NONE, None, + DBUS_NAME, *object_path, DBUS_INTERFACE_ENTRY_GROUP, None) + + connection = self.entrygroup.get_connection() + subscription = connection.signal_subscribe( + DBUS_NAME, DBUS_INTERFACE_ENTRY_GROUP, 'StateChanged', + *object_path, None, Gio.DBusSignalFlags.NONE, + self.entrygroup_state_changed_callback) + + self.connections[connection] = [subscription] txt = {} @@ -298,18 +322,28 @@ class Zeroconf: self.txt = txt log.debug('Publishing service %s of type %s', self.name, self.stype) - self.entrygroup.AddService(Interface.UNSPEC, - Protocol.UNSPEC, dbus.UInt32(0), self.name, self.stype, '', - '', dbus.UInt16(self.port), self.avahi_txt(), - reply_handler=self.service_added_callback, - error_handler=self.service_add_fail_callback) - self.entrygroup.Commit(reply_handler=self.service_committed_callback, - error_handler=self.entrygroup_commit_error_CB) + try: + self.entrygroup.call_sync( + 'AddService', + GLib.Variant('(iiussssqaay)', (Interface.UNSPEC, + Protocol.UNSPEC, 0, + self.name, self.stype, '', + '', self.port, + self.avahi_txt())), + Gio.DBusCallFlags.NONE, -1, None) + except GLib.Error as e: + self.service_add_fail_callback(e) + return False + + try: + self.entrygroup.call_sync('Commit', None, + Gio.DBusCallFlags.NONE, -1, None) + except GLib.Error as e: + self.entrygroup_commit_error_CB(e) return True - - except dbus.DBusException as e: + except GLib.Error as e: log.debug(str(e)) return False @@ -317,8 +351,10 @@ class Zeroconf: if not self.connected: return False - state = self.server.GetState() - if state == ServerState.RUNNING: + state = self.server.call_sync( + 'GetState', None, Gio.DBusCallFlags.NONE, -1, None) + + if state[0] == ServerState.RUNNING: if self.create_service(): self.announced = True return True @@ -327,54 +363,46 @@ class Zeroconf: def remove_announce(self): if self.announced is False: return False - try: - if self.entrygroup.GetState() != EntryGroup.FAILURE: - self.entrygroup.Reset() - self.entrygroup.Free() - # .Free() has mem leaks - self.entrygroup._obj._bus = None - self.entrygroup._obj = None - self.entrygroup = None - self.announced = False - return True - return False - except dbus.DBusException: - log.debug("Can't remove service. That should not happen") + if self._call(self.entrygroup, 'GetState') != EntryGroup.FAILURE: + self._call(self.entrygroup, 'Reset') + self._call(self.entrygroup, 'Free') + self.entrygroup = None + self.announced = False + + return True + return False def browse_domain(self, interface, protocol, domain): self.new_service_type(interface, protocol, self.stype, domain, '') - def avahi_dbus_connect_cb(self, a, connect, disconnect): - if connect != "": - log.debug('Lost connection to avahi-daemon') - self.disconnect() - if self.disconnected_CB: - self.disconnected_CB() - else: - log.debug('We are connected to avahi-daemon') + def avahi_dbus_connect_cb(self, connection, sender_name, object_path, + interface_name, signal_name, parameters): + name, oldOwner, newOwner = parameters + if name == DBUS_NAME: + if newOwner and not oldOwner: + log.debug('We are connected to avahi-daemon') + else: + log.debug('Lost connection to avahi-daemon') + self.disconnect() + if self.disconnected_CB: + self.disconnected_CB() # connect to dbus def connect_dbus(self): try: - import dbus # pylint: disable=redefined-outer-name - from dbus.mainloop.glib import DBusGMainLoop - main_loop = DBusGMainLoop(set_as_default=True) - dbus.set_default_main_loop(main_loop) - except ImportError: - log.debug('Error: python-dbus needs to be installed. No ' - 'zeroconf support.') - return False - if self.bus: - return True - try: - self.bus = dbus.SystemBus() - self.bus.add_signal_receiver(self.avahi_dbus_connect_cb, - 'NameOwnerChanged', 'org.freedesktop.DBus', - arg0='org.freedesktop.Avahi') - except Exception as e: - # System bus is not present - self.bus = None + proxy = Gio.DBusProxy.new_for_bus_sync( + Gio.BusType.SYSTEM, Gio.DBusProxyFlags.NONE, None, + 'org.freedesktop.DBus', '/org/freedesktop/DBus', + 'org.freedesktop.DBus', None) + + connection = proxy.get_connection() + subscription = connection.signal_subscribe( + 'org.freedesktop.DBus', 'org.freedesktop.DBus', + 'NameOwnerChanged', '/org/freedesktop/DBus', None, + Gio.DBusSignalFlags.NONE, self.avahi_dbus_connect_cb) + self.connections[connection] = [subscription] + except GLib.Error as e: log.debug(str(e)) return False else: @@ -388,10 +416,15 @@ class Zeroconf: if self.server: return True try: - self.server = dbus.Interface(self.bus.get_object(DBUS_NAME, - DBUS_PATH_SERVER), DBUS_INTERFACE_SERVER) - self.server.connect_to_signal('StateChanged', - self.server_state_changed_callback) + self.server = Gio.DBusProxy.new_for_bus_sync( + Gio.BusType.SYSTEM, Gio.DBusProxyFlags.NONE, None, + DBUS_NAME, '/', DBUS_INTERFACE_SERVER, None) + + connection = self.server.get_connection() + subscription = connection.signal_subscribe( + DBUS_NAME, DBUS_INTERFACE_SERVER, 'StateChanged', '/', None, + Gio.DBusSignalFlags.NONE, self.server_state_changed_callback) + self.connections[connection] = [subscription] except Exception as e: # Avahi service is not present self.server = None @@ -413,14 +446,28 @@ class Zeroconf: Interface.UNSPEC, Protocol.UNSPEC, 'local') # Browse for other browsable domains - self.domain_browser = dbus.Interface(self.bus.get_object( - DBUS_NAME, self.server.DomainBrowserNew( - Interface.UNSPEC, Protocol.UNSPEC, '', - DomainBrowser.BROWSE, dbus.UInt32(0))), - DBUS_INTERFACE_DOMAIN_BROWSER) - self.domain_browser.connect_to_signal('ItemNew', - self.new_domain_callback) - self.domain_browser.connect_to_signal('Failure', self.error_callback) + object_path = self.server.call_sync( + 'DomainBrowserNew', + GLib.Variant('(iisiu)', (Interface.UNSPEC, Protocol.UNSPEC, '', + DomainBrowser.BROWSE, 0)), + Gio.DBusCallFlags.NONE, -1, None) + + self.domain_browser = Gio.DBusProxy.new_for_bus_sync( + Gio.BusType.SYSTEM, Gio.DBusProxyFlags.NONE, None, DBUS_NAME, + *object_path, DBUS_INTERFACE_DOMAIN_BROWSER, None) + + connection = self.domain_browser.get_connection() + subscription = connection.signal_subscribe( + DBUS_NAME, DBUS_INTERFACE_DOMAIN_BROWSER, 'ItemNew', + *object_path, None, Gio.DBusSignalFlags.NONE, + self.new_domain_callback) + self.connections[connection] = [subscription] + + subscription = connection.signal_subscribe( + DBUS_NAME, DBUS_INTERFACE_DOMAIN_BROWSER, 'Failure', + *object_path, None, Gio.DBusSignalFlags.NONE, + self.error_callback) + self.connections[connection].append(subscription) else: self.browse_domain( Interface.UNSPEC, Protocol.UNSPEC, self.domain) @@ -430,23 +477,14 @@ class Zeroconf: def disconnect(self): if self.connected: self.connected = False - if self.service_browser: - try: - self.service_browser.Free() - except dbus.DBusException as e: - log.debug(str(e)) - self.service_browser._obj._bus = None - self.service_browser._obj = None + for connection, subscriptions in self.connections.items(): + for subscription in subscriptions: + connection.signal_unsubscribe(subscription) + for con in self.sb_connections: + self.service_browser.disconnect(con) if self.domain_browser: - try: - self.domain_browser.Free() - except dbus.DBusException as e: - log.debug(str(e)) - self.domain_browser._obj._bus = None - self.domain_browser._obj = None + self._call(self.domain_browser, 'Free') self.remove_announce() - self.server._obj._bus = None - self.server._obj = None self.server = None self.service_browser = None self.domain_browser = None @@ -459,11 +497,16 @@ class Zeroconf: # get txt data from last recorded resolved info # TODO: Better try to get it from last IPv6 mDNS, then last IPv4? ri = val[Constant.RESOLVED_INFO][0] - self.server.ResolveService(int(ri[ConstantRI.INTERFACE]), int(ri[ConstantRI.PROTOCOL]), - val[Constant.BARE_NAME], self.stype, val[Constant.DOMAIN], - Protocol.UNSPEC, dbus.UInt32(0), - reply_handler=self.service_resolved_all_callback, - error_handler=self.error_callback) + output = self.server.call_sync( + 'ResolveService', + GLib.Variant('(iisssiu)', (ri[ConstantRI.INTERFACE], ri[ConstantRI.PROTOCOL], + val[Constant.BARE_NAME], self.stype, val[Constant.DOMAIN], + Protocol.UNSPEC, 0)), + Gio.DBusCallFlags.NONE, + -1, + None + ) + self.service_resolved_all_callback(*output) return True @@ -481,12 +524,16 @@ class Zeroconf: txt = self.avahi_txt() if self.connected and self.entrygroup: - self.entrygroup.UpdateServiceTxt(Interface.UNSPEC, - Protocol.UNSPEC, dbus.UInt32(0), self.name, self.stype, '', - txt, reply_handler=self.service_updated_callback, - error_handler=self.error_callback) + try: + self.entrygroup.call_sync( + 'UpdateServiceTxt', + GLib.Variant('(iiusssaay)', (Interface.UNSPEC, + Protocol.UNSPEC, 0, self.name, + self.stype, '', txt)), + Gio.DBusCallFlags.NONE, -1, None) + except GLib.Error as e: + self.error_callback(e) + return False + return True return False - - -# END Zeroconf View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ee6f65f404868559a748c8acaec3a30012… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ee6f65f404868559a748c8acaec3a30012… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix imports
by Philipp Hörist 03 Mar '19

03 Mar '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 94eef409 by Philipp Hörist at 2019-03-03T18:40:39Z Fix imports dispatcher_nb was renamed in nbxmpp - - - - - 4 changed files: - gajim/common/connection.py - gajim/common/zeroconf/client_zeroconf.py - test/broken/unit/test_jingle.py - test/broken/unit/test_socks5.py Changes: ===================================== gajim/common/connection.py ===================================== @@ -1071,7 +1071,7 @@ class Connection(CommonConnection, ConnectionHandlers): con.set_resume_data(self._sm_resume_data) # increase default timeout for server responses - nbxmpp.dispatcher_nb.DEFAULT_TIMEOUT_SECONDS = \ + nbxmpp.dispatcher.DEFAULT_TIMEOUT_SECONDS = \ self.try_connecting_for_foo_secs # FIXME: this is a hack; need a better way if self.on_connect_success == self._on_new_account: # pylint: disable=comparison-with-callable ===================================== gajim/common/zeroconf/client_zeroconf.py ===================================== @@ -26,7 +26,7 @@ from random import Random from unittest.mock import Mock import nbxmpp -from nbxmpp import dispatcher_nb +from nbxmpp import dispatcher from nbxmpp import simplexml from nbxmpp.structs import StanzaHandler from nbxmpp.plugin import PlugIn @@ -231,7 +231,7 @@ class P2PClient(IdleObject): def on_connect(self, conn): self.Connection = conn self.Connection.PlugIn(self) - dispatcher_nb.Dispatcher().PlugIn(self) + dispatcher.Dispatcher().PlugIn(self) self._register_handlers() def StreamInit(self): ===================================== test/broken/unit/test_jingle.py ===================================== @@ -1,5 +1,5 @@ ''' -Tests for dispatcher_nb.py +Tests for dispatcher.py ''' import unittest @@ -9,7 +9,7 @@ lib.setup_env() from mock import Mock from gajim.common.protocol.bytestream import ConnectionIBBytestream, ConnectionSocks5Bytestream -from nbxmpp import dispatcher_nb +from nbxmpp import dispatcher from nbxmpp import protocol from gajim.common.jingle import ConnectionJingle from gajim.common import app @@ -79,7 +79,7 @@ class Connection(Mock, ConnectionJingle, ConnectionSocks5Bytestream, class TestJingle(unittest.TestCase): def setUp(self): - self.dispatcher = dispatcher_nb.XMPPDispatcher() + self.dispatcher = dispatcher.XMPPDispatcher() app.nec = Mock() app.socks5queue = SocksQueue(Mock()) # Setup mock client ===================================== test/broken/unit/test_socks5.py ===================================== @@ -1,5 +1,5 @@ ''' -Tests for dispatcher_nb.py +Tests for dispatcher.py ''' import unittest View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/94eef409db9ac5395e041de098faeee070… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/94eef409db9ac5395e041de098faeee070… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 7 commits: Remove suffix from roster_nb
by Philipp Hörist 03 Mar '19

03 Mar '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 2d5a41fe by André Apitzsch at 2019-02-06T22:23:24Z Remove suffix from roster_nb - - - - - 6ce27515 by André Apitzsch at 2019-02-06T22:37:13Z Remove suffix from client_nb - - - - - d3df75cb by André Apitzsch at 2019-02-06T22:41:15Z Remove suffix from features_nb - - - - - faf5cd48 by André Apitzsch at 2019-02-06T22:48:09Z Remove suffix from dispatcher_nb - - - - - e63e4723 by André Apitzsch at 2019-02-06T22:52:38Z Remove suffix from tls_nb - - - - - 09b64b9f by André Apitzsch at 2019-02-06T23:01:07Z Remove suffix from transports_nb - - - - - fe2e49d2 by Philipp Hörist at 2019-03-03T18:29:29Z Merge branch 'removeSuffix' into 'master' Remove "_nb" suffix See merge request gajim/python-nbxmpp!30 - - - - - 16 changed files: - nbxmpp/__init__.py - nbxmpp/bosh.py - nbxmpp/client_nb.py → nbxmpp/client.py - nbxmpp/dispatcher_nb.py → nbxmpp/dispatcher.py - nbxmpp/features_nb.py → nbxmpp/features.py - nbxmpp/proxy_connectors.py - nbxmpp/roster_nb.py → nbxmpp/roster.py - nbxmpp/smacks.py - nbxmpp/tls_nb.py → nbxmpp/tls.py - nbxmpp/transports_nb.py → nbxmpp/transports.py - test/broken/test_xmpp_smacks.py - test/unit/test_xml_vulnerability.py - test/unit/test_xmpp_client_nb.py → test/unit/test_xmpp_client.py - test/unit/test_xmpp_dispatcher_nb.py → test/unit/test_xmpp_dispatcher.py - test/unit/test_xmpp_transports_nb.py → test/unit/test_xmpp_transports.py - test/unit/test_xmpp_transports_nb2.py → test/unit/test_xmpp_transports2.py Changes: ===================================== nbxmpp/__init__.py ===================================== @@ -9,9 +9,9 @@ Thanks and credits to the xmpppy developers. See: http://xmpppy.sourceforge.net/ """ from .protocol import * -from . import simplexml, protocol, auth, transports_nb, roster_nb -from . import dispatcher_nb, features_nb, idlequeue, bosh, tls_nb, proxy_connectors -from .client_nb import NonBlockingClient +from . import simplexml, protocol, auth, transports, roster +from . import dispatcher, features, idlequeue, bosh, tls, proxy_connectors +from .client import NonBlockingClient from .plugin import PlugIn from .smacks import Smacks ===================================== nbxmpp/bosh.py ===================================== @@ -23,7 +23,7 @@ import locale import logging from hashlib import sha1 -from .transports_nb import NonBlockingTransport, NonBlockingHTTPBOSH,\ +from .transports import NonBlockingTransport, NonBlockingHTTPBOSH,\ CONNECTED, CONNECTING, DISCONNECTED, DISCONNECTING,\ urisplit, DISCONNECT_TIMEOUT_SECONDS from .protocol import BOSHBody, Protocol, NS_CLIENT ===================================== nbxmpp/client_nb.py → nbxmpp/client.py ===================================== @@ -1,5 +1,4 @@ -## client_nb.py -## based on client.py, changes backported up to revision 1.60 +## client.py ## ## Copyright (C) 2003-2005 Alexey "Snake" Nezhdanov ## modified by Dimitur Kirov <dkirov(a)gmail.com> @@ -21,7 +20,7 @@ Client class establishes connection to XMPP Server and handles authentication import socket import logging -from . import transports_nb, dispatcher_nb, roster_nb, protocol, bosh +from . import transports, dispatcher, roster, protocol, bosh from .protocol import NS_TLS from .protocol import JID from .auth import SASL @@ -31,7 +30,7 @@ from .const import Realm from .const import Event -log = logging.getLogger('nbxmpp.client_nb') +log = logging.getLogger('nbxmpp.client') class NonBlockingClient: @@ -207,7 +206,7 @@ class NonBlockingClient: 'tls' - TLS established after negotiation with starttls, or 'plain'. cacerts, mycerts, tls_version, cipher_list, alpn - see tls_nb.NonBlockingTLS constructor for more details + see tls.NonBlockingTLS constructor for more details """ self.on_connect = on_connect self.on_connect_failure=on_connect_failure @@ -244,7 +243,7 @@ class NonBlockingClient: # tcp_host is hostname of machine used for socket connection # (DNS request will be done for proxy or BOSH CM hostname) tcp_host, tcp_port, proxy_user, proxy_pass = \ - transports_nb.get_proxy_data_from_dict(proxy) + transports.get_proxy_data_from_dict(proxy) if proxy['type'] == 'bosh': # Setup BOSH transport @@ -271,7 +270,7 @@ class NonBlockingClient: if not proxy or proxy['type'] != 'bosh': # Setup ordinary TCP transport - self.socket = transports_nb.NonBlockingTCP.get_instance( + self.socket = transports.NonBlockingTCP.get_instance( on_disconnect=self.disconnect, raise_event=self.raise_event, idlequeue=self.idlequeue, @@ -377,7 +376,7 @@ class NonBlockingClient: if 'Dispatcher' in self.__dict__: self.Dispatcher.PlugOut() self.got_features = False - dispatcher_nb.Dispatcher.get_instance().PlugIn(self) + dispatcher.Dispatcher.get_instance().PlugIn(self) on_next_receive('RECEIVE_DOCUMENT_ATTRIBUTES') elif mode == 'FAILURE': @@ -572,7 +571,7 @@ class NonBlockingClient: Plug in the roster """ if 'NonBlockingRoster' not in self.__dict__: - return roster_nb.NonBlockingRoster.get_instance( + return roster.NonBlockingRoster.get_instance( version=version).PlugIn(self, request=request) def getRoster(self, on_ready=None, force=False): @@ -591,8 +590,8 @@ class NonBlockingClient: """ if requestRoster: # FIXME: used somewhere? - roster_nb.NonBlockingRoster.get_instance().PlugIn(self) - self.send(dispatcher_nb.Presence(to=jid, typ=typ)) + roster.NonBlockingRoster.get_instance().PlugIn(self) + self.send(dispatcher.Presence(to=jid, typ=typ)) ############################################################################### ### following methods are moved from blocking client class of xmpppy ===================================== nbxmpp/dispatcher_nb.py → nbxmpp/dispatcher.py ===================================== @@ -1,5 +1,4 @@ -## dispatcher_nb.py -## based on dispatcher.py +## dispatcher.py ## ## Copyright (C) 2003-2005 Alexey "Snake" Nezhdanov ## modified by Dimitur Kirov <dkirov(a)gmail.com> @@ -72,7 +71,7 @@ from nbxmpp.modules.misc import unwrap_mam from nbxmpp.util import get_properties_struct -log = logging.getLogger('nbxmpp.dispatcher_nb') +log = logging.getLogger('nbxmpp.dispatcher') #: default timeout to wait for response for our id DEFAULT_TIMEOUT_SECONDS = 25 ===================================== nbxmpp/features_nb.py → nbxmpp/features.py ===================================== ===================================== nbxmpp/proxy_connectors.py ===================================== @@ -1,5 +1,4 @@ ## proxy_connectors.py -## based on transports_nb.py ## ## Copyright (C) 2003-2004 Alexey "Snake" Nezhdanov ## modified by Dimitur Kirov <dkirov(a)gmail.com> ===================================== nbxmpp/roster_nb.py → nbxmpp/roster.py ===================================== @@ -1,5 +1,4 @@ -## roster_nb.py -## based on roster.py +## roster.py ## ## Copyright (C) 2003-2005 Alexey "Snake" Nezhdanov ## modified by Dimitur Kirov <dkirov(a)gmail.com> @@ -25,7 +24,7 @@ from .protocol import JID, Iq, Presence, Node, NS_MUC_USER, NS_ROSTER from .plugin import PlugIn -log = logging.getLogger('nbxmpp.roster_nb') +log = logging.getLogger('nbxmpp.roster') class NonBlockingRoster(PlugIn): ===================================== nbxmpp/smacks.py ===================================== @@ -21,7 +21,7 @@ import logging from nbxmpp.protocol import NS_STREAM_MGMT from nbxmpp.protocol import NS_DELAY2 from nbxmpp.simplexml import Node -from nbxmpp.transports_nb import DISCONNECTING +from nbxmpp.transports import DISCONNECTING from nbxmpp.plugin import PlugIn from nbxmpp.const import Realm from nbxmpp.const import Event ===================================== nbxmpp/tls_nb.py → nbxmpp/tls.py ===================================== @@ -1,5 +1,4 @@ -## tls_nb.py -## based on transports_nb.py +## tls.py ## ## Copyright (C) 2003-2004 Alexey "Snake" Nezhdanov ## modified by Dimitur Kirov <dkirov(a)gmail.com> @@ -23,7 +22,7 @@ import logging from .plugin import PlugIn -log = logging.getLogger('nbxmpp.tls_nb') +log = logging.getLogger('nbxmpp.tls') PYOPENSSL = 'PYOPENSSL' ===================================== nbxmpp/transports_nb.py → nbxmpp/transports.py ===================================== @@ -1,5 +1,4 @@ -## transports_nb.py -## based on transports.py +## transports.py ## ## Copyright (C) 2003-2004 Alexey "Snake" Nezhdanov ## modified by Dimitur Kirov <dkirov(a)gmail.com> @@ -37,9 +36,9 @@ from urllib.parse import urlparse from .plugin import PlugIn from .idlequeue import IdleObject from . import proxy_connectors -from . import tls_nb +from . import tls -log = logging.getLogger('nbxmpp.transports_nb') +log = logging.getLogger('nbxmpp.transports') def urisplit(uri): """ @@ -130,7 +129,7 @@ class NonBlockingTransport(PlugIn): :param estabilish_tls: boolean whether to estabilish TLS connection after TCP connection is done :param certs: tuple of (cacerts, mycerts) see constructor - of tls_nb.NonBlockingTLS for more details + of tls.NonBlockingTLS for more details :param tls_version: The lowest supported TLS version. :param cipher_list: list of ciphers used to connect to server """ @@ -429,7 +428,7 @@ class NonBlockingTCP(NonBlockingTransport, IdleObject): NonBlockingTLS module """ cacerts, mycerts = self.certs - result = tls_nb.NonBlockingTLS.get_instance(cacerts, mycerts, + result = tls.NonBlockingTLS.get_instance(cacerts, mycerts, self.tls_version, self.cipher_list, self.alpn).PlugIn(self) if result: on_succ() @@ -607,7 +606,7 @@ class NonBlockingTCP(NonBlockingTransport, IdleObject): try: # get as many bites, as possible, but not more than RECV_BUFSIZE received = self._recv(RECV_BUFSIZE) - except tls_nb.SSLWrapper.Error as e: + except tls.SSLWrapper.Error as e: log.info("_do_receive, caught SSL error, got %s:" % received, exc_info=True) errnum, errstr = e.errno,\ @@ -619,7 +618,7 @@ class NonBlockingTCP(NonBlockingTransport, IdleObject): errstr = 'zero bytes on recv' if (self.ssl_lib is None and received == '') or \ - (self.ssl_lib == tls_nb.PYOPENSSL and errnum == -1 ): + (self.ssl_lib == tls.PYOPENSSL and errnum == -1 ): # -1 in pyopenssl: errstr == Unexpected EOF log.info("Disconnected by remote server: #%s, %s" % (errnum, errstr)) self.on_remote_disconnect() ===================================== test/broken/test_xmpp_smacks.py ===================================== @@ -4,7 +4,7 @@ Tests for smacks.py Stream Management import unittest from unittest.mock import Mock -from nbxmpp import dispatcher_nb +from nbxmpp import dispatcher from nbxmpp import protocol from nbxmpp import smacks @@ -14,7 +14,7 @@ class TestDispatcherNB(unittest.TestCase): into a mock client ''' def setUp(self): - self.dispatcher = dispatcher_nb.XMPPDispatcher() + self.dispatcher = dispatcher.XMPPDispatcher() # Setup mock client self.client = Mock() ===================================== test/unit/test_xml_vulnerability.py ===================================== @@ -1,7 +1,7 @@ import unittest from unittest.mock import Mock -from nbxmpp import dispatcher_nb +from nbxmpp import dispatcher class XMLVulnerability(unittest.TestCase): @@ -9,7 +9,7 @@ class XMLVulnerability(unittest.TestCase): def setUp(self): self.client = Mock() self.client.Connection = Mock() - self.dispatcher = dispatcher_nb.XMPPDispatcher() + self.dispatcher = dispatcher.XMPPDispatcher() self.dispatcher.PlugIn(self.client) self.dispatcher.StreamInit() ===================================== test/unit/test_xmpp_client_nb.py → test/unit/test_xmpp_client.py ===================================== @@ -1,5 +1,5 @@ ''' -Testing script for NonBlockingClient class (src/common/xmpp/client_nb.py) +Testing script for NonBlockingClient class (nbxmpp/client.py) It actually connects to a xmpp server. ''' @@ -9,7 +9,7 @@ from unittest.mock import Mock from test.lib.xmpp_mocks import MockConnection, IdleQueueThread -from nbxmpp import client_nb +from nbxmpp import client # (XMPP server hostname, c2s port). Script will connect to the machine. xmpp_server_port = ('gajim.org', 5222) @@ -54,7 +54,7 @@ class TestNonBlockingClient(unittest.TestCase): def on_connect_failure(self): pass - self.client = client_nb.NonBlockingClient( + self.client = client.NonBlockingClient( domain=server_port[0], idlequeue=self.idlequeue_thread.iq, caller=Mock(spec=TempConnection)) ===================================== test/unit/test_xmpp_dispatcher_nb.py → test/unit/test_xmpp_dispatcher.py ===================================== @@ -1,12 +1,12 @@ ''' -Tests for dispatcher_nb.py +Tests for dispatcher.py ''' import unittest from unittest.mock import Mock from test import lib -from nbxmpp import dispatcher_nb +from nbxmpp import dispatcher from nbxmpp import protocol from nbxmpp.protocol import JID @@ -17,7 +17,7 @@ class TestDispatcherNB(unittest.TestCase): into a mock client ''' def setUp(self): - self.dispatcher = dispatcher_nb.XMPPDispatcher() + self.dispatcher = dispatcher.XMPPDispatcher() # Setup mock client self.client = Mock() ===================================== test/unit/test_xmpp_transports_nb.py → test/unit/test_xmpp_transports.py ===================================== @@ -4,7 +4,7 @@ Unit test for tranports classes. import unittest -from nbxmpp import transports_nb +from nbxmpp import transports class TestModuleLevelFunctions(unittest.TestCase): @@ -13,7 +13,7 @@ class TestModuleLevelFunctions(unittest.TestCase): ''' def test_urisplit(self): def check_uri(uri, proto, host, port, path): - _proto, _host, _port, _path = transports_nb.urisplit(uri) + _proto, _host, _port, _path = transports.urisplit(uri) self.assertEqual(proto, _proto) self.assertEqual(host, _host) self.assertEqual(path, _path) @@ -30,7 +30,7 @@ class TestModuleLevelFunctions(unittest.TestCase): def test_get_proxy_data_from_dict(self): def check_dict(proxy_dict, host, port, user, passwd): - _host, _port, _user, _passwd = transports_nb.get_proxy_data_from_dict( + _host, _port, _user, _passwd = transports.get_proxy_data_from_dict( proxy_dict) self.assertEqual(_host, host) self.assertEqual(_port, port) ===================================== test/unit/test_xmpp_transports_nb2.py → test/unit/test_xmpp_transports2.py ===================================== @@ -7,7 +7,7 @@ import unittest import socket from test.lib.xmpp_mocks import IdleQueueThread, IdleMock -from nbxmpp import transports_nb +from nbxmpp import transports class AbstractTransportTest(unittest.TestCase): @@ -72,7 +72,7 @@ class TestNonBlockingTCP(AbstractTransportTest): except socket.error as e: self.testcase.fail(msg=str(e)) - self.socket = transports_nb.NonBlockingTCP( + self.socket = transports.NonBlockingTCP( raise_event=lambda event_type, data: self.testcase.assertTrue( event_type and data), on_disconnect=lambda: self.on_success(mode='SocketDisconnect'), @@ -210,7 +210,7 @@ class TestNonBlockingHTTP(AbstractTransportTest): } def _get_transport(self, http_dict, proxy_dict=None): - return transports_nb.NonBlockingHTTP( + return transports.NonBlockingHTTP( raise_event=None, on_disconnect=None, idlequeue=self.idlequeue_thread.iq, View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/7d1b7f39a865ccc6544440f5e… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/7d1b7f39a865ccc6544440f5e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Make passwords module more resilient
by Philipp Hörist 02 Mar '19

02 Mar '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: c58c7cc4 by Philipp Hörist at 2019-03-02T18:59:27Z Make passwords module more resilient - Catch more exceptions - Add more log output - - - - - 2 changed files: - gajim/common/passwords.py - gajim/config.py Changes: ===================================== gajim/common/passwords.py ===================================== @@ -35,7 +35,7 @@ try: KEYRING_AVAILABLE = True except ImportError: KEYRING_AVAILABLE = False - log.debug('python-keyring missing, falling back to plaintext storage') + log.warning('python-keyring missing, falling back to plaintext storage') class PasswordStorage: @@ -58,24 +58,32 @@ class SecretPasswordStorage(PasswordStorage): def __init__(self): self.keyring = keyring.get_keyring() - log.info('Chose %s backend', self.keyring) + log.info('Select %s backend', self.keyring) def save_password(self, account_name, password): try: + log.info('Save password to keyring') self.keyring.set_password('gajim', account_name, password) return True - except Exception as error: - log.warning('Save password failed') - log.debug(error) + except Exception: + log.exception('Save password failed') return False def get_password(self, account_name): - log.debug('getting password') - return self.keyring.get_password('gajim', account_name) + log.info('Request password from keyring') + try: + return self.keyring.get_password('gajim', account_name) + except Exception: + log.exception('Request password failed') + return def delete_password(self, account_name): - return self.keyring.delete_password('gajim', account_name) - + log.info('Remove password from keyring') + try: + return self.keyring.delete_password('gajim', account_name) + except Exception: + log.exception('Remove password failed') + return class PasswordStorageManager(PasswordStorage): """Access all the implemented password storage backends, knowing which ones @@ -119,22 +127,23 @@ class PasswordStorageManager(PasswordStorage): if backend: pw = backend.get_password(account_name) + if backend != self.preferred_backend: # migrate password to preferred_backend self.save_password(account_name, pw) - # TODO: remove from old backend return pw def save_password(self, account_name, password): if account_name in app.connections: app.connections[account_name].password = password + if not app.config.get_per('accounts', account_name, 'savepass'): return True if self.preferred_backend: if self.preferred_backend.save_password(account_name, password): app.config.set_per('accounts', account_name, 'password', - self.preferred_backend.identifier) + self.preferred_backend.identifier) else: app.config.set_per('accounts', account_name, 'password', password) return True @@ -143,10 +152,9 @@ class PasswordStorageManager(PasswordStorage): if account_name in app.connections: app.connections[account_name].password = None - if not self.preferred_backend: + if self.preferred_backend is not None: self.preferred_backend.delete_password(account_name) - else: - app.config.set_per('accounts', account_name, 'password', None) + app.config.set_per('accounts', account_name, 'password', None) return True def set_preferred_backend(self): ===================================== gajim/config.py ===================================== @@ -31,6 +31,7 @@ from gi.repository import Gtk from gi.repository import GObject from gajim.common import app +from gajim.common import passwords from gajim.common.i18n import _ from gajim import dialogs @@ -213,6 +214,7 @@ class RemoveAccountWindow: app.interface.roster.setup_and_draw_roster() app.app.remove_account_actions(self.account) gui_menu_builder.build_accounts_menu() + passwords.delete_password(self.account) window = app.get_app_window('AccountsWindow') if window is not None: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c58c7cc4a0ff5ad237db0c3d72de0ab088… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c58c7cc4a0ff5ad237db0c3d72de0ab088… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] Redirect some print statments to stderr
by Philipp Hörist 02 Mar '19

02 Mar '19

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: c0178db7 by Philipp Hörist at 2019-03-02T09:52:30Z Redirect some print statments to stderr Otherwise they errors will not show up if the console output is redirected to a file - - - - - 3 changed files: - gajim/common/i18n.py - gajim/common/logging_helpers.py - gajim/gtkexcepthook.py Changes: ===================================== gajim/common/i18n.py ===================================== @@ -151,7 +151,7 @@ def ngettext(s_sing, s_plural, n, replace_sing=None, replace_plural=None): try: locale.setlocale(locale.LC_ALL, '') except locale.Error as error: - print(error) + print(error, file=sys.stderr) try: LANG = get_default_lang() @@ -161,7 +161,7 @@ try: os.environ['LANG'] = LANG print('Found default language: %s' % LANG) except Exception as error: - print('Failed to determine default language') + print('Failed to determine default language', file=sys.stderr) import traceback traceback.print_exc() @@ -177,6 +177,6 @@ for dir_ in iter_locale_dirs(): else: break else: - print('No translations found') - print('Dirs searched: %s' % get_locale_dirs()) + print('No translations found', file=sys.stderr) + print('Dirs searched: %s' % get_locale_dirs(), file=sys.stderr) _ = _translation.gettext ===================================== gajim/common/logging_helpers.py ===================================== @@ -28,7 +28,7 @@ def parseLogLevel(arg): return int(arg) if arg.isupper() and hasattr(logging, arg): return getattr(logging, arg) - print(_('%s is not a valid loglevel') % repr(arg)) + print(_('%s is not a valid loglevel') % repr(arg), file=sys.stderr) return 0 def parseLogTarget(arg): @@ -69,7 +69,8 @@ def parseAndSetLogLevels(arg): target = parseLogTarget(target.strip()) if target: logging.getLogger(target).setLevel(level) - print("Logger %s level set to %d" % (target, level)) + print("Logger %s level set to %d" % (target, level), + file=sys.stderr) class colors: ===================================== gajim/gtkexcepthook.py ===================================== @@ -85,7 +85,7 @@ class ExceptionDialog(): traceback.print_exception(type_, value, tb, None, trace) self.text = self.get_issue_text(trace.getvalue()) buffer_.set_text(self.text) - print(self.text) + print(self.text, file=sys.stderr) self.exception_view.set_editable(False) self.dialog.show() if __name__ == '__main__': View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c0178db779d8a6f25f986b7609174b3672… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c0178db779d8a6f25f986b7609174b3672… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] 2 commits: Use a UUID4 as item id for pubsub posts
by Philipp Hörist 02 Mar '19

02 Mar '19

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: 56e40954 by Philipp Hörist at 2019-03-02T09:47:18Z Use a UUID4 as item id for pubsub posts - - - - - c5d2f8bd by Philipp Hörist at 2019-03-02T09:47:34Z Use pathlib replace() for saving config This makes it hopefully more resilient on Windows - - - - - 2 changed files: - gajim/common/optparser.py - gajim/groups.py Changes: ===================================== gajim/common/optparser.py ===================================== @@ -27,6 +27,7 @@ import os import sys import re import logging +from pathlib import Path from gajim.common import app from gajim.common import caps_cache @@ -104,25 +105,22 @@ class OptionsParser: fd.write(s + ' = ' + value + '\n') def write(self): - (base_dir, filename) = os.path.split(self.__filename) - self.__tempfile = os.path.join(base_dir, '.' + filename) + config_path = Path(self.__filename) + tempfile = 'temp_%s' % config_path.name + temp_filepath = config_path.parent / tempfile try: - with open(self.__tempfile, 'w', encoding='utf-8') as f: - app.config.foreach(self.write_line, f) - except IOError as e: - return str(e) - - if os.path.exists(self.__filename): - if os.name == 'nt': - # win32 needs this - try: - os.remove(self.__filename) - except Exception as e: - return str(e) + with open(str(temp_filepath), 'w', encoding='utf-8') as file: + app.config.foreach(self.write_line, file) + except IOError: + log.exception('Failed to write config file') + return + try: - os.rename(self.__tempfile, self.__filename) - except IOError as e: - return str(e) + temp_filepath.replace(config_path) + except Exception: + log.exception('Failed to replace config file') + else: + log.info('Successful saved config file') def update_config(self, old_version, new_version): old_version_list = old_version.split('.') # convert '0.x.y' to (0, x, y) ===================================== gajim/groups.py ===================================== @@ -17,6 +17,8 @@ '''Window to create new post for discussion groups service.''' +import uuid + from gajim.common import app from nbxmpp import Node from gajim import gtkgui_helpers @@ -65,7 +67,7 @@ class GroupsPostWindow: # publish it to node con = app.connections[self.account] con.get_module('PubSub').send_pb_publish( - self.servicejid, self.groupid, item, '0') + self.servicejid, self.groupid, item, str(uuid.uuid4())) # close the window self.window.destroy() View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c4b5671b697ad5e22f9f5328df76aa455… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c4b5671b697ad5e22f9f5328df76aa455… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Use pathlib replace() for saving config
by Philipp Hörist 02 Mar '19

02 Mar '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1f479e5b by Philipp Hörist at 2019-03-02T09:43:14Z Use pathlib replace() for saving config This makes it hopefully more resilient on Windows - - - - - 1 changed file: - gajim/common/optparser.py Changes: ===================================== gajim/common/optparser.py ===================================== @@ -27,6 +27,7 @@ import os import sys import re import logging +from pathlib import Path from gajim.common import app from gajim.common import caps_cache @@ -104,25 +105,22 @@ class OptionsParser: fd.write(s + ' = ' + value + '\n') def write(self): - (base_dir, filename) = os.path.split(self.__filename) - self.__tempfile = os.path.join(base_dir, '.' + filename) + config_path = Path(self.__filename) + tempfile = 'temp_%s' % config_path.name + temp_filepath = config_path.parent / tempfile try: - with open(self.__tempfile, 'w', encoding='utf-8') as f: - app.config.foreach(self.write_line, f) - except IOError as e: - return str(e) - - if os.path.exists(self.__filename): - if os.name == 'nt': - # win32 needs this - try: - os.remove(self.__filename) - except Exception as e: - return str(e) + with open(str(temp_filepath), 'w', encoding='utf-8') as file: + app.config.foreach(self.write_line, file) + except IOError: + log.exception('Failed to write config file') + return + try: - os.rename(self.__tempfile, self.__filename) - except IOError as e: - return str(e) + temp_filepath.replace(config_path) + except Exception: + log.exception('Failed to replace config file') + else: + log.info('Successful saved config file') def update_config(self, old_version, new_version): old_version_list = old_version.split('.') # convert '0.x.y' to (0, x, y) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1f479e5ba45b61ec92f89248d96df5e122… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1f479e5ba45b61ec92f89248d96df5e122… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix typo
by Philipp Hörist 02 Mar '19

02 Mar '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: d61ca3ae by Philipp Hörist at 2019-03-02T08:32:08Z Fix typo - - - - - 1 changed file: - gajim/data/gui/start_chat_dialog.ui Changes: ===================================== gajim/data/gui/start_chat_dialog.ui ===================================== @@ -244,7 +244,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Semi-Anonymous -<span size="small">Only moderators can see your XMPP-Address)</span></property> +<span size="small">(Only moderators can see your XMPP-Address)</span></property> <property name="use_markup">True</property> <property name="xalign">0</property> </object> View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d61ca3ae6d7fc5e00e461ed85e8bce3898… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d61ca3ae6d7fc5e00e461ed85e8bce3898… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Use a UUID4 as item id for pubsub posts
by Philipp Hörist 01 Mar '19

01 Mar '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: e023c332 by Philipp Hörist at 2019-03-01T21:57:44Z Use a UUID4 as item id for pubsub posts - - - - - 1 changed file: - gajim/gtk/discovery.py Changes: ===================================== gajim/gtk/discovery.py ===================================== @@ -43,6 +43,7 @@ import types import weakref +import uuid import nbxmpp from gi.repository import GLib @@ -2189,7 +2190,7 @@ class GroupsPostWindow: # publish it to node con = app.connections[self.account] con.get_module('PubSub').send_pb_publish( - self.servicejid, self.groupid, item, '0') + self.servicejid, self.groupid, item, str(uuid.uuid4())) # close the window self.window.destroy() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e023c33268eba59c7d0cdbe31b69ea769a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e023c33268eba59c7d0cdbe31b69ea769a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] StartChatDialog: Add Muclumbus search
by Philipp Hörist 01 Mar '19

01 Mar '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 55343633 by Philipp Hörist at 2019-03-01T20:45:50Z StartChatDialog: Add Muclumbus search - - - - - 3 changed files: - gajim/data/gui/start_chat_dialog.ui - gajim/data/style/gajim.css - gajim/gtk/start_chat.py Changes: ===================================== gajim/data/gui/start_chat_dialog.ui ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.20"/> <object class="GtkBox" id="box"> @@ -25,7 +25,7 @@ </packing> </child> <child> - <object class="GtkScrolledWindow"> + <object class="GtkScrolledWindow" id="scrolledwindow"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hscrollbar_policy">never</property> @@ -53,4 +53,218 @@ </packing> </child> </object> + <object class="GtkGrid" id="search_result_grid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkLabel" id="name_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="ellipsize">end</property> + <property name="max_width_chars">50</property> + <property name="xalign">0</property> + <style> + <class name="bold"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="jid_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="hexpand">True</property> + <property name="ellipsize">end</property> + <property name="max_width_chars">50</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">system-users-symbolic</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="user_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="tooltip_text" translatable="yes">Users</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + </object> + <object class="GtkGrid" id="tooltip"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="column_spacing">6</property> + <child> + <object class="GtkLabel" id="tooltip_name"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="halign">start</property> + <property name="ellipsize">end</property> + <property name="max_width_chars">50</property> + <property name="xalign">0</property> + <style> + <class name="bold"/> + </style> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="tooltip_jid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="hexpand">True</property> + <property name="ellipsize">end</property> + <property name="max_width_chars">50</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="tooltip_description"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="halign">start</property> + <property name="wrap">True</property> + <property name="max_width_chars">65</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="tooltip_name_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Name:</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="tooltip_description_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Description:</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Address:</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="tooltip_user"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="valign">center</property> + <property name="icon_name">system-users-symbolic</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="anonymous_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Semi-Anonymous +<span size="small">Only moderators can see your XMPP-Address)</span></property> + <property name="use_markup">True</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkImage" id="anonymous_icon"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="valign">center</property> + <property name="icon_name">security-medium-symbolic</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + </object> </interface> ===================================== gajim/data/style/gajim.css ===================================== @@ -134,6 +134,15 @@ list.settings > row > box { #StartChatListBox > row { padding: 10px 20px 10px 10px; } #StartChatListBox > row:not(.activatable) label { color: @insensitive_fg_color } +/* StartChatListBox */ +.start-chat-row { border-bottom: 1px solid; border-color: @theme_unfocused_bg_color; } +.start-chat-row:last-child { border-bottom: 0px} +.start-chat-row.activatable:active { box-shadow: none; } +.start-chat-row { padding: 10px 20px 10px 10px; } +.start-chat-row:not(.activatable) label { color: @insensitive_fg_color } +.start-chat-row:focus { outline: none; } + + /* GroupchatConfig */ #GroupchatConfig > box > buttonbox { margin: 0px 12px 12px 12px; } #GroupchatConfig stack { border-bottom: 1px solid; border-color: @borders;} ===================================== gajim/gtk/start_chat.py ===================================== @@ -13,12 +13,16 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. import locale +from enum import IntEnum from gi.repository import Gdk from gi.repository import Gtk from gi.repository import GLib from gi.repository import Pango +from nbxmpp.util import is_error_result +from nbxmpp.const import AnonymityMode + from gajim.common import app from gajim.common import helpers from gajim.common.i18n import _ @@ -26,6 +30,15 @@ from gajim.common.const import AvatarSize from gajim.gtk.util import get_icon_name from gajim.gtk.util import get_builder +from gajim.gtk.util import ensure_not_destroyed + + +SERVICE_JID = 'rodrigo.de.mucobedo(a)dreckshal.de' + + +class Search(IntEnum): + CONTACT = 0 + MUC = 1 class StartChatDialog(Gtk.ApplicationWindow): @@ -38,6 +51,9 @@ class StartChatDialog(Gtk.ApplicationWindow): self.set_title(_('Start new Conversation')) self.set_default_size(-1, 400) self.ready_to_destroy = False + self._parameter_form = None + self._destroyed = False + self._search_stopped = False self.builder = get_builder('start_chat_dialog.ui') self.listbox = self.builder.get_object('listbox') @@ -66,6 +82,9 @@ class StartChatDialog(Gtk.ApplicationWindow): self.listbox.set_sort_func(self._sort_func, None) self.listbox.connect('row-activated', self._on_row_activated) + self._muc_search_listbox = MUCSearch() + self._current_listbox = self.listbox + self.connect('key-press-event', self._on_key_press) self.connect('destroy', self._destroy) @@ -118,7 +137,7 @@ class StartChatDialog(Gtk.ApplicationWindow): return True if (event.state == Gdk.ModifierType.SHIFT_MASK and - event.keyval == Gdk.KEY_ISO_Left_Tab): + event.keyval == Gdk.KEY_ISO_Left_Tab): self.search_entry.emit('previous-match') return True @@ -127,6 +146,8 @@ class StartChatDialog(Gtk.ApplicationWindow): return True if event.keyval == Gdk.KEY_Escape: + self._search_stopped = True + self._muc_search_listbox.remove_all() if self.search_entry.get_text() != '': self.search_entry.emit('stop-search') else: @@ -134,6 +155,11 @@ class StartChatDialog(Gtk.ApplicationWindow): return True if event.keyval == Gdk.KEY_Return: + if self._current_listbox_is(Search.MUC): + self._muc_search_listbox.remove_all() + self._start_search() + return True + row = self.listbox.get_selected_row() if row is not None: row.emit('activate') @@ -159,8 +185,27 @@ class StartChatDialog(Gtk.ApplicationWindow): self.ready_to_destroy = True + def _set_listbox(self, listbox): + if self._current_listbox == listbox: + return + viewport = self.builder.scrolledwindow.get_child() + viewport.remove(viewport.get_child()) + self.builder.scrolledwindow.remove(viewport) + self.builder.scrolledwindow.add(listbox) + self._current_listbox = listbox + + def _current_listbox_is(self, box): + if self._current_listbox == self.listbox: + return box == Search.CONTACT + return box == Search.MUC + def _on_search_changed(self, entry): search_text = entry.get_text() + if search_text.startswith('g:'): + self._set_listbox(self._muc_search_listbox) + return + + self._set_listbox(self.listbox) if '@' in search_text: self._add_new_jid_row() self._update_new_jid_rows(search_text) @@ -256,7 +301,83 @@ class StartChatDialog(Gtk.ApplicationWindow): return locale.strcoll(name1.lower(), name2.lower()) @staticmethod - def _destroy(*args): + def _get_connection(): + accounts = app.get_connected_accounts() + if not accounts: + raise NotConnected + return app.connections[accounts.pop()].connection + + def _start_search(self): + self._search_stopped = False + try: + con = self._get_connection() + except NotConnected: + return + + text = self.search_entry.get_text() + text = text[2:].strip() + self._muc_search_listbox.start_search() + + if self._parameter_form is None: + con.get_module('Muclumbus').request_parameters( + SERVICE_JID, + callback=self._parameters_received, + user_data=(con, text)) + else: + self._parameter_form.vars['q'].value = text + + con.get_module('Muclumbus').set_search( + SERVICE_JID, + self._parameter_form, + callback=self._on_search_result, + user_data=con) + + @ensure_not_destroyed + def _parameters_received(self, result, user_data): + if is_error_result(result): + self._on_error(result) + return + + con, text = user_data + self._parameter_form = result + self._parameter_form.type_ = 'submit' + self._parameter_form.vars['q'].value = text + + con.get_module('Muclumbus').set_search( + SERVICE_JID, + self._parameter_form, + callback=self._on_search_result, + user_data=con) + + @ensure_not_destroyed + def _on_search_result(self, result, con): + if self._search_stopped: + return + + if is_error_result(result): + self._on_error(result) + return + + for item in result.items: + self._muc_search_listbox.add(ResultRow(item)) + + if result.end: + self._muc_search_listbox.end_search() + return + + con.get_module('Muclumbus').set_search( + SERVICE_JID, + self._parameter_form, + items_per_page=result.max, + after=result.last, + callback=self._on_search_result, + user_data=con) + + def _on_error(self, result): + self._muc_search_listbox.show_error(result) + + def _destroy(self, *args): + self._destroyed = True del app.interface.instances['start_chat'] @@ -345,3 +466,149 @@ class ContactRow(Gtk.Grid): if self.show_account: return '%s %s %s' % (self.name, self.jid, self.account_label) return '%s %s' % (self.name, self.jid) + + +class MUCSearch(Gtk.ListBox): + def __init__(self): + Gtk.ListBox.__init__(self) + self.set_has_tooltip(True) + self.set_activate_on_single_click(False) + self._progress = None + + self._ui = get_builder('start_chat_dialog.ui', ['tooltip']) + self.connect('query-tooltip', self._query_tooltip) + self.connect('row-activated', self._on_row_activated) + self.show_all() + + def remove_all(self): + def remove(row): + self.remove(row) + row.destroy() + self.foreach(remove) + + def show_error(self, error): + self.insert(ErrorRow(error), 0) + self.remove(self._progress) + self._progress.destroy() + + def start_search(self): + self._progress = ProgressRow() + super().add(self._progress) + + def end_search(self): + self._progress.stop() + + def add(self, row): + super().add(row) + self._progress.update() + + def _query_tooltip(self, _widget, _x_pos, y_pos, _keyboard_mode, tooltip): + row = self.get_row_at_y(y_pos) + if row is None or not isinstance(row, ResultRow): + self._clear_tooltip() + return False + + if row.item.anonymity_mode == AnonymityMode.SEMI: + self._ui.anonymous_icon.show() + self._ui.anonymous_label.show() + + self._ui.tooltip_user.set_text(row.item.nusers) + self._ui.tooltip_jid.set_text(row.item.jid) + if row.item.description: + self._ui.tooltip_description.set_text(row.item.description) + self._ui.tooltip_description.show() + self._ui.tooltip_description_label.show() + + if row.item.name: + self._ui.tooltip_name.set_text(row.item.name) + self._ui.tooltip_name.show() + self._ui.tooltip_name_label.show() + + tooltip.set_custom(self._ui.tooltip) + return True + + def _clear_tooltip(self): + self._ui.anonymous_icon.hide() + self._ui.anonymous_label.hide() + self._ui.tooltip_description.hide() + self._ui.tooltip_description_label.hide() + self._ui.tooltip_name.hide() + self._ui.tooltip_name_label.hide() + + def _on_row_activated(self, _listbox, row): + app.interface.join_gc_minimal(None, row.item.jid) + + +class ResultRow(Gtk.ListBoxRow): + def __init__(self, item): + Gtk.ListBoxRow.__init__(self) + self.set_activatable(True) + self.get_style_context().add_class('start-chat-row') + self.item = item + self._ui = get_builder('start_chat_dialog.ui', ['search_result_grid']) + self._ui.jid_label.set_text(item.jid) + self._ui.name_label.set_text(item.name) + self._ui.user_label.set_text(item.nusers) + self.add(self._ui.search_result_grid) + self.show_all() + + +class ErrorRow(Gtk.ListBoxRow): + def __init__(self, error): + Gtk.ListBoxRow.__init__(self) + self.set_selectable(False) + self.set_activatable(False) + self.get_style_context().add_class('start-chat-row') + self._error = Gtk.Label(label=str(error)) + self._error.set_line_wrap(True) + self._error.set_line_wrap_mode(Pango.WrapMode.WORD) + self._error.set_xalign(0) + self._error_image = Gtk.Image.new_from_icon_name( + 'dialog-error', Gtk.IconSize.MENU) + self._error_image.get_style_context().add_class('error-color') + self._error_image.set_valign(Gtk.Align.CENTER) + box = Gtk.Box() + box.set_spacing(6) + box.add(self._error_image) + box.add(self._error) + self.add(box) + self.show_all() + + +class ProgressRow(Gtk.ListBoxRow): + def __init__(self): + Gtk.ListBoxRow.__init__(self) + self.set_selectable(False) + self.set_activatable(False) + self.get_style_context().add_class('start-chat-row') + self._text = _('%s Group chats found') + self._count = 0 + self._spinner = Gtk.Spinner() + self._spinner.start() + self._count_label = Gtk.Label(label=self._text % 0) + self._count_label.get_style_context().add_class('bold') + self._finished_image = Gtk.Image.new_from_icon_name( + 'emblem-ok-symbolic', Gtk.IconSize.MENU) + self._finished_image.get_style_context().add_class('success-color') + self._finished_image.set_no_show_all(True) + + box = Gtk.Box() + box.set_spacing(6) + box.add(self._finished_image) + box.add(self._spinner) + box.add(self._count_label) + self.add(box) + self.show_all() + + def update(self): + self._count += 1 + self._count_label.set_text(self._text % self._count) + + def stop(self): + self._spinner.stop() + self._spinner.hide() + self._finished_image.show() + + +class NotConnected(Exception): + pass View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/553436332bcc3dcd886ba11ae12fdb814c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/553436332bcc3dcd886ba11ae12fdb814c… 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