TRKJ/EdgeNode
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeNode.git synced 2026-01-04 22:55:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

WAF策略增加“最多检查内容尺寸“选项

Browse Source
This commit is contained in:
GoEdgeLab
2023-08-02 17:00:16 +08:00
parent f60a2845f3
commit dd66e1d322
8 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
internal/waf/checkpoints/request_all.go
View File

@@ -2,7 +2,6 @@ package checkpoints
import (
"github.com/TeaOSLab/EdgeNode/internal/waf/requests"
"github.com/TeaOSLab/EdgeNode/internal/waf/utils"
"github.com/iwind/TeaGo/maps"
)
@@ -12,7 +11,7 @@ type RequestAllCheckpoint struct {
}
func (this *RequestAllCheckpoint) RequestValue(req requests.Request, param string, options maps.Map, ruleId int64) (value interface{}, hasRequestBody bool, sysErr error, userErr error) {
valueBytes := []byte{}
var valueBytes = []byte{}
if len(req.WAFRaw().RequestURI) > 0 {
valueBytes = append(valueBytes, req.WAFRaw().RequestURI...)
} else if req.WAFRaw().URL != nil {
@@ -30,7 +29,7 @@ func (this *RequestAllCheckpoint) RequestValue(req requests.Request, param strin
var bodyData = req.WAFGetCacheBody()
hasRequestBody = true
if len(bodyData) == 0 {
data, err := req.WAFReadBody(utils.MaxBodySize) // read body
data, err := req.WAFReadBody(req.WAFMaxRequestSize()) // read body
if err != nil {
return "", hasRequestBody, err, nil
}

3
internal/waf/checkpoints/request_body.go
View File

@@ -2,7 +2,6 @@ package checkpoints
import (
"github.com/TeaOSLab/EdgeNode/internal/waf/requests"
"github.com/TeaOSLab/EdgeNode/internal/waf/utils"
"github.com/iwind/TeaGo/maps"
)
@@ -25,7 +24,7 @@ func (this *RequestBodyCheckpoint) RequestValue(req requests.Request, param stri
var bodyData = req.WAFGetCacheBody()
hasRequestBody = true
if len(bodyData) == 0 {
data, err := req.WAFReadBody(utils.MaxBodySize) // read body
data, err := req.WAFReadBody(req.WAFMaxRequestSize()) // read body
if err != nil {
return "", hasRequestBody, err, nil
}

3
internal/waf/checkpoints/request_form_arg.go
View File

@@ -2,7 +2,6 @@ package checkpoints
import (
"github.com/TeaOSLab/EdgeNode/internal/waf/requests"
"github.com/TeaOSLab/EdgeNode/internal/waf/utils"
"github.com/iwind/TeaGo/maps"
"net/url"
)
@@ -27,7 +26,7 @@ func (this *RequestFormArgCheckpoint) RequestValue(req requests.Request, param s
var bodyData = req.WAFGetCacheBody()
if len(bodyData) == 0 {
data, err := req.WAFReadBody(utils.MaxBodySize) // read body
data, err := req.WAFReadBody(req.WAFMaxRequestSize()) // read body
if err != nil {
return "", hasRequestBody, err, nil
}

3
internal/waf/checkpoints/request_json_arg.go
View File

@@ -4,7 +4,6 @@ import (
"encoding/json"
"github.com/TeaOSLab/EdgeNode/internal/utils"
"github.com/TeaOSLab/EdgeNode/internal/waf/requests"
wafutils "github.com/TeaOSLab/EdgeNode/internal/waf/utils"
"github.com/iwind/TeaGo/maps"
"strings"
)
@@ -18,7 +17,7 @@ func (this *RequestJSONArgCheckpoint) RequestValue(req requests.Request, param s
var bodyData = req.WAFGetCacheBody()
hasRequestBody = true
if len(bodyData) == 0 {
data, err := req.WAFReadBody(wafutils.MaxBodySize) // read body
data, err := req.WAFReadBody(req.WAFMaxRequestSize()) // read body
if err != nil {
return "", hasRequestBody, err, nil
}

5
internal/waf/checkpoints/request_upload.go
View File

@@ -3,7 +3,6 @@ package checkpoints
import (
"bytes"
"github.com/TeaOSLab/EdgeNode/internal/waf/requests"
"github.com/TeaOSLab/EdgeNode/internal/waf/utils"
"github.com/iwind/TeaGo/lists"
"github.com/iwind/TeaGo/maps"
"io"
@@ -40,7 +39,7 @@ func (this *RequestUploadCheckpoint) RequestValue(req requests.Request, param st
if req.WAFRaw().MultipartForm == nil {
var bodyData = req.WAFGetCacheBody()
if len(bodyData) == 0 {
data, err := req.WAFReadBody(utils.MaxBodySize)
data, err := req.WAFReadBody(req.WAFMaxRequestSize())
if err != nil {
sysErr = err
return
@@ -53,7 +52,7 @@ func (this *RequestUploadCheckpoint) RequestValue(req requests.Request, param st
oldBody := req.WAFRaw().Body
req.WAFRaw().Body = io.NopCloser(bytes.NewBuffer(bodyData))
err := req.WAFRaw().ParseMultipartForm(utils.MaxBodySize)
err := req.WAFRaw().ParseMultipartForm(req.WAFMaxRequestSize())
// 还原
req.WAFRaw().Body = oldBody