push v2.1.0

L-codes · Oct 25, 2021 · b543ac0 · b543ac0
1 parent 9656b8d
commit b543ac0
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,25 @@
 # Change Log
 
+### v2.1.0:
+    更新简述: 内网探测，更快，更准，更方便!!!
+
+    新特征:
+        1. 新增 -g 参数，可方便指定内网网管地址范围作为目标
+        2. 新增 -cnet 参数，可将输入的目标地址转成 CIDR mask 24 进行扫描
+        3. 新增 -hp 参数，可在随机端口扫描下指定优先扫描的端口列表
+        4. 新增 -ep 参数，排除端口
+        5. 新增 -sh 参数，打印扫描主机列表
+    增强:
+        1. 增强错误主机地址匹配，减少错误信息提示
+        2. CIDR 格式的目标地址，忽略网络地址和广播地址
+        3. 检测设置端口范围有效性
+        4. 增加结果保存信息提醒
+        5. 增强 -i 参数的目标文件列表读取，可使用 "#" 开头注释，并且目标列表从覆盖改成了追加
+        6. 对可选参数进行分类，优化了 help 打印信息
+    修复:
+        1. 发包任务计数错误显示
+        2. 修复 pps 显示 BUG
+
 ### v2.0.0:
     更新简述: 更快，更准，更方便!!!
 

diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@
 
 ## Version
 
-2.0.0 - [版本修改日志](CHANGELOG.md)
+2.1.0 - [版本修改日志](CHANGELOG.md)
 
 
 
@@ -32,13 +32,14 @@
 1. 直接运行，查看帮助信息 (所有参数与语法说明)
 ```ruby
 $ ./mx1014
+
                           ...                                     .
                         .111111111111111.........................1111
       ......111..    .10011111011111110000000000000000111111111100000
   10010000000011.1110000001.111.111......1111111111111111..........
   10twelve0111...   .10001. ..
   100011...          1001               MX1014 by L
-  .001              1001               Version 2.0.0
+  .001              1001               Version 2.1.0
   .1.              ...1.
 
 
@@ -52,23 +53,34 @@ Target Example:
     github.com:22,443,rce
 
 Options:
-    -p  Ports  Default port ranges. (Default is "in" port group)
+  [Target]
     -i  File   Target input from list
+    -g  Net    Intranet gateway address range (10/100/172/192/all)
+    -sh        Show scan target
+    -cnet      C net mode
+
+  [Port]
+    -p  Ports  Default port ranges (Default is "in" port group)
+    -sp        Only show default ports (see -p)
+    -ep Ports  Exclude port (see -p)
+    -hp Ports  Priority scan port (Default 80,443,8080,22,445,3389)
+    -fuzz      Fuzz Port
+
+  [Connect]
     -t  Int    The Number of Goroutine (Default is 512)
-    -T  Int    TCP Connect Timeout (Default is 1514ms)
-    -o  File   Output file path
-    -r         Scan in import order
+    -T  Int    TCP Connect Timeout (Default is 1980ms)
     -u         UDP spray
     -e         Echo mode (TCP needs to be manually)
+    -A         Disable auto discard
+    -a  Int    Too many filtered, Discard the host (Default is 512)
+
+  [Output]
+    -o  File   Output file path
     -c         Allow display of closed ports (Only TCP)
     -d  Str    Specify Echo mode data (Default is "%port%\n")
     -D  Int    Progress Bar Refresh Delay (Default is 5s)
     -l         Output alive host
-    -a  Int    Too many filtered, Discard the host (Default is 1014)
-    -A         Disable auto disable
     -v         Verbose mode
-    -fuzz      Fuzz Port
-    -sp        Only show default ports (see -p)
 ```
 
 2. 简单扫描三百多个内网常见端口
@@ -168,6 +180,14 @@ $ ./mx1014 -sp -p 80 -fuzz
 81,80,8080,79
 ```
 
+8. 快速探测内网资产
+```ruby
+# 通过 80 端口找到内网存活的网段
+$ ./mx1014 -l -p 80 -g all -o up.txt
+# 根据存活的网段进行 C 段探测
+$ ./mx1014 -cnet -i up.txt
+```
+
 ## Port Group
 ```ruby
 # NOTE Reference:

diff --git a/mx1014.go b/mx1014.go
@@ -656,7 +656,7 @@ func usage() {
   10010000000011.1110000001.111.111......1111111111111111..........
   10twelve0111...   .10001. ..
   100011...          1001               MX1014 by L
-  .001              1001               Version 2.0.1
+  .001              1001               Version 2.1.0
   .1.              ...1.