fix: sync example config with codes

Bump golang.org/x/net from 0.0.0-20220531201128-c960675eff93 to 0.7.0

.circleci/config.yml

@@ -1,56 +0,0 @@
-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
-

.github/sower.hcl

@@ -0,0 +1,100 @@
+# 远程、上游连接方式
+remote {
+    type = "sower"
+    addr = "proxy.com"
+    password = "I_am_Passw0rd"
+    # type="socks5"
+    # addr="127.0.0.1:7890"
+}
+
+dns {
+    disable = false
+    # 监听该 IP 的 UDP(53)、TCP(80、443) 端口，DNS 会将请求导向这个地址
+    serve = "127.0.0.1"
+    # serve6 = "<ipv6>"
+    # 监听的网络接口
+    # serve_iface = "lo"
+    # 必填，优先使用 DHCP 中的 DNS 服务器，如果没有则使用该地址
+    fallback = "223.5.5.5"
+}
+
+socks_5 {
+    disable = false
+    # 不写 IP 则监听所有 IP
+    addr = "127.0.0.1:1080"
+}
+
+# 路由规则，各规则优先级:
+# 禁止访问规则 > 直接访问规则 > 代理访问规则 > GEOIP 规则
+# file 字段可填 URL 或本地文件路径，URL 将通过代理请求
+
+# 禁止访问规则。被命中的请求，将被禁止访问。可用于广告过滤之类的目的
+router "block" {
+    file = "https://raw.githubusercontent.com/pexcn/daily/gh-pages/adlist/adlist.txt"
+    rules = []
+}
+
+# 直接访问规则。被命中的请求，将被直接访问，不再通过代理
+router "direct" {
+    file = "https://raw.githubusercontent.com/pexcn/daily/gh-pages/chinalist/chinalist.txt"
+    rules = [
+      "imap.*.*",
+      "imap.*.*.*",
+      "smtp.*.*",
+      "smtp.*.*.*",
+      "pop.*.*",
+      "pop.*.*.*",
+      "pop3.*.*",
+      "pop3.*.*.*",
+      "**.cn",
+      ]
+}
+
+# 代理访问规则。被命中的请求，将通过代理进行转发
+router "proxy" {
+    file = "https://raw.githubusercontent.com/pexcn/daily/gh-pages/gfwlist/gfwlist.txt"
+    rules = [
+      "**.google.*",
+      "**.goo.gl",
+      "**.googleusercontent.com",
+      "**.googleapis.com",
+      "*.googlesource.com",
+      "**.youtube.com",
+      "**.ytimg.com",
+      "**.ggpht.com",
+      "**.googlevideo.com",
+      "**.facebook.com",
+      "**.fbcdn.net",
+      "**.twitter.com",
+      "**.twimg.com",
+      "**.blogspot.com",
+      "**.appspot.com",
+      "**.wikipedia.org",
+      "**.wikimedia.org",
+      "*.cloudfront.net",
+      "**.amazon.com",
+      "**.amazonaws.com",
+      "*.githubusercontent.com",
+      "*.githubassets.com",
+      "*.github.*",
+      "lookup-api.apple.com",
+    ]
+}
+
+# GEOIP 规则。大陆境内的 IP，将直接访问。
+# 非大陆境内的 IP，将通过另一套检测逻辑，确定是否需要进行代理。
+# 为避免误伤一些非标页面端口(除 80/443 外)，该规则只在 Socks5 模式下生效
+router "country" {
+    // mmdb = "Country.mmdb"  # https://github.com/alecthw/mmdb_china_ip_list
+    file = "https://raw.githubusercontent.com/pexcn/daily/gh-pages/chnroute/chnroute.txt"
+    rules = [
+        "127.0.0.0/8",
+        "172.16.0.0/12",
+        "192.168.0.0/16",
+        "10.0.0.0/8",
+        "17.0.0.0/8",
+        "100.64.0.0/10",
+        "224.0.0.0/4",
+        "fe80::/10",
+    ]
+}

.github/sower.plist

@@ -0,0 +1,20 @@
+<?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>sower</string>
+		<key>ProgramArguments</key>
+		<array>
+			<string>/usr/local/bin/sower</string>
+			<string>-f</string>
+			<string>/usr/local/etc/sower/sower.hcl</string>
+		</array>
+		<key>KeepAlive</key>
+            <true/>
+		<key>RunAtLoad</key>
+            <true/>
+        <key>WorkingDirectory</key>
+            <string>/usr/local/etc/sower</string>
+	</dict>
+</plist>

.github/sower.service

@@ -0,0 +1,13 @@
+[Unit]
+Description=sower client service
+After=network.target
+
+[Service]
+Type=simple
+WorkingDirectory=/etc/sower
+ExecStart=/usr/local/bin/sower -f /etc/sower/sower.hcl
+Restart=on-failure
+RestartSec=1min
+
+[Install]
+WantedBy=multi-user.target

.github/sower.toml

@@ -0,0 +1,93 @@
+[remote] # 远程、上游连接方式
+type = "sower"
+addr = "proxy.com"
+password = "I_am_Passw0rd"
+# type: "socks5"
+# addr: "127.0.0.1:7890"
+
+[dns]
+disable = false
+# 监听该 IP 的 UDP(53)、TCP(80、443) 端口，DNS 会将请求导向这个地址
+serve = "127.0.0.1"
+# serve6 = <ipv6>
+# 监听的网络接口
+# serve_iface = "lo"
+
+# 必填，优先使用 DHCP 中的 DNS 服务器，如果没有则使用该地址
+fallback = "223.5.5.5"
+
+[socks_5]
+disable = false
+# 不写 IP 则监听所有 IP
+addr = "127.0.0.1:1080"
+
+# 路由规则，各规则优先级:
+# 禁止访问规则 > 直接访问规则 > 代理访问规则 > GEOIP 规则
+# file 字段可填 URL 或本地文件路径，URL 将通过代理请求
+
+# 禁止访问规则。被命中的请求，将被禁止访问。可用于广告过滤之类的目的
+[router.block]
+file = "https://raw.githubusercontent.com/pexcn/daily/gh-pages/adlist/adlist.txt"
+rules = []
+
+# 直接访问规则。被命中的请求，将被直接访问，不再通过代理
+[router.direct]
+file = "https://raw.githubusercontent.com/pexcn/daily/gh-pages/chinalist/chinalist.txt"
+rules = [
+  "imap.*.*",
+  "imap.*.*.*",
+  "smtp.*.*",
+  "smtp.*.*.*",
+  "pop.*.*",
+  "pop.*.*.*",
+  "pop3.*.*",
+  "pop3.*.*.*",
+  "**.cn",
+]
+
+# 代理访问规则。被命中的请求，将通过代理进行转发
+[router.proxy]
+file = "https://raw.githubusercontent.com/pexcn/daily/gh-pages/gfwlist/gfwlist.txt"
+rules = [
+  "**.google.*",
+  "**.goo.gl",
+  "**.googleusercontent.com",
+  "**.googleapis.com",
+  "*.googlesource.com",
+  "**.youtube.com",
+  "**.ytimg.com",
+  "**.ggpht.com",
+  "**.googlevideo.com",
+  "**.facebook.com",
+  "**.fbcdn.net",
+  "**.twitter.com",
+  "**.twimg.com",
+  "**.blogspot.com",
+  "**.appspot.com",
+  "**.wikipedia.org",
+  "**.wikimedia.org",
+  "*.cloudfront.net",
+  "**.amazon.com",
+  "**.amazonaws.com",
+  "*.githubusercontent.com",
+  "*.githubassets.com",
+  "*.github.*",
+  "lookup-api.apple.com",
+]
+
+# GEOIP 规则。大陆境内的 IP，将直接访问。
+# 非大陆境内的 IP，将通过另一套检测逻辑，确定是否需要进行代理。
+# 为避免误伤一些非标页面端口(除 80/443 外)，该规则只在 Socks5 模式下生效
+[router.country]
+mmdb = "Country.mmdb" # https://github.com/alecthw/mmdb_china_ip_list
+file = "https://raw.githubusercontent.com/pexcn/daily/gh-pages/chnroute/chnroute.txt"
+rules = [
+  "127.0.0.0/8",
+  "172.16.0.0/12",
+  "192.168.0.0/16",
+  "10.0.0.0/8",
+  "17.0.0.0/8",
+  "100.64.0.0/10",
+  "224.0.0.0/4",
+  "fe80::/10",
+]

.github/sower.yaml

@@ -0,0 +1,89 @@
+remote: # 远程、上游连接方式
+  type: "sower"
+  addr: "proxy.com"
+  password: "I_am_Passw0rd"
+  # type: "socks5"
+  # addr: "127.0.0.1:7890"
+
+dns:
+  disable: false
+  # 监听该 IP 的 UDP(53)、TCP(80、443) 端口，DNS 会将请求导向这个地址
+  serve: "127.0.0.1"
+  # serve6: <ipv6>
+  # 监听的网络接口
+  # serve_iface: "lo"
+  # 必填，优先使用 DHCP 中的 DNS 服务器，如果没有则使用该地址
+  fallback: "223.5.5.5"
+
+socks_5:
+  disable: false
+  # 不写 IP 则监听所有 IP
+  addr: "127.0.0.1:1080"
+
+# 路由规则，各规则优先级:
+# 禁止访问规则 > 直接访问规则 > 代理访问规则 > GEOIP 规则
+# file 字段可填 URL 或本地文件路径，URL 将通过代理请求
+router:
+  # 禁止访问规则。被命中的请求，将被禁止访问。可用于广告过滤之类的目的
+  block:
+    file: "https://raw.githubusercontent.com/pexcn/daily/gh-pages/adlist/adlist.txt"
+    rules: []
+
+  # 直接访问规则。被命中的请求，将被直接访问，不再通过代理
+  direct:
+    file: "https://raw.githubusercontent.com/pexcn/daily/gh-pages/chinalist/chinalist.txt"
+    rules:
+      - "imap.*.*"
+      - "imap.*.*.*"
+      - "smtp.*.*"
+      - "smtp.*.*.*"
+      - "pop.*.*"
+      - "pop.*.*.*"
+      - "pop3.*.*"
+      - "pop3.*.*.*"
+      - "**.cn"
+
+  # 代理访问规则。被命中的请求，将通过代理进行转发
+  proxy:
+    file: "https://raw.githubusercontent.com/pexcn/daily/gh-pages/gfwlist/gfwlist.txt"
+    rules:
+      - "**.google.*"
+      - "**.goo.gl"
+      - "**.googleusercontent.com"
+      - "**.googleapis.com"
+      - "*.googlesource.com"
+      - "**.youtube.com"
+      - "**.ytimg.com"
+      - "**.ggpht.com"
+      - "**.googlevideo.com"
+      - "**.facebook.com"
+      - "**.fbcdn.net"
+      - "**.twitter.com"
+      - "**.twimg.com"
+      - "**.blogspot.com"
+      - "**.appspot.com"
+      - "**.wikipedia.org"
+      - "**.wikimedia.org"
+      - "*.cloudfront.net"
+      - "**.amazon.com"
+      - "**.amazonaws.com"
+      - "*.githubusercontent.com"
+      - "*.githubassets.com"
+      - "*.github.*"
+      - "lookup-api.apple.com"
+
+  # GEOIP 规则。大陆境内的 IP，将直接访问。
+  # 非大陆境内的 IP，将通过另一套检测逻辑，确定是否需要进行代理。
+  # 为避免误伤一些非标页面端口(除 80/443 外)，该规则只在 Socks5 模式下生效
+  country:
+    mmdb: "Country.mmdb" # https://github.com/alecthw/mmdb_china_ip_list
+    file: "https://raw.githubusercontent.com/pexcn/daily/gh-pages/chnroute/chnroute.txt"
+    rules:
+      - "127.0.0.0/8"
+      - "172.16.0.0/12"
+      - "192.168.0.0/16"
+      - "10.0.0.0/8"
+      - "17.0.0.0/8"
+      - "100.64.0.0/10"
+      - "224.0.0.0/4"
+      - "fe80::/10"

.github/sower_run.vbs

@@ -0,0 +1 @@
+CreateObject("WScript.Shell").Run "C:\Software\Sower\sower.exe -f sower.hcl",0

.github/sowerd.service

@@ -0,0 +1,14 @@
+[Unit]
+Description=sowerd server service
+After=network.target
+
+[Service]
+Type=simple
+ExecStart=/usr/local/bin/sowerd
+Environment="FAKE_SITE=127.0.0.1:8080"
+Environment="PASSWORD=I_am_Passw0rd"
+Restart=on-failure
+RestartSec=1min
+
+[Install]
+WantedBy=multi-user.target

.github/workflows/master.yml

@@ -0,0 +1,18 @@
+name: Go
+on:
+  push:
+    branches:
+      - master
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/setup-go@v2
+        with:
+          go-version: ^1.17
+      - uses: actions/checkout@v2
+
+      - name: test and build
+        run: |
+          make

.github/workflows/release.yml

