small refactoring for future basic auth support

Author: shadowy-pycoder

README.md

@@ -49,6 +49,9 @@ Specify http server in proxy configuration of Postman
 - **SOCKS5 Authentication Support**  
   Supports username/password authentication for SOCKS5 proxies.
 
+- **HTTP Authentication Support**  
+  Supports username/password authentication for HTTP proxy server.
+
 - **Lightweight and Fast**  
   Designed with minimal overhead and efficient request handling.
 
@@ -93,32 +96,35 @@ gohpts -h
  | |__| | (_) | |  | | |      | |  ____) |
   \_____|\___/|_|  |_|_|      |_| |_____/
 
-GoHPTS (HTTP Proxy to SOCKS5) by shadowy-pycoder
+GoHPTS (HTTP(S) Proxy to SOCKS5 proxy) by shadowy-pycoder
 GitHub: https://github.com/shadowy-pycoder/go-http-proxy-to-socks
 
 Usage: gohpts [OPTIONS]
 Options:
   -h    Show this help message and exit.
+  -U string
+        User for HTTP proxy (basic auth). This flag invokes prompt for password (not echoed to terminal)
   -c string
         Path to certificate PEM encoded file
   -d    Show logs in DEBUG mode
   -f string
-        Path to proxychain YAML configuration file
+        Path to server configuration file in YAML format
   -j    Show logs in JSON format
   -k string
         Path to private key PEM encoded file
-  -l value
-        Address of HTTP proxy server (Default: localhost:8080)
-  -p    Password for SOCKS5 proxy (not echoed to terminal)
-  -s value
-        Address of SOCKS5 proxy server (Default: localhost:1080)
+  -l string
+        Address of HTTP proxy server (default "127.0.0.1:8080")
+  -s string
+        Address of SOCKS5 proxy server (default "127.0.0.1:1080")
   -u string
-        User for SOCKS5 proxy
+        User for SOCKS5 proxy authentication. This flag invokes prompt for password (not echoed to terminal)
   -v    print version
 ```
 
 ## Example
 
+### Configuration via CLI flags
+
 ```shell
 gohpts -s 1080 -l 8080 -d -j
 ```
@@ -131,23 +137,34 @@ Output:
 {"level":"debug","time":"2025-05-28T06:15:22+00:00","message":"HTTP/1.1 - CONNECT - www.google.com:443"}
 ```
 
-Specify username and password fo SOCKS5 proxy server:
+Specify username and password for SOCKS5 proxy server:
 
 ```shell
-gohpts -s 1080 -l 8080 -d -j -u user -p
+gohpts -s 1080 -l 8080 -d -j -u user
 SOCKS5 Password: #you will be prompted for password input here
 ```
 
+Specify username and password for HTTP proxy server:
+
+```shell
+gohpts -s 1080 -l 8080 -d -j -U user
+HTTP Password: #you will be prompted for password input here
+```
+
+When both `-u` and `-U` are present, you will be prompted twice
+
 Run http proxy over TLS connection
 
 ```shell
 gohpts -s 1080 -l 8080 -c "path/to/certificate" -k "path/to/private/key"
 ```
 
-Run http proxy in SOCKS5 proxy chain mode
+### Configuration via YAML file
+
+Run http proxy in SOCKS5 proxy chain mode (specify server settings via YAML configuration file)
 
 ```shell
-gohpts -f "path/to/proxychain/config" -d
+gohpts -f "path/to/proxychain/config" -d -j
 ```
 
 Config example:
@@ -188,6 +205,14 @@ proxy_list:
     password: password
   - address: 127.0.0.1:1081
   - address: :1082 # empty host means localhost
+server:
+  address: 127.0.0.1:8080 # the only required field in this section
+  # these are for adding basic authentication
+  username: username
+  password: password
+  # comment out these to use HTTP instead of HTTPS
+  cert_file: ~/local.crt
+  key_file: ~/local.key
 ```
 
 To learn more about proxy chains visit [Proxychains Github](https://github.com/rofl0r/proxychains-ng)

cmd/gohpts/cli.go

@@ -4,8 +4,6 @@ import (
 	"flag"
 	"fmt"
 	"os"
-	"strconv"
-	"strings"
 
 	gohpts "github.com/shadowy-pycoder/go-http-proxy-to-socks"
 	"golang.org/x/term"
@@ -24,7 +22,7 @@ const usagePrefix string = `
  | |__| | (_) | |  | | |      | |  ____) |
   \_____|\___/|_|  |_|_|      |_| |_____/ 
                                           
