Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] XMLConsole: Inject jabber:client into message, presence and iq
by Philipp Hörist 17 Sep '19

17 Sep '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: a1c352f2 by Philipp Hörist at 2019-09-17T18:03:16Z XMLConsole: Inject jabber:client into message, presence and iq - - - - - 1 changed file: - gajim/gtk/xml_console.py Changes: ===================================== gajim/gtk/xml_console.py ===================================== @@ -172,10 +172,18 @@ class XMLConsoleWindow(Gtk.ApplicationWindow): stanza = buffer_.get_text(begin_iter, end_iter, True) if stanza: try: - node = nbxmpp.Protocol(node=stanza) + node = nbxmpp.Node(node=stanza) except Exception as error: ErrorDialog(_('Invalid Node'), str(error)) return + + if node.getName() in ('message', 'presence', 'iq'): + # Parse stanza again if its a message, presence or iq and + # set jabber:client as toplevel namespace + # Use type Protocol so nbxmpp counts the stanza for + # stream management + node = nbxmpp.Protocol(node=stanza, + attrs={'xmlns': 'jabber:client'}) app.connections[self.account].connection.send(node) self.last_stanza = stanza buffer_.set_text('') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a1c352f24b4aee30fe60459b04d61e818a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a1c352f24b4aee30fe60459b04d61e818a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp] Deleted branch asterix_master
by Yann Leboulanger 17 Sep '19

17 Sep '19

Yann Leboulanger deleted branch asterix_master at gajim / python-nbxmpp -- You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp] Pushed new branch asterix_master
by Yann Leboulanger 17 Sep '19

17 Sep '19

Yann Leboulanger pushed new branch asterix_master at gajim / python-nbxmpp -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/tree/asterix_master You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] AddContact: Set info button sensitive if JID is passed
by Philipp Hörist 16 Sep '19

16 Sep '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2c4f4d1e by Philipp Hörist at 2019-09-16T19:41:21Z AddContact: Set info button sensitive if JID is passed - - - - - 1 changed file: - gajim/gtk/add_contact.py Changes: ===================================== gajim/gtk/add_contact.py ===================================== @@ -137,6 +137,9 @@ class AddNewContactWindow(Gtk.ApplicationWindow): else: uid, transport = app.get_name_and_server_from_jid(jid) self.uid_entry.set_text(uid.replace('%', '@', 1)) + + self.show_contact_info_button.set_sensitive(True) + # set protocol_combobox model = self.protocol_combobox.get_model() iter_ = model.get_iter_first() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2c4f4d1e4ba88e790aee35996afdf6a364… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2c4f4d1e4ba88e790aee35996afdf6a364… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] AddContact: Handle only bare JIDs
by Philipp Hörist 16 Sep '19

16 Sep '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 92d127ae by Philipp Hörist at 2019-09-16T19:37:30Z AddContact: Handle only bare JIDs - - - - - 1 changed file: - gajim/gtk/add_contact.py Changes: ===================================== gajim/gtk/add_contact.py ===================================== @@ -45,6 +45,9 @@ class AddNewContactWindow(Gtk.ApplicationWindow): self.account = account self.adding_jid = False + if jid is not None: + jid = app.get_jid_without_resource(jid) + # fill accounts with active accounts accounts = app.get_enabled_accounts_with_labels() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/92d127aea6993abd6c164fd4cf74ba80bf… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/92d127aea6993abd6c164fd4cf74ba80bf… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] GroupChat: Use correct key when formatting message
by Philipp Hörist 15 Sep '19

15 Sep '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: c4a4f60f by Philipp Hörist at 2019-09-15T20:13:42Z GroupChat: Use correct key when formatting message - - - - - 1 changed file: - gajim/groupchat_control.py Changes: ===================================== gajim/groupchat_control.py ===================================== @@ -1937,12 +1937,12 @@ class GroupchatControl(ChatControlBase): elif StatusCode.REMOVED_AFFILIATION_CHANGE in status_codes: reason = _(': Affiliation changed') - message = message.format(nick=nick, actor=actor, reason=reason) + message = message.format(nick=nick, by=actor, reason=reason) self.add_info_message(message) elif StatusCode.REMOVED_NONMEMBER_IN_MEMBERS_ONLY in status_codes: reason = _(': Group chat configuration changed to members-only') - message = message.format(nick=nick, actor=actor, reason=reason) + message = message.format(nick=nick, by=actor, reason=reason) self.add_info_message(message) elif print_join_left: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c4a4f60fafffbf86739c15c6588d14edb5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c4a4f60fafffbf86739c15c6588d14edb5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Show SSLError dialog for all errors
by Philipp Hörist 12 Sep '19

