Mercurial Repositories > eric / file comparison
comparison: E5Network/E5SslErrorHandler.py
E5Network/E5SslErrorHandler.py
- changeset 4241
- 545629046c45
- parent 4021
- 195a471c327b
- child 4334
- 423ddcc8c815
equal
deleted
inserted
replaced
| 4239:4883661fc427 | 4241:545629046c45 |
|---|---|
| 15 | 15 |
| 16 from E5Gui import E5MessageBox | 16 from E5Gui import E5MessageBox |
| 17 | 17 |
| 18 import Preferences | 18 import Preferences |
| 19 import Utilities | 19 import Utilities |
| 20 import Globals | |
| 20 | 21 |
| 21 | 22 |
| 22 class E5SslErrorHandler(QObject): | 23 class E5SslErrorHandler(QObject): |
| 23 """ | 24 """ |
| 24 Class implementing a handler for SSL errors. | 25 Class implementing a handler for SSL errors. |
| 39 super(E5SslErrorHandler, self).__init__(parent) | 40 super(E5SslErrorHandler, self).__init__(parent) |
| 40 | 41 |
| 41 caList = self.__getSystemCaCertificates() | 42 caList = self.__getSystemCaCertificates() |
| 42 if Preferences.Prefs.settings.contains("Help/CaCertificatesDict"): | 43 if Preferences.Prefs.settings.contains("Help/CaCertificatesDict"): |
| 43 # port old entries stored under 'Help' | 44 # port old entries stored under 'Help' |
| 44 certificateDict = Preferences.toDict( | 45 certificateDict = Globals.toDict( |
| 45 Preferences.Prefs.settings.value("Help/CaCertificatesDict")) | 46 Preferences.Prefs.settings.value("Help/CaCertificatesDict")) |
| 46 Preferences.Prefs.settings.setValue( | 47 Preferences.Prefs.settings.setValue( |
| 47 "Ssl/CaCertificatesDict", certificateDict) | 48 "Ssl/CaCertificatesDict", certificateDict) |
| 48 Preferences.Prefs.settings.remove("Help/CaCertificatesDict") | 49 Preferences.Prefs.settings.remove("Help/CaCertificatesDict") |
| 49 else: | 50 else: |
| 50 certificateDict = Preferences.toDict( | 51 certificateDict = Globals.toDict( |
| 51 Preferences.Prefs.settings.value("Ssl/CaCertificatesDict")) | 52 Preferences.Prefs.settings.value("Ssl/CaCertificatesDict")) |
| 52 for server in certificateDict: | 53 for server in certificateDict: |
| 53 for cert in QSslCertificate.fromData(certificateDict[server]): | 54 for cert in QSslCertificate.fromData(certificateDict[server]): |
| 54 if cert not in caList: | 55 if cert not in caList: |
| 55 caList.append(cert) | 56 caList.append(cert) |
| 103 @return tuple indicating to ignore the SSL errors (one of NotIgnored, | 104 @return tuple indicating to ignore the SSL errors (one of NotIgnored, |
| 104 SystemIgnored or UserIgnored) and indicating a change of the | 105 SystemIgnored or UserIgnored) and indicating a change of the |
| 105 default SSL configuration (boolean) | 106 default SSL configuration (boolean) |
| 106 """ | 107 """ |
| 107 caMerge = {} | 108 caMerge = {} |
| 108 certificateDict = Preferences.toDict( | 109 certificateDict = Globals.toDict( |
| 109 Preferences.Prefs.settings.value("Ssl/CaCertificatesDict")) | 110 Preferences.Prefs.settings.value("Ssl/CaCertificatesDict")) |
| 110 for caServer in certificateDict: | 111 for caServer in certificateDict: |
| 111 caMerge[caServer] = QSslCertificate.fromData( | 112 caMerge[caServer] = QSslCertificate.fromData( |
| 112 certificateDict[caServer]) | 113 certificateDict[caServer]) |
| 113 caNew = [] | 114 caNew = [] |
| 232 """ | 233 """ |
| 233 Private method to get the list of system certificates. | 234 Private method to get the list of system certificates. |
| 234 | 235 |
| 235 @return list of system certificates (list of QSslCertificate) | 236 @return list of system certificates (list of QSslCertificate) |
| 236 """ | 237 """ |
| 237 caList = QSslCertificate.fromData(Preferences.toByteArray( | 238 caList = QSslCertificate.fromData(Globals.toByteArray( |
| 238 Preferences.Prefs.settings.value("Ssl/SystemCertificates"))) | 239 Preferences.Prefs.settings.value("Ssl/SystemCertificates"))) |
| 239 if not caList: | 240 if not caList: |
| 240 caList = QSslSocket.systemCaCertificates() | 241 caList = QSslSocket.systemCaCertificates() |
| 241 return caList | 242 return caList |
