Commits

commits@gajim.org

17632 discussions

gajim: fix receiving highlighted corrected message. Fixes #7431
by Gajim 27 Mar '14

27 Mar '14

changeset 3450c48ddb75 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=3450c48ddb75 description: fix receiving highlighted corrected message. Fixes #7431 diffstat: src/conversation_textview.py | 6 ++++-- src/groupchat_control.py | 40 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 42 insertions(+), 4 deletions(-) diffs (73 lines): diff -r bb651151e276 -r 3450c48ddb75 src/conversation_textview.py --- a/src/conversation_textview.py Mon Jan 27 20:18:42 2014 +0100 +++ b/src/conversation_textview.py Wed Jan 29 22:10:48 2014 +0100 @@ -479,7 +479,8 @@ self.last_sent_message_marks[1] = buffer_.create_mark(None, i2, left_gravity=True) - def correct_last_received_message(self, message, xhtml, name, old_txt): + def correct_last_received_message(self, message, xhtml, name, old_txt, + other_tags_for_name=[], other_tags_for_text=[]): if name not in self.last_received_message_marks: return m1 = self.last_received_message_marks[name][0] @@ -490,7 +491,8 @@ txt = buffer_.get_text(i1, i2, True) buffer_.delete(i1, i2) i2 = self.print_conversation_line(message, '', 'incoming', name, None, - xhtml=xhtml, iter_=i1) + other_tags_for_name=other_tags_for_name, + other_tags_for_text=other_tags_for_text, xhtml=xhtml, iter_=i1) tt_txt = _('Message was corrected. Last message was:\n %s') % \ GLib.markup_escape_text(old_txt) self.show_corrected_message_warning(i2, tt_txt) diff -r bb651151e276 -r 3450c48ddb75 src/groupchat_control.py --- a/src/groupchat_control.py Mon Jan 27 20:18:42 2014 +0100 +++ b/src/groupchat_control.py Wed Jan 29 22:10:48 2014 +0100 @@ -1035,8 +1035,44 @@ obj.xhtml_msgtxt, obj.nick, old_txt) else: old_txt = self.last_received_txt[obj.nick] - self.conv_textview.correct_last_received_message(obj.msgtxt, - obj.xhtml_msgtxt, obj.nick, old_txt) + (highlight, sound) = self.highlighting_for_message(obj.msgtxt, obj.timestamp) + other_tags_for_name = [] + other_tags_for_text = [] + if obj.nick in self.gc_custom_colors: + other_tags_for_name.append('gc_nickname_color_' + \ + str(self.gc_custom_colors[obj.nick])) + else: + self.gc_count_nicknames_colors += 1 + if self.gc_count_nicknames_colors == \ + self.number_of_colors: + self.gc_count_nicknames_colors = 0 + self.gc_custom_colors[obj.nick] = \ + self.gc_count_nicknames_colors + other_tags_for_name.append('gc_nickname_color_' + \ + str(self.gc_count_nicknames_colors)) + if highlight: + # muc-specific chatstate + if self.parent_win: + self.parent_win.redraw_tab(self, 'attention') + else: + self.attention_flag = True + other_tags_for_name.append('bold') + other_tags_for_text.append('marked') + + if obj.nick in self.attention_list: + self.attention_list.remove(obj.nick) + elif len(self.attention_list) > 6: + self.attention_list.pop(0) # remove older + self.attention_list.append(obj.nick) + + if obj.msgtxt.startswith('/me ') or \ + obj.msgtxt.startswith('/me\n'): + other_tags_for_text.append('gc_nickname_color_' + \ + str(self.gc_custom_colors[obj.nick])) + self.conv_textview.correct_last_received_message( + obj.msgtxt, obj.xhtml_msgtxt, obj.nick, old_txt, + other_tags_for_name=other_tags_for_name, + other_tags_for_text=other_tags_for_text) self.last_received_txt[obj.nick] = obj.msgtxt self.last_received_id[obj.nick] = obj.stanza.getID() return

1 0

gajim: don't allow to do ctrl+r when roster is hidden. See #7315
by Gajim 27 Mar '14

27 Mar '14

