Skip to content

Commit afe2209

Browse files
committed
feat(correlation-rules): update URLs and add rule status filter
1 parent 229d8be commit afe2209

3 files changed

Lines changed: 10 additions & 4 deletions

File tree

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://10.21.199.3";
136-
public static final String PDF_SERVICE_URL = "http://web-pdf:8080/generate-pdf";
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";
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: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ 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", ""),
2627
RULE_CATEGORY("ruleCategory","UtmCorrelationRules", "");
2728
//RULE_DATA_TYPES("jt.dataType","UtmCorrelationRules", "dataTypes");
2829
//DATA_TYPES("jt.dataType","UtmNetworkScan", "dataInputSourceList");

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,13 @@ 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(),f.getActive(),f.getSystemOwner(),f.getDataTypes(),
179-
f.getInitDate(),f.getEndDate(), f.getSearch() == null ? null :"%" + f.getSearch() + "%", p );
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 );
180185

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

0 commit comments

Comments
 (0)