push v2.4.0

L-codes · Feb 20, 2023 · 9ce7500 · 9ce7500
1 parent 4e56054
commit 9ce7500
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Change Log
 
+### v2.4.0:
+    新特征:
+        1. 新增 -r 参数，开启自动检测排除端口全开放的目标(如 synproxy)，避免无意结果出现
+        2. Unix 环境运行时可自动尝试调节`ulimit -n`限制
+    增强：
+        1. 错误信息优化
+        2. 遇到 `too many open files` 错误则结束扫描并提醒，避免无意义扫描
+        3. 扫描端口列表更新
+
 ### v2.3.1:
     更新简述: 支持更多平台运行!!!
     增强:

diff --git a/README.md b/README.md
@@ -7,18 +7,20 @@
 
 ## Version
 
-2.3.1 - [版本修改日志](CHANGELOG.md)
+2.4.0 - [版本修改日志](CHANGELOG.md)
 
 
 ## Features
 
 * 兼容 nmap 的端口和目标语法，并支持导入多个 TARGET, 灵活扫描
 * 扫描过程中有自动判定主机存活是否继续扫描其主机的机制，从而加快端口探测速度
+* 可对端口全开放的(如synproxy)目标，进行自动排除，避免出现无意义的扫描结果
 * 使用端口分组的概念，方便指定特定端口组，进行针对性扫描 (端口别名，参考下面的 "Port Group")
 * 支持 TCP/UDP 的 Echo 回显数据发送 (UDP 不会返回端口状态)，便于出网探测
 * 支持 TCP closed 状态显示，便于主机存活与出网探测
 * 支持端口模糊测试
 * 支持各组目标扫描不同的端口
+* Unix 环境运行时可自动尝试调节`ulimit -n`限制
 * windows 最低环境支持 xp/2003 等 (即兼容 Golang 1.10.8)
 * 支持 Linux 2.6.18 等 (即兼容 Golang 1.10.8)
 * 使用 epollwait 修改编译, release 兼容 CentOS5
@@ -190,6 +192,11 @@ $ ./mx1014 -sp -p 80 -fuzz
 81,80,8080,79
 ```
 
+8. 自动排除端口全开放的主机，如 syn-proxy
+```ruby
+$ ./mx1014 -r -i targets.txt
+```
+
 
 ## Port Group
 ```ruby
@@ -205,7 +212,7 @@ $ ./mx1014 -sp -p 80 -fuzz
 
   # web
   web1: "80,443,8080",
-  web2: "81-90,444,800,801,1024,1443,2000,2001,3001,4430,4433,4443,5000,5001,5555,5800,6000-6003,6080,6443,6588,6666,6888,7004-7009,7080,7443,7777,8000-8030,8040,8060,8066,8070,8080-8111,8181,8182,8200,8282,8363,8761,8787,8800,8848,8866,8873,8881-8890,8899,8900,8989,8999,9000-9010,9999,10000,10001,10080,10800,18080,18090,activemq,arl,baota,cassini,dlink,ejinshan,fastcgi,flink,fortigate,hivision,ifw8,iis,java_ws,jboss,kc_aom,kibana,natshell,nexus,oracle_web,portainer,rabbitmq,rizhiyi,sapido,seeyon,solr,squid,weblogic,websphere_web,yapi,elasticsearch,zabbix,grafana",
+  web2: "81-90,444,800,801,1024,1443,2000,2001,3001,4430,4433,4443,5000,5001,5555,5800,6000-6003,6080,6443,6588,6666,6888,7004-7009,7080,7443,7777,8000-8030,8040,8060,8066,8070,8080-8111,8181,8182,8200,8282,8363,8761,8787,8800,8848,8866,8873,8881-8890,8899,8900,8989,8999,9000-9010,9999,10000,10001,10080,10800,18080,18090,activemq,arl,baota,cassini,dlink,ejinshan,fastcgi,flink,fortigate,hivision,ifw8,iis,java_ws,jboss,kc_aom,kibana,natshell,nexus,oracle_web,portainer,rabbitmq,rizhiyi,sapido,seeyon,solr,squid,weblogic,websphere_web,yapi,elasticsearch,zabbix,grafana,wildfly",
   iis: "80,443,47001",
   jboss: "80,1111,4444,4445,8080,8443,45566",
   zookeeper: "2181,2888,3888",
