Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Add new extension point method
by Philipp Hörist 27 Jun '17

27 Jun '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 55889d04 by Philipp Hörist at 2017-06-27T20:51:55+02:00 Add new extension point method - - - - - 7 changed files: - src/chat_control.py - src/chat_control_base.py - src/common/connection.py - src/common/connection_handlers.py - src/conversation_textview.py - src/groupchat_control.py - src/plugins/pluginmanager.py Changes: ===================================== src/chat_control.py ===================================== --- a/src/chat_control.py +++ b/src/chat_control.py @@ -851,7 +851,7 @@ class ChatControl(ChatControlBase): 'authenticated': False} if self.encryption: - gajim.plugin_manager.gui_extension_point( + gajim.plugin_manager.extension_point( 'encryption_state' + self.encryption, self, encryption_state) self._show_lock_image(**encryption_state) @@ -877,7 +877,7 @@ class ChatControl(ChatControlBase): def _on_authentication_button_clicked(self, widget): if self.encryption: - gajim.plugin_manager.gui_extension_point( + gajim.plugin_manager.extension_point( 'encryption_dialog' + self.encryption, self) def send_message(self, message, keyID='', chatstate=None, xhtml=None, @@ -888,7 +888,7 @@ class ChatControl(ChatControlBase): if self.encryption: self.sendmessage = True - gajim.plugin_manager.gui_extension_point( + gajim.plugin_manager.extension_point( 'send_message' + self.encryption, self) if not self.sendmessage: return @@ -1399,7 +1399,7 @@ class ChatControl(ChatControlBase): def _on_message_tv_buffer_changed(self, textbuffer): super()._on_message_tv_buffer_changed(textbuffer) if textbuffer.get_char_count() and self.encryption: - gajim.plugin_manager.gui_extension_point( + gajim.plugin_manager.extension_point( 'typing' + self.encryption, self) if (not self.session or not self.session.status) and \ gajim.connections[self.account].archiving_136_supported: ===================================== src/chat_control_base.py ===================================== --- a/src/chat_control_base.py +++ b/src/chat_control_base.py @@ -527,8 +527,6 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): self) gajim.plugin_manager.remove_gui_extension_point( 'chat_control_base_draw_banner', self) - gajim.plugin_manager.remove_gui_extension_point('print_special_text', - self) gajim.ged.remove_event_handler('our-show', ged.GUI1, self._nec_our_status) ===================================== src/common/connection.py ===================================== --- a/src/common/connection.py +++ b/src/common/connection.py @@ -2039,7 +2039,7 @@ class Connection(CommonConnection, ConnectionHandlers): config_key = '%s-%s' % (self.name, obj.jid) encryption = gajim.config.get_per('encryption', config_key, 'encryption') if encryption: - gajim.plugin_manager.gui_extension_point( + gajim.plugin_manager.extension_point( 'encrypt' + encryption, self, obj, self.send_message) else: self.send_message(obj) @@ -2646,7 +2646,7 @@ class Connection(CommonConnection, ConnectionHandlers): config_key = '%s-%s' % (self.name, obj.jid) encryption = gajim.config.get_per('encryption', config_key, 'encryption') if encryption: - gajim.plugin_manager.gui_extension_point( + gajim.plugin_manager.extension_point( 'gc_encrypt' + encryption, self, obj, self.send_gc_message) else: self.send_gc_message(obj) ===================================== src/common/connection_handlers.py ===================================== --- a/src/common/connection_handlers.py +++ b/src/common/connection_handlers.py @@ -1084,7 +1084,7 @@ class ConnectionHandlersBase: if obj.conn.name != self.name: return - gajim.plugin_manager.gui_extension_point( + gajim.plugin_manager.extension_point( 'decrypt', self, obj, self._on_message_received) if not obj.encrypted: self._on_message_received(obj) ===================================== src/conversation_textview.py ===================================== --- a/src/conversation_textview.py +++ b/src/conversation_textview.py @@ -822,7 +822,7 @@ class ConversationTextview(GObject.GObject): return True else: self.plugin_modified = False - gajim.plugin_manager.gui_extension_point( + gajim.plugin_manager.extension_point( 'hyperlink_handler', word, kind, self, self.tv.get_toplevel()) if self.plugin_modified: @@ -920,7 +920,7 @@ class ConversationTextview(GObject.GObject): # PluginSystem: adding GUI extension point for ConversationTextview self.plugin_modified = False - gajim.plugin_manager.gui_extension_point('print_special_text', self, + gajim.plugin_manager.extension_point('print_special_text', self, special_text, other_tags, graphics, additional_data) if self.plugin_modified: return @@ -1397,7 +1397,7 @@ class ConversationTextview(GObject.GObject): # PluginSystem: adding GUI extension point for ConversationTextview self.plugin_modified = False - gajim.plugin_manager.gui_extension_point('print_real_text', self, + gajim.plugin_manager.extension_point('print_real_text', self, text, text_tags, graphics, iter_, additional_data) if self.plugin_modified: ===================================== src/groupchat_control.py ===================================== --- a/src/groupchat_control.py +++ b/src/groupchat_control.py @@ -776,7 +776,7 @@ class GroupchatControl(ChatControlBase): 'authenticated': False} if self.encryption: - gajim.plugin_manager.gui_extension_point( + gajim.plugin_manager.extension_point( 'encryption_state' + self.encryption, self, encryption_state) self._show_lock_image(**encryption_state) @@ -802,7 +802,7 @@ class GroupchatControl(ChatControlBase): self.lock_image.set_sensitive(visible) def _on_authentication_button_clicked(self, widget): - gajim.plugin_manager.gui_extension_point( + gajim.plugin_manager.extension_point( 'encryption_dialog' + self.encryption, self) def _change_style(self, model, path, iter_, option): @@ -2022,7 +2022,7 @@ class GroupchatControl(ChatControlBase): if self.encryption: self.sendmessage = True - gajim.plugin_manager.gui_extension_point( + gajim.plugin_manager.extension_point( 'send_message' + self.encryption, self) if not self.sendmessage: return ===================================== src/plugins/pluginmanager.py ===================================== --- a/src/plugins/pluginmanager.py +++ b/src/plugins/pluginmanager.py @@ -158,6 +158,26 @@ class PluginManager(metaclass=Singleton): return None @log_calls('PluginManager') + def extension_point(self, gui_extpoint_name, *args): + ''' + Invokes all handlers (from plugins) for a particular extension point, but + doesnt add it to collection for further processing. + For example if you pass a message for encryption via extension point to a + plugin, its undesired that the call is stored and replayed on activating the + plugin. For example after an update. + + :param gui_extpoint_name: name of GUI extension point. + :type gui_extpoint_name: str + :param args: parameters to be passed to extension point handlers + (typically and object that invokes `gui_extension_point`; + however, this can be practically anything) + :type args: tuple + ''' + + self._execute_all_handlers_of_gui_extension_point(gui_extpoint_name, + *args) + + @log_calls('PluginManager') def gui_extension_point(self, gui_extpoint_name, *args): ''' Invokes all handlers (from plugins) for particular GUI extension point View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/55889d045fb0fffebb8f9d4e2b60380be6…

