Commits December 2018

commits@gajim.org

1 participants
81 discussions

[Git][gajim/gajim][master] Improve MUC notifications
by Philipp Hörist 15 Dec '18

15 Dec '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 760645f5 by Philipp Hörist at 2018-12-15T22:37:44Z Improve MUC notifications - Play sound for received messages, if notify for all messages is activated - Send system notifications on MUC messages - Make notify for all the default in private MUCs Fixes #9383 - - - - - 9 changed files: - gajim/chat_control_base.py - gajim/common/config.py - gajim/common/connection_handlers_events.py - gajim/common/events.py - gajim/groupchat_control.py - gajim/gtk/notification.py - gajim/gtk/util.py - gajim/message_window.py - gajim/roster_window.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -905,8 +905,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): return if kind == 'incoming': if not self.type_id == message_control.TYPE_GC or \ - app.config.get('notify_on_all_muc_messages') or \ - app.config.get_per('rooms', jid, 'notify_on_all_messages') or \ + app.config.notify_for_muc(jid) or \ 'marked' in other_tags_for_text: # it's a normal message, or a muc message with want to be # notified about if quitting just after ===================================== gajim/common/config.py ===================================== @@ -482,7 +482,7 @@ class Config: 'contact_disconnected': [False, 'disconnected.wav'], 'message_sent': [False, 'sent.wav'], 'muc_message_highlight': [True, 'gc_message1.wav', _('Sound to play when a group chat message contains one of the words in muc_highlight_words, or when a group chat message contains your nickname.')], - 'muc_message_received': [False, 'gc_message2.wav', _('Sound to play when any MUC message arrives.')], + 'muc_message_received': [True, 'gc_message2.wav', _('Sound to play when any MUC message arrives.')], } proxies_default = { @@ -638,13 +638,15 @@ class Config: obj[subname] = value self._timeout_save() - def get_per(self, optname, key=None, subname=None): # per_group_of_option + def get_per(self, optname, key=None, subname=None, default=None): # per_group_of_option if optname not in self.__options_per_key: return None dict_ = self.__options_per_key[optname][1] if not key: return list(dict_.keys()) if key not in dict_: + if default is not None: + return default if subname in self.__options_per_key[optname][0]: return self.__options_per_key[optname][0][subname][1] return None @@ -712,6 +714,11 @@ class Config: return (account not in no_log_for) and (jid not in no_log_for) + def notify_for_muc(self, room): + all_ = self.get('notify_on_all_muc_messages') + room = self.get_per('rooms', room, 'notify_on_all_messages') + return all_ or room + def _init_options(self): for opt in self.__options[0]: self.__options[1][opt] = self.__options[0][opt][Option.VAL] ===================================== gajim/common/connection_handlers_events.py ===================================== @@ -1036,7 +1036,46 @@ class NotificationEvent(nec.NetworkIncomingEvent): else: self.do_sound = False - self.do_popup = False + self.control = app.interface.msg_win_mgr.search_control( + msg_obj.jid, self.account) + + if self.control is not None: + self.control_focused = self.control.has_focus() + + if app.config.get('notify_on_new_message'): + notify_for_muc = (app.config.notify_for_muc(self.jid) or + sound == 'highlight') + if not notify_for_muc: + self.do_popup = False + + elif self.control_focused: + self.do_popup = False + + elif app.config.get('autopopupaway'): + # always show notification + self.do_popup = True + + elif app.connections[self.conn.name].connected in (2, 3): + # we're online or chat + self.do_popup = True + + self.popup_msg_type = 'gc_msg' + self.popup_event_type = _('New Group Chat Message') + + if app.config.get('notification_preview_message'): + self.popup_text = msg_obj.msgtxt + + type_events = ['printed_marked_gc_msg', 'printed_gc_msg'] + count = len(app.events.get_events(self.account, self.jid, type_events)) + + contact = app.contacts.get_contact(self.account, self.jid) + + self.popup_title = i18n.ngettext( + 'New message from %(nickname)s', + '%(n_msgs)i unread messages in %(groupchat_name)s', + count) % {'nickname': self.base_event.nick, + 'n_msgs': count, + 'groupchat_name': contact.get_shown_name()} def handle_incoming_pres_event(self, pres_obj): if app.jid_is_transport(pres_obj.jid): ===================================== gajim/common/events.py ===================================== @@ -332,6 +332,16 @@ class Events: events_list.append(ev) return events_list + def get_all_events(self, types=None): + accounts = self._events.keys() + events = [] + for account in accounts: + for jid in self._events[account]: + for event in self._events[account][jid]: + if types is None or event.type_ in types: + events.append(event) + return events + def get_first_event(self, account=None, jid=None, type_=None): """ Return the first event of type type_ if given ===================================== gajim/groupchat_control.py ===================================== @@ -375,8 +375,11 @@ class GroupchatControl(ChatControlBase): act.connect('change-state', self._on_minimize) self.parent_win.window.add_action(act) + # Enable notify on all for private rooms + members_only = muc_caps_cache.supports(self.contact.jid, + 'muc#roomconfig_membersonly') value = app.config.get_per( - 'rooms', self.contact.jid, 'notify_on_all_messages') + 'rooms', self.contact.jid, 'notify_on_all_messages', members_only) act = Gio.SimpleAction.new_stateful( 'notify-on-message-' + self.control_id, @@ -1294,8 +1297,7 @@ class GroupchatControl(ChatControlBase): def get_nb_unread(self): type_events = ['printed_marked_gc_msg'] - if app.config.get('notify_on_all_muc_messages') or \ - app.config.get_per('rooms', self.room_jid, 'notify_on_all_messages'): + if app.config.notify_for_muc(self.room_jid): type_events.append('printed_gc_msg') nb = len(app.events.get_events(self.account, self.room_jid, type_events)) @@ -1314,25 +1316,30 @@ class GroupchatControl(ChatControlBase): Returns a 2-Tuple. The first says whether or not to highlight the text, the second, what sound to play """ - highlight, sound = (None, None) + highlight, sound = None, None + + notify = app.config.notify_for_muc(self.room_jid) + message_sound_enabled = app.config.get_per('soundevents', + 'muc_message_received', + 'enabled') # Are any of the defined highlighting words in the text? if self.needs_visual_notification(text): highlight = True - if app.config.get_per('soundevents', 'muc_message_highlight', - 'enabled'): + if app.config.get_per('soundevents', + 'muc_message_highlight', + 'enabled'): sound = 'highlight' # Do we play a sound on every muc message? - elif app.config.get_per('soundevents', 'muc_message_received', \ - 'enabled'): + elif notify and message_sound_enabled: sound = 'received' # Is it a history message? Don't want sound-floods when we join. if tim is not None and time.mktime(time.localtime()) - tim > 1: sound = None - return (highlight, sound) + return highlight, sound def check_and_possibly_add_focus_out_line(self): """ ===================================== gajim/gtk/notification.py ===================================== @@ -111,7 +111,8 @@ class Notification: if event.type_ == 'gc-invitation': self._withdraw('gc-invitation', event.account, event.room_jid) if event.type_ in ('normal', 'printed_chat', 'chat', - 'printed_pm', 'pm'): + 'printed_pm', 'pm', 'printed_marked_gc_msg', + 'printed_gc_msg'): self._withdraw('new-message', event.account, event.jid) def _nec_our_status(self, obj): @@ -164,6 +165,7 @@ class Notification: if event_type in ( _('Contact Signed In'), _('Contact Signed Out'), _('New Message'), _('New Single Message'), _('New Private Message'), + _('New Group Chat Message'), _('Contact Changed Status'), _('File Transfer Request'), _('File Transfer Error'), _('File Transfer Completed'), _('File Transfer Stopped'), _('Groupchat Invitation'), @@ -193,7 +195,8 @@ class Notification: notif_id = self._make_id('connection-failed', account) elif event_type in (_('New Message'), _('New Single Message'), - _('New Private Message')): + _('New Private Message'), + _('New Group Chat Message')): avatar = app.contacts.get_avatar(account, jid) if avatar: icon_pixbuf = avatar ===================================== gajim/gtk/util.py ===================================== @@ -467,11 +467,8 @@ def get_show_in_systray(type_, jid): """ Return True if this event must be shown in systray, else False """ - notify = app.config.get('notify_on_all_muc_messages') - notify_for_jid = app.config.get_per( - 'rooms', jid, 'notify_on_all_messages') - - if type_ == 'printed_gc_msg' and not notify and not notify_for_jid: + notify = app.config.notify_for_muc(jid) + if type_ == 'printed_gc_msg' and not notify: # it's not an highlighted message, don't show in systray return False return app.config.get('trayicon_notification_on_events') ===================================== gajim/message_window.py ===================================== @@ -490,10 +490,9 @@ class MessageWindow: return unread = 0 for ctrl in self.controls(): - if ctrl.type_id == message_control.TYPE_GC and not \ - app.config.get('notify_on_all_muc_messages') and not \ - app.config.get_per('rooms', ctrl.room_jid, - 'notify_on_all_messages') and not ctrl.attention_flag: + if (ctrl.type_id == message_control.TYPE_GC and not + app.config.notify_for_muc(ctrl.room_jid) and not + ctrl.attention_flag): # count only pm messages unread += ctrl.get_nb_unread_pm() continue @@ -509,10 +508,8 @@ class MessageWindow: if control.type_id == message_control.TYPE_GC: name = control.room_jid.split('@')[0] - urgent = control.attention_flag or \ - app.config.get('notify_on_all_muc_messages') or \ - app.config.get_per('rooms', control.room_jid, - 'notify_on_all_messages') + urgent = (control.attention_flag or + app.config.notify_for_muc(control.room_jid)) else: name = control.contact.get_shown_name() if control.resource: ===================================== gajim/roster_window.py ===================================== @@ -2520,10 +2520,10 @@ class RosterWindow: return # check if we have unread messages unread = app.events.get_nb_events() - if not app.config.get('notify_on_all_muc_messages'): - unread_not_to_notify = app.events.get_nb_events( - ['printed_gc_msg']) - unread -= unread_not_to_notify + + for event in app.events.get_all_events(['printed_gc_msg']): + if not app.config.notify_for_muc(event.jid): + unread -= 1 # check if we have recent messages recent = False View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/760645f5c3006de6c47353c02461f8067f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/760645f5c3006de6c47353c02461f8067f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Dont draw contact after selection change
by Philipp Hörist 14 Dec '18

14 Dec '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: dac53707 by Philipp Hörist at 2018-12-14T20:39:58Z Dont draw contact after selection change This seems to be an old codepath, currently there is no need to redraw a contact on selection change Fixes #9496 - - - - - 1 changed file: - gajim/groupchat_control.py Changes: ===================================== gajim/groupchat_control.py ===================================== @@ -174,8 +174,6 @@ class GroupchatControl(ChatControlBase): self.widget_set_visible(self.xml.get_object('banner_eventbox'), app.config.get('hide_groupchat_banner')) - self._last_selected_contact = None # None or holds jid, account tuple - # muc attention flag (when we are mentioned in a muc) # if True, the room has mentioned us self.attention_flag = False @@ -198,12 +196,8 @@ class GroupchatControl(ChatControlBase): self.event_box = self.xml.get_object('banner_eventbox') self.list_treeview = self.xml.get_object('list_treeview') - selection = self.list_treeview.get_selection() - id_ = selection.connect('changed', - self.on_list_treeview_selection_changed) - self.handlers[id_] = selection id_ = self.list_treeview.connect('style-set', - self.on_list_treeview_style_set) + self.on_list_treeview_style_set) self.handlers[id_] = self.list_treeview # flag that stops hpaned position event @@ -912,21 +906,6 @@ class GroupchatControl(ChatControlBase): nick = contact[Column.NICK] self.draw_contact(nick) - def on_list_treeview_selection_changed(self, selection): - model, selected_iter = selection.get_selected() - self.draw_contact(self.nick) - if self._last_selected_contact is not None: - self.draw_contact(self._last_selected_contact) - if selected_iter is None: - self._last_selected_contact = None - return - contact = model[selected_iter] - nick = contact[Column.NICK] - self._last_selected_contact = nick - if contact[Column.TYPE] != 'contact': - return - self.draw_contact(nick, selected=True, focus=True) - def get_tab_label(self, chatstate): """ Markup the label if necessary. Returns a tuple such as: (new_label_str, @@ -1625,7 +1604,7 @@ class GroupchatControl(ChatControlBase): if ctrl and msg: ctrl.send_message(msg) - def draw_contact(self, nick, selected=False, focus=False): + def draw_contact(self, nick): iter_ = self.get_contact_iter(nick) if not iter_: return View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/dac5370780961b05782d0767ee6f21788f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/dac5370780961b05782d0767ee6f21788f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Fix bind after failed resume
by Philipp Hörist 14 Dec '18

