0xb00b5/0xb00b5-packmate
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Исправлено удаление паттернов

Browse Source
This commit is contained in:
serega6531
2019-05-13 00:38:45 +03:00
parent 48397aed09
commit adba3aa18c
3 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/ru/serega6531/packmate/PcapWorker.java
View File

@@ -45,7 +45,7 @@ public class PcapWorker {
private final Map<UnfinishedStream, List<ru.serega6531.packmate.model.Packet>> unfinishedStreams = new HashMap<>(); private final Map<UnfinishedStream, List<ru.serega6531.packmate.model.Packet>> unfinishedStreams = new HashMap<>();
// в следующих мапах в листах srcIp соответствующего пакета // в следующих мапах в сетах srcIp соответствующего пакета
private final Map<UnfinishedStream, Set<String>> fins = new HashMap<>(); private final Map<UnfinishedStream, Set<String>> fins = new HashMap<>();
private final Map<UnfinishedStream, Set<String>> acks = new HashMap<>(); private final Map<UnfinishedStream, Set<String>> acks = new HashMap<>();

2
src/main/java/ru/serega6531/packmate/model/Stream.java
View File

@@ -40,7 +40,7 @@ public class Stream {
private long endTimestamp; private long endTimestamp;
@ManyToMany(cascade = CascadeType.ALL) @ManyToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
private List<Pattern> foundPatterns; private List<Pattern> foundPatterns;
private boolean favorite; private boolean favorite;

15
src/main/java/ru/serega6531/packmate/service/PatternService.java
View File

@@ -3,8 +3,11 @@ package ru.serega6531.packmate.service;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import ru.serega6531.packmate.model.Pattern; import ru.serega6531.packmate.model.Pattern;
import ru.serega6531.packmate.model.Stream;
import ru.serega6531.packmate.repository.PatternRepository; import ru.serega6531.packmate.repository.PatternRepository;
import java.util.HashMap; import java.util.HashMap;
@@ -18,12 +21,14 @@ import java.util.stream.Collectors;
public class PatternService { public class PatternService {
private final PatternRepository repository; private final PatternRepository repository;
private final StreamService streamService;
private Map<String, java.util.regex.Pattern> compiledPatterns = new HashMap<>(); private Map<String, java.util.regex.Pattern> compiledPatterns = new HashMap<>();
@Autowired @Autowired
public PatternService(PatternRepository repository) { public PatternService(PatternRepository repository, @Lazy StreamService streamService) {
this.repository = repository; this.repository = repository;
this.streamService = streamService;
} }
public List<Pattern> findAll() { public List<Pattern> findAll() {
@@ -47,11 +52,19 @@ public class PatternService {
} }
} }
@Transactional
public void deleteById(int id) { public void deleteById(int id) {
final Optional<Pattern> optional = repository.findById(id); final Optional<Pattern> optional = repository.findById(id);
if(optional.isPresent()) { if(optional.isPresent()) {
final Pattern pattern = optional.get(); final Pattern pattern = optional.get();
log.info("Удален паттерн {} со значением {}", pattern.getName(), pattern.getValue()); log.info("Удален паттерн {} со значением {}", pattern.getName(), pattern.getValue());
for (Stream stream : pattern.getMatchedStreams()) {
stream.getFoundPatterns().remove(pattern);
streamService.save(stream);
}
pattern.getMatchedStreams().clear();
repository.delete(pattern); repository.delete(pattern);
} }
} }