Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Refactor getting avatars from pubsub
by Philipp Hörist 08 Feb '18

08 Feb '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7479bd8b by Philipp Hörist at 2018-02-08T21:06:23+01:00 Refactor getting avatars from pubsub - use SendAndCallForResponse instead of triggering an Event - validate iq result even more, it didnt print iq errors before - - - - - 4 changed files: - gajim/common/connection_handlers_events.py - gajim/common/exceptions.py - gajim/common/pep.py - gajim/common/pubsub.py Changes: ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -24,8 +24,6 @@ from calendar import timegm import datetime import hashlib -import binascii -import base64 import hmac import logging import sys @@ -604,48 +602,6 @@ class PubsubBookmarksReceivedEvent(nec.NetworkIncomingEvent, BookmarksHelper): self.parse_bookmarks() return True -class PubsubAvatarReceivedEvent(nec.NetworkIncomingEvent): - name = 'pubsub-avatar-received' - base_network_events = ['pubsub-received'] - - def __init__(self, name, base_event): - ''' - Pre-Generated attributes on self: - - :conn: Connection instance - :jid: The from jid - :pubsub_node: The 'pubsub' node - :items_node: The 'items' node - ''' - self._set_base_event_vars_as_attributes(base_event) - - def generate(self): - if self.items_node.getAttr('node') != 'urn:xmpp:avatar:data': - return - item = self.items_node.getTag('item') - if not item: - log.warning('Received malformed avatar data via pubsub') - log.debug(self.stanza) - return - self.sha = item.getAttr('id') - data_tag = item.getTag('data', namespace='urn:xmpp:avatar:data') - if self.sha is None or data_tag is None: - log.warning('Received malformed avatar data via pubsub') - log.debug(self.stanza) - return - self.data = data_tag.getData() - if self.data is None: - log.warning('Received malformed avatar data via pubsub') - log.debug(self.stanza) - return - try: - self.data = base64.b64decode(self.data.encode('utf-8')) - except binascii.Error as err: - log.debug('Received malformed avatar data via pubsub: %s' % err) - return - - return True - class SearchFormReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): name = 'search-form-received' base_network_events = [] ===================================== gajim/common/exceptions.py ===================================== --- a/gajim/common/exceptions.py +++ b/gajim/common/exceptions.py @@ -147,3 +147,13 @@ class PluginsystemError(Exception): def __str__(self): return self.text + +class StanzaMalformed(Exception): + """ + Malfromed Stanza + """ + def __init__(self, message, stanza=''): + Exception.__init__(self, message, stanza) + self._msg = '{}\n{}'.format(message, stanza) + def __str__(self): + return self._msg ===================================== gajim/common/pep.py ===================================== --- a/gajim/common/pep.py +++ b/gajim/common/pep.py @@ -509,8 +509,8 @@ class AvatarNotificationPEP(AbstractPEP): jid, self.avatar['id']) return app.log('avatar').info('Request (Pubsub): %s', jid) - con.send_pb_retrieve(jid, 'urn:xmpp:avatar:data', - self.avatar['id']) + con.get_pubsub_avatar(jid, 'urn:xmpp:avatar:data', + self.avatar['id']) SUPPORTED_PERSONAL_USER_EVENTS = [ ===================================== gajim/common/pubsub.py ===================================== --- a/gajim/common/pubsub.py +++ b/gajim/common/pubsub.py @@ -21,16 +21,18 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## +import base64 +import binascii + import nbxmpp from gajim.common import app #TODO: Doesn't work #from common.connection_handlers import PEP_CONFIG PEP_CONFIG = 'pep_config' from gajim.common import ged -from gajim.common.nec import NetworkEvent from gajim.common.connection_handlers_events import PubsubReceivedEvent from gajim.common.connection_handlers_events import PubsubBookmarksReceivedEvent -from gajim.common.connection_handlers_events import PubsubAvatarReceivedEvent +from gajim.common.exceptions import StanzaMalformed import logging log = logging.getLogger('gajim.c.pubsub') @@ -39,11 +41,8 @@ class ConnectionPubSub: def __init__(self): self.__callbacks = {} app.nec.register_incoming_event(PubsubBookmarksReceivedEvent) - app.nec.register_incoming_event(PubsubAvatarReceivedEvent) app.ged.register_event_handler('pubsub-bookmarks-received', ged.CORE, self._nec_pubsub_bookmarks_received) - app.ged.register_event_handler('pubsub-avatar-received', - ged.CORE, self._nec_pubsub_avatar_received) def cleanup(self): app.ged.remove_event_handler('pubsub-bookmarks-received', @@ -103,22 +102,35 @@ class ConnectionPubSub: self.connection.send(query) - def send_pb_retrieve(self, jid, node, item_id=None, cb=None, *args, **kwargs): + @staticmethod + def get_pb_retrieve_iq(jid, node, item_id=None): """ - Get items from a node + Get IQ to query items from a node """ - if not self.connection or self.connected < 2: - return query = nbxmpp.Iq('get', to=jid) r = query.addChild('pubsub', namespace=nbxmpp.NS_PUBSUB) r = r.addChild('items', {'node': node}) if item_id is not None: r.addChild('item', {'id': item_id}) + return query + + def send_pb_retrieve(self, jid, node, item_id=None, cb=None, *args, **kwargs): + """ + Get items from a node + """ + if not self.connection or self.connected < 2: + return + query = self.get_pb_retrieve_iq(jid, node, item_id) id_ = self.connection.send(query) if cb: self.__callbacks[id_] = (cb, args, kwargs) + def get_pubsub_avatar(self, jid, node, item_id): + query = self.get_pb_retrieve_iq(jid, node, item_id) + self.connection.SendAndCallForResponse( + query, self._nec_pubsub_avatar_received, {'jid': jid}) + def send_pb_retract(self, jid, node, id_): """ Delete item from a node @@ -211,25 +223,62 @@ class ConnectionPubSub: # We got bookmarks from pubsub, now get those from xml to merge them self.get_bookmarks(storage_type='xml') - def _nec_pubsub_avatar_received(self, obj): - if obj.conn.name != self.name: - return - - if obj.jid is None: + def _validate_avatar_node(self, stanza): + jid = stanza.getFrom() + if jid is None: jid = self.get_own_jid().getStripped() else: - jid = obj.jid.getStripped() + jid = jid.getStripped() + + if nbxmpp.isErrorNode(stanza): + raise StanzaMalformed(stanza.getErrorMsg()) + + pubsub_node = stanza.getTag('pubsub') + if pubsub_node is None: + raise StanzaMalformed('No pubsub node', stanza) + + items_node = pubsub_node.getTag('items') + if items_node is None: + raise StanzaMalformed('No items node', stanza) + + if items_node.getAttr('node') != 'urn:xmpp:avatar:data': + raise StanzaMalformed('Wrong namespace', stanza) + + item = items_node.getTag('item') + if item is None: + raise StanzaMalformed('No item node', stanza) + + sha = item.getAttr('id') + data_tag = item.getTag('data', namespace='urn:xmpp:avatar:data') + if sha is None or data_tag is None: + raise StanzaMalformed('No id attr or data node found', stanza) + + data = data_tag.getData() + if data is None: + raise StanzaMalformed('Data node empty', stanza) + + data = base64.b64decode(data.encode('utf-8')) + + return jid, sha, data + + def _nec_pubsub_avatar_received(self, conn, stanza, jid): + try: + jid, sha, data = self._validate_avatar_node(stanza) + except (StanzaMalformed, binascii.Error) as error: + app.log('avatar').warning( + 'Error loading Avatar (Pubsub): %s %s', jid, error) + return app.log('avatar').info( - 'Received Avatar (Pubsub): %s %s', jid, obj.sha) - app.interface.save_avatar(obj.data) + 'Received Avatar (Pubsub): %s %s', jid, sha) + app.interface.save_avatar(data) if self.get_own_jid().bareMatch(jid): - app.config.set_per('accounts', self.name, 'avatar_sha', obj.sha) + app.config.set_per('accounts', self.name, 'avatar_sha', sha) else: own_jid = self.get_own_jid().getStripped() - app.logger.set_avatar_sha(own_jid, jid, obj.sha) - app.contacts.set_avatar(self.name, jid, obj.sha) + app.logger.set_avatar_sha(own_jid, jid, sha) + app.contacts.set_avatar(self.name, jid, sha) app.interface.update_avatar(self.name, jid) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7479bd8bd6052ed53ff131bc859d95a21b… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7479bd8bd6052ed53ff131bc859d95a21b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Add navigation for chat history
by Philipp Hörist 08 Feb '18

08 Feb '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: b0bf7433 by Daniel at 2018-02-07T10:04:56+01:00 Add navigation for chat history - - - - - 7b1bdc55 by Philipp Hörist at 2018-02-08T17:34:19+01:00 Merge branch 'history-navigation' into 'master' Add navigation for chat history See merge request gajim/gajim!202 - - - - - 3 changed files: - gajim/common/logger.py - gajim/data/gui/history_window.ui - gajim/history_window.py Changes: ===================================== gajim/common/logger.py ===================================== --- a/gajim/common/logger.py +++ b/gajim/common/logger.py @@ -732,6 +732,64 @@ class Logger: # attributes set to None because of the MAX() function return self.con.execute(sql, tuple(jids)).fetchone().time + def get_first_date_that_has_logs(self, account, jid): + """ + Get the timestamp of the first message we received for the jid. + + :param account: The account + + :param jid: The jid for which we request the first timestamp + + returns a timestamp or None + """ + jids = self._get_family_jids(account, jid) + + kinds = map(str, [KindConstant.STATUS, + KindConstant.GCSTATUS]) + + sql = ''' + SELECT MIN(time) as time FROM logs + NATURAL JOIN jids WHERE jid IN ({jids}) + AND kind NOT IN ({kinds}) + '''.format(jids=', '.join('?' * len(jids)), + kinds=', '.join(kinds)) + + # fetchone() returns always at least one Row with all + # attributes set to None because of the MIN() function + return self.con.execute(sql, tuple(jids)).fetchone().time + + def get_date_has_logs(self, account, jid, date): + """ + Get single timestamp of a message we received for the jid + in the time range of one day. + + :param account: The account + + :param jid: The jid for which we request the first timestamp + + :param date: datetime.datetime instance + example: datetime.datetime(year, month, day) + + returns a timestamp or None + """ + jids = self._get_family_jids(account, jid) + + kinds = map(str, [KindConstant.STATUS, + KindConstant.GCSTATUS]) + + delta = datetime.timedelta( + hours=23, minutes=59, seconds=59, microseconds=999999) + + sql = ''' + SELECT time + FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) + AND time BETWEEN ? AND ? + '''.format(jids=', '.join('?' * len(jids))) + + return self.con.execute(sql, tuple(jids) + + (date.timestamp(), + (date + delta).timestamp())).fetchone() + def get_room_last_message_time(self, account, jid): """ Get the timestamp of the last message we received in a room. ===================================== gajim/data/gui/history_window.ui ===================================== --- a/gajim/data/gui/history_window.ui +++ b/gajim/data/gui/history_window.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.20"/> <object class="GtkApplicationWindow" id="history_window"> @@ -35,7 +35,7 @@ <object class="GtkEntry" id="query_entry"> <property name="can_focus">True</property> <property name="invisible_char">●</property> - <property name="placeholder_text">Enter name / JID of contact or groupchat</property> + <property name="placeholder_text" translatable="yes">Enter name / JID of contact or groupchat</property> </object> <packing> <property name="expand">True</property> @@ -102,11 +102,13 @@ <object class="GtkPaned" id="hpaned"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="margin_bottom">5</property> <property name="position">165</property> <child> <object class="GtkBox" id="vbox2"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="margin_right">5</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> @@ -123,7 +125,98 @@ </packing> </child> <child> - <placeholder/> + <object class="GtkButtonBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="spacing">5</property> + <property name="layout_style">expand</property> + <child> + <object class="GtkButton" id="button_first_day"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <signal name="clicked" handler="_change_date" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">go-first-symbolic</property> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="button_previous_day"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <signal name="clicked" handler="_change_date" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">go-previous-symbolic</property> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="button_next_day"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <signal name="clicked" handler="_change_date" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">go-next-symbolic</property> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="button_last_day"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <signal name="clicked" handler="_change_date" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">go-last-symbolic</property> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> </child> </object> <packing> ===================================== gajim/history_window.py ===================================== --- a/gajim/history_window.py +++ b/gajim/history_window.py @@ -71,6 +71,10 @@ class HistoryWindow: self.window = xml.get_object('history_window') self.window.set_application(app.app) self.calendar = xml.get_object('calendar') + self.button_first_day = xml.get_object('button_first_day') + self.button_previous_day = xml.get_object('button_previous_day') + self.button_next_day = xml.get_object('button_next_day') + self.button_last_day = xml.get_object('button_last_day') scrolledwindow = xml.get_object('scrolledwindow') self.history_textview = conversation_textview.ConversationTextview( account, used_in_history_window = True) @@ -309,17 +313,25 @@ class HistoryWindow: self.jids_to_search = [info_jid] - # select logs for last date we have logs with contact - self.calendar.set_sensitive(True) - last_log = \ - app.logger.get_last_date_that_has_logs(self.account, self.jid) + # Get first/last date we have logs with contact (for log navigation) + self.first_log = app.logger.get_first_date_that_has_logs( + self.account, self.jid) + self.first_day = self._get_date_from_timestamp(self.first_log) + self.last_log = app.logger.get_last_date_that_has_logs( + self.account, self.jid) + self.last_day = self._get_date_from_timestamp(self.last_log) - date = time.localtime(last_log) + # Select logs for last date we have logs with contact + self.calendar.set_sensitive(True) + gtk_month = gtkgui_helpers.make_python_month_gtk_month( + self.last_day.month) + self.calendar.select_month(gtk_month, self.last_day.year) + self.calendar.select_day(self.last_day.day) - y, m, d = date[0], date[1], date[2] - gtk_month = gtkgui_helpers.make_python_month_gtk_month(m) - self.calendar.select_month(gtk_month, y) - self.calendar.select_day(d) + self.button_previous_day.set_sensitive(True) + self.button_next_day.set_sensitive(True) + self.button_first_day.set_sensitive(True) + self.button_last_day.set_sensitive(True) self.search_entry.set_sensitive(True) self.search_entry.grab_focus() @@ -339,6 +351,10 @@ class HistoryWindow: self.checkbutton.set_sensitive(False) self.calendar.set_sensitive(False) self.calendar.clear_marks() + self.button_previous_day.set_sensitive(False) + self.button_next_day.set_sensitive(False) + self.button_first_day.set_sensitive(False) + self.button_last_day.set_sensitive(False) self.results_window.set_property('visible', False) @@ -377,6 +393,60 @@ class HistoryWindow: for date in log_days: widget.mark_day(date.day) + def _get_date_from_timestamp(self, timestamp): + # Conversion from timestamp to date + log = time.localtime(timestamp) + y, m, d = log[0], log[1], log[2] + date = datetime.datetime(y, m, d) + return(date) + + def _change_date(self, widget): + # Get day selected in calendar + y, m, d = self.calendar.get_date() + py_m = gtkgui_helpers.make_gtk_month_python_month(m) + _date = datetime.datetime(y, py_m, d) + + if widget is self.button_first_day: + gtk_m = gtkgui_helpers.make_python_month_gtk_month( + self.first_day.month) + self.calendar.select_month(gtk_m, self.first_day.year) + self.calendar.select_day(self.first_day.day) + return + elif widget is self.button_last_day: + gtk_m = gtkgui_helpers.make_python_month_gtk_month( + self.last_day.month) + self.calendar.select_month(gtk_m, self.last_day.year) + self.calendar.select_day(self.last_day.day) + return + elif widget is self.button_previous_day: + end_date = self.first_day + timedelta = datetime.timedelta(days=-1) + if end_date >= _date: + return + elif widget is self.button_next_day: + end_date = self.last_day + timedelta = datetime.timedelta(days=1) + if end_date <= _date: + return + + # Iterate through days until log entry found or + # supplied end_date (first_log / last_log) reached + logs = None + while logs is None: + _date = _date + timedelta + if _date == end_date: + break + try: + logs = app.logger.get_date_has_logs( + self.account, self.jid, _date) + except exceptions.PysqliteOperationalError as e: + dialogs.ErrorDialog(_('Disk Error'), str(e)) + return + + gtk_month = gtkgui_helpers.make_python_month_gtk_month(_date.month) + self.calendar.select_month(gtk_month, _date.year) + self.calendar.select_day(_date.day) + def _get_string_show_from_constant_int(self, show): if show == ShowConstant.ONLINE: show = 'online' View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/4bbc6b19729f3b0c0907c52a49806326d… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/4bbc6b19729f3b0c0907c52a49806326d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fail gracefully on invalid MAM GC Stanza
by Philipp Hörist 07 Feb '18

07 Feb '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4bbc6b19 by Philipp Hörist at 2018-02-07T19:20:19+01:00 Fail gracefully on invalid MAM GC Stanza Fixes #8883 - - - - - 1 changed file: - gajim/common/connection_handlers_events.py Changes: ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -1159,7 +1159,12 @@ class MamGcMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): if self.msg_.getType() != 'groupchat': return False - self.room_jid = self.stanza.getFrom().getStripped() + try: + self.room_jid = self.stanza.getFrom().getStripped() + except AttributeError: + log.warning('Received GC MAM message ' + 'without from attribute\n%s', self.stanza) + return False self.unique_id = self.get_stanza_id(self.result, query=True) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4bbc6b19729f3b0c0907c52a49806326d9… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4bbc6b19729f3b0c0907c52a49806326d9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: Use keyring module to handle password storage
by Philipp Hörist 06 Feb '18

06 Feb '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: d0f4ebd0 by André Apitzsch at 2018-02-03T20:32:37+01:00 Use keyring module to handle password storage - - - - - 0d37609d by André Apitzsch at 2018-02-03T22:13:43+01:00 PasswordStorageManager: remove unused member - - - - - f1e95825 by André Apitzsch at 2018-02-04T17:02:02+01:00 Migrate config for new password identifier + version bump - - - - - 624a2c5c by Philipp Hörist at 2018-02-06T20:52:44+01:00 Merge branch 'keyring' into 'master' Use keyring module to also handle password storage on linux See merge request gajim/gajim!206 - - - - - 4 changed files: - gajim/__init__.py - gajim/common/optparser.py - gajim/common/passwords.py - setup.py Changes: ===================================== gajim/__init__.py ===================================== --- a/gajim/__init__.py +++ b/gajim/__init__.py @@ -1,6 +1,6 @@ import subprocess -__version__ = "0.98.2" +__version__ = "0.98.3" try: node = subprocess.Popen('git rev-parse --short=12 HEAD', shell=True, ===================================== gajim/common/optparser.py ===================================== --- a/gajim/common/optparser.py +++ b/gajim/common/optparser.py @@ -249,6 +249,8 @@ class OptionsParser: self.update_config_to_016112() if old < [0, 98, 2] and new >= [0, 98, 2]: self.update_config_to_0982() + if old < [0, 98, 3] and new >= [0, 98, 3]: + self.update_config_to_0983() app.logger.init_vars() app.logger.attach_cache_database() @@ -924,3 +926,12 @@ class OptionsParser: ''' ) app.config.set('version', '0.98.2') + + def update_config_to_0983(self): + for account in self.old_values['accounts'].keys(): + password = self.old_values['accounts'][account]['password'] + if password == "winvault:": + app.config.set_per('accounts', account, 'password', 'keyring:') + elif password == "libsecret:": + app.config.set_per('accounts', account, 'password', '') + app.config.set('version', '0.98.3') ===================================== gajim/common/passwords.py ===================================== --- a/gajim/common/passwords.py +++ b/gajim/common/passwords.py @@ -24,11 +24,7 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## -import os import logging -import gi - -from gi.repository import GLib from gajim.common import app @@ -37,11 +33,10 @@ __all__ = ['get_password', 'save_password'] log = logging.getLogger('gajim.password') keyring = None -if os.name == 'nt': - try: - import keyring - except ImportError: - log.debug('python-keyring missing, falling back to plaintext storage') +try: + import keyring +except ImportError: + log.debug('python-keyring missing, falling back to plaintext storage') class PasswordStorage(object): @@ -54,54 +49,16 @@ class PasswordStorage(object): raise NotImplementedError -class LibSecretPasswordStorage(PasswordStorage): - """Store password using libsecret""" - identifier = 'libsecret:' - def __init__(self): - gi.require_version('Secret', '1') - gir = __import__('gi.repository', globals(), locals(), ['Secret'], 0) - self.Secret = gir.Secret - self.GAJIM_SCHEMA = self.Secret.Schema.new( - "org.gnome.keyring.NetworkPassword", - self.Secret.SchemaFlags.NONE, - { - 'user': self.Secret.SchemaAttributeType.STRING, - 'server': self.Secret.SchemaAttributeType.STRING, - 'protocol': self.Secret.SchemaAttributeType.STRING, - } - ) - - def get_password(self, account_name): - server = app.config.get_per('accounts', account_name, 'hostname') - user = app.config.get_per('accounts', account_name, 'name') - password = self.Secret.password_lookup_sync(self.GAJIM_SCHEMA, - {'user': user, 'server': server, 'protocol': 'xmpp'}, None) - return password - - def save_password(self, account_name, password, update=True): - server = app.config.get_per('accounts', account_name, 'hostname') - user = app.config.get_per('accounts', account_name, 'name') - display_name = _('XMPP account %s') % user + '@' + server - attributes = {'user': user, 'server': server, 'protocol': 'xmpp'} - try: - return self.Secret.password_store_sync( - self.GAJIM_SCHEMA, attributes, self.Secret.COLLECTION_DEFAULT, - display_name, password or '', None) - except GLib.Error as error: - log.error(error) - return False - - -class SecretWindowsPasswordStorage(PasswordStorage): - """ Windows Keyring """ - identifier = 'winvault:' +class SecretPasswordStorage(PasswordStorage): + """ Store password using Keyring """ + identifier = 'keyring:' def __init__(self): - self.win_keyring = keyring.get_keyring() + self.keyring = keyring.get_keyring() def save_password(self, account_name, password): try: - self.win_keyring.set_password('gajim', account_name, password) + self.keyring.set_password('gajim', account_name, password) return True except: log.exception('error:') @@ -109,19 +66,17 @@ class SecretWindowsPasswordStorage(PasswordStorage): def get_password(self, account_name): log.debug('getting password') - return self.win_keyring.get_password('gajim', account_name) + return self.keyring.get_password('gajim', account_name) class PasswordStorageManager(PasswordStorage): """Access all the implemented password storage backends, knowing which ones are available and which we prefer to use. - Also implements storing directly in gajim config (former - SimplePasswordStorage class).""" + Also implements storing directly in gajim config.""" def __init__(self): self.preferred_backend = None - self.libsecret = None - self.winsecret = None + self.secret = None self.connect_backends() self.set_preferred_backend() @@ -131,25 +86,15 @@ class PasswordStorageManager(PasswordStorage): """ # TODO: handle disappearing backends - if app.config.get('use_keyring'): - if os.name == 'nt' and keyring: - self.winsecret = SecretWindowsPasswordStorage() - else: - try: - self.libsecret = LibSecretPasswordStorage() - except (ValueError, AttributeError) as e: - log.debug("Could not connect to libsecret: %s" % e) + if app.config.get('use_keyring') and keyring: + self.secret = SecretPasswordStorage() def get_password(self, account_name): pw = app.config.get_per('accounts', account_name, 'password') if not pw: return pw - if pw.startswith(LibSecretPasswordStorage.identifier) and \ - self.libsecret: - backend = self.libsecret - elif pw.startswith(SecretWindowsPasswordStorage.identifier) and \ - self.winsecret: - backend = self.winsecret + if pw.startswith(SecretPasswordStorage.identifier) and self.secret: + backend = self.secret else: backend = None @@ -157,7 +102,7 @@ class PasswordStorageManager(PasswordStorage): pw = backend.get_password(account_name) if backend != self.preferred_backend: # migrate password to preferred_backend - self.preferred_backend.save_password(account_name, pw) + self.save_password(account_name, pw) # TODO: remove from old backend return pw @@ -176,18 +121,11 @@ class PasswordStorageManager(PasswordStorage): return True def set_preferred_backend(self): - if self.libsecret: - self.preferred_backend = self.libsecret - elif self.winsecret: - self.preferred_backend = self.winsecret + if self.secret: + self.preferred_backend = self.secret else: self.preferred_backend = None - def has_keyring(self): - """Is there a real password storage backend? Else, passwords are stored - plain in gajim config""" - return bool(self.preferred_backend) - passwordStorageManager = None def get_storage(): ===================================== setup.py ===================================== --- a/setup.py +++ b/setup.py @@ -280,4 +280,7 @@ setup( 'pyOpenSSL>=0.12', 'pyasn1', ], + extras_require={ + 'secret_password': ["keyring"] + } ) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/1e8304755fde705750bcac3b1101589b0… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/1e8304755fde705750bcac3b1101589b0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Convert xmpp uris not to GFiles
by Philipp Hörist 06 Feb '18