14 Dec '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 7f39ed31 by Philipp Hörist at 2018-12-14T20:14:48Z Fix bind after failed resume We already received the features at the time of a failed resume so the handler is never called - - - - - 1 changed file: - nbxmpp/bind.py Changes: ===================================== nbxmpp/bind.py ===================================== @@ -47,6 +47,12 @@ class NonBlockingBind(PlugIn): self._owner.RegisterHandler( 'features', self._on_features, xmlns=NS_STREAMS) + feats = self._owner.Dispatcher.Stream.features + if feats is not None: + if feats.getTag('bind', namespace=NS_BIND) is not None: + # We already received the features + self._on_features(None, feats) + def _on_features(self, _con, feats): """ Determine if server supports resource binding and set some internal @@ -123,4 +129,4 @@ class NonBlockingBind(PlugIn): if feats.getTag('sm', namespace=NS_STREAM_MGMT): self._owner.Smacks.send_enable() self._owner.Dispatcher.Event(Realm.CONNECTING, Event.CONNECTION_ACTIVE) - self.PlugOut() \ No newline at end of file + self.PlugOut() View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/7f39ed31591c7d0eea66259d4b… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/7f39ed31591c7d0eea66259d4b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix start chat menu action
by Philipp Hörist 12 Dec '18

12 Dec '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5843827a by Philipp Hörist at 2018-12-12T22:35:36Z Fix start chat menu action Fixes #8275 - - - - - 1 changed file: - gajim/gui_menu_builder.py Changes: ===================================== gajim/gui_menu_builder.py ===================================== @@ -933,19 +933,13 @@ def get_conv_context_menu(account, kind, text): menuitem.set_label(label) if action.startswith('-'): + text = text.replace('xmpp:', '') + text = text.split('?')[0] action = 'app.%s%s' % (account, action) else: action = 'app.%s' % action menuitem.set_action_name(action) - if 'join-groupchat' in action: - text = text.replace('xmpp:', '') - text = text.split('?')[0] - - if 'add-contact' in action: - text = text.replace('xmpp:', '') - text = text.split('?')[0] - if action == 'app.open-link': value = GLib.Variant.new_strv([kind, text]) elif action == 'app.copy-link': View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5843827abc94818e867dab1b82cdb1d18b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5843827abc94818e867dab1b82cdb1d18b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Fix disabled join groupchat menu
by Philipp Hörist 10 Dec '18

10 Dec '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4e814dab by Philipp Hörist at 2018-12-10T21:30:37Z Fix disabled join groupchat menu When there are no bookmarks on the server the join groupchat menu was disabled, preventing the user to open the join groupchat dialog - - - - - be420d44 by Philipp Hörist at 2018-12-10T21:30:45Z Implement XEP-0411 Bookmarks Conversion If bookmarks conversion is announced by the server: - Dont merge bookmarks - Only push to either private storage or pubsub - - - - - 4 changed files: - gajim/common/modules/bookmarks.py - gajim/groupchat_control.py - gajim/gtk/join_groupchat.py - gajim/gui_menu_builder.py Changes: ===================================== gajim/common/modules/bookmarks.py ===================================== @@ -38,7 +38,6 @@ class Bookmarks: self._account = con.name self.bookmarks = {} self.conversion = False - self.available = False self.handlers = [] @@ -96,14 +95,18 @@ class Bookmarks: def _pubsub_bookmarks_received(self, _con, stanza): if not nbxmpp.isResultNode(stanza): log.info('No pubsub bookmarks: %s', stanza.getError()) - # Fallback, request private storage - self._request_private_bookmarks() + # Fallback, request private storage, only if server + # doesnt have bookmark conversion + if not self.conversion: + self._request_private_bookmarks() return - self.available = True log.info('Received Bookmarks (PubSub)') self._parse_bookmarks(stanza) - self._request_private_bookmarks() + if not self.conversion: + # If server does not have bookmark conversion, request private + # storage and try to merge the bookmarks + self._request_private_bookmarks() def _request_private_bookmarks(self) -> None: if not app.account_is_connected(self._account): @@ -120,7 +123,6 @@ class Bookmarks: if not nbxmpp.isResultNode(stanza): log.info('No private bookmarks: %s', stanza.getError()) else: - self.available = True log.info('Received Bookmarks (PrivateStorage)') merged = self._parse_bookmarks(stanza, check_merge=True) if merged and self._pubsub_support(): @@ -264,6 +266,9 @@ class Bookmarks: if storage_type is None: if self._pubsub_support(): self._pubsub_store(storage_node) + if self.conversion: + # Only push to either pubsub or private storage + return self._private_store(storage_node) elif storage_type == BookmarkStorageType.PUBSUB: if self._pubsub_support(): ===================================== gajim/groupchat_control.py ===================================== @@ -419,10 +419,9 @@ class GroupchatControl(ChatControlBase): # Bookmarks con = app.connections[self.account] - bookmark_support = con.get_module('Bookmarks').available bookmarked = self.room_jid in con.get_module('Bookmarks').bookmarks win.lookup_action('bookmark-' + self.control_id).set_enabled( - self.is_connected and bookmark_support and not bookmarked) + self.is_connected and not bookmarked) # Request Voice role = self.get_role(self.nick) ===================================== gajim/gtk/join_groupchat.py ===================================== @@ -113,10 +113,6 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): # Set bookmark switch sensitive if server supports bookmarks acc = self.account_combo.get_active_id() - con = app.connections[acc] - if not con.get_module('Bookmarks').available: - self.bookmark_switch.set_sensitive(False) - self.autojoin_switch.set_sensitive(False) self.show_all() ===================================== gajim/gui_menu_builder.py ===================================== @@ -714,10 +714,8 @@ def get_groupchat_menu(control_id, account, jid): def get_bookmarks_menu(account, rebuild=False): con = app.connections[account] - boomarks = con.get_module('Bookmarks').get_sorted_bookmarks( - short_name=True) - if not boomarks: - return None + boomarks = con.get_module('Bookmarks').get_sorted_bookmarks(short_name=True) + menu = Gio.Menu() # Build Join Groupchat View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/6e30d3af6473d41de42f1d60cd0363215… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/6e30d3af6473d41de42f1d60cd0363215… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] Update ChangeLog
by Philipp Hörist 09 Dec '18

09 Dec '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: c9033938 by Philipp Hörist at 2018-12-09T20:41:25Z Update ChangeLog - - - - - 1 changed file: - ChangeLog Changes: ===================================== ChangeLog ===================================== @@ -1,3 +1,24 @@ +Gajim 1.1.1 (10 December 2018) + + Bug fixes + + * 9427 Placeholder not cleared if pasting text into message input + * 9444 Determine the delay timestamp correctly when using mam:1 + * 9453 Fix opening links inside the group chat subject (MacOS/Windows) + * 9465 Allow the full range of possible nicknames in group chats + * 9067 Gajim crashes when receiving xhtml messages + * 9472 Handle presences without from attr correctly + * 9473 Error when creating a new group chat + * 9491 Identify group chat subject changes correctly + * Determine soundplayer correctly on unix systems + * In some circumstances plugins could not be deleted + * Show correct contact status on tabs + * Dont answer group chat receipt requests + * Fix receipts for private messages + * Pressing the back button in the Accounts window leads to an error + * Better handle not available keyring backends + * Dont show incorrect contact on private messages + Gajim 1.1.0 (06 November 2018) New View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c90339383c5276df677407e63af3dbad05… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c90339383c5276df677407e63af3dbad05… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] 2 commits: Find correct contact on private message
by Philipp Hörist 09 Dec '18

09 Dec '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: 5af79671 by Philipp Hörist at 2018-12-09T20:24:43Z Find correct contact on private message get_contact() returns also a contact if only the bare jid matches, which for private messages is the groupchat contact object. - - - - - 2a8d5739 by Philipp Hörist at 2018-12-09T20:24:56Z MUC: Identify subject change correctly Fixes #9491 - - - - - 5 changed files: - gajim/common/connection_handlers_events.py - gajim/common/modules/message.py - gajim/groupchat_control.py - gajim/roster_window.py - gajim/session.py Changes: ===================================== gajim/common/connection_handlers_events.py ===================================== @@ -432,15 +432,6 @@ class GcMessageReceivedEvent(nec.NetworkIncomingEvent): # message from server self.nick = '' - self.subject = self.stanza.getSubject() - - if self.subject is not None: - app.nec.push_incoming_event( - nec.NetworkEvent('gc-subject-received', - nickname=self.msg_obj.resource, - **vars(self.msg_obj))) - return - conditions = self.stanza.getStatusConditions() if conditions: self.status_code = [] ===================================== gajim/common/modules/message.py ===================================== @@ -227,7 +227,10 @@ class Message: subject = event.stanza.getSubject() groupchat = event.mtype == 'groupchat' - muc_subject = subject and groupchat + + # XEP-0045: only a message that contains a <subject/> but no <body/> + # element shall be considered a subject change for MUC purposes. + muc_subject = subject and groupchat and not event.msgtxt # Determine timestamps if groupchat: @@ -284,6 +287,11 @@ class Message: event.session, event.fjid, timestamp) return + if muc_subject: + app.nec.push_incoming_event(NetworkEvent('gc-subject-received', + **vars(event))) + return + if groupchat: app.nec.push_incoming_event(GcMessageReceivedEvent( None, ===================================== gajim/groupchat_control.py ===================================== @@ -1535,7 +1535,7 @@ class GroupchatControl(ChatControlBase): self.draw_banner_text() def _nec_gc_subject_received(self, event): - if event.conn.name != self.account: + if event.account != self.account: return if event.jid != self.room_jid: return @@ -1544,7 +1544,7 @@ class GroupchatControl(ChatControlBase): return self.set_subject(event.subject) text = _('%(nick)s has set the subject to %(subject)s') % { - 'nick': event.nickname, 'subject': event.subject} + 'nick': event.resource, 'subject': event.subject} if event.delayed: date = time.strftime('%d-%m-%Y %H:%M:%S', ===================================== gajim/roster_window.py ===================================== @@ -2700,10 +2700,10 @@ class RosterWindow: def _nec_gc_subject_received(self, obj): contact = app.contacts.get_contact_with_highest_priority( - obj.conn.name, obj.jid) + obj.account, obj.jid) if contact: contact.status = obj.subject - self.draw_contact(obj.jid, obj.conn.name) + self.draw_contact(obj.jid, obj.account) def _nec_metacontacts_received(self, obj): self.redraw_metacontacts(obj.conn.name) ===================================== gajim/session.py ===================================== @@ -79,11 +79,13 @@ class ChatControlSession: """ if obj.session != self: return - contact = app.contacts.get_contact(self.conn.name, obj.jid, - obj.resource) - if not contact: - contact = app.contacts.get_gc_contact(self.conn.name, obj.jid, - obj.resource) + + if obj.muc_pm: + contact = app.contacts.get_gc_contact( + self.conn.name, obj.jid, obj.resource) + else: + contact = app.contacts.get_contact( + self.conn.name, obj.jid, obj.resource) if self.resource != obj.resource: self.resource = obj.resource if self.control: View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/1c09b50791eecd26c706a53d877912e1d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/1c09b50791eecd26c706a53d877912e1d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Adapt to nbxmpp API changes
by Philipp Hörist 09 Dec '18

