Commits October 2020

commits@gajim.org

1 participants
87 discussions

[Git][gajim/python-nbxmpp][master] Add Nested Roster Groups (XEP-0083) support
by Philipp Hörist 26 Oct '20

26 Oct '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 355e3076 by lovetox at 2020-10-26T21:15:48+01:00 Add Nested Roster Groups (XEP-0083) support - - - - - 4 changed files: - nbxmpp/dispatcher.py - + nbxmpp/modules/delimiter.py - nbxmpp/namespaces.py - python-nbxmpp.doap Changes: ===================================== nbxmpp/dispatcher.py ===================================== @@ -80,6 +80,7 @@ from nbxmpp.modules.mam import MAM from nbxmpp.modules.vcard_temp import VCardTemp from nbxmpp.modules.vcard4 import VCard4 from nbxmpp.modules.ping import Ping +from nbxmpp.modules.delimiter import Delimiter from nbxmpp.modules.misc import unwrap_carbon from nbxmpp.modules.misc import unwrap_mam from nbxmpp.util import get_properties_struct @@ -189,6 +190,7 @@ class StanzaDispatcher(Observable): self._modules['VCardTemp'] = VCardTemp(self._client) self._modules['VCard4'] = VCard4(self._client) self._modules['Ping'] = Ping(self._client) + self._modules['Delimiter'] = Delimiter(self._client) for instance in self._modules.values(): for handler in instance.handlers: ===================================== nbxmpp/modules/delimiter.py ===================================== @@ -0,0 +1,63 @@ +# Copyright (C) 2020 Philipp Hörist <philipp AT hoerist.com> +# +# This file is part of nbxmpp. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 3 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; If not, see <http://www.gnu.org/licenses/>. + +from nbxmpp.namespaces import Namespace +from nbxmpp.protocol import Iq +from nbxmpp.protocol import Node +from nbxmpp.errors import StanzaError +from nbxmpp.task import iq_request_task +from nbxmpp.modules.base import BaseModule +from nbxmpp.modules.util import process_response + + +class Delimiter(BaseModule): + def __init__(self, client): + BaseModule.__init__(self, client) + + self._client = client + self.handlers = [] + + @iq_request_task + def request_delimiter(self): + _task = yield + + response = yield _make_request() + if response.isError(): + raise StanzaError(response) + + delimiter = response.getQuery().getTagData('roster') or None + yield delimiter + + @iq_request_task + def set_delimiter(self, delimiter): + _task = yield + + response = yield _make_set_request(delimiter) + yield process_response(response) + + +def _make_request(): + node = Node('storage', attrs={'xmlns': Namespace.DELIMITER}) + iq = Iq('get', Namespace.PRIVATE, payload=node) + return iq + + +def _make_set_request(delimiter): + iq = Iq('set', Namespace.PRIVATE) + roster = iq.getQuery().addChild('roster', namespace=Namespace.DELIMITER) + roster.setData(delimiter) + return iq ===================================== nbxmpp/namespaces.py ===================================== @@ -55,6 +55,7 @@ class _Namespaces: DATA_VALIDATE: str = 'http://jabber.org/protocol/xdata-validate' DELAY: str = 'jabber:x:delay' DELAY2: str = 'urn:xmpp:delay' + DELIMITER: str = 'roster:delimiter' DISCO: str = 'http://jabber.org/protocol/disco' DISCO_INFO: str = 'http://jabber.org/protocol/disco#info' DISCO_ITEMS: str = 'http://jabber.org/protocol/disco#items' ===================================== python-nbxmpp.doap ===================================== @@ -144,6 +144,13 @@ <xmpp:version>1.1</xmpp:version> </xmpp:SupportedXep> </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0083.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>1.0</xmpp:version> + </xmpp:SupportedXep> + </implements> <implements> <xmpp:SupportedXep> <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0084.html" /> View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/355e3076fdcf231b467a01f1… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/355e3076fdcf231b467a01f1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][chat_markers] 10 commits: MAM: Adapt to nbxmpp changes
by Daniel Brötzmann 26 Oct '20

26 Oct '20

