更新版本至1.5.0

Author: muddlelife

Cargo.toml

@@ -1,15 +1,18 @@
 [package]
 name = "windfire"
-version = "1.4.0"
+version = "1.5.0"
 authors = ["muddlelife <[email protected]>"]
 edition = "2021"
 
 [dependencies]
 clap = { version = "4.5.17",features = ["derive"] }
+crossbeam = "0.8.4"
+csv = "1.3.0"
 futures = "0.3.30"
 lazy_static = "1.5.0"
 regex = "1.10.6"
 reqwest = { version = "0.12.7" ,features = ["socks"]}
+serde = { version = "1.0.210", features = ["derive"] }
 tokio = { version = "1.40.0", features = ["full"] }
 
 [profile.release]

README.md

@@ -16,6 +16,7 @@ Options:
   -c, --status-code <STATUS_CODE>  Display the specified status code [default: 200]
   -p, --path <PATH>                Designated path scan [default: ]
   -x, --proxy <PROXY>              Supported Proxy socks5, http, and https, Example: -x socks5://127.0.0.1:1080
+  -o, --output <OUTPUT>            Output is an csv document, Example: -o result.csv 
   -h, --help                       Print help (see more with '--help')
   -V, --version                    Print version
 ```
@@ -51,6 +52,10 @@ windfire -f urls.txt > result.txt
 ```shell
 windfire -f urls.txt -x socks5://127.0.0.1:1080
 ```
+6. 批量执行，可保存为csv文件
+```shell
+windfire -f urls.txt -o result.csv
+```
 ## 默认打印信息
 ```shell
 https://www.baidu.com [200] [百度一下，你就知道] [BWS/1.1] [https://www.baidu.com/] [414219]

src/httpclient.rs

@@ -1,6 +1,7 @@
-use crate::utils::get_format_info;
+use crate::utils::{get_format_info, ScanInfo};
 use reqwest::{header, Client};
 use std::time::Duration;
+use crossbeam::queue::SegQueue;
 
 pub const USER_AGENT: &str =
     "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:128.0) Gecko/20100101 Firefox/128.0";
