Skip to content

Commit

Permalink
feature: io package inspect stream reader
Browse files Browse the repository at this point in the history
refactor: block* filters to use the new io package
refactor: remove custom matcher

Signed-off-by: Sandor Szücs <[email protected]>
  • Loading branch information
szuecs committed Jan 11, 2024
1 parent e297b55 commit 4425ef7
Show file tree
Hide file tree
Showing 7 changed files with 883 additions and 397 deletions.
68 changes: 45 additions & 23 deletions filters/block/block.go
Original file line number Diff line number Diff line change
@@ -1,25 +1,30 @@
package block

import (
"bytes"
"encoding/hex"
"errors"

"github.com/zalando/skipper/filters"
)

var (
ErrClosed = errors.New("reader closed")
"github.com/zalando/skipper/io"
"github.com/zalando/skipper/metrics"
)

type blockSpec struct {
MaxMatcherBufferSize uint64
hex bool
}

type toBlockKeys struct{ Str []byte }

func (b toBlockKeys) String() string {
return string(b.Str)
}

type block struct {
toblockList []toblockKeys
toblockList []toBlockKeys
maxEditorBuffer uint64
maxBufferHandling maxBufferHandling
maxBufferHandling io.MaxBufferHandling
metrics metrics.Metrics
}

// NewBlockFilter *deprecated* version of NewBlock
Expand Down Expand Up @@ -52,7 +57,7 @@ func (bs *blockSpec) CreateFilter(args []interface{}) (filters.Filter, error) {
return nil, filters.ErrInvalidFilterParameters
}

sargs := make([]toblockKeys, 0, len(args))
sargs := make([]toBlockKeys, 0, len(args))
for _, w := range args {
v, ok := w.(string)
if !ok {
Expand All @@ -63,33 +68,50 @@ func (bs *blockSpec) CreateFilter(args []interface{}) (filters.Filter, error) {
if err != nil {
return nil, err
}
sargs = append(sargs, toblockKeys{str: a})
sargs = append(sargs, toBlockKeys{Str: a})
} else {
sargs = append(sargs, toblockKeys{str: []byte(v)})
sargs = append(sargs, toBlockKeys{Str: []byte(v)})
}
}

b := &block{
return &block{
toblockList: sargs,
maxBufferHandling: maxBufferBestEffort,
maxBufferHandling: io.MaxBufferBestEffort,
maxEditorBuffer: bs.MaxMatcherBufferSize,
}
metrics: metrics.Default,
}, nil
}

return *b, nil
func blockMatcher(m metrics.Metrics, matches []toBlockKeys) func(b []byte) (int, error) {
return func(b []byte) (int, error) {
for _, s := range matches {
s := s
if bytes.Contains(b, s.Str) {
m.IncCounter("blocked.requests")
return 0, io.ErrBlocked
}
}
return len(b), nil
}
}

func (b block) Request(ctx filters.FilterContext) {
func (b *block) Request(ctx filters.FilterContext) {
req := ctx.Request()
if req.ContentLength == 0 {
return
}

req.Body = newMatcher(
req.Body,
b.toblockList,
b.maxEditorBuffer,
b.maxBufferHandling,
)
// fix filter chaining - https://github.com/zalando/skipper/issues/2605
ctx.Request().Header.Del("Content-Length")
ctx.Request().ContentLength = -1

req.Body = io.InspectReader(
req.Context(),
io.BufferOptions{
MaxBufferHandling: b.maxBufferHandling,
ReadBufferSize: b.maxEditorBuffer,
},
blockMatcher(b.metrics, b.toblockList),
req.Body)
}

func (block) Response(filters.FilterContext) {}
func (*block) Response(filters.FilterContext) {}
Loading

0 comments on commit 4425ef7

Please sign in to comment.