Merge pull request #130 from GoToolSharing/dev

Release v1.7.0

Author: qu35t-code

.github/workflows/go.yml

@@ -17,22 +17,22 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go: ['1.19', '1.20', '1.21']
+        go: ['1.20', '1.22', '1.23', '1.24']
         os: [ 'linux', 'windows', 'darwin' ]
         arch: [ 'amd64', 'arm64' ]
     outputs:
       commit-hash: ${{ steps.get_commit.outputs.commit }}
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Set up Go
-      uses: actions/setup-go@v4
+      uses: actions/setup-go@v5
       with:
         go-version: ${{ matrix.go }}
 
     - name: Build
       env:
         GOOS: ${{ matrix.os }}
         GOARCH: ${{ matrix.arch }}
-      run: go build -v ./...
+      run: go build -v ./...

.github/workflows/golangci-lint.yml

@@ -14,22 +14,22 @@ jobs:
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Set up Go
-      uses: actions/setup-go@v4
+      uses: actions/setup-go@v5
       with:
-        go-version: 1.19
+        go-version: 1.24
 
     - name: Run golangci-lint
-      uses: golangci/golangci-lint-action@v3
+      uses: golangci/golangci-lint-action@v6.3.2
       with:
         version: latest
-        skip-pkg-cache: true
-        skip-build-cache: true
+        skip-cache: true
+        skip-save-cache: true
 
     - name: Upload lint results
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       if: failure()
       with:
         name: golangci-lint-results

.github/workflows/release.yml

@@ -13,17 +13,17 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
     - name: Set up Go
-      uses: actions/setup-go@v4
+      uses: actions/setup-go@v5
       with:
         go-version: '1.20'
 
     - name: Release
-      uses: goreleaser/goreleaser-action@v4
+      uses: goreleaser/goreleaser-action@v6
       with:
         distribution: goreleaser
         version: latest

cmd/info.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"net/http"
 	"os"
-	"strconv"
 	"strings"
 	"text/tabwriter"
 	"time"
@@ -23,8 +22,8 @@ type Response struct {
 }
 
 // Retrieves data for user profile