@@ -62,6 +63,7 @@ pub async fn send_request(
     url: &str,
     u16_vec: Vec<u16>,
     path: &str,
+    seg_queue: &SegQueue<ScanInfo>,
 ) -> Result<String, reqwest::Error> {
     // 解析URL，如果path为空，则默认为/，如果有值，则加上，还需要处理url有没有/
     let url = if path.is_empty() {
@@ -77,16 +79,25 @@ pub async fn send_request(
 
     let response = client.get(url.as_str()).send().await?;
 
-    let scan_info = get_format_info(response);
+    let scan_info = get_format_info(response,url);
     let scan_info = scan_info.await;
 
+    let url = scan_info.url;
     let status_code = scan_info.status_code;
     let title = scan_info.title;
     let content_length = scan_info.content_length;
     let server = scan_info.server;
     let jump_url = scan_info.jump_url;
 
     if u16_vec.contains(&status_code) {
+        seg_queue.push(ScanInfo {
+            url: url.to_string(),
+            status_code,
+            title: title.to_string(),
+            server: server.to_string(),
+            jump_url: jump_url.to_string(),
+            content_length,
+        });
         Ok(format!(
             "{} [{}] [{}] [{}] [{}] [{}]",
             url, status_code, title, server, jump_url, content_length

src/main.rs

@@ -1,9 +1,10 @@
 use crate::httpclient::{create_http_client, send_request};
-use crate::utils::read_file;
+use crate::utils::{queue_to_csv, read_file, ScanInfo};
 use clap::Parser;
 use futures::future::join_all;
 use reqwest::Client;
 use std::sync::Arc;
+use crossbeam::queue::SegQueue;
 use tokio::sync::Semaphore;
 use tokio::task;
 
@@ -12,7 +13,7 @@ mod utils;
 
 #[derive(Parser, Debug)]
 #[command(
-    version = "1.4.0",
+    version = "1.5.0",
     about = "An efficient and fast url survival detection tool",
     long_about = "Efficient URL activity tester written in Rust. Fast, batch, and lightweight"
 )]
@@ -44,6 +45,10 @@ struct Args {
     /// Supported Proxy socks5, http, and https, Example: -x socks5://127.0.0.1:1080
     #[arg(short = 'x', long)]
     proxy: Option<String>,
+
+    /// Output is an csv document, Example: -o result.csv
+    #[arg(short = 'o', long)]
+    output: Option<String>,
 }
 
 #[tokio::main]
@@ -59,10 +64,11 @@ async fn main() {
 
     let path = args.path;
     let proxy = args.proxy;
+    let seg_queue: Arc<SegQueue<ScanInfo>> = Arc::new(SegQueue::new());
 
     if let Some(url) = args.url {
         let client = create_http_client(args.timeout, proxy);
-        let result = send_request(client, &url, u16_vec, &path).await;
+        let result = send_request(client, &url, u16_vec, &path, &seg_queue).await;
         match result {
             Ok(result) => {
                 if result != "" {
@@ -85,9 +91,10 @@ async fn main() {
                     let client: Client = client.clone();
                     let u16_vec = u16_vec.clone();
                     let path = path.clone();
+                    let seg_queue = Arc::clone(&seg_queue);
                     futures.push(task::spawn(async move {
                         let permit = semaphore.acquire().await.unwrap();
-                        let result = send_request(client, url.as_str(), u16_vec, &path).await;
+                        let result = send_request(client, url.as_str(), u16_vec, &path, &seg_queue).await;
                         match result {
                             Ok(result) => {
                                 if result != "" {
@@ -100,6 +107,10 @@ async fn main() {
                     }));
                 }
                 join_all(futures).await;
+                // 保存结果为CSV
+                if let Some(output) = args.output {
+                    queue_to_csv(&seg_queue, output.as_str()).ok();
+                }
             }
             Err(e) => {
                 println!("{}", e)

src/utils.rs

@@ -4,6 +4,9 @@ use reqwest::Response;
 use std::net::Ipv4Addr;
 use std::str::FromStr;
 use tokio::fs::File;
+use crossbeam::queue::SegQueue;
+use csv::WriterBuilder;
+use serde::{Deserialize, Serialize};
 use tokio::io::{AsyncBufReadExt, BufReader};
 
 lazy_static! {
@@ -59,16 +62,18 @@ pub(crate) async fn read_file(path: &str) -> Result<Vec<String>, tokio::io::Erro
 }
 
 // 获取目标结果
+#[derive(Debug, Serialize, Deserialize, Clone)]
 pub struct ScanInfo {
+    pub url: String,
     pub status_code: u16,
     pub title: String,
-    pub content_length: usize,
     pub server: String,
     pub jump_url: String, // 跳转后的url
+    pub content_length: usize,
 }
 
 // 根据响应获取响应结果
-pub async fn get_format_info(response: Response) -> ScanInfo {
+pub async fn get_format_info(response: Response, url: String) -> ScanInfo {
     let status_code = response.status().as_u16();
     let jump_url = response.url().to_string();
 
@@ -85,6 +90,7 @@ pub async fn get_format_info(response: Response) -> ScanInfo {
     let title = extract_title(&content).unwrap_or("".to_string());
 
     ScanInfo {
+        url,
         status_code,
         title,
         content_length,
@@ -140,3 +146,12 @@ pub fn cidr_to_ip_range(cidr: &str) -> Vec<String> {
 
     ip_list
 }
+
+// 将结果转为csv表格
+pub fn queue_to_csv(scan_info_queue: &SegQueue<ScanInfo>, path: &str)  -> Result<(), Box<dyn std::error::Error>>{
+    let mut wtr = WriterBuilder::new().from_path(path)?;
+    while let Some(info) = scan_info_queue.pop() {
+        wtr.serialize(info)?;
+    }
+    Ok(())
+}