Move SshError into BuiltinError

greenbone · Nov 5, 2024 · 5f51612 · 5f51612
1 parent 95e74c6
commit 5f51612
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/rust/src/nasl/builtin/error.rs b/rust/src/nasl/builtin/error.rs
@@ -31,10 +31,22 @@ macro_rules! builtin_error_variant (
                 NaslError::Builtin(BuiltinError::$variant(value))
             }
         }
+
+        impl TryFrom<NaslError> for $ty {
+            type Error = ();
+
+            fn try_from(value: NaslError) -> Result<Self, Self::Error> {
+                match value {
+                    NaslError::Builtin(BuiltinError::$variant(e)) => Ok(e),
+                    _ => Err(()),
+                }
+            }
+        }
     }
 );
 
 builtin_error_variant!(StringError, String);
 builtin_error_variant!(MiscError, Misc);
 builtin_error_variant!(SocketError, Socket);
 builtin_error_variant!(CryptographicError, Cryptographic);
+builtin_error_variant!(SshError, Ssh);
diff --git a/rust/src/nasl/builtin/mod.rs b/rust/src/nasl/builtin/mod.rs
@@ -25,7 +25,6 @@ mod string;
 mod tests;
 
 pub use error::BuiltinError;
-pub use ssh::SshError;
 
 use crate::nasl::syntax::{Loader, NoOpLoader};
 use crate::nasl::utils::{Context, Executor, NaslVarRegister, NaslVarRegisterBuilder, Register};

diff --git a/rust/src/nasl/builtin/ssh/error.rs b/rust/src/nasl/builtin/ssh/error.rs
@@ -2,8 +2,6 @@ use std::fmt;
 
 use thiserror::Error;
 
-use crate::nasl::NaslError;
-
 use super::SessionId;
 
 /// A cloneable representation of the Error type of the underlying SSH lib
@@ -162,9 +160,3 @@ impl SshError {
         m.attach_error_info(self)
     }
 }
-
-impl From<SshError> for NaslError {
-    fn from(e: SshError) -> Self {
-        NaslError::Ssh(e)
-    }
-}
diff --git a/rust/src/nasl/builtin/ssh/tests/mod.rs b/rust/src/nasl/builtin/ssh/tests/mod.rs
@@ -83,10 +83,10 @@ async fn ssh_connect() {
             check_err_matches!(
                 t,
                 format!(r#"id = ssh_connect(port:{}, keytype: "ssh-rsa");"#, PORT),
-                NaslError::Ssh(SshError {
+                SshError {
                     kind: SshErrorKind::Connect,
                     ..
-                })
+                }
             );
         },
         default_config(),
@@ -115,10 +115,10 @@ async fn ssh_userauth() {
             check_err_matches!(
                 t,
                 r#"ssh_userauth(session_id);"#,
-                NaslError::Ssh(SshError {
+                SshError {
                     kind: SshErrorKind::NoAuthenticationGiven,
                     ..
-                }),
+                },
             );
             userauth(&mut t);
         },

diff --git a/rust/src/nasl/utils/error.rs b/rust/src/nasl/utils/error.rs
@@ -5,7 +5,7 @@
 //! Defines function error kinds
 use thiserror::Error;
 
-use crate::nasl::builtin::{BuiltinError, SshError};
+use crate::nasl::builtin::BuiltinError;
 use crate::nasl::prelude::NaslValue;
 
 use crate::storage::StorageError;
@@ -22,9 +22,6 @@ pub enum NaslError {
     /// An example would be that there is no free memory left in the system
     #[error("{0}")]
     Dirty(String),
-    /// An Error originating from an SSH-specific NASL function
-    #[error("SSH error: {0}")]
-    Ssh(SshError),
     #[error("{0}")]
     Argument(#[from] ArgumentError),
     #[error("{0}")]