12 Sep '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 890846fc by Philipp Hörist at 2019-09-12T18:50:24Z Show SSLError dialog for all errors Fixes #9835 - - - - - 1 changed file: - gajim/gtk/ssl_error_dialog.py Changes: ===================================== gajim/gtk/ssl_error_dialog.py ===================================== @@ -102,5 +102,5 @@ class SSLErrorDialog(Gtk.ApplicationWindow): f.write(self._server + '\n') f.write(pem + '\n\n') - self._con.process_ssl_errors() self.destroy() + self._con.process_ssl_errors() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/890846fc38aaf0a09d9219aa786a776bf2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/890846fc38aaf0a09d9219aa786a776bf2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ChatControlBase: fix autoscroll on keyboard shortcuts
by Philipp Hörist 11 Sep '19

11 Sep '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 16046d7e by Andrey Gursky at 2019-09-11T15:17:47Z ChatControlBase: fix autoscroll on keyboard shortcuts The issue reported by concerto [1] is a regression since af312830ef42fdb7. [1] https://conference.gajim.org:5281/muc_log/gajim/2019-09-10#df591057-8693-4e… - - - - - 1 changed file: - gajim/chat_control_base.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -698,6 +698,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): if event.keyval == Gdk.KEY_Page_Down or \ event.keyval == Gdk.KEY_Page_Up: self.conv_textview.tv.event(event) + self._on_scroll(None, event.keyval) return True if event.get_state() & Gdk.ModifierType.CONTROL_MASK: if event.keyval == Gdk.KEY_Tab: # CTRL + TAB View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/16046d7e87bc8962e35a41dc38f7e56b10… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/16046d7e87bc8962e35a41dc38f7e56b10… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove obsolete ConfirmationDialogDoubleCheck
by Philipp Hörist 11 Sep '19

