Merge branch 'release/v11.2.1' of https://github.com/utmstack/UTMStack into release/v11.2.1

Author: Kbayero

backend/src/main/java/com/park/utmstack/service/app_info/AppInfoService.java

@@ -16,7 +16,7 @@ public class AppInfoService {
 
     private static final String CLASSNAME = "AppInfoService";
 
-    public AppInfoDto loadVersionInfo() throws Exception {
+    public AppInfoDto loadVersionInfo() {
         final String ctx = "loadVersionInfo";
         try {
             ObjectMapper mapper = new ObjectMapper();

backend/src/main/java/com/park/utmstack/service/impl/UtmAlertServiceImpl.java

@@ -81,6 +81,7 @@ public void checkForNewAlerts() {
 
             List<FilterType> filters = new ArrayList<>();
             filters.add(new FilterType(Constants.alertStatus, OperatorType.IS, AlertStatus.OPEN.getCode()));
+            filters.add(new FilterType(Constants.alertTags, OperatorType.DOES_NOT_CONTAIN, Constants.FALSE_POSITIVE_TAG));
             filters.add(new FilterType(Constants.timestamp, OperatorType.IS_GREATER_THAN, initialDate.getLastAlertTimestamp().toString()));
 
             SearchRequest.Builder srb = new SearchRequest.Builder();

backend/src/main/java/com/park/utmstack/service/validators/tw_config/TwConfigValidatorService.java

@@ -0,0 +1,43 @@
+package com.park.utmstack.service.validators.tw_config;
+
+import com.park.utmstack.domain.UtmConfigurationParameter;
+import com.park.utmstack.service.app_info.AppInfoService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.Errors;
+import org.springframework.validation.Validator;
+
+@Service
+@RequiredArgsConstructor
+public class TwConfigValidatorService implements Validator {
+
+    private final AppInfoService infoService;
+
+    @Override
+    public boolean supports(Class<?> clazz) {
+        return UtmConfigurationParameter.class.equals(clazz);
+    }
+
+    @Override
+    public void validate(Object target, Errors errors) {
+        UtmConfigurationParameter parameter = (UtmConfigurationParameter) target;
+
+        String value = parameter.getConfParamValue();
+        if (value == null) {
+            errors.rejectValue("confParamValue", "null", "Value cannot be null");
+            return;
+        }
+
+        String edition;
+        try {
+            edition = infoService.loadVersionInfo().getEdition();
+        } catch (Exception e) {
+            errors.reject("appInfo.error", "Could not determine application edition");
+            return;
+        }
+
+        if (!Boolean.parseBoolean(value) && "community".equals(edition)) {
+            errors.rejectValue("confParamValue", "forbidden", "Forbidden to disable in COMMUNITY edition");
+        }
+    }
+}

backend/src/main/java/com/park/utmstack/web/rest/UtmConfigurationParameterResource.java

@@ -9,9 +9,11 @@
 import com.park.utmstack.service.dto.UtmConfigurationParameterCriteria;
 import com.park.utmstack.service.mail_config.MailConfigService;
 import com.park.utmstack.service.validators.email.EmailValidatorService;
+import com.park.utmstack.service.validators.tw_config.TwConfigValidatorService;
 import com.park.utmstack.util.ResponseUtil;
 import com.park.utmstack.util.exceptions.UtmMailException;
 import com.park.utmstack.web.rest.util.PaginationUtil;
+import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springdoc.api.annotations.ParameterObject;
@@ -35,6 +37,7 @@
  * REST controller for managing UtmConfigurationParameter.
  */
 @RestController
+@RequiredArgsConstructor
 @RequestMapping("/api")
 public class UtmConfigurationParameterResource {
 
@@ -48,19 +51,7 @@ public class UtmConfigurationParameterResource {
     private final EmailValidatorService emailValidatorService;
     private final MailConfigService mailConfigService;
     private final UtmStackService utmStackService;
-    public UtmConfigurationParameterResource(UtmConfigurationParameterService utmConfigurationParameterService,
-                                             UtmConfigurationParameterQueryService utmConfigurationParameterQueryService,
-                                             ApplicationEventService applicationEventService,
-                                             EmailValidatorService emailValidatorService,
-                                             MailConfigService mailConfigService,
-                                             UtmStackService utmStackService) {
-        this.utmConfigurationParameterService = utmConfigurationParameterService;
-        this.utmConfigurationParameterQueryService = utmConfigurationParameterQueryService;
-        this.applicationEventService = applicationEventService;
-        this.emailValidatorService = emailValidatorService;
-        this.mailConfigService = mailConfigService;
-        this.utmStackService = utmStackService;
-    }
+    private final TwConfigValidatorService twConfigValidatorService;
 
     /**
      * PUT  /utm-configuration-parameters : Updates an existing utmConfigurationParameter.
@@ -76,16 +67,21 @@ public ResponseEntity<Void> updateConfigurationParameters(@Valid @RequestBody Li
         try {
             Assert.notEmpty(parameters, "There isn't any parameter to update");
             for (UtmConfigurationParameter parameter : parameters) {
+                Errors errors = new BeanPropertyBindingResult(parameter, "utmConfigurationParameter");
+
+                if(parameter.getConfParamShort().equals("utmstack.tw.enable")){
+                    twConfigValidatorService.validate(parameter, errors);
+                }
+
                 if(StringUtils.hasText(parameter.getConfParamRegexp())){
-                    Errors errors = new BeanPropertyBindingResult(parameter, "utmConfigurationParameter");
                     emailValidatorService.validate(parameter, errors);
+                }
 
-                    if (errors.hasErrors()) {
-                        String msg =  String.format("Validation failed for field %s.", parameter.getConfParamShort());
-                        log.error(msg);
-                        applicationEventService.createEvent(msg, ApplicationEventType.ERROR);
-                        return ResponseUtil.buildPreconditionFailedResponse(msg);
-                    }
+                if (errors.hasErrors()) {
+                    String msg =  String.format("Validation failed for field %s.", parameter.getConfParamShort());
+                    log.error(msg);
+                    applicationEventService.createEvent(msg, ApplicationEventType.ERROR);
+                    return ResponseUtil.buildPreconditionFailedResponse(msg);
                 }
             }
             utmConfigurationParameterService.saveAll(parameters);

backend/src/main/resources/config/liquibase/changelog/20260113001_update_macos_integration_category.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<databaseChangeLog
+        xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd">
+
+    <changeSet id="20260113001" author="manuel">
+
+        <update tableName="utm_module">
+            <column name="module_category" value="Agents &amp; Syslog"/>
+            <where>module_name = 'MACOS'</where>
+        </update>
+
+    </changeSet>
+</databaseChangeLog>

backend/src/main/resources/config/liquibase/master.xml

@@ -301,5 +301,7 @@
 
     <include file="config/liquibase/changelog/20260112001_add_threatwinds_credentials_section.xml" relativeToChangelogFile="false"/>
 
+    <include file="config/liquibase/changelog/20260113001_update_macos_integration_category.xml" relativeToChangelogFile="false"/>
+
 
 </databaseChangeLog>