feat[backend](modules-config): removed decryption type in all comunications with modules config service

Author: AlexSanchez-bit

backend/src/main/java/com/park/utmstack/event_processor/EventProcessorManagerService.java

@@ -1,25 +1,18 @@
 package com.park.utmstack.event_processor;
 
 import com.park.utmstack.config.Constants;
-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;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
 import org.springframework.web.util.UriComponentsBuilder;
 
 import java.util.List;
-import java.util.Set;
 
 @Service
 @RequiredArgsConstructor
@@ -30,8 +23,6 @@ public class EventProcessorManagerService {
 
     private final RestTemplateService restTemplateService;
 
-    private final List<ModuleName> typeFileNeedsDecryptList = List.of(ModuleName.GCP);
-
     public static final String EVENT_PROCESSOR_BASE_URL = "http://" +
             System.getenv(Constants.ENV_EVENT_PROCESSOR_HOST) + ":" +
             System.getenv(Constants.ENV_EVENT_PROCESSOR_PORT);
@@ -59,27 +50,6 @@ public void updateModule(ModuleDTO 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(moduleName)) {
-                    gpc.setConfValue(CipherUtil.decrypt(gpc.getConfValue(), System.getenv(Constants.ENV_ENCRYPTION_KEY)));
-                }
-            });
-        });
-    }
-
     private HttpHeaders buildEventProcessorHeaders() {
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(MediaType.APPLICATION_JSON);

backend/src/main/java/com/park/utmstack/service/application_modules/UtmModuleGroupConfigurationService.java

@@ -43,6 +43,11 @@ public void createConfigurationKeys(List<UtmModuleGroupConfiguration> keys) thro
         try {
             if (CollectionUtils.isEmpty(keys))
                 return;
+            for (UtmModuleGroupConfiguration key : keys) {
+                if (isSensitiveType(key.getConfDataType()) && StringUtils.hasText(key.getConfValue())) {
+                    key.setConfValue(CipherUtil.encrypt(key.getConfValue(), System.getenv(Constants.ENV_ENCRYPTION_KEY)));
+                }
+            }
             moduleConfigurationRepository.saveAll(keys);
         } catch (Exception e) {
             throw new Exception(ctx + ": " + e.getMessage());

backend/src/main/java/com/park/utmstack/service/application_modules/UtmModuleGroupService.java

@@ -249,13 +249,19 @@ public void updateCollectorConfigurationKeys(CollectorConfigDTO collectorConfig)
                 moduleGroupRepository.deleteAll(dbConfigs);
             } else {
                 for (UtmModuleGroupConfiguration key : keys) {
-                    if (key.getConfDataType().equals("password")) {
-                        if (Constants.MASKED_VALUE.equals(key.getConfValue())) {
-                            continue;
-                        }
+                    boolean isSensitive = isSensitiveType(key.getConfDataType());
+                    if (isSensitive && Constants.MASKED_VALUE.equals(key.getConfValue())) {
+                        continue;
+                    }
+                    if (isSensitive) {
                         key.setConfValue(CipherUtil.encrypt(key.getConfValue(), System.getenv(Constants.ENV_ENCRYPTION_KEY)));
                     }
                 }
+
+                List<UtmModuleGroupConfiguration> toSave = keys.stream()
+                        .filter(k -> !(isSensitiveType(k.getConfDataType()) && Constants.MASKED_VALUE.equals(k.getConfValue())))
+                        .collect(Collectors.toList());
+
                 List<Long> keyGroupIds = keys.stream()
                         .map(UtmModuleGroupConfiguration::getGroupId)
                         .toList();
@@ -265,7 +271,9 @@ public void updateCollectorConfigurationKeys(CollectorConfigDTO collectorConfig)
                         .collect(Collectors.toList());
 
                 moduleGroupRepository.deleteAll(groupsToDelete);
-                moduleGroupConfigurationRepository.saveAll(keys);
+                if (!toSave.isEmpty()) {
+                    moduleGroupConfigurationRepository.saveAll(toSave);
+                }
             }
 
         } catch (Exception e) {
@@ -274,4 +282,8 @@ public void updateCollectorConfigurationKeys(CollectorConfigDTO collectorConfig)
         }
     }
 
+    private boolean isSensitiveType(String dataType) {
+        return Constants.CONF_TYPE_PASSWORD.equals(dataType) || Constants.CONF_TYPE_FILE.equals(dataType);
+    }
+
 }

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

@@ -159,6 +159,17 @@ public ResponseEntity<UtmModuleGroup> getConfigurationGroup(@PathVariable Long g
         final String ctx = CLASSNAME + ".getConfigurationGroups";
 
         Optional<UtmModuleGroup> group = moduleGroupService.findOne(groupId);
+        group.ifPresent(g -> {
+            if (g.getModuleGroupConfigurations() != null) {
+                for (UtmModuleGroupConfiguration conf : g.getModuleGroupConfigurations()) {
+                    if ((Constants.CONF_TYPE_PASSWORD.equals(conf.getConfDataType())
+                            || Constants.CONF_TYPE_FILE.equals(conf.getConfDataType()))
+                            && conf.getConfValue() != null) {
+                        conf.setConfValue(Constants.MASKED_VALUE);
+                    }
+                }
+            }
+        });
         return ResponseUtil.wrapOrNotFound(group);
 
     }

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

@@ -124,9 +124,7 @@ public ResponseEntity<UtmModule> getModuleDetailsDecrypted(@RequestParam ModuleN
         final String ctx = CLASSNAME + ".getModuleDetailsDecrypted";
         try {
             UtmModule module = moduleFactory.getInstance(nameShort).getDetails(utmServerRepository.getUtmServer());
-            if (InternalApiKeyFilter.isApiKeyHeaderInUse()) {
-                this.eventProcessorManagerService.decryptModuleConfig(module);
-            } else {
+            if (!InternalApiKeyFilter.isApiKeyHeaderInUse()) {
                 String msg = ctx + ": You must provide the header used to communicate internally with this resource";
                 log.error(msg);
                 eventService.createEvent(msg, ApplicationEventType.ERROR);