Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Set secure_delete pragma for SQLite3 connections
by Philipp Hörist 19 Jun '18

19 Jun '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 22d799a7 by Alexander Krotov at 2018-06-19T19:07:16+02:00 Set secure_delete pragma for SQLite3 connections secure_delete makes SQLite3 overwrite deleted data with zeros, thus actually deleting it from the filesystem. Ubuntu and FreeBSD enable it by defualt, but some distributions, such as Debian, have it disabled by default, so it is better to set it explicitly. The performance impact should be negligible as Gajim uses the database rarely. - - - - - 2 changed files: - gajim/common/logger.py - gajim/history_manager.py Changes: ===================================== gajim/common/logger.py ===================================== --- a/gajim/common/logger.py +++ b/gajim/common/logger.py @@ -158,9 +158,15 @@ class Logger: self._create(CACHE_SQL_STATEMENT, self._cache_db_path) @staticmethod - def _create(statement, path): + def _connect(*args, **kwargs): + con = sqlite.connect(*args, **kwargs) + con.execute("PRAGMA secure_delete=1") + return con + + @classmethod + def _create(cls, statement, path): log.info(_('Creating %s'), path) - con = sqlite.connect(path) + con = cls._connect(path) os.chmod(path, 0o600) try: @@ -181,11 +187,11 @@ class Logger: def _migrate_databases(self): try: - con = sqlite.connect(self._log_db_path) + con = self._connect(self._log_db_path) self._migrate_logs(con) con.close() - con = sqlite.connect(self._cache_db_path) + con = self._connect(self._cache_db_path) self._migrate_cache(con) con.close() except Exception: @@ -272,7 +278,7 @@ class Logger: app.ged.raise_event(event, None, str(error)) def _connect_databases(self): - self._con = sqlite.connect( + self._con = self._connect( self._log_db_path, timeout=20.0, isolation_level='IMMEDIATE') self._con.row_factory = self.namedtuple_factory ===================================== gajim/history_manager.py ===================================== --- a/gajim/history_manager.py +++ b/gajim/history_manager.py @@ -131,6 +131,7 @@ class HistoryManager: self.con = sqlite3.connect( log_db_path, timeout=20.0, isolation_level='IMMEDIATE') + self.con.execute("PRAGMA secure_delete=1") self.cur = self.con.cursor() self._init_jids_listview() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/22d799a75ef8fcaec4b0c9a14ca8473f4e… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/22d799a75ef8fcaec4b0c9a14ca8473f4e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Increase timeframe for duplicate search
by Philipp Hörist 19 Jun '18

19 Jun '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: e20f0440 by Philipp Hörist at 2018-06-19T19:05:44+02:00 Increase timeframe for duplicate search A too short timeframe leads to not recognizing duplicates if the server time differs from the user time. This is only a problem with mam:1 Fixes #8750 - - - - - 1 changed file: - gajim/common/logger.py Changes: ===================================== gajim/common/logger.py ===================================== --- a/gajim/common/logger.py +++ b/gajim/common/logger.py @@ -1235,8 +1235,8 @@ class Logger: """ # Add 10 seconds around the timestamp - start_time = timestamp - 10 - end_time = timestamp + 10 + start_time = timestamp - 30 + end_time = timestamp + 30 account_id = self.get_account_id(account) log.debug('start: %s, end: %s, jid: %s, message: %s', View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e20f044001b8fb0e1d6e42100201d8a62a… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e20f044001b8fb0e1d6e42100201d8a62a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Spellcheck some comments and docstrings
by Yann Leboulanger 19 Jun '18

