From d1ff89676d4975791d0089c5eaca76060a716fe8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BD=B1=E8=88=9E=E8=80=85?= <shadow1ng@qq.com>
Date: Fri, 11 Mar 2022 16:13:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88webscan=E6=A8=A1=E5=9D=9760s?=
 =?UTF-8?q?=E8=B6=85=E6=97=B6,=E5=87=8F=E5=B0=91=E6=BC=8F=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebScan/WebScan.go  | 28 ++++++----------------------
 WebScan/lib/eval.go |  2 +-
 2 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/WebScan/WebScan.go b/WebScan/WebScan.go
index 158ac07..e478d95 100644
--- a/WebScan/WebScan.go
+++ b/WebScan/WebScan.go
@@ -7,7 +7,6 @@ import (
 	"github.com/shadow1ng/fscan/common"
 	"net/http"
 	"strings"
-	"time"
 )
 
 //go:embed pocs
@@ -18,27 +17,12 @@ func WebScan(info *common.HostInfo) {
 	buf := strings.Split(info.Url, "/")
 	pocinfo.Target = strings.Join(buf[:3], "/")
 
-	var flag bool
-	go func() {
-		time.Sleep(60 * time.Second)
-		flag = true
-	}()
-
-	go func() {
-		if pocinfo.PocName != "" {
+	if pocinfo.PocName != "" {
+		Execute(pocinfo)
+	} else {
+		for _, infostr := range info.Infostr {
+			pocinfo.PocName = lib.CheckInfoPoc(infostr)
 			Execute(pocinfo)
-		} else {
-			for _, infostr := range info.Infostr {
-				pocinfo.PocName = lib.CheckInfoPoc(infostr)
-				Execute(pocinfo)
-			}
-		}
-		flag = true
-	}()
-
-	for {
-		if flag {
-			return
 		}
 	}
 }
@@ -46,7 +30,7 @@ func WebScan(info *common.HostInfo) {
 func Execute(PocInfo common.PocInfo) {
 	req, err := http.NewRequest("GET", PocInfo.Target, nil)
 	if err != nil {
-		errlog := fmt.Sprintf("[-] webtitle %v %v", PocInfo.Target, err)
+		errlog := fmt.Sprintf("[-] webpocinit %v %v", PocInfo.Target, err)
 		common.LogError(errlog)
 		return
 	}
diff --git a/WebScan/lib/eval.go b/WebScan/lib/eval.go
index eb056c1..c003b24 100644
--- a/WebScan/lib/eval.go
+++ b/WebScan/lib/eval.go
@@ -591,7 +591,7 @@ func getRespBody(oResp *http.Response) ([]byte, error) {
 			body = append(body, buf...)
 		}
 	} else {
-		raw, err := ioutil.ReadAll(io.LimitReader(oResp.Body, int64(3<<20)))
+		raw, err := ioutil.ReadAll(oResp.Body)
 		if err != nil {
 			return nil, err
 		}