From 14544a5ec17dbdeb296ce11126b59d9733da86e2 Mon Sep 17 00:00:00 2001
From: rizlas <rizlas@users.noreply.github.com>
Date: Tue, 30 May 2023 15:04:42 +0200
Subject: [PATCH 1/2] Add Enabled certificates generation for container (#1993)

* Enabled certificates generation before gvmd start

* Moved certificate generation in start-gvmd script and made it optional
---
 .docker/prod.Dockerfile | 4 ++++
 .docker/start-gvmd.sh   | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/.docker/prod.Dockerfile b/.docker/prod.Dockerfile
index f9a586ce2..b1641270e 100644
--- a/.docker/prod.Dockerfile
+++ b/.docker/prod.Dockerfile
@@ -68,6 +68,9 @@ ARG DEBIAN_FRONTEND=noninteractive
 # Loading scap and cert data
 # xml-twig-tools
 
+# Required for set up certificates for GVM
+# gnutls-bin
+
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
     dpkg \
@@ -76,6 +79,7 @@ RUN apt-get update && \
     gosu \
     gnupg \
     gpgsm \
+    gnutls-bin \
     libbsd0 \
     libgpgme11 \
     libical3 \
diff --git a/.docker/start-gvmd.sh b/.docker/start-gvmd.sh
index 695e4d51b..c4ced08d3 100644
--- a/.docker/start-gvmd.sh
+++ b/.docker/start-gvmd.sh
@@ -24,6 +24,11 @@
 [ -z "$GVMD_USER" ] && GVMD_USER="gvmd"
 [ -z "$PGRES_DATA"] && PGRES_DATA="/var/lib/postgresql"
 
+if [ -n "$GVM_CERTS" ] && [ "$GVM_CERTS" = true ]; then
+	echo "Generating certs"
+	gvm-manage-certs -a
+fi
+
 # check for psql connection
 FILE=$PGRES_DATA/started
 until test -f "$FILE"; do

From 33ae8f7842784f8eb31ca6e6e9a136e042dfaa4a Mon Sep 17 00:00:00 2001
From: Kevin Hester <kevin.hester@aegis-ew.com>
Date: Tue, 23 May 2023 11:44:14 +1200
Subject: [PATCH 2/2] Added to fork_cve_scan_handler() cleanup so it matches
 fork_osp_scan_handler() (greenbone/gvmd/issues/1979)

---
 src/manage.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/manage.c b/src/manage.c
index cdf705bf1..9a444f1cf 100644
--- a/src/manage.c
+++ b/src/manage.c
@@ -3089,9 +3089,12 @@ fork_cve_scan_handler (task_t task, target_t target)
         set_report_scan_run_status (global_current_report,
                                     TASK_STATUS_INTERRUPTED);
         global_current_report = (report_t) 0;
+        current_scanner_task = 0;
         return -9;
       default:
         /* Parent, successfully forked. */
+        global_current_report = 0;
+        current_scanner_task = 0;
         g_debug ("%s: %i forked %i", __func__, getpid (), pid);
         return 0;
     }