Merge lp:~mardy/signon-ui/proxy into lp:signon-ui

[Alberto Mardegan]

Use libproxy to detect proxy settings

This is needed as a workaround for
https://bugreports.qt-project.org/browse/QTBUG-26295

[David King (amigadave)]

242 + -lproxy

Use the pkg-config file (libproxy-1.0) please.

review: Needs Fixing

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:61
http://s-jenkins:8080/job/online-accounts-signon-ui-ci/12/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/online-accounts-signon-ui-ci/./label=quantal/12/console

review: Needs Fixing (continuous-integration)

[lp:~mardy/signon-ui/proxy]

62. By Alberto Mardegan on 2012-09-17

Use pkg-config

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:62
http://s-jenkins:8080/job/online-accounts-signon-ui-ci/13/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/online-accounts-signon-ui-ci/./label=quantal/13/console

review: Needs Fixing (continuous-integration)

[Alberto Mardegan (mardy)]

Updated to use pkg-config.
The Jenkins failure is due to the new dependency on libproxy; I'll update the packaging branch once this MR is approved.

[David King (amigadave)]

Looks good. The CI failure is only because of a missing libproxy-dev build dependency in the packaging.

review: Approve

=== modified file 'src/main.cpp'
--- src/main.cpp	2012-07-26 10:38:55 +0000
+++ src/main.cpp	2012-09-17 09:03:20 +0000
@@ -21,6 +21,7 @@
 #include "debug.h"
 #include "i18n.h"
 #include "indicator-service.h"
+#include "my-network-proxy-factory.h"
 #include "service.h"
 
 #include <QApplication>
@@ -58,6 +59,12 @@
 
     initTr(I18N_DOMAIN, NULL);
 
+    /* Use a libproxy-based proxy factory; this code will no longer be
+     * needed when https://bugreports.qt-project.org/browse/QTBUG-26295
+     * is fixed. */
+    MyNetworkProxyFactory proxyFactory;
+    QNetworkProxyFactory::setApplicationProxyFactory(&proxyFactory);
+
     Service *service = new Service();
     if (daemonTimeout > 0)
         service->setTimeout(daemonTimeout);
 
