增加-dns参数启用dnslog poc

Plugins/scanner.go

@@ -1,7 +1,6 @@
 package Plugins
 
 import (
-	"errors"
 	"fmt"
 	"github.com/shadow1ng/fscan/WebScan/lib"
 	"github.com/shadow1ng/fscan/common"
@@ -21,6 +20,8 @@ func Scan(info common.HostInfo) {
 	lib.Inithttp(common.Pocinfo)
 	var ch = make(chan struct{}, common.Threads)
 	var wg = sync.WaitGroup{}
+	web := strconv.Itoa(common.PORTList["web"])
+	ms17010 := strconv.Itoa(common.PORTList["ms17010"])
 	if len(Hosts) > 0 || len(common.HostPort) > 0 {
 		if common.IsPing == false && len(Hosts) > 0 {
 			Hosts = CheckLive(Hosts, common.Ping)
@@ -30,6 +31,7 @@ func Scan(info common.HostInfo) {
 			common.LogWG.Wait()
 			return
 		}
+		common.GC()
 		var AlivePorts []string
 		if common.Scantype == "webonly" {
 			AlivePorts = NoPortScan(Hosts, info.Ports)
@@ -47,6 +49,7 @@ func Scan(info common.HostInfo) {
 			common.HostPort = nil
 			fmt.Println("[*] AlivePorts len is:", len(AlivePorts))
 		}
+		common.GC()
 		var severports []string //severports := []string{"21","22","135"."445","1433","3306","5432","6379","9200","11211","27017"...}
 		for _, port := range common.PORTList {
 			severports = append(severports, strconv.Itoa(port))
@@ -56,31 +59,30 @@ func Scan(info common.HostInfo) {
 			info.Host, info.Ports = strings.Split(targetIP, ":")[0], strings.Split(targetIP, ":")[1]
 			if common.Scantype == "all" || common.Scantype == "main" {
 				switch {
-				case info.Ports == "135":
-					AddScan(info.Ports, info, ch, &wg) //findnet
 				case info.Ports == "445":
+					AddScan(ms17010, info, &ch, &wg) //ms17010
 					//AddScan(info.Ports, info, ch, &wg)  //smb
-					AddScan("1000001", info, ch, &wg) //ms17010
 					//AddScan("1000002", info, ch, &wg) //smbghost
 				case info.Ports == "9000":
-					AddScan(info.Ports, info, ch, &wg) //fcgiscan
-					AddScan("1000003", info, ch, &wg)  //http
+					AddScan(web, info, &ch, &wg)        //http
+					AddScan(info.Ports, info, &ch, &wg) //fcgiscan
 				case IsContain(severports, info.Ports):
-					AddScan(info.Ports, info, ch, &wg) //plugins scan
+					AddScan(info.Ports, info, &ch, &wg) //plugins scan
 				default:
-					AddScan("1000003", info, ch, &wg) //webtitle
+					AddScan(web, info, &ch, &wg) //webtitle
 				}
 			} else {
-				port, _ := common.PORTList[common.Scantype]
-				scantype := strconv.Itoa(port)
-				AddScan(scantype, info, ch, &wg)
+				scantype := strconv.Itoa(common.PORTList[common.Scantype])
+				AddScan(scantype, info, &ch, &wg)
 			}
 		}
 	}
+	common.GC()
 	for _, url := range common.Urls {
 		info.Url = url
-		AddScan("1000003", info, ch, &wg)
+		AddScan(web, info, &ch, &wg)
 	}
+	common.GC()
 	wg.Wait()
 	common.LogWG.Wait()
 	close(common.Results)
@@ -89,35 +91,26 @@ func Scan(info common.HostInfo) {
 
 var Mutex = &sync.Mutex{}
 
-func AddScan(scantype string, info common.HostInfo, ch chan struct{}, wg *sync.WaitGroup) {
+func AddScan(scantype string, info common.HostInfo, ch *chan struct{}, wg *sync.WaitGroup) {
+	*ch <- struct{}{}
 	wg.Add(1)
 	go func() {
 		Mutex.Lock()
 		common.Num += 1
 		Mutex.Unlock()
-		ScanFunc(PluginList, scantype, &info)
+		ScanFunc(&scantype, &info)
 		Mutex.Lock()
 		common.End += 1
 		Mutex.Unlock()
-		<-ch
 		wg.Done()
+		<-*ch
 	}()
-	ch <- struct{}{}
 }
 
-func ScanFunc(m map[string]interface{}, name string, infos ...interface{}) (result []reflect.Value, err error) {
-	f := reflect.ValueOf(m[name])
-	if len(infos) != f.Type().NumIn() {
-		err = errors.New("The number of infos is not adapted ")
-		fmt.Println(err.Error())
-		return result, nil
-	}
-	in := make([]reflect.Value, len(infos))
-	for k, info := range infos {
-		in[k] = reflect.ValueOf(info)
-	}
-	result = f.Call(in)
-	return result, nil
+func ScanFunc(name *string, info *common.HostInfo) {
+	f := reflect.ValueOf(PluginList[*name])
+	in := []reflect.Value{reflect.ValueOf(info)}
+	f.Call(in)
 }
 
 func IsContain(items []string, item string) bool {