Add the ability to set the proxy server on a per-page-object basis.

Issue: ariya#11667
WiserSolutions · Sep 29, 2016 · c6c7fe5 · c6c7fe5
1 parent 69c68f5
commit c6c7fe5
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 0 deletions.
diff --git a/src/consts.h b/src/consts.h
@@ -55,6 +55,7 @@
 #define PAGE_SETTINGS_JS_ENABLED            "javascriptEnabled"
 #define PAGE_SETTINGS_XSS_AUDITING          "XSSAuditingEnabled"
 #define PAGE_SETTINGS_USER_AGENT            "userAgent"
+#define PAGE_SETTINGS_PROXY                 "proxy"
 #define PAGE_SETTINGS_LOCAL_ACCESS_REMOTE   "localToRemoteUrlAccessEnabled"
 #define PAGE_SETTINGS_USERNAME              "userName"
 #define PAGE_SETTINGS_PASSWORD              "password"

diff --git a/src/phantom.cpp b/src/phantom.cpp
@@ -420,6 +420,15 @@ void Phantom::setProxy(const QString& ip, const qint64& port, const QString& pro
     }
 }
 
+QString Phantom::proxy()
+{
+    QNetworkProxy proxy = QNetworkProxy::applicationProxy();
+    if (proxy.hostName().isEmpty()) {
+        return NULL;
+    }
+    return proxy.hostName() + ":" + QString::number(proxy.port());
+}
+
 void Phantom::exit(int code)
 {
     if (m_config.debug()) {

diff --git a/src/phantom.h b/src/phantom.h
@@ -170,6 +170,8 @@ public slots:
      */
     void setProxy(const QString& ip, const qint64& port = 80, const QString& proxyType = "http", const QString& user = NULL, const QString& password = NULL);
 
+    QString proxy();
+
     // exit() will not exit in debug mode. debugExit() will always exit.
     void exit(int code = 0);
     void debugExit(int code = 0);

diff --git a/src/webpage.cpp b/src/webpage.cpp
@@ -55,6 +55,8 @@
 #include <QDebug>
 #include <QImageWriter>
 #include <QUuid>
+#include <QUrl>
+#include <QNetworkProxy>
 
 #include "phantom.h"
 #include "networkaccessmanager.h"
@@ -641,6 +643,21 @@ void WebPage::applySettings(const QVariantMap& def)
         m_networkAccessManager->setResourceTimeout(def[PAGE_SETTINGS_RESOURCE_TIMEOUT].toInt());
     }
 
+    if (def.contains(PAGE_SETTINGS_PROXY)) {
+        setProxy(def[PAGE_SETTINGS_PROXY].toString());
+    }
+}
+
+void WebPage::setProxy(const QString& proxyUrl)
+{
+    QUrl url(proxyUrl);
+    qDebug() << "Setting proxy to: " << url.scheme() << url.host() << url.port();
+    QNetworkProxy::ProxyType type = QNetworkProxy::HttpProxy;
+    if (url.scheme() == "socks5") {
+        type = QNetworkProxy::Socks5Proxy;
+    }
+    QNetworkProxy proxy(type, url.host(), url.port(), url.userName(), url.password());
+    m_networkAccessManager->setProxy(proxy);
 }
 
 QString WebPage::userAgent() const

diff --git a/src/webpage.h b/src/webpage.h
@@ -501,6 +501,8 @@ public slots:
 
     void clearMemoryCache();
 
+    void setProxy(const QString& proxyUrl);
+
 signals:
     void initialized();
     void loadStarted();