From 8a8ad28100ec97990f80c44212931b98ad4a0861 Mon Sep 17 00:00:00 2001 From: GoEdgeLab Date: Fri, 8 Dec 2023 15:39:23 +0800 Subject: [PATCH] =?UTF-8?q?WAF=E6=A3=80=E6=9F=A5=E9=A1=B9=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E2=80=9C=E6=89=80=E6=9C=89=E6=8A=A5=E5=A4=B4=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../waf/checkpoints/request_header_names.go | 32 +++++++++++++++++++ .../checkpoints/request_header_names_test.go | 23 +++++++++++++ internal/waf/checkpoints/utils.go | 8 +++++ 3 files changed, 63 insertions(+) create mode 100644 internal/waf/checkpoints/request_header_names.go create mode 100644 internal/waf/checkpoints/request_header_names_test.go diff --git a/internal/waf/checkpoints/request_header_names.go b/internal/waf/checkpoints/request_header_names.go new file mode 100644 index 0000000..74fbfad --- /dev/null +++ b/internal/waf/checkpoints/request_header_names.go @@ -0,0 +1,32 @@ +package checkpoints + +import ( + "github.com/TeaOSLab/EdgeNode/internal/waf/requests" + "github.com/TeaOSLab/EdgeNode/internal/waf/utils" + "github.com/iwind/TeaGo/maps" + "strings" +) + +type RequestHeaderNamesCheckpoint struct { + Checkpoint +} + +func (this *RequestHeaderNamesCheckpoint) RequestValue(req requests.Request, param string, options maps.Map, ruleId int64) (value any, hasRequestBody bool, sysErr error, userErr error) { + var headerNames = []string{} + for k := range req.WAFRaw().Header { + headerNames = append(headerNames, k) + } + value = strings.Join(headerNames, "\n") + return +} + +func (this *RequestHeaderNamesCheckpoint) ResponseValue(req requests.Request, resp *requests.Response, param string, options maps.Map, ruleId int64) (value any, hasRequestBody bool, sysErr error, userErr error) { + if this.IsRequest() { + return this.RequestValue(req, param, options, ruleId) + } + return +} + +func (this *RequestHeaderNamesCheckpoint) CacheLife() utils.CacheLife { + return utils.CacheShortLife +} diff --git a/internal/waf/checkpoints/request_header_names_test.go b/internal/waf/checkpoints/request_header_names_test.go new file mode 100644 index 0000000..e29640e --- /dev/null +++ b/internal/waf/checkpoints/request_header_names_test.go @@ -0,0 +1,23 @@ +// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved. + +package checkpoints_test + +import ( + "github.com/TeaOSLab/EdgeNode/internal/waf/checkpoints" + "github.com/TeaOSLab/EdgeNode/internal/waf/requests" + "net/http" + "testing" +) + +func TestRequestHeaderNamesCheckpoint_RequestValue(t *testing.T) { + var checkpoint = &checkpoints.RequestHeaderNamesCheckpoint{} + rawReq, err := http.NewRequest(http.MethodGet, "https://example.com", nil) + if err != nil { + t.Fatal(err) + } + rawReq.Header.Set("Accept", "text/html") + rawReq.Header.Set("User-Agent", "Chrome") + rawReq.Header.Set("Accept-Encoding", "br, gzip") + var req = requests.NewTestRequest(rawReq) + t.Log(checkpoint.RequestValue(req, "", nil, 0)) +} diff --git a/internal/waf/checkpoints/utils.go b/internal/waf/checkpoints/utils.go index b1c2406..62a4b6a 100644 --- a/internal/waf/checkpoints/utils.go +++ b/internal/waf/checkpoints/utils.go @@ -226,6 +226,14 @@ var AllCheckpoints = []*CheckpointDefinition{ Instance: new(RequestHeadersCheckpoint), Priority: 100, }, + { + Name: "所有请求报头名称", + Prefix: "headerNames", + Description: "使用换行符(\\n)隔开的报头名称字符串,每行一个名称", + HasParams: false, + Instance: new(RequestHeaderNamesCheckpoint), + Priority: 100, + }, { Name: "单个Header值", Prefix: "header",