1 0

[Git][gajim/gajim][master] Better error message why pgp is not working
by Philipp Hörist 26 Jun '17

26 Jun '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1a2d32fc by Philipp Hörist at 2017-06-26T18:09:15+02:00 Better error message why pgp is not working - - - - - 1 changed file: - src/roster_window.py Changes: ===================================== src/roster_window.py ===================================== --- a/src/roster_window.py +++ b/src/roster_window.py @@ -2130,8 +2130,9 @@ class RosterWindow: keyid = gajim.config.get_per('accounts', account, 'keyid') if keyid and not gajim.connections[account].gpg: dialogs.WarningDialog(_('OpenPGP is not usable'), - _('You will be connected to %s without OpenPGP.') % \ - account) + _('Gajim needs python-gnupg >= 0.3.8\n' + 'Beware there is an incompatible python package called gnupg.\n' + 'You will be connected to %s without OpenPGP.') % account) self.send_status_continue(account, status, txt, auto, to) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1a2d32fca522fc3eb43c2bdce07d15b70d…

1 0

[Git][gajim/gajim][master] Set password also on connection object on change
by Philipp Hörist 25 Jun '17

25 Jun '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7a6d7bae by Philipp Hörist at 2017-06-25T23:14:35+02:00 Set password also on connection object on change - - - - - 1 changed file: - src/common/passwords.py Changes: ===================================== src/common/passwords.py ===================================== --- a/src/common/passwords.py +++ b/src/common/passwords.py @@ -170,4 +170,6 @@ def get_password(account_name): return get_storage().get_password(account_name) def save_password(account_name, password): + if account_name in gajim.connections: + gajim.connections[account_name].set_password(password) return get_storage().save_password(account_name, password) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7a6d7baebc87bc690826151190eccfd2e9…

1 0

[Git][gajim/gajim][master] Fix plugin installation from zip
by Philipp Hörist 25 Jun '17

