Clear rejected SSL questions when reloading page.

Fixes #565.

qutebrowser/browser/network/networkmanager.py

@@ -21,7 +21,8 @@
 
 import collections
 
-from PyQt5.QtCore import pyqtSlot, pyqtSignal, PYQT_VERSION, QCoreApplication
+from PyQt5.QtCore import (pyqtSlot, pyqtSignal, PYQT_VERSION, QCoreApplication,
+                          QUrl)
 from PyQt5.QtNetwork import QNetworkAccessManager, QNetworkReply, QSslError
 
 try:
@@ -188,7 +189,7 @@ class NetworkManager(QNetworkAccessManager):
             request.deleteLater()
         self.shutting_down.emit()
 
-    if SSL_AVAILABLE:
+    if SSL_AVAILABLE:  # noqa
         @pyqtSlot('QNetworkReply*', 'QList<QSslError>')
         def on_ssl_errors(self, reply, errors):
             """Decide if SSL errors should be ignored or not.
@@ -228,6 +229,26 @@ class NetworkManager(QNetworkAccessManager):
                                   'SSL error: {}'.format(err.errorString()))
                 reply.ignoreSslErrors()
 
+        @pyqtSlot(QUrl)
+        def clear_rejected_ssl_errors(self, url):
+            """Clear the rejected SSL errors on a reload.
+
+            Args:
+                url: The URL to remove.
+            """
+            try:
+                del self._rejected_ssl_errors[url]
+            except KeyError:
+                pass
+    else:
+        @pyqtSlot(QUrl)
+        def clear_rejected_ssl_errors(self, _url):
+            """Clear the rejected SSL errors on a reload.
+
+            Does nothing because SSL is unavailable.
+            """
+            pass
+
     @pyqtSlot('QNetworkReply', 'QAuthenticator')
     def on_authentication_required(self, reply, authenticator):
         """Called when a website needs authentication."""

qutebrowser/browser/webpage.py

@@ -53,9 +53,12 @@ class BrowserPage(QWebPage):
 
     Signals:
         shutting_down: Emitted when the page is currently shutting down.
+        reloading: Emitted before a web page reloads.
+                   arg: The URL which gets reloaded.
     """
 
     shutting_down = pyqtSignal()
+    reloading = pyqtSignal(QUrl)
 
     def __init__(self, win_id, tab_id, parent=None):
         super().__init__(parent)
@@ -73,6 +76,7 @@ class BrowserPage(QWebPage):
             win_id, tab_id, self)
         self.setNetworkAccessManager(self._networkmanager)
         self.setForwardUnsupportedContent(True)
+        self.reloading.connect(self._networkmanager.clear_rejected_ssl_errors)
         self.printRequested.connect(self.on_print_requested)
         self.downloadRequested.connect(self.on_download_requested)
         self.unsupportedContent.connect(self.on_unsupported_content)
@@ -527,10 +531,12 @@ class BrowserPage(QWebPage):
             request: QNetworkRequest
             typ: QWebPage::NavigationType
         """
-        if typ != QWebPage.NavigationTypeLinkClicked:
-            return True
         url = request.url()
         urlstr = url.toDisplayString()
+        if typ == QWebPage.NavigationTypeReload:
+            self.reloading.emit(url)
+        if typ != QWebPage.NavigationTypeLinkClicked:
+            return True
         if not url.isValid():
             message.error(self._win_id, "Invalid link {} clicked!".format(
                 urlstr))