perf: 优化PortScan.go的代码,添加注释,规范输出

This commit is contained in:
ZacharyZcR 2024-12-18 23:40:35 +08:00
parent 79343b1722
commit cd6809e775

View File

@ -4,96 +4,120 @@ import (
"fmt" "fmt"
"github.com/shadow1ng/fscan/Common" "github.com/shadow1ng/fscan/Common"
"sort" "sort"
"strconv"
"sync" "sync"
"time" "time"
) )
// Addr 表示待扫描的地址
type Addr struct { type Addr struct {
ip string ip string // IP地址
port int port int // 端口号
} }
// PortScan 执行端口扫描
func PortScan(hostslist []string, ports string, timeout int64) []string { func PortScan(hostslist []string, ports string, timeout int64) []string {
var AliveAddress []string var AliveAddress []string
// 解析端口列表
probePorts := Common.ParsePort(ports) probePorts := Common.ParsePort(ports)
if len(probePorts) == 0 { if len(probePorts) == 0 {
fmt.Printf("[-] parse port %s error, please check your port format\n", ports) fmt.Printf("[-] 端口格式错误: %s, 请检查端口格式\n", ports)
return AliveAddress return AliveAddress
} }
noPorts := Common.ParsePort(Common.NoPorts)
if len(noPorts) > 0 {
temp := map[int]struct{}{}
for _, port := range probePorts {
temp[port] = struct{}{}
}
for _, port := range noPorts { // 排除指定端口
delete(temp, port) probePorts = excludeNoPorts(probePorts)
}
var newDatas []int // 创建通道
for port := range temp {
newDatas = append(newDatas, port)
}
probePorts = newDatas
sort.Ints(probePorts)
}
workers := Common.Threads workers := Common.Threads
Addrs := make(chan Addr, 100) addrs := make(chan Addr, 100)
results := make(chan string, 100) results := make(chan string, 100)
var wg sync.WaitGroup var wg sync.WaitGroup
//接收结果 // 接收扫描结果
go func() { go collectResults(&AliveAddress, results, &wg)
for found := range results {
AliveAddress = append(AliveAddress, found)
wg.Done()
}
}()
//多线程扫描 // 启动扫描协程
for i := 0; i < workers; i++ { for i := 0; i < workers; i++ {
go func() { go func() {
for addr := range Addrs { for addr := range addrs {
PortConnect(addr, results, timeout, &wg) PortConnect(addr, results, timeout, &wg)
wg.Done() wg.Done()
} }
}() }()
} }
//添加扫描目标 // 添加扫描目标
for _, port := range probePorts { for _, port := range probePorts {
for _, host := range hostslist { for _, host := range hostslist {
wg.Add(1) wg.Add(1)
Addrs <- Addr{host, port} addrs <- Addr{host, port}
} }
} }
wg.Wait() wg.Wait()
close(Addrs) close(addrs)
close(results) close(results)
return AliveAddress return AliveAddress
} }
func PortConnect(addr Addr, respondingHosts chan<- string, adjustedTimeout int64, wg *sync.WaitGroup) { // collectResults 收集扫描结果
host, port := addr.ip, addr.port func collectResults(aliveAddrs *[]string, results <-chan string, wg *sync.WaitGroup) {
conn, err := Common.WrapperTcpWithTimeout("tcp4", fmt.Sprintf("%s:%v", host, port), time.Duration(adjustedTimeout)*time.Second) for found := range results {
if err == nil { *aliveAddrs = append(*aliveAddrs, found)
defer conn.Close() wg.Done()
address := host + ":" + strconv.Itoa(port)
result := fmt.Sprintf("%s open", address)
Common.LogSuccess(result)
wg.Add(1)
respondingHosts <- address
} }
} }
func NoPortScan(hostslist []string, ports string) (AliveAddress []string) { // PortConnect 尝试连接指定端口
probePorts := Common.ParsePort(ports) func PortConnect(addr Addr, respondingHosts chan<- string, timeout int64, wg *sync.WaitGroup) {
noPorts := Common.ParsePort(Common.NoPorts) // 建立TCP连接
if len(noPorts) > 0 { conn, err := Common.WrapperTcpWithTimeout("tcp4",
temp := map[int]struct{}{} fmt.Sprintf("%s:%v", addr.ip, addr.port),
time.Duration(timeout)*time.Second)
if err != nil {
return
}
defer conn.Close()
// 记录开放端口
address := fmt.Sprintf("%s:%d", addr.ip, addr.port)
result := fmt.Sprintf("[+] 端口开放 %s", address)
Common.LogSuccess(result)
wg.Add(1)
respondingHosts <- address
}
// NoPortScan 生成端口列表(不进行扫描)
func NoPortScan(hostslist []string, ports string) []string {
var AliveAddress []string
// 解析并排除端口
probePorts := excludeNoPorts(Common.ParsePort(ports))
// 生成地址列表
for _, port := range probePorts { for _, port := range probePorts {
for _, host := range hostslist {
address := fmt.Sprintf("%s:%d", host, port)
AliveAddress = append(AliveAddress, address)
}
}
return AliveAddress
}
// excludeNoPorts 排除指定的端口
func excludeNoPorts(ports []int) []int {
noPorts := Common.ParsePort(Common.NoPorts)
if len(noPorts) == 0 {
return ports
}
// 使用map过滤端口
temp := make(map[int]struct{})
for _, port := range ports {
temp[port] = struct{}{} temp[port] = struct{}{}
} }
@ -101,18 +125,12 @@ func NoPortScan(hostslist []string, ports string) (AliveAddress []string) {
delete(temp, port) delete(temp, port)
} }
var newDatas []int // 转换为切片并排序
for port, _ := range temp { var newPorts []int
newDatas = append(newDatas, port) for port := range temp {
newPorts = append(newPorts, port)
} }
probePorts = newDatas sort.Ints(newPorts)
sort.Ints(probePorts)
} return newPorts
for _, port := range probePorts {
for _, host := range hostslist {
address := host + ":" + strconv.Itoa(port)
AliveAddress = append(AliveAddress, address)
}
}
return
} }