Merge lp:~midori/midori/proxy into lp:midori

[Cris Dywan]

Use SoupProxyResolverGnome unconditionally and disable prefetching if proxy is active

[gue5t gue5t (gue5t)]

Wireshark seems to like this, and the code looks good.

review: Approve

[Cody Garver (codygarver)]

Is this fix worthy of an emergency release?

[André Stösel (ivaldi)]

Release is next week and this is old bug - I wouldn't rush things.

[lp:~midori/midori/proxy]

6313. By André Stösel on 2013-08-05

deactive DNS prefetching when using custom proxy

[André Stösel (ivaldi)]

I fixed a little bug - it wasn't working if I specified the proxy in midori itself (instead of auto detection).

[lp:~midori/midori/proxy]

6314. By André Stösel on 2013-08-07

diable hosting detection when using a proxy

[André Stösel (ivaldi)]

The automatic proxy detection dosn't work for me so it would be nice if someone else could test if the commit 6314 turns of the host detection while using a proxy setup.

(enter "localhost/" in the url bar (without "http" and with the ending "/" - it's turned off it it's redirect to the default search engine))

[gue5t gue5t (gue5t)]

What exactly is the automatic proxy detection? The last commit looks good but if I'm not misunderstanding it, that commit disables prefetching in sokoke_magic_uri (parsing URIs from user input).

[André Stösel (ivaldi)]

"automatic proxy detection" -> preferences -> network -> proxy server -> automatic (gnome or enviroment)

yes, it does if a proxy is used
(prefetching i used to detect hostnames in the local network -> you have to type "http://localhost/" instead of "localhost/")

[Cris Dywan (kalikiana)]

The code in sokoke looks redundant to me - it already checks if enable-dns-prefetching is true. Given that the proxy code changes that, there should be no need for a further check.

review: Needs Fixing

[André Stösel (ivaldi)]

The problem is that settings is always NULL -> I could remove the enable-dns-prefetching check, but than I should remove the MidoriWebSettings* settings argument too -> the "API" would change - but right now it's only used inside sokoke and in tests

[André Stösel (ivaldi)]

I finished my review - looks good for the wk1 part, but I havn't tested wk2 yet.
(Right now the wk2 build isn't recommended -> I guess we can review it before next release.)

review: Approve

[Cris Dywan (kalikiana)]

> The problem is that settings is always NULL -> I could remove the enable-dns-
> prefetching check, but than I should remove the MidoriWebSettings* settings

I would actually prefer if we could make it have the settings to avoid that extra code. But let's keep the low profile fix for now and get onto the clean up later.

review: Approve

=== modified file 'midori/midori-session.c'
--- midori/midori-session.c	2013-07-29 20:58:17 +0000
+++ midori/midori-session.c	2013-08-07 21:27:28 +0000
@@ -18,6 +18,7 @@
 
 #include <glib/gi18n-lib.h>
 #include <libsoup/soup-cookie-jar-sqlite.h>
+#include <libsoup/soup-gnome-features.h>
 
     #define LIBSOUP_USE_UNSTABLE_REQUEST_API
     #include <libsoup/soup-cache.h>
@@ -54,27 +55,22 @@
                                             GParamSpec*        pspec,
                                             SoupSession*       session)
 {
+    gboolean uses_proxy = TRUE;
     MidoriProxy proxy_type = katze_object_get_enum (settings, "proxy-type");
     if (proxy_type == MIDORI_PROXY_AUTOMATIC)
     {
-        gboolean gnome_supported = FALSE;
-        GModule* module;
-        GType (*get_type_function) (void);
-        if (g_module_supported ())
-            if ((module = g_module_open ("libsoup-gnome-2.4.so", G_MODULE_BIND_LOCAL)))
-            {
-                if (g_module_symbol (module, "soup_proxy_resolver_gnome_get_type",
-                                     (void*) &get_type_function))
-                {
-                    soup_session_add_feature_by_type (session, get_type_function ());
-                    gnome_supported = TRUE;
-                }
-            }
-        if (!gnome_supported)
-            midori_soup_session_set_proxy_uri (session, g_getenv ("http_proxy"));
+        soup_session_add_feature_by_type (session, SOUP_TYPE_PROXY_RESOLVER_GNOME);
+
+        GProxyResolver* resolver = g_proxy_resolver_get_default ();
+        gchar** proxies = g_proxy_resolver_lookup (resolver, "none", NULL, NULL);
+
+        if (!proxies || !g_strcmp0 (proxies[0], "direct://"))
+            uses_proxy = FALSE;
+        g_strfreev (proxies);
     }
     else if (proxy_type == MIDORI_PROXY_HTTP)
     {
+        soup_session_remove_feature_by_type (session, SOUP_TYPE_PROXY_RESOLVER_GNOME);
         gchar* proxy = katze_object_get_string (settings, "http-proxy");
         GString* http_proxy = g_string_new (proxy);
         g_string_append_printf (http_proxy, ":%d", katze_object_get_int (settings, "http-proxy-port"));
@@ -83,7 +79,18 @@
         g_free (proxy);
     }
     else
+    {
+        uses_proxy = FALSE;
+        soup_session_remove_feature_by_type (session, SOUP_TYPE_PROXY_RESOLVER_GNOME);
         midori_soup_session_set_proxy_uri (session, NULL);
+    }
+
+    /* If a proxy server looks to be active, we disable prefetching, otherwise
+       libSoup may be prefetching outside the proxy server beyond our control.
+     */
+
+    if (uses_proxy)
+        g_object_set (settings, "enable-dns-prefetching", FALSE, NULL);
 }
 #endif
 

=== modified file 'midori/sokoke.c'
--- midori/sokoke.c	2013-08-02 16:40:27 +0000
+++ midori/sokoke.c	2013-08-07 21:27:28 +0000
@@ -864,6 +864,16 @@
     static gint host_count = G_MAXINT;
     gchar* hostname;
 
+
+#ifndef HAVE_WEBKIT2
+    SoupURI* soup_uri;
+    SoupSession* session = webkit_get_default_session ();
+
+    g_object_get (G_OBJECT (session), "proxy-uri", &soup_uri, NULL);
+    if (soup_uri)
+        return FALSE;
+#endif
+
     if (settings && !katze_object_get_boolean (settings, "enable-dns-prefetching"))
         return FALSE;