Merge pull request #81 from lwch/dev

lwch · web-flow · commit ba8540b95766 · 2023-11-29T18:43:33.000+08:00
v0.13.0
diff --git a/.github/workflows/build-builder-image.yml b/.github/workflows/build-builder-image.yml
@@ -7,28 +7,29 @@ on:
     - cron: '30 0 * * *'
 
 env:
-  GO_VERSION: "1.20.3"
+  GO_VERSION: "1.20.11"
 
 jobs:
 
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: builder
 
-      - uses: docker/setup-qemu-action@v2
-      - uses: docker/setup-buildx-action@v2
+      - uses: docker/setup-qemu-action@v3
+      - uses: docker/setup-buildx-action@v3
 
-      - uses: docker/login-action@v2
+      - uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - uses: docker/build-push-action@v3
+      - uses: docker/build-push-action@v5
         with:
           context: .
+          pull: true
           push: true
           tags: lwch/natpass-builder:${{ env.GO_VERSION }}
           build-args: |
diff --git a/.github/workflows/build-release-image.yml b/.github/workflows/build-release-image.yml
@@ -11,20 +11,21 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: release
 
-      - uses: docker/setup-qemu-action@v2
-      - uses: docker/setup-buildx-action@v2
+      - uses: docker/setup-qemu-action@v3
+      - uses: docker/setup-buildx-action@v3
 
-      - uses: docker/login-action@v2
+      - uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - uses: docker/build-push-action@v3
+      - uses: docker/build-push-action@v5
         with:
           context: .
+          pull: true
           push: true
           tags: lwch/natpass-release
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,20 +15,18 @@ jobs:
         os:
           - ubuntu-20.04
           - ubuntu-22.04
-          - windows-2019
-          - windows-2022
-          - macos-10.15
           - macos-11
           - macos-12
+          - macos-13
         go:
           - '1.18'
           - '1.19'
           - '1.20'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
           go-version: ${{ matrix.go }}
 
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -38,7 +38,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,7 +12,7 @@ jobs:
       - id: get_version
         run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: build
         uses: lwch/natpass@builder
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -220,4 +220,10 @@
 ## v0.12.3
 
 1. go版本升级到1.20.3
