Merge branch 'release/v11.2.9' into fix/dependabot-remediation

Signed-off-by: Osmany Montero <osmontero@icloud.com>

Author: osmontero

agent/go.mod

@@ -16,7 +16,7 @@ require (
 	github.com/threatwinds/go-sdk v1.1.21
 	github.com/threatwinds/logger v1.2.3
 	github.com/utmstack/UTMStack/shared v0.0.0
-	golang.org/x/sys v0.44.0
+	golang.org/x/sys v0.45.0
 	google.golang.org/grpc v1.81.1
 	google.golang.org/protobuf v1.36.11
 	gorm.io/gorm v1.31.1

agent/go.sum

@@ -189,8 +189,8 @@ golang.org/x/net v0.52.0/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw=
 golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
 golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.44.0 h1:ildZl3J4uzeKP07r2F++Op7E9B29JRUy+a27EibtBTQ=
-golang.org/x/sys v0.44.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
+golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY=
+golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
 golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8=
 golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA=
 golang.org/x/tools v0.42.0 h1:uNgphsn75Tdz5Ji2q36v/nsFSfR/9BRFvqhGBaJGd5k=

backend/src/main/java/com/park/utmstack/domain/application_modules/factory/impl/ModuleSocAi.java

@@ -45,12 +45,83 @@ public List<ModuleRequirement> checkRequirements(Long serverId) throws Exception
     public List<ModuleConfigurationKey> getConfigurationKeys(Long groupId) throws Exception {
         List<ModuleConfigurationKey> keys = new ArrayList<>();
 
+        keys.add(ModuleConfigurationKey.builder()
+            .withGroupId(groupId)
+            .withConfKey("utmstack.socai.provider")
+            .withConfName("AI Provider")
+            .withConfDescription("AI provider used by SOC AI.")
+            .withConfDataType("text")
+            .withConfValue("openai")
+            .withConfRequired(true)
+            .build());
+
+        keys.add(ModuleConfigurationKey.builder()
+            .withGroupId(groupId)
+            .withConfKey("utmstack.socai.model")
+            .withConfName("AI Model")
+            .withConfDescription("AI model that SOC AI will use to analyze alerts (first option of active provider).")
+            .withConfDataType("text")
+            .withConfValue("gpt-4o")
+            .withConfRequired(true)
+            .build());
+
+        keys.add(ModuleConfigurationKey.builder()
+            .withGroupId(groupId)
+            .withConfKey("utmstack.socai.url")
+            .withConfName("Provider URL")
+            .withConfDescription("Endpoint URL for the provider (only set for azure / ollama / custom).")
+            .withConfDataType("text")
+            .withConfValue("")
+            .withConfRequired(false)
+            .build());
+
+        keys.add(ModuleConfigurationKey.builder()
+            .withGroupId(groupId)
+            .withConfKey("utmstack.socai.maxTokens")
+            .withConfName("Max Tokens")
+            .withConfDescription("Maximum number of tokens used per request.")
+            .withConfDataType("text")
+            .withConfValue("4096")
+            .withConfRequired(true)
+            .build());
+
+        keys.add(ModuleConfigurationKey.builder()
+            .withGroupId(groupId)
+            .withConfKey("utmstack.socai.authType")
+            .withConfName("Authentication Type")
+            .withConfDescription("Authentication type used to reach the provider (none for ollama).")
+            .withConfDataType("text")
+            .withConfValue("custom-headers")
+            .withConfRequired(true)
+            .build());
+
+        keys.add(ModuleConfigurationKey.builder()
+            .withGroupId(groupId)
+            .withConfKey("utmstack.socai.customHeaders")
+            .withConfName("Custom Headers")
+            .withConfDescription("Custom headers (JSON object) sent with each request to the provider.")
+            .withConfDataType("password")
+            .withConfValue("")
+            .withConfRequired(false)
+            .build());
+
+        keys.add(ModuleConfigurationKey.builder()
+            .withGroupId(groupId)
+            .withConfKey("utmstack.socai.autoAnalyze")
+            .withConfName("Auto Analyze")
+            .withConfDescription("If set to \"true\", SOC AI will automatically analyze incoming alerts.")
+            .withConfDataType("text")
+            .withConfValue("false")
+            .withConfRequired(false)
+            .build());
+
         keys.add(ModuleConfigurationKey.builder()
             .withGroupId(groupId)
             .withConfKey("utmstack.socai.incidentCreation")
             .withConfName("Automatic Incident creation")
             .withConfDescription("If set to \"true\", the system will create incidents based on analysis of alerts.")
-            .withConfDataType("bool")
+            .withConfDataType("text")
+            .withConfValue("false")
             .withConfRequired(false)
             .build());
 
@@ -60,37 +131,11 @@ public List<ModuleConfigurationKey> getConfigurationKeys(Long groupId) throws Ex
             .withConfName("Change Alert Status")
             .withConfDescription("If set to \"true\", SOC Ai will automatically change the status of alerts. " +
                 "Analysts should investigate those with the status \"In Review\".")
-            .withConfDataType("bool")
+            .withConfDataType("text")
+            .withConfValue("false")
             .withConfRequired(false)
             .build());
 
-        keys.add(ModuleConfigurationKey.builder()
-                .withGroupId(groupId)
-                .withConfKey("utmstack.socai.model")
-                .withConfName("Select AI Model")
-                .withConfDescription("Choose the AI model that SOC AI will use to analyze alerts.")
-                .withConfDataType("select")
-                .withConfRequired(true)
-                .withConfOptions(
-                        "[" +
-                                "{\"value\": \"gpt-4\", \"label\": \"GPT-4\"}," +
-                                "{\"value\": \"gpt-4-0613\", \"label\": \"GPT-4 (0613)\"}," +
-                                "{\"value\": \"gpt-4-32k\", \"label\": \"GPT-4 32K\"}," +
-                                "{\"value\": \"gpt-4-32k-0613\", \"label\": \"GPT-4 32K (0613)\"}," +
-                                "{\"value\": \"gpt-4-turbo\", \"label\": \"GPT-4 Turbo\"}," +
-                                "{\"value\": \"gpt-4o\", \"label\": \"GPT-4 Omni\"}," +
-                                "{\"value\": \"gpt-4o-mini\", \"label\": \"GPT-4 Omni Mini\"}," +
-                                "{\"value\": \"gpt-4.1\", \"label\": \"GPT-4.1\"}," +
-                                "{\"value\": \"gpt-4.1-mini\", \"label\": \"GPT-4.1 Mini\"}," +
-                                "{\"value\": \"gpt-4.1-nano\", \"label\": \"GPT-4.1 Nano\"}," +
-                                "{\"value\": \"gpt-3.5-turbo\", \"label\": \"GPT-3.5 Turbo\"}," +
-                                "{\"value\": \"gpt-3.5-turbo-0613\", \"label\": \"GPT-3.5 Turbo (0613)\"}," +
-                                "{\"value\": \"gpt-3.5-turbo-16k\", \"label\": \"GPT-3.5 Turbo 16K\"}," +
-                                "{\"value\": \"gpt-3.5-turbo-16k-0613\", \"label\": \"GPT-3.5 Turbo 16K (0613)\"}" +
-                                "]"
-                )
-                .build());
-
         return keys;
     }
 

