Compare commits

...
Author SHA1 Message Date
bee 1755713f8a Added justfile for tests 2024-10-31 18:49:24 +00:00
Roger G. Coram aed0d71de8 Merge pull request #675 from mcamou/add-arm64-docker-build
Fixes #645: Add arm64 Docker image build
2024-10-26 11:52:07 +01:00
mcamou ea428a1a22 Add arm64 Docker image build 2024-10-26 12:19:04 +02:00
Roger G. Coram da41cb062d fix: avoid duplicate IP addresses (#660)
avoid scanning duplicated IPs for overlapping CIDRs.

fixes #651
2024-09-21 19:06:14 +01:00
Roger G. Coram 0a40d1539a Merge pull request #653 from socketz/patch-1
Update README.md
2024-09-19 14:13:43 +01:00
Roger G. Coram c3d24feebe Merge pull request #632 from RustScan/dependabot/cargo/env_logger-0.11.5
Bump env_logger from 0.11.3 to 0.11.5
2024-09-18 16:45:03 +01:00
socketz 0a09da40aa Update README.md
Fixed Build badge
2024-08-27 13:00:33 +02:00
dependabot[bot] 6ffd5f741e Bump env_logger from 0.11.3 to 0.11.5
Bumps [env_logger](https://github.com/rust-cli/env_logger) from 0.11.3 to 0.11.5.
- [Release notes](https://github.com/rust-cli/env_logger/releases)
- [Changelog](https://github.com/rust-cli/env_logger/blob/main/CHANGELOG.md)
- [Commits](https://github.com/rust-cli/env_logger/compare/v0.11.3...v0.11.5)

---
updated-dependencies:
- dependency-name: env_logger
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
2024-08-21 18:49:48 +00:00
6 changed files with 30 additions and 5 deletions

No files matched your search

+4
View File
@@ -15,6 +15,9 @@ jobs:
- name: Check out the repo
uses: actions/checkout@v4
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Log in to Docker Hub
if: github.event_name != 'pull_request'
uses: docker/login-action@v3
@@ -34,5 +37,6 @@ jobs:
with:
context: .
push: ${{ contains(fromJson('["push", "release"]'), github.event_name) }} # Publish to docker registry only on push event or new release.
platforms: linux/amd64,linux/arm64
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
Generated
+2 -2
View File
@@ -489,9 +489,9 @@ dependencies = [
[[package]]
name = "env_logger"
version = "0.11.3"
version = "0.11.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9"
checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d"
dependencies = [
"anstream",
"anstyle",
+1 -1
View File
@@ -23,7 +23,7 @@ async-std = "1.7.0"
futures = "0.3"
rlimit = "0.10.1"
log = "0.4.22"
env_logger = "0.11.3"
env_logger = "0.11.5"
anstream = "=0.6.14"
dirs = "5.0.1"
gcd = "2.0.1"
+1 -1
View File
@@ -232,4 +232,4 @@ This project follows the [all-contributors](https://github.com/all-contributors/
[badge-3]: https://img.shields.io/github/downloads/rustscan/rustscan/total?label=GitHub%20Downloads
[badge-4]: https://img.shields.io/crates/d/rustscan?label=Cargo%20Downloads
[badge-5]: https://img.shields.io/discord/754001738184392704
[badge-6]: https://github.com/RustScan/RustScan/workflows/Continuous%20integration/badge.svg?branch=master
[badge-6]: https://github.com/RustScan/RustScan/workflows/Build/badge.svg?branch=master
+5
View File
@@ -0,0 +1,5 @@
test:
cargo nextest run
cargo clippy
cargo fmt --check
cargo doc --workspace --all-features --no-deps --document-private-items
+17 -1
View File
@@ -1,4 +1,5 @@
//! Provides functions to parse input IP addresses, CIDRs or files.
use std::collections::BTreeSet;
use std::fs::{self, File};
use std::io::{prelude::*, BufReader};
use std::net::{IpAddr, SocketAddr, ToSocketAddrs};
@@ -27,6 +28,8 @@ use crate::warning;
///
/// let ips = parse_addresses(&opts);
/// ```
///
/// Finally, any duplicates are removed to avoid excessive scans.
pub fn parse_addresses(input: &Opts) -> Vec<IpAddr> {
let mut ips: Vec<IpAddr> = Vec::new();
let mut unresolved_addresses: Vec<&str> = Vec::new();
@@ -66,7 +69,10 @@ pub fn parse_addresses(input: &Opts) -> Vec<IpAddr> {
}
}
ips
ips.into_iter()
.collect::<BTreeSet<_>>()
.into_iter()
.collect()
}
/// Given a string, parse it as a host, IP address, or CIDR.
@@ -256,6 +262,16 @@ mod tests {
assert_eq!(ips.len(), 0);
}
#[test]
fn parse_duplicate_cidrs() {
let mut opts = Opts::default();
opts.addresses = vec!["79.98.104.0/21".to_owned(), "79.98.104.0/24".to_owned()];
let ips = parse_addresses(&opts);
assert_eq!(ips.len(), 2_048);
}
#[test]
fn resolver_default_cloudflare() {
let opts = Opts::default();