06 Feb '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1e830475 by Philipp Hörist at 2018-02-06T20:41:24+01:00 Convert xmpp uris not to GFiles We dont need to use the ::open handler to handle xmpp uris - - - - - 1 changed file: - gajim/gajim.py Changes: ===================================== gajim/gajim.py ===================================== --- a/gajim/gajim.py +++ b/gajim/gajim.py @@ -102,7 +102,6 @@ class GajimApplication(Gtk.Application): self.connect('command-line', self._handle_remote_options) self.connect('startup', self._startup) self.connect('activate', self._activate) - self.connect('open', self._open) self.profile = '' self.config_path = None @@ -250,10 +249,9 @@ class GajimApplication(Gtk.Application): from gajim import gui_menu_builder gui_menu_builder.build_accounts_menu() - def _open(self, application, file, hint, *args): + def _open_uris(self, uris): from gajim.common import app - for arg in file: - uri = arg.get_uri() + for uri in uris: app.log('uri_handler').info('open %s', uri) if not uri.startswith('xmpp:'): continue @@ -297,22 +295,19 @@ class GajimApplication(Gtk.Application): self.activate_action('ipython') return 0 - gfiles = self._parse_file_args(command_line) - if gfiles is not None: - self.open(gfiles, '') + uri = self._parse_uris(command_line) + if uri is not None: + self._open_uris(uri) return 0 self.activate() return 0 @staticmethod - def _parse_file_args(command_line): + def _parse_uris(command_line): args = command_line.get_arguments() if len(args) > 1: - gfiles = [] - for arg in args[1:]: - gfiles.append(command_line.create_file_for_arg(arg)) - return gfiles + return args[1:] def _handle_local_options(self, application, options: GLib.VariantDict) -> int: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1e8304755fde705750bcac3b1101589b0a… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1e8304755fde705750bcac3b1101589b0a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add Gajim version to exception output
by Philipp Hörist 05 Feb '18

