update query

Author: bufsnake

.github/workflows/go.yml

@@ -13,7 +13,7 @@ jobs:
     - name: Install Golang
       uses: actions/setup-go@v2
       with:
-        go-version: 1.16
+        go-version: 1.17
 
     - name: Get Current Date
       id: date

README.md

@@ -96,16 +96,20 @@ Usage of ./httpx:
 
 ## 逻辑查询
 
-📢: 正常查询字符串时，必须添加""
-
-> 支持五个字段的查询
+`ip=127.0.0.1 || ip="127.0.0.1" or ip=127.0.0.1 && body="123" and statuscode=200` 
 
 ```bash
+# 如果未加关键字，则会全部进行查询
+
+ip
 host
 title
+statuscode
+bodylength
+createtime
+body
 tls
 icp
-body
 ```
 
 > 逻辑
@@ -115,24 +119,19 @@ body
 ||
 ```
 
-> 使用 () 和 && || = == != ~= ~!=符号
+> 使用 () 和 && || = == != ~= !~=符号
 
 ```bash
 ()
-&&
-||
+&& / and
+|| / or
 =
 ==
 !=
 ~=
-~!=
+!~=
 ```
 
-### example
-
-- host="127.0.0.1" && body="test"
-- (icp="京" || icp="沪") && title="404"
-
 ## 操作
 
 - TLS 面板

go.mod

@@ -4,23 +4,25 @@ go 1.16
 
 require golang.org/x/text v0.3.7
 
-require github.com/chromedp/cdproto v0.0.0-20220530001853-c0f376d894d1
+require github.com/chromedp/cdproto v0.0.0-20220620034043-93c6adfcda6a
 
 require (
 	github.com/bufsnake/parseip v0.0.0-20210416105416-fc19e9d32da7
-	github.com/bufsnake/wappalyzer v0.0.0-20220602013647-3f6d6dd8fd3f
+	github.com/bufsnake/query v0.0.0-20220622025727-3847305c1438
+	github.com/bufsnake/wappalyzer v0.0.0-20220622031713-6e3d99ae0ac0
 	github.com/chromedp/chromedp v0.8.2
 	github.com/gin-gonic/gin v1.7.7
 	github.com/grantae/certinfo v0.0.0-20170412194111-59d56a35515b
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/kr/pretty v0.3.0 // indirect
 	github.com/liyue201/goqr v0.0.0-20200803022322-df443203d4ea
 	github.com/logrusorgru/aurora v2.0.3+incompatible
-	github.com/miekg/dns v1.1.49 // indirect
+	github.com/miekg/dns v1.1.50 // indirect
 	golang.org/x/image v0.0.0-20211028202545-6944b10bf410
-	golang.org/x/net v0.0.0-20220531201128-c960675eff93 // indirect
-	golang.org/x/tools v0.1.10 // indirect
-	golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df // indirect
+	golang.org/x/net v0.0.0-20220621193019-9d032be2e588 // indirect
+	golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c // indirect
+	golang.org/x/tools v0.1.11 // indirect
+	golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
 	gorm.io/driver/sqlite v1.1.5
 	gorm.io/gorm v1.21.15
 )

go.sum

@@ -1,12 +1,18 @@
 github.com/bufsnake/parseip v0.0.0-20210416105416-fc19e9d32da7 h1:aGPoF7HYZG2ZP804E0OEQeX81mM3aHHiyfMXwffRp24=
 github.com/bufsnake/parseip v0.0.0-20210416105416-fc19e9d32da7/go.mod h1:OceFywin22f9fCK98DiNJ74kHQsBoLGBZOhVuuTHs90=
+github.com/bufsnake/query v0.0.0-20220622025727-3847305c1438 h1:GoshYfBrmkFLtHky+CcgsABK1wrjkS16L8uBtTOe6Oc=
+github.com/bufsnake/query v0.0.0-20220622025727-3847305c1438/go.mod h1:vmTD8mpODbNMj5o7ohlaChfsM5pGLruB1Kz+Gb7f4/8=
 github.com/bufsnake/wappalyzer v0.0.0-20220602013647-3f6d6dd8fd3f h1:1VwJnChtEynrk3bgFPZDFJtzACnhDYOEVrtttTulbh8=
 github.com/bufsnake/wappalyzer v0.0.0-20220602013647-3f6d6dd8fd3f/go.mod h1:CyG4jjgFWSJ5ibP3lww9F8jaKReHhvlpKRIaZmXDVZc=
+github.com/bufsnake/wappalyzer v0.0.0-20220622031713-6e3d99ae0ac0 h1:T32wOHn3yviD6uescqkckNK7hODmguFqXA8VLIpXKdg=
+github.com/bufsnake/wappalyzer v0.0.0-20220622031713-6e3d99ae0ac0/go.mod h1:CyG4jjgFWSJ5ibP3lww9F8jaKReHhvlpKRIaZmXDVZc=
 github.com/chromedp/cdproto v0.0.0-20211126220118-81fa0469ad77/go.mod h1:At5TxYYdxkbQL0TSefRjhLE3Q0lgvqKKMSFUglJ7i1U=
 github.com/chromedp/cdproto v0.0.0-20211205231339-d2673e93eee4/go.mod h1:At5TxYYdxkbQL0TSefRjhLE3Q0lgvqKKMSFUglJ7i1U=
 github.com/chromedp/cdproto v0.0.0-20220515234810-83d799542a04/go.mod h1:5Y4sD/eXpwrChIuxhSr/G20n9CdbCmoerOHnuAf0Zr0=
 github.com/chromedp/cdproto v0.0.0-20220530001853-c0f376d894d1 h1:dl8AS1mmnSC7kTpRKD4mrDrV3HJqFAm975HWap3HGg0=
 github.com/chromedp/cdproto v0.0.0-20220530001853-c0f376d894d1/go.mod h1:5Y4sD/eXpwrChIuxhSr/G20n9CdbCmoerOHnuAf0Zr0=
+github.com/chromedp/cdproto v0.0.0-20220620034043-93c6adfcda6a h1:2NhZzSwvpDdhdMK+imNJUvK80/kyfbd1E11kbxkCgHw=
+github.com/chromedp/cdproto v0.0.0-20220620034043-93c6adfcda6a/go.mod h1:5Y4sD/eXpwrChIuxhSr/G20n9CdbCmoerOHnuAf0Zr0=
 github.com/chromedp/chromedp v0.7.6/go.mod h1:ayT4YU/MGAALNfOg9gNrpGSAdnU51PMx+FCeuT1iXzo=
 github.com/chromedp/chromedp v0.8.2 h1:EYSsSqWuKYwyHZEJpU00kOGOMz5DE0qDVckelzauMFA=
 github.com/chromedp/chromedp v0.8.2/go.mod h1:vpbCNtfYeOUo2q5reuwX6ZmPpbHRf5PZfAqNR2ObB+g=
@@ -70,6 +76,8 @@ github.com/mattn/go-sqlite3 v1.14.8/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A
 github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4=
 github.com/miekg/dns v1.1.49 h1:qe0mQU3Z/XpFeE+AEBo2rqaS1IPBJ3anmqZ4XiZJVG8=
 github.com/miekg/dns v1.1.49/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME=
+github.com/miekg/dns v1.1.50 h1:DQUfb9uc6smULcREF09Uc+/Gd46YWqJd5DbpPE9xkcA=
+github.com/miekg/dns v1.1.50/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
@@ -101,6 +109,8 @@ golang.org/x/image v0.0.0-20211028202545-6944b10bf410/go.mod h1:023OzeP/+EPmXeap
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 h1:kQgndtyPBW/JIYERgdxfwMYh3AVStj88WQTlNDi2a+o=
 golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
@@ -109,6 +119,8 @@ golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qx
 golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220531201128-c960675eff93 h1:MYimHLfoXEpOhqd/zgoA/uoXzHB86AEky4LAx5ij9xA=
 golang.org/x/net v0.0.0-20220531201128-c960675eff93/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.0.0-20220621193019-9d032be2e588 h1:9ubFuySsnAJYGyJrZ3koiEv8FyqofCBdz3G9Mbf2YFc=
+golang.org/x/net v0.0.0-20220621193019-9d032be2e588/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -127,6 +139,8 @@ golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c h1:aFV+BgZ4svzjfabn8ERpuB4JI4N6/rdy1iusx77G3oU=
+golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -140,11 +154,15 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn
 golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.10 h1:QjFRCZxdOhBJ/UNgnBZLbNV13DlbnK0quyivTnXJM20=
 golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
+golang.org/x/tools v0.1.11 h1:loJ25fNOEhSXfHrpoGj91eCUThwdNX6u24rO1xnNteY=
+golang.org/x/tools v0.1.11/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df h1:5Pf6pFKu98ODmgnpvkJ3kFUOQGGLIzLIkbzUHp47618=
 golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
+golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f h1:uF6paiQQebLeSXkrTqHqz0MXhXXS1KgF41eUdBNvxK0=
+golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

internal/api/main.go

@@ -3,7 +3,7 @@ package api
 import (
 	"github.com/bufsnake/httpx/internal/models"
 	"github.com/bufsnake/httpx/internal/modelsImpl"
-	"github.com/bufsnake/httpx/pkg/query"
+	"github.com/bufsnake/query"
 	"github.com/bufsnake/wappalyzer"
 	"github.com/gin-gonic/gin"
 	"log"
@@ -15,8 +15,15 @@ type api struct {
 	db *modelsImpl.Database
 }
 
-func NewAPI(db *modelsImpl.Database) api {
-	return api{db: db}
+func NewAPI(db *modelsImpl.Database) *api {
+	err := query.AddKeywords([]string{
+		"ip", "host", "title", "statuscode", "bodylength", "createtime",
+		"body", "tls", "icp",
+	})
+	if err != nil {
+		log.Fatalln(err)
+	}
+	return &api{db: db}
 }
 
 type getdata struct {
@@ -85,7 +92,7 @@ func (a *api) Search(c *gin.Context) {
 		c.String(500, "keyword is empty")
 		return
 	}
-	sql, params, formatQuery, err := query.AnalysisQuery(q.Word)
+	sql, params, formatQuery, err := query.AnalyseQuery(q.Word)
 	if err != nil {
 		c.String(500, "have an error in your query syntax")
 		return
@@ -131,7 +138,7 @@ func (a *api) Copy(c *gin.Context) {
 			return
 		}
 	} else {
-		sql, params, _, err := query.AnalysisQuery(q.Word)
+		sql, params, _, err := query.AnalyseQuery(q.Word)
 		if err != nil {
 			c.String(500, "have an error in your query syntax")
 			return

internal/core/main.go

@@ -156,21 +156,25 @@ func (c *Core) screenshot(w *sync.WaitGroup, datas chan models.Datas, screen_sho
 				image string
 				icp   string
 				title string
+				body  string
 				err   error
 			)
 			fingers := make(map[string]wappalyzer.Technologie)
-			image, title, fingers, err = screen_shot.Run(data.URL, data.XFrameOptions)
+			image, title, body, fingers, err = screen_shot.Run(data.URL, data.XFrameOptions)
 			if err != nil {
 				c.log.Error(err)
-			} else {
-				data.Image = image
-				if icp != "" && icp != data.ICP {
-					data.ICP += "|" + icp
-				}
+			}
+			data.Image = image
+			if icp != "" && icp != data.ICP {
+				data.ICP += "|" + icp
 			}
 			if title != "" {
 				data.Title = title
 			}
+			if body != "" {
+				data.BodyLength = strconv.Itoa(len(body))
+				data.HTTPDump = body
+			}
 			if len(fingers) != 0 {
 				fingers_ := make([]models.Finger, 0)
 				for name, val := range fingers {