add grpc 2022-11-26

GhostTroops · Nov 25, 2022 · 41385f3 · 41385f3
1 parent 5890c91
commit 41385f3
Show file tree

Hide file tree

Showing 46 changed files with 939 additions and 43 deletions.
diff --git a/brute/dicts/filedic.txt b/brute/dicts/filedic.txt
@@ -1,6 +1,6 @@
 /Login.jsp
 /login.jsp
-.*org/login
+/.well-known/security.txt
 ../../../../../../../../../../../../../../../../../../usr/local/cpanel/logs/login_log%00
 ../../../../../../../../../../../../../../../../../../usr/local/cpanel/logs/login_log
 ../../../../../../../../../../../../../../../../../usr/local/cpanel/logs/login_log
@@ -3703,7 +3703,6 @@ $metadata
 /.web
 /.well-known/acme-challenge/
 /.well-known/apple-app-site-association
-/.well-known/security.txt
 /.workspace/
 /.wp-config.php.swp
 /.www_acl

diff --git a/config/config.json b/config/config.json
@@ -12,6 +12,14 @@
       "-c",20,
       "-o","{PWD}/logs"
     ],
+    "uncover": [
+      "-q","",
+      "-e","shodan",
+      "-pc","{PWD}/config/uncover/provider-config.yaml",
+      "-config","{PWD}/config/uncover/config.yaml",
+      "-f","ip,port,host",
+      "-json","-o",""
+    ],
     "ffuf": [
       "-u","",
       "-w","{PWD}/brute/dicts/filedic.txt",
@@ -77,7 +85,8 @@
       "-silent","-nc","-json", "-o", ""
     ],
     "shuffledns": [
-      "-r", "",
+      "-d", "",
+      "-r","{PWD}/config/resolvers.txt",
       "-w","{PWD}/config/database/subdomain.txt",
       "-silent","-nc","-json", "-o", ""
     ],
@@ -152,7 +161,7 @@
     ],
     "naabu":[
       "-l", "",
-      "-port", "1-65535",
+      "-top-ports", "http",
       "-iv", "4,6",
       "-scan-type", "s",
       "-sa","-silent","-nc",

diff --git a/config/databases/db_404_strings → config/database/db_404_strings b/config/databases/db_404_strings → config/database/db_404_strings
diff --git a/config/databases/db_content_search → config/database/db_content_search b/config/databases/db_content_search → config/database/db_content_search
diff --git a/config/databases/db_dictionary → config/database/db_dictionary b/config/databases/db_dictionary → config/database/db_dictionary
diff --git a/config/databases/db_dir_traversal → config/database/db_dir_traversal b/config/databases/db_dir_traversal → config/database/db_dir_traversal
diff --git a/config/databases/db_domino → config/database/db_domino b/config/databases/db_domino → config/database/db_domino
diff --git a/config/databases/db_drupal → config/database/db_drupal b/config/databases/db_drupal → config/database/db_drupal
diff --git a/config/databases/db_embedded → config/database/db_embedded b/config/databases/db_embedded → config/database/db_embedded
diff --git a/config/databases/db_favicon → config/database/db_favicon b/config/databases/db_favicon → config/database/db_favicon
diff --git a/config/databases/db_headers → config/database/db_headers b/config/databases/db_headers → config/database/db_headers
diff --git a/config/databases/db_httpoptions → config/database/db_httpoptions b/config/databases/db_httpoptions → config/database/db_httpoptions
diff --git a/config/databases/db_multiple_index → config/database/db_multiple_index b/config/databases/db_multiple_index → config/database/db_multiple_index
diff --git a/config/databases/db_outdated → config/database/db_outdated b/config/databases/db_outdated → config/database/db_outdated
diff --git a/config/databases/db_parked_strings → config/database/db_parked_strings b/config/databases/db_parked_strings → config/database/db_parked_strings
diff --git a/config/databases/db_realms → config/database/db_realms b/config/databases/db_realms → config/database/db_realms
diff --git a/config/databases/db_server_msgs → config/database/db_server_msgs b/config/databases/db_server_msgs → config/database/db_server_msgs
diff --git a/config/databases/db_tests → config/database/db_tests b/config/databases/db_tests → config/database/db_tests
diff --git a/config/databases/db_variables → config/database/db_variables b/config/databases/db_variables → config/database/db_variables
diff --git a/config/databases/subdomain.txt → config/database/subdomain.txt b/config/databases/subdomain.txt → config/database/subdomain.txt
diff --git a/config/resolvers.txt b/config/resolvers.txt
@@ -0,0 +1,5 @@
+8.8.8.8
+114.114.114.114
+1.1.1.1
+2409:8062:2000:1::1
+2409:8062:2000:1::2
diff --git a/config/scan4all_db.db b/config/scan4all_db.db
diff --git a/doNaabu_test.go b/doNaabu_test.go
@@ -1,13 +1,39 @@
 package main
 
 import (
+	"github.com/hktalent/ProScan4all/lib/util"
 	"github.com/hktalent/ProScan4all/pkg/xcmd"
-	util "github.com/hktalent/go-utils"
+	"log"
+	"strings"
 	"testing"
 )
 
+func DoInitAll() {
+	util.DoInit(&config)
+}
+
+func TestDoUncover(t *testing.T) {
+	DoInitAll()
+	a := strings.Split(`'ssl:"China Lodging Group"'
+'ssl:"huazhu"'
+'ssl:"huazhu.com"'
+'ssl:"alipay.com"'
+'ssl:"hackerone.com"'
+'ssl:"paypal.com"'
+'ssl:"PayPal, Inc."'
+'ssl:"tencent"'
+'ssl:"paypal"'
+'ssl:"paypal.com"'`, "\n")
+	for _, x := range a {
+		if got := xcmd.DoUncover(x); got != "" {
+			log.Println(got)
+		}
+	}
+	util.Wg.Wait()
+	util.CloseAll()
+}
 func TestDoAmass(t *testing.T) {
-	util.DoInitAll()
+	DoInitAll()
 	type args struct {
 		s string
 	}
@@ -29,7 +55,7 @@ func TestDoAmass(t *testing.T) {
 	util.CloseAll()
 }
 func TestDoSubfinder(t *testing.T) {
-	util.DoInitAll()
+	DoInitAll()
 	type args struct {
 		s string
 	}
@@ -51,7 +77,7 @@ func TestDoSubfinder(t *testing.T) {
 	util.CloseAll()
 }
 func TestDoShuffledns(t *testing.T) {
-	util.DoInitAll()
+	DoInitAll()
 	type args struct {
 		s string
 	}
@@ -60,20 +86,20 @@ func TestDoShuffledns(t *testing.T) {
 		args args
 		want string
 	}{
-		{"shuffledns", args{"www.sina.com.cn\nhttps://ww.baidu.com:443\n"}, ""},
+		{"shuffledns", args{"huazhu.com"}, ""},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			if got := xcmd.DoShuffledns(tt.args.s); got != tt.want {
-				t.Errorf("DoNaabu() = %v, want %v", got, tt.want)
+				t.Errorf("DoShuffledns() = %v, want %v", got, tt.want)
 			}
 		})
 	}
 	util.Wg.Wait()
 	util.CloseAll()
 }
 func TestDoKatana(t *testing.T) {
-	util.DoInitAll()
+	DoInitAll()
 	type args struct {
 		s string
 	}
@@ -95,7 +121,7 @@ func TestDoKatana(t *testing.T) {
 	util.CloseAll()
 }
 func TestDoTlsx(t *testing.T) {
-	util.DoInitAll()
+	DoInitAll()
 	type args struct {
 		s string
 	}
@@ -104,20 +130,116 @@ func TestDoTlsx(t *testing.T) {
 		args args
 		want string
 	}{
-		{"tlsx", args{"www.sina.com.cn\nhttps://ww.baidu.com:443\n"}, ""},
+		{"tlsx", args{`mercure.huazhu.com
+wifi.huazhu.com
+checkin.huazhu.com
+cdn.huazhu.com
+img3.huazhu.com
+ota.huazhu.com
+sms.huazhu.com
+hms.huazhu.com
+ehk.huazhu.com
+stalker.huazhu.com
+msoid.huazhu.com
+ssl.huazhu.com
+zzyg.huazhu.com
+p.huazhu.com
+homs.huazhu.com
+ir.huazhu.com
+d.huazhu.com
+fuli.huazhu.com
+mail2.huazhu.com
+benefit.huazhu.com
+excashier.huazhu.com
+track.huazhu.com
+mms.huazhu.com
+seal.huazhu.com
+vip.huazhu.com
+fr.huazhu.com
+srm.huazhu.com
+career.huazhu.com
+edm.huazhu.com
+img2.huazhu.com
+campus.huazhu.com
+tqm.huazhu.com
+gpn.huazhu.com
+yiqi.huazhu.com
+mx3.huazhu.com
+smarthome.huazhu.com
+ccapi.huazhu.com
+appservice.huazhu.com
+cc.huazhu.com
+webmail.huazhu.com
+mas.huazhu.com
+av.huazhu.com
+h5.huazhu.com
+bm.huazhu.com
+mt.huazhu.com
+rms.huazhu.com
+mbs.huazhu.com
+mobile.huazhu.com
+wso.huazhu.com
+fuli.huazhu.com
+track.huazhu.com
+mobile.huazhu.com
+assist.huazhu.com
+booking.huazhu.com
+i.huazhu.com
+my.huazhu.com
+ygg.huazhu.com
+gslb.huazhu.com
+hxr.huazhu.com
+qa.huazhu.com
+epos.huazhu.com
+research.huazhu.com
+web.huazhu.com
+hotels.huazhu.com
+m.huazhu.com
+appapi.huazhu.com
+passport.huazhu.com
+wxapi.huazhu.com
+nexus.huazhu.com
+api.huazhu.com
+upload.huazhu.com
+webcs2.huazhu.com
+app6.huazhu.com
+app.huazhu.com
+promotion.huazhu.com
+customer.huazhu.com
+hud.huazhu.com
+kaifa.huazhu.com
+hpd.huazhu.com
+hec.huazhu.com
+gw.huazhu.com
+idp.huazhu.com
+breakfast.huazhu.com
+vat.huazhu.com
+signin.huazhu.com
+cashier.huazhu.com
+inside.huazhu.com
+shop.huazhu.com
+hsc.huazhu.com
+mx13.huazhu.com
+mx15.huazhu.com
+mx14.huazhu.com
+mx11.huazhu.com
+power.huazhu.com
+hfs.huazhu.com
+services.huazhu.com
+hos.huazhu.com`}, ""},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			if got := xcmd.DoTlsx(tt.args.s); got != tt.want {
-				t.Errorf("DoNaabu() = %v, want %v", got, tt.want)
+				t.Errorf("DoTlsx() = %v, want %v", got, tt.want)
 			}
 		})
 	}
 	util.Wg.Wait()
 	util.CloseAll()
 }
 func TestDoDnsx(t *testing.T) {
-	util.DoInitAll()
+	DoInitAll()
 	type args struct {
 		s string
 	}
@@ -139,7 +261,7 @@ func TestDoDnsx(t *testing.T) {
 	util.CloseAll()
 }
 func TestDoNuclei(t *testing.T) {
-	util.DoInitAll()
+	DoInitAll()
 	type args struct {
 		s string
 	}
@@ -161,7 +283,7 @@ func TestDoNuclei(t *testing.T) {
 	util.CloseAll()
 }
 func TestDoHttpx(t *testing.T) {
-	util.DoInitAll()
+	DoInitAll()
 	type args struct {
 		s string
 	}
@@ -184,7 +306,7 @@ func TestDoHttpx(t *testing.T) {
 }
 
 func TestDoNaabu(t *testing.T) {
-	util.DoInitAll()
+	DoInitAll()
 	type args struct {
 		s string
 	}

diff --git a/go.mod b/go.mod
@@ -19,8 +19,8 @@ require (
 	github.com/projectdiscovery/networkpolicy v0.0.2-0.20220925181336-68b15b6cbe8c
 	github.com/remeh/sizedwaitgroup v1.0.0
 	go.uber.org/ratelimit v0.2.0
-	golang.org/x/net v0.1.0
-	golang.org/x/sys v0.1.0
+	golang.org/x/net v0.2.0
+	golang.org/x/sys v0.2.0
 )
 
 require (
@@ -135,7 +135,7 @@ require (
 	golang.org/x/crypto v0.0.0-20221012134737-56aed061732a
 	golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1
 	golang.org/x/time v0.0.0-20220922220347-f3bd1da661af
-	google.golang.org/genproto v0.0.0-20220916172020-2692e8806bfa
+	google.golang.org/genproto v0.0.0-20221118155620-16455021b5e6
 	google.golang.org/protobuf v1.28.1
 	gopkg.in/irc.v3 v3.1.4
 	gorm.io/driver/sqlite v1.4.3
@@ -277,6 +277,7 @@ require (
 	github.com/hktalent/bleve-mapping-ui v0.4.1 // indirect
 	github.com/hktalent/go-utils v0.0.0-20221022101117-e2abdad71ff5 // indirect
 	github.com/hktalent/goxml2json v0.0.0-20221020100654-3af6886de60c // indirect
+	github.com/hktalent/gson v0.0.0-20221118090607-68e4c7359da2 // indirect
 	github.com/hktalent/jaeles v1.0.1 // indirect
 	github.com/hktalent/kvDb v0.0.0-20221117003327-e25054351180 // indirect
 	github.com/hktalent/websocket v0.0.0-20220908204337-b4a81b861976 // indirect
@@ -411,9 +412,10 @@ require (
 	golang.org/x/exp v0.0.0-20221018221608-02f3b879a704 // indirect
 	golang.org/x/mod v0.6.0-dev.0.20221005201717-2666ed6287c1 // indirect
 	golang.org/x/sync v0.0.0-20220907140024-f12130a52804 // indirect
-	golang.org/x/term v0.1.0 // indirect
+	golang.org/x/term v0.2.0 // indirect
 	golang.org/x/tools v0.1.12 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/grpc v1.51.0 // indirect
 	gopkg.in/alecthomas/kingpin.v2 v2.2.6 // indirect
 	gopkg.in/corvus-ch/zbase32.v1 v1.0.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect

diff --git a/go.sum b/go.sum
@@ -773,6 +773,8 @@ github.com/hktalent/go-utils v0.0.0-20221022101117-e2abdad71ff5 h1:BLippEkuknXco
 github.com/hktalent/go-utils v0.0.0-20221022101117-e2abdad71ff5/go.mod h1:+xqUvKeUpQPRGzg9m5uMDKTOHv0RRDIw5K4JCUKzClA=
 github.com/hktalent/goxml2json v0.0.0-20221020100654-3af6886de60c h1:cSXjPYq2VBEoM14sPKuqA8yL7en7A1oYz+K6Gc+LmW4=
 github.com/hktalent/goxml2json v0.0.0-20221020100654-3af6886de60c/go.mod h1:ADjILrqfUYHa7t3yutaiNXwsVnxkMd1xXTLa8Dq4d4o=
+github.com/hktalent/gson v0.0.0-20221118090607-68e4c7359da2 h1:+yV5XQgBCnLsDrFUpCl/SAUx/nanMoXzBk42ifrEo2Q=
+github.com/hktalent/gson v0.0.0-20221118090607-68e4c7359da2/go.mod h1:vty8KnMAKpulzEMEWYfzIs18v0WdYTjLSGOyEfPj6Bw=
 github.com/hktalent/jaeles v0.0.0-20220729035545-f2032a5ed55a h1:L27LVsVowwKSeiZWk9PMk4RdEyR4YDPSbcu5zdzK4cc=
 github.com/hktalent/jaeles v0.0.0-20220729035545-f2032a5ed55a/go.mod h1:MEcxgmTrrmSoLf9sytrXJH8WcWmrICB6jsU1/27e0BI=
 github.com/hktalent/jaeles v1.0.1 h1:kv3T1lVFTbUCaSaLLOM12DAblZVn9Pxv7oSBxZv145w=
@@ -1931,6 +1933,8 @@ golang.org/x/net v0.0.0-20221004154528-8021a29435af h1:wv66FM3rLZGPdxpYL+ApnDe2H
 golang.org/x/net v0.0.0-20221004154528-8021a29435af/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0=
 golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
+golang.org/x/net v0.2.0 h1:sZfSu1wtKLGlWI4ZZayP0ck9Y73K1ynO6gqzTdBVdPU=
+golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -2069,6 +2073,8 @@ golang.org/x/sys v0.0.0-20221006211917-84dc82d7e875/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
+golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
@@ -2077,6 +2083,7 @@ golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 h1:Q5284mrmYTpACcm+eAKjKJH4
 golang.org/x/term v0.0.0-20220722155259-a9ba230a4035/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.1.0 h1:g6Z6vPFA9dYBAF7DWcH6sCcOntplXsDKcliusYijMlw=
 golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -2259,6 +2266,8 @@ google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxH
 google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24=
 google.golang.org/genproto v0.0.0-20220916172020-2692e8806bfa h1:VWkrxnAx2C2hirAP+W5ADU7e/+93Yhk//ioKd2XFyDI=
 google.golang.org/genproto v0.0.0-20220916172020-2692e8806bfa/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo=
+google.golang.org/genproto v0.0.0-20221118155620-16455021b5e6 h1:a2S6M0+660BgMNl++4JPlcAO/CjkqYItDEZwkoDQK7c=
+google.golang.org/genproto v0.0.0-20221118155620-16455021b5e6/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg=
 google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
@@ -2285,6 +2294,8 @@ google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG
 google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
 google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
 google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
+google.golang.org/grpc v1.51.0 h1:E1eGv1FTqoLIdnBCZufiSHgKjlqG6fKFf6pPWtMTh8U=
+google.golang.org/grpc v1.51.0/go.mod h1:wgNDFcnuBGmxLKI/qn4T+m5BtEBYXJPvibbUPsAIPww=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=