3 Commits
Author SHA1 Message Date
pyro 7bc5442416 added some install stuff, and started the code for launching odysseus in
the projects distrobox for ai stuff.
2026-09-30 09:41:22 -05:00
pyro 7247e85762 added a step to make sure state infomration is saved before exit, and
updated the parse_scope command to work better.
2026-09-23 11:14:28 -05:00
pyro 0bad1c7b66 added the ability to exclude hosts and net ranges to projects so that
excluded hosts are not touched by the tool.
2026-09-17 13:11:33 -05:00
4 changed files with 155 additions and 13 deletions

No files matched your search

+114 -11
View File
@@ -32,6 +32,7 @@ use std::sync::{Arc, Mutex, mpsc::Sender, mpsc::channel};
use std::thread; use std::thread;
use std::time::Duration; use std::time::Duration;
use std::time::{self, Instant}; use std::time::{self, Instant};
use trust_dns_resolver::proto::rr::rdata::svcb::SvcParamKey::Port;
use walkdir::WalkDir; use walkdir::WalkDir;
pub struct AppState { pub struct AppState {
@@ -281,6 +282,8 @@ impl AppState {
self.help.push( self.help.push(
"Shortcuts:\nCTRL+P = new_project\nCTRL+s = save\nCTRL_+h = select_host\n".to_string(), "Shortcuts:\nCTRL+P = new_project\nCTRL+s = save\nCTRL_+h = select_host\n".to_string(),
); );
self.help.push("exclude\nexcludes an IP or a cidr network from the scope and all future tool calls.\nexport 192.168.1.1 192.168.2.0/24\n".to_string());
self.help.push("start_odysseus\nstarts the odyssues server in the distrobox of the project.\nUSAGE:\nstart_odysseus port_number\n".to_string());
self.help.push("exit\nquit the tool\n".to_string()); self.help.push("exit\nquit the tool\n".to_string());
self.initialize_modules(); self.initialize_modules();
return Ok(()); return Ok(());
@@ -864,23 +867,52 @@ impl AppState {
} }
"parse_scope" => { "parse_scope" => {
let mut general_path = self.projects[self.selected_project].notes.clone(); let mut general_path = self.projects[self.selected_project].notes.clone();
let mut scope_path = self.projects[self.selected_project].notes.clone();
scope_path.push("scope.md");
general_path.push("general.md"); general_path.push("general.md");
let general_string = read_to_string(general_path)?; let general_string = read_to_string(general_path)?;
if let Some((_, scope_section)) = general_string.split_once("# Scope") { let mut scope_file = OpenOptions::new()
if let Some((scope_section, _)) = scope_section.split_once("#") { .create(true)
scope_section.lines().into_iter().for_each(|line| { .truncate(true)
if line.contains("|") { .write(true)
if !line.contains("Subnet") { .open(scope_path)?;
if !line.contains("--") { general_string
let host = .split_whitespace()
line.split("|").collect::<Vec<&str>>()[1].to_string(); .into_iter()
self.projects[self.selected_project].add_scope(host); .for_each(|word| {
if let Ok(_) = word.trim().parse::<IpNet>() {
if let Err(e) = write!(scope_file, "{}\n", word) {
let _ = self.main_tx.send(ToolMessage::Output((
rid,
format!("Error writing scope file! {e}"),
)));
} }
} else if let Ok(_) = word.trim().parse::<IpAddr>() {
if let Err(e) = write!(scope_file, "{}\n", word) {
let _ = self.main_tx.send(ToolMessage::Output((
rid,
format!("Error writing scope file! {e}"),
)));
}
} else if word.contains(".com")
|| word.contains(".org")
|| word.contains(".gov")
|| word.contains(".site")
|| word.contains(".local")
|| word.contains(".ad")
{
if let Err(e) = write!(scope_file, "{}\n", word) {
let _ = self.main_tx.send(ToolMessage::Output((
rid,
format!("Error writing scope file! {e}"),
)));
} }
} }
}); });
} let _ = self.main_tx.send(ToolMessage::Output((
} rid,
"[success] scope parsed and scope.md written!".to_string(),
)));
} }
"show_config" | "sc" => { "show_config" | "sc" => {
let _ = self let _ = self
@@ -1151,6 +1183,7 @@ impl AppState {
} }
2 => { 2 => {
args_vec[0].split(",").into_iter().for_each(|ip| { args_vec[0].split(",").into_iter().for_each(|ip| {
if !project.exclusions.contains(&ip.to_string()) {
if let Ok(ip) = ip.parse::<IpAddr>() { if let Ok(ip) = ip.parse::<IpAddr>() {
let mut new_host = Host::new(); let mut new_host = Host::new();
new_host.ip = ip.to_string(); new_host.ip = ip.to_string();
@@ -1162,6 +1195,7 @@ impl AppState {
hosts.push(new_host); hosts.push(new_host);
} }
} }
}
}); });
args_vec[1].split(",").into_iter().for_each(|p| { args_vec[1].split(",").into_iter().for_each(|p| {
if p.contains("-") { if p.contains("-") {
@@ -1660,6 +1694,74 @@ impl AppState {
} }
} }
"exclude" => {
if let Some(args) = command_args {
let project = self.projects[self.selected_project].clone();
if args.contains(" ") {
args.split(" ")
.into_iter()
.filter(|ex| !project.exclusions.contains(&ex.to_string()))
.for_each(|ex| {
if let Ok(_) = ex.parse::<IpAddr>() {
self.projects[self.selected_project]
.exclusions
.push(ex.to_string());
} else if let Ok(net) = ex.parse::<IpNet>() {
net.hosts().into_iter().for_each(|ip| {
self.projects[self.selected_project]
.exclusions
.push(ip.to_string());
});
}
});
}
}
}
"start_odysseus" => {
if let Some(args) = command_args {
let working_db = self.projects[self.selected_project].db.clone();
if let Some(db) = working_db {
if let Some(tools_dir) = self.config.get("TOOLS") {
let mut odysseus_path = None;
let entries = WalkDir::new(tools_dir);
entries.into_iter().for_each(|entry| {
if let Ok(entry) = entry {
if entry.file_name().to_string_lossy().contains("odysseus") {
if entry.path().is_dir() {
odysseus_path = Some(entry.into_path());
}
}
}
});
if let Some(path) = odysseus_path {
let tx_clone = self.main_tx.clone();
self.workers.spawn(move||{
let output = db.run_command(format!("cd {}; source venv/bin/activate; python -m uvicorn app:app --host 127.0.0.1 --port {}", path.display(), args.trim()).as_str());
let _ = tx_clone.send(ToolMessage::Output((rid, format!("{}", output))));
});
let _ = self.main_tx.send(ToolMessage::Output((
rid,
"[success] odysseus command ran!".to_string(),
)));
}
}
}
} else {
let _ = self.main_tx.send(ToolMessage::Output((
rid,
"[error] malformed command".to_string(),
)));
let _ = self
.main_tx
.send(ToolMessage::Output((rid, "[error] USAGE:".to_string())));
let _ = self.main_tx.send(ToolMessage::Output((
rid,
"[error] start_odysseus {port number}".to_string(),
)));
}
}
"exit" => { "exit" => {
self.save_all()?; self.save_all()?;
let _ = self.main_tx.send(ToolMessage::AppStateExit); let _ = self.main_tx.send(ToolMessage::AppStateExit);
@@ -1945,6 +2047,7 @@ impl AppState {
current: false, current: false,
db: db, db: db,
scope: Vec::new(), scope: Vec::new(),
exclusions: Vec::new(),
}; };
match new_project.save_config() { match new_project.save_config() {
Ok(_) => {} Ok(_) => {}
+3
View File
@@ -1086,6 +1086,9 @@ pub fn run_tui(
server_lock.action_que.push("disconnect".to_string()); server_lock.action_que.push("disconnect".to_string());
} }
}); });
println!("saving state information");
let _ = state.save_all();
println!("SAVED!");
for handle in handles { for handle in handles {
handle.join().unwrap(); handle.join().unwrap();
} }
+24
View File
@@ -129,6 +129,30 @@ pub fn client_install() -> Result<(), Box<dyn Error>> {
root_config_folder_path.join("victim"), root_config_folder_path.join("victim"),
&options, &options,
)?; )?;
if get_user_input(
"do you want to copy tetanus to your path so you can run it anywhere?",
)?
.contains("y")
{
println!("this will require sudo. Please complete the following sudo prompt.");
if let Ok(exe_path) = env::current_exe() {
if let Ok(res) = Command::new("sudo")
.arg("cp")
.arg(exe_path.display().to_string())
.arg("/usr/bin/tetanus")
.status()
{
if res.success() {
println!("copied to path!");
println!("install completed!");
} else {
eprintln!(
"error copying to path. please copy this executable to your path manually."
);
}
}
}
}
env::set_current_dir("../")?; env::set_current_dir("../")?;
remove_dir_all("./temp")?; remove_dir_all("./temp")?;
} }
+14 -2
View File
@@ -10,6 +10,7 @@ use std::net::IpAddr;
use std::path::PathBuf; use std::path::PathBuf;
use std::process::{Command, Stdio}; use std::process::{Command, Stdio};
use std::sync::mpsc::Sender; use std::sync::mpsc::Sender;
use walkdir::WalkDir;
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub struct Project { pub struct Project {
@@ -22,6 +23,7 @@ pub struct Project {
pub current: bool, pub current: bool,
pub db: Option<DistroBox>, pub db: Option<DistroBox>,
pub scope: Vec<String>, pub scope: Vec<String>,
pub exclusions: Vec<String>,
} }
impl Project { impl Project {
@@ -36,6 +38,7 @@ impl Project {
current: false, current: false,
db: None, db: None,
scope: Vec::new(), scope: Vec::new(),
exclusions: Vec::new(),
} }
} }
@@ -56,6 +59,7 @@ impl Project {
} }
pub fn add_host(&mut self, mut host: Host) { pub fn add_host(&mut self, mut host: Host) {
if !self.exclusions.contains(&host.ip) {
let mut new_id = 0; let mut new_id = 0;
self.hosts.iter().for_each(|h| { self.hosts.iter().for_each(|h| {
if h.id > new_id { if h.id > new_id {
@@ -68,6 +72,7 @@ impl Project {
self.hosts.push(host); self.hosts.push(host);
} }
} }
}
pub fn config_folder(&mut self, path: PathBuf) { pub fn config_folder(&mut self, path: PathBuf) {
self.config_folder = path; self.config_folder = path;
@@ -106,6 +111,12 @@ impl Project {
self.add_scope(ip.trim().to_string()); self.add_scope(ip.trim().to_string());
}); });
} }
"exclusions" => {
let ips: Vec<&str> = parts[1].split(",").collect();
ips.iter().for_each(|ip| {
self.exclusions.push(ip.to_string());
});
}
_ => {} _ => {}
} }
} }
@@ -225,12 +236,13 @@ impl Project {
} }
let mut file = File::create(&self.config_folder)?; let mut file = File::create(&self.config_folder)?;
let mut out_string = format!( let mut out_string = format!(
"org_name: {}\nname: {}\nnotes: {}\nfiles: {}\nscope: {}\n", "org_name: {}\nname: {}\nnotes: {}\nfiles: {}\nscope: {}\nexclusions: {}\n",
self.org_name, self.org_name,
self.name, self.name,
self.notes.display(), self.notes.display(),
self.files.display(), self.files.display(),
self.scope.join(","), self.scope.join(","),
self.exclusions.join(","),
); );
if self.current { if self.current {
out_string.push_str("stage: current"); out_string.push_str("stage: current");
@@ -306,7 +318,7 @@ impl DistroBox {
if !added_volumes.contains(&String::from(folder_name)) { if !added_volumes.contains(&String::from(folder_name)) {
create_command create_command
.arg("--volume") .arg("--volume")
.arg(format!("{}:/{}:rw", volume, folder_name)); .arg(format!("{}:/project:rw", volume));
added_volumes.push(folder_name.to_string()); added_volumes.push(folder_name.to_string());
} }
} }