修复一个web超时的bug

Plugins/elasticsearch.go

@@ -1,15 +1,12 @@
 package Plugins
 
 import (
-	"crypto/tls"
 	"fmt"
+	"github.com/shadow1ng/fscan/WebScan/lib"
+	"github.com/shadow1ng/fscan/common"
 	"io/ioutil"
-	"net"
 	"net/http"
 	"strings"
-	"time"
-
-	"github.com/shadow1ng/fscan/common"
 )
 
 func elasticsearchScan(info *common.HostInfo) error {
@@ -20,20 +17,6 @@ func elasticsearchScan(info *common.HostInfo) error {
 func geturl2(info *common.HostInfo) (flag bool, err error) {
 	flag = false
 	url := fmt.Sprintf("%s:%d/_cat", info.Url, common.PORTList["elastic"])
-	var client = &http.Client{
-		Timeout: time.Duration(info.WebTimeout) * time.Second,
-		Transport: &http.Transport{
-			TLSClientConfig:   &tls.Config{InsecureSkipVerify: true},
-			DisableKeepAlives: false,
-			DialContext: (&net.Dialer{
-				Timeout: time.Duration(info.WebTimeout) * time.Second,
-			}).DialContext,
-		},
-		CheckRedirect: func(req *http.Request, via []*http.Request) error {
-			return http.ErrUseLastResponse
-		},
-	}
-
 	res, err := http.NewRequest("GET", url, nil)
 	if err == nil {
 		res.Header.Add("User-agent", "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/28.0.1468.0 Safari/537.36")
@@ -41,8 +24,10 @@ func geturl2(info *common.HostInfo) (flag bool, err error) {
 		res.Header.Add("Accept-Language", "zh-CN,zh;q=0.9")
 		res.Header.Add("Accept-Encoding", "gzip, deflate")
 		res.Header.Add("Connection", "close")
-		resp, err := client.Do(res)
-
+		if common.Pocinfo.Cookie != "" {
+			res.Header.Set("Cookie", common.Pocinfo.Cookie)
+		}
+		resp, err := lib.Client.Do(res)
 		if err == nil {
 			defer resp.Body.Close()
 			body, _ := ioutil.ReadAll(resp.Body)

Plugins/scanner.go

@@ -14,6 +14,10 @@ import (
 func Scan(info common.HostInfo) {
 	fmt.Println("scan start")
 	Hosts, _ := common.ParseIP(info.Host, common.HostFile)
+	WebScan.Inithttp(common.Pocinfo)
+	var ch = make(chan struct{}, common.Threads)
+	var wg = sync.WaitGroup{}
+	if len(Hosts) > 0 {
 		if common.IsPing == false {
 			Hosts = ICMPRun(Hosts, common.Ping)
 			fmt.Println("icmp alive hosts len is:", len(Hosts))
@@ -25,13 +29,11 @@ func Scan(info common.HostInfo) {
 		if info.Scantype == "portscan" {
 			return
 		}
-	WebScan.Inithttp(common.Pocinfo)
+
 		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))
 		}
-	var ch = make(chan struct{}, common.Threads)
-	var wg = sync.WaitGroup{}
 		for _, targetIP := range AlivePorts {
 			info.Host, info.Ports = strings.Split(targetIP, ":")[0], strings.Split(targetIP, ":")[1]
 			if info.Scantype == "all" {
@@ -49,6 +51,7 @@ func Scan(info common.HostInfo) {
 				AddScan(scantype, info, ch, &wg)
 			}
 		}
+	}
 	if common.URL != "" {
 		info.Url = common.URL
 		AddScan("1000003", info, ch, &wg)

common/config.go

@@ -63,7 +63,6 @@ type HostInfo struct {
 	Domain    string
 	Url       string
 	Timeout   int64
-	WebTimeout int64
 	Scantype  string
 	Command   string
 	Username  string

common/flag.go

@@ -26,7 +26,6 @@ func Flag(Info *HostInfo) {
 	flag.StringVar(&Info.Username, "user", "", "username")
 	flag.StringVar(&Info.Password, "pwd", "", "password")
 	flag.Int64Var(&Info.Timeout, "time", 3, "Set timeout")
-	flag.Int64Var(&Info.WebTimeout, "wt", 5, "Set web timeout")
 	flag.StringVar(&Info.Scantype, "m", "all", "Select scan type ,as: -m ssh")
 	flag.IntVar(&Threads, "t", 200, "Thread nums")
 	flag.StringVar(&HostFile, "hf", "", "host file, -hs ip.txt")
@@ -45,6 +44,7 @@ func Flag(Info *HostInfo) {
 	flag.StringVar(&Pocinfo.PocName, "pocname", "", "use the pocs these contain pocname, -pocname weblogic")
 	flag.StringVar(&Pocinfo.Proxy, "proxy", "", "set poc proxy, -proxy http://127.0.0.1:8080")
 	flag.StringVar(&Pocinfo.Cookie, "cookie", "", "set poc cookie")
+	flag.Int64Var(&Pocinfo.Timeout, "wt", 5, "Set web timeout")
 	flag.IntVar(&Pocinfo.Num, "Num", 20, "poc rate")
 	flag.Parse()
 }