backend/src/main/java/com/park/utmstack/web/rest/application_modules/UtmModuleGroupResource.java

@@ -30,6 +30,7 @@
 import javax.validation.Valid;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
 
@@ -82,6 +83,15 @@ public ResponseEntity<UtmModuleGroup> createConfigurationGroup(@Valid @RequestBo
             defaultConfigurationKeys.forEach(key -> keys.add(new UtmModuleGroupConfiguration(key)));
             moduleGroupConfigurationService.createConfigurationKeys(keys);
 
+            for (UtmModuleGroupConfiguration conf : keys) {
+                if ((Constants.CONF_TYPE_PASSWORD.equals(conf.getConfDataType())
+                        || Constants.CONF_TYPE_FILE.equals(conf.getConfDataType()))
+                        && conf.getConfValue() != null) {
+                    conf.setConfValue(Constants.MASKED_VALUE);
+                }
+            }
+            result.setModuleGroupConfigurations(new HashSet<>(keys));
+
             return ResponseEntity.ok(result);
         } catch (DataIntegrityViolationException e) {
             String msg = ctx + ": " + e.getMostSpecificCause().getMessage().replaceAll("\n", "");

frontend/src/app/app-module/guides/guide-soc-ai/guide-soc-ai.component.html

@@ -155,9 +155,11 @@ <h4 class="card-title mb-0 text-primary">SOC AI</h4>
                   <i [ngClass]="saving ? 'icon-spinner2 spinner' : 'icon-cog5'" class="mr-1"></i>
                   Save configuration
                 </button>
+
                 <app-app-module-activate-button [module]="module.SOC_AI" [type]="'integration'"
-                                                [disabled]="false"
+                                                [disabled]="!configReady"
                                                 [serverId]="serverId"
+                                                (disableModuleClicked)="disableModule()"
                                                 class="ml-2">
                 </app-app-module-activate-button>
               </div>

frontend/src/app/app-module/guides/guide-soc-ai/guide-soc-ai.component.ts

@@ -39,6 +39,8 @@ export class GuideSocAiComponent implements OnInit {
   saving = false;
   loading = true;
 
+  configReady=false
+
   // Form values - what the user sees/edits
   formValues: {[key: string]: string} = {};
   customModelValue = '';
@@ -322,6 +324,7 @@ export class GuideSocAiComponent implements OnInit {
         };
       }
       this.loading = false;
+      this.configReady = true;
       this.cdr.detectChanges();
     }, () => {
       this.loading = false;
@@ -439,6 +442,31 @@ export class GuideSocAiComponent implements OnInit {
 
   save() {
     this.saving = true;
+
+    if (!this.groupId || !this.rawConfigs.length) {
+      this.moduleGroupService.create({
+        name: 'socai',
+        description: 'socai',
+        moduleId: this.integrationId
+      }).subscribe(
+        response => {
+          this.groupId = response.body.id;
+          this.rawConfigs = response.body.moduleGroupConfigurations || [];
+          this.cdr.markForCheck()
+          this.persistConfig();
+        },
+        () => {
+          this.saving = false;
+          this.cdr.markForCheck();
+          this.toast.showError('Error', 'Failed to create configuration group. Please try again.');
+        }
+      );
+      return;
+    }
+    this.persistConfig();
+  }
+
+  private persistConfig() {
     const changes: UtmModuleGroupConfType[] = [];
 
     // Set provider
@@ -494,12 +522,16 @@ export class GuideSocAiComponent implements OnInit {
       // Otherwise: don't touch customHeaders — keep existing value in DB
     }
 
+    this.rawConfigs=changes
+    this.cdr.markForCheck()
+
     this.moduleGroupConfService.update({
       keys: changes,
       moduleId: this.integrationId
     }).subscribe(
       () => {
         this.saving = false;
+        this.configReady = true;
         this.cdr.markForCheck()
         this.toast.showSuccessBottom('SOC AI configuration saved successfully');
       },
@@ -610,4 +642,10 @@ export class GuideSocAiComponent implements OnInit {
       // Invalid JSON, start empty
     }
   }
+
+
+  public disableModule(){
+    this.groupId=null
+    this.rawConfigs=[]
+  }
 }

frontend/src/app/app-module/shared/components/app-module-activate-button/app-module-activate-button.component.ts

@@ -95,11 +95,10 @@ export class AppModuleActivateButtonComponent implements OnInit, OnDestroy {
           this.moduleRefreshBehavior.$moduleChange.next(true);
           this.toastService.showSuccessBottom('Module ' + this.moduleDetail.moduleName +
             ' has been ' + (this.moduleDetail.moduleActive ? 'enabled' : 'disabled') + ' successfully');
+          if (!status) {
+            this.disableModuleClicked.emit();
+          }
         });
-    } else {
-      if (fromOnclick && !status) {
-        this.disableModuleClicked.emit();
-      }
     }
   }
 

