Changeset 23769 in webkit

Timestamp:

Jun 25, 2007 11:20:57 AM (17 years ago)

Author:

staikos

Message:

Some work on adding HTTP proxy and SSL errors to WebKitQt, as well as preparing
for upcoming patches to do authentication.

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/network/ResourceHandleInternal.h (modified) (3 diffs)
• WebCore/platform/network/qt/ResourceHandleQt.cpp (modified) (3 diffs)
• WebKitQt/Api/qwebnetworkinterface.cpp (modified) (10 diffs)
• WebKitQt/Api/qwebnetworkinterface.h (modified) (2 diffs)
• WebKitQt/Api/qwebnetworkinterface_p.h (modified) (2 diffs)
• WebKitQt/Api/qwebpage.cpp (modified) (2 diffs)
• WebKitQt/Api/qwebpage.h (modified) (2 diffs)
• WebKitQt/Api/qwebpage_p.h (modified) (2 diffs)
• WebKitQt/ChangeLog (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-06-25  George Staikos  <staikos@kde.org>
+
+        Reviewed by Zack.
+
+        Start to add proxy and SSL support to WebKitQt.  Proxying works.
+
+        * platform/network/ResourceHandleInternal.h:
+        (WebCore::ResourceHandleInternal::ResourceHandleInternal):
+        * platform/network/qt/ResourceHandleQt.cpp:
+        (WebCore::ResourceHandle::start):
+
 2007-06-25  Alp Toker  <alp.toker@collabora.co.uk>
 

trunk/WebCore/platform/network/ResourceHandleInternal.h

@@ -46 +46 @@
 
 #if PLATFORM(QT)
+class QWebFrame;
 class QWebNetworkJob;
 #endif
@@ -98 +99 @@
 #if PLATFORM(QT)
             , m_job(0)
+            , m_frame(0)
 #endif
 #if PLATFORM(MAC)
@@ -150 +152 @@
 #if PLATFORM(QT)
         QWebNetworkJob *m_job;
+        QWebFrame *m_frame;
 #endif
 #if PLATFORM(MAC)

trunk/WebCore/platform/network/qt/ResourceHandleQt.cpp

@@ -29 +29 @@
 #include "config.h"
 
-#include <QRegExp>
-
 #include "Frame.h"
 #include "DocLoader.h"
@@ -39 +37 @@
 #include "qwebpage_p.h"
 #include "ChromeClientQt.h"
+#include "FrameLoaderClientQt.h"
 #include "Page.h"
 
@@ -72 +71 @@
     }
 
-    ChromeClientQt *client = static_cast<ChromeClientQt *>(page->chrome()->client());
-    QWebPagePrivate *webPage = client->m_webPage->d;
-    return QWebNetworkManager::self()->add(this, webPage->networkInterface);
+    getInternal()->m_frame = static_cast<FrameLoaderClientQt*>(frame->loader()->client())->webFrame();
+    return QWebNetworkManager::self()->add(this, getInternal()->m_frame->page()->d->networkInterface);
 }
 

trunk/WebKitQt/Api/qwebnetworkinterface.cpp

@@ -22 +22 @@
 */
 #include <qglobal.h>
+#include "qwebframe.h"
 #include "qwebnetworkinterface.h"
 #include "qwebnetworkinterface_p.h"
 #include "qwebobjectpluginconnector.h"
+#include "qwebpage.h"
 #include <qdebug.h>
 #include <qfile.h>
+#include <qnetworkproxy.h>
 #include <qurl.h>
 
@@ -100 +103 @@
     url = u;
     int port = url.port();
-    if (port > 0 && port != 80)
+    const QString scheme = u.scheme();
+    if (port > 0 && (port != 80 || scheme != "http") && (port != 443 || scheme != "https"))
         httpHeader.setValue(QLatin1String("Host"), url.host() + QLatin1Char(':') + QString::number(port));
     else
