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

Author: osmontero

agent/main.go

@@ -168,7 +168,6 @@ func main() {
 			fmt.Println("[OK]")
 
 			fmt.Println("TLS certificates loaded successfully!")
-			fmt.Println("NOTE: You may need to restart integrations with TLS enabled for changes to take effect.")
 			time.Sleep(5 * time.Second)
 
 		case "check-tls-certs":

agent/modules/syslog.go

@@ -258,6 +258,13 @@ func (m *SyslogModule) enableUDP() {
 func (m *SyslogModule) disableTCP() {
 	if m.TCPListener.IsEnabled && m.TCPListener.Port != "" {
 		utils.Logger.Info("Server %s closed in port: %s protocol: TCP", m.DataType, m.TCPListener.Port)
+
+		if m.TCPListener.Listener != nil {
+			if err := m.TCPListener.Listener.Close(); err != nil {
+				utils.Logger.ErrorF("error closing TCP listener: %v", err)
+			}
+		}
+
 		m.TCPListener.Cancel()
 		m.TCPListener.IsEnabled = false
 	}
@@ -266,6 +273,13 @@ func (m *SyslogModule) disableTCP() {
 func (m *SyslogModule) disableUDP() {
 	if m.UDPListener.IsEnabled && m.UDPListener.Port != "" {
 		utils.Logger.Info("Server %s closed in port: %s protocol: UDP", m.DataType, m.UDPListener.Port)
+
+		if m.UDPListener.Listener != nil {
+			if err := m.UDPListener.Listener.Close(); err != nil {
+				utils.Logger.ErrorF("error closing UDP listener: %v", err)
+			}
+		}
+
 		m.UDPListener.Cancel()
 		m.UDPListener.IsEnabled = false
 	}

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

@@ -151,6 +151,11 @@ public final class Constants {
     public static final String ENV_TFA_ENABLE = "APP_TFA_ENABLED";
     public static final String TFA_EXEMPTION_HEADER = "X-Bypass-TFA";
 
+    // Configuration data types for moduleGroupConfiguration
+
+    public static final String CONF_TYPE_PASSWORD = "password";
+    public static final String CONF_TYPE_FILE = "file";
+
     private Constants() {
     }
 }

backend/src/main/java/com/park/utmstack/domain/UtmDataInputStatus.java

@@ -35,16 +35,6 @@ public class UtmDataInputStatus implements Serializable {
     @Column(name = "source", length = 256, nullable = false)
     private String source;
 
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "source", referencedColumnName = "asset_name", insertable = false, updatable = false, nullable = false)
-    @JsonIgnore
-    private UtmNetworkScan assetName;
-
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "source", referencedColumnName = "asset_ip", insertable = false, updatable = false, nullable = false)
-    @JsonIgnore
-    private UtmNetworkScan assetIp;
-
     @NotNull
     @Size(max = 50)
     @Column(name = "data_type", length = 50, nullable = false)

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

@@ -21,47 +21,40 @@ public class UtmModuleConfigValidator {
     private final UtmModuleGroupConfigurationRepository moduleGroupConfigurationRepository;
     private final UtmStackConnectionService utmStackConnectionService;
 
-    /**
-     * Validates if the given configuration allows a successful connection to UTMStack.
-     *
-     * @param keys A list of configuration keys that should include at least `ipAddress` and `connectionKey`.
-     * @return true if login and ping are successful; false otherwise.
-     * @throws Exception If required fields are missing or the connection fails.
-     */
     public boolean validate(UtmModule module, List<UtmModuleGroupConfiguration> keys) throws Exception {
         if (keys.isEmpty()) return false;
 
-        List<UtmModuleGroupConfiguration> configurations = moduleGroupConfigurationRepository
-                .findAllByGroupId(keys.get(0).getGroupId())
-                .stream()
-                .map(c -> {
-                    if (this.containsConfigInKeys(keys, c.getConfKey()) != null) {
-                        return this.containsConfigInKeys(keys, c.getConfKey());
-                    } else {
-                        if ("password".equals(c.getConfDataType())) {
-                            c.setConfValue(CipherUtil.decrypt(
-                                    c.getConfValue(),
-                                    System.getenv(Constants.ENV_ENCRYPTION_KEY)
-                            ));
-                        }
-                        return c;
-                    }
-                })
-                .collect(Collectors.toList());
+        List<UtmModuleGroupConfiguration> dbConfigs = moduleGroupConfigurationRepository
+                .findAllByGroupId(keys.get(0).getGroupId());
+
+        List<UtmModuleGroupConfDTO> configDTOs = dbConfigs.stream()
+                .map(dbConf -> {
+                    UtmModuleGroupConfiguration override = findInKeys(keys, dbConf.getConfKey());
+                    UtmModuleGroupConfiguration source = override != null ? override : dbConf;
 
-        List<UtmModuleGroupConfDTO> configDTOs = configurations.stream()
-                .map(entity -> new UtmModuleGroupConfDTO(entity.getConfKey(), entity.getConfValue()))
-                .collect(Collectors.toList());
+                    return new UtmModuleGroupConfDTO(
+                            source.getConfKey(),
+                            decryptIfNeeded(source.getConfDataType(), source.getConfValue())
+                    );
+                })
+                .toList();
 
         UtmModuleGroupConfWrapperDTO body = new UtmModuleGroupConfWrapperDTO(configDTOs);
 
-        return utmStackConnectionService.testConnection(module.getModuleName().name(),body);
+        return utmStackConnectionService.testConnection(module.getModuleName().name(), body);
     }
 
-    private UtmModuleGroupConfiguration containsConfigInKeys(List<UtmModuleGroupConfiguration> keys, String confKey) {
+    private UtmModuleGroupConfiguration findInKeys(List<UtmModuleGroupConfiguration> keys, String confKey) {
         return keys.stream()
-                .filter(key -> key.getConfKey().equals(confKey))
+                .filter(k -> k.getConfKey().equals(confKey))
                 .findFirst()
                 .orElse(null);
     }
+
+    private String decryptIfNeeded(String dataType, String value) {
+        if (Constants.CONF_TYPE_PASSWORD.equals(dataType) || Constants.CONF_TYPE_FILE.equals(dataType)) {
+            return CipherUtil.decrypt(value, System.getenv(Constants.ENV_ENCRYPTION_KEY));
+        }
+        return value;
+    }
 }

backend/src/main/java/com/park/utmstack/domain/network_scan/UtmNetworkScan.java

@@ -140,12 +140,6 @@ public class UtmNetworkScan implements Serializable {
     @OneToMany(mappedBy = "asset", fetch = FetchType.LAZY)
     private List<UtmAssetMetrics> metrics;
 
-    /*@OneToMany(mappedBy = "assetName", fetch = FetchType.LAZY)
-    private List<UtmDataInputStatus> dataInputSourceList;
-
-    @OneToMany(mappedBy = "assetIp", fetch = FetchType.LAZY)
-    private List<UtmDataInputStatus> dataInputIpList;*/
-
     @OneToOne
     @JoinColumn(name = "group_id", referencedColumnName = "id", insertable = false, updatable = false)
     private UtmAssetGroup assetGroup;

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

@@ -62,8 +62,8 @@ public void decryptModuleConfig (UtmModule module){
         Set<UtmModuleGroup> groups = module.getModuleGroups();
         groups.forEach((gp) -> {
             gp.getModuleGroupConfigurations().forEach((gpc) -> {
-                if ((gpc.getConfDataType().equals("password") && StringUtils.hasText(gpc.getConfValue()))
-                        || (gpc.getConfDataType().equals("file") && StringUtils.hasText(gpc.getConfValue())) && typeFileNeedsDecryptList.contains(module.getModuleName())) {
+                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.setConfValue(CipherUtil.decrypt(gpc.getConfValue(), System.getenv(Constants.ENV_ENCRYPTION_KEY)));
                 }
             });

backend/src/main/java/com/park/utmstack/repository/network_scan/UtmNetworkScanRepository.java

@@ -56,11 +56,11 @@ public interface UtmNetworkScanRepository extends JpaRepository<UtmNetworkScan,
         "AND ((cast(:initDate as timestamp) is null) or (cast(:endDate as timestamp) is null) or (ns.discoveredAt BETWEEN :initDate AND :endDate)) " +
         "AND (:dataTypes IS NULL OR EXISTS (\n" +
         "       SELECT 1 FROM UtmDataInputStatus ip\n" +
-        "       WHERE ip.assetIp = ns.assetIp AND ip.dataType IN :dataTypes\n" +
+        "       WHERE ip.source = ns.assetIp AND ip.dataType IN :dataTypes\n" +
         "     ) \n" +
         "     OR EXISTS (\n" +
         "       SELECT 1 FROM UtmDataInputStatus src\n" +
-        "       WHERE src.assetName = ns.assetName AND src.dataType IN :dataTypes\n" +
+        "       WHERE src.source = ns.assetName AND src.dataType IN :dataTypes\n" +
         "     ))" +
         "AND (:ports IS NULL OR ns.id IN (" +
         "   SELECT p.scanId FROM UtmPorts p WHERE p.port IN :ports))")

frontend/src/app/shared/components/auth/login/login.component.ts

@@ -151,7 +151,7 @@ export class LoginComponent implements OnInit {
         this.startLogin = false;
         this.authenticationError = true;
         const utmStackError = err.headers.get('X-UtmStack-error');
-        if (utmStackError.includes('UserJWTController.authorize: blocked')) {
+        if (utmStackError && utmStackError.includes('UserJWTController.authorize: blocked')) {
           this.utmToast.showError('Login blocked', 'Your ip was blocked due multiple login failures, please try again in 10 minutes');
         } else {
           this.utmToast.showError('Login fail', 'Authentication error, ' +