-func fetchData(itemID string, endpoint string, infoKey string) (map[string]interface{}, error) {
-	url := config.BaseHackTheBoxAPIURL + endpoint + itemID
+func fetchData(itemID int, endpoint string, infoKey string) (map[string]interface{}, error) {
+	url := fmt.Sprintf("%s%s%d", config.BaseHackTheBoxAPIURL, endpoint, itemID)
 	config.GlobalConfig.Logger.Debug(fmt.Sprintf("URL: %s", url))
 
 	resp, err := utils.HtbRequest(http.MethodGet, url, nil)
@@ -45,7 +44,7 @@ func fetchAndDisplayInfo(url, header string, params []string, elementType string
 	w := utils.SetTabWriterHeader(header)
 
 	// Iteration on all machines / challenges / users argument
-	var itemID string
+	var itemID int
 	for _, param := range params {
 		if elementType == "Challenge" {
 			config.GlobalConfig.Logger.Info("Challenge search...")
@@ -55,13 +54,12 @@ func fetchAndDisplayInfo(url, header string, params []string, elementType string
 			}
 			config.GlobalConfig.Logger.Debug(fmt.Sprintf("Challenge found: %v", challenges))
 
-			// TODO: get this int
-			itemID = strconv.Itoa(challenges.ID)
+			itemID = challenges.ID
 		} else {
 			itemID, _ = utils.SearchItemIDByName(param, elementType)
 		}
 
-		resp, err := utils.HtbRequest(http.MethodGet, (url + itemID), nil)
+		resp, err := utils.HtbRequest(http.MethodGet, fmt.Sprintf("%s%d", url, itemID), nil)
 		if err != nil {
 			return err
 		}
@@ -88,7 +86,6 @@ func fetchAndDisplayInfo(url, header string, params []string, elementType string
 			url  string
 		}{
 			{"Fortresses", "/user/profile/progress/fortress/"},
-			{"Endgames", "/user/profile/progress/endgame/"},
 			{"Prolabs", "/user/profile/progress/prolab/"},
 			{"Activity", "/user/profile/activity/"},
 		}
@@ -203,7 +200,7 @@ func coreInfoCmd(machineName []string, challengeName []string, usernameName []st
 
 // getMachineStatus returns machine status
 func getMachineStatus(data map[string]interface{}) string {
-	if data["retired"].(float64) == 0 {
+	if data["retired"] == false {
 		return "No"
 	}
 	return "Yes"
@@ -223,144 +220,138 @@ func displayActiveMachine(header string) error {
 	if err != nil {
 		return err
 	}
+	if machineID == 0 {
+		fmt.Println("No machine is running")
+		return nil
+	}
 	machineType, err := utils.GetMachineType(machineID)
 	if err != nil {
 		return err
 	}
 	config.GlobalConfig.Logger.Debug(fmt.Sprintf("Machine Type: %s", machineType))
 
-	var expiresTime string
-	switch {
-	case machineType == "release":
-		expiresTime, err = utils.GetReleaseArenaExpiredTime()
-		config.GlobalConfig.Logger.Debug(fmt.Sprintf("Expires Time: %s", expiresTime))
-		if err != nil {
-			return err
-		}
-	default:
-		expiresTime, err = utils.GetActiveExpiredTime()
-		config.GlobalConfig.Logger.Debug(fmt.Sprintf("Expires Time:: %s", expiresTime))
-		if err != nil {
-			return err
-		}
+	expiresTime, err := utils.GetExpiredTime(machineType)
+	if err != nil {
+		return err
 	}
+	config.GlobalConfig.Logger.Debug(fmt.Sprintf("Expires Time: %s", expiresTime))
 
-	if machineID != "" {
-		config.GlobalConfig.Logger.Info("Active machine found !")
-		config.GlobalConfig.Logger.Debug(fmt.Sprintf("Machine ID: %s", machineID))
-		config.GlobalConfig.Logger.Debug(fmt.Sprintf("Expires At: %v", expiresTime))
+	config.GlobalConfig.Logger.Info("Active machine found !")
+	config.GlobalConfig.Logger.Debug(fmt.Sprintf("Machine ID: %d", machineID))
 
-		layout := "2006-01-02 15:04:05"
-
-		date, err := time.Parse(layout, expiresTime)
+	if expiresTime != "Undefined" {
+		err = checkIfExpiringSoon(expiresTime, machineID)
 		if err != nil {
-			return fmt.Errorf("date conversion error: %v", err)
+			return err
 		}
+	}
 
-		now := time.Now()
-		config.GlobalConfig.Logger.Debug(fmt.Sprintf("Actual date: %v", now))
-
-		timeLeft := date.Sub(now)
-		limit := 2 * time.Hour
-		if timeLeft > 0 && timeLeft <= limit {
-			var remainingTime string
-			if date.After(now) {
-				duration := date.Sub(now)
-				hours := int(duration.Hours())
-				minutes := int(duration.Minutes()) % 60
-				seconds := int(duration.Seconds()) % 60
-
-				remainingTime = fmt.Sprintf("%dh %dm %ds", hours, minutes, seconds)
-
-			}
-			// Extend time
-			isConfirmed := utils.AskConfirmation(fmt.Sprintf("Would you like to extend the active machine time ? Remaining: %s", remainingTime))
-			if isConfirmed {
-				jsonData := []byte("{\"machine_id\":" + machineID + "}")
-				resp, err := utils.HtbRequest(http.MethodPost, config.BaseHackTheBoxAPIURL+"/vm/extend", jsonData)
-				if err != nil {
-					return err
-				}
-				var response Response
-				if err := json.NewDecoder(resp.Body).Decode(&response); err != nil {
-					return fmt.Errorf("error decoding JSON response: %v", err)
-				}
-
-				inputLayout := time.RFC3339Nano
-
-				date, err := time.Parse(inputLayout, response.ExpiresAt)
-				if err != nil {
-					return fmt.Errorf("error decoding JSON response: %v", err)
-				}
-
-				outputLayout := "2006-01-02 -> 15h 04m 05s"
+	tabwriter.NewWriter(os.Stdout, 0, 0, 3, ' ', tabwriter.Debug)
+	w := utils.SetTabWriterHeader(header)
 
-				formattedDate := date.Format(outputLayout)
+	url := fmt.Sprintf("%s/machine/profile/%d", config.BaseHackTheBoxAPIURL, machineID)
+	resp, err := utils.HtbRequest(http.MethodGet, url, nil)
+	if err != nil {
+		return err
+	}
+	info := utils.ParseJsonMessage(resp, "info")
+	// info := utils.ParseJsonMessage(resp, "data")
 
-				fmt.Println(response.Message)
-				fmt.Printf("Expires Date: %s\n", formattedDate)
+	data := info.(map[string]interface{})
+	status := utils.SetStatus(data)
+	retiredStatus := getMachineStatus(data)
 
-			}
-		}
+	datetime, err := utils.ParseAndFormatDate(data["release"].(string))
+	if err != nil {
+		return err
+	}
+	config.GlobalConfig.Logger.Debug(fmt.Sprintf("Machine Type: %s", machineType))
 
-		tabwriter.NewWriter(os.Stdout, 0, 0, 3, ' ', tabwriter.Debug)
-		w := utils.SetTabWriterHeader(header)
+	userSubscription, err := utils.GetUserSubscription()
+	if err != nil {
+		return err
+	}
+	config.GlobalConfig.Logger.Debug(fmt.Sprintf("User subscription: %s", userSubscription))
 
-		url := fmt.Sprintf("%s/machine/profile/%s", config.BaseHackTheBoxAPIURL, machineID)
-		resp, err := utils.HtbRequest(http.MethodGet, url, nil)
+	ip := "Undefined"
+	_ = ip
+	switch {
+	case machineType == "release":
+		ip, err = utils.GetActiveReleaseArenaMachineIP()
 		if err != nil {
 			return err
 		}
-		info := utils.ParseJsonMessage(resp, "info")
-		// info := utils.ParseJsonMessage(resp, "data")
-
-		data := info.(map[string]interface{})
-		status := utils.SetStatus(data)
-		retiredStatus := getMachineStatus(data)
-
-		datetime, err := utils.ParseAndFormatDate(data["release"].(string))
+	case userSubscription == "vip+":
+		ip, err = utils.GetActiveMachineIP()
 		if err != nil {
 			return err
 		}
+	default:
+		ip = getIPStatus(data).(string)
+	}
 
-		machineType, err := utils.GetMachineType(machineID)
-		if err != nil {
-			return err
-		}
-		config.GlobalConfig.Logger.Debug(fmt.Sprintf("Machine Type: %s", machineType))
+	bodyData := fmt.Sprintf("%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\n",
+		data["name"], data["os"], retiredStatus,
+		data["difficultyText"], data["stars"],
+		ip, status, data["last_reset_time"], datetime)
 
-		userSubscription, err := utils.GetUserSubscription()
-		if err != nil {
-			return err
-		}
-		config.GlobalConfig.Logger.Debug(fmt.Sprintf("User subscription: %s", userSubscription))
+	utils.SetTabWriterData(w, bodyData)
+	w.Flush()
+	return nil
+}
+
+func checkIfExpiringSoon(expiresTime string, machineID int) error {
+	layout := "2006-01-02 15:04:05"
 
-		ip := "Undefined"
-		_ = ip
-		switch {
-		case machineType == "release":
-			ip, err = utils.GetActiveReleaseArenaMachineIP()
+	date, err := time.Parse(layout, expiresTime)
+	if err != nil {
+		return fmt.Errorf("date conversion error: %v", err)
+	}
+
+	now := time.Now()
+	config.GlobalConfig.Logger.Debug(fmt.Sprintf("Actual date: %v", now))
+
+	timeLeft := date.Sub(now)
+	limit := 2 * time.Hour
+	if timeLeft > 0 && timeLeft <= limit {
+		var remainingTime string
+		if date.After(now) {
+			duration := date.Sub(now)
+			hours := int(duration.Hours())
+			minutes := int(duration.Minutes()) % 60
+			seconds := int(duration.Seconds()) % 60
+
+			remainingTime = fmt.Sprintf("%dh %dm %ds", hours, minutes, seconds)
+
+		}
+		// Extend time
+		isConfirmed := utils.AskConfirmation(fmt.Sprintf("Would you like to extend the active machine time ? Remaining: %s", remainingTime))
+		if isConfirmed {
+			jsonData := []byte(fmt.Sprintf(`{"machine_id":%d}`, machineID))
+			resp, err := utils.HtbRequest(http.MethodPost, config.BaseHackTheBoxAPIURL+"/vm/extend", jsonData)
 			if err != nil {
 				return err
 			}
-		case userSubscription == "vip+":
-			ip, err = utils.GetActiveMachineIP()
+			var response Response
+			if err := json.NewDecoder(resp.Body).Decode(&response); err != nil {
+				return fmt.Errorf("error decoding JSON response: %v", err)
+			}
+
+			inputLayout := "2006-01-02 15:04:05"
+
+			date, err := time.Parse(inputLayout, response.ExpiresAt)
 			if err != nil {
-				return err
+				return fmt.Errorf("error decoding JSON response: %v", err)
 			}
-		default:
-			ip = getIPStatus(data).(string)
-		}
 
-		bodyData := fmt.Sprintf("%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\n",
-			data["name"], data["os"], retiredStatus,
-			data["difficultyText"], data["stars"],
-			ip, status, data["last_reset_time"], datetime)
+			outputLayout := "2006-01-02 - 15h 04m 05s"
 
-		utils.SetTabWriterData(w, bodyData)
-		w.Flush()
-	} else {
-		fmt.Println("No machine is running")
+			formattedDate := date.Format(outputLayout)
+
+			fmt.Println(response.Message)
+			fmt.Printf("Expires Date: %s\n", formattedDate)
+
+		}
 	}
 	return nil
 }