Mercurial Repositories > eric / file comparison
comparison: eric7/EricNetwork/EricSslErrorHandler.py
eric7/EricNetwork/EricSslErrorHandler.py
- branch
- eric7
- changeset 8637
- 394377638256
- parent 8358
- 144a6b854f70
- child 8881
- 54e42bc2437a
equal
deleted
inserted
replaced
| 8636:c0a3a6e40815 | 8637:394377638256 |
|---|---|
| 44 @param parent reference to the parent object (QObject) | 44 @param parent reference to the parent object (QObject) |
| 45 """ | 45 """ |
| 46 super().__init__(parent) | 46 super().__init__(parent) |
| 47 | 47 |
| 48 caList = self.__getSystemCaCertificates() | 48 caList = self.__getSystemCaCertificates() |
| 49 if Preferences.Prefs.settings.contains("Help/CaCertificatesDict"): | 49 if Preferences.getSettings().contains("Help/CaCertificatesDict"): |
| 50 # port old entries stored under 'Help' | 50 # port old entries stored under 'Help' |
| 51 certificateDict = Globals.toDict( | 51 certificateDict = Globals.toDict( |
| 52 Preferences.Prefs.settings.value("Help/CaCertificatesDict")) | 52 Preferences.getSettings().value("Help/CaCertificatesDict")) |
| 53 Preferences.Prefs.settings.setValue( | 53 Preferences.getSettings().setValue( |
| 54 "Ssl/CaCertificatesDict", certificateDict) | 54 "Ssl/CaCertificatesDict", certificateDict) |
| 55 Preferences.Prefs.settings.remove("Help/CaCertificatesDict") | 55 Preferences.getSettings().remove("Help/CaCertificatesDict") |
| 56 else: | 56 else: |
| 57 certificateDict = Globals.toDict( | 57 certificateDict = Globals.toDict( |
| 58 Preferences.Prefs.settings.value("Ssl/CaCertificatesDict")) | 58 Preferences.getSettings().value("Ssl/CaCertificatesDict")) |
| 59 for server in certificateDict: | 59 for server in certificateDict: |
| 60 for cert in QSslCertificate.fromData(certificateDict[server]): | 60 for cert in QSslCertificate.fromData(certificateDict[server]): |
| 61 if cert not in caList: | 61 if cert not in caList: |
| 62 caList.append(cert) | 62 caList.append(cert) |
| 63 sslCfg = QSslConfiguration.defaultConfiguration() | 63 sslCfg = QSslConfiguration.defaultConfiguration() |
| 119 change of the default SSL configuration | 119 change of the default SSL configuration |
| 120 @rtype tuple of (EricSslErrorState, bool) | 120 @rtype tuple of (EricSslErrorState, bool) |
| 121 """ | 121 """ |
| 122 caMerge = {} | 122 caMerge = {} |
| 123 certificateDict = Globals.toDict( | 123 certificateDict = Globals.toDict( |
| 124 Preferences.Prefs.settings.value("Ssl/CaCertificatesDict")) | 124 Preferences.getSettings().value("Ssl/CaCertificatesDict")) |
| 125 for caServer in certificateDict: | 125 for caServer in certificateDict: |
| 126 caMerge[caServer] = QSslCertificate.fromData( | 126 caMerge[caServer] = QSslCertificate.fromData( |
| 127 certificateDict[caServer]) | 127 certificateDict[caServer]) |
| 128 caNew = [] | 128 caNew = [] |
| 129 | 129 |
| 193 for server in caMerge: | 193 for server in caMerge: |
| 194 pems = QByteArray() | 194 pems = QByteArray() |
| 195 for cert in caMerge[server]: | 195 for cert in caMerge[server]: |
| 196 pems.append(cert.toPem() + b'\n') | 196 pems.append(cert.toPem() + b'\n') |
| 197 certificateDict[server] = pems | 197 certificateDict[server] = pems |
| 198 Preferences.Prefs.settings.setValue( | 198 Preferences.getSettings().setValue( |
| 199 "Ssl/CaCertificatesDict", | 199 "Ssl/CaCertificatesDict", |
| 200 certificateDict) | 200 certificateDict) |
| 201 | 201 |
| 202 return EricSslErrorState.USER_IGNORED, caRet | 202 return EricSslErrorState.USER_IGNORED, caRet |
| 203 | 203 |
| 265 Private method to get the list of system certificates. | 265 Private method to get the list of system certificates. |
| 266 | 266 |
| 267 @return list of system certificates (list of QSslCertificate) | 267 @return list of system certificates (list of QSslCertificate) |
| 268 """ | 268 """ |
| 269 caList = QSslCertificate.fromData(Globals.toByteArray( | 269 caList = QSslCertificate.fromData(Globals.toByteArray( |
| 270 Preferences.Prefs.settings.value("Ssl/SystemCertificates"))) | 270 Preferences.getSettings().value("Ssl/SystemCertificates"))) |
| 271 if not caList: | 271 if not caList: |
| 272 caList = QSslConfiguration.systemCaCertificates() | 272 caList = QSslConfiguration.systemCaCertificates() |
| 273 return caList | 273 return caList |
