Skip to content
This repository was archived by the owner on Sep 12, 2024. It is now read-only.

Commit 706c36a

Browse files
committed
[Debug] fix target connect func
1 parent f16742a commit 706c36a

1 file changed

Lines changed: 31 additions & 38 deletions

File tree

pkg/util/request.go

Lines changed: 31 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -357,36 +357,37 @@ func VerifyPortConnection(targetAddr string) bool {
357357
return true
358358
}
359359

360-
func VerifyTargetConnection(originalReq *http.Request) bool {
361-
fastReq := fasthttp.AcquireRequest()
362-
fastResp := fasthttp.AcquireResponse()
363-
oriData, err := GetOriginalReqBody(originalReq)
364-
if err != nil {
365-
return false
366-
}
367-
err = CopyRequest(originalReq, fastReq, oriData)
368-
if err != nil {
369-
return false
370-
}
371-
timeout := conf.GlobalConfig.HttpConfig.HttpTimeout
372-
// 检测原始请求
373-
err = fasthttpClient.DoTimeout(fastReq, fastResp, time.Duration(timeout)*time.Second)
374-
if err != nil {
375-
// 检测原始请求 + index.php
376-
uri := string(fastReq.RequestURI())
377-
if uri != "" && strings.HasSuffix(uri, "/") {
378-
uri = fmt.Sprint(uri, "index.php")
379-
} else {
380-
uri = fmt.Sprint(uri, "/index.php")
381-
}
382-
fastReq.SetRequestURI(uri)
383-
err = fasthttpClient.DoTimeout(fastReq, fastResp, time.Duration(timeout)*time.Second)
384-
if err != nil {
385-
return false
386-
}
387-
}
388-
return true
389-
}
360+
// 以后接被动扫描插件的时候用
361+
//func VerifyTargetConnection(originalReq *http.Request) bool {
362+
// fastReq := fasthttp.AcquireRequest()
363+
// fastResp := fasthttp.AcquireResponse()
364+
// oriData, err := GetOriginalReqBody(originalReq)
365+
// if err != nil {
366+
// return false
367+
// }
368+
// err = CopyRequest(originalReq, fastReq, oriData)
369+
// if err != nil {
370+
// return false
371+
// }
372+
// timeout := conf.GlobalConfig.HttpConfig.HttpTimeout
373+
// // 检测原始请求
374+
// err = fasthttpClient.DoTimeout(fastReq, fastResp, time.Duration(timeout)*time.Second)
375+
// if err != nil {
376+
// // 检测原始请求 + index.php
377+
// uri := string(fastReq.RequestURI())
378+
// if uri != "" && strings.HasSuffix(uri, "/") {
379+
// uri = fmt.Sprint(uri, "index.php")
380+
// } else {
381+
// uri = fmt.Sprint(uri, "/index.php")
382+
// }
383+
// fastReq.SetRequestURI(uri)
384+
// err = fasthttpClient.DoTimeout(fastReq, fastResp, time.Duration(timeout)*time.Second)
385+
// if err != nil {
386+
// return false
387+
// }
388+
// }
389+
// return true
390+
//}
390391

391392
func VerifyInputTarget(target string) (bool, string) {
392393
// 连通性校验改到这里
@@ -438,14 +439,6 @@ func GenOriginalReq(target string) (*http.Request, error) {
438439
originalReq.Header.Set("User-Agent", conf.GlobalConfig.HttpConfig.Headers.UserAgent)
439440
originalReq.Header.Set("Accept-Language","en")
440441
originalReq.Header.Set("Connection","close")
441-
442-
// 检查fixUrl连通性
443-
verify = VerifyTargetConnection(originalReq)
444-
if !verify {
445-
errMsg := fmt.Errorf("util/requests.go:GenOriginalReq %s can not connect", fixTarget)
446-
log.Error(errMsg)
447-
return nil, errMsg
448-
}
449442
return originalReq, nil
450443
}
451444

0 commit comments

Comments
 (0)