Fix tests

* Tidy repo

* Tidy

* Fix up

* Setup default target

.github/workflows/go.yml

@@ -13,9 +13,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v3
+      uses: actions/setup-go@v4
       with:
-        go-version: ^1.15
+        go-version: '1.20.2'
     - name: Check out code
       uses: actions/checkout@v3
     - name: Build

Dockerfile

@@ -1,11 +1,9 @@
-FROM golang:latest
+FROM golang:1.20.2
 
 WORKDIR /app
 
 COPY ./ /app
 
-RUN go mod download
+RUN go install github.com/githubnemo/CompileDaemon@latest
 
-RUN go get github.com/githubnemo/CompileDaemon
-
-ENTRYPOINT CompileDaemon --build="make build" --command=./bin/edgeboxctl
+ENTRYPOINT CompileDaemon --build="make build" --command=./bin/edgeboxctl-$(go env GOOS)-$(go env GOARCH)

Makefile

@@ -1,29 +1,18 @@
-PROJECT?=github.com/edgebox-iot/edgeboxctl
+.DEFAULT_GOAL := build
 
+PROJECT ?= github.com/edgebox-iot/edgeboxctl
 RELEASE ?= dev
 COMMIT := $(shell git rev-parse --short HEAD)
 BUILD_DATE := $(shell date -u '+%Y-%m-%d_%H:%M:%S')
 BUILD_DIR = bin
+GOOS := $(shell go env GOOS)
+GOARCH := $(shell go env GOARCH)
 
-build-all:
+
+build-all: clean
 	GOOS=linux GOARCH=amd64 make build
 	GOOS=linux GOARCH=arm make build
-
-build-prod:
-	GOOS=linux GOARCH=arm RELEASE=prod make build
-
-build-cloud:
-	GOOS=linux GOARCH=amd64 RELEASE=cloud make build
-
-build-arm64:
-	GOOS=linux GOARCH=arm64 RELEASE=prod make build
-
-build-armhf:
-	GOOS=linux GOARCH=arm RELEASE=prod make build
-
-build-amd64:
-	GOOS=linux GOARCH=amd64 RELEASE=prod make build
-
+	GOOS=linux GOARCH=arm64 make build
 
 build:
 	@echo "Building ${GOOS}-${GOARCH}"
@@ -32,7 +21,6 @@ build:
 		-X ${PROJECT}/internal/diagnostics.Commit=${COMMIT} \
 		-X ${PROJECT}/internal/diagnostics.BuildDate=${BUILD_DATE}" \
 		-o bin/edgeboxctl-${GOOS}-${GOARCH} ${PROJECT}/cmd/edgeboxctl
-	cp ./bin/edgeboxctl-${GOOS}-${GOARCH} ./bin/edgeboxctl
 
 clean:
 	rm -rf ${BUILD_DIR}
@@ -47,18 +35,14 @@ test-with-coverage:
 install:
 	sudo systemctl stop edgeboxctl || true
 	sudo rm -rf /usr/local/bin/edgeboxctl /usr/local/sbin/edgeboctl /lib/systemd/system/edgeboxctl.service
-	sudo cp ./bin/edgeboxctl /usr/local/bin/edgeboxctl
-	sudo cp ./bin/edgeboxctl /usr/local/sbin/edgeboxctl
+	sudo cp ./bin/edgeboxctl-${GOOS}-${GOARCH} /usr/local/bin/edgeboxctl
+	sudo cp ./bin/edgeboxctl-${GOOS}-${GOARCH} /usr/local/sbin/edgeboxctl
 	sudo cp ./edgeboxctl.service /lib/systemd/system/edgeboxctl.service
 	sudo systemctl daemon-reload
 	@echo "Edgeboxctl installed successfully"
 	@echo "To start edgeboxctl run: systemctl start edgeboxctl"
 
-install-prod: build-prod install
-install-cloud: build-cloud install
-install-arm64: build-arm64 install
-install-armhf: build-armhf install
-install-amd64: build-amd64 install
+build-install: build install
 
 start:
 	systemctl start edgeboxctl
@@ -68,4 +52,3 @@ stop:
 
 log: start
 	journalctl -fu edgeboxctl
-

README.md