@@ -0,0 +1,52 @@
+name: Release
+on:
+  push:
+    tags:
+      - "v*.*.*"
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/setup-go@v2
+        with:
+          go-version: ^1.18
+      - uses: actions/checkout@v2
+
+      - name: build matrix
+        run: |
+          mv .github/* . || true
+
+          make build GO='GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go'
+          tar czvf sower-linux-amd64.tar.gz sower sowerd sower.hcl sower.yaml sower.toml sower.service sowerd.service
+          make clean
+          make build GO='GOOS=linux GOARCH=arm CGO_ENABLED=0 go'
+          tar czvf sower-linux-arm.tar.gz sower sowerd sower.hcl sower.yaml sower.toml sower.service sowerd.service
+          make clean
+          make build GO='GOOS=linux GOARCH=arm64 CGO_ENABLED=0 go'
+          tar czvf sower-linux-arm64.tar.gz sower sowerd sower.hcl sower.yaml sower.toml sower.service sowerd.service
+          make clean
+          make build GO='GOOS=linux GOARCH=mips CGO_ENABLED=0 go'
+          tar czvf sower-linux-mips.tar.gz sower sowerd sower.hcl sower.yaml sower.toml sower.service sowerd.service
+          make clean
+          make build GO='GOOS=linux GOARCH=mipsle CGO_ENABLED=0 go'
+          tar czvf sower-linux-mipsle.tar.gz sower sowerd sower.hcl sower.yaml sower.toml sower.service sowerd.service
+          make clean
+
+          make build GO='GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 go'
+          tar czvf sower-darwin-amd64.tar.gz sower sowerd sower.hcl sower.yaml sower.toml sower.plist
+          make clean
+          make build GO='GOOS=darwin GOARCH=arm64 CGO_ENABLED=0 go'
+          tar czvf sower-darwin-arm64.tar.gz sower sowerd sower.hcl sower.yaml sower.toml sower.plist
+          make clean
+
+          make build GO='GOOS=windows GOARCH=amd64 CGO_ENABLED=0 go'
+          mv sower sower.exe
+          mv sowerd sowerd.exe
+          tar czvf sower-windows-amd64.tar.gz sower.exe sowerd.exe sower.hcl sower.yaml sower.toml sower_run.vbs
+          make clean
+
+      - uses: ncipollo/release-action@v1
+        with:
+          artifacts: "*.tar.gz"
+          token: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -17,6 +17,17 @@
 *.swo
 .vscode
 .idea
-sower
-sower.exe*
-/sower.toml
+**.env
+/bin
+
+
+**.mmdb
+/cmd/client/client
+/cmd/server/server
+/sower
+/sowerd
+/*.yml
+/*.yaml
+/*.toml
+/*.hcl
+/*.tf

LICENSE

@@ -1,373 +1,22 @@
-Mozilla Public License Version 2.0
-==================================
+MIT License
 
-1. Definitions
---------------
+Copyright (c) 2020 wweir
 
-1.1. "Contributor"
-    means each individual or legal entity that creates, contributes to
-    the creation of, or owns Covered Software.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-1.2. "Contributor Version"
-    means the combination of the Contributions of others (if any) used
-    by a Contributor and that particular Contributor's Contribution.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
-1.3. "Contribution"
-    means Covered Software of a particular Contributor.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
 
-1.4. "Covered Software"
-    means Source Code Form to which the initial Contributor has attached
-    the notice in Exhibit A, the Executable Form of such Source Code
-    Form, and Modifications of such Source Code Form, in each case
-    including portions thereof.
-
-1.5. "Incompatible With Secondary Licenses"
-    means
-
-    (a) that the initial Contributor has attached the notice described
-        in Exhibit B to the Covered Software; or
-
-    (b) that the Covered Software was made available under the terms of
-        version 1.1 or earlier of the License, but not also under the
-        terms of a Secondary License.
-
-1.6. "Executable Form"
-    means any form of the work other than Source Code Form.
-
-1.7. "Larger Work"
-    means a work that combines Covered Software with other material, in
-    a separate file or files, that is not Covered Software.
-
-1.8. "License"
-    means this document.
-
-1.9. "Licensable"
-    means having the right to grant, to the maximum extent possible,
-    whether at the time of the initial grant or subsequently, any and
-    all of the rights conveyed by this License.
-
-1.10. "Modifications"
-    means any of the following:
-
-    (a) any file in Source Code Form that results from an addition to,
-        deletion from, or modification of the contents of Covered
-        Software; or
-
-    (b) any new file in Source Code Form that contains any Covered
-        Software.
-
-1.11. "Patent Claims" of a Contributor
-    means any patent claim(s), including without limitation, method,
-    process, and apparatus claims, in any patent Licensable by such
-    Contributor that would be infringed, but for the grant of the
-    License, by the making, using, selling, offering for sale, having
-    made, import, or transfer of either its Contributions or its
-    Contributor Version.
-
-1.12. "Secondary License"
-    means either the GNU General Public License, Version 2.0, the GNU
-    Lesser General Public License, Version 2.1, the GNU Affero General
-    Public License, Version 3.0, or any later versions of those
-    licenses.
-
-1.13. "Source Code Form"
-    means the form of the work preferred for making modifications.
-
-1.14. "You" (or "Your")
-    means an individual or a legal entity exercising rights under this
-    License. For legal entities, "You" includes any entity that
-    controls, is controlled by, or is under common control with You. For
-    purposes of this definition, "control" means (a) the power, direct
-    or indirect, to cause the direction or management of such entity,
-    whether by contract or otherwise, or (b) ownership of more than
-    fifty percent (50%) of the outstanding shares or beneficial
-    ownership of such entity.
-
-2. License Grants and Conditions
---------------------------------
-
-2.1. Grants
-
-Each Contributor hereby grants You a world-wide, royalty-free,
-non-exclusive license:
-
-(a) under intellectual property rights (other than patent or trademark)
-    Licensable by such Contributor to use, reproduce, make available,
-    modify, display, perform, distribute, and otherwise exploit its
-    Contributions, either on an unmodified basis, with Modifications, or
-    as part of a Larger Work; and
-
-(b) under Patent Claims of such Contributor to make, use, sell, offer
-    for sale, have made, import, and otherwise transfer either its
-    Contributions or its Contributor Version.
-
-2.2. Effective Date
-
-The licenses granted in Section 2.1 with respect to any Contribution
-become effective for each Contribution on the date the Contributor first
-distributes such Contribution.
-
-2.3. Limitations on Grant Scope
-
-The licenses granted in this Section 2 are the only rights granted under
-this License. No additional rights or licenses will be implied from the
-distribution or licensing of Covered Software under this License.
-Notwithstanding Section 2.1(b) above, no patent license is granted by a
-Contributor:
-
-(a) for any code that a Contributor has removed from Covered Software;
-    or
-
-(b) for infringements caused by: (i) Your and any other third party's
-    modifications of Covered Software, or (ii) the combination of its
-    Contributions with other software (except as part of its Contributor
-    Version); or
-
-(c) under Patent Claims infringed by Covered Software in the absence of
-    its Contributions.
-
-This License does not grant any rights in the trademarks, service marks,
-or logos of any Contributor (except as may be necessary to comply with
-the notice requirements in Section 3.4).
-
-2.4. Subsequent Licenses
-
-No Contributor makes additional grants as a result of Your choice to
-distribute the Covered Software under a subsequent version of this
-License (see Section 10.2) or under the terms of a Secondary License (if
-permitted under the terms of Section 3.3).
-
-2.5. Representation
-
-Each Contributor represents that the Contributor believes its
-Contributions are its original creation(s) or it has sufficient rights
-to grant the rights to its Contributions conveyed by this License.
-
-2.6. Fair Use
-
-This License is not intended to limit any rights You have under
-applicable copyright doctrines of fair use, fair dealing, or other
-equivalents.
-
-2.7. Conditions
-
-Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
-in Section 2.1.
-
-3. Responsibilities
--------------------
-
-3.1. Distribution of Source Form
-
-All distribution of Covered Software in Source Code Form, including any
-Modifications that You create or to which You contribute, must be under
-the terms of this License. You must inform recipients that the Source
-Code Form of the Covered Software is governed by the terms of this
-License, and how they can obtain a copy of this License. You may not
-attempt to alter or restrict the recipients' rights in the Source Code
-Form.
-
-3.2. Distribution of Executable Form
-
-If You distribute Covered Software in Executable Form then:
-
-(a) such Covered Software must also be made available in Source Code
-    Form, as described in Section 3.1, and You must inform recipients of
-    the Executable Form how they can obtain a copy of such Source Code
-    Form by reasonable means in a timely manner, at a charge no more
-    than the cost of distribution to the recipient; and
-
-(b) You may distribute such Executable Form under the terms of this
-    License, or sublicense it under different terms, provided that the
-    license for the Executable Form does not attempt to limit or alter
-    the recipients' rights in the Source Code Form under this License.
-
-3.3. Distribution of a Larger Work
-
-You may create and distribute a Larger Work under terms of Your choice,
-provided that You also comply with the requirements of this License for
-the Covered Software. If the Larger Work is a combination of Covered
-Software with a work governed by one or more Secondary Licenses, and the
-Covered Software is not Incompatible With Secondary Licenses, this
-License permits You to additionally distribute such Covered Software
-under the terms of such Secondary License(s), so that the recipient of
-the Larger Work may, at their option, further distribute the Covered
-Software under the terms of either this License or such Secondary
-License(s).
-
-3.4. Notices
-
-You may not remove or alter the substance of any license notices
-(including copyright notices, patent notices, disclaimers of warranty,
-or limitations of liability) contained within the Source Code Form of
-the Covered Software, except that You may alter any license notices to
-the extent required to remedy known factual inaccuracies.
-
-3.5. Application of Additional Terms
-
-You may choose to offer, and to charge a fee for, warranty, support,
-indemnity or liability obligations to one or more recipients of Covered
-Software. However, You may do so only on Your own behalf, and not on
-behalf of any Contributor. You must make it absolutely clear that any
-such warranty, support, indemnity, or liability obligation is offered by
-You alone, and You hereby agree to indemnify every Contributor for any
-liability incurred by such Contributor as a result of warranty, support,
-indemnity or liability terms You offer. You may include additional
-disclaimers of warranty and limitations of liability specific to any
-jurisdiction.
-
-4. Inability to Comply Due to Statute or Regulation
----------------------------------------------------
-
-If it is impossible for You to comply with any of the terms of this
-License with respect to some or all of the Covered Software due to
-statute, judicial order, or regulation then You must: (a) comply with
-the terms of this License to the maximum extent possible; and (b)
-describe the limitations and the code they affect. Such description must
-be placed in a text file included with all distributions of the Covered
-Software under this License. Except to the extent prohibited by statute
-or regulation, such description must be sufficiently detailed for a
-recipient of ordinary skill to be able to understand it.
-
-5. Termination
---------------
-
-5.1. The rights granted under this License will terminate automatically
-if You fail to comply with any of its terms. However, if You become
-compliant, then the rights granted under this License from a particular
-Contributor are reinstated (a) provisionally, unless and until such
-Contributor explicitly and finally terminates Your grants, and (b) on an
-ongoing basis, if such Contributor fails to notify You of the
-non-compliance by some reasonable means prior to 60 days after You have
-come back into compliance. Moreover, Your grants from a particular
-Contributor are reinstated on an ongoing basis if such Contributor
-notifies You of the non-compliance by some reasonable means, this is the
-first time You have received notice of non-compliance with this License
-from such Contributor, and You become compliant prior to 30 days after
-Your receipt of the notice.
-
-5.2. If You initiate litigation against any entity by asserting a patent
-infringement claim (excluding declaratory judgment actions,
-counter-claims, and cross-claims) alleging that a Contributor Version
-directly or indirectly infringes any patent, then the rights granted to
-You by any and all Contributors for the Covered Software under Section
-2.1 of this License shall terminate.
-
-5.3. In the event of termination under Sections 5.1 or 5.2 above, all
-end user license agreements (excluding distributors and resellers) which
-have been validly granted by You or Your distributors under this License
-prior to termination shall survive termination.
-
-************************************************************************
-*                                                                      *
-*  6. Disclaimer of Warranty                                           *
-*  -------------------------                                           *
-*                                                                      *
-*  Covered Software is provided under this License on an "as is"       *
-*  basis, without warranty of any kind, either expressed, implied, or  *
-*  statutory, including, without limitation, warranties that the       *
-*  Covered Software is free of defects, merchantable, fit for a        *
-*  particular purpose or non-infringing. The entire risk as to the     *
-*  quality and performance of the Covered Software is with You.        *
-*  Should any Covered Software prove defective in any respect, You     *
-*  (not any Contributor) assume the cost of any necessary servicing,   *
-*  repair, or correction. This disclaimer of warranty constitutes an   *
-*  essential part of this License. No use of any Covered Software is   *
-*  authorized under this License except under this disclaimer.         *
-*                                                                      *
-************************************************************************
-
-************************************************************************
-*                                                                      *
-*  7. Limitation of Liability                                          *
-*  --------------------------                                          *
-*                                                                      *
-*  Under no circumstances and under no legal theory, whether tort      *
-*  (including negligence), contract, or otherwise, shall any           *
-*  Contributor, or anyone who distributes Covered Software as          *
-*  permitted above, be liable to You for any direct, indirect,         *
-*  special, incidental, or consequential damages of any character      *
-*  including, without limitation, damages for lost profits, loss of    *
-*  goodwill, work stoppage, computer failure or malfunction, or any    *
-*  and all other commercial damages or losses, even if such party      *
-*  shall have been informed of the possibility of such damages. This   *
-*  limitation of liability shall not apply to liability for death or   *
-*  personal injury resulting from such party's negligence to the       *
-*  extent applicable law prohibits such limitation. Some               *
-*  jurisdictions do not allow the exclusion or limitation of           *
-*  incidental or consequential damages, so this exclusion and          *
-*  limitation may not apply to You.                                    *
-*                                                                      *
-************************************************************************
-
-8. Litigation
--------------
-
-Any litigation relating to this License may be brought only in the
-courts of a jurisdiction where the defendant maintains its principal
-place of business and such litigation shall be governed by laws of that
-jurisdiction, without reference to its conflict-of-law provisions.
-Nothing in this Section shall prevent a party's ability to bring
-cross-claims or counter-claims.
-
-9. Miscellaneous
-----------------
-
-This License represents the complete agreement concerning the subject
-matter hereof. If any provision of this License is held to be
-unenforceable, such provision shall be reformed only to the extent
-necessary to make it enforceable. Any law or regulation which provides
-that the language of a contract shall be construed against the drafter
-shall not be used to construe this License against a Contributor.
-
-10. Versions of the License
----------------------------
-
-10.1. New Versions
-
-Mozilla Foundation is the license steward. Except as provided in Section
-10.3, no one other than the license steward has the right to modify or
-publish new versions of this License. Each version will be given a
-distinguishing version number.
-
-10.2. Effect of New Versions
-
-You may distribute the Covered Software under the terms of the version
-of the License under which You originally received the Covered Software,
-or under the terms of any subsequent version published by the license
-steward.
-
-10.3. Modified Versions
-
-If you create software not governed by this License, and you want to
-create a new license for such software, you may create and use a
-modified version of this License if you rename the license and remove
-any references to the name of the license steward (except to note that
-such modified license differs from this License).
-
-10.4. Distributing Source Code Form that is Incompatible With Secondary
-Licenses
-
-If You choose to distribute Source Code Form that is Incompatible With
-Secondary Licenses under the terms of this version of the License, the
-notice described in Exhibit B of this License must be attached.
-
-Exhibit A - Source Code Form License Notice
--------------------------------------------
-
-  This Source Code Form is subject to the terms of the Mozilla Public
-  License, v. 2.0. If a copy of the MPL was not distributed with this
-  file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-If it is not possible or desirable to put the notice in a particular
-file, then You may include the notice in a location (such as a LICENSE
-file in a relevant directory) where a recipient would be likely to look
-for such a notice.
-
-You may add additional accurate notices of copyright ownership.
-
-Exhibit B - "Incompatible With Secondary Licenses" Notice
----------------------------------------------------------
-
-  This Source Code Form is "Incompatible With Secondary Licenses", as
-  defined by the Mozilla Public License, v. 2.0.

Makefile

@@ -1,32 +1,25 @@
-SERVER:=127.0.0.1:5533
+MAKEFLAGS += --jobs all
+GO:=CGO_ENABLED=0 go
 
 default: test build
 
-generate:
-	go generate ./...
 test:
-	go vet ./...
-	go test -race ./...
-build:
-	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 .
+	${GO} vet ./...
+	${GO} test ./...
 
-kill:
-	sudo pkill -9 sower || true
+build: sower sowerd
+.PHONY: sower
+sower:
+	${GO} build -ldflags "\
+		-X main.version=$(shell git describe --tags --always) \
+		-X main.date=$(shell date +%Y-%m-%d)" \
+		-o sower ./cmd/sower
+.PHONY: sowerd
+sowerd:
+	${GO} build -ldflags "\
+		-X main.version=$(shell git describe --tags --always) \
+		-X main.date=$(shell date +%Y-%m-%d)" \
+		-o sowerd ./cmd/sowerd
 
-client: build kill
-	sudo $(PWD)/sower
-
-server: build kill
-	$(PWD)/sower -n TCP -v 1
-
-run: build kill
-	$(PWD)/sower -n TCP -v 1  &
-	sudo $(PWD)/sower &
-	@sleep 1
-	curl 127.0.0.1
-	@sleep 1
-	@sudo pkill -9 sower || true
+clean:
+	rm -f sower sowerd sower.exe sowerd.exe

README.md

@@ -1,95 +1,72 @@
 # sower
+
 [![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)
+[![Actions Status](https://github.com/wweir/sower/workflows/Go/badge.svg)](https://github.com/wweir/sower/actions)
 [![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)
 
 中文介绍见 [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.
+Sower is a cross-platform intelligent transparent proxy tool. It provides both socks5 proxy and DNS-based proxy. All these kinds of proxies support intelligent routing.
 
+If you already have another proxy solution, you can use its socks5(h) service as a parent proxy to enjoy sower's intelligent routing.
 
 ## 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.
+To enjoy sower, you need to deploy sower on both server-side(sowerd) and client-side(sower).
 
-```shell
-$ bash -c "$(curl -s https://raw.githubusercontent.com/wweir/sower/master/deploy/install)"
-```
+## Sowerd
 
-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 want to use sower as a secondary proxy to provide intelligent routing, you can skip sowerd._
 
-If you wanna uninstall sower, change `install` into `uninstall` and rerun the command.
+On the server-side, sowerd runs just like a web server proxy. It will bind two ports `80` / `443`.
 
-### 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
+You can use your own certificate or the certificate automatically applied for by sowerd from [`Let's Encrypt`](https://letsencrypt.org/).
 
-### Docker deploy
-The auto build docker images are [wweir/sower](https://hub.docker.com/r/wweir/sower).
+There are two ways to run the sowerd service:
 
-It is very simple to use it on the server side. Export the port(5533) and run it directly.
+1. Run the command with root permission
 
-But the client is more troublesome and needs some understanding of the working mechanism of the sower.
+   ```shell
+   # sowerd -password XXX -fake_site 127.0.0.1:8080
+   ```
 
+2. Install as a systemd service
+
+   ```service
+   [Unit]
+   Description=sower server service
+   After=network.target
+
+   [Service]
+   Type=simple
+   ExecStart=/usr/local/bin/sowerd
+   Environment="FAKE_SITE=127.0.0.1:8080"
+   Environment="PASSWORD=XXX"
+
+   [Install]
+   WantedBy=multi-user.target
+   ```
+
+## Sower
+
+A config file is required on the sower client side. [Here](https://github.com/wweir/sower/wiki/sower.hcl) is a usable example in China.
+
+`Sower` will bind 4 ports by default with root permission. They are: `udp(53)` / `tcp(80)` / `tcp(443)` / `tcp(1080)`.
+
+After doing the next three steps, you can enjoy the intelligent transparent proxy solution:
+
+1. Run the command with root permission:
+
+   ```shell
+   # sower -f sower.hcl
+   ```
+
+2. Change your DNS server to `127.0.0.1`.
+
+3. Set your proxy to `socks5h://127.0.0.1:1080`.
 
 ## Architecture
-```
-          request target servers
-<-------------+              +------------->
-              |              |
-              |              |
-      +------------server-------------+
-      |       | relay service|        |
-      | +-----+---------------------+ |
-      | |                           | |
-      | | parse http(s) target url  | |
-      | |                           | |
-      | +---------------------------+ |
-      |     shadow service            |
-      +--------^----------------------+
-               |           request domain server
-       quic / KCP / TCP         +---------->
-               |                |
-      +--------+---client+------+-----+
-      |                  |            |
-      |  shadow service  |            |
-      |  relay service   |     dns    |
-      |                  |   service  |
-      |                  |            |
-      |       127.0.0.1 or other      |
-      |                  |            |
-      +-^-----^----------+---^----^---+
-        |     |              |    |
-        |     |              |    |   +----->
-http(s) proxy |   +----------+    |   |
-              2   1               1   2
-              +   +               +   +
-         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/)
-
-
-## Todo
-- [x] authenticate
-- [ ] broker
-- [x] CI/CD
-- [ ] relay optimization
-- [ ] deploy script for all normal platform
-- [x] dns rule intelligent suggestions
+![Architecture diagram](./sower.drawio.svg)

cmd/sower/main.go

@@ -0,0 +1,287 @@
+package main
+
+import (
+	"bufio"
+	"compress/gzip"
+	"io"
+	"net"
+	"net/http"
+	"os"
+	"runtime"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/cristalhq/aconfig"
+	"github.com/cristalhq/aconfig/aconfighcl"
+	"github.com/cristalhq/aconfig/aconfigtoml"
+	"github.com/cristalhq/aconfig/aconfigyaml"
+	"github.com/miekg/dns"
+	"github.com/pkg/errors"
+	"github.com/sower-proxy/deferlog/log"
+	"github.com/wweir/sower/pkg/suffixtree"
+	"github.com/wweir/sower/router"
+)
+
+var (
+	version, date string
+
+	conf = struct {
+		Debug bool `default:"false" usage:"debug mode"`
+
+		Remote struct {
+			Type     string `default:"sower" required:"true" usage:"option: sower/trojan/socks5"`
+			Addr     string `required:"true" usage:"proxy address, eg: proxy.com/127.0.0.1:7890"`
+			Password string `usage:"remote proxy password"`
+		}
+
+		DNS struct {
+			Disable    bool   `default:"false" usage:"disable DNS proxy"`
+			Serve      string `default:"127.0.0.1" usage:"dns server ip"`
+			Serve6     string `usage:"dns server ipv6, eg: ::1"`
+			ServeIface string `usage:"use the IP in the net interface, if serve ip not setted. eg: eth0"`
+			Fallback   string `default:"223.5.5.5" required:"true" usage:"fallback dns server"`
+		}
+		Socks5 struct {
+			Disable bool   `default:"false" usage:"disable sock5 proxy"`
+			Addr    string `default:"127.0.0.1:1080" usage:"socks5 listen address"`
+		} `flag:"socks5"`
+
+		Router struct {
+			Block struct {
+				File       string   `usage:"block list file, local file or remote"`
+				FilePrefix string   `default:"**." usage:"parsed as '<prefix>line_text'"`
+				Rules      []string `usage:"block list rules"`
+			}
+			Direct struct {
+				File       string   `usage:"direct list file, local file or remote"`
+				FilePrefix string   `default:"**." usage:"parsed as '<prefix>line_text'"`
+				Rules      []string `usage:"direct list rules"`
+			}
+			Proxy struct {
+				File       string   `usage:"proxy list file, local file or remote"`
+				FilePrefix string   `default:"**." usage:"parsed as '<prefix>line_text'"`
+				Rules      []string `usage:"proxy list rules"`
+			}
+
+			Country struct {
+				MMDB       string   `usage:"mmdb file"`
+				File       string   `usage:"CIDR block list file, local file or remote"`
+				FilePrefix string   `default:"" usage:"parsed as '<prefix>line_text'"`
+				Rules      []string `usage:"CIDR list rules"`
+			}
+		}
+	}{}
+)
+
+func init() {
+	if err := aconfig.LoaderFor(&conf, aconfig.Config{
+		AllowUnknownFields: true,
+		FileFlag:           "f",
+		FileDecoders: map[string]aconfig.FileDecoder{
+			".yml":  aconfigyaml.New(),
+			".yaml": aconfigyaml.New(),
+			".toml": aconfigtoml.New(),
+			".hcl":  aconfighcl.New(),
+		},
+	}).Load(); err != nil {
+		log.Fatal().Err(err).
+			Interface("config", conf).
+			Msg("Load config")
+	}
+
+	if conf.DNS.ServeIface != "" {
+		iface, err := net.InterfaceByName(conf.DNS.ServeIface)
+		log.DebugFatal(err).Str("iface", conf.DNS.ServeIface).Msg("get iface")
+		addrs, err := iface.Addrs()
+		log.InfoFatal(err).Str("iface", conf.DNS.ServeIface).Msg("get iface addrs")
+		for _, addr := range addrs {
+			ip, _, err := net.ParseCIDR(addr.String())
+			log.InfoFatal(err).Str("iface", conf.DNS.ServeIface).
+				Msg("parse iface addr: " + addr.String())
+
+			if ip.To4() != nil { // ipv4
+				if conf.DNS.Serve == "" {
+					conf.DNS.Serve = ip.String()
+				}
+			} else if ip.IsGlobalUnicast() { // ipv6 must be global unicast
+				if conf.DNS.Serve6 == "" {
+					conf.DNS.Serve6 = ip.String()
+				}
+			}
+		}
+	}
+
+	if !conf.DNS.Disable && conf.DNS.Serve == "" {
+		log.Fatal().Msg("dns serve ip and serve inteface not setted")
+	}
+
+	conf.Router.Direct.Rules = append(conf.Router.Direct.Rules,
+		conf.Remote.Addr, "**.in-addr.arpa", "**.ip6.arpa")
+	log.Info().
+		Str("version", version).
+		Str("date", date).
+		Interface("config", conf).
+		Msg("Starting")
+}
+
+func main() {
+	proxyDial := GenProxyDial(conf.Remote.Type, conf.Remote.Addr, conf.Remote.Password)
+	r := router.NewRouter(conf.DNS.Serve, conf.DNS.Fallback, conf.Router.Country.MMDB, proxyDial)
+	r.BlockRule = suffixtree.NewNodeFromRules(conf.Router.Block.Rules...)
+	r.DirectRule = suffixtree.NewNodeFromRules(conf.Router.Direct.Rules...)
+	r.ProxyRule = suffixtree.NewNodeFromRules(conf.Router.Proxy.Rules...)
+	r.AddCountryCIDRs(conf.Router.Country.Rules...)
+
+	if conf.DNS.Disable {
+		log.Info().Msg("DNS proxy disabled")
+	} else {
+		ips := make([]string, 0, 2)
+		if strings.TrimSpace(conf.DNS.Serve) != "" {
+			ips = append(ips, conf.DNS.Serve)
+		}
+		if strings.TrimSpace(conf.DNS.Serve6) != "" {
+			ips = append(ips, conf.DNS.Serve6)
+		}
+
+		for _, ip := range ips {
+			lnHTTP, err := net.Listen("tcp", net.JoinHostPort(ip, "80"))
+			log.DebugFatal(err).Str("listen_on", net.JoinHostPort(ip, "80")).Msg("listen port 80")
+			go ServeHTTP(lnHTTP, r)
+
+			lnHTTPS, err := net.Listen("tcp", net.JoinHostPort(ip, "443"))
+			log.DebugFatal(err).Str("listen_on", net.JoinHostPort(ip, "443")).Msg("listen port 443")
+			go ServeHTTPS(lnHTTPS, r)
+
+			go func(ip string) {
+				err := dns.ListenAndServe(net.JoinHostPort(ip, "53"), "udp", r)
+				log.InfoFatal(err).Str("listen_on", ip).Msg("serve dns")
+			}(ip)
+		}
+	}
+
+	go func() {
+		if conf.Socks5.Disable {
+			log.Info().Msg("SOCKS5 proxy disabled")
+			return
+		}
+
+		ln, err := net.Listen("tcp", conf.Socks5.Addr)
+		if err != nil {
+			log.Fatal().Err(err).Msg("listen port")
+		}
+		log.Info().Msgf("SOCKS5 proxy listening on %s", conf.Socks5.Addr)
+		go ServeSocks5(ln, r)
+	}()
+
+	start := time.Now()
+	loadRule(r.BlockRule, proxyDial, conf.Router.Block.File, conf.Router.Block.FilePrefix)
+	loadRule(r.DirectRule, proxyDial, conf.Router.Direct.File, conf.Router.Direct.FilePrefix)
+	loadRule(r.ProxyRule, proxyDial, conf.Router.Proxy.File, conf.Router.Proxy.FilePrefix)
+	for line := range fetchRuleFile(proxyDial, conf.Router.Country.File) {
+		r.AddCountryCIDRs(line)
+	}
+
+	log.Info().
+		Dur("took", time.Since(start)).
+		Uint64("blockRule", r.BlockRule.Count).
+		Uint64("directRule", r.DirectRule.Count).
+		Uint64("proxyRule", r.ProxyRule.Count).
+		Msg("Loaded rules, proxy started")
+	runtime.GC()
+	select {}
+}
+
+func loadRule(rule *suffixtree.Node, proxyDial router.ProxyDialFn, file, linePrefix string) {
+	for line := range fetchRuleFile(proxyDial, file) {
+		rule.Add(linePrefix + line)
+	}
+	rule.GC()
+}
+
+func fetchRuleFile(proxyDial router.ProxyDialFn, file string) <-chan string {
+	if file == "" {
+		return make(chan string)
+	}
+
+	var loadFn func() (io.ReadCloser, error)
+	if _, err := os.Stat(file); err == nil {
+		// load rule file from local file
+		loadFn = func() (io.ReadCloser, error) {
+			return os.Open(file)
+		}
+	} else {
+		// load rule file from remote by HTTP
+		client := &http.Client{
+			Transport: &http.Transport{
+				Dial: func(network, addr string) (net.Conn, error) {
+					domain, port, _ := net.SplitHostPort(addr)
+					p, _ := strconv.Atoi(port)
+					return proxyDial("tcp", domain, uint16(p))
+				},
+			},
+		}
+
+		loadFn = func() (io.ReadCloser, error) {
+			req, _ := http.NewRequest(http.MethodGet, file, nil)
+			req.Header.Add("Accept-Encoding", "gzip")
+			resp, err := client.Do(req)
+			if err != nil {
+				return nil, err
+			}
+
+			if resp.StatusCode != http.StatusOK {
+				resp.Body.Close()
+				return nil, errors.Errorf("status code: %d", resp.StatusCode)
+			}
+
+			return resp.Body, nil
+		}
+	}
+
+	// load rule file, retry 10 times
+	rc, err := loadFn()
+	for i := time.Duration(1); i < 10; i++ {
+		if err == nil {
+			break
+		}
+
+		// wait: 28.5s
+		time.Sleep(i * i * 100 * time.Millisecond)
+		rc, err = loadFn()
+	}
+	log.InfoFatal(err).
+		Str("file", file).
+		Msg("fetch rule file")
+
+	ch := make(chan string, 100)
+	go func() {
+		defer rc.Close()
+		defer close(ch)
+		if gr, err := gzip.NewReader(rc); err == nil {
+			rc = gr
+			defer gr.Close()
+		}
+
+		br := bufio.NewReader(rc)
+		for {
+			line, _, err := br.ReadLine()
+			if err == io.EOF {
+				return
+			} else if err != nil {
+				log.Error().Err(err).
+					Str("file", file).
+					Msg("read line")
+				return
+			}
+
+			if strings.TrimSpace(string(line)) == "" {
+				continue
+			}
+
+			ch <- string(line)
+		}
+	}()
+
+	return ch
+}

cmd/sower/proxy.go

@@ -0,0 +1,219 @@
+package main
+
+import (
+	"bufio"
+	"crypto/tls"
+	"net"
+	"net/http"
+	"time"
+
+	"github.com/pkg/errors"
+	"github.com/sower-proxy/conns/relay"
+	"github.com/sower-proxy/conns/teeconn"
+	"github.com/sower-proxy/deferlog/log"
+	"github.com/wweir/sower/router"
+	"github.com/wweir/sower/transport"
+	"github.com/wweir/sower/transport/socks5"
+	"github.com/wweir/sower/transport/sower"
+	"github.com/wweir/sower/transport/trojan"
+)
+
+func GenProxyDial(proxyType, proxyHost, proxyPassword string) router.ProxyDialFn {
+	var proxy transport.Transport
+	var dialFn func() (net.Conn, error)
+
+	switch conf.Remote.Type {
+	case "sower":
+		proxy = sower.New(conf.Remote.Password)
+		tlsCfg := &tls.Config{}
+		dialFn = func() (net.Conn, error) {
+			return tls.Dial("tcp", net.JoinHostPort(proxyHost, "443"), tlsCfg)
+		}
+
+	case "trojan":
+		proxy = trojan.New(conf.Remote.Password)
+		tlsCfg := &tls.Config{}
+		dialFn = func() (net.Conn, error) {
+			return tls.Dial("tcp", net.JoinHostPort(proxyHost, "443"), tlsCfg)
+		}
+
+	case "socks5":
+		proxy = socks5.New()
+		dialFn = func() (net.Conn, error) {
+			return net.Dial("tcp", proxyHost)
+		}
+
+	default:
+		log.Fatal().
+			Str("type", conf.Remote.Type).
+			Msg("unknown proxy type")
+	}
+
+	return func(network, host string, port uint16) (net.Conn, error) {
+		if host == "" || port == 0 {
+			return nil, errors.Errorf("invalid addr(%s:%d)", host, port)
+		}
+
+		conn, err := dialFn()
+		if err != nil {
+			return nil, err
+		}
+
+		if err := proxy.Wrap(conn, host, port); err != nil {
+			conn.Close()
+			return nil, err
+		}
+
+		return conn, nil
+	}
+}
+
+func ServeHTTP(ln net.Listener, r *router.Router) {
+	conn, err := ln.Accept()
+	if err != nil {
+		log.Fatal().Err(err).
+			Msg("serve socks5")
+	}
+
+	go ServeHTTP(ln, r)
+	start := time.Now()
+	teeconn := teeconn.New(conn)
+	defer teeconn.Close()
+
+	req, err := http.ReadRequest(bufio.NewReader(teeconn))
+	if err != nil {
+		log.Error().Err(err).Msg("read http request")
+		return
+	}
+
+	rc, err := r.ProxyDial("tcp", req.Host, 80)
+	if err != nil {
+		log.Error().Err(err).
+			Str("host", req.Host).
+			Interface("req", req.URL).
+			Msg("dial proxy")
+		return
+	}
+	defer rc.Close()
+
+	teeconn.Stop().Reread()
+	err = relay.Relay(teeconn, rc)
+	log.DebugWarn(err).
+		Str("host", req.Host).
+		Dur("spend", time.Since(start)).
+		Msg("serve http")
+}
+
+func ServeHTTPS(ln net.Listener, r *router.Router) {
+	conn, err := ln.Accept()
+	if err != nil {
+		log.Fatal().Err(err).
+			Msg("serve socks5")
+	}
+
+	go ServeHTTPS(ln, r)
+	start := time.Now()
+	teeconn := teeconn.New(conn)
+	defer teeconn.Close()
+
+	var domain string
+	tls.Server(teeconn, &tls.Config{
+		GetConfigForClient: func(hello *tls.ClientHelloInfo) (*tls.Config, error) {
+			domain = hello.ServerName
+			return nil, nil
+		},
+	}).Handshake()
+
+	rc, err := r.ProxyDial("tcp", domain, 443)
+	if err != nil {
+		log.Error().Err(err).
+			Str("host", domain).
+			Msg("dial proxy")
+		return
+	}
+	defer rc.Close()
+
+	teeconn.Stop().Reread()
+	err = relay.Relay(teeconn, rc)
+	log.DebugWarn(err).
+		Str("host", domain).
+		Dur("spend", time.Since(start)).
+		Msg("serve http")
+}
+
+func ServeSocks5(ln net.Listener, r *router.Router) {
+	conn, err := ln.Accept()
+	if err != nil {
+		log.Fatal().Err(err).
+			Msg("serve socks5")
+	}
+	go ServeSocks5(ln, r)
+	defer conn.Close()
+
+	teeConn := teeconn.New(conn)
+
+	buf1 := make([]byte, 1)
+	if _, err := teeConn.Read(buf1); err != nil {
+		log.Warn().Err(err).
+			Msg("read socks5 version")
+		return
+	}
+
+	if buf1[0] != 5 {
+		teeConn.Reread()
+		serveHttpProxy(teeConn, r)
+		return
+	}
+
+	teeConn.Stop().Reread()
+	addr, err := socks5.New().Unwrap(teeConn)
+	if err != nil {
+		log.Warn().Err(err).
+			Msgf("parse socks5 target: %s", addr)
+		return
+	}
+
+	host, port := addr.(*socks5.AddrHead).Addr()
+	r.RouteHandle(teeConn, host, port)
+}
+
+func serveHttpProxy(teeConn *teeconn.Conn, r *router.Router) {
+	req, err := http.ReadRequest(bufio.NewReader(teeConn))
+	if err != nil {
+		log.Warn().Err(err).
+			Msg("read http request")
+		return
+	}
+
+	teeConn.Stop()
+	switch req.Method {
+	case "CONNECT":
+		if _, err := teeConn.Write([]byte(req.Proto + " 200 Connection established\r\n\r\n")); err != nil {
+			log.Warn().Err(err).
+				Msg("write https proxy response")
+			return
+		}
+
+		host, port, err := router.ParseHostPort(req.Host, 443)
+		if err != nil {
+			log.Warn().Err(err).
+				Msg("parse https_proxy target")
+			return
+		}
+
+		rc, err := r.ProxyDial("tcp", host, port)
+		if err != nil {
+			log.Warn().Err(err).
+				Str("host", host).
+				Msg("dial proxy")
+			return
+		}
+		defer rc.Close()
+
+		relay.Relay(teeConn, rc)
+
+	default:
+		teeConn.Reread()
+		r.RouteHandle(teeConn, req.Host, 80)
+	}
+}

cmd/sowerd/main.go

@@ -0,0 +1,148 @@
+package main
+
+import (
+	"crypto/tls"
+	"net"
+	"net/http"
+	"os"
+	"path/filepath"
+	"time"
+
+	"github.com/cristalhq/aconfig"
+	"github.com/sower-proxy/conns/relay"
+	"github.com/sower-proxy/conns/teeconn"
+	"github.com/sower-proxy/deferlog"
+	"github.com/sower-proxy/deferlog/log"
+	"github.com/wweir/sower/transport/sower"
+	"github.com/wweir/sower/transport/trojan"
+	"golang.org/x/crypto/acme/autocert"
+)
+
+var (
+	version, date string
+
+	conf = struct {
+		ServeIP  string `usage:"listen to port 80 443 of this IP, eg: 0.0.0.0"`
+		Password string `required:"true"`
+		FakeSite string `default:"127.0.0.1:8080" usage:"fake site address or directoy"`
+
+		Cert struct {
+			Email string
+			Cert  string
+			Key   string
+		}
+	}{}
+)
+
+func init() {
+	err := aconfig.LoaderFor(&conf, aconfig.Config{}).Load()
+	log.InfoFatal(err).
+		Str("version", version).
+		Str("date", date).
+		Interface("config", conf).
+		Msg("Load config")
+}
+
+func main() {
+	cacheDir, _ := os.UserCacheDir()
+	cacheDir = filepath.Join(cacheDir, "sower")
+	if err := os.MkdirAll(cacheDir, 0600); err != nil {
+		log.Fatal().Err(err).
+			Str("dir", cacheDir).
+			Msg("make cache dir")
+	}
+
+	certManager := autocert.Manager{
+		Prompt: autocert.AcceptTOS,
+		Email:  conf.Cert.Email,
+		Cache:  autocert.DirCache(cacheDir),
+	}
+
+	tlsConf := &tls.Config{
+		GetCertificate: certManager.GetCertificate,
+		MinVersion:     tls.VersionTLS12,
+		NextProtos:     []string{"http/1.1", "h2"},
+	}
+	if conf.Cert.Cert != "" || conf.Cert.Key != "" {
+		cert, err := tls.LoadX509KeyPair(conf.Cert.Cert, conf.Cert.Key)
+		if err != nil {
+			log.Fatal().Err(err).Msg("load certificate")
+		}
+
+		tlsConf.GetCertificate = nil
+		tlsConf.Certificates = []tls.Certificate{cert}
+	}
+
+	// Redirect 80 to 443
+	go func() {
+		err := http.ListenAndServe(net.JoinHostPort(conf.ServeIP, "80"),
+			certManager.HTTPHandler(http.HandlerFunc(redirectToHTTPS)))
+		log.Fatal().Err(err).
+			Str("IP", conf.ServeIP).
+			Msg("Listen HTTP service")
+	}()
+
+	ln, err := tls.Listen("tcp", net.JoinHostPort(conf.ServeIP, "443"), tlsConf)
+	log.InfoFatal(err).
+		Str("IP", conf.ServeIP).
+		Msg("Start listen HTTPS service")
+
+	if si, err := os.Stat(conf.FakeSite); err == nil && si.IsDir() {
+		http.NewFileTransport(http.Dir(conf.FakeSite))
+	} else if _, _, err := net.SplitHostPort(conf.FakeSite); err == nil {
+		go serve443(ln, conf.FakeSite, sower.New(conf.Password), trojan.New(conf.Password))
+	}
+
+	select {}
+}
+
+func redirectToHTTPS(w http.ResponseWriter, r *http.Request) {
+	r.URL.Scheme = "https"
+	if host, _, err := net.SplitHostPort(r.Host); err != nil {
+		r.URL.Host = r.Host
+	} else {
+		r.URL.Host = host
+	}
+
+	http.Redirect(w, r, r.URL.String(), 301)
+}
+
+func serve443(ln net.Listener, fakeSite string, sower *sower.Sower, trojan *trojan.Trojan) {
+	conn, err := ln.Accept()
+	if err != nil {
+		log.Fatal().Err(err).Msg("serve 443 port")
+	}
+	go serve443(ln, fakeSite, sower, trojan)
+	teeconn := teeconn.New(conn)
+	defer teeconn.Close()
+
+	var addr net.Addr
+	var dur time.Duration
+	defer func() {
+		deferlog.DebugWarn(err).
+			Dur("spend", dur).
+			Msgf("relay conn to %s", addr)
+	}()
+
+	// 1. detect if it's a sower underlaying connection
+	teeconn.Reread()
+	if addr, err = sower.Unwrap(teeconn); err == nil {
+		teeconn.Stop()
+
+		dur, err = relay.RelayTo(teeconn, addr.String())
+		return
+	}
+
+	// 2. detect if it's a trojan underlaying connection
+	teeconn.Reread()
+	if addr, err = trojan.Unwrap(teeconn); err == nil {
+		teeconn.Stop()
+
+		dur, err = relay.RelayTo(teeconn, addr.String())
+		return
+	}
+
+	// 3. fallback to fake site
+	teeconn.Stop().Reread()
+	dur, err = relay.RelayTo(teeconn, fakeSite)
+}

conf/conf.go

@@ -1,124 +0,0 @@
-package conf
-
-import (
-	"context"
-	"flag"
-	"os"
-	"os/exec"
-	"runtime"
-	"strconv"
-	"sync"
-	"time"
-
-	"github.com/golang/glog"
-	toml "github.com/pelletier/go-toml"
-	"github.com/wweir/sower/util"
-)
-
-// Conf define the config items
-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"`
-	ClientIP      string `toml:"client_ip"`
-	ClearDNSCache string `toml:"clear_dns_cache"`
-
-	BlockList   []string `toml:"blocklist"`
-	WhiteList   []string `toml:"whitelist"`
-	Suggestions []string `toml:"suggestions"`
-	Verbose     int      `toml:"verbose"`
-}{}
-
-// OnRefreash will be executed while init and write new config
-var OnRefreash = []func() error{
-	func() (err error) {
-		f, err := os.OpenFile(Conf.ConfigFile, os.O_RDONLY, 0644)
-		if err != nil {
-			return err
-		}
-		defer f.Close()
-
-		//safe refresh config
-		file := Conf.ConfigFile
-		if err = toml.NewDecoder(f).Decode(&Conf); err != nil {
-			return err
-		}
-		Conf.ConfigFile = file
-
-		return flag.Set("v", strconv.Itoa(Conf.Verbose))
-	},
-	func() error {
-		if Conf.ClearDNSCache != "" {
-			ctx, cancel := context.WithTimeout(context.TODO(), 5*time.Second)
-			defer cancel()
-
-			switch runtime.GOOS {
-			case "windows":
-				return exec.CommandContext(ctx, "cmd", "/c", Conf.ClearDNSCache).Run()
-			default:
-				return exec.CommandContext(ctx, "sh", "-c", Conf.ClearDNSCache).Run()
-			}
-		}
-		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)
-		}
-	}
-}
-
-// mu keep synchronized add rule(write), do not care read while write
-var mu = &sync.Mutex{}
-
-// AddSuggest add new domain into suggest rules
-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.Errorln(err)
-		}
-	}
-}

conf/conf_posix.go

@@ -1,26 +0,0 @@
-// +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

@@ -1,145 +0,0 @@
-// +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,44 +0,0 @@
-net_type="TCP"
-cipher="AES_128_GCM"
-password="12345678"
-server_port="5533"
-# 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
-    "**.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

@@ -1,18 +0,0 @@
-# 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

@@ -1,18 +0,0 @@
-<?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

@@ -1,93 +0,0 @@
-#!/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

@@ -1,14 +0,0 @@
-[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

@@ -1,14 +0,0 @@
-[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

@@ -1,20 +0,0 @@
-#!/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

@@ -1,91 +0,0 @@
-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.Errorln(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

@@ -1,20 +0,0 @@
-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

@@ -1,150 +0,0 @@
-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, 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 {
-			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
-		if len(r.Question) == 0 {
-			return
-		}
-
-		domain := r.Question[0].Name
-		if idx := strings.IndexByte(domain, colon); idx > 0 {
-			domain = domain[:idx]
-		}
-
-		matchAndServe(w, r, domain, listenIP, dnsServer, dhcpCh, ip, suggest)
-	})
-
-	server := &dns.Server{Addr: net.JoinHostPort(listenIP, "53"), Net: "udp"}
-	glog.Fatalln(server.ListenAndServe())
-}
-
-func matchAndServe(w dns.ResponseWriter, r *dns.Msg, domain, listenIP, dnsServer string,
-	dhcpCh chan struct{}, ipNet net.IP, suggest *intelliSuggest) {
-
-	inWriteList := whiteList.Match(domain)
-	if !inWriteList && (blockList.Match(domain) || suggestList.Match(domain)) {
-		glog.V(2).Infof("match %s suss", domain)
-		w.WriteMsg(localA(r, domain, ipNet))
-		return
-	}
-
-	msg, err := dns.Exchange(r, dnsServer)
-	if err != nil && dhcpCh != nil {
-		select {
-		case dhcpCh <- struct{}{}:
-		default:
-		}
-	}
-
-	// trigger suggest logic except dhcp dns server error
-	if !inWriteList {
-		go mem.Remember(suggest, domain)
-	}
-
-	if msg == nil { // expose any response except nil
-		glog.V(1).Infof("get dns of %s fail: %s", domain, err)
-		return
-	}
-	w.WriteMsg(msg)
-}
-
-type intelliSuggest struct {
-	listenIP string
-	timeout  time.Duration
-}
-
-func (i *intelliSuggest) GetOne(domain interface{}) (iface interface{}, e error) {
-	iface, e = struct{}{}, nil
-
-	// kill deadloop, for ugly wildcard setting dns setting
-	addr := strings.TrimSuffix(domain.(string), ".")
-	if len(strings.Split(addr, ".")) > 10 {
-		return
-	}
-
-	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

@@ -1,131 +0,0 @@
-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/util.go

@@ -1,59 +0,0 @@
-package dns
-
-import (
-	"net"
-
-	"github.com/golang/glog"
-	"github.com/miekg/dns"
-	"github.com/wweir/sower/conf"
-	"github.com/wweir/sower/util"
-)
-
-var (
-	blockList   *util.Node
-	whiteList   *util.Node
-	suggestList *util.Node
-)
-
-func init() {
-	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)
-	glog.V(1).Infoln("load config")
-
-	conf.OnRefreash = append(conf.OnRefreash, func() error {
-		blockList = loadRules("block", conf.Conf.BlockList)
-		suggestList = loadRules("suggest", conf.Conf.Suggestions)
-		whiteList = loadRules("white", conf.Conf.WhiteList)
-		whiteList.Add(host)
-		glog.V(1).Infoln("reload config")
-		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,25 +1,37 @@
 module github.com/wweir/sower
 
+go 1.22
+
+toolchain go1.22.3
+
 require (
-	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/hashicorp/golang-lru v0.5.0 // indirect
-	github.com/klauspost/cpuid v1.2.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.1
-	github.com/lucas-clemente/quic-go-certificates v0.0.0-20160823095156-d2f86524cced // indirect
-	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/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
+	github.com/cristalhq/aconfig v0.18.5
+	github.com/cristalhq/aconfig/aconfighcl v0.17.1
+	github.com/cristalhq/aconfig/aconfigtoml v0.17.1
+	github.com/cristalhq/aconfig/aconfigyaml v0.17.1
+	github.com/krolaw/dhcp4 v0.0.0-20190909130307-a50d88189771
+	github.com/libp2p/go-reuseport v0.4.0
+	github.com/miekg/dns v1.1.59
+	github.com/oschwald/geoip2-golang v1.9.0
+	github.com/pkg/errors v0.9.1
+	github.com/sower-proxy/conns v0.0.3
+	github.com/sower-proxy/deferlog v1.0.7
+	github.com/sower-proxy/mem v0.0.3
+	golang.org/x/crypto v0.23.0
+)
+
+require (
+	github.com/BurntSushi/toml v1.3.2 // indirect
+	github.com/hashicorp/hcl v1.0.0 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/oschwald/maxminddb-golang v1.12.0 // indirect
+	github.com/rs/zerolog v1.32.0 // indirect
+	golang.org/x/mod v0.17.0 // indirect
+	golang.org/x/net v0.25.0 // indirect
+	golang.org/x/sync v0.7.0 // indirect
+	golang.org/x/sys v0.20.0 // indirect
+	golang.org/x/text v0.15.0 // indirect
+	golang.org/x/tools v0.21.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -1,73 +1,70 @@
-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/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
+github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8=
+github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
+github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
+github.com/cristalhq/aconfig v0.17.0/go.mod h1:NXaRp+1e6bkO4dJn+wZ71xyaihMDYPtCSvEhMTm/H3E=
+github.com/cristalhq/aconfig v0.18.5 h1:QqXH/Gy2c4QUQJTV2BN8UAuL/rqZ3IwhvxeC8OgzquA=
+github.com/cristalhq/aconfig v0.18.5/go.mod h1:NXaRp+1e6bkO4dJn+wZ71xyaihMDYPtCSvEhMTm/H3E=
+github.com/cristalhq/aconfig/aconfighcl v0.17.1 h1:/hJvmmoP3akvjY8qARiXgN30m/WXeBvpQdQ8v4DE8W8=
+github.com/cristalhq/aconfig/aconfighcl v0.17.1/go.mod h1:oOPqMmdUjVW6pKKO1zkOwQKHSUD0rlu8F5do+pylOQc=
+github.com/cristalhq/aconfig/aconfigtoml v0.17.1 h1:TA3xH8mALD8YeULsr4v87cMbKGBma35lWeRga4Xn11Q=
+github.com/cristalhq/aconfig/aconfigtoml v0.17.1/go.mod h1:xt4kCEjhgvHWO/oDGJHQHrW5CnvSEoBjJhRXVBdYbhQ=
+github.com/cristalhq/aconfig/aconfigyaml v0.17.1 h1:xCCbRKVmKrft9gQj3gHOq6U5PduasvlXEIsxtyzmFZ0=
+github.com/cristalhq/aconfig/aconfigyaml v0.17.1/go.mod h1:5DTsjHkvQ6hfbyxfG32roB1lF0U82rROtFaLxibL8V8=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 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/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/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.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.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/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/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
+github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
+github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
+github.com/krolaw/dhcp4 v0.0.0-20190909130307-a50d88189771 h1:t2c2B9g1ZVhMYduqmANSEGVD3/1WlsrEYNPtVoFlENk=
+github.com/krolaw/dhcp4 v0.0.0-20190909130307-a50d88189771/go.mod h1:0AqAH3ZogsCrvrtUpvc6EtVKbc3w6xwZhkvGLuqyi3o=
+github.com/libp2p/go-reuseport v0.4.0 h1:nR5KU7hD0WxXCJbmw7r2rhRYruNRl2koHw8fQscQm2s=
+github.com/libp2p/go-reuseport v0.4.0/go.mod h1:ZtI03j/wO5hZVDFo2jKywN6bYKWLOy8Se6DrI2E1cLU=
+github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
+github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/miekg/dns v1.1.59 h1:C9EXc/UToRwKLhK5wKU/I4QVsBUc8kE6MkHBkeypWZs=
+github.com/miekg/dns v1.1.59/go.mod h1:nZpewl5p6IvctfgrckopVx2OlSEHPRO/U4SYkRklrEk=
+github.com/oschwald/geoip2-golang v1.9.0 h1:uvD3O6fXAXs+usU+UGExshpdP13GAqp4GBrzN7IgKZc=
+github.com/oschwald/geoip2-golang v1.9.0/go.mod h1:BHK6TvDyATVQhKNbQBdrj9eAvuwOMi2zSFXizL3K81Y=
+github.com/oschwald/maxminddb-golang v1.12.0 h1:9FnTOD0YOhP7DGxGsq4glzpGy5+w7pq50AS6wALUMYs=
+github.com/oschwald/maxminddb-golang v1.12.0/go.mod h1:q0Nob5lTCqyQ8WT6FYgS1L7PXKVVbgiymefNwIjPzgY=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 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/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=
+github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
+github.com/rs/zerolog v1.32.0 h1:keLypqrlIjaFsbmJOBdB/qvyF8KEtCWHwobLp5l/mQ0=
+github.com/rs/zerolog v1.32.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
+github.com/sower-proxy/conns v0.0.3 h1:3jbkvPhDwC+ph/NZi7Gywks9WakHK4ept7CkjTiNUJ8=
+github.com/sower-proxy/conns v0.0.3/go.mod h1:p3ZM/8MolzW4TN0LaiPJnwnhhif3y9sBi2vQEWHvwhg=
+github.com/sower-proxy/deferlog v1.0.7 h1:2gRkdTeSHPhnAj6uwBJ74ufqEmn1spT5o1Y3jGXY9zU=
+github.com/sower-proxy/deferlog v1.0.7/go.mod h1:TVXk/Pm7TAs1ZqayZfrxSbwCl+SSm7+p1xcEPkKHWvQ=
+github.com/sower-proxy/mem v0.0.3 h1:JK86etQ2QxRUXhs9JhoKYz5p3pFBSrI3UXVhwm44OzM=
+github.com/sower-proxy/mem v0.0.3/go.mod h1:tM3P+gCAZMVBnOixGVAHS34si9Iwj2HU6M4IVEv4rK0=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
+golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
+golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
+golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
+golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
+golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
+golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
+golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
+golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/tools v0.21.0 h1:qc0xYgIbsSDt9EyWz05J5wfa7LOVW0YTLOXrqdLAWIw=
+golang.org/x/tools v0.21.0/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
+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/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

main.go

@@ -1,28 +0,0 @@
-package main
-
-import (
-	"github.com/golang/glog"
-	"github.com/wweir/sower/conf"
-	"github.com/wweir/sower/dns"
-	"github.com/wweir/sower/proxy"
-)
-
-var version, date string
-
-func main() {
-	conf := conf.Conf
-	glog.Infof("Starting sower(%s %s): %v", version, date, conf)
-
-	if conf.ServerAddr == "" {
-		proxy.StartServer(conf.NetType, conf.ServerPort, conf.Cipher, conf.Password)
-
-	} else {
-		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

@@ -1,48 +0,0 @@
-package parse
-
-import (
-	"bufio"
-	"fmt"
-	"io"
-	"net"
-	"net/http"
-	"strings"
-
-	"github.com/wweir/sower/util"
-)
-
-func ParseAddr(conn net.Conn) (teeConn *util.TeeConn, addr string, err error) {
-	teeConn = &util.TeeConn{Conn: conn}
-	teeConn.StartOrReset()
-	defer teeConn.Stop()
-
-	buf := make([]byte, 1)
-	if n, err := teeConn.Read(buf); err != nil {
-		return teeConn, "", fmt.Errorf("Read conn fail: %v, readed: %v", err, buf[:n])
-	}
-
-	teeConn.StartOrReset()
-
-	// https
-	if buf[0] == 0x16 { // SSL handleshake
-		host, _, err := extractSNI(io.Reader(teeConn))
-		if err != nil {
-			return teeConn, "", err
-		}
-		if strings.Contains(host, ":") {
-			return teeConn, host, nil
-		}
-		return teeConn, host + ":443", nil
-	}
-
-	// http
-	b := bufio.NewReader(teeConn)
-	resp, err := http.ReadRequest(b)
-	if err != nil {
-		return teeConn, "", err
-	}
-	if strings.Contains(resp.Host, ":") {
-		return teeConn, resp.Host, nil
-	}
-	return teeConn, resp.Host + ":80", nil
-}

parse/sni.go

@@ -1,232 +0,0 @@
-// Copyright 2016 Google Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package parse
-
-import (
-	"encoding/binary"
-	"errors"
-	"fmt"
-	"io"
-)
-
-func extractSNI(r io.Reader) (string, int, error) {
-	handshake, tlsver, err := handshakeRecord(r)
-	if err != nil {
-		return "", 0, fmt.Errorf("reading TLS record: %s", err)
-	}
-
-	sni, err := parseHello(handshake)
-	if err != nil {
-		return "", 0, fmt.Errorf("reading ClientHello: %s", err)
-	}
-	if len(sni) == 0 {
-		// ClientHello did not present an SNI extension. Valid packet,
-		// no hostname.
-		return "", tlsver, nil
-	}
-
-	hostname, err := parseSNI(sni)
-	if err != nil {
-		return "", 0, fmt.Errorf("parsing SNI extension: %s", err)
-	}
-	return hostname, tlsver, nil
-}
-
-// Extract the indicated hostname, if any, from the given SNI
-// extension bytes.
-func parseSNI(b []byte) (string, error) {
-	b, _, err := vector(b, 2)
-	if err != nil {
-		return "", err
-	}
-
-	var ret []byte
-	for len(b) >= 3 {
-		typ := b[0]
-		ret, b, err = vector(b[1:], 2)
-		if err != nil {
-			return "", fmt.Errorf("truncated SNI extension")
-		}
-
-		if typ == sniHostnameID {
-			return string(ret), nil
-		}
-	}
-
-	if len(b) != 0 {
-		return "", fmt.Errorf("trailing garbage at end of SNI extension")
-	}
-
-	// No DNS-based SNI present.
-	return "", nil
-}
-
-const sniExtensionID = 0
-const sniHostnameID = 0
-
-// Parse a TLS handshake record as a ClientHello message and extract
-// the SNI extension bytes, if any.
-func parseHello(b []byte) ([]byte, error) {
-	if len(b) == 0 {
-		return nil, errors.New("zero length handshake record")
-	}
-	if b[0] != 1 {
-		return nil, fmt.Errorf("non-ClientHello handshake record type %d", b[0])
-	}
-
-	// We're expecting a stricter TLS parser to run after we've
-	// proxied, so we ignore any trailing bytes that might be present
-	// (e.g. another handshake message).
-	b, _, err := vector(b[1:], 3)
-	if err != nil {
-		return nil, fmt.Errorf("reading ClientHello: %s", err)
-	}
-
-	// ClientHello must be at least 34 bytes to reach the first vector
-	// length byte. The actual minimal size is larger than that, but
-	// vector() will correctly handle truncated packets.
-	if len(b) < 34 {
-		return nil, errors.New("ClientHello packet too short")
-	}
-
-	if b[0] != 3 {
-		return nil, fmt.Errorf("ClientHello has unsupported version %d.%d", b[0], b[1])
-	}
-	switch b[1] {
-	case 1, 2, 3:
-		// TLS 1.0, TLS 1.1, TLS 1.2
-	default:
-		return nil, fmt.Errorf("TLS record has unsupported version %d.%d", b[0], b[1])
-	}
-
-	// Skip over version and random struct
-	b = b[34:]
-
-	// We don't technically care about SessionID, but we care that the
-	// framing is well-formed all the way up to the SNI field, so that
-	// we are sure that we're pulling the same SNI bytes as the
-	// eventual TLS implementation.
-	vec, b, err := vector(b, 1)
-	if err != nil {
-		return nil, fmt.Errorf("reading ClientHello SessionID: %s", err)
-	}
-	if len(vec) > 32 {
-		return nil, fmt.Errorf("ClientHello SessionID too long (%db)", len(vec))
-	}
-
-	// Likewise, we're just checking the bare minimum of framing.
-	vec, b, err = vector(b, 2)
-	if err != nil {
-		return nil, fmt.Errorf("reading ClientHello CipherSuites: %s", err)
-	}
-	if len(vec) < 2 || len(vec)%2 != 0 {
-		return nil, fmt.Errorf("ClientHello CipherSuites invalid length %d", len(vec))
-	}
-
-	vec, b, err = vector(b, 1)
-	if err != nil {
-		return nil, fmt.Errorf("reading ClientHello CompressionMethods: %s", err)
-	}
-	if len(vec) < 1 {
-		return nil, fmt.Errorf("ClientHello CompressionMethods invalid length %d", len(vec))
-	}
-
-	// Finally, we reach the extensions.
-	if len(b) == 0 {
-		// No extensions. This is not an error, it just means we have
-		// no SNI payload.
-		return nil, nil
-	}
-	b, vec, err = vector(b, 2)
-	if err != nil {
-		return nil, fmt.Errorf("reading ClientHello extensions: %s", err)
-	}
-	if len(vec) != 0 {
-		return nil, fmt.Errorf("%d bytes of trailing garbage in ClientHello", len(vec))
-	}
-
-	for len(b) >= 4 {
-		typ := binary.BigEndian.Uint16(b[:2])
-		vec, b, err = vector(b[2:], 2)
-		if err != nil {
-			return nil, fmt.Errorf("reading ClientHello extension %d: %s", typ, err)
-		}
-		if typ == sniExtensionID {
-			// Found the SNI extension, return its payload. We don't
-			// care about anything in the packet beyond this point.
-			return vec, nil
-		}
-	}
-
-	if len(b) != 0 {
-		return nil, fmt.Errorf("%d bytes of trailing garbage in ClientHello", len(b))
-	}
-
-	// Successfully parsed all extensions, but there was no SNI.
-	return nil, nil
-}
-
-const maxTLSRecordLength = 16384
-
-// Read one TLS record, which must be for the handshake protocol, from r.
-func handshakeRecord(r io.Reader) ([]byte, int, error) {
-	var hdr struct {
-		Type         uint8
-		Major, Minor uint8
-		Length       uint16
-	}
-	if err := binary.Read(r, binary.BigEndian, &hdr); err != nil {
-		return nil, 0, fmt.Errorf("reading TLS record header: %s", err)
-	}
-
-	if hdr.Type != 22 {
-		return nil, 0, fmt.Errorf("TLS record is not a handshake")
-	}
-
-	if hdr.Major != 3 {
-		return nil, 0, fmt.Errorf("TLS record has unsupported version %d.%d", hdr.Major, hdr.Minor)
-	}
-	switch hdr.Minor {
-	case 1, 2, 3:
-		// TLS 1.0, TLS 1.1, TLS 1.2
-	default:
-		return nil, 0, fmt.Errorf("TLS record has unsupported version %d.%d", hdr.Major, hdr.Minor)
-	}
-
-	if hdr.Length > maxTLSRecordLength {
-		return nil, 0, fmt.Errorf("TLS record length is greater than %d", maxTLSRecordLength)
-	}
-
-	ret := make([]byte, hdr.Length)
-	if _, err := io.ReadFull(r, ret); err != nil {
-		return nil, 0, err
-	}
-
-	return ret, int(hdr.Minor), nil
-}
-
-func vector(b []byte, lenBytes int) ([]byte, []byte, error) {
-	if len(b) < lenBytes {
-		return nil, nil, errors.New("not enough space in packet for vector")
-	}
-	var l int
-	for _, b := range b[:lenBytes] {
-		l = (l << 8) + int(b)
-	}
-	if len(b) < l+lenBytes {
-		return nil, nil, errors.New("not enough space in packet for vector")
-	}
-	return b[lenBytes : l+lenBytes], b[l+lenBytes:], nil
-}

pkg/dhcp/dhcp.go

@@ -0,0 +1,64 @@
+package dhcp
+
+import (
+	"math/rand"
+	"net"
+	"runtime"
+	"time"
+
+	"github.com/krolaw/dhcp4"
+	"github.com/libp2p/go-reuseport"
+	"github.com/pkg/errors"
+)
+
+var xid = make([]byte, 4)
+var broadcastAddr, _ = net.ResolveUDPAddr("udp", "255.255.255.255:67")
+
+func GetDNSServer() ([]string, error) {
+	iface, err := PickInternetInterface()
+	if err != nil {
+		return nil, errors.Wrap(err, "pick interface")
+	}
+
+	rand.Read(xid)
+	pack := dhcp4.RequestPacket(dhcp4.Discover, iface.HardwareAddr, net.IPv4(0, 0, 0, 0), xid, true, []dhcp4.Option{
+		{Code: dhcp4.OptionRequestedIPAddress, Value: []byte(iface.IP.To4())},
+		{Code: dhcp4.End},
+	})
+
+	var conn net.PacketConn
+	if runtime.GOOS == "windows" {
+		if conn, err = reuseport.ListenPacket("udp4", iface.IP.String()+":68"); err != nil {
+			return nil, errors.Wrap(err, "listen dhcp")
+		}
+	} else {
+		if conn, err = reuseport.ListenPacket("udp4", "0.0.0.0:68"); err != nil {
+			return nil, errors.Wrap(err, "listen dhcp")
+		}
+	}
+	defer conn.Close()
+	conn.SetDeadline(time.Now().Add(3 * time.Second))
+
+	if _, err := conn.WriteTo([]byte(pack), broadcastAddr); err != nil {
+		return nil, errors.Wrap(err, "write broadcast")
+	}
+
+	buf := make([]byte, 1500 /*MTU*/)
+	n, _, err := conn.ReadFrom(buf)
+	if err != nil {
+		return nil, errors.Wrap(err, "read dhcp offer")
+	}
+
+	pack = dhcp4.Packet(buf[:n])
+	dnsBytes := pack.ParseOptions()[dhcp4.OptionDomainNameServer]
+	if len(dnsBytes) < 4 || len(dnsBytes)%4 != 0 {
+		return nil, errors.New("invalid DNS setting in upstream network device")
+	}
+
+	ips := []string{}
+	for i := 0; i < len(dnsBytes); i += 4 {
+		ips = append(ips, net.IP(dnsBytes[i:i+4]).String())
+	}
+
+	return ips, nil
+}

