Merge pull request #13 from frack113/refactor/modules

Refactor/modules

src/cli.rs

@@ -13,12 +13,12 @@
 
 */
 
-use crate::commands::ads::ADS;
-use crate::commands::file::FileCreate;
-use crate::commands::mutex::Mutex;
-use crate::commands::namepipe::NamePipe;
-use crate::commands::ppid::PPID;
-use crate::commands::service::BYOVD;
+use crate::malware::ads::ADS;
+use crate::malware::file::FileCreate;
+use crate::malware::mutex::Mutex;
+use crate::malware::namepipe::NamePipe;
+use crate::malware::ppid::PPID;
+use crate::malware::service::BYOVD;
 use clap::Parser;
 
 #[derive(Parser)]
@@ -46,7 +46,7 @@ impl Arguments {
 }
 
 #[derive(Parser)]
-pub enum Commands {
+enum Commands {
     #[clap(arg_required_else_help = true)]
     FileCreate(FileCreate),
     #[clap(arg_required_else_help = true)]

src/main.rs

@@ -11,8 +11,10 @@
 Working date:  2023-08
 */
 
-use wag::cli::Arguments;
+mod cli;
+mod malware;
 
+use cli::Arguments;
 use clap::Parser;
 
 fn banner() {

src/commands/ads.rs → src/malware/ads.rs

@@ -7,7 +7,7 @@
 //
 // Last update 20240224
 
-use crate::commands::tools::{
+use crate::malware::tools::{
     hex_to_bytes, regex_to_string, EXIST_ALL_GOOD, EXIST_CLI_ERROR, EXIST_TEST_ERROR,
 };
 

src/commands/file.rs → src/malware/file.rs

@@ -18,7 +18,7 @@ You can use `SET | more` or `Get-ChildItem Env:` to get the list
 
 */
 
-use crate::commands::tools::{
+use crate::malware::tools::{
     hex_to_bytes, process_is_admin, regex_to_string, EXIST_ALL_GOOD, EXIST_TEST_ERROR,
 };
 use clap::Parser;

src/commands/mutex.rs → src/malware/mutex.rs

@@ -11,7 +11,7 @@ use windows::core::{Result as WindowsResult, PCSTR};
 use windows::Win32::Foundation::{CloseHandle, HANDLE};
 use windows::Win32::System::Threading::CreateMutexA;
 
-use crate::commands::tools::{regex_to_string, EXIST_ALL_GOOD};
+use crate::malware::tools::{regex_to_string, EXIST_ALL_GOOD};
 use clap::Parser;
 use std::{thread, time};
 

src/commands/namepipe.rs → src/malware/namepipe.rs

@@ -12,7 +12,7 @@ use windows::Win32::Foundation::{CloseHandle, HANDLE};
 use windows::Win32::Storage::FileSystem::PIPE_ACCESS_DUPLEX;
 use windows::Win32::System::Pipes::{CreateNamedPipeA, PIPE_TYPE_MESSAGE};
 
-use crate::commands::tools::{regex_to_string, EXIST_ALL_GOOD};
+use crate::malware::tools::{regex_to_string, EXIST_ALL_GOOD};
 use clap::Parser;
 use std::{thread, time};
 

src/commands/ppid.rs → src/malware/ppid.rs

@@ -7,7 +7,7 @@
 //
 // Last update 20240224
 
-use crate::commands::tools::{EXIST_ALL_GOOD, EXIST_TEST_ERROR};
+use crate::malware::tools::{EXIST_ALL_GOOD, EXIST_TEST_ERROR};
 use clap::Parser;
 
 use rand::prelude::SliceRandom;

src/commands/service.rs → src/malware/service.rs

@@ -17,7 +17,7 @@ use windows::Win32::System::Services::{
 };
 
 // Some others
-use crate::commands::tools::{process_is_admin, EXIST_ALL_GOOD, EXIST_TEST_ERROR};
+use crate::malware::tools::{process_is_admin, EXIST_ALL_GOOD, EXIST_TEST_ERROR};
 use clap::Parser;
 use std::{thread, time};