diff --git a/.gitignore b/.gitignore index 257e47e..45895e4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -/deepin-network-proxy-manager -/deepin-network-proxy-manager-debug +/cgtproxy +/cgtproxy-debug /test/coverage.html /test/coverprofile diff --git a/Makefile b/Makefile index e38a843..ea99043 100644 --- a/Makefile +++ b/Makefile @@ -2,8 +2,8 @@ all \ coverage \ debug-build \ - deepin-network-proxy-manager \ - deepin-network-proxy-manager-debug \ + cgtproxy \ + cgtproxy-debug \ dlv-headless \ generate \ install \ @@ -12,22 +12,22 @@ test \ test/coverage.html -all: deepin-network-proxy-manager +all: cgtproxy coverage: test/coverage.html -debug-build: deepin-network-proxy-manager-debug +debug-build: cgtproxy-debug -deepin-network-proxy-manager: generate - go build ./cmd/deepin-network-proxy-manager - strip ./deepin-network-proxy-manager +cgtproxy: generate + go build ./cmd/cgtproxy + strip ./cgtproxy -deepin-network-proxy-manager-debug: generate - go build -tags debug -o deepin-network-proxy-manager-debug \ - ./cmd/deepin-network-proxy-manager +cgtproxy-debug: generate + go build -tags debug -o cgtproxy-debug \ + ./cmd/cgtproxy dlv-headless: generate - dlv debug ./cmd/deepin-network-proxy-manager --headless + dlv debug ./cmd/cgtproxy --headless generate: go generate ./... diff --git a/cmd/deepin-network-proxy-manager/cmd/check.go b/cmd/cgtproxy/cmd/check.go similarity index 85% rename from cmd/deepin-network-proxy-manager/cmd/check.go rename to cmd/cgtproxy/cmd/check.go index 9fadd72..53d9391 100644 --- a/cmd/deepin-network-proxy-manager/cmd/check.go +++ b/cmd/cgtproxy/cmd/check.go @@ -3,8 +3,8 @@ package cmd import ( "fmt" - "github.com/black-desk/deepin-network-proxy-manager/internal/consts" - . "github.com/black-desk/deepin-network-proxy-manager/internal/log" + "github.com/black-desk/cgtproxy/internal/consts" + . "github.com/black-desk/cgtproxy/internal/log" "github.com/spf13/cobra" ) diff --git a/cmd/deepin-network-proxy-manager/cmd/checkconfig.go b/cmd/cgtproxy/cmd/checkconfig.go similarity index 82% rename from cmd/deepin-network-proxy-manager/cmd/checkconfig.go rename to cmd/cgtproxy/cmd/checkconfig.go index 58fca34..5cdb516 100644 --- a/cmd/deepin-network-proxy-manager/cmd/checkconfig.go +++ b/cmd/cgtproxy/cmd/checkconfig.go @@ -4,9 +4,9 @@ import ( "fmt" "os" - "github.com/black-desk/deepin-network-proxy-manager/internal/config" - "github.com/black-desk/deepin-network-proxy-manager/internal/consts" - . "github.com/black-desk/deepin-network-proxy-manager/internal/log" + "github.com/black-desk/cgtproxy/internal/config" + "github.com/black-desk/cgtproxy/internal/consts" + . "github.com/black-desk/cgtproxy/internal/log" . "github.com/black-desk/lib/go/errwrap" "github.com/spf13/cobra" ) diff --git a/cmd/deepin-network-proxy-manager/cmd/checkkernel.go b/cmd/cgtproxy/cmd/checkkernel.go similarity index 96% rename from cmd/deepin-network-proxy-manager/cmd/checkkernel.go rename to cmd/cgtproxy/cmd/checkkernel.go index ad3199e..e59d136 100644 --- a/cmd/deepin-network-proxy-manager/cmd/checkkernel.go +++ b/cmd/cgtproxy/cmd/checkkernel.go @@ -9,8 +9,8 @@ import ( "os" "strings" - "github.com/black-desk/deepin-network-proxy-manager/internal/consts" - . "github.com/black-desk/deepin-network-proxy-manager/internal/log" + "github.com/black-desk/cgtproxy/internal/consts" + . "github.com/black-desk/cgtproxy/internal/log" . "github.com/black-desk/lib/go/errwrap" "github.com/spf13/cobra" ) diff --git a/cmd/deepin-network-proxy-manager/cmd/root.go b/cmd/cgtproxy/cmd/root.go similarity index 78% rename from cmd/deepin-network-proxy-manager/cmd/root.go rename to cmd/cgtproxy/cmd/root.go index 58479d0..cb1e6d8 100644 --- a/cmd/deepin-network-proxy-manager/cmd/root.go +++ b/cmd/cgtproxy/cmd/root.go @@ -5,10 +5,10 @@ import ( "fmt" "os" - "github.com/black-desk/deepin-network-proxy-manager/internal/config" - "github.com/black-desk/deepin-network-proxy-manager/internal/consts" - "github.com/black-desk/deepin-network-proxy-manager/internal/core" - . "github.com/black-desk/deepin-network-proxy-manager/internal/log" + "github.com/black-desk/cgtproxy/internal/config" + "github.com/black-desk/cgtproxy/internal/consts" + "github.com/black-desk/cgtproxy/internal/core" + . "github.com/black-desk/cgtproxy/internal/log" "github.com/spf13/cobra" ) @@ -17,7 +17,7 @@ var flags struct { } var rootCmd = &cobra.Command{ - Use: "deepin-network-proxy-manager", + Use: "cgtproxy", Short: "A transparent network proxy manager for deepin", RunE: func(cmd *cobra.Command, args []string) (err error) { defer func() { @@ -25,7 +25,7 @@ var rootCmd = &cobra.Command{ return } - Log.Errorw("Error occur while running deepin-network-proxy-manager.", + Log.Errorw("Error occur while running cgtproxy.", "config", flags.CfgPath, "error", err, ) diff --git a/cmd/cgtproxy/main.go b/cmd/cgtproxy/main.go new file mode 100644 index 0000000..f3167d6 --- /dev/null +++ b/cmd/cgtproxy/main.go @@ -0,0 +1,7 @@ +package main + +import "github.com/black-desk/cgtproxy/cmd/cgtproxy/cmd" + +func main() { + cmd.Execute() +} diff --git a/cmd/deepin-network-proxy-manager/main.go b/cmd/deepin-network-proxy-manager/main.go deleted file mode 100644 index f9fc1bd..0000000 --- a/cmd/deepin-network-proxy-manager/main.go +++ /dev/null @@ -1,7 +0,0 @@ -package main - -import "github.com/black-desk/deepin-network-proxy-manager/cmd/deepin-network-proxy-manager/cmd" - -func main() { - cmd.Execute() -} diff --git a/go.mod b/go.mod index 493b5ae..f0d57b5 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/black-desk/deepin-network-proxy-manager +module github.com/black-desk/cgtproxy go 1.20 diff --git a/internal/config/alloc.go b/internal/config/alloc.go index 02caacf..b03aca7 100644 --- a/internal/config/alloc.go +++ b/internal/config/alloc.go @@ -1,7 +1,7 @@ package config import ( - . "github.com/black-desk/deepin-network-proxy-manager/internal/log" + . "github.com/black-desk/cgtproxy/internal/log" . "github.com/black-desk/lib/go/errwrap" ) diff --git a/internal/config/check.go b/internal/config/check.go index 5ac43eb..6f33a94 100644 --- a/internal/config/check.go +++ b/internal/config/check.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" - "github.com/black-desk/deepin-network-proxy-manager/internal/consts" - . "github.com/black-desk/deepin-network-proxy-manager/internal/log" + "github.com/black-desk/cgtproxy/internal/consts" + . "github.com/black-desk/cgtproxy/internal/log" . "github.com/black-desk/lib/go/errwrap" fstab "github.com/deniswernert/go-fstab" "github.com/go-playground/validator/v10" diff --git a/internal/config/config_test.go b/internal/config/config_test.go index 451446b..1e05d15 100644 --- a/internal/config/config_test.go +++ b/internal/config/config_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - . "github.com/black-desk/deepin-network-proxy-manager/internal/config" + . "github.com/black-desk/cgtproxy/internal/config" . "github.com/black-desk/lib/go/ginkgo-helper" . "github.com/black-desk/lib/go/gomega-helper" "github.com/go-playground/validator/v10" diff --git a/internal/config/error.go b/internal/config/error.go index fe450fb..883cc59 100644 --- a/internal/config/error.go +++ b/internal/config/error.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/black-desk/deepin-network-proxy-manager/internal/consts" + "github.com/black-desk/cgtproxy/internal/consts" ) var ( diff --git a/internal/consts/consts.go b/internal/consts/consts.go index ade7e5a..3c9e9d8 100644 --- a/internal/consts/consts.go +++ b/internal/consts/consts.go @@ -3,12 +3,12 @@ package consts const ( CheckDocumentString = ` You might want check documentation and wiki on github for some help. -https://github.com/black-desk/deepin-network-proxy-manager +https://github.com/black-desk/cgtproxy ` - CfgPath = "/etc/deepin/network-proxy/config.yaml" + CfgPath = "/etc/cgtproxy/config.yaml" PortsPattern = `^\[(\d+),(\d+)\)$` - NftTableName = "deepin_network_proxy" + NftTableName = "cgtproxy" ) diff --git a/internal/core/core.go b/internal/core/core.go index 283e922..f622c66 100644 --- a/internal/core/core.go +++ b/internal/core/core.go @@ -5,8 +5,8 @@ import ( "github.com/sourcegraph/conc/pool" - "github.com/black-desk/deepin-network-proxy-manager/internal/config" - . "github.com/black-desk/deepin-network-proxy-manager/internal/log" + "github.com/black-desk/cgtproxy/internal/config" + . "github.com/black-desk/cgtproxy/internal/log" . "github.com/black-desk/lib/go/errwrap" ) @@ -19,7 +19,7 @@ type Core struct { type Opt = (func(*Core) (*Core, error)) func New(opts ...Opt) (ret *Core, err error) { - defer Wrap(&err, "Failed to create new deepin-network-proxy-manager core.") + defer Wrap(&err, "Failed to create new cgtproxy core.") core := &Core{} for i := range opts { diff --git a/internal/core/monitor/monitor.go b/internal/core/monitor/monitor.go index ae72ae8..5cf9b5b 100644 --- a/internal/core/monitor/monitor.go +++ b/internal/core/monitor/monitor.go @@ -1,10 +1,10 @@ package monitor import ( - "github.com/black-desk/deepin-network-proxy-manager/internal/config" - "github.com/black-desk/deepin-network-proxy-manager/internal/core/watcher" - . "github.com/black-desk/deepin-network-proxy-manager/internal/log" - "github.com/black-desk/deepin-network-proxy-manager/internal/types" + "github.com/black-desk/cgtproxy/internal/config" + "github.com/black-desk/cgtproxy/internal/core/watcher" + . "github.com/black-desk/cgtproxy/internal/log" + "github.com/black-desk/cgtproxy/internal/types" . "github.com/black-desk/lib/go/errwrap" ) diff --git a/internal/core/monitor/monitor_test.go b/internal/core/monitor/monitor_test.go index a359567..4946706 100644 --- a/internal/core/monitor/monitor_test.go +++ b/internal/core/monitor/monitor_test.go @@ -6,10 +6,10 @@ import ( "os" "testing" - "github.com/black-desk/deepin-network-proxy-manager/internal/config" - . "github.com/black-desk/deepin-network-proxy-manager/internal/core/monitor" - "github.com/black-desk/deepin-network-proxy-manager/internal/core/watcher" - "github.com/black-desk/deepin-network-proxy-manager/internal/types" + "github.com/black-desk/cgtproxy/internal/config" + . "github.com/black-desk/cgtproxy/internal/core/monitor" + "github.com/black-desk/cgtproxy/internal/core/watcher" + "github.com/black-desk/cgtproxy/internal/types" . "github.com/black-desk/lib/go/ginkgo-helper" . "github.com/black-desk/lib/go/gomega-helper" . "github.com/onsi/ginkgo/v2" diff --git a/internal/core/monitor/run.go b/internal/core/monitor/run.go index e85ec54..79ebc5d 100644 --- a/internal/core/monitor/run.go +++ b/internal/core/monitor/run.go @@ -6,8 +6,8 @@ import ( "path/filepath" "strings" - . "github.com/black-desk/deepin-network-proxy-manager/internal/log" - "github.com/black-desk/deepin-network-proxy-manager/internal/types" + . "github.com/black-desk/cgtproxy/internal/log" + "github.com/black-desk/cgtproxy/internal/types" . "github.com/black-desk/lib/go/errwrap" ) diff --git a/internal/core/providers.go b/internal/core/providers.go index e1bcd08..c41b01a 100644 --- a/internal/core/providers.go +++ b/internal/core/providers.go @@ -3,13 +3,13 @@ package core import ( "sync" - "github.com/black-desk/deepin-network-proxy-manager/internal/config" - "github.com/black-desk/deepin-network-proxy-manager/internal/core/monitor" - "github.com/black-desk/deepin-network-proxy-manager/internal/core/repeater" - "github.com/black-desk/deepin-network-proxy-manager/internal/core/rulemanager" - "github.com/black-desk/deepin-network-proxy-manager/internal/core/table" - "github.com/black-desk/deepin-network-proxy-manager/internal/core/watcher" - "github.com/black-desk/deepin-network-proxy-manager/internal/types" + "github.com/black-desk/cgtproxy/internal/config" + "github.com/black-desk/cgtproxy/internal/core/monitor" + "github.com/black-desk/cgtproxy/internal/core/repeater" + "github.com/black-desk/cgtproxy/internal/core/rulemanager" + "github.com/black-desk/cgtproxy/internal/core/table" + "github.com/black-desk/cgtproxy/internal/core/watcher" + "github.com/black-desk/cgtproxy/internal/types" "github.com/google/nftables" "github.com/google/wire" diff --git a/internal/core/rulemanager/rulemanager.go b/internal/core/rulemanager/rulemanager.go index ec32a1b..560469c 100644 --- a/internal/core/rulemanager/rulemanager.go +++ b/internal/core/rulemanager/rulemanager.go @@ -3,10 +3,10 @@ package rulemanager import ( "regexp" - "github.com/black-desk/deepin-network-proxy-manager/internal/config" - "github.com/black-desk/deepin-network-proxy-manager/internal/core/table" - . "github.com/black-desk/deepin-network-proxy-manager/internal/log" - "github.com/black-desk/deepin-network-proxy-manager/internal/types" + "github.com/black-desk/cgtproxy/internal/config" + "github.com/black-desk/cgtproxy/internal/core/table" + . "github.com/black-desk/cgtproxy/internal/log" + "github.com/black-desk/cgtproxy/internal/types" . "github.com/black-desk/lib/go/errwrap" "github.com/vishvananda/netlink" ) diff --git a/internal/core/rulemanager/run.go b/internal/core/rulemanager/run.go index 80cbc2b..60b8b63 100644 --- a/internal/core/rulemanager/run.go +++ b/internal/core/rulemanager/run.go @@ -5,10 +5,10 @@ import ( "net" "os" - "github.com/black-desk/deepin-network-proxy-manager/internal/config" - "github.com/black-desk/deepin-network-proxy-manager/internal/core/table" - . "github.com/black-desk/deepin-network-proxy-manager/internal/log" - "github.com/black-desk/deepin-network-proxy-manager/internal/types" + "github.com/black-desk/cgtproxy/internal/config" + "github.com/black-desk/cgtproxy/internal/core/table" + . "github.com/black-desk/cgtproxy/internal/log" + "github.com/black-desk/cgtproxy/internal/types" . "github.com/black-desk/lib/go/errwrap" "github.com/vishvananda/netlink" "golang.org/x/sys/unix" diff --git a/internal/core/run.go b/internal/core/run.go index 9f07a5f..888130e 100644 --- a/internal/core/run.go +++ b/internal/core/run.go @@ -6,11 +6,11 @@ import ( "os/signal" "syscall" - "github.com/black-desk/deepin-network-proxy-manager/internal/core/monitor" - "github.com/black-desk/deepin-network-proxy-manager/internal/core/repeater" - "github.com/black-desk/deepin-network-proxy-manager/internal/core/rulemanager" - "github.com/black-desk/deepin-network-proxy-manager/internal/core/watcher" - . "github.com/black-desk/deepin-network-proxy-manager/internal/log" + "github.com/black-desk/cgtproxy/internal/core/monitor" + "github.com/black-desk/cgtproxy/internal/core/repeater" + "github.com/black-desk/cgtproxy/internal/core/rulemanager" + "github.com/black-desk/cgtproxy/internal/core/watcher" + . "github.com/black-desk/cgtproxy/internal/log" . "github.com/black-desk/lib/go/errwrap" ) @@ -120,7 +120,7 @@ func (c *Core) runWatcher(ctx context.Context) (err error) { return } - Log.Debugw("Start filesystem watcher.") + Log.Debugw("Start filesystem watcher.") err = w.Run(ctx) if err != nil { diff --git a/internal/core/table/dump_debug.go b/internal/core/table/dump_debug.go index bf4b820..de77cbf 100644 --- a/internal/core/table/dump_debug.go +++ b/internal/core/table/dump_debug.go @@ -6,8 +6,8 @@ package table import ( "go.uber.org/zap" - . "github.com/black-desk/deepin-network-proxy-manager/internal/core/table/internal" - . "github.com/black-desk/deepin-network-proxy-manager/internal/log" + . "github.com/black-desk/cgtproxy/internal/core/table/internal" + . "github.com/black-desk/cgtproxy/internal/log" "github.com/google/nftables/expr" ) diff --git a/internal/core/table/init.go b/internal/core/table/init.go index 228b059..61b9cb3 100644 --- a/internal/core/table/init.go +++ b/internal/core/table/init.go @@ -3,8 +3,8 @@ package table import ( "net" - "github.com/black-desk/deepin-network-proxy-manager/internal/consts" - . "github.com/black-desk/deepin-network-proxy-manager/internal/log" + "github.com/black-desk/cgtproxy/internal/consts" + . "github.com/black-desk/cgtproxy/internal/log" . "github.com/black-desk/lib/go/errwrap" "github.com/google/nftables" "github.com/google/nftables/expr" @@ -441,7 +441,7 @@ func (t *Table) initPreroutingChain() (err error) { SourceRegister: 1, IsDestRegSet: true, SetName: t.markMap.Name, - SetID: t.markMap.ID, + SetID: t.markMap.ID, }, } exprs = addDebugCounter(exprs) diff --git a/internal/core/table/method.go b/internal/core/table/method.go index 24fa87f..32325bb 100644 --- a/internal/core/table/method.go +++ b/internal/core/table/method.go @@ -7,8 +7,8 @@ import ( "strings" "syscall" - "github.com/black-desk/deepin-network-proxy-manager/internal/config" - . "github.com/black-desk/deepin-network-proxy-manager/internal/log" + "github.com/black-desk/cgtproxy/internal/config" + . "github.com/black-desk/cgtproxy/internal/log" . "github.com/black-desk/lib/go/errwrap" "github.com/google/nftables" "github.com/google/nftables/binaryutil" diff --git a/internal/core/table/new.go b/internal/core/table/new.go index beba77a..d5a408e 100644 --- a/internal/core/table/new.go +++ b/internal/core/table/new.go @@ -1,8 +1,8 @@ package table import ( - "github.com/black-desk/deepin-network-proxy-manager/internal/config" - . "github.com/black-desk/deepin-network-proxy-manager/internal/log" + "github.com/black-desk/cgtproxy/internal/config" + . "github.com/black-desk/cgtproxy/internal/log" . "github.com/black-desk/lib/go/errwrap" "github.com/google/nftables" ) @@ -26,7 +26,7 @@ type Table struct { cgroupMap *nftables.Set cgroupMapElement map[string]nftables.SetElement - markMap *nftables.Set + markMap *nftables.Set outputChain *nftables.Chain preroutingChain *nftables.Chain diff --git a/internal/core/table/table_test.go b/internal/core/table/table_test.go index ee75dc5..79c146b 100644 --- a/internal/core/table/table_test.go +++ b/internal/core/table/table_test.go @@ -6,11 +6,11 @@ import ( "syscall" "testing" - "github.com/black-desk/deepin-network-proxy-manager/internal/config" - "github.com/black-desk/deepin-network-proxy-manager/internal/consts" - "github.com/black-desk/deepin-network-proxy-manager/internal/core/table" - . "github.com/black-desk/deepin-network-proxy-manager/internal/core/table/internal" - tabletest "github.com/black-desk/deepin-network-proxy-manager/internal/core/table/internal/test" + "github.com/black-desk/cgtproxy/internal/config" + "github.com/black-desk/cgtproxy/internal/consts" + "github.com/black-desk/cgtproxy/internal/core/table" + . "github.com/black-desk/cgtproxy/internal/core/table/internal" + tabletest "github.com/black-desk/cgtproxy/internal/core/table/internal/test" . "github.com/black-desk/lib/go/ginkgo-helper" "github.com/google/nftables" . "github.com/onsi/ginkgo/v2" diff --git a/internal/core/watcher/handler.go b/internal/core/watcher/handler.go index 8feb716..9635a27 100644 --- a/internal/core/watcher/handler.go +++ b/internal/core/watcher/handler.go @@ -4,7 +4,7 @@ import ( "errors" "os" - . "github.com/black-desk/deepin-network-proxy-manager/internal/log" + . "github.com/black-desk/cgtproxy/internal/log" fsevents "github.com/tywkeene/go-fsevents" ) diff --git a/internal/core/watcher/watcher.go b/internal/core/watcher/watcher.go index 7241888..8f71f31 100644 --- a/internal/core/watcher/watcher.go +++ b/internal/core/watcher/watcher.go @@ -1,8 +1,8 @@ package watcher import ( - "github.com/black-desk/deepin-network-proxy-manager/internal/config" - . "github.com/black-desk/deepin-network-proxy-manager/internal/log" + "github.com/black-desk/cgtproxy/internal/config" + . "github.com/black-desk/cgtproxy/internal/log" . "github.com/black-desk/lib/go/errwrap" fsevents "github.com/tywkeene/go-fsevents" ) diff --git a/internal/core/wire.go b/internal/core/wire.go index 8bc2798..e0b4d2a 100644 --- a/internal/core/wire.go +++ b/internal/core/wire.go @@ -4,10 +4,10 @@ package core import ( - "github.com/black-desk/deepin-network-proxy-manager/internal/core/monitor" - "github.com/black-desk/deepin-network-proxy-manager/internal/core/repeater" - "github.com/black-desk/deepin-network-proxy-manager/internal/core/rulemanager" - "github.com/black-desk/deepin-network-proxy-manager/internal/core/watcher" + "github.com/black-desk/cgtproxy/internal/core/monitor" + "github.com/black-desk/cgtproxy/internal/core/repeater" + "github.com/black-desk/cgtproxy/internal/core/rulemanager" + "github.com/black-desk/cgtproxy/internal/core/watcher" "github.com/google/wire" ) diff --git a/internal/core/wire_gen.go b/internal/core/wire_gen.go index a3c69ea..f8fd573 100644 --- a/internal/core/wire_gen.go +++ b/internal/core/wire_gen.go @@ -7,10 +7,10 @@ package core import ( - "github.com/black-desk/deepin-network-proxy-manager/internal/core/monitor" - "github.com/black-desk/deepin-network-proxy-manager/internal/core/repeater" - "github.com/black-desk/deepin-network-proxy-manager/internal/core/rulemanager" - "github.com/black-desk/deepin-network-proxy-manager/internal/core/watcher" + "github.com/black-desk/cgtproxy/internal/core/monitor" + "github.com/black-desk/cgtproxy/internal/core/repeater" + "github.com/black-desk/cgtproxy/internal/core/rulemanager" + "github.com/black-desk/cgtproxy/internal/core/watcher" ) // Injectors from wire.go: