rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow user to cancel proxy authentication request

Browse Source
This commit is contained in:
Ian Walker 2017-09-25 14:48:54 +09:00
parent 78bddaefe6
commit ad2bb45446
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
qutebrowser/browser/webengine/webenginetab.py
View File

@ -22,7 +22,7 @@
import os import os
import math import math
import functools import functools
import html import html as html_utils
import sip import sip
from PyQt5.QtCore import pyqtSlot, Qt, QEvent, QPoint, QUrl, QTimer from PyQt5.QtCore import pyqtSlot, Qt, QEvent, QPoint, QUrl, QTimer
@ -684,11 +684,11 @@ class WebEngineTab(browsertab.AbstractTab):
self.add_history_item.emit(url, requested_url, title) self.add_history_item.emit(url, requested_url, title)
@pyqtSlot(QUrl, 'QAuthenticator*', 'QString') @pyqtSlot(QUrl, 'QAuthenticator*', 'QString')
def _on_proxy_authentication_required(self, _url, authenticator, def _on_proxy_authentication_required(self, url, authenticator,
proxy_host): proxy_host):
"""Called when a proxy needs authentication.""" """Called when a proxy needs authentication."""
msg = "<b>{}</b> requires a username and password.".format( msg = "<b>{}</b> requires a username and password.".format(
html.escape(proxy_host)) html_utils.escape(proxy_host))
answer = message.ask( answer = message.ask(
title="Proxy authentication required", text=msg, title="Proxy authentication required", text=msg,
mode=usertypes.PromptMode.user_pwd, mode=usertypes.PromptMode.user_pwd,
@ -696,6 +696,18 @@ class WebEngineTab(browsertab.AbstractTab):
if answer is not None: if answer is not None:
authenticator.setUser(answer.user) authenticator.setUser(answer.user)
authenticator.setPassword(answer.password) authenticator.setPassword(answer.password)
else:
try:
# pylint: disable=no-member, useless-suppression
sip.assign(authenticator, QAuthenticator())
except AttributeError:
url_string = url.toDisplayString()
error_page = jinja.render(
'error.html',
title="Error loading page: {}".format(url_string),
url=url_string, error="Proxy authentication required",
icon='')
self.set_html(error_page)
@pyqtSlot(QUrl, 'QAuthenticator*') @pyqtSlot(QUrl, 'QAuthenticator*')
def _on_authentication_required(self, url, authenticator): def _on_authentication_required(self, url, authenticator):