add new struct to handle also .inc files

Author: jjnicola

rust/crates/greenbone-scanner-framework/src/models/vtdata.rs

@@ -544,6 +544,11 @@ impl TagValue {
     }
 }
 
+pub enum ScriptMetadata { 
+    VT(VTData),
+    IncFile(IncFileData),
+}
+
 #[derive(Clone, Debug, Default, PartialEq, Eq, Hash, serde::Serialize, serde::Deserialize)]
 #[serde(rename_all = "snake_case")]
 /// Structure to hold a NVT
@@ -583,3 +588,17 @@ impl Display for VTData {
         write!(f, "VT {} ({})", self.oid, self.filename)
     }
 }
+
+#[derive(Clone, Debug, Default, PartialEq, Eq, Hash, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "snake_case")]
+/// Structure to hold an IncFile
+/// For integrity check and feed update
+pub struct IncFileData {
+    pub filename: String,
+}
+
+impl Display for IncFileData {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.filename)
+    }
+}

rust/src/openvasd/config/mod.rs

@@ -696,7 +696,7 @@ impl Config {
             config.feed.path.clone_from(path);
         }
         if let Some(path) = cmds.get_one::<PathBuf>("lock-file-dir") {
-            config.feed.lock_file_dir.clone_from(path);
+            config.feed.lock_file_dir.clone_from(&Some(path.to_path_buf()));
         }
         if let Some(path) = cmds.get_one::<PathBuf>("notus-products") {
             config.notus.products_path.clone_from(path);

rust/src/openvasd/scans/scheduling.rs

@@ -531,7 +531,7 @@ where
         scanner: Arc::new(scanner),
         feed_sync_in_progress: Arc::new(RwLock::new(IsInProgress::default())),
         scan_state: change_scan_status,
-        lock_file_dir: config.feed.lock_file_dir.to_string_lossy().to_string(),
+        lock_file_dir: config.feed.lock_file_dir.clone().unwrap_or(PathBuf::from("/var/lib/openvas")).to_string_lossy().to_string(),
     };
 
     run_scheduler(config.scheduler.check_interval, scheduler, feed).await

rust/src/openvasd/vts/mod.rs

@@ -7,6 +7,7 @@ use std::{
 
 use greenbone_scanner_framework::{GetVTsError, StreamResult};
 use scannerlib::Promise;
+use scannerlib::models::{IncFile, ScriptMetadata};
 use scannerlib::nasl::syntax::Loader;
 use scannerlib::notus::advisory_loader;
 use scannerlib::{
@@ -269,7 +270,8 @@ where
     synchronize_json(ps, &hash, move |sender| {
         let file = std::fs::File::open(&path).map_err(|_| not_found())?;
         let reader = BufReader::new(file);
-        for element in json_stream::iter_json_array::<VTData, _>(reader).filter_map(|x| x.ok()) {
+        for element in json_stream::iter_json_array::<ScriptMetadata, _>(reader).filter_map(|x| x.ok()) {
+            tracing::info!("{}", &element.filename);
             if sender.send(element).is_err() {
                 break;
             }

rust/src/openvasd/vts/redis.rs

@@ -320,8 +320,8 @@ impl PluginStorer for RedisPluginHandler {
                             Some(vt) => {
                                 let mut file = feed_path;
                                 file.push(vt.filename.clone());
-                                let mtime = fs::metadata(file)
-                                    .expect("File Metadata")
+                                let mtime = fs::metadata(&file)
+                                    .expect(format!("File Metadata {:?}", file.to_string_lossy()).as_str())
                                     .modified()
                                     .expect("File mtime not supported")
                                     .duration_since(UNIX_EPOCH)

rust/src/storage/redis/connector.rs

@@ -5,6 +5,7 @@
 use std::collections::BTreeMap;
 use std::fmt::Debug;
 
+use std::path::PathBuf;
 use std::str::FromStr;
 
 use super::dberror::DbError;
@@ -542,6 +543,14 @@ pub trait RedisAddNvt: RedisWrapper {
     /// - 'oid:<OID>:prefs': stores the plugins preferences, including the script_timeout
     ///   (which is especial and uses preferences id 0)
     fn redis_add_nvt(&mut self, nvt: VTData, mtime: String) -> RedisStorageResult<()> {
+        let filename = nvt.filename;
+        if let Some(vt_fn) = PathBuf::from(filename.clone()).extension() && vt_fn == "inc" {
+            let key_name = format!("signaturecheck:{filename}");
+            self.del(&key_name)?;
+            self.rpush(&key_name, mtime)?;
+            return Ok(());
+        };
+
         let oid = nvt.oid;
         let name = nvt.name;
         let required_keys = nvt.required_keys.join(", ");
@@ -558,7 +567,6 @@ pub trait RedisAddNvt: RedisWrapper {
             .join("|");
         let category = (nvt.category as i64).to_string();
         let family = nvt.family;
-        let filename = nvt.filename;
 
         // Get the references
         let (cves, bids, xrefs) = Self::refs(&nvt.references);