Merge branch 'refactor/watch-config'

.circleci/config.yml

@@ -0,0 +1,56 @@
+version: 2
+jobs:
+  build:
+    docker:
+      - image: circleci/golang:1.11.4
+    steps:
+      - checkout # check out the code in the project directory
+      - setup_remote_docker # install docker in docker
+      - run:
+          name: Prepare Environment
+          command: |
+            cp conf/sower.toml .
+            cp deploy/* .
+            mkdir artifacts
+      - run:
+          name: Run Unit Test
+          command: |
+            make test
+      - run:
+          name: Build linux Binary
+          command: |
+            make build
+            tar czvf artifacts/sower_linux_amd64.tar.gz sower sower.toml sower-client.service sower-server.service
+      - run:
+          name: Build macOS Binary
+          command: |
+            GOOS=darwin GOARCH=amd64 make build
+            tar czvf artifacts/sower_darwin_amd64.tar.gz sower sower.toml cc.wweir.sower.plist
+      - run:
+          name: Build Windows Binary
+          command: |
+            GOOS=windows GOARCH=amd64 make build
+            tar czvf artifacts/sower_windows_amd64.tar.gz sower sower.toml
+      - run:
+          name: Publish Release on GitHub
+          command: |
+            git describe --tags | grep - && exit
+
+            GHR_VERSION="$(curl -s "https://api.github.com/repos/tcnksm/ghr/releases/latest" | awk -F '"'  '/tag_name/{printf $4}')"
+            curl -SLf https://github.com/tcnksm/ghr/releases/download/"$GHR_VERSION"/ghr_"$GHR_VERSION"_linux_amd64.tar.gz | tar xzC /go/bin --strip-components=1
+
+            VERSION=$(git describe --tags)
+            ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete ${VERSION%-*-*} artifacts/
+      - run:
+          name: Build Docker Image
+          command: |
+            git describe --tags | grep - && exit
+
+            docker login -u $DOCKER_USER -p $DOCKER_PASS
+            make image
+            VERSION=$(git describe --tags)
+            docker tag sower wweir/sower:${VERSION%-*-*}
+            docker push wweir/sower:${VERSION%-*-*}
+            docker tag sower wweir/sower:latest
+            docker push wweir/sower:latest
+

.gitignore

@@ -12,11 +12,11 @@
 *.out
 
 .DS_Store
-**/.DS_Store
+._*
+*.swp
+*.swo
 .vscode
 .idea
 sower
-cert.pem
-**/cert.pem
-privkey.pem
-**/privkey.pem
+sower.exe*
+/sower.toml

Makefile

@@ -1,22 +1,31 @@
 SERVER:=127.0.0.1:5533
 
-default: build
+default: test build
 
 generate:
 	go generate ./...
-
+test:
+	go test -race ./...
 build:
-	GOBIN=$(PWD) go install -v
+	GO111MODULE=on go build -v -ldflags \
+		"-X main.version=$(shell git describe --tags) \
+		 -X main.date=$(shell date +%Y-%m-%d)"
+image:
+	docker build -t sower -f deploy/Dockerfile .
 
 kill:
 	sudo pkill -9 sower || true
 
 client: build kill
-	sudo $(PWD)/sower -f conf/sower.toml -logtostderr
+	sudo $(PWD)/sower
 
 server: build kill
-	$(PWD)/sower -n QUIC -logtostderr -v 1
+	$(PWD)/sower -n TCP -v 1
 
 run: build kill
-	$(PWD)/sower -n QUIC -logtostderr -v 1 &
-	sudo $(PWD)/sower -f conf/sower.toml -logtostderr
+	$(PWD)/sower -n TCP -v 1  &
+	sudo $(PWD)/sower &
+	@sleep 1
+	curl 127.0.0.1
+	@sleep 1
+	@sudo pkill -9 sower || true

README.md

@@ -1,7 +1,54 @@
 # sower
