Fix: feed-filter .inc file paths (#2012)

* Fix: feed-filter .inc file paths

* fix typos

Author: jjnicola

rust/Cargo.lock

@@ -16,7 +16,6 @@ hyper = { version = "1", features = ["full"] }
 hyper-rustls = "0"
 hyper-util = { version = "0", features = ["tokio"] }
 insta = { version = "1.41.1", features = ["ron", "toml"] }
-reqwest = "0.12.23"
 rustls = "0.23.31"
 rustls-pemfile = "2.2.0"
 rustls-pemfile-old = { version = "1.0.2", package = "rustls-pemfile" }
@@ -136,6 +135,7 @@ nasl-function-proc-macro = { path = "crates/nasl-function-proc-macro" }
 greenbone-scanner-framework = { path = "crates/greenbone-scanner-framework" }
 nasl-c-lib = { path = "crates/nasl-c-lib", optional = true }
 rpmdb = { path = "crates/rpmdb-rs" }
+search_path = "0.1.4"
 
 [workspace]
 members = ["crates/smoketest", "crates/nasl-function-proc-macro"]

rust/Cargo.toml

@@ -24,7 +24,7 @@ All settings for running the smoke-tests are set via environmental variables. Th
 |TARGET_PASSWORD|Password for login in the target during the authenticated scan|empty string|no|Necessary for authenticated scans|
 |API_KEY|API Key for authenticated communication with `openvasd`|None|no||
 |OPENVASD_SERVER|Socket where openvasd listen on|http://127.0.0.1:3000|no|Must be specified with port|
-|CLIENT_CERT|PEM file combinating public certificate and any 3rd party intermediate certificates ||yes for mTLS|Necessary for mTLS enabled|
+|CLIENT_CERT|PEM file combining public certificate and any 3rd party intermediate certificates ||yes for mTLS|Necessary for mTLS enabled|
 |CLIENT_KEY|Client private key||yes for mTLS|Necessary for mTLS enabled|
 |SCAN_CONFIG|Scan config in json file format to be run against the target|simple_scan_ssh_only.json|yes||
 

rust/crates/smoketest/README.md

@@ -260,7 +260,9 @@ impl ScriptReader {
         ast.iter_stmts()
             .filter_map(|stmt| {
                 if let Statement::Include(include) = stmt {
-                    Some(ScriptPath(include.path.clone()))
+                    let sp = search_path::SearchPath::from(self.feed_path.clone());
+                    sp.find_file(&PathBuf::from(include.path.as_str()))
+                        .map(|i| ScriptPath::new(&self.feed_path, &i))
                 } else {
                     None
                 }
@@ -302,8 +304,9 @@ impl RunnableScripts {
                         assert!(
                             resolved.keys().any(|k| k.0 == dep.0)
                                 || unresolved.keys().any(|k| k.0 == dep.0),
-                            "Reference to non-existent file: {}",
-                            k.0
+                            "References to non-existent file: {}. dep: {}",
+                            k.0,
+                            dep.0
                         );
                     }
                 }

rust/src/feed_filter/main.rs

@@ -235,7 +235,7 @@ impl SshSession {
     }
 }
 
-/// Conveniene macro to implement a method of the underlying
+/// Convenience macro to implement a method of the underlying
 /// libssh::Session by calling it with all given arguments and
 /// transforming the Err variant according to the given SshError
 /// variant, giving it the session id and the error message.

rust/src/nasl/builtin/ssh/libssh/session.rs

@@ -119,7 +119,7 @@ where
     fn signature_check(&self) -> Result<(), Error> {
         if self.signature_check {
             match self.loader.verify_signature() {
-                Ok(_) => tracing::trace!("Signature check succsessful"),
+                Ok(_) => tracing::trace!("Signature check successful"),
                 Err(VerifyError::MissingKeyring) => {
                     tracing::warn!("Signature check enabled but missing keyring");
                     return Err(Error::SignatureCheckError(VerifyError::MissingKeyring));

rust/src/notus/notus.rs

@@ -53,7 +53,7 @@ where
 
     if signature_check {
         match advisories_files.verify_signature() {
-            Ok(_) => tracing::info!("Signature check succsessful"),
+            Ok(_) => tracing::info!("Signature check successful"),
             Err(feed::VerifyError::MissingKeyring) => {
                 tracing::warn!("Signature check enabled but missing keyring");
                 return Err(feed::VerifyError::MissingKeyring.into());

rust/src/scannerctl/notus_update/update.rs

@@ -610,7 +610,7 @@ impl From<models::Credential> for Credential {
                 credentials.push(("password".to_string(), password));
                 credentials.push(("community".to_string(), community));
                 credentials.push(("auth_algorithm".to_string(), auth_algorithm));
-                credentials.push(("privacy_passwor".to_string(), privacy_password));
+                credentials.push(("privacy_password".to_string(), privacy_password));
                 credentials.push(("privacy_algorithm".to_string(), privacy_algorithm));
             }
         };