Merge remote-tracking branch 'origin/v11' into release/v11.1.1

# Conflicts:
#	frontend/src/app/shared/services/version/app-version.service.ts

Author: mjabascal10

CHANGELOG.md

@@ -1,12 +1,8 @@
-# UTMStack 11.0.3
+# UTMStack 11.1.0
 
-This is the release notes for **UTMStack v11.0.3**, a minor update focused on bug fixes and performance improvements.
+These are the release notes for **UTMStack v11.1.0**, highlighting new features, bug fixes, and performance improvements.
 
-## Fixed Issues
+## Features
 
-- Fixed a bug in the SOC-AI integration that caused occasional failures when generating insights.
-- Fixed a bug when trying to enroll and authenticate by TFA.
-
-## Enhancements
-
-- SIEM configuration now adapts to the Sovereign Cloud Model implemented by the provider in each region for Azure and Microsoft 365 integrations.
+- Introduced SQL query support in LogExplorer, enabling users to execute SQL queries on OpenSearch indices directly from the user interface.
+- Added an interactive Adversary View to the Threat Management module, providing a graphical, filterable visualization of relationships between Adversaries, their generated Alerts, and associated Echoes.

frontend/src/app/app-module/guides/guide-as400/constants.ts

@@ -7,7 +7,7 @@ export const PLATFORM = [
                   `cd "C:\\Program Files\\UTMStack\\UTMStack Collectors\\AS400"; ` +
                   `& curl.exe -k -o ".\\windows-as400-collector.zip" ` +
                   `"https://V_IP:9001/private/dependencies/collector/windows-as400-collector.zip"; ` +
-                  `Expand-Archive -Path ".\\windows-as400-collector.zip" -DestinationPath "."; ` +  
+                  `Expand-Archive -Path ".\\windows-as400-collector.zip" -DestinationPath "."; ` +
                   `Remove-Item ".\\windows-as400-collector.zip"; Start-Process ".\\utmstack_collectors_installer.exe" ` +
                   `-ArgumentList 'install', 'as400', 'V_IP', '<secret>V_TOKEN</secret>' -NoNewWindow -Wait`,
 
@@ -34,7 +34,7 @@ export const PLATFORM = [
                   `https://V_IP:9001/private/dependencies/collector/linux-as400-collector.zip ` +
                   `&& unzip linux-as400-collector.zip && rm linux-as400-collector.zip && chmod -R 755 ` +
                   `utmstack_collectors_installer && ./utmstack_collectors_installer install as400 ` +
-                  `V_IP <secret>V_TOKEN<secret>"`,
+                  `V_IP <secret>V_TOKEN</secret>"`,
 
 
       uninstall: `sudo bash -c " cd /opt/utmstack-linux-collectors/as400 && ./utmstack_collectors_installer ` +

installer/config/const.go

@@ -13,6 +13,7 @@ const (
 	GetLicenseEndpoint         = "/api/v1/licenses"
 	HealthEndpoint             = "/api/v1/health"
 	LogCollectorEndpoint       = "/api/v1/logcollectors/upload"
+	GetLatestVersionEndpoint   = "/api/v1/versions/latest"
 
 	ImagesPath = "/utmstack/images"
 

installer/install.go

@@ -13,8 +13,14 @@ import (
 	"github.com/utmstack/UTMStack/installer/utils"
 )
 
-func Install() error {
+func Install(specificVersion string) error {
 	fmt.Println("### Installing UTMStack ###")
+
+	if specificVersion != "" {
+		updater.SpecificVersion = specificVersion
+		fmt.Printf("Installing specific version: %s\n", specificVersion)
+	}
+
 	go updater.MonitorConnection(config.GetCMServer(), 30*time.Second, 3, &config.ConnectedToInternet)
 
 	isInstalledAlready, err := utils.CheckIfServiceIsInstalled("UTMStackComponentsUpdater")

installer/main.go

@@ -15,7 +15,11 @@ func main() {
 			help()
 
 		case "--install", "-i":
-			err := Install()
+			var specificVersion string
+			if len(os.Args) > 3 && (os.Args[2] == "--version" || os.Args[2] == "-V") {
+				specificVersion = os.Args[3]
+			}
+			err := Install(specificVersion)
 			if err != nil {
 				fmt.Printf("\nerror installing UTMStack: %v", err)
 				os.Exit(1)
@@ -48,7 +52,7 @@ func main() {
 			help()
 		}
 	} else {
-		err := Install()
+		err := Install("")
 		if err != nil {
 			fmt.Printf("\nerror installing UTMStack: %v", err)
 			os.Exit(1)
@@ -60,8 +64,12 @@ func help() {
 	fmt.Println("### UTMStack ###")
 	fmt.Println("Usage: installer <argument>")
 	fmt.Println("Arguments:")
-	fmt.Println("  --help, -h              Show this help")
-	fmt.Println("  --install, -i <ID>      Install UTMStack (Requires organization ID)")
-	fmt.Println("  --uninstall, -u         Uninstall UTMStack")
-	fmt.Println("  --version, -v           Show UTMStack version")
+	fmt.Println("  --help, -h                            Show this help")
+	fmt.Println("  --install, -i [--version|-V <ver>]    Install UTMStack (optionally specify version)")
+	fmt.Println("  --uninstall, -u                       Uninstall UTMStack")
+	fmt.Println("  --version, -v                         Show UTMStack version")
+	fmt.Println("")
+	fmt.Println("Examples:")
+	fmt.Println("  installer --install                   Install latest version")
+	fmt.Println("  installer --install --version v11.0.3 Install specific version v11.0.3")
 }

installer/updater/versions.go

@@ -3,6 +3,7 @@ package updater
 import (
 	"bytes"
 	"fmt"
+	"net/http"
 	"os"
 	"os/exec"
 	"regexp"
@@ -15,19 +16,31 @@ import (
 )
 
 var (
-	version     = VersionFile{}
-	versionOnce sync.Once
+	version         = VersionFile{}
+	versionOnce     sync.Once
+	SpecificVersion string // Version specified via command line flag
 )
 
 func GetVersion() (VersionFile, error) {
 	var err error
 	versionOnce.Do(func() {
 		if !utils.CheckIfPathExist(config.VersionFilePath) {
-			if config.ConnectedToInternet {
-				version.Version = config.INSTALLER_VERSION
+			// Check if a specific version was requested via command line
+			if SpecificVersion != "" {
+				version.Version = SpecificVersion
 				version.Changelog = ""
 				version.Edition = "community"
-
+			} else if config.ConnectedToInternet {
+				latestVersion, errFetch := fetchLatestVersionFromCM()
+				if errFetch != nil {
+					config.Logger().Info("Could not fetch latest version from CM, using installer version: %v", errFetch)
+					version.Version = config.INSTALLER_VERSION
+					version.Changelog = ""
+				} else {
+					version.Version = latestVersion.Version
+					version.Changelog = latestVersion.Changelog
+				}
+				version.Edition = "community"
 			} else {
 				versionFromTar, errB := ExtractVersionFromFolder(config.ImagesPath)
 				if errB == nil {
@@ -206,3 +219,25 @@ func SortVersions(versions []map[string]string) []map[string]string {
 
 	return versions
 }
+
+func fetchLatestVersionFromCM() (*VersionDTO, error) {
+	url := fmt.Sprintf("%s%s", config.GetCMServer(), config.GetLatestVersionEndpoint)
+
+	resp, status, err := utils.DoReq[VersionDTO](
+		url,
+		nil,
+		http.MethodGet,
+		nil,
+		nil,
+	)
+
+	if err != nil {
+		return nil, fmt.Errorf("error fetching latest version: %v", err)
+	}
+
+	if status != http.StatusOK {
+		return nil, fmt.Errorf("unexpected status code: %d", status)
+	}
+
+	return &resp, nil
+}