Daniel Brötzmann pushed to branch chat_markers at gajim / gajim Commits: 7056fecf by lovetox at 2020-10-25T14:22:05+01:00 MAM: Adapt to nbxmpp changes - - - - - 8e79f9f7 by André Apitzsch at 2020-10-25T17:39:24+01:00 Use styling directives as recommended in XEP-0393 Remove style *underline* and add style *strikethrough*. Fixes #7613. - - - - - 29ee43b4 by wurstsalat at 2020-10-25T17:52:30+01:00 GroupchatControl: Fix DND - - - - - 56bb6ce2 by wurstsalat at 2020-10-25T17:52:30+01:00 Don’t show notifications for own muc messages on DND - - - - - 5e3e0ad3 by lovetox at 2020-10-26T08:40:48+01:00 MAM: Handle errors better - - - - - 5c995389 by lovetox at 2020-10-26T20:22:13+01:00 SecurityLabels: Adapt to nbxmpp changes - - - - - ce68aa99 by lovetox at 2020-10-26T20:47:57+01:00 ChatControl: Show displaymarking correctly - - - - - a9649e18 by Yann Leboulanger at 2020-10-26T20:50:25+01:00 Add Chat Markers (XEP-0333) - - - - - 5576b5e6 by wurstsalat at 2020-10-26T20:50:25+01:00 Improvements - - - - - 78d119a3 by wurstsalat at 2020-10-26T20:50:25+01:00 Improvements 2 - - - - - 22 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/connection_handlers_events.py - gajim/common/const.py - gajim/common/events.py - gajim/common/modules/__init__.py - + gajim/common/modules/chat_markers.py - gajim/common/modules/mam.py - gajim/common/modules/message.py - gajim/common/modules/security_labels.py - gajim/common/setting_values.py - gajim/common/settings.py - gajim/conversation_textview.py - gajim/data/gui/chat_control.ui - gajim/data/style/gajim.css - gajim/groupchat_control.py - gajim/gtk/accounts.py - gajim/gtk/groupchat_settings.py - gajim/gtk/history_sync.py - gajim/gtk/mam_preferences.py - gajim/gui_interface.py - gajim/gui_menu_builder.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -123,7 +123,7 @@ def __init__(self, parent_win, contact, acct, session, resource=None): # Menu for the HeaderBar self.control_menu = gui_menu_builder.get_singlechat_menu( - self.control_id, self.account, self.contact.jid) + self.control_id, self.account, self.contact.jid, self._type) # Settings menu self.xml.settings_menu.set_menu_model(self.control_menu) @@ -228,6 +228,7 @@ def __init__(self, parent_win, contact, acct, session, resource=None): ('mam-decrypted-message-received', ged.GUI1, self._on_mam_decrypted_message_received), ('decrypted-message-received', ged.GUI1, self._on_decrypted_message_received), ('receipt-received', ged.GUI1, self._receipt_received), + ('displayed-received', ged.GUI1, self._displayed_received), ('message-error', ged.GUI1, self._on_message_error), ('zeroconf-error', ged.GUI1, self._on_zeroconf_error), ]) @@ -271,6 +272,15 @@ def add_actions(self): act.connect('change-state', self._on_send_chatstate) self.parent_win.window.add_action(act) + marker = self.contact.settings.get('send_marker') + + act = Gio.SimpleAction.new_stateful( + f'send-marker-{self.control_id}', + None, + GLib.Variant.new_boolean(marker)) + act.connect('change-state', self._on_send_marker) + self.parent_win.window.add_action(act) + def update_actions(self): win = self.parent_win.window online = app.account_is_connected(self.account) @@ -338,6 +348,12 @@ def update_actions(self): tooltip_text = _('No File Transfer available') self.xml.sendfile_button.set_tooltip_text(tooltip_text) + # Chat markers + state = GLib.Variant.new_boolean( + self.contact.settings.get('send_marker')) + win.lookup_action( + f'send-marker-{self.control_id}').change_state(state) + # Convert to GC if app.settings.get_account_setting(self.account, 'is_zeroconf'): win.lookup_action( @@ -363,6 +379,7 @@ def remove_actions(self): 'information-', 'start-call-', 'send-chatstate-', + 'send-marker-', ] for action in actions: self.parent_win.window.remove_action(f'{action}{self.control_id}') @@ -435,6 +452,10 @@ def _on_send_chatstate(self, action, param): action.set_state(param) self.contact.settings.set('send_chatstate', param.get_string()) + def _on_send_marker(self, action, param): + action.set_state(param) + self.contact.settings.set('send_marker', param.get_boolean()) + def subscribe_events(self): """ Register listeners to the events class @@ -623,7 +644,7 @@ def _on_message_sent(self, event): message_id = event.message_id if event.label: - displaymarking = event.label.getTag('displaymarking') + displaymarking = event.label.displaymarking else: displaymarking = None if self.correcting: @@ -643,6 +664,10 @@ def _on_message_sent(self, event): def _receipt_received(self, event): self.conv_textview.show_receipt(event.receipt_id) + @event_filter(['account', 'jid']) + def _displayed_received(self, event): + self.conv_textview.show_displayed(event.marker_id) + @event_filter(['account', 'jid']) def _on_zeroconf_error(self, event): self.add_status_message(event.message) @@ -1384,6 +1409,14 @@ def read_queue(self): self.set_session(event.session) if message_ids: app.storage.archive.set_read_messages(message_ids) + + # XEP-0333 Send <displayed> marker + con = app.connections[self.account] + con.get_module('ChatMarkers').send_displayed_marker( + self.contact, + self.last_msg_id, + self._type) + self.last_msg_id = None app.events.remove_events(self.account, jid_with_resource, types=[str(self._type)]) ===================================== gajim/chat_control_base.py ===================================== @@ -145,6 +145,10 @@ def __init__(self, parent_win, widget_name, contact, acct, # Drag and drop self.xml.overlay.add_overlay(self.xml.drop_area) self.xml.drop_area.hide() + self.xml.overlay.connect( + 'drag-data-received', self._on_drag_data_received) + self.xml.overlay.connect('drag-motion', self._on_drag_motion) + self.xml.overlay.connect('drag-leave', self._on_drag_leave) self.TARGET_TYPE_URI_LIST = 80 uri_entry = Gtk.TargetEntry.new( @@ -214,6 +218,9 @@ def __init__(self, parent_win, widget_name, contact, acct, self.received_history_pos = 0 self.orig_msg = None + # For XEP-0333 + self.last_msg_id = None + self.correcting = False self.last_sent_msg = None @@ -479,7 +486,8 @@ def _sec_labels_received(self, event): model.clear() sel = 0 - _label, labellist, default = event.catalog + labellist = event.catalog.get_label_names() + default = event.catalog.default for index, label in enumerate(labellist): model.append([label]) if label == default: @@ -969,7 +977,7 @@ def get_seclabel(self): if self._type.is_privatechat: jid = self.gc_contact.room_jid catalog = con.get_module('SecLabels').get_catalog(jid) - labels, label_list, _ = catalog + labels, label_list = catalog.labels, catalog.get_label_names() lname = label_list[idx] label = labels[lname] return label @@ -1111,6 +1119,7 @@ def add_message(self, displaymarking=None, msg_log_id=None, message_id=None, + stanza_id=None, correct_id=None, additional_data=None, marker=None, @@ -1154,6 +1163,12 @@ def add_message(self, if restored: return + if message_id: + if self._type.is_groupchat: + self.last_msg_id = stanza_id or message_id + else: + self.last_msg_id = message_id + if kind == 'incoming': if (not self._type.is_groupchat or self.contact.can_notify() or @@ -1198,7 +1213,10 @@ def add_message(self, event = event_type(text, subject, - self, msg_log_id, + self, + msg_log_id, + message_id=message_id, + stanza_id=stanza_id, show_in_roster=show_in_roster, show_in_systray=show_in_systray) app.events.add_event(self.account, full_jid, event) @@ -1350,7 +1368,7 @@ def set_control_active(self, state): jid = self.contact.jid if self.conv_textview.autoscroll: # we are at the end - type_ = ['printed_%s' % self._type] + type_ = [f'printed_{self._type}'] if self._type.is_groupchat: type_ = ['printed_gc_msg', 'printed_marked_gc_msg'] if not app.events.remove_events(self.account, @@ -1358,6 +1376,12 @@ def set_control_active(self, state): types=type_): # There were events to remove self.redraw_after_event_removed(jid) + # XEP-0333 Send <displayed> marker + con.get_module('ChatMarkers').send_displayed_marker( + self.contact, + self.last_msg_id, + self._type) + self.last_msg_id = None # send chatstate inactive to the one we're leaving # and active to the one we visit if self.msg_textview.has_text(): @@ -1386,20 +1410,27 @@ def _on_edge_reached(self, _scrolledwindow, pos): types_list = [] if self._type.is_groupchat: types_list = ['printed_gc_msg', 'gc_msg', 'printed_marked_gc_msg'] - else: # Not a GC - types_list = ['printed_%s' % self._type, str(self._type)] + else: + types_list = [f'printed_{self._type}', str(self._type)] if not app.events.get_events(self.account, jid, types_list): return if not self.parent_win: return - if self.parent_win.get_active_control() == self and \ - self.parent_win.window.is_active(): + if (self.parent_win.get_active_control() == self and + self.parent_win.window.is_active()): # we are at the end if not app.events.remove_events( self.account, jid, types=types_list): # There were events to remove self.redraw_after_event_removed(jid) + # XEP-0333 Send <displayed> tag + con = app.connections[self.account] + con.get_module('ChatMarkers').send_displayed_marker( + self.contact, + self.last_msg_id, + self._type) + self.last_msg_id = None def _on_scrollbar_button_release(self, scrollbar, event): if event.get_button()[1] != 1: @@ -1464,6 +1495,8 @@ def redraw_after_event_removed(self, jid): We just removed a 'printed_*' event, redraw contact in roster or gc_roster and titles in roster and msg_win """ + if not self.parent_win: # minimized groupchat + return self.parent_win.redraw_tab(self) self.parent_win.show_title() # TODO : get the contact and check get_show_in_roster() ===================================== gajim/common/connection_handlers_events.py ===================================== @@ -287,14 +287,15 @@ def handle_incoming_gc_msg_event(self, msg_obj): nick = msg_obj.properties.muc_nickname - if nick != msg_obj.gc_control.nick: - self.do_sound = True - if sound == 'received': - self.sound_event = 'muc_message_received' - elif sound == 'highlight': - self.sound_event = 'muc_message_highlight' - else: - self.do_sound = False + if nick == msg_obj.gc_control.nick: + # A message from ourself + return + + self.do_sound = True + if sound == 'received': + self.sound_event = 'muc_message_received' + elif sound == 'highlight': + self.sound_event = 'muc_message_highlight' else: self.do_sound = False ===================================== gajim/common/const.py ===================================== @@ -970,6 +970,7 @@ def is_error(self): Namespace.SECLABEL, Namespace.CONFERENCE, Namespace.CORRECT, + Namespace.CHATMARKERS, Namespace.EME, Namespace.XHTML_IM, Namespace.HASHES_2, ===================================== gajim/common/events.py ===================================== @@ -91,13 +91,16 @@ class PmEvent(ChatEvent): class PrintedChatEvent(Event): type_ = 'printed_chat' def __init__(self, message, subject, control, msg_log_id, time_=None, - show_in_roster=False, show_in_systray=True): + message_id=None, stanza_id=None, show_in_roster=False, + show_in_systray=True): Event.__init__(self, time_, show_in_roster=show_in_roster, - show_in_systray=show_in_systray) + show_in_systray=show_in_systray) self.message = message self.subject = subject self.control = control self.msg_log_id = msg_log_id + self.message_id = message_id + self.stanza_id = stanza_id class PrintedGcMsgEvent(PrintedChatEvent): type_ = 'printed_gc_msg' ===================================== gajim/common/modules/__init__.py ===================================== @@ -40,6 +40,7 @@ 'bookmarks', 'caps', 'carbons', + 'chat_markers', 'chatstates', 'delimiter', 'discovery', ===================================== gajim/common/modules/chat_markers.py ===================================== @@ -0,0 +1,119 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +# Chat Markers (XEP-0333) + +import nbxmpp +from nbxmpp.namespaces import Namespace +from nbxmpp.structs import StanzaHandler + +from gajim.common import app +from gajim.common.nec import NetworkEvent +from gajim.common.modules.base import BaseModule + + +class ChatMarkers(BaseModule): + + _nbxmpp_extends = 'ChatMarkers' + + def __init__(self, con): + BaseModule.__init__(self, con) + + self.handlers = [ + StanzaHandler(name='message', + callback=self._process_chat_marker, + ns=Namespace.CHATMARKERS, + priority=47), + ] + + def _process_chat_marker(self, _con, _stanza, properties): + if not properties.is_marker or not properties.marker.is_displayed: + return + + if properties.type.is_error: + return + + if properties.type.is_groupchat: + manager = self._con.get_module('MUC').get_manager() + muc_data = manager.get(properties.muc_jid) + if muc_data is None: + return + + if properties.muc_nickname != muc_data.nick: + return + + self._raise_event('read-state-sync', properties) + return + + if properties.is_carbon_message and properties.carbon.is_sent: + self._raise_event('read-state-sync', properties) + return + + if properties.is_mam_message: + if properties.from_.bareMatch(self._con.get_own_jid()): + return + + self._raise_event('displayed-received', properties) + + def _raise_event(self, name, properties): + self._log.info('%s: %s %s', + name, + properties.jid, + properties.marker.id) + + jid = properties.jid + if not properties.is_muc_pm and not properties.type.is_groupchat: + jid = properties.jid.bare + + app.nec.push_outgoing_event( + NetworkEvent(name, + account=self._account, + jid=jid, + properties=properties, + type=properties.type, + is_muc_pm=properties.is_muc_pm, + marker_id=properties.marker.id)) + + def _send_marker(self, contact, marker, id_, type_): + jid = contact.jid + if contact.is_pm_contact: + jid = app.get_jid_without_resource(contact.jid) + + if type_ in ('gc', 'pm'): + disco_info = app.storage.cache.get_last_disco_info(jid) + + context = 'public' + if disco_info is not None and disco_info.muc_is_members_only: + context = 'private' + + if not app.settings.get_group_chat_setting( + self._account, jid, 'send_marker', context=context): + return + else: + if not app.settings.get_contact_setting( + self._account, jid, 'send_marker'): + return + + typ = 'groupchat' if type_ == 'gc' else 'chat' + message = nbxmpp.Message(to=contact.jid, typ=typ) + message.setMarker(marker, id_) + self._log.info('Send %s: %s', marker, contact.jid) + self._nbxmpp().send(message) + + def send_displayed_marker(self, contact, id_, type_): + self._send_marker(contact, 'displayed', id_, str(type_)) + + +def get_instance(*args, **kwargs): + return ChatMarkers(*args, **kwargs), 'ChatMarkers' ===================================== gajim/common/modules/mam.py ===================================== @@ -21,8 +21,11 @@ import nbxmpp from nbxmpp.namespaces import Namespace from nbxmpp.util import generate_id -from nbxmpp.util import is_error_result +from nbxmpp.errors import StanzaError +from nbxmpp.errors import MalformedStanzaError +from nbxmpp.errors import is_error from nbxmpp.structs import StanzaHandler +from nbxmpp.modules.util import raise_if_error from gajim.common import app from gajim.common.nec import NetworkEvent @@ -34,6 +37,7 @@ from gajim.common.modules.misc import parse_oob from gajim.common.modules.misc import parse_correction from gajim.common.modules.util import get_eme_message +from gajim.common.modules.util import as_task from gajim.common.modules.base import BaseModule @@ -262,13 +266,8 @@ def _get_query_id(self, jid): self._mam_query_ids[jid] = query_id return query_id - def request_archive_on_signin(self): + def _get_query_params(self): own_jid = self._con.get_own_jid().bare - - if own_jid in self._mam_query_ids: - self._log.warning('Request already running: %s', own_jid) - return - archive = app.storage.archive.get_archive_infos(own_jid) mam_id = None @@ -276,7 +275,6 @@ def request_archive_on_signin(self): mam_id = archive.last_mam_id start_date = None - queryid = self._get_query_id(own_jid) if mam_id: self._log.info('Request archive: %s, after mam-id %s', own_jid, mam_id) @@ -286,38 +284,13 @@ def request_archive_on_signin(self): start_date = datetime.utcnow() - timedelta(days=7) self._log.info('Request archive: %s, after date %s', own_jid, start_date) + return mam_id, start_date - self._nbxmpp('MAM').make_query(own_jid, - queryid, - after=mam_id, - start=start_date, - callback=self._result_finished, - user_data={'queryid': queryid, - 'start': start_date, - 'groupchat': False}) - - if own_jid in self._catch_up_finished: - self._catch_up_finished.remove(own_jid) - - def request_archive_on_muc_join(self, jid): + def _get_muc_query_params(self, jid, threshold): archive = app.storage.archive.get_archive_infos(jid) - disco_info = app.storage.cache.get_last_disco_info(jid) - - context = 'public' - if disco_info is not None and disco_info.muc_is_members_only: - context = 'private' - - threshold = app.settings.get_group_chat_setting(self._account, - jid, - 'sync_threshold', - context=context) - self._log.info('Threshold for %s: %s', jid, threshold) - - if threshold == SyncThreshold.NO_SYNC: - return - mam_id = None start_date = None + if archive is None or archive.last_mam_id is None: # First join start_date = datetime.utcnow() - timedelta(days=1) @@ -353,67 +326,129 @@ def request_archive_on_muc_join(self, jid): self._log.info('Request archive: %s, after mam-id %s:', jid, archive.last_mam_id) + return mam_id, start_date + + @as_task + def request_archive_on_signin(self): + _task = yield + + own_jid = self._con.get_own_jid().bare + + if own_jid in self._mam_query_ids: + self._log.warning('request already running for %s', own_jid) + return + + mam_id, start_date = self._get_query_params() + + result = yield self._execute_query(own_jid, mam_id, start_date) + if is_error(result): + if result.condition != 'item-not-found': + self._log.warning(result) + return + + app.storage.archive.reset_archive_infos(result.jid) + _, start_date = self._get_query_params() + result = yield self._execute_query(result.jid, None, start_date) + if is_error(result): + self._log.warning(result) + return + + if result.rsm.last is not None: + # <last> is not provided if the requested page was empty + # so this means we did not get anything hence we only need + # to update the archive info if <last> is present + app.storage.archive.set_archive_infos( + result.jid, + last_mam_id=result.rsm.last, + last_muc_timestamp=time.time()) + + if start_date is not None: + # Record the earliest timestamp we request from + # the account archive. For the account archive we only + # set start_date at the very first request. + app.storage.archive.set_archive_infos( + result.jid, + oldest_mam_timestamp=start_date.timestamp()) + + @as_task + def request_archive_on_muc_join(self, jid): + _task = yield + + disco_info = app.storage.cache.get_last_disco_info(jid) + + context = 'public' + if disco_info is not None and disco_info.muc_is_members_only: + context = 'private' + + threshold = app.settings.get_group_chat_setting(self._account, + jid, + 'sync_threshold', + context=context) + self._log.info('Threshold for %s: %s', jid, threshold) + + if threshold == SyncThreshold.NO_SYNC: + return + + mam_id, start_date = self._get_muc_query_params(jid, threshold) + + result = yield self._execute_query(jid, mam_id, start_date) + if is_error(result): + if result.condition != 'item-not-found': + self._log.warning(result) + return + + app.storage.archive.reset_archive_infos(result.jid) + _, start_date = self._get_muc_query_params(jid, threshold) + result = yield self._execute_query(result.jid, None, start_date) + if is_error(result): + self._log.warning(result) + return + + if result.rsm.last is not None: + # <last> is not provided if the requested page was empty + # so this means we did not get anything hence we only need + # to update the archive info if <last> is present + app.storage.archive.set_archive_infos( + result.jid, + last_mam_id=result.rsm.last, + last_muc_timestamp=time.time()) + + @as_task + def _execute_query(self, jid, mam_id, start_date): + _task = yield + if jid in self._catch_up_finished: self._catch_up_finished.remove(jid) queryid = self._get_query_id(jid) - self._nbxmpp('MAM').make_query(jid, + + result = yield self.make_query(jid, queryid, after=mam_id, - start=start_date, - callback=self._result_finished, - user_data={'queryid': queryid, - 'start': start_date, - 'groupchat': True}) - - def _result_finished(self, result, user_data): - queryid, start_date, groupchat = user_data.values() - self._remove_query_id(result.jid) - - if is_error_result(result): - if result.condition == 'item-not-found': - app.storage.archive.reset_archive_infos(result.jid) - if groupchat: - self.request_archive_on_muc_join(result.jid) - else: - self.request_archive_on_signin() - return + start=start_date) - if result.complete: - self._catch_up_finished.append(result.jid) - self._log.info('Request finished: %s, last mam id: %s', - result.jid, result.rsm.last) + self._remove_query_id(result.jid) - if result.rsm.last is not None: - # <last> is not provided if the requested page was empty - # so this means we did not get anything hence we only need - # to update the archive info if <last> is present - app.storage.archive.set_archive_infos( - result.jid, - last_mam_id=result.rsm.last, - last_muc_timestamp=time.time()) - - if start_date is not None and not groupchat: - # Record the earliest timestamp we request from - # the account archive. For the account archive we only - # set start_date at the very first request. - app.storage.archive.set_archive_infos( - result.jid, - oldest_mam_timestamp=start_date.timestamp()) + raise_if_error(result) - else: + while not result.complete: app.storage.archive.set_archive_infos(result.jid, last_mam_id=result.rsm.last) queryid = self._get_query_id(result.jid) - self._nbxmpp('MAM').make_query(result.jid, + result = yield self.make_query(result.jid, queryid, after=result.rsm.last, - start=start_date, - callback=self._result_finished, - user_data={'queryid': queryid, - 'start': start_date, - 'groupchat': groupchat}) + start=start_date) + + self._remove_query_id(result.jid) + + raise_if_error(result) + + self._catch_up_finished.append(result.jid) + self._log.info('Request finished: %s, last mam id: %s', + result.jid, result.rsm.last) + yield result def request_archive_interval(self, start_date, @@ -433,24 +468,26 @@ def request_archive_interval(self, queryid = self._get_query_id(jid) self._mam_query_ids[jid] = queryid - self._nbxmpp('MAM').make_query(jid, - queryid, - after=after, - start=start_date, - end=end_date, - callback=self._on_interval_result, - user_data={'queryid': queryid, - 'start_date': start_date, - 'end_date': end_date}) + self.make_query(jid, + queryid, + after=after, + start=start_date, + end=end_date, + callback=self._on_interval_result, + user_data=(queryid, start_date, end_date)) return queryid - def _on_interval_result(self, result, user_data): - queryid, start_date, end_date = user_data.values() - self._remove_query_id(result.jid) + def _on_interval_result(self, task): + queryid, start_date, end_date = task.get_user_data() - if is_error_result(result): + try: + result = task.finish() + except (StanzaError, MalformedStanzaError) as error: + self._remove_query_id(error.jid) return + self._remove_query_id(result.jid) + if start_date: timestamp = start_date.timestamp() else: ===================================== gajim/common/modules/message.py ===================================== @@ -28,7 +28,6 @@ from gajim.common.const import KindConstant from gajim.common.modules.base import BaseModule from gajim.common.modules.util import get_eme_message -from gajim.common.modules.security_labels import parse_securitylabel from gajim.common.modules.misc import parse_correction from gajim.common.modules.misc import parse_oob from gajim.common.modules.misc import parse_xhtml @@ -178,6 +177,10 @@ def _message_received(self, _con, stanza, properties): if properties.eme is not None: msgtxt = get_eme_message(properties.eme) + displaymarking = None + if properties.has_security_label: + displaymarking = properties.security_label.displaymarking + event_attr = { 'conn': self._con, 'stanza': stanza, @@ -195,7 +198,7 @@ def _message_received(self, _con, stanza, properties): 'gc_control': gc_control, 'popup': False, 'msg_log_id': None, - 'displaymarking': parse_securitylabel(stanza), + 'displaymarking': displaymarking, 'properties': properties, } @@ -305,8 +308,10 @@ def build_message_stanza(self, message): stanza.setID(message.message_id) stanza.setOriginID(message.message_id) + stanza.setMarkable() + if message.label: - stanza.addChild(node=message.label) + stanza.addChild(node=message.label.to_node()) # XEP-0172: user_nickname if message.user_nick: @@ -347,6 +352,10 @@ def build_message_stanza(self, message): stanza.setTag('no-store', namespace=Namespace.MSG_HINTS) + # XEP-0333 + if message.message: + stanza.setMarkable() + # Add other nodes if message.nodes is not None: for node in message.nodes: ===================================== gajim/common/modules/security_labels.py ===================================== @@ -14,15 +14,22 @@ # XEP-0258: Security Labels in XMPP -import nbxmpp from nbxmpp.namespaces import Namespace +from nbxmpp.errors import is_error from gajim.common import app -from gajim.common.nec import NetworkIncomingEvent +from gajim.common.nec import NetworkEvent from gajim.common.modules.base import BaseModule +from gajim.common.modules.util import as_task class SecLabels(BaseModule): + + _nbxmpp_extends = 'SecurityLabels' + _nbxmpp_methods = [ + 'request_catalog', + ] + def __init__(self, con): BaseModule.__init__(self, con) @@ -36,58 +43,28 @@ def pass_disco(self, info): self.supported = True self._log.info('Discovered security labels: %s', info.jid) + @as_task def request_catalog(self, jid): - server = app.get_jid_from_account(self._account).split("@")[1] - iq = nbxmpp.Iq(typ='get', to=server) - iq.addChild(name='catalog', - namespace=Namespace.SECLABEL_CATALOG, - attrs={'to': jid}) - self._log.info('Request catalog: server: %s, to: %s', server, jid) - self._con.connection.SendAndCallForResponse( - iq, self._catalog_received) - - def _catalog_received(self, _nbxmpp_client, stanza): - if not nbxmpp.isResultNode(stanza): - self._log.info('Error: %s', stanza.getError()) - return + _task = yield - query = stanza.getTag('catalog', namespace=Namespace.SECLABEL_CATALOG) - to = query.getAttr('to') - items = query.getTags('item') + catalog = yield self._nbxmpp('SecurityLabels').request_catalog(jid) - labels = {} - label_list = [] - default = None - for item in items: - label = item.getAttr('selector') - labels[label] = item.getTag('securitylabel') - label_list.append(label) - if item.getAttr('default') == 'true': - default = label + if is_error(catalog): + self._log.info(catalog) + return - catalog = (labels, label_list, default) - self._catalogs[to] = catalog + self._catalogs[jid] = catalog - self._log.info('Received catalog: %s', to) - self._log.debug(catalog) + self._log.info('Received catalog: %s', jid) - app.nec.push_incoming_event(SecLabelCatalog( - None, account=self._account, jid=to, catalog=catalog)) + app.nec.push_incoming_event(NetworkEvent('sec-catalog-received', + account=self._account, + jid=jid, + catalog=catalog)) def get_catalog(self, jid): return self._catalogs.get(jid) -def parse_securitylabel(stanza): - seclabel = stanza.getTag('securitylabel', namespace=Namespace.SECLABEL) - if seclabel is None: - return None - return seclabel.getTag('displaymarking') - - -class SecLabelCatalog(NetworkIncomingEvent): - name = 'sec-catalog-received' - - def get_instance(*args, **kwargs): return SecLabels(*args, **kwargs), 'SecLabels' ===================================== gajim/common/setting_values.py ===================================== @@ -255,12 +255,16 @@ class _ACCOUNT_DEFAULT: 'filetransfer_preference': 'httpupload', 'send_chatstate_default': 'composing_only', 'gc_send_chatstate_default': 'composing_only', + 'send_marker_default': True, + 'gc_send_marker_private_default': True, + 'gc_send_marker_public_default': False, 'chat_history_max_age': -1, }, 'contact': { 'speller_language': '', 'send_chatstate': HAS_ACCOUNT_DEFAULT, + 'send_marker': HAS_ACCOUNT_DEFAULT, 'encryption': '', }, @@ -272,6 +276,7 @@ class _ACCOUNT_DEFAULT: 'minimize_on_autojoin': True, 'minimize_on_close': True, 'send_chatstate': HAS_ACCOUNT_DEFAULT, + 'send_marker': HAS_ACCOUNT_DEFAULT, 'encryption': '', 'sync_threshold': HAS_APP_DEFAULT, }, ===================================== gajim/common/settings.py ===================================== @@ -678,11 +678,13 @@ def set_group_chat_setting(self, def set_group_chat_settings(self, setting: str, - value: SETTING_TYPE) -> None: + value: SETTING_TYPE, + context: str = None) -> None: for account in self._account_settings: for jid in self._account_settings[account]['group_chat']: - self.set_group_chat_setting(account, jid, setting, value) + self.set_group_chat_setting( + account, jid, setting, value, context) def get_contact_setting(self, account: str, ===================================== gajim/conversation_textview.py ===================================== @@ -38,6 +38,7 @@ from gajim.common import helpers from gajim.common import i18n from gajim.common.i18n import _ +from gajim.common.i18n import Q_ from gajim.common.helpers import AdditionalDataDict from gajim.common.const import StyleAttr from gajim.common.const import Trust @@ -194,8 +195,8 @@ def __init__(self, account, used_in_history_window=False): tag = buffer_.create_tag('italic') tag.set_property('style', Pango.Style.ITALIC) - tag = buffer_.create_tag('underline') - tag.set_property('underline', Pango.Underline.SINGLE) + tag = buffer_.create_tag('strikethrough') + tag.set_property('strikethrough', True) buffer_.create_tag('focus-out-line', justification=Gtk.Justification.CENTER) self.displaymarking_tags = {} @@ -311,6 +312,12 @@ def show_receipt(self, id_): return line.set_receipt() + def show_displayed(self, id_): + line = self._get_message_line(id_) + if line is None: + return + line.set_displayed() + def show_error(self, id_, error): line = self._get_message_line(id_) if line is None: @@ -692,46 +699,46 @@ def print_special_text(self, special_text, other_tags, graphics=True, tags.append('sth_at_sth') elif special_text.startswith('*'): # it's a bold text tags.append('bold') - if special_text[1] == '/' and special_text[-2] == '/' and\ - len(special_text) > 4: # it's also italic - tags.append('italic') + if special_text[1] == '~' and special_text[-2] == '~' and\ + len(special_text) > 4: # it's also strikethrough + tags.append('strikethrough') if not show_ascii_formatting_chars: - special_text = special_text[2:-2] # remove */ /* + special_text = special_text[2:-2] # remove *~ ~* elif special_text[1] == '_' and special_text[-2] == '_' and \ - len(special_text) > 4: # it's also underlined - tags.append('underline') + len(special_text) > 4: # it's also italic + tags.append('italic') if not show_ascii_formatting_chars: special_text = special_text[2:-2] # remove *_ _* else: if not show_ascii_formatting_chars: special_text = special_text[1:-1] # remove * * - elif special_text.startswith('/'): # it's an italic text - tags.append('italic') + elif special_text.startswith('~'): # it's a strikethrough text + tags.append('strikethrough') if special_text[1] == '*' and special_text[-2] == '*' and \ len(special_text) > 4: # it's also bold tags.append('bold') if not show_ascii_formatting_chars: - special_text = special_text[2:-2] # remove /* */ + special_text = special_text[2:-2] # remove ~* *~ elif special_text[1] == '_' and special_text[-2] == '_' and \ - len(special_text) > 4: # it's also underlined - tags.append('underline') + len(special_text) > 4: # it's also italic + tags.append('italic') if not show_ascii_formatting_chars: - special_text = special_text[2:-2] # remove /_ _/ + special_text = special_text[2:-2] # remove ~_ _~ else: if not show_ascii_formatting_chars: - special_text = special_text[1:-1] # remove / / - elif special_text.startswith('_'): # it's an underlined text - tags.append('underline') + special_text = special_text[1:-1] # remove ~ ~ + elif special_text.startswith('_'): # it's an italic text + tags.append('italic') if special_text[1] == '*' and special_text[-2] == '*' and \ len(special_text) > 4: # it's also bold tags.append('bold') if not show_ascii_formatting_chars: special_text = special_text[2:-2] # remove _* *_ - elif special_text[1] == '/' and special_text[-2] == '/' and \ - len(special_text) > 4: # it's also italic - tags.append('italic') + elif special_text[1] == '~' and special_text[-2] == '~' and \ + len(special_text) > 4: # it's also strikethrough + tags.append('strikethrough') if not show_ascii_formatting_chars: - special_text = special_text[2:-2] # remove _/ /_ + special_text = special_text[2:-2] # remove _~ ~_ else: if not show_ascii_formatting_chars: special_text = special_text[1:-1] # remove _ _ @@ -1084,9 +1091,9 @@ def print_time(self, text, kind, tim, direction_mark, other_tags_for_time, iter_ 'time_sometimes') def print_displaymarking(self, displaymarking, iter_): - bgcolor = displaymarking.getAttr('bgcolor') or '#FFF' - fgcolor = displaymarking.getAttr('fgcolor') or '#000' - text = displaymarking.getData() + bgcolor = displaymarking.bgcolor + fgcolor = displaymarking.fgcolor + text = displaymarking.name if text: buffer_ = self.tv.get_buffer() tag = self.displaymarking_tags.setdefault(bgcolor + '/' + fgcolor, @@ -1194,16 +1201,27 @@ def __init__(self, id_, timestamp, message_icons, start_mark): self.timestamp = timestamp self.start_mark = start_mark self._has_receipt = False + self._has_displayed = False self._message_icons = message_icons @property def has_receipt(self): return self._has_receipt + @property + def has_displayed(self): + return self._has_displayed + def set_receipt(self): self._has_receipt = True + if self._has_displayed: + return self._message_icons.set_receipt_icon_visible(True) + def set_displayed(self): + self._has_displayed = True + self._message_icons.set_displayed_icon_visible(True) + def set_correction(self, tooltip): self._message_icons.set_correction_icon_visible(True) self._message_icons.set_correction_tooltip(tooltip) @@ -1222,12 +1240,12 @@ def __init__(self): 'document-edit-symbolic', Gtk.IconSize.MENU) self._correction_image.set_no_show_all(True) - self._receipt_image = Gtk.Image.new_from_icon_name( + self._marker_image = Gtk.Image.new_from_icon_name( 'emblem-ok-symbolic', Gtk.IconSize.MENU) - self._receipt_image.get_style_context().add_class( + self._marker_image.get_style_context().add_class( 'receipt-received-color') - self._receipt_image.set_tooltip_text(_('Received')) - self._receipt_image.set_no_show_all(True) + self._marker_image.set_tooltip_text(_('Received')) + self._marker_image.set_no_show_all(True) self._error_image = Gtk.Image.new_from_icon_name( 'dialog-warning-symbolic', Gtk.IconSize.MENU) @@ -1235,14 +1253,22 @@ def __init__(self): self._error_image.set_no_show_all(True) self.add(self._correction_image) - self.add(self._receipt_image) + self.add(self._marker_image) self.add(self._error_image) self.show_all() def set_receipt_icon_visible(self, visible): if not app.settings.get('positive_184_ack'): return - self._receipt_image.set_visible(visible) + self._marker_image.set_visible(visible) + + def set_displayed_icon_visible(self, visible): + self._marker_image.set_visible(visible) + self._marker_image.get_style_context().remove_class( + 'receipt-received-color') + self._marker_image.get_style_context().add_class( + 'displayed-received-color') + self._marker_image.set_tooltip_text(Q_('?Message state:Read')) def set_correction_icon_visible(self, visible): self._correction_image.set_visible(visible) ===================================== gajim/data/gui/chat_control.ui ===================================== @@ -398,9 +398,6 @@ <object class="GtkOverlay" id="overlay"> <property name="visible">True</property> <property name="can_focus">False</property> - <signal name="drag-data-received" handler="_on_drag_data_received" swapped="no"/> - <signal name="drag-leave" handler="_on_drag_leave" swapped="no"/> - <signal name="drag-motion" handler="_on_drag_motion" swapped="no"/> <child> <object class="GtkPaned" id="paned1"> <property name="visible">True</property> ===================================== gajim/data/style/gajim.css ===================================== @@ -295,6 +295,7 @@ button.flat.link { padding: 0; border: 0; } /*Receipts*/ .receipt-received-color { color: rgb(75, 181, 67); } +.displayed-received-color { color: rgb(0, 141, 242); } /*Dataforms*/ .field-fixed { font-size: 16px; font-weight: bold; padding-top:5px;} ===================================== gajim/groupchat_control.py ===================================== @@ -658,6 +658,17 @@ def on_groupchat_maximize(self): self.update_actions() self.set_lock_image() self.draw_banner_text() + type_ = ['printed_gc_msg', 'printed_marked_gc_msg'] + if not app.events.remove_events(self.account, + self.get_full_jid(), + types=type_): + # XEP-0333 Send <displayed> marker + con = app.connections[self.account] + con.get_module('ChatMarkers').send_displayed_marker( + self.contact, + self.last_msg_id, + self._type) + self.last_msg_id = None def _on_roster_row_activated(self, _roster, nick): self._start_private_message(nick) @@ -796,17 +807,21 @@ def _on_gc_message_received(self, event): else: if event.properties.muc_nickname == self.nick: self.last_sent_txt = event.msgtxt + stanza_id = None + if event.properties.stanza_id: + stanza_id = event.properties.stanza_id.id self.add_message(event.msgtxt, contact=event.properties.muc_nickname, tim=event.properties.timestamp, displaymarking=event.displaymarking, correct_id=event.correct_id, message_id=event.properties.id, + stanza_id=stanza_id, additional_data=event.additional_data) event.needs_highlight = self.needs_visual_notification(event.msgtxt) def on_private_message(self, nick, sent, msg, tim, session, additional_data, - msg_log_id=None, displaymarking=None): + message_id, msg_log_id=None, displaymarking=None): # Do we have a queue? fjid = self.room_jid + '/' + nick @@ -819,7 +834,9 @@ def on_private_message(self, nick, sent, msg, tim, session, additional_data, session=session, displaymarking=displaymarking, sent_forwarded=sent, - additional_data=additional_data) + additional_data=additional_data, + message_id=message_id) + app.events.add_event(self.account, fjid, event) if allow_popup_window(self.account): @@ -837,7 +854,7 @@ def on_private_message(self, nick, sent, msg, tim, session, additional_data, def add_message(self, text, contact='', tim=None, displaymarking=None, correct_id=None, message_id=None, - additional_data=None): + stanza_id=None, additional_data=None): """ Add message to the ConversationsTextview @@ -887,6 +904,7 @@ def add_message(self, text, contact='', tim=None, displaymarking=displaymarking, correct_id=correct_id, message_id=message_id, + stanza_id=stanza_id, additional_data=additional_data) def get_nb_unread(self): @@ -1057,6 +1075,7 @@ def _on_decrypted_message_received(self, event): event.properties.timestamp, self.session, event.additional_data, + event.properties.id, msg_log_id=event.msg_log_id, displaymarking=event.displaymarking) @@ -1095,7 +1114,7 @@ def is_connected(self, value: bool) -> None: def got_connected(self): self.roster.initial_draw() - if self.disco_info.has_mam: + if self.disco_info.has_mam_2: # Request MAM con = app.connections[self.account] con.get_module('MAM').request_archive_on_muc_join( ===================================== gajim/gtk/accounts.py ===================================== @@ -720,6 +720,19 @@ def __init__(self, account): 'button-style': 'destructive-action', 'button-callback': self._reset_gc_send_chatstate}), + Setting(SettingKind.SWITCH, + _('Send Read Markers'), + SettingType.VALUE, + app.settings.get_account_setting( + account, 'send_marker_default'), + callback=self._send_read_marker, + desc=_('Default for chats and private group chats'), + props={'button-text': _('Reset'), + 'button-tooltip': _('Reset all chats to the ' + 'current default value'), + 'button-style': 'destructive-action', + 'button-callback': self._reset_send_read_marker}), + Setting(SettingKind.POPOVER, _('Keep Chat History'), SettingType.ACCOUNT_CONFIG, @@ -739,6 +752,20 @@ def _reset_gc_send_chatstate(button): button.set_sensitive(False) app.settings.set_group_chat_settings('send_chatstate', None) + def _send_read_marker(self, state, _data): + app.settings.set_account_setting( + self._account, 'send_marker_default', state) + app.settings.set_account_setting( + self._account, 'gc_send_marker_private_default', state) + + def _reset_send_read_marker(self, button): + button.set_sensitive(False) + app.settings.set_contact_settings('send_marker', None) + app.settings.set_group_chat_settings( + 'send_marker', None, context='private') + for ctrl in app.interface.msg_win_mgr.get_controls(acct=self._account): + ctrl.update_actions() + class ConnectionPage(GenericSettingPage): ===================================== gajim/gtk/groupchat_settings.py ===================================== @@ -71,6 +71,13 @@ def __init__(self, account, jid, context): 'send_chatstate', props={'entries': chat_state}), + Setting(SettingKind.SWITCH, + _('Send Chat Markers'), + SettingType.GROUP_CHAT, + 'send_marker', + context=context, + desc=_('Let others know if you read up to this point')), + Setting(SettingKind.POPOVER, _('Sync Threshold'), SettingType.GROUP_CHAT, ===================================== gajim/gtk/history_sync.py ===================================== @@ -19,7 +19,8 @@ from gi.repository import Gtk from gi.repository import GLib -from nbxmpp.util import is_error_result +from nbxmpp.errors import StanzaError +from nbxmpp.errors import MalformedStanzaError from gajim.common import app from gajim.common import ged @@ -149,9 +150,10 @@ def _prepare_query(self): max_=0, callback=self._received_count) - - def _received_count(self, result): - if is_error_result(result): + def _received_count(self, task): + try: + result = task.finish() + except (StanzaError, MalformedStanzaError): return if result.rsm.count is not None: ===================================== gajim/gtk/mam_preferences.py ===================================== @@ -17,14 +17,14 @@ from gi.repository import Gtk from gi.repository import Gdk -from nbxmpp.util import is_error_result +from nbxmpp.errors import MalformedStanzaError +from nbxmpp.errors import StanzaError from gajim.common import app from gajim.common.i18n import _ from gajim.gtk.util import get_builder from gajim.gtk.util import EventHelper -from gajim.gtk.util import ensure_not_destroyed from gajim.gtk.dialogs import DialogButton from gajim.gtk.dialogs import ConfirmationDialog from gajim.gtk.dialogs import InformationDialog @@ -66,10 +66,11 @@ def __init__(self, account): def _on_destroy(self, *args): self._destroyed = True - @ensure_not_destroyed - def _mam_prefs_received(self, result): - if is_error_result(result): - self._on_error(result.get_text()) + def _mam_prefs_received(self, task): + try: + result = task.finish() + except (StanzaError, MalformedStanzaError) as error: + self._on_error(error.get_text()) return self._disable_spinner() @@ -83,10 +84,11 @@ def _mam_prefs_received(self, result): for jid in result.never: self._ui.preferences_store.append((str(jid), False)) - @ensure_not_destroyed - def _mam_prefs_saved(self, result): - if is_error_result(result): - self._on_error(result.get_text()) + def _mam_prefs_saved(self, task): + try: + task.finish() + except StanzaError as error: + self._on_error(error.get_text()) return self._disable_spinner() ===================================== gajim/gui_interface.py ===================================== @@ -242,6 +242,43 @@ def handle_event_presence(self, obj): if ctrl and ctrl.session and len(obj.contact_list) > 1: ctrl.remove_session(ctrl.session) + @staticmethod + def handle_event_read_state_sync(event): + if event.type.is_groupchat: + control = app.get_groupchat_control( + event.account, event.jid.bare) + if control is None: + log.warning('Groupchat control not found') + return + + jid = event.jid.bare + types = ['printed_gc_msg', 'printed_marked_gc_msg'] + + else: + types = ['chat', 'pm', 'printed_chat', 'printed_pm'] + jid = event.jid + + control = app.interface.msg_win_mgr.get_control(jid, event.account) + + # Compare with control.last_msg_id. + events_ = app.events.get_events(event.account, jid, types) + if not events_: + log.warning('No Events') + return + + if event.type.is_groupchat: + id_ = events_[-1].stanza_id or events_[-1].message_id + else: + id_ = events_[-1].message_id + + if id_ != event.marker_id: + return + + if not app.events.remove_events(event.account, jid, types=types): + # There were events to remove + if control is not None: + control.redraw_after_event_removed(event.jid) + @staticmethod def handle_event_msgsent(obj): if not obj.play_sound: @@ -1060,6 +1097,7 @@ def create_core_handlers_list(self): 'unsubscribed-presence-received': [ self.handle_event_unsubscribed_presence], 'zeroconf-name-conflict': [self.handle_event_zc_name_conflict], + 'read-state-sync': [self.handle_event_read_state_sync], } def register_core_handlers(self): @@ -1310,7 +1348,7 @@ def make_regexps(self): # detects eg. *b* *bold* *bold bold* test *bold* *bold*! (*bold*) # doesn't detect (it's a feature :P) * bold* *bold * * bold * test*bold* formatting = r'|(?<!\w)' r'\*[^\s*]' r'([^*]*[^\s*])?' r'\*(?!\w)|'\ - r'(?<!\S)' r'/[^\s/]' r'([^/]*[^\s/])?' r'/(?!\S)|'\ + r'(?<!\S)' r'~[^\s~]' r'([^~]*[^\s~])?' r'~(?!\S)|'\ r'(?<!\w)' r'_[^\s_]' r'([^_]*[^\s_])?' r'_(?!\w)' basic_pattern = links + '|' + mail + '|' + legacy_prefixes ===================================== gajim/gui_menu_builder.py ===================================== @@ -511,12 +511,13 @@ def get_transport_menu(contact, account): return menu -def get_singlechat_menu(control_id, account, jid): +def get_singlechat_menu(control_id, account, jid, type_): singlechat_menu = [ (_('Send File'), [ ('win.send-file-httpupload-', _('Upload File…')), ('win.send-file-jingle-', _('Send File Directly…')), ]), + ('win.send-marker-', _('Send Read Markers')), (_('Send Chatstate'), ['chatstate']), ('win.invite-contacts-', _('Invite Contacts…')), ('win.add-to-roster-', _('Add to Contact List…')), @@ -545,6 +546,9 @@ def build_menu(preset): for item in preset: if isinstance(item[1], str): action_name, label = item + if action_name == 'win.send-marker-' and type_ == 'pm': + continue + if action_name == 'app.browse-history': menuitem = Gio.MenuItem.new(label, action_name) dict_ = {'account': GLib.Variant('s', account), View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a21d8fdc01c3d903b09b76e9b44071d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a21d8fdc01c3d903b09b76e9b44071d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ChatControl: Show displaymarking correctly
by Philipp Hörist 26 Oct '20

