Skip to content

Commit bfdf02a

Browse files
committed
refacto: fix start last release arena machine
1 parent 4157511 commit bfdf02a

File tree

3 files changed

+10
-13
lines changed

3 files changed

+10
-13
lines changed

cmd/start.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,13 +184,13 @@ var startCmd = &cobra.Command{
184184
var machineID int
185185
if machineChoosen == "" {
186186
config.GlobalConfig.Logger.Info("Launching the machine in release arena")
187-
//machineID, err = utils.SearchLastReleaseArenaMachine()
188-
// TODO: Up again
187+
machineID, err = utils.SearchLastReleaseArenaMachine()
188+
189189
if err != nil {
190190
config.GlobalConfig.Logger.Error("", zap.Error(err))
191191
os.Exit(1)
192192
}
193-
config.GlobalConfig.Logger.Debug(fmt.Sprintf("Machine ID : %s", machineID))
193+
config.GlobalConfig.Logger.Debug(fmt.Sprintf("Machine ID : %d", machineID))
194194

195195
}
196196
output, err := coreStartCmd(machineChoosen, machineID)

lib/submit/submit.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,9 @@ func CoreSubmitCmd(difficultyParam int, modeType string, modeValue string) (stri
122122
config.GlobalConfig.Logger.Debug(fmt.Sprintf("Release Arena ID : %s", releaseID))
123123
url = fmt.Sprintf("%s/arena/own", config.BaseHackTheBoxAPIURL)
124124
payload = map[string]string{
125-
"id": releaseID,
125+
"id": string(releaseID),
126126
}
127-
mID = releaseID
127+
mID = string(releaseID)
128128
}
129129

130130
fmt.Print("Flag : ")

lib/utils/utils.go

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
"os"
1313
"os/signal"
1414
"os/user"
15-
"strconv"
1615
"strings"
1716
"sync"
1817
"syscall"
@@ -557,21 +556,19 @@ func GetCurrentUsername() string {
557556
return user.Username
558557
}
559558

560-
func SearchLastReleaseArenaMachine() (string, error) {
559+
func SearchLastReleaseArenaMachine() (int, error) {
561560
url := fmt.Sprintf("%s/season/machine/active", config.BaseHackTheBoxAPIURL)
562561
resp, err := HtbRequest(http.MethodGet, url, nil)
563562
if err != nil {
564-
return "", err
563+
return 0, err
565564
}
566565
info := ParseJsonMessage(resp, "data")
567566
if info == nil {
568-
return "", err
567+
return 0, err
569568
}
570569
config.GlobalConfig.Logger.Debug(fmt.Sprintf("Information on the last active machine: %v", info))
571-
machineF64 := info.(map[string]interface{})["id"].(float64)
572-
machineID := int(machineF64)
573-
machineIDstr := strconv.Itoa(machineID)
574-
return machineIDstr, nil
570+
machineID := int(info.(map[string]interface{})["id"].(float64))
571+
return machineID, nil
575572
}
576573

577574
func extractNamesAndIDs(jsonData string) (map[string]int, error) {

0 commit comments

Comments
 (0)