@@ -219,6 +226,7 @@ $ ./mx1014 -sp -p 80 -fuzz
   rabbitmq: "15672",
   flink: "8081",
   oracle_web: "3339",
+  wildfly: "9990",
   baota: "888,8888",
   fastcgi: "9000",
   kc_aom: "12580",
@@ -316,7 +324,8 @@ $ ./mx1014 -sp -p 80 -fuzz
   hashicorp: "8500",
   checkpoint: "264",
   pcanywhere: "5632",
-  docker: "2375,2376,2377,4243,5000",
+  docker: "2375,2376,2377,4243,5000,10250",
+  etcd: "2379",
   iscsi: "3260",
   saprouter: "3299",
   distcc: "3632",

diff --git a/mx1014.go b/mx1014.go
@@ -636,12 +636,12 @@ var (
     hostMap           = make(map[string][]string) // rawtarget: hosts
     targetFilterCount = make(map[string]int)
     portGroup = map[string][]int {
-      "in": []int{ 21,22,23,25,80,81,82,83,84,85,86,87,88,89,90,109,110,111,115,135,137,138,139,143,161,210,264,389,443,444,445,465,502,512,513,514,515,554,587,593,623,636,800,801,873,880,888,993,995,1000,1001,1024,1026,1028,1080,1090,1098,1099,1100,1101,1111,1158,1352,1433,1434,1443,1521,2000,2001,2049,2100,2121,2181,2222,2375,2376,2377,2525,2888,3000,3001,3128,3260,3268,3269,3299,3306,3307,3308,3339,3389,3632,3690,3888,4243,4369,4430,4433,4443,4444,4445,4446,4447,4712,4786,4848,4990,5000,5001,5003,5005,5432,5480,5555,5556,5601,5632,5672,5800,5858,5900,5901,5985,5986,6000,6001,6002,6003,6080,6379,6443,6588,6666,6868,6888,7000,7001,7002,7003,7004,7005,7006,7007,7008,7009,7010,7070,7071,7080,7088,7443,7777,7788,8000,8001,8002,8003,8004,8005,8006,8007,8008,8009,8010,8011,8012,8013,8014,8015,8016,8017,8018,8019,8020,8021,8022,8023,8024,8025,8026,8027,8028,8029,8030,8040,8041,8042,8060,8066,8069,8070,8080,8081,8082,8083,8084,8085,8086,8087,8088,8089,8090,8091,8092,8093,8094,8095,8096,8097,8098,8099,8100,8101,8102,8103,8104,8105,8106,8107,8108,8109,8110,8111,8161,8180,8181,8182,8200,8282,8363,8383,8443,8453,8480,8485,8500,8554,8761,8787,8800,8848,8866,8873,8880,8881,8882,8883,8884,8885,8886,8887,8888,8889,8890,8899,8900,8983,8989,8999,9000,9001,9002,9003,9004,9005,9006,9007,9008,9009,9010,9043,9080,9081,9082,9083,9090,9092,9200,9229,9300,9443,9875,9876,9999,10000,10001,10080,10443,10800,10909,10911,10912,10999,11099,11211,12580,15672,18080,18090,19001,19888,20880,27017,28017,41414,45000,45001,45566,47001,50010,50020,50070,50075,50090,50470,50475,55555,63790 },
-      "rce": []int{ 139,445,502,512,513,514,515,623,1000,1001,1028,1090,1098,1099,1100,1101,2049,2100,2375,2376,2377,3128,3632,4243,4369,4444,4445,4446,4447,4712,4786,4848,4990,5000,5001,5005,5480,5555,5556,5800,5858,5900,5901,6379,8000,8009,8069,8080,8081,8083,8161,8383,8453,8500,8983,9000,9092,9200,9229,9300,9875,9876,9999,10001,10909,10911,10912,10999,11099,19001,20880,45000,45001,47001,63790 },
+      "in": []int{ 21,22,23,25,80,81,82,83,84,85,86,87,88,89,90,109,110,111,115,135,137,138,139,143,161,210,264,389,443,444,445,465,502,512,513,514,515,554,587,593,623,636,800,801,873,880,888,993,995,1000,1001,1024,1026,1028,1080,1090,1098,1099,1100,1101,1111,1158,1352,1433,1434,1443,1521,2000,2001,2049,2100,2121,2181,2222,2375,2376,2377,2525,2888,3000,3001,3128,3260,3268,3269,3299,3306,3307,3308,3339,3389,3632,3690,3888,4243,4369,4430,4433,4443,4444,4445,4446,4447,4712,4786,4848,4990,5000,5001,5003,5005,5432,5480,5555,5556,5601,5632,5672,5800,5858,5900,5901,5985,5986,6000,6001,6002,6003,6080,6379,6443,6588,6666,6868,6888,7000,7001,7002,7003,7004,7005,7006,7007,7008,7009,7010,7070,7071,7080,7088,7443,7777,7788,8000,8001,8002,8003,8004,8005,8006,8007,8008,8009,8010,8011,8012,8013,8014,8015,8016,8017,8018,8019,8020,8021,8022,8023,8024,8025,8026,8027,8028,8029,8030,8040,8041,8042,8060,8066,8069,8070,8080,8081,8082,8083,8084,8085,8086,8087,8088,8089,8090,8091,8092,8093,8094,8095,8096,8097,8098,8099,8100,8101,8102,8103,8104,8105,8106,8107,8108,8109,8110,8111,8161,8180,8181,8182,8200,8282,8363,8383,8443,8453,8480,8485,8500,8554,8761,8787,8800,8848,8866,8873,8880,8881,8882,8883,8884,8885,8886,8887,8888,8889,8890,8899,8900,8983,8989,8999,9000,9001,9002,9003,9004,9005,9006,9007,9008,9009,9010,9043,9080,9081,9082,9083,9090,9092,9200,9229,9300,9443,9875,9876,9990,9999,10000,10001,10080,10250,10443,10800,10909,10911,10912,10999,11099,11211,12580,15672,18080,18090,19001,19888,20880,27017,28017,41414,45000,45001,45566,47001,50010,50020,50070,50075,50090,50470,50475,55555,63790 },
+      "rce": []int{ 139,445,502,512,513,514,515,623,1000,1001,1028,1090,1098,1099,1100,1101,2049,2100,2375,2376,2377,3128,3632,4243,4369,4444,4445,4446,4447,4712,4786,4848,4990,5000,5001,5005,5480,5555,5556,5800,5858,5900,5901,6379,8000,8009,8069,8080,8081,8083,8161,8383,8453,8500,8983,9000,9092,9200,9229,9300,9875,9876,9999,10001,10250,10909,10911,10912,10999,11099,19001,20880,45000,45001,47001,63790 },
       "info": []int{ 21,22,23,25,109,110,111,115,135,137,138,139,143,161,264,465,554,587,593,873,993,995,1026,1352,2121,2181,2222,2525,2888,3000,3260,3299,3690,3888,5601,5632,5672,8020,8040,8041,8042,8480,8485,8554,9000,9083,19888,41414,50010,50020,50070,50075,50090,50470,50475 },
       "brute": []int{ 21,22,23,25,88,109,110,115,139,143,210,389,445,465,554,587,636,873,993,995,1080,1158,1433,1434,1521,2121,2222,2525,3268,3269,3306,3307,3308,3389,5432,5800,5900,5901,5985,5986,6379,8554,11211,27017,28017,63790 },
       "web1": []int{ 80,443,8080 },
-      "web2": []int{ 80,81,82,83,84,85,86,87,88,89,90,443,444,800,801,880,888,1024,1080,1111,1443,2000,2001,3000,3001,3128,3339,4430,4433,4443,4444,4445,5000,5001,5003,5555,5601,5800,6000,6001,6002,6003,6080,6443,6588,6666,6868,6888,7000,7001,7002,7003,7004,7005,7006,7007,7008,7009,7010,7070,7071,7080,7088,7443,7777,7788,8000,8001,8002,8003,8004,8005,8006,8007,8008,8009,8010,8011,8012,8013,8014,8015,8016,8017,8018,8019,8020,8021,8022,8023,8024,8025,8026,8027,8028,8029,8030,8040,8060,8066,8069,8070,8080,8081,8082,8083,8084,8085,8086,8087,8088,8089,8090,8091,8092,8093,8094,8095,8096,8097,8098,8099,8100,8101,8102,8103,8104,8105,8106,8107,8108,8109,8110,8111,8161,8180,8181,8182,8200,8282,8363,8443,8761,8787,8800,8848,8866,8873,8880,8881,8882,8883,8884,8885,8886,8887,8888,8889,8890,8899,8900,8983,8989,8999,9000,9001,9002,9003,9004,9005,9006,9007,9008,9009,9010,9043,9080,9081,9082,9083,9090,9200,9300,9443,9999,10000,10001,10080,10443,10800,12580,15672,18080,18090,45566,47001,55555 },
+      "web2": []int{ 80,81,82,83,84,85,86,87,88,89,90,443,444,800,801,880,888,1024,1080,1111,1443,2000,2001,3000,3001,3128,3339,4430,4433,4443,4444,4445,5000,5001,5003,5555,5601,5800,6000,6001,6002,6003,6080,6443,6588,6666,6868,6888,7000,7001,7002,7003,7004,7005,7006,7007,7008,7009,7010,7070,7071,7080,7088,7443,7777,7788,8000,8001,8002,8003,8004,8005,8006,8007,8008,8009,8010,8011,8012,8013,8014,8015,8016,8017,8018,8019,8020,8021,8022,8023,8024,8025,8026,8027,8028,8029,8030,8040,8060,8066,8069,8070,8080,8081,8082,8083,8084,8085,8086,8087,8088,8089,8090,8091,8092,8093,8094,8095,8096,8097,8098,8099,8100,8101,8102,8103,8104,8105,8106,8107,8108,8109,8110,8111,8161,8180,8181,8182,8200,8282,8363,8443,8761,8787,8800,8848,8866,8873,8880,8881,8882,8883,8884,8885,8886,8887,8888,8889,8890,8899,8900,8983,8989,8999,9000,9001,9002,9003,9004,9005,9006,9007,9008,9009,9010,9043,9080,9081,9082,9083,9090,9200,9300,9443,9990,9999,10000,10001,10080,10443,10800,12580,15672,18080,18090,45566,47001,55555 },
       "iis": []int{ 80,443,47001 },
       "jboss": []int{ 80,1111,4444,4445,8080,8443,45566 },
       "zookeeper": []int{ 2181,2888,3888 },
@@ -655,6 +655,7 @@ var (
       "rabbitmq": []int{ 15672 },
       "flink": []int{ 8081 },
       "oracle_web": []int{ 3339 },
+      "wildfly": []int{ 9990 },
       "baota": []int{ 888,8888 },
       "fastcgi": []int{ 9000 },
       "kc_aom": []int{ 12580 },
@@ -744,7 +745,8 @@ var (
       "hashicorp": []int{ 8500 },
       "checkpoint": []int{ 264 },
       "pcanywhere": []int{ 5632 },
-      "docker": []int{ 2375,2376,2377,4243,5000 },
+      "docker": []int{ 2375,2376,2377,4243,5000,10250 },
+      "etcd": []int{ 2379 },
       "iscsi": []int{ 3260 },
       "saprouter": []int{ 3299 },
       "distcc": []int{ 3632 },
@@ -781,7 +783,7 @@ func usage() {
   10010000000011.1110000001.111.111......1111111111111111..........
   10twelve0111...   .10001. ..
   100011...          1001               MX1014 by L
-  .001              1001               Version 2.3.1
+  .001              1001               Version 2.4.0
   .1.              ...1.