05 Feb '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1f3a3211 by Philipp Hörist at 2018-02-05T21:00:28+01:00 Add Gajim version to exception output - - - - - 1 changed file: - gajim/gtkexcepthook.py Changes: ===================================== gajim/gtkexcepthook.py ===================================== --- a/gajim/gtkexcepthook.py +++ b/gajim/gtkexcepthook.py @@ -31,6 +31,7 @@ from io import StringIO from urllib.parse import urlencode import nbxmpp +import gajim import gi gi.require_version('Gtk', '3.0') from gi.repository import Gtk, GObject @@ -49,6 +50,7 @@ ISSUE_TEXT = '''## Versions - GTK+ Version: {} - PyGObject Version: {} - python-nbxmpp Version: {} +- Gajim Version: {} ## Traceback ``` @@ -104,6 +106,7 @@ class ExceptionDialog(): gtk_ver, gobject_ver, nbxmpp.__version__, + gajim.__version__, traceback_text) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1f3a321112cf5f49bba50891d6d4279f00… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1f3a321112cf5f49bba50891d6d4279f00… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix StartChatDialog
by Philipp Hörist 05 Feb '18

05 Feb '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4a65f4ae by Philipp Hörist at 2018-02-05T20:55:48+01:00 Fix StartChatDialog Fixes #8881 - - - - - 1 changed file: - gajim/dialogs.py Changes: ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -2836,8 +2836,8 @@ class StartChatDialog(Gtk.ApplicationWindow): for jid in groupchats: name = groupchats[jid] - if name is None: - name = app.get_nick_from_jid(groupchats[jid]) + if not name: + name = app.get_nick_from_jid(jid) row = ContactRow(account, None, jid, name, show_account, True) self.listbox.add(row) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4a65f4aeae70717494d5824a19bac454af… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4a65f4aeae70717494d5824a19bac454af… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Correctly handle cmdline args for remote instance
by Philipp Hörist 03 Feb '18

