Release/v11.0.2

.github/workflows/v11-deployment-pipeline.yml

@@ -193,6 +193,7 @@ jobs:
           curl -sSL "https://storage.googleapis.com/utmstack-updates/dependencies/agent/utmstack_agent_dependencies_linux.zip" -o ./dependencies/agent/utmstack_agent_dependencies_linux.zip
           curl -sSL "https://storage.googleapis.com/utmstack-updates/dependencies/agent/utmstack_agent_dependencies_windows.zip" -o ./dependencies/agent/utmstack_agent_dependencies_windows.zip
           curl -sSL "https://storage.googleapis.com/utmstack-updates/dependencies/agent/utmstack_agent_dependencies_windows_arm64.zip" -o ./dependencies/agent/utmstack_agent_dependencies_windows_arm64.zip
+          curl -sSL "https://storage.googleapis.com/utmstack-updates/dependencies/agent/utmstack-macos-agent-v10.pkg" -o ./dependencies/agent/utmstack-macos-agent.pkg
 
           cp "${{ github.workspace }}/agent/utmstack_agent_service" ./dependencies/agent/
           cp "${{ github.workspace }}/agent/utmstack_agent_service.exe" ./dependencies/agent/

CHANGELOG.md

@@ -1,4 +1,12 @@
-# UTMStack 11.0.1 Release Notes
+# UTMStack 11.0.3
 
-- Enriched the TIMEZONES constant to include additional IANA zones for broader coverage.
-- Support for additional syslog framing methods (RFC 5424 octet counting).
+This is the release notes for **UTMStack v11.0.3**, a minor update focused on bug fixes and performance improvements.
+
+## Fixed Issues
+
+- 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.

backend/src/main/java/com/park/utmstack/advice/GlobalExceptionHandler.java

@@ -10,6 +10,7 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.authentication.BadCredentialsException;
+import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
@@ -60,6 +61,16 @@ public ResponseEntity<?> handleConflict(Exception e, HttpServletRequest request)
         return ResponseUtil.buildErrorResponse(HttpStatus.CONFLICT, e.getMessage());
     }
 
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public ResponseEntity<?> handleMethodArgumentNotValid(MethodArgumentNotValidException e, HttpServletRequest request) {
+        return ResponseUtil.buildBadRequestResponse(e.getBindingResult().getAllErrors().get(0).getDefaultMessage());
+    }
+
+    @ExceptionHandler(ApiException.class)
+    public ResponseEntity<?> handleApiException(ApiException ex) {
+        return ResponseUtil.buildErrorResponse(ex.getStatus(), ex.getMessage());
+    }
+
     @ExceptionHandler(Exception.class)
     public ResponseEntity<?> handleGenericException(Exception e, HttpServletRequest request) {
         return ResponseUtil.buildInternalServerErrorResponse(e.getMessage());

backend/src/main/java/com/park/utmstack/aop/logging/NoLogException.java

@@ -1,10 +1,8 @@
 package com.park.utmstack.aop.logging;
 
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import java.lang.annotation.*;
 
+@Inherited
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface NoLogException {}

backend/src/main/java/com/park/utmstack/config/Constants.java

@@ -162,6 +162,9 @@ public final class Constants {
     public static final String API_KEY_HEADER = "Utm-Api-Key";
     public static final List<String> API_ENDPOINT_IGNORE = Collections.emptyList();
 
+    // Application version file
+    public static final String APP_VERSION_FILE = "/updates/version.json";
+
     private Constants() {
     }
 }

backend/src/main/java/com/park/utmstack/domain/application_modules/UtmModuleGroupConfiguration.java

@@ -71,7 +71,8 @@ public UtmModuleGroupConfiguration(ModuleConfigurationKey key) {
         this.confDataType = key.getConfDataType();
         this.confRequired = key.getConfRequired();
         this.confOptions = key.getConfOptions();
-        this.confVisibility = key.getConfOptions();
+        this.confValue = key.getConfValue();
+        this.confVisibility = key.getConfVisibility();
     }
 
 }

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

@@ -72,6 +72,22 @@ public List<ModuleConfigurationKey> getConfigurationKeys(Long groupId) throws Ex
             .withConfDataType("text")
             .withConfRequired(true)
             .build());
+
+        keys.add(ModuleConfigurationKey.builder()
+                .withGroupId(groupId)
+                .withConfKey("office365_cloud_environment")
+                .withConfName("Cloud Environment")
+                .withConfDescription("Select the Microsoft cloud environment for Office 365 integration.")
+                .withConfDataType("select")
+                .withConfRequired(false)
+                .withConfValue("Commercial")
+                .withConfOptions("[" +
+                        "{ \"value\": \"Commercial\", \"label\": \"Commercial - Azure commercial global (Default)\" }," +
+                        "{ \"value\": \"GCC\", \"label\": \"GCC - US Government Community Cloud\" }," +
+                        "{ \"value\": \"GCCHigh\", \"label\": \"GCC High - US Government Community Cloud High (DoD IL4)\" }," +
+                        "{ \"value\": \"DoD\", \"label\": \"DoD - US Department of Defense (DoD IL5)\" }" +
+                        "]")
+                .build());
         return keys;
     }
 

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