19 Jun '18

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 1870f560 by Alexander Krotov at 2018-06-19T01:56:18+03:00 Spellcheck some comments and docstrings - - - - - 5 changed files: - gajim/adhoc_commands.py - gajim/config.py - gajim/disco.py - gajim/emoticons.py - gajim/groupchat_control.py Changes: ===================================== gajim/adhoc_commands.py ===================================== --- a/gajim/adhoc_commands.py +++ b/gajim/adhoc_commands.py @@ -550,7 +550,7 @@ class CommandWindow: progressbar.pulse() return True # important to keep callback be called back! - # 12 times per second (80 miliseconds) + # 12 times per second (80 milliseconds) self.pulse_id = GLib.timeout_add(80, callback) def remove_pulsing(self): ===================================== gajim/config.py ===================================== --- a/gajim/config.py +++ b/gajim/config.py @@ -1893,7 +1893,7 @@ class ManageBookmarksWindow: self.ignore_events = False - # Account-JID, RoomName, Room-JID, Autojoin, Minimize, Passowrd, Nick, + # Account-JID, RoomName, Room-JID, Autojoin, Minimize, Password, Nick, # Show_Status self.treestore = Gtk.TreeStore(str, str, str, bool, bool, str, str, str) self.treestore.set_sort_column_id(1, Gtk.SortType.ASCENDING) ===================================== gajim/disco.py ===================================== --- a/gajim/disco.py +++ b/gajim/disco.py @@ -211,7 +211,7 @@ class Closure(object): """ A weak reference to a callback with arguments as an object - Weak references to methods immediatly die, even if the object is still + Weak references to methods immediately die, even if the object is still alive. Besides a handy way to store a callback, this provides a workaround that keeps a reference to the object instead. @@ -1248,7 +1248,7 @@ class ToplevelAgentBrowser(AgentBrowser): def _create_treemodel(self): # JID, node, icon, description, state - # state is None on sucess or has a string + # state is None on success or has a string # from LABELS on error or while fetching view = self.window.services_treeview self.model = Gtk.TreeStore(str, str, GdkPixbuf.Pixbuf, str, str) @@ -1441,7 +1441,7 @@ class ToplevelAgentBrowser(AgentBrowser): self.execute_button.set_sensitive(True) if self.search_button and nbxmpp.NS_SEARCH in features: self.search_button.set_sensitive(True) - # Don't autorize to register with a server via disco + # Don't authorize to register with a server via disco if self.register_button and nbxmpp.NS_REGISTER in features and \ jid != self.jid: # We can register this agent @@ -1824,7 +1824,7 @@ class MucBrowser(AgentBrowser): def on_scroll(self, *args): """ - Scrollwindow callback to trigger new queries on scolling + Scrollwindow callback to trigger new queries on scrolling """ # This apparently happens when inactive sometimes self._query_visible() @@ -1860,7 +1860,7 @@ class MucBrowser(AgentBrowser): def _channel_altinfo(self, jid, node, items, name = None): """ - Callback for the alternate disco#items query. We try to atleast get the + Callback for the alternate disco#items query. We try to at least get the amount of users in the room if the service does not support MUC dataforms """ if items == 0: @@ -1958,7 +1958,7 @@ class DiscussionGroupsBrowser(AgentBrowser): """ Create treemodel for the window """ - # JID, node, name (with description) - pango markup, dont have info?, subscribed? + # JID, node, name (with description) - pango markup, don't have info?, subscribed? self.model = Gtk.TreeStore(str, str, str, bool, bool) # sort by name self.model.set_sort_column_id(2, Gtk.SortType.ASCENDING) ===================================== gajim/emoticons.py ===================================== --- a/gajim/emoticons.py +++ b/gajim/emoticons.py @@ -311,7 +311,7 @@ class EmoticonPopover(Gtk.Popover): def do_destroy(self): # Remove the references we hold to other objects self.text_widget = None - # Even though we dont destroy the Popover, handlers are getting + # Even though we don't destroy the Popover, handlers are getting # still disconnected, which makes the handler_id invalid # FIXME: find out how we can prevent handlers getting disconnected self.handler_id = None ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -75,7 +75,7 @@ log = logging.getLogger('gajim.groupchat_control') @unique class Column(IntEnum): IMG = 0 # image to show state (online, new message etc) - NICK = 1 # contact nickame or ROLE name + NICK = 1 # contact nickname or ROLE name TYPE = 2 # type of the row ('contact' or 'role') TEXT = 3 # text shown in the cellrenderer AVATAR_IMG = 4 # avatar of the contact @@ -725,7 +725,7 @@ class GroupchatControl(ChatControlBase): def _on_minimize(self, action, param): """ - When a grouchat is minimized, unparent the tab, put it in roster etc + When a groupchat is minimized, unparent the tab, put it in roster etc """ action.set_state(param) non_minimized_gc = app.config.get_per( @@ -843,7 +843,7 @@ class GroupchatControl(ChatControlBase): def tree_compare_iters(self, model, iter1, iter2, data=None): """ - Compare two iters to sort them + Compare two iterators to sort them """ type1 = model[iter1][Column.TYPE] type2 = model[iter2][Column.TYPE] @@ -2315,7 +2315,7 @@ class GroupchatControl(ChatControlBase): return includes = app.config.get('confirm_close_muc_rooms').split(' ') excludes = app.config.get('noconfirm_close_muc_rooms').split(' ') - # whether to ask for comfirmation before closing muc + # whether to ask for confirmation before closing muc if (app.config.get('confirm_close_muc') or self.room_jid in includes)\ and app.gc_connected[self.account][self.room_jid] and self.room_jid \ not in excludes: @@ -2460,7 +2460,7 @@ class GroupchatControl(ChatControlBase): fjid = self.room_jid + '/' + nick if nick.lower().startswith(begin.lower()) and not \ helpers.jid_is_blocked(self.account, fjid): - # the word is the begining of a nick + # the word is the beginning of a nick self.nick_hits.append(nick) if len(self.nick_hits): if len(splitted_text) < 2 or with_refer_to_nick_char: @@ -2472,13 +2472,13 @@ class GroupchatControl(ChatControlBase): start_iter = end_iter.copy() if self.last_key_tabs and with_refer_to_nick_char or (text and \ text[-1] == ' '): - # have to accomodate for the added space from last + # have to accommodate for the added space from last # completion # gc_refer_to_nick_char may be more than one char! start_iter.backward_chars(len(begin) + len(add)) elif self.last_key_tabs and not app.config.get( 'shell_like_completion'): - # have to accomodate for the added space from last + # have to accommodate for the added space from last # completion start_iter.backward_chars(len(begin) + \ len(gc_refer_to_nick_char)) @@ -2730,8 +2730,8 @@ class GroupchatControl(ChatControlBase): def on_row_activated(self, widget, path): """ - When an iter is activated (dubblick or single click if gnome is set this - way + When an iter is activated (double click or single click if gnome + is set this way) """ if path.get_depth() == 1: # It's a group if (widget.row_expanded(path)): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1870f560a492f0be1508b5f1525c860bd8… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1870f560a492f0be1508b5f1525c860bd8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove forward message adhoc commands
by Philipp Hörist 17 Jun '18

