admin/spray
1
0
Fork 0
mirror of https://github.com/chainreactors/spray.git synced 2025-09-15 11:40:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

修复bytes类型转换错误的bug

Browse Source
This commit is contained in:
M09Ic 2023-06-03 21:09:01 +08:00
parent 976ce55bdc
commit fc3f476fe2
4 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/option.go
View File

@ -505,7 +505,7 @@ func (opt *Option) PrepareRunner() (*Runner, error) {
logs.Log.Importantf("Loaded %d dictionaries and %d decorators", len(opt.Dictionaries), len(r.Fns)) logs.Log.Importantf("Loaded %d dictionaries and %d decorators", len(opt.Dictionaries), len(r.Fns))
if opt.Match != "" { if opt.Match != "" {
exp, err := expr.Compile(opt.Match) exp, err := expr.Compile(opt.Match, expr.Patch(&bytesPatcher{}))
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -513,7 +513,7 @@ func (opt *Option) PrepareRunner() (*Runner, error) {
} }
if opt.Filter != "" { if opt.Filter != "" {
exp, err := expr.Compile(opt.Filter) exp, err := expr.Compile(opt.Filter, expr.Patch(&bytesPatcher{}))
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -535,7 +535,7 @@ func (opt *Option) PrepareRunner() (*Runner, error) {
} }
if express != "" { if express != "" {
exp, err := expr.Compile(express) exp, err := expr.Compile(express, expr.Patch(&bytesPatcher{}))
if err != nil { if err != nil {
return nil, err return nil, err
} }

16
internal/utils.go
View File

@ -3,6 +3,7 @@ package internal
import ( import (
"bytes" "bytes"
"github.com/antonmedv/expr" "github.com/antonmedv/expr"
"github.com/antonmedv/expr/ast"
"github.com/antonmedv/expr/vm" "github.com/antonmedv/expr/vm"
"github.com/chainreactors/logs" "github.com/chainreactors/logs"
"github.com/chainreactors/spray/pkg" "github.com/chainreactors/spray/pkg"
@ -276,3 +277,18 @@ func MatchWithGlobs(u string, globs []string) bool {
} }
return false return false
} }
type bytesPatcher struct{}
func (p *bytesPatcher) Visit(node *ast.Node) {
switch (*node).(type) {
case *ast.MemberNode:
ast.Patch(node, &ast.CallNode{
Callee: &ast.MemberNode{
Node: *node,
Name: "String",
Property: &ast.StringNode{Value: "String"},
},
})
}
}

6
pkg/baseline.go
View File

@ -105,9 +105,9 @@ type Baseline struct {
Url *url.URL `json:"-"` Url *url.URL `json:"-"`
Dir bool `json:"-"` Dir bool `json:"-"`
Chunked bool `json:"-"` Chunked bool `json:"-"`
Body []byte `json:"-"` Body BS `json:"-"`
Header []byte `json:"-"` Header BS `json:"-"`
Raw []byte `json:"-"` Raw BS `json:"-"`
Recu bool `json:"-"` Recu bool `json:"-"`
RecuDepth int `json:"-"` RecuDepth int `json:"-"`
URLs []string `json:"-"` URLs []string `json:"-"`

6
pkg/types.go
View File

@ -37,3 +37,9 @@ var ErrMap = map[ErrorType]string{
func (e ErrorType) Error() string { func (e ErrorType) Error() string {
return ErrMap[e] return ErrMap[e]
} }
type BS []byte
func (b BS) String() string {
return string(b)
}