Marmelator/redaction-service
1
0
Fork 0
Code Issues Pull Requests 14 Actions Packages Projects Releases 622 Wiki Activity

RED-9869: allow java.text and find ruleIdentifiers with whitespaces/linebreaks

Browse Source
This commit is contained in:
Kilian Schuettler 2024-08-12 12:34:13 +02:00
parent 9dbf5c479f
commit 1b67ea1068
3 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/drools/DroolsValidationService.java
View File

@ -45,7 +45,7 @@ public class DroolsValidationService {
private final KieContainerCreationService kieContainerCreationService; private final KieContainerCreationService kieContainerCreationService;
private final DeprecatedElementsFinder deprecatedElementsFinder; private final DeprecatedElementsFinder deprecatedElementsFinder;
private static final Pattern allowedImportsPattern = Pattern.compile( private static final Pattern allowedImportsPattern = Pattern.compile(
"^(?:import\\s+static\\s+)?(?:import\\s+)?(?:com\\.knecon\\.fforesight|com\\.iqser\\.red|java\\.util)\\..*;$"); "^(?:import\\s+static\\s+)?(?:import\\s+)?(?:com\\.knecon\\.fforesight|com\\.iqser\\.red|java\\.util|java\\.text)\\..*;$");
public static final String LINEBREAK_MATCHER = "\\R"; public static final String LINEBREAK_MATCHER = "\\R";

5
redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/drools/RuleFileParser.java
View File

@ -32,7 +32,7 @@ import lombok.experimental.UtilityClass;
public class RuleFileParser { public class RuleFileParser {
private final static Pattern ruleIdentifierInCodeFinder = Pattern.compile( private final static Pattern ruleIdentifierInCodeFinder = Pattern.compile(
"\\b(?:redact|apply|skip|remove|ignore|applyWithLineBreaks|applyWithReferences|skipWithReferences)\\s*\\(\"([a-zA-Z0-9]+.\\d+.\\d+)\",.*(?:, .*)?\\)"); "\\b(?:redact|apply|skip|remove|ignore|applyWithLineBreaks|applyWithReferences|skipWithReferences)\\s*\\(\\s*\"([a-zA-Z0-9]+.\\d+.\\d+)\"\\s*,\\s*.*(?:\\s*,\\s*.*)\\s*?\\)");
@SneakyThrows @SneakyThrows
@ -78,7 +78,8 @@ public class RuleFileParser {
.map(GlobalDescr::getLine) .map(GlobalDescr::getLine)
.orElse(0), .orElse(0),
allQueries, allQueries,
ruleClasses, customDroolsValidation); ruleClasses,
customDroolsValidation);
} }

42
redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/drools/files/management/services/DroolsValidationServiceTest.java
View File

@ -361,7 +361,6 @@ class DroolsValidationServiceTest {
} }
@Test @Test
@SneakyThrows @SneakyThrows
void testRulesWithBlacklistedKeyword() { void testRulesWithBlacklistedKeyword() {
@ -379,16 +378,16 @@ class DroolsValidationServiceTest {
String rulesString1 = rulesString.substring(0, indexGlobalStart) + importTenantContext + rulesString.substring(indexGlobalStart); String rulesString1 = rulesString.substring(0, indexGlobalStart) + importTenantContext + rulesString.substring(indexGlobalStart);
String evilRulePart1 = """ String evilRulePart1 = """
//------------------------------------ All the evil rules ------------------------------------ //------------------------------------ All the evil rules ------------------------------------
// Rule unit: EV.1 // Rule unit: EV.1
rule "EV.1.0: Remove duplicate FileAttributes but also do very evil things" rule "EV.1.0: Remove duplicate FileAttributes but also do very evil things"
salience 999 salience 999
when when
$fileAttribute: FileAttribute($label: label, $value: value) $fileAttribute: FileAttribute($label: label, $value: value)
$duplicate: FileAttribute(this != $fileAttribute, label == $label, value == $value) $duplicate: FileAttribute(this != $fileAttribute, label == $label, value == $value)
"""; """;
String evilRulePart2 = """ String evilRulePart2 = """
then then
retract($duplicate); retract($duplicate);
@ -408,11 +407,13 @@ class DroolsValidationServiceTest {
.forEach(System.out::println); .forEach(System.out::println);
assertFalse(droolsValidation.isCompiled()); assertFalse(droolsValidation.isCompiled());
assertEquals(2, droolsValidation.getBlacklistErrorMessages().size()); assertEquals(2, droolsValidation.getBlacklistErrorMessages().size());
assertEquals(1, droolsValidation.getBlacklistErrorMessages() assertEquals(1,
droolsValidation.getBlacklistErrorMessages()
.get(0).getBlacklistedKeywords().size()); .get(0).getBlacklistedKeywords().size());
assertTrue(droolsValidation.getBlacklistErrorMessages() assertTrue(droolsValidation.getBlacklistErrorMessages()
.get(0).getBlacklistedKeywords().contains("TenantContext")); .get(0).getBlacklistedKeywords().contains("TenantContext"));
assertEquals(2, droolsValidation.getBlacklistErrorMessages() assertEquals(2,
droolsValidation.getBlacklistErrorMessages()
.get(1).getBlacklistedKeywords().size()); .get(1).getBlacklistedKeywords().size());
assertTrue(droolsValidation.getBlacklistErrorMessages() assertTrue(droolsValidation.getBlacklistErrorMessages()
.get(1).getBlacklistedKeywords().contains("TenantContext")); .get(1).getBlacklistedKeywords().contains("TenantContext"));
@ -429,14 +430,39 @@ class DroolsValidationServiceTest {
.forEach(System.out::println); .forEach(System.out::println);
assertFalse(droolsValidation2.isCompiled()); assertFalse(droolsValidation2.isCompiled());
assertEquals(2, droolsValidation2.getBlacklistErrorMessages().size()); assertEquals(2, droolsValidation2.getBlacklistErrorMessages().size());
assertEquals(1, droolsValidation2.getBlacklistErrorMessages() assertEquals(1,
droolsValidation2.getBlacklistErrorMessages()
.get(0).getBlacklistedKeywords().size()); .get(0).getBlacklistedKeywords().size());
assertTrue(droolsValidation2.getBlacklistErrorMessages() assertTrue(droolsValidation2.getBlacklistErrorMessages()
.get(0).getBlacklistedKeywords().contains("TenantContext")); .get(0).getBlacklistedKeywords().contains("TenantContext"));
assertEquals(1, droolsValidation2.getBlacklistErrorMessages() assertEquals(1,
droolsValidation2.getBlacklistErrorMessages()
.get(1).getBlacklistedKeywords().size()); .get(1).getBlacklistedKeywords().size());
assertTrue(droolsValidation2.getBlacklistErrorMessages() assertTrue(droolsValidation2.getBlacklistErrorMessages()
.get(1).getBlacklistedKeywords().contains("System.")); .get(1).getBlacklistedKeywords().contains("System."));
} }
@Test
void assertRuleIdentifierDoesNotMatch() {
String ruleString = RuleManagementResources.getBaseRuleFileString() + """
rule "CBI.0.0: Redact CBI Authors (non vertebrate Study)"
when
not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
$entity: TextEntity(type() == "CBI_author", dictionaryEntry)
then
$entity.redact(
"CBI.1.0",
"Author found",
"Article 39(e)(3) of Regulation (EC) No 178/2002"
);
end
""";
RuleFileBluePrint ruleFileBluePrint = RuleFileParser.buildBluePrintFromRulesString(ruleString);
assertFalse(ruleFileBluePrint.getDroolsValidation().isCompiled());
}
} }