changeset bba1663fafb6 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=bba1663fafb6 description: don't allow to do ctrl+r when roster is hidden. See #7315 diffstat: data/gui/roster_window.ui | 1 + src/message_window.py | 6 ++++++ 2 files changed, 7 insertions(+), 0 deletions(-) diffs (41 lines): diff -r 3450c48ddb75 -r bba1663fafb6 data/gui/roster_window.ui --- a/data/gui/roster_window.ui Wed Jan 29 22:10:48 2014 +0100 +++ b/data/gui/roster_window.ui Wed Feb 05 12:46:48 2014 +0100 @@ -319,6 +319,7 @@ <child> <object class="GtkCheckMenuItem" id="show_roster_menuitem"> <property name="visible">True</property> + <property name="sensitive">False</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> <property name="label" translatable="yes">Show _Roster</property> diff -r 3450c48ddb75 -r bba1663fafb6 src/message_window.py --- a/src/message_window.py Wed Jan 29 22:10:48 2014 +0100 +++ b/src/message_window.py Wed Feb 05 12:46:48 2014 +0100 @@ -86,6 +86,8 @@ self.parent_paned = parent_paned self.notebook.reparent(self.parent_paned) self.parent_paned.pack2(self.notebook, resize=True, shrink=True) + gajim.interface.roster.xml.get_object('show_roster_menuitem').\ + set_sensitive(True) orig_window.destroy() del orig_window @@ -615,6 +617,8 @@ # Don't close parent window, just remove the child child = self.parent_paned.get_child2() self.parent_paned.remove(child) + gajim.interface.roster.xml.get_object('show_roster_menuitem').\ + set_sensitive(False) else: self.window.destroy() return # don't show_title, we are dead @@ -1261,6 +1265,8 @@ # Don't close parent window, just remove the child child = w.parent_paned.get_child2() w.parent_paned.remove(child) + gajim.interface.roster.xml.get_object('show_roster_menuitem').\ + set_sensitive(False) gtkgui_helpers.resize_window(w.window, gajim.config.get('roster_width'), gajim.config.get('roster_height'))

1 0

gajim: active plugin installer plugin by default if it's availab...
by Gajim 27 Mar '14

27 Mar '14

changeset eac993c50375 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=eac993c50375 description: active plugin installer plugin by default if it's available. Fixes #7655 diffstat: src/gui_interface.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diffs (14 lines): diff -r bba1663fafb6 -r eac993c50375 src/gui_interface.py --- a/src/gui_interface.py Wed Feb 05 12:46:48 2014 +0100 +++ b/src/gui_interface.py Wed Feb 12 14:04:19 2014 +0100 @@ -2754,6 +2754,10 @@ cfg_was_read = parser.read() + if not cfg_was_read: + # enable plugin_installer by default when creating config file + gajim.config.set_per('plugins', 'plugin_installer', 'active', True) + gajim.logger.reset_shown_unread_messages() # override logging settings from config (don't take care of '-q' option) if gajim.config.get('verbose'):

1 0

gajim: "A connection is not available" transient for chat contro...
by Gajim 27 Mar '14

27 Mar '14

changeset e6fabc5a3c35 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=e6fabc5a3c35 description: "A connection is not available" transient for chat control. Fixes#7098 diffstat: src/chat_control.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 1b1d2c5425a0 -r e6fabc5a3c35 src/chat_control.py --- a/src/chat_control.py Thu Jan 02 12:33:54 2014 +0400 +++ b/src/chat_control.py Fri Jan 03 14:17:40 2014 +0400 @@ -830,7 +830,8 @@ if gajim.connections[self.account].connected < 2 and send_message: # we are not connected dialogs.ErrorDialog(_('A connection is not available'), - _('Your message can not be sent until you are connected.')) + _('Your message can not be sent until you are connected.'), + transient_for=self.parent_win.window) send_message = False if send_message:

1 0

gajim: add paplay to the list of sound players. Fixes #7608
by Gajim 27 Mar '14

27 Mar '14

