[优化] 开启 debug 时仅详细打印来自 poc 的请求

CHANGELOG.MD

@@ -4,6 +4,7 @@
 
 - [BUG] 修复某些情况 `path` 开头包含多个 `/` 问题
 - [优化] 使用 `interactsh` 反连随机选择可用的服务器
+- [优化] 开启 `debug` 时仅详细打印来自 `poc` 的请求
 - [优化] 开启 `debug` 时请求响应限制打印长度
 
 感谢以下用户的贡献:

base/poc.go

@@ -46,6 +46,7 @@ type POC struct {
 }
 
 func (p *POC) DoReq(req *client.TheRequest) (*client.TheResponse, error) {
+	req.IsFromPoC = true
 	return p.Context.Client.DoReq(req)
 }
 

client/client.go

@@ -51,6 +51,7 @@ func (c *HttpClient) DoReq(req *TheRequest) (*TheResponse, error) {
 	if err != nil {
 		return nil, xerr.Wrap(err)
 	}
+	rawReq.IsFromPoC = req.IsFromPoC
 	rawReq.SetBody(req.Body)
 	rawReq.SetFollowRedirect(req.FollowRedirect)
 	for k, v := range req.Headers {

client/req.go

@@ -26,6 +26,8 @@ type TheRequest struct {
 	Body           string
 	Headers        map[string]string
 	All            []byte
+	// 特殊信息
+	IsFromPoC bool
 }
 
 // Equals

rawhttp/impl.go

@@ -131,10 +131,12 @@ func (c *HTTPClient) DoReq(req *Request) (*Response, error) {
 
 	buildReq := c.buildReqRaw(req)
 
-	if c.Debug {
+	if c.Debug && req.IsFromPoC {
 		log.BluePrintln("------------------- REQUEST DEBUG -------------------")
 		log.YellowPrintln(formatMessage(buildReq))
 		log.BluePrintln("-----------------------------------------------------")
+	} else if c.Debug && !req.IsFromPoC {
+		log.BluePrintln(fmt.Sprintf("[*] %s://%s:%s%s", req.Protocol, req.IP, req.Port, req.Path))
 	}
 
 	n, err := conn.Write(buildReq)
@@ -187,7 +189,7 @@ func (c *HTTPClient) DoReq(req *Request) (*Response, error) {
 		}
 	}
 
-	if c.Debug {
+	if c.Debug && req.IsFromPoC {
 		log.BluePrintln("------------------- RESPONSE DEBUG -------------------")
 		log.YellowPrintln(formatMessage(resp.RawResponse))
 		log.BluePrintln("-----------------------------------------------------")

rawhttp/req.go

@@ -42,6 +42,8 @@ type Request struct {
 	RawHeader     []byte
 	RawRequest    []byte
 	redirectCount int
+	// 特殊信息
+	IsFromPoC bool
 }
 
 func NewRequest(target string, method string) (*Request, error) {

reverse/dnslog.go

@@ -79,6 +79,7 @@ func (d *DnsLogCn) waitInternal() bool {
 		Headers: map[string]string{
 			"Cookie": d.session,
 		},
+		IsFromPoC: false,
 	})
 	if err != nil {
 		log.Error(err)

reverse/interact.go

@@ -159,6 +159,7 @@ func NewInteract(c *client.HttpClient, server string) (*Interact, error) {
 		Headers: map[string]string{
 			"Content-Type": "application/json",
 		},
+		IsFromPoC: false,
 	}
 	reResp, err := c.DoReq(regReq)
 	if err != nil {
@@ -202,6 +203,7 @@ func (i *Interact) Close() {
 		Headers: map[string]string{
 			"Content-Type": "application/json",
 		},
+		IsFromPoC: false,
 	}
 	deResp, err := i.c.DoReq(deReq)
 	if err != nil {
@@ -236,6 +238,7 @@ func (i *Interact) Wait(w int) bool {
 		FollowRedirect: false,
 		Body:           "",
 		Headers:        make(map[string]string),
+		IsFromPoC:      false,
 	}
 	var respAesKey string
 	t := time.Duration(w) * time.Second

reverse/reverse.go

@@ -71,6 +71,7 @@ func NewReverse(c *client.HttpClient) (Reverse, error) {
 			FollowRedirect: false,
 			Body:           "",
 			Headers:        make(map[string]string),
+			IsFromPoC:      false,
 		})
 		if err != nil {
 			return nil, xerr.Wrap(err)