output: add new net.proxy_env_ignore option [v4.0]

include/fluent-bit/flb_network.h

@@ -99,6 +99,9 @@ struct flb_net_setup {
 
     /* maximum number of allowed active TCP connections */
     int max_worker_connections;
+
+    /* If true, ignore HTTP_PROXY, NO_PROXY, etc. */
+    int proxy_env_ignore;
 };
 
 /* Defines a host service and it properties */

src/flb_network.c

@@ -152,6 +152,7 @@ void flb_net_setup_init(struct flb_net_setup *net)
     net->io_timeout = 0; /* Infinite time */
     net->source_address = NULL;
     net->backlog = FLB_NETWORK_DEFAULT_BACKLOG_SIZE;
+    net->proxy_env_ignore = FLB_FALSE;
 }
 
 int flb_net_host_set(const char *plugin_name, struct flb_net_host *host, const char *address)

src/flb_output.c

@@ -1592,6 +1592,35 @@ int flb_output_upstream_set(struct flb_upstream *u, struct flb_output_instance *
     /* Set networking options 'net.*' received through instance properties */
     memcpy(&u->base.net, &ins->net_setup, sizeof(struct flb_net_setup));
 
+    /*
+     * If the Upstream was created using a proxy from the environment but the
+     * final configuration asks to ignore environment proxy variables, restore
+     * the original destination host information.
+     */
+    if (u->base.net.proxy_env_ignore == FLB_TRUE && u->proxied_host) {
+        flb_free(u->tcp_host);
+        u->tcp_host = flb_strdup(u->proxied_host);
+        u->tcp_port = u->proxied_port;
+
+        flb_free(u->proxied_host);
+        u->proxied_host = NULL;
+        u->proxied_port = 0;
+
+        /*
+         * Credentials are only set when the connection was configured via environment
+         * variables. Since we just reverted the upstream to the destination configured
+         * by the plugin, drop any credentials that may have been parsed.
+         */
+        if (u->proxy_username) {
+            flb_free(u->proxy_username);
+            u->proxy_username = NULL;
+        }
+        if (u->proxy_password) {
+            flb_free(u->proxy_password);
+            u->proxy_password = NULL;
+        }
+    }
+
     return 0;
 }
 

src/flb_upstream.c

@@ -136,6 +136,12 @@ struct flb_config_map upstream_net[] = {
      "Set the maximum number of active TCP connections that can be used per worker thread."
     },
 
+    {
+     FLB_CONFIG_MAP_BOOL, "net.proxy_env_ignore", "FALSE",
+     0, FLB_TRUE, offsetof(struct flb_net_setup, proxy_env_ignore),
+     "Ignore the environment variables HTTP_PROXY, HTTPS_PROXY and NO_PROXY when "
+    },
+
     /* EOF */
     {0}
 };