-2. 更新第三方库
+2. 更新第三方库
+
+## v0.13.0
+
+1. 支持自动生成local_port
+2. 更新第三方库
+3. go版本升级到1.20.11
diff --git a/code/client/app/handler.go b/code/client/app/handler.go
@@ -30,7 +30,7 @@ func (p *program) shellCreate(mgr *rule.Mgr, conn *conn.Conn, msg *network.Msg)
 	create := msg.GetCreq()
 	tn := mgr.GetLinked(create.GetName(), msg.GetFrom())
 	if tn == nil {
-		tn = shell.New(global.Rule{
+		tn = shell.New(&global.Rule{
 			Name:   create.GetName(),
 			Target: msg.GetFrom(),
 			Type:   "shell",
@@ -57,7 +57,7 @@ func (p *program) vncCreate(confDir string, mgr *rule.Mgr, conn *conn.Conn, msg
 	create := msg.GetCreq()
 	tn := mgr.GetLinked(create.GetName(), msg.GetFrom())
 	if tn == nil {
-		tn = vnc.New(global.Rule{
+		tn = vnc.New(&global.Rule{
 			Name:   create.GetName(),
 			Target: msg.GetFrom(),
 			Type:   "vnc",
@@ -92,7 +92,7 @@ func (p *program) codeCreate(confDir string, mgr *rule.Mgr, conn *conn.Conn, msg
 	create := msg.GetCreq()
 	tn := mgr.GetLinked(create.GetName(), msg.GetFrom())
 	if tn == nil {
-		tn = code.New(global.Rule{
+		tn = code.New(&global.Rule{
 			Name:   create.GetName(),
 			Target: msg.GetFrom(),
 			Type:   "code-server",
diff --git a/code/client/conn/send_conn.go b/code/client/conn/send_conn.go
@@ -9,7 +9,7 @@ import (
 )
 
 // SendConnectReq send connect request message
-func (conn *Conn) SendConnectReq(id string, cfg global.Rule) {
+func (conn *Conn) SendConnectReq(id string, cfg *global.Rule) {
 	var msg network.Msg
 	msg.To = cfg.Target
 	msg.XType = network.Msg_connect_req
@@ -68,7 +68,7 @@ func (conn *Conn) SendConnectReq(id string, cfg global.Rule) {
 }
 
 // SendConnectVnc send connect vnc request message
-func (conn *Conn) SendConnectVnc(id string, cfg global.Rule, quality uint64, showCursor bool) {
+func (conn *Conn) SendConnectVnc(id string, cfg *global.Rule, quality uint64, showCursor bool) {
 	var msg network.Msg
 	msg.To = cfg.Target
 	msg.XType = network.Msg_connect_req
diff --git a/code/client/global/conf.go b/code/client/global/conf.go
@@ -42,7 +42,7 @@ type Configure struct {
 	DashboardEnabled bool
 	DashboardListen  string
 	DashboardPort    uint16
-	Rules            []Rule
+	Rules            []*Rule
 	CodeDir          string
 }
 
@@ -70,8 +70,8 @@ func LoadConf(dir string) *Configure {
 			Listen  string `yaml:"listen"`
 			Port    uint16 `yaml:"port"`
 		} `yaml:"dashboard"`
-		Rules   []Rule `yaml:"rules"`
-		CodeDir string `yaml:"codedir"`
+		Rules   []*Rule `yaml:"rules"`
+		CodeDir string  `yaml:"codedir"`
 	}
 	cfg.ID = "unset"
 	cfg.Server = "127.0.0.1:6154"
diff --git a/code/client/global/port.go b/code/client/global/port.go
@@ -0,0 +1,15 @@
+package global
+
+import (
+	"net"
+
+	"github.com/lwch/runtime"
+)
+
+// GeneratePort generate port for listen
+func GeneratePort() uint16 {
+	l, err := net.ListenTCP("tcp", &net.TCPAddr{})
+	runtime.Assert(err)
+	defer l.Close()
+	return uint16(l.Addr().(*net.TCPAddr).Port)
+}
diff --git a/code/client/rule/bench/bench.go b/code/client/rule/bench/bench.go
@@ -15,7 +15,7 @@ import (
 // Bench benchmark handler
 type Bench struct {
 	Name string
-	cfg  global.Rule
+	cfg  *global.Rule
 }
 
 // Link bench link
@@ -39,7 +39,7 @@ func (link *Link) GetPackets() (uint64, uint64) {
 }
 
 // New new benchmark handler
-func New(cfg global.Rule) *Bench {
+func New(cfg *global.Rule) *Bench {
 	return &Bench{
 		Name: cfg.Name,
 		cfg:  cfg,
@@ -92,6 +92,10 @@ func (bench *Bench) Handle(conn *conn.Conn) {
 	mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
 		bench.http(conn, w, r)
 	})
+	if bench.cfg.LocalPort == 0 {
+		bench.cfg.LocalPort = global.GeneratePort()
+		logging.Info("generate port for %s: %d", bench.Name, bench.cfg.LocalPort)
+	}
 	svr := &http.Server{
 		Addr:    fmt.Sprintf("%s:%d", bench.cfg.LocalAddr, bench.cfg.LocalPort),
 		Handler: mux,
diff --git a/code/client/rule/code/code.go b/code/client/rule/code/code.go
@@ -20,14 +20,14 @@ import (
 type Code struct {
 	sync.RWMutex
 	Name         string
-	cfg          global.Rule
+	cfg          *global.Rule
 	workspace    map[string]*Workspace
 	readTimeout  time.Duration
 	writeTimeout time.Duration
 }
 
 // New new code-server handler
-func New(cfg global.Rule, readTimeout, writeTimeout time.Duration) *Code {
+func New(cfg *global.Rule, readTimeout, writeTimeout time.Duration) *Code {
 	return &Code{
 		Name:         cfg.Name,
 		cfg:          cfg,
@@ -110,6 +110,10 @@ func (code *Code) Handle(c *conn.Conn) {
 	mux.HandleFunc("/info", code.Info)
 	mux.HandleFunc("/forward/", pf(code.Forward))
 	mux.HandleFunc("/", pf(code.Render))
+	if code.cfg.LocalPort == 0 {
+		code.cfg.LocalPort = global.GeneratePort()
+		logging.Info("generate port for %s: %d", code.Name, code.cfg.LocalPort)
+	}
 	svr := &http.Server{
 		Addr:    fmt.Sprintf("%s:%d", code.cfg.LocalAddr, code.cfg.LocalPort),
 		Handler: mux,
diff --git a/code/client/rule/shell/shell.go b/code/client/rule/shell/shell.go
@@ -18,14 +18,14 @@ import (
 type Shell struct {
 	sync.RWMutex
 	Name         string
-	cfg          global.Rule
+	cfg          *global.Rule
 	links        map[string]*Link
 	readTimeout  time.Duration
 	writeTimeout time.Duration
 }
 
 // New new shell
-func New(cfg global.Rule, readTimeout, writeTimeout time.Duration) *Shell {
+func New(cfg *global.Rule, readTimeout, writeTimeout time.Duration) *Shell {
 	return &Shell{
 		Name:         cfg.Name,
 		cfg:          cfg,
@@ -113,6 +113,10 @@ func (shell *Shell) Handle(c *conn.Conn) {
 	mux.HandleFunc("/ws/", pf(shell.WS))
 	mux.HandleFunc("/resize", pf(shell.Resize))
 	mux.HandleFunc("/", shell.Render)
+	if shell.cfg.LocalPort == 0 {
+		shell.cfg.LocalPort = global.GeneratePort()
+		logging.Info("generate port for %s: %d", shell.Name, shell.cfg.LocalPort)
+	}
 	svr := &http.Server{
 		Addr:    fmt.Sprintf("%s:%d", shell.cfg.LocalAddr, shell.cfg.LocalPort),
 		Handler: mux,
diff --git a/code/client/rule/vnc/vnc.go b/code/client/rule/vnc/vnc.go
@@ -19,15 +19,15 @@ import (
 type VNC struct {
 	sync.RWMutex
 	Name         string
-	cfg          global.Rule
+	cfg          *global.Rule
 	link         *Link
 	readTimeout  time.Duration
 	writeTimeout time.Duration
 	chClipboard  chan *network.VncClipboard
 }
 
 // New new vnc
-func New(cfg global.Rule, readTimeout, writeTimeout time.Duration) *VNC {
+func New(cfg *global.Rule, readTimeout, writeTimeout time.Duration) *VNC {
 	return &VNC{
 		Name:         cfg.Name,
 		cfg:          cfg,
@@ -109,6 +109,10 @@ func (v *VNC) Handle(c *conn.Conn) {
 	mux.HandleFunc("/clipboard", pf(v.Clipboard))
 	mux.HandleFunc("/ws/", pf(v.WS))
 	mux.HandleFunc("/", v.Render)
+	if v.cfg.LocalPort == 0 {
+		v.cfg.LocalPort = global.GeneratePort()
+		logging.Info("generate port for %s: %d", v.Name, v.cfg.LocalPort)
+	}
 	svr := &http.Server{
 		Addr:    fmt.Sprintf("%s:%d", v.cfg.LocalAddr, v.cfg.LocalPort),
 		Handler: mux,
diff --git a/conf/rule.d/code-server.yaml b/conf/rule.d/code-server.yaml
@@ -7,4 +7,4 @@
   target: remote       # 目标客户端ID
   type: code-server    # code-server
   local_addr: 0.0.0.0  # 本地监听地址
-  local_port: 8000     # 本地监听端口号
+  # local_port: 8000     # 本地监听端口号
diff --git a/conf/rule.d/shell.yaml b/conf/rule.d/shell.yaml
@@ -2,7 +2,7 @@
   target: remote       # 目标客户端ID
   type: shell          # web shell
   local_addr: 0.0.0.0  # 本地监听地址
-  local_port: 2222     # 本地监听端口号
+  # local_port: 2222     # 本地监听端口号
   #exec: /bin/bash     # 运行命令
                        # windows默认powershell或cmd
                        # 其他系统bash或sh
diff --git a/conf/rule.d/vnc.yaml b/conf/rule.d/vnc.yaml
@@ -3,5 +3,5 @@
   target: remote       # 目标客户端ID
   type: vnc            # web vnc
   local_addr: 0.0.0.0  # 本地监听地址
-  local_port: 5900     # 本地监听端口号
+  # local_port: 5900     # 本地监听端口号
   fps: 10              # 刷新频率
diff --git a/docker_build b/docker_build
@@ -1,6 +1,6 @@
 #!/bin/sh
 VERSION=dev
-GO_VERSION=1.20.3
+GO_VERSION=1.20.11
 docker run -it --rm -e BUILD_VERSION=$VERSION \
     -e GOPROXY=https://goproxy.cn \
     -v `pwd`:/code -w /code lwch/natpass-builder:$GO_VERSION
diff --git a/docs/rules.md b/docs/rules.md
diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
