status: Show achievement when pwned

GoToolSharing · Feb 12, 2025 · c388227 · c388227
1 parent 9d6f193
commit c388227
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 23 deletions.
diff --git a/cmd/status.go b/cmd/status.go
@@ -33,6 +33,17 @@ func coreStatusCmd() (string, error) {
 	fmt.Println(fmt.Sprintf("Name : %s", name))
 	fmt.Println(fmt.Sprintf("OS : %s", os))
 	fmt.Println(fmt.Sprintf("Stars : %v", stars))
+
+	if authUserInUserOwns && authUserInRootOwns {
+		link, err := utils.GetAchievementLink(int(activeMachineData["id"].(float64)))
+		if err != nil {
+			config.GlobalConfig.Logger.Error("", zap.Error(err))
+			return "", err
+		}
+		fmt.Println("The machine has been pwned !")
+		fmt.Println(link)
+		return "", nil
+	}
 	fmt.Println(fmt.Sprintf("User flag : %v", authUserInUserOwns))
 	fmt.Println(fmt.Sprintf("Root flag : %v", authUserInRootOwns))
 	return "", nil

diff --git a/cmd/submit.go b/cmd/submit.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/GoToolSharing/htb-cli/config"
 	"github.com/GoToolSharing/htb-cli/lib/submit"
+	"github.com/GoToolSharing/htb-cli/lib/utils"
 	"github.com/GoToolSharing/htb-cli/lib/webhooks"
 	"github.com/spf13/cobra"
 	"go.uber.org/zap"
@@ -85,7 +86,7 @@ var submitCmd = &cobra.Command{
 
 		fmt.Println(output)
 
-		link, err := submit.GetAchievementLink(machineID)
+		link, err := utils.GetAchievementLink(machineID)
 		if err != nil {
 			config.GlobalConfig.Logger.Error("", zap.Error(err))
 			os.Exit(1)

diff --git a/lib/submit/submit.go b/lib/submit/submit.go
@@ -165,25 +165,3 @@ func CoreSubmitCmd(difficultyParam int, modeType string, modeValue string) (stri
 	}
 	return message, mID, nil
 }
-
-func GetAchievementLink(machineID int) (string, error) {
-	resp, err := utils.HtbRequest(http.MethodGet, fmt.Sprintf("%s/user/info", config.BaseHackTheBoxAPIURL), nil)
-	if err != nil {
-		return "", err
-	}
-	info := utils.ParseJsonMessage(resp, "info")
-	infoMap, _ := info.(map[string]interface{})
-	config.GlobalConfig.Logger.Debug(fmt.Sprintf("User ID: %v", infoMap["id"]))
-	config.GlobalConfig.Logger.Debug(fmt.Sprintf("Machine ID: %d", machineID))
-
-	resp, err = utils.HtbRequest(http.MethodGet, fmt.Sprintf("%s/user/achievement/machine/%v/%d", config.BaseHackTheBoxAPIURL, infoMap["id"], machineID), nil)
-	if err != nil {
-		return "", err
-	}
-	_, ok := utils.ParseJsonMessage(resp, "message").(string)
-	if !ok {
-		return fmt.Sprintf("\nAchievement link: https://labs.hackthebox.com/achievement/machine/%v/%d", infoMap["id"], machineID), nil
-	}
-	return "", nil
-
-}
diff --git a/lib/utils/machines.go b/lib/utils/machines.go
@@ -0,0 +1,30 @@
+package utils
+
+import (
+	"fmt"
+	"net/http"
+
+	"github.com/GoToolSharing/htb-cli/config"
+)
+
+func GetAchievementLink(machineID int) (string, error) {
+	resp, err := HtbRequest(http.MethodGet, fmt.Sprintf("%s/user/info", config.BaseHackTheBoxAPIURL), nil)
+	if err != nil {
+		return "", err
+	}
+	info := ParseJsonMessage(resp, "info")
+	infoMap, _ := info.(map[string]interface{})
+	config.GlobalConfig.Logger.Debug(fmt.Sprintf("User ID: %v", infoMap["id"]))
+	config.GlobalConfig.Logger.Debug(fmt.Sprintf("Machine ID: %d", machineID))
+
+	resp, err = HtbRequest(http.MethodGet, fmt.Sprintf("%s/user/achievement/machine/%v/%d", config.BaseHackTheBoxAPIURL, infoMap["id"], machineID), nil)
+	if err != nil {
+		return "", err
+	}
+	_, ok := ParseJsonMessage(resp, "message").(string)
+	if !ok {
+		return fmt.Sprintf("\nAchievement link: https://labs.hackthebox.com/achievement/machine/%v/%d", infoMap["id"], machineID), nil
+	}
+	return "", nil
+
+}