fix: updated reverse to manually set the dial func that uses the slave

shoriwe · Jun 11, 2023 · d08e213 · d08e213
1 parent 2b27847
commit d08e213
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 15 deletions.
diff --git a/proxies/socks5_test.go b/proxies/socks5_test.go
@@ -61,6 +61,7 @@ func TestSocks5_Reverse(t *testing.T) {
 	go func() {
 		s := &reverse.Slave{
 			Master: master,
+			Dial:   net.Dial,
 		}
 		defer s.Close()
 		go s.Serve()

diff --git a/reverse/master_test.go b/reverse/master_test.go
@@ -17,7 +17,7 @@ func TestMaster_init(t *testing.T) {
 		master := network.Dial(control.Addr().String())
 		defer master.Close()
 		go func() {
-			s := &Slave{Master: master}
+			s := &Slave{Master: master, Dial: net.Dial}
 			defer s.Close()
 			assert.Nil(tt, s.init())
 		}()
@@ -36,7 +36,7 @@ func TestMaster_init(t *testing.T) {
 		go func() {
 			master := network.Dial(control.Addr().String())
 			defer master.Close()
-			s := &Slave{Master: master}
+			s := &Slave{Master: master, Dial: net.Dial}
 			defer s.Close()
 			assert.Nil(tt, s.init())
 			assert.Nil(tt, s.init())
@@ -73,7 +73,7 @@ func TestMaster_Accept(t *testing.T) {
 		doneChan := make(chan struct{}, 2)
 		defer close(doneChan)
 		go func() {
-			s := &Slave{Master: master}
+			s := &Slave{Master: master, Dial: net.Dial}
 			defer s.Close()
 			go s.Serve()
 			<-doneChan
@@ -117,7 +117,7 @@ func TestMaster_SlaveDial(t *testing.T) {
 			<-doneChan
 		}()
 		go func() {
-			s := &Slave{Master: master}
+			s := &Slave{Master: master, Dial: net.Dial}
 			defer s.Close()
 			go s.Serve()
 			<-doneChan
@@ -149,7 +149,7 @@ func TestMaster_SlaveDial(t *testing.T) {
 		doneChan := make(chan struct{}, 1)
 		defer close(doneChan)
 		go func() {
-			s := &Slave{Master: master}
+			s := &Slave{Master: master, Dial: net.Dial}
 			defer s.Close()
 			go s.Serve()
 			<-doneChan
@@ -178,7 +178,7 @@ func TestMaster_SlaveAccept(t *testing.T) {
 		doneChan := make(chan struct{}, 2)
 		defer close(doneChan)
 		go func() {
-			s := &Slave{Master: master, Listener: sListener}
+			s := &Slave{Master: master, Listener: sListener, Dial: net.Dial}
 			defer s.Close()
 			go s.Serve()
 			<-doneChan

diff --git a/reverse/slave.go b/reverse/slave.go
@@ -7,11 +7,13 @@ import (
 	"net"
 
 	"github.com/hashicorp/yamux"
+	"github.com/shoriwe/fullproxy/v3/utils/network"
 )
 
 type Slave struct {
 	initialized bool
-	Listener    net.Listener   // Optional listener
+	Listener    net.Listener // Optional listener
+	Dial        network.DialFunc
 	Master      net.Conn       // Master connection
 	Control     *yamux.Session // Control channel
 }
@@ -47,7 +49,7 @@ func (s *Slave) HandleAccept(conn net.Conn, req *Request) (err error) {
 
 func (s *Slave) HandleDial(conn net.Conn, req *Request) (err error) {
 	var target net.Conn
-	target, err = net.Dial(req.Network, req.Address)
+	target, err = s.Dial(req.Network, req.Address)
 	if err == nil {
 		defer target.Close()
 		err = gob.NewEncoder(conn).Encode(SucceedResponse)

diff --git a/reverse/slave_test.go b/reverse/slave_test.go
@@ -18,7 +18,7 @@ func TestSlave_init(t *testing.T) {
 		master := network.Dial(control.Addr().String())
 		defer master.Close()
 		go func() {
-			s := &Slave{Master: master}
+			s := &Slave{Master: master, Dial: net.Dial}
 			defer s.Close()
 			assert.Nil(tt, s.init())
 		}()
@@ -37,7 +37,7 @@ func TestSlave_init(t *testing.T) {
 		go func() {
 			master := network.Dial(control.Addr().String())
 			defer master.Close()
-			s := &Slave{Master: master}
+			s := &Slave{Master: master, Dial: net.Dial}
 			defer s.Close()
 			assert.Nil(tt, s.init())
 			assert.Nil(tt, s.init())
@@ -78,7 +78,7 @@ func TestSlave_HandleAccept(t *testing.T) {
 			assert.Nil(tt, wErr)
 			<-doneChan
 		}()
-		s := &Slave{Master: master, Listener: sListener}
+		s := &Slave{Master: master, Listener: sListener, Dial: net.Dial}
 		defer s.Close()
 		assert.Nil(tt, s.init())
 		go func() {
@@ -119,7 +119,7 @@ func TestSlave_HandleAccept(t *testing.T) {
 			assert.NotNil(tt, cErr)
 			<-doneChan
 		}()
-		s := &Slave{Master: master}
+		s := &Slave{Master: master, Dial: net.Dial}
 		defer s.Close()
 		assert.Nil(tt, s.init())
 		job, aErr := s.Control.Accept()
@@ -159,7 +159,7 @@ func TestSlave_Handle(t *testing.T) {
 			assert.Nil(tt, wErr)
 			<-doneChan
 		}()
-		s := &Slave{Master: master, Listener: sListener}
+		s := &Slave{Master: master, Listener: sListener, Dial: net.Dial}
 		defer s.Close()
 		assert.Nil(tt, s.init())
 		go func() {
@@ -203,7 +203,7 @@ func TestSlave_Handle(t *testing.T) {
 			assert.Nil(tt, wErr)
 			<-doneChan
 		}()
-		s := &Slave{Master: master}
+		s := &Slave{Master: master, Dial: net.Dial}
 		defer s.Close()
 		assert.Nil(tt, s.init())
 		go func() {
@@ -248,7 +248,7 @@ func TestSlave_Handle(t *testing.T) {
 			}))
 			<-doneChan
 		}()
-		s := &Slave{Master: master, Listener: sListener}
+		s := &Slave{Master: master, Listener: sListener, Dial: net.Dial}
 		defer s.Close()
 		assert.Nil(tt, s.init())
 		job, aErr := s.Control.Accept()