Merge pull request #3 from RicYaben/middlewares

Apply middlewares before dialing
honeynet · Jan 15, 2023 · 9fe01f1 · 9fe01f1
2 parents 246c9f0 + 28addea
commit 9fe01f1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,6 +19,7 @@ workspace*.code-*
 # Transit folders
 /vendor/
 /bin/
+/tcpdump/
 
 # whatever the rules are, include all the `.md` files
 !*.md

diff --git a/riotpot/flags.go → cmd/riotpot/flags.go b/riotpot/flags.go → cmd/riotpot/flags.go
diff --git a/riotpot/main.go → cmd/riotpot/main.go b/riotpot/main.go → cmd/riotpot/main.go
diff --git a/internal/proxy/tcpproxy.go b/internal/proxy/tcpproxy.go
@@ -52,6 +52,12 @@ func (tcpProxy *TCPProxy) Start() (err error) {
 			}
 			defer client.Close()
 
+			// Apply the middlewares to the connection before dialing the server
+			_, err = tcpProxy.middlewares.Apply(client)
+			if err != nil {
+				return
+			}
+
 			// Get a connection to the server for each new connection with the client
 			server, servErr := net.DialTimeout(globals.TCP.String(), tcpProxy.service.GetAddress(), 1*time.Second)
 
@@ -65,9 +71,6 @@ func (tcpProxy *TCPProxy) Start() (err error) {
 			tcpProxy.wg.Add(1)
 
 			go func() {
-				// Apply the middlewares to the connection
-				tcpProxy.middlewares.Apply(client)
-
 				// Handle the connection between the client and the server
 				// NOTE: The handlers will defer the connections
 				tcpProxy.handle(client, server)