17 Jun '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3c1490a3 by Philipp Hörist at 2018-06-17T23:21:29+02:00 Remove forward message adhoc commands These commands introduce security concerns because how they interact with encrypted messages. With MAM and Carbons installed on nearly every server these Adhoc commands became not useful anymore - - - - - 1 changed file: - gajim/common/commands.py Changes: ===================================== gajim/common/commands.py ===================================== --- a/gajim/common/commands.py +++ b/gajim/common/commands.py @@ -26,7 +26,6 @@ import nbxmpp from gajim.common import helpers from gajim.common import dataforms from gajim.common import app -from gajim.common.connection_handlers_events import MessageOutgoingEvent import logging log = logging.getLogger('gajim.c.commands') @@ -277,80 +276,6 @@ class LeaveGroupchatsCommand(AdHocCommand): return False -class ForwardMessagesCommand(AdHocCommand): - # http://www.xmpp.org/extensions/xep-0146.html#forward - commandnode = 'forward-messages' - commandname = _('Forward unread messages') - - @staticmethod - def isVisibleFor(samejid): - """ - Forward messages is visible only if the entity has the same bare jid - """ - return samejid - - def execute(self, request): - account = self.connection.name - # Forward messages - events = app.events.get_events(account, types=['chat', 'normal', - 'printed_chat']) - j, resource = app.get_room_and_nick_from_fjid(self.jid) - for jid in events: - for event in events[jid]: - ev_typ = event.type_ - if ev_typ == 'printed_chat': - ev_typ = 'chat' - app.nec.push_outgoing_event(MessageOutgoingEvent(None, - account=account, jid=j, message=event.message, type_=ev_typ, - subject=event.subject, resource=resource, forward_from=jid, - delayed=event.time_)) - - # Inform other client of completion - response, cmd = self.buildResponse(request, status = 'completed') - cmd.addChild('note', {}, _('All unread messages have been forwarded.')) - - self.connection.connection.send(response) - - return False # finish the session - -class FwdMsgThenDisconnectCommand(AdHocCommand): - commandnode = 'fwd-msd-disconnect' - commandname = _('Forward unread message then disconnect') - - @staticmethod - def isVisibleFor(samejid): - """ - Forward unread messages then disconnect is visible only if the entity has the same bare jid - """ - return samejid - - def execute(self, request): - account = self.connection.name - # Forward messages - events = app.events.get_events(account, types=['chat', 'normal']) - j, resource = app.get_room_and_nick_from_fjid(self.jid) - for jid in events: - for event in events[jid]: - ev_typ = event.type_ - if ev_typ == 'printed_chat': - ev_typ = 'chat' - app.nec.push_outgoing_event(MessageOutgoingEvent(None, - account=account, jid=j, message=event.message, type_=ev_typ, - subject=event.subject, resource=resource, forward_from=jid, - delayed=event.time_, now=True)) - - response, cmd = self.buildResponse(request, status = 'completed') - cmd.addChild('note', {}, _('The status has been changed.')) - - # if going offline, we need to push response so it won't go into - # queue and disappear - self.connection.connection.send(response, now = True) - - # send new status - app.interface.roster.send_status(self.connection.name, 'offline', '') - # finish the session - return False - class ConnectionCommands: """ This class depends on that it is a part of Connection() class @@ -360,8 +285,7 @@ class ConnectionCommands: # a list of all commands exposed: node -> command class self.__commands = {} if app.config.get('remote_commands'): - for cmdobj in (ChangeStatusCommand, ForwardMessagesCommand, - LeaveGroupchatsCommand, FwdMsgThenDisconnectCommand): + for cmdobj in (ChangeStatusCommand, LeaveGroupchatsCommand): self.__commands[cmdobj.commandnode] = cmdobj # a list of sessions; keys are tuples (jid, sessionid, node) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3c1490a3066515ff1f9adaff7f9dc102f0… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3c1490a3066515ff1f9adaff7f9dc102f0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix TypeError: get_dialog() got multiple values for argument 'name'
by Philipp Hörist 17 Jun '18