pkg/dhcp/dhcp_test.go

@@ -0,0 +1,15 @@
+package dhcp_test
+
+import (
+	"fmt"
+
+	"github.com/wweir/sower/pkg/dhcp"
+)
+
+func Example_dns() {
+	got, err := dhcp.GetDNSServer()
+	if err != nil {
+		panic(err)
+	}
+	fmt.Println(got)
+}

pkg/dhcp/pick_iface_other.go

@@ -0,0 +1,30 @@
+// +build !windows
+
+package dhcp
+
+import (
+	"errors"
+	"net"
+)
+
+// PickInternetInterface pick the first active net interface
+func PickInternetInterface() (*Iface, error) {
+	ifaces, err := net.Interfaces()
+	if err != nil {
+		return nil, err
+	}
+
+	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 {
+				return &Iface{ifaces[i].HardwareAddr, ip}, nil
+			}
+		}
+	}
+	return nil, errors.New("no valid interface")
+}

pkg/dhcp/pick_iface_test.go

@@ -0,0 +1,15 @@
+package dhcp_test
+
+import (
+	"fmt"
+
+	"github.com/wweir/sower/pkg/dhcp"
+)
+
+func Example_iface() {
+	got, err := dhcp.PickInternetInterface()
+	if err != nil {
+		panic(err)
+	}
+	fmt.Println(got)
+}