25 Jun '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6a49e2d8 by Philipp Hörist at 2017-06-25T22:34:14+02:00 Fix plugin installation from zip - - - - - 2 changed files: - src/plugins/gui.py - src/plugins/pluginmanager.py Changes: ===================================== src/plugins/gui.py ===================================== --- a/src/plugins/gui.py +++ b/src/plugins/gui.py @@ -281,7 +281,7 @@ class PluginsWindow(object): for i, row in enumerate(model): if plugin == row[Column.PLUGIN]: - model.remove(model.get_iter((i, Column.PLUGIN))) + model.remove(row.iter) break iter_ = model.append([plugin, plugin.name, False, @@ -308,7 +308,7 @@ class PluginsWindow(object): return model = self.installed_plugins_model iter_ = model.append([plugin, plugin.name, False, - plugin.activatable], self.get_plugin_icon(plugin)) + plugin.activatable, self.get_plugin_icon(plugin)]) sel = self.installed_plugins_treeview.get_selection() sel.select_iter(iter_) ===================================== src/plugins/pluginmanager.py ===================================== --- a/src/plugins/pluginmanager.py +++ b/src/plugins/pluginmanager.py @@ -573,7 +573,7 @@ class PluginManager(metaclass=Singleton): def install_from_zip(self, zip_filename, owerwrite=None): ''' - Install plagin from zip and return plugin + Install plugin from zip and return plugin ''' try: zip_file = zipfile.ZipFile(zip_filename) @@ -595,7 +595,7 @@ class PluginManager(metaclass=Singleton): # members not safe raise PluginsystemError(_('Archive is malformed')) if filename.endswith('/') and filename.find('/', 0, -1) < 0: - dirs.append(filename) + dirs.append(filename.strip('/')) if 'manifest.ini' in filename.split('/')[1]: manifest = True if not manifest: @@ -614,8 +614,8 @@ class PluginManager(metaclass=Singleton): zip_file.extractall(user_dir) zip_file.close() - path = os.path.join(user_dir, dirs[0]) - plugins = self.scan_dir_for_plugins(plugin_dir, False) + + plugins = self.scan_dir_for_plugins(plugin_dir, package=True) if not plugins: return self.add_plugin(plugins[0]) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6a49e2d869d4e04b7fac56465182fac65b…

1 0

[Git][gajim/gajim][master] Add tooltip for encryption button
by Philipp Hörist 25 Jun '17

25 Jun '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: b5d3578e by Philipp Hörist at 2017-06-25T18:06:46+02:00 Add tooltip for encryption button Fixes #8663 - - - - - 2 changed files: - data/gui/chat_control.ui - data/gui/groupchat_control.ui Changes: ===================================== data/gui/chat_control.ui ===================================== --- a/data/gui/chat_control.ui +++ b/data/gui/chat_control.ui @@ -944,6 +944,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Choose an encryption</property> <property name="relief">none</property> <child> <object class="GtkImage"> ===================================== data/gui/groupchat_control.ui ===================================== --- a/data/gui/groupchat_control.ui +++ b/data/gui/groupchat_control.ui @@ -438,6 +438,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Choose an encryption</property> <property name="relief">none</property> <child> <object class="GtkImage"> View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b5d3578e39b94e4f87c5a933557766d269…

1 0

[Git][gajim/python-nbxmpp][master] Update ChangeLog
by Philipp Hörist 18 Jun '17

18 Jun '17

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 4ce30160 by Philipp Hörist at 2017-06-18T13:44:47+02:00 Update ChangeLog - - - - - 1 changed file: - ChangeLog Changes: ===================================== ChangeLog ===================================== --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +python-nbxmpp 0.x.x (tbd) + + * Add new XEP Namespaces for Jingle and Hashes + python-nbxmpp 0.5.6 (03 June 2017) * Support XEP-0198 Version 1.5.2 View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/4ce3016001112f7cc2c579bc2f…

1 0

[Git][gajim/gajim][master] Support IPV6 and IPV4 domainparts
by Philipp Hörist 16 Jun '17

16 Jun '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 49a78ae8 by Philipp Hörist at 2017-06-16T23:40:42+02:00 Support IPV6 and IPV4 domainparts https://tools.ietf.org/html/rfc7622#section-3.2 - - - - - 1 changed file: - src/common/helpers.py Changes: ===================================== src/common/helpers.py ===================================== --- a/src/common/helpers.py +++ b/src/common/helpers.py @@ -173,6 +173,35 @@ def prep(user, server, resource): """ # This function comes from #http://svn.twistedmatrix.com/cvs/trunk/twisted/words/protocols/jabber/jid.py + + ip_address = False + + try: + socket.inet_aton(server) + ip_address = True + except socket.error: + pass + + if not ip_address and hasattr(socket, 'inet_pton'): + try: + socket.inet_pton(socket.AF_INET6, server.strip('[]')) + server = '[%s]' % server.strip('[]') + ip_address = True + except (socket.error, ValueError): + pass + + if not ip_address: + if server is not None: + if len(server) < 1 or len(server) > 1023: + raise InvalidFormat(_('Server must be between 1 and 1023 chars')) + try: + from nbxmpp.stringprepare import nameprep + server = nameprep.prepare(server) + except UnicodeError: + raise InvalidFormat(_('Invalid character in hostname.')) + else: + raise InvalidFormat(_('Server address required.')) + if user is not None: if len(user) < 1 or len(user) > 1023: raise InvalidFormat(_('Username must be between 1 and 1023 chars')) @@ -184,17 +213,6 @@ def prep(user, server, resource): else: user = None - if server is not None: - if len(server) < 1 or len(server) > 1023: - raise InvalidFormat(_('Server must be between 1 and 1023 chars')) - try: - from nbxmpp.stringprepare import nameprep - server = nameprep.prepare(server) - except UnicodeError: - raise InvalidFormat(_('Invalid character in hostname.')) - else: - raise InvalidFormat(_('Server address required.')) - if resource is not None: if len(resource) < 1 or len(resource) > 1023: raise InvalidFormat(_('Resource must be between 1 and 1023 chars')) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/49a78ae8ed999ee8866ea570746b9c1b61…

1 0

[Git][gajim/gajim][master] 9 commits: Synchronise hashes support with XEP-0300 in Jingle
by Yann Leboulanger 16 Jun '17

16 Jun '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 2b9f9f3b by Emmanuel Gil Peyrot at 2017-06-14T20:26:37+01:00 Synchronise hashes support with XEP-0300 in Jingle - - - - - 71f0e40c by Emmanuel Gil Peyrot at 2017-06-14T20:26:37+01:00 Update JingleFT to its latest experimental version - - - - - 8356256f by Emmanuel Gil Peyrot at 2017-06-14T20:29:52+01:00 Update to XEP-0300 version 0.5 (:2 namespace). - - - - - 09e6cfbb by Emmanuel Gil Peyrot at 2017-06-14T20:31:29+01:00 Update to XEP-0234 version 0.18.0 (:5 namespace). - - - - - 785a0b61 by Emmanuel Gil Peyrot at 2017-06-14T20:47:41+01:00 Update to XEP-0300 version 0.5 (:2 namespace). - - - - - aad5c160 by Emmanuel Gil Peyrot at 2017-06-14T20:47:41+01:00 Update to XEP-0234 version 0.18.0 (:5 namespace). - - - - - 5606e5b9 by Yann Leboulanger at 2017-06-14T22:32:21+02:00 Merge branch 'jingleft' of https://dev.gajim.org/linkmauve/gajim into HEAD - - - - - 7f4e9306 by Yann Leboulanger at 2017-06-16T21:15:24+02:00 do not decode received data via IBB before writing them to a file - - - - - 46506150 by Yann Leboulanger at 2017-06-16T21:19:38+02:00 Merge branch 'jingleft' into 'master' Update JingleFT support, and fix sending files See merge request !89 - - - - - 14 changed files: - src/chat_control.py - src/common/caps_cache.py - src/common/connection_handlers.py - src/common/connection_handlers_events.py - src/common/gajim.py - src/common/helpers.py - src/common/jingle.py - src/common/jingle_content.py - src/common/jingle_ft.py - src/common/jingle_session.py - src/common/protocol/bytestream.py - src/filetransfers_window.py - src/gui_interface.py - src/gui_menu_builder.py Changes: ===================================== src/chat_control.py ===================================== --- a/src/chat_control.py +++ b/src/chat_control.py @@ -51,7 +51,7 @@ from common.logger import KindConstant from nbxmpp.protocol import NS_XHTML, NS_XHTML_IM, NS_FILE, NS_MUC from nbxmpp.protocol import NS_ESESSION from nbxmpp.protocol import NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO -from nbxmpp.protocol import NS_JINGLE_ICE_UDP, NS_JINGLE_FILE_TRANSFER +from nbxmpp.protocol import NS_JINGLE_ICE_UDP, NS_JINGLE_FILE_TRANSFER_5 from nbxmpp.protocol import NS_CHATSTATES from common.connection_handlers_events import MessageOutgoingEvent from common.exceptions import GajimGeneralException @@ -387,7 +387,7 @@ class ChatControl(ChatControlBase): # Send file if ((self.contact.supports(NS_FILE) or \ - self.contact.supports(NS_JINGLE_FILE_TRANSFER)) and \ + self.contact.supports(NS_JINGLE_FILE_TRANSFER_5)) and \ (self.type_id == 'chat' or self.gc_contact.resource)) and \ self.contact.show != 'offline': self._send_file_button.set_sensitive(True) @@ -395,7 +395,7 @@ class ChatControl(ChatControlBase): else: self._send_file_button.set_sensitive(False) if not (self.contact.supports(NS_FILE) or self.contact.supports( - NS_JINGLE_FILE_TRANSFER)): + NS_JINGLE_FILE_TRANSFER_5)): self._send_file_button.set_tooltip_text(_( "This contact does not support file transfer.")) else: ===================================== src/common/caps_cache.py ===================================== --- a/src/common/caps_cache.py +++ b/src/common/caps_cache.py @@ -39,11 +39,11 @@ log = logging.getLogger('gajim.c.caps_cache') from nbxmpp import (NS_XHTML_IM, NS_ESESSION, NS_CHATSTATES, NS_JINGLE_ICE_UDP, NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO, - NS_JINGLE_FILE_TRANSFER) + NS_JINGLE_FILE_TRANSFER_5) # Features where we cannot safely assume that the other side supports them FEATURE_BLACKLIST = [NS_CHATSTATES, NS_XHTML_IM, NS_ESESSION, NS_JINGLE_ICE_UDP, NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO, - NS_JINGLE_FILE_TRANSFER] + NS_JINGLE_FILE_TRANSFER_5] # Query entry status codes NEW = 0 ===================================== src/common/connection_handlers.py ===================================== --- a/src/common/connection_handlers.py +++ b/src/common/connection_handlers.py @@ -187,7 +187,7 @@ class ConnectionDisco: query.setAttr('node', 'http://gajim.org#' + gajim.version.split('-', 1)[ 0]) for f in (nbxmpp.NS_BYTESTREAM, nbxmpp.NS_SI, nbxmpp.NS_FILE, - nbxmpp.NS_COMMANDS, nbxmpp.NS_JINGLE_FILE_TRANSFER, + nbxmpp.NS_COMMANDS, nbxmpp.NS_JINGLE_FILE_TRANSFER_5, nbxmpp.NS_JINGLE_XTLS, nbxmpp.NS_PUBKEY_PUBKEY, nbxmpp.NS_PUBKEY_REVOKE, nbxmpp.NS_PUBKEY_ATTEST): feature = nbxmpp.Node('feature') ===================================== src/common/connection_handlers_events.py ===================================== --- a/src/common/connection_handlers_events.py +++ b/src/common/connection_handlers_events.py @@ -2306,12 +2306,12 @@ class FileRequestReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): self.file_props.session_type = 'jingle' self.file_props.stream_methods = nbxmpp.NS_BYTESTREAM desc = self.jingle_content.getTag('description') - if desc.getTag('offer'): - file_tag = desc.getTag('offer').getTag('file') + 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() else: - file_tag = desc.getTag('request').getTag('file') + file_tag = desc.getTag('file') h = file_tag.getTag('hash') h = h.getData() if h else None n = file_tag.getTag('name') ===================================== src/common/gajim.py ===================================== --- a/src/common/gajim.py +++ b/src/common/gajim.py @@ -253,7 +253,7 @@ gajim_common_features = [nbxmpp.NS_BYTESTREAM, nbxmpp.NS_SI, nbxmpp.NS_FILE, nbxmpp.NS_REGISTER, nbxmpp.NS_VERSION, nbxmpp.NS_DATA, nbxmpp.NS_ENCRYPTED, 'msglog', 'sslc2s', 'stringprep', nbxmpp.NS_PING, nbxmpp.NS_TIME_REVISED, nbxmpp.NS_SSN, nbxmpp.NS_MOOD, nbxmpp.NS_ACTIVITY, nbxmpp.NS_NICK, - nbxmpp.NS_ROSTERX, nbxmpp.NS_SECLABEL, nbxmpp.NS_HASHES, + nbxmpp.NS_ROSTERX, nbxmpp.NS_SECLABEL, nbxmpp.NS_HASHES_2, nbxmpp.NS_HASHES_MD5, nbxmpp.NS_HASHES_SHA1, nbxmpp.NS_HASHES_SHA256, nbxmpp.NS_HASHES_SHA512, nbxmpp.NS_CONFERENCE] ===================================== src/common/helpers.py ===================================== --- a/src/common/helpers.py +++ b/src/common/helpers.py @@ -1289,7 +1289,7 @@ def update_optional_features(account = None): gajim.gajim_optional_features[a].append(nbxmpp.NS_JINGLE_RTP_VIDEO) gajim.gajim_optional_features[a].append(nbxmpp.NS_JINGLE_ICE_UDP) gajim.gajim_optional_features[a].append( - nbxmpp.NS_JINGLE_FILE_TRANSFER) + nbxmpp.NS_JINGLE_FILE_TRANSFER_5) gajim.gajim_optional_features[a].append(nbxmpp.NS_JINGLE_XTLS) gajim.gajim_optional_features[a].append(nbxmpp.NS_JINGLE_BYTESTREAM) gajim.gajim_optional_features[a].append(nbxmpp.NS_JINGLE_IBB) ===================================== src/common/jingle.py ===================================== --- a/src/common/jingle.py +++ b/src/common/jingle.py @@ -172,15 +172,19 @@ class ConnectionJingle(object): return c.transport.sid def __hash_support(self, contact): - if contact.supports(nbxmpp.NS_HASHES): - if contact.supports(nbxmpp.NS_HASHES_SHA512): + if contact.supports(nbxmpp.NS_HASHES_2): + if contact.supports(nbxmpp.NS_HASHES_BLAKE2B_512): + return 'blake2b-512' + elif contact.supports(nbxmpp.NS_HASHES_BLAKE2B_256): + return 'blake2b-256' + elif contact.supports(nbxmpp.NS_HASHES_SHA3_512): + return 'sha3-512' + elif contact.supports(nbxmpp.NS_HASHES_SHA3_256): + return 'sha3-256' + elif contact.supports(nbxmpp.NS_HASHES_SHA512): return 'sha-512' elif contact.supports(nbxmpp.NS_HASHES_SHA256): return 'sha-256' - elif contact.supports(nbxmpp.NS_HASHES_SHA1): - return 'sha-1' - elif contact.supports(nbxmpp.NS_HASHES_MD5): - return 'md5' return None def iter_jingle_sessions(self, jid, sid=None, media=None): ===================================== src/common/jingle_content.py ===================================== --- a/src/common/jingle_content.py +++ b/src/common/jingle_content.py @@ -175,12 +175,8 @@ class JingleContent: def _fill_content(self, content): description_node = nbxmpp.simplexml.Node( - tag=nbxmpp.NS_JINGLE_FILE_TRANSFER + ' description') - if self.session.werequest: - simode = nbxmpp.simplexml.Node(tag='request') - else: - simode = nbxmpp.simplexml.Node(tag='offer') - file_tag = simode.setTag('file') + tag=nbxmpp.NS_JINGLE_FILE_TRANSFER_5 + ' description') + file_tag = description_node.setTag('file') if self.file_props.name: node = nbxmpp.simplexml.Node(tag='name') node.addData(self.file_props.name) @@ -196,7 +192,7 @@ class JingleContent: if self.file_props.type_ == 'r': if self.file_props.hash_: file_tag.addChild('hash', attrs={'algo': self.file_props.algo}, - namespace=nbxmpp.NS_HASHES, + namespace=nbxmpp.NS_HASHES_2, payload=self.file_props.hash_) else: # if the file is less than 10 mb, then it is small @@ -217,7 +213,6 @@ class JingleContent: desc = file_tag.setTag('desc') if self.file_props.desc: desc.setData(self.file_props.desc) - description_node.addChild(node=simode) if self.use_security: security = nbxmpp.simplexml.Node( tag=nbxmpp.NS_JINGLE_XTLS + ' security') ===================================== src/common/jingle_ft.py ===================================== --- a/src/common/jingle_ft.py +++ b/src/common/jingle_ft.py @@ -155,7 +155,7 @@ class JingleFileTransfer(JingleContent): checksum = nbxmpp.Node(tag='checksum', payload=[nbxmpp.Node(tag='file', payload=[self._compute_hash()])]) - checksum.setNamespace(nbxmpp.NS_JINGLE_FILE_TRANSFER) + checksum.setNamespace(nbxmpp.NS_JINGLE_FILE_TRANSFER_5) self.session.__session_info(checksum) pjid = gajim.get_jid_without_resource(self.session.peerjid) file_info = {'name' : self.file_props.name, @@ -176,7 +176,7 @@ class JingleFileTransfer(JingleContent): except IOError: # can't open file return - h = nbxmpp.Hashes() + h = nbxmpp.Hashes2() hash_ = h.calculateHash(self.file_props.algo, file_) file_.close() # DEBUG @@ -410,4 +410,4 @@ class JingleFileTransfer(JingleContent): def get_content(desc): return JingleFileTransfer -contents[nbxmpp.NS_JINGLE_FILE_TRANSFER] = get_content +contents[nbxmpp.NS_JINGLE_FILE_TRANSFER_5] = get_content ===================================== src/common/jingle_session.py ===================================== --- a/src/common/jingle_session.py +++ b/src/common/jingle_session.py @@ -444,9 +444,9 @@ class JingleSession: for child in payload: if child.getName() == 'checksum': hash_ = child.getTag('file').getTag(name='hash', - namespace=nbxmpp.NS_HASHES) + namespace=nbxmpp.NS_HASHES_2) algo = hash_.getAttr('algo') - if algo in nbxmpp.Hashes.supported: + if algo in nbxmpp.Hashes2.supported: file_props = FilesProp.getFileProp(self.connection.name, self.sid) file_props.algo = algo ===================================== src/common/protocol/bytestream.py ===================================== --- a/src/common/protocol/bytestream.py +++ b/src/common/protocol/bytestream.py @@ -926,10 +926,10 @@ class ConnectionIBBytestream(ConnectionBytestream): log.debug('ReceiveHandler called sid->%s seq->%s' % (sid, seq)) try: seq = int(seq) - data = base64.b64decode(data.encode('utf-8')).decode('utf-8') + data = base64.b64decode(data.encode('utf-8')) except Exception: seq = '' - data = '' + data = b'' err = None file_props = FilesProp.getFilePropByTransportSid(self.name, sid) if file_props is None: ===================================== src/filetransfers_window.py ===================================== --- a/src/filetransfers_window.py +++ b/src/filetransfers_window.py @@ -40,7 +40,7 @@ from common import helpers from common.file_props import FilesProp from common.protocol.bytestream import (is_transfer_active, is_transfer_paused, is_transfer_stopped) -from nbxmpp.protocol import NS_JINGLE_FILE_TRANSFER +from nbxmpp.protocol import NS_JINGLE_FILE_TRANSFER_5 import logging log = logging.getLogger('gajim.filetransfer_window') @@ -357,7 +357,7 @@ class FileTransfersWindow: file_path, file_name, file_desc) if file_props is None: return False - if contact.supports(NS_JINGLE_FILE_TRANSFER): + if contact.supports(NS_JINGLE_FILE_TRANSFER_5): log.info("contact %s supports jingle file transfer"%(contact.get_full_jid())) gajim.connections[account].start_file_transfer(contact.get_full_jid(), file_props) ===================================== src/gui_interface.py ===================================== --- a/src/gui_interface.py +++ b/src/gui_interface.py @@ -73,7 +73,7 @@ from session import ChatControlSession from common import sleepy from nbxmpp import idlequeue -from nbxmpp import Hashes +from nbxmpp import Hashes2 from common.zeroconf import connection_zeroconf from common import resolver from common import caps_cache @@ -988,7 +988,7 @@ class Interface: session = gajim.connections[account].get_jingle_session(jid=None, sid=file_props.sid) ft_win = self.instances['file_transfers'] - h = Hashes() + h = Hashes2() try: file_ = open(file_props.file_name, 'rb') except: ===================================== src/gui_menu_builder.py ===================================== --- a/src/gui_menu_builder.py +++ b/src/gui_menu_builder.py @@ -27,7 +27,7 @@ from common import gajim from common import helpers from common import i18n from nbxmpp.protocol import NS_COMMANDS, NS_FILE, NS_MUC, NS_ESESSION -from nbxmpp.protocol import NS_JINGLE_FILE_TRANSFER, NS_CONFERENCE +from nbxmpp.protocol import NS_JINGLE_FILE_TRANSFER_5, NS_CONFERENCE from gtkgui_helpers import get_action def build_resources_submenu(contacts, account, action, room_jid=None, @@ -260,7 +260,7 @@ control=None, gc_contact=None, is_anonymous=True): else: start_chat_menuitem.connect('activate', gajim.interface.on_open_chat_window, contact, account) - if contact.supports(NS_FILE) or contact.supports(NS_JINGLE_FILE_TRANSFER): + if contact.supports(NS_FILE) or contact.supports(NS_JINGLE_FILE_TRANSFER_5): send_file_menuitem.set_sensitive(True) send_file_menuitem.connect('activate', roster.on_send_file_menuitem_activate, contact, account) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/44430988a5d04cc763a10b1a6008a4430…

1 0

[Git][gajim/gajim][master] update dep list
by Yann Leboulanger 14 Jun '17

14 Jun '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 44430988 by Yann Leboulanger at 2017-06-14T21:39:12+02:00 update dep list - - - - - 1 changed file: - README Changes: ===================================== README ===================================== --- a/README +++ b/README @@ -16,6 +16,7 @@ <ul> <li>python3.4 or higher</li> <li>python3-gi</li> +<li>python3-gi-cairo</li> <li>gir1.2-gtk-3.0</li> <li>python-nbxmpp</li> </ul> @@ -43,6 +44,8 @@ <h2>Compile-time Requirements</h2> <ul> <li>intltool (>= 0.40.1)</li> +<li>pkg-config</li> +<li>libtool</li> </ul> <p><strong>NOTE:</strong> If you still have problems compiling, you may want to try removing the gtk1 series of the above dependencies.</p> View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/44430988a5d04cc763a10b1a6008a4430d…

1 0

[Git][gajim/python-nbxmpp][master] 4 commits: Fix the namespace of the XEP-0300 hashes
by Yann Leboulanger 14 Jun '17

14 Jun '17

Yann Leboulanger pushed to branch master at gajim / python-nbxmpp Commits: f3e5659c by Emmanuel Gil Peyrot at 2017-06-14T20:20:39+01:00 Fix the namespace of the XEP-0300 hashes It was taken from a wrong example instead of from the registry. - - - - - 997b3516 by Emmanuel Gil Peyrot at 2017-06-14T20:22:03+01:00 Update JingleFT and Hashes to their latest experimental version - - - - - cbc2bae8 by Emmanuel Gil Peyrot at 2017-06-14T20:22:03+01:00 Update hash calculation to the latest recommendation - - - - - ce015edb by Yann Leboulanger at 2017-06-14T21:27:19+02:00 Merge branch 'jingleft' into 'master' Update JingleFT and Hashes to their latest experimental version See merge request !7 - - - - - 1 changed file: - nbxmpp/protocol.py Changes: ===================================== nbxmpp/protocol.py ===================================== --- a/nbxmpp/protocol.py +++ b/nbxmpp/protocol.py @@ -24,6 +24,7 @@ from .simplexml import Node, NodeBuilder import time import string import hashlib +from base64 import b64encode def ascii_upper(s): return s.upper() @@ -95,7 +96,8 @@ NS_JINGLE_ERRORS = 'urn:xmpp:jingle:errors:1' # XEP-0166 NS_JINGLE_RTP = 'urn:xmpp:jingle:apps:rtp:1' # XEP-0167 NS_JINGLE_RTP_AUDIO = 'urn:xmpp:jingle:apps:rtp:audio' # XEP-0167 NS_JINGLE_RTP_VIDEO = 'urn:xmpp:jingle:apps:rtp:video' # XEP-0167 -NS_JINGLE_FILE_TRANSFER ='urn:xmpp:jingle:apps:file-transfer:3' # XEP-0234 +NS_JINGLE_FILE_TRANSFER = 'urn:xmpp:jingle:apps:file-transfer:3' # XEP-0234 +NS_JINGLE_FILE_TRANSFER_5 = 'urn:xmpp:jingle:apps:file-transfer:5' # XEP-0234 NS_JINGLE_XTLS='urn:xmpp:jingle:security:xtls:0' # XTLS: EXPERIMENTAL security layer of jingle NS_JINGLE_RAW_UDP = 'urn:xmpp:jingle:transports:raw-udp:1' # XEP-0177 NS_JINGLE_ICE_UDP = 'urn:xmpp:jingle:transports:ice-udp:1' # XEP-0176 @@ -173,10 +175,15 @@ NS_PUBKEY_REVOKE = 'urn:xmpp:revoke:2' NS_PUBKEY_ATTEST = 'urn:xmpp:attest:2' NS_STREAM_MGMT = 'urn:xmpp:sm:3' # XEP-198 NS_HASHES = 'urn:xmpp:hashes:1' # XEP-300 -NS_HASHES_MD5 = 'urn:xmpp:hash-function-textual-names:md5' -NS_HASHES_SHA1 = 'urn:xmpp:hash-function-textual-names:sha-1' -NS_HASHES_SHA256 = 'urn:xmpp:hash-function-textual-names:sha-256' -NS_HASHES_SHA512 = 'urn:xmpp:hash-function-textual-names:sha-512' +NS_HASHES_2 = 'urn:xmpp:hashes:2' # XEP-300 +NS_HASHES_MD5 = 'urn:xmpp:hash-function-text-names:md5' +NS_HASHES_SHA1 = 'urn:xmpp:hash-function-text-names:sha-1' +NS_HASHES_SHA256 = 'urn:xmpp:hash-function-text-names:sha-256' +NS_HASHES_SHA512 = 'urn:xmpp:hash-function-text-names:sha-512' +NS_HASHES_SHA3_256 = 'urn:xmpp:hash-function-text-names:sha3-256' +NS_HASHES_SHA3_512 = 'urn:xmpp:hash-function-text-names:sha3-512' +NS_HASHES_BLAKE2B_256 = 'urn:xmpp:hash-function-text-names:id-blake2b256' +NS_HASHES_BLAKE2B_512 = 'urn:xmpp:hash-function-text-names:id-blake2b512' #xmpp_stream_error_conditions = ''' #bad-format -- -- -- The entity has sent XML that cannot be processed. @@ -1347,6 +1354,62 @@ class Hashes(Node): hash_ = hl.hexdigest() return hash_ +class Hashes2(Node): + """ + Hash elements for various XEPs as defined in XEP-300 + """ + + """ + RECOMENDED HASH USE: + Algorithm Support + MD2 MUST NOT + MD4 MUST NOT + MD5 MUST NOT + SHA-1 SHOULD NOT + SHA-256 MUST + SHA-512 SHOULD + SHA3-256 MUST + SHA3-512 SHOULD + BLAKE2b256 MUST + BLAKE2b512 SHOULD + """ + + supported = ('sha-256', 'sha-512', 'sha3-256', 'sha3-512', 'blake2b-256', 'blake2b-512') + + def __init__(self, nsp=NS_HASHES): + Node.__init__(self, None, {}, [], None, None, False, None) + self.setNamespace(nsp) + self.setName('hash') + + def calculateHash(self, algo, file_string): + """ + Calculate the hash and add it. It is preferable doing it here + instead of doing it all over the place in Gajim. + """ + hl = None + hash_ = None + if algo == 'sha-256': + hl = hashlib.sha256() + elif algo == 'sha-512': + hl = hashlib.sha512() + elif algo == 'sha3-256': + hl = hashlib.sha3_256() + elif algo == 'sha3-512': + hl = hashlib.sha3_512() + elif algo == 'blake2b-256': + hl = hashlib.blake2b(digest_size=32) + elif algo == 'blake2b-512': + hl = hashlib.blake2b(digest_size=64) + # file_string can be a string or a file + if hl is not None: + if isinstance(file_string, bytes): + hl.update(file_string) + else: # if it is a file + for line in file_string: + hl.update(line) + hash_ = b64encode(hl.digest()).decode('ascii') + return hash_ + def addHash(self, hash_, algo): self.setAttr('algo', algo) self.setData(hash_) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/5300788382de00698213167ad…

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits