added final success message

work vs personal if work and personal configs
exist.

pentest_tool/Cargo.lock

@@ -238,6 +238,15 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "colored"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fde0e0ec90c9dfb3b4b1a0891a7dcd0e2bffde2f7efed5fe7c9bb00e5bfb915e"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "combine"
 version = "4.6.7"
@@ -1257,12 +1266,14 @@ version = "3.1.1"
 dependencies = [
  "chrono",
  "clearscreen",
+ "colored",
  "directories",
  "dns-lookup",
  "fs_extra",
  "futures-io 0.2.1",
  "reqwest",
  "rodio",
+ "term_size",
  "walkdir",
 ]
 
@@ -1808,6 +1819,16 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
+[[package]]
+name = "term_size"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
 [[package]]
 name = "terminfo"
 version = "0.8.0"

pentest_tool/Cargo.toml

@@ -6,10 +6,12 @@ edition = "2021"
 [dependencies]
 chrono = "0.4.39"
 clearscreen = "3.0.0"
+colored = "3.0.0"
 directories = "5.0.1"
 dns-lookup = "2.0.4"
 fs_extra = "1.3.0"
 futures-io = { version = "0.2.0-beta" }
 reqwest = {version = "0.12.12", features = ["blocking", "json"]}
 rodio = "0.20.1"
+term_size = "0.3.2"
 walkdir = "2.5.0"

pentest_tool/src/box_controls.rs

@@ -5,6 +5,8 @@ use std::fs;
 use std::io::Write;
 use std::thread::{self, JoinHandle};
 use std::time::Duration;
+use colored::Colorize;
+
 use crate::{get_user_input, Project};
 
 pub fn stop_all_boxes(projects: &Vec<Project>){
@@ -74,6 +76,7 @@ pub fn project_inline_terminal(project: Project){
     process::Command::new("distrobox").arg("enter").arg("--root").arg(project.boxname).arg("--").arg("script").arg("-a").arg("-B").arg("/pentest/working/terminal.log").status().expect("error opeing konsole");
 }
 
+#[allow(unused)]
 pub fn make_box(project: &Project, tools_dir: &PathBuf, boxtemplate: &String, new: bool, fingerprint: bool){
     println!("stopping template box to ensure we can clone it!");
     let stop_result = Command::new("distrobox").arg("stop").arg("--root").arg(boxtemplate).status();
@@ -221,8 +224,8 @@ pub fn launch_cobalt_strike(project: Project) -> Option<JoinHandle<()>>{
                                                                                         .output();
             if cobalt_strike_launch_result.is_err(){
                 let error = cobalt_strike_launch_result.err().unwrap();
-                println!("error launching cobalt strike!");
-                println!("{}", error);
+                println!("{}", "error launching cobalt strike!".red());
+                println!("{}", error.to_string().red());
             }
         }
     });
@@ -236,6 +239,7 @@ pub fn launch_cobalt_strike(project: Project) -> Option<JoinHandle<()>>{
     return Some(handle);
 }
 
+#[allow(unused)]
 pub fn launch_bloodhound_gui(project: Project) -> Option<JoinHandle<()>>{
     let mut bloodhound_command = String::new();
     let version_response = get_user_input("do you want to use a specific bloodhound version?");
@@ -257,8 +261,8 @@ pub fn launch_bloodhound_gui(project: Project) -> Option<JoinHandle<()>>{
                                                         .status();
     if neo4jstart_res.is_err(){
         let error = neo4jstart_res.err().unwrap();
-        println!("errror starting neo4j...");
-        println!("{}", error);
+        println!("{}","errror starting neo4j...".red());
+        println!("{}", error.to_string().red());
     }
     else{
         neo4j_started = true;
@@ -278,8 +282,8 @@ pub fn launch_bloodhound_gui(project: Project) -> Option<JoinHandle<()>>{
                                                         .output();
         if bloodhound_res.is_err(){
             let error = bloodhound_res.err().unwrap();
-            println!("error starting bloodhound!");
-            println!("{}", error);
+            println!("{}","error starting bloodhound!".red());
+            println!("{}", error.to_string().red());
         }
     });
     return Some(handle);

pentest_tool/src/cli.rs

@@ -1,11 +1,17 @@
-use std::os::unix::thread;
+use std::fs::read_to_string;
+use std::fs::OpenOptions;
 use std::path::PathBuf;
 use std::process::exit;
+use std::io::Write;
 use std::thread::JoinHandle;
 use chrono::Datelike;
 use clearscreen::clear;
 use clearscreen;
 use chrono::Local;
+use colored::Colorize;
+use crate::print_error;
+use crate::print_informational;
+use crate::print_success;
 use crate::Project;
 use crate::project_controls;
 use crate::box_controls;
@@ -18,117 +24,134 @@ use crate::victim_commands;
 use crate::enumeration;
 use crate:: tool_controls;
 use crate::configuration;
+use crate::tableize;
 
 
 fn help(command: Option<String>){
     if command.is_some(){
         let help_cmd = command.unwrap();
+        let mut lines = Vec::new();
+        lines.push("COMMAND||ALIASES||INFO".to_owned());
         match help_cmd.as_str(){
-            "list projects" | "lp" | "listp" | "list p" => {println!("Command: list projects\nAliases: lp, listp, list p\n\nThis command lists all projects currently tracked by the pentest_tool"); return;},
-            "switch project" | "swp" | "switch p" | "switchp" => {println!("Command: switch project\nAliases: swp, switch p, switchp\n\nThis command will switch the active project from the current one to a new on of your choosing. It will prompt you to make a selection."); return;},
-            "show active project" | "show active" | "sa" | "show a" => {println!("Command: show active project\nAliases: sa, show a\n\nThis command shows information about the currently active project. NOTE the most useful information is already displayed above the CLI prompt."); return;},
-            "create new project" | "cnp" | "new project" | "np" => {println!("Command: create new project\nAliases: cnp, new project, np\n\nThis command creates a new project and default note structure based on pyro's perferred note structure. It will prompt you for any needed information."); return;},
-            "save projects" | "sp" | "save" | "s" => {println!("Command: save projects\nAliases: sp save\n\nThis command saves all project information to the ~/.config/pyro_pentest_tool/projects.conf file"); return;},
-            "import project" | "ip" | "import" => {println!("Command: import project\nAliases: ip, import\n\nThis command will impot an existing project and set up a new distrobox for the project if it is a current project."); return;},
-            "remove project" | "rp" | "remove" | "rmp" => {println!("Command:remove project\nAliases:rp, remove, rmp\n\nThis command removes a project from the list of projects tracked by the pentest_tool, and will destroy its distrobox. It does not remove any directories used or created by the distrobox. Run this after the report is written."); return;},
-            "show upcoming projects" | "sup" | "show upcoming" => {println!("Command:show upcoming projects\nAliases:sup, show upcoming\n\nThis command shows a list of upcoming projects. Use this to verify which project you want to promote when the project enters the active phase."); return;},
-            "promote project" | "pp" | "promote" => {println!("Command:promote project\nAliases:pp (ha), promote\n\nThis command promotes an upcoming project to a current project. It will copy the folders that were created over to the current project space and set up a new distrobox for the project."); return;},
-            "new terminal" | "enter" | "enter terminal" | "nt" | "et" => {println!("Command:new terminal\nAliases:enter, enter terminal, nt, et\n\nThis command spawns a new terminal window in the active project's distrobox. Use this to interact with your project's distrobox."); return;},
-            "inline terminal" | "it" | "enter inline" | "ei" => {println!("Command:inline terminal\nAliases:it enter, inline, ei\n\nThis command spawns a terminal in this window using the current active project's distrobox"); return;},
-            "cobalt strike" | "cs"  => {println!("Command:cobalt strike\nAliases:cs\n\nThis command opens cobalt strike in the active project's distrobox, and spins it off as a new thread to ensure it doesn't block the rest of this tools operation. NOTE the cobalt strike window will need to be closed before this tool exits sucessfully."); return;},
-            "recreate distrobox" | "rdb" | "ndb" | "new distrobox" => {println!("Command:recreate distrobox\nAliases:rdb, ndb, new distrobox\n\nThis command destroyes the existing distrobox for the currently active project, and clones a new one based on the current state of the template distrobox."); return;},
-            "generate userpass" | "userpass" | "gup" | "up" => {println!("Command:generate userpass\nAliases:userpass, gup, up\n\nThis command generates a userpass file based on the active project's notes. The file will be in the username:password format."); return;},
-            "inital enum" | "ie" | "enum" => {println!("Command:initial enum\nAliases:ie, enum\n\nThis command runs the initial enum script on a nessus csv and saves the output to the active project's notes in the host_notes.md file."); return;},
-            "build attack notes" | "ban" | "attack notes" | "hn" => {println!("Command:build attack notes\nAliases:ban, attack notes\n\nThis command builds the active project's attack note based on the active project's host notes (for external tests). It is expected that you'd run the initial enum command, then manually fill out the enumeration talbes with correct service names and ports."); return;},
-            "host discovery" | "build host discovery" | "hd" | "bhd"  => {println!("Command:host discovery\nAliases:build host discovery, hd, bhd\n\nThis command prints the host discovery ping command for the active project, based on the scope table in the general.md notes file."); return;},
-            "cobaltstrike port scan" | "cs port scan" | "csps" => {println!("Command:port scan\nAliases:cs port scan, cobaltstrike port scan, csps, ps (tell your cat I said that)\n\nThis command prints the cobalt strike portscan command based on the active project's scope table in the general.md notes file"); return;},
-            "parse port scan" | "pps" | "parse scan" => {println!("Command:parse port scan\nAliases:pps, parse scan\n\nThis commmand parses a cobalt strike portscan TSV and saves interesting hoests to files to the active project's files folder. The host files are designated with the service that was detected that might be interesting. Use this to generate target lists for specific protocols."); return;},
-            "stop boxes" | "stop distroboxes" | "sdb" => {println!("Command:stop boxes\nAliases:stop distroboxes, sdb\n\nThis command stops all distroboxes for the tracked projects. Note if the distrobox isn't running you will see errors in the console, you can safely ignore these."); return;},
-            "password spray" | "pass spray" | "pas" => {println!("Command:password spray\nAliases:pass spray, pas\n\nThis command iterates through the password spray note file and print the command to perform the spray, waiting the proper observation window beteen commands. It prompts you to save if needed. NOTE this will block execution for the rest of the program until it is either finished, or you save and exit the password spray function. I'm working on making this better."); return;},
-            "bloodhound" | "bh" => {println!("Command:bloodhound\nAliases:bh\n\nThis command launches bloodhound in the active project's distrobox. It will automatically start neo4j before staring bloodhound."); return;},
-            "parse gather contacts" | "pgc" | "parse contacts" | "pc" => {println!("Command:parse gather contacts\nAliases:pgc, parse contacts, pc\n\nThis command parses output saved from the gather contacts burpsuite extension."); return;},
-            "prune distroboxes" | "pdb" | "prune" => {println!("Command:prune distroboxes\nAliases:pdb, prune\n\nthis command prunes distroboxes for all projects that are not being tracked by this tool (frees up system storage). This will start all the currently acvtive distorboxes to ensure they don't get pruned, and then will delete all the not-started distrobox volumes and resources."); return;},
-            "clear" | "clear screen" | "cls" => {println!("Command:clear\nAliases:clear screen, cls\n\nThis command clears the screen of command output."); return},
-            "exit" => {println!("Command:exit\nAliases:(none)\nThis command exits the pentest_tool, it will save all project infomation, and wait for all threads to re-join the main thread before exiting."); return;},
-            "settings" => {println!("\n\nThe settings file is located at ~/.config/pyro_pentest_tool/conf\n\nThe format is setting_name:setting_value.\n\nNeeded settings are\n  project_files - the place to store current project files folders\n\n  projtect_notes - the place to store current project notes\n\n  tools_folder - the place to store custom tools like those downloaded from github\n\n  upcoming_files - the place to store upcoming project files folders\n\n  upcoming_notes -  The place to store upcoming project note files\n\n  box_template - the name of the distrobox you want to clone for project boxes\n\n  terminal - the command you use to launch a terminal, while running a specific command: Ex: konsole -e \n\n  cracking_rig - the user and host you use for a personal cracking rig in the openssh formating: Ex: pyro@cracking_rig or pyro@192.168.1.101 if you do not have a cracking rig the default is @n\n\n rockyou_location - the location on the cracking rig for the rockyou.txt file default is n\n\n  rule_location - the location on the cracking rig for the one rule to rule them all file. Default is n\n\n  pass_file - this is the location where you store your standard password spray file. If you do not have a custom one this tool provides one. The default is ~/.config/pyro_pentest_tool/passwordspary.md\n\n  fingerprint - this is whether you want fingerprint authentication within your distroboxes, takes y/n\n\n  vault_name - the name of your obsidian vault, default is notes\n\n"); return;},
-            "parse normal nmap file" | "pnnf" | "parse nmap" | "pn" => {println!("Command:parse normal nmap file\nAliases: pnnf, parse nmap, pn\n\nThis command parses the normal output of an nmap scan (like if you just tee'd or >'d it to a file) and outputs in host:port or int the coablt strike tsv format. It will attempt to find the file within the active project's files folder, and if it can't find the file it will prompt you for input.")},
-            "sharpersist command" | "spc" | "sharp scheduled task" | "sst" => {println!("Command: sharpersist command\nAliases: spc, sharp scheduled task, sst\n\nThis comand prints the commands to run to use sharpersist.exe to create a scheduled task that runs hourly called FRPersist.")},
-            "port scan" | "ps" | "nmap" | "nmap scan" | "ns" | "nm" => {println!("Command: port scan\nAliases: ps, nmap, nmap scan, ns, nm\n\nThis command runs an nmap scan against the scope in the active projects notes, and saves the output.")},
-            "show scope" | "ss" | "show s" | "s s" | "scope" => {println!("Command:show scope\nAliases:ss, show s, s s, scope\n\nThis command displays the current project's scope as just the hosts in the scope table in your notes.")},
-            "port scan command" | "psc" | "nmap command" | "nmc" => {println!("command:port scan command\nAliases:psc,nmap command, nmc\n\nThis command will print the nmap command to manually run a scan to the terminal so you can copy paste it.")},
-            "update git tools" | "ugt" | "update git" | "ug" => {println!("Command: update git tools\nAliases: update git, ugt, ug\n\nThis command attempts to update the git tools in your tools directory, it will attempt to update every directory as a git project. If the directory is not a git project it should just error out and continue to the next one.")},
-            "dns records" | "dr" => {println!("Command:dnsrecords\nAliases:dr\n\nThis command will run dns recon inside of your distrobox and save the results to your enumeration notes.")},
-            "brute force subdomains"| "bsd" | "gobuster dns" | "gd" => {println!("Command:brute force subdomains\nAliases:bsd,gobuster dns, gd\n\nthis command will run gobuster in the project's distrobox and save the results to your notes.")},
-            "dns enumeration" | "de" | "all dns stuff" | "ads" | "dns stuff" | "ds" => {println!("Command:dns enumeration\nAliases:de, all dns stuff, ads, dns stuff, de\n\nThis command will perform both dns record enumeration with dnsrecon, and subdomain enumeration using gobster inside of your distrobox and save the output to your notes.")},
-            "modify tool config" | "mtc"  => {println!("Command: modify tool config\nAliases: mtc\n\nThis command lets you modify the tool's configuration.");}
+            "list projects" | "lp" | "listp" | "list p" => lines.push("list projects||lp, listp, list p||This command lists all projects currently tracked by the pentest_tool".to_owned().to_owned()) ,
+            "switch project" | "swp" | "switch p" | "switchp" => lines.push(" switch project|| swp, switch p, switchp||This command will switch the active project from the current one to a new on of your choosing. It will prompt you to make a selection.".to_owned()) ,
+            "show active project" | "show active" | "sa" | "show a" => lines.push(" show active project|| sa, show a||This command shows information about the currently active project. NOTE the most useful information is already displayed above the CLI prompt.".to_owned()) ,
+            "create new project" | "cnp" | "new project" | "np" => lines.push(" create new project|| cnp, new project, np||This command creates a new project and default note structure based on pyro's perferred note structure. It will prompt you for any needed information.".to_owned()) ,
+            "save projects" | "sp" | "save" | "s" => lines.push(" save projects|| sp save||This command saves all project information to the ~/.config/pyro_pentest_tool/projects.conf file".to_owned()) ,
+            "import project" | "ip" | "import" => lines.push(" import project|| ip, import||This command will impot an existing project and set up a new distrobox for the project if it is a current project.".to_owned()) ,
+            "remove project" | "rp" | "remove" | "rmp" => lines.push("remove project||rp, remove, rmp||This command removes a project from the list of projects tracked by the pentest_tool, and will destroy its distrobox. It does not remove any directories used or created by the distrobox. Run this after the report is written.".to_owned()) ,
+            "show upcoming projects" | "sup" | "show upcoming" => lines.push("show upcoming projects||sup, show upcoming||This command shows a list of upcoming projects. Use this to verify which project you want to promote when the project enters the active phase.".to_owned()) ,
+            "promote project" | "pp" | "promote" => lines.push("promote project||pp (ha), promote||This command promotes an upcoming project to a current project. It will copy the folders that were created over to the current project space and set up a new distrobox for the project.".to_owned()) ,
+            "new terminal" | "enter" | "enter terminal" | "nt" | "et" => lines.push("new terminal||enter, enter terminal, nt, et||This command spawns a new terminal window in the active project's distrobox. Use this to interact with your project's distrobox.".to_owned()) ,
+            "inline terminal" | "it" | "enter inline" | "ei" => lines.push("inline terminal||it enter, inline, ei||This command spawns a terminal in this window using the current active project's distrobox".to_owned()) ,
+            "cobalt strike" | "cs"  => lines.push("cobalt strike||cs||This command opens cobalt strike in the active project's distrobox, and spins it off as a new thread to ensure it doesn't block the rest of this tools operation. NOTE the cobalt strike window will need to be closed before this tool exits sucessfully.".to_owned()) ,
+            "recreate distrobox" | "rdb" | "ndb" | "new distrobox" => lines.push("recreate distrobox||rdb, ndb, new distrobox||This command destroyes the existing distrobox for the currently active project, and clones a new one based on the current state of the template distrobox.".to_owned()) ,
+            "generate userpass" | "userpass" | "gup" | "up" => lines.push("generate userpass||userpass, gup, up||This command generates a userpass file based on the active project's notes. The file will be in the username:password format.".to_owned()) ,
+            "inital enum" | "ie" | "enum" => lines.push("initial enum||ie, enum||This command runs the initial enum script on a nessus csv and saves the output to the active project's notes in the host_notes.md file.".to_owned()) ,
+            "build attack notes" | "ban" | "attack notes" | "hn" => lines.push("build attack notes||ban, attack notes||This command builds the active project's attack note based on the active project's host notes (for external tests). It is expected that you'd run the initial enum command, then manually fill out the enumeration talbes with correct service names and ports.".to_owned()) ,
+            "host discovery" | "build host discovery" | "hd" | "bhd"  => lines.push("host discovery||build host discovery, hd, bhd||This command prints the host discovery ping command for the active project, based on the scope table in the general.md notes file.".to_owned()) ,
+            "cobaltstrike port scan" | "cs port scan" | "csps" => lines.push("port scan||cs port scan, cobaltstrike port scan, csps, ps (tell your cat I said that)||This command prints the cobalt strike portscan command based on the active project's scope table in the general.md notes file".to_owned()) ,
+            "parse port scan" | "pps" | "parse scan" => lines.push("parse port scan||pps, parse scan||This commmand parses a cobalt strike portscan TSV and saves interesting hoests to files to the active project's files folder. The host files are designated with the service that was detected that might be interesting. Use this to generate target lists for specific protocols.".to_owned()) ,
+            "stop boxes" | "stop distroboxes" | "sdb" => lines.push("stop boxes||stop distroboxes, sdb||This command stops all distroboxes for the tracked projects. Note if the distrobox isn't running you will see errors in the console, you can safely ignore these.".to_owned()) ,
+            "password spray" | "pass spray" | "pas" => lines.push("password spray||pass spray, pas||This command iterates through the password spray note file and print the command to perform the spray, waiting the proper observation window beteen commands. It prompts you to save if needed. NOTE this will block execution for the rest of the program until it is either finished, or you save and exit the password spray function. I'm working on making this better.".to_owned()) ,
+            "bloodhound" | "bh" => lines.push("bloodhound||bh||This command launches bloodhound in the active project's distrobox. It will automatically start neo4j before staring bloodhound.".to_owned()) ,
+            "parse gather contacts" | "pgc" | "parse contacts" | "pc" => lines.push("parse gather contacts||pgc, parse contacts, pc||This command parses output saved from the gather contacts burpsuite extension.".to_owned()) ,
+            "prune distroboxes" | "pdb" | "prune" => lines.push("prune distroboxes||pdb, prune||this command prunes distroboxes for all projects that are not being tracked by this tool (frees up system storage). This will start all the currently acvtive distorboxes to ensure they don't get pruned, and then will delete all the not-started distrobox volumes and resources.".to_owned()) ,
+            "clear" | "clear screen" | "cls" => lines.push("clear||clear screen, cls||This command clears the screen of command output.".to_owned()) ,
+            "exit" => lines.push("exit||(none)\nThis command exits the pentest_tool, it will save all project infomation, and wait for all threads to re-join the main thread before exiting.".to_owned()) ,
+            "settings" => lines.push("||The settings file is located at ~/.config/pyro_pentest_tool/conf||The format is setting_name:setting_value.||Needed settings are\n  project_files - the place to store current project files folders||  projtect_notes - the place to store current project notes||  tools_folder - the place to store custom tools like those downloaded from github||  upcoming_files - the place to store upcoming project files folders||  upcoming_notes -  The place to store upcoming project note files||  box_template - the name of the distrobox you want to clone for project boxes||  terminal - the command you use to launch a terminal, while running a specific  Ex: konsole -e ||  cracking_rig - the user and host you use for a personal cracking rig in the openssh formating: Ex: pyro@cracking_rig or pyro@192.168.1.101 if you do not have a cracking rig the default is @n|| rockyou_location - the location on the cracking rig for the rockyou.txt file default is n||  rule_location - the location on the cracking rig for the one rule to rule them all file. Default is n||  pass_file - this is the location where you store your standard password spray file. If you do not have a custom one this tool provides one. The default is ~/.config/pyro_pentest_tool/passwordspary.md||  fingerprint - this is whether you want fingerprint authentication within your distroboxes, takes y/n||  vault_name - the name of your obsidian vault, default is notes||".to_owned()) ,
+            "parse normal nmap file" | "pnnf" | "parse nmap" | "pn" => lines.push("parse normal nmap file|| pnnf, parse nmap, pn||This command parses the normal output of an nmap scan (like if you just tee'd or >'d it to a file) and outputs in host:port or int the coablt strike tsv format. It will attempt to find the file within the active project's files folder, and if it can't find the file it will prompt you for input.".to_owned()),
+            "sharpersist command" | "spc" | "sharp scheduled task" | "sst" => lines.push(" sharpersist command|| spc, sharp scheduled task, sst||This comand prints the commands to run to use sharpersist.exe to create a scheduled task that runs hourly called FRPersist.".to_owned()),
+            "port scan" | "ps" | "nmap" | "nmap scan" | "ns" | "nm" => lines.push(" port scan|| ps, nmap, nmap scan, ns, nm||This command runs an nmap scan against the scope in the active projects notes, and saves the output.".to_owned()),
+            "show scope" | "ss" | "show s" | "s s" | "scope" => lines.push("show scope||ss, show s, s s, scope||This command displays the current project's scope as just the hosts in the scope table in your notes.".to_owned()),
+            "port scan command" | "psc" | "nmap command" | "nmc" => lines.push("port scan command||psc,nmap command, nmc||This command will print the nmap command to manually run a scan to the terminal so you can copy paste it.".to_owned()),
+            "update git tools" | "ugt" | "update git" | "ug" => lines.push(" update git tools|| update git, ugt, ug||This command attempts to update the git tools in your tools directory, it will attempt to update every directory as a git project. If the directory is not a git project it should just error out and continue to the next one.".to_owned()),
+            "dns records" | "dr" => lines.push("dnsrecords||dr||This command will run dns recon inside of your distrobox and save the results to your enumeration notes.".to_owned()),
+            "brute force subdomains"| "bsd" | "gobuster dns" | "gd" => lines.push("brute force subdomains||bsd,gobuster dns, gd||this command will run gobuster in the project's distrobox and save the results to your notes.".to_owned()),
+            "dns enumeration" | "de" | "all dns stuff" | "ads" | "dns stuff" | "ds" => lines.push("dns enumeration||de, all dns stuff, ads, dns stuff, de||This command will perform both dns record enumeration with dnsrecon, and subdomain enumeration using gobster inside of your distrobox and save the output to your notes.".to_owned()),
+            "modify tool config" | "mtc"  => lines.push("modify tool config|| mtc||This command lets you modify the tool's configuration.".to_owned()),
+            "separate work and personal projects" | "swpp" | "separate projects" | "seppro" => lines.push("separate work and personal||swpp, separate projects, seppro||This command lets you separate work and personal projects into separate config files. This allows you to load personal and work projects separately!".to_owned()),
+            "switch to personal projects" | "switch personal" => lines.push("switch to personal projects||switch personal||This command lets you switch which config file is loaded to the personal config file.".to_owned()),
+            "switch to work projects" | "switch work" => lines.push("switch to work projects||switch work||This command lets you switch to load the work projects.".to_owned()),
             _ => ()
         }
+        tableize(lines);
     }
+    else{
         println!("Welcom to Pyro's pentest command line!");
         println!("the pentest_tool uses a configuration file to store your settings. This configuration file is located at ~/.config/pyro_pentest_tool/conf.\nYou can modify this file, but do so cautiously, incorrect formatting will cause this program to have a bruh moment.\nThe correct format is setting_name:setting_value\nExample:\nprojecT_files:/var/home/pyro/pentests/current");
         println!("for help configuring the settings file run help settings");
-    println!("available commands: name | aliases | ...");
-    print!("
-menu | main menu | mm
-list projects |  lp  |  listp  |  list p  
-switch project  |  sp  |  switch p  |  switchp  
-show active project  |  show active  |  sa  |  show a 
-create new project  |  cnp  |  new project  |  np  
-save projects  |  sp  |  save  |  s  
-import project  |  ip  |  import  
-remove project  |  rp  |  remove  |  rmp  
-show upcoming project  |  sup  |  show upcoming  
-promote project  |  pp  |  promote  
-new terminal  |  enter  |  enter terminal  |  nt  |  et  
-inline terminal  |  it  |  enter inline  |  ei  
-cobalt strike  |  cs   
-recreate distrobox  |  rdb  |  ndb  |  new distrobox  
-generate userpass  |  userpass  |  gup  |  up  
-inital enum  |  ie  |  enum  
-host discovery  |  build host discovery  |  hd  |  bhd   
-port scan  |  cs port scan  |  cobaltstrike port scan  |  csps  |  ps  
-parse port scan  |  pps  |  parse scan  
-stop boxes  |  stop distroboxes  |  sdb  
-password spray  |  pass spray  |  pas  
-bloodhound  |  bh 
-parse gather contacts  |  pgc  |  parse contacts  |  pc  
-prune distroboxes  |  pdb  |  prune  
-clear | clear screen | cls
-parse nomral nmap file | pnnf | parse nmap | pn
-show scope | ss | show s | s s | scope
-sharpersist command | spc | sharp scheduled task
-port scan | ps | nmap | nmap scan | ns | nm
-port scan command | psc | nmap command | nmc
-update git tools | ugt | update git | ug
-dns records | dr 
-brute force subdomains| bsd | gobuster dns | gd 
-dns enumeration | de | all dns stuff | ads | dns stuff | ds  
-modify tool config | mtc
-help  |  ?  |  -h 
-")
+        let lines = vec!["command||aliases".to_owned(),
+                                    "menu||main menu, mm".to_owned(),
+                                    "list projects||lp, listp, list p".to_owned(),  
+                                    "switch project||sp, switch p, switchp".to_owned(),  
+                                    "show active project||show active, sa, show a".to_owned(), 
+                                    "create new project||cnp, new project, np".to_owned(),  
+                                    "save projects||sp, save, s".to_owned(),  
+                                    "import project||ip, import".to_owned(),  
+                                    "remove project||rp, remove, rmp".to_owned(),  
+                                    "show upcoming project||sup, show upcoming".to_owned(),  
+                                    "promote project||pp, promote".to_owned(),  
+                                    "new terminal||enter, enter terminal, nt, et".to_owned(),  
+                                    "inline terminal||it, enter inline, ei".to_owned(),  
+                                    "cobalt strike||cs".to_owned(),   
+                                    "recreate distrobox||rdb, ndb, new distrobox".to_owned(),  
+                                    "generate userpass||userpass, gup, up".to_owned(),  
+                                    "inital enum||ie, enum".to_owned(),  
+                                    "host discovery  ||build host discovery, hd, bhd".to_owned(),   
+                                    "port scan||cs port scan, cobaltstrike port scan, csps, ps".to_owned(),  
+                                    "parse port scan  ||pps, parse scan".to_owned(),  
+                                    "stop boxes||stop distroboxes, sdb".to_owned(),  
+                                    "password spray||pass spray, pas".to_owned(),  
+                                    "bloodhound||bh".to_owned(), 
+                                    "parse gather contacts||pgc, parse contacts, pc".to_owned(),  
+                                    "prune distroboxes||pdb, prune".to_owned(),  
+                                    "clear||clear screen, cls".to_owned(),
+                                    "parse nomral nmap file||pnnf, parse nmap, pn".to_owned(),
+                                    "show scope||ss, show s, s s, scope".to_owned(),
+                                    "sharpersist command||spc, sharp scheduled task".to_owned(),
+                                    "port scan||ps, nmap, nmap scan, ns, nm".to_owned(),
+                                    "port scan command||psc, nmap command, nmc".to_owned(),
+                                    "update git tools||ugt, update git, ug".to_owned(),
+                                    "dns records||dr".to_owned(), 
+                                    "brute force subdomain||bsd, gobuster dns, gd".to_owned(), 
+                                    "dns enumeration||de, all dns stuff, ads, dns stuff, ds".to_owned(),  
+                                    "modify tool config||mtc".to_owned(),
+                                    "separate work and personal projects||swpp, separate projects, seppro".to_owned(),
+                                    "switch to personal projects||switch personal".to_owned(),
+                                    "switch to work projects||switch work".to_owned(), 
+                                    "help||?, -h".to_owned()];
+        println!("available commands:");
+        tableize(lines);
+    }
 }
 
-pub fn get_active_project(projects: &Vec<Project>) -> &Project{
+pub fn get_active_project(projects: &Vec<Project>) -> Option<&Project>{
     let mut active_project = &projects[0];
     for project in projects{
         if project.active == true{
             active_project = project
         }
     }
-    return active_project
+    return Some(active_project)
 }
 
-pub fn next_project_id(config_path: &PathBuf) -> i32{
-    let projects = project_controls::get_projects(config_path, false);
+pub fn next_project_id(config_path: &PathBuf) -> Option<i32>{
+    let projects_res = project_controls::get_projects(config_path, false);
+    if projects_res.is_none(){
+        println!("{}", "Error loading projects!!".red());
+        return None;
+    }
+    let projects = projects_res.unwrap();
     let mut new_id = 0;
     for project in projects.clone(){
         if project.id > new_id{
             new_id = project.id + 1;
         }
     }
-    return new_id;
+    return Some(new_id);
 }
-
+#[allow(unused)]
 pub fn run_command(cmd: String,
                    mut projects: &mut Vec<Project>, 
                    config_path: PathBuf, 
@@ -145,8 +168,18 @@ pub fn run_command(cmd: String,
                    password_spray_file: &PathBuf, 
                    fingerprint: bool, 
                    vault_name: String) -> Option<JoinHandle<()>> {
-    let mut new_id = next_project_id(&config_path);
-    let active_project = get_active_project(&projects);
+    let new_id_res = next_project_id(&config_path);
+    if new_id_res.is_none(){
+        println!("{}", "failed to get new project ID!".red());
+        return None;
+    }
+    let mut new_id = new_id_res.unwrap();
+    let active_project_res = get_active_project(&projects);
+    if active_project_res.is_none(){
+        println!("{}", "failed to get active project!".red());
+        return None;
+    }
+    let active_project = active_project_res.unwrap();
     let mut notes_folder_string = format!("{}", &active_project.notes_folder.display());
     let mut obsidian_folder_vec = PathBuf::new();
     let mut reached_vault_folder = false;
@@ -222,14 +255,18 @@ pub fn run_command(cmd: String,
                         "dns squatting scan" | "dnstwist" | "dss" => {let twist_handle = enumeration::dns_squatting(&active_project, None, true); return twist_handle},
                         "print report information" | "pri" => {info_controls::print_report_information(&active_project); return None;},
                         "modify tool config" | "mtc"  => {configuration::generate_tool_config(&config_path); return None;},
+                        "separate work and personal projects" | "swpp" | "separate projects" | "seppro" => {project_controls::separate_personal_work_projects(&config_path); return None;}
+                        "switch to personal projects" | "switch personal" => {let mut project_load_res = project_controls::swith_to_personal(&config_path); if project_load_res.is_some(){projects.clear();for project in project_load_res.unwrap(){projects.push(project);}}; return None;},
+                        "switch to work projects" | "switch work" => {let mut project_load_res = project_controls::swith_to_work(&config_path); if project_load_res.is_some(){projects.clear();for project in project_load_res.unwrap(){projects.push(project);}}; return None;}
                         _ => {help(None); println!("\n\n unknown command."); return None;}
     }
 }
 
 fn print_banner(banner: &str){
-    print!("{}", banner);
+    print!("{}", banner.custom_color((255,165,0)));
 }
 
+#[allow(unused)]
 pub fn cli(interactive: bool,
            mut projects: Vec<Project>, 
            config_path: PathBuf, 
@@ -245,7 +282,7 @@ pub fn cli(interactive: bool,
            upcoming_notes: &PathBuf, 
            password_spray_file: &PathBuf, 
            fingerprint: bool, 
-           vault_name: String) {
+           vault_name: String,) {
     let mut threads = Vec::new();
     if interactive{
         let mut loopize = true;
@@ -300,7 +337,12 @@ pub fn cli(interactive: bool,
         print_banner(banner);
         while loopize{
             project_controls::save_projects(&projects, &config_path);
-            let active_project = get_active_project(&projects);
+            let active_project_res = get_active_project(&projects);
+            if active_project_res.is_none(){
+                println!("{}", "failed to get active project!".red());
+                return;
+            }
+            let active_project = active_project_res.unwrap();
             let current_information = format!("
 Active Project: {}, {}
 Project Status: {}
@@ -312,8 +354,9 @@ Obsidian URI: {}
 for help enter help or ?. for information about a specific command enter help (command)
 
 
-", active_project.customer, active_project.project_name, active_project.stage, active_project.files_folder.display(), active_project.notes_folder.display(), active_project.boxname, "coming soon");
-            let prompt = format!("\n{}:{}\nCommand?", active_project.customer, active_project.project_name);
+", active_project.customer.green(), active_project.project_name.green(), active_project.stage.green(), active_project.files_folder.display().to_string().green(), active_project.notes_folder.display().to_string().green(), active_project.boxname.green(), "coming soon".red());
+            println!("{}", config_path.display());
+            let prompt = format!("\n{}:{}\nCommand?", active_project.customer.custom_color((255,165,0)), active_project.project_name.custom_color((255,165,0)));
             let command = get_user_input(&prompt);
             match command.as_str(){
                 "exit" => loopize = false,
@@ -322,6 +365,7 @@ for help enter help or ?. for information about a specific command enter help (c
                 "clear" | "clear screen" | "cls" => {clear().unwrap(); print_banner(banner);},
                 "list threads" | "threads" | "lst" => println!("There are {} threads still running.", threads.len()),
                 "info" => println!("{}", current_information),
+                "test_table" =>  {let mut lines = Vec::new(); lines.push("column1||column2||column3||column4".to_owned()); lines.push("thing1||thing2||thing3||thing4".to_owned()); lines.push("ttttttttttttttttthing5||thing6||thing7||thing8".to_owned()); tableize(lines);}
                 _ =>  {let thread_option = run_command(command, &mut projects, config_path.clone(), base_files, base_notes, tools_dir, boxtemplate.clone(), terminal.clone(), cracking_rig.clone(), rockyou.clone(), rule.clone(), upcoming_files, upcoming_notes, password_spray_file, fingerprint, vault_name.clone()); if thread_option.is_some(){threads.push(thread_option.unwrap())}},
             }
         }
@@ -330,6 +374,45 @@ for help enter help or ?. for information about a specific command enter help (c
             box_controls::stop_all_boxes(&projects);
         }
     }
+    print_informational("saving workspace projects...");
+    let mut workspace_config_path = config_path.clone();
+    workspace_config_path.pop();
+    let mut project_conf_path = config_path.clone();
+    let mut success_message = String::new();
+    project_conf_path.pop();
+    project_conf_path.push("projects.work");
+    let worksapces_in_use = project_conf_path.exists();
+    if worksapces_in_use{
+        if get_user_input("are your work projects currently loaded? (not yoru personal projects...)").to_lowercase().contains("y"){
+            workspace_config_path.push("projects.work");
+            success_message = String::from("projects.conf saved to projects.work");
+        }
+        else{
+            workspace_config_path.push("projects.personal");
+            success_message = String::from("projects.conf saved to projects.personal");
+        }
+        let open_res = OpenOptions::new().create(true).write(true).open(workspace_config_path);
+        if open_res.is_err(){
+            print_error("error opeing workspace config file!", open_res.err().unwrap().to_string());
+        }
+        else{
+            project_conf_path.pop();
+            project_conf_path.push("projects.conf");
+            let mut workspace_config_file = open_res.unwrap();
+            let projects_read_res = read_to_string(project_conf_path);
+            if projects_read_res.is_ok(){
+                let project_string = projects_read_res.unwrap();
+                let write_res = write!(workspace_config_file, "{}", project_string);
+                if write_res.is_err(){
+                    print_error("error writing workspace config file!", write_res.err().unwrap().to_string());
+                }
+            }
+            else{
+                print_error("error reading projects config file!", projects_read_res.err().unwrap().to_string());
+            }
+        }
+        print_success(success_message);
+    }
     if threads.len() > 0{
         println!("closing threads...");
         println!("note this will hang until all threads have completed");
@@ -338,4 +421,10 @@ for help enter help or ?. for information about a specific command enter help (c
             let _ = thread.join();
         }
     }
+    if worksapces_in_use{
+        print_success("projects saved to projects.conf, workspace project updated, threads finished. pentest_tool OUT!");
+    }
+    else{
+        print_success("projects saved to projects.conf, threads finished. pentest_tool OUT!");
+    }
 }

pentest_tool/src/configuration.rs

@@ -1,10 +1,12 @@
-use std::{fmt::write, path::PathBuf};
+use std::path::PathBuf;
 use std::fs::read_to_string;
 use std::io::Write;
-use crate::{get_user_input, open_overwrite, Project};
+use colored::Colorize;
+use crate::{get_user_input, open_overwrite};
 
 
 
+#[allow(unused)]
 pub fn generate_tool_config(config_dir: &PathBuf){
     let mut config_file_path = config_dir.clone();
     println!("{}", config_file_path.display());
@@ -137,8 +139,8 @@ vault_name:{}
         let write_res= write!(config_file, "{}", new_config);
         if write_res.is_err(){
             let error = write_res.err().unwrap();
-            println!("error writing config file!");
-            println!("{}", error);
+            println!("{}","error writing config file!".red());
+            println!("{}", error.to_string().red());
             println!("nothing was saved...");
             return;
         }

pentest_tool/src/enumeration.rs

@@ -4,17 +4,21 @@ use std::thread::JoinHandle;
 use std::thread::{spawn, sleep};
 use std::io::Write;
 use std::time::Duration;
+use colored::Colorize;
 use dns_lookup::lookup_host;
 use crate::get_user_input;
-use crate::info_controls::get_scope_entries;
 use crate::Project;
 use crate::open_append;
+use crate::print_error;
+use crate::print_success;
+use crate::print_informational;
 
+#[allow(unused)]
 pub fn run_dns_enumeration(project: &Project, given_domains: Option<&Vec<String>>, standalone: bool) -> Option<JoinHandle<()>>{
     let notes_folder = project.notes_folder.clone();
     let mut enumeration = notes_folder.clone();
     enumeration.push("enumeration.md");
-    let mut enumeration_file_res = open_append(&enumeration);
+    let enumeration_file_res = open_append(&enumeration);
     if enumeration_file_res.is_none(){
         println!("error opening enumeration_file!");
         println!("try creating it manually.");
@@ -52,18 +56,20 @@ pub fn run_dns_enumeration(project: &Project, given_domains: Option<&Vec<String>
                                                    .output();
             if output_res.is_err(){
                 let error = output_res.err().unwrap();
-                println!("From DNS Enumeration Thread: error running dnsrecon in the project's distrobox!");
-                println!("{}", error);
+                println!("{}", "From DNS Enumeration Thread: error running dnsrecon in the project's distrobox!".red());
+                println!("{}", error.to_string().red());
                 return;
             }
-            //sleep(Duration::from_secs(10));
+            println!("sleping for 10 seconds to allow for sudo password input.");
+            sleep(Duration::from_secs(10));
             let output_string_res = read_to_string("dns_temp.csv");
             if output_string_res.is_err(){
                 let error = output_string_res.err().unwrap();
                 println!("From DNS Enumeration Thread: error reading output data!");
-                println!("{}", error);
+                println!("{}", error.to_string().red());
                 return;
             }
+            print_success("DNS Enumeration Done, Writing to file...");
             let output_string = output_string_res.unwrap();
             let lines: Vec<&str> = output_string.split("\n").collect();
             let mut out_data = String::new();
@@ -108,8 +114,8 @@ pub fn run_dns_enumeration(project: &Project, given_domains: Option<&Vec<String>
             if standalone{
                 out_data.push_str("\n---\n");
             }
-            println!("From DNS Enumeration Thread: Finished gathering data for {} writing to notes...", domain);
             write!(enumeration_file, "{}", &out_data).unwrap();
+           print_success("DNS Records: Gathered | Notes: Written | DNS Record Thread OUT!"); 
             let remove_res = remove_file("dns_temp.csv");
             if remove_res.is_err(){
                 println!("From DNS Enumeration Thread: error removing temporay data file!");
@@ -120,14 +126,14 @@ pub fn run_dns_enumeration(project: &Project, given_domains: Option<&Vec<String>
     return Some(dns_handle);
 }
 
+#[allow(unused)]
 pub fn bruteforce_subs(project: &Project, given_domains: Option<&Vec<String>>, given_wordlist: Option<String>, standalone: bool) -> Option<JoinHandle<()>>{
     let mut enumeration_path = project.notes_folder.clone();
     enumeration_path.push("enumeration.md");
     let enumeration_file_res = OpenOptions::new().append(true).create(true).open(enumeration_path);
     if enumeration_file_res.is_err(){
         let error = enumeration_file_res.err().unwrap();
-        println!("error opening enumeration notes file!");
-        println!("{}", error);
+        print_error("FROM GOBUSTER THREAD: error opening enumeration notes file!", error.to_string());
         return None;
     }
     let mut enumeration_file = enumeration_file_res.unwrap();
@@ -180,15 +186,45 @@ pub fn bruteforce_subs(project: &Project, given_domains: Option<&Vec<String>>, g
                                                             .output();
             if gobuster_cmd_res.is_err(){
                 let error = gobuster_cmd_res.err().unwrap();
-                println!("From gobuster thread: Error running gobuster command!");
-                println!("{}", error);
+                println!("{}","From gobuster thread: Error running gobuster command!".red());
+                println!("{}", error.to_string().red());
                 return;
             }
+            print_informational("sleeping for 10 seconds to allow for sudo password input.");
+            sleep(Duration::from_secs(10));
             let gobuser_output = gobuster_cmd_res.unwrap().stdout;
-            println!("From Gobuster Thread: Sudomain enumeration Done!");
             let gobuster_string = String::from_utf8_lossy(&gobuser_output);
+            let mut final_string = String::new();
+            if gobuster_string.contains("specify the '--wildcard' switch"){
+                let gobuster_cmd_res = Command::new("distrobox")
+                                                            .arg("enter")
+                                                            .arg("--root")
+                                                            .arg(working_project.boxname.to_owned())
+                                                            .arg("--")
+                                                            .arg("gobuster")
+                                                            .arg("dns")
+                                                            .arg("-d")
+                                                            .arg(&domain)
+                                                            .arg("-w")
+                                                            .arg(wordlist.to_owned())
+                                                            .arg("--wildcard")
+                                                            .output();
+                if gobuster_cmd_res.is_err(){
+                    let error = gobuster_cmd_res.err().unwrap();
+                    println!("{}","From gobuster thread: Error running gobuster command!".red());
+                    println!("{}", error.to_string().red());
+                    return;
+                }
+                let new_gobuser_output = gobuster_cmd_res.unwrap().stdout;
+                let new_gobuser_string = String::from_utf8_lossy(&new_gobuser_output);
+                final_string = new_gobuser_string.to_string();
+            }
+            else{
+                final_string = gobuster_string.to_string();
+            }
+            print_success("Gobuster enumeration Done!");
             let mut domain_names = Vec::new();
-            let lines: Vec<&str> = gobuster_string.split("\n").collect();
+            let lines: Vec<&str> = final_string.split("\n").collect();
             for line in lines{
                 if line.contains("Found:"){
                     let domain = line.split_whitespace().collect::<Vec<&str>>()[1];
@@ -214,11 +250,12 @@ pub fn bruteforce_subs(project: &Project, given_domains: Option<&Vec<String>>, g
         let write_res = write!(enumeration_file, "{}", out_data);
         if write_res.is_err(){
             let error = write_res.err().unwrap();
-            println!("FROM Gobuster Thread: error writing notes!");
-            println!("{}", error);
+            println!("{}","FROM Gobuster Thread: error writing notes!".red());
+            println!("{}", error.to_string().red());
             return;
         }
         write_res.unwrap();
+        print_success("Subdomains: Bruteforced | Enumeration notes: Written | Gobuster thread out!");
     });
     return Some(gobuster_thread);
 }
@@ -229,8 +266,8 @@ pub fn dns_squatting(project: &Project, given_domains: Option<&Vec<String>>, sta
     let open_enumeration_notes_res = OpenOptions::new().append(true).create(true).open(enumeration_notes);
     if open_enumeration_notes_res.is_err(){
         let error = open_enumeration_notes_res.err().unwrap();
-        println!("Error opening enumeration notes");
-        println!("{}", error);
+        println!("{}","Error opening enumeration notes".red());
+        println!("{}", error.to_string().red());
         return None;
     }
     let mut enumeration_file = open_enumeration_notes_res.unwrap();
@@ -254,8 +291,8 @@ pub fn dns_squatting(project: &Project, given_domains: Option<&Vec<String>>, sta
         let write_res = write!(enumeration_file, "### Domain Squatting\n");
         if write_res.is_err(){
             let error = write_res.err().unwrap();
-            println!("error writing to enumeration notes file!");
-            println!("{}", error);
+            println!("{}","error writing to enumeration notes file!".red());
+            println!("{}", error.to_string().red());
             return;
         }
         write_res.unwrap();
@@ -276,10 +313,12 @@ pub fn dns_squatting(project: &Project, given_domains: Option<&Vec<String>>, sta
                                                     .output();
             if twist_output.is_err(){
                 let error = twist_output.err().unwrap();
-                println!("From DNSTwist thread: Error running dnstwist command!");
-                println!("{}", error);
+                println!("{}","From DNSTwist thread: Error running dnstwist command!".red());
+                println!("{}", error.to_string().red());
                 return;
             }
+            print_informational("sleeping for 10 seconds to get sudo password.");
+            sleep(Duration::from_secs(10));
             let twist_output_vec = twist_output.unwrap().stdout;
             let output_string = String::from_utf8_lossy(&twist_output_vec);
             let output_lines = output_string.split("\n");
@@ -294,6 +333,7 @@ pub fn dns_squatting(project: &Project, given_domains: Option<&Vec<String>>, sta
             }
         }
     });
+    print_success("Domains: Squatted | Notes: Written | DNSTwist thread OUT!");
     return Some(squatting_thread);
 }
 
@@ -303,8 +343,8 @@ pub fn do_all_dns_enumeration(project: &Project) -> Option<JoinHandle<()>>{
     let enumeration_file_res = OpenOptions::new().append(true).create(true).open(enumeration_path);
     if enumeration_file_res.is_err(){
         let error = enumeration_file_res.err().unwrap();
-        println!("error opening enumeration notes file!");
-        println!("{}", error);
+        println!("{}","error opening enumeration notes file!".red());
+        println!("{}", error.to_string().red());
         return None;
     }
     let mut enumeration_file = enumeration_file_res.unwrap();
@@ -319,14 +359,15 @@ pub fn do_all_dns_enumeration(project: &Project) -> Option<JoinHandle<()>>{
         }
     }
     let wordlist = get_user_input("path to wordlist for sub domain bruteforcing?");
+    print_informational("target data gathered. Spawning threads to do enumeration...");
     let working_project = project.clone();
     let all_dns_handle = spawn(move ||{
         let mut write_success = true;
         let write_res = write!(enumeration_file, "# DNS Enumeration\n");
         if write_res.is_err(){
             let error = write_res.err().unwrap();
-            println!("From All DNS thread: Error writing notes file!");
-            println!("{}", error);
+            println!("{}","From All DNS thread: Error writing notes file!".red());
+            println!("{}", error.to_string().red());
             write_success = false;
         }
         if write_success{
@@ -350,6 +391,7 @@ pub fn do_all_dns_enumeration(project: &Project) -> Option<JoinHandle<()>>{
                 }
                 write!(enumeration_file, "\n---\n").unwrap();
             }
+            print_success("All DNS Enum threads finished, notes have been written. DNS Enumeration Thread OUT!");
         }
     });
     return Some(all_dns_handle);

pentest_tool/src/info_controls.rs

@@ -1,28 +1,22 @@
 use std::collections::HashMap;
 use std::fs;
-use std::fs::create_dir_all;
 use std::fs::read_to_string;
 use std::fs::OpenOptions;
-use std::hash::Hash;
 use std::io::BufReader;
 use std::io::Write;
 use std::path::PathBuf;
-use std::process;
-use std::process::Command;
 use std::thread;
 use std::time::Duration;
 use std::io::stdin;
-use std::thread::JoinHandle;
+use colored::Colorize;
 use walkdir::WalkDir;
 use clearscreen::clear;
 use clearscreen;
 use rodio::{Decoder, OutputStream, Sink};
 use crate::get_user_input;
-use crate::open_overwrite;
-use crate::open_append;
-use crate::project_controls::get_projects;
 use crate::Project;
 
+#[allow(unused)]
 pub fn run_initial_enum(project: &Project){
     #[derive(Clone)]
     struct Target {
@@ -40,8 +34,8 @@ pub fn run_initial_enum(project: &Project){
     let csv_read_res = fs::read_to_string(&csv_path);
     if csv_read_res.is_err(){
         let error = csv_read_res.err().unwrap();
-        println!("error reading csv!");
-        println!("{}", error);
+        println!("{}","error reading csv!".red());
+        println!("{}", error.to_string().red());
         return;
     }
     let csv_data = csv_read_res.unwrap();
@@ -77,16 +71,16 @@ pub fn run_initial_enum(project: &Project){
         let host_notes_open_res = fs::OpenOptions::new().append(true).create(true).open(&host_notes_path);
         if host_notes_open_res.is_err(){
             let error = host_notes_open_res.err().unwrap();
-            println!("error opening host notes file!");
-            println!("{}", error);
+            println!("{}","error opening host notes file!".red());
+            println!("{}", error.to_string().red());
             return;
         }
         let host_notes = host_notes_open_res.unwrap();
         let attack_notes_open_res = fs::OpenOptions::new().append(true).create(true).open(&attack_notes_path);
         if attack_notes_open_res.is_err(){
             let error = attack_notes_open_res.err().unwrap();
-            println!("error opening attack notes!");
-            println!("{}", error);
+            println!("{}","error opening attack notes!".red());
+            println!("{}", error.to_string().red());
             return;
         }
         for target in targets.clone(){
@@ -101,7 +95,7 @@ pub fn run_initial_enum(project: &Project){
     }
 }
 
-pub fn build_external_attack_notes(project: &Project){
+/*pub fn build_external_attack_notes(project: &Project){
     #[derive(Clone)]
     struct Port{
         service: String,
@@ -117,7 +111,7 @@ pub fn build_external_attack_notes(project: &Project){
     if host_notes_read_res.is_err(){
         let error = host_notes_read_res.err().unwrap();
         println!("error reading host notes");
-        println!("{}", error);
+        println!("{}", error.to_string().red());
         return;
     }
     let host_notes_string = host_notes_read_res.unwrap();
@@ -173,7 +167,7 @@ pub fn build_external_attack_notes(project: &Project){
             write!(attack_file, "\n---\n").expect("since we used the open options already this should never fail.");
         }
     }
-}
+}*/
 
 pub fn generate_userpass(project: &Project){
     let mut outlines = Vec::new();
@@ -200,7 +194,7 @@ pub fn generate_userpass(project: &Project){
     }
 }
 
-pub fn open_in_dolphin(folder: &str, project: Project){
+/*pub fn open_in_dolphin(folder: &str, project: Project){
     let mut to_open = PathBuf::new();
     match folder{
         "notes" => to_open.push(project.notes_folder),
@@ -210,7 +204,7 @@ pub fn open_in_dolphin(folder: &str, project: Project){
     process::Command::new("dolphin")
                          .arg(to_open)
                          .spawn().expect("error opening dolphin");
-}
+}*/
 
 pub fn print_report_information(project: &Project){
     let scope = get_scope_entries(project);
@@ -228,8 +222,8 @@ pub fn print_report_information(project: &Project){
         let enumeration_read_res = fs::read_to_string(notes_path);
         if enumeration_read_res.is_err(){
             let error = enumeration_read_res.err().unwrap();
-            println!("error reading enumeration notes!");
-            println!("{}", error);
+            println!("{}","error reading enumeration notes!".red());
+            println!("{}", error.to_string().red());
         }
         else{
             let enumeration_text = enumeration_read_res.unwrap();
@@ -364,6 +358,7 @@ fn nefarious_config(tools_dir: &PathBuf) -> String{
     }
 }
 
+#[allow(unused)]
 fn msolspray_config(tools_dir: &PathBuf) -> String{
     let mut msolspray_path = String::new();
     let mut outline = String::new();
@@ -451,6 +446,7 @@ fn msolspray_config(tools_dir: &PathBuf) -> String{
     return outline;
 }
 
+#[allow(unused)]
 pub fn password_spray_help(project: &Project, season: String, lseason: String, year: i32, tools_dir: &PathBuf, config_path: &PathBuf){
     let mut wait_time:u64 = 0;
     let mut wait_time_response = String::new();
@@ -595,7 +591,7 @@ pub fn password_spray_help(project: &Project, season: String, lseason: String, y
     }
 }
 
-pub fn crack_hashes(cracking_rig: &String, project: &Project, terminal: &String, rockyou: &String, rule: &String){
+/*pub fn crack_hashes(cracking_rig: &String, project: &Project, terminal: &String, rockyou: &String, rule: &String){
     let mut hash_file = String::new();
     println!("trying to automatically find hashes.txt file...");
     let find_result = find_file(&project.files_folder, "hashes.txt");
@@ -757,7 +753,7 @@ pub fn get_mssql_column_names(project: &Project) -> Option<JoinHandle<()>>{
                 if netexec_cmd_res.is_err(){
                     let error = netexec_cmd_res.err().unwrap();
                     println!("error running netexec command!");
-                    println!("{}", error);
+                    println!("{}", error.to_string().red());
                 }
                 else{
                     let output_string = String::from_utf8(netexec_cmd_res.unwrap().stdout).unwrap();
@@ -775,7 +771,7 @@ pub fn get_mssql_column_names(project: &Project) -> Option<JoinHandle<()>>{
         }
     });
     return Some(db_handle);
-}
+}*/
 
 pub fn partse_gathercontacts(project: &Project){
     fn format_names(names: Vec<&str>) -> HashMap<&str, Vec<String>>{
@@ -832,8 +828,8 @@ last
     let gather_source = fs::read_to_string(gather_file);
     if gather_source.is_err(){
         let error = gather_source.err().unwrap();
-        println!("error reading gather contacts output!");
-        println!("{}", error);
+        println!("{}","error reading gather contacts output!".red());
+        println!("{}", error.to_string().red());
         return;
     }
     let gather_source_string = gather_source.unwrap();
@@ -859,15 +855,15 @@ last
     let email_text_res = OpenOptions::new().append(true).create(true).open(email_text_path);
     if email_text_res.is_err(){
         let error = email_text_res.err().unwrap();
-        println!("error opening email text file!");
-        println!("{}", error);
+        println!("{}","error opening email text file!".red());
+        println!("{}", error.to_string().red());
         return;
     }
     let email_notes_res = OpenOptions::new().append(true).create(true).open(email_note_path);
     if email_notes_res.is_err(){
         let error = email_notes_res.err().unwrap();
-        println!("error opeing email notes file!");
-        println!("{}", error);
+        println!("{}","error opeing email notes file!".red());
+        println!("{}", error.to_string().red());
         return;
     }
     let mut email_text_file = email_text_res.unwrap();
@@ -876,8 +872,8 @@ last
     let note_wriet_res = write!(email_note_file, "# Email Enumeration\n");
     if note_wriet_res.is_err(){
         let error = note_wriet_res.err().unwrap();
-        println!("error writing to email notes file!");
-        println!("{}", error);
+        println!("{}","error writing to email notes file!".red());
+        println!("{}", error.to_string().red());
         write_success = false;
     }
     if write_success{
@@ -896,9 +892,9 @@ last
     }
 }
 
-pub fn get_all_host_addresses(project: &Project){
+/*pub fn get_all_host_addresses(project: &Project){
     println!("to do");
-}
+}*/
 
 pub fn get_scope_entries(project: &Project) -> Option<Vec<String>>{
     let mut general_path = project.notes_folder.clone();
@@ -906,8 +902,8 @@ pub fn get_scope_entries(project: &Project) -> Option<Vec<String>>{
     let genera_read_res = read_to_string(general_path);
     if genera_read_res.is_err(){
         let error = genera_read_res.err().unwrap();
-        println!("ooof error reading your general notes file!");
-        println!("{}", error);
+        println!("{}","ooof error reading your general notes file!".red());
+        println!("{}", error.to_string().red());
         return None;
     }
     let general_string = genera_read_res.unwrap();

pentest_tool/src/install.rs

@@ -1,20 +1,20 @@
 use std::collections::HashMap;
-use std::fs::{File, create_dir_all, remove_dir_all};
-use std::io::{read_to_string, Read};
+use std::fs::{create_dir_all, remove_dir_all, File};
+use std::io::Read;
 use std::io::Write;
-use std::io::stdin;
+use std::env;
 use std::io::copy;
 use std::process::Command;
 use std::time::Duration;
 use reqwest::blocking::get;
 use std::{path::Path, path::PathBuf};
-use std::{process, thread};
+use std::thread;
 use std::process::exit;
-use directories::UserDirs;
-
-use crate::get_user_input;
+use colored::Colorize;
 
+use crate::{get_user_input, print_informational, print_success};
 
+#[allow(unused)]
 pub fn install(config_path: &PathBuf){
     let mut _terminal_commands = HashMap::from([
         ("kde", "konsole -e !!!"),
@@ -53,8 +53,8 @@ pub fn install(config_path: &PathBuf){
             let create_res = create_dir_all(folder);
             if create_res.is_err(){
                 let error = create_res.err().unwrap();
-                    println!("error creating folder {}", folder.display());
-                    println!("{}", error);
+                    println!("{}{}","error creating folder ".red(), folder.display().to_string().red());
+                    println!("{}", error.to_string().red());
                     println!("you'll need to create this manually after the install is done!");
                     folder_creation = false;
                 }
@@ -65,12 +65,12 @@ pub fn install(config_path: &PathBuf){
     let distrobox_run_res = Command::new("distrobox").arg("list").arg("--root").output();
     if distrobox_run_res.is_err(){
         let error = distrobox_run_res.err().unwrap();
-        println!("Distrobox file was not found!");
-        println!("This usually means that distrobox is not installed.");
-        println!("please install distrobox, if you're on kali run `sudo apt install distrobox`");
-        println!("{}", error);
-        println!("this project heavily relies on distrobox, as its primarily a distrobox mangement tool.");
-        println!("cleaning up up configuration folders, please install distrobox and re-run this program.");
+        println!("{}","Distrobox file was not found!".red());
+        println!("{}","This usually means that distrobox is not installed.".red());
+        println!("{}","please install distrobox, if you're on kali run `sudo apt install distrobox`".red());
+        println!("{}", error.to_string().red());
+        println!("{}","this project heavily relies on distrobox, as its primarily a distrobox mangement tool.".red());
+        println!("{}","cleaning up up configuration folders, please install distrobox and re-run this program.".red());
         let cleanup = remove_dir_all(&del_on_fail);
         if cleanup.is_err(){
             println!("error cleaning up configuration folder!");
@@ -120,9 +120,9 @@ pub fn install(config_path: &PathBuf){
                                                             .status();
         if template_box_create_res.is_err(){
             let error = template_box_create_res.err().unwrap();
-            println!("error creating template box!");
-            println!("{}", error);
-            println!("\n\n\nplese create it yourself with the following command.");
+            println!("{}","error creating template box!".red());
+            println!("{}", error.to_string().red());
+            println!("{}","\n\n\nplese create it yourself with the following command.".red());
             println!("\n\ndistrobox create --root --image {}, --name {}, --init --volume {}", &box_image, &template_box_name, &tool_volume);
         }
         else{
@@ -214,15 +214,15 @@ vault_name:{}"
     let project_conf_res = File::create_new(&projects_conf_path);
     if project_conf_res.is_err(){
         let error = project_conf_res.err().unwrap();
-        println!("ooof error creating the projects configuration file.");
-        println!("try creating it manually!");
+        println!("{}","ooof error creating the projects configuration file.".red());
+        println!("{}","try creating it manually!".red());
         println!("copy the following configuration and save it to {}", &projects_conf_path.display());
         println!("customer:name:notes:files:active:time:box_name:stage");
         println!("default:default:{}:{}:yes:{}:current", &current_notes.display(), &current_projects.display(), &template_box_name);
         exit(1);
     }
     let mut project_conf_file = project_conf_res.unwrap();
-    let project_write_res = write!(project_conf_file, "customer:name:notes:files:active:time:box_name:stage\ndefault:default:{}:{}:yes:{}:current", &current_notes.display(), &current_projects.display(), &template_box_name);
+    let project_write_res = write!(project_conf_file, "Projects Config File");
     if project_write_res.is_err(){
         println!("error writing project config file.");
         exit(1);
@@ -271,6 +271,35 @@ vault_name:{}"
         exit(1);
     }
     password_write_res.unwrap();
-    println!("install completed successfully!");
-    println!("re-run this to launch!");
+    let current_path_res = env::current_exe();
+    let mut copied_to_path = false;
+    if current_path_res.is_ok(){
+        let current_path = current_path_res.unwrap();
+        let mut new_path = PathBuf::from("/usr/bin/pentest_tool");
+        print_informational("We ar going to try and copy this executable to a location on your $PATH");
+        print_informational("the default location is /usr/bin/pentest_tool");
+        if get_user_input("is this ok?").contains("n"){
+            new_path.clear();
+            new_path.push(get_user_input("ooof, ok. Please enter where you'd like to save it on your $PATH"));
+            if !new_path.display().to_string().contains("pentest_tool"){
+                new_path.push("pentest_tool");
+            }
+        }
+        let copy_cmd_res = Command::new("sudo").arg("cp").arg(current_path.display().to_string()).arg(new_path.display().to_string()).status();
+        if copy_cmd_res.is_ok(){
+            let copy_cmd_status = copy_cmd_res.unwrap();
+            if copy_cmd_status.success(){
+                copied_to_path = true;
+            }
+        }
+    }
+    if !copied_to_path{
+        print_informational("we could not copy this executable to your path!");
+        print_informational("please copy this file to somewhere on your $PATH.");
+        print_informational("for example `cp pentest_tool /usr/bin/pentest_tool");
+        print_success("otherwise this tool is ready to go, you would just need to launch it from this folder.");
+    }
+    else{
+        print_success("install completed successfully!");
+    }
 }

pentest_tool/src/main.rs

@@ -1,8 +1,9 @@
+use std::collections::HashMap;
 use std::{io::stdin, path::PathBuf, process::Command};
 use directories::UserDirs;
-use reqwest::Response;
 use std::process::exit;
 use std::fs::{self, File};
+use colored::Colorize;
 
 #[derive(Clone)]
 pub struct Project{
@@ -29,12 +30,106 @@ mod enumeration;
 mod tool_controls;
 mod configuration;
 
+pub fn print_error(message: &str ,error: String){
+    println!("{}", message.red());
+    println!("{}", error.red());
+}
+
+pub fn print_success<T>(message: T) where T: AsRef<str> {
+    println!("{}", message.as_ref().green());
+}
+
+pub fn print_informational<T>(message: T) where T: AsRef<str>{
+    println!("{}", message.as_ref().custom_color((255,165,0)));
+}
+
+pub fn tableize(given_lines: Vec<String>) {
+    let column_count = given_lines[0].split("||").collect::<Vec<&str>>().len();
+    // the following code just adds a junk line in at index 1 because that gets eaten for some reason...
+    // I want to try to figure out why its getten eaten, but just needed to get it working for now.
+    let mut lines = Vec::new();
+    let mut junk_line = format!("{}", "junk||".repeat(column_count));
+    junk_line.pop();
+    junk_line.pop();
+    for line in given_lines{
+        lines.push(line);
+    }
+    lines.insert(1,junk_line);
+    // end of junk line logic.
+    let (terminal_width, _terminal_height) = term_size::dimensions().unwrap();
+    let mut column_sizes:HashMap<usize, usize> = HashMap::new();
+    for column_number in 0..column_count{
+        column_sizes.insert(column_number, 0);
+    }
+    let mut longest_column = 0;
+    for line in &lines{
+        let cells: Vec<&str> = line.split("||").collect();
+        let mut current_cell: usize = 0;
+        for cell in cells{
+            let cell_length = cell.len() + 2;
+            if column_sizes[&current_cell] < cell_length{
+                column_sizes.insert(current_cell, cell_length);
+            }
+            if cell_length > longest_column{
+                longest_column = current_cell;
+            }
+            current_cell += 1;
+        }
+    
+    let longest_line = (column_count*2) - 1;
+    if longest_line > terminal_width{
+        let difference = longest_line - terminal_width - 3;
+        column_sizes.insert(longest_column, column_sizes[&longest_column] - difference);
+    }
+    }
+    let mut header = String::new();
+    let mut outdata = String::new();
+    let mut count = 0;
+    let mut separater = String::new();
+    let ending = format!("{}\n", "|".green());
+    for line in lines{
+        count += 1;
+        //println!("{}", line);
+        let mut add_ending = false;
+        let data_vec: Vec<&str> = line.split("||").collect();
+        let mut column_numbers: Vec<&usize> = column_sizes.keys().collect();
+        column_numbers.sort_by(|a, b| a.cmp(b));
+        for column in column_numbers{
+            /*if data_vec[*column].len() > column_sizes[&longest_column]{
+                let split_data_vec = data_vec[*column].split_at(column_sizes[&longest_column]);
+            }*/
+            let padding = column_sizes[column] - data_vec[*column].len();
+            if count == 1{
+                let formatted_cell = format!("{} {}{}", "|".green(), data_vec[*column].bold().green(), " ".repeat(padding)); 
+                header.push_str(&formatted_cell);
+            }
+            else if count == 2 {
+                let formatted_cell = format!("{} {} ", "|".green(), "-".repeat(column_sizes[column] - 1).green());
+                separater.push_str(&formatted_cell);
+            }
+            else {
+
+                let formatted_cell = format!("{} {}{}", "|".green(), data_vec[*column], " ".repeat(padding));
+                outdata.push_str(&formatted_cell);
+                add_ending = true;
+            }
+        }
+        if add_ending{
+            outdata.push_str(&ending)
+        }
+    }
+    outdata.push_str(&separater);
+    outdata.push_str(&ending);
+    let print_output = format!("{}{}{}{}{}", header, ending, separater, ending, outdata);
+    println!("{}", print_output);
+}
+
 pub fn open_overwrite(path: &PathBuf) -> Option<File>{
-    let file_create_res = fs::OpenOptions::new().create(true).write(true).open(path);
+    let file_create_res = fs::OpenOptions::new().create(true).write(true).truncate(true).open(path);
     if file_create_res.is_err(){
         let error = file_create_res.err().unwrap();
-        println!("error opening {} file!", path.display());
-        println!("{}", error);
+        println!("{} {} {}","error opening".red(), path.display().to_string().red(), " file".red());
+        println!("{}", error.to_string().red());
         return None;
     }
     else {
@@ -47,8 +142,8 @@ pub fn open_append(path: &PathBuf) -> Option<File>{
     let file_create_res = fs::OpenOptions::new().create(true).append(true).open(path);
     if file_create_res.is_err(){
         let error = file_create_res.err().unwrap();
-        println!("error opening {} file!", path.display());
-        println!("{}", error);
+        println!("{} {} {}","error opening".red(), path.display().to_string().red(), " file".red());
+        println!("{}", error.to_string().red());
         return None;
     }
     else {
@@ -75,7 +170,7 @@ pub fn get_user_input(prompt: &str) -> String{
 
 
 fn main() {
-    print!("
+    print!("{}","
     ⠀⠀⠀⣠⠶⠚⠛⠛⠛⠲⢦⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
     ⠀⠀⠀⣴⠟⠁⠀⠀⠀⠀⠀⠀⠀⠻⡄⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
     ⠀⣠⣾⣷⣄⠀⠀⠀⢀⣠⣤⣤⡀⠀⢿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
@@ -94,7 +189,7 @@ fn main() {
     ⠀⠀⠀⠀⣀⡀⠀⣰⠇⣾⠀⠀⠈⣩⣥⣄⣿⠀⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
     ⠀⠀⠀⠀⢿⡉⠳⡟⣸⠃⠀⠀⠀⠘⢷⣌⠉⠀⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
     ⠀⠀⠀⠀⠀⠙⢦⣴⠏⠀⠀⠀⠀⠀⠀⠉⠳⠶⠏⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
-    ");
+    ".red());
     let mut config_path = PathBuf::new();
     let user_dirs_res = UserDirs::new();
     if user_dirs_res.is_none(){
@@ -162,9 +257,15 @@ fn main() {
     cracking_rig: {}\n
     upcoming project folders: {}
     upcoming project notes: {}
-", &project_base_folder.display(), &project_base_notes.display(), &tools_folder.display(), box_template, terminal_command, cracking_rig, &upcoming_files.display(), &upcoming_notes.display());
-    println!("loading project configs...");
-    let projects = project_controls::get_projects(&config_path, true);
-    let _continue = get_user_input("press enter to load command line interface.");
+", &project_base_folder.display().to_string().green(), &project_base_notes.display().to_string().green(), &tools_folder.display().to_string().green(), box_template.to_string().green(), terminal_command.green(), cracking_rig.green(), &upcoming_files.display().to_string().green(), &upcoming_notes.display().to_string().green());
+    println!("{}","loading project configs...".green());
+    let projects_res = project_controls::get_projects(&config_path, true);
+    if projects_res.is_none(){
+        println!("{}", "ERROR NO PROJECTS LOADED!!!".red());
+        println!("{}", "CHECK YOUR PROJECTS.CONF FILE".red());
+        return;
+    }
+    let projects = projects_res.unwrap();
+    let _continue = get_user_input("press enter to load Command Line Interface");
     cli::cli(true, projects, config_path, &project_base_folder, &project_base_notes, &tools_folder, box_template, terminal_command, cracking_rig, rockyou, rule, &upcoming_files, &upcoming_notes, &pass_spray_file, fingerprint, vault_name);
 }

pentest_tool/src/menu.rs

@@ -2,6 +2,7 @@ use std::path::PathBuf;
 use std::thread::JoinHandle;
 use clearscreen::clear;
 use clearscreen;
+use colored::Colorize;
 use crate::get_user_input;
 use crate::Project;
 use crate::cli;
@@ -66,6 +67,9 @@ pub fn main_menu(projects: &mut Vec<Project>,
         clear().expect("error clearing screen");
         print!("
 {}
+{}
+
+\n", banner.custom_color((255,165,0)), "
 ___  ___      _        ___  ___                   
 |  \\/  |     (_)       |  \\/  |                 _ 
 | .  . | __ _ _ _ __   | .  . | ___ _ __  _   _(_)
@@ -102,7 +106,7 @@ ___  ___      _        ___  ___
             28.) enter external only menu
             29.) enter internal only menu
             30.) exit menu
-\n", banner);
+".custom_color((255,165,0)));
         match get_user_input("selection?").as_str(){
             "1" => {let thread_option = cli::run_command("show active project".to_owned(), projects, config_path.clone(), base_files, base_notes, tools_dir, boxtemplate.clone(), terminal.to_owned(), cracking_rig.to_owned(), rockyou.to_owned(), rule.to_owned(), upcoming_files, upcoming_notes, password_spray_file, fingerprint, vault_name.to_owned()); if thread_option.is_some(){threads.push(thread_option.unwrap());}},
             "2" => {let thread_option = cli::run_command("list projects".to_owned(), projects, config_path.clone(), base_files, base_notes, tools_dir, boxtemplate.clone(), terminal.to_owned(), cracking_rig.to_owned(), rockyou.to_owned(), rule.to_owned(), upcoming_files, upcoming_notes, password_spray_file, fingerprint, vault_name.to_owned()); if thread_option.is_some(){threads.push(thread_option.unwrap());}},
@@ -134,7 +138,7 @@ ___  ___      _        ___  ___
             "28" => {let threads_option = external_menu(banner, projects, config_path.clone(), base_files, base_notes, tools_dir, boxtemplate.clone(), terminal.clone(), cracking_rig.clone(), rockyou.clone(), rule.clone(), upcoming_files, upcoming_notes, password_spray_file, fingerprint, vault_name.clone()); if threads_option.is_some(){for thread in threads_option.unwrap(){threads.push(thread)}}},
             "29" => {let threads_option = internal_menu(banner, projects, config_path.clone(), base_files, base_notes, tools_dir, boxtemplate.clone(), terminal.clone(), cracking_rig.clone(), rockyou.clone(), rule.clone(), upcoming_files, upcoming_notes, password_spray_file, fingerprint, vault_name.clone()); if threads_option.is_some(){for thread in threads_option.unwrap(){threads.push(thread)}}},
             "30" => loopize = false,
-            _ => println!("unknown selection, try again!"),
+            _ => println!("{}","unknown selection, try again!".red()),
         }
     }
     if threads.len() > 0{
@@ -166,7 +170,9 @@ ___  ___      _        ___  ___
                 let _enter_to_clear = get_user_input("press enter to display external project menu.");
                 clear().expect("error clearing screen");
                 print!("
-        {}
+{}
+{}
+        \n", banner.custom_color((255,165,0)), "
  _____     _                        _  ___  ___                   
 |  ___|   | |                      | | |  \\/  |                 _ 
 | |____  _| |_ ___ _ __ _ __   __ _| | | .  . | ___ _ __  _   _(_)
@@ -196,7 +202,7 @@ ___  ___      _        ___  ___
         21.) Brute force Subdomains
         22.) Do all DNS Enumeration
         23.) exit menu
-        \n", banner);
+        ".custom_color((255,165,0)));
                 match get_user_input("selection?").as_str(){
                     "1" => {let thread_option = cli::run_command("show active project".to_owned(), projects, config_path.clone(), base_files, base_notes, tools_dir, boxtemplate.clone(), terminal.to_owned(), cracking_rig.to_owned(), rockyou.to_owned(), rule.to_owned(), upcoming_files, upcoming_notes, password_spray_file, fingerprint, vault_name.to_owned()); if thread_option.is_some(){threads.push(thread_option.unwrap());}},
                     "2" => {let thread_option = cli::run_command("list projects".to_owned(), projects, config_path.clone(), base_files, base_notes, tools_dir, boxtemplate.clone(), terminal.to_owned(), cracking_rig.to_owned(), rockyou.to_owned(), rule.to_owned(), upcoming_files, upcoming_notes, password_spray_file, fingerprint, vault_name.to_owned()); if thread_option.is_some(){threads.push(thread_option.unwrap());}},
@@ -221,7 +227,7 @@ ___  ___      _        ___  ___
                     "21" => {let thread_option = cli::run_command("brute force subdomains".to_owned(), projects, config_path.clone(), base_files, base_notes, tools_dir, boxtemplate.clone(), terminal.to_owned(), cracking_rig.to_owned(), rockyou.to_owned(), rule.to_owned(), upcoming_files, upcoming_notes, password_spray_file, fingerprint, vault_name.to_owned()); if thread_option.is_some(){threads.push(thread_option.unwrap());}},
                     "22" => {let thread_option = cli::run_command("dns enumeration".to_owned(), projects, config_path.clone(), base_files, base_notes, tools_dir, boxtemplate.clone(), terminal.to_owned(), cracking_rig.to_owned(), rockyou.to_owned(), rule.to_owned(), upcoming_files, upcoming_notes, password_spray_file, fingerprint, vault_name.to_owned()); if thread_option.is_some(){threads.push(thread_option.unwrap());}},
                     "23" => loopize = false,
-                    _ => println!("unknown selection, try again!"),
+                    _ => println!("{}", "unknown selection, try again!".red()),
                 }
             }
             if threads.len() > 0{
@@ -255,7 +261,9 @@ ___  ___      _        ___  ___
                     let _enter_to_clear = get_user_input("press enter to display internal project menu.");
                     clear().expect("error clearing screen");
                     print!("
-            {}
+{}
+{}
+            \n", banner.custom_color((255,165,0)), "
  _____      _                        _  ___  ___                   
 |_   _|    | |                      | | |  \\/  |                 _ 
   | | _ __ | |_ ___ _ __ _ __   __ _| | | .  . | ___ _ __  _   _(_)
@@ -284,7 +292,7 @@ ___  ___      _        ___  ___
         20.) open bloodhound in the current project's distrobox
         21.) prune unused distroboxes (free up system storage)
         22.) exit menu
-            \n", banner);
+            ".custom_color((255,165,0)));
                     match get_user_input("selection?").as_str(){
                         "1" => {let thread_option = cli::run_command("show active project".to_owned(), projects, config_path.clone(), base_files, base_notes, tools_dir, boxtemplate.clone(), terminal.to_owned(), cracking_rig.to_owned(), rockyou.to_owned(), rule.to_owned(), upcoming_files, upcoming_notes, password_spray_file, fingerprint, vault_name.to_owned()); if thread_option.is_some(){threads.push(thread_option.unwrap());}},
                         "2" => {let thread_option = cli::run_command("list projects".to_owned(), projects, config_path.clone(), base_files, base_notes, tools_dir, boxtemplate.clone(), terminal.to_owned(), cracking_rig.to_owned(), rockyou.to_owned(), rule.to_owned(), upcoming_files, upcoming_notes, password_spray_file, fingerprint, vault_name.to_owned()); if thread_option.is_some(){threads.push(thread_option.unwrap());}},
@@ -308,7 +316,7 @@ ___  ___      _        ___  ___
                         "20" => {let thread_option = cli::run_command("bloodhound".to_owned(), projects, config_path.clone(), base_files, base_notes, tools_dir, boxtemplate.clone(), terminal.to_owned(), cracking_rig.to_owned(), rockyou.to_owned(), rule.to_owned(), upcoming_files, upcoming_notes, password_spray_file, fingerprint, vault_name.to_owned()); if thread_option.is_some(){threads.push(thread_option.unwrap());}},
                         "21" => {let thread_option = cli::run_command("prune distroboxes".to_owned(), projects, config_path.clone(), base_files, base_notes, tools_dir, boxtemplate.clone(), terminal.to_owned(), cracking_rig.to_owned(), rockyou.to_owned(), rule.to_owned(), upcoming_files, upcoming_notes, password_spray_file, fingerprint, vault_name.to_owned()); if thread_option.is_some(){threads.push(thread_option.unwrap());}},
                         "22" => loopize = false,
-                        _ => println!("unknown selection, try again!"),
+                        _ => println!("{}", "unknown selection, try again!".red()),
                     }
                 }
                 if threads.len() > 0{

pentest_tool/src/portscan_controls.rs

@@ -1,12 +1,14 @@
-use std::fs::{self, OpenOptions};
+use std::collections::HashMap;
+use std::fs;
 use std::fs::{read_to_string, create_dir_all};
 use std::io::Write;
 use std::path::PathBuf;
  use std::process::Command;
-use chrono::format::format;
-use reqwest::blocking::get;
+use std::thread::{sleep, spawn, JoinHandle};
+use std::time::Duration;
+use colored::Colorize;
 use walkdir::WalkDir;
-use crate::get_user_input;
+use crate::{get_user_input, print_error, print_informational, print_success};
 use crate::Project;
 use crate::open_overwrite;
 use crate::open_append;
@@ -54,8 +56,8 @@ pub fn parse_normal_nmap_output(project: &Project){
     let file_read_res = fs::read_to_string(file_to_parse);
     if file_read_res.is_err(){
         let error = file_read_res.err().unwrap();
-        println!("ooof error reading the file!");
-        println!("{}", error);
+        println!("{}","ooof error reading the file!".red());
+        println!("{}", error.to_string().red());
         return;
     }
     let nmap_string = file_read_res.unwrap();
@@ -96,8 +98,8 @@ pub fn parse_normal_nmap_output(project: &Project){
     let save_open_res = fs::OpenOptions::new().create(true).append(true).open(&save_path);
     if save_open_res.is_err(){
         let error = save_open_res.err().unwrap();
-        println!("oof error opening the save file!");
-        println!("{}", error);
+        println!("{}","oof error opening the save file!".red());
+        println!("{}", error.to_string().red());
         if get_user_input("do you want to print the results to the console instead?").to_lowercase().contains("y"){
             for host in &host_ports{
                 println!("{}", host);
@@ -111,8 +113,8 @@ pub fn parse_normal_nmap_output(project: &Project){
     let tsv_open_res = fs::OpenOptions::new().create(true).append(true).open(save_path);
     if tsv_open_res.is_err(){
         let error = tsv_open_res.err().unwrap();
-        println!("error opening tsv file!");
-        println!("{}", error);
+        println!("{}","error opening tsv file!".red());
+        println!("{}", error.to_string().red());
         if get_user_input("do you want to print the results to the console instead?").to_lowercase().contains("y"){
             for host in &host_ports{
                 println!("{}", host);
@@ -194,7 +196,7 @@ pub fn build_cmd_for_host_discovery(project: &Project){
     let general_note_string = read_to_string(general_note_path);
     let mut _note_string = String::new();
    match general_note_string{
-        Err(error) => {println!("error reading file to string!! {}", error); return;},
+        Err(error) => {println!("{} {}", "error reading file to string!!".green(), error.to_string().green()); return;},
         _=> _note_string = general_note_string.unwrap()
     }
     let lines: Vec<&str> = _note_string.split("\n").collect();
@@ -233,7 +235,7 @@ pub fn build_cmd_for_host_discovery(project: &Project){
         final_command.push_str(">> ping_only_replies.txt &");
     }
     final_command.pop();
-    println!("{}", final_command);
+    print_success(final_command);
 }
 
 pub fn parse_csportscan(project: &Project){
@@ -259,8 +261,8 @@ pub fn parse_csportscan(project: &Project){
     let tsv_read_res = read_to_string(tsv_path);
     if tsv_read_res.is_err(){
         let error = tsv_read_res.err().unwrap();
-        println!("ooof error reading tsv file!");
-        println!("{}", error);
+        println!("{}","ooof error reading tsv file!".red());
+        println!("{}", error.to_string().red());
         return;
     }
     println!("tsv read, parsing lines...");
@@ -316,7 +318,7 @@ pub fn parse_csportscan(project: &Project){
         outfile.clear();
         outfile.push(get_user_input("ok, please enter the full path to the folder you want to save them to."));
     }
-    print!("
+    let host_number_results = format!("
 {} Windows hosts found!
 {} SSH hosts found!
 {} FTP hosts found!
@@ -326,7 +328,8 @@ pub fn parse_csportscan(project: &Project){
 {} RDP hosts found!
 {} untagged hosts found!
 ", windows_hosts.len(), ssh_hosts.len(), ftp_hosts.len(), telnet_hosts.len(), snmp_hosts.len(), dns_hosts.len(), rdp_hosts.len(), unknown_ports.len());
-    println!("lines parsed! creating output files...");
+    print_success(host_number_results);
+    print_informational("data gathered, writing to notes...");
     outfile.push("windows_hosts.txt");
     let file_option = open_overwrite(&outfile);
     if file_option.is_some(){
@@ -335,11 +338,12 @@ pub fn parse_csportscan(project: &Project){
             let write_res = write!(windows_file, "{}\n", host);
             if write_res.is_err(){
                 let error = write_res.err().unwrap();
-                println!("oooof error writing windows_hosts.txt!!");
-                println!("{}", error);
+                println!("{}","oooof error writing windows_hosts.txt!!".red());
+                println!("{}", error.to_string().red());
             }
             else{
                 write_res.unwrap();
+                print_success("windows hosts file written!");
             }
         }
     }
@@ -352,11 +356,12 @@ pub fn parse_csportscan(project: &Project){
             let write_res = write!(ssh_file, "{}\n", host);
             if write_res.is_err(){
                 let error = write_res.err().unwrap();
-                println!("oooof error writing ssh_hosts.txt!!");
-                println!("{}", error);
+                println!("{}","oooof error writing ssh_hosts.txt!!".red());
+                println!("{}", error.to_string().red());
             }
             else{
                 write_res.unwrap();
+                print_success("ssh hosts file written!");
             }
         }
     }
@@ -369,11 +374,12 @@ pub fn parse_csportscan(project: &Project){
             let write_res = write!(telnet_file, "{}\n", host);
             if write_res.is_err(){
                 let error = write_res.err().unwrap();
-                println!("oooof error writing _hosts.txt!!");
-                println!("{}", error);
+                println!("{}","oooof error writing _hosts.txt!!".red());
+                println!("{}", error.to_string().red());
             }
             else{
                 write_res.unwrap();
+                print_success("telnet hosts file written!");
             }
         }
     }
@@ -386,11 +392,12 @@ pub fn parse_csportscan(project: &Project){
             let write_res = write!(ftp_file, "{}\n", host);
             if write_res.is_err(){
                 let error = write_res.err().unwrap();
-                println!("oooof error writing _hosts.txt!!");
-                println!("{}", error);
+                println!("{}","oooof error writing _hosts.txt!!".red());
+                println!("{}", error.to_string().red());
             }
             else{
                 write_res.unwrap();
+                print_success("fpt hosts file written!");
             }
         }
     }
@@ -403,11 +410,12 @@ pub fn parse_csportscan(project: &Project){
             let write_res = write!(snmp_file, "{}\n", host);
             if write_res.is_err(){
                 let error = write_res.err().unwrap();
-                println!("oooof error writing _hosts.txt!!");
-                println!("{}", error);
+                println!("{}","oooof error writing _hosts.txt!!".red());
+                println!("{}", error.to_string().red());
             }
             else{
                 write_res.unwrap();
+                print_success("snmp hosts file written!")
             }
         }
     }
@@ -420,11 +428,12 @@ pub fn parse_csportscan(project: &Project){
             let write_res = write!(dns_file, "{}\n", host);
             if write_res.is_err(){
                 let error = write_res.err().unwrap();
-                println!("oooof error writing _hosts.txt!!");
-                println!("{}", error);
+                println!("{}","oooof error writing _hosts.txt!!".red());
+                println!("{}", error.to_string().red());
             }
             else{
                 write_res.unwrap();
+                print_success("dns hosts file written!")
             }
         }
     }
@@ -437,11 +446,12 @@ pub fn parse_csportscan(project: &Project){
             let write_res = write!(rdp_file, "{}\n", host);
             if write_res.is_err(){
                 let error = write_res.err().unwrap();
-                println!("oooof error writing _hosts.txt!!");
-                println!("{}", error);
+                println!("{}","oooof error writing _hosts.txt!!".red());
+                println!("{}", error.to_string().red());
             }
             else{
                 write_res.unwrap();
+                print_success("rdp hosts file written!");
             }
         }
     }
@@ -454,26 +464,28 @@ pub fn parse_csportscan(project: &Project){
             let write_res = write!(web_file, "{}\n", host);
             if write_res.is_err(){
                 let error = write_res.err().unwrap();
-                println!("oooof error writing _hosts.txt!!");
-                println!("{}", error);
+                println!("{}","oooof error writing _hosts.txt!!".red());
+                println!("{}", error.to_string().red());
             }
             else{
                 write_res.unwrap();
+                print_success("web hosts file written!");
             }
         }
     }
-    println!("interesting ports have been written to... writing untagged port files...");
+    print_informational("tagged port files have been written to, saving untagged ports...");
     outfile.pop();
     outfile.push("untagged ports");
     if !outfile.exists(){
         let untagged_res = create_dir_all(&outfile);
         if untagged_res.is_err(){
             let error = untagged_res.err().unwrap();
-            println!("ooof error creating untagged folder!");
-            println!("{}", error);
+            println!("{}","ooof error creating untagged folder!".red());
+            println!("{}", error.to_string().red());
         }
         else{
             untagged_res.unwrap();
+            print_success("untagged port file written!");
         }
     }
     for line in unknown_ports{
@@ -488,18 +500,18 @@ pub fn parse_csportscan(project: &Project){
             let write_res = write!(write_file, "{}\n", host);
             if write_res.is_err(){
                 let error = write_res.err().unwrap();
-                println!("ooof error writing to file...");
-                println!("{}", error);
+                println!("{}","ooof error writing to file...".red());
+                println!("{}", error.to_string().red());
             }
         }
         outfile.pop();
     }
-    println!("DONE all files saved to {}", outfile.display());
+    print_success(format!("DONE all files saved to {}", outfile.display()));
     println!("note if no hosts were found for a protocol their files will be empty.");
 }
 
-pub fn run_nmap_portscan(project: &Project){
-    let files_folder = project.files_folder.clone();
+#[allow(unused)]
+pub fn run_nmap_portscan(project: &Project) -> Option<JoinHandle<()>>{
     let notes_folder = project.notes_folder.clone();
     let mut ports_to_scan = vec![String::from("80"), String::from("443"),
                                  String::from("161"),
@@ -516,16 +528,15 @@ pub fn run_nmap_portscan(project: &Project){
                                  String::from("1433"),
                                  String::from("3306"),
                                  String::from("2222"),];
-    let mut save_path = files_folder.clone();
     let mut general_notes = notes_folder.clone();
     general_notes.push("general.md");
     println!("building targets from scope in general notes...");
     let targets_res = info_controls::get_scope_entries(project);
     if targets_res.is_none(){
-        return;
+        return None;
     }
     let mut targets = targets_res.unwrap();
-    println!("Got targets from scope!");
+    print_success("Got targets from scope!");
     for target in &targets{
         println!("{}", target);
     }
@@ -558,7 +569,7 @@ pub fn run_nmap_portscan(project: &Project){
         }
         if get_user_input("continue?").to_lowercase().contains("n"){
             println!("ok exiting this function, feel free to try again...");
-            return;
+            return None;
         }
         targets = modified_targets;
     }
@@ -577,83 +588,170 @@ pub fn run_nmap_portscan(project: &Project){
             }
         }
     }
-    let proxy = get_user_input("will you be using proxychains for this scan?").to_lowercase();
-    println!("sweet we have what we need!");
+    let proxy = get_user_input("will you be using proxychains for this scan?").to_lowercase().contains("y");
+    print_success("sweet we have what we need!");
+    print_informational("Targets:");
+    for target in &targets{
+        print_success(format!("{}", target));
+    }
     println!("building portscan command...");
-    let port_string = ports_to_scan.join(",");
-    let hosts_string = targets.join(" ");
-    let mut scan_results = String::new();
-    if proxy.contains("y"){
-        println!("running command, this may take a bit of time...");
-        let command_res = Command::new("distrobox")
+    let working_project = project.clone();
+    let mut save_path = project.files_folder.clone();
+    save_path.push("working");
+    if !save_path.exists(){
+        save_path.clear();
+        save_path = project.files_folder.clone();
+    }
+    save_path.push("services.tsv");
+    let mut enumeration_notes_path = project.notes_folder.clone();
+    enumeration_notes_path.push("enumeration.md");
+    let mut nmap_output = Vec::new();
+    let nmap_thread = spawn(move || {
+        if proxy{
+        let port_scancmd_res = Command::new("distrobox")
                                                 .arg("enter")
                                                 .arg("--root")
-                                                .arg(project.boxname.to_owned())
+                                                .arg(working_project.boxname)
                                                 .arg("--")
                                                 .arg("proxychains")
-                                                .arg("namp")
+                                                .arg("nmap")
                                                 .arg("-sT")
                                                 .arg("-p")
-                                                .arg(port_string)
-                                                .arg(hosts_string)
+                                                .arg(ports_to_scan.join(","))
+                                                .arg(targets.join(" "))
                                                 .output();
-        if command_res.is_err(){
-            let error = command_res.err().unwrap();
-            println!("error running portscan command!");
-            println!("{}", error);
+            if port_scancmd_res.is_err(){
+                let error = port_scancmd_res.err().unwrap();
+                println!("{}","FROM NMAP THREAD: error running portscan!".red());
+                println!("{}", error.to_string().red());
                 return;
             }
-        let output = command_res.unwrap().stdout;
-        scan_results = String::from_utf8_lossy(&output).into_owned();
+            nmap_output = port_scancmd_res.unwrap().stdout;
         }
         else{
-      let command_res = Command::new("distrobox")
+            let port_scancmd_res = Command::new("distrobox")
                                                 .arg("enter")
                                                 .arg("--root")
-                                                .arg(project.boxname.to_owned())
+                                                .arg(working_project.boxname)
                                                 .arg("--")
-                                                .arg("proxychains")
-                                                .arg("namp")
+                                                .arg("nmap")
                                                 .arg("-sT")
                                                 .arg("-p")
-                                                .arg(port_string)
-                                                .arg(hosts_string)
+                                                .arg(ports_to_scan.join(","))
+                                                .arg(targets.join(" "))
                                                 .output();
-        if command_res.is_err(){
-            let error = command_res.err().unwrap();
-            println!("error running portscan command!");
-            println!("{}", error);
+            if port_scancmd_res.is_err(){
+                let error = port_scancmd_res.err().unwrap();
+                println!("{}","FROM NMAP THREAD: error running portscan!".red());
+                println!("{}", error.to_string().red());
                 return;
             }
-        let output = command_res.unwrap().stdout;
-        scan_results = String::from_utf8_lossy(&output).into_owned();  
+            nmap_output = port_scancmd_res.unwrap().stdout;
         } 
-    save_path.push("working/nmap_output.txt");
-    println!("going to save to {}", save_path.display());
-    if get_user_input("is that ok?").to_lowercase().contains("n"){
-        save_path.clear();
-        save_path.push(get_user_input("where do you want to save it then? (full path)"));
+        println!("FROM NMAP THREAD: nmap scan finished, parsing the results...");
+        let nmap_output_string = String::from_utf8_lossy(&nmap_output);
+        let mut nmap_log_path = save_path.clone(); 
+        nmap_log_path.pop();
+        nmap_log_path.push("nmap.log");
+        let nmap_log_file = open_append(&nmap_log_path);
+        if nmap_log_file.is_some(){
+            let mut nmap_log_file = nmap_log_file.unwrap();
+            write!(nmap_log_file, "{}", nmap_output_string).unwrap();
+            print_success("nmap log file written!");
         }
-    let save_file_res = OpenOptions::new().create(true).append(true).open(save_path);
-    if save_file_res.is_err(){
-        let error = save_file_res.err().unwrap();
-        println!("error opening save file!");
-        println!("{}", error);
-        if get_user_input("output results to console?").to_lowercase().contains("y"){
-            println!("{}", &scan_results);
+        let mut host_ports = Vec::new();
+        let host_sections: Vec<&str> = nmap_output_string.split("Nmap scan report ").collect();
+        for section in host_sections{
+            let mut host = String::new();
+            let mut ports = Vec::new();
+            let lines: Vec<&str> = section.split("\n").collect();
+            let mut port_section = false;
+            for line in lines{
+                if line.contains("for "){
+                    if !line.contains("(not scanned)"){
+                        host = line.split(" ").collect::<Vec<&str>>()[1..].join(" ").to_owned();
                     }
+                }
+                else if line.contains("Host is up"){
+                    port_section = true;
+                }
+                else if port_section{
+                    if line.contains("open"){
+                        let words: Vec<&str> = line.split_whitespace().collect();
+                        if words.len() >= 3{
+                            let port = words [0];
+                            let service = words [2];
+                            let port_entry = format!("{}:{}", port, service);
+                            ports.push(port_entry);
+                        }
+                    }
+                }
+            }
+            for port in ports{
+                let entry_words: Vec<&str> = port.split(":").collect();
+                let port = entry_words[0];
+                let service = entry_words[1];
+                let host_entry = format!("{}\t{}\t{}", host, port, service);
+                host_ports.push(host_entry);
+            }
+        }
+        let services_file_open_res = open_overwrite(&save_path);
+        if services_file_open_res.is_none(){
+            println!("FROM NMAP THREAD: error opening the services.tsv file to write!");
+            println!("FROM NMAP THREAD: exiting");
             return;
         }
-    let mut save_file = save_file_res.unwrap();
-    let write_res = write!(save_file, "{}", scan_results);
-    if write_res.is_err(){
-        let error = write_res.err().unwrap();
-        println!("error writing results to file!");
-        println!("{}", error);
-        if get_user_input("print results to console instead?").to_lowercase().contains("y"){
-            println!("{}", scan_results);
+        let mut services_file = services_file_open_res.unwrap();
+        let enumeration_open_res = open_append(&enumeration_notes_path);
+        if enumeration_open_res.is_none(){
+            print_error("error opening enumeration notes file!", "".to_owned());
+        }
+        let services_write_res = write!(services_file, "host\tport\tbanner\tnotes\n");
+        if services_write_res.is_err(){
+            let error = services_write_res.err().unwrap();
+            println!("{}","FROM NMAP THREAD: error writing to the services.tsv file!".red());
+            println!("{}", error.to_string().red());
+            return;
+        }
+        let mut enumeration_write = false;
+        if enumeration_open_res.is_some(){
+            enumeration_write = true;
+        }
+        let mut host_all_ports: HashMap<String, Vec<String>> = HashMap::new();
+        for host in &host_ports{
+            write!(services_file, "{}\n", host).unwrap();
+            let host_data: Vec<&str> = host.split("\t").collect();
+            let address = host_data[0].to_owned();
+            let port = host_data[1].to_owned();
+            let service = host_data[2].to_owned();
+            if host_all_ports.contains_key(&address){
+                host_all_ports.get_mut(&address).unwrap().push(format!("{}:{}", port, service));
+            }
+            else {
+                host_all_ports.insert(address, vec![format!("{}:{}", port, service)]);
             }
         }
+        if enumeration_write{
+            let mut enumeration_file = enumeration_open_res.unwrap();
+            let write_res = write!(enumeration_file, "\n# Port Scan\n");
+            if write_res.is_ok(){
+                write_res.unwrap();
+                for host in host_all_ports.keys(){
+                    write!(enumeration_file, "## {}\n| HOST | PORT | SERVICE |\n| ---- | ---- | ------- |\n", host).unwrap();
+                    for port_entry in &host_all_ports[host]{
+                        let parts: Vec<&str> = port_entry.split(":").collect();
+                        let port = parts[0];
+                        let services = parts[1];
+                        write!(enumeration_file, "| {} | {} | {} |\n", host, port, services).unwrap();
+                    }
+                }
+                write!(enumeration_file, "\n---\n").unwrap();
+            }
+        }
+        print_success(format!("FROM NMAP THREAD: Parsing done! You're scan results are saved in cobalt strike services.tsv format at {}", save_path.display()));
+    });
+    sleep(Duration::from_secs(10));
+    return Some(nmap_thread);
 }
 
 pub fn build_nmap_command(project: &Project){
@@ -737,9 +835,9 @@ pub fn build_nmap_command(project: &Project){
     let targets_string = targets.join(" ");
     println!("\nYour portscan command is:");
     if get_user_input("will you be using proxychains for this scan?").to_lowercase().contains("y"){
-        println!("\n\nproxychains nmap -sT -p {} {} -Pn | tee {}", ports_string, targets_string, save_path.display());
+        print_success(format!("\n\nproxychains nmap -sT -p {} {} -Pn | tee {}", ports_string, targets_string, save_path.display()));
     }
     else{
-        println!("nmap -p {} {} -Pn | tee {}", ports_string, targets_string, save_path.display());
+        print_success(format!("nmap -p {} {} -Pn | tee {}", ports_string, targets_string, save_path.display()));
     }
 }

pentest_tool/src/project_controls.rs

@@ -1,5 +1,6 @@
 use std::env;
 use std::fs;
+use std::fs::read_to_string;
 use std::io::stdin;
 use std::io::Write;
 use std::path::PathBuf;
@@ -8,9 +9,15 @@ use std::process::Command;
 use std::thread;
 use std::time::Duration;
 use std::str::FromStr;
+use colored::Colorize;
+
 use crate::get_user_input;
+use crate::open_overwrite;
+use crate::tableize;
 use crate::Project;
 use crate::box_controls::make_box;
+use crate::print_success;
+use crate::print_error;
 
 pub fn 
 switch_project(projects: &mut Vec<Project>){
@@ -27,19 +34,19 @@ switch_project(projects: &mut Vec<Project>){
         for project in projects{
             if project.id ==  new_id{
                 project.active = true;
-                println!("project found switching to {} {}", project.customer, project.project_name);
+                print_success(format!("project found switching to {} {}", project.customer, project.project_name));
                 env::set_var("CURRENT_PROJECT_BOX", project.boxname.clone());
             }
             else if project.id != new_id{
                 project.active = false;
             }
             else{
-                println!("error unknown project id");
+                print_error("error selecting new project", String::from("unknown project id selected."));
             }
         }
     }
     else{
-        println!("error we need user input here dummy!");
+        print_error("error selecting new project", String::from("we need input here dummy!"));
     }
     
 }
@@ -49,8 +56,14 @@ pub fn save_projects(projects: &Vec<Project>, config_path: &PathBuf){
    let mut active_set = false;
     save_file_path.pop();
     save_file_path.push("projects.conf");
-    let mut save_file = fs::File::create(save_file_path).expect("error creating save_file");
-    save_file.write_all(b"customer:name:notes:files:active:time:box_name:stage\n").expect("error writing first line to file");
+    let save_file_res = fs::File::create(save_file_path);
+    if save_file_res.is_err(){
+        let error = save_file_res.err().unwrap().to_string();
+        print_error("error creating save file.", error);
+        return;
+    }
+    let mut save_file = save_file_res.unwrap();
+    save_file.write_all(b"Current Loaded Projects Config File\n").expect("error writing first line to file");
     for project in projects{
         let default = format!{"{}:{}:{}:{}:", project.customer, project.project_name, project.notes_folder.display(), project.files_folder.display()};
         let mut _outline = String::new();
@@ -64,10 +77,17 @@ pub fn save_projects(projects: &Vec<Project>, config_path: &PathBuf){
         else{
             _outline = format!("{}no:{}:{}\n", default, project.boxname, project.stage);
         }
-        save_file.write_all(_outline.as_bytes()).expect("error writing outline");
+        let write_res = save_file.write_all(_outline.as_bytes());
+        if write_res.is_err(){
+            let error = write_res.err().unwrap().to_string();
+            print_error("error saving projects.conf file!", error);
+            return;
+        }
+        write_res.unwrap();
     }
 }
 
+#[allow(unused)]
 pub fn new_project(projects: &mut Vec<Project>, project_dir: &PathBuf, notes_dir: &PathBuf, tools_dir: &PathBuf, boxtemplate: &String, config_path: &PathBuf, new_id: i32, upcoming_files: &PathBuf, upcoming_notes: &PathBuf, fingerprint: bool){
     let mut new_project_dir = PathBuf::new();
     let mut new_note_dir = PathBuf::new();
@@ -290,7 +310,7 @@ pub fn remove_project(projects: &mut Vec<Project>, config_path: &PathBuf){
     }
 }
 
-pub fn get_projects(config_path: &PathBuf, show: bool) -> Vec<Project>{
+pub fn get_projects(config_path: &PathBuf, show: bool) -> Option<Vec<Project>>{
     let mut mut_config_path = config_path.clone();
     mut_config_path.pop();
     mut_config_path.push("projects.conf");
@@ -300,20 +320,29 @@ pub fn get_projects(config_path: &PathBuf, show: bool) -> Vec<Project>{
     let bkup_result = fs::copy(&mut_config_path, &bkup_config_path);
     if bkup_result.is_err(){
         let error = bkup_result.err().unwrap();
-        println!("error backing up the projects.conf file!");
-        println!("error: {}", error);
+        println!("{}","error backing up the projects.conf file!".red());
+        println!("{}", error.to_string().red());
     }
     let mut projects = Vec::new();
-    let projects_string = fs::read_to_string(mut_config_path).expect("error reading projects file");
+    let projects_string_res = fs::read_to_string(mut_config_path);
+    if projects_string_res.is_err(){
+        let error = projects_string_res.err().unwrap();
+        println!("{}", "Error Loading Project!".red());
+        println!("{}", error.to_string().red());
+        return None;
+    }
+    let projects_string = projects_string_res.unwrap();
     let project_lines:Vec<&str> = projects_string.split("\n").collect();
     let mut first = 0;
     let mut already_active = false;
     for line in project_lines{
+        //println!("{}", line);
         first = first + 1;
         if first != 1{
             if line.len() > 1{
                 let settings: Vec<&str> = line.split(":").collect();
-                //debug config file...
+                if settings.len() > 5{
+                    // debug config file...
                     /*let mut count = 0;
                     for settin in &settings{
                         println!("{}: {}", count, settin);
@@ -337,21 +366,25 @@ pub fn get_projects(config_path: &PathBuf, show: bool) -> Vec<Project>{
                     let project_stage = settings[6].to_owned();
                     let new_project = Project{customer: customer, project_name: project, files_folder: project_folder, notes_folder: notes_folder, active: active, id: first, boxname: boxname, stage: project_stage};
                     if show{
-                    println!("{} {} LOADED!", &new_project.customer, &new_project.project_name);
+                        println!("{} {} {}", &new_project.customer, &new_project.project_name, "LOADED!".green());
                     }
                     projects.push(new_project);
                 }
             }
         }
-    return projects
+    }
+    return Some(projects)
 }
 
 pub fn print_upcoming_projects(projects: &Vec<Project>){
+    let mut lines = vec![String::from("CUSTOMER||PROJECT")];
     for project in projects{
         if project.stage.contains("upcoming"){
-            println!("{}:{}", project.customer, project.project_name);
+            let new_line = format!("{}||{}", project.customer, project.project_name);
+            lines.push(new_line);
         }
     }
+    tableize(lines);
 }
 
 pub fn promote_project(projects: &mut Vec<Project>, config_path: &PathBuf, project_dir: &PathBuf, notes_dir: &PathBuf, tools_dir: &PathBuf, boxtemplate: &String, fingerprint: bool){
@@ -408,7 +441,7 @@ pub fn promote_project(projects: &mut Vec<Project>, config_path: &PathBuf, proje
                 println!("failed to copy the project folder, try to move it manually!");
             }
             if note_move_success.success(){
-                println!("we copied the notes folder correctly!!");
+                print_success("we copied the notes folder correctly!!");
                 let mut remove_folder = PathBuf::new();
                 remove_folder.push(&project.files_folder);
                 remove_folder.pop();
@@ -455,11 +488,144 @@ pub fn promote_project(projects: &mut Vec<Project>, config_path: &PathBuf, proje
     projects.clear();
     projects.append(&mut projects_to_save);
     save_projects(&projects_to_save, config_path);
+    print_success("project promoted successfully!");
 }
 
 pub fn list_projects(projects: &Vec<Project>){
-    println!("+++++++++++++++++++++"); 
+    let mut lines = vec!["customer||project||stage".to_owned()];
     for project in projects{
-        println!("++Customer: {}|Project name: {}|Stage: {}++",project.customer ,project.project_name, project.stage)}
-    println!("++++++++++++++++++++")
+        let new_line = format!("{}||{}||{}", project.customer, project.project_name, project.stage);
+        lines.push(new_line);
+    }
+    tableize(lines);
+}
+
+
+pub fn separate_personal_work_projects(config_path: &PathBuf){
+    let mut projects_conf_path = config_path.clone();
+    projects_conf_path.pop();
+    projects_conf_path.push("projects.conf");
+    let mut working_conf_path = config_path.clone();
+    working_conf_path.pop();
+    working_conf_path.push("projects.work");
+    let mut personal_conf_path = config_path.clone();
+    personal_conf_path.pop();
+    personal_conf_path.push("projects.personal");
+    println!("{}", projects_conf_path.display());
+    let project_read_res = read_to_string(&projects_conf_path);
+    if project_read_res.is_err(){
+        print_error("error reading current projects config file!", project_read_res.err().unwrap().to_string());
+        return;
+    }
+    let project_string = project_read_res.unwrap();
+    let project_lines: Vec<&str> = project_string.split("\n").collect();
+    let mut personal_projects = Vec::new();
+    let  mut work_projects = Vec::new();
+    let mut default = String::new();
+    for line in project_lines{
+        let words: Vec<&str> = line.split(":").collect();
+        if words.len() > 3{
+            if words[0].contains("default"){
+                default = line.to_owned();
+            }
+            else{
+                println!("{} {}", words[0], words[1]);
+                if get_user_input("should this project be added to your personal projects config files?").to_lowercase().contains("y"){
+                    personal_projects.push(line.to_owned());
+                    print_success(format!("{}:{} {}",words[0], words[1], "successfully added to personal config!"));
+                    if get_user_input("Do you also want to keep it in your work projects config?").to_lowercase().contains("y"){
+                        work_projects.push(line.to_owned());
+                    }
+                }
+                else{
+                    work_projects.push(line.to_owned());
+                }
+            }
+        }
+    }
+    let work_config_open_res = fs::OpenOptions::new().create(true).write(true).open(working_conf_path);
+    if work_config_open_res.is_err(){
+        print_error("error opening work projects config file!", work_config_open_res.err().unwrap().to_string());
+        return;
+    }
+    let person_config_open_res = fs::OpenOptions::new().create(true).write(true).open(personal_conf_path);
+    if person_config_open_res.is_err(){
+        print_error("error opening personal config file!", person_config_open_res.err().unwrap().to_string());
+        return;
+    }
+    let mut work_config_file = work_config_open_res.unwrap();
+    let mut personal_config_file = person_config_open_res.unwrap();
+    let work_write_success = write!(work_config_file, "Work Config File\n");
+    let personal_write_success = write!(personal_config_file, "Personal Config File\n");
+    if work_write_success.is_err(){
+        print_error("error writing to work config file!", work_write_success.err().unwrap().to_string());
+        return;
+    }
+    else{
+        work_write_success.unwrap();
+    }
+    if personal_write_success.is_err(){
+        print_error("error writing personal config file!", personal_write_success.err().unwrap().to_string());
+        return;
+    }
+    else{
+        personal_write_success.unwrap();
+    }
+    write!(personal_config_file, "{}\n", default).unwrap();
+    write!(work_config_file, "{}\n", default).unwrap();
+    for project in work_projects{
+        write!(work_config_file, "{}\n", project).unwrap();
+    }
+    for project in personal_projects{
+        write!(personal_config_file, "{}\n", project).unwrap();
+    }
+    print_success("projects separated successfully!");
+}
+
+pub fn swith_to_personal(config: &PathBuf) -> Option<Vec<Project>>{
+    let mut projects_path = config.clone();
+    projects_path.pop();
+    let mut personal_projects = config.clone();
+    personal_projects.pop();
+    projects_path.push("projects.conf");
+    personal_projects.push("projects.personal");
+    let personal_projects_read_res = read_to_string(&personal_projects);
+    if personal_projects_read_res.is_err(){
+        print_error("error reading personal projects!", personal_projects_read_res.err().unwrap().to_string());
+        return None;
+    }
+    let person_projects_string = personal_projects_read_res.unwrap();
+    let open_res = open_overwrite(&projects_path);
+    if open_res.is_none(){
+        print_error("error opening projects.conf file!", "".to_string());
+        return None;
+    }
+    let mut project_conf = open_res.unwrap();
+    write!(project_conf, "{}", person_projects_string).unwrap();
+    let new_projects = get_projects(config, true);
+    return new_projects;
+}
+
+pub fn swith_to_work(config: &PathBuf) -> Option<Vec<Project>>{
+    let mut projects_path = config.clone();
+    projects_path.pop();
+    let mut work_projects = config.clone();
+    work_projects.pop();
+    projects_path.push("projects.conf");
+    work_projects.push("projects.work");
+    let work_projects_read_res = read_to_string(work_projects);
+    if work_projects_read_res.is_err(){
+        print_error("error reading personal projects!", work_projects_read_res.err().unwrap().to_string());
+        return None;
+    }
+    let work_projects_string = work_projects_read_res.unwrap();
+    let open_res = open_overwrite(&projects_path);
+    if open_res.is_none(){
+        print_error("", "error opening projects.conf file!".to_string());
+        return None;
+    }
+    let mut project_conf = open_res.unwrap();
+    write!(project_conf, "{}", work_projects_string).unwrap();
+    let new_projects = get_projects(config, true);
+    return new_projects;
 }

pentest_tool/src/start_pentest.rs

@@ -2,6 +2,8 @@ use std::fs;
 use std::fs::File;
 use std::io::Write;
 use std::path::PathBuf;
+use colored::Colorize;
+
 use crate::Project;
 use crate::project_controls;
 use crate::get_user_input;
@@ -37,7 +39,8 @@ fn external(passtemp: &PathBuf, project: &Project){
     let file_creation_res = fs::create_dir_all(&notes_path);
     if file_creation_res.is_err(){
         let error = file_creation_res.err().unwrap();
-        println!("error creating notes folder! {}", error);
+        println!("{}","error creating notes folder!".red());
+        println!("{}", error.to_string().red())
     }
     else{
         file_creation_res.unwrap();
@@ -75,18 +78,7 @@ Planning call notes:
 * password attacks
     * password sprays 3-12 hours
     * lock out policy - 
-
-## Enumeration in progress
-
-### DNS Bruteforcing
-
-| domain name | IP | inscope? |
-| ----------- | -- | -------- |
-
-# Attack Surface Enumeration
-
-| IP | host notes | needs? |
-| -- | ---------- | ------ |\n").expect("faile to write pentest notes");
+|\n").expect("faile to write pentest notes");
 
     }
     notes_path.pop();
@@ -146,7 +138,8 @@ fn internal(passtemp: &PathBuf, project: &Project){
     let file_creation_res = fs::create_dir_all(&notes_path);
     if file_creation_res.is_err(){
         let error = file_creation_res.err().unwrap();
-        println!("error creating notes folder! {}", error);
+        println!("{}","error creating notes folder!".red());
+        println!("{}", error.to_string().red())
     }
     else{
         file_creation_res.unwrap();
@@ -156,7 +149,8 @@ fn internal(passtemp: &PathBuf, project: &Project){
     let pass_result = fs::copy(&passtemp, &notes_path);
     if pass_result.is_err(){
         let error = pass_result.err().unwrap();
-        println!("error copying password spray file, try again manually! {}", error);
+        println!("{}","error copying password spray file, try again manually!".red());
+        println!("{}", error.to_string().red())
     }
     else{
         pass_result.unwrap();
@@ -327,8 +321,8 @@ fn vishing(project: &Project){
     let mknote_folder_res = fs::create_dir_all(&notes_path);
     if mknote_folder_res.is_err(){
         let error = mknote_folder_res.err().unwrap();
-        println!("Error creating notes folder!");
-        println!("{}", error);
+        println!("{}","Error creating notes folder!".red());
+        println!("{}", error.to_string().red());
         return;
     }
     notes_path.push("general.md");

pentest_tool/src/tool_controls.rs

@@ -1,6 +1,8 @@
 use std::{env::set_current_dir, path::PathBuf};
 use std::process::Command;
+use colored::Colorize;
 use walkdir::WalkDir;
+use crate::print_success;
 
 
 pub fn update_git_tools(tools_dir: &PathBuf){
@@ -16,8 +18,8 @@ pub fn update_git_tools(tools_dir: &PathBuf){
         let cd_res = set_current_dir(&folder);
         if cd_res.is_err(){
             let error = cd_res.err().unwrap();
-            println!("error changing directory!");
-            println!("{}", error);
+            println!("{}","error changing directory!".red());
+            println!("{}", error.to_string().red());
         }
         else{
             let _cd = cd_res.unwrap();
@@ -27,13 +29,13 @@ pub fn update_git_tools(tools_dir: &PathBuf){
                                                         .status();
             if git_command_res.is_err(){
                 let error = git_command_res.err().unwrap();
-                println!("error running git pull command!");
-                println!("{}", error);
+                println!("{}","error running git pull command!".red());
+                println!("{}", error.to_string().red());
             }
             else{
                 let git_command = git_command_res.unwrap();
                 if git_command.success(){
-                    println!("successfully updated {}", folder.display());
+                    print_success(format!("successfully updated {}", folder.display()));
                 }
             }
         }

pentest_tool/src/victim_commands.rs

@@ -1,6 +1,8 @@
 use std::path::PathBuf;
+use colored::Colorize;
 use walkdir::WalkDir;
-use crate::{get_user_input, Project};
+use crate::get_user_input;
+use crate::print_success;
 
 pub fn sharp_persist_command(tools_dir: &PathBuf){
     let filename = "SharPersist.exe";
@@ -20,13 +22,13 @@ pub fn sharp_persist_command(tools_dir: &PathBuf){
             "1" => println!("execute-assembly {} -t schtask -c \"{}\" -n FRPersist -m add -o hourly", binary_path, beacon_path),
             "2" => println!("inlineExecute-Assembly --dotnetassembly {} --assemblyargs -t schtask -c \"{}\" -n FRPersist -m add -o hourly --etw --amsi", binary_path, beacon_path),
             "3" => println!("upload {}\n\nrun .\\SharPersist.exe -t schtask -c \"{}\" -n FRPersist -m add -o hourly", binary_path, beacon_path),
-            _ => println!("unknown selection")
+            _ => println!("{}","unknown selection".red())
         }
         return;
     }
     let file_to_run = get_user_input("path to the file you want to run for persistence?");
-    println!("ok then, upload the following file to the machine");
-    println!("{}", binary_path);
-    println!("C:\\path\\to\\your\\sharpersist.exe -t schtask -c \"{}\" -n FRPersist -m add -o hourly", file_to_run);
+    print_success("ok then, upload the following file to the machine");
+    print_success(format!("{}", binary_path));
+    print_success(format!("C:\\path\\to\\your\\sharpersist.exe -t schtask -c \"{}\" -n FRPersist -m add -o hourly", file_to_run));
     return;
 }