From ffb5a4f92791e980657e2b9bc3a467c870a1ba0a Mon Sep 17 00:00:00 2001
From: its-a-feature <codybthomas@gmail.com>
Date: Mon, 5 Aug 2024 18:17:58 -0500
Subject: [PATCH] slight update to rpfwd timeouts

---
 CHANGELOG.MD                                      | 3 ++-
 VERSION                                           | 2 +-
 mythic-docker/src/VERSION                         | 2 +-
 mythic-docker/src/rabbitmq/utils_proxy_traffic.go | 4 +++-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.MD b/CHANGELOG.MD
index f67da32d3..fe0ad5d46 100644
--- a/CHANGELOG.MD
+++ b/CHANGELOG.MD
@@ -4,12 +4,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [3.3.0-rc14] - 2024-08-05
+## [3.3.0-rc15] - 2024-08-05
 
 ### Changed
 
 - Updated the login function to return the user's utc time preference
 - Added button to show/hide deleted consuming containers
+- Shortened the dial time for rpfwd connections to 5s instead of 30s
 
 ## [3.3.0-rc13] - 2024-08-05
 
diff --git a/VERSION b/VERSION
index 9f80ae8da..7211e9019 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.3.0-rc14
\ No newline at end of file
+3.3.0-rc15
\ No newline at end of file
diff --git a/mythic-docker/src/VERSION b/mythic-docker/src/VERSION
index 9f80ae8da..7211e9019 100644
--- a/mythic-docker/src/VERSION
+++ b/mythic-docker/src/VERSION
@@ -1 +1 @@
-3.3.0-rc14
\ No newline at end of file
+3.3.0-rc15
\ No newline at end of file
diff --git a/mythic-docker/src/rabbitmq/utils_proxy_traffic.go b/mythic-docker/src/rabbitmq/utils_proxy_traffic.go
index f82ea7738..594e4da7c 100644
--- a/mythic-docker/src/rabbitmq/utils_proxy_traffic.go
+++ b/mythic-docker/src/rabbitmq/utils_proxy_traffic.go
@@ -885,7 +885,9 @@ func (p *callbackPortUsage) manageConnections() {
 					//logging.LogInfo("send message along to acceptedConnection's messagesFromAgent", "chan", newMsg.ServerID)
 				} else {
 					// got a new serverID from the agent that we aren't tracking, so we need to make a new connection
-					if conn, err := net.Dial("tcp", fmt.Sprintf("%s:%d", p.RemoteIP, p.RemotePort)); err != nil {
+					d := net.Dialer{Timeout: 5 * time.Second}
+					conn, err := d.Dial("tcp", fmt.Sprintf("%s:%d", p.RemoteIP, p.RemotePort))
+					if err != nil {
 						logging.LogError(err, "Failed to connect to remote for rpfwd", "remote_ip", p.RemoteIP, "remote port", p.RemotePort)
 						interceptProxyToAgentMessageChan <- interceptProxyToAgentMessage{
 							Message: proxyToAgentMessage{