03 Feb '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: d8020f18 by Philipp Hörist at 2018-02-03T09:36:21+01:00 Correctly handle cmdline args for remote instance - - - - - 1 changed file: - gajim/gajim.py Changes: ===================================== gajim/gajim.py ===================================== --- a/gajim/gajim.py +++ b/gajim/gajim.py @@ -62,7 +62,10 @@ class GajimApplication(Gtk.Application): def __init__(self): Gtk.Application.__init__(self, application_id='org.gajim.Gajim', - flags=Gio.ApplicationFlags.HANDLES_OPEN) + flags=( + Gio.ApplicationFlags.HANDLES_COMMAND_LINE | + Gio.ApplicationFlags.HANDLES_OPEN | + Gio.ApplicationFlags.CAN_OVERRIDE_APP_ID)) self.add_main_option('version', ord('V'), GLib.OptionFlags.NONE, GLib.OptionArg.NONE, @@ -96,6 +99,7 @@ class GajimApplication(Gtk.Application): _('open ipython shell')) self.connect('handle-local-options', self._handle_local_options) + self.connect('command-line', self._handle_remote_options) self.connect('startup', self._startup) self.connect('activate', self._activate) self.connect('open', self._open) @@ -285,9 +289,34 @@ class GajimApplication(Gtk.Application): from gajim.common import app app.logger.commit() + def _handle_remote_options(self, application, command_line): + # Parse all options that should be executed on a remote instance + options = command_line.get_options_dict() + + if options.contains('ipython'): + self.activate_action('ipython') + return 0 + + gfiles = self._parse_file_args(command_line) + if gfiles is not None: + self.open(gfiles, '') + return 0 + + self.activate() + return 0 + + @staticmethod + def _parse_file_args(command_line): + args = command_line.get_arguments() + if len(args) > 1: + gfiles = [] + for arg in args[1:]: + gfiles.append(command_line.create_file_for_arg(arg)) + return gfiles + def _handle_local_options(self, application, options: GLib.VariantDict) -> int: - + # Parse all options that have to be executed before ::startup logging_helpers.init() if options.contains('profile'): @@ -297,11 +326,6 @@ class GajimApplication(Gtk.Application): app_id = '%s.%s' % (self.get_application_id(), profile) self.set_application_id(app_id) self.profile = profile - - # Register the Application, so it knows if its primary or not - # This is needed so we can execute actions on the remote instance - self.register(None) - if options.contains('separate'): self.profile_separation = True if options.contains('config-path'): @@ -319,9 +343,7 @@ class GajimApplication(Gtk.Application): logging_helpers.set_loglevels(loglevel) if options.contains('warnings'): self.show_warnings() - if options.contains('ipython'): - self.activate_action('ipython') - return 0 + return -1 def show_warnings(self): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d8020f18a1df1c1b6d9dd14c36b329ec0f… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d8020f18a1df1c1b6d9dd14c36b329ec0f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Port ipython command from gajim-remote
by Philipp Hörist 01 Feb '18

