diff --git a/.gitignore b/.gitignore index 2918140..c2e2db9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,3 @@ -# Ignore all -* - -# Unignore all with extensions -!*.* - # ---> Go # If you prefer the allow list template instead of the deny list, see community template: # https://github.com/github/gitignore/blob/main/community/Golang/Go.AllowList.gitignore diff --git a/server/gencerts.sh b/server/gencerts.sh new file mode 100755 index 0000000..432932c --- /dev/null +++ b/server/gencerts.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +echo "Generating..." + +openssl genpkey -algorithm RSA -out ./hmac_key.pem -pkeyopt rsa_keygen_bits:4096 + +openssl req -new -newkey rsa:4096 -x509 -sha256 -days 365 -nodes -keyout api_key.pem -out api_cert.pem \ + -subj "/C=NL/ST=Noord-Holland/L=Amsterdam/O=ExOrg/OU=IT/CN=localhost" \ No newline at end of file diff --git a/server/ghostrunner-server b/server/ghostrunner-server new file mode 100755 index 0000000..d1defe4 Binary files /dev/null and b/server/ghostrunner-server differ diff --git a/server/src/modules/timekeeper/expire.go b/server/src/modules/timekeeper/expire.go new file mode 100644 index 0000000..9758110 --- /dev/null +++ b/server/src/modules/timekeeper/expire.go @@ -0,0 +1,10 @@ +package timekeeper + +import ( + "ghostrunner-server/modules/utilities" + "log" +) + +func expireRoutine() { + log.Println(utilities.InfoTag, "Checking for expired tasks.") +} diff --git a/server/src/modules/timekeeper/routine.go b/server/src/modules/timekeeper/task.go similarity index 93% rename from server/src/modules/timekeeper/routine.go rename to server/src/modules/timekeeper/task.go index 7a5db56..b31d4c9 100644 --- a/server/src/modules/timekeeper/routine.go +++ b/server/src/modules/timekeeper/task.go @@ -11,7 +11,7 @@ import ( "sync" ) -func routine(venvName string, pyListArgs []string) { +func taskRoutine(venvName string, pyListArgs []string) { d := listDevices(venvName, pyListArgs) // Retrieve the Online devices. curTasks := database.RetrieveTasks() @@ -39,9 +39,7 @@ func routine(venvName string, pyListArgs []string) { rawResult := forgeAndExec(venvName, task.Nodeid, task.Command) pResult := generateResult(rawResult) - for idx, item := range pResult { - log.Println(idx, item) - } + insertResult(pResult) log.Println(utilities.InfoTag, "Removing Task from database...") database.RemoveTask(task.Name, task.Nodeid) @@ -106,3 +104,10 @@ func generateResult(rawOut string) []string { return result } + +func insertResult(result []string) error { + for idx, item := range result { + log.Println(idx, item) + } + return nil +} diff --git a/server/src/modules/timekeeper/timekeeper.go b/server/src/modules/timekeeper/timekeeper.go index cec11f6..48c86d4 100644 --- a/server/src/modules/timekeeper/timekeeper.go +++ b/server/src/modules/timekeeper/timekeeper.go @@ -20,7 +20,8 @@ func KeepTime(interval int, venvName string) { for range ticker.C { log.Println(utilities.InfoTag, "----------------------------------------") log.Println(utilities.InfoTag, "Routine Started.") - routine(venvName, pyListArgs) + expireRoutine() + taskRoutine(venvName, pyListArgs) log.Println(utilities.InfoTag, "Routine Ended.") } }