17 Jun '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 27bb7d1a by André Apitzsch at 2018-06-17T21:15:51+02:00 Fix TypeError: get_dialog() got multiple values for argument 'name' - - - - - 1 changed file: - gajim/dialog_messages.py Changes: ===================================== gajim/dialog_messages.py ===================================== --- a/gajim/dialog_messages.py +++ b/gajim/dialog_messages.py @@ -180,10 +180,10 @@ messages = { } -def get_dialog(name, *args, **kwargs): - message = messages.get(name, None) +def get_dialog(dialog_name, *args, **kwargs): + message = messages.get(dialog_name, None) if message is None: - raise ValueError('Dialog %s does not exist' % name) + raise ValueError('Dialog %s does not exist' % dialog_name) # Set transient window transient_for = kwargs.get('transient_for', None) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/27bb7d1a38a56e5cca3191edb1300cd45b… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/27bb7d1a38a56e5cca3191edb1300cd45b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix docstrings for XEP-0146 commands
by Philipp Hörist 17 Jun '18

17 Jun '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 956a4201 by Alexander Krotov at 2018-06-17T20:09:32+02:00 Fix docstrings for XEP-0146 commands - - - - - 1 changed file: - gajim/common/commands.py Changes: ===================================== gajim/common/commands.py ===================================== --- a/gajim/common/commands.py +++ b/gajim/common/commands.py @@ -198,7 +198,7 @@ class LeaveGroupchatsCommand(AdHocCommand): @staticmethod def isVisibleFor(samejid): """ - Change status is visible only if the entity has the same bare jid + Leave groupchats is visible only if the entity has the same bare jid """ return samejid @@ -285,7 +285,7 @@ class ForwardMessagesCommand(AdHocCommand): @staticmethod def isVisibleFor(samejid): """ - Change status is visible only if the entity has the same bare jid + Forward messages is visible only if the entity has the same bare jid """ return samejid @@ -320,7 +320,7 @@ class FwdMsgThenDisconnectCommand(AdHocCommand): @staticmethod def isVisibleFor(samejid): """ - Change status is visible only if the entity has the same bare jid + Forward unread messages then disconnect is visible only if the entity has the same bare jid """ return samejid View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/956a42017147384e9e07b7fe2e5a6814f4… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/956a42017147384e9e07b7fe2e5a6814f4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove yahoo transport
by Philipp Hörist 17 Jun '18