09 Dec '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6e30d3af by Philipp Hörist at 2018-12-09T17:48:44Z Adapt to nbxmpp API changes - Remove support for OAUTH2 - Remove insecure password dialog, its impossible now that a user can connect plain by mistake - Refactor requesting the password - Add possibility to delete passwords - - - - - 6 changed files: - gajim/common/config.py - gajim/common/connection.py - gajim/common/connection_handlers_events.py - gajim/common/passwords.py - gajim/gtk/accounts.py - gajim/gui_interface.py Changes: ===================================== gajim/common/config.py ===================================== @@ -391,9 +391,6 @@ class Config: 'subscription_request_msg': [opt_str, '', _('Message that is sent to contacts you want to add')], 'enable_message_carbons': [opt_bool, True, _('If enabled and if server supports this feature, Gajim will receive messages sent and received by other resources.')], 'ft_send_local_ips': [opt_bool, True, _('If enabled, Gajim will send your local IPs so your contact can connect to your machine to transfer files.')], - 'oauth2_refresh_token': [opt_str, '', _('Latest token for OAuth 2.0 authentication.')], - 'oauth2_client_id': [opt_str, '0000000044077801', _('client_id for OAuth 2.0 authentication.')], - 'oauth2_redirect_url': [opt_str, 'https%3A%2F%2Fgajim.org%2Fmsnauth%2Findex.cgi', _('redirect_url for OAuth 2.0 authentication.')], 'opened_chat_controls': [opt_str, '', _('Space separated list of JIDs for which chat window will be re-opened on next startup.')], 'recent_groupchats': [opt_str, ''], 'httpupload_verify': [opt_bool, True, _('HTTP Upload: Enable HTTPS Verification')], ===================================== gajim/common/connection.py ===================================== @@ -87,7 +87,7 @@ class CommonConnection: self.connected = 0 self.connection = None # xmpppy ClientCommon instance self.is_zeroconf = False - self.password = '' + self.password = None self.server_resource = self._compute_resource() self.gpg = None self.USE_GPG = False @@ -500,7 +500,6 @@ class Connection(CommonConnection, ConnectionHandlers): self.new_account_info = None self.new_account_form = None self.last_sent = [] - self.password = passwords.get_password(name) self._unregister_account = False self._unregister_account_cb = None @@ -510,7 +509,6 @@ class Connection(CommonConnection, ConnectionHandlers): self.register_supported = False # Do we auto accept insecure connection self.connection_auto_accepted = False - self.pasword_callback = None self.on_connect_success = None self.on_connect_failure = None @@ -1273,25 +1271,45 @@ class Connection(CommonConnection, ConnectionHandlers): return log.info('SSL Cert accepted') - name = None - if not app.config.get_per('accounts', self.name, 'anonymous_auth'): - name = app.config.get_per('accounts', self.name, 'name') + self._auth() + + def _get_password(self, mechanism, on_password): + if not mechanism.startswith('SCRAM') and not mechanism == 'PLAIN': + log.error('No password method for %s known', mechanism) + return + + if self.password is not None: + # Passord already known + on_password(self.password) + return + + pass_saved = app.config.get_per('accounts', self.name, 'savepass') + if pass_saved: + # Request password from keyring only if the user chose to save + # his password + self.password = passwords.get_password(self.name) + if self.password is not None: + on_password(self.password) + else: + app.nec.push_incoming_event(PasswordRequiredEvent( + None, conn=self, on_password=on_password)) + + def _auth(self): self._register_handlers(self.connection, self._current_type) - auth_mechs = app.config.get_per( - 'accounts', self.name, 'authentication_mechanisms').split() - for mech in auth_mechs: - if mech not in nbxmpp.auth_nb.SASL_AUTHENTICATION_MECHANISMS: - log.warning('Unknown authentication mechanisms %s', mech) - if not auth_mechs: - auth_mechs = None + if app.config.get_per('accounts', self.name, 'anonymous_auth'): + name = None + auth_mechs = {'ANONYMOUS'} else: - auth_mechs = set(auth_mechs) - self.connection.auth(user=name, - password=self.password, + name = app.config.get_per('accounts', self.name, 'name') + auth_mechs = app.config.get_per( + 'accounts', self.name, 'authentication_mechanisms').split() + auth_mechs = set(auth_mechs) if auth_mechs else None + + self.connection.auth(name, + get_password=self._get_password, resource=self.server_resource, - sasl=True, auth_mechs=auth_mechs) def _register_handlers(self, con, con_type): @@ -1795,66 +1813,6 @@ class Connection(CommonConnection, ConnectionHandlers): caps=ptype != 'unavailable', idle_time=idle_time) - def get_password(self, callback, type_): - if app.config.get_per('accounts', self.name, 'anonymous_auth') and \ - type_ != 'ANONYMOUS': - app.nec.push_incoming_event( - NonAnonymousServerErrorEvent(None, conn=self)) - self.disconnect(reconnect=False) - return - self.pasword_callback = (callback, type_) - if type_ == 'X-MESSENGER-OAUTH2': - client_id = app.config.get_per('accounts', self.name, - 'oauth2_client_id') - refresh_token = app.config.get_per('accounts', self.name, - 'oauth2_refresh_token') - if refresh_token: - renew_url = ( - 'https://oauth.live.com/token?client_id=' - '%s&redirect_uri=https%%3A%%2F%%2Foauth.live.' - 'com%%2Fdesktop&grant_type=refresh_token&' - 'refresh_token=%s') % (client_id, refresh_token) - result = helpers.download_image(self.name, {'src': renew_url})[0] - if result: - dict_ = json.loads(result) - if 'access_token' in dict_: - self.set_password(dict_['access_token']) - return - script_url = app.config.get_per('accounts', self.name, - 'oauth2_redirect_url') - token_url = ( - 'https://oauth.live.com/authorize?client_id=' - '%s&scope=wl.messenger%%20wl.offline_access&' - 'response_type=code&redirect_uri=%s') % (client_id, script_url) - helpers.launch_browser_mailer('url', token_url) - self.disconnect(reconnect=False) - app.nec.push_incoming_event( - Oauth2CredentialsRequiredEvent(None, conn=self)) - return - if self.password: - self.set_password(self.password) - return - app.nec.push_incoming_event(PasswordRequiredEvent(None, conn=self)) - - def set_password(self, password): - self.password = password - if self.pasword_callback: - callback, type_ = self.pasword_callback - if self._current_type == 'plain' and type_ == 'PLAIN' and \ - app.config.get_per('accounts', self.name, - 'warn_when_insecure_password'): - app.nec.push_incoming_event(InsecurePasswordEvent(None, - conn=self)) - return - callback(password) - self.pasword_callback = None - - def accept_insecure_password(self): - if self.pasword_callback: - callback = self.pasword_callback[0] - callback(self.password) - self.pasword_callback = None - def unregister_account(self, on_remove_success): self._unregister_account = True self._unregister_account_cb = on_remove_success ===================================== gajim/common/connection_handlers_events.py ===================================== @@ -681,9 +681,6 @@ class PEPReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): class PlainConnectionEvent(nec.NetworkIncomingEvent): name = 'plain-connection' -class InsecurePasswordEvent(nec.NetworkIncomingEvent): - name = 'insecure-password' - class InsecureSSLConnectionEvent(nec.NetworkIncomingEvent): name = 'insecure-ssl-connection' @@ -723,9 +720,6 @@ class ZeroconfNameConflictEvent(nec.NetworkIncomingEvent): class PasswordRequiredEvent(nec.NetworkIncomingEvent): name = 'password-required' -class Oauth2CredentialsRequiredEvent(nec.NetworkIncomingEvent): - name = 'oauth2-credentials-required' - class SignedInEvent(nec.NetworkIncomingEvent): name = 'signed-in' ===================================== gajim/common/passwords.py ===================================== @@ -43,10 +43,14 @@ class PasswordStorage: def get_password(self, account_name): """Return the password for account_name, or None if not found.""" raise NotImplementedError + def save_password(self, account_name, password): """Save password for account_name. Return a bool indicating success.""" raise NotImplementedError + def delete_password(self, account_name): + """Delete password for account_name. Return a bool indicating success.""" + raise NotImplementedError class SecretPasswordStorage(PasswordStorage): """ Store password using Keyring """ @@ -69,6 +73,10 @@ class SecretPasswordStorage(PasswordStorage): log.debug('getting password') return self.keyring.get_password('gajim', account_name) + def delete_password(self, account_name): + return self.keyring.delete_password('gajim', account_name) + + class PasswordStorageManager(PasswordStorage): """Access all the implemented password storage backends, knowing which ones are available and which we prefer to use. @@ -118,17 +126,27 @@ class PasswordStorageManager(PasswordStorage): return pw def save_password(self, account_name, password): + if account_name in app.connections: + app.connections[account_name].password = password + if not app.config.get_per('accounts', account_name, 'savepass'): + return True + if self.preferred_backend: if self.preferred_backend.save_password(account_name, password): app.config.set_per('accounts', account_name, 'password', self.preferred_backend.identifier) - if account_name in app.connections: - app.connections[account_name].password = password - return True + else: + app.config.set_per('accounts', account_name, 'password', password) + return True - app.config.set_per('accounts', account_name, 'password', password) + def delete_password(self, account_name): if account_name in app.connections: - app.connections[account_name].password = password + app.connections[account_name].password = None + + if not self.preferred_backend: + self.preferred_backend.delete_password(account_name) + else: + app.config.set_per('accounts', account_name, 'password', None) return True def set_preferred_backend(self): @@ -148,7 +166,8 @@ def get_storage(): def get_password(account_name): return get_storage().get_password(account_name) +def delete_password(account_name): + return get_storage().delete_password(account_name) + def save_password(account_name, password): - if account_name in app.connections: - app.connections[account_name].set_password(password) return get_storage().save_password(account_name, password) ===================================== gajim/gtk/accounts.py ===================================== @@ -810,4 +810,4 @@ class LoginDialog(OptionsDialog): def on_destroy(self, *args): savepass = app.config.get_per('accounts', self.account, 'savepass') if not savepass: - passwords.save_password(self.account, '') + passwords.delete_password(self.account) ===================================== gajim/gui_interface.py ===================================== @@ -107,7 +107,6 @@ from gajim.gtk.dialogs import WarningDialog from gajim.gtk.dialogs import InformationDialog from gajim.gtk.dialogs import InputDialog from gajim.gtk.dialogs import YesNoDialog -from gajim.gtk.dialogs import InputTextDialog from gajim.gtk.dialogs import PlainConnectionDialog from gajim.gtk.dialogs import SSLErrorDialog from gajim.gtk.dialogs import ConfirmationDialogDoubleCheck @@ -713,45 +712,19 @@ class Interface: text = _('Enter your password for account %s') % account def on_ok(passphrase, save): - if save: - app.config.set_per('accounts', account, 'savepass', True) - passwords.save_password(account, passphrase) - obj.conn.set_password(passphrase) + app.config.set_per('accounts', account, 'savepass', save) + passwords.save_password(account, passphrase) + obj.on_password(passphrase) del self.pass_dialog[account] def on_cancel(): - self.roster.set_state(account, 'offline') - self.roster.update_status_combobox() + obj.conn.disconnect(reconnect=False, immediately=True) del self.pass_dialog[account] self.pass_dialog[account] = dialogs.PassphraseDialog( _('Password Required'), text, _('Save password'), ok_handler=on_ok, cancel_handler=on_cancel) - def handle_oauth2_credentials(self, obj): - account = obj.conn.name - def on_ok(refresh): - app.config.set_per('accounts', account, 'oauth2_refresh_token', - refresh) - st = app.config.get_per('accounts', account, 'last_status') - msg = helpers.from_one_line(app.config.get_per('accounts', - account, 'last_status_msg')) - app.interface.roster.send_status(account, st, msg) - del self.pass_dialog[account] - - def on_cancel(): - app.config.set_per('accounts', account, 'oauth2_refresh_token', - '') - self.roster.set_state(account, 'offline') - self.roster.update_status_combobox() - del self.pass_dialog[account] - - instruction = _('Please copy / paste the refresh token from the website' - ' that has just been opened.') - self.pass_dialog[account] = InputTextDialog( - _('Oauth2 Credentials'), instruction, is_modal=False, - ok_handler=on_ok, cancel_handler=on_cancel) - def handle_event_roster_info(self, obj): #('ROSTER_INFO', account, (jid, name, sub, ask, groups)) account = obj.conn.name @@ -1454,48 +1427,6 @@ class Interface: checktext2, on_response_ok=on_ok, on_response_cancel=on_cancel, is_modal=False) - def handle_event_insecure_password(self, obj): - # ('INSECURE_PASSWORD', account, ()) - def on_ok(is_checked): - if not is_checked[0]: - on_cancel() - return - del self.instances[obj.conn.name]['online_dialog']\ - ['insecure_password'] - if is_checked[1]: - app.config.set_per('accounts', obj.conn.name, - 'warn_when_insecure_password', False) - if obj.conn.connected == 0: - # We have been disconnecting (too long time since window is - # opened) - # re-connect with auto-accept - obj.conn.connection_auto_accepted = True - show, msg = obj.conn.continue_connect_info[:2] - self.roster.send_status(obj.conn.name, show, msg) - return - obj.conn.accept_insecure_password() - - def on_cancel(): - del self.instances[obj.conn.name]['online_dialog']\ - ['insecure_password'] - obj.conn.disconnect(reconnect=False) - app.nec.push_incoming_event(OurShowEvent(None, conn=obj.conn, - show='offline')) - - pritext = _('Insecure connection') - sectext = _('You are about to send your password unencrypted on an ' - 'insecure connection. Are you sure you want to do that?') - checktext1 = _('Yes, I really want to connect insecurely') - checktext2 = _('_Do not ask me again') - if 'insecure_password' in self.instances[obj.conn.name]\ - ['online_dialog']: - self.instances[obj.conn.name]['online_dialog']\ - ['insecure_password'].destroy() - self.instances[obj.conn.name]['online_dialog']['insecure_password'] = \ - ConfirmationDialogDoubleCheck(pritext, sectext, checktext1, - checktext2, on_response_ok=on_ok, on_response_cancel=on_cancel, - is_modal=False) - def create_core_handlers_list(self): self.handlers = { 'DB_ERROR': [self.handle_event_db_error], @@ -1515,7 +1446,6 @@ class Interface: 'gpg-trust-key': [self.handle_event_gpg_trust_key], 'http-auth-received': [self.handle_event_http_auth], 'information': [self.handle_event_information], - 'insecure-password': [self.handle_event_insecure_password], 'insecure-ssl-connection': \ [self.handle_event_insecure_ssl_connection], 'iq-error-received': [self.handle_event_iq_error], @@ -1530,7 +1460,6 @@ class Interface: 'message-sent': [self.handle_event_msgsent], 'metacontacts-received': [self.handle_event_metacontacts], 'muc-owner-received': [self.handle_event_gc_config], - 'oauth2-credentials-required': [self.handle_oauth2_credentials], 'our-show': [self.handle_event_status], 'password-required': [self.handle_event_password_required], 'plain-connection': [self.handle_event_plain_connection], View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6e30d3af6473d41de42f1d60cd0363215b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6e30d3af6473d41de42f1d60cd0363215b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Rewrite auth module from scratch
by Philipp Hörist 09 Dec '18

