Working file input

.all-contributorsrc

@@ -193,15 +193,6 @@
         "bug",
         "design"
       ]
-    },
-    {
-      "login": "dmitris",
-      "name": "Dmitry Savintsev",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/31205?v=4",
-      "profile": "https://github.com/dmitris",
-      "contributions": [
-        "code"
-      ]
     }
   ],
   "contributorsPerLine": 7,

.gitignore

@@ -118,5 +118,6 @@ fabric.properties
 .idea/caches/build_file_checksums.ser
 
 .idea/*
-.idea
 .idea*
+.idea
+

Dockerfile

@@ -1,11 +1,8 @@
 FROM rust:alpine as builder
-LABEL maintainer="CMNatic <https://github.com/CMNatic">
 RUN apk add --no-cache build-base
 
-# Encourage some layer caching here rather then copying entire directory that includes docs to builder container ~CMN
 WORKDIR /usr/src/rustscan
-COPY Cargo.toml Cargo.lock ./
-COPY src src
+COPY . .
 RUN cargo install --path .
 
 FROM alpine:3.12
@@ -16,4 +13,4 @@ RUN addgroup -S rustscan && \
     apk add --no-cache nmap nmap-scripts wget
 COPY --from=builder /usr/local/cargo/bin/rustscan /usr/local/bin/rustscan
 USER rustscan
-ENTRYPOINT [ "/usr/local/bin/rustscan" ]
+ENTRYPOINT [ "/usr/local/bin/rustscan" ]

README.md

@@ -427,7 +427,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-20-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-19-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)):
@@ -460,7 +460,6 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="https://liberapay.com/Artem4/"><img src="https://avatars0.githubusercontent.com/u/5614476?v=4" width="100px;" alt=""/><br /><sub><b>Artem Polishchuk</b></sub></a><br /><a href="#platform-tim77" title="Packaging/porting to new platform">📦</a></td>
     <td align="center"><a href="https://github.com/buermarc"><img src="https://avatars2.githubusercontent.com/u/44375277?v=4" width="100px;" alt=""/><br /><sub><b>buermarc</b></sub></a><br /><a href="https://github.com/RustScan/RustScan/commits?author=buermarc" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/bergabman"><img src="https://avatars1.githubusercontent.com/u/44554109?v=4" width="100px;" alt=""/><br /><sub><b>bergabman</b></sub></a><br /><a href="https://github.com/RustScan/RustScan/commits?author=bergabman" title="Code">💻</a> <a href="https://github.com/RustScan/RustScan/issues?q=author%3Abergabman" title="Bug reports">🐛</a> <a href="#design-bergabman" title="Design">🎨</a></td>
-    <td align="center"><a href="https://github.com/dmitris"><img src="https://avatars0.githubusercontent.com/u/31205?v=4" width="100px;" alt=""/><br /><sub><b>Dmitry Savintsev</b></sub></a><br /><a href="https://github.com/RustScan/RustScan/commits?author=dmitris" title="Code">💻</a></td>
   </tr>
 </table>
 

src/input.rs

@@ -1,6 +1,7 @@
 use serde_derive::Deserialize;
 use std::collections::HashMap;
 use std::fs;
+use std::path::PathBuf;
 use structopt::{clap::arg_enum, StructOpt};
 
 const LOWEST_PORT_NUMBER: u16 = 1;
@@ -105,6 +106,10 @@ pub struct Opts {
     #[structopt(long, possible_values = &ScanOrder::variants(), case_insensitive = true, default_value = "serial")]
     pub scan_order: ScanOrder,
 
+    /// Input file containing IP addresses delimited by new lines
+    #[structopt(short, long)]
+    pub input: Option<PathBuf>,
+
     /// 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'.
@@ -198,6 +203,7 @@ pub struct Config {
     no_nmap: Option<bool>,
     ulimit: Option<rlimit::rlim>,
     scan_order: Option<ScanOrder>,
+    input: Option<PathBuf>,
     command: Option<Vec<String>>,
 }
 

src/main.rs

@@ -234,18 +234,19 @@ fn parse_addresses(opts: &Opts) -> Vec<IpAddr> {
             Ok(cidr) => cidr.iter().for_each(|ip| ips.push(ip)),
             _ => match format!("{}:{}", &ip_or_host, 80).to_socket_addrs() {
                 Ok(mut iter) => ips.push(iter.nth(0).unwrap().ip()),
-                _ => match read_ips_from_file(ip_or_host.to_owned()) {
-                    Ok(x) => ips.extend(x),
-                    _ => {
-                        warning!(
-                            format!("Host {:?} could not be resolved.", ip_or_host),
-                            opts.greppable,
-                            opts.accessible
-                        );
-                    }
-                },
+                _ => {
+                    warning!(
+                        format!("Host {:?} could not be resolved.", ip_or_host),
+                        opts.greppable,
+                        opts.accessible
+                    );
+                }
             },
         }
+        match read_ips_from_file(ip_or_host.to_owned()) {
+            Ok(x) => ips.extend(x),
+            _ => (),
+        }
     }
 
     ips