mirror of
https://github.com/shadow1ng/fscan.git
synced 2026-02-17 22:22:27 +08:00
## 架构重构
- 全局变量消除,迁移至 Config/State 对象
- SMB 插件融合(smb/smb2/smbghost/smbinfo)
- 服务探测重构,实现 Nmap 风格 fallback 机制
- 输出系统重构,TXT 实时刷盘 + 双写机制
- i18n 框架升级至 go-i18n
## 性能优化
- 正则表达式预编译
- 内存优化 map[string]struct{}
- 并发指纹匹配
- SOCKS5 连接复用
- 滑动窗口调度 + 自适应线程池
## 新功能
- Web 管理界面
- 多格式 POC 适配(xray/afrog)
- 增强指纹库(3139条)
- Favicon hash 指纹识别
- 插件选择性编译(Build Tags)
- fscan-lab 靶场环境
- 默认端口扩展(62→133)
## 构建系统
- 添加 no_local tag 支持排除本地插件
- 多版本构建:fscan/fscan-nolocal/fscan-web
- CI 添加 snapshot 模式支持仅测试构建
## Bug 修复
- 修复 120+ 个问题,包括 RDP panic、批量扫描漏报、
JSON 输出格式、Redis 检测、Context 超时等
## 测试增强
- 单元测试覆盖率 74-100%
- 并发安全测试
- 集成测试(Web/端口/服务/SSH/ICMP)
161 lines
3.9 KiB
Go
161 lines
3.9 KiB
Go
package output
|
||
|
||
import (
|
||
"fmt"
|
||
"sync"
|
||
)
|
||
|
||
// ResultBuffer 公共的去重缓冲逻辑,供各Writer复用
|
||
type ResultBuffer struct {
|
||
mu sync.Mutex
|
||
|
||
// 分类缓冲
|
||
HostResults []*ScanResult
|
||
PortResults []*ScanResult
|
||
ServiceResults []*ScanResult
|
||
VulnResults []*ScanResult
|
||
|
||
// 去重map
|
||
seenHosts map[string]struct{}
|
||
seenPorts map[string]struct{}
|
||
seenServices map[string]int // 存储索引,用于更新更完整的记录
|
||
seenVulns map[string]struct{}
|
||
}
|
||
|
||
// NewResultBuffer 创建新的结果缓冲
|
||
func NewResultBuffer() *ResultBuffer {
|
||
return &ResultBuffer{
|
||
seenHosts: make(map[string]struct{}),
|
||
seenPorts: make(map[string]struct{}),
|
||
seenServices: make(map[string]int),
|
||
seenVulns: make(map[string]struct{}),
|
||
}
|
||
}
|
||
|
||
// Add 添加结果到缓冲(自动去重)
|
||
func (b *ResultBuffer) Add(result *ScanResult) {
|
||
b.mu.Lock()
|
||
defer b.mu.Unlock()
|
||
|
||
if result == nil {
|
||
return
|
||
}
|
||
|
||
key := b.generateKey(result)
|
||
|
||
switch result.Type {
|
||
case TypeHost:
|
||
if _, exists := b.seenHosts[key]; !exists {
|
||
b.seenHosts[key] = struct{}{}
|
||
b.HostResults = append(b.HostResults, result)
|
||
}
|
||
case TypePort:
|
||
if _, exists := b.seenPorts[key]; !exists {
|
||
b.seenPorts[key] = struct{}{}
|
||
b.PortResults = append(b.PortResults, result)
|
||
}
|
||
case TypeService:
|
||
if idx, exists := b.seenServices[key]; !exists {
|
||
b.seenServices[key] = len(b.ServiceResults)
|
||
b.ServiceResults = append(b.ServiceResults, result)
|
||
} else {
|
||
// 保留信息更完整的记录
|
||
if b.isMoreComplete(result, b.ServiceResults[idx]) {
|
||
b.ServiceResults[idx] = result
|
||
}
|
||
}
|
||
case TypeVuln:
|
||
if _, exists := b.seenVulns[key]; !exists {
|
||
b.seenVulns[key] = struct{}{}
|
||
b.VulnResults = append(b.VulnResults, result)
|
||
}
|
||
}
|
||
}
|
||
|
||
// generateKey 生成结果的唯一键(用于去重)
|
||
func (b *ResultBuffer) generateKey(result *ScanResult) string {
|
||
switch result.Type {
|
||
case TypeHost:
|
||
return result.Target
|
||
case TypePort:
|
||
if result.Details != nil {
|
||
if port, ok := result.Details["port"]; ok {
|
||
return fmt.Sprintf("%s:%v", result.Target, port)
|
||
}
|
||
}
|
||
return result.Target
|
||
case TypeService:
|
||
return result.Target
|
||
case TypeVuln:
|
||
return result.Target + "|" + result.Status
|
||
default:
|
||
return result.Target + "|" + result.Status
|
||
}
|
||
}
|
||
|
||
// isMoreComplete 判断新记录是否比旧记录信息更完整
|
||
func (b *ResultBuffer) isMoreComplete(newResult, oldResult *ScanResult) bool {
|
||
return b.CalculateCompleteness(newResult) > b.CalculateCompleteness(oldResult)
|
||
}
|
||
|
||
// CalculateCompleteness 计算记录的信息完整度
|
||
func (b *ResultBuffer) CalculateCompleteness(result *ScanResult) int {
|
||
score := 0
|
||
if result.Details == nil {
|
||
return score
|
||
}
|
||
|
||
// 有 status 码加分
|
||
if status, ok := result.Details["status"]; ok && status != nil && status != 0 {
|
||
score += 2
|
||
}
|
||
// 有 server 加分
|
||
if server, ok := result.Details["server"].(string); ok && server != "" {
|
||
score += 2
|
||
}
|
||
// 有 title 加分
|
||
if title, ok := result.Details["title"].(string); ok && title != "" {
|
||
score += 1
|
||
}
|
||
// 有指纹加分
|
||
if fps := result.Details["fingerprints"]; fps != nil {
|
||
switch v := fps.(type) {
|
||
case []string:
|
||
if len(v) > 0 {
|
||
score += 3
|
||
}
|
||
case []interface{}:
|
||
if len(v) > 0 {
|
||
score += 3
|
||
}
|
||
}
|
||
}
|
||
// 有 banner 加分
|
||
if banner, ok := result.Details["banner"].(string); ok && banner != "" {
|
||
score += 1
|
||
}
|
||
|
||
return score
|
||
}
|
||
|
||
// Summary 获取统计摘要
|
||
func (b *ResultBuffer) Summary() (hosts, ports, services, vulns int) {
|
||
b.mu.Lock()
|
||
defer b.mu.Unlock()
|
||
return len(b.HostResults), len(b.PortResults), len(b.ServiceResults), len(b.VulnResults)
|
||
}
|
||
|
||
// Clear 清空缓冲
|
||
func (b *ResultBuffer) Clear() {
|
||
b.mu.Lock()
|
||
defer b.mu.Unlock()
|
||
b.HostResults = nil
|
||
b.PortResults = nil
|
||
b.ServiceResults = nil
|
||
b.VulnResults = nil
|
||
b.seenHosts = make(map[string]struct{})
|
||
b.seenPorts = make(map[string]struct{})
|
||
b.seenServices = make(map[string]int)
|
||
b.seenVulns = make(map[string]struct{})
|
||
}
|