eric: comparison WebBrowser/SafeBrowsing/SafeBrowsingDialog.py

-:6c7766cde4c1
+:d3448873ced3
 Module implementing a dialog to configure safe browsing support.
 """
 from __future__ import unicode_literals
-from PyQt5.QtCore import pyqtSlot, Qt
+from PyQt5.QtCore import pyqtSlot, Qt, QUrl
 from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QAbstractButton, \
 QApplication
 from E5Gui import E5MessageBox
 self.__manager = manager
 self.__manager.progressMessage.connect(self.__setProgressMessage)
 self.__manager.progress.connect(self.__setProgress)
-self.__saveButton = self.buttonBox.addButton(
-self.tr("Save"), QDialogButtonBox.ActionRole)
 self.iconLabel.setPixmap(
 UI.PixmapCache.getPixmap("safeBrowsing48.png"))
 self.__gsbHelpDialog = None
 self.__enabled = Preferences.getWebBrowser("SafeBrowsingEnabled")
 self.__apiKey = Preferences.getWebBrowser("SafeBrowsingApiKey")
+self.__filterPlatform = Preferences.getWebBrowser(
+"SafeBrowsingFilterPlatform")
 self.buttonBox.setFocus()
 msh = self.minimumSizeHint()
 self.resize(max(self.width(), msh.width()), msh.height())
 """
 Public slot to show the dialog.
 """
 self.gsbGroupBox.setChecked(self.__enabled)
 self.gsbApiKeyEdit.setText(self.__apiKey)
+self.gsbFilterPlatformCheckBox.setChecked(self.__filterPlatform)
 self.__updateCacheButtons()
 super(SafeBrowsingDialog, self).show()
 @param button button that was clicked (QAbstractButton)
 """
 if button == self.buttonBox.button(QDialogButtonBox.Close):
 self.close()
-elif button == self.__saveButton:
-self.__save()
 @pyqtSlot()
 def __save(self):
 """
 Private slot to save the configuration.
 @return flag indicating success
 @rtype bool
 """
 self.__enabled = self.gsbGroupBox.isChecked()
 self.__apiKey = self.gsbApiKeyEdit.text()
+self.__filterPlatform = self.gsbFilterPlatformCheckBox.isChecked()
 Preferences.setWebBrowser("SafeBrowsingEnabled", self.__enabled)
 Preferences.setWebBrowser("SafeBrowsingApiKey", self.__apiKey)
+Preferences.setWebBrowser("SafeBrowsingFilterPlatform",
+self.__filterPlatform)
 self.__manager.configurationChanged()
 self.__updateCacheButtons()
 @return flag indicating the presence of modified data
 @rtype bool
 """
 return (
 self.__enabled != self.gsbGroupBox.isChecked() or
-self.__apiKey != self.gsbApiKeyEdit.text()
+self.__apiKey != self.gsbApiKeyEdit.text() or
+self.__filterPlatform != self.gsbFilterPlatformCheckBox.isChecked()
 )
 def __okToClose(self):
 """
 Private method to check, if it is safe to close the dialog.
 @return flag indicating safe to close
 @rtype bool
 """
+QApplication.restoreOverrideCursor()
 if self.__isModified():
 res = E5MessageBox.okToClearData(
 self,
 self.tr("Safe Browsing Management"),
 self.tr("""The dialog contains unsaved changes."""),
 @pyqtSlot()
 def on_updateCacheButton_clicked(self):
 """
 Private slot to update the local cache database.
 """
+E5MessageBox.information(
+self,
+self.tr("Update Safe Browsing Cache"),
+self.tr("""Updating the Safe Browsing cache might be a lengthy"""
+""" operation. Please be patient!"""))
 QApplication.setOverrideCursor(Qt.WaitCursor)
 ok, error = self.__manager.updateHashPrefixCache()
 self.__resetProgress()
 QApplication.restoreOverrideCursor()
 if not ok:
 @pyqtSlot()
 def on_clearCacheButton_clicked(self):
 """
 Private slot to clear the local cache database.
 """
-self.__manager.fullCacheCleanup()
+res = E5MessageBox.yesNo(
+self,
+self.tr("Clear Safe Browsing Cache"),
+self.tr("""Do you really want to clear the Safe Browsing cache?"""
+""" Re-populating it might take some time."""))
+if res:
+QApplication.setOverrideCursor(Qt.WaitCursor)
+self.__manager.fullCacheCleanup()
+QApplication.restoreOverrideCursor()
 @pyqtSlot(str, int)
 def __setProgressMessage(self, message, maximum):
 """
 Private slot to set the progress message and the maximum value.
 Private method to reset the progress info.
 """
 self.progressLabel.clear()
 self.progressBar.setMaximum(100)
 self.progressBar.setValue(0)
+@pyqtSlot(str)
+def on_urlEdit_textChanged(self, text):
+"""
+Private slot to handle changes of the entered URL text.
+@param text entered URL text
+@type str
+"""
+url = QUrl.fromUserInput(text)
+enable = (
+url.isValid() and
+bool(url.scheme()) and
+url.scheme() not in self.__manager.getIgnoreSchemes()
+)
+self.urlCheckButton.setEnabled(enable)
+@pyqtSlot()
+def on_urlCheckButton_clicked(self):
+"""
+Private slot to check the entered URL.
+"""
+# Malicious URL for testing:
+# http://malware.testing.google.test/testing/malware/*
+# http://ianfette.org
+#
+urlStr = self.urlEdit.text()
+url = QUrl.fromUserInput(urlStr)
+threatLists = self.__manager.lookupUrl(url)
+if threatLists:
+threatMessages = self.__manager.getThreatMessages(threatLists)
+E5MessageBox.warning(
+self,
+self.tr("Check URL"),
+self.tr("<p>The URL <b>{0}</b> was found in the Safe Browsing"
+" Database.</p>{1}").format(urlStr,
+"".join(threatMessages))
+)
+else:
+E5MessageBox.information(
+self,
+self.tr("Check URL"),
+self.tr("<p>The URL <b>{0}</b> was not found in the Safe"
+" Browsing Database and may be considered safe.</p>")
+.format(urlStr)
+)
+@pyqtSlot()
+def on_saveButton_clicked(self):
+"""
+Private slot to save the configuration data.
+"""
+self.__save()

Mercurial Repositories > eric / file comparison

comparison: WebBrowser/SafeBrowsing/SafeBrowsingDialog.py

WebBrowser/SafeBrowsing/SafeBrowsingDialog.py