diff --git a/cmd/cmd.go b/cmd/cmd.go index ef862fd..68753c2 100644 --- a/cmd/cmd.go +++ b/cmd/cmd.go @@ -3,8 +3,8 @@ package cmd import ( "context" "fmt" - "github.com/chainreactors/gogo/v2/pkg/utils" "github.com/chainreactors/logs" + "github.com/chainreactors/parsers/iutils" "github.com/chainreactors/spray/internal" "github.com/chainreactors/spray/pkg" "github.com/chainreactors/spray/pkg/ihttp" @@ -55,7 +55,7 @@ func Spray() { err = pkg.LoadTemplates() if err != nil { - utils.Fatal(err.Error()) + iutils.Fatal(err.Error()) } if option.Extracts != nil { diff --git a/go.mod b/go.mod index 55932c9..ba18e35 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/chainreactors/files v0.2.5-0.20221212083256-16ee4c1ae47e github.com/chainreactors/go-metrics v0.0.0-20220926021830-24787b7a10f8 - github.com/chainreactors/gogo/v2 v2.10.1 + github.com/chainreactors/gogo/v2 v2.10.4 github.com/chainreactors/ipcs v0.0.13 github.com/chainreactors/logs v0.7.1-0.20221214153111-85f123ff6580 github.com/chainreactors/parsers v0.3.0 @@ -18,6 +18,7 @@ require ( github.com/jessevdk/go-flags v1.5.0 github.com/panjf2000/ants/v2 v2.7.0 github.com/valyala/fasthttp v1.43.0 + golang.org/x/time v0.3.0 sigs.k8s.io/yaml v1.3.0 ) @@ -32,6 +33,5 @@ require ( github.com/twmb/murmur3 v1.1.6 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect golang.org/x/sys v0.2.0 // indirect - golang.org/x/time v0.3.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect ) diff --git a/go.sum b/go.sum index c3446b1..023986f 100644 --- a/go.sum +++ b/go.sum @@ -11,22 +11,17 @@ github.com/chainreactors/files v0.2.5-0.20221212083256-16ee4c1ae47e h1:Y/NB1dgNm github.com/chainreactors/files v0.2.5-0.20221212083256-16ee4c1ae47e/go.mod h1:/Xa9YXhjBlaC33JTD6ZTJFig6pcplak2IDcovf42/6A= github.com/chainreactors/go-metrics v0.0.0-20220926021830-24787b7a10f8 h1:kMFr1Hj+rkp1wBPIw2pcQvelO5GnA7r7wY3h6vJ1joA= github.com/chainreactors/go-metrics v0.0.0-20220926021830-24787b7a10f8/go.mod h1:7NDvFERNiXsujaBPD6s4WXj52uKdfnF2zVHQtKXIEV4= -github.com/chainreactors/gogo/v2 v2.10.1 h1:s3GqcqwBLT1dR6dYTXYEQ14+bej1oImmwFg5QqlxL8k= -github.com/chainreactors/gogo/v2 v2.10.1/go.mod h1:0l7MElzkSqExIcN4hrwtij0AuqaY0Iyto1HSKYFMetU= +github.com/chainreactors/gogo/v2 v2.10.4 h1:oi/eciYdP6rWbAdparMTEVAoMZW4PDHI4nv3f1wmUsc= +github.com/chainreactors/gogo/v2 v2.10.4/go.mod h1:SszYI35PAzaOQ4h8fk4bPzkoyEkh9Viw8f2kjpOu0Ks= github.com/chainreactors/ipcs v0.0.9/go.mod h1:E9M3Ohyq0TYQLlV4i2dbM9ThBZB1Nnd7Oexoie2xLII= github.com/chainreactors/ipcs v0.0.13 h1:TZww7XRr4qZPWqy9DjBzcJgxtSUwT4TAbcho4156bRI= github.com/chainreactors/ipcs v0.0.13/go.mod h1:E9M3Ohyq0TYQLlV4i2dbM9ThBZB1Nnd7Oexoie2xLII= github.com/chainreactors/logs v0.6.1/go.mod h1:Y0EtAnoF0kiASIJUnXN0pcOt420iRpHOAnOhEphzRHA= github.com/chainreactors/logs v0.7.1-0.20221214153111-85f123ff6580 h1:28gbL1t+Mm4AoP1MeKM9oeSHoPcUwIrzrLtmdusHMIo= github.com/chainreactors/logs v0.7.1-0.20221214153111-85f123ff6580/go.mod h1:Y0EtAnoF0kiASIJUnXN0pcOt420iRpHOAnOhEphzRHA= -github.com/chainreactors/parsers v0.2.9-0.20221210155102-cc0814762410 h1:K7EV0wtUuN6Rvh/MgqaBXyElD3guPsgNR5kF8nrV7iw= -github.com/chainreactors/parsers v0.2.9-0.20221210155102-cc0814762410/go.mod h1:Z9weht+lnFCk7UcwqFu6lXpS7u5vttiy0AJYOAyCCLA= -github.com/chainreactors/parsers v0.2.9-0.20230117063421-a463730bca48 h1:zuCauWp/Em+hQoHkwymOsHjHm7sp9ydxhcymQVuY/+o= -github.com/chainreactors/parsers v0.2.9-0.20230117063421-a463730bca48/go.mod h1:Z9weht+lnFCk7UcwqFu6lXpS7u5vttiy0AJYOAyCCLA= -github.com/chainreactors/parsers v0.2.9-0.20230128044108-411f7c3b1bb7 h1:gUTcvvEaixo0Fom4i+hEc9ZuJwTmgp+TGlb+kYoJ8pI= -github.com/chainreactors/parsers v0.2.9-0.20230128044108-411f7c3b1bb7/go.mod h1:Z9weht+lnFCk7UcwqFu6lXpS7u5vttiy0AJYOAyCCLA= -github.com/chainreactors/parsers v0.2.9-0.20230128045953-708a73b0e3b3 h1:Hovp8f/5UK+cu+LnKECKSr2lNAakoyhcoybsGwQeg+8= -github.com/chainreactors/parsers v0.2.9-0.20230128045953-708a73b0e3b3/go.mod h1:Z9weht+lnFCk7UcwqFu6lXpS7u5vttiy0AJYOAyCCLA= +github.com/chainreactors/parsers v0.2.9-0.20230128061921-aa83139d24f5/go.mod h1:Z9weht+lnFCk7UcwqFu6lXpS7u5vttiy0AJYOAyCCLA= +github.com/chainreactors/parsers v0.3.0 h1:OJ/K/ZRsaSWkQNf6+3yliHrps+zj0fZl2/7juhjFQsY= +github.com/chainreactors/parsers v0.3.0/go.mod h1:Z9weht+lnFCk7UcwqFu6lXpS7u5vttiy0AJYOAyCCLA= github.com/chainreactors/words v0.3.2-0.20230105161651-7c1fc4c9605a h1:vRAMDJ6UQV73uyiRBQnuE/+S7Q7JTpfubSpyRlooZ2U= github.com/chainreactors/words v0.3.2-0.20230105161651-7c1fc4c9605a/go.mod h1:QIWX1vMT5j/Mp9zx3/wgZh3FqskhjCbo/3Ffy/Hxj9w= github.com/davecgh/go-spew v0.0.0-20161028175848-04cdfd42973b/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/pkg/baseline.go b/pkg/baseline.go index 34fa449..3f2842c 100644 --- a/pkg/baseline.go +++ b/pkg/baseline.go @@ -3,9 +3,9 @@ package pkg import ( "bytes" "encoding/json" - "github.com/chainreactors/gogo/v2/pkg/utils" "github.com/chainreactors/logs" "github.com/chainreactors/parsers" + "github.com/chainreactors/parsers/iutils" "github.com/chainreactors/spray/pkg/ihttp" "net/url" "strconv" @@ -134,7 +134,7 @@ func (bl *Baseline) Collect() { bl.Frameworks = FingerDetect(string(bl.Raw)) if len(bl.Body) > 0 { if bl.ContentType == "html" { - bl.Title = utils.AsciiEncode(parsers.MatchTitle(string(bl.Body))) + bl.Title = iutils.AsciiEncode(parsers.MatchTitle(string(bl.Body))) } else if bl.ContentType == "ico" { if name, ok := Md5Fingers[parsers.Md5Hash(bl.Body)]; ok { bl.Frameworks = append(bl.Frameworks, &parsers.Framework{Name: name}) diff --git a/pkg/utils.go b/pkg/utils.go index 3212c09..c18895f 100644 --- a/pkg/utils.go +++ b/pkg/utils.go @@ -3,7 +3,6 @@ package pkg import ( "encoding/json" "github.com/chainreactors/gogo/v2/pkg/fingers" - "github.com/chainreactors/gogo/v2/pkg/utils" "github.com/chainreactors/ipcs" "github.com/chainreactors/parsers" "github.com/chainreactors/parsers/iutils" @@ -196,7 +195,7 @@ func LoadTemplates() error { for k, v := range keywords { t := make([]string, len(v.([]interface{}))) for i, vv := range v.([]interface{}) { - t[i] = utils.ToString(vv) + t[i] = iutils.ToString(vv) } mask.SpecialWords[k] = t }