pkg/dhcp/pick_iface_windows.go

@@ -0,0 +1,51 @@
+// +build windows
+
+package dhcp
+
+import (
+	"bytes"
+	"errors"
+	"net"
+	"os"
+	"syscall"
+	"unsafe"
+)
+
+// PickInternetInterface pick the first active net interface
+func PickInternetInterface() (*Iface, error) {
+	list, err := getAdapterList()
+	if err != nil {
+		return nil, err
+	}
+	for {
+		if list.DhcpEnabled == 1 && list.LeaseObtained != 0 {
+			ip := bytes.TrimRight(list.IpAddressList.IpAddress.String[:], string([]byte{0}))
+			return &Iface{net.HardwareAddr(list.Address[:list.AddressLength]), net.ParseIP(string(ip))}, nil
+		}
+
+		if list.Next != nil {
+			list = list.Next
+		} else {
+			return nil, errors.New("no valid interface")
+		}
+	}
+}
+
+func getAdapterList() (*syscall.IpAdapterInfo, error) {
+	b := make([]byte, 1000)
+	l := uint32(len(b))
+	a := (*syscall.IpAdapterInfo)(unsafe.Pointer(&b[0]))
+	// TODO(mikio): GetAdaptersInfo returns IP_ADAPTER_INFO that
+	// contains IPv4 address list only. We should use another API
+	// for fetching IPv6 stuff from the kernel.
+	err := syscall.GetAdaptersInfo(a, &l)
+	if err == syscall.ERROR_BUFFER_OVERFLOW {
+		b = make([]byte, l)
+		a = (*syscall.IpAdapterInfo)(unsafe.Pointer(&b[0]))
+		err = syscall.GetAdaptersInfo(a, &l)
+	}
+	if err != nil {
+		return nil, os.NewSyscallError("GetAdaptersInfo", err)
+	}
+	return a, nil
+}

