mirror of
https://github.com/shadow1ng/fscan.git
synced 2026-09-22 03:10:42 +08:00
v2.1.2 核心优化与多架构发布 (#561)
* feat: v2.1.0 核心重构与功能增强
## 架构重构
- 全局变量消除,迁移至 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)
* fix(ci): 移除 PR 对 Project 自动化的触发
* fix: Elasticsearch未授权检测优先于爆破 (#554)
* fix: 修复RDP爆破高误报率问题 (#555)
- 移除 screen.go 中错误的认证结果覆盖逻辑
- 启用 NLA 协议的 ErrorCode 字段检测
- 添加 PubKeyAuth 验证确保认证真正成功
- 修复 io.go 中错误被静默忽略的问题
- 修复 socket.go/io.go 中可能导致 panic 的代码
- 修复 screen.go 中文件句柄泄漏和 log.Panic
* fix: 修复-user/-pwd凭据参数不生效的问题
问题原因:
- Parse()解析凭据后更新globalConfig
- 但BuildConfigFromFlags()创建新Config时使用默认字典
- 导致解析的UserPassPairs等凭据信息被丢弃
修复内容:
1. initialize.go: 将Parse解析的凭据结果应用到新Config
2. credential.go: 单用户密码对时创建UserPassPairs
3. rdp.go: 单凭据测试时跳过指纹识别,减少连接次数
* feat: RDP使用NLA仅验证模式,避免挤掉已登录用户
- 添加ErrNLAAuthSuccess标志用于NLA验证成功信号
- tpkt层支持nlaAuthOnly模式,验证成功后不建立完整会话
- x224层正确传播NLA验证结果
- rdpCrack改用NlaAuth进行凭据验证
* fix: 修复进度条在Windows终端满屏重复输出的问题
- 添加终端宽度检测,动态调整进度条长度
- 使用空格覆盖清除旧内容,避免残留
- 简化进度条格式,确保不超过终端宽度
* feat: 优化日志颜色方案,区分漏洞和普通信息
- 新增 LogVuln 级别(红色),用于漏洞和重要发现
- 密码爆破成功、未授权访问、POC漏洞等改用红色显示
- 普通信息(扫描统计等)改为白色
- Web指纹保持绿色
* refactor: 精简化输出,移除冗余启动信息
- 移除showParseSummary开局配置输出
- 移除LogPluginInfo/LogPluginInfoWithPort插件信息输出
- 移除alive_scanner冗余统计输出
- 移除port_scan_start扫描开始提示
- 移除handleUDPPorts SNMP死代码
- 移除相关i18n条目
* chore: 版本号更新为2.1.1
* fix: 降级依赖版本以保持Go 1.20兼容性
* feat(ldap): 添加NTLM Hash认证支持 (#433)
* chore: 清理无用的 replace 指令
* fix(ping): 修复 TTL expired 导致主机误判为存活的问题
在 ExecCommandPing 中增加错误关键词检测,当 ping 输出包含
TTL expired、Destination unreachable 等错误信息时,不再将
目标主机标记为存活。
Fixes #454
* fix(proxy): 修复透明代理导致输出全端口的问题
在代理初始化时主动探测代理行为,通过连接 RFC 5737 保留的
测试地址来检测是否存在"全回显"问题。如果探测到代理不可靠,
则在端口扫描时跳过所有端口,避免误报。
- 新增 proxyReliable 标志位标记代理可靠性
- 新增 ProbeProxyBehavior 函数探测代理行为
- 端口扫描前检查代理可靠性并输出警告
Fixes #495
* refactor: 移动debug模块到common/debug子包
* fix(web): 修复-u模式下Web插件未执行的问题
* fix: 优化输出格式和颜色显示
- 网段统计格式改为 10.253.0.0/16 网段存活: 26
- WebTitle基础信息改为白色,指纹识别单独绿色输出
- 移除重复的端口数量输出
* fix: URL解析自动补全协议头
-uf 文件中 192.168.1.1:8080 自动转为 http://192.168.1.1:8080
* fix: 修复-u/-uf模式下URLs丢失导致0目标扫描的问题
Parse阶段将URLs设置到全局状态,但Initialize随后创建新状态
并覆盖了全局状态,导致URLs数据丢失。现在在创建新状态前
先保存并迁移Parse阶段设置的URLs和HostPorts数据。
* fix: 智能检测HTTP/HTTPS协议并优化URL显示
- 修复-u/-uf模式URLs丢失导致0目标扫描问题
- detectProtocol改为主动TLS握手检测,不依赖服务名
- WebTitle输出显示完整协议(http/https)
- 隐藏标准端口(80/443)使输出更简洁
* refactor: 精简parsers包,统一配置构建入口
- 删除冗余的中间层(XXXInput、XXXParser类)
- 新增 config_builder.go 统一配置构建
- parsers包从3000+行精简至~540行
- 保留核心函数:ParseIP、ParsePort、文件读取、凭据解析
* test: 扩展parsers单元测试覆盖边缘情况
- 新增内网简写解析测试(192/172/10)
- 新增完整IP范围和无效CIDR测试
- 新增Windows行尾(CRLF)处理测试
- 新增凭据和哈希文件解析测试
- 新增端口解析边缘情况测试
- 测试覆盖率达到94.2%
* refactor: 优化控制台输出格式
- 去掉时间戳,保留[*][+]前缀
- Web输出合并WebTitle和WebFinger为一行
- 有指纹显示绿色[+],无指纹显示白色[*]
- 格式: code:xxx len:xxx title:xxx server:xxx [指纹]
- 服务探测格式: [Product:xxx ||Version:xxx] Banner:(xxx)
- 字段对齐,输出更清爽
* feat: 添加凭据测试未发现弱密码的提示
- credential_tester.go: 失败时设置 Type=ResultTypeCredential
- scanner.go: 根据结果类型在 error 级别输出'未发现弱密码'提示
- 新增 i18n 翻译 brute_no_weak_pass
使用 -log all 或 -log error 可看到此提示
* refactor(logging): 重构日志级别为层级过滤设计
- LogLevel 从 string 改为 int 类型,支持层级比较
- 层级设计:Debug(0) < Base(1) < Info(2) < Success(3) < Vuln(4) < Error(5)
- 设置一个级别后,显示该级别及以上的日志
- Error 级别始终显示,不会被配置过滤掉
- 保留向后兼容别名(LevelAll, LevelInfoSuccess 等)
- 更新测试以匹配新的层级过滤行为
* style(logging): Error级别日志改为黄色显示
* style(findnet): NetInfo输出改为每行一个IP
* refactor(ms17010): 优化错误提示,明确指出SMBv1不支持等情况
* fix(credential): 修复凭据测试结果不一致的问题
问题原因:
1. 未知错误类型不重试,导致服务端限流时跳过正确密码
2. SSH 错误分类不够准确,某些临时错误未被识别
修复内容:
1. 未知错误改为可重试(可能是临时问题)
2. 增加 SSH 特有的网络错误识别(handshake failed, disconnect 等)
* fix(portfinger): 修复SMB2服务指纹识别和NetInfo输出问题
- 添加SMB2ProgNeg探针支持现代Windows的SMB2协议
- 修复Go regexp对高位字节的UTF-8兼容问题,使用Latin-1转换
- 修复探针失败后连接重建逻辑
- 修复vendor_product字段名不匹配问题
- 修复NetInfo多行输出被其他日志打断的问题
* fix(config): 从默认端口移除9100,避免触发打印机打印 (#517)
* feat(proxy): 增强代理端口扫描的深度验证机制
- 新增4阶段深度验证:Banner读取→探测发送→响应等待→最终判定
- 新增SOCKS5错误码和代理错误文本检测
- 优化ProbeProxyBehavior探测逻辑,发送数据验证连接可达性
- 解决透明代理/全回显代理导致的假阳性问题
* fix(proxy): 修复代理深度验证的若干问题
- detector.go: 修复 AutoConfigureProxy 覆盖探测结果的问题
只有未探测过时才设置默认 proxyReliable 值
- port_scan.go: 改进深度验证机制
- 使用带 Host header 的 HTTP GET 请求替代 OPTIONS
- 延长响应等待超时至 2s 以适配慢速服务器
- 正确重置连接 deadline 避免影响后续操作
* refactor: 统一 common 包文件命名风格
Flag.go -> flag.go
* refactor(proxy): 删除自定义 contains() 函数,改用标准库
- 用 strings.Contains() 替代手写的 contains()
- 删除过时的注释
* fix(parsers): 修复带横杠域名被误识别为IP范围的问题
如 111-555.sss.com 这类域名因包含 - 被错误解析为 IP 范围,
添加 looksLikeIPRange() 检查,只有 - 前是有效 IP 才走范围解析
* fix(proxy): 修复代理模式下服务识别错误和端口漏扫问题
- port_scan.go: 验证通过后重建干净连接,避免HTTP GET探测污染服务识别
- port_scan.go: 优化验证策略,用轻量CRLF探测替代HTTP GET,超时从2.2s降至0.6s
- manager.go: 修正ProbeProxyBehavior判断逻辑,超时应视为代理正常转发
* fix(pool): 移除线程池预分配,优化大规模扫描内存占用
WithPreAlloc(true) 会预先创建所有 worker goroutine,
在大规模扫描(如 25域名×65535端口)时可能导致内存问题
* refactor(logging): 统一日志前缀,删除废弃的 LogBase
- 删除 LogBase 函数,所有调用迁移到 LogInfo/LogError
- 新增 PrefixDebug ([.]) 前缀,所有日志级别现在都有前缀
- 修复日志输出缩进不一致的问题
- 删除未使用的 PrefixDefault 常量
* perf(icmp): 实现自适应等待算法优化存活检测性能
- 新增 waitAdaptive 函数,监控响应增量实现智能提前结束
- 算法保守原则:最小等待1s + 连续500ms无新响应才提前结束
- 添加100ms检查间隔避免CPU空转
- 保留原有最大等待时间(3s/6s)作为兜底
- 添加完整单元测试覆盖各种场景
优化效果:
- 全部响应:~100ms (原3s)
- 无响应:~1s (原3s)
- 部分响应后稳定:~1.5s (原3s)
* perf(scan): 实现启发式优化提升扫描体验
1. 端口优先级排序:高价值端口(80,443,22,3389等)优先扫描
- 用户能更快看到有意义的结果
- 不影响端口喷洒策略
2. TCP 补充探测:ICMP 响应率<10%时自动启用
- 对未响应主机用 TCP 80/443/22/445 补充探测
- 解决防火墙过滤 ICMP 导致漏检的问题
* refactor(grdp): 精简RDP库,删除认证检测不需要的代码
- 删除 VNC 协议支持 (protocol/rfb, client/rfb.go)
- 删除完整客户端框架 (client/)
- 删除 RemoteApp 等插件 (plugin/)
- 删除 RLE 图形解压 (core/rle.go)
- 删除绘图指令处理 (pdu/orders.go, pdu/gdi.go)
- 精简 screen.go,移除截图和完整会话功能
- 移除未使用的 RGB 转换函数
grdp 代码从 13,044 行精简至 7,581 行,削减 42%
* refactor(common): 删除死代码,优化代码风格
- 删除未使用的 joinStrings/joinInts 函数
- 删除未使用的 memStats 字段和 getMemoryInfo 方法
- 简化 parsePasswords 中的循环为 append(...) 形式
* refactor(services): 统一数据库插件的DBWrapper
4个数据库插件(MySQL、PostgreSQL、MSSQL、Oracle)都有相同的sql.DB包装代码,
合并为通用的SQLDBWrapper,减少重复。
* refactor(core,grdp): 删除未使用的死代码
- 移除 BaseScanStrategy.LogPluginInfoWithPort 方法(无调用者)
- 移除 mcs.go 中被注释的旧 connect 函数实现
* refactor: 删除 deadcode 检测出的未使用函数
- proxy/detector.go: 删除 IsSOCKS5Standard, IsProxyInitialized
- findnet.go: 删除 NetworkInfo.OneLine, TreeFormat 方法
- port_scan.go: 删除 estimateScanTime 函数
- web_scanner.go: 删除 GetFingerprints 函数
- 清理相关测试代码
* refactor: 删除更多未使用的死代码
- parse.go: 删除 RemoveDuplicate 函数及其测试
- parsers.go: 删除 excludeHosts, removeDuplicates 别名函数
- 更新测试使用真正的函数名
* fix(test): 修复 TestParseIP_InvalidIPRange 测试用例
- 删除不合理的测试用例(无效IP被当作普通主机名处理是设计行为)
- 修复测试逻辑,只在真正通过时输出"正确"
* fix(scan): 移除域名预解析,保留原始域名进行扫描
域名预解析会将域名转换为IP,导致虚拟主机场景下HTTP访问失败
(Host头变成IP而非域名,无法正确路由)
* fix(scan): 修复 -hf 参数无法单独使用的问题
* fix(proxy): 修复透明代理环境下 SOCKS5 代理全端口误报问题
问题:在透明代理(TUN模式)环境下使用 SOCKS5 代理扫描时,
会出现全端口开放的误报,因为代理可靠性检测被透明代理污染。
修复方案(参考 fscanx):
1. 将探针从 CRLF 改为 HTTP GET,更有效检测真实连接状态
2. 删除 "uncertain" 状态,无响应一律判定为端口关闭
3. 调整超时时间以适应代理链路延迟
Fixes #524
* feat(telnet): 新增 telnetd RCE 命令执行验证,修复未授权访问日志级别
* fix: 修复 i18n.Tr vet 报错、Unicode 测试用例,移除过期域名
- 移除 i18n.Tr 中错误的 fmt.Sprintf fallback,消除 go vet 误报
- 修复 match_engine_test Unicode 测试用例与 Latin-1 转换逻辑不匹配
- README 移除过期的 fscan.club 域名
- 添加 .gitattributes 统一换行符为 LF
* refactor: 统一控制台输出风格,使用统一的日志函数
手动合并 PR #558 的改动,适配重构后的代码路径
* fix(ci): 修复版本注入和CI触发配置
- goreleaser ldflags 指向正确的包路径 common.version/commit/date
- version 改为 var 支持 ldflags 注入,banner 显示 commit 和构建日期
- test-build 触发分支增加 dev-* 通配
* fix(ci): 修复 Windows 产物 .exe.exe 双后缀问题
* feat(ci): 扩展构建架构支持 MIPS/ARM/FreeBSD/Solaris
This commit is contained in:
@@ -0,0 +1,740 @@
|
||||
package output
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"encoding/csv"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"os"
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
)
|
||||
|
||||
// escapeControlChars 转义控制字符
|
||||
func escapeControlChars(s string) string {
|
||||
replacer := strings.NewReplacer(
|
||||
"\r\n", "\\r\\n",
|
||||
"\n", "\\n",
|
||||
"\r", "\\r",
|
||||
"\t", "\\t",
|
||||
)
|
||||
return replacer.Replace(s)
|
||||
}
|
||||
|
||||
// =============================================================================
|
||||
// TXTWriter - 文本格式写入器
|
||||
// =============================================================================
|
||||
|
||||
// TXTWriter 文本格式写入器(分类缓冲,按类型聚合输出)
|
||||
type TXTWriter struct {
|
||||
file *os.File
|
||||
bufWriter *bufio.Writer
|
||||
mu sync.Mutex
|
||||
closed bool
|
||||
buffer *ResultBuffer // 内存分类缓冲
|
||||
realtimeFile *os.File // 实时备份文件
|
||||
realtimePath string // 实时备份文件路径
|
||||
}
|
||||
|
||||
// NewTXTWriter 创建文本写入器
|
||||
func NewTXTWriter(filePath string) (*TXTWriter, error) {
|
||||
file, err := os.OpenFile(filePath, DefaultFileFlags, DefaultFilePermissions)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to create TXT file: %w", err)
|
||||
}
|
||||
|
||||
// 创建实时备份文件(防崩溃丢数据)
|
||||
realtimePath := filePath + ".realtime.tmp"
|
||||
realtimeFile, err := os.OpenFile(realtimePath, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, DefaultFilePermissions)
|
||||
if err != nil {
|
||||
file.Close()
|
||||
return nil, fmt.Errorf("failed to create realtime backup file: %w", err)
|
||||
}
|
||||
|
||||
return &TXTWriter{
|
||||
file: file,
|
||||
bufWriter: bufio.NewWriter(file),
|
||||
buffer: NewResultBuffer(),
|
||||
realtimeFile: realtimeFile,
|
||||
realtimePath: realtimePath,
|
||||
}, nil
|
||||
}
|
||||
|
||||
// WriteHeader 写入头部
|
||||
func (w *TXTWriter) WriteHeader() error {
|
||||
return nil
|
||||
}
|
||||
|
||||
// Write 收集扫描结果到分类缓冲,同时实时备份
|
||||
func (w *TXTWriter) Write(result *ScanResult) error {
|
||||
w.mu.Lock()
|
||||
defer w.mu.Unlock()
|
||||
|
||||
if w.closed {
|
||||
return fmt.Errorf("writer is closed")
|
||||
}
|
||||
if result == nil {
|
||||
return fmt.Errorf("result cannot be nil")
|
||||
}
|
||||
|
||||
// 1. 加入内存分类缓冲(用于最终有序输出)
|
||||
w.buffer.Add(result)
|
||||
|
||||
// 2. 实时写入备份文件(防崩溃丢数据)
|
||||
if w.realtimeFile != nil {
|
||||
line := w.formatLine(result)
|
||||
if _, err := w.realtimeFile.WriteString(line + "\n"); err != nil {
|
||||
return fmt.Errorf("failed to write realtime backup: %w", err)
|
||||
}
|
||||
if err := w.realtimeFile.Sync(); err != nil {
|
||||
return fmt.Errorf("failed to sync realtime backup: %w", err)
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// getSeparator 获取分隔线文本
|
||||
func (w *TXTWriter) getSeparator(newType ResultType) string {
|
||||
switch newType {
|
||||
case TypeHost:
|
||||
return "# ===== 存活主机 ====="
|
||||
case TypePort:
|
||||
return "# ===== 开放端口 ====="
|
||||
case TypeService:
|
||||
return "# ===== 服务信息 ====="
|
||||
case TypeVuln:
|
||||
return "# ===== 漏洞信息 ====="
|
||||
default:
|
||||
return "# ===================="
|
||||
}
|
||||
}
|
||||
|
||||
// formatLine 根据结果类型格式化输出行
|
||||
func (w *TXTWriter) formatLine(result *ScanResult) string {
|
||||
switch result.Type {
|
||||
case TypeHost:
|
||||
return result.Target
|
||||
case TypePort:
|
||||
port := w.getDetail(result, "port")
|
||||
if port != nil {
|
||||
return fmt.Sprintf("%s:%v", result.Target, port)
|
||||
}
|
||||
return result.Target
|
||||
case TypeService:
|
||||
return w.formatServiceLine(result)
|
||||
case TypeVuln:
|
||||
return w.formatVulnLine(result)
|
||||
default:
|
||||
return result.Target
|
||||
}
|
||||
}
|
||||
|
||||
// formatServiceLine 格式化服务识别结果
|
||||
func (w *TXTWriter) formatServiceLine(result *ScanResult) string {
|
||||
service := w.getDetailStr(result, "service")
|
||||
banner := w.getDetailStr(result, "banner")
|
||||
|
||||
// 判断是否为Web服务
|
||||
isWebFlag := false
|
||||
if v, ok := w.getDetail(result, "is_web").(bool); ok && v {
|
||||
isWebFlag = true
|
||||
}
|
||||
if !isWebFlag {
|
||||
if w.getDetail(result, "status") != nil || w.getDetailStr(result, "server") != "" {
|
||||
isWebFlag = true
|
||||
}
|
||||
}
|
||||
|
||||
if isWebFlag || service == "http" || service == "https" {
|
||||
return w.formatWebServiceLine(result)
|
||||
}
|
||||
|
||||
// 非Web服务:ip:port service banner
|
||||
target := result.Target
|
||||
if !strings.Contains(target, ":") {
|
||||
if port := w.getDetail(result, "port"); port != nil {
|
||||
target = fmt.Sprintf("%s:%v", target, port)
|
||||
}
|
||||
}
|
||||
|
||||
var parts []string
|
||||
parts = append(parts, target)
|
||||
if service != "" {
|
||||
parts = append(parts, service)
|
||||
}
|
||||
if banner != "" {
|
||||
if len(banner) > 100 {
|
||||
banner = banner[:100] + "..."
|
||||
}
|
||||
banner = escapeControlChars(banner)
|
||||
parts = append(parts, banner)
|
||||
}
|
||||
return strings.Join(parts, " ")
|
||||
}
|
||||
|
||||
// formatWebServiceLine 格式化Web服务结果
|
||||
func (w *TXTWriter) formatWebServiceLine(result *ScanResult) string {
|
||||
target := result.Target
|
||||
if !strings.Contains(target, ":") {
|
||||
if port := w.getDetail(result, "port"); port != nil {
|
||||
target = fmt.Sprintf("%s:%v", target, port)
|
||||
}
|
||||
}
|
||||
|
||||
protocol := "http"
|
||||
service := w.getDetailStr(result, "service")
|
||||
if service == "https" || strings.Contains(target, ":443") {
|
||||
protocol = "https"
|
||||
}
|
||||
|
||||
url := fmt.Sprintf("%s://%s", protocol, target)
|
||||
title := w.getDetailStr(result, "title")
|
||||
status := w.getDetail(result, "status")
|
||||
server := w.getDetailStr(result, "server")
|
||||
fingerprints := w.getFingerprints(result)
|
||||
|
||||
var parts []string
|
||||
parts = append(parts, url)
|
||||
if title != "" {
|
||||
parts = append(parts, fmt.Sprintf("[%s]", title))
|
||||
}
|
||||
if status != nil && status != 0 {
|
||||
parts = append(parts, fmt.Sprintf("%v", status))
|
||||
}
|
||||
if server != "" {
|
||||
parts = append(parts, server)
|
||||
}
|
||||
if len(fingerprints) > 0 {
|
||||
parts = append(parts, fingerprints)
|
||||
}
|
||||
return strings.Join(parts, " ")
|
||||
}
|
||||
|
||||
// getFingerprints 获取指纹信息并格式化
|
||||
func (w *TXTWriter) getFingerprints(result *ScanResult) string {
|
||||
fp := w.getDetail(result, "fingerprints")
|
||||
if fp == nil {
|
||||
return ""
|
||||
}
|
||||
|
||||
switch v := fp.(type) {
|
||||
case []string:
|
||||
if len(v) > 0 {
|
||||
return "[" + strings.Join(v, ",") + "]"
|
||||
}
|
||||
case []interface{}:
|
||||
if len(v) > 0 {
|
||||
var fps []string
|
||||
for _, f := range v {
|
||||
fps = append(fps, fmt.Sprintf("%v", f))
|
||||
}
|
||||
return "[" + strings.Join(fps, ",") + "]"
|
||||
}
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
// formatVulnLine 格式化漏洞发现结果
|
||||
func (w *TXTWriter) formatVulnLine(result *ScanResult) string {
|
||||
vulnType := w.getDetailStr(result, "type")
|
||||
|
||||
if vulnType == "weak_credential" {
|
||||
username := w.getDetailStr(result, "username")
|
||||
password := w.getDetailStr(result, "password")
|
||||
service := w.getDetailStr(result, "service")
|
||||
|
||||
if service != "" {
|
||||
return fmt.Sprintf("%s %s %s/%s", result.Target, service, username, password)
|
||||
}
|
||||
return fmt.Sprintf("%s %s/%s", result.Target, username, password)
|
||||
}
|
||||
|
||||
vuln := w.getDetailStr(result, "vulnerability")
|
||||
if vuln != "" {
|
||||
return fmt.Sprintf("%s %s", result.Target, vuln)
|
||||
}
|
||||
return fmt.Sprintf("%s %s", result.Target, result.Status)
|
||||
}
|
||||
|
||||
// getDetail 获取详情字段值
|
||||
func (w *TXTWriter) getDetail(result *ScanResult, key string) interface{} {
|
||||
if result.Details == nil {
|
||||
return nil
|
||||
}
|
||||
return result.Details[key]
|
||||
}
|
||||
|
||||
// getDetailStr 获取详情字段字符串值
|
||||
func (w *TXTWriter) getDetailStr(result *ScanResult, key string) string {
|
||||
val := w.getDetail(result, key)
|
||||
if val == nil {
|
||||
return ""
|
||||
}
|
||||
if s, ok := val.(string); ok {
|
||||
return s
|
||||
}
|
||||
return fmt.Sprintf("%v", val)
|
||||
}
|
||||
|
||||
// Flush 刷新写入器
|
||||
func (w *TXTWriter) Flush() error {
|
||||
w.mu.Lock()
|
||||
defer w.mu.Unlock()
|
||||
|
||||
if w.closed {
|
||||
return nil
|
||||
}
|
||||
|
||||
if err := w.bufWriter.Flush(); err != nil {
|
||||
return err
|
||||
}
|
||||
return w.file.Sync()
|
||||
}
|
||||
|
||||
// Close 关闭写入器(清理资源,删除临时备份)
|
||||
func (w *TXTWriter) Close() error {
|
||||
w.mu.Lock()
|
||||
defer w.mu.Unlock()
|
||||
|
||||
if w.closed {
|
||||
return nil
|
||||
}
|
||||
|
||||
// 按顺序写入所有分类结果
|
||||
w.writeSection(TypeHost, w.buffer.HostResults)
|
||||
w.writeSection(TypePort, w.buffer.PortResults)
|
||||
w.writeSection(TypeService, w.buffer.ServiceResults)
|
||||
w.writeSection(TypeVuln, w.buffer.VulnResults)
|
||||
|
||||
// 单独输出 Web 服务列表(便于复制测试)
|
||||
w.writeWebServices()
|
||||
|
||||
w.closed = true
|
||||
|
||||
// 关闭并删除实时备份文件(正常结束,不再需要)
|
||||
if w.realtimeFile != nil {
|
||||
w.realtimeFile.Close()
|
||||
os.Remove(w.realtimePath)
|
||||
}
|
||||
|
||||
if err := w.bufWriter.Flush(); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := w.file.Sync(); err != nil {
|
||||
return err
|
||||
}
|
||||
return w.file.Close()
|
||||
}
|
||||
|
||||
// writeSection 写入一个分类的所有结果
|
||||
func (w *TXTWriter) writeSection(resultType ResultType, results []*ScanResult) {
|
||||
if len(results) == 0 {
|
||||
return
|
||||
}
|
||||
|
||||
separator := w.getSeparator(resultType)
|
||||
_, _ = w.bufWriter.WriteString(separator + "\n")
|
||||
|
||||
for _, result := range results {
|
||||
line := w.formatLine(result)
|
||||
if line != "" {
|
||||
_, _ = w.bufWriter.WriteString(line + "\n")
|
||||
}
|
||||
}
|
||||
_, _ = w.bufWriter.WriteString("\n")
|
||||
}
|
||||
|
||||
// writeWebServices 单独输出 Web 服务 URL 列表
|
||||
func (w *TXTWriter) writeWebServices() {
|
||||
var urls []string
|
||||
|
||||
for _, result := range w.buffer.ServiceResults {
|
||||
if !w.isWebService(result) {
|
||||
continue
|
||||
}
|
||||
|
||||
target := result.Target
|
||||
if !strings.Contains(target, ":") {
|
||||
if port := w.getDetail(result, "port"); port != nil {
|
||||
target = fmt.Sprintf("%s:%v", target, port)
|
||||
}
|
||||
}
|
||||
|
||||
protocol := "http"
|
||||
service := w.getDetailStr(result, "service")
|
||||
if service == "https" || strings.Contains(target, ":443") {
|
||||
protocol = "https"
|
||||
}
|
||||
|
||||
urls = append(urls, fmt.Sprintf("%s://%s", protocol, target))
|
||||
}
|
||||
|
||||
if len(urls) == 0 {
|
||||
return
|
||||
}
|
||||
|
||||
_, _ = w.bufWriter.WriteString("# ===== Web服务 =====\n")
|
||||
for _, url := range urls {
|
||||
_, _ = w.bufWriter.WriteString(url + "\n")
|
||||
}
|
||||
_, _ = w.bufWriter.WriteString("\n")
|
||||
}
|
||||
|
||||
// isWebService 判断是否为 Web 服务
|
||||
func (w *TXTWriter) isWebService(result *ScanResult) bool {
|
||||
if v, ok := w.getDetail(result, "is_web").(bool); ok && v {
|
||||
return true
|
||||
}
|
||||
if w.getDetail(result, "status") != nil {
|
||||
return true
|
||||
}
|
||||
if w.getDetailStr(result, "server") != "" {
|
||||
return true
|
||||
}
|
||||
service := w.getDetailStr(result, "service")
|
||||
return service == "http" || service == "https"
|
||||
}
|
||||
|
||||
// GetFormat 获取格式类型
|
||||
func (w *TXTWriter) GetFormat() Format {
|
||||
return FormatTXT
|
||||
}
|
||||
|
||||
// =============================================================================
|
||||
// JSONWriter - JSON格式写入器
|
||||
// =============================================================================
|
||||
|
||||
// JSONWriter JSON格式写入器(分类去重,输出完整JSON)
|
||||
// 双写机制:内存分类缓冲 + 实时NDJSON备份
|
||||
type JSONWriter struct {
|
||||
file *os.File
|
||||
mu sync.Mutex
|
||||
closed bool
|
||||
buffer *ResultBuffer
|
||||
realtimeFile *os.File // 实时备份文件(NDJSON格式)
|
||||
realtimePath string // 实时备份文件路径
|
||||
}
|
||||
|
||||
// JSONOutput JSON输出结构
|
||||
type JSONOutput struct {
|
||||
ScanTime time.Time `json:"scan_time"`
|
||||
Summary JSONSummary `json:"summary"`
|
||||
Hosts []*ScanResult `json:"hosts,omitempty"`
|
||||
Ports []*ScanResult `json:"ports,omitempty"`
|
||||
Services []*ScanResult `json:"services,omitempty"`
|
||||
Vulns []*ScanResult `json:"vulns,omitempty"`
|
||||
}
|
||||
|
||||
// JSONSummary 扫描摘要
|
||||
type JSONSummary struct {
|
||||
TotalHosts int `json:"total_hosts"`
|
||||
TotalPorts int `json:"total_ports"`
|
||||
TotalServices int `json:"total_services"`
|
||||
TotalVulns int `json:"total_vulns"`
|
||||
}
|
||||
|
||||
// NewJSONWriter 创建JSON写入器
|
||||
func NewJSONWriter(filePath string) (*JSONWriter, error) {
|
||||
file, err := os.OpenFile(filePath, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, DefaultFilePermissions)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to create JSON file: %w", err)
|
||||
}
|
||||
|
||||
// 创建实时备份文件(NDJSON格式,每行一个JSON对象)
|
||||
realtimePath := filePath + ".realtime.tmp"
|
||||
realtimeFile, err := os.OpenFile(realtimePath, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, DefaultFilePermissions)
|
||||
if err != nil {
|
||||
file.Close()
|
||||
return nil, fmt.Errorf("failed to create realtime backup file: %w", err)
|
||||
}
|
||||
|
||||
return &JSONWriter{
|
||||
file: file,
|
||||
buffer: NewResultBuffer(),
|
||||
realtimeFile: realtimeFile,
|
||||
realtimePath: realtimePath,
|
||||
}, nil
|
||||
}
|
||||
|
||||
// WriteHeader 写入头部
|
||||
func (w *JSONWriter) WriteHeader() error {
|
||||
return nil
|
||||
}
|
||||
|
||||
// Write 收集扫描结果,同时实时写入备份文件
|
||||
func (w *JSONWriter) Write(result *ScanResult) error {
|
||||
w.mu.Lock()
|
||||
defer w.mu.Unlock()
|
||||
|
||||
if w.closed {
|
||||
return fmt.Errorf("writer is closed")
|
||||
}
|
||||
if result == nil {
|
||||
return fmt.Errorf("result cannot be nil")
|
||||
}
|
||||
|
||||
// 1. 加入内存分类缓冲(用于最终有序输出)
|
||||
w.buffer.Add(result)
|
||||
|
||||
// 2. 实时写入备份文件(NDJSON格式,防崩溃丢失)
|
||||
if w.realtimeFile != nil {
|
||||
data, err := json.Marshal(result)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to marshal result: %w", err)
|
||||
}
|
||||
if _, err := w.realtimeFile.Write(append(data, '\n')); err != nil {
|
||||
return fmt.Errorf("failed to write realtime backup: %w", err)
|
||||
}
|
||||
if err := w.realtimeFile.Sync(); err != nil {
|
||||
return fmt.Errorf("failed to sync realtime backup: %w", err)
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// Flush 刷新写入器
|
||||
func (w *JSONWriter) Flush() error {
|
||||
return nil
|
||||
}
|
||||
|
||||
// Close 关闭写入器(写入完整JSON,删除临时备份)
|
||||
func (w *JSONWriter) Close() error {
|
||||
w.mu.Lock()
|
||||
defer w.mu.Unlock()
|
||||
|
||||
if w.closed {
|
||||
return nil
|
||||
}
|
||||
|
||||
hosts, ports, services, vulns := w.buffer.Summary()
|
||||
output := JSONOutput{
|
||||
ScanTime: time.Now(),
|
||||
Summary: JSONSummary{
|
||||
TotalHosts: hosts,
|
||||
TotalPorts: ports,
|
||||
TotalServices: services,
|
||||
TotalVulns: vulns,
|
||||
},
|
||||
Hosts: w.buffer.HostResults,
|
||||
Ports: w.buffer.PortResults,
|
||||
Services: w.buffer.ServiceResults,
|
||||
Vulns: w.buffer.VulnResults,
|
||||
}
|
||||
|
||||
data, err := json.MarshalIndent(output, JSONIndentPrefix, JSONIndentString)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
w.closed = true
|
||||
|
||||
// 关闭并删除实时备份文件(正常结束,不再需要)
|
||||
if w.realtimeFile != nil {
|
||||
w.realtimeFile.Close()
|
||||
os.Remove(w.realtimePath)
|
||||
}
|
||||
|
||||
if _, err := w.file.Write(data); err != nil {
|
||||
return err
|
||||
}
|
||||
return w.file.Close()
|
||||
}
|
||||
|
||||
// GetFormat 获取格式类型
|
||||
func (w *JSONWriter) GetFormat() Format {
|
||||
return FormatJSON
|
||||
}
|
||||
|
||||
// =============================================================================
|
||||
// CSVWriter - CSV格式写入器
|
||||
// =============================================================================
|
||||
|
||||
// CSVWriter CSV格式写入器(分类去重)
|
||||
// 双写机制:内存分类缓冲 + 实时NDJSON备份
|
||||
type CSVWriter struct {
|
||||
file *os.File
|
||||
bufWriter *bufio.Writer
|
||||
csvWriter *csv.Writer
|
||||
mu sync.Mutex
|
||||
closed bool
|
||||
buffer *ResultBuffer
|
||||
realtimeFile *os.File // 实时备份文件(NDJSON格式)
|
||||
realtimePath string // 实时备份文件路径
|
||||
}
|
||||
|
||||
// NewCSVWriter 创建CSV写入器
|
||||
func NewCSVWriter(filePath string) (*CSVWriter, error) {
|
||||
file, err := os.OpenFile(filePath, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, DefaultFilePermissions)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to create CSV file: %w", err)
|
||||
}
|
||||
|
||||
// 创建实时备份文件(NDJSON格式)
|
||||
realtimePath := filePath + ".realtime.tmp"
|
||||
realtimeFile, err := os.OpenFile(realtimePath, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, DefaultFilePermissions)
|
||||
if err != nil {
|
||||
file.Close()
|
||||
return nil, fmt.Errorf("failed to create realtime backup file: %w", err)
|
||||
}
|
||||
|
||||
bufWriter := bufio.NewWriter(file)
|
||||
csvWriter := csv.NewWriter(bufWriter)
|
||||
|
||||
return &CSVWriter{
|
||||
file: file,
|
||||
bufWriter: bufWriter,
|
||||
csvWriter: csvWriter,
|
||||
buffer: NewResultBuffer(),
|
||||
realtimeFile: realtimeFile,
|
||||
realtimePath: realtimePath,
|
||||
}, nil
|
||||
}
|
||||
|
||||
// WriteHeader 写入CSV头部
|
||||
func (w *CSVWriter) WriteHeader() error {
|
||||
return nil // 延迟到Close时写入
|
||||
}
|
||||
|
||||
// Write 收集扫描结果,同时实时写入备份文件
|
||||
func (w *CSVWriter) Write(result *ScanResult) error {
|
||||
w.mu.Lock()
|
||||
defer w.mu.Unlock()
|
||||
|
||||
if w.closed {
|
||||
return fmt.Errorf("writer is closed")
|
||||
}
|
||||
if result == nil {
|
||||
return fmt.Errorf("result cannot be nil")
|
||||
}
|
||||
|
||||
// 1. 加入内存分类缓冲(用于最终有序输出)
|
||||
w.buffer.Add(result)
|
||||
|
||||
// 2. 实时写入备份文件(NDJSON格式,防崩溃丢失)
|
||||
if w.realtimeFile != nil {
|
||||
data, err := json.Marshal(result)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to marshal result: %w", err)
|
||||
}
|
||||
if _, err := w.realtimeFile.Write(append(data, '\n')); err != nil {
|
||||
return fmt.Errorf("failed to write realtime backup: %w", err)
|
||||
}
|
||||
if err := w.realtimeFile.Sync(); err != nil {
|
||||
return fmt.Errorf("failed to sync realtime backup: %w", err)
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// Flush 刷新写入器
|
||||
func (w *CSVWriter) Flush() error {
|
||||
return nil
|
||||
}
|
||||
|
||||
// Close 关闭写入器(按类型分组写入,删除临时备份)
|
||||
func (w *CSVWriter) Close() error {
|
||||
w.mu.Lock()
|
||||
defer w.mu.Unlock()
|
||||
|
||||
if w.closed {
|
||||
return nil
|
||||
}
|
||||
|
||||
// 写入各分类
|
||||
w.writeSection("# Hosts", []string{"Target"}, w.buffer.HostResults, w.formatHostRecord)
|
||||
w.writeSection("# Ports", []string{"Target", "Port", "Status"}, w.buffer.PortResults, w.formatPortRecord)
|
||||
w.writeSection("# Services", []string{"Target", "Service", "Version", "Banner"}, w.buffer.ServiceResults, w.formatServiceRecord)
|
||||
w.writeSection("# Vulns", []string{"Target", "Type", "Details"}, w.buffer.VulnResults, w.formatVulnRecord)
|
||||
|
||||
w.closed = true
|
||||
|
||||
// 关闭并删除实时备份文件(正常结束,不再需要)
|
||||
if w.realtimeFile != nil {
|
||||
w.realtimeFile.Close()
|
||||
os.Remove(w.realtimePath)
|
||||
}
|
||||
|
||||
w.csvWriter.Flush()
|
||||
if err := w.csvWriter.Error(); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := w.bufWriter.Flush(); err != nil {
|
||||
return err
|
||||
}
|
||||
return w.file.Close()
|
||||
}
|
||||
|
||||
func (w *CSVWriter) writeSection(title string, headers []string, results []*ScanResult, formatter func(*ScanResult) []string) {
|
||||
if len(results) == 0 {
|
||||
return
|
||||
}
|
||||
|
||||
_ = w.csvWriter.Write([]string{title})
|
||||
_ = w.csvWriter.Write(headers)
|
||||
|
||||
for _, result := range results {
|
||||
_ = w.csvWriter.Write(formatter(result))
|
||||
}
|
||||
_ = w.csvWriter.Write([]string{})
|
||||
}
|
||||
|
||||
func (w *CSVWriter) formatHostRecord(result *ScanResult) []string {
|
||||
return []string{result.Target}
|
||||
}
|
||||
|
||||
func (w *CSVWriter) formatPortRecord(result *ScanResult) []string {
|
||||
port := ""
|
||||
if result.Details != nil {
|
||||
if p, ok := result.Details["port"]; ok {
|
||||
port = fmt.Sprintf("%v", p)
|
||||
}
|
||||
}
|
||||
return []string{result.Target, port, "open"}
|
||||
}
|
||||
|
||||
func (w *CSVWriter) formatServiceRecord(result *ScanResult) []string {
|
||||
service, version, banner := "", "", ""
|
||||
if result.Details != nil {
|
||||
if s, ok := result.Details["service"].(string); ok {
|
||||
service = s
|
||||
}
|
||||
if s, ok := result.Details["name"].(string); ok && service == "" {
|
||||
service = s
|
||||
}
|
||||
if v, ok := result.Details["version"].(string); ok {
|
||||
version = v
|
||||
}
|
||||
if b, ok := result.Details["banner"].(string); ok {
|
||||
banner = escapeControlChars(b)
|
||||
if len(banner) > 100 {
|
||||
banner = banner[:100] + "..."
|
||||
}
|
||||
}
|
||||
}
|
||||
target := result.Target
|
||||
if !strings.Contains(target, ":") {
|
||||
if p, ok := result.Details["port"]; ok {
|
||||
target = fmt.Sprintf("%s:%v", target, p)
|
||||
}
|
||||
}
|
||||
return []string{target, service, version, banner}
|
||||
}
|
||||
|
||||
func (w *CSVWriter) formatVulnRecord(result *ScanResult) []string {
|
||||
vulnType := ""
|
||||
if result.Details != nil {
|
||||
if t, ok := result.Details["type"].(string); ok {
|
||||
vulnType = t
|
||||
}
|
||||
}
|
||||
return []string{result.Target, vulnType, result.Status}
|
||||
}
|
||||
|
||||
// GetFormat 获取格式类型
|
||||
func (w *CSVWriter) GetFormat() Format {
|
||||
return FormatCSV
|
||||
}
|
||||
Reference in New Issue
Block a user