@@ -335 +339 @@
 {
     return d->interface;
+}
+
+/*!
+   Returns the network interface that is associated with this job.
+*/
+QWebFrame *QWebNetworkJob::frame() const
+{
+    if (d->resourceHandle) {
+        ResourceHandleInternal *rhi = d->resourceHandle->getInternal();
+        if (rhi) {
+            return rhi->m_frame;
+        }
+    }
+    return 0;
 }
 
@@ -791 +809 @@
         connect(connection[i].http, SIGNAL(requestFinished(int, bool)),
                 this, SLOT(onRequestFinished(int, bool)));
+        connect(connection[i].http, SIGNAL(done(bool)),
+                this, SLOT(onDone(bool)));
         connect(connection[i].http, SIGNAL(stateChanged(int)),
                 this, SLOT(onStateChanged(int)));
+        connect(connection[i].http, SIGNAL(authenticationRequired(const QString&, quint16, QAuthenticator*)),
+                this, SLOT(onAuthenticationRequired(const QString&, quint16, QAuthenticator*)));
+        connect(connection[i].http, SIGNAL(proxyAuthenticationRequired(const QNetworkProxy&, QAuthenticator*)),
+                this, SLOT(onProxyAuthenticationRequired(const QNetworkProxy&, QAuthenticator*)));
+        connect(connection[i].http, SIGNAL(sslErrors(const QList<QSslError>&)),
+                this, SLOT(onSslErrors(const QList<QSslError>&)));
     }
 }
@@ -831 +857 @@
     
     QHttp *http = connection[c].http;
+
+    connection[c].current = job;
+    http->setProxy(job->frame()->page()->networkProxy());
+    connection[c].proxyDone = false;
+
     QByteArray postData = job->postData();
     if (!postData.isEmpty())
@@ -836 +867 @@
     else
         http->request(job->httpHeader());
-    connection[c].current = job;
 
     DEBUG() << "WebCoreHttp::scheduleNextRequest: using connection" << c;
@@ -880 +910 @@
 }
 
-void WebCoreHttp::onRequestFinished(int, bool error)
+void WebCoreHttp::onRequestFinished(int id, bool error)
 {
     int c = getConnection();
+    if (!connection[c].proxyDone) {
+        connection[c].proxyDone = true;
+        return;
+    }
     QWebNetworkJob *req = connection[c].current;
     if (!req) {
@@ -888 +922 @@
         return;
     }
+
     QHttp *http = connection[c].http;
     DEBUG() << "WebCoreHttp::slotFinished connection=" << c << error << req;
-
     if (error)
         DEBUG() << "   error: " << http->errorString();
@@ -901 +935 @@
     }
     emit req->networkInterface()->finished(req, error ? 1 : 0);
+}
+
+void WebCoreHttp::onDone(bool error)
+{
+    int c = getConnection();
+    QWebNetworkJob *req = connection[c].current;
+    if (!req) {
+        scheduleNextRequest();
+        return;
+    }
+
+    DEBUG() << "WebCoreHttp::DONE connection=" << c << error << req;
+    QHttp *http = connection[c].http;
+
+    if (error)
+        DEBUG() << "   error: " << http->errorString();
 
     connection[c].current = 0;
@@ -937 +987 @@
 }
 
+void WebCoreHttp::onSslErrors(const QList<QSslError>& errors)
+{
+    int c = getConnection();
+    QWebNetworkJob *req = connection[c].current;
+    if (!req) {
+        return;
+    }
+
+    qDebug() << "SSL ERRORS";
+    //emit req->frame()->page()->sslErrors(req->frame(), errors);
+}
+
+void WebCoreHttp::onAuthenticationRequired(const QString& hostname, quint16 port, QAuthenticator *auth)
+{
+    int c = getConnection();
+    QWebNetworkJob *req = connection[c].current;
+    if (!req) {
+        return;
+    }
+
+    qDebug() << "AUTH REQUIRED" << hostname << port << auth;
+    //emit req->frame()->page()->authenticate(req->frame(), hostname, port, auth);
+}
+
+void WebCoreHttp::onProxyAuthenticationRequired(const QNetworkProxy& proxy, QAuthenticator *auth)
+{
+}
+
 HostInfo::HostInfo(const QUrl& url)
     : protocol(url.scheme())