26 Oct '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: ce68aa99 by lovetox at 2020-10-26T20:47:57+01:00 ChatControl: Show displaymarking correctly - - - - - 1 changed file: - gajim/chat_control.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -623,7 +623,7 @@ def _on_message_sent(self, event): message_id = event.message_id if event.label: - displaymarking = event.label.getTag('displaymarking') + displaymarking = event.label.displaymarking else: displaymarking = None if self.correcting: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ce68aa9979ae3bbec1a7f59b2c184607… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ce68aa9979ae3bbec1a7f59b2c184607… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] SecurityLabels: Adapt to nbxmpp changes
by Philipp Hörist 26 Oct '20

26 Oct '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5c995389 by lovetox at 2020-10-26T20:22:13+01:00 SecurityLabels: Adapt to nbxmpp changes - - - - - 4 changed files: - gajim/chat_control_base.py - gajim/common/modules/message.py - gajim/common/modules/security_labels.py - gajim/conversation_textview.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -483,7 +483,8 @@ def _sec_labels_received(self, event): model.clear() sel = 0 - _label, labellist, default = event.catalog + labellist = event.catalog.get_label_names() + default = event.catalog.default for index, label in enumerate(labellist): model.append([label]) if label == default: @@ -973,7 +974,7 @@ def get_seclabel(self): if self._type.is_privatechat: jid = self.gc_contact.room_jid catalog = con.get_module('SecLabels').get_catalog(jid) - labels, label_list, _ = catalog + labels, label_list = catalog.labels, catalog.get_label_names() lname = label_list[idx] label = labels[lname] return label ===================================== gajim/common/modules/message.py ===================================== @@ -28,7 +28,6 @@ from gajim.common.const import KindConstant from gajim.common.modules.base import BaseModule from gajim.common.modules.util import get_eme_message -from gajim.common.modules.security_labels import parse_securitylabel from gajim.common.modules.misc import parse_correction from gajim.common.modules.misc import parse_oob from gajim.common.modules.misc import parse_xhtml @@ -178,6 +177,10 @@ def _message_received(self, _con, stanza, properties): if properties.eme is not None: msgtxt = get_eme_message(properties.eme) + displaymarking = None + if properties.has_security_label: + displaymarking = properties.security_label.displaymarking + event_attr = { 'conn': self._con, 'stanza': stanza, @@ -195,7 +198,7 @@ def _message_received(self, _con, stanza, properties): 'gc_control': gc_control, 'popup': False, 'msg_log_id': None, - 'displaymarking': parse_securitylabel(stanza), + 'displaymarking': displaymarking, 'properties': properties, } @@ -306,7 +309,7 @@ def build_message_stanza(self, message): stanza.setOriginID(message.message_id) if message.label: - stanza.addChild(node=message.label) + stanza.addChild(node=message.label.to_node()) # XEP-0172: user_nickname if message.user_nick: ===================================== gajim/common/modules/security_labels.py ===================================== @@ -14,15 +14,22 @@ # XEP-0258: Security Labels in XMPP -import nbxmpp from nbxmpp.namespaces import Namespace +from nbxmpp.errors import is_error from gajim.common import app -from gajim.common.nec import NetworkIncomingEvent +from gajim.common.nec import NetworkEvent from gajim.common.modules.base import BaseModule +from gajim.common.modules.util import as_task class SecLabels(BaseModule): + + _nbxmpp_extends = 'SecurityLabels' + _nbxmpp_methods = [ + 'request_catalog', + ] + def __init__(self, con): BaseModule.__init__(self, con) @@ -36,58 +43,28 @@ def pass_disco(self, info): self.supported = True self._log.info('Discovered security labels: %s', info.jid) + @as_task def request_catalog(self, jid): - server = app.get_jid_from_account(self._account).split("@")[1] - iq = nbxmpp.Iq(typ='get', to=server) - iq.addChild(name='catalog', - namespace=Namespace.SECLABEL_CATALOG, - attrs={'to': jid}) - self._log.info('Request catalog: server: %s, to: %s', server, jid) - self._con.connection.SendAndCallForResponse( - iq, self._catalog_received) - - def _catalog_received(self, _nbxmpp_client, stanza): - if not nbxmpp.isResultNode(stanza): - self._log.info('Error: %s', stanza.getError()) - return + _task = yield - query = stanza.getTag('catalog', namespace=Namespace.SECLABEL_CATALOG) - to = query.getAttr('to') - items = query.getTags('item') + catalog = yield self._nbxmpp('SecurityLabels').request_catalog(jid) - labels = {} - label_list = [] - default = None - for item in items: - label = item.getAttr('selector') - labels[label] = item.getTag('securitylabel') - label_list.append(label) - if item.getAttr('default') == 'true': - default = label + if is_error(catalog): + self._log.info(catalog) + return - catalog = (labels, label_list, default) - self._catalogs[to] = catalog + self._catalogs[jid] = catalog - self._log.info('Received catalog: %s', to) - self._log.debug(catalog) + self._log.info('Received catalog: %s', jid) - app.nec.push_incoming_event(SecLabelCatalog( - None, account=self._account, jid=to, catalog=catalog)) + app.nec.push_incoming_event(NetworkEvent('sec-catalog-received', + account=self._account, + jid=jid, + catalog=catalog)) def get_catalog(self, jid): return self._catalogs.get(jid) -def parse_securitylabel(stanza): - seclabel = stanza.getTag('securitylabel', namespace=Namespace.SECLABEL) - if seclabel is None: - return None - return seclabel.getTag('displaymarking') - - -class SecLabelCatalog(NetworkIncomingEvent): - name = 'sec-catalog-received' - - def get_instance(*args, **kwargs): return SecLabels(*args, **kwargs), 'SecLabels' ===================================== gajim/conversation_textview.py ===================================== @@ -1084,9 +1084,9 @@ def print_time(self, text, kind, tim, direction_mark, other_tags_for_time, iter_ 'time_sometimes') def print_displaymarking(self, displaymarking, iter_): - bgcolor = displaymarking.getAttr('bgcolor') or '#FFF' - fgcolor = displaymarking.getAttr('fgcolor') or '#000' - text = displaymarking.getData() + bgcolor = displaymarking.bgcolor + fgcolor = displaymarking.fgcolor + text = displaymarking.name if text: buffer_ = self.tv.get_buffer() tag = self.displaymarking_tags.setdefault(bgcolor + '/' + fgcolor, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5c995389092869e59c54072650947978… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5c995389092869e59c54072650947978… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] SecurityLabels: Add more stuff
by Philipp Hörist 26 Oct '20