-Yet another cross platform transparent proxy tool
+[![GitHub release](http://img.shields.io/github/release/wweir/sower.svg?style=popout)](https://github.com/wweir/sower/releases)
+[![CircleCI](https://img.shields.io/circleci/token/64114421aab286b6e918741071535250a5273f06/project/github/wweir/sower/master.svg?style=popout)](https://circleci.com/gh/wweir/sower)
+[![GitHub issue](https://img.shields.io/github/issues/wweir/sower.svg?style=popout)](https://github.com/wweir/sower/issues)
+[![GitHub star](https://img.shields.io/github/stars/wweir/sower.svg?style=popout)](https://github.com/wweir/sower/stargazers)
+[![GitHub license](https://img.shields.io/github/license/wweir/sower.svg?style=popout)](LICENSE)
 
-## architecture
+中文介绍见 [Wiki](https://github.com/wweir/sower/wiki)
+
+The sower is a cross-platform intelligent transparent proxy tool base on DNS solution.
+
+The first time you visit a new website, sower will detect if the domain in block list and add it in suggect list. So that, you do not need to care about the rules, sower will handle it in a intelligent way.
+
+If you wanna enjoy the sower, you need to deploy sower on both server and client side.
+On client side, sower listening UDP `53` and TCP `80`/`443` ports, so that you need run it with privileged.
+On server side, it just listening to a port (default `5533`), parse and relay the request to target server.
+
+Sower also provides an http(s) proxy listening on `:8080` by default. You can turn it off or use another port at any time.
+
+
+## Installation
+After Deployed, please check your config file, it is placed in `/usr/local/etc/sower.toml` by default. Here is the example config file [**conf/sower.toml**](https://github.com/wweir/sower/blob/master/conf/sower.toml)
+
+### Auto deploy
+Auto deploy script support Linux server side and masOS/Linux client side.
+
+```shell
+$ bash -c "$(curl -s https://raw.githubusercontent.com/wweir/sower/master/deploy/install)"
+```
+
+Then modify the configuration file as needed and set `127.0.0.1` as your first domain name server.
+In most situation, you just need to modify `/etc/resolv.conf`.
+
+If you wanna uninstall sower, change `install` into `uninstall` and rerun the command.
+
+### Manually deploy
+1. Download the precompiled file from https://github.com/wweir/sower/releases
+2. Decompression the file into a folder
+3. Run `./sower -h` for help
+5. Config domain name server
+4. Config auto start
+
+### Docker deploy
+The auto build docker images are [wweir/sower](https://hub.docker.com/r/wweir/sower).
+
+It is very simple to use it on the server side. Export the port(5533) and run it directly.
+
+But the client is more troublesome and needs some understanding of the working mechanism of the sower.
+
+
+## Architecture
 ```
           request target servers
 <-------------+              +------------->
@@ -11,38 +58,38 @@ Yet another cross platform transparent proxy tool
       |       | relay service|        |
       | +-----+---------------------+ |
       | |                           | |
-      | | parsr http(s) target url  | |
+      | | parse http(s) target url  | |
       | |                           | |
       | +---------------------------+ |
-      |                               |
+      |     shadow service            |
       +--------^----------------------+
                |           request domain server
-       quic connection          +---------->
+       quic / KCP / TCP         +---------->
                |                |
       +--------+---client+------+-----+
       |                  |            |
-      |                  |            |
+      |  shadow service  |            |
       |  relay service   |     dns    |
-      |                  |    server  |
+      |                  |   service  |
       |                  |            |
       |       127.0.0.1 or other      |
       |                  |            |
-      +-------^----------+---^----^---+
-              |              |    |
-              |              |    |   +----->
-              |   +----------+    |   |
+      +-^-----^----------+---^----^---+
+        |     |              |    |
+        |     |              |    |   +----->
+http(s) proxy |   +----------+    |   |
               2   1               1   2
               +   +               +   +
-          block request       normal request
+         blocked request      normal request
 
 ```
+For more detail, see [透明代理 Sower 技术剖析](https://wweir.cc/post/%E9%80%8F%E6%98%8E%E4%BB%A3%E7%90%86-sower-%E6%8A%80%E6%9C%AF%E5%89%96%E6%9E%90/)
 
-## install
-1. install server on `server node` by `make server`
-2. write config file, example: [conf/sower.toml](https://github.com/wweir/sower/blob/master/conf/sower.toml)
-3. install client on `client node` by `make client`
-4. add `127.0.0.1` as you first domain server
 
-## todo
-- [ ] authenticate
-- [ ] broker
+## Todo
+- [x] authenticate
+- [ ] broker
+- [x] CI/CD
+- [ ] relay optimization
+- [ ] deploy script for all normal platform
+- [x] dns rule intelligent suggestions

conf/conf.go

@@ -3,106 +3,112 @@ package conf
 import (
 	"context"
 	"flag"
-	"net"
+	"os"
 	"os/exec"
-	"path/filepath"
 	"strconv"
+	"sync"
 	"time"
 
-	"github.com/BurntSushi/toml"
 	"github.com/golang/glog"
-	"github.com/wweir/fsnotify"
+	toml "github.com/pelletier/go-toml"
+	"github.com/wweir/sower/util"
 )
 
 var Conf = struct {
 	ConfigFile string
 	NetType    string `toml:"net_type"`
+	Cipher     string `toml:"cipher"`
 	Password   string `toml:"password"`
 
 	ServerPort string `toml:"server_port"`
 	ServerAddr string `toml:"server_addr"`
+	HTTPProxy  string `toml:"http_proxy"`
 
-	DnsServer     string `toml:"dns_server"`
+	DNSServer     string `toml:"dns_server"`
 	ClientIP      string `toml:"client_ip"`
-	ClientIPNet   net.IP `toml:"-"`
-	ClearDnsCache string `toml:"clear_dns_cache"`
+	ClearDNSCache string `toml:"clear_dns_cache"`
 
 	BlockList   []string `toml:"blocklist"`
+	WhiteList   []string `toml:"whitelist"`
 	Suggestions []string `toml:"suggestions"`
 	Verbose     int      `toml:"verbose"`
 }{}
+var mu = &sync.Mutex{}
 
-func init() {
-	flag.StringVar(&Conf.ConfigFile, "f", "", "config file location")
-	flag.StringVar(&Conf.NetType, "n", "QUIC", "proxy net type (QUIC|KCP|TCP)")
-	flag.StringVar(&Conf.Password, "p", "12345678", "password")
-	flag.StringVar(&Conf.ServerPort, "P", "5533", "server mode listen port")
-	flag.StringVar(&Conf.ServerAddr, "s", "", "server IP (run in client mode if set)")
-	flag.StringVar(&Conf.DnsServer, "d", "114.114.114.114", "client dns server")
-	flag.StringVar(&Conf.ClientIP, "c", "127.0.0.1", "client dns service redirect IP")
+var OnRefreash = []func() error{
+	func() (err error) {
+		mu.Lock()
+		defer mu.Unlock()
 
-	if !flag.Parsed() {
-		flag.Parse()
-	}
-
-	if Conf.ConfigFile == "" {
-		return
-	}
-	if err := OnRefreash[0](); err != nil {
-		panic(err)
-	}
-	watchConfigFile()
-}
-
-var OnRefreash = []func() error{func() error {
-	if _, err := toml.DecodeFile(Conf.ConfigFile, &Conf); err != nil {
-		return err
-	}
-	Conf.ClientIPNet = net.ParseIP(Conf.ClientIP)
-
-	// clear dns cache
-	if Conf.ClearDnsCache != "" {
-		ctx, _ := context.WithTimeout(context.TODO(), 5*time.Second)
-		if err := exec.CommandContext(ctx, "sh", "-c", Conf.ClearDnsCache).Run(); err != nil {
-			glog.Errorln(err)
+		f, err := os.OpenFile(Conf.ConfigFile, os.O_RDONLY, 0644)
+		if err != nil {
+			return err
 		}
-	}
+		defer f.Close()
 
-	// for glog
-	if err := flag.Set("v", strconv.Itoa(Conf.Verbose)); err != nil {
-		return err
-	}
-	return nil
-}}
+		file := Conf.ConfigFile
+		if err = toml.NewDecoder(f).Decode(&Conf); err != nil {
+			return err
+		}
+		Conf.ConfigFile = file
 
-func watchConfigFile() {
-	watcher, err := fsnotify.NewWatcher()
-	if err != nil {
-		glog.Fatalln(err)
-	}
-	if err := watcher.Add(filepath.Dir(Conf.ConfigFile)); err != nil {
-		glog.Fatalln(err)
-	}
-
-	go func() {
-		for {
-			select {
-			case event := <-watcher.Events:
-				if event.Op == fsnotify.Rename {
-					if err := watcher.Add(Conf.ConfigFile); err != nil {
-						glog.Errorln(err)
-					}
-				}
-
-				glog.Infof("watch %s event: %v", Conf.ConfigFile, event)
-				for i := range OnRefreash {
-					if err := OnRefreash[i](); err != nil {
-						glog.Errorln(err)
-					}
-				}
-			case err := <-watcher.Errors:
-				glog.Fatalln(err)
+		return flag.Set("v", strconv.Itoa(Conf.Verbose))
+	},
+	func() error {
+		if Conf.ClearDNSCache != "" {
+			ctx, _ := context.WithTimeout(context.TODO(), 5*time.Second)
+			if err := exec.CommandContext(ctx, "sh", "-c", Conf.ClearDNSCache).Run(); err != nil {
+				glog.Errorln(err)
 			}
 		}
-	}()
+		return nil
+	},
+}
+
+func init() {
+	initArgs()
+
+	if _, err := os.Stat(Conf.ConfigFile); os.IsNotExist(err) {
+		glog.Warningln("no config file has been load:", Conf.ConfigFile)
+		return
+	}
+	for i := range OnRefreash {
+		if err := OnRefreash[i](); err != nil {
+			glog.Fatalln(err)
+		}
+	}
+}
+
+func AddSuggest(domain string) {
+	mu.Lock()
+	defer mu.Unlock()
+
+	Conf.Suggestions = append(Conf.Suggestions, domain)
+	Conf.Suggestions = util.NewReverseSecSlice(Conf.Suggestions).Sort().Uniq()
+
+	// safe write
+	f, err := os.OpenFile(Conf.ConfigFile+"~", os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644)
+	if err != nil {
+		glog.Errorln(err)
+		return
+	}
+
+	if err := toml.NewEncoder(f).ArraysWithOneElementPerLine(true).Encode(Conf); err != nil {
+		glog.Errorln(err)
+		f.Close()
+		return
+	}
+	f.Close()
+
+	if err = os.Rename(Conf.ConfigFile+"~", Conf.ConfigFile); err != nil {
+		glog.Errorln(err)
+		return
+	}
+
+	// reload config
+	for i := range OnRefreash {
+		if err := OnRefreash[i](); err != nil {
+			glog.Fatalln(err)
+		}
+	}
 }

conf/conf_posix.go

@@ -0,0 +1,26 @@
+// +build !windows
+
+package conf
+
+import (
+	"flag"
+	"os"
+	"path/filepath"
+)
+
+func initArgs() {
+	flag.StringVar(&Conf.ConfigFile, "f", filepath.Dir(os.Args[0])+"/sower.toml", "config file location")
+	flag.StringVar(&Conf.NetType, "n", "TCP", "proxy net type (QUIC|KCP|TCP)")
+	flag.StringVar(&Conf.Cipher, "C", "AES_128_GCM", "cipher type (AES_128_GCM|AES_192_GCM|AES_256_GCM|CHACHA20_IETF_POLY1305|XCHACHA20_IETF_POLY1305)")
+	flag.StringVar(&Conf.Password, "p", "12345678", "password")
+	flag.StringVar(&Conf.ServerPort, "P", "5533", "server mode listen port")
+	flag.StringVar(&Conf.ServerAddr, "s", "", "server IP (run in client mode if set)")
+	flag.StringVar(&Conf.HTTPProxy, "H", "", "http proxy listen addr")
+	flag.StringVar(&Conf.DNSServer, "d", "114.114.114.114", "client dns server")
+	flag.StringVar(&Conf.ClientIP, "c", "127.0.0.1", "client dns service redirect IP")
+
+	if !flag.Parsed() {
+		flag.Set("logtostderr", "true")
+		flag.Parse()
+	}
+}

conf/conf_windows.go

@@ -0,0 +1,145 @@
+// +build windows
+package conf
+
+import (
+	"flag"
+	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
+	"time"
+
+	"github.com/golang/glog"
+	"golang.org/x/sys/windows"
+	"golang.org/x/sys/windows/svc"
+	"golang.org/x/sys/windows/svc/eventlog"
+	"golang.org/x/sys/windows/svc/mgr"
+)
+
+const name = "sower"
+const cmdsAccepted = svc.AcceptStop | svc.AcceptShutdown | svc.AcceptPauseAndContinue
+
+func initArgs() {
+	flag.StringVar(&Conf.ConfigFile, "f", filepath.Dir(os.Args[0])+"/sower.toml", "config file location")
+	install := flag.Bool("install", false, "install sower as a service")
+	uninstall := flag.Bool("uninstall", false, "uninstall sower from service list")
+
+	if !flag.Parsed() {
+		flag.Set("log_dir", filepath.Dir(os.Args[0]))
+		flag.Parse()
+	}
+
+	switch {
+	case *install:
+		mgrDo(func(m *mgr.Mgr) error {
+			s, err := m.OpenService(name)
+			if err == nil {
+				s.Close()
+				return fmt.Errorf("service %s already exists", name)
+			}
+			s, err = m.CreateService(name, os.Args[0], mgr.Config{
+				DisplayName: "Sower Proxy",
+				StartType:   windows.SERVICE_AUTO_START,
+			})
+			if err != nil {
+				return err
+			}
+			defer s.Close()
+			err = eventlog.InstallAsEventCreate(name, eventlog.Error|eventlog.Warning|eventlog.Info)
+			if err != nil {
+				s.Delete()
+				return fmt.Errorf("SetupEventLogSource() failed: %s", err)
+			}
+
+			return s.Start()
+		})
+		os.Exit(0)
+
+	case *uninstall:
+		serviceDo(func(s *mgr.Service) error {
+			err := s.Delete()
+			if err != nil {
+				return err
+			}
+			return eventlog.Remove(name)
+		})
+		os.Exit(0)
+
+	default:
+		os.Chdir(filepath.Dir(os.Args[0]))
+		if active, err := svc.IsAnInteractiveSession(); err != nil {
+			glog.Exitf("failed to determine if we are running in an interactive session: %v", err)
+		} else if !active {
+			go func() {
+				elog, err := eventlog.Open(name)
+				if err != nil {
+					glog.Exitln(err)
+				}
+				defer elog.Close()
+
+				if err := svc.Run(name, &myservice{}); err != nil {
+					elog.Error(1, fmt.Sprintf("%s service failed: %v", name, err))
+					glog.Exitln(err)
+				}
+				elog.Info(1, fmt.Sprintf("winsvc.RunAsService: %s service stopped", name))
+				os.Exit(0)
+			}()
+		}
+	}
+}
+
+func serviceDo(fn func(*mgr.Service) error) {
+	mgrDo(func(m *mgr.Mgr) error {
+		s, err := m.OpenService(name)
+		if err != nil {
+			return fmt.Errorf("could not access service: %v", err)
+		}
+		defer s.Close()
+		return fn(s)
+	})
+}
+func mgrDo(fn func(m *mgr.Mgr) error) {
+	m, err := mgr.Connect()
+	if err != nil {
+		glog.Exitln(err)
+	}
+	defer m.Disconnect()
+
+	if err := fn(m); err != nil {
+		glog.Fatalln(err)
+	}
+}
+
+type myservice struct{}
+
+func (m *myservice) Execute(args []string, r <-chan svc.ChangeRequest, changes chan<- svc.Status) (ssec bool, errno uint32) {
+	elog, err := eventlog.Open(name)
+	if err != nil {
+		glog.Errorln(err)
+		return
+	}
+	defer elog.Close()
+	elog.Info(1, strings.Join(args, "-"))
+
+	changes <- svc.Status{State: svc.StartPending}
+	changes <- svc.Status{State: svc.Running, Accepts: cmdsAccepted}
+	for {
+		c := <-r
+		switch c.Cmd {
+		case svc.Interrogate:
+			changes <- c.CurrentStatus
+			// Testing deadlock from https://code.google.com/p/winsvc/issues/detail?id=4
+			time.Sleep(100 * time.Millisecond)
+			changes <- c.CurrentStatus
+		case svc.Stop, svc.Shutdown:
+			changes <- svc.Status{State: svc.StopPending}
+			return
+		case svc.Pause:
+			changes <- svc.Status{State: svc.Paused, Accepts: cmdsAccepted}
+		case svc.Continue:
+			changes <- svc.Status{State: svc.Running, Accepts: cmdsAccepted}
+		default:
+			elog.Error(1, fmt.Sprintf("unexpected control request #%d", c))
+		}
+	}
+}

conf/sower.toml

@@ -1,83 +1,44 @@
-net_type="KCP"
+net_type="TCP"
+cipher="AES_128_GCM"
 password="12345678"
 server_port="5533"
-server_addr="remote-server:5533" # replce it to remote server
-dns_server="114.114.114.114"
-# client_ip="192.168.0.1"
-# clear_dns_cache="sudo killall -HUP mDNSResponder"
+# server_addr="remote-server:5533" # replce it to remote server
+http_proxy=":8080"               # eg: 192.168.0.2:8080
+dns_server=""                    # Keep empty for dynamic setting from net env
+client_ip="127.0.0.1"            # listen the IP, dns target is the IP
+# clear_dns_cache="killall -HUP mDNSResponder"
 blocklist=[
-    "*.google.com", # google
-    "ocsp.pki.goog",
-    "g.co",
-    "*.goo.gl",
-    "*.googleusercontent.com",
-    "*.googleapis.com",
-    "gmail.com",
-    "*.youtube.com", # youtube
-    "*.ytimg.com",
-    "*.ggpht.com",
-    "*.googlevideo.com",
-    "*.vimeo.com",
-    "*.facebook.com", # facebook
-    "*.xx.fbcdn.net",
-    "connect.facebook.net",
-    "*.twitter.com", # twitter
-    "t.co",
-    "*.twimg.com",
-    "www.linkedin.com",
-    "www.reddit.com", # reddit
-    "www.redditmedia.com",
-    "*.blogspot.com", # blogspot
-    "www.blogger.com",
-    "www.feedburner.com",
-    "img1.blogblog.com",
-    "*.aws.amazon.com", # amazon
-    "m.media-amazon.com",
-    "*.awsstatic.com",
-    "*.s3.amazonaws.com",
-	"*.cloudfront.net", # atlassian
-    "synchrony-cdn.atlassian.com",
-    "avatar-cdn.atlassian.com",
-    "*.medium.com",
-    "accounts-static.cdn.mozilla.net", # firefox
-    "*.services.mozilla.com",
-    "pocket-image-cache.com", # pocket
-    "*.golang.org", # golang
-    "go.googlesource.com",
-    "godoc.org",
-    "gist.github.com", # github
-    "*.k8s.io", # k8s
-    "k8s.gcr.io",
-    "*.wikipedia.org", # wikipeida
-    "*.wikimedia.org",
-    "*.wikisource.org",
-    "lookup-api.apple.com",
-    "lookup-api.apple.com.edgekey.net",
-    "e16991.b.akamaiedge.net",
-    "*.web.telegram.org", # telegram
-    "core.telegram.org",
-    "telegram.org",
-    "telegram.me",
-    "t.me",
-    "*.slack.com", #slack
-    "*.slack-edge.com",
-    "js.driftt.com",
-    "cloud.feedly.com", # feedly
-    "static.grammarly.com", # grammarly
-    "apkpure.com", # apkpure
-    "download.apkpure.com",
-    "*.nytimes.com", # New York times
-    "*.nyt.com",
-    "bandwagonhost.com", # bandwagonhost
-    "www.bwh1.net",
-    "*.akadns.net", # suggestions
-    "*.haxx.se",
-    "shadowsocks.org",
-    "t66y.com",
-    "ocsp.godaddy.com",
-    "*.qualtrics.com",
-    "*.starfieldtech.com",
-    "*.typekit.net",
-    "www.v2ray.com",
+    "**.google.com", # google
+    "**.goo.gl",
+    "**.googleusercontent.com",
+    "**.googleapis.com",
+    "*.googlesource.com",
+    "**.youtube.com", # youtube
+    "**.ytimg.com",
+    "**.ggpht.com",
+    "**.googlevideo.com",
+    "**.facebook.com", # facebook
+    "**.fbcdn.net",
+    "**.twitter.com", # twitter
+    "**.twimg.com",
+    "**.blogspot.com", # blogspot
+    "**.appspot.com",
+    "**.wikipedia.org", # wikipeida
+    "*.cloudfront.net",
+    "**.amazon.com",
+    "**.amazonaws.com",
+    "*.githubusercontent.com",
+    "*.github.com",
+    "*.github.io",
+    "**.mozilla.com",
+    "**.mozilla.net",
+    "**.akadns.net",
+]
+whitelist=[
+    "iamp.*.*.*",
+    "iamp.*.*",
+    "imap-mail.outlook.com",
+    "**.qq.com",
+    "**.baidu.com",
 ]
 verbose=0

deploy/Dockerfile

@@ -0,0 +1,18 @@
+# Compile
+FROM golang:1.11-alpine AS compiler
+
+RUN apk add --no-cache git make
+
+# enable go modules
+WORKDIR /go-mod
+COPY . .
+
+# do not worry about downloading dependency, sower will fix this.
+RUN CGO_ENABLED=0 make build
+
+
+# Build image
+FROM scratch
+
+COPY --from=compiler /go-mod/sower /sower
+ENTRYPOINT [ "/sower" ]

deploy/cc.wweir.sower.plist

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>Label</key>
+  <string>cc.wweir.sower</string>
+  <key>ProgramArguments</key>
+  <array>
+	  <string>/usr/local/bin/sower</string>
+    <string>-f</string>
+    <string>/usr/local/etc/sower.toml</string>
+  </array>
+  <key>KeepAlive</key>
+  <true/>
+  <key>RunAtLoad</key>
+  <true/>
+</dict>
+</plist>

deploy/install

@@ -0,0 +1,93 @@
+#!/usr/bin/env bash
+set -u -e
+[[ -d /tmp/sower ]] || mkdir /tmp/sower
+cd /tmp/sower
+
+echo ========    Install sower to your system    ========
+succ_message(){
+	echo
+	echo ========    Installed sower to your system    ========
+	echo The config file is: /usr/local/etc/sower.toml
+	echo please set 127.0.0.1 as the first domain name server manually.
+}
+
+# main logic
+VERSION="$(curl -s "https://api.github.com/repos/wweir/sower/releases/latest" | awk -F '"'  '/tag_name/{printf $4}')"
+case "$(uname -s)" in
+	"Darwin")
+		printf "Please enter remote server adddress: "
+		read ADDRESS
+		echo
+
+		curl -SLf https://github.com/wweir/sower/releases/download/$VERSION/sower_darwin_amd64.tar.gz | tar xzv
+		sudo mkdir -p /usr/local/bin/
+		sudo mv sower /usr/local/bin/
+
+		if [[ -r /usr/local/etc/sower.toml ]]; then
+			echo The config file already exists, keep the original file
+		else
+			sed -i~ "s/# server_addr=\"remote-server/server_addr=\"$ADDRESS/" sower.toml
+			sed -i~ "s/# clear_dns_cache/clear_dns_cache/" sower.toml
+			sudo mkdir -p /usr/local/etc/
+			sudo mv sower.toml /usr/local/etc/
+		fi
+
+		echo
+		echo Register auto start service, root privilege is needed!
+		echo
+		sudo mv cc.wweir.sower.plist /Library/LaunchDaemons/
+		sudo chown root:wheel /Library/LaunchDaemons/cc.wweir.sower.plist
+		sudo launchctl load -w /Library/LaunchDaemons/cc.wweir.sower.plist
+		succ_message
+		;;
+
+	"Linux")
+		if [[ "$(cat /proc/1/comm)" != "systemd" ]]; then
+			echo do not support auto deploy on SysVinit
+			exit 1
+		fi
+		printf "Server side or client side, which do you wanna install [c/s]: "
+		read SIDE
+		echo
+
+		case "$SIDE" in
+			"c")
+				printf "Please enter remote server adddress: "
+				read ADDRESS
+				echo
+
+				curl -SLf https://github.com/wweir/sower/releases/download/$VERSION/sower_linux_amd64.tar.gz | tar xzv
+
+				sudo mv sower /usr/local/bin/
+
+				if [[ -r /usr/local/etc/sower.toml ]]; then
+					echo The config file already exists, keep the original file
+				else
+					sed -i~ "s/# server_addr=\"remote-server/server_addr=\"$ADDRESS/" sower.toml
+					sudo mv sower.toml /usr/local/etc/
+				fi
+
+				sudo mv sower-client.service /etc/systemd/system/
+				sudo systemctl enable sower-client
+				sudo systemctl start sower-client
+				succ_message
+				;;
+
+			"s")
+				curl -SLf https://github.com/wweir/sower/releases/download/$VERSION/sower_linux_amd64.tar.gz | tar xzv
+
+				sudo mv sower /usr/local/bin/
+				sudo mv sower-server.service /etc/systemd/system/
+				sudo systemctl enable sower-server
+				sudo systemctl start sower-server
+				;;
+
+			*)
+				echo "invalid: $SIDE" && exit 1
+				;;
+		esac
+		;;
+	*)
+		echo Do not support auto deploy on this platform.
+		;;
+esac

deploy/sower-client.service

@@ -0,0 +1,14 @@
+[Unit]
+Description=Sower client service
+After=network.target
+
+[Install]
+WantedBy=multi-user.target
+
+[Service]
+Type=simple
+User=root
+WorkingDirectory=/tmp
+ExecStart=/usr/local/bin/sower -f /usr/local/etc/sower.toml
+RestartSec=3
+Restart=on-failure

deploy/sower-server.service

@@ -0,0 +1,14 @@
+[Unit]
+Description=Sower server service
+After=network.target
+
+[Install]
+WantedBy=multi-user.target
+
+[Service]
+Type=simple
+User=nobody
+WorkingDirectory=/tmp
+ExecStart=/usr/local/bin/sower -n TCP -v 1
+RestartSec=3
+Restart=on-failure

deploy/uninstall

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+set -u -x -e
+
+# main logic
+case "$(uname -s)" in
+	"Darwin")
+		sudo launchctl unload /Library/LaunchDaemons/cc.wweir.sower.plist
+		sudo rm -rf /Library/LaunchDaemons/cc.wweir.sower.plist
+		rm -rf /usr/local/bin/sower /usr/local/etc/sower.toml
+		;;
+	"Linux")
+		sudo systemctl disable sower-client ||true
+		sudo systemctl disable sower-server || true
+		sudo rm -rf /etc/systemd/system/sower-client.service /etc/systemd/system/sower-server.service
+		sudo rm -rf /usr/local/bin/sower /usr/local/etc/sower.toml
+		;;
+	*)
+		echo Do not support auto deploy on this platform.
+		;;
+esac

dns/dhcp.go

@@ -0,0 +1,91 @@
+package dns
+
+import (
+	"math/rand"
+	"net"
+	"runtime"
+
+	"github.com/golang/glog"
+	"go.universe.tf/netboot/dhcp4"
+)
+
+var xid = make([]byte, 4)
+
+func GetDefaultDNSServer() string {
+	pack := &dhcp4.Packet{
+		Type:      dhcp4.MsgDiscover,
+		Broadcast: true,
+	}
+	options := map[dhcp4.Option][]byte{
+		dhcp4.OptRequestedOptions: []byte{byte(dhcp4.OptDNSServers)},
+	}
+
+	NewConn := dhcp4.NewConn
+	if runtime.GOOS == "linux" {
+		NewConn = dhcp4.NewSnooperConn
+	}
+
+	ifaces := mustGetInterfaces()
+	for _, iface := range ifaces {
+		conn, err := NewConn(iface.IP.String() + ":68")
+		if err != nil { // maybe in use
+			glog.V(1).Infoln(err)
+			continue
+		}
+		defer conn.Close()
+
+		rand.Read(xid)
+		pack.TransactionID = xid
+		pack.HardwareAddr = iface.Interface.HardwareAddr
+		options[dhcp4.OptClientIdentifier] = iface.Interface.HardwareAddr
+		pack.Options = dhcp4.Options(options)
+
+		if err := conn.SendDHCP(pack, iface.Interface); err != nil {
+			glog.Errorln(err)
+			continue
+		}
+
+		pack, _, err = conn.RecvDHCP()
+		if err != nil {
+			glog.Errorln(err)
+			continue
+		}
+
+		ips, err := pack.Options.IPs(dhcp4.OptDNSServers)
+		if err != nil {
+			glog.Errorln(err)
+			continue
+		}
+		return ips[0].String() // if len(ips) == 0, err should not be wrong size
+	}
+	return ""
+}
+
+type netIface struct {
+	*net.Interface
+	net.Addr
+	net.IP
+}
+
+func mustGetInterfaces() []*netIface {
+	ifaces, err := net.Interfaces()
+	if err != nil {
+		glog.Fatalln(err)
+	}
+
+	v4Iface := make([]*netIface, 0, len(ifaces))
+	for i := range ifaces {
+		if len(ifaces[i].HardwareAddr) == 0 {
+			continue
+		}
+
+		addrs, _ := ifaces[i].Addrs()
+		for _, addr := range addrs {
+			if ip := addr.(*net.IPNet).IP.To4(); ip != nil {
+				v4Iface = append(v4Iface, &netIface{&ifaces[i], addr, ip})
+				break
+			}
+		}
+	}
+	return v4Iface
+}

dns/dhcp_test.go

@@ -0,0 +1,20 @@
+package dns
+
+import "testing"
+
+func TestGetDefaultDNSServer(t *testing.T) {
+	t.Skip("skip for some enviroment not support dhcp")
+
+	tests := []struct {
+		name string
+	}{{
+		"",
+	}}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := GetDefaultDNSServer(); got == "" {
+				t.Errorf("GetDefaultDNSServer() return empty")
+			}
+		})
+	}
+}

dns/dns.go

@@ -3,20 +3,47 @@ package dns
 import (
 	"net"
 	"strings"
+	"sync/atomic"
 	"time"
 
 	"github.com/golang/glog"
 	"github.com/miekg/dns"
+	mem "github.com/wweir/mem-go"
 	"github.com/wweir/sower/conf"
 )
 
 const colon = byte(':')
 
-func StartDNS(dnsServer string) {
+func StartDNS(dnsServer, listenIP string) {
+	ip := net.ParseIP(listenIP)
+
+	suggest := &intelliSuggest{listenIP, 800 * time.Millisecond}
+	mem.DefaultCache = mem.New(time.Hour)
+
+	dhcpCh := make(chan struct{})
+	if dnsServer != "" {
+		dnsServer = net.JoinHostPort(dnsServer, "53")
+	} else {
+		go func() {
+			for {
+				<-dhcpCh
+				host := GetDefaultDNSServer()
+				if host == "" {
+					continue
+				}
+				// atomic action
+				dnsServer = net.JoinHostPort(host, "53")
+				glog.Infoln("set dns server to", host)
+			}
+		}()
+		dhcpCh <- struct{}{}
+	}
+
 	dns.HandleFunc(".", func(w dns.ResponseWriter, r *dns.Msg) {
 		// *Msg r has an TSIG record and it was validated
 		if r.IsTsig() != nil && w.TsigStatus() == nil {
-			r.SetTsig(r.Extra[len(r.Extra)-1].(*dns.TSIG).Hdr.Name, dns.HmacMD5, 300, time.Now().Unix())
+			lastTsig := r.Extra[len(r.Extra)-1].(*dns.TSIG)
+			r.SetTsig(lastTsig.Hdr.Name, dns.HmacMD5, 300, time.Now().Unix())
 		}
 
 		//https://stackoverflow.com/questions/4082081/requesting-a-and-aaaa-records-in-single-dns-query/4083071#4083071
@@ -29,83 +56,97 @@ func StartDNS(dnsServer string) {
 			domain = domain[:idx]
 		}
 
-		if len(conf.Conf.BlockList) == 0 {
-			bestTry(w, r, domain, dnsServer)
-		} else {
-			manual(w, r, domain, dnsServer)
-		}
+		matchAndServe(w, r, domain, listenIP, dnsServer, dhcpCh, ip, suggest)
 	})
 
-	server := &dns.Server{Addr: ":53", Net: "udp"}
+	server := &dns.Server{Addr: net.JoinHostPort(listenIP, "53"), Net: "udp"}
 	glog.Fatalln(server.ListenAndServe())
 }
 
-func bestTry(w dns.ResponseWriter, r *dns.Msg, domain, dnsServer string) {
-	msg, _ := dns.Exchange(r, dnsServer+":53")
-	if msg == nil {
-		return
-	}
-	if len(msg.Answer) == 0 { // expose any response
-		w.WriteMsg(msg)
-		return
-	}
+func matchAndServe(w dns.ResponseWriter, r *dns.Msg, domain, listenIP, dnsServer string,
+	dhcpCh chan struct{}, ipNet net.IP, suggest *intelliSuggest) {
 
-	var ip string
-	switch msg.Answer[0].(type) {
-	case *dns.A:
-		ip = msg.Answer[0].(*dns.A).A.String()
-	case *dns.AAAA:
-		ip = "[" + msg.Answer[0].(*dns.AAAA).AAAA.String() + "]"
-	default:
-		w.WriteMsg(msg)
-		return
-	}
+	inWriteList := whiteList.Match(domain)
 
-	if _, err := net.DialTimeout("tcp", ip+":http", time.Second); err != nil {
-		glog.V(2).Infoln(ip+":80", err)
-		w.WriteMsg(localA(r, domain))
-		return
-	}
-	w.WriteMsg(msg)
-}
-
-func manual(w dns.ResponseWriter, r *dns.Msg, domain, dnsServer string) {
-	if rule.Match(strings.TrimSuffix(domain, ".")) {
+	if !inWriteList && (blockList.Match(domain) || suggestList.Match(domain)) {
 		glog.V(2).Infof("match %s suss", domain)
-		w.WriteMsg(localA(r, domain))
+		w.WriteMsg(localA(r, domain, ipNet))
 		return
 	}
 
-	msg, err := dns.Exchange(r, dnsServer+":53")
+	if !inWriteList {
+		go mem.Remember(suggest, domain)
+	}
+
+	msg, err := dns.Exchange(r, dnsServer)
+	if err != nil && dhcpCh != nil {
+		select {
+		case dhcpCh <- struct{}{}:
+		default:
+		}
+	}
 	if msg == nil { // expose any response except nil
 		glog.V(1).Infof("get dns of %s fail: %s", domain, err)
 		return
 	}
 	w.WriteMsg(msg)
+}
 
-	if conf.Conf.Verbose != 0 && len(msg.Answer) != 0 {
-		go func() {
-			_, err := net.DialTimeout("tcp", domain+":http", 2*time.Second)
-			if err == nil || !strings.Contains(err.Error(), "timeout") {
-				return
-			}
+type intelliSuggest struct {
+	listenIP string
+	timeout  time.Duration
+}
 
-			_, err = net.DialTimeout("tcp", domain+":https", 3*time.Second)
-			if err == nil || !strings.Contains(err.Error(), "timeout") {
-				return
-			}
+func (i *intelliSuggest) GetOne(domain interface{}) (iface interface{}, e error) {
+	iface, e = struct{}{}, nil
 
-			glog.V(1).Infof("SUGGEST check (%s) http(s) service: %s", domain, err)
-		}()
+	// kill deadloop, for ugly wildcard setting dns setting
+	addr := strings.TrimSuffix(domain.(string), ".")
+	if len(strings.Split(addr, ".")) > 10 {
+		return
 	}
-}
 
-func localA(r *dns.Msg, domain string) *dns.Msg {
-	m := new(dns.Msg)
-	m.SetReply(r)
-	m.Answer = []dns.RR{&dns.A{
-		Hdr: dns.RR_Header{Name: domain, Rrtype: dns.TypeA, Class: dns.ClassINET, Ttl: 20},
-		A:   conf.Conf.ClientIPNet,
-	}}
-	return m
+	// give local dial a hand, make it not so easy to be added into suggestions
+	HTTPPing(addr, addr, Http, i.timeout/20)
+
+	var (
+		pings = []struct {
+			viaAddr string
+			port    Port
+		}{
+			{addr, Http},
+			{addr, Https},
+			{i.listenIP, Http},
+			{i.listenIP, Https},
+		}
+		half  = int32(len(pings) / 2)
+		score = new(int32)
+	)
+	for idx := range pings {
+		go func(idx int) {
+			err := HTTPPing(pings[idx].viaAddr, addr, pings[idx].port, i.timeout)
+			if err != nil {
+				// local ping fail
+				if pings[idx].viaAddr == addr {
+					atomic.AddInt32(score, 1)
+				}
+			} else {
+				// remote ping succ
+				if pings[idx].viaAddr == i.listenIP {
+					atomic.AddInt32(score, 1)
+
+					// local ping took longger than remote
+				} else if atomic.LoadInt32(score) >= half {
+					atomic.AddInt32(score, 1)
+				}
+			}
+
+			if atomic.LoadInt32(score) > half {
+				atomic.StoreInt32(score, 0) // avoid redo add action
+				conf.AddSuggest(addr)
+				glog.Infof("added suggest domain: %s", addr)
+			}
+		}(idx)
+	}
+	return
 }

dns/http_ping.go

@@ -0,0 +1,131 @@
+package dns
+
+import (
+	"bytes"
+	"crypto/tls"
+	"encoding/binary"
+	"io"
+	"net"
+	"time"
+)
+
+// HTTPPing try connect to a http(s) server with domain though the http addr
+func HTTPPing(viaHost, domain string, port Port, timeout time.Duration) (err error) {
+	conn, err := net.DialTimeout("tcp", port.JoinAddr(viaHost), timeout)
+	if err != nil {
+		return err
+	}
+	defer conn.Close()
+
+	conn.SetDeadline(time.Now().Add(timeout))
+	if _, err = conn.Write(port.pingMsg(domain)); err != nil {
+		return err
+	}
+
+	// err -> nil:		read something succ
+	// err -> io.EOF:	no such domain or connection refused
+	// err -> timeout:	tcp package has been dropped
+	_, err = conn.Read(make([]byte, 1))
+	if err == io.EOF && viaHost == domain {
+		return nil
+	}
+	return err
+}
+
+// Port ==========================
+type Port uint16
+
+const (
+	Http Port = iota
+	Https
+)
+
+func (p Port) JoinAddr(addr string) string {
+	switch p {
+	case Http:
+		return addr + ":80"
+	case Https:
+		return addr + ":443"
+	default:
+		panic("invalid port")
+	}
+}
+
+func (p Port) pingMsg(domain string) []byte {
+	switch p {
+	case Http:
+		return []byte("TRACE / HTTP/1.1\r\nHost: " + domain + "\r\n\r\n")
+	case Https:
+		return NewClientHelloSNIMsg(domain)
+	default:
+		panic("invalid port")
+	}
+}
+
+// SNI ==========================
+type clientHelloSNI struct {
+	ContentType uint8
+	Version     uint16
+	Length      uint16
+	handshakeProtocol
+}
+type handshakeProtocol struct {
+	HandshakeType            uint8
+	LengthExpand             uint8
+	Length                   uint16
+	Version                  uint16
+	Random                   [32]byte
+	SessionIDLength          uint8
+	CipherSuitesLength       uint16
+	CipherSuite              uint16
+	CompressionMethodsLength uint8
+	CompressionMethod        uint8
+	ExtensionsLength         uint16
+	extensionServerName
+}
+type extensionServerName struct {
+	Type   uint16
+	Length uint16
+	serverNameIndicationExtension
+}
+type serverNameIndicationExtension struct {
+	ServerNameListlength uint16
+	ServerNameType       uint8
+	ServerNamelength     uint16
+	// ServerName        []byte // Disable for fix length
+}
+
+func NewClientHelloSNIMsg(domain string) []byte {
+	length := uint16(len(domain))
+	msg := &clientHelloSNI{
+		ContentType: 0x16,   // Content Type: Handshake (22)
+		Version:     0x0301, // Version: TLS 1.0 (0x0301)
+		Length:      length + 56,
+		handshakeProtocol: handshakeProtocol{
+			HandshakeType:            0x01, // Handshake Type: Client Hello (1)
+			Length:                   length + 52,
+			Version:                  0x0303,     // Version: TLS 1.2 (0x0303)
+			Random:                   [32]byte{}, // [32]byte{},
+			SessionIDLength:          0x0,        // Session ID Length: 0
+			CipherSuitesLength:       2,          // Cipher Suites Length: 84
+			CipherSuite:              tls.TLS_RSA_WITH_AES_128_GCM_SHA256,
+			CompressionMethodsLength: 1,    // Compression Methods Length: 1
+			CompressionMethod:        0x00, // Compression null
+			ExtensionsLength:         length + 9,
+			extensionServerName: extensionServerName{
+				Type:   0x0000, // Type: server_name (0)
+				Length: length + 5,
+				serverNameIndicationExtension: serverNameIndicationExtension{
+					ServerNameListlength: length + 3,
+					ServerNameType:       0x00, // Server Name Type: host_name (0)
+					ServerNamelength:     length,
+				},
+			},
+		},
+	}
+
+	buf := bytes.NewBuffer(make([]byte, 0, length+61))
+	binary.Write(buf, binary.BigEndian, msg)
+	buf.WriteString(domain)
+	return buf.Bytes()
+}

dns/suffixTree.go

@@ -1,73 +0,0 @@
-package dns
-
-import (
-	"strings"
-)
-
-type Node struct {
-	Node map[string]*Node
-}
-
-func NewNode() *Node {
-	return &Node{Node: map[string]*Node{}}
-}
-func NewNodeFromRule(rules ...string) *Node {
-	node := NewNode()
-	for i := range rules {
-		node.Add(strings.Split(rules[i], "."))
-	}
-	return node
-}
-
-func (n *Node) String() string {
-	return n.string("")
-}
-func (n *Node) string(prefix string) (out string) {
-	for key, val := range n.Node {
-		out += prefix + key + "\n" + val.string(prefix+"    ")
-	}
-	return
-}
-
-func (n *Node) Add(secs []string) {
-	length := len(secs)
-	switch length {
-	case 0:
-		return
-	case 1:
-		n.Node[secs[length-1]] = NewNode()
-	default:
-		subNode, ok := n.Node[secs[length-1]]
-		if !ok {
-			subNode = NewNode()
-			n.Node[secs[length-1]] = subNode
-		}
-		subNode.Add(secs[:length-1])
-	}
-}
-
-func (n *Node) Match(addr string) bool {
-	return n.matchSecs(strings.Split(addr, "."))
-}
-
-func (n *Node) matchSecs(secs []string) bool {
-	length := len(secs)
-	if length == 0 {
-		switch len(n.Node) {
-		case 0:
-			return true
-		case 1:
-			_, ok := n.Node["*"]
-			return ok
-		default:
-			return false
-		}
-	}
-
-	if n, ok := n.Node[secs[length-1]]; ok {
-		return n.matchSecs(secs[:length-1])
-	}
-
-	_, ok := n.Node["*"]
-	return ok
-}

dns/util.go

@@ -1,19 +1,57 @@
 package dns
 
 import (
+	"net"
+
 	"github.com/golang/glog"
+	"github.com/miekg/dns"
 	"github.com/wweir/sower/conf"
+	"github.com/wweir/sower/util"
 )
 
-var rule *Node
+var (
+	blockList   *util.Node
+	whiteList   *util.Node
+	suggestList *util.Node
+)
 
 func init() {
-	rule = NewNodeFromRule(conf.Conf.BlockList...)
-	glog.V(2).Infof("block rule:\n%s", rule)
+	host, _, _ := net.SplitHostPort(conf.Conf.ServerAddr)
+
+	//first init
+	blockList = loadRules("block", conf.Conf.BlockList)
+	suggestList = loadRules("suggest", conf.Conf.Suggestions)
+	whiteList = loadRules("white", conf.Conf.WhiteList)
+	whiteList.Add(host)
 
 	conf.OnRefreash = append(conf.OnRefreash, func() error {
-		rule = NewNodeFromRule(conf.Conf.BlockList...)
-		glog.V(2).Infof("block rule:\n%s", rule)
+		blockList = loadRules("block", conf.Conf.BlockList)
+		suggestList = loadRules("suggest", conf.Conf.Suggestions)
+		whiteList = loadRules("white", conf.Conf.WhiteList)
+		whiteList.Add(host)
 		return nil
 	})
 }
+
+func loadRules(name string, list []string) *util.Node {
+	rule := util.NewNodeFromRules(".", list...)
+	glog.V(3).Infof("load %s rule:\n%s", name, rule)
+	return rule
+}
+
+func localA(r *dns.Msg, domain string, localIP net.IP) *dns.Msg {
+	m := new(dns.Msg)
+	m.SetReply(r)
+	if localIP.To4() != nil {
+		m.Answer = []dns.RR{&dns.A{
+			Hdr: dns.RR_Header{Name: domain, Rrtype: dns.TypeA, Class: dns.ClassINET, Ttl: 20},
+			A:   localIP,
+		}}
+	} else {
+		m.Answer = []dns.RR{&dns.AAAA{
+			Hdr:  dns.RR_Header{Name: domain, Rrtype: dns.TypeAAAA, Class: dns.ClassINET, Ttl: 20},
+			AAAA: localIP,
+		}}
+	}
+	return m
+}

go.mod

@@ -1,28 +1,25 @@
 module github.com/wweir/sower
 
 require (
-	github.com/BurntSushi/toml v0.3.1
-	github.com/bifurcation/mint v0.0.0-20181105071958-a14404e9a861 // indirect
+	github.com/bifurcation/mint v0.0.0-20181105071958-a14404e9a861 // lock version
 	github.com/cheekybits/genny v1.0.0 // indirect
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
-	github.com/golang/mock v1.1.1 // indirect
 	github.com/hashicorp/golang-lru v0.5.0 // indirect
 	github.com/klauspost/cpuid v1.2.0 // indirect
-	github.com/klauspost/reedsolomon v1.7.0 // indirect
+	github.com/klauspost/reedsolomon v1.9.0 // indirect
 	github.com/lucas-clemente/aes12 v0.0.0-20171027163421-cd47fb39b79f // indirect
-	github.com/lucas-clemente/quic-go v0.10.0
+	github.com/lucas-clemente/quic-go v0.10.1
 	github.com/lucas-clemente/quic-go-certificates v0.0.0-20160823095156-d2f86524cced // indirect
-	github.com/miekg/dns v1.1.1
-	github.com/onsi/ginkgo v1.7.0 // indirect
-	github.com/onsi/gomega v1.4.3 // indirect
-	github.com/pkg/errors v0.8.0
+	github.com/miekg/dns v1.1.4
+	github.com/pelletier/go-toml v1.2.0
+	github.com/pkg/errors v0.8.1
 	github.com/templexxx/cpufeat v0.0.0-20180724012125-cef66df7f161 // indirect
 	github.com/templexxx/xor v0.0.0-20181023030647-4e92f724b73b // indirect
 	github.com/tjfoc/gmsm v1.0.1 // indirect
-	github.com/wweir/fsnotify v1.4.8
-	github.com/xtaci/kcp-go v4.3.2+incompatible
-	golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9 // indirect
-	golang.org/x/net v0.0.0-20181201002055-351d144fa1fc // indirect
-	golang.org/x/sync v0.0.0-20181108010431-42b317875d0f // indirect
-	golang.org/x/sys v0.0.0-20181128092732-4ed8d59d0b35 // indirect
+	github.com/ulule/deepcopier v0.0.0-20171107155558-ca99b135e50f // indirect
+	github.com/wweir/mem-go v0.0.0-20190109100331-8673ab596296
+	github.com/xtaci/kcp-go v5.0.7+incompatible
+	go.universe.tf/netboot v0.0.0-20190215013330-01f30467ac8e
+	golang.org/x/crypto v0.0.0-20190222235706-ffb98f73852f // lock version
+	golang.org/x/sys v0.0.0-20190222171317-cd391775e71e
 )

go.sum

@@ -1,68 +1,73 @@
-github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/bifurcation/mint v0.0.0-20181105071958-a14404e9a861 h1:x17NvoJaphEzay72TFej4OSSsgu3xRYBLkbIwdofS/4=
 github.com/bifurcation/mint v0.0.0-20181105071958-a14404e9a861/go.mod h1:zVt7zX3K/aDCk9Tj+VM7YymsX66ERvzCJzw8rFCX2JU=
 github.com/cheekybits/genny v1.0.0 h1:uGGa4nei+j20rOSeDeP5Of12XVm7TGUd4dJA9RDitfE=
 github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ=
-github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/mock v1.1.1 h1:G5FRp8JnTd7RQH5kemVNlMeyXQAztQ3mOWV95KxsXH8=
-github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/google/go-cmp v0.1.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/hashicorp/golang-lru v0.5.0 h1:CL2msUPvZTLb5O648aiLNJw3hnBxN2+1Jq8rCOH9wdo=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
-github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/hashicorp/hcl v0.0.0-20171017181929-23c074d0eceb/go.mod h1:oZtUIOe8dh44I2q6ScRibXws4Ajl+d+nod3AaR9vL5w=
+github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/klauspost/cpuid v1.2.0 h1:NMpwD2G9JSFOE1/TJjGSo5zG7Yb2bTe7eq1jH+irmeE=
 github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
-github.com/klauspost/reedsolomon v1.7.0 h1:pLFmRKGko2ZieiTGyo9DahLCIuljyxm+Zzhz/fYEonE=
-github.com/klauspost/reedsolomon v1.7.0/go.mod h1:CwCi+NUr9pqSVktrkN+Ondf06rkhYZ/pcNv7fu+8Un4=
+github.com/klauspost/reedsolomon v1.9.0 h1:usyTY5K7D2B6WOHn2jmpB7ky8Qom96mShZmmq3OW4JU=
+github.com/klauspost/reedsolomon v1.9.0/go.mod h1:CwCi+NUr9pqSVktrkN+Ondf06rkhYZ/pcNv7fu+8Un4=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/lucas-clemente/aes12 v0.0.0-20171027163421-cd47fb39b79f h1:sSeNEkJrs+0F9TUau0CgWTTNEwF23HST3Eq0A+QIx+A=
 github.com/lucas-clemente/aes12 v0.0.0-20171027163421-cd47fb39b79f/go.mod h1:JpH9J1c9oX6otFSgdUHwUBUizmKlrMjxWnIAjff4m04=
-github.com/lucas-clemente/quic-go v0.10.0 h1:xEF+pSHYAOcu+U10Meunf+DTtc8vhQDRqlA0BJ6hufc=
-github.com/lucas-clemente/quic-go v0.10.0/go.mod h1:wuD+2XqEx8G9jtwx5ou2BEYBsE+whgQmlj0Vz/77PrY=
+github.com/lucas-clemente/quic-go v0.10.1 h1:ipcMmYP9RT+b1YytOKGUY1qndxPGOczVEQkAVz3CZrs=
+github.com/lucas-clemente/quic-go v0.10.1/go.mod h1:wuD+2XqEx8G9jtwx5ou2BEYBsE+whgQmlj0Vz/77PrY=
 github.com/lucas-clemente/quic-go-certificates v0.0.0-20160823095156-d2f86524cced h1:zqEC1GJZFbGZA0tRyNZqRjep92K5fujFtFsu5ZW7Aug=
 github.com/lucas-clemente/quic-go-certificates v0.0.0-20160823095156-d2f86524cced/go.mod h1:NCcRLrOTZbzhZvixZLlERbJtDtYsmMw8Jc4vS8Z0g58=
-github.com/miekg/dns v1.1.1 h1:DVkblRdiScEnEr0LR9nTnEQqHYycjkXW9bOjd+2EL2o=
-github.com/miekg/dns v1.1.1/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
-github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs=
-github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/gomega v1.4.3 h1:RE1xgDvH7imwFD45h+u2SgIfERHlS2yNG4DObb5BSKU=
-github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw=
-github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/magiconair/properties v1.7.4/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
+github.com/miekg/dns v1.1.4 h1:rCMZsU2ScVSYcAsOXgmC6+AKOK+6pmQTOcw03nfwYV0=
+github.com/miekg/dns v1.1.4/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
+github.com/mitchellh/mapstructure v0.0.0-20180203102830-a4e142e9c047/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/pelletier/go-toml v1.1.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
+github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc=
+github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
+github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/spf13/afero v1.0.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
+github.com/spf13/cast v1.1.0/go.mod h1:r2rcYCSwa1IExKTDiTfzaxqT2FNHs8hODu4LnUfgKEg=
+github.com/spf13/cobra v0.0.1/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
+github.com/spf13/jwalterweatherman v0.0.0-20180109140146-7c0cea34c8ec/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
+github.com/spf13/pflag v1.0.0/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/spf13/viper v1.0.0/go.mod h1:A8kyI5cUJhb8N+3pkfONlcEcZbueH6nhAm0Fq7SrnBM=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/templexxx/cpufeat v0.0.0-20180724012125-cef66df7f161 h1:89CEmDvlq/F7SJEOqkIdNDGJXrQIhuIx9D2DBXjavSU=
 github.com/templexxx/cpufeat v0.0.0-20180724012125-cef66df7f161/go.mod h1:wM7WEvslTq+iOEAMDLSzhVuOt5BRZ05WirO+b09GHQU=
 github.com/templexxx/xor v0.0.0-20181023030647-4e92f724b73b h1:mnG1fcsIB1d/3vbkBak2MM0u+vhGhlQwpeimUi7QncM=
 github.com/templexxx/xor v0.0.0-20181023030647-4e92f724b73b/go.mod h1:5XA7W9S6mni3h5uvOC75dA3m9CCCaS83lltmc0ukdi4=
 github.com/tjfoc/gmsm v1.0.1 h1:R11HlqhXkDospckjZEihx9SW/2VW0RgdwrykyWMFOQU=
 github.com/tjfoc/gmsm v1.0.1/go.mod h1:XxO4hdhhrzAd+G4CjDqaOkd0hUzmtPR/d3EiBBMn/wc=
-github.com/wweir/fsnotify v1.4.8 h1:zxOoqwE5p91F3rmcYLQheoSeTlIVqwi2b5T7UlpElWE=
-github.com/wweir/fsnotify v1.4.8/go.mod h1:4GuxIc23DXfJI1/LhBXG5eE/wJ4CzL+kk5M7woxVprc=
-github.com/xtaci/kcp-go v4.3.2+incompatible h1:vM5gqHI8p5xa3eXQH279+16fG86gCz/IRamaQvWG+a8=
-github.com/xtaci/kcp-go v4.3.2+incompatible/go.mod h1:bN6vIwHQbfHaHtFpEssmWsN45a+AZwO7eyRCmEIbtvE=
-golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9 h1:mKdxBk7AujPs8kU4m80U72y/zjbZ3UcXC7dClwKbUI0=
-golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181201002055-351d144fa1fc h1:a3CU5tJYVj92DY2LaA1kUkrsqD5/3mLDhx2NcNqyW+0=
-golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181108010431-42b317875d0f h1:Bl/8QSvNqXvPGPGXa2z5xUTmV7VDcZyvRZ+QQXkXTZQ=
-golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181128092732-4ed8d59d0b35 h1:YAFjXN64LMvktoUZH9zgY4lGc/msGN7HQfoSuKCgaDU=
-golang.org/x/sys v0.0.0-20181128092732-4ed8d59d0b35/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
-gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
-gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
-gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+github.com/ulule/deepcopier v0.0.0-20171107155558-ca99b135e50f h1:QatZ4lsJBY3x1+Imst9g95+vUl7m52dqM9Pi4aSMW8w=
+github.com/ulule/deepcopier v0.0.0-20171107155558-ca99b135e50f/go.mod h1:BNLmYJ8oMJPIPpNx5968jCyUhwEU1XT3YsuOqtbo5qo=
+github.com/wweir/mem-go v0.0.0-20190109100331-8673ab596296 h1:/HkUfg+ZMx/tNdnyJdVlhyv+xO3A7ZlpfL9nFLWLYcc=
+github.com/wweir/mem-go v0.0.0-20190109100331-8673ab596296/go.mod h1:k7rjBGWoJ+JKwvfe8juAX0zgybjo/Yo3JGkca5f/06s=
+github.com/xtaci/kcp-go v5.0.7+incompatible h1:zs9tc8XRID0m+aetu3qPWZFyRt2UIMqbXIBgw+vcnlE=
+github.com/xtaci/kcp-go v5.0.7+incompatible/go.mod h1:bN6vIwHQbfHaHtFpEssmWsN45a+AZwO7eyRCmEIbtvE=
+go.universe.tf/netboot v0.0.0-20190215013330-01f30467ac8e h1:7H7ZaK8/trvkwdGUmQZIkXIGVUDWG7z8p9stiR9KvBY=
+go.universe.tf/netboot v0.0.0-20190215013330-01f30467ac8e/go.mod h1:SayXxCfNj1vDO8eF7GpY1xEZ8px5LfHUSr+uJJMcDTo=
+golang.org/x/crypto v0.0.0-20180206190813-d9133f546934 h1:UbtgwftcdEk1BsxGUZ2PA880WW9HqmwoQn6MKRkNelQ=
+golang.org/x/crypto v0.0.0-20180206190813-d9133f546934/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20190222235706-ffb98f73852f h1:qWFY9ZxP3tfI37wYIs/MnIAqK0vlXp1xnYEa5HxFSSY=
+golang.org/x/crypto v0.0.0-20190222235706-ffb98f73852f/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/net v0.0.0-20180202180947-2fb46b16b8dd h1:sFXnfxrhbeCXDiKa6Ra98LxiHoUWSHs9AKOxFURy5pY=
+golang.org/x/net v0.0.0-20180202180947-2fb46b16b8dd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/sys v0.0.0-20180202135801-37707fdb30a5 h1:MF92a0wJ3gzSUVBpjcwdrDr5+klMFRNEEu6Mev4n00I=
+golang.org/x/sys v0.0.0-20180202135801-37707fdb30a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190222171317-cd391775e71e h1:oF7qaQxUH6KzFdKN4ww7NpPdo53SZi4UlcksLrb2y/o=
+golang.org/x/sys v0.0.0-20190222171317-cd391775e71e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/text v0.0.0-20171227012246-e19ae1496984/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.0.0/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=

main.go

@@ -7,14 +7,22 @@ import (
 	"github.com/wweir/sower/proxy"
 )
 
+var version, date string
+
 func main() {
 	conf := conf.Conf
-	glog.Infoln("Starting:", conf)
+	glog.Infof("Starting sower(%s %s): %v", version, date, conf)
 
 	if conf.ServerAddr == "" {
-		proxy.StartServer(conf.NetType, conf.ServerPort, conf.Password)
+		proxy.StartServer(conf.NetType, conf.ServerPort, conf.Cipher, conf.Password)
+
 	} else {
-		go dns.StartDNS(conf.DnsServer)
-		proxy.StartClient(conf.NetType, conf.ServerAddr, conf.Password)
+		if conf.HTTPProxy != "" {
+			go proxy.StartHttpProxy(conf.NetType, conf.ServerAddr,
+				conf.Cipher, conf.Password, conf.HTTPProxy)
+		}
+
+		go dns.StartDNS(conf.DNSServer, conf.ClientIP)
+		proxy.StartClient(conf.NetType, conf.ServerAddr, conf.Cipher, conf.Password, conf.ClientIP)
 	}
 }

parse/parse_addr.go

@@ -7,10 +7,12 @@ import (
 	"net"
 	"net/http"
 	"strings"
+
+	"github.com/wweir/sower/util"
 )
 
-func ParseAddr(conn net.Conn) (teeConn *TeeConn, addr string, err error) {
-	teeConn = &TeeConn{Conn: conn}
+func ParseAddr(conn net.Conn) (teeConn *util.TeeConn, addr string, err error) {
+	teeConn = &util.TeeConn{Conn: conn}
 	teeConn.StartOrReset()
 	defer teeConn.Stop()
 

proxy/client.go

@@ -14,42 +14,56 @@ type Client interface {
 	Dial(server string) (net.Conn, error)
 }
 
-func StartClient(netType, server, password string) {
-	var connCh = listenLocal([]string{":80", ":443"})
-	var client Client
+func NewClient(netType string) Client {
 	switch netType {
 	case QUIC.String():
-		client = quic.NewClient()
+		return quic.NewClient()
 	case KCP.String():
-		client = kcp.NewClient()
+		return kcp.NewClient()
 	case TCP.String():
-		client = tcp.NewClient()
+		return tcp.NewClient()
+	default:
+		glog.Fatalln("invalid net type: " + netType)
+		return nil
 	}
+}
 
+func StartClient(netType, server, cipher, password, listenIP string) {
+	connCh := listenLocal(listenIP, []string{"80", "443"})
+	client := NewClient(netType)
+	resolved := false
+
+	glog.Infoln("Client started.")
 	for {
 		conn := <-connCh
 		glog.V(1).Infof("new conn from (%s) to (%s)", conn.RemoteAddr(), server)
 
+		if !resolved {
+			if addr, err := net.ResolveTCPAddr("tcp", server); err != nil {
+				glog.Errorln(err)
+			} else {
+				server = addr.String()
+				resolved = true
+			}
+		}
+
 		rc, err := client.Dial(server)
 		if err != nil {
 			conn.Close()
 			glog.Errorln(err)
 			continue
 		}
-
-		if rc, err = shadow.Shadow(rc, password); err != nil {
-			glog.Fatalln(err)
-		}
+		rc = shadow.Shadow(rc, cipher, password)
 
 		go relay(conn, rc)
 	}
 }
 
-func listenLocal(ports []string) <-chan net.Conn {
+func listenLocal(listenIP string, ports []string) <-chan net.Conn {
 	connCh := make(chan net.Conn, 10)
 	for i := range ports {
 		go func(port string) {
-			ln, err := net.Listen("tcp", port)
+			ln, err := net.Listen("tcp", net.JoinHostPort(listenIP, port))
 			if err != nil {
 				glog.Fatalln(err)
 			}
@@ -57,10 +71,11 @@ func listenLocal(ports []string) <-chan net.Conn {
 			for {
 				conn, err := ln.Accept()
 				if err != nil {
-					glog.Errorln("accept", port, "fail:", err)
+					glog.Errorln("accept", listenIP+port, "fail:", err)
 					continue
 				}
 
+				conn.(*net.TCPConn).SetKeepAlive(true)
 				connCh <- conn
 			}
 		}(ports[i])

proxy/http_proxy.go

@@ -0,0 +1,103 @@
+package proxy
+
+import (
+	"context"
+	"crypto/tls"
+	"io"
+	"net"
+	"net/http"
+	"time"
+
+	"github.com/golang/glog"
+	"github.com/wweir/sower/shadow"
+)
+
+func StartHttpProxy(netType, server, cipher, password, addr string) {
+	client := NewClient(netType)
+	resolved := false
+
+	srv := &http.Server{
+		Addr: addr,
+		Handler: http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			if !resolved {
+				if addr, err := net.ResolveTCPAddr("tcp", server); err != nil {
+					glog.Errorln(err)
+				} else {
+					server = addr.String()
+					resolved = true
+				}
+			}
+
+			if r.Method == http.MethodConnect {
+				httpsProxy(w, r, client, server, cipher, password)
+			} else {
+				httpProxy(w, r, client, server, cipher, password)
+			}
+		}),
+		// Disable HTTP/2.
+		TLSNextProto: map[string]func(*http.Server, *tls.Conn, http.Handler){},
+		IdleTimeout:  90 * time.Second,
+	}
+
+	glog.Fatalln(srv.ListenAndServe())
+}
+
+func httpProxy(w http.ResponseWriter, req *http.Request, client Client, server, cipher, password string) {
+	roundTripper := &http.Transport{
+		DialContext: func(context.Context, string, string) (net.Conn, error) {
+			conn, err := client.Dial(server)
+			if err != nil {
+				return nil, err
+			}
+			return shadow.Shadow(conn, cipher, password), nil
+		},
+		MaxIdleConns:          100,
+		IdleConnTimeout:       90 * time.Second,
+		TLSHandshakeTimeout:   10 * time.Second,
+		ExpectContinueTimeout: 1 * time.Second,
+	}
+
+	resp, err := roundTripper.RoundTrip(req)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusServiceUnavailable)
+		glog.Errorln("serve https proxy, get remote data:", err)
+		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, client Client, server, cipher, password string) {
+	// local conn
+	conn, _, err := w.(http.Hijacker).Hijack()
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusServiceUnavailable)
+		return
+	}
+	conn.(*net.TCPConn).SetKeepAlive(true)
+
+	if _, err := conn.Write([]byte(r.Proto + " 200 Connection established\r\n\r\n")); err != nil {
+		conn.Close()
+		glog.Errorln("serve https proxy, write data fail:", err)
+		return
+	}
+
+	// remote conn
+	rc, err := client.Dial(server)
+	if err != nil {
+		conn.Close()
+		http.Error(w, err.Error(), http.StatusServiceUnavailable)
+		glog.Errorln("serve https proxy, dial remote fail:", err)
+		return
+	}
+	rc = shadow.Shadow(rc, cipher, password)
+
+	relay(rc, conn)
+}

proxy/kcp/server.go

@@ -15,7 +15,7 @@ type server struct {
 	SockBuf     int
 }
 
-func NewServer(password string) *server {
+func NewServer() *server {
 	return &server{
 		DataShard:   10,
 		ParityShard: 3,

proxy/quic/client.go

@@ -7,6 +7,7 @@ import (
 
 	quic "github.com/lucas-clemente/quic-go"
 	"github.com/pkg/errors"
+	"github.com/wweir/sower/util"
 )
 
 type client struct {
@@ -16,11 +17,12 @@ type client struct {
 
 func NewClient() *client {
 	return &client{
-		// conf: &quic.Config{
-		// 	HandshakeTimeout:   5 * time.Second,
-		// 	MaxIncomingStreams: 1024,
-		// 	KeepAlive:          true,
-		// },
+		conf: &quic.Config{
+			HandshakeTimeout:   5 * time.Second,
+			MaxIncomingStreams: 1024,
+			KeepAlive:          true,
+			IdleTimeout:        5 * time.Minute,
+		},
 	}
 }
 
@@ -29,12 +31,17 @@ func (c *client) Dial(server string) (net.Conn, error) {
 		if sess, err := quic.DialAddr(server, &tls.Config{InsecureSkipVerify: true}, c.conf); err != nil {
 			return nil, errors.Wrap(err, "session")
 		} else {
+			go func() {
+				<-sess.Context().Done()
+				sess.Close()
+				c.sess = nil
+			}()
 			c.sess = sess
 		}
 	}
 
 	var stream quic.Stream
-	if err := WithTimeout(func() (err error) {
+	if err := util.WithTimeout(func() (err error) {
 		if stream, err = c.sess.OpenStream(); err != nil {
 			c.sess = nil
 		}

proxy/quic/server.go

@@ -2,6 +2,7 @@ package quic
 
 import (
 	"net"
+	"time"
 
 	"github.com/golang/glog"
 	quic "github.com/lucas-clemente/quic-go"
@@ -14,11 +15,12 @@ type server struct {
 
 func NewServer() *server {
 	return &server{
-		// conf: &quic.Config{
-		// 	HandshakeTimeout:   5 * time.Second,
-		// 	MaxIncomingStreams: 1024,
-		// 	KeepAlive:          true,
-		// },
+		conf: &quic.Config{
+			HandshakeTimeout:   5 * time.Second,
+			MaxIncomingStreams: 1024,
+			KeepAlive:          true,
+			IdleTimeout:        5 * time.Minute,
+		},
 	}
 }
 

proxy/quic/util.go

@@ -8,11 +8,9 @@ import (
 	"encoding/pem"
 	"math/big"
 	"net"
-	"time"
 
 	"github.com/golang/glog"
 	quic "github.com/lucas-clemente/quic-go"
-	"github.com/pkg/errors"
 )
 
 type streamConn struct {
@@ -48,20 +46,3 @@ func mockTlsPem() *tls.Config {
 	}
 	return &tls.Config{Certificates: []tls.Certificate{tlsCert}}
 }
-
-func WithTimeout(fn func() error, timeout time.Duration) error {
-	var okCh = make(chan struct{})
-	var err error
-
-	go func() {
-		err = fn()
-		close(okCh)
-	}()
-
-	select {
-	case <-okCh:
-		return err
-	case <-time.After(timeout):
-		return errors.New("timeout: " + timeout.String())
-	}
-}

proxy/server.go

@@ -16,34 +16,37 @@ type Server interface {
 	Listen(port string) (<-chan net.Conn, error)
 }
 
-func StartServer(netType, port, password string) {
-	var server Server
+func NewServer(netType string) Server {
 	switch netType {
 	case QUIC.String():
-		server = quic.NewServer()
+		return quic.NewServer()
 	case KCP.String():
-		server = kcp.NewServer(password)
+		return kcp.NewServer()
 	case TCP.String():
-		server = tcp.NewServer()
+		return tcp.NewServer()
+	default:
+		glog.Fatalln("invalid net type: " + netType)
+		return nil
 	}
+}
 
+func StartServer(netType, port, cipher, password string) {
 	if port == "" {
 		glog.Fatalln("port must set")
 	}
 	if !strings.Contains(port, ":") {
 		port = ":" + port
 	}
-	connCh, err := server.Listen(port)
+
+	connCh, err := NewServer(netType).Listen(port)
 	if err != nil {
 		glog.Fatalf("listen %v fail: %s", port, err)
 	}
 
+	glog.Infoln("Server started.")
 	for {
 		conn := <-connCh
-		conn, err := shadow.Shadow(conn, password)
-		if err != nil {
-			glog.Fatalln(err)
-		}
+		conn = shadow.Shadow(conn, cipher, password)
 
 		go handle(conn)
 	}
@@ -52,6 +55,7 @@ func StartServer(netType, port, password string) {
 func handle(conn net.Conn) {
 	conn, addr, err := parse.ParseAddr(conn)
 	if err != nil {
+		conn.Close()
 		glog.Warningln(err)
 		return
 	}
@@ -59,13 +63,11 @@ func handle(conn net.Conn) {
 
 	rc, err := net.Dial("tcp", addr)
 	if err != nil {
+		conn.Close()
 		glog.Warningln(err)
 		return
 	}
-
-	if err := rc.(*net.TCPConn).SetKeepAlive(true); err != nil {
-		glog.Warningln(err)
-	}
+	rc.(*net.TCPConn).SetKeepAlive(true)
 
 	relay(rc, conn)
 }

proxy/tcp/client.go

@@ -1,14 +1,26 @@
 package tcp
 
-import "net"
+import (
+	"net"
+	"time"
+)
 
 type client struct {
+	DialTimeout time.Duration
 }
 
 func NewClient() *client {
-	return &client{}
+	return &client{
+		DialTimeout: 5 * time.Second,
+	}
 }
 
 func (c *client) Dial(server string) (net.Conn, error) {
-	return net.Dial("tcp", server)
+	conn, err := net.DialTimeout("tcp", server, c.DialTimeout)
+	if err != nil {
+		return nil, err
+	}
+
+	conn.(*net.TCPConn).SetKeepAlive(true)
+	return conn, nil
 }

proxy/tcp/server.go

@@ -27,6 +27,7 @@ func (s *server) Listen(port string) (<-chan net.Conn, error) {
 				glog.Fatalln("TCP listen:", err)
 			}
 
+			conn.(*net.TCPConn).SetKeepAlive(true)
 			connCh <- conn
 		}
 	}()

proxy/util.go

@@ -34,9 +34,10 @@ func redirect(dst, src net.Conn, wg *sync.WaitGroup, exitFlag *int32) {
 	}
 
 	if atomic.CompareAndSwapInt32(exitFlag, 0, 1) {
+		// wakeup blocked goroutine
 		now := time.Now()
-		src.SetReadDeadline(now)
-		dst.SetWriteDeadline(now)
+		src.SetDeadline(now)
+		dst.SetDeadline(now)
 	} else {
 		src.Close()
 		dst.Close()

shadow/cipher.go

@@ -0,0 +1,67 @@
+package shadow
+
+import (
+	"crypto/aes"
+	"crypto/cipher"
+
+	"github.com/pkg/errors"
+	"golang.org/x/crypto/chacha20poly1305"
+)
+
+//go:generate stringer -type=cipherType $GOFILE
+type cipherType int
+
+const (
+	AES_128_GCM cipherType = iota
+	AES_192_GCM
+	AES_256_GCM
+	CHACHA20_IETF_POLY1305
+	XCHACHA20_IETF_POLY1305
+)
+
+func pickCipher(cipherType, password string) (cipher.AEAD, error) {
+	var blockSize int
+	switch cipherType {
+	case AES_128_GCM.String():
+		blockSize = 16
+	case AES_192_GCM.String():
+		blockSize = 24
+	case AES_256_GCM.String():
+		blockSize = 32
+
+	case CHACHA20_IETF_POLY1305.String():
+		return chacha20poly1305.New(genKey(password, 256))
+	case XCHACHA20_IETF_POLY1305.String():
+		return chacha20poly1305.NewX(genKey(password, 256))
+
+	default:
+		return nil, errors.New("do not support cipher type: " + cipherType)
+	}
+
+	// aes gcm
+	block, err := aes.NewCipher(genKey(password, blockSize))
+	if err != nil {
+		return nil, errors.Wrap(err, "password")
+	}
+
+	aead, err := cipher.NewGCM(block)
+	if err != nil {
+		return nil, errors.Wrap(err, AES_128_GCM.String())
+	}
+	return aead, nil
+}
+
+func genKey(filler string, size int) []byte {
+	res := make([]byte, size)
+	if filler == "" {
+		panic("password should not be empty")
+	}
+
+	fillerByte := []byte(filler)
+	length := len(fillerByte)
+	for i := 0; ; i++ {
+		if copy(res[i*length:], fillerByte) != length {
+			return res
+		}
+	}
+}

shadow/ciphertype_string.go

@@ -0,0 +1,16 @@
+// Code generated by "stringer -type=cipherType cipher.go"; DO NOT EDIT.
+
+package shadow
+
+import "strconv"
+
+const _cipherType_name = "AES_128_GCMAES_192_GCMAES_256_GCMCHACHA20_IETF_POLY1305XCHACHA20_IETF_POLY1305"
+
+var _cipherType_index = [...]uint8{0, 11, 22, 33, 55, 78}
+
+func (i cipherType) String() string {
+	if i < 0 || i >= cipherType(len(_cipherType_index)-1) {
+		return "cipherType(" + strconv.FormatInt(int64(i), 10) + ")"
+	}
+	return _cipherType_name[_cipherType_index[i]:_cipherType_index[i+1]]
+}

shadow/doc.go

@@ -1,6 +1,4 @@
-// transter conn to be a crypto conn
-// stream mode, blocksize is 1350, for mtu
-// data  [0   ...   1332]
-// block [size][2 ... 1350]
-// payload size + data size + aead overhead => (2+1332+16)
+// Package shadow transter conn to be a crypto conn
+// support aead mode only
+// payload: [size](2+Overhead bytes) + [content](size+Overhead bytes)
 package shadow

shadow/shadow.go

@@ -1,128 +1,102 @@
 package shadow
 
 import (
-	"crypto/aes"
 	"crypto/cipher"
 	"encoding/binary"
 	"io"
-	"log"
 	"math/rand"
 	"net"
-
-	"github.com/pkg/errors"
 )
 
-func init() {
-	log.SetFlags(log.Ltime | log.Lshortfile)
-}
-
-var MTU = 1350 //MTU must little than 0xFFFF
+const MAX_SIZE = 0xFFFF
 
 type conn struct {
-	dataSize     int
+	maxSize      int
 	aead         cipher.AEAD
 	encryptNonce func() []byte
 	decryptNonce func() []byte
 	writeBuf     []byte
 	readBuf      []byte
 	readOffset   int
-	readLast     int
 	net.Conn
 }
 
 func (c *conn) Read(b []byte) (n int, err error) {
-	bLength := len(b)
-	offset := 0
-	switch c.readOffset {
-	case -1:
-		return 0, io.EOF
-	case 0: // read from conn
-	default: // read from buffer
-		offset = copy(b, c.readBuf[c.readOffset:c.readLast])
-		if offset+c.readOffset < c.readLast {
-			c.readOffset += offset
-			return offset, nil
-		}
+	// read from buffer
+	if c.readOffset != 0 {
+		dataSize := len(c.readBuf) - c.aead.Overhead()
+		n = copy(b, c.readBuf[c.readOffset:dataSize])
+		c.readOffset += n
 
-		if c.readLast < c.dataSize {
-			c.readOffset = -1
-			return offset, io.EOF
+		if c.readOffset == dataSize {
+			c.readOffset = 0
 		}
-		c.readOffset = 0
+		return
 	}
 
 	// read from conn
-	for ; offset < bLength; offset += c.readOffset {
-		_, err = io.ReadFull(c.Conn, c.readBuf)
-		if err != nil && err != io.EOF {
-			c.readOffset = 0
-			return offset, err
+	dataSize := 0
+	{ //read data size
+		c.readBuf = make([]byte, 2+c.aead.Overhead())
+		if _, err = io.ReadFull(c.Conn, c.readBuf); err != nil {
+			return
 		}
-
-		_, e := c.aead.Open(c.readBuf[:0], c.decryptNonce(), c.readBuf, nil)
-		if e != nil {
-			c.readOffset = 0
-			return offset, e
+		if _, err = c.aead.Open(c.readBuf[:0], c.decryptNonce(), c.readBuf, nil); err != nil {
+			return
 		}
-
-		c.readLast = int(c.readBuf[0])<<8 + int(c.readBuf[1]) + 2
-		c.readOffset = copy(b[offset:], c.readBuf[2:2+c.readLast])
-		if c.readOffset < c.readLast {
-			c.readOffset += 2
-			return len(b), nil
-		} else if err == io.EOF {
-			readOffset := c.readOffset
-			c.readOffset = 0
-			return readOffset, err
+		dataSize = int(c.readBuf[0])<<8 + int(c.readBuf[1])
+	}
+	{ // read data
+		c.readBuf = make([]byte, dataSize+c.aead.Overhead())
+		if _, err = io.ReadFull(c.Conn, c.readBuf); err != nil {
+			return
+		}
+		if _, err = c.aead.Open(c.readBuf[:0], c.decryptNonce(), c.readBuf, nil); err != nil {
+			return
 		}
 	}
-	return len(b), err
+
+	// buffer extra data
+	if n = copy(b, c.readBuf[:dataSize]); n < dataSize {
+		c.readOffset = n
+	}
+	return
 }
 
 func (c *conn) Write(b []byte) (n int, err error) {
-	bLength := len(b)
-	size := 0
-
-	for offset := 0; offset < bLength; offset += size {
-		if offset+c.dataSize <= bLength {
-			size = c.dataSize
-		} else {
-			size = bLength - offset
-		}
-
-		// BigEndian
-		c.writeBuf[0], c.writeBuf[1] = byte((size&0xFF00)>>8), byte(size&0xFF)
-		copy(c.writeBuf[2:size+2], b[offset:offset+size])
-		c.aead.Seal(c.writeBuf[:0], c.encryptNonce(), c.writeBuf[:c.dataSize+2], nil)
-
-		_, err = c.Conn.Write(c.writeBuf)
-		if err != nil {
-			return offset, err
-		}
+	bLen := len(b)
+	dataSize := MAX_SIZE - (2 + c.aead.Overhead()) - c.aead.Overhead()
+	if bLen < c.maxSize {
+		dataSize = bLen
 	}
-	return len(b), err
+
+	// BigEndian
+	c.writeBuf[0], c.writeBuf[1] = byte((dataSize&0xFF00)>>8), byte(dataSize&0xFF)
+
+	c.aead.Seal(c.writeBuf[:0], c.encryptNonce(), c.writeBuf[:2], nil)
+	c.aead.Seal(c.writeBuf[:2+c.aead.Overhead()], c.encryptNonce(), b[:dataSize], nil)
+
+	_, err = c.Conn.Write(c.writeBuf[:dataSize+(2+c.aead.Overhead())+c.aead.Overhead()])
+	if err != nil {
+		return 0, err
+	}
+	return dataSize, err
 }
 
-func Shadow(c net.Conn, password string) (net.Conn, error) {
-	block, err := aes.NewCipher([]byte(password + password)[:16])
+func Shadow(c net.Conn, cipher, password string) net.Conn {
+	aead, err := pickCipher(cipher, password)
 	if err != nil {
-		return nil, errors.Wrap(err, "password too short")
-	}
-
-	aead, err := cipher.NewGCM(block)
-	if err != nil {
-		return nil, errors.Wrap(err, "GCM")
+		panic(err)
 	}
 
 	return &conn{
-		dataSize:     MTU - aead.Overhead() - 2,
+		maxSize:      MAX_SIZE - (2 - aead.Overhead()) - aead.Overhead(),
 		aead:         aead,
 		encryptNonce: newNonce(password, aead.NonceSize()),
 		decryptNonce: newNonce(password, aead.NonceSize()),
-		writeBuf:     make([]byte, MTU),
-		readBuf:      make([]byte, MTU),
+		writeBuf:     make([]byte, 0xFFFF),
 		Conn:         c,
-	}, nil
+	}
 }
 
 func newNonce(password string, size int) func() []byte {

util/rev_sec.go

@@ -0,0 +1,52 @@
+package util
+
+import (
+	"sort"
+	"strings"
+)
+
+type ReverseSecSlice struct {
+	sort.StringSlice
+}
+
+func NewReverseSecSlice(a []string) *ReverseSecSlice {
+	return &ReverseSecSlice{sort.StringSlice(a)}
+}
+
+func (p *ReverseSecSlice) Sort() *ReverseSecSlice {
+	sort.Sort(p)
+	return p
+}
+func (p *ReverseSecSlice) Uniq() []string {
+	olds := []string(p.StringSlice)
+
+	last := ""
+	strs := make([]string, 0, len(olds))
+	for _, str := range olds {
+		if str != last {
+			strs = append(strs, str)
+		}
+		last = str
+	}
+	return strs
+}
+
+func (p *ReverseSecSlice) Less(i, j int) bool {
+	secsI := strings.Split(p.StringSlice[i], ".")
+	secsJ := strings.Split(p.StringSlice[j], ".")
+
+	lenI := len(secsI) - 1
+	lenJ := len(secsJ) - 1
+	length := lenI
+	if lenI > lenJ {
+		length = lenJ
+	}
+
+	for idx := 0; idx <= length; idx++ {
+		if secsI[lenI-idx] == secsJ[lenJ-idx] {
+			continue
+		}
+		return secsI[lenI-idx] < secsJ[lenJ-idx]
+	}
+	return lenI < lenJ
+}

util/rev_sec_test.go

@@ -0,0 +1,65 @@
+package util
+
+import (
+	"sort"
+	"testing"
+)
+
+func TestReverseSecSlice_Less(t *testing.T) {
+	type fields struct {
+		StringSlice sort.StringSlice
+	}
+	type args struct {
+		i int
+		j int
+	}
+	slice := fields{sort.StringSlice([]string{
+		"a.b.c",
+		"a.b.c",
+		"d.b.c",
+		"d.a.b.c",
+		"",
+		"",
+	})}
+	tests := []struct {
+		name   string
+		fields fields
+		args   args
+		want   bool
+	}{{
+		name:   "equal",
+		fields: slice,
+		args:   args{0, 1},
+		want:   false,
+	}, {
+		name:   "less",
+		fields: slice,
+		args:   args{0, 2},
+		want:   true,
+	}, {
+		name:   "length",
+		fields: slice,
+		args:   args{0, 3},
+		want:   true,
+	}, {
+		name:   "single_empty",
+		fields: slice,
+		args:   args{0, 4},
+		want:   false,
+	}, {
+		name:   "all_empty",
+		fields: slice,
+		args:   args{4, 5},
+		want:   false,
+	}}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			p := &ReverseSecSlice{
+				StringSlice: tt.fields.StringSlice,
+			}
+			if got := p.Less(tt.args.i, tt.args.j); got != tt.want {
+				t.Errorf("ReverseSecSlice.Less() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}

util/suffix_tree.go

@@ -0,0 +1,101 @@
+package util
+
+import (
+	"strings"
+	"sync"
+)
+
+type Node struct {
+	node
+	sep string
+	*sync.RWMutex
+}
+type node struct {
+	node map[string]*node
+}
+
+func NewNode(sep string) *Node {
+	return &Node{node{node: map[string]*node{}}, sep, &sync.RWMutex{}}
+}
+func NewNodeFromRules(sep string, rules ...string) *Node {
+	n := NewNode(sep)
+	for i := range rules {
+		n.Add(rules[i])
+	}
+	return n
+}
+
+func (n *Node) String() string {
+	n.RLock()
+	defer n.RUnlock()
+	return n.string("", "     ")
+}
+func (n *node) string(prefix, indent string) (out string) {
+	for key, val := range n.node {
+		out += prefix + key + "\n" + val.string(prefix+indent, indent)
+	}
+	return
+}
+
+func (n *Node) trim(item string) string {
+	return strings.TrimSuffix(item, n.sep)
+}
+
+func (n *Node) Add(item string) {
+	n.Lock()
+	defer n.Unlock()
+	n.add(strings.Split(n.trim(item), n.sep))
+}
+func (n *node) add(secs []string) {
+	length := len(secs)
+	switch length {
+	case 0:
+		return
+	case 1:
+		n.node[secs[length-1]] = &node{node: map[string]*node{"": &node{}}}
+	default:
+		sec := secs[length-1]
+		if sec == "**" {
+			sec = "*"
+		}
+
+		subNode, ok := n.node[sec]
+		if !ok {
+			subNode = &node{node: map[string]*node{}}
+			n.node[sec] = subNode
+		}
+		subNode.add(secs[:length-1])
+	}
+}
+
+func (n *Node) Match(item string) bool {
+	return n.matchSecs(strings.Split(n.trim(item), n.sep), false)
+}
+
+func (n *node) matchSecs(secs []string, fuzzNode bool) bool {
+	length := len(secs)
+	if length == 0 {
+		if _, ok := n.node[""]; ok {
+			return true
+		}
+		if _, ok := n.node["**"]; ok {
+			return true
+		}
+		if _, ok := n.node["*"]; ok {
+			return !fuzzNode
+		}
+		return false
+	}
+
+	if n, ok := n.node[secs[length-1]]; ok {
+		return n.matchSecs(secs[:length-1], false)
+	}
+	if n, ok := n.node["*"]; ok {
+		return n.matchSecs(secs[:length-1], true)
+	}
+	if _, ok := n.node["**"]; ok {
+		return true
+	}
+
+	return false
+}

util/suffix_tree_test.go

@@ -0,0 +1,77 @@
+package util
+
+import (
+	"testing"
+)
+
+func TestNode_Match(t *testing.T) {
+	type test struct {
+		arg  string
+		want bool
+	}
+	tests := []struct {
+		name  string
+		node  *Node
+		tests []test
+	}{{
+		"simple",
+		NewNodeFromRules(".", "a.wweir.cc", "b.wweir.cc"),
+		[]test{
+			{"a.wweir.cc", true},
+			{"b.wweir.cc", true},
+		},
+	}, {
+		"parent",
+		NewNodeFromRules(".", "wweir.cc", "a.wweir.cc"),
+		[]test{
+			{"wweir.cc", true},
+			{"a.wweir.cc", true},
+			{"b.wweir.cc", false},
+		},
+	}, {
+		"fuzz1",
+		NewNodeFromRules(".", "wweir.cc", "a.wweir.cc", "*.wweir.cc"),
+		[]test{
+			{"wweir.cc", true},
+			{"a.wweir.cc", true},
+			{"b.wweir.cc", true},
+			{"a.b.wweir.cc", false},
+		},
+	}, {
+		"fuzz2",
+		NewNodeFromRules(".", "a.*.cc"),
+		[]test{
+			{"wweir.cc", false},
+			{"a.wweir.cc", true},
+			{"b.wweir.cc", false},
+		},
+	}, {
+		"fuzz3",
+		NewNodeFromRules(".", "*.*.cc", "iamp.*.*"),
+		[]test{
+			{"wweir.cc", false},
+			{"a.wweir.cc", true},
+			{"b.wweir.cc", true},
+			{"iamp.wweir.cc", true},
+		},
+	}, {
+		"fuzz4",
+		NewNodeFromRules(".", "**.cc", "a.**.com"),
+		[]test{
+			{"wweir.cc", true},
+			{"a.wweir.cc", true},
+			{"a.b.wweir.cc", true},
+			{"a.wweir.com", true},
+			{"b.wweir.com", false},
+		},
+	}}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			for _, test := range tt.tests {
+				if got := tt.node.Match(test.arg); got != test.want {
+					t.Errorf("Node.Match(%s) = %v, want %v", test.arg, got, test.want)
+				}
+			}
+		})
+	}
+}

util/tee_conn.go

@@ -1,4 +1,4 @@
-package parse
+package util
 
 import (
 	"net"

util/with_timeout.go

@@ -0,0 +1,23 @@
+package util
+
+import (
+	"errors"
+	"time"
+)
+
+func WithTimeout(fn func() error, timeout time.Duration) error {
+	var okCh = make(chan struct{})
+	var err error
+
+	go func() {
+		err = fn()
+		close(okCh)
+	}()
+
+	select {
+	case <-okCh:
+		return err
+	case <-time.After(timeout):
+		return errors.New("timeout: " + timeout.String())
+	}
+}