From e14ac34b1cfdae057be29fc6696ecd1f805a896b Mon Sep 17 00:00:00 2001 From: Jannik Hollenbach Date: Wed, 4 Sep 2019 15:29:43 +0200 Subject: [PATCH 1/4] Reduce default process history period to 1 day --- .../amass-process/src/main/resources/bpmn/amass_process.bpmn | 2 +- .../src/main/resources/bpmn/arachni_process.bpmn | 2 +- .../src/main/resources/bpmn/__artifactId__.bpmn | 2 +- .../src/main/resources/bpmn/combined_amass_nmap_process.bpmn | 2 +- .../src/main/resources/bpmn/combined-nmap-nikto-process.bpmn | 2 +- .../src/main/resources/bpmn/combined-nmap-ssh-process.bpmn | 2 +- .../nikto-process/src/main/resources/bpmn/nikto_scan.bpmn | 2 +- .../nmap-process/src/main/resources/bpmn/nmap_process.bpmn | 2 +- .../nmap-process/src/main/resources/bpmn/nmap_process_raw.bpmn | 2 +- .../ssh-process/src/main/resources/bpmn/ssh_process.bpmn | 2 +- .../src/main/resources/bpmn/wordpress_process.bpmn | 2 +- .../zap-process/src/main/resources/bpmn/zap_process.bpmn | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/scb-scanprocesses/amass-process/src/main/resources/bpmn/amass_process.bpmn b/scb-scanprocesses/amass-process/src/main/resources/bpmn/amass_process.bpmn index 6a705ddf..926d9b15 100644 --- a/scb-scanprocesses/amass-process/src/main/resources/bpmn/amass_process.bpmn +++ b/scb-scanprocesses/amass-process/src/main/resources/bpmn/amass_process.bpmn @@ -1,6 +1,6 @@ - + diff --git a/scb-scanprocesses/arachni-process/src/main/resources/bpmn/arachni_process.bpmn b/scb-scanprocesses/arachni-process/src/main/resources/bpmn/arachni_process.bpmn index bc63b4f2..7acdaef9 100644 --- a/scb-scanprocesses/arachni-process/src/main/resources/bpmn/arachni_process.bpmn +++ b/scb-scanprocesses/arachni-process/src/main/resources/bpmn/arachni_process.bpmn @@ -1,6 +1,6 @@ - + diff --git a/scb-scanprocesses/archetype-process/src/main/resources/archetype-resources/src/main/resources/bpmn/__artifactId__.bpmn b/scb-scanprocesses/archetype-process/src/main/resources/archetype-resources/src/main/resources/bpmn/__artifactId__.bpmn index 586bbbbb..e95c0137 100644 --- a/scb-scanprocesses/archetype-process/src/main/resources/archetype-resources/src/main/resources/bpmn/__artifactId__.bpmn +++ b/scb-scanprocesses/archetype-process/src/main/resources/archetype-resources/src/main/resources/bpmn/__artifactId__.bpmn @@ -1,6 +1,6 @@ - + diff --git a/scb-scanprocesses/combined-amass-nmap-process/src/main/resources/bpmn/combined_amass_nmap_process.bpmn b/scb-scanprocesses/combined-amass-nmap-process/src/main/resources/bpmn/combined_amass_nmap_process.bpmn index cdc8693f..f960bc8a 100644 --- a/scb-scanprocesses/combined-amass-nmap-process/src/main/resources/bpmn/combined_amass_nmap_process.bpmn +++ b/scb-scanprocesses/combined-amass-nmap-process/src/main/resources/bpmn/combined_amass_nmap_process.bpmn @@ -1,6 +1,6 @@ - + diff --git a/scb-scanprocesses/combined-nmap-nikto-process/src/main/resources/bpmn/combined-nmap-nikto-process.bpmn b/scb-scanprocesses/combined-nmap-nikto-process/src/main/resources/bpmn/combined-nmap-nikto-process.bpmn index 71e11bd0..9d53c240 100644 --- a/scb-scanprocesses/combined-nmap-nikto-process/src/main/resources/bpmn/combined-nmap-nikto-process.bpmn +++ b/scb-scanprocesses/combined-nmap-nikto-process/src/main/resources/bpmn/combined-nmap-nikto-process.bpmn @@ -1,6 +1,6 @@ - + diff --git a/scb-scanprocesses/combined-nmap-ssh-process/src/main/resources/bpmn/combined-nmap-ssh-process.bpmn b/scb-scanprocesses/combined-nmap-ssh-process/src/main/resources/bpmn/combined-nmap-ssh-process.bpmn index 1771c977..fdcaea7d 100644 --- a/scb-scanprocesses/combined-nmap-ssh-process/src/main/resources/bpmn/combined-nmap-ssh-process.bpmn +++ b/scb-scanprocesses/combined-nmap-ssh-process/src/main/resources/bpmn/combined-nmap-ssh-process.bpmn @@ -1,6 +1,6 @@ - + diff --git a/scb-scanprocesses/nikto-process/src/main/resources/bpmn/nikto_scan.bpmn b/scb-scanprocesses/nikto-process/src/main/resources/bpmn/nikto_scan.bpmn index c243395e..e8572405 100644 --- a/scb-scanprocesses/nikto-process/src/main/resources/bpmn/nikto_scan.bpmn +++ b/scb-scanprocesses/nikto-process/src/main/resources/bpmn/nikto_scan.bpmn @@ -1,6 +1,6 @@ - + diff --git a/scb-scanprocesses/nmap-process/src/main/resources/bpmn/nmap_process.bpmn b/scb-scanprocesses/nmap-process/src/main/resources/bpmn/nmap_process.bpmn index d840ebdf..fd405508 100644 --- a/scb-scanprocesses/nmap-process/src/main/resources/bpmn/nmap_process.bpmn +++ b/scb-scanprocesses/nmap-process/src/main/resources/bpmn/nmap_process.bpmn @@ -1,6 +1,6 @@ - + diff --git a/scb-scanprocesses/nmap-process/src/main/resources/bpmn/nmap_process_raw.bpmn b/scb-scanprocesses/nmap-process/src/main/resources/bpmn/nmap_process_raw.bpmn index f55471c6..4ae88e43 100644 --- a/scb-scanprocesses/nmap-process/src/main/resources/bpmn/nmap_process_raw.bpmn +++ b/scb-scanprocesses/nmap-process/src/main/resources/bpmn/nmap_process_raw.bpmn @@ -1,6 +1,6 @@ - + diff --git a/scb-scanprocesses/ssh-process/src/main/resources/bpmn/ssh_process.bpmn b/scb-scanprocesses/ssh-process/src/main/resources/bpmn/ssh_process.bpmn index ef222bab..a76f8ea8 100644 --- a/scb-scanprocesses/ssh-process/src/main/resources/bpmn/ssh_process.bpmn +++ b/scb-scanprocesses/ssh-process/src/main/resources/bpmn/ssh_process.bpmn @@ -1,6 +1,6 @@ - + diff --git a/scb-scanprocesses/wordpress-process/src/main/resources/bpmn/wordpress_process.bpmn b/scb-scanprocesses/wordpress-process/src/main/resources/bpmn/wordpress_process.bpmn index bc86da49..01758e99 100644 --- a/scb-scanprocesses/wordpress-process/src/main/resources/bpmn/wordpress_process.bpmn +++ b/scb-scanprocesses/wordpress-process/src/main/resources/bpmn/wordpress_process.bpmn @@ -1,6 +1,6 @@ - + diff --git a/scb-scanprocesses/zap-process/src/main/resources/bpmn/zap_process.bpmn b/scb-scanprocesses/zap-process/src/main/resources/bpmn/zap_process.bpmn index ba461e17..2106fe14 100644 --- a/scb-scanprocesses/zap-process/src/main/resources/bpmn/zap_process.bpmn +++ b/scb-scanprocesses/zap-process/src/main/resources/bpmn/zap_process.bpmn @@ -1,6 +1,6 @@ - + SequenceFlow_SummaryCreated From fd67d3d47f9d0e2415fdee69928766dc4533a926 Mon Sep 17 00:00:00 2001 From: Jannik Hollenbach Date: Fri, 13 Sep 2019 14:10:07 +0200 Subject: [PATCH 2/4] Add History Cleanup Start and Stop Config --- .../engine/history/HistoryCleanupConfig.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 scb-engine/src/main/java/io/securecodebox/engine/history/HistoryCleanupConfig.java diff --git a/scb-engine/src/main/java/io/securecodebox/engine/history/HistoryCleanupConfig.java b/scb-engine/src/main/java/io/securecodebox/engine/history/HistoryCleanupConfig.java new file mode 100644 index 00000000..5c414932 --- /dev/null +++ b/scb-engine/src/main/java/io/securecodebox/engine/history/HistoryCleanupConfig.java @@ -0,0 +1,14 @@ +package io.securecodebox.engine.history; + +import org.camunda.bpm.engine.impl.cfg.AbstractProcessEnginePlugin; +import org.camunda.bpm.engine.impl.cfg.ProcessEngineConfigurationImpl; +import org.springframework.stereotype.Component; + +@Component +public class HistoryCleanupConfig extends AbstractProcessEnginePlugin { + @Override + public void preInit(ProcessEngineConfigurationImpl processEngineConfiguration) { + processEngineConfiguration.setHistoryCleanupBatchWindowStartTime("20:00"); + processEngineConfiguration.setHistoryCleanupBatchWindowEndTime("24:00"); + } +} \ No newline at end of file From 2cf1d7ceb406dc884f8d89fe84f781ee0eb8c926 Mon Sep 17 00:00:00 2001 From: Jannik Hollenbach Date: Mon, 30 Sep 2019 17:29:56 +0200 Subject: [PATCH 3/4] Update elastic version defined in engine core --- scb-engine/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scb-engine/pom.xml b/scb-engine/pom.xml index a7c8bce5..d87d4f4c 100644 --- a/scb-engine/pom.xml +++ b/scb-engine/pom.xml @@ -232,7 +232,7 @@ org.elasticsearch elasticsearch - 6.4.3 + 6.8.2 From 9043abacc2d01ea3e8c92b7665b4ff800f5c1007 Mon Sep 17 00:00:00 2001 From: Jannik Hollenbach Date: Mon, 30 Sep 2019 17:39:31 +0200 Subject: [PATCH 4/4] Update elastic version in elastic persistence provider --- .../elasticsearch-persistenceprovider/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scb-persistenceproviders/elasticsearch-persistenceprovider/pom.xml b/scb-persistenceproviders/elasticsearch-persistenceprovider/pom.xml index b7e489d7..f02b6182 100644 --- a/scb-persistenceproviders/elasticsearch-persistenceprovider/pom.xml +++ b/scb-persistenceproviders/elasticsearch-persistenceprovider/pom.xml @@ -31,7 +31,7 @@ 0.0.1-SNAPSHOT - 6.8.1 + 6.8.2