26 Oct '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: d08544a6 by lovetox at 2020-10-26T20:21:31+01:00 SecurityLabels: Add more stuff - Add request_catalog() - Refactor parsing data - - - - - 2 changed files: - nbxmpp/modules/security_labels.py - nbxmpp/structs.py Changes: ===================================== nbxmpp/modules/security_labels.py ===================================== @@ -15,10 +15,16 @@ # You should have received a copy of the GNU General Public License # along with this program; If not, see <http://www.gnu.org/licenses/>. +from typing import Dict + +from dataclasses import dataclass + +from nbxmpp.protocol import Iq +from nbxmpp.simplexml import Node from nbxmpp.namespaces import Namespace from nbxmpp.structs import StanzaHandler -from nbxmpp.structs import SecurityLabel -from nbxmpp.structs import DisplayMarking +from nbxmpp.errors import StanzaError +from nbxmpp.task import iq_request_task from nbxmpp.modules.base import BaseModule @@ -39,18 +45,116 @@ class SecurityLabels(BaseModule): if security is None: return - displaymarking = security.getTag('displaymarking') - if displaymarking is None: + try: + security_label = SecurityLabel.from_node(security) + except ValueError as error: + self._log.warning(error) return - label = displaymarking.getData() - if not label: - self._log.warning('No label found') - self._log.warning(stanza) - return + properties.security_label = security_label + + @iq_request_task + def request_catalog(self, jid): + _task = yield + + response = yield _make_catalog_request(self._client.domain, jid) + if response.isError(): + raise StanzaError(response) + + catalog_node = response.getTag('catalog', + namespace=Namespace.SECLABEL_CATALOG) + to = catalog_node.getAttr('to') + items = catalog_node.getTags('item') + + labels = {} + default = None + for item in items: + label = item.getAttr('selector') + if label is None: + continue + + security = item.getTag('securitylabel', + namespace=Namespace.SECLABEL) + if security is None: + continue + + try: + security_label = SecurityLabel.from_node(security) + except ValueError: + continue + + labels[label] = security_label + + if item.getAttr('default') == 'true': + default = label + + yield Catalog(labels=labels, default=default) + + +def _make_catalog_request(domain, jid): + iq = Iq(typ='get', to=domain) + iq.addChild(name='catalog', + namespace=Namespace.SECLABEL_CATALOG, + attrs={'to': jid}) + return iq + + +@dataclass +class Displaymarking: + name: str + fgcolor: str + bgcolor: str + + def to_node(self): + displaymarking = Node(tag='displaymarking') + if self.fgcolor and self.fgcolor != '#000': + displaymarking.setAttr('fgcolor', self.fgcolor) + + if self.bgcolor and self.bgcolor != '#FFF': + displaymarking.setAttr('bgcolor', self.bgcolor) + + if self.name: + displaymarking.setData(self.name) + + return displaymarking + + @classmethod + def from_node(cls, node): + return cls(name=node.getData(), + fgcolor=node.getAttr('fgcolor') or '#000', + bgcolor=node.getAttr('bgcolor') or '#FFF') + + +@dataclass +class SecurityLabel: + displaymarking: Displaymarking + label: Node + + def to_node(self): + security = Node(tag='securitylabel', + attrs={'xmlns': Namespace.SECLABEL}) + if self.displaymarking is not None: + security.addChild(node=self.displaymarking.to_node()) + security.addChild(node=self.label) + return security + + @classmethod + def from_node(cls, security): + displaymarking = security.getTag('displaymarking') + if displaymarking is not None: + displaymarking = Displaymarking.from_node(displaymarking) + + label = security.getTag('label') + if label is None: + raise ValueError('label node missing') + + return cls(displaymarking=displaymarking, label=label) + - fgcolor = displaymarking.getAttr('fgcolor') - bgcolor = displaymarking.getAttr('bgcolor') +@dataclass +class Catalog: + labels: Dict[str, SecurityLabel] + default: str - properties.security_label = SecurityLabel( - DisplayMarking(label, fgcolor, bgcolor)) + def get_label_names(self): + return list(self.labels.keys()) ===================================== nbxmpp/structs.py ===================================== @@ -115,9 +115,6 @@ OOBData = namedtuple('OOBData', 'url desc') CorrectionData = namedtuple('CorrectionData', 'id') -DisplayMarking = namedtuple('DisplayMarking', 'label fgcolor bgcolor') -SecurityLabel = namedtuple('SecurityLabel', 'displaymarking') - RegisterData = namedtuple('RegisterData', 'instructions form fields_form oob_url bob_data') HTTPUploadData = namedtuple('HTTPUploadData', 'put_uri get_uri headers') View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/d08544a6631fb71bbfcf2c1a… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/d08544a6631fb71bbfcf2c1a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Util: Remove obsolete methods
by Philipp Hörist 26 Oct '20