09 Dec '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: f2a20338 by Philipp Hörist at 2018-12-09T17:43:48Z Rewrite auth module from scratch - Move NonBlockingBind to own module - Add SCRAM-SHA-256 and SCRAM-SHA-256-PLUS support - Remove DIGEST-MD5 and X-MESSENGER-OAUTH2 support - - - - - 9 changed files: - nbxmpp/__init__.py - + nbxmpp/auth.py - − nbxmpp/auth_nb.py - + nbxmpp/bind.py - nbxmpp/client_nb.py - nbxmpp/const.py - nbxmpp/protocol.py - + nbxmpp/util.py - + test/unit/test_sasl_scram.py Changes: ===================================== nbxmpp/__init__.py ===================================== @@ -9,7 +9,7 @@ Thanks and credits to the xmpppy developers. See: http://xmpppy.sourceforge.net/ """ from .protocol import * -from . import simplexml, protocol, auth_nb, transports_nb, roster_nb +from . import simplexml, protocol, auth, transports_nb, roster_nb from . import dispatcher_nb, features_nb, idlequeue, bosh, tls_nb, proxy_connectors from .client_nb import NonBlockingClient from .plugin import PlugIn ===================================== nbxmpp/auth.py ===================================== @@ -0,0 +1,473 @@ +# Copyright (C) 2018 Philipp Hörist <philipp AT hoerist.com> +# +# This file is part of nbxmpp. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; If not, see <http://www.gnu.org/licenses/>. + +import os +import hmac +import binascii +import logging +import hashlib +from hashlib import pbkdf2_hmac +from functools import partial + +from nbxmpp.plugin import PlugIn +from nbxmpp.protocol import NS_SASL +from nbxmpp.protocol import Node +from nbxmpp.protocol import NodeProcessed +from nbxmpp.protocol import SASL_ERROR_CONDITIONS +from nbxmpp.protocol import SASL_AUTH_MECHS +from nbxmpp.util import b64decode +from nbxmpp.util import b64encode +from nbxmpp.const import GSSAPIState + + +log = logging.getLogger('nbxmpp.auth') + +try: + kerberos = __import__('kerberos') + KERBEROS_AVAILABLE = True +except ImportError: + KERBEROS_AVAILABLE = False + + +class SASL(PlugIn): + """ + Implements SASL authentication. Can be plugged into NonBlockingClient + to start authentication + """ + + _default_mechs = set(['SCRAM-SHA-256-PLUS', + 'SCRAM-SHA-256', + 'SCRAM-SHA-1-PLUS', + 'SCRAM-SHA-1', + 'PLAIN']) + + def __init__(self, username, auth_mechs, get_password, on_finished): + """ + :param username: XMPP username + :param auth_mechs: Set of valid authentication mechanisms. + Possible entries are: + 'ANONYMOUS', 'EXTERNAL', 'GSSAPI', 'SCRAM-SHA-1-PLUS', + 'SCRAM-SHA-1', 'SCRAM-SHA-256', 'SCRAM-SHA-256-PLUS', 'PLAIN' + :param on_finished: Callback after SASL is finished + :param get_password: Callback that must return the password for the + chosen mechanism + """ + PlugIn.__init__(self) + self.username = username + self._on_finished = on_finished + self._get_password = get_password + + self._prefered_mechs = auth_mechs + self._enabled_mechs = self._prefered_mechs or self._default_mechs + self._chosen_mechanism = None + self._method = None + + self._channel_binding = None + + def _setup_mechs(self): + if self._owner.connected in ('ssl', 'tls'): + if self._owner.protocol_type == 'BOSH': + # PLUS would break if the server uses any kind of reverse proxy + self._enabled_mechs.discard('SCRAM-SHA-1-PLUS') + self._enabled_mechs.discard('SCRAM-SHA-256-PLUS') + else: + self._channel_binding = self._owner.Connection.NonBlockingTLS.get_channel_binding() + # TLS handshake is finished so channel binding data muss exist + if self._channel_binding is None: + raise ValueError('No channel binding data found') + + else: + self._enabled_mechs.discard('SCRAM-SHA-1-PLUS') + self._enabled_mechs.discard('SCRAM-SHA-256-PLUS') + if self._prefered_mechs is None: + # if the client didnt specify any auth mechs avoid + # sending the password over a plain connection + self._enabled_mechs.discard('PLAIN') + + if not KERBEROS_AVAILABLE: + self._enabled_mechs.discard('GSSAPI') + + def plugin(self, _owner): + self._setup_mechs() + self._owner.RegisterHandler( + 'challenge', self._on_challenge, xmlns=NS_SASL) + self._owner.RegisterHandler( + 'failure', self._on_failure, xmlns=NS_SASL) + self._owner.RegisterHandler( + 'success', self._on_success, xmlns=NS_SASL) + + # Execute the Handler manually, we already received the features + self._on_features(None, self._owner.Dispatcher.Stream.features) + + def plugout(self): + """ + Remove SASL handlers from owner's dispatcher. Used internally + """ + self._owner.UnregisterHandler( + 'challenge', self._on_challenge, xmlns=NS_SASL) + self._owner.UnregisterHandler( + 'failure', self._on_failure, xmlns=NS_SASL) + self._owner.UnregisterHandler( + 'success', self._on_success, xmlns=NS_SASL) + + def _on_features(self, _con, stanza): + """ + Used to determine if server supports SASL auth. Used internally + """ + if not stanza.getTag('mechanisms', namespace=NS_SASL): + return + + mechanisms = stanza.getTag('mechanisms', namespace=NS_SASL) + mechanisms = mechanisms.getTags('mechanism') + + mechs = set(mech.getData() for mech in mechanisms) + available_mechs = mechs & self._enabled_mechs + + log.info('Available mechanisms: %s', available_mechs) + + if not available_mechs: + log.error('No available auth mechanisms found') + self._abort_auth('invalid-mechanism') + return + + for mech in SASL_AUTH_MECHS: + if mech in available_mechs: + self._chosen_mechanism = mech + break + + if self._chosen_mechanism is None: + log.error('No available auth mechanisms found') + self._abort_auth('invalid-mechanism') + return + + log.info('Chosen auth mechanism: %s', self._chosen_mechanism) + self._auth() + + def _auth(self): + password_cb = partial(self._on_password, self.username) + + if self._chosen_mechanism == 'SCRAM-SHA-256-PLUS': + self._method = SCRAM_SHA_256_PLUS(self._owner.Connection, + self._channel_binding) + self._get_password(self._chosen_mechanism, password_cb) + + elif self._chosen_mechanism == 'SCRAM-SHA-256': + self._method = SCRAM_SHA_256(self._owner.Connection, None) + self._get_password(self._chosen_mechanism, password_cb) + + elif self._chosen_mechanism == 'SCRAM-SHA-1-PLUS': + self._method = SCRAM_SHA_1_PLUS(self._owner.Connection, + self._channel_binding) + self._get_password(self._chosen_mechanism, password_cb) + + elif self._chosen_mechanism == 'SCRAM-SHA-1': + self._method = SCRAM_SHA_1(self._owner.Connection, None) + self._get_password(self._chosen_mechanism, password_cb) + + elif self._chosen_mechanism == 'PLAIN': + self._method = PLAIN(self._owner.Connection) + self._get_password(self._chosen_mechanism, password_cb) + + elif self._chosen_mechanism == 'ANONYMOUS': + self._method = ANONYMOUS(self._owner.Connection) + self._method.initiate() + + elif self._chosen_mechanism == 'EXTERNAL': + self._method = EXTERNAL(self._owner.Connection) + self._method.initiate(self.username, self._owner.Server) + + elif self._chosen_mechanism == 'GSSAPI': + self._method = GSSAPI(self._owner.Connection) + self._method.initiate(self._owner.xmpp_hostname) + + else: + log.error('Unknown auth mech') + + def _on_password(self, username, password): + if password is None: + log.warning('No password supplied') + return + self._method.initiate(username, password) + + def _on_challenge(self, _con, stanza): + try: + self._method.response(stanza.getData()) + except AttributeError: + log.info('Mechanism has no response method') + self._abort_auth() + except AuthFail as error: + log.error(error) + self._abort_auth() + raise NodeProcessed + + def _on_success(self, _con, stanza): + log.info('Successfully authenticated with remote server') + try: + self._method.success(stanza.getData()) + except AttributeError: + pass + except AuthFail as error: + log.error(error) + self._abort_auth() + raise NodeProcessed + + self._on_finished(True, None, None) + raise NodeProcessed + + def _on_failure(self, _con, stanza): + text = stanza.getTagData('text') + reason = 'not-authorized' + childs = stanza.getChildren() + for child in childs: + name = child.getName() + if name == 'text': + continue + if name in SASL_ERROR_CONDITIONS: + reason = name + break + + log.info('Failed SASL authentification: %s %s', reason, text) + self._abort_auth(reason, text) + raise NodeProcessed + + def _abort_auth(self, reason='malformed-request', text=None): + node = Node('abort', attrs={'xmlns': NS_SASL}) + self._owner.send(node) + self._owner.Connection.start_disconnect() + self._on_finished(False, reason, text) + + +class PLAIN: + + _mechanism = 'PLAIN' + + def __init__(self, con): + self._con = con + + def initiate(self, username, password): + payload = b64encode('\x00%s\x00%s' % (username, password)) + node = Node('auth', + attrs={'xmlns': NS_SASL, 'mechanism': 'PLAIN'}, + payload=[payload]) + self._con.send(node) + + +class EXTERNAL: + + _mechanism = 'EXTERNAL' + + def __init__(self, con): + self._con = con + + def initiate(self, username, server): + payload = b64encode('%s@%s' % (username, server)) + node = Node('auth', + attrs={'xmlns': NS_SASL, 'mechanism': 'EXTERNAL'}, + payload=[payload]) + self._con.send(node) + + +class ANONYMOUS: + + _mechanism = 'ANONYMOUS' + + def __init__(self, con): + self._con = con + + def initiate(self): + node = Node('auth', attrs={'xmlns': NS_SASL, 'mechanism': 'ANONYMOUS'}) + self._con.send(node) + + +class GSSAPI: + + _mechanism = 'GSSAPI' + + def __init__(self, con): + self._con = con + self._gss_vc = None + self._state = GSSAPIState.STEP + + def initiate(self, hostname): + self._gss_vc = kerberos.authGSSClientInit('xmpp@%s' % hostname)[1] + kerberos.authGSSClientStep(self._gss_vc, '') + response = kerberos.authGSSClientResponse(self._gss_vc) + node = Node('auth', + attrs={'xmlns': NS_SASL, 'mechanism': 'GSSAPI'}, + payload=(response or '')) + self._con.send(node) + + def response(self, server_message, *args, **kwargs): + server_message = b64decode(server_message, bytes) + if self._state == GSSAPIState.STEP: + rc = kerberos.authGSSClientStep(self._gss_vc, server_message) + if rc != kerberos.AUTH_GSS_CONTINUE: + self._state = GSSAPIState.WRAP + elif self._state == GSSAPIState.WRAP: + rc = kerberos.authGSSClientUnwrap(self._gss_vc, server_message) + response = kerberos.authGSSClientResponse(self._gss_vc) + rc = kerberos.authGSSClientWrap( + self._gss_vc, + response, + kerberos.authGSSClientUserName(self._gss_vc)) + response = kerberos.authGSSClientResponse(self._gss_vc) + if not response: + response = '' + + node = Node('response', + attrs={'xmlns': NS_SASL}, + payload=response) + self._con.send(node) + + +class SCRAM: + + _mechanism = '' + _channel_binding = '' + _hash_method = '' + + def __init__(self, con, channel_binding): + self._con = con + self._channel_binding_data = channel_binding + self._client_nonce = '%x' % int(binascii.hexlify(os.urandom(24)), 16) + self._client_first_message_bare = None + self._server_signature = None + self._password = None + + @property + def nonce_length(self): + return len(self._client_nonce) + + @property + def _b64_channel_binding_data(self): + if self._mechanism.endswith('PLUS'): + return b64encode(b'%s%s' % (self._channel_binding.encode(), + self._channel_binding_data)) + return b64encode(self._channel_binding) + + @staticmethod + def _scram_parse(scram_data): + return dict(s.split('=', 1) for s in scram_data.split(',')) + + def initiate(self, username, password): + self._password = password + self._client_first_message_bare = 'n=%s,r=%s' % (username, + self._client_nonce) + client_first_message = '%s%s' % (self._channel_binding, + self._client_first_message_bare) + payload = b64encode(client_first_message) + node = Node('auth', + attrs={'xmlns': NS_SASL, 'mechanism': self._mechanism}, + payload=[payload]) + self._con.send(node) + + def response(self, server_first_message): + server_first_message = b64decode(server_first_message) + challenge = self._scram_parse(server_first_message) + + client_nonce = challenge['r'][:self.nonce_length] + if client_nonce != self._client_nonce: + raise AuthFail('Invalid client nonce received from server') + + salt = b64decode(challenge['s'], bytes) + iteration_count = int(challenge['i']) + + if iteration_count < 4096: + raise AuthFail('Salt iteration count to low: %s' % iteration_count) + + salted_password = pbkdf2_hmac(self._hash_method, + self._password.encode('utf8'), + salt, + iteration_count) + + client_final_message_wo_proof = 'c=%s,r=%s' % ( + self._b64_channel_binding_data, + challenge['r'] + ) + + client_key = self._hmac(salted_password, 'Client Key') + stored_key = self._h(client_key) + auth_message = '%s,%s,%s' % (self._client_first_message_bare, + server_first_message, + client_final_message_wo_proof) + client_signature = self._hmac(stored_key, auth_message) + client_proof = self._xor(client_key, client_signature) + + client_finale_message = 'c=%s,r=%s,p=%s' % ( + self._b64_channel_binding_data, + challenge['r'], + b64encode(client_proof) + ) + + server_key = self._hmac(salted_password, 'Server Key') + self._server_signature = self._hmac(server_key, auth_message) + + log.debug('Response: %s', client_finale_message) + payload = b64encode(client_finale_message) + node = Node('response', + attrs={'xmlns': NS_SASL}, + payload=[payload]) + self._con.send(node) + + def success(self, server_last_message): + server_last_message = b64decode(server_last_message) + success = self._scram_parse(server_last_message) + server_signature = b64decode(success['v'], bytes) + if server_signature != self._server_signature: + raise AuthFail('Invalid server signature') + + def _hmac(self, key, message): + return hmac.new(key=key, + msg=message.encode(), + digestmod=self._hash_method).digest() + + @staticmethod + def _xor(x, y): + return bytes([px ^ py for px, py in zip(x, y)]) + + def _h(self, data): + return hashlib.new(self._hash_method, data).digest() + + +class SCRAM_SHA_1(SCRAM): + + _mechanism = 'SCRAM-SHA-1' + _channel_binding = 'y,,' + _hash_method = 'sha1' + + +class SCRAM_SHA_1_PLUS(SCRAM_SHA_1): + + _mechanism = 'SCRAM-SHA-1-PLUS' + _channel_binding = 'p=tls-unique,,' + + +class SCRAM_SHA_256(SCRAM): + + _mechanism = 'SCRAM-SHA-256' + _channel_binding = 'y,,' + _hash_method = 'sha256' + + +class SCRAM_SHA_256_PLUS(SCRAM_SHA_256): + + _mechanism = 'SCRAM-SHA-256-PLUS' + _channel_binding = 'p=tls-unique,,' + + +class AuthFail(Exception): + pass ===================================== nbxmpp/auth_nb.py deleted ===================================== @@ -1,658 +0,0 @@ -## auth_nb.py -## based on auth.py, changes backported up to revision 1.41 -## -## Copyright (C) 2003-2005 Alexey "Snake" Nezhdanov -## modified by Dimitur Kirov <dkirov(a)gmail.com> -## -## 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 2, 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. - -""" -Provides plugs for SASL and NON-SASL authentication mechanisms. -Can be used both for client and transport authentication - -See client_nb.py -""" - -import re -import os -import binascii -import base64 -import hmac -import hashlib -import logging - -from .protocol import NS_SASL, NS_SESSION, NS_STREAMS, NS_BIND -from .protocol import NS_STREAM_MGMT -from .protocol import Node, NodeProcessed, isResultNode, Protocol -from .protocol import SASL_ERROR_CONDITIONS -from .plugin import PlugIn -from .const import Realm -from .const import Event - -from . import dispatcher_nb - -log = logging.getLogger('nbxmpp.auth_nb') - -def HH(some): return hashlib.md5(some).hexdigest() -def H(some): return hashlib.md5(some).digest() -def C(some): return b':'.join(some) - -try: - kerberos = __import__('kerberos') - have_kerberos = True -except ImportError: - have_kerberos = False - -GSS_STATE_STEP = 0 -GSS_STATE_WRAP = 1 -SASL_FAILURE_IN_PROGRESS = 'failure-in-process' -SASL_FAILURE = 'failure' -SASL_SUCCESS = 'success' -SASL_UNSUPPORTED = 'not-supported' -SASL_IN_PROCESS = 'in-process' - -# compile the search regex for _challenge_splitter -_challenge_regex = re.compile( - r'(\w+)=' # keyword - r'("[^"]+"|[^,]+)' # value - r',?', # optional comma separator - re.VERBOSE -) - -def _challenge_splitter(data): - """ - Helper function that creates a dict from challenge string. Used - for DIGEST-MD5 authentication. - - Sample challenge string: - - username="example.org",realm="somerealm", - nonce="OA6MG9tEQGm2hh",cnonce="OA6MHXh6VqTrRk", - nc=00000001,qop="auth,auth-int,auth-conf",charset=utf-8 - - Expected result for challan: - - dict['qop'] = ('auth','auth-int','auth-conf') - - dict['realm'] = 'somerealm' - """ - dict_ = {} - for match in _challenge_regex.finditer(data): - k = match.group(1) - v = match.group(2) - if v.startswith('"'): - v = v[1:-1] # Remove quote - if v.find(',') >= 0: - v = v.split(',') # Split using comma - dict_[k] = v - return dict_ - -def _scram_parse(chatter): - """Helper function. Used for SCRAM-SHA-1, SCRAM-SHA-1-PLUS authentication""" - return dict(s.split('=', 1) for s in chatter.split(',')) - -SASL_AUTHENTICATION_MECHANISMS = \ - set(['ANONYMOUS', 'EXTERNAL', 'GSSAPI', 'SCRAM-SHA-1-PLUS', 'SCRAM-SHA-1', - 'PLAIN', 'X-MESSENGER-OAUTH2']) - -class SASL(PlugIn): - """ - Implements SASL authentication. Can be plugged into NonBlockingClient - to start authentication - """ - - def __init__(self, username, password, on_sasl, channel_binding, - auth_mechs): - """ - :param username: XMPP username - :param password: XMPP password - :param on_sasl: Callback, will be called after each SASL auth-step. - :param channel_binding: TLS channel binding data, None if the - binding data is not available - :param auth_mechs: Set of valid authentication mechanisms. - Possible entries are: - 'ANONYMOUS', 'EXTERNAL', 'GSSAPI', 'SCRAM-SHA-1-PLUS', - 'SCRAM-SHA-1', 'DIGEST-MD5', 'PLAIN', 'X-MESSENGER-OAUTH2' - """ - PlugIn.__init__(self) - self.username = username - self.password = password - self.on_sasl = on_sasl - self.channel_binding = channel_binding - self.enabled_auth_mechs = auth_mechs - self.realm = None - - def plugin(self, owner): - if 'version' not in self._owner.Dispatcher.Stream._document_attrs: - self.startsasl = SASL_UNSUPPORTED - elif self._owner.Dispatcher.Stream.features: - try: - self.FeaturesHandler(self._owner.Dispatcher, - self._owner.Dispatcher.Stream.features) - except NodeProcessed: - pass - else: - self.startsasl = None - - def plugout(self): - """ - Remove SASL handlers from owner's dispatcher. Used internally - """ - if 'features' in self._owner.__dict__: - self._owner.UnregisterHandler('features', self.FeaturesHandler, - xmlns=NS_STREAMS) - if 'challenge' in self._owner.__dict__: - self._owner.UnregisterHandler('challenge', self.SASLHandler, - xmlns=NS_SASL) - if 'failure' in self._owner.__dict__: - self._owner.UnregisterHandler('failure', self.SASLHandler, - xmlns=NS_SASL) - if 'success' in self._owner.__dict__: - self._owner.UnregisterHandler('success', self.SASLHandler, - xmlns=NS_SASL) - - def auth(self): - """ - Start authentication. Result can be obtained via "SASL.startsasl" - attribute and will be either SASL_SUCCESS or SASL_FAILURE - - Note that successful auth will take at least two Dispatcher.Process() - calls. - """ - if self.startsasl: - pass - elif self._owner.Dispatcher.Stream.features: - try: - self.FeaturesHandler(self._owner.Dispatcher, - self._owner.Dispatcher.Stream.features) - except NodeProcessed: - pass - else: - self._owner.RegisterHandler('features', - self.FeaturesHandler, xmlns=NS_STREAMS) - - def FeaturesHandler(self, conn, feats): - """ - Used to determine if server supports SASL auth. Used internally - """ - if not feats.getTag('mechanisms', namespace=NS_SASL): - self.startsasl='not-supported' - log.info('SASL not supported by server') - return - - self.mecs = set( - mec.getData() - for mec - in feats.getTag('mechanisms', namespace=NS_SASL).getTags('mechanism') - ) & self.enabled_auth_mechs - - # Password based authentication mechanism ordered by strength. - # If the server supports a mechanism disable all weaker mechanisms. - password_auth_mechs_strength = ['SCRAM-SHA-1-PLUS', 'SCRAM-SHA-1', - 'DIGEST-MD5', 'PLAIN', 'X-MESSENGER-OAUTH2'] - if self.channel_binding is None: - password_auth_mechs_strength.remove('SCRAM-SHA-1-PLUS') - for i in range(0, len(password_auth_mechs_strength)): - if password_auth_mechs_strength[i] in self.mecs: - for m in password_auth_mechs_strength[i + 1:]: - self.mecs.discard(m) - break - - self._owner.RegisterHandler('challenge', self.SASLHandler, - xmlns=NS_SASL) - self._owner.RegisterHandler('failure', self.SASLHandler, xmlns=NS_SASL) - self._owner.RegisterHandler('success', self.SASLHandler, xmlns=NS_SASL) - self.MechanismHandler() - - def MechanismHandler(self): - if 'ANONYMOUS' in self.mecs and self.username is None: - self.mecs.remove('ANONYMOUS') - node = Node('auth', attrs={'xmlns': NS_SASL, - 'mechanism': 'ANONYMOUS'}) - self.mechanism = 'ANONYMOUS' - self.startsasl = SASL_IN_PROCESS - self._owner.send(str(node)) - raise NodeProcessed - if "EXTERNAL" in self.mecs: - self.mecs.remove('EXTERNAL') - sasl_data = '%s@%s' % (self.username, self._owner.Server) - sasl_data = base64.b64encode(sasl_data.encode('utf-8')).decode( - 'utf-8').replace('\n', '') - node = Node('auth', attrs={'xmlns': NS_SASL, - 'mechanism': 'EXTERNAL'}, payload=[sasl_data]) - self.mechanism = 'EXTERNAL' - self.startsasl = SASL_IN_PROCESS - self._owner.send(str(node)) - raise NodeProcessed - if 'GSSAPI' in self.mecs and have_kerberos: - self.mecs.remove('GSSAPI') - try: - self.gss_vc = kerberos.authGSSClientInit('xmpp@' + \ - self._owner.xmpp_hostname)[1] - kerberos.authGSSClientStep(self.gss_vc, '') - response = kerberos.authGSSClientResponse(self.gss_vc) - node=Node('auth', attrs={'xmlns': NS_SASL, - 'mechanism': 'GSSAPI'}, payload=(response or '')) - self.mechanism = 'GSSAPI' - self.gss_step = GSS_STATE_STEP - self.startsasl = SASL_IN_PROCESS - self._owner.send(str(node)) - raise NodeProcessed - except kerberos.GSSError as e: - log.info('GSSAPI authentication failed: %s' % str(e)) - if 'SCRAM-SHA-1-PLUS' in self.mecs and self.channel_binding is not None: - self.mecs.remove('SCRAM-SHA-1-PLUS') - self.mechanism = 'SCRAM-SHA-1-PLUS' - self._owner._caller.get_password(self.set_password, self.mechanism) - self.scram_step = 0 - self.startsasl = SASL_IN_PROCESS - raise NodeProcessed - if 'SCRAM-SHA-1' in self.mecs: - self.mecs.remove('SCRAM-SHA-1') - self.mechanism = 'SCRAM-SHA-1' - self._owner._caller.get_password(self.set_password, self.mechanism) - self.scram_step = 0 - self.startsasl = SASL_IN_PROCESS - raise NodeProcessed - if 'DIGEST-MD5' in self.mecs: - self.mecs.remove('DIGEST-MD5') - node = Node('auth', attrs={'xmlns': NS_SASL, - 'mechanism': 'DIGEST-MD5'}) - self.mechanism = 'DIGEST-MD5' - self.startsasl = SASL_IN_PROCESS - self._owner.send(str(node)) - raise NodeProcessed - if 'PLAIN' in self.mecs: - self.mecs.remove('PLAIN') - self.mechanism = 'PLAIN' - self._owner._caller.get_password(self.set_password, self.mechanism) - self.startsasl = SASL_IN_PROCESS - raise NodeProcessed - if 'X-MESSENGER-OAUTH2' in self.mecs: - self.mecs.remove('X-MESSENGER-OAUTH2') - self.mechanism = 'X-MESSENGER-OAUTH2' - self._owner._caller.get_password(self.set_password, self.mechanism) - self.startsasl = SASL_IN_PROCESS - raise NodeProcessed - self.startsasl = SASL_FAILURE - log.info('I can only use ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS,' - ' SCRAM-SHA-1, DIGEST-MD5, PLAIN and X-MESSENGER-OAUTH2' - ' mechanisms.') - if self.on_sasl: - self.on_sasl() - return - - def SASLHandler(self, conn, challenge): - """ - Perform next SASL auth step. Used internally - """ - if challenge.getNamespace() != NS_SASL: - return - - def scram_base64(s): - try: - s = s.encode('utf-8') - except: - pass - return ''.join(base64.b64encode(s).decode('utf-8').\ - split('\n')) - - incoming_data = challenge.getData() - data=base64.b64decode(incoming_data.encode('utf-8')) - - if self.mechanism != 'GSSAPI': - data=data.decode('utf-8') - - ### Handle Auth result - def on_auth_fail(reason, text=None): - log.info('Failed SASL authentification: %s %s', reason, text) - self._owner.send(str(Node('abort', attrs={'xmlns': NS_SASL}))) - if len(self.mecs) > 0: - # There are other mechanisms to test, but wait for <failure> - # answer from server - self.startsasl = SASL_FAILURE_IN_PROGRESS - raise NodeProcessed - if self.on_sasl: - self.on_sasl((reason, text)) - raise NodeProcessed - - if challenge.getName() == 'failure': - if self.startsasl == SASL_FAILURE_IN_PROGRESS: - self.MechanismHandler() - raise NodeProcessed - self.startsasl = SASL_FAILURE - - text = challenge.getTagData('text') - reason = 'not-authorized' - childs = challenge.getChildren() - for child in childs: - name = child.getName() - if name == 'text': - continue - if name in SASL_ERROR_CONDITIONS: - reason = name - break - on_auth_fail(reason, text) - - elif challenge.getName() == 'success': - if self.mechanism in ('SCRAM-SHA-1', 'SCRAM-SHA-1-PLUS'): - # check data-with-success - data = _scram_parse(data) - if data['v'] != scram_base64(self.scram_ServerSignature): - on_auth_fail('ServerSignature is wrong') - - self.startsasl = SASL_SUCCESS - log.info('Successfully authenticated with remote server.') - handlers = self._owner.Dispatcher.dumpHandlers() - - # Bosh specific dispatcher replugging - # save old features. They will be used in case we won't get response - # on stream restart after SASL auth (happens with XMPP over BOSH - # with Openfire) - old_features = self._owner.Dispatcher.Stream.features - self._owner.Dispatcher.PlugOut() - dispatcher_nb.Dispatcher.get_instance().PlugIn(self._owner, - after_SASL=True, old_features=old_features) - self._owner.Dispatcher.restoreHandlers(handlers) - self._owner.User = self.username - - if self.on_sasl: - self.on_sasl() - raise NodeProcessed - - ### Perform auth step - if self.mechanism != 'GSSAPI': - log.info('Got challenge:' + data) - else: - log.info('Got challenge') - - if self.mechanism == 'GSSAPI': - if self.gss_step == GSS_STATE_STEP: - rc = kerberos.authGSSClientStep(self.gss_vc, incoming_data) - if rc != kerberos.AUTH_GSS_CONTINUE: - self.gss_step = GSS_STATE_WRAP - elif self.gss_step == GSS_STATE_WRAP: - rc = kerberos.authGSSClientUnwrap(self.gss_vc, incoming_data) - response = kerberos.authGSSClientResponse(self.gss_vc) - rc = kerberos.authGSSClientWrap(self.gss_vc, response, - kerberos.authGSSClientUserName(self.gss_vc)) - response = kerberos.authGSSClientResponse(self.gss_vc) - if not response: - response = '' - self._owner.send(Node('response', attrs={'xmlns': NS_SASL}, - payload=response).__str__()) - raise NodeProcessed - if self.mechanism in ('SCRAM-SHA-1', 'SCRAM-SHA-1-PLUS'): - hashfn = hashlib.sha1 - - def HMAC(k, s): - return hmac.new(key=k, msg=s, digestmod=hashfn).digest() - - def XOR(x, y): - r = [px ^ py for px, py in zip(x, y)] - return bytes(r) - - def Hi(s, salt, iters): - ii = 1 - try: - s = s.encode('utf-8') - except: - pass - ui_1 = HMAC(s, salt + b'\0\0\0\01') - ui = ui_1 - for i in range(iters - 1): - ii += 1 - ui_1 = HMAC(s, ui_1) - ui = XOR(ui, ui_1) - return ui - - def scram_H(s): - return hashfn(s).digest() - - if self.scram_step == 0: - self.scram_step = 1 - self.scram_soup += ',' + data + ',' - data = _scram_parse(data) - # Check server nonce here. - # The first part of server nonce muss be the nonce send by client. - if (data['r'][:len(self.client_nonce)] != self.client_nonce): - on_auth_fail('Server nonce is incorrect') - raise NodeProcessed - if self.mechanism == 'SCRAM-SHA-1': - r = 'c=' + scram_base64(self.scram_gs2) - else: - # Channel binding data goes in here too. - r = 'c=' + scram_base64(self.scram_gs2.encode('utf-8') - + self.channel_binding) - r += ',r=' + data['r'] - self.scram_soup += r - self.scram_soup = self.scram_soup.encode('utf-8') - salt = base64.b64decode(data['s'].encode('utf-8')) - iter = int(data['i']) - SaltedPassword = Hi(self.password, salt, iter) - # TODO: Could cache this, along with salt+iter. - ClientKey = HMAC(SaltedPassword, b'Client Key') - StoredKey = scram_H(ClientKey) - ClientSignature = HMAC(StoredKey, self.scram_soup) - ClientProof = XOR(ClientKey, ClientSignature) - r += ',p=' + scram_base64(ClientProof) - ServerKey = HMAC(SaltedPassword, b'Server Key') - self.scram_ServerSignature = HMAC(ServerKey, self.scram_soup) - sasl_data = scram_base64(r) - node = Node('response', attrs={'xmlns': NS_SASL}, - payload=[sasl_data]) - self._owner.send(str(node)) - raise NodeProcessed - - if self.scram_step == 1: - data = _scram_parse(data) - if base64.b64decode(data['v'].encode('utf-8')).decode('utf-8') \ - != self.scram_ServerSignature: - # TODO: Not clear what to do here - need to abort. - raise Exception - node = Node('response', attrs={'xmlns': NS_SASL}); - self._owner.send(str(node)) - raise NodeProcessed - - # DIGEST-MD5 - # magic foo... - chal = _challenge_splitter(data) - if not self.realm and 'realm' in chal: - self.realm = chal['realm'] - if 'qop' in chal and ((chal['qop'] =='auth') or \ - (isinstance(chal['qop'], list) and 'auth' in chal['qop'])): - self.resp = {'username': self.username, - 'nonce': chal['nonce'], - 'cnonce': '%x' % int(binascii.hexlify(os.urandom(24)), 16), - 'nc': ('00000001'), # ToDo: Is this a tupel or only a string? - 'qop': 'auth', - 'digest-uri': 'xmpp/' + self._owner.Server, - 'charset': 'utf-8' - } - if self.realm: - self.resp['realm'] = self.realm - else: - self.resp['realm'] = self._owner.Server - # Password is now required - self._owner._caller.get_password(self.set_password, self.mechanism) - elif 'rspauth' in chal: - # Check rspauth value - if chal['rspauth'] != self.digest_rspauth: - on_auth_fail('rspauth is wrong') - self._owner.send(str(Node('response', attrs={'xmlns':NS_SASL}))) - else: - self.startsasl = SASL_FAILURE - log.info('Failed SASL authentification: unknown challenge') - if self.on_sasl: - self.on_sasl() - raise NodeProcessed - - @staticmethod - def _convert_to_iso88591(string): - try: - string = string.encode('iso-8859-1') - except UnicodeEncodeError: - pass - return string - - def set_password(self, password): - self.password = '' if password is None else password - if self.mechanism in ('SCRAM-SHA-1', 'SCRAM-SHA-1-PLUS'): - self.client_nonce = '%x' % int(binascii.hexlify(os.urandom(24)), 16) - self.scram_soup = 'n=' + self.username + ',r=' + self.client_nonce - if self.mechanism == 'SCRAM-SHA-1': - if self.channel_binding is None: - # Client doesn't support Channel Binding - self.scram_gs2 = 'n,,' # No CB yet. - else: - # Client supports CB, but server doesn't support CB - self.scram_gs2 = 'y,,' - else: - self.scram_gs2 = 'p=tls-unique,,' - sasl_data = base64.b64encode((self.scram_gs2 + self.scram_soup).\ - encode('utf-8')).decode('utf-8').replace('\n', '') - node = Node('auth', attrs={'xmlns': NS_SASL, - 'mechanism': self.mechanism}, payload=[sasl_data]) - elif self.mechanism == 'DIGEST-MD5': - hash_username = self._convert_to_iso88591(self.resp['username']) - hash_realm = self._convert_to_iso88591(self.resp['realm']) - hash_password = self._convert_to_iso88591(self.password) - A1 = C([H(C([hash_username, hash_realm, hash_password])), - self.resp['nonce'].encode('utf-8'), self.resp['cnonce'].encode( - 'utf-8')]) - A2 = C([b'AUTHENTICATE', self.resp['digest-uri'].encode('utf-8')]) - response = HH(C([HH(A1).encode('utf-8'), self.resp['nonce'].encode( - 'utf-8'), self.resp['nc'].encode('utf-8'), self.resp['cnonce'].\ - encode('utf-8'), self.resp['qop'].encode('utf-8'), HH(A2).\ - encode('utf-8')])) - A2 = C([b'', self.resp['digest-uri'].encode('utf-8')]) - self.digest_rspauth = HH(C([HH(A1).encode('utf-8'), self.resp[ - 'nonce'].encode('utf-8'), self.resp['nc'].encode('utf-8'), - self.resp['cnonce'].encode('utf-8'), self.resp['qop'].encode( - 'utf-8'), HH(A2).encode('utf-8')])) - self.resp['response'] = response - sasl_data = '' - for key in ('charset', 'username', 'realm', 'nonce', 'nc', 'cnonce', - 'digest-uri', 'response', 'qop'): - if key in ('nc', 'qop', 'response', 'charset'): - sasl_data += "%s=%s," % (key, self.resp[key]) - else: - sasl_data += '%s="%s",' % (key, self.resp[key]) - sasl_data = base64.b64encode(sasl_data[:-1].encode('utf-8')).\ - decode('utf-8').replace('\r', '').replace('\n', '') - node = Node('response', attrs={'xmlns': NS_SASL}, - payload=[sasl_data]) - elif self.mechanism == 'PLAIN': - sasl_data = '\x00%s\x00%s' % (self.username, self.password) - sasl_data = base64.b64encode(sasl_data.encode('utf-8')).decode( - 'utf-8').replace('\n', '') - node = Node('auth', attrs={'xmlns': NS_SASL, 'mechanism': 'PLAIN'}, - payload=[sasl_data]) - elif self.mechanism == 'X-MESSENGER-OAUTH2': - node = Node('auth', attrs={'xmlns': NS_SASL, - 'mechanism': 'X-MESSENGER-OAUTH2'}) - node.addData(password) - self._owner.send(str(node)) - - -class NonBlockingBind(PlugIn): - """ - Bind some JID to the current connection to allow router know of our - location. Must be plugged after successful SASL auth - """ - - def __init__(self): - PlugIn.__init__(self) - self._session_required = False - - def plugin(self, _owner): - self._owner.RegisterHandler( - 'features', self.FeaturesHandler, xmlns=NS_STREAMS) - # Execute the Handler manually, maybe we registered the features - # handler to late. This can happen when the client does not call - # bind() immediately - self.FeaturesHandler(None, self._owner.Dispatcher.Stream.features) - - def FeaturesHandler(self, con, feats): - """ - Determine if server supports resource binding and set some internal - attributes accordingly. - """ - if not feats or not feats.getTag('bind', namespace=NS_BIND): - return - - session = feats.getTag('session', namespace=NS_SESSION) - if session is not None: - if session.getTag('optional') is None: - self._session_required = True - - self.NonBlockingBind() - - def plugout(self): - """ - Remove Bind handler from owner's dispatcher. Used internally - """ - self._owner.UnregisterHandler( - 'features', self.FeaturesHandler, xmlns=NS_STREAMS) - - def NonBlockingBind(self): - """ - Perform binding. Use provided resource name or random (if not provided). - """ - - resource = [] - if self._owner._Resource: - resource = [Node('resource', payload=[self._owner._Resource])] - - self._owner.Dispatcher.SendAndWaitForResponse( - Protocol('iq', typ='set', payload=[Node('bind', - attrs={'xmlns': NS_BIND}, payload=resource)]), - func=self._on_bound) - - def _on_bound(self, resp): - if isResultNode(resp): - bind = resp.getTag('bind') - if bind is not None: - jid = bind.getTagData('jid') - log.info('Successfully bound %s', jid) - self._owner.set_bound_jid(jid) - - if not self._session_required: - # Server don't want us to initialize a session - log.info('No session required') - self._on_bind_successful() - else: - node = Node('session', attrs={'xmlns':NS_SESSION}) - iq = Protocol('iq', typ='set', payload=[node]) - self._owner.SendAndWaitForResponse( - iq, func=self._on_session) - return - if resp: - log.error('Binding failed: %s.', resp.getTag('error')) - else: - log.error('Binding failed: timeout expired') - self._owner.Connection.start_disconnect() - self._owner.Dispatcher.Event(Realm.CONNECTING, Event.BIND_FAILED) - self.PlugOut() - - def _on_session(self, resp): - if isResultNode(resp): - log.info('Successfully started session') - self._on_bind_successful() - else: - log.error('Session open failed') - self._owner.Connection.start_disconnect() - self._owner.Dispatcher.Event(Realm.CONNECTING, Event.SESSION_FAILED) - self.PlugOut() - - def _on_bind_successful(self): - feats = self._owner.Dispatcher.Stream.features - if feats.getTag('sm', namespace=NS_STREAM_MGMT): - self._owner.Smacks.send_enable() - self._owner.Dispatcher.Event(Realm.CONNECTING, Event.CONNECTION_ACTIVE) - self.PlugOut() ===================================== nbxmpp/bind.py ===================================== @@ -0,0 +1,126 @@ +# Copyright (C) 2003-2005 Alexey "Snake" Nezhdanov +# Copyright (C) Dimitur Kirov <dkirov AT gmail.com> +# Copyright (C) 2018 Philipp Hörist <philipp AT hoerist.com> +# +# This file is part of nbxmpp. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; If not, see <http://www.gnu.org/licenses/>. + +import logging + +from nbxmpp.plugin import PlugIn +from nbxmpp.protocol import NS_BIND +from nbxmpp.protocol import NS_SESSION +from nbxmpp.protocol import NS_STREAMS +from nbxmpp.protocol import NS_STREAM_MGMT +from nbxmpp.protocol import Node +from nbxmpp.protocol import isResultNode +from nbxmpp.protocol import Protocol +from nbxmpp.const import Realm +from nbxmpp.const import Event + +log = logging.getLogger('nbxmpp.bind') + + +class NonBlockingBind(PlugIn): + """ + Bind some JID to the current connection to allow router know of our + location. Must be plugged after successful SASL auth + """ + + def __init__(self): + PlugIn.__init__(self) + self._session_required = False + + def plugin(self, _owner): + self._owner.RegisterHandler( + 'features', self._on_features, xmlns=NS_STREAMS) + + def _on_features(self, _con, feats): + """ + Determine if server supports resource binding and set some internal + attributes accordingly. + """ + if not feats or not feats.getTag('bind', namespace=NS_BIND): + return + + session = feats.getTag('session', namespace=NS_SESSION) + if session is not None: + if session.getTag('optional') is None: + self._session_required = True + + self._bind() + + def plugout(self): + """ + Remove Bind handler from owner's dispatcher. Used internally + """ + self._owner.UnregisterHandler( + 'features', self._on_features, xmlns=NS_STREAMS) + + def _bind(self): + """ + Perform binding. Use provided resource name or random (if not provided). + """ + resource = [] + if self._owner._Resource: + resource = [Node('resource', payload=[self._owner._Resource])] + + payload = Node('bind', attrs={'xmlns': NS_BIND}, payload=resource) + node = Protocol('iq', typ='set', payload=[payload]) + + self._owner.Dispatcher.SendAndWaitForResponse(node, func=self._on_bind) + + def _on_bind(self, stanza): + if isResultNode(stanza): + bind = stanza.getTag('bind') + if bind is not None: + jid = bind.getTagData('jid') + log.info('Successfully bound %s', jid) + self._owner.set_bound_jid(jid) + + if not self._session_required: + # Server don't want us to initialize a session + log.info('No session required') + self._on_bind_successful() + else: + node = Node('session', attrs={'xmlns':NS_SESSION}) + iq = Protocol('iq', typ='set', payload=[node]) + self._owner.SendAndWaitForResponse( + iq, func=self._on_session) + return + if stanza: + log.error('Binding failed: %s.', stanza.getTag('error')) + else: + log.error('Binding failed: timeout expired') + self._owner.Connection.start_disconnect() + self._owner.Dispatcher.Event(Realm.CONNECTING, Event.BIND_FAILED) + self.PlugOut() + + def _on_session(self, stanza): + if isResultNode(stanza): + log.info('Successfully started session') + self._on_bind_successful() + else: + log.error('Session open failed') + self._owner.Connection.start_disconnect() + self._owner.Dispatcher.Event(Realm.CONNECTING, Event.SESSION_FAILED) + self.PlugOut() + + def _on_bind_successful(self): + feats = self._owner.Dispatcher.Stream.features + if feats.getTag('sm', namespace=NS_STREAM_MGMT): + self._owner.Smacks.send_enable() + self._owner.Dispatcher.Event(Realm.CONNECTING, Event.CONNECTION_ACTIVE) + self.PlugOut() \ No newline at end of file ===================================== nbxmpp/client_nb.py ===================================== @@ -21,11 +21,11 @@ Client class establishes connection to XMPP Server and handles authentication import socket import logging -from . import transports_nb, dispatcher_nb, auth_nb, roster_nb, protocol, bosh +from . import transports_nb, dispatcher_nb, roster_nb, protocol, bosh from .protocol import NS_TLS from .protocol import JID -from .auth_nb import SASL_AUTHENTICATION_MECHANISMS -from .auth_nb import NonBlockingBind +from .auth import SASL +from .bind import NonBlockingBind from .smacks import Smacks from .const import Realm from .const import Event @@ -135,13 +135,7 @@ class NonBlockingClient: if 'NonBlockingRoster' in self.__dict__: self.NonBlockingRoster.PlugOut() if 'SASL' in self.__dict__: - if 'startsasl' in self.SASL.__dict__ and \ - self.SASL.startsasl == 'failure-in-process': - sasl_failed = True - self.SASL.startsasl = 'failure' - self._on_start_sasl() - else: - self.SASL.PlugOut() + self.SASL.PlugOut() if 'NonBlockingTCP' in self.__dict__: self.NonBlockingTCP.PlugOut() if 'NonBlockingHTTP' in self.__dict__: @@ -521,77 +515,52 @@ class NonBlockingClient: ### follows code for authentication, resource bind, session and roster download ############################################################################### - def auth(self, user, password, resource='', sasl=True, auth_mechs=None): + def auth(self, user, get_password=None, resource='', auth_mechs=None): """ Authenticate connnection and bind resource. If resource is not provided random one or library name used :param user: XMPP username - :param password: XMPP password + :param get_password: Callback that must return the password for the + chosen mechanism :param resource: resource that shall be used for auth/connecting - :param sasl: Boolean indicating if SASL shall be used. (default: True) :param auth_mechs: Set of valid authentification mechanisms. If None all - authentification mechanisms will be allowed. Possible entries are: - 'ANONYMOUS', 'EXTERNAL', 'GSSAPI', 'SCRAM-SHA-1-PLUS', - 'SCRAM-SHA-1', 'DIGEST-MD5', 'PLAIN', 'X-MESSENGER-OAUTH2', - 'XEP-0078' - """ - self._User, self._Password = user, password - self._Resource, self._sasl = resource, sasl - self._channel_binding = None - if self.connected in ('ssl', 'tls'): - try: - if self.protocol_type != 'BOSH': - self._channel_binding = self.Connection.NonBlockingTLS.get_channel_binding() - # TLS handshake is finished so channel binding data muss exist - assert (self._channel_binding is not None) - except NotImplementedError: - pass - if auth_mechs is None: - self._auth_mechs = SASL_AUTHENTICATION_MECHANISMS - else: - self._auth_mechs = auth_mechs - - self._on_doc_attrs() - - def _on_doc_attrs(self): - """ - Plug authentication objects and start auth + authentification mechanisms will be allowed. + See the auth module for possible values """ - if self._sasl: - auth_nb.SASL.get_instance(self._User, self._Password, - self._on_start_sasl, self._channel_binding, - self._auth_mechs).PlugIn(self) - if not hasattr(self, 'SASL'): + if 'SASL' in self.__dict__: + log.error('Auth not possible while another auth is in progress') return - self.SASL.auth() - return True + self._User = user + self._Resource = resource - def _on_start_sasl(self, data=None): - """ - Callback used by SASL, called on each auth step - """ - if self.SASL.startsasl == 'in-process': - return self.onreceive(None) + SASL.get_instance(self._User, + auth_mechs, + get_password, + self._on_sasl_finished).PlugIn(self) + + def _on_sasl_finished(self, success, reason, text): + if success: + self.SASL.PlugOut() + if self.protocol_type == 'BOSH': + self.Dispatcher.after_SASL = True + self.Dispatcher.StreamInit() - if self.SASL.startsasl == 'failure': - # wrong user/pass, stop auth - if 'SASL' in self.__dict__: - self.SASL.PlugOut() - self.connected = None # FIXME: is this intended? We use ''elsewhere - self.Dispatcher.Event(Realm.CONNECTING, Event.AUTH_FAILED, data) - - elif self.SASL.startsasl == 'success': self.connected += '+sasl' - self.Dispatcher.Event(Realm.CONNECTING, Event.AUTH_SUCCESSFUL) + self.Dispatcher.Event(Realm.CONNECTING, + Event.AUTH_SUCCESSFUL) self._owner.Smacks.register_handlers() + else: + self.Dispatcher.Event(Realm.CONNECTING, + Event.AUTH_FAILED, + (reason, text)) def bind(self): # Check if we can resume - if self._owner.Smacks.resume_supported: - self._owner.Smacks.resume_request() + if self.Smacks.resume_supported: + self.Smacks.resume_request() else: # If we cant resume we bind and enable sm afterwards NonBlockingBind.get_instance().PlugIn(self) ===================================== nbxmpp/const.py ===================================== @@ -16,6 +16,7 @@ # along with this program; If not, see <http://www.gnu.org/licenses/>. from enum import Enum +from enum import IntEnum from enum import unique @unique @@ -38,3 +39,7 @@ class Event(Enum): def __str__(self): return self.value + +class GSSAPIState(IntEnum): + STEP = 0 + WRAP = 1 ===================================== nbxmpp/protocol.py ===================================== @@ -268,6 +268,17 @@ NS_BOOKMARK_CONVERSION = 'urn:xmpp:bookmarks-conversion:0' #for (k, v) in loc.items(): #print('%s = \'%s\'' % (k, v)) +SASL_AUTH_MECHS = [ + 'SCRAM-SHA-256-PLUS', + 'SCRAM-SHA-256', + 'SCRAM-SHA-1-PLUS', + 'SCRAM-SHA-1', + 'PLAIN', + 'GSSAPI', + 'EXTERNAL', + 'ANONYMOUS', +] + SASL_ERROR_CONDITIONS = [ 'aborted', 'account-disabled', ===================================== nbxmpp/util.py ===================================== @@ -0,0 +1,34 @@ +# Copyright (C) 2018 Philipp Hörist <philipp AT hoerist.com> +# +# This file is part of nbxmpp. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; If not, see <http://www.gnu.org/licenses/>. + +import base64 + +def b64decode(data, return_type=str): + if isinstance(data, str): + data = data.encode() + result = base64.b64decode(data) + if return_type == bytes: + return result + return result.decode() + +def b64encode(data, return_type=str): + if isinstance(data, str): + data = data.encode() + result = base64.b64encode(data) + if return_type == bytes: + return result + return result.decode() ===================================== test/unit/test_sasl_scram.py ===================================== @@ -0,0 +1,28 @@ +import unittest +from unittest.mock import Mock + +from nbxmpp.auth import SCRAM_SHA_1 + + +class SCRAM(unittest.TestCase): + def setUp(self): + self.con = Mock() + self._method = SCRAM_SHA_1(self.con, None) + self._method._client_nonce = '4691d8f313ddb02d2eed511d5617a5c6f72efa671613c598' + + self._username = 'philw' + self._password = 'testtest123' + + self.auth = '<auth xmlns="urn:ietf:params:xml:ns:xmpp-sasl" mechanism="SCRAM-SHA-1">eSwsbj1waGlsdyxyPTQ2OTFkOGYzMTNkZGIwMmQyZWVkNTExZDU2MTdhNWM2ZjcyZWZhNjcxNjEzYzU5OA==</auth>' + self.challenge = 'cj00NjkxZDhmMzEzZGRiMDJkMmVlZDUxMWQ1NjE3YTVjNmY3MmVmYTY3MTYxM2M1OThDaEJpZGEyb0NJeks5S25QdGsxSUZnPT0scz1iZFkrbkRjdUhuVGFtNzgyaG9neHNnPT0saT00MDk2' + self.response = '<response xmlns="urn:ietf:params:xml:ns:xmpp-sasl">Yz1lU3dzLHI9NDY5MWQ4ZjMxM2RkYjAyZDJlZWQ1MTFkNTYxN2E1YzZmNzJlZmE2NzE2MTNjNTk4Q2hCaWRhMm9DSXpLOUtuUHRrMUlGZz09LHA9NUd5a09hWCtSWlllR3E2L2U3YTE2UDVBeFVrPQ==</response>' + self.success = 'dj1qMGtuNlVvT1FjTmJ0MGFlYnEwV1QzYWNkSW89' + + def test_auth(self): + self._method.initiate(self._username, self._password) + self.assertEqual(self.auth, str(self.con.send.call_args[0][0])) + + self._method.response(self.challenge) + self.assertEqual(self.response, str(self.con.send.call_args[0][0])) + + self._method.success(self.success) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/f2a203387891455c052d44f8b1… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/f2a203387891455c052d44f8b1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Find correct contact on private message
by Philipp Hörist 08 Dec '18

