Marmelator/persistence-service
1
0
Fork 0
Code Issues Pull Requests 17 Actions Packages Projects Releases 1.1k Wiki Activity

RED-7631: unescaped rule files #174

Merged
kilian.schuettler1 merged 2 commits from RED-7631 into master 2023-10-11 10:48:30 +02:00
Conversation 9 Commits 2 Files Changed 2 +15 -12
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DossierTemplateImportService.java
View File

@ -25,7 +25,6 @@ import java.util.stream.Collectors;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream;
import org.apache.commons.compress.compressors.FileNameUtil;
import org.apache.commons.compress.utils.FileNameUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
@ -217,18 +216,25 @@ public class DossierTemplateImportService {
FileAttributesGeneralConfiguration fileAttributesGeneralConfiguration = objectMapper.readValue(bytes, FileAttributesGeneralConfiguration.class);
importTemplateResult.setFileAttributesGeneralConfiguration(fileAttributesGeneralConfiguration);
} else if (ze.getName().contains(ExportFilename.RULES.getFilename())) {
if(ze.getName().endsWith(".txt")) {
if (ze.getName().endsWith(".txt")) {
String rules = objectMapper.readValue(new String(bytes), String.class);
importTemplateResult.setRuleSet(rules);
}else if(ze.getName().endsWith(".drl")) {
} else if (ze.getName().endsWith(".drl")) {
String rules = new String(bytes);
importTemplateResult.setRuleSet(rules);
} else {
throw new BadRequestException("File is not in TXT or DRL format. "+ FileNameUtils.getExtension(ze.getName()) +" format is not supported.");
throw new BadRequestException("Rule file is not in TXT or DRL format. " + FileNameUtils.getExtension(ze.getName()) + " format is not supported.");
}
} else if (ze.getName().contains(ExportFilename.COMPONENT_RULES.getFilename())) {
String rules = objectMapper.readValue(new String(bytes), String.class);
importTemplateResult.setComponentRuleSet(rules);
if (ze.getName().endsWith(".txt")) {
String rules = objectMapper.readValue(new String(bytes), String.class);
importTemplateResult.setComponentRuleSet(rules);
} else if (ze.getName().endsWith(".drl")) {
String rules = new String(bytes);
importTemplateResult.setComponentRuleSet(rules);
} else {
throw new BadRequestException("Component rule file is not in TXT or DRL format. " + FileNameUtils.getExtension(ze.getName()) + " format is not supported.");
}
} else if (ze.getName().contains(ExportFilename.DOSSIER_TYPE.getFilename())) {
Type type = objectMapper.readValue(bytes, Type.class);
importTemplateResult.getTypes().add(type);
@ -280,7 +286,7 @@ public class DossierTemplateImportService {
}
}
if(importTemplateResult.getDossierTemplate() == null) {
if (importTemplateResult.getDossierTemplate() == null) {
throw new BadRequestException("Provided archive is faulty");
}
return importTemplateResult;

7
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/export/DossierTemplateExportService.java
View File

@ -8,10 +8,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Locale;
import java.util.stream.Collectors;
import org.apache.commons.text.StringEscapeUtils;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.stereotype.Service;
@ -58,7 +56,6 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemp
import com.iqser.red.service.persistence.service.v1.api.shared.model.download.DownloadStatusValue;
import jakarta.transaction.Transactional;
import liquibase.util.StringUtil;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
@ -185,8 +182,8 @@ public class DossierTemplateExportService {
try {
var componentRuleSet = rulesPersistenceService.getRules(dossierTemplateId, RuleFileType.COMPONENT);
fileSystemBackedArchiver.addEntries(new FileSystemBackedArchiver.ArchiveModel(null,
getFilename(ExportFilename.COMPONENT_RULES, TXT_EXT),
objectMapper.writeValueAsBytes(componentRuleSet.getValue())));
getFilename(ExportFilename.COMPONENT_RULES, RULE_EXT),
componentRuleSet.getValue().getBytes(StandardCharsets.UTF_8)));
} catch (NotFoundException e) {
log.debug("No component rules present.");
}