Merge branch 'main' into dependabot/go_modules/agent/agent/golang.org/x/crypto-0.31.0

Author: osmontero

.github/workflows/principal-agent.yml

@@ -53,7 +53,7 @@ jobs:
           go-version: 1.21
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: '3.12'
 

.github/workflows/principal-installer-release.yml

@@ -40,7 +40,7 @@ jobs:
 
     - name: Create Release
       id: create_release
-      uses: softprops/action-gh-release@v1
+      uses: softprops/action-gh-release@v2
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:

.github/workflows/used-docker-frontend.yml

@@ -36,7 +36,7 @@ jobs:
           npm run-script build
 
       - name: Setup BuildX
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3

.github/workflows/used-docker-java-11.yml

@@ -18,14 +18,14 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           java-version: "11"
           distribution: "temurin"
 
       - name: Read version from config
         id: read_version
-        uses: CumulusDS/[email protected].1
+        uses: CumulusDS/[email protected].2
         with:
           file: version.yml
           version: version     

.github/workflows/used-docker-java.yml

@@ -16,7 +16,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           java-version: "11"
           distribution: "temurin"

CHANGELOG.md

@@ -1,7 +1,8 @@
-# UTMStack 10.5.17 Release Notes
+# UTMStack 10.5.18 Release Notes
 ## Bugfix
--Fixed an issue preventing incident status updates when entering long solutions.
--Fixed an issue blocking incident creation from the Alerts panel.
--Added Asia/Jakarta timezone to the TIMEZONES list.
--Fixed Timezone changes on an instance don't get updated when access by Federation Server
--Fixed Last log not displayed for a generated alert 
+- Fixed unable to change status to complete if observations contains french characters
+- Fixed Elastic filter time adds unnecessary /d to intervals in Log Explorer
+- Fixed handle special characters in password query parameter
+- Fixed filter duplication issue in Log Explorer when removing filters
+- Fixed Cisco ASA and Cisco Firepower filters when the data coming without syslog date or host information
+- Fixed container memory resource distribution

SECURITY.md

@@ -13,8 +13,10 @@
 |  7.x      | :x:                | Jan 15, 2022 |
 |  8.x      | :x:                | Jan 15, 2023 |
 |  9.x      | :x:                | Jan 15, 2024 |
-|  10.x     | :white_check_mark: | Jan 15, 2025 |
+|  10.x     | :white_check_mark: | Jan 15, 2026 |
 |  11.x LTS | :date:             | Jan 15, 2030 |
 |  12.x LTS | :clock1:           | Jan 15, 2036 |
 
 :white_check_mark: Supported | :x: Unsupported | :date: Will be released soon | :clock1: Planned
+
+Please report security vulnerabilities to [email protected]

backend/src/main/java/com/park/utmstack/domain/chart_builder/types/query/OperatorType.java

@@ -4,6 +4,8 @@ public enum OperatorType {
     IS,
     IS_NOT,
     CONTAIN,
+    CONTAIN_ONE_OF,
+    DOES_NOT_CONTAIN_ONE_OF,
     DOES_NOT_CONTAIN,
     IS_ONE_OF,
     IS_NOT_ONE_OF,

backend/src/main/java/com/park/utmstack/domain/compliance/UtmComplianceReportConfig.java

@@ -83,6 +83,12 @@ public class UtmComplianceReportConfig implements Serializable {
     @Column(name = "config_url")
     private String configUrl;
 
+    @Column(name = "config_report_note")
+    private String configReportNote;
+
+    @Column(name = "config_report_name", length = 50)
+    private String configReportName;
+
     @Transient
     @JsonSerialize
     @JsonDeserialize
@@ -303,4 +309,20 @@ public UtmDashboard getAssociatedDashboard() {
     public void setAssociatedDashboard(UtmDashboard associatedDashboard) {
         this.associatedDashboard = associatedDashboard;
     }
+
+    public String getConfigReportNote() {
+        return configReportNote;
+    }
+
+    public void setConfigReportNote(String configReportNote) {
+        this.configReportNote = configReportNote;
+    }
+
+    public String getConfigReportName() {
+        return configReportName;
+    }
+
+    public void setConfigReportName(String configReportName) {
+        this.configReportName = configReportName;
+    }
 }

backend/src/main/java/com/park/utmstack/service/compliance/config/UtmComplianceReportConfigQueryService.java

@@ -46,17 +46,23 @@ private Specification<UtmComplianceReportConfig> createSpecification(UtmComplian
             }
             if (criteria.getConfigReportEditable() != null) {
                 specification = specification.and(
-                    buildSpecification(criteria.getConfigReportEditable(), UtmComplianceReportConfig_.configReportEditable));
+                        buildSpecification(criteria.getConfigReportEditable(), UtmComplianceReportConfig_.configReportEditable));
             }
-            if (criteria.getConfigSolution() != null) {
+            if (criteria.getConfigSolution() != null || criteria.getConfigReportName() != null) {
                 specification = specification.and(
-                    buildStringSpecification(criteria.getConfigSolution(), UtmComplianceReportConfig_.configSolution));
+                        buildStringSpecification(criteria.getConfigSolution(), UtmComplianceReportConfig_.configSolution)
+                                .or(buildStringSpecification(criteria.getConfigSolution(), UtmComplianceReportConfig_.configReportName)));
+            }
+            if (criteria.getConfigReportName() != null) {
+                specification = specification.and(
+                        buildStringSpecification(criteria.getConfigReportName(), UtmComplianceReportConfig_.configReportName));
             }
             if (criteria.getStandardSectionId() != null) {
                 specification = specification.and(
-                    buildRangeSpecification(criteria.getStandardSectionId(), UtmComplianceReportConfig_.standardSectionId));
+                        buildRangeSpecification(criteria.getStandardSectionId(), UtmComplianceReportConfig_.standardSectionId));
             }
         }
         return specification;
     }
+
 }