feat: switching to https://github.com/reeflective/console

core/go.mod

@@ -5,7 +5,7 @@ go 1.23.3
 require (
 	github.com/Code-Hex/Neo-cowsay/v2 v2.0.4
 	github.com/Microsoft/go-winio v0.6.2
-	github.com/bettercap/readline v0.0.0-20210228151553-655e48bcb7bf
+	github.com/alecthomas/chroma v0.10.0
 	github.com/cavaliergopher/grab/v3 v3.0.1
 	github.com/creack/pty v1.1.24
 	github.com/fatih/color v1.18.0
@@ -28,10 +28,12 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/pkg/sftp v1.13.7
 	github.com/posener/h2conn v0.0.0-20231204025407-3997deeca0f0
+	github.com/reeflective/console v0.1.20
 	github.com/refraction-networking/utls v1.6.7
 	github.com/schollz/progressbar/v3 v3.18.0
 	github.com/shadowsocks/go-shadowsocks2 v0.1.5
 	github.com/shirou/gopsutil/v3 v3.24.5
+	github.com/spf13/cobra v1.8.1
 	github.com/spf13/pflag v1.0.5
 	github.com/txthinking/socks5 v0.0.0-20230325130024-4230056ae301
 	github.com/vishvananda/netlink v1.3.0
@@ -57,6 +59,7 @@ require (
 	github.com/bodgit/windows v1.0.1 // indirect
 	github.com/cloudflare/circl v1.5.0 // indirect
 	github.com/coreos/go-iptables v0.8.0 // indirect
+	github.com/dlclark/regexp2 v1.4.0 // indirect
 	github.com/dsnet/compress v0.0.2-0.20230904184137-39efe44ab707 // indirect
 	github.com/gen2brain/shm v0.1.1 // indirect
 	github.com/go-ole/go-ole v1.3.0 // indirect
@@ -68,8 +71,10 @@ require (
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
 	github.com/iamacarpet/go-winpty v1.0.4 // indirect
+	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jaypipes/pcidb v1.0.1 // indirect
 	github.com/jezek/xgb v1.1.1 // indirect
+	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
 	github.com/klauspost/compress v1.17.11 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.9 // indirect
 	github.com/klauspost/pgzip v1.2.6 // indirect
@@ -87,8 +92,11 @@ require (
 	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
 	github.com/pierrec/lz4/v4 v4.1.22 // indirect
 	github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
+	github.com/reeflective/readline v1.0.15 // indirect
 	github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
+	github.com/rsteube/carapace v0.46.3-0.20231214181515-27e49f3c3b69 // indirect
+	github.com/rsteube/carapace-shlex v0.1.1 // indirect
 	github.com/shoenig/go-m1cpu v0.1.6 // indirect
 	github.com/sorairolake/lzip-go v0.3.5 // indirect
 	github.com/templexxx/cpu v0.1.1 // indirect
@@ -102,8 +110,10 @@ require (
 	github.com/vishvananda/netns v0.0.5 // indirect
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
 	go4.org v0.0.0-20230225012048-214862532bf5 // indirect
+	golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa // indirect
 	golang.org/x/sync v0.10.0 // indirect
 	golang.org/x/text v0.21.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	howett.net/plist v1.0.1 // indirect
+	mvdan.cc/sh/v3 v3.7.0 // indirect
 )

core/lib/agent/ccHandler.go

@@ -78,9 +78,9 @@ func processCCData(data *emp3r0r_def.MsgTunData) {
 			break
 		}
 	case "kill":
-		// Usage: kill --dst <pid>...
+		// Usage: kill --pid <pid>...
 		// Kills the specified processes.
-		out, err = shellKill(cmdSlice[2:]) // skip "kill" and "--dst"
+		out, err = shellKill(cmdSlice[2:]) // skip "kill" and "--pid"
 		if err != nil {
 			out = fmt.Sprintf("Failed to kill: %v", err)
 			break

core/lib/cc/api_server.go

@@ -84,10 +84,6 @@ func processAPIReq(c net.Conn) {
 		// deal with the command
 		cmd := string(data)
 		cmd = strings.TrimSpace(cmd)
-		err = CmdHandler(cmd)
 		CliPrintInfo("emp3r0r received %s", strconv.Quote(cmd))
-		if err != nil {
-			CliPrintError("Command failed: %v", err)
-		}
 	}
 }

core/lib/cc/buildAgent.go

@@ -13,9 +13,10 @@ import (
 	emp3r0r_def "github.com/jm33-m0/emp3r0r/core/lib/emp3r0r_def"
 	"github.com/jm33-m0/emp3r0r/core/lib/tun"
 	"github.com/jm33-m0/emp3r0r/core/lib/util"
+	"github.com/spf13/cobra"
 )
 
-func UpgradeAgent() {
+func UpgradeAgent(cmd *cobra.Command, args []string) {
 	if !util.IsExist(WWWRoot + "agent") {
 		CliPrintError("%s/agent not found, build one with `use gen_agent` first", WWWRoot)
 		return

core/lib/cc/cc.go

@@ -18,6 +18,7 @@ import (
 	"github.com/jm33-m0/emp3r0r/core/lib/util"
 	"github.com/olekukonko/tablewriter"
 	"github.com/posener/h2conn"
+	"github.com/spf13/cobra"
 )
 
 var (
@@ -211,7 +212,7 @@ func ListTargets() {
 }
 
 // Update agent list, then switch to its tmux window
-func ls_targets() {
+func ls_targets(cmd *cobra.Command, args []string) {
 	ListTargets()
 	TmuxSwitchWindow(AgentListPane.WindowID)
 }