Merge branch 'main' into rs-network-functions2

greenbone · Nov 7, 2024 · e98e23a · e98e23a
2 parents 2b58f2f + 771eeab
commit e98e23a
Show file tree

Hide file tree

Showing 15 changed files with 572 additions and 305 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,7 +8,7 @@ message ("-- Configuring the Scanner...")
 
 # VERSION: Always include major, minor and patch level.
 project (openvas
-  VERSION 23.10.0
+  VERSION 23.10.1
   LANGUAGES C)
 
 if (POLICY CMP0005)

diff --git a/charts/openvasd/Chart.yaml b/charts/openvasd/Chart.yaml
@@ -21,4 +21,4 @@ version: 0.1.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "23.10.0"
+appVersion: "23.10.1"
diff --git a/rust/doc/openapi.yml b/rust/doc/openapi.yml
@@ -346,7 +346,6 @@ paths:
                   description: "Schema of a list of results response"
                 get results 0-3:
                   $ref: "#/components/examples/scan_results"
-
         "400":
           description: "Bad range format"
         "404":

diff --git a/rust/src/nasl/syntax/tests/parsing.rs b/rust/src/nasl/syntax/tests/parsing.rs
diff --git a/rust/src/openvas/result_collector.rs b/rust/src/openvas/result_collector.rs
@@ -11,7 +11,7 @@ use std::{
 };
 
 use crate::openvas::openvas_redis::{KbAccess, VtHelper};
-use crate::osp::{OspResultType, OspScanResult, StringF32};
+use crate::osp::{OspResultType, OspScanResult};
 use crate::storage::redis::RedisStorageResult;
 
 /// Structure to hold the results retrieve from redis main kb
@@ -111,62 +111,29 @@ where
                     }
                 };
             }
-
-            if error_msg {
+            let mut push_result = |x| {
                 scan_results.push(OspScanResult {
-                    result_type: OspResultType::Error,
-                    host: current_host,
-                    hostname: host_name,
-                    port,
-                    test_id: roid.to_string(),
-                    description: value,
-                    severity: StringF32::from(0.0),
-                    name: rname,
+                    result_type: x,
+                    host: Some(current_host.clone()),
+                    hostname: Some(host_name.clone()),
+                    port: Some(port.clone()),
+                    test_id: Some(roid.to_string()),
+                    description: value.clone(),
+                    severity: None,
+                    name: rname.clone(),
                 });
+            };
+
+            if error_msg {
+                push_result(OspResultType::Error);
             } else if result_type == "LOG" {
-                scan_results.push(OspScanResult {
-                    result_type: OspResultType::Log,
-                    host: current_host,
-                    hostname: host_name,
-                    port,
-                    test_id: roid.to_string(),
-                    description: value,
-                    severity: StringF32::from(0.0),
-                    name: rname,
-                });
+                push_result(OspResultType::Log);
             } else if result_type == "HOST_START" {
-                scan_results.push(OspScanResult {
-                    result_type: OspResultType::HostStart,
-                    host: current_host,
-                    hostname: host_name,
-                    port,
-                    test_id: roid.to_string(),
-                    description: value,
-                    severity: StringF32::from(0.0),
-                    name: rname,
-                });
+                push_result(OspResultType::HostStart);
             } else if result_type == "HOST_END" {
-                scan_results.push(OspScanResult {
-                    result_type: OspResultType::HostEnd,
-                    host: current_host,
-                    hostname: host_name,
-                    port,
-                    test_id: roid.to_string(),
-                    description: value,
-                    severity: StringF32::from(0.0),
-                    name: rname,
-                });
+                push_result(OspResultType::HostEnd);
             } else if result_type == "ALARM" {
-                scan_results.push(OspScanResult {
-                    result_type: OspResultType::Alarm,
-                    host: current_host,
-                    hostname: host_name,
-                    port,
-                    test_id: roid.to_string(),
-                    description: value,
-                    severity: StringF32::from(0.0),
-                    name: rname,
-                });
+                push_result(OspResultType::Alarm);
             } else if result_type == "DEADHOST" {
                 new_dead += i64::from_str(&value).expect("Valid amount of dead hosts");
             } else if host_count {

diff --git a/rust/src/openvasd/config.rs b/rust/src/openvasd/config.rs
@@ -110,7 +110,7 @@ pub struct OspdWrapper {
 impl Default for OspdWrapper {
     fn default() -> Self {
         OspdWrapper {
-            socket: PathBuf::from("/var/run/ospd/ospd.sock"),
+            socket: PathBuf::from("/var/run/ospd/ospd-openvas.sock"),
             read_timeout: None,
         }
     }
@@ -655,7 +655,7 @@ mod tests {
         assert_eq!(config.scheduler.check_interval, Duration::from_millis(500));
         assert_eq!(
             config.scanner.ospd.socket,
-            PathBuf::from("/var/run/ospd/ospd.sock")
+            PathBuf::from("/var/run/ospd/ospd-openvas.sock")
         );
         assert!(config.scanner.ospd.read_timeout.is_none());