11 Sep '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: ed80f936 by Daniel Brötzmann at 2019-09-11T09:11:27Z Remove obsolete ConfirmationDialogDoubleCheck - - - - - 1 changed file: - gajim/gtk/dialogs.py Changes: ===================================== gajim/gtk/dialogs.py ===================================== @@ -246,78 +246,6 @@ class ErrorDialog(HigDialog): self.popup() -class ConfirmationDialogDoubleCheck(ConfirmationDialog): - """ - HIG compliant confirmation dialog with 2 checkbuttons - """ - - def __init__(self, pritext, sectext='', checktext1='', checktext2='', - tooltip1='', tooltip2='', on_response_ok=None, on_response_cancel=None, - transient_for=None, is_modal=True): - self.user_response_ok = on_response_ok - self.user_response_cancel = on_response_cancel - if transient_for is None: - transient_for = app.app.get_active_window() - HigDialog.__init__(self, transient_for, Gtk.MessageType.QUESTION, - Gtk.ButtonsType.OK_CANCEL, pritext, sectext, self.on_response_ok, - self.on_response_cancel) - - self.set_default_response(Gtk.ResponseType.OK) - - ok_button = self.get_widget_for_response(Gtk.ResponseType.OK) - ok_button.grab_focus() - - vbox = self.get_content_area() - if checktext1: - self.checkbutton1 = Gtk.CheckButton.new_with_mnemonic(checktext1) - if tooltip1: - self.checkbutton1.set_tooltip_text(tooltip1) - vbox.pack_start(self.checkbutton1, False, True, 0) - else: - self.checkbutton1 = None - if checktext2: - self.checkbutton2 = Gtk.CheckButton.new_with_mnemonic(checktext2) - if tooltip2: - self.checkbutton2.set_tooltip_text(tooltip2) - vbox.pack_start(self.checkbutton2, False, True, 0) - else: - self.checkbutton2 = None - - self.set_modal(is_modal) - self.popup() - - def on_response_ok(self, widget): - if self.user_response_ok: - if isinstance(self.user_response_ok, tuple): - self.user_response_ok[0](self.is_checked(), - *self.user_response_ok[1:]) - else: - self.user_response_ok(self.is_checked()) - self.call_cancel_on_destroy = False - self.destroy() - - def on_response_cancel(self, widget): - if self.user_response_cancel: - if isinstance(self.user_response_cancel, tuple): - self.user_response_cancel[0](*self.user_response_cancel[1:]) - else: - self.user_response_cancel() - self.call_cancel_on_destroy = False - self.destroy() - - def is_checked(self): - ''' Get active state of the checkbutton ''' - if self.checkbutton1: - is_checked_1 = self.checkbutton1.get_active() - else: - is_checked_1 = False - if self.checkbutton2: - is_checked_2 = self.checkbutton2.get_active() - else: - is_checked_2 = False - return [is_checked_1, is_checked_2] - - class ConfirmationDialogDoubleRadio(ConfirmationDialog): """ HIG compliant confirmation dialog with 2 radios View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ed80f936594c11a55dfca162cb6938e7b3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ed80f936594c11a55dfca162cb6938e7b3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Rework SSLErrorDialog
by Philipp Hörist 11 Sep '19

11 Sep '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: ac428f11 by Daniel Brötzmann at 2019-09-11T05:02:45Z Rework SSLErrorDialog - - - - - 5 changed files: - + gajim/data/gui/ssl_error_dialog.ui - gajim/gtk/dialogs.py - + gajim/gtk/ssl_error_dialog.py - gajim/gui_interface.py - + test/gtk/ssl_error_dialog.py Changes: ===================================== gajim/data/gui/ssl_error_dialog.ui ===================================== @@ -0,0 +1,173 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<interface> + <requires lib="gtk+" version="3.20"/> + <object class="GtkBox" id="ssl_error_box"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="border_width">18</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_bottom">6</property> + <property name="label" translatable="yes">SSL Certificate Verification Error</property> + <style> + <class name="large-header"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="intro_text"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_right">30</property> + <property name="margin_bottom">6</property> + <property name="wrap">True</property> + <property name="max_width_chars">50</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Identified Error</property> + <style> + <class name="bold"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="ssl_error"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_bottom">12</property> + <property name="label" translatable="yes"><error></property> + <property name="wrap">True</property> + <property name="max_width_chars">42</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="add_certificate_checkbutton"> + <property name="label" translatable="yes">Add this certificate to the list of _trusted certificates</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="no_show_all">True</property> + <property name="halign">start</property> + <property name="margin_left">15</property> + <property name="margin_right">15</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="ignore_error_checkbutton"> + <property name="label" translatable="yes">_Ignore this error for this certificate</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">start</property> + <property name="margin_left">15</property> + <property name="margin_right">15</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">12</property> + <property name="spacing">12</property> + <child> + <object class="GtkButton" id="abort_button"> + <property name="label" translatable="yes">_Abort</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="hexpand">True</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_abort_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="view_cert_button"> + <property name="label" translatable="yes">_View Certificate</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="halign">center</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_view_cert_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="connect_button"> + <property name="label" translatable="yes">_Connect</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="hexpand">True</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_connect_clicked" swapped="no"/> + <style> + <class name="destructive-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">6</property> + </packing> + </child> + </object> +</interface> ===================================== gajim/gtk/dialogs.py ===================================== @@ -13,7 +13,6 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. from datetime import datetime - from collections import namedtuple from gi.repository import GLib @@ -536,6 +535,7 @@ class CertificateDialog(Gtk.ApplicationWindow): self.set_resizable(False) self.set_position(Gtk.WindowPosition.CENTER) self.set_title(_('Certificate')) + self.account = account self._ui = get_builder('certificate_dialog.ui') self.add(self._ui.certificate_box) @@ -603,25 +603,6 @@ class CertificateDialog(Gtk.ApplicationWindow): self._clipboard.set_text(clipboard_text, -1) -class SSLErrorDialog(ConfirmationDialogDoubleCheck): - def __init__(self, account, certificate, pritext, sectext, checktext1, - checktext2, on_response_ok=None, on_response_cancel=None): - self.account = account - self.cert = certificate - ConfirmationDialogDoubleCheck.__init__( - self, pritext, sectext, - checktext1, checktext2, on_response_ok=on_response_ok, - on_response_cancel=on_response_cancel, is_modal=False) - b = Gtk.Button(_('View certificate…')) - b.connect('clicked', self.on_cert_clicked) - b.show_all() - area = self.get_action_area() - area.pack_start(b, True, True, 0) - - def on_cert_clicked(self, button): - CertificateDialog(self, self.account, self.cert) - - class ChangePasswordDialog(Gtk.Dialog): def __init__(self, account, success_cb, transient_for): super().__init__(title=_('Change Password'), ===================================== gajim/gtk/ssl_error_dialog.py ===================================== @@ -0,0 +1,106 @@ +# 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/>. + +import os + +from OpenSSL import crypto + +from gi.repository import Gtk + +from gajim.common import app +from gajim.common import configpaths +from gajim.common.const import SSLError +from gajim.common.connection_handlers_events import OurShowEvent +from gajim.common.i18n import _ + +from gajim.gtk.dialogs import CertificateDialog +from gajim.gtk.util import get_builder + + +class SSLErrorDialog(Gtk.ApplicationWindow): + def __init__(self, account, connection, cert, error_num): + Gtk.ApplicationWindow.__init__(self) + self.set_name('SSLErrorDialog') + self.set_application(app.app) + self.set_show_menubar(False) + self.set_resizable(False) + self.set_position(Gtk.WindowPosition.CENTER) + self.set_title(_('SSL Certificate Verification Error')) + + self._ui = get_builder('ssl_error_dialog.ui') + self.add(self._ui.ssl_error_box) + + self.account = account + self._error_num = error_num + self._con = connection + self._cert = cert + self._server = app.config.get_per('accounts', self.account, 'hostname') + + self._process_error() + + self._ui.connect_signals(self) + self.show_all() + + def _process_error(self): + self._ui.intro_text.set_text( + _('There was an error while attempting to verify the SSL ' + 'certificate of your XMPP server (%s).') % self._server) + + unknown_error = _('Unknown SSL error \'%s\'') % self._error_num + ssl_error = SSLError.get(self._error_num, unknown_error) + self._ui.ssl_error.set_text(ssl_error) + + if self._error_num in (18, 27): + # Errors: 18 Self signed certificate; 27 Certificate not trusted + self._ui.add_certificate_checkbutton.show() + + def _on_abort_clicked(self, _button): + self._con.disconnect(reconnect=False) + app.nec.push_incoming_event(OurShowEvent(None, conn=self._con, + show='offline')) + self.destroy() + + def _on_view_cert_clicked(self, _button): + window = app.get_app_window(CertificateDialog, self.account) + if window is None: + CertificateDialog(self, self.account, self._cert) + else: + window.present() + + def _on_connect_clicked(self, _button): + # Ignore this error + if self._ui.ignore_error_checkbutton.get_active(): + ignore_ssl_errors = app.config.get_per( + 'accounts', self.account, 'ignore_ssl_errors').split() + ignore_ssl_errors.append(str(self._error_num)) + app.config.set_per('accounts', self.account, 'ignore_ssl_errors', + ' '.join(ignore_ssl_errors)) + + if self._ui.add_certificate_checkbutton.get_active(): + pem = crypto.dump_certificate( + crypto.FILETYPE_PEM, self._cert).decode('utf-8') + + # Check if cert is already in file + certs = '' + my_ca_certs = configpaths.get('MY_CACERTS') + if os.path.isfile(my_ca_certs): + with open(my_ca_certs, encoding='utf-8') as f: + certs = f.read() + if pem not in certs: + with open(my_ca_certs, 'a', encoding='utf-8') as f: + f.write(self._server + '\n') + f.write(pem + '\n\n') + + self._con.process_ssl_errors() + self.destroy() ===================================== gajim/gui_interface.py ===================================== @@ -46,7 +46,6 @@ from gi.repository import Gio from nbxmpp import idlequeue from nbxmpp import Hashes2 from nbxmpp.structs import TuneData -import OpenSSL from gajim.common import app from gajim.common import events @@ -86,7 +85,6 @@ from gajim.common.connection_handlers_events import ( from gajim.common.modules.httpupload import HTTPUploadProgressEvent from gajim.common.connection import Connection from gajim.common.file_props import FilesProp -from gajim.common.const import SSLError from gajim import roster_window from gajim.common import ged @@ -103,7 +101,6 @@ from gajim.gtk.dialogs import NewConfirmationCheckDialog from gajim.gtk.dialogs import DialogButton from gajim.gtk.dialogs import InputDialog from gajim.gtk.dialogs import PassphraseDialog -from gajim.gtk.dialogs import SSLErrorDialog from gajim.gtk.dialogs import InvitationReceivedDialog from gajim.gtk.profile import ProfileWindow from gajim.gtk.filechoosers import FileChooserDialog @@ -113,6 +110,7 @@ from gajim.gtk.filetransfer import FileTransfersWindow from gajim.gtk.http_upload_progress import HTTPUploadProgressWindow from gajim.gtk.roster_item_exchange import RosterItemExchangeWindow from gajim.gtk.subscription_request import SubscriptionRequestWindow +from gajim.gtk.ssl_error_dialog import SSLErrorDialog from gajim.gtk.util import get_show_in_roster from gajim.gtk.util import get_show_in_systray @@ -1090,74 +1088,15 @@ class Interface: def handle_event_ssl_error(self, obj): account = obj.conn.name - server = app.config.get_per('accounts', account, 'hostname') - - def on_ok(is_checked): - del self.instances[account]['online_dialog']['ssl_error'] - if is_checked[0]: - - pem = OpenSSL.crypto.dump_certificate( - OpenSSL.crypto.FILETYPE_PEM, obj.cert).decode('utf-8') - - # Check if cert is already in file - certs = '' - my_ca_certs = configpaths.get('MY_CACERTS') - if os.path.isfile(my_ca_certs): - with open(my_ca_certs, encoding='utf-8') as f: - certs = f.read() - if pem in certs: - ErrorDialog(_('Certificate Already in File'), - _('This certificate is already in file %s, so it\'s ' - 'not added again.') % my_ca_certs) - else: - with open(my_ca_certs, 'a', encoding='utf-8') as f: - f.write(server + '\n') - f.write(pem + '\n\n') - - if is_checked[1]: - ignore_ssl_errors = app.config.get_per('accounts', account, - 'ignore_ssl_errors').split() - ignore_ssl_errors.append(str(obj.error_num)) - app.config.set_per('accounts', account, 'ignore_ssl_errors', - ' '.join(ignore_ssl_errors)) - obj.conn.process_ssl_errors() + connection = obj.conn + cert = obj.cert + error_num = obj.error_num - def on_cancel(): - del self.instances[account]['online_dialog']['ssl_error'] - obj.conn.disconnect(reconnect=False) - app.nec.push_incoming_event(OurShowEvent(None, conn=obj.conn, - show='offline')) - - text = _('The authenticity of the %s ' - 'certificate could be invalid') % server - - default_text = _('\nUnknown SSL error: %d') % obj.error_num - ssl_error_text = SSLError.get(obj.error_num, default_text) - text += _('\nSSL Error: <b>%s</b>') % ssl_error_text - - fingerprint_sha1 = obj.cert.digest('sha1').decode('utf-8') - fingerprint_sha256 = obj.cert.digest('sha256').decode('utf-8') - - pritext = _('Error verifying SSL certificate') - sectext = _('There was an error verifying the SSL certificate of your ' - 'XMPP server: %(error)s\nDo you still want to connect to this ' - 'server?') % {'error': text} - if obj.error_num in (18, 27): - checktext1 = _('Add this certificate to the list of trusted ' - 'certificates.\nSHA-1 fingerprint of the certificate:\n%(sha1)s' - '\nSHA-256 fingerprint of the certificate:\n%(sha256)s') % \ - {'sha1': fingerprint_sha1, 'sha256': fingerprint_sha256} + window = app.get_app_window(SSLErrorDialog, account) + if window is None: + SSLErrorDialog(account, connection, cert, error_num) else: - checktext1 = '' - checktext2 = _('Ignore this error for this certificate.') - if 'ssl_error' in self.instances[account]['online_dialog']: - self.instances[account]['online_dialog']['ssl_error'].destroy() - self.instances[account]['online_dialog']['ssl_error'] = \ - SSLErrorDialog(obj.conn.name, obj.cert, pritext, - sectext, checktext1, checktext2, on_response_ok=on_ok, - on_response_cancel=on_cancel) - self.instances[account]['online_dialog']['ssl_error'].set_title( - _('SSL Certificate Verification for %s') % account) + window.present() def handle_event_plain_connection(self, obj): # ('PLAIN_CONNECTION', account, (connection)) ===================================== test/gtk/ssl_error_dialog.py ===================================== @@ -0,0 +1,52 @@ +import gi +gi.require_version('Gtk', '3.0') +from gi.repository import Gtk + +import OpenSSL + +from test.gtk import util +from gajim.common.const import CSSPriority +from gajim.gtk.ssl_error_dialog import SSLErrorDialog + +util.load_style('gajim.css', CSSPriority.APPLICATION) + +cert = ''' +-----BEGIN CERTIFICATE----- +MIIFhDCCBGygAwIBAgISA4oUEifTr7Y+mcdiwu6KWpcVMA0GCSqGSIb3DQEBCwUA +MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD +ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xOTA0MDMxODE3NDVaFw0x +OTA3MDIxODE3NDVaMBsxGTAXBgNVBAMMECoubGlnaHR3aXRjaC5vcmcwggEiMA0G +CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/3mcevikse7QwDYwPcGAD9zHw3UWE +7J8SJR349/rFTF2tBFDvEa62OUKTCg5vPKVKaXHlzruk/A7blgqsEdugycORwPD1 +7YNJ27EldrRtotjclurzKL6D/MgcaQ4cTkPOD3cWbf/L+HClGrpFt7su6Z6cTutC +wiAYAdlfmVgSSv15F1xOTyFyfGJKQnW628Xs8xUvZh5H/SsEEum4MwVVGW06Z/A/ +mwX2jmJUb2M25S1Ma025nZpGYyAAqecTmPb3fStnXm4sdytfZhm4+nj9mH9GQIU1 +t/jO/7X7IFpc9DvVRSumSVqvNaVgiWmTLP4VxlCVJO6mibOXXUUDA5RfAgMBAAGj +ggKRMIICjTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG +AQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFC4/ZRurw2wVFsgJBTb9Fh/3 +0aV9MB8GA1UdIwQYMBaAFKhKamMEfd265tE5t6ZFZe/zqOyhMG8GCCsGAQUFBwEB +BGMwYTAuBggrBgEFBQcwAYYiaHR0cDovL29jc3AuaW50LXgzLmxldHNlbmNyeXB0 +Lm9yZzAvBggrBgEFBQcwAoYjaHR0cDovL2NlcnQuaW50LXgzLmxldHNlbmNyeXB0 +Lm9yZy8wSQYDVR0RBEIwQIIQKi5saWdodHdpdGNoLm9yZ4IOKi5tZXRyb25vbWUu +aW2CDmxpZ2h0d2l0Y2gub3JnggxtZXRyb25vbWUuaW0wTAYDVR0gBEUwQzAIBgZn +gQwBAgEwNwYLKwYBBAGC3xMBAQEwKDAmBggrBgEFBQcCARYaaHR0cDovL2Nwcy5s +ZXRzZW5jcnlwdC5vcmcwggECBgorBgEEAdZ5AgQCBIHzBIHwAO4AdQB0ftqDMa0z +EJEhnM4lT0Jwwr/9XkIgCMY3NXnmEHvMVgAAAWnkosBAAAAEAwBGMEQCICEfmTBk +OxS95eiYsfTH5HdL7kfp68BSin5LqeGyyxk9AiA3qeDZNKklJTdWqYjto7kUqJNd +YiL99SrqwzR6w+AqSwB1ACk8UZZUyDlluqpQ/FgH1Ldvv1h6KXLcpMMM9OVFR/R4 +AAABaeSiwEUAAAQDAEYwRAIgFxouOkJeqkQUe6zNI5w/6YBIQFrsrIZdPcX+r6JI +is8CIEEETzlEyj9lWR/BSSruSp0FT5CuoNNeEG7HxrJ+gVhZMA0GCSqGSIb3DQEB +CwUAA4IBAQAQtfs1NPNMmBQRcKsZyGLZsvpp2hIhdYi72RYnHnIl4MXbhyNj9xtI +cJr9PQ+3FsSnxy7LDjZMpbmBuXhawOyPBPw2M0f0Tv6Eo6miwvP/X1kLE3VjTzCo +6JPh6bEB5wa+kH/pUcGlV6uyT7IuXOiArx0VmIpTA3uwlVdfynOnR3CF20Ds4FLc +JxbGMqRuw/sGiTLKlXc1xVil8WZjL3hokzrgI7K6np2skUjWuMZvhJgwi5QiE7/C +ejsJoYkpvcaiaLAyVymTY/n/oM2oQpv5Mqjit+18RB9c2P+ifH5iDKC/jTKn4NNz +8xSTlUlCBTCozjzscZVeVDIojmejWclT +-----END CERTIFICATE-----''' + +cert = OpenSSL.crypto.load_certificate(OpenSSL.crypto.FILETYPE_PEM, cert) +ssl_error_num = 10 +win = SSLErrorDialog('testacc', None, cert, ssl_error_num) +win.connect('destroy', Gtk.main_quit) +win.show_all() +Gtk.main() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ac428f1115fc797079d2718383f44a721e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ac428f1115fc797079d2718383f44a721e… You're receiving this email because of your account on dev.gajim.org.

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