Changeset 51298 in webkit

Timestamp:

Nov 22, 2009 2:29:10 PM (14 years ago)

Author:

eric@webkit.org

Message:

2009-11-22 Jakub Wieczorek <​faw217@gmail.com>

Reviewed by Adam Barth.

[Qt] DumpRenderTree should explicitly ignore any SSL certificate errors
for localhost and 127.0.0.1.
​https://bugs.webkit.org/show_bug.cgi?id=31783

Unskip the http/tests/ssl/verify-ssl-enabled.php test, which is passing now.

• platform/qt/Skipped:

2009-11-22 Jakub Wieczorek <​faw217@gmail.com>

Reviewed by Adam Barth.

[Qt] DumpRenderTree should explicitly ignore any SSL certificate errors
for localhost and 127.0.0.1.
​https://bugs.webkit.org/show_bug.cgi?id=31783

Unskip the http/tests/ssl/verify-ssl-enabled.php test, which is passing now.

• DumpRenderTree/qt/DumpRenderTree.cpp: (WebCore::NetworkAccessManager::NetworkAccessManager): (WebCore::NetworkAccessManager::sslErrorsEncountered): (WebCore::WebPage::WebPage):
• DumpRenderTree/qt/DumpRenderTree.h:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt/Skipped (modified) (2 diffs)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp (modified) (3 diffs)
• WebKitTools/DumpRenderTree/qt/DumpRenderTree.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-11-22  Jakub Wieczorek  <faw217@gmail.com>
+
+        Reviewed by Adam Barth.
+
+        [Qt] DumpRenderTree should explicitly ignore any SSL certificate errors
+        for localhost and 127.0.0.1.
+        https://bugs.webkit.org/show_bug.cgi?id=31783
+
+        Unskip the http/tests/ssl/verify-ssl-enabled.php test, which is passing now.
+
+        * platform/qt/Skipped:
+
 2009-11-22  Chris Evans  <cevans@chromium.org>
 

trunk/LayoutTests/platform/qt/Skipped

@@ -38 +38 @@
 http/tests/navigation
 http/tests/plugins
-http/tests/ssl
 http/tests/webarchive
 http/tests/wml
@@ -44 +43 @@
 # Failing URL test
 http/tests/uri/escaped-entity.html
+
+# Failing HTTP SSL tests
+http/tests/ssl/referer-301.html
+http/tests/ssl/referer-303.html
 
 # Failing HTTP Loading tests

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-11-22  Jakub Wieczorek  <faw217@gmail.com>
+
+        Reviewed by Adam Barth.
+
+        [Qt] DumpRenderTree should explicitly ignore any SSL certificate errors
+        for localhost and 127.0.0.1.
+        https://bugs.webkit.org/show_bug.cgi?id=31783
+
+        Unskip the http/tests/ssl/verify-ssl-enabled.php test, which is passing now.
+
+        * DumpRenderTree/qt/DumpRenderTree.cpp:
+        (WebCore::NetworkAccessManager::NetworkAccessManager):
+        (WebCore::NetworkAccessManager::sslErrorsEncountered):
+        (WebCore::WebPage::WebPage):
+        * DumpRenderTree/qt/DumpRenderTree.h:
+
 2009-11-22  Chris Evans  <cevans@chromium.org>
 

trunk/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp

@@ -50 +50 @@
 #include <QFocusEvent>
 #include <QFontDatabase>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
 #include <QNetworkRequest>
 #include <QUndoStack>
@@ -79 +81 @@
 const unsigned int maxViewWidth = 800;
 const unsigned int maxViewHeight = 600;
+
+NetworkAccessManager::NetworkAccessManager(QObject* parent)
+    : QNetworkAccessManager(parent)
+{
+#ifndef QT_NO_SSL
+    connect(this, SIGNAL(sslErrors(QNetworkReply*, const QList<QSslError>&)),
+            this, SLOT(sslErrorsEncountered(QNetworkReply*, const QList<QSslError>&)));
+#endif
+}
+
+#ifndef QT_NO_SSL
+void NetworkAccessManager::sslErrorsEncountered(QNetworkReply* reply, const QList<QSslError>& errors)
+{
+    if (reply->url().host() == "127.0.0.1" || reply->url().host() == "localhost") {
+        bool ignore = true;
+
+        // Accept any HTTPS certificate.
+        foreach (const QSslError& error, errors) {
+            if (error.error() < QSslError::UnableToGetIssuerCertificate || error.error() > QSslError::HostNameMismatch) {
+                ignore = false;
+                break;
+            }
+        }
+
+        if (ignore)
+            reply->ignoreSslErrors();
+    }
+}
+#endif
 
 WebPage::WebPage(QWidget *parent, DumpRenderTree *drt)
@@ -103 +134 @@
             this, SLOT(setViewGeometry(const QRect & )));
 
+    setNetworkAccessManager(new NetworkAccessManager(this));
     setPluginFactory(new TestPlugin(this));
 }

trunk/WebKitTools/DumpRenderTree/qt/DumpRenderTree.h

@@ -32 +32 @@
 
 #include <QList>
+#include <QNetworkAccessManager>
 #include <QObject>
 #include <QTextStream>
 #include <QSocketNotifier>
+
+#ifndef QT_NO_SSL
+#include <QSslError>
+#endif
 
 #include <qwebpage.h>
@@ -122 +127 @@
 };
 
+class NetworkAccessManager : public QNetworkAccessManager {
+    Q_OBJECT
+public:
+    NetworkAccessManager(QObject* parent);
+
+private slots:
+#ifndef QT_NO_SSL
+    void sslErrorsEncountered(QNetworkReply*, const QList<QSslError>&);
+#endif
+};
+
 class WebPage : public QWebPage {
     Q_OBJECT