26 Oct '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 37ce80bc by lovetox at 2020-10-26T13:47:32+01:00 Util: Remove obsolete methods - - - - - 1 changed file: - nbxmpp/util.py Changes: ===================================== nbxmpp/util.py ===================================== @@ -16,7 +16,6 @@ # along with this program; If not, see <http://www.gnu.org/licenses/>. import base64 -import weakref import hashlib import uuid import binascii @@ -26,13 +25,11 @@ import logging from logging import LoggerAdapter from collections import defaultdict -from functools import wraps from functools import lru_cache from gi.repository import Gio from nbxmpp.protocol import DiscoInfoMalformed -from nbxmpp.protocol import isErrorNode from nbxmpp.const import GIO_TLS_ERRORS from nbxmpp.namespaces import Namespace from nbxmpp.protocol import StanzaMalformed @@ -83,47 +80,6 @@ def get_properties_struct(name): return Properties() -def call_on_response(cb): - def response_decorator(func): - @wraps(func) - def func_wrapper(self, *args, **kwargs): - user_data = kwargs.pop('user_data', None) - callback_ = kwargs.pop('callback', None) - - stanza = func(self, *args, **kwargs) - if isinstance(stanza, tuple): - stanza, attrs = stanza - else: - attrs = {} - - if user_data is not None: - attrs['user_data'] = user_data - - if callback_ is not None: - attrs['callback'] = weakref.WeakMethod(callback_) - - self._client.send_stanza(stanza, - callback=getattr(self, cb), - user_data=attrs) - return func_wrapper - return response_decorator - - -def callback(func): - @wraps(func) - def func_wrapper(self, _con, stanza, **kwargs): - cb = kwargs.pop('callback', None) - user_data = kwargs.pop('user_data', None) - - result = func(self, stanza, **kwargs) - if cb is not None and cb() is not None: - if user_data is not None: - cb()(result, user_data) - else: - cb()(result) - return func_wrapper - - def from_xs_boolean(value): if value in ('1', 'true', 'True'): return True @@ -161,30 +117,6 @@ def error_factory(stanza, condition=None, text=None): return error_classes.get(app_namespace, CommonError)(stanza) -def raise_error(log_method, stanza, condition=None, text=None): - if not isErrorNode(stanza) and condition != 'stanza-malformed': - condition = 'stanza-malformed' - if log_method.__name__ not in ('warning', 'error'): - log_method = log_method.__self__.warning - - try: - error = error_factory(stanza, condition, text) - except Exception: - log.exception('Malformed error stanza') - log.error(stanza) - error = StanzaMalformedError(stanza, text) - return error - - log_method(error) - if log_method.__name__ in ('warning', 'error'): - log_method(stanza) - return error - - -def is_error_result(result): - return isinstance(result, CommonError) - - def clip_rgb(red, green, blue): return ( min(max(red, 0), 1), View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/37ce80bc449450131000e035… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/37ce80bc449450131000e035… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: OpenPGP: Use tasks
by Philipp Hörist 26 Oct '20

