add session-aware scan logging

This commit is contained in:
ZacharyZcR
2026-05-18 16:19:34 +08:00
parent 8de7570268
commit adb3ac5b74
6 changed files with 131 additions and 59 deletions
+11 -7
View File
@@ -28,13 +28,13 @@ func (p *FTPPlugin) Scan(ctx context.Context, info *common.HostInfo, session *co
config := session.Config
state := session.State
if config.DisableBrute {
return p.identifyService(info, config, state)
return p.identifyService(info, session)
}
target := info.Target()
// 优先检测匿名访问
if result := p.testAnonymousAccess(ctx, info, config, state); result != nil && result.Success {
if result := p.testAnonymousAccess(ctx, info, session); result != nil && result.Success {
return result
}
@@ -63,7 +63,7 @@ func (p *FTPPlugin) Scan(ctx context.Context, info *common.HostInfo, session *co
output.WriteString(fmt.Sprintf("\n [->] %s", file))
}
}
common.LogVuln(output.String())
session.LogVuln(output.String())
}
return result
@@ -144,7 +144,9 @@ func classifyFTPErrorType(err error) ErrorType {
return ClassifyError(err, ftpAuthErrors, ftpNetworkErrors)
}
func (p *FTPPlugin) identifyService(info *common.HostInfo, config *common.Config, state *common.State) *ScanResult {
func (p *FTPPlugin) identifyService(info *common.HostInfo, session *common.ScanSession) *ScanResult {
config := session.Config
state := session.State
target := info.Target()
conn, err := ftplib.Dial(target, ftplib.DialWithTimeout(config.Timeout))
@@ -160,7 +162,7 @@ func (p *FTPPlugin) identifyService(info *common.HostInfo, config *common.Config
defer func() { _ = conn.Quit() }()
banner := "FTP"
common.LogSuccess(i18n.Tr("ftp_service", target, banner))
session.LogSuccess(i18n.Tr("ftp_service", target, banner))
return &ScanResult{
Type: plugins.ResultTypeService,
Success: true,
@@ -170,7 +172,9 @@ func (p *FTPPlugin) identifyService(info *common.HostInfo, config *common.Config
}
// testAnonymousAccess 测试FTP匿名访问
func (p *FTPPlugin) testAnonymousAccess(ctx context.Context, info *common.HostInfo, config *common.Config, state *common.State) *ScanResult {
func (p *FTPPlugin) testAnonymousAccess(ctx context.Context, info *common.HostInfo, session *common.ScanSession) *ScanResult {
config := session.Config
state := session.State
target := info.Target()
anonymousCreds := []Credential{
@@ -204,7 +208,7 @@ func (p *FTPPlugin) testAnonymousAccess(ctx context.Context, info *common.HostIn
output.WriteString(fmt.Sprintf("\n [->] %s", file))
}
}
common.LogVuln(output.String())
session.LogVuln(output.String())
return &ScanResult{
Type: plugins.ResultTypeCredential,