17 Jun '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: ab3c53bf by André Apitzsch at 2018-06-15T12:19:02+02:00 Remove yahoo transport fixes #9188 - - - - - 30 changed files: - gajim/common/app.py - gajim/common/logger.py - − gajim/data/icons/hicolor/16x16/status/yahoo-away.png - − gajim/data/icons/hicolor/16x16/status/yahoo-chat.png - − gajim/data/icons/hicolor/16x16/status/yahoo-dnd.png - − gajim/data/icons/hicolor/16x16/status/yahoo-notinroster.png - − gajim/data/icons/hicolor/16x16/status/yahoo-offline.png - − gajim/data/icons/hicolor/16x16/status/yahoo-online.png - − gajim/data/icons/hicolor/16x16/status/yahoo-xa.png - − gajim/data/icons/hicolor/32x32/categories/gajim-agent-yahoo.png - − gajim/data/icons/hicolor/32x32/status/yahoo-away.png - − gajim/data/icons/hicolor/32x32/status/yahoo-chat.png - − gajim/data/icons/hicolor/32x32/status/yahoo-dnd.png - − gajim/data/icons/hicolor/32x32/status/yahoo-notinroster.png - − gajim/data/icons/hicolor/32x32/status/yahoo-offline.png - − gajim/data/icons/hicolor/32x32/status/yahoo-online.png - − gajim/data/icons/hicolor/32x32/status/yahoo-xa.png - − gajim/data/icons/hicolor/48x48/status/yahoo-offline.png - − gajim/data/icons/hicolor/48x48/status/yahoo-online.png - − gajim/data/icons/hicolor/scalable/status/gajim-agent-yahoo.svg - − gajim/data/iconsets/transports/yahoo/16x16/away.png - − gajim/data/iconsets/transports/yahoo/16x16/chat.png - − gajim/data/iconsets/transports/yahoo/16x16/dnd.png - − gajim/data/iconsets/transports/yahoo/16x16/not_in_roster.png - − gajim/data/iconsets/transports/yahoo/16x16/offline.png - − gajim/data/iconsets/transports/yahoo/16x16/online.png - − gajim/data/iconsets/transports/yahoo/16x16/xa.png - − gajim/data/iconsets/transports/yahoo/32x32/away.png - − gajim/data/iconsets/transports/yahoo/32x32/chat.png - − gajim/data/iconsets/transports/yahoo/32x32/dnd.png The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ab3c53bf49d6f43457eae8e6c418fa1799… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ab3c53bf49d6f43457eae8e6c418fa1799… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Contacts should not be added to Zeroconf account
by Philipp Hörist 06 Jun '18

06 Jun '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6492d159 by Philipp Hörist at 2018-06-06T21:19:18+02:00 Contacts should not be added to Zeroconf account - - - - - 1 changed file: - gajim/dialogs.py Changes: ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -861,6 +861,8 @@ class AddNewContactWindow: # fill accounts with active accounts accounts = [] for account in app.connections.keys(): + if account == 'Local': + continue if app.connections[account].connected > 1: accounts.append(account) if not accounts: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6492d159189e89456f29a3117bf9fdc57c… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6492d159189e89456f29a3117bf9fdc57c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Flatpak: fix dbus build
by Philipp Hörist 06 Jun '18

06 Jun '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6985da75 by André Apitzsch at 2018-06-06T00:19:06+02:00 Flatpak: fix dbus build after package update only python2 version was build - - - - - 1 changed file: - org.gajim.Gajim.json Changes: ===================================== org.gajim.Gajim.json ===================================== --- a/org.gajim.Gajim.json +++ b/org.gajim.Gajim.json @@ -215,6 +215,11 @@ }, { "name": "python3-dbus-python", + "build-options": { + "env": { + "PYTHON_VERSION": "3" + } + }, "sources": [ { "type": "archive", View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6985da75b468bb99ae0585b12127bdda88… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6985da75b468bb99ae0585b12127bdda88… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Dont request vcard more than once per session
by Philipp Hörist 05 Jun '18

