utmstack
diff --git a/‎CHANGELOG.md‎
Lines changed: 6 additions & 5 deletions b/‎CHANGELOG.md‎
Lines changed: 6 additions & 5 deletions
diff --git a/‎agent/logservice/processor.go‎
Lines changed: 10 additions & 2 deletions b/‎agent/logservice/processor.go‎
Lines changed: 10 additions & 2 deletions
diff --git a/‎backend/src/main/java/com/park/utmstack/event_processor/EventProcessorManagerService.java‎
Lines changed: 13 additions & 2 deletions b/‎backend/src/main/java/com/park/utmstack/event_processor/EventProcessorManagerService.java‎
Lines changed: 13 additions & 2 deletions
diff --git a/‎backend/src/main/java/com/park/utmstack/repository/application_modules/UtmModuleRepository.java‎
Lines changed: 3 additions & 2 deletions b/‎backend/src/main/java/com/park/utmstack/repository/application_modules/UtmModuleRepository.java‎
Lines changed: 3 additions & 2 deletions
diff --git a/‎backend/src/main/java/com/park/utmstack/service/application_modules/UtmModuleGroupConfigurationService.java‎
Lines changed: 11 additions & 10 deletions b/‎backend/src/main/java/com/park/utmstack/service/application_modules/UtmModuleGroupConfigurationService.java‎
Lines changed: 11 additions & 10 deletions
diff --git a/‎backend/src/main/java/com/park/utmstack/service/application_modules/UtmModuleService.java‎
Lines changed: 24 additions & 28 deletions b/‎backend/src/main/java/com/park/utmstack/service/application_modules/UtmModuleService.java‎
Lines changed: 24 additions & 28 deletions
diff --git a/‎backend/src/main/java/com/park/utmstack/web/rest/application_modules/UtmModuleGroupConfigurationResource.java‎
Lines changed: 10 additions & 1 deletion b/‎backend/src/main/java/com/park/utmstack/web/rest/application_modules/UtmModuleGroupConfigurationResource.java‎
Lines changed: 10 additions & 1 deletion
diff --git a/‎backend/src/main/java/com/park/utmstack/web/rest/application_modules/UtmModuleResource.java‎
Lines changed: 13 additions & 13 deletions b/‎backend/src/main/java/com/park/utmstack/web/rest/application_modules/UtmModuleResource.java‎
Lines changed: 13 additions & 13 deletions
diff --git a/‎frontend/src/app/data-management/adversary-management/adversary-alerts-graph/adversary-alerts-graph.component.html‎
Lines changed: 24 additions & 1 deletion b/‎frontend/src/app/data-management/adversary-management/adversary-alerts-graph/adversary-alerts-graph.component.html‎
Lines changed: 24 additions & 1 deletion
@@ -1,8 +1,9 @@
-# UTMStack 11.1.0
+# UTMStack 11.1.1
 
-These are the release notes for **UTMStack v11.1.0**, highlighting new features, bug fixes, and performance improvements.
+These are the release notes for **UTMStack v11.1.1**, highlighting new features, bug fixes, and performance improvements.
 