@@ -7,6 +7,7 @@
 import com.park.utmstack.domain.application_modules.types.ModuleConfigurationKey;
 import com.park.utmstack.domain.application_modules.types.ModuleRequirement;
 import com.park.utmstack.domain.application_modules.validators.UtmModuleConfigValidator;
+import com.park.utmstack.repository.UtmModuleGroupConfigurationRepository;
 import com.park.utmstack.service.application_modules.UtmModuleService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
@@ -23,6 +24,7 @@ public class ModuleSocAi implements IModule {
 
     private final UtmModuleService moduleService;
     private final UtmModuleConfigValidator utmStackConfigValidator;
+    private final UtmModuleGroupConfigurationRepository moduleGroupConfigurationRepository;
 
     @Override
     public UtmModule getDetails(Long serverId) throws Exception {
@@ -102,8 +104,49 @@ public List<ModuleConfigurationKey> getConfigurationKeys(Long groupId) throws Ex
         return keys;
     }
 
-    public boolean validateConfiguration(UtmModule module, List<UtmModuleGroupConfiguration> configuration) throws Exception {
-        return utmStackConfigValidator.validate(module, configuration);
+    public boolean validateConfiguration(UtmModule module, List<UtmModuleGroupConfiguration> configuration) {
+
+        if(configuration == null || configuration.isEmpty()) {
+            throw  new IllegalArgumentException("Configurations cannot be null or empty");
+        }
+
+        Long groupId = configuration.get(0).getGroupId();
+
+        List<UtmModuleGroupConfiguration> dbConfigs = moduleGroupConfigurationRepository
+                .findAllByGroupId(groupId);
+
+        UtmModuleGroupConfiguration providerConfig = configuration.stream()
+                .filter(c -> "utmstack.socai.provider".equals(c.getConfKey()))
+                .findFirst()
+                .orElseGet(() -> dbConfigs.stream()
+                        .filter(c -> "utmstack.socai.provider".equals(c.getConfKey()))
+                        .findFirst()
+                        .orElse(null));
+
+        List<UtmModuleGroupConfiguration> configs = dbConfigs.stream()
+                .filter(c -> !"utmstack.socai.provider".equals(c.getConfKey()))
+                .toList();
+
+        List<UtmModuleGroupConfiguration> filteredConfigs = providerConfig != null && "custom".equals(providerConfig.getConfValue())
+                ? filterCustomConfigs(configs)
+                : filterStandardConfigs(configs);
+
+        filteredConfigs.add(providerConfig);
+
+        return utmStackConfigValidator.validate(module, configuration, filteredConfigs);
+    }
+
+    private List<UtmModuleGroupConfiguration> filterCustomConfigs(List<UtmModuleGroupConfiguration> configs) {
+        return configs.stream()
+                .filter(config -> !config.getConfKey().equals("utmstack.socai.model"))
+                .collect(Collectors.toList());
+    }
+
+    private List<UtmModuleGroupConfiguration> filterStandardConfigs(List<UtmModuleGroupConfiguration> configs) {
+        return configs.stream()
+                .filter(config -> !config.getConfKey().equals("utmstack.socai.custom.model") &&
+                        !config.getConfKey().equals("utmstack.socai.custom.url"))
+                .collect(Collectors.toList());
     }
 
     @Override

backend/src/main/java/com/park/utmstack/domain/application_modules/types/ModuleConfigurationKey.java

@@ -1,74 +1,24 @@
 package com.park.utmstack.domain.application_modules.types;
 
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
 public class ModuleConfigurationKey {
     private Long groupId;
     private String confKey;
     private String confName;
+    private String confValue;
     private String confDescription;
     private String confDataType;
     private String confOptions;
-
+    private String confVisibility;
     private Boolean confRequired;
 
     private ModuleConfigurationKey() {
     }
 
-    public Long getGroupId() {
-        return groupId;
-    }
-
-    public void setGroupId(Long groupId) {
-        this.groupId = groupId;
-    }
-
-    public String getConfKey() {
-        return confKey;
-    }
-
-    public void setConfKey(String confKey) {
-        this.confKey = confKey;
-    }
-
-    public String getConfName() {
-        return confName;
-    }
-
-    public void setConfName(String confName) {
-        this.confName = confName;
-    }
-
-    public String getConfDescription() {
-        return confDescription;
-    }
-
-    public void setConfDescription(String confDescription) {
-        this.confDescription = confDescription;
-    }
-
-    public String getConfDataType() {
-        return confDataType;
-    }
-
-    public void setConfDataType(String confDataType) {
-        this.confDataType = confDataType;
-    }
-
-    public Boolean getConfRequired() {
-        return confRequired;
-    }
-
-    public void setConfRequired(Boolean confRequired) {
-        this.confRequired = confRequired;
-    }
-
-    public String getConfOptions() {
-        return confOptions;
-    }
-
-    public void setConfOptions(String confOptions) {
-        this.confOptions = confOptions;
-    }
-
     public static Builder builder() {
         return new Builder();
     }
@@ -77,11 +27,11 @@ public static class Builder {
         private Long groupId;
         private String confKey;
         private String confName;
+        private String confValue;
         private String confDescription;
         private String confDataType;
         private Boolean confRequired;
-        private Boolean confVisible = true;
-
+        private String confVisibility;
         private String confOptions;
 
         public Builder withGroupId(Long groupId) {
@@ -119,6 +69,16 @@ public Builder withConfOptions(String confOptions) {
             return this;
         }
 
+        public Builder withConfValue(String confValue) {
+            this.confValue = confValue;
+            return this;
+        }
+
+        public Builder withConfVisibility(String confVisibility) {
+            this.confVisibility = confVisibility;
+            return this;
+        }
+
         public ModuleConfigurationKey build() {
             ModuleConfigurationKey key = new ModuleConfigurationKey();
             key.setGroupId(groupId);
@@ -128,6 +88,8 @@ public ModuleConfigurationKey build() {
             key.setConfDataType(confDataType);
             key.setConfRequired(confRequired);
             key.setConfOptions(confOptions);
+            key.setConfValue(confValue);
+            key.setConfVisibility(confVisibility);
             return key;
         }
     }

backend/src/main/java/com/park/utmstack/domain/application_modules/validators/UtmModuleConfigValidator.java

@@ -4,44 +4,49 @@
 import com.park.utmstack.domain.application_modules.UtmModule;
 import com.park.utmstack.domain.application_modules.UtmModuleGroupConfiguration;
 import com.park.utmstack.repository.UtmModuleGroupConfigurationRepository;
-import com.park.utmstack.service.application_modules.connectors.UtmStackConnectionService;
+import com.park.utmstack.service.application_modules.connectors.ModuleConfigurationValidationService;
 import com.park.utmstack.service.dto.application_modules.UtmModuleGroupConfDTO;
 import com.park.utmstack.service.dto.application_modules.UtmModuleGroupConfWrapperDTO;
 import com.park.utmstack.util.CipherUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 @Service
 @RequiredArgsConstructor
 public class UtmModuleConfigValidator {
 
     private final UtmModuleGroupConfigurationRepository moduleGroupConfigurationRepository;
-    private final UtmStackConnectionService utmStackConnectionService;
+    private final ModuleConfigurationValidationService utmStackConnectionService;
 
-    public boolean validate(UtmModule module, List<UtmModuleGroupConfiguration> keys) throws Exception {
+    public boolean validate(UtmModule module, List<UtmModuleGroupConfiguration> keys) {
         if (keys.isEmpty()) return false;
 
         List<UtmModuleGroupConfiguration> dbConfigs = moduleGroupConfigurationRepository
                 .findAllByGroupId(keys.get(0).getGroupId());
 
+        return validate(module, keys, dbConfigs);
+    }
+
+    public boolean validate(UtmModule module, List<UtmModuleGroupConfiguration> keys, List<UtmModuleGroupConfiguration> dbConfigs) {
+        if (keys.isEmpty()) return false;
+
         List<UtmModuleGroupConfDTO> configDTOs = dbConfigs.stream()
                 .map(dbConf -> {
                     UtmModuleGroupConfiguration override = findInKeys(keys, dbConf.getConfKey());
                     UtmModuleGroupConfiguration source = override != null ? override : dbConf;
 
                     return new UtmModuleGroupConfDTO(
                             source.getConfKey(),
-                            decryptIfNeeded(source.getConfDataType(), source.getConfValue())
+                            override != null ? source.getConfValue() : decryptIfNeeded(source.getConfDataType(), source.getConfValue())
                     );
                 })
                 .toList();
 
         UtmModuleGroupConfWrapperDTO body = new UtmModuleGroupConfWrapperDTO(configDTOs);
 
-        return utmStackConnectionService.testConnection(module.getModuleName().name(), body);
+        return utmStackConnectionService.validateModuleConfiguration(module.getModuleName().name(), body);
     }
 
     private UtmModuleGroupConfiguration findInKeys(List<UtmModuleGroupConfiguration> keys, String confKey) {

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

@@ -0,0 +1,31 @@
+package com.park.utmstack.service.app_info;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.park.utmstack.service.dto.app_info.AppInfoDto;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.io.File;
+import java.io.IOException;
+
+import static com.park.utmstack.config.Constants.APP_VERSION_FILE;
+
+@Service
+@Slf4j
+public class AppInfoService {
+
+    private static final String CLASSNAME = "AppInfoService";
+
+    public AppInfoDto loadVersionInfo() throws Exception {
+        final String ctx = "loadVersionInfo";
+        try {
+            ObjectMapper mapper = new ObjectMapper();
+            return mapper.readValue(new File(APP_VERSION_FILE), AppInfoDto.class);
+        } catch (IOException e) {
+            log.error("{}: An error occurred while reading the version file: {}", CLASSNAME + "." + ctx, e.getMessage(), e);
+            throw new RuntimeException("An error occurred while reading the version file");
+        }
+
+    }
+}
+