26 Oct '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 562a26fd by lovetox at 2020-10-26T13:42:13+01:00 OpenPGP: Use tasks - - - - - 99486bcc by lovetox at 2020-10-26T13:44:45+01:00 OMEMO: Don’t fail on empty pubsub nodes - - - - - 2 changed files: - nbxmpp/modules/omemo.py - nbxmpp/modules/openpgp.py Changes: ===================================== nbxmpp/modules/omemo.py ===================================== @@ -124,7 +124,7 @@ class OMEMO(BaseModule): raise_if_error(items) - if items is None: + if not items: yield task.set_result(None) yield _parse_devicelist(items[0]) @@ -164,7 +164,7 @@ class OMEMO(BaseModule): raise_if_error(items) - if items is None: + if not items: yield task.set_result(None) yield _parse_bundle(items[0]) ===================================== nbxmpp/modules/openpgp.py ===================================== @@ -22,25 +22,25 @@ import string from nbxmpp.namespaces import Namespace from nbxmpp.protocol import NodeProcessed from nbxmpp.protocol import Node -from nbxmpp.protocol import isResultNode from nbxmpp.protocol import StanzaMalformed -from nbxmpp.util import call_on_response -from nbxmpp.util import callback from nbxmpp.util import b64decode from nbxmpp.util import b64encode -from nbxmpp.util import raise_error from nbxmpp.structs import StanzaHandler from nbxmpp.structs import PGPKeyMetadata from nbxmpp.structs import PGPPublicKey +from nbxmpp.errors import MalformedStanzaError +from nbxmpp.task import iq_request_task from nbxmpp.modules.date_and_time import parse_datetime -from nbxmpp.modules.pubsub import get_pubsub_request from nbxmpp.modules.base import BaseModule +from nbxmpp.modules.util import finalize +from nbxmpp.modules.util import raise_if_error class OpenPGP(BaseModule): _depends = { - 'publish': 'PubSub' + 'publish': 'PubSub', + 'request_items': 'PubSub', } def __init__(self, client): @@ -107,8 +107,8 @@ class OpenPGP(BaseModule): return try: - data = self._parse_keylist(properties.jid, item) - except StanzaMalformed as error: + data = _parse_keylist(properties.jid, item) + except ValueError as error: self._log.warning(error) self._log.warning(stanza) raise NodeProcessed @@ -123,162 +123,137 @@ class OpenPGP(BaseModule): properties.pubsub_event = pubsub_event - @staticmethod - def _parse_keylist(jid, item): - keylist_node = item.getTag('public-keys-list', - namespace=Namespace.OPENPGP) - if keylist_node is None: - raise StanzaMalformed('No public-keys-list node found') - - metadata = keylist_node.getTags('pubkey-metadata') - if not metadata: - return None - - data = [] - for key in metadata: - fingerprint = key.getAttr('v4-fingerprint') - date = key.getAttr('date') - if fingerprint is None or date is None: - raise StanzaMalformed('Invalid metadata node') - - timestamp = parse_datetime(date, epoch=True) - if timestamp is None: - raise StanzaMalformed('Invalid date timestamp: %s' % date) - - data.append(PGPKeyMetadata(jid, fingerprint, timestamp)) - return data - - def set_keylist(self, keylist): - item = Node('public-keys-list', {'xmlns': Namespace.OPENPGP}) - if keylist is not None: - for key in keylist: - date = time.strftime('%Y-%m-%dT%H:%M:%SZ', - time.gmtime(key.date)) - attrs = {'v4-fingerprint': key.fingerprint, - 'date': date} - item.addChild('pubkey-metadata', attrs=attrs) + @iq_request_task + def set_keylist(self, keylist, public=True): + task = yield + + access_model = 'open' if public else 'presence' + + options = { + 'pubsub#persist_items': 'true', + 'pubsub#access_model': access_model, + } self._log.info('Set keylist: %s', keylist) - self.publish(Namespace.OPENPGP_PK, item, id_='current') + result = yield self.publish(Namespace.OPENPGP_PK, + _make_keylist(keylist), + id_='current', + options=options, + force_node_options=True) + + yield finalize(task, result) - def set_public_key(self, key, fingerprint, date): - date = time.strftime( - '%Y-%m-%dT%H:%M:%SZ', time.gmtime(date)) - item = Node('pubkey', attrs={'xmlns': Namespace.OPENPGP, - 'date': date}) - data = item.addChild('data') - data.addData(b64encode(key)) - node = '%s:%s' % (Namespace.OPENPGP_PK, fingerprint) + @iq_request_task + def set_public_key(self, key, fingerprint, date, public=True): + task = yield self._log.info('Set public key') - self.publish(node, item, id_='current') + access_model = 'open' if public else 'presence' - @call_on_response('_public_key_received') - def request_public_key(self, jid, fingerprint): - self._log.info('Request public key from: %s %s', jid, fingerprint) - node = '%s:%s' % (Namespace.OPENPGP_PK, fingerprint) - return get_pubsub_request(jid, node, max_items=1) + options = { + 'pubsub#persist_items': 'true', + 'pubsub#access_model': access_model, + } - @callback - def _public_key_received(self, stanza): - jid = stanza.getFrom().bare + result = yield self.publish(f'{Namespace.OPENPGP_PK}:{fingerprint}', + _make_public_key(key, date), + id_='current', + options=options, + force_node_options=True) - if not isResultNode(stanza): - return raise_error(self._log.info, stanza) + yield finalize(task, result) - pubsub_node = stanza.getTag('pubsub') - items_node = pubsub_node.getTag('items') - item = items_node.getTag('item') + @iq_request_task + def request_public_key(self, jid, fingerprint): + task = yield - pub_key = item.getTag('pubkey', namespace=Namespace.OPENPGP) - if pub_key is None: - return raise_error(self._log.warning, stanza, 'stanza-malformed', - 'PGP public key has no pubkey node') + self._log.info('Request public key from: %s %s', jid, fingerprint) - date = parse_datetime(pub_key.getAttr('date'), epoch=True) + items = yield self.request_items( + f'{Namespace.OPENPGP_PK}:{fingerprint}', + max_items=1, + jid=jid) - data = pub_key.getTag('data') - if data is None: - return raise_error(self._log.warning, stanza, 'stanza-malformed', - 'PGP public key has no data node') + raise_if_error(items) + + if not items: + yield task.set_result(None) try: - key = b64decode(data.getData(), return_type=bytes) - except Exception as error: - return raise_error(self._log.warning, stanza, 'stanza-malformed', - str(error)) + key = _parse_public_key(jid, items[0]) + except ValueError as error: + raise MalformedStanzaError(str(error), items) - key = PGPPublicKey(jid, key, date) - self._log.info('Received public key: %s %s', key.jid, key.date) - return key + yield key + + @iq_request_task + def request_keylist(self, jid=None): + task = yield - @call_on_response('_keylist_received') - def request_keylist(self, jid): self._log.info('Request keylist from: %s', jid) - return get_pubsub_request(jid, Namespace.OPENPGP_PK, max_items=1) - @callback - def _keylist_received(self, stanza): - jid = stanza.getFrom().bare + items = yield self.request_items( + Namespace.OPENPGP_PK, + max_items=1, + jid=jid) - if not isResultNode(stanza): - return raise_error(self._log.info, stanza) + raise_if_error(items) - pubsub_node = stanza.getTag('pubsub') - items_node = pubsub_node.getTag('items') - item = items_node.getTag('item') + if not items: + yield task.set_result(None) try: - keylist = self._parse_keylist(jid, item) - except StanzaMalformed as error: - return raise_error(self._log.warning, stanza, - 'stanza-malformed', str(error)) + keylist = _parse_keylist(jid, items[0]) + except ValueError as error: + raise MalformedStanzaError(str(error), items) + self._log.info('Received keylist: %s', keylist) - return keylist + yield keylist - @call_on_response('_secret_key_received') + @iq_request_task def request_secret_key(self): - self._log.info('Request secret key') - jid = self._client.get_bound_jid().bare - return get_pubsub_request(jid, Namespace.OPENPGP_SK, max_items=1) + task = yield - @callback - def _secret_key_received(self, stanza): - if not isResultNode(stanza): - return raise_error(self._log.info, stanza) + self._log.info('Request secret key') - pubsub_node = stanza.getTag('pubsub') - items_node = pubsub_node.getTag('items') - item = items_node.getTag('item') + items = yield self.request_items( + Namespace.OPENPGP_SK, + max_items=1) - sec_key = item.getTag('secretkey', namespace=Namespace.OPENPGP) - if sec_key is None: - return raise_error(self._log.warning, stanza, 'stanza-malformed', - 'PGP secretkey node not found') + raise_if_error(items) - data = sec_key.getData() - if not data: - return raise_error(self._log.warning, stanza, 'stanza-malformed', - 'PGP secretkey has no data') + if not items: + yield task.set_result(None) try: - key = b64decode(data, return_type=bytes) - except Exception as error: - return raise_error(self._log.warning, stanza, 'stanza-malformed', - str(error)) - self._log.info('Received secret key') - return key + secret_key = _parse_secret_key(items[0]) + except ValueError as error: + raise MalformedStanzaError(str(error), items) + yield secret_key + + @iq_request_task def set_secret_key(self, secret_key): - item = Node('secretkey', {'xmlns': Namespace.OPENPGP}) - if secret_key is not None: - item.setData(b64encode(secret_key)) + task = yield + + self._log.info('Set public key') + + options = { + 'pubsub#persist_items': 'true', + 'pubsub#access_model': 'whitelist', + } self._log.info('Set secret key') - self.publish(Namespace.OPENPGP_SK, item, id_='current') + result = yield self.publish(Namespace.OPENPGP_SK, + _make_secret_key(secret_key), + id_='current', + options=options, + force_node_options=True) + + yield finalize(task, result) def parse_signcrypt(stanza): @@ -374,3 +349,93 @@ def create_message_stanza(stanza, encrypted_payload, with_fallback_text): if with_fallback_text: stanza.setBody( '[This message is *encrypted* with OpenPGP (See :XEP:`0373`]') + + +def _make_keylist(keylist): + item = Node('public-keys-list', {'xmlns': Namespace.OPENPGP}) + if keylist is not None: + for key in keylist: + date = time.strftime('%Y-%m-%dT%H:%M:%SZ', + time.gmtime(key.date)) + attrs = {'v4-fingerprint': key.fingerprint, + 'date': date} + item.addChild('pubkey-metadata', attrs=attrs) + return item + + +def _make_public_key(key, date): + date = time.strftime( + '%Y-%m-%dT%H:%M:%SZ', time.gmtime(date)) + item = Node('pubkey', attrs={'xmlns': Namespace.OPENPGP, + 'date': date}) + data = item.addChild('data') + data.addData(b64encode(key)) + return item + + +def _make_secret_key(secret_key): + item = Node('secretkey', {'xmlns': Namespace.OPENPGP}) + if secret_key is not None: + item.setData(b64encode(secret_key)) + return item + + +def _parse_public_key(jid, item): + pub_key = item.getTag('pubkey', namespace=Namespace.OPENPGP) + if pub_key is None: + raise ValueError('pubkey node missing') + + date = parse_datetime(pub_key.getAttr('date'), epoch=True) + + data = pub_key.getTag('data') + if data is None: + raise ValueError('data node missing') + + try: + key = b64decode(data.getData(), return_type=bytes) + except Exception as error: + raise ValueError(f'decoding error: {error}') + + return PGPPublicKey(jid, key, date) + + +def _parse_keylist(jid, item): + keylist_node = item.getTag('public-keys-list', + namespace=Namespace.OPENPGP) + if keylist_node is None: + raise ValueError('public-keys-list node missing') + + metadata = keylist_node.getTags('pubkey-metadata') + if not metadata: + return None + + data = [] + for key in metadata: + fingerprint = key.getAttr('v4-fingerprint') + date = key.getAttr('date') + if fingerprint is None or date is None: + raise ValueError('Invalid metadata node') + + timestamp = parse_datetime(date, epoch=True) + if timestamp is None: + raise ValueError('Invalid date timestamp: %s' % date) + + data.append(PGPKeyMetadata(jid, fingerprint, timestamp)) + return data + + +def _parse_secret_key(item): + sec_key = item.getTag('secretkey', namespace=Namespace.OPENPGP) + if sec_key is None: + raise ValueError('secretkey node missing') + + data = sec_key.getData() + if not data: + raise ValueError('secretkey data missing') + + try: + key = b64decode(data, return_type=bytes) + except Exception as error: + raise ValueError(f'decoding error: {error}') + + return key View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/5e63a080e160078237ccf67… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/5e63a080e160078237ccf67… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Client: Revert ping timeout
by Philipp Hörist 26 Oct '20

