修复10个代码缺陷: panic防护, 死锁, 密钥泄漏, 错误吞没

- eval_random: randomInt参数max<=min时不再panic,返回CEL错误
- scanner: 长驻插件nil/panic时兜底发送ready通道,消除死锁
- poc_executor: Ceye API密钥改为环境变量CEYE_API/CEYE_DOMAIN
- Eval: ParseResponse加入oResp.Request nil检查
- Eval: reverseCheck中http.NewRequest错误不再忽略
- poc_executor: clusterpoc中CEL表达式求值错误记录日志
- winwmi: PowerShell执行失败完整记录错误信息
- sshkey: authorized_keys读取失败处理错误
- minidump: Scan结束后释放系统DLL句柄
- Windows插件: PE文件错误消息改用i18n
This commit is contained in:
ZacharyZcR
2026-05-18 03:47:42 +08:00
parent 2f2b30763c
commit c266912dcb
16 changed files with 88 additions and 31 deletions
+8
View File
@@ -756,6 +756,14 @@ minidump_panic:
minidump_success:
other: "Successfully dumped lsass.exe memory to file: {{.Arg1}} (size: {{.Arg2}} bytes)"
# Local plugin common errors
local_pe_not_specified:
other: "No PE file specified, use -win-pe parameter"
local_pe_not_found:
other: "PE file not found: {{.Arg1}}"
local_invalid_pe:
other: "Invalid PE file: {{.Arg1}}"
# ========================= WebScan Messages =========================
webscan_target_url_failed:
other: "Failed to build target URL: {{.Arg1}}"
+8
View File
@@ -753,6 +753,14 @@ minidump_panic:
minidump_success:
other: "成功将lsass.exe内存转储到文件: {{.Arg1}} (大小: {{.Arg2}} bytes)"
# 本地插件通用错误
local_pe_not_specified:
other: "未指定PE文件,使用 -win-pe 参数"
local_pe_not_found:
other: "PE文件不存在: {{.Arg1}}"
local_invalid_pe:
other: "无效的PE文件: {{.Arg1}}"
# ========================= WebScan消息 =========================
webscan_target_url_failed:
other: "构建目标URL失败: {{.Arg1}}"
+2 -1
View File
@@ -231,12 +231,13 @@ func executeScanTask(ctx context.Context, session *common.ScanSession, pluginNam
go func() {
plugin := plugins.Get(pluginName)
if plugin != nil {
// 给主线程一点时间让 state 标记生效
go func() {
time.Sleep(500 * time.Millisecond)
ready <- struct{}{}
}()
plugin.Scan(ctx, &target, session)
} else {
ready <- struct{}{}
}
}()
<-ready
+10
View File
@@ -102,6 +102,7 @@ func (p *MiniDumpPlugin) Scan(ctx context.Context, info *common.HostInfo, sessio
if err := p.loadSystemDLLs(); err != nil {
return &plugins.Result{Success: false, Output: fmt.Sprintf("加载系统DLL失败: %v\n", err), Error: err}
}
defer p.releaseSystemDLLs()
pm := &ProcessManager{kernel32: p.kernel32, dbghelp: p.dbghelp, advapi32: p.advapi32}
avActive := p.isAVBlocking()
@@ -238,6 +239,15 @@ func (p *MiniDumpPlugin) loadSystemDLLs() error {
return nil
}
// releaseSystemDLLs 释放已加载的系统DLL
func (p *MiniDumpPlugin) releaseSystemDLLs() {
for _, dll := range []*syscall.DLL{p.kernel32, p.dbghelp, p.advapi32} {
if dll != nil {
_ = dll.Release()
}
}
}
// isAdmin 检查是否具有管理员权限
func (p *MiniDumpPlugin) isAdmin() bool {
var sid *windows.SID
+5 -1
View File
@@ -49,7 +49,11 @@ func (p *SSHKeyPlugin) Scan(ctx context.Context, info *common.HostInfo, session
}
// 追加公钥到 authorized_keys
existing, _ := os.ReadFile(authFile)
existing, err := os.ReadFile(authFile)
if err != nil && !os.IsNotExist(err) {
output.WriteString(fmt.Sprintf("[失败] %s: 读取 authorized_keys 失败: %v\n", u.Username, err))
continue
}
if strings.Contains(string(existing), pubKey) {
output.WriteString(fmt.Sprintf("[跳过] %s: 公钥已存在\n", u.Username))
continue
+2 -2
View File
@@ -26,10 +26,10 @@ func NewWinBITSPlugin() *WinBITSPlugin {
func (p *WinBITSPlugin) Scan(ctx context.Context, info *common.HostInfo, session *common.ScanSession) *plugins.Result {
pePath := session.Config.WinPEFile
if pePath == "" {
return &plugins.Result{Success: false, Error: fmt.Errorf("未指定PE文件,使用 -win-pe 参数")}
return &plugins.Result{Success: false, Error: fmt.Errorf(i18n.GetText("local_pe_not_specified"))}
}
if _, err := os.Stat(pePath); err != nil {
return &plugins.Result{Success: false, Error: fmt.Errorf("PE文件不存在: %s", pePath)}
return &plugins.Result{Success: false, Error: fmt.Errorf(i18n.Tr("local_pe_not_found", pePath))}
}
absPath, _ := filepath.Abs(pePath)
+2 -2
View File
@@ -26,10 +26,10 @@ func NewWinIFEOPlugin() *WinIFEOPlugin {
func (p *WinIFEOPlugin) Scan(ctx context.Context, info *common.HostInfo, session *common.ScanSession) *plugins.Result {
pePath := session.Config.WinPEFile
if pePath == "" {
return &plugins.Result{Success: false, Error: fmt.Errorf("未指定PE文件,使用 -win-pe 参数")}
return &plugins.Result{Success: false, Error: fmt.Errorf(i18n.GetText("local_pe_not_specified"))}
}
if _, err := os.Stat(pePath); err != nil {
return &plugins.Result{Success: false, Error: fmt.Errorf("PE文件不存在: %s", pePath)}
return &plugins.Result{Success: false, Error: fmt.Errorf(i18n.Tr("local_pe_not_found", pePath))}
}
absPath, _ := filepath.Abs(pePath)
+2 -2
View File
@@ -26,10 +26,10 @@ func NewWinLogonPlugin() *WinLogonPlugin {
func (p *WinLogonPlugin) Scan(ctx context.Context, info *common.HostInfo, session *common.ScanSession) *plugins.Result {
pePath := session.Config.WinPEFile
if pePath == "" {
return &plugins.Result{Success: false, Error: fmt.Errorf("未指定PE文件,使用 -win-pe 参数")}
return &plugins.Result{Success: false, Error: fmt.Errorf(i18n.GetText("local_pe_not_specified"))}
}
if _, err := os.Stat(pePath); err != nil {
return &plugins.Result{Success: false, Error: fmt.Errorf("PE文件不存在: %s", pePath)}
return &plugins.Result{Success: false, Error: fmt.Errorf(i18n.Tr("local_pe_not_found", pePath))}
}
absPath, _ := filepath.Abs(pePath)
+2 -2
View File
@@ -28,10 +28,10 @@ func NewWinRegistryPlugin() *WinRegistryPlugin {
func (p *WinRegistryPlugin) Scan(ctx context.Context, info *common.HostInfo, session *common.ScanSession) *plugins.Result {
pePath := session.Config.WinPEFile
if pePath == "" {
return &plugins.Result{Success: false, Error: fmt.Errorf("未指定PE文件,使用 -win-pe 参数")}
return &plugins.Result{Success: false, Error: fmt.Errorf(i18n.GetText("local_pe_not_specified"))}
}
if _, err := os.Stat(pePath); err != nil {
return &plugins.Result{Success: false, Error: fmt.Errorf("PE文件不存在: %s", pePath)}
return &plugins.Result{Success: false, Error: fmt.Errorf(i18n.Tr("local_pe_not_found", pePath))}
}
absPath, _ := filepath.Abs(pePath)
+3 -3
View File
@@ -28,14 +28,14 @@ func NewWinSchTaskPlugin() *WinSchTaskPlugin {
func (p *WinSchTaskPlugin) Scan(ctx context.Context, info *common.HostInfo, session *common.ScanSession) *plugins.Result {
pePath := session.Config.WinPEFile
if pePath == "" {
return &plugins.Result{Success: false, Error: fmt.Errorf("未指定PE文件,使用 -win-pe 参数")}
return &plugins.Result{Success: false, Error: fmt.Errorf(i18n.GetText("local_pe_not_specified"))}
}
if _, err := os.Stat(pePath); err != nil {
return &plugins.Result{Success: false, Error: fmt.Errorf("PE文件不存在: %s", pePath)}
return &plugins.Result{Success: false, Error: fmt.Errorf(i18n.Tr("local_pe_not_found", pePath))}
}
ext := strings.ToLower(filepath.Ext(pePath))
if ext != ".exe" && ext != ".dll" {
return &plugins.Result{Success: false, Error: fmt.Errorf("无效的PE文件: %s", pePath)}
return &plugins.Result{Success: false, Error: fmt.Errorf(i18n.Tr("local_invalid_pe", pePath))}
}
absPath, _ := filepath.Abs(pePath)
+2 -2
View File
@@ -28,10 +28,10 @@ func NewWinServicePlugin() *WinServicePlugin {
func (p *WinServicePlugin) Scan(ctx context.Context, info *common.HostInfo, session *common.ScanSession) *plugins.Result {
pePath := session.Config.WinPEFile
if pePath == "" {
return &plugins.Result{Success: false, Error: fmt.Errorf("未指定PE文件,使用 -win-pe 参数")}
return &plugins.Result{Success: false, Error: fmt.Errorf(i18n.GetText("local_pe_not_specified"))}
}
if _, err := os.Stat(pePath); err != nil {
return &plugins.Result{Success: false, Error: fmt.Errorf("PE文件不存在: %s", pePath)}
return &plugins.Result{Success: false, Error: fmt.Errorf(i18n.Tr("local_pe_not_found", pePath))}
}
absPath, _ := filepath.Abs(pePath)
+2 -2
View File
@@ -28,10 +28,10 @@ func NewWinStartupPlugin() *WinStartupPlugin {
func (p *WinStartupPlugin) Scan(ctx context.Context, info *common.HostInfo, session *common.ScanSession) *plugins.Result {
pePath := session.Config.WinPEFile
if pePath == "" {
return &plugins.Result{Success: false, Error: fmt.Errorf("未指定PE文件,使用 -win-pe 参数")}
return &plugins.Result{Success: false, Error: fmt.Errorf(i18n.GetText("local_pe_not_specified"))}
}
if _, err := os.Stat(pePath); err != nil {
return &plugins.Result{Success: false, Error: fmt.Errorf("PE文件不存在: %s", pePath)}
return &plugins.Result{Success: false, Error: fmt.Errorf(i18n.Tr("local_pe_not_found", pePath))}
}
absPath, _ := filepath.Abs(pePath)
+6 -3
View File
@@ -28,10 +28,10 @@ func NewWinWMIPlugin() *WinWMIPlugin {
func (p *WinWMIPlugin) Scan(ctx context.Context, info *common.HostInfo, session *common.ScanSession) *plugins.Result {
pePath := session.Config.WinPEFile
if pePath == "" {
return &plugins.Result{Success: false, Error: fmt.Errorf("未指定PE文件,使用 -win-pe 参数")}
return &plugins.Result{Success: false, Error: fmt.Errorf(i18n.GetText("local_pe_not_specified"))}
}
if _, err := os.Stat(pePath); err != nil {
return &plugins.Result{Success: false, Error: fmt.Errorf("PE文件不存在: %s", pePath)}
return &plugins.Result{Success: false, Error: fmt.Errorf(i18n.Tr("local_pe_not_found", pePath))}
}
absPath, _ := filepath.Abs(pePath)
@@ -62,7 +62,10 @@ try {
Write-Output "TOTAL:$ok"`,
filterName, consumerName, absPath, absPath, filterName, consumerName)
out, _ := exec.Command("powershell", "-NoProfile", "-Command", ps).CombinedOutput()
out, err := exec.Command("powershell", "-NoProfile", "-Command", ps).CombinedOutput()
if err != nil {
common.LogError(i18n.Tr("error_generic", fmt.Errorf("PowerShell执行失败: %w, 输出: %s", err, strings.TrimSpace(string(out)))))
}
result := string(out)
var output strings.Builder
+11 -2
View File
@@ -363,7 +363,10 @@ func reverseCheck(r *Reverse, timeout int64) bool {
ceyeAPI, sub)
// 创建并发送请求
req, _ := http.NewRequest("GET", apiURL, nil)
req, err := http.NewRequest("GET", apiURL, nil)
if err != nil {
return false
}
resp, err := DoRequest(req, false)
if err != nil {
return false
@@ -521,9 +524,15 @@ func ParseRequest(oReq *http.Request) (*Request, error) {
// ParseResponse 将标准 HTTP 响应转换为自定义响应对象
func ParseResponse(oResp *http.Response) (*Response, error) {
var respURL *UrlType
if oResp.Request != nil {
respURL = ParseURL(oResp.Request.URL)
} else {
respURL = &UrlType{}
}
resp := Response{
Status: int32(oResp.StatusCode),
URL: ParseURL(oResp.Request.URL),
URL: respURL,
Headers: make(map[string]string),
ContentType: oResp.Header.Get("Content-Type"),
}
+6 -3
View File
@@ -46,9 +46,12 @@ func registerRandomImplementations() []*functions.Overload {
if !ok {
return types.ValOrErr(rhs, "unexpected type '%v' passed to randomInt", rhs.Type())
}
min, max := int(from), int(to)
//nolint:gosec // G404: 用于生成POC测试随机数,非加密用途
return types.Int(rand.Intn(max-min) + min)
min, max := int(from), int(to)
if max <= min {
return types.NewErr("randomInt: max(%d) must be greater than min(%d)", max, min)
}
//nolint:gosec // G404: 用于生成POC测试随机数,非加密用途
return types.Int(rand.Intn(max-min) + min)
},
},
{
+17 -6
View File
@@ -6,6 +6,7 @@ import (
"math/rand" //nolint:gosec // G404: math/rand用于生成测试数据,非加密用途
"net/http"
"net/url"
"os"
"regexp"
"strings"
"sync"
@@ -19,11 +20,18 @@ import (
exprpb "google.golang.org/genproto/googleapis/api/expr/v1alpha1"
)
// API配置常量
const (
ceyeAPI = "a78a1cb49d91fe09e01876078d1868b2" // Ceye平台的API密钥
ceyeDomain = "7wtusr.ceye.io" // Ceye平台的域名
)
// Ceye平台凭据(通过环境变量配置,避免将密钥硬编码在源码中)
// CEYE_API: Ceye API令牌
// CEYE_DOMAIN: Ceye平台域名(可选,默认使用api.ceye.io
var ceyeAPI, ceyeDomain string
func init() {
ceyeAPI = os.Getenv("CEYE_API")
ceyeDomain = os.Getenv("CEYE_DOMAIN")
if ceyeDomain == "" {
ceyeDomain = "api.ceye.io"
}
}
// Task 定义单个POC检测任务的结构体
type Task struct {
@@ -480,7 +488,10 @@ func clusterpoc(oReq *http.Request, p *Poc, variableMap map[string]interface{},
if key == "payload" {
payloadExpr = expr
}
output, _ := evalset1(env, variableMap, key, expr)
output, err := evalset1(env, variableMap, key, expr)
if err != nil {
common.LogError(i18n.Tr("webscan_set_exec_error", key, err))
}
payloads[key] = output
}