Changeset 134 in code for trunk

Timestamp:

Feb 27, 2021, 6:29:10 AM (4 years ago)

Author:

aurelien

Message:

[enh] implement HTTP proxy over environment variables
[enh] implement custom HTP proxy over command line (proxy auth supported)
[enh] allow for IPv4 only connectivity
[enh] improve help message for each option
[enh] log connection method on startup
[fix] ensure all connectivity flags (-proxyenv,-proxy, -socks5, -ipv6) are mutually exclusive

File:

• trunk/morty.go (modified) (3 diffs)

trunk/morty.go

@@ -38 +38 @@
 )
 
-const VERSION = "v0.2.0"
+const VERSION = "v0.2.1"
 
 const MAX_REDIRECT_COUNT = 5
@@ -1057 +1057 @@
         cfg.ListenAddress = *flag.String("listen", cfg.ListenAddress, "Listen address")
         cfg.Key = *flag.String("key", cfg.Key, "HMAC url validation key (base64 encoded) - leave blank to disable validation")
-        cfg.IPV6 = *flag.Bool("ipv6", cfg.IPV6, "Allow IPv6 HTTP requests")
         cfg.Debug = *flag.Bool("debug", cfg.Debug, "Debug mode")
         cfg.RequestTimeout = *flag.Uint("timeout", cfg.RequestTimeout, "Request timeout")
         cfg.FollowRedirect = *flag.Bool("followredirect", cfg.FollowRedirect, "Follow HTTP GET redirect")
+        proxyenv := flag.Bool("proxyenv", false, "Use a HTTP proxy as set in the environment (HTTP_PROXY, HTTPS_PROXY and NO_PROXY). Overrides -proxy, -socks5, -ipv6.")
+        proxy := flag.String("proxy", "", "Use the specified HTTP proxy (ie: '[user:pass@]hostname:port'). Overrides -socks5, -ipv6.")
+        socks5 := flag.String("socks5", "", "Use a SOCKS5 proxy (ie: 'hostname:port'). Overrides -ipv6.")
+        cfg.IPV6 = *flag.Bool("ipv6", cfg.IPV6, "Use IPv6 and IPv4 to send HTTP requests.")
         version := flag.Bool("version", false, "Show version")
-        socks5 := flag.String("socks5", "", "SOCKS5 proxy")
         flag.Parse()
 
@@ -1070 +1072 @@
         }
 
-        if *socks5 != "" {
-                // this disables CLIENT.DialDualStack
+        if *proxyenv && os.Getenv("HTTP_PROXY") == "" && os.Getenv("HTTPS_PROXY") == "" {
+                log.Fatal("Error -proxyenv is used but no environment variables named 'HTTP_PROXY' and/or 'HTTPS_PROXY' could be found.")
+                os.Exit(1)
+        }
+
+        if *proxyenv && (os.Getenv("HTTP_PROXY") != "" || os.Getenv("HTTPS_PROXY") != "") {
+                CLIENT.Dial = fasthttpproxy.FasthttpProxyHTTPDialer()
+                log.Println("Using environment defined proxy(ies).")
+        } else if *proxy != "" {
+                CLIENT.Dial = fasthttpproxy.FasthttpHTTPDialer(*proxy)
+                log.Println("Using custom HTTP proxy.")
+        } else if *socks5 != "" {
                 CLIENT.Dial = fasthttpproxy.FasthttpSocksDialer(*socks5)
-        }
-        if cfg.IPV6 {
+                log.Println("Using Socks5 proxy.")
+        } else if cfg.IPV6 {
                 CLIENT.Dial = fasthttp.DialDualStack
+                log.Println("Using dual stack (IPv4/IPv6) direct connections.")
+        } else {
+                CLIENT.Dial = fasthttp.Dial
+                log.Println("Using IPv4 only direct connections.")
         }