Optimize code

conf/conf.go

@@ -38,7 +38,7 @@ var (
 	version, date string
 
 	installCmd  string
-	execFile, _ = filepath.Abs(os.Args[0])
+	execFile, _ = os.Executable()
 	execDir, _  = filepath.Abs(filepath.Dir(execFile))
 	// Conf full config, include common and server / client
 	Conf = struct {
@@ -57,7 +57,7 @@ func init() {
 	flag.StringVar(&Conf.Client.Address, "c", "", "remote server domain, eg: aa.bb.cc, socks5h://127.0.0.1:1080")
 	flag.StringVar(&Conf.Client.HTTPProxy, "http_proxy", ":8080", "http proxy, empty to disable")
 	flag.IntVar(&Conf.Client.Router.DetectLevel, "level", 2, "dynamic rule detect level: 0~4")
-	flag.StringVar(&Conf.Client.Router.DetectTimeout, "timeout", "500ms", "dynamic rule detect timeout")
+	flag.StringVar(&Conf.Client.Router.DetectTimeout, "timeout", "300ms", "dynamic rule detect timeout")
 	uninstallFlag := flag.Bool("uninstall", false, "uninstall service")
 	_init() // execute platform init logic
 

conf/conf_darwin.go

@@ -51,17 +51,12 @@ func _init() {
 		flag.StringVar(&Conf.file, "f", ConfigDir+"/sower.toml", "config file, rewrite all other parameters if set")
 	}
 
-	flag.StringVar(&installCmd, "install", "", "install service with cmd, eg: '-f "+ConfigDir+"/sower.toml'")
+	flag.StringVar(&installCmd, "install", "", "install service with cmd, eg: '-f \""+ConfigDir+"/sower.toml\"'")
 }
 
 func runAsService() {}
 
 func install() {
-	execFile, err := filepath.Abs(os.Args[0])
-	if err != nil {
-		log.Fatalw("get binary path", "err", err)
-	}
-
 	if err := ioutil.WriteFile(svcPath, []byte(fmt.Sprintf(svcFile, execFile, installCmd)), 0644); err != nil {
 		log.Fatalw("write service file", "err", err)
 	}

conf/conf_linux.go

@@ -57,11 +57,6 @@ func _init() {
 func runAsService() {}
 
 func install() {
-	execFile, err := filepath.Abs(os.Args[0])
-	if err != nil {
-		log.Fatalw("get binary path", "err", err)
-	}
-
 	if err := ioutil.WriteFile(svcPath, []byte(fmt.Sprintf(svcFile, execFile, installCmd)), 0644); err != nil {
 		log.Fatalw("write service file", "err", err)
 	}

conf/conf_windows.go

@@ -23,6 +23,8 @@ import (
 const name = "sower"
 const cmdsAccepted = svc.AcceptStop | svc.AcceptShutdown | svc.AcceptPauseAndContinue
 
+var ConfigDir = execDir
+
 func _init() {
 	flag.StringVar(&Conf.file, "f", filepath.Join(execDir, "sower.toml"), "config file, rewrite all other parameters if set")
 	flag.StringVar(&installCmd, "install", "", "put any character to install as a service, eg: true")

conf/sower.toml

@@ -11,7 +11,7 @@ password="" # sower password
 
   [client.router]
     detect_level = 2 # 0~4, the bigger the harder to add
-    detect_timeout = "500ms"
+    detect_timeout = "300ms"
     direct_list = [
       "**.in-addr.arpa",
       "imap.*.*",

main.go

@@ -12,7 +12,7 @@ import (
 func main() {
 	switch {
 	case conf.Conf.Server.Upstream != "":
-		proxy.StartServer(conf.Conf.Server.Upstream, conf.Conf.Password,
+		proxy.StartServer(conf.Conf.Server.Upstream, conf.Conf.Password, conf.ConfigDir,
 			conf.Conf.Server.CertFile, conf.Conf.Server.KeyFile, conf.Conf.Server.CertEmail)
 
 	case conf.Conf.Client.Address != "":
@@ -39,9 +39,7 @@ func main() {
 			conf.Conf.Client.DNSServeIP != "", conf.Conf.Client.PortForward)
 
 	default:
-		if conf.Conf.Server.Upstream == "" && conf.Conf.Client.Address == "" {
-			fmt.Println()
-			flag.Usage()
-		}
+		fmt.Println()
+		flag.Usage()
 	}
 }

proxy/http_proxy.go

@@ -3,23 +3,34 @@ package proxy
 import (
 	"context"
 	"crypto/tls"
-	"io"
 	"net"
 	"net/http"
+	"net/http/httputil"
 	"time"
 
 	"github.com/wweir/sower/transport"
 	"github.com/wweir/utils/log"
 )
 
+// StartHTTPProxy start http reverse proxy.
+// The httputil.ReverseProxy do not supply enough support for https request.
 func StartHTTPProxy(httpProxyAddr, serverAddr string, password []byte, shouldProxy func(string) bool) {
+	proxy := httputil.ReverseProxy{
+		Director: func(r *http.Request) {},
+		Transport: &http.Transport{
+			DialContext: func(ctx context.Context, network, addr string) (net.Conn, error) {
+				addr, _ = withDefaultPort(addr, "80")
+				return transport.Dial(serverAddr, addr, password)
+			}},
+	}
+
 	srv := &http.Server{
 		Addr: httpProxyAddr,
 		Handler: http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			if r.Method == http.MethodConnect {
 				httpsProxy(w, r, serverAddr, password, shouldProxy)
 			} else {
-				httpProxy(w, r, serverAddr, password, shouldProxy)
+				proxy.ServeHTTP(w, r)
 			}
 		}),
 		// Disable HTTP/2.
@@ -31,34 +42,6 @@ func StartHTTPProxy(httpProxyAddr, serverAddr string, password []byte, shouldPro
 	go log.Fatalw("serve http proxy", "addr", httpProxyAddr, "err", srv.ListenAndServe())
 }
 
-func httpProxy(w http.ResponseWriter, r *http.Request,
-	serverAddr string, password []byte, shouldProxy func(string) bool) {
-
-	target, host := withDefaultPort(r.Host, "80")
-
-	roundTripper := &http.Transport{}
-	if shouldProxy(host) {
-		roundTripper.DialContext = func(ctx context.Context, network, addr string) (net.Conn, error) {
-			return transport.Dial(serverAddr, target, password)
-		}
-	}
-
-	resp, err := roundTripper.RoundTrip(r)
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusServiceUnavailable)
-		return
-	}
-	defer resp.Body.Close()
-
-	for k, vs := range resp.Header {
-		for _, v := range vs {
-			w.Header().Add(k, v)
-		}
-	}
-	w.WriteHeader(resp.StatusCode)
-	io.Copy(w, resp.Body)
-}
-
 func httpsProxy(w http.ResponseWriter, r *http.Request,
 	serverAddr string, password []byte, shouldProxy func(string) bool) {
 
@@ -70,10 +53,10 @@ func httpsProxy(w http.ResponseWriter, r *http.Request,
 		return
 	}
 	conn.(*net.TCPConn).SetKeepAlive(true)
+	defer conn.Close()
 
 	if _, err := conn.Write([]byte(r.Proto + " 200 Connection established\r\n\r\n")); err != nil {
 		http.Error(w, err.Error(), http.StatusServiceUnavailable)
-		conn.Close()
 		return
 	}
 

proxy/proxy.go

@@ -66,7 +66,7 @@ func StartClient(serverAddr, password string, enableDNS bool, forwards map[strin
 	select {}
 }
 
-func StartServer(relayTarget, password, certFile, keyFile, email string) {
+func StartServer(relayTarget, password, cacheDir, certFile, keyFile, email string) {
 	dir, _ := os.UserCacheDir()
 	dir = filepath.Join("/", dir, "sower")
 	log.Infow("certificate cache dir", "dir", dir)

proxy/util.go

@@ -1,13 +1,49 @@
 package proxy
 
 import (
+	"bufio"
+	"crypto/tls"
 	"io"
 	"net"
+	"net/http"
 	"sync"
 	"sync/atomic"
 	"time"
+
+	"github.com/wweir/sower/util"
 )
 
+func ParseHTTP(conn net.Conn) (net.Conn, string, error) {
+	teeConn := &util.TeeConn{Conn: conn}
+	defer teeConn.Stop()
+
+	resp, err := http.ReadRequest(bufio.NewReader(teeConn))
+	if err != nil {
+		return teeConn, "", err
+	}
+
+	if _, _, err := net.SplitHostPort(resp.Host); err != nil {
+		resp.Host = net.JoinHostPort(resp.Host, "80")
+	}
+
+	return teeConn, resp.Host, nil
+}
+
+func ParseHTTPS(conn net.Conn) (net.Conn, string, error) {
+	teeConn := &util.TeeConn{Conn: conn}
+	defer teeConn.Stop()
+
+	var domain string
+	tls.Server(teeConn, &tls.Config{
+		GetConfigForClient: func(hello *tls.ClientHelloInfo) (*tls.Config, error) {
+			domain = hello.ServerName
+			return nil, nil
+		},
+	}).Handshake()
+
+	return teeConn, net.JoinHostPort(domain, "443"), nil
+}
+
 func withDefaultPort(addr string, port string) (address, host string) {
 	host, _, err := net.SplitHostPort(addr)
 	if err != nil {

router/router.go

@@ -46,8 +46,8 @@ func (r *Route) ShouldProxy(domain string) bool {
 		r.dynamicRule = util.NewNodeFromRules(r.DynamicList...)
 
 		if timeout, err := time.ParseDuration(r.DetectTimeout); err != nil {
-			r.timeout = 200 * time.Millisecond
-			log.Warnw("parse detect timeout", "err", err, "default", "t.timeout")
+			r.timeout = 300 * time.Millisecond
+			log.Warnw("parse detect timeout", "err", err, "default", r.timeout)
 		} else {
 			r.timeout = timeout
 		}

transport/util.go

@@ -28,9 +28,7 @@ func Dial(address, target string, password []byte) (net.Conn, error) {
 		return nil, err
 	}
 
-	return DialTlsProxyConn(net.JoinHostPort(address, "443"), host, uint16(p), &tls.Config{
-		ServerName: address,
-		MinVersion: tls.VersionTLS12,
-		NextProtos: []string{"http/1.1", "h2"},
-	}, password)
+	// tls.Config is same as golang http pkg default behavior
+	return DialTlsProxyConn(net.JoinHostPort(address, "443"),
+		host, uint16(p), &tls.Config{}, password)
 }