05 Jun '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1303b89b by Philipp Hörist at 2018-06-05T23:37:10+02:00 Dont request vcard more than once per session Print a warning message if the announced avatar sha differs from the received one Fixes #9171 - - - - - 1 changed file: - gajim/common/connection_handlers.py Changes: ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -289,13 +289,14 @@ class ConnectionVcard: self.own_vcard = None self.room_jids = [] self.avatar_presence_sent = False + self._requested_shas = {} app.ged.register_event_handler('presence-received', ged.GUI2, - self._vcard_presence_received) + self._vcard_presence_received) app.ged.register_event_handler('gc-presence-received', ged.GUI2, - self._vcard_gc_presence_received) + self._vcard_gc_presence_received) app.ged.register_event_handler('room-avatar-received', ged.GUI2, - self._vcard_presence_received) + self._vcard_presence_received) def _vcard_presence_received(self, obj): if obj.conn.name != self.name: @@ -342,28 +343,32 @@ class ConnectionVcard: 'Update (vCard): %s %s', obj.jid, obj.avatar_sha) current_sha = app.contacts.get_avatar_sha(self.name, obj.jid) - if obj.avatar_sha != current_sha: - if room_avatar: - # We dont save the room avatar hash in our DB, so check - # if we previously downloaded it - if app.interface.avatar_exists(obj.avatar_sha): - app.contacts.set_avatar(self.name, obj.jid, obj.avatar_sha) - app.interface.update_avatar( - self.name, obj.jid, room_avatar=room_avatar) - else: - app.log('avatar').info( - 'Request (vCard): %s', obj.jid) - self.request_vcard(self._on_room_avatar_received, obj.jid) + if obj.avatar_sha == current_sha: + app.log('avatar').info( + 'Avatar already known (vCard): %s %s', + obj.jid, obj.avatar_sha) + return - else: + if room_avatar: + # We dont save the room avatar hash in our DB, so check + # if we previously downloaded it + if app.interface.avatar_exists(obj.avatar_sha): + app.contacts.set_avatar(self.name, obj.jid, obj.avatar_sha) + app.interface.update_avatar( + self.name, obj.jid, room_avatar=room_avatar) + elif obj.jid not in self._requested_shas: app.log('avatar').info( 'Request (vCard): %s', obj.jid) - self.request_vcard(self._on_avatar_received, obj.jid) + self._requested_shas[obj.jid] = obj.avatar_sha + self.request_vcard(self._on_room_avatar_received, obj.jid) + return - else: + if obj.jid not in self._requested_shas: app.log('avatar').info( - 'Avatar already known (vCard): %s %s', - obj.jid, obj.avatar_sha) + 'Request (vCard): %s', obj.jid) + self._requested_shas[obj.jid] = obj.avatar_sha + self.request_vcard(self._on_avatar_received, obj.jid) + def _vcard_gc_presence_received(self, obj): if obj.conn.name != self.name: @@ -395,10 +400,12 @@ class ConnectionVcard: 'Update (vCard): %s %s', obj.nick, obj.avatar_sha) path = os.path.join(configpaths.get('AVATAR'), obj.avatar_sha) if not os.path.isfile(path): - app.log('avatar').info( - 'Request (vCard): %s', obj.nick) - obj.conn.request_vcard( - self._on_avatar_received, obj.fjid, room=True) + if obj.fjid not in self._requested_shas: + app.log('avatar').info( + 'Request (vCard): %s', obj.nick) + self._requested_shas[obj.fjid] = obj.avatar_sha + obj.conn.request_vcard( + self._on_avatar_received, obj.fjid, room=True) return if gc_contact.avatar_sha != obj.avatar_sha: @@ -531,7 +538,8 @@ class ConnectionVcard: try: photo_decoded = base64.b64decode(photo.encode('utf-8')) except binascii.Error as error: - app.log('avatar').warning('Invalid avatar for %s: %s', jid, error) + app.log('avatar').warning('Invalid avatar for %s: %s', + jid, error) return None, None avatar_sha = hashlib.sha1(photo_decoded).hexdigest() @@ -612,7 +620,14 @@ class ConnectionVcard: def _on_room_avatar_received(self, jid, resource, room, vcard): avatar_sha, photo_decoded = self._get_vcard_photo(vcard, jid) + expected_avatar_sha = self._requested_shas[jid] + if expected_avatar_sha != avatar_sha: + app.log('avatar').warning( + 'Avatar mismatch (vCard): %s %s', jid, avatar_sha) + return + app.interface.save_avatar(photo_decoded) + self._requested_shas.pop(jid) app.log('avatar').info('Received (vCard): %s %s', jid, avatar_sha) app.contacts.set_avatar(self.name, jid, avatar_sha) @@ -622,8 +637,19 @@ class ConnectionVcard: """ Called when we receive a vCard Parse the vCard and trigger Events """ - avatar_sha, photo_decoded = self._get_vcard_photo(vcard, jid) + request_jid = jid + if room: + request_jid = '%s/%s' % (jid, resource) + + avatar_sha, photo_decoded = self._get_vcard_photo(vcard, request_jid) + expected_avatar_sha = self._requested_shas[request_jid] + if expected_avatar_sha != avatar_sha: + app.log('avatar').warning( + 'Avatar mismatch (vCard): %s %s', request_jid, avatar_sha) + return + app.interface.save_avatar(photo_decoded) + self._requested_shas.pop(request_jid) # Received vCard from a contact if room: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1303b89ba13e9e6217151fe4421d8f478e… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1303b89ba13e9e6217151fe4421d8f478e… 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