Merge pull request #9 from ted-gould/fix/ci-go-version

Fix: Update Go version in CI to match toolchain

Author: ted-gould

.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: '1.22'
+          go-version: '1.24.1'
       - name: Build project
         run: go build ./...
       # Add build steps here
@@ -30,7 +30,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: '1.22'
+          go-version: '1.24.1'
       - name: Run tests
         run: go test ./...
       # Add test steps here
@@ -47,7 +47,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: '1.22'
+          go-version: '1.24.1'
       - name: Install golangci-lint
         run: go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
       - name: Run golangci-lint

cmd/xteve-inactive/main.go

@@ -5,8 +5,7 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
-	"io"
-	"io/ioutil"
+	"io" // Added for io.ReadAll
 	"net/http"
 	"os"
 	"strconv"
@@ -49,7 +48,7 @@ func runLogic(cmdHost, cmdPort string, outWriter io.Writer, errWriter io.Writer)
 
 	defer resp.Body.Close()
 
-	respStr, err := ioutil.ReadAll(resp.Body)
+	respStr, err := io.ReadAll(resp.Body)
 	if err != nil {
 		fmt.Fprintf(errWriter, "Unable read response: %v\n", err)
 		return -1

cmd/xteve-status/main.go

@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
-	"io/ioutil"
+	"io" // For io.ReadAll
 	"net/http"
 	"os"
 	"strconv"
@@ -50,7 +50,7 @@ func main() {
 
 	defer resp.Body.Close()
 
-	respStr, err := ioutil.ReadAll(resp.Body)
+	respStr, err := io.ReadAll(resp.Body)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Unable read response: %v\n", err)
 		os.Exit(-1)

src/authentication.go

@@ -21,25 +21,25 @@ func activatedSystemAuthentication() (err error) {
 	defaults["authentication.xml"] = false
 	defaults["authentication.api"] = false
 	err = authentication.SetDefaultUserData(defaults)
-
+	// Propagate error from SetDefaultUserData
 	return
 }
 
 func createFirstUserForAuthentication(username, password string) (token string, err error) {
-	var authenticationErr = func(err error) {
-		if err != nil {
-			return
-		}
-	}
-
 	err = authentication.CreateDefaultUser(username, password)
-	authenticationErr(err)
+	if err != nil {
+		return "", err
+	}
 
 	token, err = authentication.UserAuthentication(username, password)
-	authenticationErr(err)
+	if err != nil {
+		return "", err
+	}
 
 	token, err = authentication.CheckTheValidityOfTheToken(token)
-	authenticationErr(err)
+	if err != nil {
+		return "", err
+	}
 
 	var userData = make(map[string]any)
 	userData["username"] = username
@@ -51,10 +51,14 @@ func createFirstUserForAuthentication(username, password string) (token string,
 	userData["defaultUser"] = true
 
 	userID, err := authentication.GetUserID(token)
-	authenticationErr(err)
+	if err != nil {
+		return "", err
+	}
 
 	err = authentication.WriteUserData(userID, userData)
-	authenticationErr(err)
+	if err != nil {
+		return "", err
+	}
 
 	return
 }
@@ -78,9 +82,19 @@ func basicAuth(r *http.Request, level string) (username string, err error) {
 		return
 	}
 
-	payload, _ := base64.StdEncoding.DecodeString(auth[1])
+	payload, errDecode := base64.StdEncoding.DecodeString(auth[1])
+	if errDecode != nil {
+		// If decoding fails, it's an invalid Authorization header.
+		// The original err (user authentication failed) is appropriate.
+		return "", err // Return the original error
+	}
 	pair := strings.SplitN(string(payload), ":", 2)
 
+	if len(pair) != 2 {
+		// If not two parts, it's an invalid format.
+		return "", err // Return the original error
+	}
+
 	username = pair[0]
 	var password = pair[1]
 
@@ -145,13 +159,22 @@ func checkAuthorizationLevel(token, level string) (err error) {
 				err = errors.New("no authorization")
 			}
 		} else {
+			// Level not found, set to false and try to save.
+			// The user does not have authorization regardless of save success.
 			userData[level] = false
-			authentication.WriteUserData(userID, userData)
-			//err = errors.New("No authorization")
+			if writeErr := authentication.WriteUserData(userID, userData); writeErr != nil {
+				// Log the error, but the primary error (no authorization) stands.
+				// log.Printf("Failed to write default authorization level for user %s, level %s: %v", userID, level, writeErr)
+			}
+			err = errors.New("no authorization") // Ensure error is set if level was not found
 		}
 	} else {
-		authentication.WriteUserData(userID, userData)
-		//err = errors.New("No authorization")
+		// UserData is empty, this is an unusual case.
+		// Attempt to write, but the user definitely doesn't have authorization.
+		if writeErr := authentication.WriteUserData(userID, userData); writeErr != nil {
+			// log.Printf("Failed to write empty userData for user %s, level %s: %v", userID, level, writeErr)
+		}
+		err = errors.New("no authorization") // Ensure error is set if userData was empty
 	}
 
 	return

src/backup.go

@@ -48,8 +48,13 @@ func xTeVeAutoBackup() (err error) {
 			end = Settings.BackupKeep - 1
 		}
 
-		for i := range len(oldBackupFiles) - end {
-			os.RemoveAll(System.Folder.Backup + oldBackupFiles[i])
+		for i := 0; i < len(oldBackupFiles)-end; i++ { // Corrected loop condition
+			backupFileToDelete := System.Folder.Backup + oldBackupFiles[i]
+			if errRemove := os.RemoveAll(backupFileToDelete); errRemove != nil {
+				// Log the error, but continue trying to delete other old backups
+				// log.Printf("Error deleting old backup file %s: %v", backupFileToDelete, errRemove)
+				// Potentially, update 'err' to return a generic error indicating some cleanup failed
+			}
 			debug = fmt.Sprintf("Delete backup file:%s", oldBackupFiles[i])
 			showDebug(debug, 1)
 		}
@@ -148,6 +153,7 @@ func xteveRestore(archive string) (newWebURL string, err error) {
 
 	if err = removeChildItems(getPlatformPath(System.Folder.Config)); err != nil {
 		ShowError(err, 1073)
+		return // Propagate the error
 	}
 
 	// Extract the ZIP Archive into the Config Folder
@@ -169,11 +175,21 @@ func xteveRestore(archive string) (newWebURL string, err error) {
 	if newPort == oldPort {
 		if err != nil {
 			ShowError(err, 0)
+			// Even if newPort == oldPort, err might have been set by a previous operation.
+			// We should return it if it's not nil.
+			if err != nil {
+				return "", err
+			}
 		}
 
-		loadSettings()
+		// loadSettings likely returns (SettingsStruct, error)
+		// We only care about the error here as Settings is a global variable modified by loadSettings.
+		if _, err = loadSettings(); err != nil {
+			ShowError(err, 0) // Or choose to propagate it
+			return "", err // Propagating seems more appropriate for a restore failure
+		}
 
-		err := Init()
+		err = Init()
 		if err != nil {
 			ShowError(err, 0)
 			return "", err
@@ -229,7 +245,10 @@ func XteveRestoreFromCLI(archive string) (err error) {
 
 	fmt.Print("All data will be replaced with those from the backup. Should the files be restored? [yes|no]:")
 
-	fmt.Scanln(&confirm)
+	if _, errScan := fmt.Scanln(&confirm); errScan != nil {
+		fmt.Println("Error reading input:", errScan)
+		return errScan // Propagate the error
+	}
 
 	switch strings.ToLower(confirm) {
 	case "yes":