Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 62 additions & 0 deletions src/address.rs
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,18 @@ pub fn parse_addresses(input: &Opts) -> Vec<IpAddr> {
}
}

// Finally, craft a list of addresses to be excluded from the scan.
let mut excluded_ips: Vec<IpAddr> = Vec::new();
if let Some(exclude_addresses) = &input.exclude_addresses {
for addr in exclude_addresses {
excluded_ips.extend(parse_address(addr, &backup_resolver));
}
}

ips.into_iter()
.collect::<BTreeSet<_>>()
.into_iter()
.filter(|ip| !excluded_ips.contains(ip))
.collect()
}

Expand Down Expand Up @@ -209,6 +218,58 @@ mod tests {
);
}

#[test]
fn parse_addresses_with_address_exclusions() {
let mut opts = Opts::default();
opts.addresses = vec!["192.168.0.0/30".to_owned()];
opts.exclude_addresses = Some(vec!["192.168.0.1".to_owned()]);
let ips = parse_addresses(&opts);

assert_eq!(
ips,
[
Ipv4Addr::new(192, 168, 0, 0),
Ipv4Addr::new(192, 168, 0, 2),
Ipv4Addr::new(192, 168, 0, 3)
]
);
}

#[test]
fn parse_addresses_with_cidr_exclusions() {
let mut opts = Opts::default();
opts.addresses = vec!["192.168.0.0/29".to_owned()];
opts.exclude_addresses = Some(vec!["192.168.0.0/30".to_owned()]);
let ips = parse_addresses(&opts);

assert_eq!(
ips,
[
Ipv4Addr::new(192, 168, 0, 4),
Ipv4Addr::new(192, 168, 0, 5),
Ipv4Addr::new(192, 168, 0, 6),
Ipv4Addr::new(192, 168, 0, 7),
]
);
}

#[test]
fn parse_addresses_with_incorrect_address_exclusions() {
let mut opts = Opts::default();
opts.addresses = vec!["192.168.0.0/30".to_owned()];
opts.exclude_addresses = Some(vec!["192.168.0.1".to_owned(), "im_wrong".to_owned()]);
let ips = parse_addresses(&opts);

assert_eq!(
ips,
[
Ipv4Addr::new(192, 168, 0, 0),
Ipv4Addr::new(192, 168, 0, 2),
Ipv4Addr::new(192, 168, 0, 3)
]
);
}

#[test]
fn parse_correct_host_addresses() {
let mut opts = Opts::default();
Expand All @@ -235,6 +296,7 @@ mod tests {

assert!(ips.is_empty());
}

#[test]
fn parse_hosts_file_and_incorrect_hosts() {
// Host file contains IP, Hosts, incorrect IPs, incorrect hosts
Expand Down
9 changes: 8 additions & 1 deletion src/input.rs
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,10 @@ pub struct Opts {
#[arg(short, long, value_delimiter = ',')]
pub exclude_ports: Option<Vec<u16>>,

/// A list of comma separated CIDRs, IPs, or hosts to be excluded from scanning.
#[arg(short = 'x', long = "exclude-addresses", value_delimiter = ',')]
pub exclude_addresses: Option<Vec<String>>,

/// UDP scanning mode, finds UDP ports that send back responses
#[arg(long)]
pub udp: bool,
Expand Down Expand Up @@ -217,7 +221,7 @@ impl Opts {
self.ports = Some(ports);
}

merge_optional!(range, resolver, ulimit, exclude_ports);
merge_optional!(range, resolver, ulimit, exclude_ports, exclude_addresses);
}
}

Expand All @@ -241,6 +245,7 @@ impl Default for Opts {
scripts: ScriptsRequired::Default,
config_path: None,
exclude_ports: None,
exclude_addresses: None,
udp: false,
}
}
Expand All @@ -266,6 +271,7 @@ pub struct Config {
command: Option<Vec<String>>,
scripts: Option<ScriptsRequired>,
exclude_ports: Option<Vec<u16>>,
exclude_addresses: Option<Vec<String>>,
udp: Option<bool>,
}

Expand Down Expand Up @@ -340,6 +346,7 @@ mod tests {
scan_order: Some(ScanOrder::Random),
scripts: None,
exclude_ports: None,
exclude_addresses: None,
udp: Some(false),
}
}
Expand Down
Loading