Commits May 2019

commits@gajim.org

1 participants
15 discussions

[Git][gajim/gajim][master] StartChatDialog: Fix filter error and add dim-label for jid
by Philipp Hörist 22 May '19

22 May '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: c1dd6a04 by Daniel Brötzmann at 2019-05-22T19:48:40Z StartChatDialog: Fix filter error and add dim-label for jid - - - - - 1 changed file: - gajim/gtk/start_chat.py Changes: ===================================== gajim/gtk/start_chat.py ===================================== @@ -242,6 +242,9 @@ class StartChatDialog(Gtk.ApplicationWindow): def _select_new_match(self, entry, direction): selected_row = self.listbox.get_selected_row() + if selected_row is None: + return + index = selected_row.get_index() if direction == 'next': @@ -440,6 +443,7 @@ class ContactRow(Gtk.Grid): self.jid_label.set_xalign(0) self.jid_label.set_width_chars(25) self.jid_label.set_halign(Gtk.Align.START) + self.jid_label.get_style_context().add_class('dim-label') middle_box.add(self.jid_label) self.add(middle_box) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c1dd6a045d1417fd3d9fe581eedf7a2246… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c1dd6a045d1417fd3d9fe581eedf7a2246… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Rework DoubleInputDialog to DestroyMucDialog
by Philipp Hörist 21 May '19

21 May '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: c18cc281 by Daniel Brötzmann at 2019-05-21T20:22:20Z Rework DoubleInputDialog to DestroyMucDialog - - - - - 3 changed files: - gajim/data/gui/dubbleinput_dialog.ui → gajim/data/gui/destroy_muc_dialog.ui - gajim/groupchat_control.py - gajim/gtk/dialogs.py Changes: ===================================== gajim/data/gui/dubbleinput_dialog.ui → gajim/data/gui/destroy_muc_dialog.ui ===================================== @@ -1,32 +1,36 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.12"/> - <object class="GtkDialog" id="dubbleinput_dialog"> + <requires lib="gtk+" version="3.20"/> + <object class="GtkDialog" id="destroy_muc_dialog"> + <property name="width_request">250</property> <property name="can_focus">False</property> - <property name="border_width">6</property> + <property name="border_width">18</property> + <property name="resizable">False</property> + <property name="modal">True</property> <property name="type_hint">dialog</property> - <signal name="destroy" handler="on_dubbleinput_dialog_destroy" swapped="no"/> + <child> + <placeholder/> + </child> <child internal-child="vbox"> - <object class="GtkBox" id="dialog-vbox10"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="spacing">12</property> <child internal-child="action_area"> - <object class="GtkButtonBox" id="dialog-action_area9"> + <object class="GtkButtonBox"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="layout_style">end</property> <child> - <object class="GtkButton" id="cancelbutton"> - <property name="label">gtk-cancel</property> - <property name="use_action_appearance">False</property> + <object class="GtkButton" id="cancel_button"> + <property name="label">_Cancel</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> - <property name="use_stock">True</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> @@ -35,15 +39,17 @@ </packing> </child> <child> - <object class="GtkButton" id="okbutton"> - <property name="label">gtk-ok</property> - <property name="use_action_appearance">False</property> + <object class="GtkButton" id="destroy_button"> + <property name="label">_Destroy</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="has_default">True</property> <property name="receives_default">False</property> - <property name="use_stock">True</property> + <property name="use_underline">True</property> + <style> + <class name="destructive-action"/> + </style> </object> <packing> <property name="expand">False</property> @@ -60,95 +66,129 @@ </packing> </child> <child> - <object class="GtkBox" id="vbox76"> + <object class="GtkGrid"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">6</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> - <object class="GtkBox" id="hbox2960"> + <object class="GtkLabel" id="label_header"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">12</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Destroy this group chat permanently?</property> + <property name="use_markup">True</property> + <property name="wrap">True</property> + <property name="xalign">0</property> + <style> + <class name="large-header"/> + </style> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkExpander" id="reason_expander"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="margin_top">6</property> <child> - <object class="GtkImage" id="image507"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-dialog-question</property> - <property name="icon_size">6</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkEntry" id="reason_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="margin_top">6</property> + <property name="activates_default">True</property> + <property name="placeholder_text" translatable="yes">Reason...</property> + <property name="show_emoji_icon">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="alt_venue_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="margin_top">6</property> + <property name="label" translatable="yes">Where participants should go (optional)</property> + <property name="wrap">True</property> + <property name="xalign">0</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="alt_venue_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="placeholder_text" translatable="yes">Alternate venue...</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">3</property> + </packing> + </child> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> </child> - <child> - <object class="GtkLabel" id="label1"> + <child type="label"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="use_markup">True</property> + <property name="label" translatable="yes">_Reason and alternate venue (optional)</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">reason_entry</property> + <signal name="mnemonic-activate" handler="_on_reason_mnemonic_activate" swapped="no"/> + <style> + <class name="dim-label"/> + </style> </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="left_attach">1</property> + <property name="top_attach">1</property> </packing> </child> <child> - <object class="GtkEntry" id="input_entry1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label2"> + <object class="GtkImage"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="valign">start</property> + <property name="icon_name">user-trash-symbolic</property> + <property name="icon_size">6</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="input_entry2"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">3</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="height">2</property> </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> </object> </child> - <action-widgets> - <action-widget response="-6">cancelbutton</action-widget> - <action-widget response="-5">okbutton</action-widget> - </action-widgets> </object> </interface> ===================================== gajim/groupchat_control.py ===================================== @@ -71,7 +71,7 @@ from gajim.common.connection_handlers_events import GcMessageOutgoingEvent from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import InputTextDialog from gajim.gtk.dialogs import ConfirmationDialogCheck -from gajim.gtk.dialogs import DoubleInputDialog +from gajim.gtk.dialogs import DestroyMucDialog from gajim.gtk.dialogs import InputDialog from gajim.gtk.dialogs import ChangeNickDialog from gajim.gtk.single_message import SingleMessageWindow @@ -643,7 +643,7 @@ class GroupchatControl(ChatControlBase): self.force_non_minimizable = False def _on_destroy_room(self, action, param): - def on_ok(reason, jid): + def _on_confirm(reason, jid): if jid: # Test jid try: @@ -658,12 +658,8 @@ class GroupchatControl(ChatControlBase): con = app.connections[self.account] con.get_module('MUC').destroy(self.room_jid, reason, jid) - # Ask for a reason - DoubleInputDialog(_('Destroying %s') % '\u200E' + \ - self.room_jid, _('You are going to remove this room permanently.' - '\nYou may specify a reason below:'), - _('You may also enter an alternate venue:'), ok_handler=on_ok, - transient_for=self.parent_win.window) + # Ask for a reason (and an alternate venue) + DestroyMucDialog(self.room_jid, destroy_handler=_on_confirm) def _on_configure_room(self, _action, _param): contact = app.contacts.get_gc_contact( ===================================== gajim/gtk/dialogs.py ===================================== @@ -814,72 +814,48 @@ class InputTextDialog(CommonInputDialog): return self.input_buffer.get_text(start_iter, end_iter, True) -class DoubleInputDialog: +class DestroyMucDialog: """ - Class for Double Input dialog + Class for Destroy MUC Dialog """ + def __init__(self, room_jid, destroy_handler=None): + self._ui = get_builder('destroy_muc_dialog.ui') + self._ui.destroy_muc_dialog.set_transient_for( + app.app.get_active_window()) + + self.destroy_handler = destroy_handler + + title = _('Destroy %s') % room_jid + self._ui.destroy_muc_dialog.set_title(title) + label_header = _('Destroy this group chat permanently?') + self._ui.label_header.set_markup(label_header) + label_alt_venue = _('Where participants should go (optional)') + self._ui.alt_venue_label.set_markup(label_alt_venue) + + self._ui.reason_entry.connect('activate', self._on_entry_activate) + self._ui.alt_venue_entry.connect('activate', self._on_entry_activate) + + self._ui.destroy_button.connect( + 'clicked', self._on_destroy_button_clicked) + self._ui.cancel_button.connect( + 'clicked', self._on_cancel_button_clicked) + self._ui.connect_signals(self) + self._ui.destroy_muc_dialog.show_all() - def __init__(self, title, label_str1, label_str2, input_str1=None, - input_str2=None, is_modal=True, ok_handler=None, cancel_handler=None, - transient_for=None): - self.xml = get_builder('dubbleinput_dialog.ui') - self.dialog = self.xml.get_object('dubbleinput_dialog') - label1 = self.xml.get_object('label1') - self.input_entry1 = self.xml.get_object('input_entry1') - label2 = self.xml.get_object('label2') - self.input_entry2 = self.xml.get_object('input_entry2') - self.dialog.set_title(title) - label1.set_markup(label_str1) - label2.set_markup(label_str2) - self.cancel_handler = cancel_handler - if input_str1: - self.input_entry1.set_text(input_str1) - self.input_entry1.select_region(0, -1) # select all - if input_str2: - self.input_entry2.set_text(input_str2) - self.input_entry2.select_region(0, -1) # select all - if transient_for is None: - transient_for = app.app.get_active_window() - self.dialog.set_transient_for(transient_for) + def _on_entry_activate(self, widget, *args): + self._ui.destroy_button.set_active(True) - self.dialog.set_modal(is_modal) + def _on_reason_mnemonic_activate(self, widget, group_cycling=False): + self._ui.reason_expander.set_expanded(True) - self.ok_handler = ok_handler - okbutton = self.xml.get_object('okbutton') - okbutton.connect('clicked', self.on_okbutton_clicked) - cancelbutton = self.xml.get_object('cancelbutton') - cancelbutton.connect('clicked', self.on_cancelbutton_clicked) - self.xml.connect_signals(self) - self.dialog.show_all() + def _on_destroy_button_clicked(self, widget): + user_input_reason = self._ui.reason_entry.get_text() + user_input_alt_venue = self._ui.alt_venue_entry.get_text() + self._ui.destroy_muc_dialog.destroy() + self.destroy_handler(user_input_reason, user_input_alt_venue) - def on_dubbleinput_dialog_destroy(self, widget): - if not self.cancel_handler: - return False - if isinstance(self.cancel_handler, tuple): - self.cancel_handler[0](*self.cancel_handler[1:]) - else: - self.cancel_handler() - - def on_okbutton_clicked(self, widget): - user_input1 = self.input_entry1.get_text() - user_input2 = self.input_entry2.get_text() - self.cancel_handler = None - self.dialog.destroy() - if not self.ok_handler: - return - if isinstance(self.ok_handler, tuple): - self.ok_handler[0](user_input1, user_input2, *self.ok_handler[1:]) - else: - self.ok_handler(user_input1, user_input2) - - def on_cancelbutton_clicked(self, widget): - self.dialog.destroy() - if not self.cancel_handler: - return - if isinstance(self.cancel_handler, tuple): - self.cancel_handler[0](*self.cancel_handler[1:]) - else: - self.cancel_handler() + def _on_cancel_button_clicked(self, widget): + self._ui.destroy_muc_dialog.destroy() class CertificateDialog(Gtk.ApplicationWindow): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c18cc281c5f5b7588771e7f3195496ee5d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c18cc281c5f5b7588771e7f3195496ee5d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Refactor conditions to determine connected state
by Philipp Hörist 20 May '19

