mirror of
https://github.com/shadow1ng/fscan.git
synced 2026-09-22 19:21:52 +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)
353 lines
8.1 KiB
Go
353 lines
8.1 KiB
Go
package proxy
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"net"
|
|
"net/url"
|
|
"sync"
|
|
"sync/atomic"
|
|
"time"
|
|
|
|
"golang.org/x/net/proxy"
|
|
)
|
|
|
|
// manager 代理管理器实现
|
|
type manager struct {
|
|
config *ProxyConfig
|
|
stats *ProxyStats // 暂时保留但不使用
|
|
mu sync.RWMutex
|
|
|
|
// 连接池
|
|
dialerCache map[string]Dialer
|
|
cacheExpiry time.Time
|
|
cacheMu sync.RWMutex
|
|
}
|
|
|
|
// NewProxyManager 创建新的代理管理器
|
|
func NewProxyManager(config *ProxyConfig) ProxyManager {
|
|
if config == nil {
|
|
config = DefaultProxyConfig()
|
|
}
|
|
|
|
// 自动配置代理行为
|
|
AutoConfigureProxy(config)
|
|
|
|
return &manager{
|
|
config: config,
|
|
stats: &ProxyStats{
|
|
ProxyType: config.Type.String(),
|
|
ProxyAddress: config.Address,
|
|
},
|
|
dialerCache: make(map[string]Dialer),
|
|
cacheExpiry: time.Now().Add(DefaultCacheExpiry),
|
|
}
|
|
}
|
|
|
|
// GetDialer 获取普通拨号器
|
|
func (m *manager) GetDialer() (Dialer, error) {
|
|
m.mu.RLock()
|
|
config := m.config
|
|
m.mu.RUnlock()
|
|
|
|
switch config.Type {
|
|
case ProxyTypeNone:
|
|
return m.createDirectDialer(), nil
|
|
case ProxyTypeSOCKS5:
|
|
return m.createSOCKS5Dialer()
|
|
case ProxyTypeHTTP, ProxyTypeHTTPS:
|
|
return m.createHTTPDialer()
|
|
default:
|
|
return nil, NewProxyError(ErrTypeConfig, ErrMsgUnsupportedProxyType, ErrCodeUnsupportedProxyType, nil)
|
|
}
|
|
}
|
|
|
|
// GetTLSDialer 获取TLS拨号器
|
|
func (m *manager) GetTLSDialer() (TLSDialer, error) {
|
|
dialer, err := m.GetDialer()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return &tlsDialerWrapper{
|
|
dialer: dialer,
|
|
config: m.config,
|
|
stats: m.stats,
|
|
}, nil
|
|
}
|
|
|
|
// UpdateConfig 更新配置
|
|
func (m *manager) UpdateConfig(config *ProxyConfig) error {
|
|
if config == nil {
|
|
return NewProxyError(ErrTypeConfig, ErrMsgEmptyConfig, ErrCodeEmptyConfig, nil)
|
|
}
|
|
|
|
m.mu.Lock()
|
|
defer m.mu.Unlock()
|
|
|
|
m.config = config
|
|
m.stats.ProxyType = config.Type.String()
|
|
m.stats.ProxyAddress = config.Address
|
|
|
|
// 自动配置代理行为
|
|
AutoConfigureProxy(config)
|
|
|
|
// 清理缓存
|
|
m.cacheMu.Lock()
|
|
m.dialerCache = make(map[string]Dialer)
|
|
m.cacheExpiry = time.Now().Add(DefaultCacheExpiry)
|
|
m.cacheMu.Unlock()
|
|
|
|
return nil
|
|
}
|
|
|
|
// Close 关闭管理器
|
|
func (m *manager) Close() error {
|
|
m.cacheMu.Lock()
|
|
defer m.cacheMu.Unlock()
|
|
|
|
m.dialerCache = make(map[string]Dialer)
|
|
return nil
|
|
}
|
|
|
|
// Stats 获取统计信息
|
|
func (m *manager) Stats() *ProxyStats {
|
|
m.mu.RLock()
|
|
defer m.mu.RUnlock()
|
|
|
|
// 返回副本以避免并发问题
|
|
statsCopy := *m.stats
|
|
return &statsCopy
|
|
}
|
|
|
|
// createDirectDialer 创建直连拨号器
|
|
func (m *manager) createDirectDialer() Dialer {
|
|
return &directDialer{
|
|
timeout: m.config.Timeout,
|
|
localAddr: m.config.LocalAddr,
|
|
stats: m.stats,
|
|
}
|
|
}
|
|
|
|
// createSOCKS5Dialer 创建SOCKS5拨号器
|
|
func (m *manager) createSOCKS5Dialer() (Dialer, error) {
|
|
// 检查缓存
|
|
cacheKey := fmt.Sprintf(CacheKeySOCKS5, m.config.Address)
|
|
m.cacheMu.RLock()
|
|
if time.Now().Before(m.cacheExpiry) {
|
|
if cached, exists := m.dialerCache[cacheKey]; exists {
|
|
m.cacheMu.RUnlock()
|
|
return cached, nil
|
|
}
|
|
}
|
|
m.cacheMu.RUnlock()
|
|
|
|
// 解析代理地址
|
|
proxyURL := fmt.Sprintf(SOCKS5URLFormat, m.config.Address)
|
|
if m.config.Username != "" {
|
|
proxyURL = fmt.Sprintf(SOCKS5URLAuthFormat,
|
|
m.config.Username, m.config.Password, m.config.Address)
|
|
}
|
|
|
|
u, err := url.Parse(proxyURL)
|
|
if err != nil {
|
|
return nil, NewProxyError(ErrTypeConfig, ErrMsgSOCKS5ParseFailed, ErrCodeSOCKS5ParseFailed, err)
|
|
}
|
|
|
|
// 创建基础拨号器
|
|
baseDial := &net.Dialer{
|
|
Timeout: m.config.Timeout,
|
|
KeepAlive: m.config.KeepAlive,
|
|
}
|
|
|
|
// 创建SOCKS5拨号器
|
|
var auth *proxy.Auth
|
|
if u.User != nil {
|
|
auth = &proxy.Auth{
|
|
User: u.User.Username(),
|
|
}
|
|
if password, hasPassword := u.User.Password(); hasPassword {
|
|
auth.Password = password
|
|
}
|
|
}
|
|
|
|
socksDialer, err := proxy.SOCKS5(NetworkTCP, u.Host, auth, baseDial)
|
|
if err != nil {
|
|
return nil, NewProxyError(ErrTypeConnection, ErrMsgSOCKS5CreateFailed, ErrCodeSOCKS5CreateFailed, err)
|
|
}
|
|
|
|
dialer := &socks5Dialer{
|
|
dialer: socksDialer,
|
|
config: m.config,
|
|
stats: m.stats,
|
|
}
|
|
|
|
// 更新缓存
|
|
m.cacheMu.Lock()
|
|
m.dialerCache[cacheKey] = dialer
|
|
m.cacheExpiry = time.Now().Add(DefaultCacheExpiry)
|
|
m.cacheMu.Unlock()
|
|
|
|
return dialer, nil
|
|
}
|
|
|
|
// createHTTPDialer 创建HTTP代理拨号器
|
|
func (m *manager) createHTTPDialer() (Dialer, error) {
|
|
// 检查缓存
|
|
cacheKey := fmt.Sprintf(CacheKeyHTTP, m.config.Address)
|
|
m.cacheMu.RLock()
|
|
if time.Now().Before(m.cacheExpiry) {
|
|
if cached, exists := m.dialerCache[cacheKey]; exists {
|
|
m.cacheMu.RUnlock()
|
|
return cached, nil
|
|
}
|
|
}
|
|
m.cacheMu.RUnlock()
|
|
|
|
dialer := &httpDialer{
|
|
config: m.config,
|
|
stats: m.stats,
|
|
baseDial: &net.Dialer{
|
|
Timeout: m.config.Timeout,
|
|
KeepAlive: m.config.KeepAlive,
|
|
},
|
|
}
|
|
|
|
// 更新缓存
|
|
m.cacheMu.Lock()
|
|
m.dialerCache[cacheKey] = dialer
|
|
m.cacheExpiry = time.Now().Add(DefaultCacheExpiry)
|
|
m.cacheMu.Unlock()
|
|
|
|
return dialer, nil
|
|
}
|
|
|
|
// directDialer 直连拨号器
|
|
type directDialer struct {
|
|
timeout time.Duration
|
|
localAddr string // 本地网卡IP地址
|
|
stats *ProxyStats
|
|
}
|
|
|
|
func (d *directDialer) Dial(network, address string) (net.Conn, error) {
|
|
return d.DialContext(context.Background(), network, address)
|
|
}
|
|
|
|
func (d *directDialer) DialContext(ctx context.Context, network, address string) (net.Conn, error) {
|
|
start := time.Now()
|
|
atomic.AddInt64(&d.stats.TotalConnections, 1)
|
|
|
|
dialer := &net.Dialer{
|
|
Timeout: d.timeout,
|
|
}
|
|
|
|
// 如果指定了本地地址,绑定 LocalAddr
|
|
if d.localAddr != "" {
|
|
if ip := net.ParseIP(d.localAddr); ip != nil {
|
|
dialer.LocalAddr = &net.TCPAddr{IP: ip}
|
|
}
|
|
}
|
|
|
|
conn, err := dialer.DialContext(ctx, network, address)
|
|
|
|
duration := time.Since(start)
|
|
d.stats.LastConnectTime = start
|
|
|
|
if err != nil {
|
|
atomic.AddInt64(&d.stats.FailedConnections, 1)
|
|
d.stats.LastError = err.Error()
|
|
return nil, NewProxyError(ErrTypeConnection, ErrMsgDirectConnFailed, ErrCodeDirectConnFailed, err)
|
|
}
|
|
|
|
atomic.AddInt64(&d.stats.ActiveConnections, 1)
|
|
d.updateAverageConnectTime(duration)
|
|
|
|
return &trackedConn{
|
|
Conn: conn,
|
|
stats: d.stats,
|
|
}, nil
|
|
}
|
|
|
|
// socks5Dialer SOCKS5拨号器
|
|
type socks5Dialer struct {
|
|
dialer proxy.Dialer
|
|
config *ProxyConfig
|
|
stats *ProxyStats
|
|
}
|
|
|
|
func (s *socks5Dialer) Dial(network, address string) (net.Conn, error) {
|
|
return s.DialContext(context.Background(), network, address)
|
|
}
|
|
|
|
func (s *socks5Dialer) DialContext(ctx context.Context, network, address string) (net.Conn, error) {
|
|
start := time.Now()
|
|
atomic.AddInt64(&s.stats.TotalConnections, 1)
|
|
|
|
// 创建一个带超时的上下文
|
|
dialCtx, cancel := context.WithTimeout(ctx, s.config.Timeout)
|
|
defer cancel()
|
|
|
|
// 使用goroutine处理拨号,以支持取消
|
|
connChan := make(chan struct {
|
|
conn net.Conn
|
|
err error
|
|
}, 1)
|
|
|
|
go func() {
|
|
conn, err := s.dialer.Dial(network, address)
|
|
select {
|
|
case <-dialCtx.Done():
|
|
if conn != nil {
|
|
_ = conn.Close() // context取消路径,Close错误可忽略
|
|
}
|
|
case connChan <- struct {
|
|
conn net.Conn
|
|
err error
|
|
}{conn, err}:
|
|
}
|
|
}()
|
|
|
|
select {
|
|
case <-dialCtx.Done():
|
|
atomic.AddInt64(&s.stats.FailedConnections, 1)
|
|
s.stats.LastError = dialCtx.Err().Error()
|
|
return nil, NewProxyError(ErrTypeTimeout, ErrMsgSOCKS5ConnTimeout, ErrCodeSOCKS5ConnTimeout, dialCtx.Err())
|
|
case result := <-connChan:
|
|
duration := time.Since(start)
|
|
s.stats.LastConnectTime = start
|
|
|
|
if result.err != nil {
|
|
atomic.AddInt64(&s.stats.FailedConnections, 1)
|
|
s.stats.LastError = result.err.Error()
|
|
return nil, NewProxyError(ErrTypeConnection, ErrMsgSOCKS5ConnFailed, ErrCodeSOCKS5ConnFailed, result.err)
|
|
}
|
|
|
|
atomic.AddInt64(&s.stats.ActiveConnections, 1)
|
|
s.updateAverageConnectTime(duration)
|
|
|
|
return &trackedConn{
|
|
Conn: result.conn,
|
|
stats: s.stats,
|
|
}, nil
|
|
}
|
|
}
|
|
|
|
// updateAverageConnectTime 更新平均连接时间
|
|
func (d *directDialer) updateAverageConnectTime(duration time.Duration) {
|
|
// 简单的移动平均
|
|
if d.stats.AverageConnectTime == 0 {
|
|
d.stats.AverageConnectTime = duration
|
|
} else {
|
|
d.stats.AverageConnectTime = (d.stats.AverageConnectTime + duration) / 2
|
|
}
|
|
}
|
|
|
|
func (s *socks5Dialer) updateAverageConnectTime(duration time.Duration) {
|
|
// 简单的移动平均
|
|
if s.stats.AverageConnectTime == 0 {
|
|
s.stats.AverageConnectTime = duration
|
|
} else {
|
|
s.stats.AverageConnectTime = (s.stats.AverageConnectTime + duration) / 2
|
|
}
|
|
}
|