changeset a85ea64c7060 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=a85ea64c7060 description: add paplay to the list of sound players. Fixes #7608 diffstat: src/gui_interface.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diffs (16 lines): diff -r e6fabc5a3c35 -r a85ea64c7060 src/gui_interface.py --- a/src/gui_interface.py Fri Jan 03 14:17:40 2014 +0400 +++ b/src/gui_interface.py Sun Jan 05 23:03:43 2014 +0100 @@ -2980,9 +2980,11 @@ if gajim.config.get('soundplayer') == '': # only on first time Gajim starts - commands = ('aplay', 'play', 'ossplay') + commands = ('paplay', 'aplay', 'play', 'ossplay') for command in commands: if helpers.is_in_path(command): + if command == 'paplay': + command += ' -n gajim' if command in ('aplay', 'play'): command += ' -q' elif command == 'ossplay':

1 0

gajim: change variable name
by Gajim 27 Mar '14

27 Mar '14

changeset 4ce454f980c5 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=4ce454f980c5 description: change variable name diffstat: src/common/helpers.py | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diffs (65 lines): diff -r a85ea64c7060 -r 4ce454f980c5 src/common/helpers.py --- a/src/common/helpers.py Sun Jan 05 23:03:43 2014 +0100 +++ b/src/common/helpers.py Tue Jan 07 19:51:56 2014 +0100 @@ -717,49 +717,49 @@ path_to_soundfile = gajim.config.get_per('soundevents', event, 'path') play_sound_file(path_to_soundfile) -def check_soundfile_path(file, dirs=(gajim.gajimpaths.data_root, +def check_soundfile_path(file_, dirs=(gajim.gajimpaths.data_root, gajim.DATA_DIR)): """ Check if the sound file exists - :param file: the file to check, absolute or relative to 'dirs' path + :param file_: the file to check, absolute or relative to 'dirs' path :param dirs: list of knows paths to fallback if the file doesn't exists (eg: ~/.gajim/sounds/, DATADIR/sounds...). :return the path to file or None if it doesn't exists. """ - if not file: + if not file_: return None - elif os.path.exists(file): - return file + elif os.path.exists(file_): + return file_ for d in dirs: - d = os.path.join(d, 'sounds', file) + d = os.path.join(d, 'sounds', file_) if os.path.exists(d): return d return None -def strip_soundfile_path(file, dirs=(gajim.gajimpaths.data_root, +def strip_soundfile_path(file_, dirs=(gajim.gajimpaths.data_root, gajim.DATA_DIR), abs=True): """ Remove knowns paths from a sound file Filechooser returns absolute path. If path is a known fallback path, we remove it. So config have no hardcoded path to DATA_DIR and text in textfield is shorther. - param: file: the filename to strip. + param: file_: the filename to strip. param: dirs: list of knowns paths from which the filename should be stripped. param: abs: force absolute path on dirs """ - if not file: + if not file_: return None - name = os.path.basename(file) + name = os.path.basename(file_) for d in dirs: d = os.path.join(d, 'sounds', name) if abs: d = os.path.abspath(d) - if file == d: + if file_ == d: return name - return file + return file_ def play_sound_file(path_to_soundfile): if path_to_soundfile == 'beep':

1 0

gajim: force sending muc invitation to the jid/resource if we're...
by Gajim 27 Mar '14

27 Mar '14

changeset 2a3a84d4a33d in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=2a3a84d4a33d description: force sending muc invitation to the jid/resource if we're chatting with a specific resource. Fixes #7582 diffstat: src/gui_menu_builder.py | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diffs (39 lines): diff -r 4ce454f980c5 -r 2a3a84d4a33d src/gui_menu_builder.py --- a/src/gui_menu_builder.py Tue Jan 07 19:51:56 2014 +0100 +++ b/src/gui_menu_builder.py Mon Jan 13 20:25:07 2014 +0100 @@ -64,9 +64,11 @@ return sub_menu def build_invite_submenu(invite_menuitem, list_, ignore_rooms=[], -show_bookmarked=False): +show_bookmarked=False, force_resource=False): """ list_ in a list of (contact, account) + force_resource means we want to send invitation even if there is only one + resource """ roster = gajim.interface.roster # used if we invite only one contact with several resources @@ -104,7 +106,7 @@ elif len(list_) == 1 and contact.supports(NS_MUC): invite_menuitem.set_sensitive(True) # use resource if it's self contact - if contact.jid == gajim.get_jid_from_account(account): + if contact.jid == gajim.get_jid_from_account(account) or force_resource: resource = contact.resource else: resource = None @@ -455,8 +457,12 @@ build_invite_submenu(invite_menuitem, [(gc_contact, account)], show_bookmarked=bookmarked) else: + force_resource = False + if control and control.resource: + force_resource = True build_invite_submenu(invite_menuitem, [(contact, account)], - show_bookmarked=contact.supports(NS_CONFERENCE)) + show_bookmarked=contact.supports(NS_CONFERENCE), + force_resource=force_resource) if gajim.account_is_disconnected(account): invite_menuitem.set_sensitive(False)

1 0

gajim: add a new event that is sent just before changing status....
by Gajim 27 Mar '14

27 Mar '14

changeset 0cb55c12b4b0 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=0cb55c12b4b0 description: add a new event that is sent just before changing status. Fixes #7593 diffstat: src/common/connection.py | 8 ++++++++ src/common/connection_handlers_events.py | 4 ++++ 2 files changed, 12 insertions(+), 0 deletions(-) diffs (51 lines): diff -r 2a3a84d4a33d -r 0cb55c12b4b0 src/common/connection.py --- a/src/common/connection.py Mon Jan 13 20:25:07 2014 +0100 +++ b/src/common/connection.py Tue Jan 14 22:48:51 2014 +0100 @@ -708,12 +708,16 @@ if gajim.HAVE_GPG: self.USE_GPG = True self.gpg = gpg.GnuPG(gajim.config.get('use_gpg_agent')) + gajim.nec.push_incoming_event(BeforeChangeShowEvent(None, + conn=self, show=show, message=msg)) self.connect_and_init(show, msg, sign_msg) return if show == 'offline': self.connected = 0 if self.connection: + gajim.nec.push_incoming_event(BeforeChangeShowEvent(None, + conn=self, show=show, message=msg)) p = nbxmpp.Presence(typ = 'unavailable') p = self.add_sha(p, False) if msg: @@ -731,12 +735,16 @@ if self.connected == 1: return if show == 'invisible': + gajim.nec.push_incoming_event(BeforeChangeShowEvent(None, + conn=self, show=show, message=msg)) self._change_to_invisible(msg) return if show not in ['offline', 'online', 'chat', 'away', 'xa', 'dnd']: return -1 was_invisible = self.connected == gajim.SHOW_LIST.index('invisible') self.connected = gajim.SHOW_LIST.index(show) + gajim.nec.push_incoming_event(BeforeChangeShowEvent(None, + conn=self, show=show, message=msg)) if was_invisible: self._change_from_invisible() self._update_status(show, msg) diff -r 2a3a84d4a33d -r 0cb55c12b4b0 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Mon Jan 13 20:25:07 2014 +0100 +++ b/src/common/connection_handlers_events.py Tue Jan 14 22:48:51 2014 +0100 @@ -997,6 +997,10 @@ name = 'our-show' base_network_events = [] +class BeforeChangeShowEvent(nec.NetworkIncomingEvent): + name = 'before-change-show' + base_network_events = [] + class MessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): name = 'message-received' base_network_events = ['raw-message-received']

1 0

gajim: Set parent for server error dialog in disco
by Gajim 27 Mar '14

27 Mar '14

changeset eac03906371e in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=eac03906371e description: Set parent for server error dialog in disco diffstat: src/disco.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 0cb55c12b4b0 -r eac03906371e src/disco.py --- a/src/disco.py Tue Jan 14 22:48:51 2014 +0100 +++ b/src/disco.py Sat Jan 18 11:44:25 2014 +0400 @@ -832,7 +832,8 @@ jid = helpers.parse_jid(jid) except helpers.InvalidFormat as s: pritext = _('Invalid Server Name') - dialogs.ErrorDialog(pritext, str(s)) + dialogs.ErrorDialog(pritext, str(s), + transient_for=self.window) return if jid == self.jid: # jid has not changed return

1 0

gajim: Support for sha256 fingerprint.
by Gajim 27 Mar '14

27 Mar '14

changeset 21e37fe416a6 in /home/hg/repos/gajim author: Fedor Brunner <fedor.brunner(a)azet.sk> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=21e37fe416a6 description: Support for sha256 fingerprint. Fixes #7628 diffstat: src/common/config.py | 1 + src/common/connection.py | 38 ++++++++++++++++++++++++------- src/common/connection_handlers_events.py | 6 +++- src/config.py | 12 ++++++--- src/dialogs.py | 8 +++++- src/gui_interface.py | 30 ++++++++++++++++-------- 6 files changed, 68 insertions(+), 27 deletions(-) diffs (232 lines): diff -r eac03906371e -r 21e37fe416a6 src/common/config.py --- a/src/common/config.py Sat Jan 18 11:44:25 2014 +0400 +++ b/src/common/config.py Tue Jan 21 15:27:41 2014 +0100 @@ -354,6 +354,7 @@ 'warn_when_insecure_ssl_connection': [ opt_bool, True, _('Show a warning dialog before using standard SSL library.') ], 'warn_when_insecure_password': [ opt_bool, True, _('Show a warning dialog before sending PLAIN password over a plain connection.') ], 'ssl_fingerprint_sha1': [ opt_str, '', '', True ], + 'ssl_fingerprint_sha256': [ opt_str, '', '', True ], 'ignore_ssl_errors': [ opt_str, '', _('Space separated list of ssl errors to ignore.') ], 'use_srv': [ opt_bool, True, '', True ], 'use_custom_host': [ opt_bool, False, '', True ], diff -r eac03906371e -r 21e37fe416a6 src/common/connection.py --- a/src/common/connection.py Sat Jan 18 11:44:25 2014 +0400 +++ b/src/common/connection.py Tue Jan 21 15:27:41 2014 +0100 @@ -1408,27 +1408,46 @@ text += _('\nSSL Error: %s') % ssl_error[errnum] else: text += _('\nUnknown SSL error: %d') % errnum - fingerprint = cert.digest('sha1').decode('utf-8') + fingerprint_sha1 = cert.digest('sha1').decode('utf-8') + fingerprint_sha256 = cert.digest('sha256').decode('utf-8') pem = OpenSSL.crypto.dump_certificate(OpenSSL.crypto.FILETYPE_PEM, cert).decode('utf-8') gajim.nec.push_incoming_event(SSLErrorEvent(None, conn=self, error_text=text, error_num=errnum, cert=pem, - fingerprint=fingerprint, certificate=cert)) + fingerprint_sha1=fingerprint_sha1, + fingerprint_sha256=fingerprint_sha256, certificate=cert)) return True if cert: - fingerprint = cert.digest('sha1').decode('utf-8') - saved_fingerprint = gajim.config.get_per('accounts', self.name, + fingerprint_sha1 = cert.digest('sha1').decode('utf-8') + fingerprint_sha256 = cert.digest('sha256').decode('utf-8') + saved_fingerprint_sha1 = gajim.config.get_per('accounts', self.name, 'ssl_fingerprint_sha1') - if saved_fingerprint: + if saved_fingerprint_sha1: # Check sha1 fingerprint - if fingerprint != saved_fingerprint: + if fingerprint_sha1 != saved_fingerprint_sha1: gajim.nec.push_incoming_event(FingerprintErrorEvent(None, conn=self, certificate=cert, - new_fingerprint=fingerprint)) + new_fingerprint_sha1=fingerprint_sha1, + new_fingerprint_sha256=fingerprint_sha256)) return True else: gajim.config.set_per('accounts', self.name, - 'ssl_fingerprint_sha1', fingerprint) + 'ssl_fingerprint_sha1', fingerprint_sha1) + + saved_fingerprint_sha256 = gajim.config.get_per('accounts', self.name, + 'ssl_fingerprint_sha256') + if saved_fingerprint_sha256: + # Check sha256 fingerprint + if fingerprint_sha256 != saved_fingerprint_sha256: + gajim.nec.push_incoming_event(FingerprintErrorEvent(None, + conn=self, certificate=con.Connection.ssl_certificate, + new_fingerprint_sha1=fingerprint_sha1, + new_fingerprint_sha256=fingerprint_sha256)) + return True + else: + gajim.config.set_per('accounts', self.name, + 'ssl_fingerprint_sha256', fingerprint_sha256) + if not check_X509.check_certificate(cert, hostname) and \ '100' not in gajim.config.get_per('accounts', self.name, 'ignore_ssl_errors').split(): @@ -1439,7 +1458,8 @@ hostname gajim.nec.push_incoming_event(SSLErrorEvent(None, conn=self, error_text=txt, error_num=100, cert=pem, - fingerprint=fingerprint, certificate=cert)) + fingerprint_sha1=fingerprint_sha1, + fingerprint_sha256=fingerprint_sha256, certificate=cert)) return True self._register_handlers(con, con_type) diff -r eac03906371e -r 21e37fe416a6 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sat Jan 18 11:44:25 2014 +0400 +++ b/src/common/connection_handlers_events.py Tue Jan 21 15:27:41 2014 +0100 @@ -1639,12 +1639,14 @@ self.ssl_msg = ssl_error.get(er, _('Unknown SSL error: %d') % \ self.errnum) self.ssl_cert = '' - self.ssl_fingerprint = '' + self.ssl_fingerprint_sha1 = '' + self.ssl_fingerprint_sha256 = '' if self.conn.connection.Connection.ssl_certificate: cert = self.conn.connection.Connection.ssl_certificate self.ssl_cert = OpenSSL.crypto.dump_certificate( OpenSSL.crypto.FILETYPE_PEM, cert).decode('utf-8') - self.ssl_fingerprint = cert.digest('sha1').decode('utf-8') + self.ssl_fingerprint_sha1 = cert.digest('sha1').decode('utf-8') + self.ssl_fingerprint_sha256 = cert.digest('sha256').decode('utf-8') return True class NewAccountNotConnectedEvent(nec.NetworkIncomingEvent): diff -r eac03906371e -r 21e37fe416a6 src/config.py --- a/src/config.py Sat Jan 18 11:44:25 2014 +0400 +++ b/src/config.py Tue Jan 21 15:27:41 2014 +0100 @@ -3784,7 +3784,9 @@ f.write(self.ssl_cert + '\n\n') f.close() gajim.connections[self.account].new_account_info[ - 'ssl_fingerprint_sha1'] = self.ssl_fingerprint + 'ssl_fingerprint_sha1'] = self.ssl_fingerprint_sha1 + gajim.connections[self.account].new_account_info[ + 'ssl_fingerprint_sha256'] = self.ssl_fingerprint_sha256 self.notebook.set_current_page(4) # show fom page elif cur_page == 4: if self.is_form: @@ -3859,7 +3861,8 @@ self.forward_button.set_sensitive(False) self.notebook.set_current_page(4) # show form page return - self.ssl_fingerprint = obj.ssl_fingerprint + self.ssl_fingerprint_sha1 = obj.ssl_fingerprint_sha1 + self.ssl_fingerprint_sha256 = obj.ssl_fingerprint_sha256 self.ssl_cert = obj.ssl_cert if obj.ssl_msg: # An SSL warning occured, show it @@ -3873,8 +3876,9 @@ 'hostname': hostname, 'error': obj.ssl_msg}) if obj.errnum in (18, 27): text = _('Add this certificate to the list of trusted ' - 'certificates.\nSHA1 fingerprint of the certificate:\n%s') \ - % obj.ssl_fingerprint + 'certificates.\nSHA1 fingerprint of the certificate:\n%s' + '\nSHA256 fingerprint of the certificate:\n%s') \ + % (obj.ssl_fingerprint_sha1, obj.ssl_fingerprint_sha256) self.xml.get_object('ssl_checkbutton').set_label(text) else: self.xml.get_object('ssl_checkbutton').set_no_show_all(True) diff -r eac03906371e -r 21e37fe416a6 src/dialogs.py --- a/src/dialogs.py Sat Jan 18 11:44:25 2014 +0400 +++ b/src/dialogs.py Tue Jan 21 15:27:41 2014 +0100 @@ -5448,14 +5448,18 @@ Expires on: %(eo)s Fingerprint -SHA1 Fingerprint: %(sha1)s''') % { +SHA1 Fingerprint: %(sha1)s + +SHA256 Fingerprint: %(sha256)s +''') % { 'scn': subject.commonName, 'sorg': subject.organizationName, 'sou': subject.organizationalUnitName, 'sn': cert.get_serial_number(), 'icn': issuer.commonName, 'iorg': issuer.organizationName, 'iou': issuer.organizationalUnitName, 'io': cert.get_notBefore(), 'eo': cert.get_notAfter(), - 'sha1': cert.digest('sha1')}) + 'sha1': cert.digest('sha1'), + 'sha256': cert.digest('sha256')}) self.set_transient_for(parent) self.set_title(_('Certificate for account %s') % account) diff -r eac03906371e -r 21e37fe416a6 src/gui_interface.py --- a/src/gui_interface.py Sat Jan 18 11:44:25 2014 +0400 +++ b/src/gui_interface.py Tue Jan 21 15:27:41 2014 +0100 @@ -1300,7 +1300,7 @@ obj.exchange_items_list, obj.fjid) def handle_event_ssl_error(self, obj): - # ('SSL_ERROR', account, (text, errnum, cert, sha1_fingerprint)) + # ('SSL_ERROR', account, (text, errnum, cert, sha1_fingerprint, sha256_fingerprint)) account = obj.conn.name server = gajim.config.get_per('accounts', account, 'hostname') @@ -1323,7 +1323,9 @@ f.write(obj.cert + '\n\n') f.close() gajim.config.set_per('accounts', account, 'ssl_fingerprint_sha1', - obj.fingerprint) + obj.fingerprint_sha1) + gajim.config.set_per('accounts', account, 'ssl_fingerprint_sha256', + obj.fingerprint_sha256) if is_checked[1]: ignore_ssl_errors = gajim.config.get_per('accounts', account, 'ignore_ssl_errors').split() @@ -1344,8 +1346,9 @@ 'server?') % {'error': obj.error_text} if obj.error_num in (18, 27): checktext1 = _('Add this certificate to the list of trusted ' - 'certificates.\nSHA1 fingerprint of the certificate:\n%s') % \ - obj.fingerprint + 'certificates.\nSHA1 fingerprint of the certificate:\n%s' + '\nSHA256 fingerprint of the certificate:\n%s') % \ + (obj.fingerprint_sha1, obj.fingerprint_sha256) else: checktext1 = '' checktext2 = _('Ignore this error for this certificate.') @@ -1359,12 +1362,14 @@ _('SSL Certificate Verification for %s') % account) def handle_event_fingerprint_error(self, obj): - # ('FINGERPRINT_ERROR', account, (new_fingerprint,)) + # ('FINGERPRINT_ERROR', account, (new_fingerprint_sha1,new_fingerprint_sha256,)) account = obj.conn.name def on_yes(is_checked): del self.instances[account]['online_dialog']['fingerprint_error'] gajim.config.set_per('accounts', account, 'ssl_fingerprint_sha1', - obj.new_fingerprint) + obj.new_fingerprint_sha1) + gajim.config.set_per('accounts', account, 'ssl_fingerprint_sha256', + obj.new_fingerprint_sha256) # Reset the ignored ssl errors gajim.config.set_per('accounts', account, 'ignore_ssl_errors', '') obj.conn.ssl_certificate_accepted() @@ -1377,11 +1382,16 @@ pritext = _('SSL certificate error') sectext = _('It seems the SSL certificate of account %(account)s has ' - 'changed or your connection is being hacked.\nOld fingerprint: ' - '%(old)s\nNew fingerprint: %(new)s\n\nDo you still want to connect ' + 'changed or your connection is being hacked.\n\nOld SHA-1 fingerprint: ' + '%(old_sha1)s\nOld SHA-256 fingerprint: %(old_sha256)s\n\n' + 'New SHA-1 fingerprint: %(new_sha1)s\nNew SHA-256 fingerprint: ' + '%(new_sha256)s\n\nDo you still want to connect ' 'and update the fingerprint of the certificate?') % \ - {'account': account, 'old': gajim.config.get_per('accounts', - account, 'ssl_fingerprint_sha1'), 'new': obj.new_fingerprint} + {'account': account, + 'old_sha1': gajim.config.get_per('accounts', account, 'ssl_fingerprint_sha1'), + 'old_sha256': gajim.config.get_per('accounts', account, 'ssl_fingerprint_sha256'), + 'new_sha1': obj.new_fingerprint_sha1, + 'new_sha256': obj.new_fingerprint_sha256} if 'fingerprint_error' in self.instances[account]['online_dialog']: self.instances[account]['online_dialog']['fingerprint_error'].\ destroy()

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