20 May '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 519d8644 by Philipp Hörist at 2019-05-20T19:33:42Z Refactor conditions to determine connected state GUI code must not be aware of what integers map to connection states - - - - - 19 changed files: - gajim/chat_control_base.py - gajim/command_system/implementation/standard.py - gajim/common/app.py - gajim/common/connection.py - gajim/common/jingle_session.py - gajim/common/modules/bytestream.py - gajim/common/modules/entity_time.py - gajim/common/modules/presence.py - gajim/common/zeroconf/connection_zeroconf.py - gajim/dialogs.py - gajim/gtk/discovery.py - gajim/gtk/join_groupchat.py - gajim/gtk/profile.py - gajim/gtk/settings.py - gajim/gtk/single_message.py - gajim/gtk/xml_console.py - gajim/gui_interface.py - gajim/remote_control.py - gajim/roster_window.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -739,7 +739,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): is_ctrl_enter = bool(event_state & Gdk.ModifierType.CONTROL_MASK) send_message = is_ctrl_enter == app.config.get('send_on_ctrl_enter') - if send_message and app.connections[self.account].connected < 2: + if send_message and not app.account_is_connected(self.account): # we are not connected app.interface.raise_dialog('not-connected-while-sending') elif send_message: ===================================== gajim/command_system/implementation/standard.py ===================================== @@ -128,7 +128,7 @@ class StandardCommonCommands(CommandContainer): if not app.config.get_per('accounts', connection.name, 'sync_with_global_status'): continue - if connection.connected < 2: + if not connection.is_connected: continue connection.change_status(status, message) @@ -142,7 +142,7 @@ class StandardCommonCommands(CommandContainer): if not app.config.get_per('accounts', connection.name, 'sync_with_global_status'): continue - if connection.connected < 2: + if not connection.is_connected: continue connection.change_status('away', message) @@ -156,7 +156,7 @@ class StandardCommonCommands(CommandContainer): if not app.config.get_per('accounts', connection.name, 'sync_with_global_status'): continue - if connection.connected < 2: + if not connection.is_connected: continue connection.change_status('online', message) ===================================== gajim/common/app.py ===================================== @@ -453,7 +453,7 @@ def account_is_connected(account): if account not in connections: return False # 0 is offline, 1 is connecting - return connections[account].connected > 1 + return connections[account].is_connected def is_invisible(account): return SHOW_LIST[connections[account].connected] == 'invisible' ===================================== gajim/common/connection.py ===================================== @@ -127,6 +127,10 @@ class CommonConnection: self.get_config_values_or_default() + @property + def is_connected(self): + return self.connected > 1 + def _register_new_handlers(self, con): for handler in modules.get_handlers(self): if len(handler) == 5: @@ -176,7 +180,7 @@ class CommonConnection: def _prepare_message(self, obj): - if not self.connection or self.connected < 2: + if not self.connection or not self.is_connected: return 1 if isinstance(obj.jid, list): @@ -511,7 +515,7 @@ class Connection(CommonConnection, ConnectionHandlers): def reconnect(self): # Do not try to reco while we are already trying self.time_to_reconnect = None - if self.connected < 2: # connection failed + if not self.is_connected: # connection failed log.info('Reconnect') self.connected = 1 app.nec.push_incoming_event(OurShowEvent(None, conn=self, @@ -1347,7 +1351,7 @@ class Connection(CommonConnection, ConnectionHandlers): return # If we are already connected, and privacy rules are supported, send # offline presence first as it's required by XEP-0126 - if self.connected > 1 and self.get_module('PrivacyLists').supported: + if self.is_connected and self.get_module('PrivacyLists').supported: self.get_module('Bytestream').remove_all_transfers() self.get_module('Presence').send_presence( typ='unavailable', @@ -1780,7 +1784,7 @@ class Connection(CommonConnection, ConnectionHandlers): # Account may have been disabled return if self.time_to_reconnect: - if self.connected < 2: + if not self.is_connected: self.reconnect() else: self.time_to_reconnect = None ===================================== gajim/common/jingle_session.py ===================================== @@ -766,7 +766,7 @@ class JingleSession: def _session_terminate(self, reason=None): stanza, jingle = self.__make_jingle('session-terminate', reason=reason) self.__broadcast_all(stanza, jingle, None, 'session-terminate-sent') - if self.connection.connection and self.connection.connected >= 2: + if self.connection.connection and self.connection.is_connected: self.connection.connection.send(stanza) # TODO: Move to GUI? reason, text = self.__reason_from_stanza(jingle) @@ -818,7 +818,7 @@ class JingleSession: def __content_remove(self, content, reason=None): assert self.state != JingleStates.ENDED - if self.connection.connection and self.connection.connected > 1: + if self.connection.connection and self.connection.is_connected: stanza, jingle = self.__make_jingle('content-remove', reason=reason) self.__append_content(jingle, content) self.connection.connection.send(stanza) ===================================== gajim/common/modules/bytestream.py ===================================== @@ -135,7 +135,7 @@ class Bytestream(BaseModule): Send iq, confirming that we want to download the file """ # user response to ConfirmationDialog may come after we've disconneted - if not self._con.connection or self._con.connected < 2: + if not app.account_is_connected(self._account): return # file transfer initiated by a jingle session @@ -176,7 +176,7 @@ class Bytestream(BaseModule): invalid stream or 'profile' for invalid profile """ # user response to ConfirmationDialog may come after we've disconnected - if not self._con.connection or self._con.connected < 2: + if not app.account_is_connected(self._account): return if file_props.sid in self._sessions: @@ -188,7 +188,7 @@ class Bytestream(BaseModule): """ Send reply to the initiator of FT that we made a connection """ - if not self._con.connection or self._con.connected < 2: + if not app.account_is_connected(self._account): return if streamhost is None: return None @@ -249,7 +249,7 @@ class Bytestream(BaseModule): """ Send iq for the present streamhosts and proxies """ - if not self._con.connection or self._con.connected < 2: + if not app.account_is_connected(self._account): return receiver = file_props.receiver sender = file_props.sender @@ -463,7 +463,7 @@ class Bytestream(BaseModule): Called when there is an error establishing BS connection, or when connection is rejected """ - if not self._con.connection or self._con.connected < 2: + if not app.account_is_connected(self._account): return file_props = FilesProp.getFileProp(self._account, sid) if file_props is None: @@ -491,7 +491,7 @@ class Bytestream(BaseModule): """ Called after authentication to proxy server """ - if not self._con.connection or self._con.connected < 2: + if not app.account_is_connected(self._account): return file_props = FilesProp.getFileProp(self._account, proxy['sid']) iq = nbxmpp.Iq(to=proxy['initiator'], typ='set') ===================================== gajim/common/modules/entity_time.py ===================================== @@ -41,7 +41,7 @@ class EntityTime(BaseModule): if not app.account_is_connected(self._account): return # If we are invisible, do not request - if self._con.connected == app.SHOW_LIST.index('invisible'): + if app.is_invisible(self._account): return if resource: ===================================== gajim/common/modules/presence.py ===================================== @@ -189,7 +189,7 @@ class Presence(BaseModule): if jid in app.to_be_removed[self._account]: app.to_be_removed[self._account].remove(jid) elif event.old_show > 1 and event.new_show == 0 and \ - self._con.connected > 1: + self._con.is_connected: if not jid in app.to_be_removed[self._account]: app.to_be_removed[self._account].append(jid) if jid in app.newly_added[self._account]: ===================================== gajim/common/zeroconf/connection_zeroconf.py ===================================== @@ -224,7 +224,7 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): app.newly_added[self.name].append(jid) if jid in app.to_be_removed[self.name]: app.to_be_removed[self.name].remove(jid) - elif event.old_show > 1 and event.new_show == 0 and self.connected > 1: + elif event.old_show > 1 and event.new_show == 0 and self.is_connected: if not jid in app.to_be_removed[self.name]: app.to_be_removed[self.name].append(jid) if jid in app.newly_added[self.name]: ===================================== gajim/dialogs.py ===================================== @@ -783,7 +783,7 @@ class SynchroniseSelectAccountDialog: return remote_account = model.get_value(iter_, 0) - if app.connections[remote_account].connected < 2: + if not app.account_is_connected(remote_account): ErrorDialog(_('This account is not connected to the server'), _('You cannot synchronize with an account unless it is connected.')) return ===================================== gajim/gtk/discovery.py ===================================== @@ -488,7 +488,7 @@ class ServiceDiscoveryWindow: self.reloading = False # Check connection - if app.connections[account].connected < 2: + if not app.account_is_connected(account): ErrorDialog(_('You are not connected to the server'), _('Without a connection, you can not browse available services')) raise RuntimeError('You must be connected to browse services') ===================================== gajim/gtk/join_groupchat.py ===================================== @@ -187,8 +187,7 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): account = self.account_combo.get_active_id() nickname = self.nick_entry.get_text() - invisible_show = app.SHOW_LIST.index('invisible') - if app.connections[account].connected == invisible_show: + if app.is_invisible(account): app.interface.raise_dialog('join-while-invisible') return ===================================== gajim/gtk/profile.py ===================================== @@ -316,7 +316,7 @@ class ProfileWindow(Gtk.ApplicationWindow): if self.update_progressbar_timeout_id: # Operation in progress return - if app.connections[self.account].connected < 2: + if not app.account_is_connected(self.account): ErrorDialog( _('You are not connected to the server'), _('Without a connection, you can not publish your contact ' ===================================== gajim/gtk/settings.py ===================================== @@ -651,5 +651,5 @@ class ChangePasswordSetting(DialogSetting): activatable = False if self.account in app.connections: con = app.connections[self.account] - activatable = con.connected >= 2 and con.register_supported + activatable = con.is_connected and con.register_supported self.set_activatable(activatable) ===================================== gajim/gtk/single_message.py ===================================== @@ -269,7 +269,7 @@ class SingleMessageWindow(Gtk.ApplicationWindow): _('Characters typed: %s') % str(characters_no)) def send_single_message(self): - if app.connections[self.account].connected <= 1: + if not app.account_is_connected(self.account): # if offline or connecting ErrorDialog(_('Connection not available'), _('Please make sure you are connected with "%s".') % self.account) ===================================== gajim/gtk/xml_console.py ===================================== @@ -148,7 +148,7 @@ class XMLConsoleWindow(Gtk.Window): self._ui.input_entry.grab_focus() def on_send(self, *args): - if app.connections[self.account].connected <= 1: + if not app.account_is_connected(self.account): # if offline or connecting ErrorDialog( _('Connection not available'), ===================================== gajim/gui_interface.py ===================================== @@ -933,9 +933,8 @@ class Interface: if obj.conn.get_module('MAM').available: obj.conn.get_module('MAM').request_archive_on_signin() - invisible_show = app.SHOW_LIST.index('invisible') # We cannot join rooms if we are invisible - if connected == invisible_show: + if app.is_invisible(account): return # send currently played music if (pep_supported and sys.platform not in ('win32', 'darwin') and @@ -1626,8 +1625,7 @@ class Interface: self.roster.on_groupchat_maximized(None, room_jid, account) return - invisible_show = app.SHOW_LIST.index('invisible') - if app.connections[account].connected == invisible_show: + if app.is_invisible(account): ErrorDialog( _('You cannot join a group chat while you are invisible')) return @@ -2179,7 +2177,7 @@ class Interface: GLib.timeout_add_seconds(2, connection.reconnect) else: for connection in app.connections.values(): - if connection.connected > 1: + if connection.is_connected: log.info('Disconnect %s', connection.name) connection.disconnect(immediately=True) ===================================== gajim/remote_control.py ===================================== @@ -437,7 +437,7 @@ class GajimRemote(Server): if not account and len(accounts) == 1: account = accounts[0] if account: - if app.connections[account].connected > 1: # account is connected + if app.account_is_connected(account): # account is connected connected_account = account contact = app.contacts.get_contact_with_highest_priority( account, jid) @@ -445,7 +445,7 @@ class GajimRemote(Server): for account_ in accounts: contact = app.contacts.get_contact_with_highest_priority( account, jid) - if contact and app.connections[account_].connected > 1: + if contact and app.account_is_connected(account_): # account is connected connected_account = account_ break @@ -466,14 +466,14 @@ class GajimRemote(Server): if not account and len(accounts) == 1: account = accounts[0] if account: - if app.connections[account].connected > 1 and \ + if app.account_is_connected(account) and \ room_jid in app.gc_connected[account] and \ app.gc_connected[account][room_jid]: # account and groupchat are connected connected_account = account else: for account_ in accounts: - if app.connections[account_].connected > 1 and \ + if app.account_is_connected(account_) and \ room_jid in app.gc_connected[account_] and \ app.gc_connected[account_][room_jid]: # account and groupchat are connected @@ -590,7 +590,7 @@ class GajimRemote(Server): connected_account = None first_connected_acct = None for acct in accounts: - if app.connections[acct].connected > 1: # account is online + if app.account_is_connected(acct): # account is online contact = app.contacts.get_first_contact_from_jid(acct, jid) if app.interface.msg_win_mgr.has_window(jid, acct): connected_account = acct @@ -790,8 +790,7 @@ class GajimRemote(Server): def add_contact(self, jid, account): if account: - if account in app.connections and \ - app.connections[account].connected > 1: + if app.account_is_connected(account): # if given account is active, use it AddNewContactWindow(account=account, jid=jid) else: ===================================== gajim/roster_window.py ===================================== @@ -2063,7 +2063,7 @@ class RosterWindow: app.config.set_per('accounts', account, 'last_status', status) app.config.set_per('accounts', account, 'last_status_msg', helpers.to_one_line(txt)) - if app.connections[account].connected < 2: + if not app.account_is_connected(account): self.set_connecting_state(account) self.send_status_continue(account, status, txt, auto, to) @@ -2112,8 +2112,7 @@ class RosterWindow: else: if status in ('invisible', 'offline'): self.delete_pep(app.get_jid_from_account(account), account) - was_invisible = app.connections[account].connected == \ - app.SHOW_LIST.index('invisible') + was_invisible = app.is_invisible(account) app.connections[account].change_status(status, txt, auto) for gc_control in app.interface.msg_win_mgr.get_controls( @@ -2409,7 +2408,7 @@ class RosterWindow: accounts = list(app.connections.keys()) get_msg = False for acct in accounts: - if app.connections[acct].connected: + if app.account_is_connected(acct): get_msg = True break @@ -2417,7 +2416,7 @@ class RosterWindow: self.quit_on_next_offline = 0 accounts_to_disconnect = [] for acct in accounts: - if app.connections[acct].connected > 1: + if app.account_is_connected(acct): self.quit_on_next_offline += 1 accounts_to_disconnect.append(acct) @@ -2505,7 +2504,7 @@ class RosterWindow: GLib.timeout_add_seconds(5, self.remove_newly_added, jid, account) elif obj.old_show > 1 and obj.new_show == 0 and \ - obj.conn.connected > 1: + obj.conn.is_connected: GLib.timeout_add_seconds(5, self.remove_to_be_removed, jid, account) @@ -2868,7 +2867,7 @@ class RosterWindow: return # account is offline, don't allow to rename - if app.connections[account].connected < 2: + if not app.account_is_connected(account): return if row_type in ('contact', 'agent'): # it's jid @@ -3225,8 +3224,7 @@ class RosterWindow: elif type_ == 'account': account = model[path][Column.ACCOUNT] if account != 'all': - show = app.connections[account].connected - if show > 1: # We are connected + if app.account_is_connected(account): self.on_change_status_message_activate(widget, account) return True show = helpers.get_global_show() @@ -4202,7 +4200,7 @@ class RosterWindow: if account_dest == 'all': return # nothing can be done, if destination account is offline - if app.connections[account_dest].connected < 2: + if not app.account_is_connected(account_dest): return # A file got dropped on the roster @@ -4748,7 +4746,7 @@ class RosterWindow: item = Gtk.MenuItem.new_with_mnemonic(uf_show) sub_menu.append(item) con = app.connections[account] - if show == 'invisible' and con.connected > 1 and \ + if show == 'invisible' and con.is_connected and \ not con.get_module('PrivacyLists').supported: item.set_sensitive(False) else: @@ -4761,7 +4759,7 @@ class RosterWindow: sub_menu.append(item) item.connect('activate', self.on_change_status_message_activate, account) - if app.connections[account].connected < 2: + if not app.account_is_connected(account): item.set_sensitive(False) item = Gtk.SeparatorMenuItem.new() @@ -4831,7 +4829,7 @@ class RosterWindow: self.add_bookmarks_list(gc_sub_menu, account) # make some items insensitive if account is offline - if app.connections[account].connected < 2: + if not app.account_is_connected(account): for widget in (add_contact_menuitem, service_discovery_menuitem, join_group_chat_menuitem, execute_command_menuitem, pep_menuitem): @@ -4859,7 +4857,7 @@ class RosterWindow: sub_menu.append(item) item.connect('activate', self.on_change_status_message_activate, account) - if app.connections[account].connected < 2: + if not app.account_is_connected(account): item.set_sensitive(False) uf_show = helpers.get_uf_show('offline', use_mnemonic=True) @@ -4969,7 +4967,7 @@ class RosterWindow: if app.config.get_per('accounts', account, 'is_zeroconf'): send_group_message_item.set_sensitive(False) - if app.connections[account].connected < 2: + if not app.account_is_connected(account): send_group_message_item.set_sensitive(False) invite_menuitem.set_sensitive(False) @@ -5012,7 +5010,7 @@ class RosterWindow: group, account) # unsensitive if account is not connected - if app.connections[account].connected < 2: + if not app.account_is_connected(account): rename_item.set_sensitive(False) # General group cannot be changed @@ -5052,7 +5050,7 @@ class RosterWindow: for titer in iters: jid = model[titer][Column.JID] account = model[titer][Column.ACCOUNT] - if app.connections[account].connected < 2: + if not app.account_is_connected(account): one_account_offline = True if not app.connections[account].get_module('PrivacyLists').supported: privacy_rules_supported = False View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/519d86444a5e0d14a21b7ce38943522f83… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/519d86444a5e0d14a21b7ce38943522f83… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Move ConnectionJingle code to module
by Philipp Hörist 19 May '19

19 May '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 275e719d by Philipp Hörist at 2019-05-19T20:33:20Z Move ConnectionJingle code to module - - - - - 24852277 by Philipp Hörist at 2019-05-19T20:33:20Z Move ConnectionSocks5Bytestream code to module - - - - - 24 changed files: - gajim/chat_control.py - gajim/command_system/implementation/standard.py - gajim/common/connection.py - gajim/common/connection_handlers.py - gajim/common/connection_handlers_events.py - gajim/common/jingle_content.py - gajim/common/jingle_ft.py - gajim/common/jingle_session.py - gajim/common/jingle_transport.py - gajim/common/modules/__init__.py - gajim/common/protocol/bytestream.py → gajim/common/modules/bytestream.py - gajim/common/modules/discovery.py - gajim/common/modules/ibb.py - gajim/common/modules/iq.py - gajim/common/jingle.py → gajim/common/modules/jingle.py - gajim/common/modules/presence.py - − gajim/common/protocol/__init__.py - gajim/common/zeroconf/client_zeroconf.py - gajim/common/zeroconf/connection_handlers_zeroconf.py - gajim/common/zeroconf/connection_zeroconf.py - gajim/dialogs.py - gajim/gtk/filetransfer.py - gajim/gui_interface.py - gajim/roster_window.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -594,7 +594,7 @@ class ChatControl(ChatControlBase): self._set_jingle_state('video', state, sid=sid, reason=reason) def _get_audio_content(self): - session = app.connections[self.account].get_jingle_session( + session = app.connections[self.account].get_module('Jingle').get_jingle_session( self.contact.get_full_jid(), self.audio_sid) return session.get_content('audio') @@ -757,8 +757,8 @@ class ChatControl(ChatControlBase): return setattr(self, jingle_type + '_sid', None) setattr(self, jingle_type + '_state', self.JINGLE_STATE_NULL) - session = app.connections[self.account].get_jingle_session( - self.contact.get_full_jid(), sid) + session = app.connections[self.account].get_module('Jingle').get_jingle_session( + self.contact.get_full_jid(), sid) if session: content = session.get_content(jingle_type) if content: @@ -790,7 +790,7 @@ class ChatControl(ChatControlBase): in_da = self.xml.get_object('incoming_drawingarea') in_da.realize() in_xid = in_da.get_window().get_xid() - sid = app.connections[self.account].start_video( + sid = app.connections[self.account].get_module('Jingle').start_video( self.contact.get_full_jid(), in_xid, out_xid) else: sid = getattr(app.connections[self.account], @@ -1470,7 +1470,7 @@ class ChatControl(ChatControlBase): app.events.remove_events(self.account, self.contact.jid, event=ev) def _on_cancel_file_request(self, widget, file_props): - app.connections[self.account].send_file_rejection(file_props) + app.connections[self.account].get_module('Bytestream').send_file_rejection(file_props) ev = self._get_file_props_event(file_props, 'file-request') if ev: app.events.remove_events(self.account, self.contact.jid, event=ev) ===================================== gajim/command_system/implementation/standard.py ===================================== @@ -189,7 +189,7 @@ class StandardCommonChatCommands(CommandContainer): for tone in sequence: if not (tone in ("*", "#") or tone.isdigit()): raise CommandError(_("%s is not a valid tone") % tone) - gjs = self.connection.get_jingle_session + gjs = self.connection.get_module('Jingle').get_jingle_session session = gjs(self.full_jid, self.audio_sid) content = session.get_content("audio") content.batch_dtmf(sequence) ===================================== gajim/common/connection.py ===================================== @@ -588,7 +588,7 @@ class Connection(CommonConnection, ConnectionHandlers): app.proxy65_manager.disconnect(self.connection) self.terminate_sessions() - self.remove_all_transfers() + self.get_module('Bytestream').remove_all_transfers() self._unregister_new_handlers(self.connection) self.connection = None @@ -1348,7 +1348,7 @@ class Connection(CommonConnection, ConnectionHandlers): # If we are already connected, and privacy rules are supported, send # offline presence first as it's required by XEP-0126 if self.connected > 1 and self.get_module('PrivacyLists').supported: - self.remove_all_transfers() + self.get_module('Bytestream').remove_all_transfers() self.get_module('Presence').send_presence( typ='unavailable', status=msg, ===================================== gajim/common/connection_handlers.py ===================================== @@ -30,10 +30,6 @@ import operator import nbxmpp from gajim.common import app -from gajim.common import helpers -from gajim.common import jingle_xtls -from gajim.common.jingle import ConnectionJingle -from gajim.common.protocol.bytestream import ConnectionSocks5Bytestream from gajim.common.connection_handlers_events import StreamReceivedEvent from gajim.common.connection_handlers_events import PresenceReceivedEvent from gajim.common.connection_handlers_events import StreamConflictReceivedEvent @@ -182,30 +178,14 @@ class ConnectionHandlersBase: return sess -class ConnectionHandlers(ConnectionSocks5Bytestream, - ConnectionHandlersBase, - ConnectionJingle): +class ConnectionHandlers(ConnectionHandlersBase): def __init__(self): - ConnectionSocks5Bytestream.__init__(self) - ConnectionJingle.__init__(self) ConnectionHandlersBase.__init__(self) app.nec.register_incoming_event(PresenceReceivedEvent) app.nec.register_incoming_event(StreamConflictReceivedEvent) app.nec.register_incoming_event(NotificationEvent) - def _PubkeyGetCB(self, con, iq_obj): - log.info('PubkeyGetCB') - jid_from = helpers.get_full_jid_from_iq(iq_obj) - sid = iq_obj.getAttr('id') - jingle_xtls.send_cert(con, jid_from, sid) - raise nbxmpp.NodeProcessed - - def _PubkeyResultCB(self, con, iq_obj): - log.info('PubkeyResultCB') - jid_from = helpers.get_full_jid_from_iq(iq_obj) - jingle_xtls.handle_new_cert(con, iq_obj, jid_from) - def _StreamCB(self, con, obj): log.debug('StreamCB') app.nec.push_incoming_event(StreamReceivedEvent(None, @@ -215,19 +195,5 @@ class ConnectionHandlers(ConnectionSocks5Bytestream, # try to find another way to register handlers in each class # that defines handlers - con.RegisterHandler('iq', self._bytestreamSetCB, 'set', - nbxmpp.NS_BYTESTREAM) - con.RegisterHandler('iq', self._bytestreamResultCB, 'result', - nbxmpp.NS_BYTESTREAM) - con.RegisterHandler('iq', self._bytestreamErrorCB, 'error', - nbxmpp.NS_BYTESTREAM) - con.RegisterHandler('iq', self._JingleCB, 'result') - con.RegisterHandler('iq', self._JingleCB, 'error') - con.RegisterHandler('iq', self._JingleCB, 'set', nbxmpp.NS_JINGLE) - con.RegisterHandler('iq', self._ResultCB, 'result') con.RegisterHandler('unknown', self._StreamCB, nbxmpp.NS_XMPP_STREAMS, xmlns=nbxmpp.NS_STREAMS) - con.RegisterHandler('iq', self._PubkeyGetCB, 'get', - nbxmpp.NS_PUBKEY_PUBKEY) - con.RegisterHandler('iq', self._PubkeyResultCB, 'result', - nbxmpp.NS_PUBKEY_PUBKEY) ===================================== gajim/common/connection_handlers_events.py ===================================== @@ -170,7 +170,7 @@ class FileRequestReceivedEvent(nec.NetworkIncomingEvent): def generate(self): self.id_ = self.stanza.getID() - self.fjid = self.conn._ft_get_from(self.stanza) + self.fjid = self.conn.get_module('Bytestream')._ft_get_from(self.stanza) self.jid = app.get_jid_without_resource(self.fjid) if self.jingle_content: secu = self.jingle_content.getTag('security') @@ -201,7 +201,7 @@ class FileRequestReceivedEvent(nec.NetworkIncomingEvent): if self.jingle_content.getAttr('creator') == 'initiator': file_tag = desc.getTag('file') self.file_props.sender = self.fjid - self.file_props.receiver = self.conn._ft_get_our_jid() + self.file_props.receiver = self.conn.get_module('Bytestream')._ft_get_our_jid() else: file_tag = desc.getTag('file') h = file_tag.getTag('hash') @@ -209,10 +209,10 @@ class FileRequestReceivedEvent(nec.NetworkIncomingEvent): n = file_tag.getTag('name') n = n.getData() if n else None pjid = app.get_jid_without_resource(self.fjid) - file_info = self.conn.get_file_info( + file_info = self.conn.get_module('Jingle').get_file_info( pjid, hash_=h, name=n, account=self.conn.name) self.file_props.file_name = file_info['file-name'] - self.file_props.sender = self.conn._ft_get_our_jid() + self.file_props.sender = self.conn.get_module('Bytestream')._ft_get_our_jid() self.file_props.receiver = self.fjid self.file_props.type_ = 's' for child in file_tag.getChildren(): @@ -236,7 +236,7 @@ class FileRequestReceivedEvent(nec.NetworkIncomingEvent): self.file_props.transport_sid = self.file_props.sid profile = si.getAttr('profile') if profile != nbxmpp.NS_FILE: - self.conn.send_file_rejection(self.file_props, code='400', + self.conn.get_module('Bytestream').send_file_rejection(self.file_props, code='400', typ='profile') raise nbxmpp.NodeProcessed feature_tag = si.getTag('feature', namespace=nbxmpp.NS_FEATURE) @@ -254,7 +254,7 @@ class FileRequestReceivedEvent(nec.NetworkIncomingEvent): nbxmpp.NS_IBB in values: break else: - self.conn.send_file_rejection(self.file_props, code='400', + self.conn.get_module('Bytestream').send_file_rejection(self.file_props, code='400', typ='stream') raise nbxmpp.NodeProcessed file_tag = si.getTag('file') @@ -269,7 +269,7 @@ class FileRequestReceivedEvent(nec.NetworkIncomingEvent): if mime_type is not None: self.file_props.mime_type = mime_type self.file_props.sender = self.fjid - self.file_props.receiver = self.conn._ft_get_our_jid() + self.file_props.receiver = self.conn.get_module('Bytestream')._ft_get_our_jid() self.file_props.request_id = self.id_ file_desc_tag = file_tag.getTag('desc') if file_desc_tag is not None: ===================================== gajim/common/jingle_content.py ===================================== @@ -219,7 +219,7 @@ class JingleContent: 'date' : self.file_props.date, 'peerjid' : pjid } - self.session.connection.set_file_info(file_info) + self.session.connection.get_module('Jingle').set_file_info(file_info) desc = file_tag.setTag('desc') if self.file_props.desc: desc.setData(self.file_props.desc) ===================================== gajim/common/jingle_ft.py ===================================== @@ -161,7 +161,7 @@ class JingleFileTransfer(JingleContent): 'date' : self.file_props.date, 'peerjid' : pjid } - self.session.connection.set_file_info(file_info) + self.session.connection.get_module('Jingle').set_file_info(file_info) def _compute_hash(self): # Caculates the hash and returns a xep-300 hash stanza ===================================== gajim/common/jingle_session.py ===================================== @@ -538,7 +538,7 @@ class JingleSession: # If we are not receiving a file # Check if there's already a session with this user: if contents[0].media != 'file': - for session in self.connection.iter_jingle_sessions(self.peerjid): + for session in self.connection.get_module('Jingle').iter_jingle_sessions(self.peerjid): if session is not self: reason = nbxmpp.Node('reason') alternative_session = reason.setTag('alternative-session') @@ -557,8 +557,8 @@ class JingleSession: n = request.getTag('file').getTag('name') n = n.getData() if n else None pjid = app.get_jid_without_resource(self.peerjid) - file_info = self.connection.get_file_info(pjid, hash_data, n, - self.connection.name) + file_info = self.connection.get_module('Jingle').get_file_info( + pjid, hash_data, n, self.connection.name) if not file_info: log.warning('The peer %s is requesting a ' \ 'file that we dont have or ' \ @@ -598,7 +598,7 @@ class JingleSession: cn.on_stanza(stanza, content, error, action) def __on_session_terminate(self, stanza, jingle, error, action): - self.connection.delete_jingle_session(self.sid) + self.connection.get_module('Jingle').delete_jingle_session(self.sid) reason, text = self.__reason_from_stanza(jingle) if reason not in ('success', 'cancel', 'decline'): self.__dispatch_error(reason, text) @@ -776,7 +776,7 @@ class JingleSession: text = '%s (%s)' % (reason, text) else: text = reason - self.connection.delete_jingle_session(self.sid) + self.connection.get_module('Jingle').delete_jingle_session(self.sid) app.nec.push_incoming_event(JingleDisconnectedReceivedEvent(None, conn=self.connection, jingle_session=self, ===================================== gajim/common/jingle_transport.py ===================================== @@ -305,7 +305,7 @@ class JingleTransportSocks5(JingleTransport): priority = (2**16) * type_preference proxy_cand = [] socks5conn = self.connection - proxyhosts = socks5conn._get_file_transfer_proxies_from_config(self.file_props) + proxyhosts = socks5conn.get_module('Bytestream')._get_file_transfer_proxies_from_config(self.file_props) if proxyhosts: self.file_props.proxyhosts = proxyhosts @@ -326,8 +326,8 @@ class JingleTransportSocks5(JingleTransport): self._add_candidates(proxy_cand) def get_content(self): - sesn = self.connection.get_jingle_session(self.ourjid, - self.file_props.sid) + sesn = self.connection.get_module('Jingle').get_jingle_session( + self.ourjid, self.file_props.sid) for content in sesn.contents.values(): if content.transport == self: return content @@ -337,8 +337,8 @@ class JingleTransportSocks5(JingleTransport): # send activate request to proxy, send activated confirmation to peer if not self.connection: return - sesn = self.connection.get_jingle_session(self.ourjid, - self.file_props.sid) + sesn = self.connection.get_module('Jingle').get_jingle_session( + self.ourjid, self.file_props.sid) if sesn is None: return ===================================== gajim/common/modules/__init__.py ===================================== @@ -75,6 +75,8 @@ MODULES = [ 'vcard_temp', 'announce', 'ibb', + 'jingle', + 'bytestream', ] _imported_modules = [] # type: List[tuple] ===================================== gajim/common/protocol/bytestream.py → gajim/common/modules/bytestream.py ===================================== @@ -28,6 +28,7 @@ import socket import logging import nbxmpp +from nbxmpp.structs import StanzaHandler from gi.repository import GLib from gajim.common import app @@ -35,9 +36,10 @@ from gajim.common import helpers from gajim.common import jingle_xtls from gajim.common.file_props import FilesProp from gajim.common.socks5 import Socks5SenderClient +from gajim.common.modules.base import BaseModule -log = logging.getLogger('gajim.c.p.bytestream') +log = logging.getLogger('gajim.c.m.bytestream') def is_transfer_paused(file_props): if file_props.stopped: @@ -71,33 +73,61 @@ def is_transfer_stopped(file_props): return True -class ConnectionBytestream: - - def pass_bytestream_disco(self, from_, identities, features, data, node): +class Bytestream(BaseModule): + def __init__(self, con): + BaseModule.__init__(self, con) + + self.handlers = [ + StanzaHandler(name='iq', + typ='result', + ns=nbxmpp.NS_BYTESTREAM, + callback=self._bytestreamResultCB), + StanzaHandler(name='iq', + typ='error', + ns=nbxmpp.NS_BYTESTREAM, + callback=self._bytestreamErrorCB), + StanzaHandler(name='iq', + typ='set', + ns=nbxmpp.NS_BYTESTREAM, + callback=self._bytestreamSetCB), + StanzaHandler(name='iq', + typ='result', + callback=self._ResultCB), + ] + + def pass_disco(self, from_, _identities, features, _data, _node): if nbxmpp.NS_BYTESTREAM not in features: return - if app.config.get_per('accounts', self.name, 'use_ft_proxies'): + if app.config.get_per('accounts', self._account, 'use_ft_proxies'): log.info('Discovered proxy: %s', from_) - our_fjid = self.get_own_jid() + our_fjid = self._con.get_own_jid() testit = app.config.get_per( - 'accounts', self.name, 'test_ft_proxies_on_startup') + 'accounts', self._account, 'test_ft_proxies_on_startup') app.proxy65_manager.resolve( - from_, self.connection, str(our_fjid), - default=self.name, testit=testit) + from_, self._con.connection, str(our_fjid), + default=self._account, testit=testit) raise nbxmpp.NodeProcessed def _ft_get_our_jid(self): - our_jid = app.get_jid_from_account(self.name) - resource = self.server_resource + if self._account == 'Local': + return app.get_jid_from_account(self._account) + our_jid = app.get_jid_from_account(self._account) + resource = self._con.server_resource return our_jid + '/' + resource def _ft_get_receiver_jid(self, file_props): + if self._account == 'Local': + return file_props.receiver.jid return file_props.receiver.jid + '/' + file_props.receiver.resource def _ft_get_from(self, iq_obj): + if self._account == 'Local': + return iq_obj.getFrom() return helpers.get_full_jid_from_iq(iq_obj) def _ft_get_streamhost_jid_attr(self, streamhost): + if self._account == 'Local': + return streamhost.getAttr('jid') return helpers.parse_jid(streamhost.getAttr('jid')) def send_file_approval(self, file_props): @@ -105,14 +135,14 @@ class ConnectionBytestream: Send iq, confirming that we want to download the file """ # user response to ConfirmationDialog may come after we've disconneted - if not self.connection or self.connected < 2: + if not self._con.connection or self._con.connected < 2: return # file transfer initiated by a jingle session log.info("send_file_approval: jingle session accept") - session = self.get_jingle_session(file_props.sender, - file_props.sid) + session = self._con.get_module('Jingle').get_jingle_session( + file_props.sender, file_props.sid) if not session: return content = None @@ -129,8 +159,8 @@ class ConnectionBytestream: if not jingle_xtls.check_cert( app.get_jid_without_resource(file_props.sender), fingerprint): - id_ = jingle_xtls.send_cert_request(self, - file_props.sender) + id_ = jingle_xtls.send_cert_request( + self._con, file_props.sender) jingle_xtls.key_exchange_pend(id_, content.on_cert_received, []) return @@ -146,7 +176,7 @@ class ConnectionBytestream: invalid stream or 'profile' for invalid profile """ # user response to ConfirmationDialog may come after we've disconnected - if not self.connection or self.connected < 2: + if not self._con.connection or self._con.connected < 2: return if file_props.sid in self._sessions: @@ -154,14 +184,11 @@ class ConnectionBytestream: jingle.cancel_session() return - -class ConnectionSocks5Bytestream(ConnectionBytestream): - def send_success_connect_reply(self, streamhost): """ Send reply to the initiator of FT that we made a connection """ - if not self.connection or self.connected < 2: + if not self._con.connection or self._con.connected < 2: return if streamhost is None: return None @@ -171,7 +198,7 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): query = iq.setTag('query', namespace=nbxmpp.NS_BYTESTREAM) stream_tag = query.setTag('streamhost-used') stream_tag.setAttr('jid', streamhost['jid']) - self.connection.send(iq) + self._con.connection.send(iq) def stop_all_active_file_transfers(self, contact): """ @@ -187,7 +214,7 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): from gajim.common.connection_handlers_events import \ FileRequestErrorEvent app.nec.push_incoming_event(FileRequestErrorEvent(None, - conn=self, jid=contact.jid, file_props=file_props, + conn=self._con, jid=contact.jid, file_props=file_props, error_msg='')) sender_jid = file_props.sender if contact.get_full_jid() == sender_jid: @@ -222,7 +249,7 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): """ Send iq for the present streamhosts and proxies """ - if not self.connection or self.connected < 2: + if not self._con.connection or self._con.connected < 2: return receiver = file_props.receiver sender = file_props.sender @@ -236,7 +263,7 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): if not listener: file_props.error = -5 from gajim.common.connection_handlers_events import FileRequestErrorEvent - app.nec.push_incoming_event(FileRequestErrorEvent(None, conn=self, + app.nec.push_incoming_event(FileRequestErrorEvent(None, conn=self._con, jid=receiver, file_props=file_props, error_msg='')) self._connect_error(file_props.sid, error='not-acceptable', error_type='modify') @@ -262,10 +289,10 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): streamhost.setAttr('jid', sender) def _add_local_ips_as_streamhosts_to_query(self, query, file_props): - if not app.config.get_per('accounts', self.name, 'ft_send_local_ips'): + if not app.config.get_per('accounts', self._account, 'ft_send_local_ips'): return try: - my_ips = [self.peerhost[0]] # The ip we're connected to server with + my_ips = [self._con.peerhost[0]] # The ip we're connected to server with # all IPs from local DNS for addr in socket.getaddrinfo(socket.gethostname(), None): if not addr[4][0] in my_ips and not addr[4][0].startswith('127') and not addr[4][0] == '::1': @@ -292,16 +319,16 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): def _add_upnp_igd_as_streamhost_to_query(self, query, file_props, iq): if not app.is_installed('UPNP'): - self.connection.send(iq) + self._con.connection.send(iq) return - my_ip = self.peerhost[0] + my_ip = self._con.peerhost[0] # check if we are connected with an IPv4 address try: socket.inet_aton(my_ip) except socket.error: - self.connection.send(iq) + self._con.connection.send(iq) return def ip_is_local(ip): @@ -351,12 +378,12 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): else: self._add_streamhosts_to_query(query, file_props.sender, ext_port, [ext_ip]) - self.connection.send(iq) + self._con.connection.send(iq) cleanup_gupnp() def fail(s, error, proto, ext_ip, local_ip, local_port, desc): log.debug('Got GUPnP-IGD error') - self.connection.send(iq) + self._con.connection.send(iq) cleanup_gupnp() def no_upnp_reply(): @@ -364,7 +391,7 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): # stop trying to use it app.disable_dependency('UPNP') self.no_gupnp_reply_id = 0 - self.connection.send(iq) + self._con.connection.send(iq) cleanup_gupnp() return False @@ -389,16 +416,16 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): proxyhost['port'], [proxyhost['host']]) def _get_file_transfer_proxies_from_config(self, file_props): - configured_proxies = app.config.get_per('accounts', self.name, + configured_proxies = app.config.get_per('accounts', self._account, 'file_transfer_proxies') - shall_use_proxies = app.config.get_per('accounts', self.name, + shall_use_proxies = app.config.get_per('accounts', self._account, 'use_ft_proxies') if shall_use_proxies: proxyhost_dicts = [] proxies = [] if configured_proxies: proxies = [item.strip() for item in configured_proxies.split(',')] - default_proxy = app.proxy65_manager.get_default_for_name(self.name) + default_proxy = app.proxy65_manager.get_default_for_name(self._account) if default_proxy: # add/move default proxy at top of the others if default_proxy in proxies: @@ -406,7 +433,7 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): proxies.insert(0, default_proxy) for proxy in proxies: - (host, _port, jid) = app.proxy65_manager.get_proxy(proxy, self.name) + (host, _port, jid) = app.proxy65_manager.get_proxy(proxy, self._account) if not host: continue host_dict = { @@ -436,9 +463,9 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): Called when there is an error establishing BS connection, or when connection is rejected """ - if not self.connection or self.connected < 2: + if not self._con.connection or self._con.connected < 2: return - file_props = FilesProp.getFileProp(self.name, sid) + file_props = FilesProp.getFileProp(self._account, sid) if file_props is None: log.error('can not send iq error on failed transfer') return @@ -451,22 +478,22 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): err = iq.setTag('error') err.setAttr('type', error_type) err.setTag(error, namespace=nbxmpp.NS_STANZAS) - self.connection.send(iq) + self._con.connection.send(iq) if msg: self.disconnect_transfer(file_props) file_props.error = -3 from gajim.common.connection_handlers_events import \ FileRequestErrorEvent app.nec.push_incoming_event(FileRequestErrorEvent(None, - conn=self, jid=to, file_props=file_props, error_msg=msg)) + conn=self._con, jid=to, file_props=file_props, error_msg=msg)) def _proxy_auth_ok(self, proxy): """ Called after authentication to proxy server """ - if not self.connection or self.connected < 2: + if not self._con.connection or self._con.connected < 2: return - file_props = FilesProp.getFileProp(self.name, proxy['sid']) + file_props = FilesProp.getFileProp(self._account, proxy['sid']) iq = nbxmpp.Iq(to=proxy['initiator'], typ='set') auth_id = "au_" + proxy['sid'] iq.setID(auth_id) @@ -475,7 +502,7 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): activate = query.setTag('activate') activate.setData(file_props.proxy_receiver) iq.setID(auth_id) - self.connection.send(iq) + self._con.connection.send(iq) # register xmpppy handlers for bytestream and FT stanzas def _bytestreamErrorCB(self, con, iq_obj): @@ -490,7 +517,7 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): return file_props.error = -4 from gajim.common.connection_handlers_events import FileRequestErrorEvent - app.nec.push_incoming_event(FileRequestErrorEvent(None, conn=self, + app.nec.push_incoming_event(FileRequestErrorEvent(None, conn=self._con, jid=jid, file_props=file_props, error_msg='')) raise nbxmpp.NodeProcessed @@ -499,7 +526,7 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): id_ = iq_obj.getAttr('id') query = iq_obj.getTag('query') sid = query.getAttr('sid') - file_props = FilesProp.getFileProp(self.name, sid) + file_props = FilesProp.getFileProp(self._account, sid) streamhosts = [] for item in query.getChildren(): if item.getName() == 'streamhost': @@ -527,7 +554,7 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): file_props.streamhosts.extend(streamhosts) else: file_props.streamhosts = streamhosts - app.socks5queue.connect_to_hosts(self.name, sid, + app.socks5queue.connect_to_hosts(self._account, sid, self.send_success_connect_reply, None) raise nbxmpp.NodeProcessed else: @@ -539,7 +566,7 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): self._connect_error(sid, 'item-not-found', 'cancel', msg='Could not connect to given hosts') if file_props.type_ == 'r': - app.socks5queue.connect_to_hosts(self.name, sid, + app.socks5queue.connect_to_hosts(self._account, sid, self.send_success_connect_reply, _connection_error) raise nbxmpp.NodeProcessed @@ -554,7 +581,7 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): return frm = self._ft_get_from(iq_obj) id_ = real_id[3:] - file_props = FilesProp.getFilePropByTransportSid(self.name, id_) + file_props = FilesProp.getFilePropByTransportSid(self._account, id_) if file_props.streamhost_used: for host in file_props.proxyhosts: if host['initiator'] == frm and 'idx' in host: @@ -572,7 +599,7 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): except Exception: # this bytestream result is not what we need pass id_ = real_id[3:] - file_props = FilesProp.getFileProp(self.name, id_) + file_props = FilesProp.getFileProp(self._account, id_) if file_props is None: raise nbxmpp.NodeProcessed if streamhost is None: @@ -596,7 +623,7 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): if file_props.stopped: self.remove_transfer(file_props) else: - app.socks5queue.send_file(file_props, self.name, 'server') + app.socks5queue.send_file(file_props, self._account, 'server') raise nbxmpp.NodeProcessed proxy = None @@ -618,7 +645,7 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): port=int(proxy['port']), fingerprint=None, connected=False, file_props=file_props) sender.streamhost = proxy - app.socks5queue.add_sockobj(self.name, sender) + app.socks5queue.add_sockobj(self._account, sender) proxy['idx'] = sender.queue_idx app.socks5queue.on_success[file_props.sid] = self._proxy_auth_ok raise nbxmpp.NodeProcessed @@ -626,21 +653,10 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): if file_props.stopped: self.remove_transfer(file_props) else: - app.socks5queue.send_file(file_props, self.name, 'server') + app.socks5queue.send_file(file_props, self._account, 'server') raise nbxmpp.NodeProcessed -class ConnectionSocks5BytestreamZeroconf(ConnectionSocks5Bytestream): - - def _ft_get_from(self, iq_obj): - return iq_obj.getFrom() - - def _ft_get_our_jid(self): - return app.get_jid_from_account(self.name) - - def _ft_get_receiver_jid(self, file_props): - return file_props.receiver.jid - - def _ft_get_streamhost_jid_attr(self, streamhost): - return streamhost.getAttr('jid') +def get_instance(*args, **kwargs): + return Bytestream(*args, **kwargs), 'Bytestream' ===================================== gajim/common/modules/discovery.py ===================================== @@ -162,7 +162,7 @@ class Discovery(BaseModule): try: self._con.get_module('MUC').pass_disco(from_, *args) self._con.get_module('HTTPUpload').pass_disco(from_, *args) - self._con.pass_bytestream_disco(from_, *args) + self._con.get_module('Bytestream').pass_disco(from_, *args) except nbxmpp.NodeProcessed: pass ===================================== gajim/common/modules/ibb.py ===================================== @@ -174,7 +174,7 @@ class IBB(BaseModule): peerjid = file_props.receiver else: peerjid = file_props.sender - session = self._con.get_jingle_session( + session = self._con.get_module('Jingle').get_jingle_session( peerjid, file_props.sid, 'file') # According to the xep, the initiator also cancels # the jingle session if there are no more files to send using IBB ===================================== gajim/common/modules/iq.py ===================================== @@ -53,7 +53,7 @@ class Iq(BaseModule): jid=properties.jid.getBare(), file_props=file_props, error_msg=properties.error.message)) - self._con.disconnect_transfer(file_props) + self._con.get_module('Bytestream').disconnect_transfer(file_props) raise nbxmpp.NodeProcessed if properties.error.type == Error.ITEM_NOT_FOUND: @@ -65,7 +65,7 @@ class Iq(BaseModule): account=self._account, jid=str(properties.jid), file_props=file_props)) - self._con.disconnect_transfer(file_props) + self._con.get_module('Bytestream').disconnect_transfer(file_props) raise nbxmpp.NodeProcessed app.nec.push_incoming_event( ===================================== gajim/common/jingle.py → gajim/common/modules/jingle.py ===================================== @@ -31,24 +31,49 @@ Handles the jingle signalling protocol import logging import nbxmpp +from nbxmpp.structs import StanzaHandler + from gajim.common import helpers from gajim.common import app +from gajim.common import jingle_xtls +from gajim.common.modules.base import BaseModule -from gajim.common.jingle_session import JingleSession, JingleStates +from gajim.common.jingle_session import JingleSession +from gajim.common.jingle_session import JingleStates from gajim.common.jingle_ft import JingleFileTransfer -from gajim.common.jingle_transport import JingleTransportSocks5, JingleTransportIBB +from gajim.common.jingle_transport import JingleTransportSocks5 +from gajim.common.jingle_transport import JingleTransportIBB if app.is_installed('FARSTREAM'): from gajim.common.jingle_rtp import JingleAudio, JingleVideo -logger = logging.getLogger('gajim.c.jingle') +logger = logging.getLogger('gajim.c.m.jingle') + +class Jingle(BaseModule): + def __init__(self, con): + BaseModule.__init__(self, con) -class ConnectionJingle: - """ - This object depends on that it is a part of Connection class. - """ + self.handlers = [ + StanzaHandler(name='iq', + typ='result', + callback=self._on_jingle_iq), + StanzaHandler(name='iq', + typ='error', + callback=self._on_jingle_iq), + StanzaHandler(name='iq', + typ='set', + ns=nbxmpp.NS_JINGLE, + callback=self._on_jingle_iq), + StanzaHandler(name='iq', + typ='get', + ns=nbxmpp.NS_PUBKEY_PUBKEY, + callback=self._on_pubkey_request), + StanzaHandler(name='iq', + typ='result', + ns=nbxmpp.NS_PUBKEY_PUBKEY, + callback=self._pubkey_result_received), + ] - def __init__(self): # dictionary: sessionid => JingleSession object self._sessions = {} @@ -68,7 +93,19 @@ class ConnectionJingle: self._sessions[sid].callbacks = [] del self._sessions[sid] - def _JingleCB(self, con, stanza): + def _on_pubkey_request(self, con, stanza, _properties): + jid_from = helpers.get_full_jid_from_iq(stanza) + self._log.info('Pubkey request from %s', jid_from) + sid = stanza.getAttr('id') + jingle_xtls.send_cert(con, jid_from, sid) + raise nbxmpp.NodeProcessed + + def _pubkey_result_received(self, con, stanza, _properties): + jid_from = helpers.get_full_jid_from_iq(stanza) + self._log.info('Pubkey result from %s', jid_from) + jingle_xtls.handle_new_cert(con, stanza, jid_from) + + def _on_jingle_iq(self, con, stanza, properties): """ The jingle stanza dispatcher @@ -103,7 +140,7 @@ class ConnectionJingle: # do we need to create a new jingle object if sid not in self._sessions: #TODO: tie-breaking and other things... - newjingle = JingleSession(con=self, weinitiate=False, jid=jid, + newjingle = JingleSession(self._con, weinitiate=False, jid=jid, iq_id=id_, sid=sid) self._sessions[sid] = newjingle # we already have such session in dispatcher... @@ -122,7 +159,7 @@ class ConnectionJingle: if jingle: jingle.add_content('voice', JingleAudio(jingle)) else: - jingle = JingleSession(self, weinitiate=True, jid=jid) + jingle = JingleSession(self._con, weinitiate=True, jid=jid) self._sessions[jingle.sid] = jingle jingle.add_content('voice', JingleAudio(jingle)) jingle.start_session() @@ -136,7 +173,7 @@ class ConnectionJingle: jingle.add_content('video', JingleVideo(jingle, in_xid=in_xid, out_xid=out_xid)) else: - jingle = JingleSession(self, weinitiate=True, jid=jid) + jingle = JingleSession(self._con, weinitiate=True, jid=jid) self._sessions[jingle.sid] = jingle jingle.add_content('video', JingleVideo(jingle, in_xid=in_xid, out_xid=out_xid)) @@ -145,16 +182,16 @@ class ConnectionJingle: def start_file_transfer(self, jid, file_props, request=False): logger.info("start file transfer with file: %s", file_props) - contact = app.contacts.get_contact_with_highest_priority(self.name, - app.get_jid_without_resource(jid)) - if app.contacts.is_gc_contact(self.name, jid): + contact = app.contacts.get_contact_with_highest_priority( + self._account, app.get_jid_without_resource(jid)) + if app.contacts.is_gc_contact(self._account, jid): gcc = jid.split('/') if len(gcc) == 2: - contact = app.contacts.get_gc_contact(self.name, gcc[0], gcc[1]) + contact = app.contacts.get_gc_contact(self._account, gcc[0], gcc[1]) if contact is None: return use_security = contact.supports(nbxmpp.NS_JINGLE_XTLS) - jingle = JingleSession(self, weinitiate=True, jid=jid, werequest=request) + jingle = JingleSession(self._con, weinitiate=True, jid=jid, werequest=request) # this is a file transfer jingle.session_type_ft = True self._sessions[jingle.sid] = jingle @@ -233,3 +270,7 @@ class ConnectionJingle: if session.peerjid == jid and session.get_content(media): return session return None + + +def get_instance(*args, **kwargs): + return Jingle(*args, **kwargs), 'Jingle' ===================================== gajim/common/modules/presence.py ===================================== @@ -201,7 +201,7 @@ class Presence(BaseModule): if properties.type.is_unavailable: # TODO: This causes problems when another # resource signs off! - self._con.stop_all_active_file_transfers(contact) + self._con.get_module('Bytestream').stop_all_active_file_transfers(contact) self._log_presence(properties) @staticmethod ===================================== gajim/common/protocol/__init__.py deleted ===================================== @@ -1,3 +0,0 @@ -""" -Implementations of specific XMPP protocols and XEPs -""" ===================================== gajim/common/zeroconf/client_zeroconf.py ===================================== @@ -327,16 +327,6 @@ class P2PClient(IdleObject): self.RegisterHandler(*StanzaHandler(name='message', callback=self._caller._messageCB)) - self.RegisterHandler('iq', self._caller._bytestreamSetCB, 'set', - nbxmpp.NS_BYTESTREAM) - self.RegisterHandler('iq', self._caller._bytestreamResultCB, 'result', - nbxmpp.NS_BYTESTREAM) - self.RegisterHandler('iq', self._caller._bytestreamErrorCB, 'error', - nbxmpp.NS_BYTESTREAM) - self.RegisterHandler('iq', self._caller._JingleCB, 'result') - self.RegisterHandler('iq', self._caller._JingleCB, 'error') - self.RegisterHandler('iq', self._caller._JingleCB, 'set', - nbxmpp.NS_JINGLE) self._caller._register_new_handlers(self) ===================================== gajim/common/zeroconf/connection_handlers_zeroconf.py ===================================== @@ -26,7 +26,6 @@ import nbxmpp from gajim.common import app -from gajim.common.protocol.bytestream import ConnectionSocks5BytestreamZeroconf from gajim.common import connection_handlers from gajim.common.i18n import _ from gajim.common.helpers import AdditionalDataDict @@ -56,12 +55,8 @@ class DecryptedMessageReceivedEvent(NetworkIncomingEvent): -class ConnectionHandlersZeroconf(ConnectionSocks5BytestreamZeroconf, - connection_handlers.ConnectionHandlersBase, - connection_handlers.ConnectionJingle): +class ConnectionHandlersZeroconf(connection_handlers.ConnectionHandlersBase): def __init__(self): - ConnectionSocks5BytestreamZeroconf.__init__(self) - connection_handlers.ConnectionJingle.__init__(self) connection_handlers.ConnectionHandlersBase.__init__(self) def _messageCB(self, con, stanza, properties): ===================================== gajim/common/zeroconf/connection_zeroconf.py ===================================== @@ -233,7 +233,7 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): if event.ptype == 'unavailable': # TODO: This causes problems when another # resource signs off! - self.stop_all_active_file_transfers(contact) + self.get_module('Bytestream').stop_all_active_file_transfers(contact) def _on_name_conflictCB(self, alt_name): self.disconnect() ===================================== gajim/dialogs.py ===================================== @@ -1344,8 +1344,8 @@ class VoIPCallReceivedDialog: def on_voip_call_received_messagedialog_response(self, dialog, response): # we've got response from user, either stop connecting or accept the call - session = app.connections[self.account].get_jingle_session(self.fjid, - self.sid) + session = app.connections[self.account].get_module('Jingle').get_jingle_session( + self.fjid, self.sid) if not session: dialog.destroy() return ===================================== gajim/gtk/filetransfer.py ===================================== @@ -36,7 +36,7 @@ from gajim.common import app from gajim.common import helpers from gajim.common.i18n import _ from gajim.common.file_props import FilesProp -from gajim.common.protocol.bytestream import (is_transfer_active, is_transfer_paused, +from gajim.common.modules.bytestream import (is_transfer_active, is_transfer_paused, is_transfer_stopped) from gajim.gtk.dialogs import HigDialog @@ -310,9 +310,8 @@ class FileTransfersWindow: new_file_props.date = file_props.date new_file_props.hash_ = file_props.hash_ new_file_props.type_ = 'r' - tsid = app.connections[account].start_file_transfer(fjid, - new_file_props, - True) + tsid = app.connections[account].get_module('Jingle').start_file_transfer( + fjid, new_file_props, True) new_file_props.transport_sid = tsid self.add_transfer(account, contact, new_file_props) @@ -352,8 +351,8 @@ class FileTransfersWindow: if file_props is None: return False - app.connections[account].start_file_transfer(contact.get_full_jid(), - file_props) + app.connections[account].get_module('Jingle').start_file_transfer( + contact.get_full_jid(), file_props) self.add_transfer(account, contact, file_props) return True @@ -364,7 +363,7 @@ class FileTransfersWindow: file_props.file_name = file_path file_props.type_ = 'r' self.add_transfer(account, contact, file_props) - app.connections[account].send_file_approval(file_props) + app.connections[account].get_module('Bytestream').send_file_approval(file_props) def on_file_request_accepted(self, account, contact, file_props): def on_ok(account, contact, file_props, file_path): @@ -411,7 +410,7 @@ class FileTransfersWindow: con = app.connections[account] accept_cb = partial(on_ok, account, contact, file_props) - cancel_cb = partial(con.send_file_rejection, file_props) + cancel_cb = partial(con.get_module('Bytestream').send_file_rejection, file_props) FileSaveDialog(accept_cb, cancel_cb, path=app.config.get('last_save_dir'), @@ -440,7 +439,7 @@ class FileTransfersWindow: self.on_file_request_accepted(account, contact, file_props) def on_response_cancel(account, file_props): - app.connections[account].send_file_rejection(file_props) + app.connections[account].get_module('Bytestream').send_file_rejection(file_props) dialog = NonModalConfirmationDialog(prim_text, sec_text, on_response_ok=(on_response_ok, account, contact, file_props), @@ -553,7 +552,7 @@ class FileTransfersWindow: account = file_props.tt_account if account in app.connections: # there is a connection to the account - app.connections[account].remove_transfer(file_props) + app.connections[account].get_module('Bytestream').remove_transfer(file_props) if file_props.type_ == 'r': # we receive a file other = file_props.sender else: # we send a file @@ -883,7 +882,7 @@ class FileTransfersWindow: # Check if we are in a IBB transfer if file_props.direction: con.get_module('IBB').send_close(file_props) - con.disconnect_transfer(file_props) + con.get_module('Bytestream').disconnect_transfer(file_props) self.set_status(file_props, 'stop') def on_notify_ft_complete_checkbox_toggled(self, widget): ===================================== gajim/gui_interface.py ===================================== @@ -742,8 +742,8 @@ class Interface: file_props.sid, file_props.received_len) def __compare_hashes(self, account, file_props): - session = app.connections[account].get_jingle_session(jid=None, - sid=file_props.sid) + session = app.connections[account].get_module('Jingle').get_jingle_session( + jid=None, sid=file_props.sid) ft_win = self.instances['file_transfers'] h = Hashes2() try: @@ -794,8 +794,8 @@ class Interface: self.popup_ft_result(account, jid, file_props) if file_props.error == 0: ft.set_status(file_props, 'ok') - session = app.connections[account].get_jingle_session(jid=None, - sid=file_props.sid) + session = app.connections[account].get_module('Jingle').get_jingle_session( + jid=None, sid=file_props.sid) # End jingle session # TODO: only if there are no other parallel downloads in this session if session: ===================================== gajim/roster_window.py ===================================== @@ -2435,7 +2435,7 @@ class RosterWindow: on_continue3(message, pep_dict) return # check if there is an active file transfer - from gajim.common.protocol.bytestream import is_transfer_active + from gajim.common.modules.bytestream import is_transfer_active files_props = app.interface.instances['file_transfers'].\ files_props transfer_active = False View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/1675161095e4dadff2e7f6e6cd5386db9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/1675161095e4dadff2e7f6e6cd5386db9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add paste-image-from-clipboard functionality
by Philipp Hörist 19 May '19

19 May '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 16751610 by Yuki at 2019-05-19T14:56:48Z Add paste-image-from-clipboard functionality - - - - - 2 changed files: - gajim/chat_control_base.py - gajim/common/config.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -26,6 +26,7 @@ import os import re import time +from tempfile import TemporaryDirectory from gi.repository import Gtk from gi.repository import Gdk @@ -297,6 +298,9 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): hbox = self.xml.get_object('hbox') hbox.pack_start(self.msg_scrolledwindow, True, True, 0) + id_ = self.msg_textview.connect('paste-clipboard', + self._on_message_textview_paste_event) + self.handlers[id_] = self.msg_textview id_ = self.msg_textview.connect('key_press_event', self._on_message_textview_key_press_event) self.handlers[id_] = self.msg_textview @@ -579,6 +583,62 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): self.parent_win.notebook.event(event) return Gdk.EVENT_STOP + def _on_message_textview_paste_event(self, texview): + clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) + image = clipboard.wait_for_image() + if image is not None: + if not app.config.get('confirm_paste_image'): + self._paste_event_confirmed(image) + return + NewConfirmationDialog( + _('Warning'), + _('You are trying to paste an image'), + _('Are you sure you want to paste your ' + 'clipboard image in the chat?'), + [DialogButton.make('Cancel'), + DialogButton.make('OK', + callback=lambda: self._paste_event_confirmed(image))], + ).show() + + def _paste_event_confirmed(self, image): + tmp_dir = TemporaryDirectory() + dir_ = tmp_dir.name + + # get file transfer preference + ft_pref = app.config.get_per('accounts', self.account, + 'filetransfer_preference') + path = os.path.join(dir_, '0.png') + image.savev(path, 'png', [], []) + con = app.connections[self.account] + win = self.parent_win.window + httpupload = win.lookup_action( + 'send-file-httpupload-%s' % self.control_id) + jingle = win.lookup_action('send-file-jingle-%s' % self.control_id) + + if self.type_id == message_control.TYPE_GC: + # groupchat only supports httpupload on drag and drop + if httpupload.get_enabled(): + # use httpupload + con.get_module('HTTPUpload').check_file_before_transfer( + path, self.encryption, self.contact, + self.session, groupchat=True) + else: + if httpupload.get_enabled() and jingle.get_enabled(): + if ft_pref == 'httpupload': + con.get_module('HTTPUpload').check_file_before_transfer( + path, self.encryption, self.contact, self.session) + else: + ft = app.interface.instances['file_transfers'] + ft.send_file(self.account, self.contact, path) + elif httpupload.get_enabled(): + con.get_module('HTTPUpload').check_file_before_transfer( + path, self.encryption, self.contact, self.session) + elif jingle.get_enabled(): + ft = app.interface.instances['file_transfers'] + ft.send_file(self.account, self.contact, path) + + tmp_dir.cleanup() + def _on_message_textview_key_press_event(self, widget, event): if event.keyval == Gdk.KEY_space: self.space_pressed = True ===================================== gajim/common/config.py ===================================== @@ -185,6 +185,7 @@ class Config: 'remote_control': [opt_bool, False, _('If checked, Gajim can be controlled remotely using gajim-remote.'), True], 'autodetect_browser_mailer': [opt_bool, True, '', True], 'print_ichat_every_foo_minutes': [opt_int, 5, _('When not printing time for every message (print_time==sometimes), print it every x minutes.')], + 'confirm_paste_image': [opt_bool, True, _('Ask before pasting an image.')], 'confirm_close_muc': [opt_bool, True, _('Ask before closing a group chat tab/window.')], 'confirm_close_muc_rooms': [opt_str, '', _('Always ask for confirmation before closing groupchats with any of the JIDs on this space separated list.')], 'noconfirm_close_muc_rooms': [opt_str, '', _('Never ask for confirmation before closing groupchats with any of the JIDs on this space separated list.')], View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1675161095e4dadff2e7f6e6cd5386db97… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1675161095e4dadff2e7f6e6cd5386db97… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix disabling Zeroconf account
by Philipp Hörist 19 May '19

19 May '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4394bb11 by Philipp Hörist at 2019-05-19T14:49:34Z Fix disabling Zeroconf account - - - - - 1 changed file: - gajim/common/zeroconf/connection_zeroconf.py Changes: ===================================== gajim/common/zeroconf/connection_zeroconf.py ===================================== @@ -107,7 +107,6 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): else: self.username = app.config.get_per('accounts', app.ZEROCONF_ACC_NAME, 'name') - # END __init__ def check_jid(self, jid): return jid @@ -469,4 +468,5 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): error_msg=error_message, msg=None, time_=None, session=session, zeroconf=True)) -# END ConnectionZeroconf + def cleanup(self): + pass View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4394bb1174eaf78f11097c7272c26a0cbe… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4394bb1174eaf78f11097c7272c26a0cbe… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: Remove getRoster() helper method
by Philipp Hörist 19 May '19

19 May '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 02915163 by Philipp Hörist at 2019-05-18T18:51:01Z Remove getRoster() helper method - - - - - e1bcbd2f by Philipp Hörist at 2019-05-19T14:10:14Z Move _compute_resource() into helper module - - - - - 7ec93f89 by Philipp Hörist at 2019-05-19T14:10:23Z Remove support for XEP-0096 (SI File Transfer) - - - - - fdfc9c90 by Philipp Hörist at 2019-05-19T14:10:27Z Move IBB code to new IBB module - - - - - 12 changed files: - gajim/common/app.py - gajim/common/connection.py - gajim/common/connection_handlers.py - gajim/common/helpers.py - gajim/common/jingle_ftstates.py - gajim/common/modules/__init__.py - gajim/common/modules/gateway.py - + gajim/common/modules/ibb.py - gajim/common/modules/presence.py - gajim/common/protocol/bytestream.py - gajim/common/zeroconf/client_zeroconf.py - gajim/gtk/filetransfer.py Changes: ===================================== gajim/common/app.py ===================================== @@ -147,7 +147,6 @@ gajim_identity = {'type': 'pc', 'category': 'client', 'name': 'Gajim'} gajim_common_features = [ nbxmpp.NS_BYTESTREAM, - nbxmpp.NS_SI, nbxmpp.NS_FILE, nbxmpp.NS_MUC, nbxmpp.NS_COMMANDS, ===================================== gajim/common/connection.py ===================================== @@ -30,7 +30,6 @@ import sys import random -import socket import operator import time @@ -40,8 +39,6 @@ import logging import base64 import ssl from functools import partial -import string -from string import Template from urllib.request import urlopen from urllib.error import URLError @@ -101,7 +98,7 @@ class CommonConnection: self.connection = None # xmpppy ClientCommon instance self.is_zeroconf = False self.password = None - self.server_resource = self._compute_resource() + self.server_resource = helpers.get_resource(self.name) self.status = '' self.old_show = '' self.priority = app.get_priority(name, 'offline') @@ -148,18 +145,6 @@ class CommonConnection: con.UnregisterHandler(*handler) self.handlers_registered = False - def _compute_resource(self): - resource = app.config.get_per('accounts', self.name, 'resource') - # All valid resource substitution strings should be added to this hash. - if resource: - rand = ''.join(random.choice(string.ascii_uppercase + string.digits) for _ in range(8)) - resource = Template(resource).safe_substitute({ - 'hostname': socket.gethostname(), - 'rand': rand - }) - app.config.set_per('accounts', self.name, 'resource', resource) - return resource - def dispatch(self, event, data): """ Always passes account name as first param @@ -397,7 +382,7 @@ class CommonConnection: # set old_show to requested 'show' in case we need to # recconect before we auth to server self.old_show = show - self.server_resource = self._compute_resource() + self.server_resource = helpers.get_resource(self.name) self.connect_and_init(show, msg) return @@ -1638,9 +1623,6 @@ class Connection(CommonConnection, ConnectionHandlers): self.connection = con nbxmpp.features.getRegInfo(con, self._hostname) - def getRoster(self): - return self.get_module('Roster') - def send_agent_status(self, agent, ptype): if not app.account_is_connected(self.name): return ===================================== gajim/common/connection_handlers.py ===================================== @@ -34,7 +34,6 @@ from gajim.common import helpers from gajim.common import jingle_xtls from gajim.common.jingle import ConnectionJingle from gajim.common.protocol.bytestream import ConnectionSocks5Bytestream -from gajim.common.protocol.bytestream import ConnectionIBBytestream from gajim.common.connection_handlers_events import StreamReceivedEvent from gajim.common.connection_handlers_events import PresenceReceivedEvent from gajim.common.connection_handlers_events import StreamConflictReceivedEvent @@ -185,10 +184,9 @@ class ConnectionHandlersBase: class ConnectionHandlers(ConnectionSocks5Bytestream, ConnectionHandlersBase, - ConnectionJingle, ConnectionIBBytestream): + ConnectionJingle): def __init__(self): ConnectionSocks5Bytestream.__init__(self) - ConnectionIBBytestream.__init__(self) ConnectionJingle.__init__(self) ConnectionHandlersBase.__init__(self) @@ -217,19 +215,12 @@ class ConnectionHandlers(ConnectionSocks5Bytestream, # try to find another way to register handlers in each class # that defines handlers - con.RegisterHandler('iq', self._siSetCB, 'set', nbxmpp.NS_SI) - con.RegisterHandler('iq', self._siErrorCB, 'error', nbxmpp.NS_SI) - con.RegisterHandler('iq', self._siResultCB, 'result', nbxmpp.NS_SI) con.RegisterHandler('iq', self._bytestreamSetCB, 'set', nbxmpp.NS_BYTESTREAM) con.RegisterHandler('iq', self._bytestreamResultCB, 'result', nbxmpp.NS_BYTESTREAM) con.RegisterHandler('iq', self._bytestreamErrorCB, 'error', nbxmpp.NS_BYTESTREAM) - con.RegisterHandlerOnce('iq', self.IBBAllIqHandler) - con.RegisterHandler('iq', self.IBBIqHandler, ns=nbxmpp.NS_IBB) - con.RegisterHandler('message', self.IBBMessageHandler, ns=nbxmpp.NS_IBB) - con.RegisterHandler('iq', self._JingleCB, 'result') con.RegisterHandler('iq', self._JingleCB, 'error') con.RegisterHandler('iq', self._JingleCB, 'set', nbxmpp.NS_JINGLE) ===================================== gajim/common/helpers.py ===================================== @@ -45,11 +45,13 @@ import logging import json import shutil import collections +import random +import string +from string import Template from io import StringIO from datetime import datetime, timedelta from distutils.version import LooseVersion as V from encodings.punycode import punycode_encode -from string import Template from functools import wraps import nbxmpp @@ -511,10 +513,10 @@ def reduce_chars_newlines(text, max_chars=0, max_lines=0): If any of the params is not present (None or 0) the action on it is not performed """ - def _cut_if_long(string): - if len(string) > max_chars: - string = string[:max_chars - 3] + '…' - return string + def _cut_if_long(string_): + if len(string_) > max_chars: + string_ = string_[:max_chars - 3] + '…' + return string_ if max_lines == 0: lines = text.split('\n') @@ -571,13 +573,13 @@ def datetime_tuple(timestamp): tim = tim.timetuple() return tim -def convert_bytes(string): +def convert_bytes(string_): suffix = '' # IEC standard says KiB = 1024 bytes KB = 1000 bytes # but do we use the standard? use_kib_mib = app.config.get('use_kib_mib') align = 1024. - bytes_ = float(string) + bytes_ = float(string_) if bytes_ >= align: bytes_ = round(bytes_/align, 1) if bytes_ >= align: @@ -846,10 +848,10 @@ def get_auth_sha(sid, initiator, target): return hashlib.sha1(("%s%s%s" % (sid, initiator, target)).encode('utf-8')).\ hexdigest() -def remove_invalid_xml_chars(string): - if string: - string = re.sub(app.interface.invalid_XML_chars_re, '', string) - return string +def remove_invalid_xml_chars(string_): + if string_: + string_ = re.sub(app.interface.invalid_XML_chars_re, '', string_) + return string_ def get_random_string_16(): """ @@ -1569,3 +1571,16 @@ def open_uri_with_custom(config_app, uri): def geo_provider_from_location(lat, lon): return ('https://www.openstreetmap.org/?' 'mlat=%s&mlon=%s&zoom=16') % (lat, lon) + + +def get_resource(account): + resource = app.config.get_per('accounts', account, 'resource') + # All valid resource substitution strings should be added to this hash. + if resource: + rand = ''.join(random.choice( + string.ascii_uppercase + string.digits) for _ in range(8)) + resource = Template(resource).safe_substitute( + {'hostname': socket.gethostname(), + 'rand': rand}) + app.config.set_per('accounts', account, 'resource', resource) + return resource ===================================== gajim/common/jingle_ftstates.py ===================================== @@ -146,8 +146,9 @@ class StateTransfering(JingleFileTransferStates): def _start_ibb_transfer(self, con): self.jft.file_props.transport_sid = self.jft.transport.sid fp = open(self.jft.file_props.file_name, 'rb') - con.OpenStream(self.jft.file_props.sid, self.jft.session.peerjid, fp, - blocksize=4096) + con.get_module('IBB').send_open(self.jft.session.peerjid, + self.jft.file_props.sid, + fp) def _start_sock5_transfer(self): # It tells wether we start the transfer as client or server ===================================== gajim/common/modules/__init__.py ===================================== @@ -74,6 +74,7 @@ MODULES = [ 'vcard_avatars', 'vcard_temp', 'announce', + 'ibb', ] _imported_modules = [] # type: List[tuple] ===================================== gajim/common/modules/gateway.py ===================================== @@ -33,7 +33,7 @@ class Gateway(BaseModule): self._con.connection.SendAndCallForResponse( iq, self._on_unsubscribe_result) - self._con.getRoster().del_item(agent) + self._con.get_module('Roster').del_item(agent) def _on_unsubscribe_result(self, stanza): if not nbxmpp.isResultNode(stanza): ===================================== gajim/common/modules/ibb.py ===================================== @@ -0,0 +1,227 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +# XEP-0047: In-Band Bytestreams + +import time + +import nbxmpp +from nbxmpp.protocol import NodeProcessed +from nbxmpp.structs import StanzaHandler +from nbxmpp.util import is_error_result + +from gajim.common import app +from gajim.common.modules.base import BaseModule +from gajim.common.file_props import FilesProp + + +class IBB(BaseModule): + + _nbxmpp_extends = 'IBB' + _nbxmpp_methods = [ + 'send_open', + 'send_close', + 'send_data', + 'send_reply', + ] + + def __init__(self, con): + BaseModule.__init__(self, con) + + self.handlers = [ + StanzaHandler(name='iq', + callback=self._ibb_received, + ns=nbxmpp.NS_IBB), + ] + + def _ibb_received(self, _con, stanza, properties): + if not properties.is_ibb: + return + + if properties.ibb.type == 'data': + self._log.info('Data received, sid: %s, seq: %s', + properties.ibb.sid, properties.ibb.seq) + file_props = FilesProp.getFilePropByTransportSid(self._account, + properties.ibb.sid) + if not file_props: + self.send_reply(stanza, nbxmpp.ERR_ITEM_NOT_FOUND) + raise NodeProcessed + + if file_props.connected: + self._on_data_received(stanza, file_props, properties) + self.send_reply(stanza) + + elif properties.ibb.type == 'open': + self._log.info('Open received, sid: %s, blocksize: %s', + properties.ibb.sid, properties.ibb.block_size) + + file_props = FilesProp.getFilePropByTransportSid(self._account, + properties.ibb.sid) + if not file_props: + self.send_reply(stanza, nbxmpp.ERR_ITEM_NOT_FOUND) + raise NodeProcessed + + file_props.block_size = properties.ibb.block_size + file_props.direction = '<' + file_props.seq = 0 + file_props.received_len = 0 + file_props.last_time = time.time() + file_props.error = 0 + file_props.paused = False + file_props.connected = True + file_props.completed = False + file_props.disconnect_cb = None + file_props.continue_cb = None + file_props.syn_id = stanza.getID() + file_props.fp = open(file_props.file_name, 'wb') + self.send_reply(stanza) + + elif properties.ibb.type == 'close': + self._log.info('Close received, sid: %s', properties.ibb.sid) + file_props = FilesProp.getFilePropByTransportSid(self._account, + properties.ibb.sid) + if not file_props: + self.send_reply(stanza, nbxmpp.ERR_ITEM_NOT_FOUND) + raise NodeProcessed + + self.send_reply(stanza) + file_props.fp.close() + file_props.completed = file_props.received_len >= file_props.size + if not file_props.completed: + file_props.error = -1 + app.socks5queue.complete_transfer_cb(self._account, file_props) + + raise NodeProcessed + + def _on_data_received(self, stanza, file_props, properties): + ibb = properties.ibb + if ibb.seq != file_props.seq: + self.send_reply(stanza, nbxmpp.ERR_UNEXPECTED_REQUEST) + self.send_close(file_props) + raise NodeProcessed + + self._log.debug('Data received: sid: %s, %s+%s bytes', + ibb.sid, file_props.fp.tell(), len(ibb.data)) + + file_props.seq += 1 + file_props.started = True + file_props.fp.write(ibb.data) + current_time = time.time() + file_props.elapsed_time += current_time - file_props.last_time + file_props.last_time = current_time + file_props.received_len += len(ibb.data) + app.socks5queue.progress_transfer_cb(self._account, file_props) + if file_props.received_len >= file_props.size: + file_props.completed = True + + def send_open(self, to, sid, fp): + self._log.info('Send open to %s, sid: %s', to, sid) + file_props = FilesProp.getFilePropBySid(sid) + file_props.direction = '>' + file_props.block_size = 4096 + file_props.fp = fp + file_props.seq = -1 + file_props.error = 0 + file_props.paused = False + file_props.received_len = 0 + file_props.last_time = time.time() + file_props.connected = True + file_props.completed = False + file_props.disconnect_cb = None + file_props.continue_cb = None + self._nbxmpp('IBB').send_open(to, + file_props.transport_sid, + 4096, + callback=self._on_open_result, + user_data=file_props) + return file_props + + def _on_open_result(self, result, file_props): + if is_error_result(result): + app.socks5queue.error_cb('Error', str(result)) + self._log.warning('Error: %s', result) + return + self.send_data(file_props) + + def send_close(self, file_props): + file_props.connected = False + file_props.fp.close() + file_props.stopped = True + to = file_props.receiver + if file_props.direction == '<': + to = file_props.sender + + self._log.info('Send close to %s, sid: %s', + to, file_props.transport_sid) + self._nbxmpp('IBB').send_close(to, file_props.transport_sid, + callback=self._on_close_result) + + if file_props.completed: + app.socks5queue.complete_transfer_cb(self._account, file_props) + else: + if file_props.type_ == 's': + peerjid = file_props.receiver + else: + peerjid = file_props.sender + session = self._con.get_jingle_session( + peerjid, file_props.sid, 'file') + # According to the xep, the initiator also cancels + # the jingle session if there are no more files to send using IBB + if session.weinitiate: + session.cancel_session() + + def _on_close_result(self, result): + if is_error_result(result): + app.socks5queue.error_cb('Error', str(result)) + self._log.warning('Error: %s', result) + return + + def send_data(self, file_props): + if file_props.completed: + self.send_close(file_props) + return + + chunk = file_props.fp.read(file_props.block_size) + if chunk: + file_props.seq += 1 + file_props.started = True + if file_props.seq == 65536: + file_props.seq = 0 + + self._log.info('Send data to %s, sid: %s', + file_props.receiver, file_props.transport_sid) + self._nbxmpp('IBB').send_data(file_props.receiver, + file_props.transport_sid, + file_props.seq, + chunk, + callback=self._on_data_result, + user_data=file_props) + current_time = time.time() + file_props.elapsed_time += current_time - file_props.last_time + file_props.last_time = current_time + file_props.received_len += len(chunk) + if file_props.size == file_props.received_len: + file_props.completed = True + app.socks5queue.progress_transfer_cb(self._account, file_props) + + def _on_data_result(self, result, file_props): + if is_error_result(result): + app.socks5queue.error_cb('Error', str(result)) + self._log.warning('Error: %s', result) + return + self.send_data(file_props) + + +def get_instance(*args, **kwargs): + return IBB(*args, **kwargs), 'IBB' ===================================== gajim/common/modules/presence.py ===================================== @@ -305,15 +305,15 @@ class Presence(BaseModule): if not app.account_is_connected(self._account): return if remove_auth: - self._con.getRoster().del_item(jid) + self._con.get_module('Roster').del_item(jid) jid_list = app.config.get_per('contacts') for j in jid_list: if j.startswith(jid): app.config.del_per('contacts', j) else: self._log.info('Unsubscribe from %s', jid) - self._con.getRoster().unsubscribe(jid) - self._con.getRoster().set_item(jid) + self._con.get_module('Roster').unsubscribe(jid) + self._con.get_module('Roster').set_item(jid) def subscribe(self, jid, msg=None, name='', groups=None, auto_auth=False): if not app.account_is_connected(self._account): ===================================== gajim/common/protocol/bytestream.py ===================================== @@ -25,8 +25,6 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. import socket -import base64 -import time import logging import nbxmpp @@ -34,7 +32,6 @@ from gi.repository import GLib from gajim.common import app from gajim.common import helpers -from gajim.common import ged from gajim.common import jingle_xtls from gajim.common.file_props import FilesProp from gajim.common.socks5 import Socks5SenderClient @@ -76,10 +73,6 @@ def is_transfer_stopped(file_props): class ConnectionBytestream: - def __init__(self): - app.ged.register_event_handler('file-request-received', ged.GUI1, - self._nec_file_request_received) - def pass_bytestream_disco(self, from_, identities, features, data, node): if nbxmpp.NS_BYTESTREAM not in features: return @@ -93,10 +86,6 @@ class ConnectionBytestream: default=self.name, testit=testit) raise nbxmpp.NodeProcessed - def cleanup(self): - app.ged.remove_event_handler('file-request-received', ged.GUI1, - self._nec_file_request_received) - def _ft_get_our_jid(self): our_jid = app.get_jid_from_account(self.name) resource = self.server_resource @@ -111,35 +100,6 @@ class ConnectionBytestream: def _ft_get_streamhost_jid_attr(self, streamhost): return helpers.parse_jid(streamhost.getAttr('jid')) - def send_file_request(self, file_props): - """ - Send iq for new FT request - """ - if not self.connection or self.connected < 2: - return - file_props.sender = self._ft_get_our_jid() - fjid = self._ft_get_receiver_jid(file_props) - iq = nbxmpp.Iq(to=fjid, typ='set') - iq.setID(file_props.sid) - si = iq.setTag('si', namespace=nbxmpp.NS_SI) - si.setAttr('profile', nbxmpp.NS_FILE) - si.setAttr('id', file_props.sid) - file_tag = si.setTag('file', namespace=nbxmpp.NS_FILE) - file_tag.setAttr('name', file_props.name) - file_tag.setAttr('size', file_props.size) - desc = file_tag.setTag('desc') - if file_props.desc: - desc.setData(file_props.desc) - file_tag.setTag('range') - feature = si.setTag('feature', namespace=nbxmpp.NS_FEATURE) - _feature = nbxmpp.DataForm(typ='form') - feature.addChild(node=_feature) - field = _feature.setField('stream-method') - field.setAttr('type', 'list-single') - field.addOption(nbxmpp.NS_BYTESTREAM) - field.addOption(nbxmpp.NS_IBB) - self.connection.send(iq) - def send_file_approval(self, file_props): """ Send iq, confirming that we want to download the file @@ -150,53 +110,33 @@ class ConnectionBytestream: # file transfer initiated by a jingle session log.info("send_file_approval: jingle session accept") - if file_props.session_type == 'jingle': - session = self.get_jingle_session(file_props.sender, - file_props.sid) - if not session: - return - content = None - for c in session.contents.values(): - if c.transport.sid == file_props.transport_sid: - content = c - break - if not content: - return - if not session.accepted: - content = session.get_content('file', content.name) - if content.use_security: - fingerprint = content.x509_fingerprint - if not jingle_xtls.check_cert( - app.get_jid_without_resource(file_props.sender), - fingerprint): - id_ = jingle_xtls.send_cert_request(self, - file_props.sender) - jingle_xtls.key_exchange_pend(id_, - content.on_cert_received, []) - return - session.approve_session() - - session.approve_content('file', content.name) - return - iq = nbxmpp.Iq(to=file_props.sender, typ='result') - iq.setAttr('id', file_props.request_id) - si = iq.setTag('si', namespace=nbxmpp.NS_SI) - if file_props.offset: - file_tag = si.setTag('file', namespace=nbxmpp.NS_FILE) - range_tag = file_tag.setTag('range') - range_tag.setAttr('offset', file_props.offset) - feature = si.setTag('feature', namespace=nbxmpp.NS_FEATURE) - _feature = nbxmpp.DataForm(typ='submit') - feature.addChild(node=_feature) - field = _feature.setField('stream-method') - field.delAttr('type') - if nbxmpp.NS_BYTESTREAM in file_props.stream_methods: - field.setValue(nbxmpp.NS_BYTESTREAM) - else: - file_props.transport_sid = file_props.sid - field.setValue(nbxmpp.NS_IBB) - self.connection.send(iq) + session = self.get_jingle_session(file_props.sender, + file_props.sid) + if not session: + return + content = None + for c in session.contents.values(): + if c.transport.sid == file_props.transport_sid: + content = c + break + if not content: + return + if not session.accepted: + content = session.get_content('file', content.name) + if content.use_security: + fingerprint = content.x509_fingerprint + if not jingle_xtls.check_cert( + app.get_jid_without_resource(file_props.sender), + fingerprint): + id_ = jingle_xtls.send_cert_request(self, + file_props.sender) + jingle_xtls.key_exchange_pend(id_, + content.on_cert_received, []) + return + session.approve_session() + + session.approve_content('file', content.name) def send_file_rejection(self, file_props, code='403', typ=None): """ @@ -208,87 +148,12 @@ class ConnectionBytestream: # user response to ConfirmationDialog may come after we've disconnected if not self.connection or self.connected < 2: return - if file_props.session_type == 'jingle': - if file_props.sid in self._sessions: - jingle = self._sessions[file_props.sid] - jingle.cancel_session() - return - iq = nbxmpp.Iq(to=file_props.sender, typ='error') - iq.setAttr('id', file_props.request_id) - if code == '400' and typ in ('stream', 'profile'): - name = 'bad-request' - text = '' - else: - name = 'forbidden' - text = 'Offer Declined' - err = nbxmpp.ErrorNode(code=code, typ='cancel', name=name, text=text) - if code == '400' and typ in ('stream', 'profile'): - if typ == 'stream': - err.setTag('no-valid-streams', namespace=nbxmpp.NS_SI) - else: - err.setTag('bad-profile', namespace=nbxmpp.NS_SI) - iq.addChild(node=err) - self.connection.send(iq) - def _siResultCB(self, con, iq_obj): - file_props = FilesProp.getFileProp(self.name, iq_obj.getAttr('id')) - if not file_props: - return - if file_props.request_id: - # we have already sent streamhosts info - return - file_props.receiver = self._ft_get_from(iq_obj) - si = iq_obj.getTag('si') - file_tag = si.getTag('file') - range_tag = None - if file_tag: - range_tag = file_tag.getTag('range') - if range_tag: - offset = range_tag.getAttr('offset') - if offset: - file_props.offset = int(offset) - length = range_tag.getAttr('length') - if length: - file_props.length = int(length) - feature = si.setTag('feature') - if feature.getNamespace() != nbxmpp.NS_FEATURE: - return - form_tag = feature.getTag('x') - form = nbxmpp.DataForm(node=form_tag) - field = form.getField('stream-method') - if field.getValue() == nbxmpp.NS_BYTESTREAM: - self._send_socks5_info(file_props) - raise nbxmpp.NodeProcessed - if field.getValue() == nbxmpp.NS_IBB: - sid = file_props.sid - file_props.transport_sid = sid - fp = open(file_props.file_name, 'rb') - self.OpenStream(sid, file_props.receiver, fp) - raise nbxmpp.NodeProcessed - - def _siSetCB(self, con, iq_obj): - from gajim.common.connection_handlers_events import FileRequestReceivedEvent - app.nec.push_incoming_event(FileRequestReceivedEvent(None, conn=self, - stanza=iq_obj)) - raise nbxmpp.NodeProcessed + if file_props.sid in self._sessions: + jingle = self._sessions[file_props.sid] + jingle.cancel_session() + return - def _nec_file_request_received(self, obj): - pass - - def _siErrorCB(self, con, iq_obj): - si = iq_obj.getTag('si') - profile = si.getAttr('profile') - if profile != nbxmpp.NS_FILE: - return - file_props = FilesProp.getFileProp(self.name, iq_obj.getAttr('id')) - if not file_props: - return - jid = self._ft_get_from(iq_obj) - file_props.error = -3 - from gajim.common.connection_handlers_events import FileRequestErrorEvent - app.nec.push_incoming_event(FileRequestErrorEvent(None, conn=self, - jid=jid, file_props=file_props, error_msg='')) - raise nbxmpp.NodeProcessed class ConnectionSocks5Bytestream(ConnectionBytestream): @@ -766,259 +631,6 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): raise nbxmpp.NodeProcessed -class ConnectionIBBytestream(ConnectionBytestream): - - def __init__(self): - ConnectionBytestream.__init__(self) - self._streams = {} - - def IBBIqHandler(self, conn, stanza): - """ - Handles streams state change. Used internally. - """ - typ = stanza.getType() - log.debug('IBBIqHandler called typ->%s', typ) - if typ == 'set' and stanza.getTag('open'): - self.StreamOpenHandler(conn, stanza) - elif typ == 'set' and stanza.getTag('close'): - self.StreamCloseHandler(conn, stanza) - elif typ == 'set' and stanza.getTag('data'): - sid = stanza.getTagAttr('data', 'sid') - file_props = FilesProp.getFilePropByTransportSid(self.name, sid) - if not file_props: - conn.send(nbxmpp.Error(stanza, nbxmpp.ERR_ITEM_NOT_FOUND)) - elif file_props.connected and self.IBBMessageHandler(conn, - stanza): - reply = stanza.buildReply('result') - reply.delChild('data') - conn.send(reply) - elif not file_props.connected: - log.debug('Received IQ for closed filetransfer, IQ dropped') - elif typ == 'error': - app.socks5queue.error_cb() - else: - conn.send(nbxmpp.Error(stanza, nbxmpp.ERR_BAD_REQUEST)) - raise nbxmpp.NodeProcessed - - def StreamOpenHandler(self, conn, stanza): - """ - Handles opening of new incoming stream. Used internally. - """ - err = None - sid = stanza.getTagAttr('open', 'sid') - blocksize = stanza.getTagAttr('open', 'block-size') - log.debug('StreamOpenHandler called sid->%s blocksize->%s', - sid, blocksize) - file_props = FilesProp.getFilePropByTransportSid(self.name, sid) - try: - blocksize = int(blocksize) - except Exception: - err = nbxmpp.ERR_BAD_REQUEST - if not sid or not blocksize: - err = nbxmpp.ERR_BAD_REQUEST - elif not file_props: - err = nbxmpp.ERR_UNEXPECTED_REQUEST - if err: - rep = nbxmpp.Error(stanza, err) - else: - log.debug("Opening stream: id %s, block-size %s", - sid, blocksize) - rep = nbxmpp.Protocol('iq', stanza.getFrom(), 'result', - stanza.getTo(), {'id': stanza.getID()}) - file_props.block_size = blocksize - file_props.direction = '<' - file_props.seq = 0 - file_props.received_len = 0 - file_props.last_time = time.time() - file_props.error = 0 - file_props.paused = False - file_props.connected = True - file_props.completed = False - file_props.disconnect_cb = None - file_props.continue_cb = None - file_props.syn_id = stanza.getID() - file_props.fp = open(file_props.file_name, 'wb') - conn.send(rep) - - def CloseIBBStream(self, file_props): - file_props.connected = False - file_props.fp.close() - file_props.stopped = True - to = file_props.receiver - if file_props.direction == '<': - to = file_props.sender - self.connection.send( - nbxmpp.Protocol('iq', to, 'set', - payload=[nbxmpp.Node(nbxmpp.NS_IBB + ' close', - {'sid':file_props.transport_sid})])) - if file_props.completed: - app.socks5queue.complete_transfer_cb(self.name, file_props) - elif file_props.session_type == 'jingle': - peerjid = \ - file_props.receiver if file_props.type_ == 's' else file_props.sender - session = self.get_jingle_session(peerjid, file_props.sid, 'file') - # According to the xep, the initiator also cancels the jingle session - # if there are no more files to send using IBB - if session.weinitiate: - session.cancel_session() - - def OpenStream(self, sid, to, fp, blocksize=4096): - """ - Start new stream. You should provide stream id 'sid', the endpoint jid - 'to', the file object containing info for send 'fp'. Also the desired - blocksize can be specified. - Take into account that recommended stanza size is 4k and IBB uses - base64 encoding that increases size of data by 1/3. - """ - file_props = FilesProp.getFilePropBySid(sid) - file_props.direction = '>' - file_props.block_size = blocksize - file_props.fp = fp - file_props.seq = 0 - file_props.error = 0 - file_props.paused = False - file_props.received_len = 0 - file_props.last_time = time.time() - file_props.connected = True - file_props.completed = False - file_props.disconnect_cb = None - file_props.continue_cb = None - syn = nbxmpp.Protocol('iq', to, 'set', payload=[nbxmpp.Node( - nbxmpp.NS_IBB + ' open', {'sid': file_props.transport_sid, - 'block-size': blocksize, 'stanza': 'iq'})]) - self.connection.send(syn) - file_props.syn_id = syn.getID() - return file_props - - def SendHandler(self, file_props): - """ - Send next portion of data if it is time to do it. Used internally. - """ - log.debug('SendHandler called') - if file_props.completed: - self.CloseIBBStream(file_props) - if file_props.paused: - return - if not file_props.connected: - #TODO: Reply with out of order error - return - chunk = file_props.fp.read(file_props.block_size) - if chunk: - datanode = nbxmpp.Node(nbxmpp.NS_IBB + ' data', { - 'sid': file_props.transport_sid, - 'seq': file_props.seq}, - base64.b64encode(chunk).decode('ascii')) - file_props.seq += 1 - file_props.started = True - if file_props.seq == 65536: - file_props.seq = 0 - file_props.syn_id = self.connection.send( - nbxmpp.Protocol(name='iq', to=file_props.receiver, - typ='set', payload=[datanode])) - current_time = time.time() - file_props.elapsed_time += current_time - file_props.last_time - file_props.last_time = current_time - file_props.received_len += len(chunk) - if file_props.size == file_props.received_len: - file_props.completed = True - app.socks5queue.progress_transfer_cb(self.name, - file_props) - else: - log.debug('Nothing to read, but file not completed') - - def IBBMessageHandler(self, conn, stanza): - """ - Receive next portion of incoming datastream and store it write - it to temporary file. Used internally. - """ - sid = stanza.getTagAttr('data', 'sid') - seq = stanza.getTagAttr('data', 'seq') - data = stanza.getTagData('data') - log.debug('ReceiveHandler called sid->%s seq->%s', sid, seq) - try: - seq = int(seq) - data = base64.b64decode(data.encode('utf-8')) - except Exception: - seq = '' - data = b'' - err = None - file_props = FilesProp.getFilePropByTransportSid(self.name, sid) - if file_props is None: - err = nbxmpp.ERR_ITEM_NOT_FOUND - else: - if not data: - err = nbxmpp.ERR_BAD_REQUEST - elif seq != file_props.seq: - err = nbxmpp.ERR_UNEXPECTED_REQUEST - else: - log.debug('Successfully received sid->%s %s+%s bytes', - sid, file_props.fp.tell(), len(data)) - file_props.seq += 1 - file_props.started = True - file_props.fp.write(data) - current_time = time.time() - file_props.elapsed_time += current_time - file_props.last_time - file_props.last_time = current_time - file_props.received_len += len(data) - app.socks5queue.progress_transfer_cb(self.name, file_props) - if file_props.received_len >= file_props.size: - file_props.completed = True - if err: - log.debug('Error on receive: %s', err) - conn.send(nbxmpp.Error(nbxmpp.Iq(to=stanza.getFrom(), - frm=stanza.getTo(), - payload=[nbxmpp.Node(nbxmpp.NS_IBB + ' close')]), err, reply=0)) - else: - return True - - def StreamCloseHandler(self, conn, stanza): - """ - Handle stream closure due to all data transmitted. - Raise xmpppy event specifying successful data receive. - """ - sid = stanza.getTagAttr('close', 'sid') - log.debug('StreamCloseHandler called sid->%s', sid) - # look in sending files - file_props = FilesProp.getFilePropByTransportSid(self.name, sid) - if file_props: - reply = stanza.buildReply('result') - reply.delChild('close') - conn.send(reply) - # look in receiving files - file_props.fp.close() - file_props.completed = file_props.received_len >= file_props.size - if not file_props.completed: - file_props.error = -1 - app.socks5queue.complete_transfer_cb(self.name, file_props) - else: - conn.send(nbxmpp.Error(stanza, nbxmpp.ERR_ITEM_NOT_FOUND)) - - - def IBBAllIqHandler(self, conn, stanza): - """ - Handle remote side reply about if it agree or not to receive our - datastream. - Used internally. Raises xmpppy event specifying if the data transfer - is agreed upon. - """ - syn_id = stanza.getID() - log.debug('IBBAllIqHandler called syn_id->%s', syn_id) - for file_props in FilesProp.getAllFileProp(): - if not file_props.direction or not file_props.connected: - # It's socks5 bytestream - # Or we closed the IBB stream - continue - if file_props.syn_id == syn_id: - if stanza.getType() == 'error': - if file_props.direction[0] == '<': - conn.Event('IBB', 'ERROR ON RECEIVE', file_props) - else: - conn.Event('IBB', 'ERROR ON SEND', file_props) - elif stanza.getType() == 'result': - self.SendHandler(file_props) - break - - class ConnectionSocks5BytestreamZeroconf(ConnectionSocks5Bytestream): def _ft_get_from(self, iq_obj): ===================================== gajim/common/zeroconf/client_zeroconf.py ===================================== @@ -327,11 +327,6 @@ class P2PClient(IdleObject): self.RegisterHandler(*StanzaHandler(name='message', callback=self._caller._messageCB)) - self.RegisterHandler('iq', self._caller._siSetCB, 'set', nbxmpp.NS_SI) - self.RegisterHandler('iq', self._caller._siErrorCB, 'error', - nbxmpp.NS_SI) - self.RegisterHandler('iq', self._caller._siResultCB, 'result', - nbxmpp.NS_SI) self.RegisterHandler('iq', self._caller._bytestreamSetCB, 'set', nbxmpp.NS_BYTESTREAM) self.RegisterHandler('iq', self._caller._bytestreamResultCB, 'result', ===================================== gajim/gtk/filetransfer.py ===================================== @@ -29,7 +29,6 @@ from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GLib from gi.repository import Pango -from nbxmpp.protocol import NS_JINGLE_FILE_TRANSFER_5 from gajim import gtkgui_helpers @@ -352,17 +351,10 @@ class FileTransfersWindow: file_path, file_name, file_desc) if file_props is None: return False - if contact.supports(NS_JINGLE_FILE_TRANSFER_5): - log.info('contact %s supports jingle file transfer', - contact.get_full_jid()) - app.connections[account].start_file_transfer(contact.get_full_jid(), - file_props) - self.add_transfer(account, contact, file_props) - else: - log.info('contact does not support jingle file transfer') - file_props.transport_sid = file_props.sid - app.connections[account].send_file_request(file_props) - self.add_transfer(account, contact, file_props) + + app.connections[account].start_file_transfer(contact.get_full_jid(), + file_props) + self.add_transfer(account, contact, file_props) return True def _start_receive(self, file_path, account, contact, file_props): @@ -890,7 +882,7 @@ class FileTransfersWindow: con = app.connections[account] # Check if we are in a IBB transfer if file_props.direction: - con.CloseIBBStream(file_props) + con.get_module('IBB').send_close(file_props) con.disconnect_transfer(file_props) self.set_status(file_props, 'stop') View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/2e50ac5205c99f22eda1b51231bb320ba… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/2e50ac5205c99f22eda1b51231bb320ba… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Add IBB (XEP-0047) module
by Philipp Hörist 19 May '19

19 May '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: ac23d278 by Philipp Hörist at 2019-05-19T13:33:48Z Add IBB (XEP-0047) module - - - - - 3 changed files: - nbxmpp/dispatcher.py - + nbxmpp/modules/ibb.py - nbxmpp/structs.py Changes: ===================================== nbxmpp/dispatcher.py ===================================== @@ -68,6 +68,7 @@ from nbxmpp.modules.annotations import Annotations from nbxmpp.modules.muclumbus import Muclumbus from nbxmpp.modules.software_version import SoftwareVersion from nbxmpp.modules.adhoc import AdHoc +from nbxmpp.modules.ibb import IBB from nbxmpp.modules.misc import unwrap_carbon from nbxmpp.modules.misc import unwrap_mam from nbxmpp.util import get_properties_struct @@ -204,6 +205,7 @@ class XMPPDispatcher(PlugIn): self._modules['Muclumbus'] = Muclumbus(self._owner) self._modules['SoftwareVersion'] = SoftwareVersion(self._owner) self._modules['AdHoc'] = AdHoc(self._owner) + self._modules['IBB'] = IBB(self._owner) for instance in self._modules.values(): for handler in instance.handlers: ===================================== nbxmpp/modules/ibb.py ===================================== @@ -0,0 +1,160 @@ +# Copyright (C) 2019 Philipp Hörist <philipp AT hoerist.com> +# +# This file is part of nbxmpp. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 3 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; If not, see <http://www.gnu.org/licenses/>. + +import logging + +from nbxmpp.protocol import Error as ErrorStanza +from nbxmpp.protocol import ERR_BAD_REQUEST +from nbxmpp.protocol import ERR_FEATURE_NOT_IMPLEMENTED +from nbxmpp.protocol import NodeProcessed +from nbxmpp.protocol import Iq +from nbxmpp.protocol import NS_IBB +from nbxmpp.protocol import isResultNode +from nbxmpp.structs import CommonResult +from nbxmpp.structs import StanzaHandler +from nbxmpp.structs import IBBData +from nbxmpp.util import b64decode +from nbxmpp.util import b64encode +from nbxmpp.util import call_on_response +from nbxmpp.util import callback +from nbxmpp.util import raise_error + +log = logging.getLogger('nbxmpp.m.ibb') + + +class IBB: + def __init__(self, client): + self._client = client + self.handlers = [ + StanzaHandler(name='iq', + callback=self._process_ibb, + ns=NS_IBB, + priority=20), + ] + + def _process_ibb(self, _con, stanza, properties): + if properties.type.is_set: + open_ = stanza.getTag('open', namespace=NS_IBB) + if open_ is not None: + properties.ibb = self._parse_open(stanza, open_) + return + + close = stanza.getTag('close', namespace=NS_IBB) + if close is not None: + properties.ibb = self._parse_close(stanza, close) + return + + data = stanza.getTag('data', namespace=NS_IBB) + if data is not None: + properties.ibb = self._parse_data(stanza, data) + return + + def _parse_open(self, stanza, open_): + attrs = open_.getAttrs() + try: + block_size = int(attrs.get('block-size')) + except Exception as error: + log.warning(error) + log.warning(stanza) + self._client.send(ErrorStanza(stanza, ERR_BAD_REQUEST)) + raise NodeProcessed + + if block_size > 65535: + log.warning('Invalid block-size') + self._client.send(ErrorStanza(stanza, ERR_BAD_REQUEST)) + raise NodeProcessed + + sid = attrs.get('sid') + if not sid: + log.warning('Invalid sid') + self._client.send(ErrorStanza(stanza, ERR_BAD_REQUEST)) + raise NodeProcessed + + type_ = attrs.get('stanza') + if type_ == 'message': + self._client.send(ErrorStanza(stanza, ERR_FEATURE_NOT_IMPLEMENTED)) + raise NodeProcessed + + return IBBData(type='open', block_size=block_size, sid=sid) + + def _parse_close(self, stanza, close): + sid = close.getAttrs().get('sid') + if sid is None: + log.warning('Invalid sid') + self._client.send(ErrorStanza(stanza, ERR_BAD_REQUEST)) + raise NodeProcessed + return IBBData(type='close', sid=sid) + + def _parse_data(self, stanza, data): + attrs = data.getAttrs() + + sid = attrs.get('sid') + if sid is None: + log.warning('Invalid sid') + self._client.send(ErrorStanza(stanza, ERR_BAD_REQUEST)) + raise NodeProcessed + + try: + seq = int(attrs.get('seq')) + except Exception: + log.exception('Invalid seq') + self._client.send(ErrorStanza(stanza, ERR_BAD_REQUEST)) + raise NodeProcessed + + try: + decoded_data = b64decode(data.getData(), return_type=bytes) + except Exception: + log.exception('Failed to decode IBB data') + self._client.send(ErrorStanza(stanza, ERR_BAD_REQUEST)) + raise NodeProcessed + + return IBBData(type='data', sid=sid, seq=seq, data=decoded_data) + + def send_reply(self, stanza, error=None): + if error is None: + reply = stanza.buildReply('result') + reply.getChildren().clear() + else: + reply = ErrorStanza(stanza, error) + self._client.send(reply) + + @call_on_response('_default_response') + def send_open(self, jid, sid, block_size): + iq = Iq('set', to=jid) + iq.addChild('open', + {'block-size': block_size, 'sid': sid, 'stanza': 'iq'}, + namespace=NS_IBB) + return iq + + @call_on_response('_default_response') + def send_close(self, jid, sid): + iq = Iq('set', to=jid) + iq.addChild('close', {'sid': sid}, namespace=NS_IBB) + return iq + + @call_on_response('_default_response') + def send_data(self, jid, sid, seq, data): + iq = Iq('set', to=jid) + ibb_data = iq.addChild('data', {'sid': sid, 'seq': seq}, namespace=NS_IBB) + ibb_data.setData(b64encode(data)) + return iq + + @callback + def _default_response(self, stanza): + if not isResultNode(stanza): + return raise_error(log.info, stanza) + return CommonResult(jid=stanza.getFrom()) ===================================== nbxmpp/structs.py ===================================== @@ -109,6 +109,9 @@ SoftwareVersionResult = namedtuple('SoftwareVersionResult', 'name version os') AdHocCommandNote = namedtuple('AdHocCommandNote', 'text type') +IBBData = namedtuple('IBBData', 'block_size sid seq type data') +IBBData.__new__.__defaults__ = (None, None, None, None, None) + class AdHocCommand(namedtuple('AdHocCommand', 'jid node name sessionid status data actions notes')): __slots__ = [] @@ -285,11 +288,16 @@ class IqProperties: self.query = None self.payload = None self.http_auth = None + self.ibb = None @property def is_http_auth(self): return self.http_auth is not None + @property + def is_ibb(self): + return self.ibb is not None + class PresenceProperties: def __init__(self): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/ac23d278b5323960b9054535ea… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/ac23d278b5323960b9054535ea… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Move roster methods into Roster module
by Philipp Hörist 17 May '19

17 May '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 22b33885 by Philipp Hörist at 2019-05-17T23:30:37Z Move roster methods into Roster module - - - - - 2e50ac52 by Philipp Hörist at 2019-05-17T23:31:09Z Remove unused code - - - - - 4 changed files: - gajim/common/connection.py - gajim/common/modules/roster.py - gajim/dialogs.py - gajim/roster_window.py Changes: ===================================== gajim/common/connection.py ===================================== @@ -355,17 +355,6 @@ class CommonConnection: additional_data=obj.additional_data, stanza_id=obj.stanza_id) - def update_contact(self, jid, name, groups): - if self.connection: - self.getRoster().set_item(jid=jid, name=name, groups=groups) - - def update_contacts(self, contacts): - """ - Update multiple roster items - """ - if self.connection: - self.getRoster().set_item_multi(contacts) - def new_account(self, name, config, sync=False): """ To be implemented by derived classes @@ -378,9 +367,6 @@ class CommonConnection: """ raise NotImplementedError - def account_changed(self, new_name): - self.name = new_name - def send_agent_status(self, agent, ptype): """ To be implemented by derived classes ===================================== gajim/common/modules/roster.py ===================================== @@ -270,6 +270,17 @@ class Roster(BaseModule): """ return self._get_item_data(jid, 'name') + def update_contact(self, jid, name, groups): + if app.account_is_connected(self._account): + self.set_item(jid=jid, name=name, groups=groups) + + def update_contacts(self, contacts): + """ + Update multiple roster items + """ + if app.account_is_connected(self._account): + self.set_item_multi(contacts) + def set_item(self, jid, name=None, groups=None): """ Rename contact 'jid' and sets the groups list that it now belongs to ===================================== gajim/dialogs.py ===================================== @@ -97,8 +97,9 @@ class EditGroupsDialog: self.dialog.show_all() if self.changes_made: for (contact, account) in self.list_: - app.connections[account].update_contact(contact.jid, - contact.name, contact.groups) + con = app.connections[account] + con.get_module('Roster').update_contact( + contact.jid, contact.name, contact.groups) def on_edit_groups_dialog_response(self, widget, response_id): if response_id == Gtk.ResponseType.CLOSE: @@ -1066,8 +1067,9 @@ class RosterItemExchangeWindow: groups = [] for u in app.contacts.get_contact(self.account, jid): u.name = model[iter_][2] - app.connections[self.account].update_contact(jid, - model[iter_][2], groups) + con = app.connections[self.account] + con.get_module('Roster').update_contact( + jid, model[iter_][2], groups) self.draw_contact(jid, self.account) # Update opened chat ctrl = app.interface.msg_win_mgr.get_control(jid, self.account) ===================================== gajim/roster_window.py ===================================== @@ -898,7 +898,8 @@ class RosterWindow: changed_contacts.append({'jid': jid, 'name': contact.name, 'groups':contact.groups}) - app.connections[acc].update_contacts(changed_contacts) + app.connections[acc].get_module('Roster').update_contacts( + changed_contacts) for c in changed_contacts: self.add_contact(c['jid'], acc) @@ -929,8 +930,9 @@ class RosterWindow: # we might be dropped from meta to group contact.groups.append(group) if update: - app.connections[account].update_contact(jid, contact.name, - contact.groups) + con = app.connections[account] + con.get_module('Roster').update_contact( + jid, contact.name, contact.groups) self.add_contact(jid, account) @@ -957,8 +959,9 @@ class RosterWindow: # Needed when we remove from "General" or "Observers" contact.groups.remove(group) if update: - app.connections[account].update_contact(jid, contact.name, - contact.groups) + con = app.connections[account] + con.get_module('Roster').update_contact( + jid, contact.name, contact.groups) self.add_contact(jid, account) # Also redraw old groups @@ -2890,8 +2893,9 @@ class RosterWindow: contacts = app.contacts.get_contacts(account, jid) for contact in contacts: contact.name = new_text - app.connections[account].update_contact(jid, new_text, \ - contacts[0].groups) + con = app.connections[account] + con.get_module('Roster').update_contact( + jid, new_text, contacts[0].groups) self.draw_contact(jid, account) # Update opened chats for ctrl in app.interface.msg_win_mgr.get_controls(jid, @@ -4075,8 +4079,9 @@ class RosterWindow: _contact.groups = c_dest.groups[:] app.contacts.add_metacontact(account_dest, c_dest.jid, _account, _contact.jid, contacts) - app.connections[account_source].update_contact(_contact.jid, - _contact.name, _contact.groups) + con = app.connections[account_source] + con.get_module('Roster').update_contact( + _contact.jid, _contact.name, _contact.groups) # Re-add all and update GUI new_family = app.contacts.get_metacontacts_family(account_source, View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/f601ca0d7b8ac0b471491bf5181e7b6cb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/f601ca0d7b8ac0b471491bf5181e7b6cb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Remove custom status per contact feature
by Philipp Hörist 17 May '19

17 May '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9dbac0f0 by Philipp Hörist at 2019-05-17T21:38:06Z Remove custom status per contact feature - - - - - f601ca0d by Philipp Hörist at 2019-05-17T23:04:11Z Add dedicated announce/motd module - - - - - 11 changed files: - gajim/app_actions.py - gajim/common/connection.py - gajim/common/modules/__init__.py - + gajim/common/modules/announce.py - gajim/common/modules/privacylists.py - gajim/data/gui/contact_context_menu.ui - gajim/gtk/single_message.py - gajim/gui_interface.py - gajim/gui_menu_builder.py - gajim/roster_window.py - test/lib/gajim_mocks.py Changes: ===================================== gajim/app_actions.py ===================================== @@ -277,9 +277,7 @@ def on_update_motd(action, param): def on_delete_motd(action, param): account = param.get_string() - server = app.config.get_per('accounts', account, 'hostname') - server += '/announce/motd/delete' - app.connections[account].send_motd(server) + app.connections[account].get_module('Announce').delete_motd() # Help Actions ===================================== gajim/common/connection.py ===================================== @@ -1566,14 +1566,6 @@ class Connection(CommonConnection, ConnectionHandlers): app.nec.push_incoming_event(OurShowEvent(None, conn=self, show=show)) - def send_motd(self, jid, subject='', msg='', xhtml=None): - if not app.account_is_connected(self.name): - return - msg_iq = nbxmpp.Message(to=jid, body=msg, subject=subject, - xhtml=xhtml) - - self.connection.send(msg_iq) - def _nec_message_outgoing(self, obj): if obj.account != self.name: return ===================================== gajim/common/modules/__init__.py ===================================== @@ -73,6 +73,7 @@ MODULES = [ 'user_tune', 'vcard_avatars', 'vcard_temp', + 'announce', ] _imported_modules = [] # type: List[tuple] ===================================== gajim/common/modules/announce.py ===================================== @@ -0,0 +1,37 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +# Server MOTD and Announce + +import nbxmpp + +from gajim.common.modules.base import BaseModule + + +class Announce(BaseModule): + def __init__(self, con): + BaseModule.__init__(self, con) + + def delete_motd(self): + server = self._con.get_own_jid().getDomain() + jid = '%s/announce/motd/delete' % server + self.set_announce(jid) + + def set_announce(self, jid, subject=None, body=None): + message = nbxmpp.Message(to=jid, body=body, subject=subject) + self._nbxmpp().send(message) + + +def get_instance(*args, **kwargs): + return Announce(*args, **kwargs), 'Announce' ===================================== gajim/common/modules/privacylists.py ===================================== @@ -242,23 +242,6 @@ class PrivacyLists(BaseModule): def _build_invisible_rule(self): node = nbxmpp.Node('list', {'name': 'invisible'}) iq = nbxmpp.Iq('set', nbxmpp.NS_PRIVACY, payload=[node]) - if (self._account in app.interface.status_sent_to_groups and - app.interface.status_sent_to_groups[self._account]): - for group in app.interface.status_sent_to_groups[self._account]: - item = node.setTag('item', {'type': 'group', - 'value': group, - 'action': 'allow', - 'order': '1'}) - item.setTag('presence-out') - - if (self._account in app.interface.status_sent_to_users and - app.interface.status_sent_to_users[self._account]): - for jid in app.interface.status_sent_to_users[self._account]: - item = node.setTag('item', {'type': 'jid', - 'value': jid, - 'action': 'allow', - 'order': '2'}) - item.setTag('presence-out') item = node.setTag('item', {'action': 'deny', 'order': '3'}) item.setTag('presence-out') ===================================== gajim/data/gui/contact_context_menu.ui ===================================== @@ -51,21 +51,6 @@ <property name="can_focus">False</property> </object> </child> - <child> - <object class="GtkMenuItem" id="send_custom_status_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Send Cus_tom Status</property> - <property name="use_underline">True</property> - <child type="submenu"> - <object class="GtkMenu" id="menu5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - </object> - </child> - </object> - </child> <child> <object class="GtkMenuItem" id="execute_command_menuitem"> <property name="visible">True</property> ===================================== gajim/gtk/single_message.py ===================================== @@ -308,8 +308,9 @@ class SingleMessageWindow(Gtk.ApplicationWindow): return True if '/announce/' in to_whom_jid: - app.connections[self.account].send_motd(to_whom_jid, subject, - message) + con = app.connections[self.account] + con.get_module('Announce').set_announce( + to_whom_jid, subject, message) continue recipient_list.append(to_whom_jid) ===================================== gajim/gui_interface.py ===================================== @@ -311,13 +311,6 @@ class Interface: account = obj.conn.name jid = obj.jid - # unset custom status - if (obj.old_show == 0 and obj.new_show > 1) or \ - (obj.old_show > 1 and obj.new_show == 0 and obj.conn.connected > 1): - if account in self.status_sent_to_users and \ - jid in self.status_sent_to_users[account]: - del self.status_sent_to_users[account][jid] - if app.jid_is_transport(jid): # It must be an agent @@ -2272,8 +2265,6 @@ class Interface: # This is the manager and factory of message windows set by the module self.msg_win_mgr = None self.minimized_controls = {} - self.status_sent_to_users = {} - self.status_sent_to_groups = {} self.pass_dialog = {} self.db_error_dialog = None ===================================== gajim/gui_menu_builder.py ===================================== @@ -221,7 +221,6 @@ control=None, gc_contact=None, is_anonymous=True): send_file_menuitem = xml.get_object('send_file_menuitem') information_menuitem = xml.get_object('information_menuitem') history_menuitem = xml.get_object('history_menuitem') - send_custom_status_menuitem = xml.get_object('send_custom_status_menuitem') send_single_message_menuitem = xml.get_object('send_single_message_menuitem') invite_menuitem = xml.get_object('invite_menuitem') block_menuitem = xml.get_object('block_menuitem') @@ -327,7 +326,7 @@ control=None, gc_contact=None, is_anonymous=True): # Zeroconf Account if app.config.get_per('accounts', account, 'is_zeroconf'): - for item in (send_custom_status_menuitem, send_single_message_menuitem, + for item in (send_single_message_menuitem, invite_menuitem, block_menuitem, unblock_menuitem, ignore_menuitem, unignore_menuitem, subscription_menuitem, manage_contact_menuitem, convert_to_gc_menuitem): @@ -348,22 +347,6 @@ control=None, gc_contact=None, is_anonymous=True): # normal account - # send custom status icon - blocked = False - if helpers.jid_is_blocked(account, jid): - blocked = True - else: - for group in contact.get_shown_groups(): - if helpers.group_is_blocked(account, group): - blocked = True - break - transport = app.get_transport_name_from_jid(jid, use_config_setting=False) - if transport and transport != 'jabber': - # Transport contact, send custom status unavailable - send_custom_status_menuitem.set_sensitive(False) - elif blocked: - send_custom_status_menuitem.set_sensitive(False) - if gc_contact: if not gc_contact.jid: # it's a pm and we don't know real JID @@ -387,16 +370,6 @@ control=None, gc_contact=None, is_anonymous=True): if app.account_is_disconnected(account): invite_menuitem.set_sensitive(False) - # One or several resource, we do the same for send_custom_status - status_menuitems = Gtk.Menu() - send_custom_status_menuitem.set_submenu(status_menuitems) - for s in ('online', 'chat', 'away', 'xa', 'dnd', 'offline'): - # icon MUST be different instance for every item - status_menuitem = Gtk.MenuItem.new_with_label(helpers.get_uf_show(s)) - status_menuitem.connect('activate', roster.on_send_custom_status, - [(contact, account)], s) - status_menuitems.append(status_menuitem) - send_single_message_menuitem.connect('activate', roster.on_send_single_message_menuitem_activate, account, contact) @@ -447,7 +420,7 @@ control=None, gc_contact=None, is_anonymous=True): if app.account_is_disconnected(account): for widget in (send_single_message_menuitem, subscription_menuitem, add_to_roster_menuitem, remove_from_roster_menuitem, - execute_command_menuitem, send_custom_status_menuitem): + execute_command_menuitem): widget.set_sensitive(False) @@ -507,24 +480,6 @@ def get_transport_menu(contact, account): if helpers.jid_is_blocked(account, jid): blocked = True - # Send Custom Status - send_custom_status_menuitem = Gtk.MenuItem.new_with_mnemonic( - _('Send Cus_tom Status')) - if blocked: - send_custom_status_menuitem.set_sensitive(False) - else: - status_menuitems = Gtk.Menu() - send_custom_status_menuitem.set_submenu(status_menuitems) - for s in ('online', 'chat', 'away', 'xa', 'dnd', 'offline'): - status_menuitem = Gtk.MenuItem.new_with_label(helpers.get_uf_show( - s)) - status_menuitem.connect('activate', roster.on_send_custom_status, - [(contact, account)], s) - status_menuitems.append(status_menuitem) - menu.append(send_custom_status_menuitem) - if app.account_is_disconnected(account): - send_custom_status_menuitem.set_sensitive(False) - item = Gtk.SeparatorMenuItem.new() # separator menu.append(item) ===================================== gajim/roster_window.py ===================================== @@ -2113,10 +2113,6 @@ class RosterWindow: app.SHOW_LIST.index('invisible') app.connections[account].change_status(status, txt, auto) - if account in app.interface.status_sent_to_users: - app.interface.status_sent_to_users[account] = {} - if account in app.interface.status_sent_to_groups: - app.interface.status_sent_to_groups[account] = {} for gc_control in app.interface.msg_win_mgr.get_controls( message_control.TYPE_GC) + \ list(app.interface.minimized_controls[account].values()): @@ -3362,67 +3358,6 @@ class RosterWindow: 'offline.') % jids ConfirmationDialog(pritext, sectext, on_response_ok=on_ok2) - def on_send_custom_status(self, widget, contact_list, show, group=None): - """ - Send custom status - """ - # contact_list has only one element except if group != None - def on_response(message, pep_dict): - if message is None: # None if user pressed Cancel - return - account_list = [] - for (contact, account) in contact_list: - if account not in account_list: - account_list.append(account) - # 1. update status_sent_to_[groups|users] list - if group: - for account in account_list: - if account not in app.interface.status_sent_to_groups: - app.interface.status_sent_to_groups[account] = {} - app.interface.status_sent_to_groups[account][group] = show - else: - for (contact, account) in contact_list: - if account not in app.interface.status_sent_to_users: - app.interface.status_sent_to_users[account] = {} - app.interface.status_sent_to_users[account][contact.jid] \ - = show - - # 2. update privacy lists if main status is invisible - for account in account_list: - if app.SHOW_LIST[app.connections[account].connected] == \ - 'invisible': - con = app.connections[account] - con.get_module('PrivacyLists').set_invisible_rule() - - # 3. send directed presence - for (contact, account) in contact_list: - our_jid = app.get_jid_from_account(account) - jid = contact.jid - if jid == our_jid: - jid += '/' + contact.resource - self.send_status(account, show, message, to=jid) - - def send_it(is_checked=None): - if is_checked is not None: # dialog has been shown - if is_checked: # user does not want to be asked again - app.config.set('confirm_custom_status', 'no') - else: - app.config.set('confirm_custom_status', 'yes') - self.get_status_message(show, on_response, show_pep=False, - always_ask=True) - - confirm_custom_status = app.config.get('confirm_custom_status') - if confirm_custom_status == 'no': - send_it() - return - pritext = _('You are about to send a custom status. Are you sure you ' - 'want to continue?') - sectext = _('This contact will temporarily see you as %(status)s, ' - 'but only until you change your status. Then they will see ' - 'your global status.') % {'status': show} - ConfirmationDialogCheck(pritext, sectext, - _('_Do not ask me again'), on_response_ok=send_it) - def on_status_combobox_changed(self, widget): """ When we change our status via the combobox @@ -5025,30 +4960,13 @@ class RosterWindow: list_online, show_bookmarked=show_bookmarked) menu.append(invite_menuitem) - # Send Custom Status - send_custom_status_menuitem = Gtk.MenuItem.new_with_mnemonic( - _('Send Cus_tom Status')) - if helpers.group_is_blocked(account, group): - send_custom_status_menuitem.set_sensitive(False) - status_menuitems = Gtk.Menu() - send_custom_status_menuitem.set_submenu(status_menuitems) - for s in ('online', 'chat', 'away', 'xa', 'dnd', 'offline'): - status_menuitem = Gtk.MenuItem.new_with_label( - helpers.get_uf_show(s)) - status_menuitem.connect('activate', self.on_send_custom_status, - list_, s, group) - status_menuitems.append(status_menuitem) - menu.append(send_custom_status_menuitem) - # there is no singlemessage and custom status for zeroconf if app.config.get_per('accounts', account, 'is_zeroconf'): - send_custom_status_menuitem.set_sensitive(False) send_group_message_item.set_sensitive(False) if app.connections[account].connected < 2: send_group_message_item.set_sensitive(False) invite_menuitem.set_sensitive(False) - send_custom_status_menuitem.set_sensitive(False) if not group in helpers.special_groups: item = Gtk.SeparatorMenuItem.new() # separator ===================================== test/lib/gajim_mocks.py ===================================== @@ -104,7 +104,6 @@ class MockInterface(Mock): self.instances = {} self.minimized_controls = {} - self.status_sent_to_users = Mock() class MockLogger(Mock): View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/9f8492ae694f6d3dbb705f9b1d84f1ecc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/9f8492ae694f6d3dbb705f9b1d84f1ecc… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits May 2019