trunk/WebKitQt/Api/qwebnetworkinterface.h

@@ -30 +30 @@
 #include <qwebkitglobal.h>
 
+class QWebFrame;
 class QWebNetworkJobPrivate;
 class QWebNetworkInterface;
@@ -97 +98 @@
     QWebNetworkInterface *networkInterface() const;
     
+    QWebFrame *frame() const;
+
 private:
     QWebNetworkJob();

trunk/WebKitQt/Api/qwebnetworkinterface_p.h

@@ -130 +130 @@
         void onReadyRead();
         void onRequestFinished(int, bool);
+        void onDone(bool);
         void onStateChanged(int);
+        void onSslErrors(const QList<QSslError>&);
+        void onAuthenticationRequired(const QString& hostname, quint16 port, QAuthenticator *);
+        void onProxyAuthenticationRequired(const QNetworkProxy& proxy, QAuthenticator *);
 
         void scheduleNextRequest();
@@ -143 +147 @@
             QHttp *http;
             QWebNetworkJob *current;
+            bool proxyDone;
         };
         HttpConnection connection[2];

trunk/WebKitQt/Api/qwebpage.cpp

@@ -55 +55 @@
 #include <QInputDialog>
 #include <QMessageBox>
+#include <QNetworkProxy>
 #include <QUndoStack>
 #include <QUrl>
@@ -449 +450 @@
 }
 
+void QWebPage::setNetworkProxy(const QNetworkProxy& proxy)
+{
+    d->networkProxy = proxy;
+}
+
+QNetworkProxy QWebPage::networkProxy() const
+{
+    return d->networkProxy;
+}
+

trunk/WebKitQt/Api/qwebpage.h

@@ -30 +30 @@
 
 #include <qwidget.h>
-class QWebFrame;
+class QNetworkProxy;
 class QUndoStack;
 class QUrl;
+class QWebFrame;
 class QWebNetworkRequest;
 
@@ -85 +86 @@
 
     QPixmap icon() const;
+
+    void setNetworkProxy(const QNetworkProxy& proxy);
+    QNetworkProxy networkProxy() const;
 
 public slots:

trunk/WebKitQt/Api/qwebpage_p.h

@@ -23 +23 @@
 #define QWEBPAGE_P_H
 
+#include <qnetworkproxy.h>
 #include <qpointer.h>
 
@@ -63 +64 @@
     bool insideOpenCall;
     QWebPage::NavigationRequestResponse navigationRequested(QWebFrame *frame, const QWebNetworkRequest &request);
+    QNetworkProxy networkProxy;
 };
 

trunk/WebKitQt/ChangeLog

@@ +1 @@
+2007-06-25  George Staikos  <staikos@kde.org>
+
+        Reviewed by Zack.
+
+        Start to add proxy and SSL support to WebKit Qt.  Proxy works
+        unauthenticated.  Added hooks to be able to add authentication.
+        Also fixes some network errors.
+
+        * Api/qwebnetworkinterface.cpp:
+        (QWebNetworkRequestPrivate::setURL):
+        (QWebNetworkJob::frame):
+        (WebCoreHttp::WebCoreHttp):
+        (WebCoreHttp::scheduleNextRequest):
+        (WebCoreHttp::onRequestFinished):
+        (WebCoreHttp::onDone):
+        (WebCoreHttp::onSslErrors):
+        (WebCoreHttp::onAuthenticationRequired):
+        (WebCoreHttp::onProxyAuthenticationRequired):
+        * Api/qwebnetworkinterface.h:
+        * Api/qwebnetworkinterface_p.h:
+        * Api/qwebpage.cpp:
+        (QWebPage::setNetworkProxy):
+        (QWebPage::networkProxy):
+        * Api/qwebpage.h:
+        * Api/qwebpage_p.h:
+
 2007-06-21  Adam Treat  <adam@staikos.net>