frontend/src/app/data-management/alert-management/alert-view/alert-view.component.html

@@ -38,6 +38,12 @@ <h5 class="card-title mb-0 text-uppercase label-header">
               &nbsp;The system has detected new alerts, retrieving from the data engine...
             </span>
           </div>
+          <div *ngIf="searching && !loading && !refreshingAlert"
+               class="search-loading-indicator text-blue-800 pt-2 pr-2 pl-2">
+            <span class="span-small-icon"><i class="icon-spinner2 spinner"></i>
+              &nbsp;Searching...
+            </span>
+          </div>
           <div *ngIf="incomingAlert$ | async as openAlert" class="d-flex justify-content-start align-items-center pt-2 pr-2 pl-2">
             <ng-container *ngIf="openAlert > 0 && showRefresh">
             <span class="span-small-icon">

frontend/src/app/data-management/alert-management/alert-view/alert-view.component.scss

@@ -32,3 +32,7 @@ tr.no-bottom-border {
 .bg-children-light {
   background-color: #cccccc52 !important;
 }
+
+.search-loading-indicator {
+  pointer-events: none;
+}

frontend/src/app/data-management/alert-management/alert-view/alert-view.component.ts

@@ -6,8 +6,8 @@ import {TranslateService} from '@ngx-translate/core';
 import {ResizeEvent} from 'angular-resizable-element';
 import {NgxSpinnerService} from 'ngx-spinner';
 import {LocalStorageService} from 'ngx-webstorage';
-import {Observable, Subject} from 'rxjs';
-import {filter, takeUntil, tap} from 'rxjs/operators';
+import {Observable, Subject, throwError, timer, Subscription} from 'rxjs';
+import {concatMap, filter, retryWhen, takeUntil, tap, finalize} from 'rxjs/operators';
 import {UtmToastService} from '../../../shared/alert/utm-toast.service';
 import {
   ElasticFilterDefaultTime
@@ -64,7 +64,8 @@ import {ElasticDataTypesEnum} from "../../../shared/enums/elastic-data-types.enu
   styleUrls: ['./alert-view.component.scss']
 })
 export class AlertViewComponent implements OnInit, OnDestroy {
-
+  private lastRequest:Subscription|null = null
+  private lastTimeout:any = -1
 
   constructor(private elasticDataService: ElasticDataService,
               private modalService: NgbModal,
@@ -343,10 +344,24 @@ export class AlertViewComponent implements OnInit, OnDestroy {
     this.getAlert('on time filter change');
   }
 
+  get searching(): boolean {
+    return this.lastRequest!=null;
+  }
+
   getAlert(calledFrom?: string, filtersParam?: ElasticFilterType[]) {
-    this.elasticDataService.search(this.page, this.itemsPerPage,
+    if(this.lastTimeout!=-1){
+      clearTimeout(this.lastTimeout)
+      if(this.lastRequest){
+        this.lastRequest.unsubscribe()
+        this.lastRequest=null
+      }
+    }
+    this.lastTimeout= setTimeout(()=>{
+    this.lastRequest=this.elasticDataService.search(this.page, this.itemsPerPage,
       MAX_SEARCH_RESULTS, this.dataNature,
-      sanitizeFilters(this.filters), this.sortBy, true).subscribe(
+      sanitizeFilters(this.filters), this.sortBy, true)
+        .pipe(finalize(()=>this.lastRequest=null))
+        .subscribe(
       (res: HttpResponse<any>) => {
         this.totalItems = Number(res.headers.get('X-Total-Count'));
         this.alerts = res.body;
@@ -355,8 +370,11 @@ export class AlertViewComponent implements OnInit, OnDestroy {
       },
       (res: HttpResponse<any>) => {
         this.utmToastService.showError('Error', 'An error occurred while listing the alerts. Please try again later.');
+        this.loading = false;
+        this.refreshingAlert = false;
       }
     );
+    },100)
   }
 
   saveReport() {