fix: sshd port change

shoriwe · Jun 12, 2023 · 1bf7078 · 1bf7078
1 parent df9990d
commit 1bf7078
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 13 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,7 +14,7 @@ jobs:
         with:
           go-version: "1.20"
       - name: Set up docker environment
-        run: docker compose up -d && sleep 2m
+        run: docker compose up -d
       - name: Test
         run: go test -p 1 -count 1 -coverpkg ./... -coverprofile coverage.txt -covermode count ./...
       - uses: codecov/codecov-action@v3

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -27,6 +27,6 @@ jobs:
       - name: Set up docker environment
         run: docker compose up -d
       - name: Test
-        run: go test -p 1 -count 1 -v ./... && sleep 2m
+        run: go test -p 1 -count 1 -v ./...
       - name: Clean docker environment
         run: docker compose --rmi all -v --remove-orphans
diff --git a/circuit/circuit_test.go b/circuit/circuit_test.go
@@ -29,7 +29,7 @@ func TestCircuit_Dial(t *testing.T) {
 		},
 		&SSH{
 			Network: "tcp",
-			Address: "localhost:2222",
+			Address: sshd.DefaultAddr,
 			Config:  *sshd.DefaultClientConfig(),
 		},
 	}
@@ -45,7 +45,7 @@ func TestCircuit_Dial(t *testing.T) {
 		circuit := &Circuit{
 			Chain: []Knot{&SSH{
 				Network: "tcp",
-				Address: "localhost:2222",
+				Address: sshd.DefaultAddr,
 			}},
 		}
 		_, err := circuit.Dial("tcp", "echo:80")

diff --git a/circuit/ssh_test.go b/circuit/ssh_test.go
@@ -13,7 +13,7 @@ func TestSSH_Next(t *testing.T) {
 	t.Run("Basic", func(tt *testing.T) {
 		s := &SSH{
 			Network: "tcp",
-			Address: "localhost:2222",
+			Address: sshd.DefaultAddr,
 			Config:  *sshd.DefaultClientConfig(),
 		}
 		closeFunc, dial, err := s.Next(net.Dial)

diff --git a/compose/network_test.go b/compose/network_test.go
@@ -198,7 +198,7 @@ func TestNetwork_setupSSHListener(t *testing.T) {
 			},
 		}
 		*l.Network = "tcp"
-		*l.Address = "localhost:2222"
+		*l.Address = sshd.DefaultAddr
 		*l.Data.Network = "tcp"
 		*l.Data.Address = "localhost:0"
 		*l.Auth.Username = sshd.SSHDefaultUser
@@ -252,7 +252,7 @@ func TestNetwork_setupSSHListener(t *testing.T) {
 			Auth: &Auth{},
 		}
 		*l.Network = "tcp"
-		*l.Address = "localhost:2222"
+		*l.Address = sshd.DefaultAddr
 		*l.Data.Network = "tcp"
 		*l.Data.Address = "localhost:0"
 		_, err := l.setupSSHListener()
@@ -334,7 +334,7 @@ func TestNetwork_Listen(t *testing.T) {
 			},
 		}
 		*l.Network = "tcp"
-		*l.Address = "localhost:2222"
+		*l.Address = sshd.DefaultAddr
 		*l.Data.Network = "tcp"
 		*l.Data.Address = "localhost:0"
 		*l.Auth.Username = sshd.SSHDefaultUser
@@ -411,7 +411,7 @@ func TestNetwork_setupSSHDialFunc(t *testing.T) {
 			},
 		}
 		*l.Network = "tcp"
-		*l.Address = "localhost:2222"
+		*l.Address = sshd.DefaultAddr
 		*l.Data.Network = "tcp"
 		*l.Data.Address = "localhost:0"
 		*l.Auth.Username = sshd.SSHDefaultUser
@@ -479,7 +479,7 @@ func TestNetwork_DialFunc(t *testing.T) {
 			},
 		}
 		*l.Network = "tcp"
-		*l.Address = "localhost:2222"
+		*l.Address = sshd.DefaultAddr
 		*l.Data.Network = "tcp"
 		*l.Data.Address = "localhost:0"
 		*l.Auth.Username = sshd.SSHDefaultUser

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -21,8 +21,8 @@ services:
     networks:
       - fullproxy
     ports:
-      - "127.0.0.1:2222:22"
-      #- "[::1]:2222:22"
+      - "127.0.0.1:22222:22"
+      #- "[::1]:22222:22"
     volumes:
       - ./sshd/entrypoint.sh:/etc/entrypoint.d/entrypoint.sh:ro
     environment:

diff --git a/sshd/default.go b/sshd/default.go
@@ -11,6 +11,7 @@ import (
 const (
 	SSHDefaultUser     = "low"
 	SSHDefaultPassword = "password"
+	DefaultAddr        = "localhost:22222"
 )
 
 func DefaultClientConfig() *ssh.ClientConfig {
@@ -24,7 +25,7 @@ func DefaultClientConfig() *ssh.ClientConfig {
 }
 
 func DefaultClient(t *testing.T) *ssh.Client {
-	client, dErr := ssh.Dial("tcp", "localhost:2222", DefaultClientConfig())
+	client, dErr := ssh.Dial("tcp", DefaultAddr, DefaultClientConfig())
 	assert.Nil(t, dErr)
 	return client
 }