26 Oct '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 5e63a080 by lovetox at 2020-10-26T11:12:50+01:00 Client: Revert ping timeout - - - - - 1 changed file: - nbxmpp/client.py Changes: ===================================== nbxmpp/client.py ===================================== @@ -560,7 +560,7 @@ class Client(Observable): self._ping_source_id = None self._log.info('Start ping timer') - self._ping_source_id = GLib.timeout_add_seconds(5, self._ping) + self._ping_source_id = GLib.timeout_add_seconds(180, self._ping) def _remove_ping_timer(self): if self._ping_source_id is None: View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/5e63a080e160078237ccf67c… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/5e63a080e160078237ccf67c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 3 commits: Add Ping module
by Philipp Hörist 26 Oct '20

26 Oct '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 6dde8442 by lovetox at 2020-10-26T11:00:00+01:00 Add Ping module - - - - - f9405ab8 by lovetox at 2020-10-26T11:04:10+01:00 Task: Add timeout - - - - - fe1cf357 by lovetox at 2020-10-26T11:05:15+01:00 Client: Use ping module - - - - - 6 changed files: - nbxmpp/client.py - nbxmpp/dispatcher.py - nbxmpp/errors.py - + nbxmpp/modules/ping.py - nbxmpp/structs.py - nbxmpp/task.py Changes: ===================================== nbxmpp/client.py ===================================== @@ -27,9 +27,11 @@ from nbxmpp.protocol import BindRequest from nbxmpp.protocol import TLSRequest from nbxmpp.protocol import isResultNode from nbxmpp.protocol import JID -from nbxmpp.protocol import Iq from nbxmpp.protocol import Protocol from nbxmpp.protocol import WebsocketCloseHeader +from nbxmpp.errors import TimeoutStanzaError +from nbxmpp.errors import StanzaError +from nbxmpp.errors import CancelledError from nbxmpp.addresses import ServerAddresses from nbxmpp.addresses import NoMoreAddresses from nbxmpp.tcp import TCPConnection @@ -46,7 +48,6 @@ from nbxmpp.util import get_stream_header from nbxmpp.util import get_stanza_id from nbxmpp.util import Observable from nbxmpp.util import validate_stream_header -from nbxmpp.util import is_error_result from nbxmpp.util import LogAdapter log = logging.getLogger('nbxmpp.stream') @@ -104,7 +105,7 @@ class Client(Observable): self._session_required = False self._connect_successful = False self._stream_close_initiated = False - self._ping_id = None + self._ping_task = None self._error = None, None, None self._ignored_tls_errors = set() @@ -438,7 +439,8 @@ class Client(Observable): def _disconnect(self, immediate=True): self.state = StreamState.DISCONNECTING self._remove_ping_timer() - self._dispatcher.remove_ping_callback(self._ping_id) + self._cancel_ping_task() + if not immediate: self._stream_close_initiated = True self._smacks.close_session() @@ -461,7 +463,7 @@ class Client(Observable): for task in self._tasks: task.cancel() self._remove_ping_timer() - self._dispatcher.remove_ping_callback(self._ping_id) + self._cancel_ping_task() self._reset_stream() self.notify('disconnected') @@ -495,7 +497,7 @@ class Client(Observable): if not self._stream_close_initiated: self.state = StreamState.DISCONNECTING self._remove_ping_timer() - self._dispatcher.remove_ping_callback(self._ping_id) + self._cancel_ping_task() self._smacks.close_session() self._end_stream() self._con.shutdown_output() @@ -558,7 +560,7 @@ class Client(Observable): self._ping_source_id = None self._log.info('Start ping timer') - self._ping_source_id = GLib.timeout_add_seconds(180, self._ping) + self._ping_source_id = GLib.timeout_add_seconds(5, self._ping) def _remove_ping_timer(self): if self._ping_source_id is None: @@ -824,21 +826,33 @@ class Client(Observable): def _ping(self): self._ping_source_id = None - iq = Iq('get', to=self.domain) - iq.addChild(name='ping', namespace=Namespace.PING) - self._ping_id = self.send_stanza(iq, - timeout=10, - callback=self._on_pong) - self._log.info('Ping') - - def _on_pong(self, _client, result): - if is_error_result(result): - if result.condition == 'timeout': - self._log.info('Ping timeout') - self._disconnect(immediate=True) - return + self._ping_task = self.get_module('Ping').ping( + self.domain, + timeout=10, + callback=self._on_pong) + + def _on_pong(self, task): + self._ping_task = None + + try: + task.finish() + except TimeoutStanzaError: + self._log.info('Ping timeout') + self._disconnect(immediate=True) + return + + except CancelledError: + return + + except StanzaError: + pass + self._log.info('Pong') + def _cancel_ping_task(self): + if self._ping_task is not None: + self._ping_task.cancel() + def register_handler(self, *args, **kwargs): self._dispatcher.register_handler(*args, **kwargs) ===================================== nbxmpp/dispatcher.py ===================================== @@ -79,9 +79,9 @@ from nbxmpp.modules.http_upload import HTTPUpload from nbxmpp.modules.mam import MAM from nbxmpp.modules.vcard_temp import VCardTemp from nbxmpp.modules.vcard4 import VCard4 +from nbxmpp.modules.ping import Ping from nbxmpp.modules.misc import unwrap_carbon from nbxmpp.modules.misc import unwrap_mam -from nbxmpp.structs import StanzaTimeoutError from nbxmpp.util import get_properties_struct from nbxmpp.util import get_invalid_xml_regex from nbxmpp.util import is_websocket_close @@ -188,6 +188,7 @@ class StanzaDispatcher(Observable): self._modules['MAM'] = MAM(self._client) self._modules['VCardTemp'] = VCardTemp(self._client) self._modules['VCard4'] = VCard4(self._client) + self._modules['Ping'] = Ping(self._client) for instance in self._modules.values(): for handler in instance.handlers: @@ -492,7 +493,7 @@ class StanzaDispatcher(Observable): if timeout < time.monotonic(): self._id_callbacks.pop(id_) - func(self._client, StanzaTimeoutError(id_), **user_data) + func(self._client, None, **user_data) return True def _remove_timeout_source(self): @@ -500,7 +501,7 @@ class StanzaDispatcher(Observable): GLib.source_remove(self._timeout_id) self._timeout_id = None - def remove_ping_callback(self, id_): + def remove_iq_callback(self, id_): self._id_callbacks.pop(id_, None) def clear_iq_callbacks(self): ===================================== nbxmpp/errors.py ===================================== @@ -137,6 +137,15 @@ class CancelledError(BaseError): self.text = 'Task has been cancelled' +class TimeoutStanzaError(BaseError): + + log_level = logging.INFO + + def __init__(self, id_): + BaseError.__init__(self, is_fatal=True) + self.text = 'IQ with id %s reached timeout' % id_ + + class RegisterStanzaError(StanzaError): def __init__(self, stanza, data): StanzaError.__init__(self, stanza) ===================================== nbxmpp/modules/ping.py ===================================== @@ -0,0 +1,44 @@ +# Copyright (C) 2020 Philipp Hörist <philipp AT hoerist.com> +# +# This file is part of nbxmpp. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 3 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; If not, see <http://www.gnu.org/licenses/>. + +from nbxmpp.protocol import Iq +from nbxmpp.namespaces import Namespace +from nbxmpp.task import iq_request_task +from nbxmpp.modules.base import BaseModule +from nbxmpp.modules.util import process_response + + +class Ping(BaseModule): + def __init__(self, client): + BaseModule.__init__(self, client) + + self._client = client + self.handlers = [] + + @iq_request_task + def ping(self, jid): + _task = yield + + self._log.info('Ping') + response = yield _make_ping_request(jid) + yield process_response(response) + + +def _make_ping_request(jid): + iq = Iq('get', to=jid) + iq.addChild(name='ping', namespace=Namespace.PING) + return iq ===================================== nbxmpp/structs.py ===================================== @@ -559,22 +559,6 @@ class StanzaMalformedError(CommonError): raise NotImplementedError -class StanzaTimeoutError(CommonError): - def __init__(self, id_): - self.condition = 'timeout' - self.id = id_ - - @classmethod - def from_string(cls, node_string): - raise NotImplementedError - - def __str__(self): - return 'IQ with id %s reached timeout' % self.id - - def serialize(self): - raise NotImplementedError - - class StreamError(CommonError): def __init__(self, stanza): self.condition = stanza.getError() ===================================== nbxmpp/task.py ===================================== @@ -25,6 +25,7 @@ from gi.repository import Soup from nbxmpp.errors import is_error from nbxmpp.errors import CancelledError +from nbxmpp.errors import TimeoutStanzaError from nbxmpp.simplexml import Node @@ -76,10 +77,11 @@ def _setup_task(task, client, callback, user_data): def iq_request_task(func): @wraps(func) - def func_wrapper(self, *args, callback=None, user_data=None, **kwargs): + def func_wrapper(self, *args, timeout=None, callback=None, user_data=None, **kwargs): task = IqRequestTask(func(self, *args, **kwargs), self._log, self._client) + task.set_timeout(timeout) return _setup_task(task, self._client, callback, user_data) return func_wrapper @@ -125,6 +127,7 @@ class Task: self._result = None self._error = None self._user_data = None + self._timeout = None self._finalize_func = None self._finalize_context = None self._state = TaskState.INIT @@ -147,6 +150,9 @@ class Task: self._done_callbacks.append(callback) + def set_timeout(self, timeout): + self._timeout = timeout + def start(self): if not self._state.is_init: raise RuntimeError('Task already started') @@ -291,15 +297,27 @@ class IqRequestTask(Task): def __init__(self, gen, logger, client): super().__init__(gen, logger) self._client = client + self._iq_id = None def _run_async(self, stanza): - self._client.send_stanza(stanza, callback=self._async_finished) + self._iq_id = self._client.send_stanza(stanza, + callback=self._async_finished, + timeout=self._timeout) def _async_finished(self, _client, result, *args, **kwargs): - if self._state != TaskState.CANCELLED: - self._next_step(result) + if self._state == TaskState.CANCELLED: + return + + if result is None: + self._error = TimeoutStanzaError(self._iq_id) + self._set_finished() + return + + self._next_step(result) def _finalize(self): + if self._iq_id is not None: + self._client._dispatcher.remove_iq_callback(self._iq_id) self._client = None super()._finalize() View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/e00aaddc8f03f00f8ad9682… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/e00aaddc8f03f00f8ad9682… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] MAM: Handle errors better
by Philipp Hörist 26 Oct '20

