Skip to content

Commit 01907ea

Browse files
committed
Revert "feat(correlation-rules): update URLs and add rule status filter"
This reverts commit afe2209.
1 parent afe2209 commit 01907ea

File tree

3 files changed

+4
-10
lines changed

3 files changed

+4
-10
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@ public final class Constants {
132132
// ----------------------------------------------------------------------------------
133133
// - Constants used to PDF microservice generation
134134
// ----------------------------------------------------------------------------------
135-
public static final String FRONT_BASE_URL = "https://utmstack.local.com/";
136-
public static final String PDF_SERVICE_URL = "http://localhost:8081/generate-pdf";
135+
public static final String FRONT_BASE_URL = "https://10.21.199.3";
136+
public static final String PDF_SERVICE_URL = "http://web-pdf:8080/generate-pdf";
137137

138138
// ----------------------------------------------------------------------------------
139139
// Defines the index pattern for querying Elasticsearch statistics indexes.

backend/src/main/java/com/park/utmstack/domain/network_scan/enums/PropertyFilter.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ public enum PropertyFilter implements Property {
2323
COLLECTOR_GROUP("assetGroup.groupName", "UtmCollector", ""),
2424
RULE_TECHNIQUE("ruleTechnique","UtmCorrelationRules", ""),
2525
RULE_ADVERSARY("ruleAdversary","UtmCorrelationRules", ""),
26-
RULE_STATUS("ruleActive","UtmCorrelationRules", ""),
2726
RULE_CATEGORY("ruleCategory","UtmCorrelationRules", "");
2827
//RULE_DATA_TYPES("jt.dataType","UtmCorrelationRules", "dataTypes");
2928
//DATA_TYPES("jt.dataType","UtmNetworkScan", "dataInputSourceList");

backend/src/main/java/com/park/utmstack/service/correlation/rules/UtmCorrelationRulesService.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -175,13 +175,8 @@ private Page<UtmCorrelationRulesDTO> filter(UtmCorrelationRulesFilter f, Pageabl
175175
f.getName() == null ? null : "%" + f.getName() + "%",f.getConfidentiality(),f.getIntegrity(),f.getAvailability(),
176176
f.getCategory(),
177177
f.getAdversary(),
178-
f.getTechnique(),
179-
f.getActive(),
180-
f.getSystemOwner(),
181-
f.getDataTypes(),
182-
f.getInitDate(),f.getEndDate(),
183-
f.getSearch() == null ? null :"%" + f.getSearch() + "%",
184-
p );
178+
f.getTechnique(),f.getActive(),f.getSystemOwner(),f.getDataTypes(),
179+
f.getInitDate(),f.getEndDate(), f.getSearch() == null ? null :"%" + f.getSearch() + "%", p );
185180

186181
List<UtmCorrelationRulesDTO> rulesList = this.utmCorrelationRulesMapper.toListDTO(page.getContent());
187182
return new PageImpl<>(rulesList, p, page.getTotalElements());

0 commit comments

Comments
 (0)