Merge pull request #2 from tobycroft/main

yangyin5127 · web-flow · commit 85332d0ee70c · 2023-03-11T22:21:33.000+08:00
ContainString方法在新版中替换成泛型方法
diff --git a/go.mod b/go.mod
@@ -2,4 +2,4 @@ module github.com/feiin/go-xss
 
 go 1.12
 
-require github.com/feiin/pkg v0.0.0-20200516102027-5ac181da46b6
+require github.com/feiin/pkg v0.2.1
diff --git a/go.sum b/go.sum
@@ -1,2 +1,4 @@
 github.com/feiin/pkg v0.0.0-20200516102027-5ac181da46b6 h1:yNgjO67CSASFT/dD06ZtNuTO5mC8NOxq8X8qOPcaNpE=
 github.com/feiin/pkg v0.0.0-20200516102027-5ac181da46b6/go.mod h1:5c1e9ZJud6jYkdjVOwYgNweJcDuFxkh2xiBek0w+hg8=
+github.com/feiin/pkg v0.2.1 h1:fqewu0DwUvMHq50jxdQcUumfQ5JjZy4DyH/jfp6JzhI=
+github.com/feiin/pkg v0.2.1/go.mod h1:a+eNap+KldbxTPdyChieaQ+z8EUr5h3eXnDliCngMP4=
diff --git a/xss.go b/xss.go
@@ -12,7 +12,7 @@ type Xss struct {
 	options XssOption
 }
 
-//NewXSS
+// NewXSS
 func NewXSS(options XssOption) *Xss {
 
 	defaultOption := NewDefaultXssOption()
@@ -82,7 +82,7 @@ func GetAttrs(html string) AttrResult {
 
 }
 
-//Process 处理xss
+// Process 处理xss
 func (x *Xss) Process(html string) string {
 
 	if len(html) < 3 {
@@ -153,7 +153,7 @@ func (x *Xss) Process(html string) string {
 			}
 
 			attrsHTML := parseAttr(attrs.Html, func(name, value string) string {
-				isWhiteAttr := arrays.ContainsString(whiteAttrList, name) != -1
+				isWhiteAttr := arrays.Contains(whiteAttrList, name) != -1
 
 				ret := onTagAttr(tag, name, value, isWhiteAttr)
 
@@ -211,7 +211,7 @@ func (x *Xss) Process(html string) string {
 	return retHTML
 }
 
-//FilterXSS filter xss func
+// FilterXSS filter xss func
 func FilterXSS(html string, options XssOption) string {
 	xss := NewXSS(options)
 	return xss.Process(html)

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@ module github.com/feiin/go-xss`
`2`	`2`
`3`	`3`	`go 1.12`
`4`	`4`
`5`		`-require github.com/feiin/pkg v0.0.0-20200516102027-5ac181da46b6`
	`5`	`+require github.com/feiin/pkg v0.2.1`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ type Xss struct {`
`12`	`12`	`options XssOption`
`13`	`13`	`}`
`14`	`14`
`15`		`-//NewXSS`
	`15`	`+// NewXSS`
`16`	`16`	`func NewXSS(options XssOption) *Xss {`
`17`	`17`
`18`	`18`	`defaultOption := NewDefaultXssOption()`
`@@ -82,7 +82,7 @@ func GetAttrs(html string) AttrResult {`
`82`	`82`
`83`	`83`	`}`
`84`	`84`
`85`		`-//Process 处理xss`
	`85`	`+// Process 处理xss`
`86`	`86`	`func (x *Xss) Process(html string) string {`
`87`	`87`
`88`	`88`	`if len(html) < 3 {`
`@@ -153,7 +153,7 @@ func (x *Xss) Process(html string) string {`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`attrsHTML := parseAttr(attrs.Html, func(name, value string) string {`
`156`		`- isWhiteAttr := arrays.ContainsString(whiteAttrList, name) != -1`
	`156`	`+ isWhiteAttr := arrays.Contains(whiteAttrList, name) != -1`
`157`	`157`
`158`	`158`	`ret := onTagAttr(tag, name, value, isWhiteAttr)`
`159`	`159`
`@@ -211,7 +211,7 @@ func (x *Xss) Process(html string) string {`
`211`	`211`	`return retHTML`
`212`	`212`	`}`
`213`	`213`
`214`		`-//FilterXSS filter xss func`
	`214`	`+// FilterXSS filter xss func`
`215`	`215`	`func FilterXSS(html string, options XssOption) string {`
`216`	`216`	`xss := NewXSS(options)`
`217`	`217`	`return xss.Process(html)`