Mercurial Repositories > eric / file comparison
comparison: E5Network/E5SslCertificatesDialog.py
E5Network/E5SslCertificatesDialog.py
- changeset 4241
- 545629046c45
- parent 4021
- 195a471c327b
- child 4631
- 5c1a96925da4
equal
deleted
inserted
replaced
| 4239:4883661fc427 | 4241:545629046c45 |
|---|---|
| 23 from .Ui_E5SslCertificatesDialog import Ui_E5SslCertificatesDialog | 23 from .Ui_E5SslCertificatesDialog import Ui_E5SslCertificatesDialog |
| 24 | 24 |
| 25 import Preferences | 25 import Preferences |
| 26 import Utilities | 26 import Utilities |
| 27 import UI.PixmapCache | 27 import UI.PixmapCache |
| 28 import Globals | |
| 28 | 29 |
| 29 | 30 |
| 30 class E5SslCertificatesDialog(QDialog, Ui_E5SslCertificatesDialog): | 31 class E5SslCertificatesDialog(QDialog, Ui_E5SslCertificatesDialog): |
| 31 """ | 32 """ |
| 32 Class implementing a dialog to show and edit all certificates. | 33 Class implementing a dialog to show and edit all certificates. |
| 65 | 66 |
| 66 def __populateServerCertificatesTree(self): | 67 def __populateServerCertificatesTree(self): |
| 67 """ | 68 """ |
| 68 Private slot to populate the server certificates tree. | 69 Private slot to populate the server certificates tree. |
| 69 """ | 70 """ |
| 70 certificateDict = Preferences.toDict( | 71 certificateDict = Globals.toDict( |
| 71 Preferences.Prefs.settings.value("Ssl/CaCertificatesDict")) | 72 Preferences.Prefs.settings.value("Ssl/CaCertificatesDict")) |
| 72 for server in certificateDict: | 73 for server in certificateDict: |
| 73 for cert in QSslCertificate.fromData(certificateDict[server]): | 74 for cert in QSslCertificate.fromData(certificateDict[server]): |
| 74 self.__createServerCertificateEntry(server, cert) | 75 self.__createServerCertificateEntry(server, cert) |
| 75 | 76 |
| 172 if parent.childCount() == 0: | 173 if parent.childCount() == 0: |
| 173 self.serversCertificatesTree.takeTopLevelItem( | 174 self.serversCertificatesTree.takeTopLevelItem( |
| 174 self.serversCertificatesTree.indexOfTopLevelItem(parent)) | 175 self.serversCertificatesTree.indexOfTopLevelItem(parent)) |
| 175 | 176 |
| 176 # delete the certificate from the user certificate store | 177 # delete the certificate from the user certificate store |
| 177 certificateDict = Preferences.toDict( | 178 certificateDict = Globals.toDict( |
| 178 Preferences.Prefs.settings.value("Ssl/CaCertificatesDict")) | 179 Preferences.Prefs.settings.value("Ssl/CaCertificatesDict")) |
| 179 if server in certificateDict: | 180 if server in certificateDict: |
| 180 certs = QSslCertificate.fromData(certificateDict[server]) | 181 certs = QSslCertificate.fromData(certificateDict[server]) |
| 181 if cert in certs: | 182 if cert in certs: |
| 182 certs.remove(cert) | 183 certs.remove(cert) |
| 200 Private slot to import server certificates. | 201 Private slot to import server certificates. |
| 201 """ | 202 """ |
| 202 certs = self.__importCertificate() | 203 certs = self.__importCertificate() |
| 203 if certs: | 204 if certs: |
| 204 server = "*" | 205 server = "*" |
| 205 certificateDict = Preferences.toDict( | 206 certificateDict = Globals.toDict( |
| 206 Preferences.Prefs.settings.value("Ssl/CaCertificatesDict")) | 207 Preferences.Prefs.settings.value("Ssl/CaCertificatesDict")) |
| 207 if server in certificateDict: | 208 if server in certificateDict: |
| 208 sCerts = QSslCertificate.fromData(certificateDict[server]) | 209 sCerts = QSslCertificate.fromData(certificateDict[server]) |
| 209 else: | 210 else: |
| 210 sCerts = [] | 211 sCerts = [] |
| 253 def __updateDefaultConfiguration(self): | 254 def __updateDefaultConfiguration(self): |
| 254 """ | 255 """ |
| 255 Private method to update the default SSL configuration. | 256 Private method to update the default SSL configuration. |
| 256 """ | 257 """ |
| 257 caList = self.__getSystemCaCertificates() | 258 caList = self.__getSystemCaCertificates() |
| 258 certificateDict = Preferences.toDict( | 259 certificateDict = Globals.toDict( |
| 259 Preferences.Prefs.settings.value("Ssl/CaCertificatesDict")) | 260 Preferences.Prefs.settings.value("Ssl/CaCertificatesDict")) |
| 260 for server in certificateDict: | 261 for server in certificateDict: |
| 261 for cert in QSslCertificate.fromData(certificateDict[server]): | 262 for cert in QSslCertificate.fromData(certificateDict[server]): |
| 262 if cert not in caList: | 263 if cert not in caList: |
| 263 caList.append(cert) | 264 caList.append(cert) |
| 269 """ | 270 """ |
| 270 Private method to get the list of system certificates. | 271 Private method to get the list of system certificates. |
| 271 | 272 |
| 272 @return list of system certificates (list of QSslCertificate) | 273 @return list of system certificates (list of QSslCertificate) |
| 273 """ | 274 """ |
| 274 caList = QSslCertificate.fromData(Preferences.toByteArray( | 275 caList = QSslCertificate.fromData(Globals.toByteArray( |
| 275 Preferences.Prefs.settings.value("Help/SystemCertificates"))) | 276 Preferences.Prefs.settings.value("Help/SystemCertificates"))) |
| 276 if not caList: | 277 if not caList: |
| 277 caList = QSslSocket.systemCaCertificates() | 278 caList = QSslSocket.systemCaCertificates() |
| 278 return caList | 279 return caList |
| 279 | 280 |