01 Feb '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9ed0edf3 by Philipp Hörist at 2018-02-02T00:21:27+01:00 Port ipython command from gajim-remote - - - - - 2 changed files: - gajim/app_actions.py - gajim/gajim.py Changes: ===================================== gajim/app_actions.py ===================================== --- a/gajim/app_actions.py +++ b/gajim/app_actions.py @@ -274,3 +274,15 @@ class AppActions(): app.interface.handle_event(dict_['account'], dict_['jid'], dict_['type_']) + + # Other Actions + + def toggle_ipython(self, action, param): + """ + Show/hide the ipython window + """ + win = app.ipython_window + if win and win.window.is_visible(): + win.present() + else: + app.interface.create_ipython_window() ===================================== gajim/gajim.py ===================================== --- a/gajim/gajim.py +++ b/gajim/gajim.py @@ -91,6 +91,9 @@ class GajimApplication(Gtk.Application): self.add_main_option('warnings', ord('w'), GLib.OptionFlags.NONE, GLib.OptionArg.NONE, _('Show all warnings')) + self.add_main_option('ipython', ord('i'), GLib.OptionFlags.NONE, + GLib.OptionArg.NONE, + _('open ipython shell')) self.connect('handle-local-options', self._handle_local_options) self.connect('startup', self._startup) @@ -294,6 +297,11 @@ class GajimApplication(Gtk.Application): app_id = '%s.%s' % (self.get_application_id(), profile) self.set_application_id(app_id) self.profile = profile + + # Register the Application, so it knows if its primary or not + # This is needed so we can execute actions on the remote instance + self.register(None) + if options.contains('separate'): self.profile_separation = True if options.contains('config-path'): @@ -311,6 +319,9 @@ class GajimApplication(Gtk.Application): logging_helpers.set_loglevels(loglevel) if options.contains('warnings'): self.show_warnings() + if options.contains('ipython'): + self.activate_action('ipython') + return 0 return -1 def show_warnings(self): @@ -386,6 +397,7 @@ class GajimApplication(Gtk.Application): ('content', action.on_contents), ('about', action.on_about), ('faq', action.on_faq), + ('ipython', action.toggle_ipython), ] act = Gio.SimpleAction.new('add-contact', GLib.VariantType.new('s')) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9ed0edf331e8163529ebe26eca3c588da0… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9ed0edf331e8163529ebe26eca3c588da0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Update flatpak file
by Yann Leboulanger 01 Feb '18

