mirror of
https://github.com/yusing/godoxy.git
synced 2025-05-20 04:42:33 +02:00
fix rule parser
This commit is contained in:
parent
28b5d44e11
commit
f2df756c17
2 changed files with 132 additions and 19 deletions
|
@ -1,7 +1,8 @@
|
|||
package rules
|
||||
|
||||
import (
|
||||
"strings"
|
||||
"bytes"
|
||||
"unicode"
|
||||
|
||||
E "github.com/yusing/go-proxy/internal/error"
|
||||
)
|
||||
|
@ -22,15 +23,30 @@ var escapedChars = map[rune]rune{
|
|||
// error 403 "Forbidden 'foo' 'bar'"
|
||||
// error 403 Forbidden\ \"foo\"\ \"bar\".
|
||||
func parse(v string) (subject string, args []string, err E.Error) {
|
||||
v = strings.TrimSpace(v)
|
||||
var buf strings.Builder
|
||||
buf := bytes.NewBuffer(make([]byte, 0, len(v)))
|
||||
|
||||
escaped := false
|
||||
quotes := make([]rune, 0, 4)
|
||||
flush := func() {
|
||||
quote := rune(0)
|
||||
flush := func(quoted bool) {
|
||||
part := buf.String()
|
||||
if !quoted {
|
||||
beg := 0
|
||||
for i, r := range part {
|
||||
if unicode.IsSpace(r) {
|
||||
beg = i + 1
|
||||
} else {
|
||||
break
|
||||
}
|
||||
}
|
||||
if beg == len(part) { // all spaces
|
||||
return
|
||||
}
|
||||
part = part[beg:] // trim leading spaces
|
||||
}
|
||||
if subject == "" {
|
||||
subject = buf.String()
|
||||
subject = part
|
||||
} else {
|
||||
args = append(args, buf.String())
|
||||
args = append(args, part)
|
||||
}
|
||||
buf.Reset()
|
||||
}
|
||||
|
@ -51,29 +67,30 @@ func parse(v string) (subject string, args []string, err E.Error) {
|
|||
continue
|
||||
case '"', '\'':
|
||||
switch {
|
||||
case len(quotes) > 0 && quotes[len(quotes)-1] == r:
|
||||
quotes = quotes[:len(quotes)-1]
|
||||
if len(quotes) == 0 {
|
||||
flush()
|
||||
} else {
|
||||
buf.WriteRune(r)
|
||||
}
|
||||
case len(quotes) == 0:
|
||||
quotes = append(quotes, r)
|
||||
case quote == 0:
|
||||
quote = r
|
||||
flush(false)
|
||||
case r == quote:
|
||||
quote = 0
|
||||
flush(true)
|
||||
default:
|
||||
buf.WriteRune(r)
|
||||
}
|
||||
case ' ':
|
||||
flush()
|
||||
if quote == 0 {
|
||||
flush(false)
|
||||
continue
|
||||
}
|
||||
fallthrough
|
||||
default:
|
||||
buf.WriteRune(r)
|
||||
}
|
||||
}
|
||||
|
||||
if len(quotes) > 0 {
|
||||
if quote != 0 {
|
||||
err = ErrUnterminatedQuotes
|
||||
} else {
|
||||
flush()
|
||||
flush(false)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
|
96
internal/route/rules/parser_test.go
Normal file
96
internal/route/rules/parser_test.go
Normal file
|
@ -0,0 +1,96 @@
|
|||
package rules
|
||||
|
||||
import (
|
||||
"strconv"
|
||||
"testing"
|
||||
|
||||
E "github.com/yusing/go-proxy/internal/error"
|
||||
. "github.com/yusing/go-proxy/internal/utils/testing"
|
||||
)
|
||||
|
||||
func TestParser(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
input string
|
||||
subject string
|
||||
args []string
|
||||
wantErr E.Error
|
||||
}{
|
||||
{
|
||||
name: "basic",
|
||||
input: "rewrite / /foo/bar",
|
||||
subject: "rewrite",
|
||||
args: []string{"/", "/foo/bar"},
|
||||
},
|
||||
{
|
||||
name: "with quotes",
|
||||
input: `error 403 "Forbidden 'foo' 'bar'."`,
|
||||
subject: "error",
|
||||
args: []string{"403", "Forbidden 'foo' 'bar'."},
|
||||
},
|
||||
{
|
||||
name: "with quotes 2",
|
||||
input: `basic_auth "username" "password"`,
|
||||
subject: "basic_auth",
|
||||
args: []string{"username", "password"},
|
||||
},
|
||||
{
|
||||
name: "with escaped",
|
||||
input: `foo bar\ baz bar\r\n\tbaz bar\'\"baz`,
|
||||
subject: "foo",
|
||||
args: []string{"bar baz", "bar\r\n\tbaz", `bar'"baz`},
|
||||
},
|
||||
{
|
||||
name: "empty string",
|
||||
input: `foo '' ""`,
|
||||
subject: "foo",
|
||||
args: []string{"", ""},
|
||||
},
|
||||
{
|
||||
name: "invalid_escape",
|
||||
input: `foo \bar`,
|
||||
wantErr: ErrUnsupportedEscapeChar,
|
||||
},
|
||||
{
|
||||
name: "chaos",
|
||||
input: `error 403 "Forbidden "foo" "bar""`,
|
||||
subject: "error",
|
||||
args: []string{"403", "Forbidden ", "foo", " ", "bar", ""},
|
||||
},
|
||||
{
|
||||
name: "chaos2",
|
||||
input: `foo "'bar' 'baz'" abc\ 'foo "bar"'.`,
|
||||
subject: "foo",
|
||||
args: []string{"'bar' 'baz'", "abc ", `foo "bar"`, "."},
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
subject, args, err := parse(tt.input)
|
||||
if tt.wantErr != nil {
|
||||
ExpectError(t, tt.wantErr, err)
|
||||
return
|
||||
}
|
||||
// t.Log(subject, args, err)
|
||||
ExpectNoError(t, err)
|
||||
ExpectEqual(t, subject, tt.subject)
|
||||
ExpectEqual(t, len(args), len(tt.args))
|
||||
for i, arg := range args {
|
||||
ExpectEqual(t, arg, tt.args[i])
|
||||
}
|
||||
})
|
||||
}
|
||||
t.Run("unterminated quotes", func(t *testing.T) {
|
||||
tests := []string{
|
||||
`error 403 "Forbidden 'foo' 'bar'`,
|
||||
`error 403 "Forbidden 'foo 'bar'`,
|
||||
`error 403 "Forbidden foo "bar'"`,
|
||||
}
|
||||
for i, test := range tests {
|
||||
t.Run(strconv.Itoa(i), func(t *testing.T) {
|
||||
_, _, err := parse(test)
|
||||
ExpectError(t, ErrUnterminatedQuotes, err)
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
Loading…
Add table
Reference in a new issue