mirror of
https://github.com/shadow1ng/fscan.git
synced 2026-09-24 04:01: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,117 @@
|
||||
package proxy
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"context"
|
||||
"encoding/base64"
|
||||
"fmt"
|
||||
"net"
|
||||
"net/http"
|
||||
"sync/atomic"
|
||||
"time"
|
||||
)
|
||||
|
||||
// httpDialer HTTP代理拨号器
|
||||
type httpDialer struct {
|
||||
config *ProxyConfig
|
||||
stats *ProxyStats
|
||||
baseDial *net.Dialer
|
||||
}
|
||||
|
||||
func (h *httpDialer) Dial(network, address string) (net.Conn, error) {
|
||||
return h.DialContext(context.Background(), network, address)
|
||||
}
|
||||
|
||||
func (h *httpDialer) DialContext(ctx context.Context, network, address string) (net.Conn, error) {
|
||||
start := time.Now()
|
||||
atomic.AddInt64(&h.stats.TotalConnections, 1)
|
||||
|
||||
// 连接到HTTP代理服务器
|
||||
proxyConn, err := h.baseDial.DialContext(ctx, NetworkTCP, h.config.Address)
|
||||
if err != nil {
|
||||
atomic.AddInt64(&h.stats.FailedConnections, 1)
|
||||
h.stats.LastError = err.Error()
|
||||
return nil, NewProxyError(ErrTypeConnection, ErrMsgHTTPConnFailed, ErrCodeHTTPConnFailed, err)
|
||||
}
|
||||
|
||||
// 发送CONNECT请求
|
||||
if err := h.sendConnectRequest(proxyConn, address); err != nil {
|
||||
_ = proxyConn.Close() // 错误处理路径,Close错误可忽略
|
||||
atomic.AddInt64(&h.stats.FailedConnections, 1)
|
||||
h.stats.LastError = err.Error()
|
||||
return nil, err
|
||||
}
|
||||
|
||||
duration := time.Since(start)
|
||||
h.stats.LastConnectTime = start
|
||||
atomic.AddInt64(&h.stats.ActiveConnections, 1)
|
||||
h.updateAverageConnectTime(duration)
|
||||
|
||||
return &trackedConn{
|
||||
Conn: proxyConn,
|
||||
stats: h.stats,
|
||||
}, nil
|
||||
}
|
||||
|
||||
// sendConnectRequest 发送HTTP CONNECT请求
|
||||
func (h *httpDialer) sendConnectRequest(conn net.Conn, address string) error {
|
||||
// 构建CONNECT请求
|
||||
req := fmt.Sprintf(HTTPConnectRequestFormat, address, address)
|
||||
|
||||
// 添加认证头
|
||||
if h.config.Username != "" {
|
||||
auth := base64.StdEncoding.EncodeToString(
|
||||
[]byte(h.config.Username + AuthSeparator + h.config.Password))
|
||||
req += fmt.Sprintf(HTTPAuthHeaderFormat, auth)
|
||||
}
|
||||
|
||||
req += HTTPRequestEndFormat
|
||||
|
||||
// 设置写超时
|
||||
if err := conn.SetWriteDeadline(time.Now().Add(h.config.Timeout)); err != nil {
|
||||
return NewProxyError(ErrTypeTimeout, ErrMsgHTTPSetWriteTimeout, ErrCodeHTTPSetWriteTimeout, err)
|
||||
}
|
||||
|
||||
// 发送请求
|
||||
if _, err := conn.Write([]byte(req)); err != nil {
|
||||
return NewProxyError(ErrTypeConnection, ErrMsgHTTPSendConnectFail, ErrCodeHTTPSendConnectFail, err)
|
||||
}
|
||||
|
||||
// 设置读超时
|
||||
if err := conn.SetReadDeadline(time.Now().Add(h.config.Timeout)); err != nil {
|
||||
return NewProxyError(ErrTypeTimeout, ErrMsgHTTPSetReadTimeout, ErrCodeHTTPSetReadTimeout, err)
|
||||
}
|
||||
|
||||
// 读取响应
|
||||
resp, err := http.ReadResponse(bufio.NewReader(conn), nil)
|
||||
if err != nil {
|
||||
return NewProxyError(ErrTypeProtocol, ErrMsgHTTPReadRespFailed, ErrCodeHTTPReadRespFailed, err)
|
||||
}
|
||||
|
||||
// 检查响应状态
|
||||
if resp.StatusCode != HTTPStatusOK {
|
||||
// 只有在失败时才关闭响应体,避免影响成功的CONNECT隧道
|
||||
_ = resp.Body.Close() // 错误处理路径,Close错误可忽略
|
||||
return NewProxyError(ErrTypeAuth,
|
||||
fmt.Sprintf(ErrMsgHTTPProxyAuthFailed, resp.StatusCode), ErrCodeHTTPProxyAuthFailed, nil)
|
||||
}
|
||||
|
||||
// 对于成功的CONNECT隧道,不要关闭resp.Body
|
||||
// 因为这会关闭底层TCP连接,导致隧道失效
|
||||
// HTTP CONNECT协议要求在200响应后保持连接开放供数据传输
|
||||
|
||||
// 清除deadline
|
||||
_ = conn.SetDeadline(time.Time{})
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// updateAverageConnectTime 更新平均连接时间
|
||||
func (h *httpDialer) updateAverageConnectTime(duration time.Duration) {
|
||||
// 简单的移动平均
|
||||
if h.stats.AverageConnectTime == 0 {
|
||||
h.stats.AverageConnectTime = duration
|
||||
} else {
|
||||
h.stats.AverageConnectTime = (h.stats.AverageConnectTime + duration) / 2
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user