mirror of
https://github.com/shadow1ng/fscan.git
synced 2026-09-24 20:21:52 +08:00
perf: 优化注释
This commit is contained in:
+43
-16
@@ -19,16 +19,21 @@ type Addr struct {
|
||||
// ScanResult 扫描结果
|
||||
type ScanResult struct {
|
||||
Address string // IP地址
|
||||
Port int // 端口号
|
||||
Port int // 端口号
|
||||
Service *ServiceInfo // 服务信息
|
||||
}
|
||||
|
||||
// PortScan 执行端口扫描
|
||||
// hostslist: 待扫描的主机列表
|
||||
// ports: 待扫描的端口范围
|
||||
// timeout: 超时时间(秒)
|
||||
// 返回活跃地址列表
|
||||
func PortScan(hostslist []string, ports string, timeout int64) []string {
|
||||
var results []ScanResult
|
||||
var aliveAddrs []string // 新增:存储活跃地址
|
||||
var aliveAddrs []string
|
||||
var mu sync.Mutex
|
||||
|
||||
// 解析端口列表
|
||||
// 解析并验证端口列表
|
||||
probePorts := Common.ParsePort(ports)
|
||||
if len(probePorts) == 0 {
|
||||
Common.LogError(fmt.Sprintf("端口格式错误: %s", ports))
|
||||
@@ -38,14 +43,14 @@ func PortScan(hostslist []string, ports string, timeout int64) []string {
|
||||
// 排除指定端口
|
||||
probePorts = excludeNoPorts(probePorts)
|
||||
|
||||
// 创建通道
|
||||
// 初始化并发控制
|
||||
workers := Common.ThreadNum
|
||||
addrs := make(chan Addr, 100)
|
||||
scanResults := make(chan ScanResult, 100)
|
||||
addrs := make(chan Addr, 100) // 待扫描地址通道
|
||||
scanResults := make(chan ScanResult, 100) // 扫描结果通道
|
||||
var wg sync.WaitGroup
|
||||
var workerWg sync.WaitGroup
|
||||
|
||||
// 启动扫描协程
|
||||
// 启动扫描工作协程
|
||||
for i := 0; i < workers; i++ {
|
||||
workerWg.Add(1)
|
||||
go func() {
|
||||
@@ -56,7 +61,7 @@ func PortScan(hostslist []string, ports string, timeout int64) []string {
|
||||
}()
|
||||
}
|
||||
|
||||
// 接收扫描结果
|
||||
// 启动结果处理协程
|
||||
var resultWg sync.WaitGroup
|
||||
resultWg.Add(1)
|
||||
go func() {
|
||||
@@ -64,14 +69,13 @@ func PortScan(hostslist []string, ports string, timeout int64) []string {
|
||||
for result := range scanResults {
|
||||
mu.Lock()
|
||||
results = append(results, result)
|
||||
// 构造活跃地址字符串
|
||||
aliveAddr := fmt.Sprintf("%s:%d", result.Address, result.Port)
|
||||
aliveAddrs = append(aliveAddrs, aliveAddr)
|
||||
mu.Unlock()
|
||||
}
|
||||
}()
|
||||
|
||||
// 添加扫描目标
|
||||
// 分发扫描任务
|
||||
for _, port := range probePorts {
|
||||
for _, host := range hostslist {
|
||||
wg.Add(1)
|
||||
@@ -79,6 +83,7 @@ func PortScan(hostslist []string, ports string, timeout int64) []string {
|
||||
}
|
||||
}
|
||||
|
||||
// 等待所有任务完成
|
||||
close(addrs)
|
||||
workerWg.Wait()
|
||||
wg.Wait()
|
||||
@@ -88,6 +93,11 @@ func PortScan(hostslist []string, ports string, timeout int64) []string {
|
||||
return aliveAddrs
|
||||
}
|
||||
|
||||
// PortConnect 执行单个端口连接检测
|
||||
// addr: 待检测的地址
|
||||
// results: 结果通道
|
||||
// timeout: 超时时间
|
||||
// wg: 等待组
|
||||
func PortConnect(addr Addr, results chan<- ScanResult, timeout int64, wg *sync.WaitGroup) {
|
||||
defer wg.Done()
|
||||
|
||||
@@ -95,6 +105,7 @@ func PortConnect(addr Addr, results chan<- ScanResult, timeout int64, wg *sync.W
|
||||
var err error
|
||||
var conn net.Conn
|
||||
|
||||
// 尝试建立TCP连接
|
||||
conn, err = Common.WrapperTcpWithTimeout("tcp4",
|
||||
fmt.Sprintf("%s:%v", addr.ip, addr.port),
|
||||
time.Duration(timeout)*time.Second)
|
||||
@@ -107,10 +118,11 @@ func PortConnect(addr Addr, results chan<- ScanResult, timeout int64, wg *sync.W
|
||||
return
|
||||
}
|
||||
|
||||
// 记录开放端口
|
||||
address := fmt.Sprintf("%s:%d", addr.ip, addr.port)
|
||||
Common.LogSuccess(fmt.Sprintf("端口开放 %s", address))
|
||||
|
||||
// 保存端口开放信息
|
||||
// 保存端口扫描结果
|
||||
portResult := &Common.ScanResult{
|
||||
Time: time.Now(),
|
||||
Type: Common.PORT,
|
||||
@@ -122,19 +134,19 @@ func PortConnect(addr Addr, results chan<- ScanResult, timeout int64, wg *sync.W
|
||||
}
|
||||
Common.SaveResult(portResult)
|
||||
|
||||
// 创建扫描结果
|
||||
// 构造扫描结果
|
||||
result := ScanResult{
|
||||
Address: addr.ip,
|
||||
Port: addr.port,
|
||||
}
|
||||
|
||||
// 服务识别
|
||||
// 执行服务识别
|
||||
if !Common.SkipFingerprint && conn != nil {
|
||||
scanner := NewPortInfoScanner(addr.ip, addr.port, conn, time.Duration(timeout)*time.Second)
|
||||
if serviceInfo, err := scanner.Identify(); err == nil {
|
||||
result.Service = serviceInfo
|
||||
|
||||
// 构造日志消息
|
||||
// 构造服务识别日志
|
||||
var logMsg strings.Builder
|
||||
logMsg.WriteString(fmt.Sprintf("服务识别 %s => ", address))
|
||||
|
||||
@@ -146,27 +158,36 @@ func PortConnect(addr Addr, results chan<- ScanResult, timeout int64, wg *sync.W
|
||||
logMsg.WriteString(fmt.Sprintf(" 版本:%s", serviceInfo.Version))
|
||||
}
|
||||
|
||||
// 构造服务详情
|
||||
// 收集服务详细信息
|
||||
details := map[string]interface{}{
|
||||
"port": addr.port,
|
||||
"service": serviceInfo.Name,
|
||||
}
|
||||
|
||||
// 添加版本信息
|
||||
if serviceInfo.Version != "" {
|
||||
details["version"] = serviceInfo.Version
|
||||
}
|
||||
|
||||
// 添加产品信息
|
||||
if v, ok := serviceInfo.Extras["vendor_product"]; ok && v != "" {
|
||||
details["product"] = v
|
||||
logMsg.WriteString(fmt.Sprintf(" 产品:%s", v))
|
||||
}
|
||||
|
||||
// 添加操作系统信息
|
||||
if v, ok := serviceInfo.Extras["os"]; ok && v != "" {
|
||||
details["os"] = v
|
||||
logMsg.WriteString(fmt.Sprintf(" 系统:%s", v))
|
||||
}
|
||||
|
||||
// 添加额外信息
|
||||
if v, ok := serviceInfo.Extras["info"]; ok && v != "" {
|
||||
details["info"] = v
|
||||
logMsg.WriteString(fmt.Sprintf(" 信息:%s", v))
|
||||
}
|
||||
|
||||
// 添加Banner信息
|
||||
if len(serviceInfo.Banner) > 0 && len(serviceInfo.Banner) < 100 {
|
||||
details["banner"] = strings.TrimSpace(serviceInfo.Banner)
|
||||
logMsg.WriteString(fmt.Sprintf(" Banner:[%s]", strings.TrimSpace(serviceInfo.Banner)))
|
||||
@@ -190,6 +211,9 @@ func PortConnect(addr Addr, results chan<- ScanResult, timeout int64, wg *sync.W
|
||||
}
|
||||
|
||||
// NoPortScan 生成端口列表(不进行扫描)
|
||||
// hostslist: 主机列表
|
||||
// ports: 端口范围
|
||||
// 返回地址列表
|
||||
func NoPortScan(hostslist []string, ports string) []string {
|
||||
var AliveAddress []string
|
||||
|
||||
@@ -208,6 +232,8 @@ func NoPortScan(hostslist []string, ports string) []string {
|
||||
}
|
||||
|
||||
// excludeNoPorts 排除指定的端口
|
||||
// ports: 原始端口列表
|
||||
// 返回过滤后的端口列表
|
||||
func excludeNoPorts(ports []int) []int {
|
||||
noPorts := Common.ParsePort(Common.ExcludePorts)
|
||||
if len(noPorts) == 0 {
|
||||
@@ -220,11 +246,12 @@ func excludeNoPorts(ports []int) []int {
|
||||
temp[port] = struct{}{}
|
||||
}
|
||||
|
||||
// 移除需要排除的端口
|
||||
for _, port := range noPorts {
|
||||
delete(temp, port)
|
||||
}
|
||||
|
||||
// 转换为切片并排序
|
||||
// 转换为有序切片
|
||||
var newPorts []int
|
||||
for port := range temp {
|
||||
newPorts = append(newPorts, port)
|
||||
|
||||
Reference in New Issue
Block a user