diff -r e9e7eca7efee -r bf71ee032bb4 src/eric7/WebBrowser/Network/NetworkManager.py
--- a/src/eric7/WebBrowser/Network/NetworkManager.py Wed Jul 13 11:16:20 2022 +0200
+++ b/src/eric7/WebBrowser/Network/NetworkManager.py Wed Jul 13 14:55:47 2022 +0200
@@ -13,15 +13,20 @@
from PyQt6.QtCore import pyqtSignal, QByteArray
from PyQt6.QtWidgets import QStyle, QDialog
from PyQt6.QtNetwork import (
- QNetworkAccessManager, QNetworkProxy, QNetworkProxyFactory, QNetworkRequest
+ QNetworkAccessManager,
+ QNetworkProxy,
+ QNetworkProxyFactory,
+ QNetworkRequest,
)
from EricWidgets import EricMessageBox
from EricWidgets.EricApplication import ericApp
from EricNetwork.EricNetworkProxyFactory import proxyAuthenticationRequired
+
try:
from EricNetwork.EricSslErrorHandler import EricSslErrorHandler
+
SSL_AVAILABLE = True
except ImportError:
SSL_AVAILABLE = False
@@ -37,94 +42,99 @@
class NetworkManager(QNetworkAccessManager):
"""
Class implementing a network manager.
-
+
@signal changed() emitted to indicate a change
"""
+
changed = pyqtSignal()
-
+
def __init__(self, engine, parent=None):
"""
Constructor
-
+
@param engine reference to the help engine (QHelpEngine)
@param parent reference to the parent object (QObject)
"""
super().__init__(parent)
-
+
from EricNetwork.EricNetworkProxyFactory import EricNetworkProxyFactory
-
+
self.__proxyFactory = EricNetworkProxyFactory()
if Preferences.getUI("UseSystemProxy"):
QNetworkProxyFactory.setUseSystemConfiguration(True)
else:
- QNetworkProxyFactory.setApplicationProxyFactory(
- self.__proxyFactory)
+ QNetworkProxyFactory.setApplicationProxyFactory(self.__proxyFactory)
QNetworkProxyFactory.setUseSystemConfiguration(False)
-
+
self.languagesChanged()
-
+
if SSL_AVAILABLE:
self.__sslErrorHandler = EricSslErrorHandler(self)
self.sslErrors.connect(self.__sslErrorHandlingSlot)
-
+
self.__temporarilyIgnoredSslErrors = {}
self.__permanentlyIgnoredSslErrors = {}
# dictionaries of permanently and temporarily ignored SSL errors
-
+
self.__insecureHosts = set()
-
+
self.__loaded = False
self.__saveTimer = AutoSaver(self, self.__save)
-
+
self.changed.connect(self.__saveTimer.changeOccurred)
self.proxyAuthenticationRequired.connect(proxyAuthenticationRequired)
self.authenticationRequired.connect(
- lambda reply, auth: self.authentication(reply.url(), auth))
-
+ lambda reply, auth: self.authentication(reply.url(), auth)
+ )
+
from .EricSchemeHandler import EricSchemeHandler
+
self.__ericSchemeHandler = EricSchemeHandler()
WebBrowserWindow.webProfile().installUrlSchemeHandler(
- QByteArray(b"eric"), self.__ericSchemeHandler)
-
+ QByteArray(b"eric"), self.__ericSchemeHandler
+ )
+
if engine:
from .QtHelpSchemeHandler import QtHelpSchemeHandler
+
self.__qtHelpSchemeHandler = QtHelpSchemeHandler(engine)
WebBrowserWindow.webProfile().installUrlSchemeHandler(
- QByteArray(b"qthelp"), self.__qtHelpSchemeHandler)
-
+ QByteArray(b"qthelp"), self.__qtHelpSchemeHandler
+ )
+
self.__interceptor = NetworkUrlInterceptor(self)
- WebBrowserWindow.webProfile().setUrlRequestInterceptor(
- self.__interceptor)
-
+ WebBrowserWindow.webProfile().setUrlRequestInterceptor(self.__interceptor)
+
WebBrowserWindow.cookieJar()
-
+
def __save(self):
"""
Private slot to save the permanent SSL error exceptions.
"""
if not self.__loaded:
return
-
+
from WebBrowser.WebBrowserWindow import WebBrowserWindow
+
if not WebBrowserWindow.isPrivate():
dbString = json.dumps(self.__permanentlyIgnoredSslErrors)
Preferences.setWebBrowser("SslExceptionsDB", dbString)
-
+
def __load(self):
"""
Private method to load the permanent SSL error exceptions.
"""
if self.__loaded:
return
-
+
dbString = Preferences.getWebBrowser("SslExceptionsDB")
if dbString:
with contextlib.suppress(ValueError):
db = json.loads(dbString)
self.__permanentlyIgnoredSslErrors = db
-
+
self.__loaded = True
-
+
def shutdown(self):
"""
Public method to shut down the network manager.
@@ -133,36 +143,37 @@
self.__loaded = False
self.__temporarilyIgnoredSslErrors = {}
self.__permanentlyIgnoredSslErrors = {}
-
+
# set proxy factory to None to avoid crashes
QNetworkProxyFactory.setApplicationProxyFactory(None)
-
+
def showSslErrorExceptionsDialog(self):
"""
Public method to show the SSL error exceptions dialog.
"""
self.__load()
-
+
from .SslErrorExceptionsDialog import SslErrorExceptionsDialog
+
dlg = SslErrorExceptionsDialog(self.__permanentlyIgnoredSslErrors)
if dlg.exec() == QDialog.DialogCode.Accepted:
self.__permanentlyIgnoredSslErrors = dlg.getSslErrorExceptions()
self.changed.emit()
-
+
def clearSslExceptions(self):
"""
Public method to clear the permanent SSL certificate error exceptions.
"""
self.__load()
-
+
self.__permanentlyIgnoredSslErrors = {}
self.changed.emit()
self.__saveTimer.saveIfNeccessary()
-
+
def certificateError(self, error, view):
"""
Public method to handle SSL certificate errors.
-
+
@param error object containing the certificate error information
@type QWebEngineCertificateError
@param view reference to a view to be used as parent for the dialog
@@ -172,40 +183,45 @@
"""
if Preferences.getWebBrowser("AlwaysRejectFaultyCertificates"):
return False
-
+
self.__load()
-
+
host = error.url().host()
-
+
self.__insecureHosts.add(host)
-
+
if (
- host in self.__temporarilyIgnoredSslErrors and
- error.error() in self.__temporarilyIgnoredSslErrors[host]
+ host in self.__temporarilyIgnoredSslErrors
+ and error.error() in self.__temporarilyIgnoredSslErrors[host]
):
return True
-
+
if (
- host in self.__permanentlyIgnoredSslErrors and
- error.error() in self.__permanentlyIgnoredSslErrors[host]
+ host in self.__permanentlyIgnoredSslErrors
+ and error.error() in self.__permanentlyIgnoredSslErrors[host]
):
return True
-
+
title = self.tr("SSL Certificate Error")
msgBox = EricMessageBox.EricMessageBox(
EricMessageBox.Warning,
title,
- self.tr("""<b>{0}</b>"""
- """<p>The host <b>{1}</b> you are trying to access has"""
- """ errors in the SSL certificate.</p>"""
- """<ul><li>{2}</li></ul>"""
- """<p>Would you like to make an exception?</p>""")
- .format(title, host, error.errorDescription()),
- modal=True, parent=view)
- permButton = msgBox.addButton(self.tr("&Permanent accept"),
- EricMessageBox.AcceptRole)
- tempButton = msgBox.addButton(self.tr("&Temporary accept"),
- EricMessageBox.AcceptRole)
+ self.tr(
+ """<b>{0}</b>"""
+ """<p>The host <b>{1}</b> you are trying to access has"""
+ """ errors in the SSL certificate.</p>"""
+ """<ul><li>{2}</li></ul>"""
+ """<p>Would you like to make an exception?</p>"""
+ ).format(title, host, error.errorDescription()),
+ modal=True,
+ parent=view,
+ )
+ permButton = msgBox.addButton(
+ self.tr("&Permanent accept"), EricMessageBox.AcceptRole
+ )
+ tempButton = msgBox.addButton(
+ self.tr("&Temporary accept"), EricMessageBox.AcceptRole
+ )
msgBox.addButton(self.tr("&Reject"), EricMessageBox.RejectRole)
msgBox.exec()
if msgBox.clickedButton() == permButton:
@@ -221,11 +237,11 @@
return True
else:
return False
-
+
def __sslErrorHandlingSlot(self, reply, errors):
"""
Private slot to handle SSL errors for a network reply.
-
+
@param reply reference to the reply object
@type QNetworkReply
@param errors list of SSL errors
@@ -233,33 +249,33 @@
"""
if Preferences.getWebBrowser("AlwaysRejectFaultyCertificates"):
return
-
+
self.__load()
-
+
host = reply.url().host()
if (
- host in self.__permanentlyIgnoredSslErrors or
- host in self.__temporarilyIgnoredSslErrors
+ host in self.__permanentlyIgnoredSslErrors
+ or host in self.__temporarilyIgnoredSslErrors
):
reply.ignoreSslErrors()
else:
self.__sslErrorHandler.sslErrorsReply(reply, errors)
-
+
def isInsecureHost(self, host):
"""
Public method to check a host against the list of insecure hosts.
-
+
@param host name of the host to be checked
@type str
@return flag indicating an insecure host
@rtype bool
"""
return host in self.__insecureHosts
-
+
def authentication(self, url, auth, page=None):
"""
Public slot to handle an authentication request.
-
+
@param url URL requesting authentication
@type QUrl
@param auth reference to the authenticator object
@@ -267,30 +283,33 @@
@param page reference to the web page
@type QWebEnginePage or None
"""
- urlRoot = (
- "{0}://{1}".format(url.scheme(), url.authority())
- )
+ urlRoot = "{0}://{1}".format(url.scheme(), url.authority())
realm = auth.realm()
- if not realm and 'realm' in auth.options():
+ if not realm and "realm" in auth.options():
realm = auth.option("realm")
info = (
- self.tr("<b>Enter username and password for '{0}', realm '{1}'</b>"
- ).format(urlRoot, realm)
- if realm else
- self.tr("<b>Enter username and password for '{0}'</b>"
- ).format(urlRoot)
+ self.tr("<b>Enter username and password for '{0}', realm '{1}'</b>").format(
+ urlRoot, realm
+ )
+ if realm
+ else self.tr("<b>Enter username and password for '{0}'</b>").format(urlRoot)
)
-
+
from UI.AuthenticationDialog import AuthenticationDialog
import WebBrowser.WebBrowserWindow
-
- dlg = AuthenticationDialog(info, auth.user(),
- Preferences.getUser("SavePasswords"),
- Preferences.getUser("SavePasswords"))
+
+ dlg = AuthenticationDialog(
+ info,
+ auth.user(),
+ Preferences.getUser("SavePasswords"),
+ Preferences.getUser("SavePasswords"),
+ )
if Preferences.getUser("SavePasswords"):
- username, password = (
- WebBrowser.WebBrowserWindow.WebBrowserWindow
- .passwordManager().getLogin(url, realm)
+ (
+ username,
+ password,
+ ) = WebBrowser.WebBrowserWindow.WebBrowserWindow.passwordManager().getLogin(
+ url, realm
)
if username:
dlg.setData(username, password)
@@ -299,47 +318,50 @@
auth.setUser(username)
auth.setPassword(password)
if Preferences.getUser("SavePasswords") and dlg.shallSave():
- (
- WebBrowser.WebBrowserWindow.WebBrowserWindow
- .passwordManager().setLogin(
- url, realm, username, password)
- )
+ pm = WebBrowser.WebBrowserWindow.WebBrowserWindow.passwordManager()
+ pm.setLogin(url, realm, username, password)
else:
if page is not None:
self.__showAuthenticationErrorPage(page, url)
-
+
def __showAuthenticationErrorPage(self, page, url):
"""
Private method to show an authentication error page.
-
+
@param page reference to the page
@type QWebEnginePage
@param url reference to the URL requesting authentication
@type QUrl
"""
html = getHtmlPage("authenticationErrorPage.html")
- html = html.replace("@IMAGE@", pixmapToDataUrl(
- ericApp().style().standardIcon(
- QStyle.StandardPixmap.SP_MessageBoxCritical).pixmap(48, 48)
- ).toString())
- html = html.replace("@FAVICON@", pixmapToDataUrl(
- ericApp().style() .standardIcon(
- QStyle.StandardPixmap.SP_MessageBoxCritical).pixmap(16, 16)
- ).toString())
+ html = html.replace(
+ "@IMAGE@",
+ pixmapToDataUrl(
+ ericApp()
+ .style()
+ .standardIcon(QStyle.StandardPixmap.SP_MessageBoxCritical)
+ .pixmap(48, 48)
+ ).toString(),
+ )
+ html = html.replace(
+ "@FAVICON@",
+ pixmapToDataUrl(
+ ericApp()
+ .style()
+ .standardIcon(QStyle.StandardPixmap.SP_MessageBoxCritical)
+ .pixmap(16, 16)
+ ).toString(),
+ )
html = html.replace("@TITLE@", self.tr("Authentication required"))
html = html.replace("@H1@", self.tr("Authentication required"))
- html = html.replace(
- "@LI-1@",
- self.tr("Authentication is required to access:"))
- html = html.replace(
- "@LI-2@",
- '<a href="{0}">{0}</a>'.format(url.toString()))
+ html = html.replace("@LI-1@", self.tr("Authentication is required to access:"))
+ html = html.replace("@LI-2@", '<a href="{0}">{0}</a>'.format(url.toString()))
page.setHtml(html, url)
-
+
def proxyAuthentication(self, requestUrl, auth, proxyHost):
"""
Public slot to handle a proxy authentication request.
-
+
@param requestUrl requested URL
@type QUrl
@param auth reference to the authenticator object
@@ -352,60 +374,59 @@
auth.setUser(proxy.user())
auth.setPassword(proxy.password())
return
-
+
proxyAuthenticationRequired(proxy, auth)
-
+
def languagesChanged(self):
"""
Public slot to (re-)load the list of accepted languages.
"""
- from WebBrowser.WebBrowserLanguagesDialog import (
- WebBrowserLanguagesDialog
- )
+ from WebBrowser.WebBrowserLanguagesDialog import WebBrowserLanguagesDialog
+
languages = Preferences.toList(
Preferences.getSettings().value(
"WebBrowser/AcceptLanguages",
- WebBrowserLanguagesDialog.defaultAcceptLanguages()))
+ WebBrowserLanguagesDialog.defaultAcceptLanguages(),
+ )
+ )
self.__acceptLanguage = WebBrowserLanguagesDialog.httpString(languages)
-
- WebBrowserWindow.webProfile().setHttpAcceptLanguage(
- self.__acceptLanguage)
-
+
+ WebBrowserWindow.webProfile().setHttpAcceptLanguage(self.__acceptLanguage)
+
def installUrlInterceptor(self, interceptor):
"""
Public method to install an URL interceptor.
-
+
@param interceptor URL interceptor to be installed
@type UrlInterceptor
"""
self.__interceptor.installUrlInterceptor(interceptor)
-
+
def removeUrlInterceptor(self, interceptor):
"""
Public method to remove an URL interceptor.
-
+
@param interceptor URL interceptor to be removed
@type UrlInterceptor
"""
self.__interceptor.removeUrlInterceptor(interceptor)
-
+
def preferencesChanged(self):
"""
Public slot to handle a change of preferences.
"""
self.__interceptor.preferencesChanged()
-
+
if Preferences.getUI("UseSystemProxy"):
QNetworkProxyFactory.setUseSystemConfiguration(True)
else:
- QNetworkProxyFactory.setApplicationProxyFactory(
- self.__proxyFactory)
+ QNetworkProxyFactory.setApplicationProxyFactory(self.__proxyFactory)
QNetworkProxyFactory.setUseSystemConfiguration(False)
-
+
def createRequest(self, op, request, data):
"""
Public method to launch a network action.
-
+
@param op operation to be performed
@type QNetworkAccessManager.Operation
@param request request to be operated on
@@ -416,7 +437,6 @@
@rtype QNetworkReply
"""
req = QNetworkRequest(request)
- req.setAttribute(
- QNetworkRequest.Attribute.Http2AllowedAttribute, True)
-
+ req.setAttribute(QNetworkRequest.Attribute.Http2AllowedAttribute, True)
+
return super().createRequest(op, req, data)