=== added file 'src/my-network-proxy-factory.cpp'
--- src/my-network-proxy-factory.cpp	1970-01-01 00:00:00 +0000
+++ src/my-network-proxy-factory.cpp	2012-09-17 09:03:20 +0000
@@ -0,0 +1,165 @@
+/*
+ * Copied from
+ * https://codereview.qt-project.org/cat/29453%2C6%2Csrc/network/kernel/qnetworkproxy_libproxy.cpp%5E0
+ *
+ * With minor modifications by
+ * Alberto Mardegan <[e-mail]>
+ */
+
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the QtNetwork module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "my-network-proxy-factory.h"
+
+#include <QNetworkProxy>
+
+#include <QtCore/QByteArray>
+#include <QtCore/QUrl>
+
+#include <proxy.h>
+
+class QLibProxyWrapper
+{
+public:
+    QLibProxyWrapper()
+        : factory(px_proxy_factory_new())
+    {
+    }
+
+    ~QLibProxyWrapper()
+    {
+        px_proxy_factory_free(factory);
+    }
+
+    QList<QUrl> getProxies(const QUrl &url);
+
+private:
+    pxProxyFactory *factory;
+};
+
+Q_GLOBAL_STATIC(QLibProxyWrapper, libProxyWrapper);
+
+/*
+    Gets the list of proxies from libproxy, converted to QUrl list.
+    Thread safe, according to libproxy documentation.
+*/
+QList<QUrl> QLibProxyWrapper::getProxies(const QUrl &url)
+{
+    QList<QUrl> ret;
+
+    if (factory) {
+        char **proxies = px_proxy_factory_get_proxies(factory, url.toEncoded());
+        if (proxies) {
+            for (int i = 0; proxies[i]; i++) {
+                ret.append(QUrl::fromEncoded(proxies[i]));
+                free(proxies[i]);
+            }
+            free(proxies);
+        }
+    }
+
+    return ret;
+}
+
+QList<QNetworkProxy> MyNetworkProxyFactory::queryProxy(const QNetworkProxyQuery &query)
+{
+    QList<QNetworkProxy> proxyList;
+
+    QUrl queryUrl;
+    QNetworkProxy::Capabilities requiredCapabilities(0);
+    switch (query.queryType()) {
+    //URL requests are directly supported by libproxy
+    case QNetworkProxyQuery::UrlRequest:
+        queryUrl = query.url();
+        break;
+    // fake URLs to get libproxy to tell us the SOCKS proxy
+    case QNetworkProxyQuery::TcpSocket:
+        queryUrl.setScheme(QLatin1String("tcp"));
+        queryUrl.setHost(query.peerHostName());
+        queryUrl.setPort(query.peerPort());
+        requiredCapabilities |= QNetworkProxy::TunnelingCapability;
+        break;
+    case QNetworkProxyQuery::UdpSocket:
+        queryUrl.setScheme(QLatin1String("udp"));
+        queryUrl.setHost(query.peerHostName());
+        queryUrl.setPort(query.peerPort());
+        requiredCapabilities |= QNetworkProxy::UdpTunnelingCapability;
+        break;
+    default:
+        proxyList.append(QNetworkProxy(QNetworkProxy::NoProxy));
+        return proxyList;
+    }
+
+    QList<QUrl> rawProxies = libProxyWrapper()->getProxies(query.url());
+
+    bool haveDirectConnection = false;
+    foreach (const QUrl& url, rawProxies) {
+        QNetworkProxy::ProxyType type;
+        if (url.scheme() == QLatin1String("http")) {
+            type = QNetworkProxy::HttpProxy;
+        } else if (url.scheme() == QLatin1String("socks")
+              || url.scheme() == QLatin1String("socks5")) {
+            type = QNetworkProxy::Socks5Proxy;
+        } else if (url.scheme() == QLatin1String("ftp")) {
+            type = QNetworkProxy::FtpCachingProxy;
+        } else if (url.scheme() == QLatin1String("direct")) {
+            type = QNetworkProxy::NoProxy;
+            haveDirectConnection = true;
+        } else {
+            continue; //unsupported proxy type e.g. socks4
+        }
+
+        QNetworkProxy proxy(type,
+            url.host(),
+            url.port(),
+            url.userName(),
+            url.password());
+
+        if ((proxy.capabilities() & requiredCapabilities) == requiredCapabilities)
+            proxyList.append(proxy);
+    }
+
+    // fallback is direct connection
+    if (proxyList.isEmpty() || !haveDirectConnection)
+        proxyList.append(QNetworkProxy(QNetworkProxy::NoProxy));
+
+    return proxyList;
+}
 
=== added file 'src/my-network-proxy-factory.h'
--- src/my-network-proxy-factory.h	1970-01-01 00:00:00 +0000
+++ src/my-network-proxy-factory.h	2012-09-17 09:03:20 +0000
@@ -0,0 +1,33 @@
+/*
+ * This file is part of signon-ui
+ *
+ * Copyright (C) 2012 Canonical Ltd.
+ *
+ * Contact: Alberto Mardegan <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef SIGNON_UI_MY_NETWORK_PROXY_FACTORY_H
+#define SIGNON_UI_MY_NETWORK_PROXY_FACTORY_H
+
+#include <QNetworkProxyFactory>
+
+class MyNetworkProxyFactory: public QNetworkProxyFactory
+{
+public:
+    // reimplemented virtual methods
+    QList<QNetworkProxy> queryProxy(const QNetworkProxyQuery &query = QNetworkProxyQuery());
+};
+
+#endif // SIGNON_UI_MY_NETWORK_PROXY_FACTORY_H
 
=== modified file 'src/src.pro'
--- src/src.pro	2012-09-14 07:14:43 +0000
+++ src/src.pro	2012-09-17 09:03:20 +0000
@@ -21,6 +21,7 @@
 PKGCONFIG += \
     accounts-qt \
     signon-plugins-common \
+    libproxy-1.0 \
     libsignon-qt
 
 HEADERS = \
@@ -48,6 +49,7 @@
     i18n.cpp \
     indicator-service.cpp \
     main.cpp \
+    my-network-proxy-factory.cpp \
     network-access-manager.cpp \
     request.cpp \
     service.cpp \