08 Dec '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 293156f6 by Philipp Hörist at 2018-12-08T23:01:18Z Find correct contact on private message get_contact() returns also a contact if only the bare jid matches, which for private messages is the groupchat contact object. - - - - - b8863e82 by Philipp Hörist at 2018-12-08T23:29:20Z MUC: Identify subject change correctly Fixes #9491 - - - - - 5 changed files: - gajim/common/connection_handlers_events.py - gajim/common/modules/message.py - gajim/groupchat_control.py - gajim/roster_window.py - gajim/session.py Changes: ===================================== gajim/common/connection_handlers_events.py ===================================== @@ -429,15 +429,6 @@ class GcMessageReceivedEvent(nec.NetworkIncomingEvent): # message from server self.nick = '' - self.subject = self.stanza.getSubject() - - if self.subject is not None: - app.nec.push_incoming_event( - nec.NetworkEvent('gc-subject-received', - nickname=self.msg_obj.resource, - **vars(self.msg_obj))) - return - conditions = self.stanza.getStatusConditions() if conditions: self.status_code = [] ===================================== gajim/common/modules/message.py ===================================== @@ -228,7 +228,10 @@ class Message: subject = event.stanza.getSubject() groupchat = event.mtype == 'groupchat' - muc_subject = subject and groupchat + + # XEP-0045: only a message that contains a <subject/> but no <body/> + # element shall be considered a subject change for MUC purposes. + muc_subject = subject and groupchat and not event.msgtxt # Determine timestamps if groupchat: @@ -287,6 +290,11 @@ class Message: event.session, event.fjid, timestamp) return + if muc_subject: + app.nec.push_incoming_event(NetworkEvent('gc-subject-received', + **vars(event))) + return + if groupchat: app.nec.push_incoming_event(GcMessageReceivedEvent( None, ===================================== gajim/groupchat_control.py ===================================== @@ -1406,7 +1406,7 @@ class GroupchatControl(ChatControlBase): self.draw_banner_text() def _nec_gc_subject_received(self, event): - if event.conn.name != self.account: + if event.account != self.account: return if event.jid != self.room_jid: return @@ -1415,7 +1415,7 @@ class GroupchatControl(ChatControlBase): return self.set_subject(event.subject) text = _('%(nick)s has set the subject to %(subject)s') % { - 'nick': event.nickname, 'subject': event.subject} + 'nick': event.resource, 'subject': event.subject} if event.delayed: date = time.strftime('%d-%m-%Y %H:%M:%S', ===================================== gajim/roster_window.py ===================================== @@ -2694,10 +2694,10 @@ class RosterWindow: def _nec_gc_subject_received(self, obj): contact = app.contacts.get_contact_with_highest_priority( - obj.conn.name, obj.jid) + obj.account, obj.jid) if contact: contact.status = obj.subject - self.draw_contact(obj.jid, obj.conn.name) + self.draw_contact(obj.jid, obj.account) def _nec_metacontacts_received(self, obj): self.redraw_metacontacts(obj.conn.name) ===================================== gajim/session.py ===================================== @@ -80,11 +80,13 @@ class ChatControlSession: """ if obj.session != self: return - contact = app.contacts.get_contact(self.conn.name, obj.jid, - obj.resource) - if not contact: - contact = app.contacts.get_gc_contact(self.conn.name, obj.jid, - obj.resource) + + if obj.muc_pm: + contact = app.contacts.get_gc_contact( + self.conn.name, obj.jid, obj.resource) + else: + contact = app.contacts.get_contact( + self.conn.name, obj.jid, obj.resource) if self.resource != obj.resource: self.resource = obj.resource if self.control: View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/d129f5559a88249f350bc6a0665f87610… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/d129f5559a88249f350bc6a0665f87610… 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 December 2018