Implemented scaffolding for BrowserDev tasks and implemented taskGetBrowserDevPassword

This commit is contained in:
Paulo Truta
2024-12-03 09:20:44 +01:00
parent b11034dd17
commit 7e42e72bb2
5 changed files with 90 additions and 0 deletions
+32
View File
@@ -7,6 +7,7 @@ import (
"log"
"os"
"io"
"errors"
"os/exec"
"bufio"
"path/filepath"
@@ -17,6 +18,7 @@ import (
"github.com/joho/godotenv"
"github.com/shirou/gopsutil/host"
"github.com/go-yaml/yaml"
)
type cloudflaredTunnelJson struct {
@@ -516,3 +518,33 @@ func ApplyUpdates() {
utils.WriteOption("UPDATING_SYSTEM", "false")
}
func FetchBrowserDevPasswordFromFile() (string, error) {
fmt.Println("Executing FetchBrowserDevPasswordFromFile")
// Read the "password" entry on the yaml file
// Read the yaml file in system.GetPath(BrowserDevPasswordFileLocation)
yamlFile, err := ioutil.ReadFile(utils.GetPath(utils.BrowserDevPasswordFileLocation))
if err != nil {
return "", err
}
// Parse the yaml file and get the "password" entry
var yamlFileMap yaml.MapSlice
err = yaml.Unmarshal(yamlFile, &yamlFileMap)
if err != nil {
return "", err
}
for _, item := range yamlFileMap {
key, value := item.Key, item.Value
if key == "password" {
if pwString, ok := value.(string); ok {
return pwString, nil
} else {
return "", errors.New("password value is not a string")
}
}
}
return "", errors.New("password key not found")
}
+47
View File
@@ -291,6 +291,11 @@ func ExecuteTask(task Task) Task {
taskResult := taskStopShell()
task.Result = sql.NullString{String: taskResult, Valid: true}
case "activate_browser_dev":
log.Println("Activating Browser Dev Environment")
taskResult := taskActivateBrowserDev()
task.Result = sql.NullString{String: taskResult, Valid: true}
case "install_edgeapp":
log.Println("Installing EdgeApp...")
@@ -495,6 +500,8 @@ func ExecuteSchedules(tick int) {
if tick == 1 {
resultPassword := taskGetBrowserDevPassword()
ip := taskGetSystemIP()
log.Println("System IP is: " + ip)
@@ -1099,6 +1106,46 @@ func taskStopShell() string {
}
func taskActivateBrowserDev() string {
fmt.Println("Executing taskActivateBrowserDev")
wsPath := utils.GetPath(utils.WsPath)
// start the code-server process
// utils.Exec(wsPath, "killall", []string{"sshx"})
utils.Exec(wsPath, "killall", []string{"code-server"})
utils.WriteOption("BROWSERDEV_STATUS", "running")
return "{\"status\": \"ok\"}"
}
func taskDeactivateBrowserDev() string {
fmt.Println("Executing taskDeactivateBrowserDev")
utils.WriteOption("BROWSERDEV_STATUS", "not_running")
return "{\"status\": \"ok\"}"
}
func taskGetBrowserDevPassword() string {
fmt.Println("Executing taskGetBrowserDevPassword")
password := utils.ReadOption("BROWSERDEV_PASSWORD")
if password == "" {
password, err := system.FetchBrowserDevPasswordFromFile()
if err == nil {
utils.WriteOption("BROWSERDEV_PASSWORD", password)
} else {
fmt.Println("Error fetching browser dev password from file: " + err.Error())
}
}
return password
}
// func taskSetBrowserDevPassword(args taskSetBrowserDevPasswordArgs) string {
// fmt.Println("Executing taskSetBrowserDevPassword")
// system.SetBrowserDevPassword(args.Password)
// utils.WriteOption("BROWSERDEV_PASSWORD", args.Password)
// return "{\"status\": \"ok\"}"
// }
func taskInstallEdgeApp(args taskInstallEdgeAppArgs) string {
fmt.Println("Executing taskInstallEdgeApp for " + args.ID)
+8
View File
@@ -112,6 +112,7 @@ const EdgeAppsPath string = "edgeAppsPath"
const EdgeAppsBackupPath string = "edgeAppsBackupPath"
const WsPath string = "wsPath"
const LoggerPath string = "loggerPath"
const BrowserDevPasswordFileLocation string = "browserDevPasswordFileLocation"
// GetPath : Returns either the hardcoded path, or a overwritten value via .env file at project root. Register paths here for seamless working code between dev and prod environments ;)
@@ -189,6 +190,13 @@ func GetPath(pathKey string) string {
targetPath = "/home/system/components/backups/pw.txt"
}
case BrowserDevPasswordFileLocation:
if env["BROWSERDEV_PASSWORD_FILE_LOCATION"] != "" {
targetPath = env["BROWSERDEV_PASSWORD_FILE_LOCATION"]
} else {
targetPath = "/root/.config/code-server/config.yaml"
}
default:
log.Printf("path_key %s nonexistant in GetPath().\n", pathKey)