add -fjo(jarm) and -ff (fetch-fields)

xiecat · Dec 30, 2021 · a23068d · a23068d
1 parent 6f6d66e
commit a23068d
Show file tree

Hide file tree

Showing 6 changed files with 210 additions and 169 deletions.
diff --git a/internal/cli/parser.go b/internal/cli/parser.go
@@ -22,6 +22,8 @@ const (
 	Stdin_Mode
 	Query_Mode
 	File_Mode
+	DefaultField    = ""
+	DefaultFieldSep = ","
 )
 
 type Options struct {
@@ -62,10 +64,14 @@ type queryOfFile struct {
 }
 
 type filter struct {
-	// 填写需要的另一个字段如，port
-	FetchOneField string
+	// 填写需要获取的字段如，port
+	FetchFields string
+	// 指定显示的分隔符
+	FetchFieldsSplit string
 	// 提取指定根域名的所有 title
 	FetchTitlesOfDomain bool
+	// 提取指定根域名的所有 title
+	FetchJarmOfDomain bool
 	// 提取完整的 hostInfo，带有 protocol
 	FetchFullHostInfo bool
 	// 排除干扰
@@ -149,7 +155,9 @@ func init() {
 		//flags.BoolVarP(&args.UniqByIP, "unique-by-ip", "ubi", args.UniqByIP, "以IP的方式进行去重"),
 		flags.BoolVarP(&args.FetchFullHostInfo, "fetch-fullHost-info", "ffi", false, "URL fetch, with scheme, hostname, port"),
 		flags.BoolVarP(&args.FetchTitlesOfDomain, "fetch-titles-ofDomain", "fto", false, "Fetch website title"),
-		// flags.StringVarP(&args.FetchOneField, "fetch-one-field", "fof", args.FetchOneField, "填写需要的另一个字段如，port"),
+		flags.BoolVarP(&args.FetchJarmOfDomain, "fetch-jarm-ofDomain", "fjo", false, "Fetch website jarm"),
+		flags.StringVarP(&args.FetchFields, "fetch-fields", "ff", DefaultField, "Fetch by fields.eg: (ip,port)"),
+		flags.StringVar(&args.FetchFieldsSplit, "fetch-fields-split", "\t", "Specify characters to split data in different fields"),
 	)
 	createGroup(
 		flags, "query", "Single query/cert/icon",

diff --git a/internal/fofa/fofa_api.go b/internal/fofa/fofa_api.go
@@ -9,6 +9,7 @@ import (
 	"math"
 	"net/http"
 	"net/url"
+	"strings"
 	"time"
 
 	"fofax/internal/cli"
@@ -150,6 +151,9 @@ func (f *FoFa) fetchByFields(fields string, queryStr string) bool {
 			printer.Debugf("Fofa Api Query: %s", apiResult.Query)
 		}
 		printer.Successf("Fetch Data From FoFa: [%d/%d]", len(apiResult.Results), apiResult.Size)
+		if f.option.FetchFields != cli.DefaultField {
+			fmt.Println(strings.Join(strings.Split(f.option.FetchFields, ","), f.option.FetchFieldsSplit))
+		}
 		for _, result := range apiResult.Results {
 			//if len(result[0]) == 0 || result[0] == ":0" {
 			//	printer.Debug("There is no HostInfo!")
@@ -179,8 +183,8 @@ func (f *FoFa) FetchFullHostInfo(queryStr string) bool {
 	return f.fetchByFields("protocol,ip,port,host,type", queryStr)
 }
 
-// FetchOneField 提取指定的字段
-func (f *FoFa) FetchOneField(field, queryStr string) bool {
+// FetchField 提取指定的字段
+func (f *FoFa) FetchField(field, queryStr string) bool {
 	return f.fetchByFields(field, queryStr)
 }
 
@@ -189,6 +193,11 @@ func (f *FoFa) FetchTitlesOfDomain(queryStr string) bool {
 	return f.fetchByFields("protocol,ip,port,host,type,title,lastupdatetime", queryStr)
 }
 
+// FetchJarmOfDomain 提取 title
+func (f *FoFa) FetchJarmOfDomain(queryStr string) bool {
+	return f.fetchByFields("protocol,ip,port,host,type,jarm,lastupdatetime", queryStr)
+}
+
 func (f *FoFa) Fetch(queryStr string) bool {
 	return f.fetchByFields("host,title,lastupdatetime", queryStr)
 }

diff --git a/internal/fxparser/FOFA.g4 b/internal/fxparser/FOFA.g4
@@ -96,6 +96,7 @@ FOFA_KEY
    | 'ip_city'
    | 'ip_after'
    | 'ip_before'
+   | 'jarm'
    | 'fx'
    ;
 

diff --git a/internal/fxparser/parser/FOFALexer.interp b/internal/fxparser/parser/FOFALexer.interp