26 Oct '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5e3e0ad3 by lovetox at 2020-10-26T08:40:48+01:00 MAM: Handle errors better - - - - - 2 changed files: - gajim/common/modules/mam.py - gajim/groupchat_control.py Changes: ===================================== gajim/common/modules/mam.py ===================================== @@ -341,11 +341,17 @@ def request_archive_on_signin(self): mam_id, start_date = self._get_query_params() result = yield self._execute_query(own_jid, mam_id, start_date) - if is_error(result) and result.condition == 'item-not-found': + if is_error(result): + if result.condition != 'item-not-found': + self._log.warning(result) + return + app.storage.archive.reset_archive_infos(result.jid) _, start_date = self._get_query_params() result = yield self._execute_query(result.jid, None, start_date) - raise_if_error(result) + if is_error(result): + self._log.warning(result) + return if result.rsm.last is not None: # <last> is not provided if the requested page was empty @@ -386,11 +392,17 @@ def request_archive_on_muc_join(self, jid): mam_id, start_date = self._get_muc_query_params(jid, threshold) result = yield self._execute_query(jid, mam_id, start_date) - if is_error(result) and result.condition == 'item-not-found': + if is_error(result): + if result.condition != 'item-not-found': + self._log.warning(result) + return + app.storage.archive.reset_archive_infos(result.jid) _, start_date = self._get_muc_query_params(jid, threshold) result = yield self._execute_query(result.jid, None, start_date) - raise_if_error(result) + if is_error(result): + self._log.warning(result) + return if result.rsm.last is not None: # <last> is not provided if the requested page was empty ===================================== gajim/groupchat_control.py ===================================== @@ -1095,7 +1095,7 @@ def is_connected(self, value: bool) -> None: def got_connected(self): self.roster.initial_draw() - if self.disco_info.has_mam: + if self.disco_info.has_mam_2: # Request MAM con = app.connections[self.account] con.get_module('MAM').request_archive_on_muc_join( View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5e3e0ad3905f4987a3bb83de30781d05… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5e3e0ad3905f4987a3bb83de30781d05… You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2020