From: Daniel Carl <danielcarl@gmx.de>
Date: Thu, 16 Jan 2014 21:24:21 +0000 (+0100)
Subject: Evaluate 'no_proxy' environment variable (#49).
X-Git-Url: https://git.owens.tech/projects.html/projects.html/git?a=commitdiff_plain;h=4b89cc7b9d0af69fab0bf3dc9ff209b14fd202d1;p=vimb.git

Evaluate 'no_proxy' environment variable (#49).

If the no_proxy environment is found and vimb is compiled with libsoup>=2.42.2
this list of domains or ips is bypassed from proxy.
---

diff --git a/doc/vimb.1 b/doc/vimb.1
index 86045e1..0d2d213 100644
--- a/doc/vimb.1
+++ b/doc/vimb.1
@@ -842,6 +842,13 @@ directory. If not set the entry out of the passwd file will be used instead.
 .B http_proxy
 If this variable is set to an none empty value, and the configuration option
 `proxy' is enabled, this will be used as http proxy.
+.TP
+.B no_proxy
+A comma separated list of domains and/or ips which should not be proxied. Note
+that an IPv6 address must appear in brackets if used with a port "[::1]:443".
+.IP
+Example: "localhost,127.0.0.1,::1,fc00::/7,example.com:8080"
+.IP
 .SH "REPORTING BUGS"
 Report bugs to the main project page on https://github.com/fanglingsu/vimb/issues
 .br
diff --git a/src/setting.c b/src/setting.c
index a94e417..fc4a91a 100644
--- a/src/setting.c
+++ b/src/setting.c
@@ -677,13 +677,21 @@ static SettingStatus download_path(const Setting *s, const SettingType type)
 static SettingStatus proxy(const Setting *s, const SettingType type)
 {
     gboolean enabled;
-    char *proxy, *proxy_new;
-    SoupURI *proxy_uri = NULL;
+#if SOUP_CHECK_VERSION(2, 42, 2)
+    GProxyResolver *proxy = NULL;
+#else
+    SoupURI *proxy = NULL;
+#endif
 
     /* get the current status */
     if (type != SETTING_SET) {
-        g_object_get(vb.session, "proxy-uri", &proxy_uri, NULL);
-        enabled = (proxy_uri != NULL);
+#if SOUP_CHECK_VERSION(2, 42, 2)
+        g_object_get(vb.session, "proxy-resolver", &proxy, NULL);
+#else
+        g_object_get(vb.session, "proxy-uri", &proxy, NULL);
+#endif
+
+        enabled = (proxy != NULL);
 
         if (type == SETTING_GET) {
             print_value(s, &enabled);
@@ -701,20 +709,44 @@ static SettingStatus proxy(const Setting *s, const SettingType type)
     }
 
     if (enabled) {
-        proxy = (char *)g_getenv("http_proxy");
-        if (proxy != NULL && strlen(proxy)) {
-            proxy_new = g_str_has_prefix(proxy, "http://")
-                ? g_strdup(proxy)
-                : g_strconcat("http://", proxy, NULL);
-            proxy_uri = soup_uri_new(proxy_new);
-
-            g_object_set(vb.session, "proxy-uri", proxy_uri, NULL);
+        const char *http_proxy = g_getenv("http_proxy");
+
+        if (http_proxy != NULL && *http_proxy != '\0') {
+            char *proxy_new = g_str_has_prefix(http_proxy, "http://")
+                ? g_strdup(http_proxy)
+                : g_strconcat("http://", http_proxy, NULL);
+
+#if SOUP_CHECK_VERSION(2, 42, 2)
+            const char *no_proxy;
+            char **ignored_hosts = NULL;
+            /* check for no_proxy environment variable that contains comma
+             * seperated domains or ip addresses to skip from proxy */
+            if ((no_proxy = g_getenv("no_proxy"))) {
+                ignored_hosts = g_strsplit(no_proxy, ",", 0);
+            }
 
-            soup_uri_free(proxy_uri);
+            proxy = g_simple_proxy_resolver_new(proxy_new, ignored_hosts);
+            if (proxy) {
+                g_object_set(vb.session, "proxy-resolver", proxy, NULL);
+            }
+            g_strfreev(ignored_hosts);
+            g_object_unref(proxy);
+#else
+            proxy = soup_uri_new(proxy_new);
+            if (proxy && SOUP_URI_VALID_FOR_HTTP(proxy)) {
+                g_object_set(vb.session, "proxy-uri", proxy, NULL);
+            }
+            soup_uri_free(proxy);
+#endif
             g_free(proxy_new);
         }
     } else {
+        /* disable the proxy */
+#if SOUP_CHECK_VERSION(2, 42, 2)
+        g_object_set(vb.session, "proxy-resolver", NULL, NULL);
+#else
         g_object_set(vb.session, "proxy-uri", NULL, NULL);
+#endif
     }
 
     return SETTING_OK;