mirror of
https://github.com/shadow1ng/fscan.git
synced 2026-09-25 04:31:52 +08:00
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)
This commit is contained in:
@@ -0,0 +1,260 @@
|
||||
package parsers
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"fmt"
|
||||
"os"
|
||||
"sort"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"github.com/shadow1ng/fscan/common/config"
|
||||
)
|
||||
|
||||
/*
|
||||
Simple.go - 简化版本的解析器函数
|
||||
|
||||
这个文件提供了简化但功能完整的解析函数,用于替代复杂的解析器架构。
|
||||
保持与现有代码的接口兼容性,但大幅简化实现逻辑。
|
||||
*/
|
||||
|
||||
// =============================================================================
|
||||
// 简化的IP/主机解析函数
|
||||
// =============================================================================
|
||||
|
||||
// ParseIP 解析各种格式的IP地址
|
||||
// 支持单个IP、IP范围、CIDR和文件输入
|
||||
func ParseIP(host string, filename string, nohosts ...string) ([]string, error) {
|
||||
var hosts []string
|
||||
|
||||
// 如果提供了文件名,从文件读取主机列表
|
||||
if filename != "" {
|
||||
fileHosts, fileErr := readHostsFromFile(filename)
|
||||
if fileErr != nil {
|
||||
return nil, fmt.Errorf("读取主机文件失败: %w", fileErr)
|
||||
}
|
||||
hosts = append(hosts, fileHosts...)
|
||||
}
|
||||
|
||||
// 解析主机参数
|
||||
if host != "" {
|
||||
hostList, hostErr := parseHostString(host)
|
||||
if hostErr != nil {
|
||||
return nil, fmt.Errorf("解析主机失败: %w", hostErr)
|
||||
}
|
||||
hosts = append(hosts, hostList...)
|
||||
}
|
||||
|
||||
// 处理排除主机
|
||||
if len(nohosts) > 0 && nohosts[0] != "" {
|
||||
excludeList, excludeErr := parseHostString(nohosts[0])
|
||||
if excludeErr != nil {
|
||||
return nil, fmt.Errorf("解析排除主机失败: %w", excludeErr)
|
||||
}
|
||||
hosts = excludeHosts(hosts, excludeList)
|
||||
}
|
||||
|
||||
// 去重和排序
|
||||
hosts = removeDuplicates(hosts)
|
||||
sort.Strings(hosts)
|
||||
|
||||
if len(hosts) == 0 {
|
||||
return nil, fmt.Errorf("没有找到有效的主机")
|
||||
}
|
||||
|
||||
return hosts, nil
|
||||
}
|
||||
|
||||
// =============================================================================
|
||||
// 简化的端口解析函数
|
||||
// =============================================================================
|
||||
|
||||
// ParsePort 解析端口配置字符串为端口号列表
|
||||
// 保持与 ParsePort 的接口兼容性
|
||||
func ParsePort(ports string) []int {
|
||||
if ports == "" {
|
||||
return nil
|
||||
}
|
||||
|
||||
var result []int
|
||||
|
||||
// 处理预定义端口组
|
||||
ports = expandPortGroups(ports)
|
||||
|
||||
// 按逗号分割
|
||||
for _, portStr := range strings.Split(ports, ",") {
|
||||
portStr = strings.TrimSpace(portStr)
|
||||
if portStr == "" {
|
||||
continue
|
||||
}
|
||||
|
||||
// 处理端口范围 (如 1-100)
|
||||
if strings.Contains(portStr, "-") {
|
||||
rangePorts := parsePortRange(portStr)
|
||||
result = append(result, rangePorts...)
|
||||
} else {
|
||||
// 单个端口
|
||||
if port, err := strconv.Atoi(portStr); err == nil {
|
||||
if port >= MinPort && port <= MaxPort {
|
||||
result = append(result, port)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 去重和排序
|
||||
result = removeDuplicatePorts(result)
|
||||
sort.Ints(result)
|
||||
|
||||
return result
|
||||
}
|
||||
|
||||
// 已移除未使用的 ParsePortsFromString 方法
|
||||
|
||||
// =============================================================================
|
||||
// 辅助函数
|
||||
// =============================================================================
|
||||
|
||||
// readHostsFromFile 从文件读取主机列表
|
||||
func readHostsFromFile(filename string) ([]string, error) {
|
||||
file, err := os.Open(filename)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer func() { _ = file.Close() }() // 只读文件,Close错误可安全忽略
|
||||
|
||||
var hosts []string
|
||||
scanner := bufio.NewScanner(file)
|
||||
for scanner.Scan() {
|
||||
line := strings.TrimSpace(scanner.Text())
|
||||
if line != "" && !strings.HasPrefix(line, CommentPrefix) {
|
||||
hosts = append(hosts, line)
|
||||
}
|
||||
}
|
||||
|
||||
return hosts, scanner.Err()
|
||||
}
|
||||
|
||||
// parseHostString 解析主机字符串
|
||||
func parseHostString(host string) ([]string, error) {
|
||||
var hosts []string
|
||||
|
||||
// 按逗号分割多个主机
|
||||
for _, h := range strings.Split(host, ",") {
|
||||
h = strings.TrimSpace(h)
|
||||
if h == "" {
|
||||
continue
|
||||
}
|
||||
|
||||
// 检查是否为CIDR格式
|
||||
if strings.Contains(h, "/") {
|
||||
cidrHosts, err := parseIPCIDR(h, SimpleMaxHosts)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("解析CIDR %s 失败: %w", h, err)
|
||||
}
|
||||
hosts = append(hosts, cidrHosts...)
|
||||
} else if strings.Contains(h, "-") && !strings.Contains(h, ":") {
|
||||
// IP范围格式 (如 192.168.1.1-10)
|
||||
rangeHosts, err := parseIPRangeString(h, SimpleMaxHosts)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("解析IP范围 %s 失败: %w", h, err)
|
||||
}
|
||||
hosts = append(hosts, rangeHosts...)
|
||||
} else {
|
||||
// 单个主机
|
||||
hosts = append(hosts, h)
|
||||
}
|
||||
}
|
||||
|
||||
return hosts, nil
|
||||
}
|
||||
|
||||
// parsePortRange 解析端口范围
|
||||
func parsePortRange(rangeStr string) []int {
|
||||
parts := strings.Split(rangeStr, "-")
|
||||
if len(parts) != 2 {
|
||||
return nil
|
||||
}
|
||||
|
||||
start, err1 := strconv.Atoi(strings.TrimSpace(parts[0]))
|
||||
end, err2 := strconv.Atoi(strings.TrimSpace(parts[1]))
|
||||
|
||||
if err1 != nil || err2 != nil || start < MinPort || end > MaxPort || start > end {
|
||||
return nil
|
||||
}
|
||||
|
||||
var ports []int
|
||||
for i := start; i <= end; i++ {
|
||||
ports = append(ports, i)
|
||||
}
|
||||
|
||||
return ports
|
||||
}
|
||||
|
||||
// expandPortGroups 展开端口组
|
||||
func expandPortGroups(ports string) string {
|
||||
// 使用预定义的端口组
|
||||
portGroups := config.GetPortGroups()
|
||||
|
||||
result := ports
|
||||
for group, portList := range portGroups {
|
||||
result = strings.ReplaceAll(result, group, portList)
|
||||
}
|
||||
|
||||
return result
|
||||
}
|
||||
|
||||
// excludeHosts 排除指定的主机
|
||||
func excludeHosts(hosts, excludeList []string) []string {
|
||||
if len(excludeList) == 0 {
|
||||
return hosts
|
||||
}
|
||||
|
||||
excludeMap := make(map[string]struct{})
|
||||
for _, exclude := range excludeList {
|
||||
excludeMap[exclude] = struct{}{}
|
||||
}
|
||||
|
||||
var result []string
|
||||
for _, host := range hosts {
|
||||
if _, found := excludeMap[host]; !found {
|
||||
result = append(result, host)
|
||||
}
|
||||
}
|
||||
|
||||
return result
|
||||
}
|
||||
|
||||
// removeDuplicates 去除字符串重复项
|
||||
func removeDuplicates(slice []string) []string {
|
||||
keys := make(map[string]struct{})
|
||||
var result []string
|
||||
|
||||
for _, item := range slice {
|
||||
if _, found := keys[item]; !found {
|
||||
keys[item] = struct{}{}
|
||||
result = append(result, item)
|
||||
}
|
||||
}
|
||||
|
||||
return result
|
||||
}
|
||||
|
||||
// removeDuplicatePorts 去除端口重复项
|
||||
func removeDuplicatePorts(slice []int) []int {
|
||||
if len(slice) == 0 {
|
||||
return nil
|
||||
}
|
||||
|
||||
keys := make(map[int]struct{}, len(slice))
|
||||
result := make([]int, 0, len(slice))
|
||||
|
||||
for _, item := range slice {
|
||||
if _, found := keys[item]; !found {
|
||||
keys[item] = struct{}{}
|
||||
result = append(result, item)
|
||||
}
|
||||
}
|
||||
|
||||
return result
|
||||
}
|
||||
Reference in New Issue
Block a user