@@ -8,7 +8,7 @@
   <h3 align="center">Edgebox Control Module</h3>
 
   <p align="center">
-    A System Control module written in Go. Its resonsability is to configure dependencies and perform system tasks, automatically in a schedule, or by command.
+    A System Control module written in Go. Its responsibility is to configure dependencies and perform system tasks, automatically on a schedule, or on demand.
     <br />
     <br />
     <a href="https://github.com/github_username/edgeboxctl/issues">Report Bug</a>
@@ -38,8 +38,6 @@
 <!-- ABOUT THE PROJECT -->
 ## About The Project
 
-[![Edgebox Screen Shot][product-screenshot]](https://edgebox.co)
-
 Edgebox is an easy to configure and use system. It brings powerful features that go alongside or can even completely replace various services that you already use in the day-to-day.
 
 
@@ -58,18 +56,15 @@ To get a local copy up and running follow these simple steps.
 
 ### Prerequisites
 
-If you're installing this to run natively in the system, you better be doing it inside of the [Development Virtual Machine](https://github.com/edgebox-iot/devm). This software can do destructive action in the system is is running. You've been warned.
+If you're running for development purposes, a docker container suffices, so make sure you have:
 
-If you're running for development purposes, a Docker container suffices, so make sure you have:
-* Docker
-* Docker Compose
-```sh
-sudo apt-get install docker docker-compose
-```
+* docker
+* docker compose
 
 Check the following links for more info on [Docker](https://www.docker.com/) and [Docker Compose](https://docs.docker.com/compose/).
 
-Aditionally, edgeboxctl needs the following bash commands available wherever it runs:
+Aditionally, `edgeboxctl` needs the following bash commands available wherever it runs:
+
 * `arm-linux-gnueabi-gcc` (`sudo apt-get install gcc-arm*`)
 * `sh`
 * `rm`
@@ -121,4 +116,4 @@ Contributions are what make the open source community such an amazing place to b
 <!-- LICENSE -->
 ## License
 
-Distributed under the MIT License. See `LICENSE` for more information.
+Distributed under the Elastic License 2.0. See `LICENSE` for more information.

internal/diagnostics/diagnostics.go

@@ -1,18 +1,5 @@
 package diagnostics
 
-type ReleaseVersion string
-
 var Version string
 var Commit string
 var BuildDate string
-
-const (
-	DEV_VERSION   ReleaseVersion = "dev"
-	PROD_VERSION  ReleaseVersion = "prod"
-	CLOUD_VERSION ReleaseVersion = "cloud"
-	OTHER_VERSION ReleaseVersion = "other"
-)
-
-func GetReleaseVersion() ReleaseVersion {
-	return ReleaseVersion(Version)
-}

internal/edgeapps/edgeapps.go

@@ -25,6 +25,7 @@ type EdgeApp struct {
 	InternetURL        string           `json:"internet_url"`
 	Options			   []EdgeAppOption  `json:"options"`
 	NeedsConfig		   bool             `json:"needs_config"`
+	Login              EdgeAppLogin	 	`json:"login"`
 }
 
 // MaybeEdgeApp : Boolean flag for validation of edgeapp existance
@@ -55,11 +56,19 @@ type EdgeAppOption struct {
 	IsInstallLocked bool   `json:"is_install_locked"`
 }
 
+type EdgeAppLogin struct {
+	Enabled  bool   `json:"enabled"`
+	Username string `json:"username"`
+	Password string `json:"password"`
+}
+
 const configFilename = "/edgebox-compose.yml"
 const envFilename = "/edgebox.env"
 const optionsTemplateFilename = "/edgeapp.template.env"
 const optionsEnvFilename = "/edgeapp.env"
+const authEnvFilename = "/auth.env"
 const runnableFilename = "/.run"
+const appdataFoldername = "/appdata"
 const myEdgeAppServiceEnvFilename = "/myedgeapp.env"
 const defaultContainerOperationSleepTime time.Duration = time.Second * 10
 
@@ -202,6 +211,21 @@ func GetEdgeApp(ID string) MaybeEdgeApp {
 			}
 		}
 
+		edgeAppBasicAuthEnabled := false
+		edgeAppBasicAuthUsername := ""
+		edgeAppBasicAuthPassword := ""
+
+		edgeAppAuthEnv, err := godotenv.Read(utils.GetPath(utils.EdgeAppsPath) + ID + authEnvFilename)
+		if err != nil {
+			log.Println("No auth.env file found. Login status is disabled.")
+		} else {
+			if edgeAppAuthEnv["USERNAME"] != "" && edgeAppAuthEnv["PASSWORD"] != "" {
+				edgeAppBasicAuthEnabled = true
+				edgeAppBasicAuthUsername = edgeAppAuthEnv["USERNAME"]
+				edgeAppBasicAuthPassword = edgeAppAuthEnv["PASSWORD"]
+			}
+		}
+
 		result = MaybeEdgeApp{
 			EdgeApp: EdgeApp{
 				ID:                 ID,
@@ -214,6 +238,8 @@ func GetEdgeApp(ID string) MaybeEdgeApp {
 				InternetURL:        edgeAppInternetURL,
 				Options: 		    edgeAppOptions,
 				NeedsConfig:        needsConfig,
+				Login:				EdgeAppLogin{edgeAppBasicAuthEnabled, edgeAppBasicAuthUsername, edgeAppBasicAuthPassword},
+				
 			},
 			Valid: true,
 		}
@@ -268,11 +294,40 @@ func SetEdgeAppInstalled(ID string) bool {
 
 func SetEdgeAppNotInstalled(ID string) bool {
 
+	// Stop the app first
+	StopEdgeApp(ID)
+
+	// Now remove any files
 	result := true
+	
 	err := os.Remove(utils.GetPath(utils.EdgeAppsPath) + ID + runnableFilename)
 	if err != nil {
 		result = false
-		log.Fatal(err)
+		log.Println(err)
+	}
+
+	err = os.Remove(utils.GetPath(utils.EdgeAppsPath) + ID + authEnvFilename)
+	if err != nil {
+		result = false
+		log.Println(err)
+	}
+
+	err = os.RemoveAll(utils.GetPath(utils.EdgeAppsPath) + ID + appdataFoldername)
+	if err != nil {
+		result = false
+		log.Println(err)
+	}
+
+	err = os.Remove(utils.GetPath(utils.EdgeAppsPath) + ID + myEdgeAppServiceEnvFilename)
+	if err != nil {
+		result = false
+		log.Println(err)
+	}
+
+	err = os.Remove(utils.GetPath(utils.EdgeAppsPath) + ID + optionsEnvFilename)
+	if err != nil {
+		result = false
+		log.Println(err)
 	}
 
 	buildFrameworkContainers()

internal/storage/storage.go

@@ -6,7 +6,6 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/edgebox-iot/edgeboxctl/internal/diagnostics"
 	"github.com/edgebox-iot/edgeboxctl/internal/utils"
 	"github.com/shirou/gopsutil/disk"
 )
@@ -75,20 +74,9 @@ const (
 	DISK_TYPE_VDA   DeviceIdentifier = "vda"
 )
 
-func GetDeviceIdentifier(release_version diagnostics.ReleaseVersion) DeviceIdentifier {
-	switch release_version {
-	case diagnostics.CLOUD_VERSION:
-		return DISK_TYPE_VDA
-	case diagnostics.PROD_VERSION:
-		return DISK_TYPE_MCBLK
-	}
-
-	return DISK_TYPE_SDA
-}
-
-// GetDevices : Returns a list of all available sotrage devices in structs filled with information
-func GetDevices(release_version diagnostics.ReleaseVersion) []Device {
 
+// GetDevices : Returns a list of all available storage devices in structs filled with information
+func GetDevices() []Device {
 	var devices []Device
 
 	cmdArgs := []string{"--raw", "--bytes", "--noheadings"}
@@ -100,8 +88,6 @@ func GetDevices(release_version diagnostics.ReleaseVersion) []Device {
 	firstDevice := true
 	currentDeviceInUseFlag := false
 
-	mainDiskID := GetDeviceIdentifier(release_version)
-
 	for scanner.Scan() {
 		// 1 Device is represented here. Extract words in order for filling a Device struct
 		// Example deviceRawInfo: "mmcblk0 179:0 0 29.7G 0 disk"
@@ -153,14 +139,9 @@ func GetDevices(release_version diagnostics.ReleaseVersion) []Device {
 				Status:     DeviceStatus{ID: 1, Description: "healthy"},
 			}
 
-			if device.ID == mainDiskID {
-				device.MainDevice = true
-			}
-
 			currentDevice = device
 
 		} else if isPartition {
-
 			mountpoint := ""
 			if len(deviceRawInfo) >= 7 {
 				mountpoint = deviceRawInfo[6]

internal/storage/storage_test.go

@@ -7,14 +7,7 @@ import (
 )
 
 func TestGetDevices(t *testing.T) {
-
-	t.Log("Testing with release version dev")
-	assertGetDevices(GetDevices("dev"), t)
-	t.Log("Testing with release version prod")
-	assertGetDevices(GetDevices("prod"), t)
-	t.Log("Testing with release version cloud")
-	assertGetDevices(GetDevices("cloud"), t)
-
+	assertGetDevices(GetDevices(), t)
 }
 
 func assertGetDevices(devices []Device, t *testing.T) {

internal/system/system.go

@@ -82,6 +82,7 @@ func SetupCloudOptions() {
 
 	if err != nil {
 		fmt.Println("Error loading .env file for cloud version setup")
+		return
 	}
 
 	if cloudEnv["NAME"] != "" {

internal/tasks/tasks.go

@@ -39,6 +39,11 @@ type TaskOption struct {
 	Value string `json:"value"`
 }
 
+type TaskBasicAuth struct {
+	Username string `json:"username"`
+	Password string `json:"password"`
+}
+
 type taskSetupTunnelArgs struct {
 	DomainName string `json:"domain_name"`
 }
@@ -65,6 +70,15 @@ type taskSetEdgeAppOptionsArgs struct {
 	Options []TaskOption `json:"options"`
 }
 
+type taskSetEdgeAppBasicAuthArgs struct {
+	ID string `json:"id"`
+	Login TaskBasicAuth `json:"login"`
+}
+
+type taskRemoveEdgeAppBasicAuthArgs struct {
+	ID string `json:"id"`
+}
+
 type taskEnableOnlineArgs struct {
 	ID          string `json:"id"`
 	InternetURL string `json:"internet_url"`
@@ -150,9 +164,6 @@ func ExecuteTask(task Task) Task {
 		log.Fatal(err.Error())
 	}
 
-	if diagnostics.GetReleaseVersion() == diagnostics.DEV_VERSION {
-		log.Printf("Dev environemnt. Not executing tasks.")
-	} else {
 	log.Println("Task: " + task.Task)
 	log.Println("Args: " + task.Args.String)
 	switch task.Task {
@@ -287,6 +298,30 @@ func ExecuteTask(task Task) Task {
 			task.Result = sql.NullString{String: taskResult, Valid: true}
 		}
 
+	case "set_edgeapp_basic_auth":
+
+		log.Println("Settig EdgeApp Basic Authentication...")
+		var args taskSetEdgeAppBasicAuthArgs
+		err := json.Unmarshal([]byte(task.Args.String), &args)
+		if err != nil {
+			log.Printf("Error reading arguments of set_edgeapp_basic_auth task: %s", err)
+		} else {
+			taskResult := taskSetEdgeAppBasicAuth(args)
+			task.Result = sql.NullString{String: taskResult, Valid: true}
+		}
+
+	case "remove_edgeapp_basic_auth":
+
+		log.Println("Removing EdgeApp Basic Authentication...")
+		var args taskRemoveEdgeAppBasicAuthArgs
+		err := json.Unmarshal([]byte(task.Args.String), &args)
+		if err != nil {
+			log.Printf("Error reading arguments of remove_edgeapp_basic_auth task: %s", err)
+		} else {
+			taskResult := taskRemoveEdgeAppBasicAuth(args)
+			task.Result = sql.NullString{String: taskResult, Valid: true}
+		}
+
 	case "enable_online":
 
 		log.Println("Enabling online access to EdgeApp...")
@@ -328,10 +363,8 @@ func ExecuteTask(task Task) Task {
 		log.Println("Disabling online access to Dashboard...")
 		taskResult := taskDisablePublicDashboard()
 		task.Result = sql.NullString{String: taskResult, Valid: true}
-
 	}
 
-	}
 
 	statement, err = db.Prepare("Update task SET status = ?, result = ?, updated = ? WHERE ID = ?;") // Prepare SQL Statement
 	if err != nil {
@@ -389,10 +422,9 @@ func ExecuteSchedules(tick int) {
 		// 	})
 		// }
 
-		if diagnostics.GetReleaseVersion() == diagnostics.CLOUD_VERSION {
+
 		log.Println("Setting up cloud version options (name, email, api token)")
 		taskSetupCloudOptions()
-		}
 
 		// Executing on startup (first tick). Schedules run before tasks in the SystemIterator
 		uptime := taskGetSystemUptime()
@@ -986,6 +1018,77 @@ func taskSetEdgeAppOptions(args taskSetEdgeAppOptionsArgs) string {
 	return string(resultJSON)
 }
 
+func taskSetEdgeAppBasicAuth(args taskSetEdgeAppBasicAuthArgs) string {
+	// Id is the edgeapp id
+	appID := args.ID
+
+
+	// Open the file to write the options,
+	// it is an env file in /home/system/components/apps/<app_id>/auth.env
+
+	// Get the path to the auth.env file
+	edgeappAuthEnvPath := "/home/system/components/apps/" + appID + "/auth.env"
+
+	// If the file does not exist, create it
+	if _, err := os.Stat(edgeappAuthEnvPath); os.IsNotExist(err) {
+		// Create the file
+		_, err := os.Create(edgeappAuthEnvPath)
+		if err != nil {
+			log.Printf("Error creating auth.env file: %s", err)
+		}
+	}
+
+	// It is an env file, so we can use go-dotenv to write the options
+	// Open the file
+	edgeappAuthEnvFile, err := os.OpenFile(edgeappAuthEnvPath, os.O_WRONLY, 0600)
+	if err != nil {
+		log.Printf("Error opening auth.env file: %s", err)
+	}
+
+	// Write the login values to the file
+	_, err = edgeappAuthEnvFile.WriteString("USERNAME=" + args.Login.Username + "\n" + "PASSWORD=" + args.Login.Password + "\n")
+	if err != nil {
+		log.Printf("Error writing credentials to auth.env file: %s", err)
+	}
+	
+	// Close the file
+	err = edgeappAuthEnvFile.Close()
+	if err != nil {
+		log.Printf("Error closing auth.env file: %s", err)
+	}
+
+	result := edgeapps.GetEdgeAppStatus(appID)
+	resultJSON, _ := json.Marshal(result)
+
+	system.StartWs()
+	taskGetEdgeApps() // This task will imediatelly update the entry in the api database.
+
+	return string(resultJSON)
+}
+
+func taskRemoveEdgeAppBasicAuth(args taskRemoveEdgeAppBasicAuthArgs) string {
+	// Id is the edgeapp id
+	appID := args.ID
+
+	// Get the path to the auth.env file
+	edgeappAuthEnvFile := "/auth.env"
+
+	fmt.Println("Removing auth.env file" + edgeappAuthEnvFile)
+
+	err := os.Remove(utils.GetPath(utils.EdgeAppsPath) + args.ID + edgeappAuthEnvFile)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	result := edgeapps.GetEdgeAppStatus(appID)
+	resultJSON, _ := json.Marshal(result)
+
+	system.StartWs()
+	taskGetEdgeApps() // This task will imediatelly update the entry in the api database.
+
+	return string(resultJSON)
+}
+
 func taskEnableOnline(args taskEnableOnlineArgs) string {
 	fmt.Println("Executing taskEnableOnline for " + args.ID)
 
@@ -1087,7 +1190,7 @@ func taskGetSystemUptime() string {
 func taskGetStorageDevices() string {
 	fmt.Println("Executing taskGetStorageDevices")
 
-	devices := storage.GetDevices(diagnostics.GetReleaseVersion())
+	devices := storage.GetDevices()
 	devicesJSON, _ := json.Marshal(devices)
 
 	utils.WriteOption("STORAGE_DEVICES_LIST", string(devicesJSON))