01 Feb '18

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 9aec93b8 by André Apitzsch at 2018-02-01T00:56:56+01:00 Update flatpak file - - - - - aec3a6df by Yann Leboulanger at 2018-02-01T07:52:09+01:00 Merge branch 'update_flatpak' into 'master' Update flatpak file See merge request gajim/gajim!204 - - - - - 1 changed file: - org.gajim.Gajim.json Changes: ===================================== org.gajim.Gajim.json ===================================== --- a/org.gajim.Gajim.json +++ b/org.gajim.Gajim.json @@ -58,8 +58,8 @@ "sources": [ { "type": "archive", - "url": "https://pypi.python.org/packages/4e/32/4070bdf32812c89eb635c80880a5caa2e018…", - "sha256": "5f4ff33371c6969b39b293d9771ee91e81d26f9129be093ca1b7be357fcefd15" + "url": "https://pypi.python.org/packages/62/ea/f41d44e0a4222fe8317ffe1fe7a5c75ec71c…", + "sha256": "8456abb0f892eb7d545f9ce94f4ba78d651365b1a59f9ce9ae7b5325a95dc698" } ] }, @@ -132,8 +132,8 @@ "sources": [ { "type": "archive", - "url": "https://pypi.python.org/packages/a4/c8/9a7a47f683d54d83f648d37c3e180317f80d…", - "sha256": "ce2007c1cea3359870b80657d634253a0765b0c7dc5a988d77ba803fc86f2c64" + "url": "https://pypi.python.org/packages/41/5f/6da80400340fd48ba4ae1c673be4dc3821ac…", + "sha256": "6501fc32f505ec5b3ed36ec65ba48f1b975f52cf2ea101c7b73a08583fd12f75" } ] }, @@ -141,13 +141,13 @@ "name": "python3-asn1crypto", "buildsystem": "simple", "build-commands": [ - "pip3 install --prefix=/app asn1crypto-0.23.0-py2.py3-none-any.whl" + "pip3 install --prefix=/app asn1crypto-0.24.0-py2.py3-none-any.whl" ], "sources": [ { "type": "file", - "url": "https://pypi.python.org/packages/5e/85/d9b46c307ff2b5504432425cd99e2d9f13ab…", - "sha256": "654b7db3b120e23474e9a1e5e38d268c77e58a9e17d2cb595456c37309846494" + "url": "https://pypi.python.org/packages/ea/cd/35485615f45f30a510576f1a56d1e0a7ad7b…", + "sha256": "2f1adbb7546ed199e3c90ef23ec95c5cf3585bac7d11fb7eb562a3fe89c64e87" } ] }, @@ -177,8 +177,8 @@ "sources": [ { "type": "archive", - "url": "https://pypi.python.org/packages/9c/1a/0fc8cffb04582f9ffca61b15b0681cf2e858…", - "sha256": "d04bb2425086c3fe86f7bc48915290b13e798497839fbb18ab7f6dffcf98cc3a" + "url": "https://pypi.python.org/packages/78/c5/7188f15a92413096c93053d5304718e1f6ba…", + "sha256": "e4d967371c5b6b2e67855066471d844c5d52d210c36c28d49a8507b96e2c5291" } ] }, @@ -186,13 +186,13 @@ "name": "python3-pyopenssl", "buildsystem": "simple", "build-commands": [ - "pip3 install --prefix=/app pyOpenSSL-17.3.0-py2.py3-none-any.whl" + "pip3 install --prefix=/app pyOpenSSL-17.5.0-py2.py3-none-any.whl" ], "sources": [ { "type": "file", - "url": "https://pypi.python.org/packages/24/37/89bf12e53f1d27e8b2c8e5f8f9c7a958a390…", - "sha256": "aade9985b93eaec51b0c0a2a60d14bb8dcff1ff8e36fe542e3c22812ec07315e" + "url": "https://pypi.python.org/packages/79/db/7c0cfe4aa8341a5fab4638952520d8db6ab8…", + "sha256": "07a2de1a54de07448732a81e38a55df7da109b2f47f599f8bb35b0cbec69d4bd" } ] }, @@ -200,13 +200,13 @@ "name": "python3-pyasn1", "buildsystem": "simple", "build-commands": [ - "pip3 install --prefix=/app pyasn1-0.3.6-py2.py3-none-any.whl" + "pip3 install --prefix=/app pyasn1-0.4.2-py2.py3-none-any.whl" ], "sources": [ { "type": "file", - "url": "https://pypi.python.org/packages/bf/56/47712763865a8639e6634e80405f6c758d44…", - "sha256": "06afc633971ab80943f06b96d3d6314f461001c92418fc0cd682a8357a1db47f" + "url": "https://pypi.python.org/packages/ba/fe/02e3e2ee243966b143657fb8bd6bc9759584…", + "sha256": "d5cd6ed995dba16fad0c521cfe31cd2d68400b53fcc2bce93326829be73ab6d1" } ] }, @@ -281,7 +281,7 @@ { "type": "git", "url": "https://dev.gajim.org/gajim/python-nbxmpp.git", - "branch": "nbxmpp-0.6.0" + "branch": "nbxmpp-0.6.2" } ] }, View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/258c7922a585b171abecbe77b12173b2f… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/258c7922a585b171abecbe77b12173b2f… 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