Sat, 19 Nov 2016 12:51:02 +0100
Prepared release 16.11.1
2354
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1 | # -*- coding: utf-8 -*- |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2 | |
4631
5c1a96925da4
Updated copyright for 2016.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4334
diff
changeset
|
3 | # Copyright (c) 2013 - 2016 Detlev Offenbach <detlev@die-offenbachs.de> |
2354
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
4 | # |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
5 | |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
6 | """ |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
7 | Module implementing a SSL error handler. |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
8 | """ |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
9 | |
3145
a9de05d4a22f
# __IGNORE_WARNING__ added/ removed.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3060
diff
changeset
|
10 | from __future__ import unicode_literals |
2525
8b507a9a2d40
Script changes: Future import added, super calls modified and unicode behavior for str.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
2360
diff
changeset
|
11 | |
3656
441956d8fce5
Started porting eric5 to PyQt5.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3484
diff
changeset
|
12 | from PyQt5.QtCore import qVersion, QObject, QByteArray |
441956d8fce5
Started porting eric5 to PyQt5.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3484
diff
changeset
|
13 | from PyQt5.QtNetwork import QSslCertificate, QSslConfiguration, QSslSocket, \ |
2354
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
14 | QSslError, QSsl |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
15 | |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
16 | from E5Gui import E5MessageBox |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
17 | |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
18 | import Preferences |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
19 | import Utilities |
4241
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
20 | import Globals |
2354
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
21 | |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
22 | |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
23 | class E5SslErrorHandler(QObject): |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
24 | """ |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
25 | Class implementing a handler for SSL errors. |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
26 | |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
27 | It also initializes the default SSL configuration with certificates |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
28 | permanently accepted by the user already. |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
29 | """ |
2360
b6bf3925e3e1
Improved the SSL error handling logic a bit.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2354
diff
changeset
|
30 | NotIgnored = 0 |
b6bf3925e3e1
Improved the SSL error handling logic a bit.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2354
diff
changeset
|
31 | SystemIgnored = 1 |
b6bf3925e3e1
Improved the SSL error handling logic a bit.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2354
diff
changeset
|
32 | UserIgnored = 2 |
b6bf3925e3e1
Improved the SSL error handling logic a bit.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2354
diff
changeset
|
33 | |
2354
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
34 | def __init__(self, parent=None): |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
35 | """ |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
36 | Constructor |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
37 | |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
38 | @param parent reference to the parent object (QObject) |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
39 | """ |
2525
8b507a9a2d40
Script changes: Future import added, super calls modified and unicode behavior for str.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
2360
diff
changeset
|
40 | super(E5SslErrorHandler, self).__init__(parent) |
2354
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
41 | |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
42 | caList = self.__getSystemCaCertificates() |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
43 | if Preferences.Prefs.settings.contains("Help/CaCertificatesDict"): |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
44 | # port old entries stored under 'Help' |
4241
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
45 | certificateDict = Globals.toDict( |
2990
583beaf0b4b8
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2360
diff
changeset
|
46 | Preferences.Prefs.settings.value("Help/CaCertificatesDict")) |
3022
57179e4cdadd
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
47 | Preferences.Prefs.settings.setValue( |
57179e4cdadd
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
48 | "Ssl/CaCertificatesDict", certificateDict) |
2354
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
49 | Preferences.Prefs.settings.remove("Help/CaCertificatesDict") |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
50 | else: |
4241
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
51 | certificateDict = Globals.toDict( |
2354
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
52 | Preferences.Prefs.settings.value("Ssl/CaCertificatesDict")) |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
53 | for server in certificateDict: |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
54 | for cert in QSslCertificate.fromData(certificateDict[server]): |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
55 | if cert not in caList: |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
56 | caList.append(cert) |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
57 | sslCfg = QSslConfiguration.defaultConfiguration() |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
58 | sslCfg.setCaCertificates(caList) |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
59 | sslCfg.setProtocol(QSsl.AnyProtocol) |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
60 | try: |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
61 | sslCfg.setSslOption(QSsl.SslOptionDisableCompression, True) |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
62 | except AttributeError: |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
63 | pass |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
64 | QSslConfiguration.setDefaultConfiguration(sslCfg) |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
65 | |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
66 | def sslErrorsReplySlot(self, reply, errors): |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
67 | """ |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
68 | Public slot to handle SSL errors for a network reply. |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
69 | |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
70 | @param reply reference to the reply object (QNetworkReply) |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
71 | @param errors list of SSL errors (list of QSslError) |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
72 | """ |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
73 | self.sslErrorsReply(reply, errors) |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
74 | |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
75 | def sslErrorsReply(self, reply, errors): |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
76 | """ |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
77 | Public slot to handle SSL errors for a network reply. |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
78 | |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
79 | @param reply reference to the reply object (QNetworkReply) |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
80 | @param errors list of SSL errors (list of QSslError) |
2360
b6bf3925e3e1
Improved the SSL error handling logic a bit.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2354
diff
changeset
|
81 | @return tuple indicating to ignore the SSL errors (one of NotIgnored, |
2990
583beaf0b4b8
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2360
diff
changeset
|
82 | SystemIgnored or UserIgnored) and indicating a change of the |
583beaf0b4b8
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2360
diff
changeset
|
83 | default SSL configuration (boolean) |
2354
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
84 | """ |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
85 | url = reply.url() |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
86 | ignore, defaultChanged = self.sslErrors(errors, url.host(), url.port()) |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
87 | if ignore: |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
88 | if defaultChanged: |
2990
583beaf0b4b8
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2360
diff
changeset
|
89 | reply.setSslConfiguration( |
583beaf0b4b8
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2360
diff
changeset
|
90 | QSslConfiguration.defaultConfiguration()) |
2354
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
91 | reply.ignoreSslErrors() |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
92 | else: |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
93 | reply.abort() |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
94 | |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
95 | return ignore, defaultChanged |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
96 | |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
97 | def sslErrors(self, errors, server, port=-1): |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
98 | """ |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
99 | Public method to handle SSL errors. |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
100 | |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
101 | @param errors list of SSL errors (list of QSslError) |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
102 | @param server name of the server (string) |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
103 | @keyparam port value of the port (integer) |
2360
b6bf3925e3e1
Improved the SSL error handling logic a bit.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2354
diff
changeset
|
104 | @return tuple indicating to ignore the SSL errors (one of NotIgnored, |
2990
583beaf0b4b8
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2360
diff
changeset
|
105 | SystemIgnored or UserIgnored) and indicating a change of the |
583beaf0b4b8
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2360
diff
changeset
|
106 | default SSL configuration (boolean) |
2354
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
107 | """ |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
108 | caMerge = {} |
4241
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
109 | certificateDict = Globals.toDict( |
3035
36e9f388958b
Fixed a bunch of indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3034
diff
changeset
|
110 | Preferences.Prefs.settings.value("Ssl/CaCertificatesDict")) |
2354
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
111 | for caServer in certificateDict: |
2990
583beaf0b4b8
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2360
diff
changeset
|
112 | caMerge[caServer] = QSslCertificate.fromData( |
583beaf0b4b8
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2360
diff
changeset
|
113 | certificateDict[caServer]) |
2354
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
114 | caNew = [] |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
115 | |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
116 | errorStrings = [] |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
117 | if port != -1: |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
118 | server += ":{0:d}".format(port) |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
119 | if errors: |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
120 | for err in errors: |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
121 | if err.error() == QSslError.NoError: |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
122 | continue |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
123 | if server in caMerge and err.certificate() in caMerge[server]: |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
124 | continue |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
125 | errorStrings.append(err.errorString()) |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
126 | if not err.certificate().isNull(): |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
127 | cert = err.certificate() |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
128 | if cert not in caNew: |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
129 | caNew.append(cert) |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
130 | if not errorStrings: |
2360
b6bf3925e3e1
Improved the SSL error handling logic a bit.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2354
diff
changeset
|
131 | return E5SslErrorHandler.SystemIgnored, False |
2354
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
132 | |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
133 | errorString = '.</li><li>'.join(errorStrings) |
3020
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2990
diff
changeset
|
134 | ret = E5MessageBox.yesNo( |
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2990
diff
changeset
|
135 | None, |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
136 | self.tr("SSL Errors"), |
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
137 | self.tr("""<p>SSL Errors for <br /><b>{0}</b>""" |
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
138 | """<ul><li>{1}</li></ul></p>""" |
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
139 | """<p>Do you want to ignore these errors?</p>""") |
3035
36e9f388958b
Fixed a bunch of indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3034
diff
changeset
|
140 | .format(server, errorString), |
2354
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
141 | icon=E5MessageBox.Warning) |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
142 | |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
143 | if ret: |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
144 | caRet = False |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
145 | if len(caNew) > 0: |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
146 | certinfos = [] |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
147 | for cert in caNew: |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
148 | certinfos.append(self.__certToString(cert)) |
3020
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2990
diff
changeset
|
149 | caRet = E5MessageBox.yesNo( |
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2990
diff
changeset
|
150 | None, |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
151 | self.tr("Certificates"), |
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
152 | self.tr( |
2990
583beaf0b4b8
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2360
diff
changeset
|
153 | """<p>Certificates:<br/>{0}<br/>""" |
583beaf0b4b8
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2360
diff
changeset
|
154 | """Do you want to accept all these certificates?""" |
3034
7ce719013078
Fixed various coding style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3022
diff
changeset
|
155 | """</p>""") |
3035
36e9f388958b
Fixed a bunch of indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3034
diff
changeset
|
156 | .format("".join(certinfos))) |
2354
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
157 | if caRet: |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
158 | if server not in caMerge: |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
159 | caMerge[server] = [] |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
160 | for cert in caNew: |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
161 | caMerge[server].append(cert) |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
162 | |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
163 | sslCfg = QSslConfiguration.defaultConfiguration() |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
164 | caList = sslCfg.caCertificates() |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
165 | for cert in caNew: |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
166 | caList.append(cert) |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
167 | sslCfg.setCaCertificates(caList) |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
168 | sslCfg.setProtocol(QSsl.AnyProtocol) |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
169 | QSslConfiguration.setDefaultConfiguration(sslCfg) |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
170 | |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
171 | certificateDict = {} |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
172 | for server in caMerge: |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
173 | pems = QByteArray() |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
174 | for cert in caMerge[server]: |
4334
423ddcc8c815
Changed code to make eric compatible to PyQt 5.5 (QByteArry issue).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4241
diff
changeset
|
175 | pems.append(cert.toPem() + b'\n') |
2354
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
176 | certificateDict[server] = pems |
2990
583beaf0b4b8
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2360
diff
changeset
|
177 | Preferences.Prefs.settings.setValue( |
583beaf0b4b8
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2360
diff
changeset
|
178 | "Ssl/CaCertificatesDict", |
2354
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
179 | certificateDict) |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
180 | |
2360
b6bf3925e3e1
Improved the SSL error handling logic a bit.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2354
diff
changeset
|
181 | return E5SslErrorHandler.UserIgnored, caRet |
2354
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
182 | |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
183 | else: |
2360
b6bf3925e3e1
Improved the SSL error handling logic a bit.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2354
diff
changeset
|
184 | return E5SslErrorHandler.NotIgnored, False |
2354
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
185 | |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
186 | def __certToString(self, cert): |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
187 | """ |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
188 | Private method to convert a certificate to a formatted string. |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
189 | |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
190 | @param cert certificate to convert (QSslCertificate) |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
191 | @return formatted string (string) |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
192 | """ |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
193 | result = "<p>" |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
194 | |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
195 | if qVersion() >= "5.0.0": |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
196 | result += self.tr("Name: {0}")\ |
2354
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
197 | .format(Utilities.html_encode(Utilities.decodeString( |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
198 | ", ".join(cert.subjectInfo(QSslCertificate.CommonName))))) |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
199 | |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
200 | result += self.tr("<br/>Organization: {0}")\ |
2354
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
201 | .format(Utilities.html_encode(Utilities.decodeString( |
2990
583beaf0b4b8
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2360
diff
changeset
|
202 | ", ".join(cert.subjectInfo( |
583beaf0b4b8
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2360
diff
changeset
|
203 | QSslCertificate.Organization))))) |
2354
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
204 | |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
205 | result += self.tr("<br/>Issuer: {0}")\ |
2354
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
206 | .format(Utilities.html_encode(Utilities.decodeString( |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
207 | ", ".join(cert.issuerInfo(QSslCertificate.CommonName))))) |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
208 | else: |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
209 | result += self.tr("Name: {0}")\ |
2354
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
210 | .format(Utilities.html_encode(Utilities.decodeString( |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
211 | cert.subjectInfo(QSslCertificate.CommonName)))) |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
212 | |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
213 | result += self.tr("<br/>Organization: {0}")\ |
2354
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
214 | .format(Utilities.html_encode(Utilities.decodeString( |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
215 | cert.subjectInfo(QSslCertificate.Organization)))) |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
216 | |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
217 | result += self.tr("<br/>Issuer: {0}")\ |
2354
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
218 | .format(Utilities.html_encode(Utilities.decodeString( |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
219 | cert.issuerInfo(QSslCertificate.CommonName)))) |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
220 | |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
221 | result += self.tr( |
2990
583beaf0b4b8
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2360
diff
changeset
|
222 | "<br/>Not valid before: {0}<br/>Valid Until: {1}")\ |
583beaf0b4b8
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2360
diff
changeset
|
223 | .format(Utilities.html_encode( |
3035
36e9f388958b
Fixed a bunch of indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3034
diff
changeset
|
224 | cert.effectiveDate().toString("yyyy-MM-dd")), |
2990
583beaf0b4b8
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2360
diff
changeset
|
225 | Utilities.html_encode( |
583beaf0b4b8
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2360
diff
changeset
|
226 | cert.expiryDate().toString("yyyy-MM-dd"))) |
2354
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
227 | |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
228 | result += "</p>" |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
229 | |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
230 | return result |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
231 | |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
232 | def __getSystemCaCertificates(self): |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
233 | """ |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
234 | Private method to get the list of system certificates. |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
235 | |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
236 | @return list of system certificates (list of QSslCertificate) |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
237 | """ |
4241
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
238 | caList = QSslCertificate.fromData(Globals.toByteArray( |
2354
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
239 | Preferences.Prefs.settings.value("Ssl/SystemCertificates"))) |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
240 | if not caList: |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
241 | caList = QSslSocket.systemCaCertificates() |
c63de4af553d
Centralized the SSL error handling in E5SslErrorHandler.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
242 | return caList |