Merge branch 'master' into bee-add-config-file

Merge pull request #159 from RustScan/bee-add-nmap-ports
updated config file to feature nmap top 1k ports
2026-11-07 09:46:04 -10:00 · 2020-08-24 17:12:59 +01:00 · 2020-08-24 16:49:13 +01:00 · 2020-08-24 16:43:11 +01:00 · 2020-08-24 13:49:10 +01:00 · 2020-08-24 12:48:45 +01:00
19 changed files with 2400 additions and 456 deletions
@@ -76,6 +76,45 @@
        "ideas",
        "design"
      ]
+    },
+    {
+      "login": "Atul9",
+      "name": "Atul Bhosale",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/3390330?v=4",
+      "profile": "https://github.com/Atul9",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "TGotwig",
+      "name": "Thomas Gotwig",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/30773779?v=4",
+      "profile": "https://tgotwig.me",
+      "contributions": [
+        "platform"
+      ]
+    },
+    {
+      "login": "remigourdon",
+      "name": "Rémi Gourdon",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/2874133?v=4",
+      "profile": "https://github.com/remigourdon",
+      "contributions": [
+        "doc",
+        "code"
+      ]
+    },
+    {
+      "login": "cmnatic",
+      "name": "Ben (CMNatic)",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/4163116?v=4",
+      "profile": "https://cmnatic.co.uk",
+      "contributions": [
+        "code",
+        "doc",
+        "design"
+      ]
    }
  ],
  "contributorsPerLine": 7,
@@ -18,6 +18,15 @@ dependencies = [
 "winapi",
 ]

+[[package]]
+name = "ansi_term"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
+dependencies = [
+ "winapi",
+]
+
 [[package]]
 name = "arrayref"
 version = "0.3.6"
@@ -42,16 +51,63 @@ dependencies = [
 ]

 [[package]]
-name = "async-std"
-version = "1.6.2"
+name = "async-executor"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00d68a33ebc8b57800847d00787307f84a562224a14db069b0acefe4c2abbf5d"
+checksum = "90f47c78ea98277cb1f5e6f60ba4fc762f5eafe9f6511bc2f7dfd8b75c225650"
 dependencies = [
+ "async-io",
+ "futures-lite",
+ "multitask",
+ "parking 1.0.6",
+ "scoped-tls",
+ "waker-fn",
+]
+
+[[package]]
+name = "async-io"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ae22a338d28c75b53702b66f77979062cb29675db376d99e451af4fa79dedb3"
+dependencies = [
+ "cfg-if",
+ "concurrent-queue",
+ "futures-lite",
+ "libc",
+ "once_cell",
+ "parking 2.0.0",
+ "polling",
+ "socket2",
+ "vec-arena",
+ "wepoll-sys-stjepang",
+ "winapi",
+]
+
+[[package]]
+name = "async-mutex"
+version = "1.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20e85981fc34e84cdff3fc2c9219189752633fdc538a06df8b5ac45b68a4f3a9"
+dependencies = [
+ "event-listener",
+]
+
+[[package]]
+name = "async-std"
+version = "1.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46c8da367da62b8ff2313c406c9ac091c1b31d67a165becdd2de380d846260f7"
+dependencies = [
+ "async-executor",
+ "async-io",
+ "async-mutex",
 "async-task",
+ "blocking",
 "crossbeam-utils",
 "futures-channel",
 "futures-core",
 "futures-io",
+ "futures-lite",
 "kv-log-macro",
 "log",
 "memchr",
@@ -60,7 +116,6 @@ dependencies = [
 "pin-project-lite",
 "pin-utils",
 "slab",
- "smol",
 "wasm-bindgen-futures",
 ]

@@ -118,15 +173,14 @@ dependencies = [

 [[package]]
 name = "blocking"
-version = "0.4.7"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2468ff7bf85066b4a3678fede6fe66db31846d753ff0adfbfab2c6a6e81612b"
+checksum = "76e94bf99b692f54c9d05f97454d3faf11134523fe5b180564a3fb6ed63bcc0a"
 dependencies = [
 "async-channel",
 "atomic-waker",
 "futures-lite",
 "once_cell",
- "parking",
 "waker-fn",
 ]

@@ -156,11 +210,11 @@ checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"

 [[package]]
 name = "clap"
-version = "2.33.1"
+version = "2.33.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129"
+checksum = "10040cdf04294b565d9e0319955430099ec3813a64c952b86a41200ad714ae48"
 dependencies = [
- "ansi_term",
+ "ansi_term 0.11.0",
 "atty",
 "bitflags",
 "strsim",
@@ -181,10 +235,16 @@ dependencies = [
 ]

 [[package]]
-name = "concurrent-queue"
-version = "1.2.0"
+name = "colorful"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e296417c8154304ac70aceda41f05318f986f7c0c767bcb0a2366fbb890e78e1"
+checksum = "0bca1619ff57dd7a56b58a8e25ef4199f123e78e503fe1653410350a1b98ae65"
+
+[[package]]
+name = "concurrent-queue"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30ed07550be01594c6026cff2a1d7fe9c8f683caa798e12b68694ac9e88286a3"
 dependencies = [
 "cache-padded",
 ]
@@ -241,9 +301,9 @@ dependencies = [

 [[package]]
 name = "event-listener"
-version = "2.3.0"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "298f00c3b04c1d9b4cb86aefaaa35348af0957d98b30a5306fc635f8e718923d"
+checksum = "68082183f458867ce7cddea16d4df4443c1537112c0c09c450dedc09daf5c719"

 [[package]]
 name = "fastrand"
@@ -309,7 +369,7 @@ dependencies = [
 "futures-core",
 "futures-io",
 "memchr",
- "parking",
+ "parking 1.0.6",
 "pin-project-lite",
 "waker-fn",
 ]
@@ -361,6 +421,12 @@ dependencies = [
 "slab",
 ]

+[[package]]
+name = "gcd"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c7cd301bf2ab11ae4e5bdfd79c221d97a25e46c089144a62ee9d09cb32d2b92"
+
 [[package]]
 name = "getrandom"
 version = "0.1.14"
@@ -444,6 +510,17 @@ version = "2.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"

+[[package]]
+name = "multitask"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c09c35271e7dcdb5f709779111f2c8e8ab8e06c1b587c1c6a9e179d865aaa5b4"
+dependencies = [
+ "async-task",
+ "concurrent-queue",
+ "fastrand",
+]
+
 [[package]]
 name = "num_cpus"
 version = "1.13.0"
@@ -466,6 +543,12 @@ version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6cb300f271742d4a2a66c01b6b2fa0c83dfebd2e0bf11addb879a3547b4ed87c"

+[[package]]
+name = "parking"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72"
+
 [[package]]
 name = "pin-project"
 version = "0.4.23"
@@ -498,6 +581,24 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"

+[[package]]
+name = "polling"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6d83023eb990619815bb41b45625b02da62b00d0f24b0a08aae37697b3f6c94"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wepoll-sys-stjepang",
+ "winapi",
+]
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea"
+
 [[package]]
 name = "proc-macro-error"
 version = "1.0.4"
@@ -558,6 +659,47 @@ dependencies = [
 "proc-macro2",
 ]

+[[package]]
+name = "rand"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
+dependencies = [
+ "getrandom",
+ "libc",
+ "rand_chacha",
+ "rand_core",
+ "rand_hc",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "rand_hc"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
+dependencies = [
+ "rand_core",
+]
+
 [[package]]
 name = "redox_syscall"
 version = "0.1.57"
@@ -595,9 +737,9 @@ checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8"

 [[package]]
 name = "rlimit"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6d26e65e82a1e2628c5f209ec12f4508fa50e644bd2f264138e60129d61eae8"
+checksum = "49b02d62c38353a6fce45c25ca19783e25dd5f495ca681c674a4ee15aa4c1536"
 dependencies = [
 "cfg-if",
 "libc",
@@ -617,17 +759,22 @@ dependencies = [

 [[package]]
 name = "rustscan"
-version = "1.4.1"
+version = "1.7.1"
 dependencies = [
+ "ansi_term 0.12.1",
 "async-std",
 "colored",
+ "colorful",
 "dirs",
 "env_logger",
 "futures",
+ "gcd",
 "log",
+ "rand",
 "rlimit",
 "shell-words",
 "structopt",
+ "toml",
 ]

 [[package]]
@@ -636,6 +783,12 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"

+[[package]]
+name = "serde"
+version = "1.0.114"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5317f7588f0a5078ee60ef675ef96735a1442132dc645eb1d12c018620ed8cd3"
+
 [[package]]
 name = "shell-words"
 version = "1.0.0"
@@ -648,27 +801,6 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"

-[[package]]
-name = "smol"
-version = "0.1.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "620cbb3c6e34da57d3a248cda0cd01cd5848164dc062e764e65d06fe3ea7aed5"
-dependencies = [
- "async-task",
- "blocking",
- "concurrent-queue",
- "fastrand",
- "futures-io",
- "futures-util",
- "libc",
- "once_cell",
- "scoped-tls",
- "slab",
- "socket2",
- "wepoll-sys-stjepang",
- "winapi",
-]
-
 [[package]]
 name = "socket2"
 version = "0.3.12"
@@ -689,9 +821,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"

 [[package]]
 name = "structopt"
-version = "0.3.15"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de2f5e239ee807089b62adce73e48c625e0ed80df02c7ab3f068f5db5281065c"
+checksum = "de5472fb24d7e80ae84a7801b7978f95a19ec32cb1876faea59ab711eb901976"
 dependencies = [
 "clap",
 "lazy_static",
@@ -700,9 +832,9 @@ dependencies = [

 [[package]]
 name = "structopt-derive"
-version = "0.4.8"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "510413f9de616762a4fbeab62509bf15c729603b72d7cd71280fbca431b1c118"
+checksum = "1e0eb37335aeeebe51be42e2dc07f031163fbabfa6ac67d7ea68b5c2f68d5f99"
 dependencies = [
 "heck",
 "proc-macro-error",
@@ -713,9 +845,9 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "1.0.36"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cdb98bcb1f9d81d07b536179c269ea15999b5d14ea958196413869445bb5250"
+checksum = "e69abc24912995b3038597a7a593be5053eb0fb44f3cc5beec0deb421790c1f4"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -749,6 +881,15 @@ dependencies = [
 "lazy_static",
 ]

+[[package]]
+name = "toml"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "unicode-segmentation"
 version = "1.6.0"
@@ -767,6 +908,12 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"

+[[package]]
+name = "vec-arena"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17dfb54bf57c9043f4616cb03dab30eff012cc26631b797d8354b916708db919"
+
 [[package]]
 name = "vec_map"
 version = "0.8.2"
@@ -1,6 +1,6 @@
 [package]
 name = "rustscan"
-version = "1.4.1"
+version = "1.7.1"
 authors = ["Bee <[email protected]>"]
 edition = "2018"
 description = "Faster Nmap Scanning with Rust"
@@ -10,21 +10,35 @@ license = "MIT"
 keywords = ["port", "scanning", "nmap"]
 categories = ["command-line-utilities"]
 readme="README.md"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+exclude = [
+    ".github/*",
+    "pictures/*",
+    "rustscan-debbuilder/*",
+]

 [dependencies]
 colored = "2.0.0"
-structopt = "0.3.15"
-async-std = "1.6.2"
+structopt = "0.3.16"
+async-std = "1.6.3"
 futures = "0.3"
-rlimit = "0.3.0"
+rlimit = "0.4.0"
 shell-words = "1.0.0"
 log = "0.4.0"
 env_logger = "0.7.1"
 dirs = "3.0.1"
+toml = "0.5.6"
+gcd = "2.0.1"
+rand = "0.7.3"
+colorful = "0.2.1"
+ansi_term = "0.12.1"
+ureq = "1.3.0"
+serde = "1.0.115"
+serde_derive = "1.0.115"

 [package.metadata.deb]
 depends = "$auto, nmap"
-authors = ["Bee <[email protected]>"]
 section = "rust"
+
+[profile.release]
+lto = true
+panic = 'abort'
@@ -0,0 +1,22 @@
+FROM rust:alpine as builder
+RUN apk update && \
+    apk add build-base && \
+    rm -rf /var/cache/apk/*
+
+WORKDIR /usr/src/rustscan
+COPY . .
+RUN cargo install --path .
+
+FROM alpine
+LABEL author="Hydragyrum <https://github.com/Hydragyrum>"
+RUN ulimit -n 100000 && \
+    apk update && \
+    apk add \
+    nmap nmap-scripts wget \
+    && \
+    rm -rf /var/cache/apk/*
+COPY --from=builder /usr/local/cargo/bin/rustscan /usr/local/bin/rustscan
+RUN addgroup -S rustscan && \
+    adduser -S -G rustscan rustscan
+USER rustscan
+ENTRYPOINT ["/usr/local/bin/rustscan"]
@@ -0,0 +1,21 @@
+install:
+	cargo install cross
+
+build:
+	make build-linux
+	make build-mac
+
+	make shasum
+
+build-linux:
+	@echo 'Building for Linux... 🐧'
+	cross build --release --target=x86_64-unknown-linux-musl
+	mkdir -p target/release-archives && tar -czf target/release-archives/rustscan-linux.tar.gz target/x86_64-unknown-linux-musl/release/rustscan 
+
+build-mac:
+	@echo 'Building for MacOS... 🍏'
+	cross build --release --target=x86_64-apple-darwin
+	mkdir -p target/release-archives && tar -czf target/release-archives/rustscan-mac.tar.gz target/x86_64-apple-darwin/release/rustscan
+
+shasum:
+	shasum -a 256 target/release-archives/rustscan-*.tar.gz
@@ -1,17 +1,17 @@
 <p align="center">
-➡️ 
+➡️
 <a href="https://discord.gg/GFrQsGy">Discord</a> |
 <a href="https://github.com/RustScan/RustScan#-full-installation-guide">Installation Guide</a> |
 <a href="https://github.com/RustScan/RustScan#-usage">Usage Guide</a>
 ⬅️
 <br>
-<img src="pictures/rustscan.png">
+<img src="https://github.com/RustScan/RustScan/blob/master/pictures/rustscan.png?raw=true">
 </p>
 <p align="center">
-<u><b> Turns a 17 minutes Nmap scan into 19 seconds. </b></u><br> Find all open ports <b>fast</b> with RustScan, automatically pipe them into Nmap. 
+<u><b> Turns a 17 minutes Nmap scan into 19 seconds. </b></u><br> Find all open ports <b>fast</b> with RustScan, automatically pipe them into Nmap.
 </p>
 <p align="center">
-<img alt="AUR version" src="https://img.shields.io/aur/version/rustscan-bin">
+<img alt="AUR version" src="https://img.shields.io/aur/version/rustscan">
 <img src="https://img.shields.io/badge/Built%20with-Rust-Purple">
 <img alt="GitHub commit activity" src="https://img.shields.io/github/commit-activity/w/brandonskerritt/rustscan">
 <img alt="GitHub All Releases" src="https://img.shields.io/github/downloads/rustscan/rustscan/total?label=GitHub%20Downloads">
@@ -21,16 +21,15 @@
 </p>
 <hr>

-
-| <p align="center"><a href="https://crates.io/crates/rustscan">🔧 Cargo (Universal) </a></p> | <p align="center"><a href="https://crates.io/crates/rust_scan"> Arch </a></p> | <p align="center"><a href="https://crates.io/crates/rust_scan"> HomeBrew </a></p> | <p align="center"><a href="https://crates.io/crates/rust_scan"> Kali / Debian </p> |
+| <p align="center"><a href="https://hub.docker.com/r/cmnatic/rustscan">🐋 Docker (Recommended) </a></p> | <p align="center"><a href="https://github.com/RustScan/RustScan/releases">👩‍💻 Kali / Debian </p> | <p align="center"><a href="https://aur.archlinux.org/packages/rustscan/">🏗️ Arch </a></p> | <p align="center"><a href="https://crates.io/crates/rustscan">🔧 Cargo (Universal) </a></p> |
 | ---- | ---- | ---- | --- |
-| <p align="center"><img src="pictures/rust.png" /></p>  | <p align="center"><img src="pictures/arch.png" /></p> | <p align="center"><img src="pictures/apple.png" /></p> | <p align="center"><img src="pictures/kali.png" /></p> |
-| `cargo install rustscan` | `yay -S rustscan` | `brew tap brandonskerritt/rustscan && brew install rustscan` | [Read the install guide](https://github.com/brandonskerritt/RustScan/blob/master/README.md#%EF%B8%8F-debian--kali) |
+| <p align="center"><img src="https://github.com/RustScan/RustScan/blob/master/pictures/docker.png?raw=true" /></p> | <p align="center"><img src="https://github.com/RustScan/RustScan/blob/master/pictures/kali.png?raw=true" /></p> | <p align="center"><img src="https://github.com/RustScan/RustScan/blob/master/pictures/arch.png?raw=true" /></p> | <p align="center"><img src="https://github.com/RustScan/RustScan/blob/master/pictures/rust.png?raw=true" /></p>
+| `docker pull rustscan/rustscan:alpine` <p>[Usage](https://github.com/RustScan/RustScan#docker-whale) | [Read the install guide](https://github.com/brandonskerritt/RustScan/blob/master/README.md#%EF%B8%8F-debian--kali) | `yay -S rustscan` | `cargo install rustscan`

 <hr>

 # 🤔 What is this?
-1. Find ports quickly using Rustscan (**8 seconds at its fastest**).
+1. Find ports quickly using Rustscan (**3 seconds at its fastest**).
 2. Automatically runs `nmap` on those ports.
 3. ???
 4. Profit!
@@ -43,8 +42,8 @@
  </tr>
  <tr>
  <th>Gif</th>
-    <td><img src="pictures/with_rustscan.gif" alt="The guy she tells you not to worry about"></td>
-    <td><img src="pictures/without_rustscan.gif" alt="You"></td>
+    <td><img src="https://github.com/RustScan/RustScan/blob/master/pictures/with_rustscan.gif?raw=true" alt="The guy she tells you not to worry about"></td>
+    <td><img src="https://github.com/RustScan/RustScan/blob/master/pictures/without_rustscan.gif?raw=true" alt="You"></td>
  </tr>
  <tr>
  <th>Time</th>
@@ -53,7 +52,7 @@
  </tr>
 </table>

-<sub><b>Note</b> This is an older gif. RustScan's current top speed is 8 seconds for all 65k ports. This gif is 26 seconds.</sub><br>
+<sub><b>Note</b> This is an older gif. RustScan's current top speed is 3 seconds for all 65k ports. This gif is 26 seconds.</sub><br>

 RustScans **only** job is to reduce the friction between finding open ports and inputting them into nmap.

@@ -64,10 +63,23 @@ RustScans **only** job is to reduce the friction between finding open ports and
 * Let's you choose what Nmap commands to run, or uses the default.
 * IPv6 Support

+## ‼️ Important Links
+
+| Installation Guide | Documentation | Discord |
+| ------------------ | ------------- | ------- |
+| 📖 [Installation Guide](https://github.com/RustScan/RustScan#-full-installation-guide) | 📚 [Documentation](https://github.com/RustScan/RustScan/issues/89) | 🦜 [Discord](https://discord.gg/GFrQsGy)
+
+## 🙋 Table of Contents
+* 📖 [Installation Guide](https://github.com/RustScan/RustScan#-full-installation-guide)
+* 🐋 [Docker Usage](https://github.com/RustScan/RustScan#docker-whale)
+* 🦜 [Discord](https://discord.gg/GFrQsGy)
+* 🤸 [Usage](https://github.com/RustScan/RustScan#-usage)
+* 🎪 [Community](https://github.com/RustScan/RustScan#-community)
+
 # 🔭 Why RustScan?
 Why spend time running fast scans and manually copying the ports, or waiting for a 20 minute scan to finish when you can just do all 65k ports in less than a minute?

-![gif](pictures/8seconds.gif)
+![gif](https://github.com/RustScan/RustScan/blob/master/pictures/8seconds.gif?raw=true)

 **RustScan running in 8 seconds and finding all open ports out of 65k.**

@@ -79,19 +91,6 @@ Why spend time running fast scans and manually copying the ports, or waiting for
 | Actually useful                                                                            | ❌        | ✅    | ❌       |
 | Realises it's not useful, and pipes the only useful data into the only useful port scanner | ✅        | ❌    | ❌       |

-## ‼️ Important Links
-
-| Installation Guide | Documentation | Discord |
-| ------------------ | ------------- | ------- |
-| 📖 [Installation Guide](https://github.com/RustScan/RustScan#-full-installation-guide) | 📚 [Documentation](https://github.com/RustScan/RustScan/issues/89) | 🦜 [Discord](https://discord.gg/GFrQsGy)
-
-## 🙋 Table of Contents
-* 📖 [Installation Guide](https://github.com/RustScan/RustScan#-full-installation-guide)
-* 🦜 [Discord](https://discord.gg/GFrQsGy)
-* 🤸 [Usage](https://github.com/RustScan/RustScan#-usage)
-* 🎪 [Contributing](https://github.com/RustScan/RustScan#-contributing)
-
-
 # 📖 Full Installation Guide
 **You need Nmap**. If you have Kali Linux or Parrot OS installed, you already have Nmap. If not, [follow the nmap install guide](https://nmap.org/download.html).

@@ -99,7 +98,7 @@ The easiest way to install RustScan is to use one of the packages provided for y

 The most universal way is to use `cargo`, Rust's built in package manager (think Pip but for Rust). [Follow this guide to installing Rust & Cargo](https://doc.rust-lang.org/cargo/getting-started/installation.html).

-If you face any issues at all, please leave a GitHub issue. I have only tested this on Linux, so there may be issues for Mac OS or Windows. 
+If you face any issues at all, please leave a GitHub issue. I have only tested this on Linux, so there may be issues for Mac OS or Windows.

 Note: sometimes Rust doesn't add Cargo to the path. Please see [this issue](https://github.com/rust-lang/rustup/issues/2436) for how to fix that.

@@ -109,23 +108,75 @@ Download the .deb file from the releases page:

 [https://github.com/brandonskerritt/RustScan/releases](https://github.com/brandonskerritt/RustScan/releases)

-Run the commpand `dpkg -i` on the file. 
+Run the commpand `dpkg -i` on the file.

 Note: sometimes you can double click the file to achieve the same result.

-### 🥧 .deb file not working?
-The .deb file only works on AMD64 CPUs. If yours is different (such as a Raspberry Pi) or the .deb file doesn't work, it is easy to build the .deb file yourself.
-**Note**: It is easier to install Rust and install via Cargo, then it is to build the .deb file. But this is just in case!
+## Docker :whale:

-1. Install Rust You can do this with `curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh` which I took from the Rust website https://www.rust-lang.org/tools/install
-2. `cargo install rustscan` if you want the easiest method possible. Otherwise, to build the .deb file `cargo install cargo-deb`
-3. Git clone this repo `git clone https://github.com/brandonskerritt/RustScan`
-4. cd RustScan (into the git cloned repo) `cd RustScan`
-5. Run `cargo deb`
-6. Your .deb file is now located in `target/releases/Debian/`
+Docker is the recommended way of installing RustScan. This is because:
+* It has a high open file descriptor limit, which is one of the [main problems](https://github.com/RustScan/RustScan/issues/40) with RustScan. Now you don't have to fiddle around trying to understand your OS.
+* It works on all systems, regardless of OS. Even Windows, which we don't officially support.
+* The Docker image uses the latest build from Cargo, our main source-of-truth package. This means that you will always be using the latest version.
+* No need to install Rust, Cargo, or Nmap.
+
+To install Docker, [follow their guide](https://docs.docker.com/engine/install/).
+
+**Once Docker is installed, you can either build your own image using the `Dockerfile` (alpine) provided in the repo, or alternatively, use the published Docker image like below (most convenient)**
+
+Please see our [DockerHub](https://hub.docker.com/repository/docker/rustscan/rustscan) for further info, however, note that we have two Docker images:
+```
+rustscan/rustscan:alpine
+
+rustscan/rustscan:latest
+```
+We strongly recommend using the `alpine` tag, as this is the latest major - stable - release of RustScan. This READMDE uses the `alpine` image by default, however, note that the`latest` image is considered experimental.
+
+#### To get started:
+
+Simply run this command against the IP you want to target:
+
+```
+docker run -it --rm --name rustscan rustscan/rustscan:alpine <rustscan arguments here> <ip address to scan>
+```
+
+Note: this will scan the Docker's localhost, not your own.
+
+Once done, you will no longer need to re-download the image (except when RustScan updates) and can use RustScan like a normal application.
+
+You will have to run this command every time, so we suggest aliasing it to something memorable.
+
+```
+alias rustscan='docker run -it --rm --name rustscan rustscan/rustscan:alpine <rustscan arguments here> <ip address to scan>'
+```
+
+Then we can:
+
+```
+rustscan 127.0.0.1 -t 500 -b 1500 -- -A
+```
+
+#### To build your own image:
+
+Download the repo:
+```
+git clone https://github.com/RustScan/RustScan.git
+```
+
+Ensure you navigate to the download location of the repo:
+```
+cd /path/to/download/RustScan
+```
+
+Build away!
+```
+docker build -t <yourimagename> .
+```

 ## 🍺 HomeBrew

+**Note for Mac users** Mac OS has a very, very small ulimit size. This will negatively impact RustScan by a significant amount. Please use the Docker container, or tell RustScan to up the ulimit size on every run.
+
 Tap the brew:

 ```
@@ -147,7 +198,9 @@ brew install rustscan
 5. Symlink to the binary or something. Whatever you want!

 ## 🦊 Community Distributions
-Here are all of RustScan's distributions, along with some community ones.
+Here are all of RustScan's community distributions.
+
+If you maintain a community distribution and want it listed here, leave an issue / pull request / Discord message or however you want to let us know.

 * [OpenSuse](https://software.opensuse.org/package/rustscan?search_term=rustscan)

@@ -160,43 +213,48 @@ rustscan -h
 ```

 ```
-RustScan 1.2.0
-Bee https://github.com/brandonskerritt
-Fast Port Scanner built in Rust
-WARNING Do not use this program against sensitive infrastructure. The specified server may not be able to handle this
-many socket connections at once.
+Fast Port Scanner built in Rust. WARNING Do not use this program against sensitive infrastructure since the specified
+server may not be able to handle this many socket connections at once. - Discord https://discord.gg/GFrQsGy - GitHub
+https://github.com/RustScan/RustScan

 USAGE:
-    rustscan [FLAGS] [OPTIONS] <ip> [command]...
+    rustscan [FLAGS] [OPTIONS] <ips-or-hosts>... [-- <command>...]

 FLAGS:
-    -h, --help       Prints help information
-    -q, --quiet      Quiet mode. Only output the ports. No Nmap. Useful for grep or outputting to a file.
-    -V, --version    Prints version information
+    -a, --accessible
+    -h, --help          Prints help information
+    -q, --quiet         Quiet mode. Only output the ports. No Nmap. Useful for grep or outputting to a file
+    -V, --version       Prints version information

 OPTIONS:
-    -T, --timeout <T>    The timeout before a port is assumed to be close. In MS. [default: 1500]
-    -b, --batch <b>      Increases speed of scanning. The batch size for port scanning. Depends on your open file limit
-                         of OS. If you do 65535 it will do every port at the same time. Although, your OS may not
-                         support this. [default: 4500]
-    -u, --ulimit <u>     Automatically ups the ULIMIT with the value you provided.
+    -b, --batch-size <batch-size>    The batch size for port scanning, it increases or slows the speed of scanning.
+                                     Depends on the open file limit of your OS.  If you do 65535 it will do every port
+                                     at the same time. Although, your OS may not support this [default: 4500]
+    -p, --ports <ports>...           A list of comma separed ports to be scanned. Example: 80,443,8080.
+    -r, --range <range>              A range of ports with format start-end. Example: 1-1000
+        --scan-order <scan-order>    The order of scanning to be performed. The "serial" option will scan ports in
+                                     ascending order while the "random" option will scan ports randomly [default:
+                                     serial]  [possible values: Serial, Random]
+    -t, --timeout <timeout>          The timeout in milliseconds before a port is assumed to be closed [default: 1500]
+    -u, --ulimit <ulimit>            Automatically ups the ULIMIT with the value you provided

 ARGS:
-    <ip>            The IP address to scan
-    <command>...    The Nmap arguments to run. To use the argument -A, end RustScan's args with '-- -A'. To run
-                    EXAMPLE: 'rustscan -T 1500 127.0.0.1 -- -A -sC'. This argument auto runs nmap {your commands}
-                    -vvv -p $PORTS 
+    <ips-or-hosts>...    A list of comma separated IP addresses or hosts to be scanned
+    <command>...         The Nmap arguments to run. To use the argument -A, end RustScan's args with '-- -A'.
+                         Example: 'rustscan -T 1500 127.0.0.1 -- -A -sC'. This command adds -Pn -vvv -p $PORTS
+                         automatically to nmap. For things like --script '(safe and vuln)' enclose it in quotations
+                         marks \"'(safe and vuln)'\"")
 ```

 The format is `rustscan -b 500 -T 1500 192.168.0.1` to scan 192.168.0.1 with 500 batch size with a timeout of 1500ms. The timeout is how long RustScan waits for a response until it assumes the port is closed.

-The batch size determines how fast RustScan is. Set it to 65k, and it will scan all 65k ports at the same time. This means at at 65k batch size, RustScan will take TIMEOUT long to scan all ports. Essentially, if timeout is 1000ms, **RustScan can scan in 1 second**. 
+The batch size determines how fast RustScan is. Set it to 65k, and it will scan all 65k ports at the same time. This means at at 65k batch size, RustScan will take TIMEOUT long to scan all ports. Essentially, if timeout is 1000ms, **RustScan can scan in 1 second**.

 Your operating system may not support this, but it is worth it to play around and see where your open file limit is. Shortly I will be releasing a dockerised version with a much larger open file limit, so this will be possible.

 ## ⚠️ WARNING

-This program, by default, scans 5000 ports at a time (5000 per second). 
+This program, by default, scans 5000 ports at a time (5000 per second).

 This may cause damage to a server, or may make it incredibly obvious you are scanning the server.

@@ -210,7 +268,7 @@ You can also use both of these at the same time, to make it as slow or as fast a

 **Please** do not use this tool against sensitive servers. It is designed mainly for Capture the Flag events, not real world servers with sensitive data.

-## 🚨 Thread Paniced at Main: Too Many Open Files
+## 🚨 Thread Panicked at Main: Too Many Open Files
 This is the most common error found in RustScan.

 The open file limit is how many open sockets you can have at any given time.
@@ -219,7 +277,7 @@ This limit changes from OS to OS.

 RustScan does not automatically create defaults (other than 5000) like Nmap does with their -T1, -T2 system.

-By figuring out for yourself the optimal batch size, you will know that RustScan is the most optimised port scanner for your system. 
+By figuring out for yourself the optimal batch size, you will know that RustScan is the most optimised port scanner for your system.

 There are 2 things you can do:
 1. Decrease batch size
@@ -248,16 +306,16 @@ ulimit -n 5000
 ```

 **Mac OS**
-Mac OS has, from what I can tell, a naturally very low open file descriptor limit. The limit for Ubuntu is 8800. The limit for Mac OS is 255! 
+Mac OS has, from what I can tell, a naturally very low open file descriptor limit. The limit for Ubuntu is 8800. The limit for Mac OS is 255!

-In this case, I would say it is safe to increase the open file limit. As most Linux based OS' have limits in the thousands. 
+In this case, I would say it is safe to increase the open file limit. As most Linux based OS' have limits in the thousands.

-Although, if this breaks anything, please don't blame me. 
+Although, if this breaks anything, please don't blame me.

 **Windows Subsystem for Linux**
-Windows Subsystem for Linux does not support ulimt (see issue #39). 
+Windows Subsystem for Linux does not support ulimit (see issue #39).

-The best way is to use it on a host computer, in Docker, or in a VM that isn't WSL. 
+The best way is to use it on a host computer, in Docker, or in a VM that isn't WSL.

 **Automatic Ulimit updating**
 We are currently working on automatic Ulimit updating. If it is too high, it will lower itself. If it is too low, it will suggest a higher Ulimit. Watch [this issue](https://github.com/brandonskerritt/RustScan/issues/25) for more.
@@ -265,7 +323,7 @@ We are currently working on automatic Ulimit updating. If it is too high, it wil
 ## 🔌 Nmap Custom Flags
 To run your own nmap commands, end the RustScan command with `-- -A` where `--` indicates "end of RustScan flags, please do not parse anything further" and any flags after that will be entered into nmap.

-RustScan automatically runs `nmap -vvv -p $PORTS $IP`. To make it run `-A`, execute the command `rustscan 127.0.0.1 -- -A`. 
+RustScan automatically runs `nmap -vvv -p $PORTS $IP`. To make it run `-A`, execute the command `rustscan 127.0.0.1 -- -A`.

 If you want to run commands such as `--script (vuln and safe)`, you will need to enclose it in quotations like so `--script '"(vuln and safe) or default"'`.

@@ -282,6 +340,22 @@ To increase accuracy, the easiest way is to increase the timeout. The default is

 Decreasing accuracy gives some speed bonus, but my testing found that batch size dramatically changed the speed whereas timeout did, but not so much.

+## 🤖 Config File
+
+RustScan uses a Config file to make things easier for you. And to also improve itself.
+The config file is used as the basis of the _adaptive learning_ mechanisms. This means that RustScan _learns_ from your scans and improves itself over time. (Don't worry, no bloated AI framework here 😉)
+
+The config file should be placed in APPDIRS. To find this folder, run RustScan and look out for RustScan saying "couldn't find config at <location>". That location is where your config file should be.
+
+Once you have this location, copy and paste this:
+
+```toml
+
+# The top ports
+[top_ports]
+80, 60, 443
+```
+
 # 🎪 Community

 Howdy Space Cow-Person 🤠🌌
@@ -294,7 +368,7 @@ TL;DR if you abuse members of our community you will be **perma-banned** 🤗

 RustScan has 2 major labels for GitHub issues you should look at:
 * Good First issue
-These are issues for newcomers to open source! 
+These are issues for newcomers to open source!
 [https://github.com/RustScan/RustScan/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22](https://github.com/RustScan/RustScan/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22)
 * Help wanted
 These are issues that aren't really for newcomers, but we could still do wiht help!
@@ -323,7 +397,7 @@ Please read the [contributing.md file](contributing.md)

 ## Contributors ✨
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-7-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-11-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->

 Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
@@ -341,6 +415,12 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
    <td align="center"><a href="https://imlonghao.com"><img src="https://avatars1.githubusercontent.com/u/4951333?v=4" width="100px;" alt=""/><br /><sub><b>imlonghao</b></sub></a><br /><a href="https://github.com/RustScan/RustScan/issues?q=author%3Aimlonghao" title="Bug reports">🐛</a> <a href="#maintenance-imlonghao" title="Maintenance">🚧</a></td>
    <td align="center"><a href="https://github.com/royharoush"><img src="https://avatars3.githubusercontent.com/u/8113056?v=4" width="100px;" alt=""/><br /><sub><b>royharoush</b></sub></a><br /><a href="#ideas-royharoush" title="Ideas, Planning, & Feedback">🤔</a> <a href="#design-royharoush" title="Design">🎨</a></td>
  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/Atul9"><img src="https://avatars1.githubusercontent.com/u/3390330?v=4" width="100px;" alt=""/><br /><sub><b>Atul Bhosale</b></sub></a><br /><a href="https://github.com/RustScan/RustScan/commits?author=Atul9" title="Code">💻</a></td>
+    <td align="center"><a href="https://tgotwig.me"><img src="https://avatars0.githubusercontent.com/u/30773779?v=4" width="100px;" alt=""/><br /><sub><b>Thomas Gotwig</b></sub></a><br /><a href="#platform-TGotwig" title="Packaging/porting to new platform">📦</a></td>
+    <td align="center"><a href="https://github.com/remigourdon"><img src="https://avatars3.githubusercontent.com/u/2874133?v=4" width="100px;" alt=""/><br /><sub><b>Rémi Gourdon</b></sub></a><br /><a href="https://github.com/RustScan/RustScan/commits?author=remigourdon" title="Documentation">📖</a> <a href="https://github.com/RustScan/RustScan/commits?author=remigourdon" title="Code">💻</a></td>
+    <td align="center"><a href="https://cmnatic.co.uk"><img src="https://avatars3.githubusercontent.com/u/4163116?v=4" width="100px;" alt=""/><br /><sub><b>Ben (CMNatic)</b></sub></a><br /><a href="https://github.com/RustScan/RustScan/commits?author=cmnatic" title="Code">💻</a> <a href="https://github.com/RustScan/RustScan/commits?author=cmnatic" title="Documentation">📖</a> <a href="#design-cmnatic" title="Design">🎨</a></td>
+  </tr>
 </table>

 <!-- markdownlint-enable -->
@@ -8,7 +8,7 @@ TL;DR if you abuse members of our community you will be **perma-banned** with no

 RustScan has 2 major labels for GitHub issues you should look at:
 * Good First issue
-These are issues for newcomers to open source! 
+These are issues for newcomers to open source!
 [https://github.com/RustScan/RustScan/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22](https://github.com/RustScan/RustScan/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22)
 * Help wanted
 These are issues that aren't really for newcomers, but we could still do wiht help!
@@ -16,7 +16,7 @@ These are issues that aren't really for newcomers, but we could still do wiht he

 If you want to, solve the issue or comment on the issue for help.

-The flow for contributing to open source software is:
+The [flow for contributing](https://guides.github.com/introduction/flow/) to open source software is:
 * Fork the repo
 * Make changes
 * Pull request to the repo
@@ -0,0 +1,28 @@
+FROM archlinux:latest
+
+RUN yes | pacman -Syu
+RUN yes | pacman -S fakeroot binutils sudo make gcc gettext awk git
+
+WORKDIR /opt
+RUN git clone https://aur.archlinux.org/yay-git.git
+
+RUN useradd -m tecmint
+RUN passwd -d tecmint
+RUN printf 'tecmint ALL=(ALL) ALL\n' | tee -a /etc/sudoers
+
+WORKDIR /opt/yay-git
+RUN chown -R tecmint /opt/yay-git
+USER tecmint
+RUN makepkg -si --noconfirm
+
+# AUR
+RUN yay -S rustscan --noconfirm
+RUN rustscan 127.0.0.1 -q -b 250 -t 1
+RUN yay -R rustscan --noconfirm
+
+# homebrew
+RUN yes | /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
+ENV PATH="/home/linuxbrew/.linuxbrew/bin:${PATH}"
+RUN yes | brew tap brandonskerritt/rustscan
+RUN yes | brew install rustscan
+RUN rustscan 127.0.0.1 -q -b 250 -t 1
@@ -5,6 +5,7 @@ git pull --force

 #amd64
 cargo deb
+yes | dpkg -i *.deb

 #arm64
 rustup target add arm-unknown-linux-gnueabihf
@@ -1,17 +1,38 @@
 extern crate shell_words;

+mod tui;
+
 mod scanner;
 use scanner::Scanner;

-use colored::*;
+mod port_strategy;
+use port_strategy::PortStrategy;
+
+use colorful::Color;
+use colorful::Colorful;
 use futures::executor::block_on;
 use rlimit::Resource;
 use rlimit::{getrlimit, setrlimit};
-use std::process::{exit, Command};
-use std::{net::IpAddr, time::Duration};
-use structopt::StructOpt;
+use serde_derive::Deserialize;
+use std::collections::HashMap;
+use std::net::ToSocketAddrs;
+use std::process::Command;
+use std::str::FromStr;
+use std::{
+    fs::File,
+    io::{Read, Write},
+    net::IpAddr,
+    path::PathBuf,
+    time::Duration,
+};
+use structopt::{clap::arg_enum, StructOpt};
+use ureq;

+extern crate colorful;
 extern crate dirs;
+
+const LOWEST_PORT_NUMBER: u16 = 1;
+const TOP_PORT_NUMBER: u16 = 65535;
 // Average value for Ubuntu
 const DEFAULT_FILE_DESCRIPTORS_LIMIT: rlimit::rlim = 8000;
 // Safest batch size based on experimentation
@@ -20,6 +41,43 @@ const AVERAGE_BATCH_SIZE: rlimit::rlim = 3000;
 #[macro_use]
 extern crate log;

+arg_enum! {
+    #[derive(Debug, StructOpt)]
+    pub enum ScanOrder {
+        Serial,
+        Random,
+    }
+}
+
+#[derive(Debug)]
+pub struct PortRange {
+    start: u16,
+    end: u16,
+}
+
+fn parse_range(input: &str) -> Result<PortRange, String> {
+    let range = input
+        .split("-")
+        .map(|x| x.parse::<u16>())
+        .collect::<Result<Vec<u16>, std::num::ParseIntError>>();
+
+    if range.is_err() {
+        return Err(String::from(
+            "the range format must be 'start-end'. Example: 1-1000.",
+        ));
+    }
+
+    match range.unwrap().as_slice() {
+        [start, end] => Ok(PortRange {
+            start: *start,
+            end: *end,
+        }),
+        _ => Err(String::from(
+            "the range format must be 'start-end'. Example: 1-1000.",
+        )),
+    }
+}
+
 #[derive(StructOpt, Debug)]
 #[structopt(name = "rustscan", setting = structopt::clap::AppSettings::TrailingVarArg)]
 /// Fast Port Scanner built in Rust.
@@ -28,20 +86,36 @@ extern crate log;
 /// - Discord https://discord.gg/GFrQsGy
 /// - GitHub https://github.com/RustScan/RustScan
 struct Opts {
-    /// The IP address to scan
-    #[structopt(parse(try_from_str))]
-    ip: IpAddr,
+    /// A list of comma separated IP addresses or hosts to be scanned.
+    #[structopt(use_delimiter = true, required = true)]
+    ips_or_hosts: Vec<String>,
+
+    /// A list of comma separed ports to be scanned. Example: 80,443,8080.
+    #[structopt(short, long, use_delimiter = true)]
+    ports: Option<Vec<u16>>,
+
+    /// A range of ports with format start-end. Example: 1-1000.
+    #[structopt(short, long, conflicts_with = "ports", parse(try_from_str = parse_range))]
+    range: Option<PortRange>,

    ///Quiet mode. Only output the ports. No Nmap. Useful for grep or outputting to a file.
    #[structopt(short, long)]
    quiet: bool,

+    //Accessible mode. Turns off features which negatively affect screen readers.
+    #[structopt(short, long)]
+    accessible: bool,
+
+    ///Config file usage
+    #[structopt(short, long)]
+    config: bool,
+
    /// The batch size for port scanning, it increases or slows the speed of
    /// scanning. Depends on the open file limit of your OS.  If you do 65535
    /// it will do every port at the same time. Although, your OS may not
    /// support this.
    #[structopt(short, long, default_value = "4500")]
-    batch_size: u32,
+    batch_size: u16,

    /// The timeout in milliseconds before a port is assumed to be closed.
    #[structopt(short, long, default_value = "1500")]
@@ -51,119 +125,209 @@ struct Opts {
    #[structopt(short, long)]
    ulimit: Option<rlimit::rlim>,

+    /// The order of scanning to be performed. The "serial" option will
+    /// scan ports in ascending order while the "random" option will scan
+    /// ports randomly.
+    #[structopt(long, possible_values = &ScanOrder::variants(), case_insensitive = true, default_value = "serial")]
+    scan_order: ScanOrder,
+
    /// The Nmap arguments to run.
    /// To use the argument -A, end RustScan's args with '-- -A'.
    /// Example: 'rustscan -T 1500 127.0.0.1 -- -A -sC'.
    /// This command adds -Pn -vvv -p $PORTS automatically to nmap.
    /// For things like --script '(safe and vuln)' enclose it in quotations marks \"'(safe and vuln)'\"")
+    #[structopt(last = true)]
    command: Vec<String>,
 }

+#[derive(Deserialize)]
+struct ConfigFile {
+    ip: IpAddr,
+}
+
 #[cfg(not(tarpaulin_include))]
 /// Faster Nmap scanning with Rust
 /// If you're looking for the actual scanning, check out the module Scanner
 fn main() {
-    // logger
    env_logger::init();

    info!("Starting up");
-    let opts = Opts::from_args();
+    let mut opts = Opts::from_args();
+
+    if opts.ports.is_none() && opts.range.is_none() {
+        opts.range = Some(PortRange {
+            start: LOWEST_PORT_NUMBER,
+            end: TOP_PORT_NUMBER,
+        });
+    }
+
    info!("Mains() `opts` arguments are {:?}", opts);

-    if !opts.quiet {
+    if !opts.quiet && !opts.accessible {
        print_opening();
    }

+    /*
+    TODO when releasing the new config file feature
+    turn this on.
+    if opts.config {
+        let config = get_config_file();
+    }*/
+    let ips: Vec<IpAddr> = parse_ips(&opts);
+
+    if ips.is_empty() {
+        warning!("No IPs could be resolved, aborting scan.", false);
+        std::process::exit(1);
+    }
+
    let ulimit: rlimit::rlim = adjust_ulimit_size(&opts);
-    let batch_size: u32 = infer_batch_size(&opts, ulimit);
+    let batch_size: u16 = infer_batch_size(&opts, ulimit);

-    // 65535 + 1 because of 0 indexing
    let scanner = Scanner::new(
-        opts.ip,
-        1,
-        65535,
+        &ips,
        batch_size,
        Duration::from_millis(opts.timeout.into()),
        opts.quiet,
+        PortStrategy::pick(opts.range, opts.ports, opts.scan_order),
    );
+
    let scan_result = block_on(scanner.run());
+    let mut ports_per_ip = HashMap::new();

-    // prints ports and places them into nmap string
-    let nmap_str_ports: Vec<String> = scan_result
-        .into_iter()
-        .map(|port| port.to_string())
-        .collect();
+    for socket in scan_result {
+        ports_per_ip
+            .entry(socket.ip())
+            .or_insert_with(Vec::new)
+            .push(socket.port());
+    }

-    // if no ports are found, suggest running with less
-    if nmap_str_ports.is_empty() {
-        panic!("{} Looks like I didn't find any open ports. This is usually caused by a high batch size.
+    for ip in ips {
+        if ports_per_ip.contains_key(&ip) {
+            continue;
+        }
+
+        // If we got here it means the IP was not found within the HashMap, this
+        // means the scan couldn't find any open ports for it.
+
+        let x = format!("{} Looks like I didn't find any open ports for {:?}. This is usually caused by a high batch size.
        \n*I used {} batch size, consider lowering to {} with {} or a comfortable number for your system.
-        \n Alternatively, increase the timeout if your ping is high. Rustscan -T 2000 for 2000 second timeout.", "ERROR".red(),
+        \n Alternatively, increase the timeout if your ping is high. Rustscan -t 2000 for 2000 second timeout.\n",
+        "ERROR",
+        ip,
        opts.batch_size,
-        (opts.batch_size / 2).to_string().green(),
-        "'rustscan -b <batch_size> <ip address>'".green());
+        (opts.batch_size / 2).to_string(),
+        "'rustscan -b <batch_size> <ip address>'");
+        warning!(x, opts.quiet);
    }

-    // Tells the user we are now switching to Nmap
-    if !opts.quiet {
-        println!("{}", "Starting nmap.".blue(),);
+    for (ip, ports) in ports_per_ip.iter_mut() {
+        let nmap_str_ports: Vec<String> = ports.into_iter().map(|port| port.to_string()).collect();
+
+        detail!("Starting Nmap", opts.quiet);
+
+        // nmap port style is 80,443. Comma separated with no spaces.
+        let ports_str = nmap_str_ports.join(",");
+
+        // if quiet mode is on nmap should not be spawned
+        if opts.quiet {
+            println!("{}", ports_str);
+            continue;
+        }
+
+        let addr = ip.to_string();
+        let user_nmap_args =
+            shell_words::split(&opts.command.join(" ")).expect("failed to parse nmap arguments");
+        let nmap_args = build_nmap_arguments(&addr, &ports_str, &user_nmap_args, ip.is_ipv6());
+
+        output!(format!(
+            "The Nmap command to be run is nmap {}\n",
+            &nmap_args.join(" ")
+        ));
+
+        // Runs the nmap command and spawns it as a process.
+        let mut child = Command::new("nmap")
+            .args(&nmap_args)
+            .spawn()
+            .expect("failed to execute nmap process");
+
+        child.wait().expect("failed to wait on nmap process");
    }
-
-    // nmap port style is 80,443. Comma seperated with no spaces.
-    let ports_str = nmap_str_ports.join(",");
-
-    // if quiet mode is on, return ports and exit
-    if opts.quiet {
-        println!("{}", ports_str);
-        exit(1);
-    }
-
-    let addr = opts.ip.to_string();
-    let user_nmap_args =
-        shell_words::split(&opts.command.join(" ")).expect("failed to parse nmap arguments");
-    let nmap_args = build_nmap_arguments(&addr, &ports_str, &user_nmap_args, opts.ip.is_ipv6());
-
-    if !opts.quiet {
-        println!("The Nmap command to be run is {}", &nmap_args.join(" "));
-    }
-
-    // Runs the nmap command and spawns it as a process.
-    let mut child = Command::new("nmap")
-        .args(&nmap_args)
-        .spawn()
-        .expect("failed to execute nmap process");
-
-    child.wait().expect("failed to wait on nmap process");
 }

 /// Prints the opening title of RustScan
 fn print_opening() {
    info!("Printing opening");
-    let s = "
-     _____           _    _____
-    |  __ \\         | |  / ____|
-    | |__) |   _ ___| |_| (___   ___ __ _ _ __
-    |  _  / | | / __| __|\\___ \\ / __/ _` | '_ \\
-    | | \\ \\ |_| \\__ \\ |_ ____) | (_| (_| | | | |
-    |_|  \\_\\__,_|___/\\__|_____/ \\___\\__,_|_| |_|
-    Faster nmap scanning with rust.";
-    println!("{}\n", s.green());
+    let s = r#".----. .-. .-. .----..---.  .----. .---.   .--.  .-. .-.
+| {}  }| { } |{ {__ {_   _}{ {__  /  ___} / {} \ |  `| |
+| .-. \| {_} |.-._} } | |  .-._} }\     }/  /\  \| |\  |
+`-' `-'`-----'`----'  `-'  `----'  `---' `-'  `-'`-' `-'
+Faster Nmap scanning with Rust."#;
+    println!("{}", s.gradient(Color::Green).bold());
+    let info = r#"________________________________________
+: https://discord.gg/GFrQsGy           :
+: https://github.com/RustScan/RustScan :
+ --------------------------------------"#;
+    println!("{}", info.gradient(Color::Yellow).bold());
+    funny_opening!();
+    // println!("{}", loaded_config_file);
+}

+fn get_config_file() {
+    let result_get_location = get_location_config();
+    let location = match result_get_location {
+        Ok(path) => path,
+        Err(_) => panic!("Your system does not have appdirs."),
+    };
+    info!("The location of config is {:?}", location);
+
+    detail!(format!("The config file is at {:?}", location));
+
+    load_and_parse_config_file(location);
+}
+
+fn get_location_config() -> Result<std::path::PathBuf, &'static str> {
+    info!("Getting location of config file");
    let config_path = match dirs::config_dir() {
        Some(mut path) => {
            path.push("rustscan");
            path.push("config.toml");
-            path
+            Ok(path)
        }
-        None => panic!("Couldn't find config dir."),
+        None => Err("Your system does not have APPDIRS"),
    };
-
-    println!(
-        "{} {:?}\n",
-        "The config file is expected to be at".yellow(),
-        config_path
-    );
+    config_path
 }
+
+fn load_and_parse_config_file(config_path: PathBuf) -> ConfigFile {
+    // Gets the file and returns the string of TOML
+    // TODO quiet mode
+
+    let mut file = File::open(&config_path);
+    let mut file: File = match file {
+        Ok(result) => result,
+        Err(_) => download_place_config_file(config_path),
+    };
+    let mut contents = String::new();
+    file.read_to_string(&mut contents).unwrap();
+    let config: ConfigFile = toml::from_str(&contents).unwrap();
+
+    config
+}
+// Downloads config file
+// Places into Appdirs
+
+fn download_place_config_file(config_location: PathBuf) -> std::fs::File {
+    info!("Placing config file");
+    let body = ureq::get("https://raw.githubusercontent.com/RustScan/RustScan/master/config.toml")
+        .call()
+        .into_string()
+        .unwrap();
+
+    let mut file = File::create(config_location).unwrap();
+    file.write(body.as_bytes()).unwrap();
+    file
+}
+
 #[cfg(not(tarpaulin_include))]
 fn build_nmap_arguments<'a>(
    addr: &'a str,
@@ -172,7 +336,6 @@ fn build_nmap_arguments<'a>(
    is_ipv6: bool,
 ) -> Vec<&'a str> {
    let mut arguments: Vec<&str> = user_args.iter().map(AsRef::as_ref).collect();
-    arguments.push("-A");
    arguments.push("-vvv");

    if is_ipv6 {
@@ -186,17 +349,37 @@ fn build_nmap_arguments<'a>(
    arguments
 }

+fn parse_ips(opts: &Opts) -> Vec<IpAddr> {
+    let mut ips: Vec<IpAddr> = Vec::new();
+
+    for ip_or_host in &opts.ips_or_hosts {
+        match IpAddr::from_str(ip_or_host) {
+            Ok(ip) => ips.push(ip),
+            _ => match format!("{}:{}", &ip_or_host, 80).to_socket_addrs() {
+                Ok(mut iter) => ips.push(iter.nth(0).unwrap().ip()),
+                _ => {
+                    let failed_to_resolve = format!("Host {:?} could not be resolved.", ip_or_host);
+                    warning!(failed_to_resolve, opts.quiet);
+                }
+            },
+        }
+    }
+
+    ips
+}
+
 fn adjust_ulimit_size(opts: &Opts) -> rlimit::rlim {
    if opts.ulimit.is_some() {
        let limit: rlimit::rlim = opts.ulimit.unwrap();

        match setrlimit(Resource::NOFILE, limit, limit) {
            Ok(_) => {
-                if !opts.quiet {
-                    println!("\nAutomatically increasing ulimit value to {}.\n", limit);
-                }
+                detail!(
+                    format!("Automatically increasing ulimit value to {}.", limit),
+                    opts.quiet
+                );
            }
-            Err(_) => println!("{}", "ERROR. Failed to set ulimit value.".red()),
+            Err(_) => println!("{}", "ERROR. Failed to set ulimit value."),
        }
    }

@@ -205,14 +388,14 @@ fn adjust_ulimit_size(opts: &Opts) -> rlimit::rlim {
    rlim
 }

-fn infer_batch_size(opts: &Opts, ulimit: rlimit::rlim) -> u32 {
+fn infer_batch_size(opts: &Opts, ulimit: rlimit::rlim) -> u16 {
    let mut batch_size: rlimit::rlim = opts.batch_size.into();

    // Adjust the batch size when the ulimit value is lower than the desired batch size
    if ulimit < batch_size {
-        if !opts.quiet {
-            println!("{}", "WARNING: Your file description limit is lower than the provided batch size. Please considering upping this (instructions in our README). NOTE: this may be dangerous and may cause harm to sensitive servers. Automatically reducing the batch Size to match your system's limit, this process isn't harmful but reduces speed.".red());
-        }
+        warning!("File limit is lower than default batch size. Consider upping with --ulimt. May cause harm to sensitive servers",
+            opts.quiet
+        );

        // When the OS supports high file limits like 8000, but the user
        // selected a batch size higher than this we should reduce it to
@@ -221,8 +404,8 @@ fn infer_batch_size(opts: &Opts, ulimit: rlimit::rlim) -> u32 {
            // ulimit is smaller than aveage batch size
            // user must have very small ulimit
            // decrease batch size to half of ulimit
+            warning!("Your file limit is very small, which negatively impacts RustScan's speed. Use the Docker image, or up the Ulimit with '--ulimit 5000'. ");
            info!("Halving batch_size because ulimit is smaller than average batch size");
-            println!("{}", "WARNING. Your open file description limit is smaller than expected. You can increase the ulimit with the '-u' flag like '-u 5000' to get default size. Or, use the Docker image. If you do not increase ulimit your RustScan speeds will be much slower in comparison to a normal ulimit.".red());
            batch_size = ulimit / 2
        } else if ulimit > DEFAULT_FILE_DESCRIPTORS_LIMIT {
            info!("Batch size is now average batch size");
@@ -234,112 +417,33 @@ fn infer_batch_size(opts: &Opts, ulimit: rlimit::rlim) -> u32 {
    // When the ulimit is higher than the batch size let the user know that the
    // batch size can be increased unless they specified the ulimit themselves.
    else if ulimit + 2 > batch_size && (opts.ulimit.is_none()) {
-        if !opts.quiet {
-            println!(
-                "Your file descriptor limit is higher than the batch size. You can potentially increase the speed by increasing the batch size, but this may cause harm to sensitive servers. Your limit is {}, try batch size {}.\n",
-                ulimit,
-                ulimit - 1
-            );
-        }
+        detail!(format!(
+                "File limit higher than batch size. Can increase speed by increasing batch size '-b {}'.",
+                ulimit - 100
+            ), opts.quiet);
    }

-    println!("The batch size is {}", batch_size);
-
-    batch_size as u32
+    batch_size as u16
 }

 #[cfg(test)]
 mod tests {
-    use super::Scanner;
-    use crate::{adjust_ulimit_size, build_nmap_arguments, infer_batch_size, print_opening, Opts};
-    use async_std::task::block_on;
-    use std::{net::IpAddr, str::FromStr, time::Duration};
+    use crate::{adjust_ulimit_size, infer_batch_size, parse_ips, print_opening, Opts, ScanOrder};

-    #[test]
-    fn scanner_runs() {
-        // Makes sure te program still runs and doesn't panic
-        let addr = match "127.0.0.1".parse::<IpAddr>() {
-            Ok(res) => res,
-            Err(_) => panic!("Could not parse IP Address"),
-        };
-        let scanner = Scanner::new(addr, 1, 65535, 100, Duration::from_millis(100), true);
-        block_on(scanner.run());
-        // if the scan fails, it wouldn't be able to assert_eq! as it panicked!
-        assert_eq!(1, 1);
-    }
-    #[test]
-    fn ipv6_scanner_runs() {
-        // Makes sure te program still runs and doesn't panic
-        let addr = match "::1".parse::<IpAddr>() {
-            Ok(res) => res,
-            Err(_) => panic!("Could not parse IP Address"),
-        };
-        let scanner = Scanner::new(addr, 1, 65535, 100, Duration::from_millis(100), false);
-        block_on(scanner.run());
-        // if the scan fails, it wouldn't be able to assert_eq! as it panicked!
-        assert_eq!(1, 1);
-    }
-    #[test]
-    fn quad_zero_scanner_runs() {
-        let addr = match "0.0.0.0".parse::<IpAddr>() {
-            Ok(res) => res,
-            Err(_) => panic!("Could not parse IP Address"),
-        };
-        let scanner = Scanner::new(addr, 1, 1000, 100, Duration::from_millis(500), true);
-        block_on(scanner.run());
-        assert_eq!(1, 1);
-    }
-    #[test]
-    fn zero_ports_no_return_no_panic() {
-        let addr = match "0.0.0.0".parse::<IpAddr>() {
-            Ok(res) => res,
-            Err(_) => panic!("Could not parse IP Address"),
-        };
-        let scanner = Scanner::new(addr, 1, 1, 100, Duration::from_millis(50), true);
-        block_on(scanner.run());
-        assert_eq!(1, 1);
-    }
-    #[test]
-    fn backwards_ports_scanner_runs() {
-        let addr = match "0.0.0.0".parse::<IpAddr>() {
-            Ok(res) => res,
-            Err(_) => panic!("Could not parse IP Address"),
-        };
-        let scanner = Scanner::new(addr, 10, 1, 100, Duration::from_millis(50), true);
-        block_on(scanner.run());
-        assert_eq!(1, 1);
-    }
-    #[test]
-    fn google_dns_runs() {
-        let addr = match "8.8.8.8".parse::<IpAddr>() {
-            Ok(res) => res,
-            Err(_) => panic!("Could not parse IP Address"),
-        };
-        let scanner = Scanner::new(addr, 400, 445, 100, Duration::from_millis(1500), true);
-        block_on(scanner.run());
-        assert_eq!(1, 1);
-    }
-    #[test]
-    fn infer_ulimit_lowering_no_panic() {
-        // this test is because of a bug where Mac OS didn't automatically lower ulimit
-        let addr = match "8.8.8.8".parse::<IpAddr>() {
-            Ok(res) => res,
-            Err(_) => panic!("Could not parse IP Address"),
-        };
-        // mac should have this automatically scaled down
-        let scanner = Scanner::new(addr, 400, 600, 10_000, Duration::from_millis(1500), true);
-        block_on(scanner.run());
-        assert_eq!(1, 1);
-    }
    #[test]
    fn batch_size_lowered() {
        let opts = Opts {
-            ip: IpAddr::from_str("127.0.0.1").unwrap(),
+            ips_or_hosts: vec!["127.0.0.1".to_owned()],
+            ports: None,
+            range: None,
            quiet: true,
            batch_size: 50_000,
-            timeout: 1000,
-            ulimit: Some(2000),
+            timeout: 1_000,
+            ulimit: Some(2_000),
            command: Vec::new(),
+            config: false,
+            accessible: false,
+            scan_order: ScanOrder::Serial,
        };
        let batch_size = infer_batch_size(&opts, 120);

@@ -349,66 +453,147 @@ mod tests {
    #[test]
    fn batch_size_lowered_average_size() {
        let opts = Opts {
-            ip: IpAddr::from_str("127.0.0.1").unwrap(),
+            ips_or_hosts: vec!["127.0.0.1".to_owned()],
+            ports: None,
+            range: None,
            quiet: true,
            batch_size: 50_000,
-            timeout: 1000,
-            ulimit: Some(2000),
+            timeout: 1_000,
+            ulimit: Some(2_000),
            command: Vec::new(),
+            config: false,
+            accessible: false,
+            scan_order: ScanOrder::Serial,
        };
-        let batch_size = infer_batch_size(&opts, 9000);
+        let batch_size = infer_batch_size(&opts, 9_000);

-        assert!(batch_size == 3000);
+        assert!(batch_size == 3_000);
    }
    #[test]
    fn batch_size_equals_ulimit_lowered() {
        // because ulimit and batch size are same size, batch size is lowered
        // to ULIMIT - 100
        let opts = Opts {
-            ip: IpAddr::from_str("127.0.0.1").unwrap(),
+            ips_or_hosts: vec!["127.0.0.1".to_owned()],
+            ports: None,
+            range: None,
            quiet: true,
            batch_size: 50_000,
-            timeout: 1000,
-            ulimit: Some(2000),
+            timeout: 1_000,
+            ulimit: Some(2_000),
            command: Vec::new(),
+            config: false,
+            accessible: false,
+            scan_order: ScanOrder::Serial,
        };
-        let batch_size = infer_batch_size(&opts, 5000);
+        let batch_size = infer_batch_size(&opts, 5_000);

-        assert!(batch_size == 4900);
+        assert!(batch_size == 4_900);
    }
    #[test]
    fn batch_size_adjusted_2000() {
        // ulimit == batch_size
        let opts = Opts {
-            ip: IpAddr::from_str("127.0.0.1").unwrap(),
+            ips_or_hosts: vec!["127.0.0.1".to_owned()],
+            ports: None,
+            range: None,
            quiet: true,
            batch_size: 50_000,
-            timeout: 1000,
-            ulimit: Some(2000),
+            timeout: 1_000,
+            ulimit: Some(2_000),
            command: Vec::new(),
+            config: false,
+            accessible: false,
+            scan_order: ScanOrder::Serial,
        };
        let batch_size = adjust_ulimit_size(&opts);

-        assert!(batch_size == 2000);
+        assert!(batch_size == 2_000);
    }
    #[test]
    fn test_print_opening_no_panic() {
-        // print opening should not paniic
+        // print opening should not panic
        print_opening();
        assert!(1 == 1);
    }
    #[test]
    fn test_high_ulimit_no_quiet_mode() {
        let opts = Opts {
-            ip: IpAddr::from_str("127.0.0.1").unwrap(),
+            ips_or_hosts: vec!["127.0.0.1".to_owned()],
+            ports: None,
+            range: None,
            quiet: false,
            batch_size: 10,
-            timeout: 1000,
+            timeout: 1_000,
            ulimit: None,
            command: Vec::new(),
+            config: false,
+            accessible: true,
+            scan_order: ScanOrder::Serial,
        };
-        let batch_size = infer_batch_size(&opts, 1000000);
+
+        infer_batch_size(&opts, 1_000_000);

        assert!(1 == 1);
    }
+
+    #[test]
+    fn parse_correct_ips_or_hosts() {
+        let opts = Opts {
+            ips_or_hosts: vec!["127.0.0.1".to_owned(), "google.com".to_owned()],
+            ports: None,
+            range: None,
+            quiet: true,
+            batch_size: 10,
+            timeout: 1_000,
+            ulimit: Some(2_000),
+            command: Vec::new(),
+            accessible: false,
+            scan_order: ScanOrder::Serial,
+            config: false,
+        };
+        let ips = parse_ips(&opts);
+
+        assert_eq!(2, ips.len());
+    }
+
+    #[test]
+    fn parse_correct_and_incorrect_ips_or_hosts() {
+        let opts = Opts {
+            ips_or_hosts: vec!["127.0.0.1".to_owned(), "im_wrong".to_owned()],
+            ports: None,
+            range: None,
+            quiet: true,
+            batch_size: 10,
+            timeout: 1_000,
+            ulimit: Some(2_000),
+            command: Vec::new(),
+            accessible: false,
+            scan_order: ScanOrder::Serial,
+            config: false,
+        };
+        let ips = parse_ips(&opts);
+
+        assert_eq!(1, ips.len());
+    }
+
+    #[test]
+    fn parse_incorrect_ips_or_hosts() {
+        let opts = Opts {
+            ips_or_hosts: vec!["im_wrong".to_owned(), "300.10.1.1".to_owned()],
+            ports: None,
+            range: None,
+            quiet: true,
+            batch_size: 10,
+            timeout: 1_000,
+            ulimit: Some(2_000),
+            command: Vec::new(),
+            accessible: false,
+            scan_order: ScanOrder::Serial,
+            config: false,
+        };
+        let ips = parse_ips(&opts);
+
+        assert_eq!(0, ips.len());
+    }
 }
@@ -0,0 +1,136 @@
+mod range_iterator;
+use super::{PortRange, ScanOrder};
+use rand::seq::SliceRandom;
+use rand::thread_rng;
+use range_iterator::RangeIterator;
+
+/// Represents options of port scanning.
+///
+/// Right now all these options involve ranges, but in the future
+/// it will also contain custom lists of ports.
+pub enum PortStrategy {
+    Manual(Vec<u16>),
+    Serial(SerialRange),
+    Random(RandomRange),
+}
+
+impl PortStrategy {
+    pub fn pick(range: Option<PortRange>, ports: Option<Vec<u16>>, order: ScanOrder) -> Self {
+        match order {
+            ScanOrder::Serial if ports.is_none() => {
+                let range = range.as_ref().unwrap();
+                PortStrategy::Serial(SerialRange {
+                    start: range.start,
+                    end: range.end,
+                })
+            }
+            ScanOrder::Random if ports.is_none() => {
+                let range = range.as_ref().unwrap();
+                PortStrategy::Random(RandomRange {
+                    start: range.start,
+                    end: range.end,
+                })
+            }
+            ScanOrder::Serial => PortStrategy::Manual(ports.unwrap()),
+            ScanOrder::Random => {
+                let mut rng = thread_rng();
+                let mut ports = ports.unwrap();
+                ports.shuffle(&mut rng);
+                PortStrategy::Manual(ports)
+            }
+        }
+    }
+
+    pub fn order(&self) -> Vec<u16> {
+        match self {
+            PortStrategy::Manual(ports) => ports.to_vec(),
+            PortStrategy::Serial(range) => range.generate(),
+            PortStrategy::Random(range) => range.generate(),
+        }
+    }
+}
+
+/// Trait associated with a port strategy. Each PortStrategy must be able
+/// to generate an order for future port scanning.
+trait RangeOrder {
+    fn generate(&self) -> Vec<u16>;
+}
+
+/// As the name implies SerialRange will always generate a vector in
+/// ascending order.
+pub struct SerialRange {
+    start: u16,
+    end: u16,
+}
+
+impl RangeOrder for SerialRange {
+    fn generate(&self) -> Vec<u16> {
+        (self.start..self.end).collect()
+    }
+}
+
+/// As the name implies RandomRange will always generate a vector with
+/// a random order. This vector is built following the LCG algorithm.
+pub struct RandomRange {
+    start: u16,
+    end: u16,
+}
+
+impl RangeOrder for RandomRange {
+    // Right now using RangeIterator and generating a range + shuffling the
+    // vector is pretty much the same. The advantages of it will come once
+    // we have to generate different ranges for different IPs without storing
+    // actual vectors.
+    //
+    // Another benefit of RangeIterator is that it always generate a range with
+    // a certain distance between the items in the Array. The chances of having
+    // port numbers close to each other are pretty slim due to the way the
+    // algorithm works.
+    fn generate(&self) -> Vec<u16> {
+        RangeIterator::new(self.start.into(), self.end.into()).collect()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::PortStrategy;
+    use crate::{PortRange, ScanOrder};
+
+    #[test]
+    fn serial_strategy_with_range() {
+        let range = PortRange { start: 1, end: 100 };
+        let strategy = PortStrategy::pick(Some(range), None, ScanOrder::Serial);
+        let result = strategy.order();
+        let expected_range = (1..100).into_iter().collect::<Vec<u16>>();
+        assert_eq!(expected_range, result);
+    }
+    #[test]
+    fn random_strategy_with_range() {
+        let range = PortRange { start: 1, end: 100 };
+        let strategy = PortStrategy::pick(Some(range), None, ScanOrder::Random);
+        let mut result = strategy.order();
+        let expected_range = (1..100).into_iter().collect::<Vec<u16>>();
+        assert_ne!(expected_range, result);
+
+        result.sort();
+        assert_eq!(expected_range, result);
+    }
+
+    #[test]
+    fn serial_strategy_with_ports() {
+        let strategy = PortStrategy::pick(None, Some(vec![80, 443]), ScanOrder::Serial);
+        let result = strategy.order();
+        assert_eq!(vec![80, 443], result);
+    }
+
+    #[test]
+    fn random_strategy_with_ports() {
+        let strategy = PortStrategy::pick(None, Some((1..10).collect()), ScanOrder::Random);
+        let mut result = strategy.order();
+        let expected_range = (1..10).into_iter().collect::<Vec<u16>>();
+        assert_ne!(expected_range, result);
+
+        result.sort();
+        assert_eq!(expected_range, result);
+    }
+}
@@ -0,0 +1,129 @@
+use gcd::Gcd;
+use rand::Rng;
+
+pub struct RangeIterator {
+    active: bool,
+    normalized_end: u32,
+    normalized_first_pick: u32,
+    normalized_pick: u32,
+    actual_start: u32,
+    step: u32,
+}
+
+/// An iterator that follows the `Linear Congruential Generator` algorithm.
+///
+/// For more information: https://en.wikipedia.org/wiki/Linear_congruential_generator
+impl RangeIterator {
+    /// Receives the the start and end of a range and normalize
+    /// these values before selecting a coprime for the end of the range
+    /// which will server as the step for the algorithm.
+    ///
+    /// For example, the range `1000-2500` will be normalized to `0-1500`
+    /// before going through the algorithm.
+    pub fn new(start: u32, end: u32) -> Self {
+        let normalized_end = end - start;
+        let step = pick_random_coprime(normalized_end);
+
+        // Randomly choose a number within the range to be the first
+        // and assign it as a pick.
+        let mut rng = rand::thread_rng();
+        let normalized_first_pick = rng.gen_range(0, normalized_end);
+
+        Self {
+            active: true,
+            normalized_end,
+            step,
+            normalized_first_pick,
+            normalized_pick: normalized_first_pick,
+            actual_start: start,
+        }
+    }
+}
+
+impl Iterator for RangeIterator {
+    type Item = u16;
+
+    // The next step is always bound by the formula: N+1 = (N + STEP) % TOP_OF_THE_RANGE
+    // It will only stop once we generate a number equal to the first generated number.
+    fn next(&mut self) -> Option<Self::Item> {
+        if !self.active {
+            return None;
+        }
+
+        let current_pick = self.normalized_pick;
+        let next_pick = (current_pick + self.step) % self.normalized_end;
+
+        // If the next pick is equal to the first pick this means that
+        // we have iterated through the entire range.
+        if next_pick == self.normalized_first_pick {
+            self.active = false;
+        }
+
+        self.normalized_pick = next_pick;
+        Some((self.actual_start + current_pick) as u16)
+    }
+}
+
+/// The probability that two random integers are coprime to one another
+/// works out to be around 61%, given that we can safely pick a random
+/// number and test it. Just in case we are having a bad day and we cannot
+/// pick a coprime number after 10 tries we just return "end - 1" which
+/// is guaranteed to be a coprime, but won't provide ideal randomization.
+///
+/// We pick between "lower_range" and "upper_range" since values too close to
+/// the boundaries, which in these case are the "start" and "end" arguments
+/// would also provide non-ideal randomization as discussed on the paragraph
+/// above.
+fn pick_random_coprime(end: u32) -> u32 {
+    let range_boundary = end / 4;
+    let lower_range = range_boundary;
+    let upper_range = end - range_boundary;
+    let mut rng = rand::thread_rng();
+    let mut candidate = rng.gen_range(lower_range, upper_range);
+
+    for _ in 0..10 {
+        if end.gcd(candidate) == 1 {
+            return candidate;
+        } else {
+            candidate = rng.gen_range(lower_range, upper_range);
+        }
+    }
+
+    end - 1
+}
+
+#[cfg(test)]
+mod tests {
+    use super::RangeIterator;
+
+    #[test]
+    fn range_iterator_iterates_through_the_entire_range() {
+        let result = generate_sorted_range(1, 10);
+        let expected_range = (1..10).into_iter().collect::<Vec<u16>>();
+        assert_eq!(expected_range, result);
+
+        let result = generate_sorted_range(1, 100);
+        let expected_range = (1..100).into_iter().collect::<Vec<u16>>();
+        assert_eq!(expected_range, result);
+
+        let result = generate_sorted_range(1, 1000);
+        let expected_range = (1..1000).into_iter().collect::<Vec<u16>>();
+        assert_eq!(expected_range, result);
+
+        let result = generate_sorted_range(1, 65_535);
+        let expected_range = (1..65_535).into_iter().collect::<Vec<u16>>();
+        assert_eq!(expected_range, result);
+
+        let result = generate_sorted_range(1000, 2000);
+        let expected_range = (1000..2000).into_iter().collect::<Vec<u16>>();
+        assert_eq!(expected_range, result);
+    }
+
+    fn generate_sorted_range(start: u32, end: u32) -> Vec<u16> {
+        let range = RangeIterator::new(start, end);
+        let mut result = range.into_iter().collect::<Vec<u16>>();
+        result.sort();
+
+        result
+    }
+}
@@ -1,139 +0,0 @@
-use async_std::io;
-use async_std::net::TcpStream;
-use async_std::prelude::*;
-use colored::*;
-use futures::stream::FuturesUnordered;
-use std::time::Duration;
-use std::{
-    io::ErrorKind,
-    net::{IpAddr, Shutdown, SocketAddr},
-};
-
-/// The class for the scanner
-/// Host is data type IpAddr and is the host address
-/// start & end is where the port scan starts and ends
-/// batch_size is how many ports at a time should be scanned
-/// Timeout is the time RustScan should wait before declaring a port closed. As datatype Duration.
-/// Quiet is whether or not RustScan should print things, or wait until the end to print only open ports.
-#[cfg(not(tarpaulin_include))]
-pub struct Scanner {
-    host: IpAddr,
-    start: u16,
-    end: u16,
-    batch_size: u32,
-    timeout: Duration,
-    quiet: bool,
-}
-
-impl Scanner {
-    pub fn new(
-        host: IpAddr,
-        start: u16,
-        end: u16,
-        batch_size: u32,
-        timeout: Duration,
-        quiet: bool,
-    ) -> Self {
-        Self {
-            host: host.to_owned(),
-            start,
-            end,
-            batch_size,
-            timeout,
-            quiet,
-        }
-    }
-
-    /// Runs scan_range with chunk sizes
-    /// If you want to run RustScan normally, this is the entry point used
-    /// Returns all open ports as Vec<u16>
-    pub async fn run(&self) -> Vec<u16> {
-        let ports: Vec<u16> = (self.start..self.end).collect();
-        let mut open_ports: std::vec::Vec<u16> = Vec::new();
-        // TODO change this to port size
-        // to fix bug when we introduce custom port ranges
-
-        for range in ports.chunks(self.batch_size as usize) {
-            let mut ports = self.scan_range(range).await;
-            open_ports.append(&mut ports);
-        }
-
-        open_ports
-    }
-
-    /// Given a range of ports, scan them all.
-    /// Returns a vector of open ports.
-    async fn scan_range(&self, range: &[u16]) -> Vec<u16> {
-        let mut ftrs = FuturesUnordered::new();
-        for port in range {
-            ftrs.push(self.scan_port(*port));
-        }
-
-        let mut open_ports: Vec<u16> = Vec::new();
-        while let Some(result) = ftrs.next().await {
-            match result {
-                Ok(port) => open_ports.push(port),
-                _ => {}
-            }
-        }
-
-        open_ports
-    }
-
-    /// Given a port, scan it.
-    /// Turns the address into a SocketAddr
-    /// Deals with the <result> type
-    /// If it experiences error ErrorKind::Other then too many files are open and it Panics!
-    /// ese any other error, it returns the error in Result as a string
-    /// If no  errors occur, it returns the port number in Result to signify the port is open.
-    /// This function mainly deals with the logic of Results handling.
-    /// # Example
-    ///
-    ///     self.scan_port(10:u16)
-    ///
-    /// Note: `self` must contain `self.host`.
-    async fn scan_port(&self, port: u16) -> io::Result<u16> {
-        let addr = SocketAddr::new(self.host, port);
-        // println!("{:?}", addr);
-        match self.connect(addr).await {
-            Ok(x) => {
-                // match stream_result.shutdown(Shutdown::Both)
-                info!("Shutting down stream");
-                match x.shutdown(Shutdown::Both) {
-                    _ => {}
-                }
-                if !self.quiet {
-                    println!("Open {}", port.to_string().purple());
-                }
-                // if connection successful
-                // shut down stream
-                // return port
-                Ok(port)
-            }
-            Err(e) => match e.kind() {
-                ErrorKind::Other => {
-                    panic!("Too many open files. Please reduce batch size. The default is 5000. Try -b 2500.");
-                }
-                _ => Err(io::Error::new(io::ErrorKind::Other, e.to_string())),
-            },
-        }
-    }
-
-    /// Performs the connection to the socket with timeout
-    /// # Example
-    ///
-    ///     let port: u16 = 80
-    ///     // Host is an IpAddr type
-    ///     let host = IpAddr::V6(Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 1));
-    ///     let addr = SocketAddr::new(host, port)
-    ///     self.connect(addr)
-    ///     // returns Result which is either Ok(stream) for port is open, or Er for port is closed.
-    ///     // Timeout occurs after self.timeout seconds
-    ///
-    async fn connect(&self, addr: SocketAddr) -> io::Result<TcpStream> {
-        let stream =
-            io::timeout(self.timeout, async move { TcpStream::connect(addr).await }).await?;
-        info!("Returning okay from connect");
-        Ok(stream)
-    }
-}
@@ -0,0 +1,213 @@
+use super::PortStrategy;
+
+use async_std::io;
+use async_std::net::TcpStream;
+use async_std::prelude::*;
+use colored::*;
+use futures::stream::FuturesUnordered;
+use std::time::Duration;
+use std::{
+    io::ErrorKind,
+    net::{IpAddr, Shutdown, SocketAddr},
+};
+
+/// The class for the scanner
+/// IP is data type IpAddr and is the IP address
+/// start & end is where the port scan starts and ends
+/// batch_size is how many ports at a time should be scanned
+/// Timeout is the time RustScan should wait before declaring a port closed. As datatype Duration.
+/// Quiet is whether or not RustScan should print things, or wait until the end to print only open ports.
+#[cfg(not(tarpaulin_include))]
+pub struct Scanner {
+    ips: Vec<IpAddr>,
+    batch_size: u16,
+    timeout: Duration,
+    quiet: bool,
+    port_strategy: PortStrategy,
+}
+
+impl Scanner {
+    pub fn new(
+        ips: &[IpAddr],
+        batch_size: u16,
+        timeout: Duration,
+        quiet: bool,
+        port_strategy: PortStrategy,
+    ) -> Self {
+        Self {
+            batch_size,
+            timeout,
+            quiet,
+            port_strategy,
+            ips: ips.iter().map(|ip| ip.to_owned()).collect(),
+        }
+    }
+
+    /// Runs scan_range with chunk sizes
+    /// If you want to run RustScan normally, this is the entry point used
+    /// Returns all open ports as Vec<u16>
+    pub async fn run(&self) -> Vec<SocketAddr> {
+        let ports: Vec<u16> = self.port_strategy.order();
+        let batch_per_ip: usize = self.batch_size as usize / self.ips.len();
+        let mut open_sockets: Vec<SocketAddr> = Vec::new();
+
+        for batch in ports.chunks(batch_per_ip) {
+            let mut sockets = self.scan_ports(batch).await;
+            open_sockets.append(&mut sockets);
+        }
+
+        open_sockets
+    }
+
+    /// Given a slice of sockets, scan them all.
+    /// Returns a vector of open sockets.
+    async fn scan_ports(&self, ports: &[u16]) -> Vec<SocketAddr> {
+        let mut ftrs = FuturesUnordered::new();
+        for port in ports {
+            for ip in &self.ips {
+                ftrs.push(self.scan_socket(SocketAddr::new(*ip, *port)));
+            }
+        }
+
+        let mut open_sockets: Vec<SocketAddr> = Vec::new();
+        while let Some(result) = ftrs.next().await {
+            match result {
+                Ok(socket) => open_sockets.push(socket),
+                _ => {}
+            }
+        }
+
+        open_sockets
+    }
+
+    /// Given a port, scan it.
+    /// Turns the address into a SocketAddr
+    /// Deals with the <result> type
+    /// If it experiences error ErrorKind::Other then too many files are open and it Panics!
+    /// ese any other error, it returns the error in Result as a string
+    /// If no  errors occur, it returns the port number in Result to signify the port is open.
+    /// This function mainly deals with the logic of Results handling.
+    /// # Example
+    ///
+    ///     self.scan_port(10:u16)
+    ///
+    /// Note: `self` must contain `self.ip`.
+    async fn scan_socket(&self, socket: SocketAddr) -> io::Result<SocketAddr> {
+        match self.connect(socket).await {
+            Ok(x) => {
+                // match stream_result.shutdown(Shutdown::Both)
+                info!("Shutting down stream");
+                match x.shutdown(Shutdown::Both) {
+                    _ => {}
+                }
+                if !self.quiet {
+                    println!("Open {}", socket.to_string().purple());
+                }
+
+                Ok(socket)
+            }
+            Err(e) => match e.kind() {
+                ErrorKind::Other => {
+                    panic!("Too many open files. Please reduce batch size. The default is 5000. Try -b 2500.");
+                }
+                _ => Err(io::Error::new(io::ErrorKind::Other, e.to_string())),
+            },
+        }
+    }
+
+    /// Performs the connection to the socket with timeout
+    /// # Example
+    ///
+    ///     let port: u16 = 80
+    ///     // ip is an IpAddr type
+    ///     let ip = IpAddr::V6(Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 1));
+    ///     let socket = SocketAddr::new(ip, port);
+    ///     self.connect(socket)
+    ///     // returns Result which is either Ok(stream) for port is open, or Er for port is closed.
+    ///     // Timeout occurs after self.timeout seconds
+    ///
+    async fn connect(&self, socket: SocketAddr) -> io::Result<TcpStream> {
+        let stream = io::timeout(
+            self.timeout,
+            async move { TcpStream::connect(socket).await },
+        )
+        .await?;
+        Ok(stream)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::{PortRange, ScanOrder};
+    use async_std::task::block_on;
+    use std::{net::IpAddr, time::Duration};
+
+    #[test]
+    fn scanner_runs() {
+        // Makes sure the program still runs and doesn't panic
+        let addrs = vec!["127.0.0.1".parse::<IpAddr>().unwrap()];
+        let range = PortRange {
+            start: 1,
+            end: 1_000,
+        };
+        let strategy = PortStrategy::pick(Some(range), None, ScanOrder::Random);
+        let scanner = Scanner::new(&addrs, 10, Duration::from_millis(100), true, strategy);
+        block_on(scanner.run());
+        // if the scan fails, it wouldn't be able to assert_eq! as it panicked!
+        assert_eq!(1, 1);
+    }
+    #[test]
+    fn ipv6_scanner_runs() {
+        // Makes sure the program still runs and doesn't panic
+        let addrs = vec!["::1".parse::<IpAddr>().unwrap()];
+        let range = PortRange {
+            start: 1,
+            end: 1_000,
+        };
+        let strategy = PortStrategy::pick(Some(range), None, ScanOrder::Random);
+        let scanner = Scanner::new(&addrs, 10, Duration::from_millis(100), true, strategy);
+        block_on(scanner.run());
+        // if the scan fails, it wouldn't be able to assert_eq! as it panicked!
+        assert_eq!(1, 1);
+    }
+    #[test]
+    fn quad_zero_scanner_runs() {
+        let addrs = vec!["0.0.0.0".parse::<IpAddr>().unwrap()];
+        let range = PortRange {
+            start: 1,
+            end: 1_000,
+        };
+        let strategy = PortStrategy::pick(Some(range), None, ScanOrder::Random);
+        let scanner = Scanner::new(&addrs, 10, Duration::from_millis(100), true, strategy);
+        block_on(scanner.run());
+        assert_eq!(1, 1);
+    }
+    #[test]
+    fn google_dns_runs() {
+        let addrs = vec!["8.8.8.8".parse::<IpAddr>().unwrap()];
+        let range = PortRange {
+            start: 400,
+            end: 445,
+        };
+        let strategy = PortStrategy::pick(Some(range), None, ScanOrder::Random);
+        let scanner = Scanner::new(&addrs, 10, Duration::from_millis(100), true, strategy);
+        block_on(scanner.run());
+        assert_eq!(1, 1);
+    }
+    #[test]
+    fn infer_ulimit_lowering_no_panic() {
+        // Test behaviour on MacOS where ulimit is not automatically lowered
+        let addrs = vec!["8.8.8.8".parse::<IpAddr>().unwrap()];
+
+        // mac should have this automatically scaled down
+        let range = PortRange {
+            start: 400,
+            end: 600,
+        };
+        let strategy = PortStrategy::pick(Some(range), None, ScanOrder::Random);
+        let scanner = Scanner::new(&addrs, 10, Duration::from_millis(100), true, strategy);
+        block_on(scanner.run());
+        assert_eq!(1, 1);
+    }
+}
@@ -0,0 +1,64 @@
+/// Terminal User Interface Module for RustScan
+/// Defines macros to use
+
+#[macro_export]
+macro_rules! warning {
+    ($name:expr) => {
+        use ansi_term::Colour::Red;
+        println!("{} {}", Red.bold().paint("[!]"), $name);
+    };
+    // quiet mode
+    ($name:expr, $quiet:expr) => {
+        use ansi_term::Colour::Red;
+        if !$quiet {
+            println!("{} {}", Red.bold().paint("[!]"), $name);
+        }
+    };
+}
+
+#[macro_export]
+macro_rules! detail {
+    ($name:expr) => {
+        use ansi_term::Colour::Blue;
+        println!("{} {}", Blue.bold().paint("[~]"), $name);
+    };
+    ($name:expr, $quiet:expr) => {
+        use ansi_term::Colour::Blue;
+        if !$quiet {
+            println!("{} {}", Blue.bold().paint("[~]"), $name);
+        }
+    };
+}
+
+#[macro_export]
+macro_rules! output {
+    ($name:expr, $quiet:expr) => {
+        use ansi_term::Colour::RGB;
+        if !$quiet {
+            println!("{} {}", RGB(0, 255, 9).bold().paint("[>]"), $name);
+        }
+    };
+    ($name:expr) => {
+        use ansi_term::Colour::RGB;
+        println!("{} {}", RGB(0, 255, 9).bold().paint("[>]"), $name);
+    };
+}
+
+#[macro_export]
+macro_rules! funny_opening {
+    // prints a funny quote / opening
+    () => {
+        use rand::seq::SliceRandom;
+        let quotes = vec![
+            "Nmap? More like slowmap.🐢",
+            "🌍HACK THE PLANET🌍",
+            "Real hackers hack time ⌛",
+            "Please contribute more quotes to our GitHub https://github.com/rustscan/rustscan",
+            "😵 https://admin.tryhackme.com",
+        ];
+        let random_quote = quotes.choose(&mut rand::thread_rng()).unwrap();
+
+        println!("{}\n", random_quote);
+        // println!("{} {}", RGB(0, 255, 9).bold().paint("[>]"), $name);
+    };
+}
Author	SHA1	Message	Date
Brandon	f1078304ae	Merge branch 'master' into bee-add-config-file	2020-08-24 17:12:59 +01:00
Brandon	22cbfc5826	Merge pull request #159 from RustScan/bee-add-nmap-ports updated config file to feature nmap top 1k ports	2020-08-24 16:49:13 +01:00
Brandon	c5091728a0	Added config file functionality	2020-08-24 16:43:11 +01:00
Brandon	a9d729300c	Merge branch 'master' into bee-add-nmap-ports	2020-08-24 13:49:10 +01:00
Brandon	4f5dd20e85	Merge pull request #162 from RustScan/ba-reduce-binary-size Reduce binary size from 2.4MB to 1.9MB	2020-08-24 12:48:45 +01:00
Bernardo Chaves	499ff66f36	Reduce binary size from 2.4MB to 1.9MB By default, Cargo instructs compilation units to be compiled and optimized in isolation. LTO instructs the linker to optimize at the link stage. This can, for example, remove dead code and often times reduces binary size. By default, when Rust code encounters a situation when it must call panic!(), it unwinds the stack and produces a helpful backtrace. The unwinding code, however, does require extra binary size. rustc can be instructed to abort immediately rather than unwind, which removes the need for this extra unwinding code. For more information see: https://github.com/johnthagen/min-sized-rust	2020-08-23 18:10:53 -04:00
Brandon	61b87243d9	Merge pull request #161 from RustScan/ba-refactor-port-strategy Allow randomized order for manual ports	2020-08-22 22:27:37 +01:00
Bernardo Chaves	e069991c8d	Allow randomized order for manual ports Before this change we would always scan manually specified ports in sequential way, this is not the case anymore. This is an important change since we are planning to introduce a config file with the top 1K ports and we would like to scan those in a randomized way.	2020-08-21 13:09:41 -04:00
Brandon	85c1cbf445	Merge pull request #160 from RustScan/bee-remove-A removed -A from nmap	2020-08-20 22:58:39 +01:00
Brandon	5551e64166	updated AUR package in readme	2020-08-20 00:40:41 +01:00
Brandon	e0aa1423ad	removed -A from nmap	2020-08-20 00:32:37 +01:00
Brandon	e609b3617c	updated config file to feature nmap top 1k ports	2020-08-20 00:05:45 +01:00
Brandon	d0d8380296	Merge pull request #158 from RustScan/ba-add-port-and-range-options Add --port and --range options	2020-08-19 16:26:39 +01:00
Brandon	d66ad34f8c	Merge branch 'master' into ba-add-port-and-range-options	2020-08-19 16:02:49 +01:00
Brandon	2670ec43df	Merge pull request #156 from spenserblack/exclude-files Exclude files	2020-08-19 00:05:59 +01:00
Bernardo Chaves	90d0b03ba7	Add --port and --range options These options are mutually exclusive, this means that when a user selects manual ports we will ignore ranges and vice-versa. Manually specifying ports won't allow scan randomization for now.	2020-08-17 20:43:44 -04:00
Spenser Black	57eb3627b3	Use absolute image URLs instead of relative	2020-08-17 10:03:04 -04:00
Spenser Black	7e675b7557	Reduce crate size	2020-08-17 09:30:07 -04:00
Bernardo Araujo	fdeaa05f23	Merge pull request #152 from RustScan/ba-add-host-resolution Add host resolution	2020-08-16 18:35:40 -04:00
Bernardo Araujo	9fbf39f0cc	Merge branch 'master' into ba-add-host-resolution	2020-08-16 18:11:27 -04:00
Ben (CMNatic)	14b6ea928d	Merge pull request #155 from CMNatic/master Updated README to use the rustscan dockerhub alpine image	2020-08-16 22:39:10 +01:00
Ben (CMNatic)	9452b1f922	Update README to add a disclaimer about the DockerHub Images + Instruct user to use the `alpine` image as it's considered the latest major release as per the release page + Formatting instructions	2020-08-16 22:37:51 +01:00
Ben (CMNatic)	ed12888e81	Updated README to use the rustscan dockerhub alpine image + Added another step to clarify process for Docker as the build will fail if the user is not in the downloaded repo + DockerHub has CI with master branch and two images tags `latest` and `alpine` where `alpine` is tagged on feature releases (currently 1.7.1)	2020-08-16 22:28:57 +01:00
Bernardo Chaves	f68abcb955	Add host resolution For now if we can establish a socket on port 80 we can infer the IP of the host. This might change in the future if we start considering other ports like 443.	2020-08-16 11:52:11 -04:00
Brandon	4c91e8fb40	Merge pull request #153 from andy5995/docs docs: fix typo in README.md, link to GitHub flow in contributing doc	2020-08-15 11:08:03 +01:00
andy5995	1d3e831066	docs: fix typo in README.md, link to GitHub flow in contributing doc	2020-08-15 02:05:20 -05:00
dependabot-preview[bot]	ff6b1c40db	Merge pull request #151 from RustScan/dependabot/cargo/async-std-1.6.3	2020-08-15 00:58:44 +00:00
dependabot-preview[bot]	5573d91a7b	Bump async-std from 1.6.2 to 1.6.3 Bumps [async-std](https://github.com/async-rs/async-std) from 1.6.2 to 1.6.3. - [Release notes](https://github.com/async-rs/async-std/releases) - [Changelog](https://github.com/async-rs/async-std/blob/master/CHANGELOG.md) - [Commits](https://github.com/async-rs/async-std/commits/v1.6.3) Signed-off-by: dependabot-preview[bot] <[email protected]>	2020-08-14 08:38:10 +00:00
Brandon	a8e56eec4b	Merge pull request #149 from RustScan/all-contributors/add-cmnatic docs: add cmnatic as a contributor	2020-08-13 22:56:14 +01:00
Brandon	fb75c9d332	Merge branch 'master' into all-contributors/add-cmnatic	2020-08-13 22:43:56 +01:00
Ben (CMNatic)	581ec27cb5	Merge pull request #148 from CMNatic/master Updated README to include instructions on building the new Dockerfile	2020-08-13 20:25:05 +01:00
allcontributors[bot]	9673c8807d	docs: update .all-contributorsrc [skip ci]	2020-08-13 19:24:12 +00:00
allcontributors[bot]	78818d6bc7	docs: update README.md [skip ci]	2020-08-13 19:24:11 +00:00
Ben (CMNatic)	d0ff597be6	Updated README to include instructions on building the new Dockerfile	2020-08-13 20:11:58 +01:00
Ben (CMNatic)	516ebe367a	Merge pull request #118 from Hydragyrum/feature/create-alpine-based-dockerfile Feature/create alpine based dockerfile	2020-08-13 19:41:52 +01:00
Ben (CMNatic)	1e9660e4ff	Merge branch 'master' into feature/create-alpine-based-dockerfile	2020-08-13 19:32:13 +01:00
Brandon	7b4dda5a19	Merge pull request #147 from RustScan/dependabot/cargo/rlimit-0.4.0 Bump rlimit from 0.3.0 to 0.4.0	2020-08-13 11:40:23 +01:00
dependabot-preview[bot]	a20b71191d	Bump rlimit from 0.3.0 to 0.4.0 Bumps [rlimit](https://github.com/Nugine/rlimit) from 0.3.0 to 0.4.0. - [Release notes](https://github.com/Nugine/rlimit/releases) - [Commits](https://github.com/Nugine/rlimit/compare/v0.3.0...v0.4.0) Signed-off-by: dependabot-preview[bot] <[email protected]>	2020-08-13 08:36:23 +00:00
Brandon	18c5dd69e5	Merge pull request #145 from RustScan/all-contributors/add-TGotwig docs: add TGotwig as a contributor	2020-08-11 19:45:15 +01:00
Brandon	090264ac26	Merge branch 'master' into all-contributors/add-TGotwig	2020-08-11 19:32:11 +01:00
Bernardo Araujo	702681606f	Merge pull request #146 from RustScan/bee-fix-spelling fixed spelling mistake	2020-08-10 20:59:20 -04:00
Brandon	c58ac613c9	fixed spelling mistake	2020-08-11 01:47:25 +01:00
Brandon	44b53fb877	Merge pull request #143 from RustScan/all-contributors/add-remigourdon docs: add remigourdon as a contributor	2020-08-10 21:47:24 +01:00
Brandon	99e72e4a16	Merge branch 'master' into all-contributors/add-remigourdon	2020-08-10 21:12:53 +01:00
Brandon	e02073bd97	Merge pull request #144 from TGotwig/master Add Makefile for cross-compiling to Linux & Mac 👷‍♂️	2020-08-10 21:12:34 +01:00
allcontributors[bot]	59bb72426d	docs: update .all-contributorsrc [skip ci]	2020-08-10 19:57:32 +00:00
allcontributors[bot]	f48590c238	docs: update README.md [skip ci]	2020-08-10 19:57:31 +00:00
tgotwig	a3eb548ae9	Add Makefile for cross-compiling to Linux & Mac 👷‍♂️	2020-08-10 15:04:06 +02:00
allcontributors[bot]	050a8baf48	docs: update .all-contributorsrc [skip ci]	2020-08-10 12:39:34 +00:00
allcontributors[bot]	9b893dbf71	docs: update README.md [skip ci]	2020-08-10 12:39:33 +00:00
Brandon	8245ccf31e	Fixing all contributors	2020-08-10 13:38:53 +01:00
Brandon	301a656006	Merge pull request #138 from RustScan/ba-update-readme-instructions Update documentation	2020-08-10 13:02:21 +01:00
Bernardo Chaves	1639aadc54	Update documentation - README - Port strategies	2020-08-09 12:29:16 -04:00
Brandon	c66bb50508	Merge pull request #132 from RustScan/ba-optimize-range-generator Refactor RangeIterator to not require Option types	2020-08-09 01:13:54 +01:00
Bernardo Chaves	b490eb08be	Refactor RangeIterator to not require Option types There's no need to deal with `unwrap` for this specific algorithm, instead we can rely on simple types to achieve the same result.	2020-08-08 14:08:43 -04:00
Brandon	990e92dcbf	Merge pull request #134 from RustScan/bee-add-a11y-mode Add a11y mode	2020-08-08 13:45:59 +01:00
Brandon	883e89fe5e	cargo fmt	2020-08-08 13:26:45 +01:00
Brandon	1b15cc2f71	Merge branch 'master' into bee-add-a11y-mode	2020-08-08 13:24:41 +01:00
Brandon	18b574f6bb	Merge pull request #137 from Nugine/fix-typo Fix typo of "ulimt"	2020-08-08 13:22:12 +01:00
Nugine	3fafee42b9	Fix typo of "ulimt"	2020-08-08 19:54:12 +08:00
Brandon	8b21dfd9a2	Merge pull request #135 from RustScan/ba-add-scan-strategy Add port scanning strategy	2020-08-08 00:43:07 +01:00
Bernardo Chaves	2f16729c54	Add port scanning strategy User will be able to pick from: - serial: in order to have their ports scanned in ascending order - random: in order to have their ports scanned randomly	2020-08-07 18:59:44 -04:00
Brandon	785c2a4de1	fixed tests	2020-08-07 22:28:57 +01:00
Brandon	80cc97bf83	removed perf data	2020-08-07 22:04:33 +01:00
Brandon	7a825dae41	the printopening() would suck in a TTS program	2020-08-07 21:39:53 +01:00
Brandon	751c4daff6	1.7.1	2020-08-07 17:48:37 +01:00
Brandon	f6214cfb27	Merge branch 'master' of github.com:brandonskerritt/RustScan	2020-08-07 17:48:10 +01:00
Brandon	a92eb80365	updated lock files	2020-08-07 17:30:39 +01:00
Brandon	aeab4fb68c	Merge pull request #131 from RustScan/bee-colours Added TUI A11Y colours + Quiet Mode Macros	2020-08-07 17:25:57 +01:00
Brandon	9ab15c9d8b	cargo fmt	2020-08-07 17:11:14 +01:00
Brandon	7146c23ed9	cleanup	2020-08-07 17:06:43 +01:00
Brandon	f37f2d8f9d	switching to master	2020-08-07 16:50:42 +01:00
Brandon	5a3a4d1c0c	cargo fmt	2020-08-07 16:36:14 +01:00
Brandon	33e7cd44b6	added quiet mode to macros	2020-08-07 16:33:25 +01:00
Brandon	8288856949	added quotes	2020-08-07 13:21:19 +01:00
Brandon	c3b96e262d	Merge pull request #130 from RustScan/bee-add-TUI-module Bee add tui module	2020-08-07 12:53:46 +01:00
Brandon	a54868000e	cargo format	2020-08-07 12:37:05 +01:00
Brandon	8f4acdf99a	cleaned up colours	2020-08-07 12:33:44 +01:00
Brandon	c637042906	fixed visual table	2020-08-07 02:08:12 +01:00
Brandon	766164588c	fixed spacing	2020-08-07 01:53:14 +01:00
Brandon	b2be83c04a	added basic TUI interface	2020-08-07 00:52:56 +01:00
Brandon	a3654b68eb	added basic TUI interface	2020-08-07 00:40:28 +01:00
Brandon	1873a92951	Merge pull request #128 from RustScan/dependabot/cargo/structopt-0.3.16 Bump structopt from 0.3.15 to 0.3.16	2020-08-06 11:25:24 +01:00
dependabot-preview[bot]	c7a422b962	Bump structopt from 0.3.15 to 0.3.16 Bumps [structopt](https://github.com/TeXitoi/structopt) from 0.3.15 to 0.3.16. - [Release notes](https://github.com/TeXitoi/structopt/releases) - [Changelog](https://github.com/TeXitoi/structopt/blob/master/CHANGELOG.md) - [Commits](https://github.com/TeXitoi/structopt/commits) Signed-off-by: dependabot-preview[bot] <[email protected]>	2020-08-06 08:39:30 +00:00
Bernardo Chaves	0eec9233bd	Make use of our new RangeIterator We now rely on a pseudo random generator to scan our IPs. We also interleave IP scanning in order to not overwhelm a single IP.	2020-08-06 01:36:36 +01:00
Bernardo Chaves	0f18bb49a3	Add pseudo random port scanning This is based on the Linear Congruential Generator algorithm which guarantees we will iterate through an entire range in a pseudo random manner. This implementation should be bound in memory by the batch_size specified by the user, which will be in average 1_000.	2020-08-06 01:36:36 +01:00
Adam Bertrand	8b363571f1	Merge branch 'master' into feature/create-alpine-based-dockerfile	2020-08-05 21:52:34 +02:00
yogendra0sharma	e546608ff8	show batch_size to user	2020-08-05 19:12:53 +01:00
yogendra0sharma	a7d1952b72	Fix Issue Unneccesary text printed	2020-08-05 19:12:53 +01:00
Hydragyrum	0fa11f6e51	Add a non-privileged user to run rustscan	2020-08-05 18:53:06 +02:00
Adam Bertrand	d423f34e7a	Merge branch 'master' into feature/create-alpine-based-dockerfile	2020-08-05 18:25:54 +02:00
Brandon	67726cc490	1.6	2020-08-04 23:30:52 +01:00
Brandon	d5d39cacd3	Merge pull request #117 from RustScan/ba-implement-multi-ip Support multiple IPs	2020-08-04 23:21:17 +01:00
Bernardo Chaves	52cbbeeac6	Adjust messages taking into account quiet mode	2020-08-04 17:40:23 -04:00
Hydragyrum	e17f9d0bb1	Add newline to dockerfile	2020-08-04 23:18:12 +02:00
Hydragyrum	3329428766	Create a basic Alpine-Based Dockerfile	2020-08-04 23:17:30 +02:00
Bernardo Chaves	23c049413b	Support multiple IPs IPs should be provided in a comma separated list. Right now every IP will be scanned sequentially and NMAP will run before the next IP scan starts. This will change on the long term once we provide randomized scans in order to not overwhelm hosts or trigger detection systems in place.	2020-08-04 16:17:27 -04:00
Brandon	9858406271	fixing cargo.toml issue	2020-08-04 16:43:14 +01:00
Brandon	6abb3737ec	cargo updates	2020-08-04 16:40:32 +01:00
Brandon	65b9cb1659	cargo update	2020-08-04 16:36:48 +01:00
Brandon	d2684baead	1.5	2020-08-04 16:36:24 +01:00
Brandon	5a40bc4182	Merge pull request #116 from RustScan/bee-add-section-deb Bee add section deb #114	2020-08-04 15:09:40 +01:00
Brandon	f03f15a6d0	Merge branch 'master' into bee-add-section-deb	2020-08-04 13:30:34 +01:00
Brandon	9740d54912	Merge pull request #112 from RustScan/all-contributors/add-Atul9 docs: add Atul9 as a contributor	2020-08-04 12:55:46 +01:00
Brandon	f577cd23bd	Merge branch 'master' into all-contributors/add-Atul9	2020-08-04 12:49:57 +01:00
Brandon	f16d704c86	Update README.md	2020-08-04 12:45:50 +01:00
Brandon	e5368a31db	Made it new line	2020-08-04 12:44:50 +01:00
Brandon	01c2580672	Made Docker command shorter	2020-08-04 12:44:14 +01:00
Brandon	200382a731	Update README.md	2020-08-04 12:42:03 +01:00
Brandon	6a000762a5	Merge branch 'master' into all-contributors/add-Atul9	2020-08-04 12:38:56 +01:00
Brandon	e9b21338ef	Added Docker to README	2020-08-04 12:28:49 +01:00
Brandon	bd436221ca	Merge branch 'master' into all-contributors/add-Atul9	2020-08-04 12:18:04 +01:00
Brandon	5d16af21f1	Updated 404 links & added emojis	2020-08-04 11:51:15 +01:00
Brandon	e331789598	Merge pull request #105 from Atul9/cleanup-readme Clean up the README file	2020-08-04 11:44:02 +01:00
Brandon	bf56b10ff4	Merge branch 'master' into all-contributors/add-Atul9	2020-08-04 11:29:57 +01:00
Brandon	719c38bd32	Update README.md	2020-08-04 11:29:05 +01:00
Atul Bhosale	a08fe2456d	Rename Community section heading to Contributing [ci skip]	2020-08-04 08:09:49 +05:30
Atul Bhosale	db1831c4b8	Replace Homebrew in Readme table with Docker [ci skip]	2020-08-04 08:09:49 +05:30
Atul Bhosale	74e2ff026a	Move table of contents higher up [ci skip]	2020-08-04 08:09:49 +05:30
Atul Bhosale	897c1c4091	Move important links under features [ci skip]	2020-08-04 08:09:49 +05:30
Brandon	a9340bb622	Merge pull request #108 from RustScan/bee-fix-mac-os-ulimit Bee fix mac os ulimit	2020-08-03 23:48:00 +01:00
allcontributors[bot]	137f8669fe	docs: update .all-contributorsrc [skip ci]	2020-08-03 17:55:15 +00:00
allcontributors[bot]	c658b0ea70	docs: update README.md [skip ci]	2020-08-03 17:55:14 +00:00