proxy/gnome: use GInetAddressMask

Replace the existing IP address mask matching code with
GInetAddressMask. Also, add a test for IP:port values in ignore_hosts,
which we weren't testing before.

diff --git a/configure.ac b/configure.ac
index 7b46406..4f8a19f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -33,7 +33,7 @@ AM_GLIB_GNU_GETTEXT
 dnl *****************************
 dnl *** Check GLib GIO        ***
 dnl *****************************
-AM_PATH_GLIB_2_0(2.31.0,,AC_MSG_ERROR(GLIB not found),gio)
+AM_PATH_GLIB_2_0(2.31.2,,AC_MSG_ERROR(GLIB not found),gio)
 
 GIO_MODULE_DIR=$($PKG_CONFIG --variable giomoduledir gio-2.0)
 AS_IF([test "x$GIO_MODULE_DIR" = "x"],

diff --git a/proxy/gnome/gproxyresolvergnome.c b/proxy/gnome/gproxyresolvergnome.c
index fdde3de..c97fa1f 100644 (file)
--- a/proxy/gnome/gproxyresolvergnome.c
+++ b/proxy/gnome/gproxyresolvergnome.c
@@ -52,13 +52,6 @@
 #define GNOME_PROXY_SOCKS_PORT_KEY        "port"
 
 typedef struct {
-  GSocketFamily family;
-  guint8        mask[16];
-  gint          length;
-  gushort       port;
-} GProxyResolverGnomeIPMask;
-
-typedef struct {
   gchar        *name;
   gint          length;
   gushort       port;
@@ -78,7 +71,7 @@ struct _GProxyResolverGnome {
   gchar *autoconfig_url;
   gboolean use_same_proxy;
 
-  GProxyResolverGnomeIPMask *ignore_ips;
+  GPtrArray *ignore_ips;
   GProxyResolverGnomeDomain *ignore_domains;
 
   gchar *http_proxy, *https_proxy;
@@ -107,7 +100,8 @@ free_settings (GProxyResolverGnome *resolver)
 {
   int i;
 
-  g_free (resolver->ignore_ips);
+  if (resolver->ignore_ips)
+    g_ptr_array_free (resolver->ignore_ips, TRUE);
   if (resolver->ignore_domains)
     {
       for (i = 0; resolver->ignore_domains[i].name; i++)
@@ -229,29 +223,34 @@ update_settings (GProxyResolverGnome *resolver)
     g_settings_get_strv (resolver->proxy_settings, GNOME_PROXY_IGNORE_HOSTS_KEY);
   if (ignore_hosts && ignore_hosts[0])
     {
-      GArray *ignore_ips;
+      GPtrArray *ignore_ips;
       GArray *ignore_domains;
-      gchar *host, *tmp, *slash, *colon, *bracket;
+      gchar *host, *tmp, *colon, *bracket;
       GInetAddress *iaddr;
-      GProxyResolverGnomeIPMask ip;
+      GInetAddressMask *mask;
       GProxyResolverGnomeDomain domain;
       gushort port;
-      gboolean is_ip;
 
-      ignore_ips = g_array_new (TRUE, FALSE, sizeof (GProxyResolverGnomeIPMask));
+      ignore_ips = g_ptr_array_new_with_free_func (g_object_unref);
       ignore_domains = g_array_new (TRUE, FALSE, sizeof (GProxyResolverGnomeDomain));
 
       for (i = 0; ignore_hosts[i]; i++)
        {
          host = g_strchomp (ignore_hosts[i]);
+
+         /* See if it's an IP address or IP/length mask */
+         mask = g_inet_address_mask_new_from_string (host, NULL);
+         if (mask)
+           {
+             g_ptr_array_add (ignore_ips, mask);
+             continue;
+           }
+
          port = 0;
-         is_ip = FALSE;
 
          if (*host == '[')
            {
              /* [IPv6]:port */
-             is_ip = TRUE;
-
              host++;
              bracket = strchr (host, ']');
              if (!bracket || !bracket[1] || bracket[1] != ':')
@@ -276,60 +275,36 @@ update_settings (GProxyResolverGnome *resolver)
                }
            }
 
-         slash = strchr (host, '/');
-         if (slash)
-           {
-             /* IPv6/length or IPv4/length */
-             is_ip = TRUE;
-             *slash = '\0';
-           }
-
          iaddr = g_inet_address_new_from_string (host);
-         if (!iaddr && is_ip)
-           goto bad;
-
          if (iaddr)
-           {
-             int addrlen = g_inet_address_get_native_size (iaddr);
-
-             memset (&ip, 0, sizeof (ip));
-             ip.family = g_inet_address_get_family (iaddr);
-             memcpy (ip.mask, g_inet_address_to_bytes (iaddr), addrlen);
-             ip.port = port;
-             if (slash)
-               {
-                 ip.length = strtoul (slash + 1, &tmp, 10);
-                 if (*tmp || ip.length > addrlen * 8)
-                   goto bad;
-               }
-             else
-               ip.length = addrlen * 8;
-
-             g_array_append_val (ignore_ips, ip);
-
-             g_object_unref (iaddr);
-           }
+           g_object_unref (iaddr);
          else
            {
              if (g_str_has_prefix (host, "*."))
                host += 2;
              else if (*host == '.')
                host++;
-
-             memset (&domain, 0, sizeof (domain));
-             domain.name = g_strdup (host);
-             domain.length = strlen (domain.name);
-             domain.port = port;
-             g_array_append_val (ignore_domains, domain);
            }
+
+         memset (&domain, 0, sizeof (domain));
+         domain.name = g_strdup (host);
+         domain.length = strlen (domain.name);
+         domain.port = port;
+         g_array_append_val (ignore_domains, domain);
          continue;
 
        bad:
          g_warning ("Ignoring invalid ignore_hosts value '%s'", host);
        }
 
-      resolver->ignore_ips = (GProxyResolverGnomeIPMask *)
-       g_array_free (ignore_ips, ignore_ips->len == 0);
+      if (ignore_ips->len)
+       resolver->ignore_ips = ignore_ips;
+      else
+       {
+         g_ptr_array_free (ignore_ips, TRUE);
+         resolver->ignore_ips = NULL;
+       }
+
       resolver->ignore_domains = (GProxyResolverGnomeDomain *)
        g_array_free (ignore_domains, ignore_domains->len == 0);
     }
@@ -418,27 +393,6 @@ g_proxy_resolver_gnome_is_supported (GProxyResolver *object)
 }
 
 static gboolean
-masked_compare (const guint8 *mask,
-               const guint8 *addr,
-               int           maskbits)
-{
-  int bytes, bits;
-
-  if (maskbits == 0)
-    return TRUE;
-
-  bytes = maskbits / 8;
-  if (bytes != 0 && memcmp (mask, addr, bytes) != 0)
-    return FALSE;
-
-  bits = maskbits % 8;
-  if (bits == 0)
-    return TRUE;
-
-  return mask[bytes] == (addr[bytes] & (0xFF << (8 - bits)));
-}
-
-static gboolean
 ignore_host (GProxyResolverGnome *resolver,
             const gchar         *host,
             gushort              port)
@@ -454,16 +408,11 @@ ignore_host (GProxyResolverGnome *resolver,
       iaddr = g_inet_address_new_from_string (host);
       if (iaddr)
        {
-         GSocketFamily family = g_inet_address_get_family (iaddr);
-         const guint8 *addr = g_inet_address_to_bytes (iaddr);
-
-         for (i = 0; resolver->ignore_ips[i].family; i++)
+         for (i = 0; i < resolver->ignore_ips->len; i++)
            {
-             GProxyResolverGnomeIPMask *ip = &resolver->ignore_ips[i];
+             GInetAddressMask *mask = resolver->ignore_ips->pdata[i];
 
-             if (ip->family == family &&
-                 (ip->port == 0 || ip->port == port) &&
-                 masked_compare (ip->mask, addr, ip->length))
+             if (g_inet_address_mask_matches (mask, iaddr))
                {
                  ignore = TRUE;
                  break;
@@ -471,7 +420,8 @@ ignore_host (GProxyResolverGnome *resolver,
            }
 
          g_object_unref (iaddr);
-         return ignore;
+         if (ignore)
+           return TRUE;
        }
     }
 

diff --git a/proxy/tests/gnome.c b/proxy/tests/gnome.c
index 1ebf62c..7c7b9b1 100644 (file)
--- a/proxy/tests/gnome.c
+++ b/proxy/tests/gnome.c
@@ -51,6 +51,7 @@ static const char *ignore_hosts[] = {
   "ddd.xx",
   "*.eee.xx:8000",
   "127.0.0.0/24",
+  "10.0.0.1:8000",
   "::1",
   "fe80::/10"
 };
@@ -95,6 +96,8 @@ static const struct {
   { "http://127.0.0.2/",                "direct://" },
   { "http://127.0.0.255/",              "direct://" },
   { "http://127.0.1.0/",                "http://localhost:8080" },
+  { "http://10.0.0.1/",                 "http://localhost:8080" },
+  { "http://10.0.0.1:8000/",            "direct://" },
   { "http://[::1]/",                    "direct://" },
   { "http://[::1]:80/",                 "direct://" },
   { "http://[::1:1]/",                  "http://localhost:8080" },