update: dirscan

Author: niudaii

pkg/dirscan/result.go

@@ -1,11 +1,11 @@
 package dirscan
 
 type Result struct {
-	Url           string
-	StatusCode    int
-	ContentLength int
-	Suffix        string
-	ContentType   string
+	Url           string `json:"url"`
+	StatusCode    int    `json:"statusCode"`
+	ContentLength int    `json:"contentLength"`
+	ContentType   string `json:"-"`
+	Title         string `json:"title"`
 }
 
 // Results 按照contentLength排序

pkg/dirscan/runner.go

@@ -1,7 +1,6 @@
 package dirscan
 
 import (
-	"fmt"
 	"github.com/niudaii/zpscan/internal/utils"
 	"github.com/niudaii/zpscan/pkg/webscan"
 	"strings"
@@ -111,9 +110,6 @@ func (r *Runner) Dirscan(input *Input) (results Results) {
 				if err != nil {
 					gologger.Debug().Msgf("%v", err)
 				} else {
-					if strings.Contains(task, "/login") {
-						fmt.Println(result)
-					}
 					if result.ContentLength != 0 && utils.HasInt(r.options.MatchStatus, result.StatusCode) {
 						flag := true
 						if suffix, ok := utils.SuffixStr(extensions, result.Url); ok {
@@ -122,7 +118,7 @@ func (r *Runner) Dirscan(input *Input) (results Results) {
 							}
 						}
 						if flag {
-							gologger.Silent().Msgf("%v [%v] [%v]", result.Url, result.StatusCode, result.ContentLength)
+							gologger.Silent().Msgf("%v [%v] [%v] [%v]", result.Url, result.StatusCode, result.ContentLength, result.Title)
 							mutex.Lock()
 							respMap[result.ContentLength] += 1
 							tmpResults = append(tmpResults, result)
@@ -165,6 +161,7 @@ func (r *Runner) Req(url string) (result *Result, err error) {
 		StatusCode:    resp.StatusCode,
 		ContentLength: len(resp.String()),
 		ContentType:   resp.GetContentType(),
+		Title:         webscan.GetTitle(resp),
 	}
 	return
 }

pkg/pocscan/runner.go

@@ -27,7 +27,6 @@ type Runner struct {
 
 func NewRunner(options *Options, gobyPocs []*goby.Poc, xrayPocs []*xray.Poc, nucleiTemplates []*nuclei.Template) (runner *Runner, err error) {
 	nucleiEngine := nuclei.InitEngine(options.Timeout, options.Proxy)
-	//nucleiEngine = nuclei.InitEngine(options.Timeout, "")
 	reqClient := utils.NewReqClient(options.Proxy, options.Timeout, options.Headers)
 	runner = &Runner{
 		gobyPocs:        gobyPocs,

pkg/webscan/runner.go

@@ -61,6 +61,7 @@ func (r *Runner) Run(urls []string) (results Results) {
 					if len(resp.Fingers) > 5 {
 						gologger.Warning().Msgf("%v 可能为蜜罐", resp.Url)
 					} else {
+						gologger.Silent().Msgf(FmtResult(resp, r.options.NoColor))
 						mutex.Lock()
 						results = append(results, resp)
 						mutex.Unlock()
@@ -103,7 +104,7 @@ func (r *Runner) Webinfo(url string) (result *Result, err error) {
 		Url:           resp.Request.URL.Scheme + "://" + resp.Request.URL.Host,
 		StatusCode:    resp.StatusCode,
 		ContentLength: len(resp.String()),
-		Title:         getTitle(resp),
+		Title:         GetTitle(resp),
 		Fingers:       r.getFinger(resp),
 	}
 	if !r.options.NoIconhash {
@@ -112,7 +113,6 @@ func (r *Runner) Webinfo(url string) (result *Result, err error) {
 	if !r.options.NoWappalyzer {
 		result.Wappalyzer = r.wappalyzerClient.Fingerprint(resp.Header, resp.Bytes())
 	}
-	gologger.Silent().Msgf(FmtResult(result, r.options.NoColor))
 	return
 }
 

pkg/webscan/title.go

@@ -16,7 +16,7 @@ var (
 	reTitle = regexp.MustCompile(`(?im)<\s*title.*>(.*?)<\s*/\s*title>`)
 )
 
-func getTitle(resp *req.Response) (title string) {
+func GetTitle(resp *req.Response) (title string) {
 	// Try to parse the DOM
 	titleDom, err := getTitleWithDom(resp)
 	// In case of error fallback to regex