-## Features
+## Fixes
+- Improved the module activation and deactivation process to handle missing modules more robustly and prevent errors when activating 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.
+## Features
+- Enabled inline expand/collapse functionality for alert echo rows.
@@ -174,8 +174,16 @@ func (l *LogProcessor) CleanCountedLogs() {
 	for range ticker.C {
 		dataRetention, err := GetDataRetention()
 		if err != nil {
-			utils.Logger.ErrorF("error getting data retention: %s", err)
-			continue
+			utils.Logger.ErrorF("error getting data retention: %s, creating default retention file", err)
+			if err := SetDataRetention(""); err != nil {
+				utils.Logger.ErrorF("error creating default data retention: %s", err)
+				continue
+			}
+			dataRetention, err = GetDataRetention()
+			if err != nil {
+				utils.Logger.ErrorF("error reading newly created data retention: %s", err)
+				continue
+			}
 		}
 		l.db.Lock()
 		_, err = l.db.DeleteOld(&models.Log{}, dataRetention)
 
@@ -4,6 +4,8 @@
 import com.park.utmstack.domain.application_modules.UtmModule;
 import com.park.utmstack.domain.application_modules.UtmModuleGroup;
 import com.park.utmstack.domain.application_modules.enums.ModuleName;
+import com.park.utmstack.service.dto.application_modules.ModuleDTO;
+import com.park.utmstack.service.dto.application_modules.UtmModuleMapper;
 import com.park.utmstack.service.web_clients.rest_template.RestTemplateService;
 import com.park.utmstack.util.CipherUtil;
 import lombok.RequiredArgsConstructor;
@@ -34,7 +36,7 @@ public class EventProcessorManagerService {
             System.getenv(Constants.ENV_EVENT_PROCESSOR_HOST) + ":" +
             System.getenv(Constants.ENV_EVENT_PROCESSOR_PORT);
 
-    public void updateModule(UtmModule module) {
+    public void updateModule(ModuleDTO module) {
         final String ctx = CLASSNAME + ".updateModule";
 
         String url = UriComponentsBuilder
@@ -60,10 +62,19 @@ public void updateModule(UtmModule module) {
 
     public void decryptModuleConfig (UtmModule module){
         Set<UtmModuleGroup> groups = module.getModuleGroups();
+        decryptModuleGroupsConfig(groups, module.getModuleName());
+    }
+
+    public void decryptModuleConfig (ModuleDTO moduleDTO){
+        Set<UtmModuleGroup> groups = moduleDTO.getModuleGroups();
+        decryptModuleGroupsConfig(groups, moduleDTO.getModuleName());
+    }
+
+    private void decryptModuleGroupsConfig(Set<UtmModuleGroup> groups, ModuleName moduleName) {
         groups.forEach((gp) -> {
             gp.getModuleGroupConfigurations().forEach((gpc) -> {
                 if ((gpc.getConfDataType().equals(Constants.CONF_TYPE_PASSWORD) && StringUtils.hasText(gpc.getConfValue()))
-                        || (gpc.getConfDataType().equals(Constants.CONF_TYPE_FILE) && StringUtils.hasText(gpc.getConfValue())) && typeFileNeedsDecryptList.contains(module.getModuleName())) {
+                        || (gpc.getConfDataType().equals(Constants.CONF_TYPE_FILE) && StringUtils.hasText(gpc.getConfValue())) && typeFileNeedsDecryptList.contains(moduleName)) {
                     gpc.setConfValue(CipherUtil.decrypt(gpc.getConfValue(), System.getenv(Constants.ENV_ENCRYPTION_KEY)));
                 }
             });
 
@@ -10,6 +10,7 @@
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Optional;
 
 
 /**
@@ -19,8 +20,8 @@
 @Repository
 public interface UtmModuleRepository extends JpaRepository<UtmModule, Long>, JpaSpecificationExecutor<UtmModule> {
 
-    @EntityGraph(attributePaths = {"moduleGroups", "moduleGroups.moduleGroupConfigurations"})
-    UtmModule findByServerIdAndModuleName(Long serverId, ModuleName shortName);
+    @EntityGraph(attributePaths = {"server", "filters", "moduleGroups", "moduleGroups.moduleGroupConfigurations"})
+    Optional<UtmModule> findByServerIdAndModuleName(Long serverId, ModuleName shortName);
 
     Integer countAllByModuleNameAndModuleActiveIsTrue(ModuleName shortName);
 
 
@@ -8,8 +8,9 @@
 import com.park.utmstack.repository.application_modules.UtmModuleRepository;
 import com.park.utmstack.event_processor.EventProcessorManagerService;
 import com.park.utmstack.util.CipherUtil;
+import com.park.utmstack.util.exceptions.ApiException;
 import lombok.RequiredArgsConstructor;
-import org.apache.commons.lang3.SerializationUtils;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -53,11 +54,11 @@ public void createConfigurationKeys(List<UtmModuleGroupConfiguration> keys) thro
      * @param keys List of configuration keys to save
      * @throws Exception In case of any error
      */
-    public void updateConfigurationKeys(Long moduleId, List<UtmModuleGroupConfiguration> keys) throws Exception {
+    public UtmModule updateConfigurationKeys(Long moduleId, List<UtmModuleGroupConfiguration> keys) throws Exception {
         final String ctx = CLASSNAME + ".updateConfigurationKeys";
         try {
             if (CollectionUtils.isEmpty(keys))
-                return;
+                throw new ApiException("No configuration keys were provided to update", HttpStatus.BAD_REQUEST);
             for (UtmModuleGroupConfiguration key : keys) {
                 if (key.getConfRequired() && !StringUtils.hasText(key.getConfValue()))
                     throw new Exception(String.format("No value was found for required configuration: %1$s (%2$s)", key.getConfName(), key.getConfKey()));
@@ -67,14 +68,14 @@ public void updateConfigurationKeys(Long moduleId, List<UtmModuleGroupConfigurat
             moduleConfigurationRepository.saveAll(keys);
 
             List<ModuleName> needRestartModules = Arrays.asList(ModuleName.AWS_IAM_USER, ModuleName.AZURE,
-                ModuleName.GCP, ModuleName.SOPHOS);
+                    ModuleName.GCP, ModuleName.SOPHOS);
 
-            moduleRepository.findById(moduleId).ifPresent(module -> {
-                module.setNeedsRestart(needRestartModules.contains(module.getModuleName()));
-                moduleRepository.save(module);
-                UtmModule detached = SerializationUtils.clone(module);
-                eventProcessorManagerService.updateModule(detached);
-            });
+            return moduleRepository.findById(moduleId)
+                    .map(module -> {
+                        module.setNeedsRestart(needRestartModules.contains(module.getModuleName()));
+                        return moduleRepository.save(module);
+                    })
+                    .orElseThrow(() -> new ApiException(String.format("Module with ID %1$s not found", moduleId), HttpStatus.NOT_FOUND));
         } catch (Exception e) {
             throw new Exception(ctx + ": " + e.getMessage());
         }
 
@@ -8,12 +8,10 @@
 import com.park.utmstack.repository.UtmModuleGroupRepository;
 import com.park.utmstack.repository.application_modules.UtmModuleRepository;
 import com.park.utmstack.service.UtmMenuService;
-import com.park.utmstack.event_processor.EventProcessorManagerService;
 import com.park.utmstack.service.dto.application_modules.ModuleActivationDTO;
 import com.park.utmstack.service.index_pattern.UtmIndexPatternService;
 import com.park.utmstack.service.logstash_filter.UtmLogstashFilterService;
 import lombok.RequiredArgsConstructor;
-import org.apache.commons.lang3.SerializationUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.data.domain.Page;
@@ -24,7 +22,6 @@
 
 import java.util.List;
 import java.util.NoSuchElementException;
-import java.util.Objects;
 import java.util.Optional;
 
 /**
@@ -43,7 +40,6 @@ public class UtmModuleService {
     private final UtmIndexPatternService indexPatternService;
     private final UtmLogstashFilterService logstashFilterService;
     private final UtmModuleGroupRepository moduleGroupRepository;
-    private final EventProcessorManagerService eventProcessorManagerService;
 
 
     /**
@@ -56,30 +52,29 @@ public class UtmModuleService {
     public UtmModule activateDeactivate(ModuleActivationDTO moduleActivationDTO) {
         final String ctx = CLASSNAME + ".activateDeactivate";
 
-            long serverId = moduleActivationDTO.getServerId();
-            ModuleName nameShort = moduleActivationDTO.getModuleName();
-            boolean activationStatus = moduleActivationDTO.getActivationStatus();
+        long serverId = moduleActivationDTO.getServerId();
+        ModuleName nameShort = moduleActivationDTO.getModuleName();
+        boolean activationStatus = moduleActivationDTO.getActivationStatus();
 
-            UtmModule module = moduleRepository.findByServerIdAndModuleName(serverId, nameShort);
+        return moduleRepository.findByServerIdAndModuleName(serverId, nameShort)
+                .map(module -> {
+                    module.setModuleActive(activationStatus);
+                    module = moduleRepository.save(module);
 
-            if (Objects.isNull(module))
-                throw new NoSuchElementException(String.format("Definition of the module %1$s not found for the server ID %2$s", nameShort.name(), serverId));
+                    List<ModuleName> nonRemovableConf = List.of(ModuleName.SOC_AI);
 
-            module.setModuleActive(activationStatus);
-            module = moduleRepository.save(module);
+                    if (!activationStatus && !nonRemovableConf.contains(nameShort))
+                        moduleGroupRepository.deleteAllByModuleId(module.getId());
 
-            List<ModuleName> nonRemovableConf = List.of(ModuleName.SOC_AI);
+                    enableDisableModuleMenus(nameShort, activationStatus);
+                    enableDisableModuleIndexPatterns(nameShort, activationStatus);
+                    enableDisableModuleFilter(nameShort, activationStatus);
 
-            if (!activationStatus && !nonRemovableConf.contains(nameShort))
-                moduleGroupRepository.deleteAllByModuleId(module.getId());
-
-            enableDisableModuleMenus(nameShort, activationStatus);
-            enableDisableModuleIndexPatterns(nameShort, activationStatus);
-            enableDisableModuleFilter(nameShort, activationStatus);
-            UtmModule detached = SerializationUtils.clone(module);
-            eventProcessorManagerService.updateModule(detached);
-
-            return module;
+                    return module;
+                })
+                .orElseThrow(() -> new NoSuchElementException(
+                        String.format("Definition of the module %1$s not found for the server ID %2$s", nameShort.name(), serverId)
+                ));
     }
 
     private void enableDisableModuleMenus(ModuleName nameShort, Boolean activationStatus) {
@@ -186,11 +181,12 @@ public Optional<UtmModule> findOne(Long id) {
 
     public UtmModule findByServerIdAndModuleName(Long serverId, ModuleName shortName) {
         final String ctx = CLASSNAME + ".findByServerIdAndModuleName";
-        try {
-            return moduleRepository.findByServerIdAndModuleName(serverId, shortName);
-        } catch (Exception e) {
-            throw new RuntimeException(ctx + ": " + e.getMessage());
-        }
+
+        return moduleRepository.findByServerIdAndModuleName(serverId, shortName)
+                .orElseThrow(() -> new NoSuchElementException(
+                        String.format("%s: The module %s not found for the server ID %s", ctx, shortName.name(), serverId)
+                ));
+
     }
 
     public boolean isModuleActive(ModuleName shortName) {
 
@@ -2,10 +2,14 @@
 
 import com.park.utmstack.aop.logging.AuditEvent;
 import com.park.utmstack.domain.application_events.enums.ApplicationEventType;
+import com.park.utmstack.domain.application_modules.UtmModule;
 import com.park.utmstack.domain.application_modules.UtmModuleGroupConfiguration;
+import com.park.utmstack.event_processor.EventProcessorManagerService;
 import com.park.utmstack.service.application_events.ApplicationEventService;
 import com.park.utmstack.service.application_modules.UtmModuleGroupConfigurationService;
 import com.park.utmstack.service.dto.application_modules.GroupConfigurationDTO;
+import com.park.utmstack.service.dto.application_modules.ModuleDTO;
+import com.park.utmstack.service.dto.application_modules.UtmModuleMapper;
 import com.park.utmstack.web.rest.util.HeaderUtil;
 import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;
@@ -27,6 +31,8 @@ public class UtmModuleGroupConfigurationResource {
     private final Logger log = LoggerFactory.getLogger(UtmModuleGroupConfigurationResource.class);
     private final UtmModuleGroupConfigurationService moduleGroupConfigurationService;
     private final ApplicationEventService applicationEventService;
+    private final UtmModuleMapper utmModuleMapper;
+    private final EventProcessorManagerService eventProcessorManagerService;
 
 
     @PutMapping("/module-group-configurations/update")
@@ -39,7 +45,10 @@ public class UtmModuleGroupConfigurationResource {
     public ResponseEntity<Void> updateConfiguration(@Valid @RequestBody GroupConfigurationDTO body) {
         final String ctx = CLASSNAME + ".updateConfiguration";
         try {
-            moduleGroupConfigurationService.updateConfigurationKeys(body.getModuleId(), body.getKeys());
+            UtmModule module = moduleGroupConfigurationService.updateConfigurationKeys(body.getModuleId(), body.getKeys());
+            ModuleDTO moduleDTO = utmModuleMapper.toDto(module, false);
+            eventProcessorManagerService.updateModule(moduleDTO);
+
             return ResponseEntity.ok().build();
         } catch (Exception e) {
             String msg = ctx + ": " + e.getMessage();
 
@@ -13,15 +13,10 @@
 import com.park.utmstack.service.application_modules.UtmModuleQueryService;
 import com.park.utmstack.service.application_modules.UtmModuleService;
 import com.park.utmstack.event_processor.EventProcessorManagerService;
-import com.park.utmstack.service.dto.application_modules.CheckRequirementsResponse;
-import com.park.utmstack.service.dto.application_modules.ModuleActivationDTO;
-import com.park.utmstack.service.dto.application_modules.ModuleDTO;
-import com.park.utmstack.service.dto.application_modules.UtmModuleCriteria;
+import com.park.utmstack.service.dto.application_modules.*;
 import com.park.utmstack.util.ResponseUtil;
 import com.park.utmstack.web.rest.util.PaginationUtil;
-import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import lombok.Setter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.data.domain.Page;
@@ -48,8 +43,8 @@ public class UtmModuleResource {
     private final UtmModuleQueryService utmModuleQueryService;
     private final ApplicationEventService eventService;
     private final UtmServerRepository utmServerRepository;
-    // List of configurations of type 'file' that needs content decryption
     private final EventProcessorManagerService eventProcessorManagerService;
+    private final UtmModuleMapper utmModuleMapper;
 
 
 
@@ -60,14 +55,19 @@ public class UtmModuleResource {
             successMessage = "Module activated/deactivated successfully"
     )
     @PutMapping("/utm-modules/activateDeactivate")
-    public ResponseEntity<UtmModule> activateDeactivate(@RequestParam Long serverId,
+    public ResponseEntity<ModuleDTO> activateDeactivate(@RequestParam Long serverId,
                                                         @RequestParam ModuleName nameShort,
                                                         @RequestParam Boolean activationStatus) {
-        return ResponseEntity.ok(moduleService.activateDeactivate(ModuleActivationDTO.builder()
-                        .serverId(serverId)
-                        .moduleName(nameShort)
-                        .activationStatus(activationStatus)
-                .build()));
+
+        UtmModule module = moduleService.activateDeactivate(ModuleActivationDTO.builder()
+                .serverId(serverId)
+                .moduleName(nameShort)
+                .activationStatus(activationStatus)
+                .build());
+        ModuleDTO moduleDTO = utmModuleMapper.toDto(module, false);
+        eventProcessorManagerService.updateModule(moduleDTO);
+
+        return ResponseEntity.ok(moduleDTO);
     }
 
     /**
 
@@ -1,4 +1,4 @@
-<div class="d-flex flex-column h-100 m-h-0 overflow-auto">
+<div class="d-flex flex-column h-100 m-h-0 overflow-auto chart-container">
   <div class="flex-grow-1 h-100">
     <div echarts
          [options]="option"
@@ -9,3 +9,26 @@
   </div>
 </div>
 
+<div *ngIf="viewAlertDetail" class="utm-right-container">
+  <div (click)="closeDetail()" class="overlay overlay-lg col-md-6"></div>
+  <div class="card utm-right-action utm-right-action-lg">
+    <div class="title d-flex justify-content-between align-items-center border-bottom-1
+     border-bottom-grey-100  p-3 ">
+      <h6 class="card-title pb-0 mb-0 text-blue-800 font-weight-light">
+        {{ alertDetail.name }}
+      </h6>
+      <div class="d-flex flex-row align-items-center gap-2">
+        <app-alert-logs-related-action [logs]="alertDetail.events"></app-alert-logs-related-action>
+        <button (click)="closeDetail()" aria-label="Close"
+                class="" type="button">
+          <div class="close-icon"></div>
+        </button>
+      </div>
+    </div>
+    <app-alert-view-detail [alert]="alertDetail"
+                           [isEcho] = "true"
+                           [hideEmptyField]= "true"
+                           [dataType]="EventDataTypeEnum.ALERT">
+    </app-alert-view-detail>
+  </div>
+</div>