pkg/dhcp/util.go

@@ -0,0 +1,9 @@
+package dhcp
+
+import "net"
+
+// Iface is net interface address info
+type Iface struct {
+	net.HardwareAddr
+	net.IP
+}

pkg/suffixtree/suffix_tree.go

@@ -0,0 +1,143 @@
+package suffixtree
+
+import (
+	"strings"
+)
+
+type Node struct {
+	*node
+	sep   string
+	Count uint64
+}
+type node struct {
+	secs     []string
+	subNodes []*node
+}
+
+func NewNodeFromRules(rules ...string) *Node {
+	n := &Node{&node{}, ".", 0}
+	for i := range rules {
+		n.Add(rules[i])
+	}
+
+	n.GC()
+	return n
+}
+
+func (n *node) GC() {
+	if n == nil {
+		return
+	}
+
+	n.secs = GCSlice(n.secs)
+	n.subNodes = GCSlice(n.subNodes)
+	for i := range n.subNodes {
+		n.subNodes[i].GC()
+	}
+}
+
+func (n *Node) String() string {
+	return n.string("", "     ")
+}
+func (n *node) string(prefix, indent string) (out string) {
+	if n == nil {
+		return
+	}
+	for key, val := range n.subNodes {
+		out += prefix + n.secs[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.Count++
+	n.add(strings.Split(n.trim(item), n.sep))
+}
+func (n *node) add(secs []string) {
+	length := len(secs)
+	switch length {
+	case 0:
+	case 1:
+		sec := secs[length-1]
+		switch sec {
+		case "", "*", "**":
+			n.secs = append([]string{sec}, n.secs...)
+			n.subNodes = append([]*node{nil}, n.subNodes...)
+		default:
+			n.secs = append(n.secs, sec)
+			n.subNodes = append(n.subNodes, nil)
+		}
+	default:
+		sec := secs[length-1]
+		if sec == "**" { // ** is only allowed in the last sec
+			sec = "*"
+		}
+
+		idx := n.index(sec)
+		if idx == -1 {
+			switch sec {
+			case "", "*", "**":
+				idx = 0
+				n.secs = append([]string{sec}, n.secs...)
+				n.subNodes = append([]*node{{}}, n.subNodes...)
+			default:
+				idx = len(n.secs)
+				n.secs = append(n.secs, sec)
+				n.subNodes = append(n.subNodes, &node{})
+			}
+
+		} else if n.subNodes[idx] == nil {
+			n.subNodes[idx] = &node{}
+			n.subNodes[idx].add([]string{""})
+		}
+
+		n.subNodes[idx].add(secs[:length-1])
+	}
+}
+
+func (n *Node) Match(item string) bool {
+	if n == nil {
+		return false
+	}
+
+	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 n == nil {
+			return true
+		}
+		return n.index("") != -1 || n.index("**") != -1
+	}
+
+	if idx := n.index(secs[length-1]); idx >= 0 {
+		if n.subNodes[idx].matchSecs(secs[:length-1], false) {
+			return true
+		}
+	}
+	if idx := n.index("*"); idx >= 0 {
+		if n.subNodes[idx].matchSecs(secs[:length-1], true) {
+			return true
+		}
+	}
+	return n.index("**") >= 0
+}
+
+// index return the sec index in node, or -1 if not found
+func (n *node) index(sec string) int {
+	if n == nil {
+		return -1
+	}
+	for s := range n.secs {
+		if n.secs[s] == sec {
+			return s
+		}
+	}
+	return -1
+}

pkg/suffixtree/suffix_tree_test.go

@@ -1,7 +1,9 @@
-package util
+package suffixtree_test
 
 import (
 	"testing"
+
+	"github.com/wweir/sower/pkg/suffixtree"
 )
 
 func TestNode_Match(t *testing.T) {
@@ -11,18 +13,18 @@ func TestNode_Match(t *testing.T) {
 	}
 	tests := []struct {
 		name  string
-		node  *Node
+		node  *suffixtree.Node
 		tests []test
 	}{{
 		"simple",
-		NewNodeFromRules(".", "a.wweir.cc", "b.wweir.cc"),
+		suffixtree.NewNodeFromRules("a.wweir.cc", "b.wweir.cc"),
 		[]test{
 			{"a.wweir.cc", true},
 			{"b.wweir.cc", true},
 		},
 	}, {
 		"parent",
-		NewNodeFromRules(".", "wweir.cc", "a.wweir.cc"),
+		suffixtree.NewNodeFromRules("wweir.cc", "a.wweir.cc"),
 		[]test{
 			{"wweir.cc", true},
 			{"a.wweir.cc", true},
@@ -30,7 +32,7 @@ func TestNode_Match(t *testing.T) {
 		},
 	}, {
 		"fuzz1",
-		NewNodeFromRules(".", "wweir.cc", "a.wweir.cc", "*.wweir.cc"),
+		suffixtree.NewNodeFromRules("wweir.cc", "a.wweir.cc", "*.wweir.cc"),
 		[]test{
 			{"wweir.cc", true},
 			{"a.wweir.cc", true},
@@ -39,15 +41,16 @@ func TestNode_Match(t *testing.T) {
 		},
 	}, {
 		"fuzz2",
-		NewNodeFromRules(".", "a.*.cc"),
+		suffixtree.NewNodeFromRules("a.*.cc", "c.wweir.*"),
 		[]test{
 			{"wweir.cc", false},
 			{"a.wweir.cc", true},
 			{"b.wweir.cc", false},
+			{"c.wweir.cc", true},
 		},
 	}, {
 		"fuzz3",
-		NewNodeFromRules(".", "*.*.cc", "iamp.*.*"),
+		suffixtree.NewNodeFromRules("*.*.cc", "iamp.*.*"),
 		[]test{
 			{"wweir.cc", false},
 			{"a.wweir.cc", true},
@@ -56,13 +59,20 @@ func TestNode_Match(t *testing.T) {
 		},
 	}, {
 		"fuzz4",
-		NewNodeFromRules(".", "**.cc", "a.**.com"),
+		suffixtree.NewNodeFromRules("**.cc", "a.**.com", "**.wweir.*"),
 		[]test{
 			{"wweir.cc", true},
 			{"a.wweir.cc", true},
 			{"a.b.wweir.cc", true},
-			{"a.wweir.com", true},
-			{"b.wweir.com", false},
+			{"a.fuzz.com", true},
+			{"b.fuzz.com", false},
+			{"www.wweir.com", true},
+		},
+	}, {
+		"github",
+		suffixtree.NewNodeFromRules("**.github.com"),
+		[]test{
+			{"github.com", true},
 		},
 	}}
 	for _, tt := range tests {

pkg/suffixtree/util.go

@@ -0,0 +1,6 @@
+package suffixtree
+
+func GCSlice[T any](arr []T) []T {
+	old := arr
+	return append(make([]T, 0, len(old)), old...)
+}

proxy/client.go

@@ -1,86 +0,0 @@
-package proxy
-
-import (
-	"net"
-
-	"github.com/golang/glog"
-	"github.com/wweir/sower/proxy/kcp"
-	"github.com/wweir/sower/proxy/quic"
-	"github.com/wweir/sower/proxy/tcp"
-	"github.com/wweir/sower/shadow"
-)
-
-type Client interface {
-	Dial(server string) (net.Conn, error)
-}
-
-func NewClient(netType string) Client {
-	switch netType {
-	case QUIC.String():
-		return quic.NewClient()
-	case KCP.String():
-		return kcp.NewClient()
-	case TCP.String():
-		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
-
-		if !resolved {
-			if addr, err := net.ResolveTCPAddr("tcp", server); err != nil {
-				glog.Errorln(err)
-			} else {
-				server = addr.String()
-				resolved = true
-			}
-		}
-		glog.V(1).Infof("new conn from (%s) to (%s)", conn.RemoteAddr(), server)
-
-		rc, err := client.Dial(server)
-		if err != nil {
-			conn.Close()
-			glog.Errorln(err)
-			continue
-		}
-		rc = shadow.Shadow(rc, cipher, password)
-
-		go relay(conn, rc)
-	}
-}
-
-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", net.JoinHostPort(listenIP, port))
-			if err != nil {
-				glog.Fatalln(err)
-			}
-
-			for {
-				conn, err := ln.Accept()
-				if err != nil {
-					glog.Errorln("accept", listenIP+port, "fail:", err)
-					continue
-				}
-
-				conn.(*net.TCPConn).SetKeepAlive(true)
-				connCh <- conn
-			}
-		}(ports[i])
-	}
-
-	glog.Infoln("listening ports:", ports)
-	return connCh
-}

proxy/http_proxy.go

@@ -1,103 +0,0 @@
-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/client.go

@@ -1,65 +0,0 @@
-package kcp
-
-import (
-	"net"
-
-	"github.com/pkg/errors"
-	kcp "github.com/xtaci/kcp-go"
-)
-
-type client struct {
-	DataShard    int
-	ParityShard  int
-	DSCP         int
-	SockBuf      int
-	AckNodelay   bool
-	NoDelay      int
-	Interval     int
-	Resend       int
-	NoCongestion int
-	SndWnd       int
-	RcvWnd       int
-	MTU          int
-}
-
-func NewClient() *client {
-	return &client{
-		DataShard:    10,
-		ParityShard:  3,
-		DSCP:         0,
-		SockBuf:      4194304,
-		NoDelay:      0,
-		Interval:     50,
-		Resend:       0,
-		NoCongestion: 0,
-		SndWnd:       0,
-		RcvWnd:       0,
-		MTU:          1350,
-	}
-}
-
-func (c *client) Dial(server string) (net.Conn, error) {
-	conn, err := kcp.DialWithOptions(server, nil, c.DataShard, c.ParityShard)
-	if err != nil {
-		return nil, errors.Wrap(err, "dial")
-	}
-
-	conn.SetStreamMode(true)
-	conn.SetWriteDelay(false)
-	conn.SetNoDelay(c.NoDelay, c.Interval, c.Resend, c.NoCongestion)
-	conn.SetWindowSize(c.SndWnd, c.RcvWnd)
-	conn.SetMtu(c.MTU)
-	conn.SetACKNoDelay(c.AckNodelay)
-
-	if err := conn.SetDSCP(c.DSCP); err != nil {
-		return nil, errors.Wrap(err, "SetDSCP")
-	}
-	if err := conn.SetReadBuffer(c.SockBuf); err != nil {
-		return nil, errors.Wrap(err, "SetReadBuffer")
-	}
-	if err := conn.SetWriteBuffer(c.SockBuf); err != nil {
-		return nil, errors.Wrap(err, "SetWriteBuffer")
-	}
-
-	return conn, nil
-}

proxy/kcp/server.go

@@ -1,56 +0,0 @@
-package kcp
-
-import (
-	"net"
-
-	"github.com/golang/glog"
-	"github.com/pkg/errors"
-	kcp "github.com/xtaci/kcp-go"
-)
-
-type server struct {
-	DataShard   int
-	ParityShard int
-	DSCP        int
-	SockBuf     int
-}
-
-func NewServer() *server {
-	return &server{
-		DataShard:   10,
-		ParityShard: 3,
-		DSCP:        0,
-		SockBuf:     4194304,
-	}
-}
-
-func (s *server) Listen(port string) (<-chan net.Conn, error) {
-	ln, err := kcp.ListenWithOptions(port, nil, s.DataShard, s.ParityShard)
-	if err != nil {
-		return nil, err
-	}
-
-	if err := ln.SetDSCP(s.DSCP); err != nil {
-		return nil, errors.Wrap(err, "SetDSCP")
-	}
-	if err := ln.SetReadBuffer(s.SockBuf); err != nil {
-		return nil, errors.Wrap(err, "SetReadBuffer")
-	}
-	if err := ln.SetWriteBuffer(s.SockBuf); err != nil {
-		return nil, errors.Wrap(err, "SetWriteBuffer")
-	}
-
-	connCh := make(chan net.Conn)
-	go func() {
-		for {
-			conn, err := ln.AcceptKCP()
-			if err != nil {
-				glog.Fatalln("KCP listen:", err)
-			}
-
-			connCh <- conn
-		}
-	}()
-
-	return connCh, nil
-}

proxy/nettype_string.go

@@ -1,16 +0,0 @@
-// Code generated by "stringer -type=netType util.go"; DO NOT EDIT.
-
-package proxy
-
-import "strconv"
-
-const _netType_name = "QUICKCPTCP"
-
-var _netType_index = [...]uint8{0, 4, 7, 10}
-
-func (i netType) String() string {
-	if i < 0 || i >= netType(len(_netType_index)-1) {
-		return "netType(" + strconv.FormatInt(int64(i), 10) + ")"
-	}
-	return _netType_name[_netType_index[i]:_netType_index[i+1]]
-}

proxy/quic/client.go

@@ -1,57 +0,0 @@
-package quic
-
-import (
-	"crypto/tls"
-	"net"
-	"time"
-
-	quic "github.com/lucas-clemente/quic-go"
-	"github.com/pkg/errors"
-	"github.com/wweir/sower/util"
-)
-
-type client struct {
-	conf *quic.Config
-	sess quic.Session
-}
-
-func NewClient() *client {
-	return &client{
-		conf: &quic.Config{
-			HandshakeTimeout:   5 * time.Second,
-			MaxIncomingStreams: 1024,
-			KeepAlive:          true,
-			IdleTimeout:        5 * time.Minute,
-		},
-	}
-}
-
-func (c *client) Dial(server string) (net.Conn, error) {
-	if c.sess == nil {
-		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 := util.WithTimeout(func() (err error) {
-		if stream, err = c.sess.OpenStream(); err != nil {
-			c.sess = nil
-		}
-		return
-	}, time.Second); err != nil {
-		return nil, errors.Wrap(err, "stream")
-	}
-
-	return &streamConn{
-		Stream: stream,
-		sess:   c.sess,
-	}, nil
-}

proxy/quic/server.go

@@ -1,59 +0,0 @@
-package quic
-
-import (
-	"net"
-	"time"
-
-	"github.com/golang/glog"
-	quic "github.com/lucas-clemente/quic-go"
-	"github.com/pkg/errors"
-)
-
-type server struct {
-	conf *quic.Config
-}
-
-func NewServer() *server {
-	return &server{
-		conf: &quic.Config{
-			HandshakeTimeout:   5 * time.Second,
-			MaxIncomingStreams: 1024,
-			KeepAlive:          true,
-			IdleTimeout:        5 * time.Minute,
-		},
-	}
-}
-
-func (s *server) Listen(port string) (<-chan net.Conn, error) {
-	ln, err := quic.ListenAddr(port, mockTlsPem(), s.conf)
-	if err != nil {
-		return nil, errors.WithStack(err)
-	}
-
-	connCh := make(chan net.Conn)
-	go func() {
-		for {
-			sess, err := ln.Accept()
-			if err != nil {
-				glog.Fatalln(err)
-			}
-			go accept(sess, connCh)
-		}
-	}()
-	return connCh, nil
-}
-
-func accept(sess quic.Session, connCh chan<- net.Conn) {
-	glog.V(1).Infoln("new session from ", sess.RemoteAddr())
-	defer sess.Close()
-
-	for {
-		stream, err := sess.AcceptStream()
-		if err != nil {
-			glog.Errorln(err)
-			return
-		}
-
-		connCh <- &streamConn{stream, sess}
-	}
-}

proxy/quic/util.go

@@ -1,48 +0,0 @@
-package quic
-
-import (
-	"crypto/rand"
-	"crypto/rsa"
-	"crypto/tls"
-	"crypto/x509"
-	"encoding/pem"
-	"math/big"
-	"net"
-
-	"github.com/golang/glog"
-	quic "github.com/lucas-clemente/quic-go"
-)
-
-type streamConn struct {
-	quic.Stream
-	sess quic.Session
-}
-
-func (s *streamConn) LocalAddr() net.Addr {
-	return s.sess.LocalAddr()
-}
-
-func (s *streamConn) RemoteAddr() net.Addr {
-	return s.sess.RemoteAddr()
-}
-
-func mockTlsPem() *tls.Config {
-	key, err := rsa.GenerateKey(rand.Reader, 1024)
-	if err != nil {
-		glog.Fatalln(err)
-	}
-	template := x509.Certificate{SerialNumber: big.NewInt(1)}
-	certDER, err := x509.CreateCertificate(rand.Reader, &template, &template, &key.PublicKey, key)
-	if err != nil {
-		glog.Fatalln(err)
-	}
-
-	certPEM := pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: certDER})
-	keyPEM := pem.EncodeToMemory(&pem.Block{Type: "RSA PRIVATE KEY", Bytes: x509.MarshalPKCS1PrivateKey(key)})
-
-	tlsCert, err := tls.X509KeyPair(certPEM, keyPEM)
-	if err != nil {
-		glog.Fatalln(err)
-	}
-	return &tls.Config{Certificates: []tls.Certificate{tlsCert}}
-}

proxy/server.go

@@ -1,73 +0,0 @@
-package proxy
-
-import (
-	"net"
-	"strings"
-
-	"github.com/golang/glog"
-	"github.com/wweir/sower/parse"
-	"github.com/wweir/sower/proxy/kcp"
-	"github.com/wweir/sower/proxy/quic"
-	"github.com/wweir/sower/proxy/tcp"
-	"github.com/wweir/sower/shadow"
-)
-
-type Server interface {
-	Listen(port string) (<-chan net.Conn, error)
-}
-
-func NewServer(netType string) Server {
-	switch netType {
-	case QUIC.String():
-		return quic.NewServer()
-	case KCP.String():
-		return kcp.NewServer()
-	case TCP.String():
-		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 := NewServer(netType).Listen(port)
-	if err != nil {
-		glog.Fatalf("listen %v fail: %s", port, err)
-	}
-
-	glog.Infoln("Server started.")
-	for {
-		conn := <-connCh
-		conn = shadow.Shadow(conn, cipher, password)
-
-		go handle(conn)
-	}
-}
-
-func handle(conn net.Conn) {
-	conn, addr, err := parse.ParseAddr(conn)
-	if err != nil {
-		conn.Close()
-		glog.Warningln(err)
-		return
-	}
-	glog.V(1).Infof("new conn from %s to %s", conn.RemoteAddr(), addr)
-
-	rc, err := net.Dial("tcp", addr)
-	if err != nil {
-		conn.Close()
-		glog.Warningln(err)
-		return
-	}
-	rc.(*net.TCPConn).SetKeepAlive(true)
-
-	relay(rc, conn)
-}

proxy/tcp/client.go

@@ -1,26 +0,0 @@
-package tcp
-
-import (
-	"net"
-	"time"
-)
-
-type client struct {
-	DialTimeout time.Duration
-}
-
-func NewClient() *client {
-	return &client{
-		DialTimeout: 5 * time.Second,
-	}
-}
-
-func (c *client) Dial(server string) (net.Conn, error) {
-	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

@@ -1,35 +0,0 @@
-package tcp
-
-import (
-	"net"
-
-	"github.com/golang/glog"
-)
-
-type server struct {
-}
-
-func NewServer() *server {
-	return &server{}
-}
-
-func (s *server) Listen(port string) (<-chan net.Conn, error) {
-	ln, err := net.Listen("tcp", port)
-	if err != nil {
-		return nil, err
-	}
-
-	connCh := make(chan net.Conn)
-	go func() {
-		for {
-			conn, err := ln.Accept()
-			if err != nil {
-				glog.Fatalln("TCP listen:", err)
-			}
-
-			conn.(*net.TCPConn).SetKeepAlive(true)
-			connCh <- conn
-		}
-	}()
-	return connCh, nil
-}

proxy/util.go

@@ -1,47 +0,0 @@
-package proxy
-
-import (
-	"io"
-	"net"
-	"sync"
-	"sync/atomic"
-	"time"
-
-	"github.com/golang/glog"
-)
-
-//go:generate stringer -type=netType $GOFILE
-type netType int
-
-const (
-	QUIC netType = iota
-	KCP
-	TCP
-)
-
-func relay(conn1, conn2 net.Conn) {
-	wg := &sync.WaitGroup{}
-	exitFlag := new(int32)
-	wg.Add(2)
-	go redirect(conn2, conn1, wg, exitFlag)
-	redirect(conn1, conn2, wg, exitFlag)
-	wg.Wait()
-}
-
-func redirect(dst, src net.Conn, wg *sync.WaitGroup, exitFlag *int32) {
-	if _, err := io.Copy(dst, src); err != nil {
-		glog.V(1).Infof("%s<>%s -> %s<>%s: %s", src.RemoteAddr(), src.LocalAddr(), dst.LocalAddr(), dst.RemoteAddr(), err)
-	}
-
-	if atomic.CompareAndSwapInt32(exitFlag, 0, 1) {
-		// wakeup blocked goroutine
-		now := time.Now()
-		src.SetDeadline(now)
-		dst.SetDeadline(now)
-	} else {
-		src.Close()
-		dst.Close()
-	}
-
-	wg.Done()
-}

router/country.go

@@ -0,0 +1,54 @@
+package router
+
+import (
+	"context"
+	"net"
+	"time"
+
+	"github.com/sower-proxy/deferlog/log"
+)
+
+func (r *Router) localSite(domain string) bool {
+	// parse domain to IP
+	ip := net.ParseIP(domain)
+	if ip == nil {
+		ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
+		defer cancel()
+
+		ips, err := net.DefaultResolver.LookupIP(ctx, "ip", domain)
+		if err != nil || len(ips) == 0 {
+			log.Warn().Err(err).
+				Str("domain", domain).
+				Int("ips", len(ips)).
+				Msg("resolve domain")
+			return false
+		}
+
+		ip = ips[0]
+	}
+
+	// CIDR match
+	for _, cidr := range r.country.cidrs {
+		if cidr.Contains(ip) {
+			return true
+		}
+	}
+
+	// MMDB match CN
+	if r.country.Reader != nil {
+		city, err := r.country.City(ip)
+		if err != nil {
+			log.Warn().Err(err).
+				Str("domain", domain).
+				IPAddr("ip", ip).
+				Msg("mmdb search")
+			return false
+		}
+
+		if city.Country.IsoCode == "CN" {
+			return true
+		}
+	}
+
+	return false
+}

router/dns.go

@@ -0,0 +1,105 @@
+package router
+
+import (
+	"net"
+
+	"github.com/miekg/dns"
+	"github.com/sower-proxy/deferlog/log"
+	"github.com/wweir/sower/pkg/dhcp"
+)
+
+func (r *Router) ServeDNS(w dns.ResponseWriter, req *dns.Msg) {
+	// https://stackoverflow.com/questions/4082081/requesting-a-and-aaaa-records-in-single-dns-query/4083071#4083071
+	if len(req.Question) == 0 {
+		_ = w.WriteMsg(r.dnsFail(req, dns.RcodeFormatError))
+		return
+	}
+
+	domain := req.Question[0].Name
+	// 1. rule_based( block > direct > proxy )
+	switch {
+	case r.BlockRule.Match(domain):
+		_ = w.WriteMsg(r.dnsFail(req, dns.RcodeNameError))
+		return
+
+	case r.DirectRule.Match(domain):
+
+	case r.ProxyRule.Match(domain):
+		host, _, err := net.SplitHostPort(w.LocalAddr().String())
+		log.DebugWarn(err).Str("host", host).Msg("proxy dns")
+		_ = w.WriteMsg(r.dnsProxyA(domain, net.ParseIP(host), req))
+		return
+	}
+
+	// 2. direct with cache, do not fallback to proxy to avoid side-effect
+	resp, err := r.Exchange(req)
+	if err != nil {
+		_ = w.WriteMsg(r.dnsFail(req, dns.RcodeServerFailure))
+	} else {
+		_ = w.WriteMsg(resp)
+	}
+}
+
+func (r *Router) dnsFail(req *dns.Msg, rcode int) *dns.Msg {
+	m := new(dns.Msg)
+	m.SetRcode(req, rcode)
+	return m
+}
+
+func (r *Router) dnsProxyA(domain string, localIP net.IP, req *dns.Msg) *dns.Msg {
+	m := new(dns.Msg)
+	m.SetReply(req)
+
+	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
+}
+
+var upstreamAddrs []string
+var upstreamIndex = -1
+var queryCount = 0
+
+func (r *Router) Exchange(req *dns.Msg) (_ *dns.Msg, err error) {
+	queryCount++
+	if upstreamIndex < 0 {
+		dnsIPs, err := dhcp.GetDNSServer()
+		log.Err(err).
+			Int("queryCount", queryCount).
+			Strs("dns", dnsIPs).
+			Msg("get dns server")
+
+		addrs := make([]string, 0, len(dnsIPs)+1)
+		for _, ip := range dnsIPs {
+			if ip != string(r.dns.serveIP) {
+				addrs = append(addrs, net.JoinHostPort(ip, "53"))
+			}
+		}
+		if len(addrs) == 0 {
+			addrs = append(addrs, net.JoinHostPort(r.dns.fallbackDNS, "53"))
+		}
+
+		queryCount = 0
+		upstreamAddrs = addrs
+		upstreamIndex = len(addrs) - 1
+	}
+
+	resp, err := dns.Exchange(req, upstreamAddrs[upstreamIndex])
+	if err != nil {
+		upstreamIndex--
+		if upstreamIndex >= 0 {
+			resp, err = dns.Exchange(req, upstreamAddrs[upstreamIndex])
+		}
+	}
+
+	return resp, err
+}

router/ping.go

@@ -0,0 +1,51 @@
+package router
+
+import (
+	"net/http"
+	"sync"
+	"time"
+
+	"github.com/sower-proxy/deferlog/log"
+	"github.com/sower-proxy/mem"
+)
+
+var accessCache = mem.NewRotateCache(time.Hour, httpPing)
+
+func (r *Router) isAccess(domain string, port uint16) bool {
+	switch port {
+	case 80:
+	case 443:
+	default:
+		return false
+	}
+
+	ok, _ := accessCache.Get(domain)
+	return ok
+}
+
+var pingClient = http.Client{
+	Timeout: 2 * time.Second,
+}
+
+func httpPing(key string) (bool, error) {
+	wg := sync.WaitGroup{}
+	wg.Add(2)
+	var err80, err443 error
+	go func() {
+		_, err80 = pingClient.Head("http://" + key)
+		wg.Done()
+	}()
+	go func() {
+		_, err443 = pingClient.Head("https://" + key)
+		wg.Done()
+	}()
+	wg.Wait()
+
+	if err80 != nil && err443 != nil {
+		log.Warn().
+			Errs("errs", []error{err80, err443}).
+			Msg("Failed to ping")
+	}
+
+	return err80 == nil && err443 == nil, nil
+}

router/router.go

@@ -0,0 +1,109 @@
+package router
+
+import (
+	"net"
+	"strconv"
+	"time"
+
+	"github.com/miekg/dns"
+	geoip2 "github.com/oschwald/geoip2-golang"
+	"github.com/pkg/errors"
+	"github.com/sower-proxy/conns/relay"
+	"github.com/sower-proxy/deferlog"
+	"github.com/sower-proxy/deferlog/log"
+	"github.com/wweir/sower/pkg/suffixtree"
+)
+
+type ProxyDialFn func(network, host string, port uint16) (net.Conn, error)
+type Router struct {
+	BlockRule  *suffixtree.Node
+	DirectRule *suffixtree.Node
+	ProxyRule  *suffixtree.Node
+	ProxyDial  ProxyDialFn
+
+	dns struct {
+		dns.Client
+		fallbackDNS string
+		serveIP     net.IP
+	}
+
+	country struct {
+		*geoip2.Reader
+		cidrs []*net.IPNet
+	}
+}
+
+func NewRouter(serveIP, fallbackDNS, mmdbFile string, proxyDial ProxyDialFn) *Router {
+	r := Router{
+		ProxyDial: proxyDial,
+	}
+
+	r.dns.serveIP = net.ParseIP(serveIP)
+	r.dns.fallbackDNS = fallbackDNS
+
+	var err error
+	r.country.Reader, err = geoip2.Open(mmdbFile)
+	log.InfoWarn(err).Str("file", mmdbFile).Msg("open geoip2 db")
+
+	return &r
+}
+
+func (r *Router) AddCountryCIDRs(cidrs ...string) {
+	for _, cidr := range cidrs {
+		_, ipnet, err := net.ParseCIDR(cidr)
+		if err != nil {
+			log.Error().Err(err).Msg("Failed to parse CIDR")
+		}
+		r.country.cidrs = append(r.country.cidrs, ipnet)
+	}
+	r.country.cidrs = suffixtree.GCSlice(r.country.cidrs)
+}
+
+func (r *Router) RouteHandle(conn net.Conn, domain string, port uint16) (err error) {
+	start := time.Now()
+	defer func() {
+		deferlog.DebugWarn(err).
+			Str("domain", domain).
+			Uint16("port", port).
+			Dur("spend", time.Since(start)).
+			Msg("serve socks5")
+	}()
+
+	addr := net.JoinHostPort(domain, strconv.FormatUint(uint64(port), 10))
+
+	// 1. rule_based( block > direct > proxy )
+	// 2. detect_based( CN IP || access site )
+	// 3. fallback( proxy )
+	switch {
+	case r.BlockRule.Match(domain):
+		return nil
+
+	case r.DirectRule.Match(domain):
+		return r.DirectHandle(conn, addr)
+
+	case r.ProxyRule.Match(domain):
+		return r.ProxyHandle(conn, domain, port)
+
+	case r.localSite(domain), r.isAccess(domain, port):
+		return r.DirectHandle(conn, addr)
+	default:
+		return r.ProxyHandle(conn, domain, port)
+	}
+}
+
+func (r *Router) ProxyHandle(conn net.Conn, domain string, port uint16) error {
+	start := time.Now()
+	rc, err := r.ProxyDial("tcp", domain, port)
+	if err != nil {
+		return errors.Wrapf(err, "proxy dial (%s:%d), spend (%s)", domain, port, time.Since(start))
+	}
+	defer rc.Close()
+
+	_ = relay.Relay(conn, rc)
+	return nil
+}
+
+func (r *Router) DirectHandle(conn net.Conn, addr string) error {
+	dur, err := relay.RelayTo(conn, addr)
+	return errors.Wrapf(err, "spend (%s)", dur)
+}

router/util.go

@@ -0,0 +1,22 @@
+package router
+
+import (
+	"net"
+	"strconv"
+)
+
+func ParseHostPort(hostport string, defaultPort uint16) (string, uint16, error) {
+	host, port, err := net.SplitHostPort(hostport)
+	if err != nil {
+		return "", 0, err
+	}
+	if port == "" {
+		return host, defaultPort, nil
+	}
+
+	portInt, err := strconv.ParseUint(port, 10, 16)
+	if err != nil {
+		return "", 0, err
+	}
+	return host, uint16(portInt), nil
+}

shadow/cipher.go

@@ -1,67 +0,0 @@
-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

@@ -1,16 +0,0 @@
-// 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,4 +0,0 @@
-// 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,111 +0,0 @@
-package shadow
-
-import (
-	"crypto/cipher"
-	"encoding/binary"
-	"io"
-	"math/rand"
-	"net"
-)
-
-const MAX_SIZE = 0xFFFF
-
-type conn struct {
-	maxSize      int
-	aead         cipher.AEAD
-	encryptNonce func() []byte
-	decryptNonce func() []byte
-	writeBuf     []byte
-	readBuf      []byte
-	readOffset   int
-	net.Conn
-}
-
-func (c *conn) Read(b []byte) (n int, err error) {
-	// 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.readOffset == dataSize {
-			c.readOffset = 0
-		}
-		return
-	}
-
-	// read from conn
-	dataSize := 0
-	{ //read data size
-		c.readBuf = make([]byte, 2+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
-		}
-		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
-		}
-	}
-
-	// 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) {
-	bLen := len(b)
-	dataSize := MAX_SIZE - (2 + c.aead.Overhead()) - c.aead.Overhead()
-	if bLen < c.maxSize {
-		dataSize = bLen
-	}
-
-	// 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, cipher, password string) net.Conn {
-	aead, err := pickCipher(cipher, password)
-	if err != nil {
-		panic(err)
-	}
-
-	return &conn{
-		maxSize:      MAX_SIZE - (2 - aead.Overhead()) - aead.Overhead(),
-		aead:         aead,
-		encryptNonce: newNonce(password, aead.NonceSize()),
-		decryptNonce: newNonce(password, aead.NonceSize()),
-		writeBuf:     make([]byte, 0xFFFF),
-		Conn:         c,
-	}
-}
-
-func newNonce(password string, size int) func() []byte {
-	num, _ := binary.Varint([]byte(password))
-	rnd := rand.New(rand.NewSource(num))
-
-	buf := make([]byte, size)
-	return func() []byte {
-		rnd.Read(buf)
-		return buf
-	}
-}

sower.drawio.svg

@@ -0,0 +1,215 @@
+<svg host="65bd71144e" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="351px" height="491px" viewBox="-0.5 -0.5 351 491" content="&lt;mxfile&gt;&lt;diagram id=&quot;u2y3ysnPqCVZKoHCRF4D&quot; name=&quot;第 1 页&quot;&gt;3VlNc9owEP01HJPxB/7gGCBtD2mbGdppcxRY2GpsyyOLAv31XSEZW5ZJKHEIzSWR1itZem/1dmUG7iTbfGSoSD7TCKcDx4o2A3c6cJyRH8JfYdhKQxAE0hAzEkmTXRtm5A9WRktZVyTCpebIKU05KXTjguY5XnDNhhija91tSVP9rQWKsWGYLVBqWn+QiCfSGjpBbf+ESZxUb7b9kXySocpZ7aRMUETXDZN7O3AnjFIuW9lmglOBXYWLHPfhwNP9whjO+TEDxDMx4jdKV2pzamF8W+2W0VUeYTHAGrjjdUI4nhVoIZ6ugV6wJTxLoWdDU02HGcebg2uy9zuFCME0w5xtwUUNcDwFjooOO1D9dY21W/kkDZyHI2VEit94P3cNATQUCt2IDA1APn37dj8zUMERhITqUsYTGtMcpbe1dazjVvvcUVootH5hzrcqvtGKUx1LwIttf4rx117VfWg+m27U5LK3Vb0DgMPy6Yot1PoVzxyxGCsvV5rEzp7kieEUcfJbPwwvwdw2QS/p4rH0wLYqSs4wyt6EgA3hEn/HU92HCnFo1/CLzino9we1GnpPCby1PkqhfpRcv3VCJP1qVE3YDWNo23ArhEN5+D2u1/2emn85Yx0N+z0eFyD+29If/J/0e/556N8L72vRHxj6EBEmMjvYSEl4Z3TcoTmUHRqjKCVxDu0FkIMZGESiIpDYb9SDjESRDB5ckj9ovptP0KoggMm98cCbdhPtH8x+qhJRE2rJvisFWteW7QcapldqplNDonKhy2WJeYuefyXErBpKugZAHT8FLMZz0Yr5DqS2ha1SKN1gPXkkKkDMJY1zVGJhgEMrmOmhBuk4ggYxh2uQlnAObbMG2fs0axDb6qEGscO3kLujlKv3GuGAojg6/k4b1gPKdYq4jN5XbjkXQ6OzMeR2q010cSrhDI9UibAHkQguViNUGmxeLV6n4PnXOsWzPI0vz23djp9RoZb/i+uasCOw5bXHR5kI13xein+wKBhIYrxbXMHoZnsZFU9Vl7244Lmyrl3bt/WKZ/iyiqdaUGtELwWQbzA3Fp+VdiWQRh04fQdzafBVJqgQzVWW3iw4bVKzo/GeQl1LqKBoTjmnWQd3nLY0DYqnlOR4sv/u9WTWOF7o2mK/v1g0P8l06Fz7vnFSMWR+kTprfj4+PYvOPWYEtiiO2vEpe3QuwXxe4ZxX+kDgXpby2mZNMf0yq+4fgotE/M2FUFjLlK7Nc30J+ludjV4EeBiEoQb6Jd04RwZfX4Ei9j7k1W1H+xnltXp1A9klehTBDwBhA1fYEX+9CBc6XEpJFlOXnNFHgDsV/E1zmuOe0lnru5gdmnj7HXi3xfEkvG0Db6X77xlxN/SeRTzoB3Ho1r+fSaWpf4R0b/8C&lt;/diagram&gt;&lt;/mxfile&gt;">
+    <defs/>
+    <g>
+        <rect x="0" y="0" width="350" height="490" fill="#ffffff" stroke="#000000" pointer-events="all"/>
+        <path d="M 170 240 L 170 156.37" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 170 151.12 L 173.5 158.12 L 170 156.37 L 166.5 158.12 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 195px; margin-left: 170px;">
+                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                            <div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; background-color: #ffffff; white-space: nowrap; ">
+                                HTTPS
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="170" y="198" fill="#000000" font-family="Helvetica" font-size="11px" text-anchor="middle">
+                    HTTPS
+                </text>
+            </switch>
+        </g>
+        <path d="M 100 240 L 100 190 L 36.37 190" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 31.12 190 L 38.12 186.5 L 36.37 190 L 38.12 193.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 190px; margin-left: 90px;">
+                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                            <div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; background-color: #ffffff; white-space: nowrap; ">
+                                socks5 upstream
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="90" y="193" fill="#000000" font-family="Helvetica" font-size="11px" text-anchor="middle">
+                    socks5 upstream
+                </text>
+            </switch>
+        </g>
+        <path d="M 240 240 L 240 190 L 303.63 190" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 308.88 190 L 301.88 193.5 L 303.63 190 L 301.88 186.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 192px; margin-left: 252px;">
+                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                            <div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; background-color: #ffffff; white-space: nowrap; ">
+                                direct visit
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="252" y="195" fill="#000000" font-family="Helvetica" font-size="11px" text-anchor="middle">
+                    direct visit
+                </text>
+            </switch>
+        </g>
+        <rect x="30" y="240" width="280" height="100" fill="#ffffff" stroke="#000000" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 278px; height: 1px; padding-top: 290px; margin-left: 31px;">
+                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
+                                sower
+                                <br/>
+                                <br/>
+                                rules and detect based router
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="170" y="294" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    sower...
+                </text>
+            </switch>
+        </g>
+        <path d="M 170 70 L 170 36.37" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 170 31.12 L 173.5 38.12 L 170 36.37 L 166.5 38.12 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 240 70 L 240 36.37" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 240 31.12 L 243.5 38.12 L 240 36.37 L 236.5 38.12 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="30" y="70" width="280" height="80" fill="#ffffff" stroke="#000000" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 278px; height: 1px; padding-top: 110px; margin-left: 31px;">
+                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
+                                sowerd
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="170" y="114" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    sowerd
+                </text>
+            </switch>
+        </g>
+        <path d="M 255 390 L 255 360 L 170 360 L 170 346.37" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 170 341.12 L 173.5 348.12 L 170 346.37 L 166.5 348.12 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 357px; margin-left: 251px;">
+                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                            <div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; background-color: #ffffff; white-space: nowrap; ">
+                                socks5 intelligent proxy
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="251" y="360" fill="#000000" font-family="Helvetica" font-size="11px" text-anchor="middle">
+                    socks5 intelligent proxy
+                </text>
+            </switch>
+        </g>
+        <ellipse cx="255" cy="397.5" rx="7.5" ry="7.5" fill="#ffffff" stroke="#000000" pointer-events="all"/>
+        <path d="M 255 405 L 255 430 M 255 410 L 240 410 M 255 410 L 270 410 M 255 430 L 240 450 M 255 430 L 270 450" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-start; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 457px; margin-left: 255px;">
+                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: nowrap; ">
+                                Browser  Users
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="255" y="469" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Brows...
+                </text>
+            </switch>
+        </g>
+        <path d="M 85 390 L 85 360 L 170 360 L 170 346.37" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 170 341.12 L 173.5 348.12 L 170 346.37 L 166.5 348.12 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 360px; margin-left: 91px;">
+                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                            <div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; background-color: #ffffff; white-space: nowrap; ">
+                                DNS route the net flow
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="91" y="363" fill="#000000" font-family="Helvetica" font-size="11px" text-anchor="middle">
+                    DNS route the net flow
+                </text>
+            </switch>
+        </g>
+        <ellipse cx="85" cy="397.5" rx="7.5" ry="7.5" fill="#ffffff" stroke="#000000" pointer-events="all"/>
+        <path d="M 85 405 L 85 430 M 85 410 L 70 410 M 85 410 L 100 410 M 85 430 L 70 450 M 85 430 L 100 450" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-start; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 457px; margin-left: 85px;">
+                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: nowrap; ">
+                                Other Users
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="85" y="469" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Other...
+                </text>
+            </switch>
+        </g>
+        <rect x="210" y="10" width="60" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 20px; margin-left: 240px;">
+                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: nowrap; ">
+                                fake site
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="240" y="24" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    fake site
+                </text>
+            </switch>
+        </g>
+        <rect x="135" y="10" width="70" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 20px; margin-left: 170px;">
+                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: nowrap; ">
+                                target site
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="170" y="24" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    target site
+                </text>
+            </switch>
+        </g>
+    </g>
+    <switch>
+        <g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/>
+        <a transform="translate(0,-5)" xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank">
+            <text text-anchor="middle" font-size="10px" x="50%" y="100%">
+                Viewer does not support full SVG 1.1
+            </text>
+        </a>
+    </switch>
+</svg>

transport/socks5/rfc.go

@@ -0,0 +1,125 @@
+package socks5
+
+import (
+	"encoding/binary"
+	"io"
+	"net"
+)
+
+// https://tools.ietf.org/html/rfc1928
+
+// 1. client send auth request
+type authReq struct {
+	VER      byte
+	NMETHODS uint8
+	METHODS  []byte
+}
+
+func (req *authReq) Fulfill(r io.Reader) error {
+	buf := make([]byte, 2)
+	if n, err := r.Read(buf); err != nil || n != 2 {
+		return err
+	}
+
+	req.VER = buf[0]
+	req.NMETHODS = buf[1]
+
+	req.METHODS = make([]byte, int(req.NMETHODS))
+	if n, err := r.Read(req.METHODS); err != nil || n != len(req.METHODS) {
+		return err
+	}
+
+	return nil
+}
+
+func (r *authReq) IsValid() bool {
+	return r.VER == 5 && r.METHODS[0] == 0
+}
+
+// 2. server response auth request
+type authResp struct {
+	VER    byte
+	METHOD byte
+}
+
+// 3. client request with target address
+type reqHead struct {
+	VER  byte
+	CMD  byte
+	RSV  byte
+	ATYP byte
+}
+
+func (r *reqHead) IsValid() bool {
+	return r.VER == 5 && r.CMD == 1
+}
+
+// 4. server response with the address that assigned to connect to target address
+type respHead struct {
+	VER      byte
+	REP      byte
+	RSV      byte
+	ATYP     byte
+	BND_ADDR [net.IPv4len]byte
+	BND_PORT uint16
+}
+
+type addrType interface {
+	Fulfill(r io.Reader) error
+	Addr() (domain string, port uint16)
+}
+
+// ATYP:
+//	0x01 -> net.IPv4len
+//	0x03 -> first byte is length
+//	0x04 -> net.IPv6len
+type addrTypeIPv4 struct {
+	DST_ADDR [4]byte
+	DST_PORT uint16
+}
+
+func (a *addrTypeIPv4) Fulfill(r io.Reader) error {
+	return binary.Read(r, binary.BigEndian, a)
+}
+func (a *addrTypeIPv4) Addr() (string, uint16) {
+	return net.IP(a.DST_ADDR[:]).String(), a.DST_PORT
+}
+
+type addrTypeDomain struct {
+	DST_ADDR_LEN uint8
+	DST_ADDR     []byte
+	DST_PORT     uint16
+}
+
+func (a *addrTypeDomain) Fulfill(r io.Reader) error {
+	buf := make([]byte, 1)
+	if _, err := io.ReadFull(r, buf); err != nil {
+		return err
+	}
+
+	a.DST_ADDR_LEN = uint8(buf[0])
+	buf = make([]byte, a.DST_ADDR_LEN+2)
+	if _, err := io.ReadFull(r, buf); err != nil {
+		return err
+	}
+
+	a.DST_ADDR = buf[:int(a.DST_ADDR_LEN)]
+	a.DST_PORT = binary.BigEndian.Uint16(buf[int(a.DST_ADDR_LEN):])
+
+	return nil
+}
+func (a *addrTypeDomain) Addr() (string, uint16) {
+	return string(a.DST_ADDR[:]), a.DST_PORT
+}
+
+type addrTypeIPv6 struct {
+	DST_ADDR [16]byte
+	DST_PORT uint16
+}
+
+func (a *addrTypeIPv6) Fulfill(r io.Reader) error {
+	return binary.Read(r, binary.BigEndian, a)
+}
+func (a *addrTypeIPv6) Addr() (string, uint16) {
+	return net.IP(a.DST_ADDR[:]).String(), a.DST_PORT
+}

transport/socks5/socks5.go

@@ -0,0 +1,113 @@
+package socks5
+
+import (
+	"bytes"
+	"encoding/binary"
+	"net"
+	"strconv"
+
+	"github.com/pkg/errors"
+)
+
+type AddrHead struct {
+	addrType
+}
+
+func (h *AddrHead) Network() string { return "tcp" }
+func (h *AddrHead) String() string {
+	host, port := h.Addr()
+	return net.JoinHostPort(host, strconv.Itoa(int(port)))
+}
+
+// Socks5 is a SOCKS5 proxy. It implements the teeconn.Conn interface.
+// It is used to be a second relay of other proxy tools.
+// user -> sower -socks5-> third-party proxy -> target
+type Socks5 struct{}
+
+func New() *Socks5 {
+	return &Socks5{}
+}
+
+var noAuthResp = authResp{VER: 5, METHOD: 0}
+var succHeadResp = respHead{VER: 5, REP: 0, RSV: 0, ATYP: 1}
+
+func (s *Socks5) Unwrap(conn net.Conn) (net.Addr, error) {
+	{ //auth
+		auth := new(authReq)
+		if err := auth.Fulfill(conn); err != nil && !auth.IsValid() {
+			return nil, errors.Errorf("read head: %v, err: %s", auth, err)
+		}
+
+		if err := binary.Write(conn, binary.BigEndian, noAuthResp); err != nil {
+			return nil, errors.Wrap(err, "write auth")
+		}
+	}
+
+	var addr addrType
+	{ // head
+		head := new(reqHead)
+		if err := binary.Read(conn, binary.BigEndian, head); err != nil || !head.IsValid() {
+			return nil, errors.Errorf("read head: %v, err: %s", head, err)
+		}
+		switch head.ATYP {
+		case 0x01: // IPv4
+			addr = &addrTypeIPv4{}
+		case 0x03: // domain name
+			addr = &addrTypeDomain{}
+		case 0x04: // IPv6
+			addr = &addrTypeIPv6{}
+		default:
+			return nil, errors.New("invalid ATYP")
+		}
+
+		if err := addr.Fulfill(conn); err != nil {
+			return nil, errors.Wrap(err, "read target")
+		}
+
+		if err := binary.Write(conn, binary.BigEndian, succHeadResp); err != nil {
+			return nil, errors.Wrap(err, "write head")
+		}
+	}
+
+	return &AddrHead{
+		addrType: addr,
+	}, nil
+}
+
+var noAuthReq = struct {
+	VER      byte
+	NMETHODS uint8
+	METHODS  byte
+}{5, 1, 0}
+var domainHead = reqHead{VER: 5, CMD: 1, RSV: 0, ATYP: 3}
+
+func (s *Socks5) Wrap(conn net.Conn, tgtHost string, tgtPort uint16) error {
+	{ // auth
+		if err := binary.Write(conn, binary.BigEndian, &noAuthReq); err != nil {
+			return errors.WithStack(err)
+		}
+
+		resp := &authResp{}
+		if err := binary.Read(conn, binary.BigEndian, resp); err != nil {
+			return errors.WithStack(err)
+		}
+	}
+	{ // head
+		buf := bytes.NewBuffer(make([]byte, 0, binary.Size(domainHead)+1+len(tgtHost)+2))
+		_ = binary.Write(buf, binary.BigEndian, domainHead)
+		buf.WriteByte(uint8(len(tgtHost)))
+		buf.WriteString(tgtHost)
+		buf.Write([]byte{byte(tgtPort >> 8), byte(tgtPort)})
+
+		if _, err := conn.Write(buf.Bytes()); err != nil {
+			return errors.WithStack(err)
+		}
+
+		head := respHead{}
+		if err := binary.Read(conn, binary.BigEndian, &head); err != nil {
+			return errors.WithStack(err)
+		}
+	}
+
+	return nil
+}

transport/sower/sower.go

@@ -0,0 +1,81 @@
+package sower
+
+import (
+	"bytes"
+	"crypto/md5"
+	"encoding/binary"
+	"net"
+	"strconv"
+
+	"github.com/pkg/errors"
+)
+
+// https://en.wikipedia.org/wiki/Domain_Name_System
+const maxDomainLength = 253
+
+var headSize = binary.Size(new(Head))
+
+// action(>=0x80) + checksum + port + target + data
+// data(HTTP, first byte < 0x7F)
+type Head struct {
+	Cmd      byte
+	Checksum uint64
+	Port     uint16
+	TgtAddr  [maxDomainLength]byte
+}
+
+func (h *Head) Network() string { return "tcp" }
+func (h *Head) String() string {
+	idx := bytes.IndexRune(h.TgtAddr[:], 0)
+	addr := string(h.TgtAddr[:idx])
+	return net.JoinHostPort(addr, strconv.Itoa(int(h.Port)))
+}
+
+type Sower struct {
+	password []byte
+}
+
+func New(password string) *Sower {
+	return &Sower{
+		password: []byte(password),
+	}
+}
+
+func (s *Sower) Unwrap(conn net.Conn) (net.Addr, error) {
+	buf := make([]byte, headSize)
+	if n, err := conn.Read(buf); err != nil || n != headSize {
+		return nil, errors.Errorf("n: %d, err: %s", n, err)
+	}
+
+	h := &Head{}
+	_ = binary.Read(bytes.NewReader(buf), binary.BigEndian, h)
+	switch h.Cmd {
+	case 0x80:
+	default:
+		return nil, errors.Errorf("invalid command: %d", h.Cmd)
+	}
+
+	if h.Checksum != sumChecksum(h.TgtAddr, s.password) {
+		return nil, errors.New("auth fail")
+	}
+
+	return h, nil
+}
+
+func (s *Sower) Wrap(conn net.Conn, tgtHost string, tgtPort uint16) error {
+	tgtAddr := [maxDomainLength]byte{}
+	copy(tgtAddr[:len(tgtHost)], []byte(tgtHost))
+
+	return binary.Write(conn, binary.BigEndian, &Head{
+		Cmd:      0x80,
+		Checksum: sumChecksum(tgtAddr, s.password),
+		Port:     tgtPort,
+		TgtAddr:  tgtAddr,
+	})
+}
+
+func sumChecksum(target [maxDomainLength]byte, password []byte) uint64 {
+	checksum := md5.Sum(append(target[:], password...))
+	checksumVal, _ := binary.Uvarint(checksum[:])
+	return checksumVal
+}

transport/transport.go

@@ -0,0 +1,10 @@
+package transport
+
+import (
+	"net"
+)
+
+type Transport interface {
+	Unwrap(conn net.Conn) (net.Addr, error)
+	Wrap(conn net.Conn, tgtHost string, tgtPort uint16) error
+}

transport/transport_test.go

@@ -0,0 +1,46 @@
+package transport
+
+import (
+	"net"
+	"strings"
+	"testing"
+
+	"github.com/sower-proxy/conns/teeconn"
+	"github.com/sower-proxy/deferlog/log"
+	"github.com/wweir/sower/transport/sower"
+	"github.com/wweir/sower/transport/trojan"
+)
+
+func init() {
+	log.Logger = log.Logger.With().Caller().Logger()
+}
+
+func testPipe(tran Transport) (net.Addr, error) {
+	r, w := net.Pipe()
+	defer r.Close()
+
+	go func(w net.Conn) {
+		defer w.Close()
+		tran.Wrap(w, "sower", 443)
+	}(w)
+
+	return tran.Unwrap(teeconn.New(r))
+}
+
+func Test_Transports(t *testing.T) {
+	if addr, err := testPipe(newSower()); err != nil || strings.TrimSpace(addr.String()) != "sower:443" {
+		t.Errorf("test sower, unexpected address: %s, err: %s", addr, err)
+	}
+
+	if addr, err := testPipe(newTrojan()); err != nil || strings.TrimSpace(addr.String()) != "sower:443" {
+		t.Errorf("test trojan, unexpected address: %s, err: %s", addr, err)
+	}
+}
+
+func newSower() *sower.Sower {
+	return sower.New("123")
+}
+
+func newTrojan() *trojan.Trojan {
+	return trojan.New("123")
+}

transport/trojan/trojan.go

@@ -0,0 +1,174 @@
+package trojan
+
+import (
+	"bytes"
+	"crypto/sha256"
+	"encoding/binary"
+	"encoding/hex"
+	"io"
+	"net"
+	"strconv"
+
+	"github.com/pkg/errors"
+)
+
+// +-----------------------+---------+----------------+---------+----------+
+// | hex(SHA224(password)) |  CRLF   | Trojan Request |  CRLF   | Payload  |
+// +-----------------------+---------+----------------+---------+----------+
+// |          56           | X'0D0A' |    Variable    | X'0D0A' | Variable |
+// +-----------------------+---------+----------------+---------+----------+
+// +-----+------+----------+----------+
+// | CMD | ATYP | DST.ADDR | DST.PORT |
+// +-----+------+----------+----------+
+// |  1  |  1   | Variable |    2     |
+// +-----+------+----------+----------+
+// o  CMD
+//         o  CONNECT X'01'
+//         o  UDP ：X'03'
+// o  ATYP
+//         o  IP V4 : X'01'
+//         o  domain: X'03'
+//         o  IP V6 : X'04'
+
+const headLen = 56 + 2 + 1 + 1
+
+type staticHead struct {
+	Passwd [56]byte
+	CRLF   [2]byte
+	CMD    uint8
+	ATYP   uint8
+}
+
+type ipv4Addr struct {
+	ADDR [4]byte
+	PORT uint16
+	CRLF [2]byte
+}
+
+func (*ipv4Addr) Network() string { return "tcp" }
+func (a *ipv4Addr) String() string {
+	return net.JoinHostPort(net.IP(a.ADDR[:]).String(), strconv.Itoa(int(a.PORT)))
+}
+
+type ipv6Addr struct {
+	ADDR [16]byte
+	PORT uint16
+	CRLF [2]byte
+}
+
+func (*ipv6Addr) Network() string { return "tcp" }
+func (a *ipv6Addr) String() string {
+	return net.JoinHostPort(net.IP(a.ADDR[:]).String(), strconv.Itoa(int(a.PORT)))
+}
+
+type domain struct {
+	ADDR string
+	PORT uint16
+	CRLF [2]byte
+}
+
+func (*domain) Network() string { return "tcp" }
+func (a *domain) String() string {
+	return net.JoinHostPort(a.ADDR, strconv.Itoa(int(a.PORT)))
+}
+func (a *domain) Fulfill(r io.Reader) error {
+	buf := make([]byte, 1)
+	if n, err := r.Read(buf); err != nil || n != 1 {
+		return errors.New("read domain length failed")
+	}
+
+	addrLen := int(buf[0])
+	buf = make([]byte, addrLen+4)
+	if n, err := r.Read(buf); err != nil || n != addrLen+4 {
+		return errors.Wrap(err, "read doamin failed")
+	}
+
+	a.ADDR = string(buf[:addrLen])
+	a.PORT = uint16(buf[addrLen])<<8 + uint16(buf[addrLen+1])
+	return nil
+}
+
+type Trojan struct {
+	headPasswd []byte
+
+	headIPv4   []byte
+	headIPv6   []byte
+	headDomain []byte
+}
+
+func New(password string) *Trojan {
+	t := &Trojan{
+		headPasswd: make([]byte, 56),
+	}
+	passSum := sha256.Sum224([]byte(password))
+	hex.Encode(t.headPasswd, passSum[:])
+
+	t.headIPv4 = append(t.headPasswd, 0x0D, 0x0A, 0x01, 0x01)
+	t.headIPv6 = append(t.headPasswd, 0x0D, 0x0A, 0x01, 0x04)
+	t.headDomain = append(t.headPasswd, 0x0D, 0x0A, 0x01, 0x03)
+	return t
+}
+
+func (t *Trojan) Unwrap(conn net.Conn) (net.Addr, error) {
+	buf := make([]byte, headLen)
+	// do not use io.ReadFull to avoid hang
+	if n, err := conn.Read(buf); err != nil || n != headLen {
+		return nil, errors.Errorf("n: %d, err: %s", n, err)
+	}
+
+	head := &staticHead{}
+	if err := binary.Read(bytes.NewBuffer(buf), binary.BigEndian, head); err != nil {
+		return nil, errors.Wrap(err, "read head")
+	}
+
+	if !bytes.Equal(head.Passwd[:], []byte(t.headPasswd)) {
+		return nil, errors.New("auth fail")
+	}
+
+	head.CMD, head.ATYP = buf[58], buf[59]
+	switch head.ATYP {
+	case 0x01: //ipv4
+		addr := &ipv4Addr{}
+		err := binary.Read(conn, binary.BigEndian, addr)
+		return addr, errors.Wrap(err, "read addr")
+
+	case 0x04: //ipv6
+		addr := &ipv6Addr{}
+		err := binary.Read(conn, binary.BigEndian, addr)
+		return addr, errors.Wrap(err, "read addr")
+
+	case 0x03: // domain
+		addr := &domain{}
+		err := addr.Fulfill(conn)
+		return addr, errors.Wrap(err, "read addr")
+
+	default:
+		return nil, errors.New("invalid ATYP")
+	}
+}
+
+func (t *Trojan) Wrap(conn net.Conn, tgtHost string, tgtPort uint16) error {
+	buf := bytes.NewBuffer(make([]byte, 0, headLen+1+len(tgtHost)+4))
+	ip := net.ParseIP(tgtHost)
+	switch {
+	case len(ip.To4()) != 0:
+		buf.Write(t.headIPv4)
+		buf.Write([]byte(ip.To4()))
+
+	case len(ip) != 0:
+		buf.Write(t.headIPv6)
+		buf.Write([]byte(ip.To16()))
+
+	default:
+		buf.Write(t.headDomain)
+		buf.WriteByte(byte(len(tgtHost)))
+		buf.WriteString(tgtHost)
+	}
+
+	buf.Write([]byte{byte(tgtPort >> 8), byte(tgtPort), 0x0D, 0x0A})
+
+	if n, err := conn.Write(buf.Bytes()); err != nil || n != len(buf.Bytes()) {
+		return errors.Errorf("n: %d, err: %s", n, err)
+	}
+	return nil
+}

util/rev_sec.go

@@ -1,52 +0,0 @@
-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

@@ -1,65 +0,0 @@
-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

@@ -1,101 +0,0 @@
-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/tee_conn.go

@@ -1,37 +0,0 @@
-package util
-
-import (
-	"net"
-)
-
-type TeeConn struct {
-	net.Conn
-	buf    []byte
-	offset int
-	tee    bool // read
-}
-
-func (t *TeeConn) StartOrReset() {
-	t.offset = 0
-	t.tee = true
-}
-func (t *TeeConn) Stop() {
-	t.offset = 0
-	t.tee = false
-}
-
-func (t *TeeConn) Read(b []byte) (n int, err error) {
-	length := len(t.buf) - t.offset
-	if length > 0 {
-		n = copy(b, t.buf[t.offset:])
-		t.offset += n
-		return
-	}
-
-	n, err = t.Conn.Read(b)
-	if t.tee {
-		t.buf = append(t.buf, b[:n]...)
-		t.offset += n
-	}
-	return n, err
-}

util/with_timeout.go

@@ -1,23 +0,0 @@
-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())
-	}
-}