-GoHPTS (HTTP Proxy to SOCKS5) by shadowy-pycoder                         
+GoHPTS (HTTP(S) Proxy to SOCKS5 proxy) by shadowy-pycoder                         
 GitHub: https://github.com/shadowy-pycoder/go-http-proxy-to-socks
 
 Usage: gohpts [OPTIONS] 
@@ -33,48 +31,15 @@ Options:
 `
 
 func root(args []string) error {
-	conf := gohpts.Config{AddrSOCKS: addrSOCKS, AddrHTTP: addrHTTP}
+	conf := gohpts.Config{}
 	flags := flag.NewFlagSet(app, flag.ExitOnError)
-	flags.Func("s", "Address of SOCKS5 proxy server (Default: localhost:1080)", func(flagValue string) error {
-		var addr string
-		i, err := strconv.Atoi(flagValue)
-		if err == nil {
-			addr = fmt.Sprintf("127.0.0.1:%d", i)
-		} else if strings.HasPrefix(flagValue, ":") {
-			addr = fmt.Sprintf("127.0.0.1%s", flagValue)
-		} else {
-			addr = flagValue
-		}
-		conf.AddrSOCKS = addr
-		return nil
-	})
-	flags.StringVar(&conf.User, "u", "", "User for SOCKS5 proxy")
-	flags.BoolFunc("p", "Password for SOCKS5 proxy (not echoed to terminal)", func(flagValue string) error {
-		fmt.Print("SOCKS5 Password: ")
-		bytepw, err := term.ReadPassword(int(os.Stdin.Fd()))
-		if err != nil {
-			os.Exit(1)
-		}
-		conf.Pass = string(bytepw)
-		fmt.Print("\033[2K\r")
-		return nil
-	})
-	flags.Func("l", "Address of HTTP proxy server (Default: localhost:8080)", func(flagValue string) error {
-		var addr string
-		i, err := strconv.Atoi(flagValue)
-		if err == nil {
-			addr = fmt.Sprintf("127.0.0.1:%d", i)
-		} else if strings.HasPrefix(flagValue, ":") {
-			addr = fmt.Sprintf("127.0.0.1%s", flagValue)
-		} else {
-			addr = flagValue
-		}
-		conf.AddrHTTP = addr
-		return nil
-	})
-	flags.StringVar(&conf.CertFile, "c", "", "Path to certificate PEM encoded file ")
-	flags.StringVar(&conf.KeyFile, "k", "", "Path to private key PEM encoded file ")
-	flags.StringVar(&conf.ProxyChainPath, "f", "", "Path to proxychain YAML configuration file")
+	flags.StringVar(&conf.AddrSOCKS, "s", addrSOCKS, "Address of SOCKS5 proxy server")
+	flags.StringVar(&conf.User, "u", "", "User for SOCKS5 proxy authentication. This flag invokes prompt for password (not echoed to terminal)")
+	flags.StringVar(&conf.AddrHTTP, "l", addrHTTP, "Address of HTTP proxy server")
+	flags.StringVar(&conf.ServerUser, "U", "", "User for HTTP proxy (basic auth). This flag invokes prompt for password (not echoed to terminal)")
+	flags.StringVar(&conf.CertFile, "c", "", "Path to certificate PEM encoded file")
+	flags.StringVar(&conf.KeyFile, "k", "", "Path to private key PEM encoded file")
+	flags.StringVar(&conf.ServerConfPath, "f", "", "Path to server configuration file in YAML format")
 	flags.BoolFunc("d", "Show logs in DEBUG mode", func(flagValue string) error {
 		conf.Debug = true
 		return nil
@@ -100,12 +65,30 @@ func root(args []string) error {
 	seen := make(map[string]bool)
 	flags.Visit(func(f *flag.Flag) { seen[f.Name] = true })
 	if seen["f"] {
-		for _, da := range []string{"s", "u", "p"} {
+		for _, da := range []string{"s", "u", "U", "c", "k", "l"} {
 			if seen[da] {
-				return fmt.Errorf("specify either -f or -s -u -p flags")
+				return fmt.Errorf("-f flag only works with -d and -j flags")
 			}
 		}
 	}
+	if seen["u"] {
+		fmt.Print("SOCKS5 Password: ")
+		bytepw, err := term.ReadPassword(int(os.Stdin.Fd()))
+		if err != nil {
+			return err
+		}
+		conf.Pass = string(bytepw)
+		fmt.Print("\033[2K\r")
+	}
+	if seen["U"] {
+		fmt.Print("HTTP Password: ")
+		bytepw, err := term.ReadPassword(int(os.Stdin.Fd()))
+		if err != nil {
+			return err
+		}
+		conf.ServerPass = string(bytepw)
+		fmt.Print("\033[2K\r")
+	}
 	p := gohpts.New(&conf)
 	p.Run()
 	return nil