Stage/vuls
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(portscan): to keep backward compatibility before v0.13.0 (#1076)

Browse Source
This commit is contained in:
Kota Kanbe
2020-11-19 16:54:36 +09:00
committed by GitHub
parent d02535d053
commit 3f8de02683
9 changed files with 168 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
scan/base.go
View File

@@ -748,11 +748,11 @@ func (l *base) detectScanDest() map[string][]string {
continue
}
for _, proc := range p.AffectedProcs {
if proc.ListenPorts == nil {
if proc.ListenPortStats == nil {
continue
}
for _, port := range proc.ListenPorts {
scanIPPortsMap[port.Address] = append(scanIPPortsMap[port.Address], port.Port)
for _, port := range proc.ListenPortStats {
scanIPPortsMap[port.BindAddress] = append(scanIPPortsMap[port.BindAddress], port.Port)
}
}
}
@@ -809,27 +809,31 @@ func (l *base) updatePortStatus(listenIPPorts []string) {
continue
}
for i, proc := range p.AffectedProcs {
if proc.ListenPorts == nil {
if proc.ListenPortStats == nil {
continue
}
for j, port := range proc.ListenPorts {
l.osPackages.Packages[name].AffectedProcs[i].ListenPorts[j].PortScanSuccessOn = l.findPortScanSuccessOn(listenIPPorts, port)
for j, port := range proc.ListenPortStats {
l.osPackages.Packages[name].AffectedProcs[i].ListenPortStats[j].PortReachableTo = l.findPortTestSuccessOn(listenIPPorts, port)
}
}
}
}
func (l *base) findPortScanSuccessOn(listenIPPorts []string, searchListenPort models.ListenPort) []string {
func (l *base) findPortTestSuccessOn(listenIPPorts []string, searchListenPort models.PortStat) []string {
addrs := []string{}
for _, ipPort := range listenIPPorts {
ipPort := l.parseListenPorts(ipPort)
if searchListenPort.Address == "*" {
ipPort, err := models.NewPortStat(ipPort)
if err != nil {
util.Log.Warnf("Failed to find: %+v", err)
continue
}
if searchListenPort.BindAddress == "*" {
if searchListenPort.Port == ipPort.Port {
addrs = append(addrs, ipPort.Address)
addrs = append(addrs, ipPort.BindAddress)
}
} else if searchListenPort.Address == ipPort.Address && searchListenPort.Port == ipPort.Port {
addrs = append(addrs, ipPort.Address)
} else if searchListenPort.BindAddress == ipPort.BindAddress && searchListenPort.Port == ipPort.Port {
addrs = append(addrs, ipPort.BindAddress)
}
}
@@ -916,11 +920,3 @@ func (l *base) parseLsOf(stdout string) map[string][]string {
}
return portPids
}
func (l *base) parseListenPorts(port string) models.ListenPort {
sep := strings.LastIndex(port, ":")
if sep == -1 {
return models.ListenPort{}
}
return models.ListenPort{Address: port[:sep], Port: port[sep+1:]}
}