diff --git a/Common/Ports.go b/Common/Ports.go index fb6600c..b1b98c6 100644 --- a/Common/Ports.go +++ b/Common/Ports.go @@ -8,8 +8,12 @@ Ports.go - 端口常量（向后兼容层） 此文件保持向后兼容，实际常量定义已迁移到Core/Constants.go */ -// 向后兼容的端口常量 - 引用Core包中的定义 +// 向后兼容的端口常量 - 引用base包中的定义 var ( - WebPorts = base.WebPorts // Web服务端口组 - MainPorts = base.MainPorts // 主要服务端口组 + WebPorts = base.WebPorts // Web服务端口组 + MainPorts = base.MainPorts // 主要服务端口组 + DbPorts = base.DbPorts // 数据库端口组 + ServicePorts = base.ServicePorts // 服务端口组 + CommonPorts = base.CommonPorts // 常用端口组 + AllPorts = base.AllPorts // 全部端口 ) diff --git a/Common/base/Constants.go b/Common/base/Constants.go index 6a9688d..9b17145 100644 --- a/Common/base/Constants.go +++ b/Common/base/Constants.go @@ -12,8 +12,12 @@ Constants.go - 核心常量定义 // 预定义端口组常量 var ( - WebPorts = "80,81,82,83,84,85,86,87,88,89,90,91,92,98,99,443,800,801,808,880,888,889,1000,1010,1080,1081,1082,1099,1118,1888,2008,2020,2100,2375,2379,3000,3008,3128,3505,5555,6080,6648,6868,7000,7001,7002,7003,7004,7005,7007,7008,7070,7071,7074,7078,7080,7088,7200,7680,7687,7688,7777,7890,8000,8001,8002,8003,8004,8005,8006,8008,8009,8010,8011,8012,8016,8018,8020,8028,8030,8038,8042,8044,8046,8048,8053,8060,8069,8070,8080,8081,8082,8083,8084,8085,8086,8087,8088,8089,8090,8091,8092,8093,8094,8095,8096,8097,8098,8099,8100,8101,8108,8118,8161,8172,8180,8181,8200,8222,8244,8258,8280,8288,8300,8360,8443,8448,8484,8800,8834,8838,8848,8858,8868,8879,8880,8881,8888,8899,8983,8989,9000,9001,9002,9008,9010,9043,9060,9080,9081,9082,9083,9084,9085,9086,9087,9088,9089,9090,9091,9092,9093,9094,9095,9096,9097,9098,9099,9100,9200,9443,9448,9800,9981,9986,9988,9998,9999,10000,10001,10002,10004,10008,10010,10051,10250,12018,12443,14000,15672,15671,16080,18000,18001,18002,18004,18008,18080,18082,18088,18090,18098,19001,20000,20720,20880,21000,21501,21502,28018" - MainPorts = "21,22,23,25,80,81,110,135,139,143,389,443,445,465,502,587,636,873,993,995,1433,1434,1521,1522,1525,2121,2200,2222,3000,3268,3269,3306,3389,5432,5672,5900,6379,7474,7687,8000,8080,8081,8088,8443,8888,9000,9042,9080,9092,9200,9300,11211,15672,22222,27017,61613,61614" + WebPorts = "80,81,82,83,84,85,86,87,88,89,90,91,92,98,99,443,800,801,808,880,888,889,1000,1010,1080,1081,1082,1099,1118,1888,2008,2020,2100,2375,2379,3000,3008,3128,3505,5555,6080,6648,6868,7000,7001,7002,7003,7004,7005,7007,7008,7070,7071,7074,7078,7080,7088,7200,7680,7687,7688,7777,7890,8000,8001,8002,8003,8004,8005,8006,8008,8009,8010,8011,8012,8016,8018,8020,8028,8030,8038,8042,8044,8046,8048,8053,8060,8069,8070,8080,8081,8082,8083,8084,8085,8086,8087,8088,8089,8090,8091,8092,8093,8094,8095,8096,8097,8098,8099,8100,8101,8108,8118,8161,8172,8180,8181,8200,8222,8244,8258,8280,8288,8300,8360,8443,8448,8484,8800,8834,8838,8848,8858,8868,8879,8880,8881,8888,8899,8983,8989,9000,9001,9002,9008,9010,9043,9060,9080,9081,9082,9083,9084,9085,9086,9087,9088,9089,9090,9091,9092,9093,9094,9095,9096,9097,9098,9099,9100,9200,9443,9448,9800,9981,9986,9988,9998,9999,10000,10001,10002,10004,10008,10010,10051,10250,12018,12443,14000,15672,15671,16080,18000,18001,18002,18004,18008,18080,18082,18088,18090,18098,19001,20000,20720,20880,21000,21501,21502,28018" + MainPorts = "21,22,23,25,80,81,110,135,139,143,389,443,445,465,502,587,636,873,993,995,1433,1434,1521,1522,1525,2121,2200,2222,3000,3268,3269,3306,3389,5432,5672,5900,6379,7474,7687,8000,8080,8081,8088,8443,8888,9000,9042,9080,9092,9200,9300,11211,15672,22222,27017,61613,61614" + DbPorts = "1433,1521,3306,5432,5672,6379,7687,9042,9093,9200,11211,27017,61616" + ServicePorts = "21,22,23,25,110,135,139,143,162,389,445,465,502,587,636,873,993,995,1433,1521,2222,3306,3389,5020,5432,5672,5671,6379,8161,8443,9000,9092,9093,9200,10051,11211,15672,15671,27017,61616,61613" + CommonPorts = "21,22,23,25,53,80,110,135,139,143,443,445,993,995,1723,3389,5060,5985,5986" + AllPorts = "1-65535" ) // ============================================================================= diff --git a/Common/parsers/TargetParser.go b/Common/parsers/TargetParser.go index b10bd43..3a3dfb8 100644 --- a/Common/parsers/TargetParser.go +++ b/Common/parsers/TargetParser.go @@ -30,7 +30,6 @@ type TargetParserOptions struct { ValidateURLs bool `json:"validate_urls"` ResolveDomains bool `json:"resolve_domains"` EnableStatistics bool `json:"enable_statistics"` - DefaultPorts string `json:"default_ports"` } // DefaultTargetParserOptions 默认目标解析器选项 @@ -43,7 +42,6 @@ func DefaultTargetParserOptions() *TargetParserOptions { ValidateURLs: DefaultValidateURLs, ResolveDomains: DefaultResolveDomains, EnableStatistics: DefaultTargetEnableStatistics, - DefaultPorts: DefaultPorts, } } diff --git a/Common/parsers/constants.go b/Common/parsers/constants.go index 26d92e7..b99b172 100644 --- a/Common/parsers/constants.go +++ b/Common/parsers/constants.go @@ -3,6 +3,8 @@ package parsers import ( "regexp" "time" + + "github.com/shadow1ng/fscan/common/base" ) /* @@ -134,7 +136,6 @@ const ( DefaultValidateURLs = true DefaultResolveDomains = false DefaultTargetEnableStatistics = true - DefaultPorts = "21,22,23,80,81,110,135,139,143,389,443,445,502,873,993,995,1433,1521,3306,5432,5672,6379,7001,7687,8000,8005,8009,8080,8089,8443,9000,9042,9092,9200,10051,11211,15672,27017,61616" // 正则表达式模式 IPv4RegexPattern = `^(\d{1,3}\.){3}\d{1,3}$` @@ -192,25 +193,21 @@ const ( SamplingMaxHost = 253 ) -// GetPortGroups 获取预定义端口组映射 +// GetPortGroups 获取预定义端口组映射（统一的端口组定义） func GetPortGroups() map[string]string { return map[string]string{ - "web": "80,81,82,83,84,85,86,87,88,89,90,443,8000,8001,8002,8003,8004,8005,8006,8007,8008,8009,8010,8080,8081,8082,8083,8084,8085,8086,8087,8088,8089,8090,8443,9000,9001,9002,9080,9090", - "main": "21,22,23,80,81,110,135,139,143,389,443,445,502,873,993,995,1433,1521,3306,5432,5672,6379,7001,7687,8000,8005,8009,8080,8089,8443,9000,9042,9092,9200,10051,11211,15672,27017,61616", - "database": "1433,1521,3306,5432,6379,11211,27017", - "common": "21,22,23,25,53,80,110,135,139,143,443,445,993,995,1723,3389,5060,5985,5986", + "web": base.WebPorts, // 使用实际的WebPorts常量 + "main": base.MainPorts, // 使用实际的MainPorts常量 + "db": base.DbPorts, // 使用实际的DbPorts常量 + "service": base.ServicePorts, // 使用实际的ServicePorts常量 + "common": base.CommonPorts, // 使用实际的CommonPorts常量 + "all": base.AllPorts, // 使用实际的AllPorts常量 } } -// GetTargetPortGroups 获取目标解析器端口组映射 +// GetTargetPortGroups 获取目标解析器端口组映射（向后兼容，调用统一函数） func GetTargetPortGroups() map[string]string { - return map[string]string{ - "service": "21,22,23,25,110,135,139,143,162,389,445,465,502,587,636,873,993,995,1433,1521,2222,3306,3389,5020,5432,5672,5671,6379,8161,8443,9000,9092,9093,9200,10051,11211,15672,15671,27017,61616,61613", - "db": "1433,1521,3306,5432,5672,6379,7687,9042,9093,9200,11211,27017,61616", - "web": "80,81,82,83,84,85,86,87,88,89,90,91,92,98,99,443,800,801,808,880,888,889,1000,1010,1080,1081,1082,1099,1118,1888,2008,2020,2100,2375,2379,3000,3008,3128,3505,5555,6080,6648,6868,7000,7001,7002,7003,7004,7005,7007,7008,7070,7071,7074,7078,7080,7088,7200,7680,7687,7688,7777,7890,8000,8001,8002,8003,8004,8005,8006,8008,8009,8010,8011,8012,8016,8018,8020,8028,8030,8038,8042,8044,8046,8048,8053,8060,8069,8070,8080,8081,8082,8083,8084,8085,8086,8087,8088,8089,8090,8091,8092,8093,8094,8095,8096,8097,8098,8099,8100,8101,8108,8118,8161,8172,8180,8181,8200,8222,8244,8258,8280,8288,8300,8360,8443,8448,8484,8800,8834,8838,8848,8858,8868,8879,8880,8881,8888,8899,8983,8989,9000,9001,9002,9008,9010,9043,9060,9080,9081,9082,9083,9084,9085,9086,9087,9088,9089,9090,9091,9092,9093,9094,9095,9096,9097,9098,9099,9100,9200,9443,9448,9800,9981,9986,9988,9998,9999,10000,10001,10002,10004,10008,10010,10051,10250,12018,12443,14000,15672,15671,16080,18000,18001,18002,18004,18008,18080,18082,18088,18090,18098,19001,20000,20720,20880,21000,21501,21502,28018", - "all": "1-65535", - "main": "21,22,23,80,81,110,135,139,143,389,443,445,502,873,993,995,1433,1521,3306,5432,5672,6379,7001,7687,8000,8005,8009,8080,8089,8443,9000,9042,9092,9200,10051,11211,15672,27017,61616", - } + return GetPortGroups() } // =============================================================================